Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33f9f78e authored by Al Viro's avatar Al Viro
Browse files

mn10300: switch to generic old sigaction() 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 7d1d990f

arch/mn10300/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/mn10300/include/asm/signal.h

+0 −7
Original line number Diff line number Diff line
@@ -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>

arch/mn10300/kernel/signal.c

+0 −35
Original line number Diff line number Diff line
@@ -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.

 */