From d8a0c16f5f2b872f70f1d0c1dd6a9e673561624c Mon Sep 17 00:00:00 2001 From: Al Viro Date: Tue, 25 Dec 2012 16:29:48 -0500 Subject: [PATCH] --- yaml --- r: 356661 b: refs/heads/master c: b68fec2416314cf21e790d1f5161f9ed12c5a3ab h: refs/heads/master i: 356659: 0efda6c025003bfb0ddb6ffcc4094544c6c77189 v: v3 --- [refs] | 2 +- trunk/arch/arm/Kconfig | 1 + trunk/arch/arm/kernel/signal.c | 10 ---------- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 6e27048a463b..18f66d79e12c 100644 --- 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 index caf0ba73ea38..614c49716ae7 100644 --- 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 index f1f6d214050f..61b2cfcef3f1 100644 --- 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)