aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/kernel
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-12-25 16:21:29 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2013-02-03 18:16:13 -0500
commite181ee4cd7e510738b1a8ede4e2f3f994df3234e (patch)
tree1e47bd77dce7284ce75458e091e724cc3eeabed4 /arch/s390/kernel
parent07562be77d5b36aa961f722292a708bb663f8a73 (diff)
s390: switch to generic old sigsuspend
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/s390/kernel')
-rw-r--r--arch/s390/kernel/entry.h1
-rw-r--r--arch/s390/kernel/signal.c10
2 files changed, 0 insertions, 11 deletions
diff --git a/arch/s390/kernel/entry.h b/arch/s390/kernel/entry.h
index d56319aa1d56..ee1a8b3d0db4 100644
--- a/arch/s390/kernel/entry.h
+++ b/arch/s390/kernel/entry.h
@@ -73,7 +73,6 @@ long sys_s390_fadvise64(int fd, u32 offset_high, u32 offset_low,
73long sys_s390_fadvise64_64(struct fadvise64_64_args __user *args); 73long sys_s390_fadvise64_64(struct fadvise64_64_args __user *args);
74long sys_s390_fallocate(int fd, int mode, loff_t offset, u32 len_high, 74long sys_s390_fallocate(int fd, int mode, loff_t offset, u32 len_high,
75 u32 len_low); 75 u32 len_low);
76long sys_sigsuspend(int history0, int history1, old_sigset_t mask);
77long sys_sigaction(int sig, const struct old_sigaction __user *act, 76long sys_sigaction(int sig, const struct old_sigaction __user *act,
78 struct old_sigaction __user *oact); 77 struct old_sigaction __user *oact);
79long sys_sigreturn(void); 78long sys_sigreturn(void);
diff --git a/arch/s390/kernel/signal.c b/arch/s390/kernel/signal.c
index fda41480b0bd..0bc5c9d1ab99 100644
--- a/arch/s390/kernel/signal.c
+++ b/arch/s390/kernel/signal.c
@@ -48,16 +48,6 @@ typedef struct
48 struct ucontext uc; 48 struct ucontext uc;
49} rt_sigframe; 49} rt_sigframe;
50 50
51/*
52 * Atomically swap in the new signal mask, and wait for a signal.
53 */
54SYSCALL_DEFINE3(sigsuspend, int, history0, int, history1, old_sigset_t, mask)
55{
56 sigset_t blocked;
57 siginitset(&blocked, mask);
58 return sigsuspend(&blocked);
59}
60
61SYSCALL_DEFINE3(sigaction, int, sig, const struct old_sigaction __user *, act, 51SYSCALL_DEFINE3(sigaction, int, sig, const struct old_sigaction __user *, act,
62 struct old_sigaction __user *, oact) 52 struct old_sigaction __user *, oact)
63{ 53{