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

Commit 177b6703 authored by Al Viro's avatar Al Viro
Browse files

frv: switch to generic old sigaction() 



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

arch/frv/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ config FRV 
	select ARCH_WANT_IPC_PARSE_VERSION

	select GENERIC_SIGALTSTACK

	select OLD_SIGSUSPEND3

	select OLD_SIGACTION



config ZONE_DMA

	bool

arch/frv/include/asm/signal.h

+0 −7
Original line number Diff line number Diff line
@@ -3,11 +3,4 @@ 


#include <uapi/asm/signal.h>



struct old_sigaction {

	__sighandler_t sa_handler;

	old_sigset_t sa_mask;

	unsigned long sa_flags;

	__sigrestore_t sa_restorer;

};



#endif /* _ASM_SIGNAL_H */

arch/frv/kernel/signal.c

+0 −32
Original line number Diff line number Diff line
@@ -32,38 +32,6 @@ struct fdpic_func_descriptor { 
	unsigned long	GOT;

};



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.

 */