diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-12-25 16:26:28 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-03 18:16:00 -0500 |
commit | 1ba3e7efb60b4d7d4f75f084214b90bd0fdaa319 (patch) | |
tree | c86e777bb84270df926b37778691e47efa9dbc3a /arch/m68k | |
parent | 08d4f65352f9464f1dd7d65d0bc27d57abf3d161 (diff) |
m68k: switch to generic old sigsuspend
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/m68k')
-rw-r--r-- | arch/m68k/Kconfig | 1 | ||||
-rw-r--r-- | arch/m68k/kernel/signal.c | 11 |
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 | |||
19 | select MODULES_USE_ELF_REL | 19 | select MODULES_USE_ELF_REL |
20 | select MODULES_USE_ELF_RELA | 20 | select MODULES_USE_ELF_RELA |
21 | select GENERIC_SIGALTSTACK | 21 | select GENERIC_SIGALTSTACK |
22 | select OLD_SIGSUSPEND3 | ||
22 | 23 | ||
23 | config RWSEM_GENERIC_SPINLOCK | 24 | config RWSEM_GENERIC_SPINLOCK |
24 | bool | 25 | 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) | |||
224 | 224 | ||
225 | #endif /* CONFIG_MMU */ | 225 | #endif /* CONFIG_MMU */ |
226 | 226 | ||
227 | /* | ||
228 | * Atomically swap in the new signal mask, and wait for a signal. | ||
229 | */ | ||
230 | asmlinkage int | ||
231 | sys_sigsuspend(int unused0, int unused1, old_sigset_t mask) | ||
232 | { | ||
233 | sigset_t blocked; | ||
234 | siginitset(&blocked, mask); | ||
235 | return sigsuspend(&blocked); | ||
236 | } | ||
237 | |||
238 | asmlinkage int | 227 | asmlinkage int |
239 | sys_sigaction(int sig, const struct old_sigaction __user *act, | 228 | sys_sigaction(int sig, const struct old_sigaction __user *act, |
240 | struct old_sigaction __user *oact) | 229 | struct old_sigaction __user *oact) |