s390: switch to generic old sigsuspend

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 019364785d339ed83a3aeba29ba5c548367a3378..17ba4f3be7ec67fe1309d565c6d65d6bf42fb2f1 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -144,6 +144,7 @@ config S390
        select GENERIC_COMPAT_RT_SIGQUEUEINFO
        select GENERIC_COMPAT_RT_SIGPROCMASK
        select GENERIC_COMPAT_RT_SIGPENDING
+       select OLD_SIGSUSPEND3
 
 config SCHED_OMIT_FRAME_POINTER
        def_bool y

diff --git a/arch/s390/kernel/entry.h b/arch/s390/kernel/entry.h
index d56319aa1d56bc7ab245fe1b2f4351c094f1c002..ee1a8b3d0db4488a93fe91704d75179f4cb0a40e 100644 (file)
--- 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,
 long sys_s390_fadvise64_64(struct fadvise64_64_args __user *args);
 long sys_s390_fallocate(int fd, int mode, loff_t offset, u32 len_high,
                        u32 len_low);
-long sys_sigsuspend(int history0, int history1, old_sigset_t mask);
 long sys_sigaction(int sig, const struct old_sigaction __user *act,
                   struct old_sigaction __user *oact);
 long sys_sigreturn(void);

diff --git a/arch/s390/kernel/signal.c b/arch/s390/kernel/signal.c
index fda41480b0bdeba4a943cc9de9fb74809c678b2f..0bc5c9d1ab990e69d6c54e0c2cbca6acdab0cbfe 100644 (file)
--- a/arch/s390/kernel/signal.c
+++ b/arch/s390/kernel/signal.c
@@ -48,16 +48,6 @@ typedef struct
        struct ucontext uc;
 } rt_sigframe;
 
-/*
- * Atomically swap in the new signal mask, and wait for a signal.
- */
-SYSCALL_DEFINE3(sigsuspend, int, history0, int, history1, old_sigset_t, mask)
-{
-       sigset_t blocked;
-       siginitset(&blocked, mask);
-       return sigsuspend(&blocked);
-}
-
 SYSCALL_DEFINE3(sigaction, int, sig, const struct old_sigaction __user *, act,
                struct old_sigaction __user *, oact)
 {