diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-12-23 02:13:57 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-03 18:15:54 -0500 |
commit | fe76141671c3025cd0da7cfafb6d8945bbe0735b (patch) | |
tree | 7e4cdec76b7aca412a8ab5ec9e260585759ced79 /arch/frv/kernel | |
parent | 0aa0203fb43f04714004b2c4ad33b858e240555d (diff) |
frv: switch to generic sigaltstack
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/frv/kernel')
-rw-r--r-- | arch/frv/kernel/signal.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/arch/frv/kernel/signal.c b/arch/frv/kernel/signal.c index 535810a3217a..445156d2d30b 100644 --- a/arch/frv/kernel/signal.c +++ b/arch/frv/kernel/signal.c | |||
@@ -74,13 +74,6 @@ asmlinkage int sys_sigaction(int sig, | |||
74 | return ret; | 74 | return ret; |
75 | } | 75 | } |
76 | 76 | ||
77 | asmlinkage | ||
78 | int sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss) | ||
79 | { | ||
80 | return do_sigaltstack(uss, uoss, __frame->sp); | ||
81 | } | ||
82 | |||
83 | |||
84 | /* | 77 | /* |
85 | * Do a signal return; undo the signal stack. | 78 | * Do a signal return; undo the signal stack. |
86 | */ | 79 | */ |
@@ -173,7 +166,7 @@ asmlinkage int sys_rt_sigreturn(void) | |||
173 | if (restore_sigcontext(&frame->uc.uc_mcontext, &gr8)) | 166 | if (restore_sigcontext(&frame->uc.uc_mcontext, &gr8)) |
174 | goto badframe; | 167 | goto badframe; |
175 | 168 | ||
176 | if (do_sigaltstack(&frame->uc.uc_stack, NULL, __frame->sp) == -EFAULT) | 169 | if (restore_altstack(&frame->uc.uc_stack)) |
177 | goto badframe; | 170 | goto badframe; |
178 | 171 | ||
179 | return gr8; | 172 | return gr8; |
@@ -345,9 +338,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, | |||
345 | /* Create the ucontext. */ | 338 | /* Create the ucontext. */ |
346 | if (__put_user(0, &frame->uc.uc_flags) || | 339 | if (__put_user(0, &frame->uc.uc_flags) || |
347 | __put_user(NULL, &frame->uc.uc_link) || | 340 | __put_user(NULL, &frame->uc.uc_link) || |
348 | __put_user((void __user *)current->sas_ss_sp, &frame->uc.uc_stack.ss_sp) || | 341 | __save_altstack(&frame->uc.uc_stack, __frame->sp)) |
349 | __put_user(sas_ss_flags(__frame->sp), &frame->uc.uc_stack.ss_flags) || | ||
350 | __put_user(current->sas_ss_size, &frame->uc.uc_stack.ss_size)) | ||
351 | goto give_sigsegv; | 342 | goto give_sigsegv; |
352 | 343 | ||
353 | if (setup_sigcontext(&frame->uc.uc_mcontext, set->sig[0])) | 344 | if (setup_sigcontext(&frame->uc.uc_mcontext, set->sig[0])) |