---

yaml --- r: 356675 b: refs/heads/master c: 86df89a h: refs/heads/master i: 356673: 04cf4dd 356671: 9e023ce v: v3
git-mirror · Feb 3, 2013 · 512ca85 · 512ca85
1 parent 20e20d1
commit 512ca85
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 24 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9df794d9275d41012909aaff3cab759e37871974
+refs/heads/master: 86df89a0845a80aa765f3e5e0da43fdf9287029f
diff --git a/trunk/arch/cris/Kconfig b/trunk/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/trunk/arch/cris/arch-v10/kernel/signal.c b/trunk/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/trunk/arch/cris/arch-v32/kernel/signal.c b/trunk/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,