fix out-of-tree build and new kernel support

[sgx.git] / pvr / pvr_debugfs.c

diff --git a/pvr/pvr_debugfs.c b/pvr/pvr_debugfs.c
index 78987c7..d1493fb 100644 (file)
--- a/pvr/pvr_debugfs.c
+++ b/pvr/pvr_debugfs.c
@@ -23,6 +23,7 @@
  *
  */
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/debugfs.h>
 #include <linux/vmalloc.h>
 #include <linux/mutex.h>
@@ -109,6 +110,8 @@ static int pvr_debugfs_reset_wrapper(void *data, u64 val)
                return pvr_debugfs_reset(data, val);
 
        BUG();
+
+       return -EFAULT;
 }
 
 DEFINE_SIMPLE_ATTRIBUTE(pvr_debugfs_reset_fops, NULL,
@@ -504,7 +507,7 @@ hwrec_registers_dump(struct PVRSRV_SGXDEV_INFO *psDevInfo)
 }
 
 static void
-hwrec_pages_free(size_t *size, u32 *pages)
+hwrec_pages_free(size_t *size, unsigned long *pages)
 {
        int i;
 
@@ -520,8 +523,8 @@ hwrec_pages_free(size_t *size, u32 *pages)
 }
 
 static int
-hwrec_pages_write(u8 *buffer, size_t size, size_t *current_size, u32 *pages,
-                 int array_size)
+hwrec_pages_write(u8 *buffer, size_t size, size_t *current_size,
+                 unsigned long *pages, int array_size)
 {
        size_t ret = 0;
 
@@ -591,7 +594,7 @@ hwrec_mem_print(char *format, ...)
  * Render status buffer dumping.
  */
 static size_t hwrec_status_size;
-static u32 hwrec_status_pages[1024];
+static unsigned long hwrec_status_pages[1024];
 
 static int
 hwrec_status_write(char *buffer, size_t size)