diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-12-25 19:28:15 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-03 18:16:04 -0500 |
| commit | 33f9f78eec7e332dac6bee9cf66cd2bd435b7419 (patch) | |
| tree | 824a1f190561ac68814ae514bad390a8c9e32d57 | |
| parent | 7d1d990ff161bdd2f0901a0916f35d272adf4c0b (diff) | |
mn10300: switch to generic old sigaction()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | arch/mn10300/Kconfig | 1 | ||||
| -rw-r--r-- | arch/mn10300/include/asm/signal.h | 7 | ||||
| -rw-r--r-- | arch/mn10300/kernel/signal.c | 35 |
3 files changed, 1 insertions, 42 deletions
diff --git a/arch/mn10300/Kconfig b/arch/mn10300/Kconfig index f15703506d3..12bf06f9abe 100644 --- 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 288ade5ec94..214ff5e9fe6 100644 --- 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 d336d64f95f..9dfac5cd16e 100644 --- a/arch/mn10300/kernel/signal.c +++ b/arch/mn10300/kernel/signal.c @@ -32,41 +32,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. */ static int restore_sigcontext(struct pt_regs *regs, |