diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-12-25 19:29:41 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-03 18:15:57 -0500 |
| commit | b0375744f1c74b39a2677fc29045ad1cb6f4c6cd (patch) | |
| tree | 3c27bb44e5dd4a96d12da9b8b3d8ac8ea00a9fec | |
| parent | b407e620eca0b026410b7f95e76c83028779019a (diff) | |
| download | linux-b0375744f1c74b39a2677fc29045ad1cb6f4c6cd.tar.gz | |
h8300: switch to generic old sigaction()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | arch/h8300/Kconfig | 1 | ||||
| -rw-r--r-- | arch/h8300/include/asm/signal.h | 7 | ||||
| -rw-r--r-- | arch/h8300/kernel/signal.c | 32 |
3 files changed, 1 insertions, 39 deletions
diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig index 18a06e4a835e..0b0176ce2c35 100644 --- a/arch/h8300/Kconfig +++ b/arch/h8300/Kconfig @@ -11,6 +11,7 @@ config H8300 select MODULES_USE_ELF_RELA select GENERIC_SIGALTSTACK select OLD_SIGSUSPEND3 + select OLD_SIGACTION config SYMBOL_PREFIX string diff --git a/arch/h8300/include/asm/signal.h b/arch/h8300/include/asm/signal.h index 9b18a0959461..6341e36386f8 100644 --- a/arch/h8300/include/asm/signal.h +++ b/arch/h8300/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; - void (*sa_restorer)(void); -}; - #define __ARCH_HAS_SA_RESTORER #include <asm/sigcontext.h> diff --git a/arch/h8300/kernel/signal.c b/arch/h8300/kernel/signal.c index 641d947a83b8..a65ff3b76326 100644 --- a/arch/h8300/kernel/signal.c +++ b/arch/h8300/kernel/signal.c @@ -46,38 +46,6 @@ #include <asm/traps.h> #include <asm/ucontext.h> -asmlinkage int -sys_sigaction(int sig, const struct old_sigaction *act, - struct old_sigaction *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. * |