diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-12-25 16:28:27 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-03 18:15:53 -0500 |
| commit | 86df89a0845a80aa765f3e5e0da43fdf9287029f (patch) | |
| tree | 9fb2300a073dc86635ed442997feee899a83c621 | |
| parent | 9df794d9275d41012909aaff3cab759e37871974 (diff) | |
| download | op-kernel-dev-86df89a0845a80aa765f3e5e0da43fdf9287029f.zip op-kernel-dev-86df89a0845a80aa765f3e5e0da43fdf9287029f.tar.gz | |
cris: switch to generic old sigsuspend
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | arch/cris/Kconfig | 1 | ||||
| -rw-r--r-- | arch/cris/arch-v10/kernel/signal.c | 12 | ||||
| -rw-r--r-- | arch/cris/arch-v32/kernel/signal.c | 11 |
3 files changed, 1 insertions, 23 deletions
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig index 22d4702..686968c 100644 --- a/arch/cris/Kconfig +++ b/arch/cris/Kconfig @@ -51,6 +51,7 @@ config CRIS select MODULES_USE_ELF_RELA select CLONE_BACKWARDS2 select GENERIC_SIGALTSTACK + select OLD_SIGSUSPEND config HZ int diff --git a/arch/cris/arch-v10/kernel/signal.c b/arch/cris/arch-v10/kernel/signal.c index 9570946..e53c1b4 100644 --- a/arch/cris/arch-v10/kernel/signal.c +++ b/arch/cris/arch-v10/kernel/signal.c @@ -41,18 +41,6 @@ void do_signal(int canrestart, struct pt_regs *regs); -/* - * Atomically swap in the new signal mask, and wait for a signal. Define - * dummy arguments to be able to reach the regs argument. (Note that this - * arrangement relies on old_sigset_t occupying one register.) - */ -int sys_sigsuspend(old_sigset_t mask) -{ - sigset_t blocked; - siginitset(&blocked, mask); - return sigsuspend(&blocked); -} - int sys_sigaction(int sig, const struct old_sigaction __user *act, struct old_sigaction *oact) { diff --git a/arch/cris/arch-v32/kernel/signal.c b/arch/cris/arch-v32/kernel/signal.c index 1f29c69..4ccf144 100644 --- a/arch/cris/arch-v32/kernel/signal.c +++ b/arch/cris/arch-v32/kernel/signal.c @@ -51,17 +51,6 @@ struct rt_signal_frame { void do_signal(int restart, struct pt_regs *regs); void keep_debug_flags(unsigned long oldccs, unsigned long oldspc, struct pt_regs *regs); -/* - * Swap in the new signal mask, and wait for a signal. Define some - * dummy arguments to be able to reach the regs argument. - */ -int -sys_sigsuspend(old_sigset_t mask) -{ - sigset_t blocked; - siginitset(&blocked, mask); - return sigsuspend(&blocked); -} int sys_sigaction(int signal, const struct old_sigaction *act, |
