diff options
| author | Brian Gerst <brgerst@gmail.com> | 2009-12-09 19:01:54 -0500 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-12-09 16:28:59 -0800 |
| commit | 052acad48a566a6dbcccb95e5d22e5e1b7cac8dd (patch) | |
| tree | 3a192104ec0f484034162a769a647525bca9c94e /arch/x86/include/asm/syscalls.h | |
| parent | 11cf88bd0b8165b65aaabaee0977e9a3ad474ab7 (diff) | |
| download | linux-stable-052acad48a566a6dbcccb95e5d22e5e1b7cac8dd.tar.gz linux-stable-052acad48a566a6dbcccb95e5d22e5e1b7cac8dd.tar.bz2 linux-stable-052acad48a566a6dbcccb95e5d22e5e1b7cac8dd.zip | |
x86: Merge sys_sigaltstack
Change 32-bit sys_sigaltstack to PTREGSCALL2, and merge with 64-bit.
Signed-off-by: Brian Gerst <brgerst@gmail.com>
LKML-Reference: <1260403316-5679-5-git-send-email-brgerst@gmail.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/include/asm/syscalls.h')
| -rw-r--r-- | arch/x86/include/asm/syscalls.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/x86/include/asm/syscalls.h b/arch/x86/include/asm/syscalls.h index 48c48e508b9f..94e0b61fb040 100644 --- a/arch/x86/include/asm/syscalls.h +++ b/arch/x86/include/asm/syscalls.h @@ -31,6 +31,9 @@ asmlinkage int sys_modify_ldt(int, void __user *, unsigned long); /* kernel/signal.c */ long sys_rt_sigreturn(struct pt_regs *); +long sys_sigaltstack(const stack_t __user *, stack_t __user *, + struct pt_regs *); + /* kernel/tls.c */ asmlinkage int sys_set_thread_area(struct user_desc __user *); @@ -46,7 +49,6 @@ int sys_clone(struct pt_regs *); asmlinkage int sys_sigsuspend(int, int, old_sigset_t); asmlinkage int sys_sigaction(int, const struct old_sigaction __user *, struct old_sigaction __user *); -int sys_sigaltstack(struct pt_regs *); unsigned long sys_sigreturn(struct pt_regs *); /* kernel/sys_i386_32.c */ @@ -76,10 +78,6 @@ asmlinkage long sys_clone(unsigned long, unsigned long, struct pt_regs *); long sys_arch_prctl(int, unsigned long); -/* kernel/signal.c */ -asmlinkage long sys_sigaltstack(const stack_t __user *, stack_t __user *, - struct pt_regs *); - /* kernel/sys_x86_64.c */ struct new_utsname; |