mn10300: switch to generic old sigaction()

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

diff --git a/arch/mn10300/Kconfig b/arch/mn10300/Kconfig
index f15703506d3f359e21e34d761310065128c7e7b1..12bf06f9abe5ee070b3b2e4fc315de367e087c89 100644 (file)
--- a/arch/mn10300/Kconfig
+++ b/arch/mn10300/Kconfig
@@ -12,6 +12,7 @@ config MN10300
        select MODULES_USE_ELF_RELA
        select GENERIC_SIGALTSTACK
        select OLD_SIGSUSPEND3
+       select OLD_SIGACTION
 
 config AM33_2
        def_bool n

diff --git a/arch/mn10300/include/asm/signal.h b/arch/mn10300/include/asm/signal.h
index 288ade5ec94ec6258de2835788723bcf6d2011d2..214ff5e9fe601c169b79c3f41d8d79bbf1b8c5f7 100644 (file)
--- a/arch/mn10300/include/asm/signal.h
+++ b/arch/mn10300/include/asm/signal.h
@@ -26,13 +26,6 @@ typedef struct {
        unsigned long   sig[_NSIG_WORDS];
 } sigset_t;
 
-struct old_sigaction {
-       __sighandler_t sa_handler;
-       old_sigset_t sa_mask;
-       unsigned long sa_flags;
-       __sigrestore_t sa_restorer;
-};
-
 #define __ARCH_HAS_SA_RESTORER
 
 #include <asm/sigcontext.h>

diff --git a/arch/mn10300/kernel/signal.c b/arch/mn10300/kernel/signal.c
index d336d64f95f234faad11a6c333b91bab8cfaabcc..9dfac5cd16e67d537ae91d17c38dca84a820d996 100644 (file)
--- a/arch/mn10300/kernel/signal.c
+++ b/arch/mn10300/kernel/signal.c
@@ -31,41 +31,6 @@
 
 #define DEBUG_SIG 0
 
-/*
- * set signal action syscall
- */
-asmlinkage long 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 (verify_area(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 (verify_area(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.
  */