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/alpha | |
| 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/alpha')
| -rw-r--r-- | arch/alpha/kernel/entry.S | 8 | ||||
| -rw-r--r-- | arch/alpha/kernel/systbls.S | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/alpha/kernel/entry.S b/arch/alpha/kernel/entry.S index f77345bc66a9..aa2e50cf9857 100644 --- a/arch/alpha/kernel/entry.S +++ b/arch/alpha/kernel/entry.S | |||
| @@ -896,9 +896,9 @@ sys_getxpid: | |||
| 896 | .end sys_getxpid | 896 | .end sys_getxpid |
| 897 | 897 | ||
| 898 | .align 4 | 898 | .align 4 |
| 899 | .globl sys_pipe | 899 | .globl sys_alpha_pipe |
| 900 | .ent sys_pipe | 900 | .ent sys_alpha_pipe |
| 901 | sys_pipe: | 901 | sys_alpha_pipe: |
| 902 | lda $sp, -16($sp) | 902 | lda $sp, -16($sp) |
| 903 | stq $26, 0($sp) | 903 | stq $26, 0($sp) |
| 904 | .prologue 0 | 904 | .prologue 0 |
| @@ -916,7 +916,7 @@ sys_pipe: | |||
| 916 | stq $1, 80+16($sp) | 916 | stq $1, 80+16($sp) |
| 917 | 1: lda $sp, 16($sp) | 917 | 1: lda $sp, 16($sp) |
| 918 | ret | 918 | ret |
| 919 | .end sys_pipe | 919 | .end sys_alpha_pipe |
| 920 | 920 | ||
| 921 | .align 4 | 921 | .align 4 |
| 922 | .globl sys_execve | 922 | .globl sys_execve |
diff --git a/arch/alpha/kernel/systbls.S b/arch/alpha/kernel/systbls.S index ba914af18c4f..9d9e3a98bb95 100644 --- a/arch/alpha/kernel/systbls.S +++ b/arch/alpha/kernel/systbls.S | |||
| @@ -52,7 +52,7 @@ sys_call_table: | |||
| 52 | .quad sys_setpgid | 52 | .quad sys_setpgid |
| 53 | .quad alpha_ni_syscall /* 40 */ | 53 | .quad alpha_ni_syscall /* 40 */ |
| 54 | .quad sys_dup | 54 | .quad sys_dup |
| 55 | .quad sys_pipe | 55 | .quad sys_alpha_pipe |
| 56 | .quad osf_set_program_attributes | 56 | .quad osf_set_program_attributes |
| 57 | .quad alpha_ni_syscall | 57 | .quad alpha_ni_syscall |
| 58 | .quad sys_open /* 45 */ | 58 | .quad sys_open /* 45 */ |