ppc64: rename to pread64/pwrite64 and add sys_readahead

arch/ppc64/kernel/misc.S

@@ -683,8 +683,8 @@ _GLOBAL(sys_call_table32)
 	.llong .sys32_rt_sigtimedwait
 	.llong .sys32_rt_sigqueueinfo
 	.llong .sys32_rt_sigsuspend
-	.llong .sys32_pread
-	.llong .sys32_pwrite	        /* 180 */
+	.llong .sys32_pread64
+	.llong .sys32_pwrite64	        /* 180 */
 	.llong .sys_chown
 	.llong .sys_getcwd
 	.llong .sys_capget
@@ -695,7 +695,7 @@ _GLOBAL(sys_call_table32)
 	.llong .sys_ni_syscall		/* streams2 */
 	.llong .sys32_vfork
 	.llong .sys32_getrlimit	        /* 190 */
-	.llong .sys_ni_syscall		/* 191 */	/* Unused */
+	.llong .sys32_readahead
 	.llong .sys_ni_syscall		/* 192 - reserved - mmap2 */
 	.llong .sys32_truncate64	/* 193 - truncate64 */
 	.llong .sys32_ftruncate64	/* 194 - ftruncate64 */
@@ -726,11 +726,12 @@ _GLOBAL(sys_call_table32)
 	.llong .sys_lremovexattr
 	.llong .sys_fremovexattr	/* 220 */
 	.llong .sys_futex
-	.llong .sys_ni_syscall		/* reserved for tux */
 	.llong .sys32_sched_setaffinity
 	.llong .sys32_sched_getaffinity
+	.llong .sys_ni_syscall		/* reserved for security */
+	.llong .sys_ni_syscall		/* 225 - reserved for tux */
 
-	.rept NR_syscalls-224
+	.rept NR_syscalls-225
 		.llong .sys_ni_syscall
 	.endr
 #endif
@@ -928,6 +929,7 @@ _GLOBAL(sys_call_table)
 	.llong .sys_ni_syscall		/* streams2 */
 	.llong .sys_vfork
 	.llong .sys_getrlimit	        /* 190 */
+	.llong .sys_readahead
 	.llong .sys_ni_syscall		/* 191 */	/* Unused */
 	.llong .sys_ni_syscall		/* 192 - reserved - mmap2 */
 	.llong .sys_ni_syscall		/* 193 - reserved - truncate64 */
@@ -959,10 +961,11 @@ _GLOBAL(sys_call_table)
 	.llong .sys_lremovexattr
 	.llong .sys_fremovexattr	/* 220 */
 	.llong .sys_futex
-	.llong .sys_ni_syscall		/* reserved for tux */
 	.llong .sys_sched_setaffinity
 	.llong .sys_sched_getaffinity
+	.llong .sys_ni_syscall		/* reserved for security */
+	.llong .sys_ni_syscall		/* reserved for tux */
 
-	.rept NR_syscalls-224
+	.rept NR_syscalls-225
 	.llong .sys_ni_syscall
 	.endr

arch/ppc64/kernel/sys_ppc32.c

@@ -4438,30 +4438,32 @@ asmlinkage int sys32_vm86(u32 a1, u32 a2, u32 a3, u32 a4)
 	return sys_vm86((int)a1, (int)a2, (int)a3, (int)a4);
 }
 
+extern ssize_t sys_pread64(unsigned int fd, char *buf, size_t count,
+			   loff_t pos);
 
-
-
-
-extern asmlinkage ssize_t sys_pread(unsigned int fd, char * buf,
-				    size_t count, loff_t pos);
-
-extern asmlinkage ssize_t sys_pwrite(unsigned int fd, const char * buf,
-				     size_t count, loff_t pos);
+extern ssize_t sys_pwrite64(unsigned int fd, const char *buf, size_t count,
+			    loff_t pos);
 
 typedef __kernel_ssize_t32 ssize_t32;
 
-asmlinkage ssize_t32 sys32_pread(unsigned int fd, char *ubuf,
-				 __kernel_size_t32 count, u32 reg6, u32 poshi, u32 poslo)
+ssize_t32 sys32_pread64(unsigned int fd, char *ubuf, __kernel_size_t32 count,
+			u32 reg6, u32 poshi, u32 poslo)
 {
-	return sys_pread(fd, ubuf, count, ((loff_t)AA(poshi) << 32) | AA(poslo));
+	return sys_pread64(fd, ubuf, count, ((loff_t)AA(poshi) << 32) | AA(poslo));
 }
 
-asmlinkage ssize_t32 sys32_pwrite(unsigned int fd, char *ubuf,
-				  __kernel_size_t32 count, u32 reg6 ,u32 poshi, u32 poslo)
+ssize_t32 sys32_pwrite64(unsigned int fd, char *ubuf, __kernel_size_t32 count,
+			 u32 reg6 ,u32 poshi, u32 poslo)
 {
-	return sys_pwrite(fd, ubuf, count, ((loff_t)AA(poshi) << 32) | AA(poslo));
+	return sys_pwrite64(fd, ubuf, count, ((loff_t)AA(poshi) << 32) | AA(poslo));
 }
 
+extern ssize_t sys_readahead(int fd, loff_t offset, size_t count);
+
+ssize_t32 sys32_readahead(int fd, u32 offhi, u32 offlo, s32 count)
+{
+        return sys_readahead(fd, ((loff_t)AA(offhi) << 32) | AA(offlo), count);
+}
 
 extern asmlinkage long sys_truncate(const char * path, unsigned long length);
 extern asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);

include/asm-ppc64/unistd.h

@@ -200,6 +200,7 @@
 #define __NR_putpmsg		188	/* some people actually want streams */
 #define __NR_vfork		189
 #define __NR_ugetrlimit		190	/* SuS compliant getrlimit */
+#define __NR_readahead		191
 #define __NR_mmap2		192
 #define __NR_truncate64		193
 #define __NR_ftruncate64	194
@@ -230,15 +231,10 @@
 #define __NR_lremovexattr	219
 #define __NR_fremovexattr	220
 #define __NR_futex		221
-#define __NR_tux		222
-#define __NR_sched_setaffinity	223     
-#define __NR_sched_getaffinity	224
-
-#if 0
-/* Remind paulus to add these into ppc32 */
-__NR_security
-__NR_readahead
-#endif
+#define __NR_sched_setaffinity	222     
+#define __NR_sched_getaffinity	223
+#define __NR_security		224
+#define __NR_tuxcall		225
 
 #define __NR(n)	#n