summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-12-25 16:26:28 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2013-02-03 18:16:00 -0500
commit1ba3e7efb60b4d7d4f75f084214b90bd0fdaa319 (patch)
treec86e777bb84270df926b37778691e47efa9dbc3a
parent08d4f65352f9464f1dd7d65d0bc27d57abf3d161 (diff)
m68k: switch to generic old sigsuspend
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--arch/m68k/Kconfig1
-rw-r--r--arch/m68k/kernel/signal.c11
2 files changed, 1 insertions, 11 deletions
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 3e73dca71677..107747981b38 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -19,6 +19,7 @@ config M68K
select MODULES_USE_ELF_REL
select MODULES_USE_ELF_RELA
select GENERIC_SIGALTSTACK
+ select OLD_SIGSUSPEND3
config RWSEM_GENERIC_SPINLOCK
bool
diff --git a/arch/m68k/kernel/signal.c b/arch/m68k/kernel/signal.c
index 41a34de4b4b4..b5c6b4d9d1a9 100644
--- a/arch/m68k/kernel/signal.c
+++ b/arch/m68k/kernel/signal.c
@@ -224,17 +224,6 @@ static inline void push_cache(unsigned long vaddr)
#endif /* CONFIG_MMU */
-/*
- * Atomically swap in the new signal mask, and wait for a signal.
- */
-asmlinkage int
-sys_sigsuspend(int unused0, int unused1, 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)