diff options
| 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/include | |
| parent | 74d96f018673759d04d032c137d132f6447bfb1e (diff) | |
| parent | 26689452f5ca201add63b1b1ff0dbcf82d6885e7 (diff) | |
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
...
Diffstat (limited to 'arch/sh/include')
| -rw-r--r-- | arch/sh/include/asm/syscalls_32.h | 6 |
1 files changed, 3 insertions, 3 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, | |||
| 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, |