---

yaml --- r: 356661 b: refs/heads/master c: b68fec2 h: refs/heads/master i: 356659: 0efda6c v: v3
git-mirror · Feb 3, 2013 · d8a0c16 · d8a0c16
1 parent 378472e
commit d8a0c16
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec93ac8663ad5fcccd44c3768b23c93b87610fc2
+refs/heads/master: b68fec2416314cf21e790d1f5161f9ed12c5a3ab
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -57,6 +57,7 @@ config ARM
 	select MODULES_USE_ELF_REL
 	select CLONE_BACKWARDS
 	select GENERIC_SIGALTSTACK
+	select OLD_SIGSUSPEND3
 	help
 	  The ARM series is a line of low-power-consumption RISC chip designs
 	  licensed by ARM Ltd and targeted at embedded applications and

diff --git a/trunk/arch/arm/kernel/signal.c b/trunk/arch/arm/kernel/signal.c
@@ -45,16 +45,6 @@ const unsigned long sigreturn_codes[7] = {
 	MOV_R7_NR_RT_SIGRETURN, SWI_SYS_RT_SIGRETURN, SWI_THUMB_RT_SIGRETURN,
 };
 
-/*
- * atomically swap in the new signal mask, and wait for a signal.
- */
-asmlinkage int sys_sigsuspend(int restart, unsigned long oldmask, 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)