diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-12-23 02:19:34 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-03 18:15:56 -0500 |
commit | 6bc43c9ee92b4146b56e8758cec73f0990410326 (patch) | |
tree | 407304e2b901b0fd63504e3b1cac7cead529aab5 | |
parent | 0aa0203fb43f04714004b2c4ad33b858e240555d (diff) |
h8300: switch to generic sigaltstack
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r-- | arch/h8300/Kconfig | 1 | ||||
-rw-r--r-- | arch/h8300/kernel/signal.c | 15 |
2 files changed, 3 insertions, 13 deletions
diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig index 2d2efb653ee0..667999e96f63 100644 --- a/arch/h8300/Kconfig +++ b/arch/h8300/Kconfig | |||
@@ -9,6 +9,7 @@ config H8300 | |||
9 | select GENERIC_IRQ_SHOW | 9 | select GENERIC_IRQ_SHOW |
10 | select GENERIC_CPU_DEVICES | 10 | select GENERIC_CPU_DEVICES |
11 | select MODULES_USE_ELF_RELA | 11 | select MODULES_USE_ELF_RELA |
12 | select GENERIC_SIGALTSTACK | ||
12 | 13 | ||
13 | config SYMBOL_PREFIX | 14 | config SYMBOL_PREFIX |
14 | string | 15 | string |
diff --git a/arch/h8300/kernel/signal.c b/arch/h8300/kernel/signal.c index 0e81b96c642f..2d37418c04fb 100644 --- a/arch/h8300/kernel/signal.c +++ b/arch/h8300/kernel/signal.c | |||
@@ -89,13 +89,6 @@ sys_sigaction(int sig, const struct old_sigaction *act, | |||
89 | return ret; | 89 | return ret; |
90 | } | 90 | } |
91 | 91 | ||
92 | asmlinkage int | ||
93 | sys_sigaltstack(const stack_t *uss, stack_t *uoss) | ||
94 | { | ||
95 | return do_sigaltstack(uss, uoss, rdusp()); | ||
96 | } | ||
97 | |||
98 | |||
99 | /* | 92 | /* |
100 | * Do a signal return; undo the signal stack. | 93 | * Do a signal return; undo the signal stack. |
101 | * | 94 | * |
@@ -212,7 +205,7 @@ asmlinkage int do_rt_sigreturn(unsigned long __unused,...) | |||
212 | if (restore_sigcontext(regs, &frame->uc.uc_mcontext, &er0)) | 205 | if (restore_sigcontext(regs, &frame->uc.uc_mcontext, &er0)) |
213 | goto badframe; | 206 | goto badframe; |
214 | 207 | ||
215 | if (do_sigaltstack(&frame->uc.uc_stack, NULL, usp) == -EFAULT) | 208 | if (restore_altstack(&frame->uc.uc_stack)) |
216 | goto badframe; | 209 | goto badframe; |
217 | 210 | ||
218 | return er0; | 211 | return er0; |
@@ -358,11 +351,7 @@ static int setup_rt_frame (int sig, struct k_sigaction *ka, siginfo_t *info, | |||
358 | /* Create the ucontext. */ | 351 | /* Create the ucontext. */ |
359 | err |= __put_user(0, &frame->uc.uc_flags); | 352 | err |= __put_user(0, &frame->uc.uc_flags); |
360 | err |= __put_user(0, &frame->uc.uc_link); | 353 | err |= __put_user(0, &frame->uc.uc_link); |
361 | err |= __put_user((void *)current->sas_ss_sp, | 354 | err |= __save_altstack(&frame->uc.uc_stack, rdusp()); |
362 | &frame->uc.uc_stack.ss_sp); | ||
363 | err |= __put_user(sas_ss_flags(rdusp()), | ||
364 | &frame->uc.uc_stack.ss_flags); | ||
365 | err |= __put_user(current->sas_ss_size, &frame->uc.uc_stack.ss_size); | ||
366 | err |= setup_sigcontext(&frame->uc.uc_mcontext, regs, set->sig[0]); | 355 | err |= setup_sigcontext(&frame->uc.uc_mcontext, regs, set->sig[0]); |
367 | err |= copy_to_user (&frame->uc.uc_sigmask, set, sizeof(*set)); | 356 | err |= copy_to_user (&frame->uc.uc_sigmask, set, sizeof(*set)); |
368 | if (err) | 357 | if (err) |