---

yaml --- r: 356690 b: refs/heads/master c: 1ba3e7e h: refs/heads/master v: v3
git-mirror · Feb 3, 2013 · 4454593 · 4454593
1 parent 13cf75c
commit 4454593
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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)