s390: switch to generic compat rt_sigpending()

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

4 files changed, 2 insertions, 22 deletions

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 26e584eda6d6..f68a030411b5 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -142,6 +142,7 @@ config S390
         select CLONE_BACKWARDS2
         select GENERIC_SIGALTSTACK
         select GENERIC_COMPAT_RT_SIGPROCMASK
+        select GENERIC_COMPAT_RT_SIGPENDING
 
 config SCHED_OMIT_FRAME_POINTER
         def_bool y
diff --git a/arch/s390/kernel/compat_linux.c b/arch/s390/kernel/compat_linux.c
index cfaba34bef3a..877b18be0f4a 100644
--- a/arch/s390/kernel/compat_linux.c
+++ b/arch/s390/kernel/compat_linux.c
@@ -368,26 +368,6 @@ asmlinkage long sys32_sched_rr_get_interval(compat_pid_t pid,
         return ret;
 }
 
-asmlinkage long sys32_rt_sigpending(compat_sigset_t __user *set,
-                                size_t sigsetsize)
-{
-        sigset_t s;
-        compat_sigset_t s32;
-        int ret;
-        mm_segment_t old_fs = get_fs();
-                
-        set_fs (KERNEL_DS);
-        ret = sys_rt_sigpending((sigset_t __force __user *) &s, sigsetsize);
-        set_fs (old_fs);
-        if (!ret) {
-                s32.sig[1] = (s.sig[0] >> 32);
-                s32.sig[0] = s.sig[0];
-                if (copy_to_user (set, &s32, sizeof(compat_sigset_t)))
-                        return -EFAULT;
-        }
-        return ret;
-}
-
 asmlinkage long
 sys32_rt_sigqueueinfo(int pid, int sig, compat_siginfo_t __user *uinfo)
 {
diff --git a/arch/s390/kernel/compat_linux.h b/arch/s390/kernel/compat_linux.h
index 1b5c451381e0..385567661ced 100644
--- a/arch/s390/kernel/compat_linux.h
+++ b/arch/s390/kernel/compat_linux.h
@@ -115,7 +115,6 @@ long sys32_truncate64(const char __user * path, unsigned long high,
 long sys32_ftruncate64(unsigned int fd, unsigned long high, unsigned long low);
 long sys32_sched_rr_get_interval(compat_pid_t pid,
                                  struct compat_timespec __user *interval);
-long sys32_rt_sigpending(compat_sigset_t __user *set, size_t sigsetsize);
 long sys32_rt_sigqueueinfo(int pid, int sig, compat_siginfo_t __user *uinfo);
 long sys32_init_module(void __user *umod, unsigned long len,
                        const char __user *uargs);
diff --git a/arch/s390/kernel/compat_wrapper.S b/arch/s390/kernel/compat_wrapper.S
index 9bea6f200500..2b813b3edbd1 100644
--- a/arch/s390/kernel/compat_wrapper.S
+++ b/arch/s390/kernel/compat_wrapper.S
@@ -703,7 +703,7 @@ ENTRY(sys32_rt_sigprocmask_wrapper)
 ENTRY(sys32_rt_sigpending_wrapper)
         llgtr   %r2,%r2                 # sigset_emu31 *
         llgfr   %r3,%r3                 # size_t
-        jg      sys32_rt_sigpending     # branch to system call
+        jg      compat_sys_rt_sigpending        # branch to system call
 
 ENTRY(compat_sys_rt_sigtimedwait_wrapper)
         llgtr   %r2,%r2                 # const sigset_emu31_t *