Merge branch 'syscalls' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

* 'syscalls' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: (44 commits) [CVE-2009-0029] s390 specific system call wrappers [CVE-2009-0029] System call wrappers part 33 [CVE-2009-0029] System call wrappers part 32 [CVE-2009-0029] System call wrappers part 31 [CVE-2009-0029] System call wrappers part 30 [CVE-2009-0029] System call wrappers part 29 [CVE-2009-0029] System call wrappers part 28 [CVE-2009-0029] System call wrappers part 27 [CVE-2009-0029] System call wrappers part 26 [CVE-2009-0029] System call wrappers part 25 [CVE-2009-0029] System call wrappers part 24 [CVE-2009-0029] System call wrappers part 23 [CVE-2009-0029] System call wrappers part 22 [CVE-2009-0029] System call wrappers part 21 [CVE-2009-0029] System call wrappers part 20 [CVE-2009-0029] System call wrappers part 19 [CVE-2009-0029] System call wrappers part 18 [CVE-2009-0029] System call wrappers part 17 [CVE-2009-0029] System call wrappers part 16 [CVE-2009-0029] System call wrappers part 15 ...
author: Linus Torvalds <torvalds@linux-foundation.org> 2009-01-14 22:58:40 -0500
committer: Linus Torvalds <torvalds@linux-foundation.org> 2009-01-14 22:58:40 -0500
commit: bca268565fd18f0b36ab8fff6e1623d8dffae2b1 (patch)
tree: 11abda03d7a7764cfa6a49a6ec2da1576b3058ee /arch/sh
parent: 74d96f018673759d04d032c137d132f6447bfb1e (diff)
parent: 26689452f5ca201add63b1b1ff0dbcf82d6885e7 (diff)
4 files changed, 7 insertions, 7 deletions
diff --git a/arch/sh/include/asm/syscalls_32.h b/arch/sh/include/asm/syscalls_32.h
index 104c5e686106..8b30200305c3 100644
--- a/arch/sh/include/asm/syscalls_32.h
+++ b/arch/sh/include/asm/syscalls_32.h
@@ -36,9 +36,9 @@ asmlinkage int sys_sigreturn(unsigned long r4, unsigned long r5,
 asmlinkage int sys_rt_sigreturn(unsigned long r4, unsigned long r5,
                                unsigned long r6, unsigned long r7,
                                struct pt_regs __regs);
-asmlinkage int sys_pipe(unsigned long r4, unsigned long r5,
+asmlinkage int sys_sh_pipe(unsigned long r4, unsigned long r5,
-                        unsigned long r6, unsigned long r7,
+                           unsigned long r6, unsigned long r7,
-                        struct pt_regs __regs);
+                           struct pt_regs __regs);
 asmlinkage ssize_t sys_pread_wrapper(unsigned int fd, char __user *buf,
                                     size_t count, long dummy, loff_t pos);
 asmlinkage ssize_t sys_pwrite_wrapper(unsigned int fd, const char __user *buf,
diff --git a/arch/sh/kernel/sys_sh32.c b/arch/sh/kernel/sys_sh32.c
index dbba1e1833d4..63ba12836eae 100644
--- a/arch/sh/kernel/sys_sh32.c
+++ b/arch/sh/kernel/sys_sh32.c
@@ -22,7 +22,7 @@
 * sys_pipe() is the normal C calling standard for creating
 * a pipe. It's not the way Unix traditionally does this, though.
 */
-asmlinkage int sys_pipe(unsigned long r4, unsigned long r5,
+asmlinkage int sys_sh_pipe(unsigned long r4, unsigned long r5,
        unsigned long r6, unsigned long r7,
        struct pt_regs __regs)
 {
diff --git a/arch/sh/kernel/syscalls_32.S b/arch/sh/kernel/syscalls_32.S
index 0af693e65764..e67c1733e1b9 100644
--- a/arch/sh/kernel/syscalls_32.S
+++ b/arch/sh/kernel/syscalls_32.S
@@ -58,7 +58,7 @@ ENTRY(sys_call_table)
        .long sys_mkdir
        .long sys_rmdir         /* 40 */
        .long sys_dup
-        .long sys_pipe
+        .long sys_sh_pipe
        .long sys_times
        .long sys_ni_syscall    /* old prof syscall holder */
        .long sys_brk           /* 45 */
@@ -105,7 +105,7 @@ ENTRY(sys_call_table)
        .long sys_uselib
        .long sys_swapon
        .long sys_reboot
-        .long old_readdir
+        .long sys_old_readdir
        .long old_mmap          /* 90 */
        .long sys_munmap
        .long sys_truncate
diff --git a/arch/sh/kernel/syscalls_64.S b/arch/sh/kernel/syscalls_64.S
index 0b436aa3cad7..557cb91f5caf 100644
--- a/arch/sh/kernel/syscalls_64.S
+++ b/arch/sh/kernel/syscalls_64.S
@@ -109,7 +109,7 @@ sys_call_table:
        .long sys_uselib
        .long sys_swapon
        .long sys_reboot
-        .long old_readdir
+        .long sys_old_readdir
        .long old_mmap                  /* 90 */
        .long sys_munmap
        .long sys_truncate
author	Linus Torvalds <torvalds@linux-foundation.org>	2009-01-14 22:58:40 -0500
committer	Linus Torvalds <torvalds@linux-foundation.org>	2009-01-14 22:58:40 -0500
commit	bca268565fd18f0b36ab8fff6e1623d8dffae2b1 (patch)
tree	11abda03d7a7764cfa6a49a6ec2da1576b3058ee /arch/sh
parent	74d96f018673759d04d032c137d132f6447bfb1e (diff)
parent	26689452f5ca201add63b1b1ff0dbcf82d6885e7 (diff)

diff --git a/arch/sh/include/asm/syscalls_32.h b/arch/sh/include/asm/syscalls_32.h index 104c5e686106..8b30200305c3 100644 --- a/arch/sh/include/asm/syscalls_32.h +++ b/arch/sh/include/asm/syscalls_32.h
@@ -36,9 +36,9 @@ asmlinkage int sys_sigreturn(unsigned long r4, unsigned long r5,
36	asmlinkage int sys_rt_sigreturn(unsigned long r4, unsigned long r5,	36	asmlinkage int sys_rt_sigreturn(unsigned long r4, unsigned long r5,
37	unsigned long r6, unsigned long r7,	37	unsigned long r6, unsigned long r7,
38	struct pt_regs __regs);	38	struct pt_regs __regs);
39	asmlinkage int sys_pipe(unsigned long r4, unsigned long r5,	39	asmlinkage int sys_sh_pipe(unsigned long r4, unsigned long r5,
40	unsigned long r6, unsigned long r7,	40	unsigned long r6, unsigned long r7,
41	struct pt_regs __regs);	41	struct pt_regs __regs);
42	asmlinkage ssize_t sys_pread_wrapper(unsigned int fd, char __user *buf,	42	asmlinkage ssize_t sys_pread_wrapper(unsigned int fd, char __user *buf,
43	size_t count, long dummy, loff_t pos);	43	size_t count, long dummy, loff_t pos);
44	asmlinkage ssize_t sys_pwrite_wrapper(unsigned int fd, const char __user *buf,	44	asmlinkage ssize_t sys_pwrite_wrapper(unsigned int fd, const char __user *buf,


diff --git a/arch/sh/kernel/sys_sh32.c b/arch/sh/kernel/sys_sh32.c index dbba1e1833d4..63ba12836eae 100644 --- a/arch/sh/kernel/sys_sh32.c +++ b/arch/sh/kernel/sys_sh32.c
@@ -22,7 +22,7 @@
22	* sys_pipe() is the normal C calling standard for creating	22	* sys_pipe() is the normal C calling standard for creating
23	* a pipe. It's not the way Unix traditionally does this, though.	23	* a pipe. It's not the way Unix traditionally does this, though.
24	*/	24	*/
25	asmlinkage int sys_pipe(unsigned long r4, unsigned long r5,	25	asmlinkage int sys_sh_pipe(unsigned long r4, unsigned long r5,
26	unsigned long r6, unsigned long r7,	26	unsigned long r6, unsigned long r7,
27	struct pt_regs __regs)	27	struct pt_regs __regs)
28	{	28	{


diff --git a/arch/sh/kernel/syscalls_32.S b/arch/sh/kernel/syscalls_32.S index 0af693e65764..e67c1733e1b9 100644 --- a/arch/sh/kernel/syscalls_32.S +++ b/arch/sh/kernel/syscalls_32.S
@@ -58,7 +58,7 @@ ENTRY(sys_call_table)
58	.long sys_mkdir	58	.long sys_mkdir
59	.long sys_rmdir /* 40 */	59	.long sys_rmdir /* 40 */
60	.long sys_dup	60	.long sys_dup
61	.long sys_pipe	61	.long sys_sh_pipe
62	.long sys_times	62	.long sys_times
63	.long sys_ni_syscall /* old prof syscall holder */	63	.long sys_ni_syscall /* old prof syscall holder */
64	.long sys_brk /* 45 */	64	.long sys_brk /* 45 */
@@ -105,7 +105,7 @@ ENTRY(sys_call_table)
105	.long sys_uselib	105	.long sys_uselib
106	.long sys_swapon	106	.long sys_swapon
107	.long sys_reboot	107	.long sys_reboot
108	.long old_readdir	108	.long sys_old_readdir
109	.long old_mmap /* 90 */	109	.long old_mmap /* 90 */
110	.long sys_munmap	110	.long sys_munmap
111	.long sys_truncate	111	.long sys_truncate


diff --git a/arch/sh/kernel/syscalls_64.S b/arch/sh/kernel/syscalls_64.S index 0b436aa3cad7..557cb91f5caf 100644 --- a/arch/sh/kernel/syscalls_64.S +++ b/arch/sh/kernel/syscalls_64.S
@@ -109,7 +109,7 @@ sys_call_table:
109	.long sys_uselib	109	.long sys_uselib
110	.long sys_swapon	110	.long sys_swapon
111	.long sys_reboot	111	.long sys_reboot
112	.long old_readdir	112	.long sys_old_readdir
113	.long old_mmap /* 90 */	113	.long old_mmap /* 90 */
114	.long sys_munmap	114	.long sys_munmap
115	.long sys_truncate	115	.long sys_truncate