diff options
-rw-r--r-- | arch/parisc/hpux/fs.c | 2 | ||||
-rw-r--r-- | arch/parisc/kernel/sys_parisc32.c | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/arch/parisc/hpux/fs.c b/arch/parisc/hpux/fs.c index 2d58b92b57e3..4204cd1f3cf9 100644 --- a/arch/parisc/hpux/fs.c +++ b/arch/parisc/hpux/fs.c | |||
@@ -73,7 +73,7 @@ struct getdents_callback { | |||
73 | #define ROUND_UP(x) (((x)+sizeof(long)-1) & ~(sizeof(long)-1)) | 73 | #define ROUND_UP(x) (((x)+sizeof(long)-1) & ~(sizeof(long)-1)) |
74 | 74 | ||
75 | static int filldir(void * __buf, const char * name, int namlen, loff_t offset, | 75 | static int filldir(void * __buf, const char * name, int namlen, loff_t offset, |
76 | ino_t ino, unsigned d_type) | 76 | u64 ino, unsigned d_type) |
77 | { | 77 | { |
78 | struct hpux_dirent * dirent; | 78 | struct hpux_dirent * dirent; |
79 | struct getdents_callback * buf = (struct getdents_callback *) __buf; | 79 | struct getdents_callback * buf = (struct getdents_callback *) __buf; |
diff --git a/arch/parisc/kernel/sys_parisc32.c b/arch/parisc/kernel/sys_parisc32.c index e0e4e0bfcc6b..29be4377aca6 100644 --- a/arch/parisc/kernel/sys_parisc32.c +++ b/arch/parisc/kernel/sys_parisc32.c | |||
@@ -313,9 +313,8 @@ struct readdir32_callback { | |||
313 | 313 | ||
314 | #define ROUND_UP(x,a) ((__typeof__(x))(((unsigned long)(x) + ((a) - 1)) & ~((a) - 1))) | 314 | #define ROUND_UP(x,a) ((__typeof__(x))(((unsigned long)(x) + ((a) - 1)) & ~((a) - 1))) |
315 | #define NAME_OFFSET(de) ((int) ((de)->d_name - (char __user *) (de))) | 315 | #define NAME_OFFSET(de) ((int) ((de)->d_name - (char __user *) (de))) |
316 | static int | 316 | static int filldir32 (void *__buf, const char *name, int namlen, |
317 | filldir32 (void *__buf, const char *name, int namlen, loff_t offset, ino_t ino, | 317 | loff_t offset, u64 ino, unsigned int d_type) |
318 | unsigned int d_type) | ||
319 | { | 318 | { |
320 | struct linux32_dirent __user * dirent; | 319 | struct linux32_dirent __user * dirent; |
321 | struct getdents32_callback * buf = (struct getdents32_callback *) __buf; | 320 | struct getdents32_callback * buf = (struct getdents32_callback *) __buf; |
@@ -377,9 +376,8 @@ out: | |||
377 | return error; | 376 | return error; |
378 | } | 377 | } |
379 | 378 | ||
380 | static int | 379 | static int fillonedir32(void * __buf, const char * name, int namlen, |
381 | fillonedir32 (void * __buf, const char * name, int namlen, loff_t offset, ino_t ino, | 380 | loff_t offset, u64 ino, unsigned int d_type) |
382 | unsigned int d_type) | ||
383 | { | 381 | { |
384 | struct readdir32_callback * buf = (struct readdir32_callback *) __buf; | 382 | struct readdir32_callback * buf = (struct readdir32_callback *) __buf; |
385 | struct old_linux32_dirent __user * dirent; | 383 | struct old_linux32_dirent __user * dirent; |