diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-12-23 02:43:08 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-03 18:15:57 -0500 |
commit | 1e974c21661db89b30eb13040fc9ab99a83b6492 (patch) | |
tree | cc8c987b339865ea850ea41c5aa00fa7e5c7d084 /arch | |
parent | 0aa0203fb43f04714004b2c4ad33b858e240555d (diff) |
hexagon: switch to generic sigaltstack
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/hexagon/Kconfig | 1 | ||||
-rw-r--r-- | arch/hexagon/kernel/signal.c | 15 |
2 files changed, 2 insertions, 14 deletions
diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig index 0744f7d7b1fd..3e6e27c11f93 100644 --- a/arch/hexagon/Kconfig +++ b/arch/hexagon/Kconfig | |||
@@ -31,6 +31,7 @@ config HEXAGON | |||
31 | select GENERIC_CLOCKEVENTS | 31 | select GENERIC_CLOCKEVENTS |
32 | select GENERIC_CLOCKEVENTS_BROADCAST | 32 | select GENERIC_CLOCKEVENTS_BROADCAST |
33 | select MODULES_USE_ELF_RELA | 33 | select MODULES_USE_ELF_RELA |
34 | select GENERIC_SIGALTSTACK | ||
34 | ---help--- | 35 | ---help--- |
35 | Qualcomm Hexagon is a processor architecture designed for high | 36 | Qualcomm Hexagon is a processor architecture designed for high |
36 | performance and low power across a wide variety of applications. | 37 | performance and low power across a wide variety of applications. |
diff --git a/arch/hexagon/kernel/signal.c b/arch/hexagon/kernel/signal.c index fe0d1373165d..46ebd4794663 100644 --- a/arch/hexagon/kernel/signal.c +++ b/arch/hexagon/kernel/signal.c | |||
@@ -247,12 +247,6 @@ void do_notify_resume(struct pt_regs *regs, unsigned long thread_info_flags) | |||
247 | /* | 247 | /* |
248 | * Architecture-specific wrappers for signal-related system calls | 248 | * Architecture-specific wrappers for signal-related system calls |
249 | */ | 249 | */ |
250 | asmlinkage int sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss) | ||
251 | { | ||
252 | struct pt_regs *regs = current_pt_regs(); | ||
253 | |||
254 | return do_sigaltstack(uss, uoss, regs->r29); | ||
255 | } | ||
256 | 250 | ||
257 | asmlinkage int sys_rt_sigreturn(void) | 251 | asmlinkage int sys_rt_sigreturn(void) |
258 | { | 252 | { |
@@ -288,14 +282,7 @@ asmlinkage int sys_rt_sigreturn(void) | |||
288 | */ | 282 | */ |
289 | regs->syscall_nr = __NR_rt_sigreturn; | 283 | regs->syscall_nr = __NR_rt_sigreturn; |
290 | 284 | ||
291 | /* | 285 | if (restore_altstack(&frame->uc.uc_stack)) |
292 | * If we were meticulous, we'd only call this if we knew that | ||
293 | * we were actually going to use an alternate stack, and we'd | ||
294 | * consider any error to be fatal. What we do here, in common | ||
295 | * with many other architectures, is call it blindly and only | ||
296 | * consider the -EFAULT return case to be proof of a problem. | ||
297 | */ | ||
298 | if (do_sigaltstack(&frame->uc.uc_stack, NULL, pt_psp(regs)) == -EFAULT) | ||
299 | goto badframe; | 286 | goto badframe; |
300 | 287 | ||
301 | return 0; | 288 | return 0; |