m68k: switch to generic old sigaction()

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

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 107747981b38091dae39f029e1155970f3eeb6e1..a358bf63defea0957bfa2a4d97fbc080a7a2fc9a 100644 (file)
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -20,6 +20,7 @@ config M68K
        select MODULES_USE_ELF_RELA
        select GENERIC_SIGALTSTACK
        select OLD_SIGSUSPEND3
+       select OLD_SIGACTION
 
 config RWSEM_GENERIC_SPINLOCK
        bool

diff --git a/arch/m68k/include/asm/signal.h b/arch/m68k/include/asm/signal.h
index c7b4fb1fa14dda9ae9fe18d38346d61c70ecf1a1..214320b5038440be179cd557479dddb7bd58eaa2 100644 (file)
--- a/arch/m68k/include/asm/signal.h
+++ b/arch/m68k/include/asm/signal.h
@@ -16,13 +16,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/m68k/kernel/signal.c b/arch/m68k/kernel/signal.c
index b5c6b4d9d1a942d7a7b051c45a39f239d527d99c..2a16df3d931283f0f55ac4c95571dbe3629678c3 100644 (file)
--- a/arch/m68k/kernel/signal.c
+++ b/arch/m68k/kernel/signal.c
@@ -224,38 +224,6 @@ static inline void push_cache(unsigned long vaddr)
 
 #endif /* CONFIG_MMU */
 
-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.
  *