diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-12-25 16:20:46 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-03 18:16:16 -0500 |
| commit | 881e252d6b37d7526008e3dcd4592823d9273e1f (patch) | |
| tree | 37868d58629f177e551f5895ada10203bfb4a61a | |
| parent | 7a879a94d90dc5c494875b54499ae321400358d8 (diff) | |
| download | linux-stable-881e252d6b37d7526008e3dcd4592823d9273e1f.tar.gz linux-stable-881e252d6b37d7526008e3dcd4592823d9273e1f.tar.bz2 linux-stable-881e252d6b37d7526008e3dcd4592823d9273e1f.zip | |
sh: switch to generic old sigsuspend()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | arch/sh/Kconfig | 1 | ||||
| -rw-r--r-- | arch/sh/include/asm/syscalls_32.h | 1 | ||||
| -rw-r--r-- | arch/sh/kernel/signal_32.c | 11 | ||||
| -rw-r--r-- | arch/sh/kernel/signal_64.c | 11 |
4 files changed, 1 insertions, 23 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index fb4a212c1bc4..d69caaf818bb 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -41,6 +41,7 @@ config SUPERH select HAVE_MOD_ARCH_SPECIFIC if DWARF_UNWINDER select MODULES_USE_ELF_RELA select GENERIC_SIGALTSTACK + select OLD_SIGSUSPEND help The SuperH is a RISC processor targeted for use in embedded systems and consumer electronics; it was also used in the Sega Dreamcast diff --git a/arch/sh/include/asm/syscalls_32.h b/arch/sh/include/asm/syscalls_32.h index 77e2054d678e..dc72388e6e5b 100644 --- a/arch/sh/include/asm/syscalls_32.h +++ b/arch/sh/include/asm/syscalls_32.h @@ -9,7 +9,6 @@ struct pt_regs; -asmlinkage int sys_sigsuspend(old_sigset_t mask); asmlinkage int sys_sigaction(int sig, const struct old_sigaction __user *act, struct old_sigaction __user *oact); asmlinkage int sys_sigreturn(unsigned long r4, unsigned long r5, diff --git a/arch/sh/kernel/signal_32.c b/arch/sh/kernel/signal_32.c index e540d07dd5c5..c660a912a470 100644 --- a/arch/sh/kernel/signal_32.c +++ b/arch/sh/kernel/signal_32.c @@ -46,17 +46,6 @@ struct fdpic_func_descriptor { */ #define UNWINDGUARD 64 -/* - * Atomically swap in the new signal mask, and wait for a signal. - */ -asmlinkage int -sys_sigsuspend(old_sigset_t mask) -{ - sigset_t blocked; - siginitset(&blocked, mask); - return sigsuspend(&blocked); -} - asmlinkage int sys_sigaction(int sig, const struct old_sigaction __user *act, struct old_sigaction __user *oact) diff --git a/arch/sh/kernel/signal_64.c b/arch/sh/kernel/signal_64.c index 0fba66e2b202..8705f3ec24f4 100644 --- a/arch/sh/kernel/signal_64.c +++ b/arch/sh/kernel/signal_64.c @@ -127,17 +127,6 @@ static void do_signal(struct pt_regs *regs) restore_saved_sigmask(); } -/* - * Atomically swap in the new signal mask, and wait for a signal. - */ -asmlinkage int -sys_sigsuspend(old_sigset_t mask) -{ - sigset_t blocked; - siginitset(&blocked, mask); - return sigsuspend(&blocked); -} - asmlinkage int sys_sigaction(int sig, const struct old_sigaction __user *act, struct old_sigaction __user *oact) |