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

Commit eb2f2566 authored by Al Viro's avatar Al Viro
Browse files

cris: switch to generic old sigaction() 



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

arch/cris/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ config CRIS 
	select CLONE_BACKWARDS2

	select GENERIC_SIGALTSTACK

	select OLD_SIGSUSPEND

	select OLD_SIGACTION



config HZ

	int

arch/cris/arch-v10/kernel/signal.c

+0 −31
Original line number Diff line number Diff line
@@ -41,37 +41,6 @@ 


void do_signal(int canrestart, struct pt_regs *regs);



int sys_sigaction(int sig, const struct old_sigaction __user *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.

 */

arch/cris/arch-v32/kernel/signal.c

+0 −36
Original line number Diff line number Diff line
@@ -52,42 +52,6 @@ void do_signal(int restart, struct pt_regs *regs); 
void keep_debug_flags(unsigned long oldccs, unsigned long oldspc,

		      struct pt_regs *regs);



int

sys_sigaction(int signal, const struct old_sigaction *act,

	      struct old_sigaction *oact)

{

	int retval;

	struct k_sigaction newk;

	struct k_sigaction oldk;



	if (act) {

		old_sigset_t mask;



		if (!access_ok(VERIFY_READ, act, sizeof(*act)) ||

		    __get_user(newk.sa.sa_handler, &act->sa_handler) ||

		    __get_user(newk.sa.sa_restorer, &act->sa_restorer) ||

		    __get_user(newk.sa.sa_flags, &act->sa_flags) ||

		    __get_user(mask, &act->sa_mask))

			return -EFAULT;



		siginitset(&newk.sa.sa_mask, mask);

	}



	retval = do_sigaction(signal, act ? &newk : NULL, oact ? &oldk : NULL);



	if (!retval && oact) {

		if (!access_ok(VERIFY_WRITE, oact, sizeof(*oact)) ||

		    __put_user(oldk.sa.sa_handler, &oact->sa_handler) ||

		    __put_user(oldk.sa.sa_restorer, &oact->sa_restorer) ||

		    __put_user(oldk.sa.sa_flags, &oact->sa_flags) ||

		    __put_user(oldk.sa.sa_mask.sig[0], &oact->sa_mask))

			return -EFAULT;



	}



	return retval;

}



static int

restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc)

{

arch/cris/include/asm/signal.h

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