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

Commit 0679a858 authored by Al Viro's avatar Al Viro
Browse files

sh: switch to generic old sigaction() 



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

arch/sh/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ config SUPERH 
	select MODULES_USE_ELF_RELA

	select GENERIC_SIGALTSTACK

	select OLD_SIGSUSPEND

	select OLD_SIGACTION

	help

	  The SuperH is a RISC processor targeted for use in embedded systems

	  and consumer electronics; it was also used in the Sega Dreamcast

arch/sh/include/asm/syscalls_32.h

+0 −2
Original line number Diff line number Diff line
@@ -9,8 +9,6 @@ 


struct pt_regs;



asmlinkage int sys_sigaction(int sig, const struct old_sigaction __user *act,

			     struct old_sigaction __user *oact);

asmlinkage int sys_sigreturn(unsigned long r4, unsigned long r5,

			     unsigned long r6, unsigned long r7,

			     struct pt_regs __regs);

arch/sh/include/uapi/asm/signal.h

+2 −0
Original line number Diff line number Diff line
@@ -5,11 +5,13 @@ 


#include <asm-generic/signal.h>



#ifndef __KERNEL__

struct old_sigaction {

	__sighandler_t sa_handler;

	old_sigset_t sa_mask;

	unsigned long sa_flags;

	void (*sa_restorer)(void);

};

#endif



#endif /* __ASM_SH_SIGNAL_H */

arch/sh/kernel/signal_32.c

+0 −32
Original line number Diff line number Diff line
@@ -46,38 +46,6 @@ struct fdpic_func_descriptor { 
 */

#define UNWINDGUARD 64



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.

 */

arch/sh/kernel/signal_64.c

+0 −32
Original line number Diff line number Diff line
@@ -127,38 +127,6 @@ static void do_signal(struct pt_regs *regs) 
	restore_saved_sigmask();

}



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.

 */