diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-12-15 20:33:22 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-12-15 20:33:28 +0100 |
| commit | ab1eebe77dd08b26585860d534e07810d1cd274d (patch) | |
| tree | 92b1ff0952cbdeef34922c43ff7eaac2162e77c4 /arch/x86/kernel/signal.c | |
| parent | 186a25026c44d1bfa97671110ff14dcd0c99678e (diff) | |
| parent | df59e7bf439918f523ac29e996ec1eebbed60440 (diff) | |
| download | kernel-crypto-ab1eebe77dd08b26585860d534e07810d1cd274d.tar.gz kernel-crypto-ab1eebe77dd08b26585860d534e07810d1cd274d.tar.xz kernel-crypto-ab1eebe77dd08b26585860d534e07810d1cd274d.zip | |
Merge branch 'x86/asm' into x86/urgent
Merge reason: it's stable so lets push it upstream.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/signal.c')
| -rw-r--r-- | arch/x86/kernel/signal.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c index 74fe6d86dc5..4fd173cd8e5 100644 --- a/arch/x86/kernel/signal.c +++ b/arch/x86/kernel/signal.c @@ -545,22 +545,12 @@ sys_sigaction(int sig, const struct old_sigaction __user *act, } #endif /* CONFIG_X86_32 */ -#ifdef CONFIG_X86_32 -int sys_sigaltstack(struct pt_regs *regs) -{ - const stack_t __user *uss = (const stack_t __user *)regs->bx; - stack_t __user *uoss = (stack_t __user *)regs->cx; - - return do_sigaltstack(uss, uoss, regs->sp); -} -#else /* !CONFIG_X86_32 */ -asmlinkage long +long sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss, struct pt_regs *regs) { return do_sigaltstack(uss, uoss, regs->sp); } -#endif /* CONFIG_X86_32 */ /* * Do a signal return; undo the signal stack. |