aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-12-25 16:29:48 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2013-02-03 18:15:47 -0500
commitb68fec2416314cf21e790d1f5161f9ed12c5a3ab (patch)
tree35b117ee6f77d6ed24f9ba943ee747b0a65767f6 /arch
parentec93ac8663ad5fcccd44c3768b23c93b87610fc2 (diff)
arm: switch to generic old sigsuspend
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/Kconfig1
-rw-r--r--arch/arm/kernel/signal.c10
2 files changed, 1 insertions, 10 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index caf0ba73ea38..614c49716ae7 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -57,6 +57,7 @@ config ARM
57 select MODULES_USE_ELF_REL 57 select MODULES_USE_ELF_REL
58 select CLONE_BACKWARDS 58 select CLONE_BACKWARDS
59 select GENERIC_SIGALTSTACK 59 select GENERIC_SIGALTSTACK
60 select OLD_SIGSUSPEND3
60 help 61 help
61 The ARM series is a line of low-power-consumption RISC chip designs 62 The ARM series is a line of low-power-consumption RISC chip designs
62 licensed by ARM Ltd and targeted at embedded applications and 63 licensed by ARM Ltd and targeted at embedded applications and
diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
index f1f6d214050f..61b2cfcef3f1 100644
--- a/arch/arm/kernel/signal.c
+++ b/arch/arm/kernel/signal.c
@@ -45,16 +45,6 @@ const unsigned long sigreturn_codes[7] = {
45 MOV_R7_NR_RT_SIGRETURN, SWI_SYS_RT_SIGRETURN, SWI_THUMB_RT_SIGRETURN, 45 MOV_R7_NR_RT_SIGRETURN, SWI_SYS_RT_SIGRETURN, SWI_THUMB_RT_SIGRETURN,
46}; 46};
47 47
48/*
49 * atomically swap in the new signal mask, and wait for a signal.
50 */
51asmlinkage int sys_sigsuspend(int restart, unsigned long oldmask, old_sigset_t mask)
52{
53 sigset_t blocked;
54 siginitset(&blocked, mask);
55 return sigsuspend(&blocked);
56}
57
58asmlinkage int 48asmlinkage int
59sys_sigaction(int sig, const struct old_sigaction __user *act, 49sys_sigaction(int sig, const struct old_sigaction __user *act,
60 struct old_sigaction __user *oact) 50 struct old_sigaction __user *oact)