From 4454593615cb2c88651a74b6c99e14fc63f86b1f Mon Sep 17 00:00:00 2001 From: Al Viro Date: Tue, 25 Dec 2012 16:26:28 -0500 Subject: [PATCH] --- yaml --- r: 356690 b: refs/heads/master c: 1ba3e7efb60b4d7d4f75f084214b90bd0fdaa319 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/m68k/Kconfig | 1 + trunk/arch/m68k/kernel/signal.c | 11 ----------- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 13fe31bb1c23..8084ddab1ae6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 08d4f65352f9464f1dd7d65d0bc27d57abf3d161 +refs/heads/master: 1ba3e7efb60b4d7d4f75f084214b90bd0fdaa319 diff --git a/trunk/arch/m68k/Kconfig b/trunk/arch/m68k/Kconfig index 3e73dca71677..107747981b38 100644 --- a/trunk/arch/m68k/Kconfig +++ b/trunk/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/trunk/arch/m68k/kernel/signal.c b/trunk/arch/m68k/kernel/signal.c index 41a34de4b4b4..b5c6b4d9d1a9 100644 --- a/trunk/arch/m68k/kernel/signal.c +++ b/trunk/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)