diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-12-25 13:51:31 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-03 18:16:06 -0500 |
| commit | e6a7ad517ae202ab8b813b179ba5ebed1ed93b04 (patch) | |
| tree | 7ec10881bbd45e8dc95aa5b90315456cf1566405 /arch | |
| parent | 6e26aab98ce8a818fb1ec47f8f727a8480a9011b (diff) | |
| download | linux-e6a7ad517ae202ab8b813b179ba5ebed1ed93b04.tar.gz linux-e6a7ad517ae202ab8b813b179ba5ebed1ed93b04.tar.bz2 linux-e6a7ad517ae202ab8b813b179ba5ebed1ed93b04.zip | |
parisc: switch to generic compat rt_sigprocmask()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/parisc/Kconfig | 1 | ||||
| -rw-r--r-- | arch/parisc/kernel/signal32.c | 35 | ||||
| -rw-r--r-- | arch/parisc/kernel/syscall_table.S | 2 |
3 files changed, 2 insertions, 36 deletions
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig index 9804a9e34979..0a8badaff8e3 100644 --- a/arch/parisc/Kconfig +++ b/arch/parisc/Kconfig @@ -24,6 +24,7 @@ config PARISC select MODULES_USE_ELF_RELA select CLONE_BACKWARDS select GENERIC_SIGALTSTACK + select GENERIC_COMPAT_RT_SIGPROCMASK help The PA-RISC microprocessor is designed by Hewlett-Packard and used diff --git a/arch/parisc/kernel/signal32.c b/arch/parisc/kernel/signal32.c index df79070c3715..49cb23462371 100644 --- a/arch/parisc/kernel/signal32.c +++ b/arch/parisc/kernel/signal32.c @@ -72,41 +72,6 @@ put_sigset32(compat_sigset_t __user *up, sigset_t *set, size_t sz) return copy_to_user(up, &s, sizeof s); } -static int -get_sigset32(compat_sigset_t __user *up, sigset_t *set, size_t sz) -{ - compat_sigset_t s; - int r; - - if (sz != sizeof *set) - return -EINVAL; - - if ((r = copy_from_user(&s, up, sz)) == 0) { - sigset_32to64(set, &s); - } - - return r; -} - -int sys32_rt_sigprocmask(int how, compat_sigset_t __user *set, compat_sigset_t __user *oset, - unsigned int sigsetsize) -{ - sigset_t old_set, new_set; - int ret; - - if (set && get_sigset32(set, &new_set, sigsetsize)) - return -EFAULT; - - KERNEL_SYSCALL(ret, sys_rt_sigprocmask, how, set ? (sigset_t __user *)&new_set : NULL, - oset ? (sigset_t __user *)&old_set : NULL, sigsetsize); - - if (!ret && oset && put_sigset32(oset, &old_set, sigsetsize)) - return -EFAULT; - - return ret; -} - - int sys32_rt_sigpending(compat_sigset_t __user *uset, unsigned int sigsetsize) { int ret; diff --git a/arch/parisc/kernel/syscall_table.S b/arch/parisc/kernel/syscall_table.S index 46dd6efacaaa..3ea2fe29f7d5 100644 --- a/arch/parisc/kernel/syscall_table.S +++ b/arch/parisc/kernel/syscall_table.S @@ -266,7 +266,7 @@ /* signals need a careful review */ ENTRY_SAME(rt_sigreturn_wrapper) ENTRY_DIFF(rt_sigaction) - ENTRY_DIFF(rt_sigprocmask) /* 175 */ + ENTRY_COMP(rt_sigprocmask) /* 175 */ ENTRY_DIFF(rt_sigpending) ENTRY_COMP(rt_sigtimedwait) /* even though the struct siginfo_t is different, it appears like |