summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-12-25 19:30:17 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2013-02-03 18:15:55 -0500
commit177b6703f62f991ca250768e23398b21f7700f91 (patch)
tree2ccb7f970353dedeb81cd154b4dd8f12e6e6b58e
parent39e08a9bae71a16ab0549b87b4e7207ae0d550ad (diff)
downloadop-kernel-dev-177b6703f62f991ca250768e23398b21f7700f91.zip
op-kernel-dev-177b6703f62f991ca250768e23398b21f7700f91.tar.gz
frv: switch to generic old sigaction()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--arch/frv/Kconfig1
-rw-r--r--arch/frv/include/asm/signal.h7
-rw-r--r--arch/frv/kernel/signal.c32
3 files changed, 1 insertions, 39 deletions
diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index 683ab5c..e3f8ffd 100644
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -14,6 +14,7 @@ config FRV
select ARCH_WANT_IPC_PARSE_VERSION
select GENERIC_SIGALTSTACK
select OLD_SIGSUSPEND3
+ select OLD_SIGACTION
config ZONE_DMA
bool
diff --git a/arch/frv/include/asm/signal.h b/arch/frv/include/asm/signal.h
index 599500a..eca0abc 100644
--- a/arch/frv/include/asm/signal.h
+++ b/arch/frv/include/asm/signal.h
@@ -3,11 +3,4 @@
#include <uapi/asm/signal.h>
-struct old_sigaction {
- __sighandler_t sa_handler;
- old_sigset_t sa_mask;
- unsigned long sa_flags;
- __sigrestore_t sa_restorer;
-};
-
#endif /* _ASM_SIGNAL_H */
diff --git a/arch/frv/kernel/signal.c b/arch/frv/kernel/signal.c
index 771756b..d822700 100644
--- a/arch/frv/kernel/signal.c
+++ b/arch/frv/kernel/signal.c
@@ -32,38 +32,6 @@ struct fdpic_func_descriptor {
unsigned long GOT;
};
-asmlinkage int sys_sigaction(int sig,
- const struct old_sigaction __user *act,
- struct old_sigaction __user *oact)
-{
- struct k_sigaction new_ka, old_ka;
- int ret;
-
- if (act) {
- old_sigset_t mask;
- if (!access_ok(VERIFY_READ, act, sizeof(*act)) ||
- __get_user(new_ka.sa.sa_handler, &act->sa_handler) ||
- __get_user(new_ka.sa.sa_restorer, &act->sa_restorer) ||
- __get_user(new_ka.sa.sa_flags, &act->sa_flags) ||
- __get_user(mask, &act->sa_mask))
- return -EFAULT;
- siginitset(&new_ka.sa.sa_mask, mask);
- }
-
- ret = do_sigaction(sig, act ? &new_ka : NULL, oact ? &old_ka : NULL);
-
- if (!ret && oact) {
- if (!access_ok(VERIFY_WRITE, oact, sizeof(*oact)) ||
- __put_user(old_ka.sa.sa_handler, &oact->sa_handler) ||
- __put_user(old_ka.sa.sa_restorer, &oact->sa_restorer) ||
- __put_user(old_ka.sa.sa_flags, &oact->sa_flags) ||
- __put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask))
- return -EFAULT;
- }
-
- return ret;
-}
-
/*
* Do a signal return; undo the signal stack.
*/
OpenPOWER on IntegriCloud