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

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

new helper: sigmask_to_save() 



replace boilerplate "should we use ->saved_sigmask or ->blocked?"
with calls of obvious inlined helper...

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

arch/alpha/kernel/signal.c

+1 −4
Original line number Diff line number Diff line
@@ -468,12 +468,9 @@ static inline void 
handle_signal(int sig, struct k_sigaction *ka, siginfo_t *info,

	      struct pt_regs * regs, struct switch_stack *sw)

{

	sigset_t *oldset = &current->blocked;

	sigset_t *oldset = sigmask_to_save();

	int ret;



	if (test_thread_flag(TIF_RESTORE_SIGMASK))

		oldset = &current->saved_sigmask;



	if (ka->sa.sa_flags & SA_SIGINFO)

		ret = setup_rt_frame(sig, ka, info, oldset, regs, sw);

	else

arch/arm/kernel/signal.c

+3 −9
Original line number Diff line number Diff line
@@ -530,11 +530,11 @@ setup_rt_frame(int usig, struct k_sigaction *ka, siginfo_t *info, 
 */	

static int

handle_signal(unsigned long sig, struct k_sigaction *ka,

	      siginfo_t *info, sigset_t *oldset,

	      struct pt_regs * regs)

	      siginfo_t *info, struct pt_regs *regs)

{

	struct thread_info *thread = current_thread_info();

	struct task_struct *tsk = current;

	sigset_t *oldset = sigmask_to_save();

	int usig = sig;

	int ret;
@@ -617,8 +617,6 @@ static void do_signal(struct pt_regs *regs, int syscall) 
	 */

	signr = get_signal_to_deliver(&info, &ka, regs, NULL);

	if (signr > 0) {

		sigset_t *oldset;



		/*

		 * Depending on the signal settings we may need to revert the

		 * decision to restart the system call.  But skip this if a
@@ -635,11 +633,7 @@ static void do_signal(struct pt_regs *regs, int syscall) 
			clear_thread_flag(TIF_SYSCALL_RESTARTSYS);

		}



		if (test_thread_flag(TIF_RESTORE_SIGMASK))

			oldset = &current->saved_sigmask;

		else

			oldset = &current->blocked;

		if (handle_signal(signr, &ka, &info, oldset, regs) == 0) {

		if (handle_signal(signr, &ka, &info, regs) == 0) {

			/*

			 * A signal was successfully delivered; the saved

			 * sigmask will have been stored in the signal frame,

arch/avr32/kernel/signal.c

+7 −13
Original line number Diff line number Diff line
@@ -224,14 +224,14 @@ static inline void setup_syscall_restart(struct pt_regs *regs) 


static inline void

handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,

	      sigset_t *oldset, struct pt_regs *regs, int syscall)

	      struct pt_regs *regs, int syscall)

{

	int ret;



	/*

	 * Set up the stack frame

	 */

	ret = setup_rt_frame(sig, ka, info, oldset, regs);

	ret = setup_rt_frame(sig, ka, info, sigmask_to_save(), regs);



	/*

	 * Check that the resulting registers are sane
@@ -255,7 +255,7 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info, 
 * doesn't want to handle. Thus you cannot kill init even with a

 * SIGKILL even by mistake.

 */

int do_signal(struct pt_regs *regs, sigset_t *oldset, int syscall)

static void do_signal(struct pt_regs *regs, int syscall)

{

	siginfo_t info;

	int signr;
@@ -267,12 +267,7 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset, int syscall) 
	 * without doing anything if so.

	 */

	if (!user_mode(regs))

		return 0;



	if (test_thread_flag(TIF_RESTORE_SIGMASK))

		oldset = &current->saved_sigmask;

	else if (!oldset)

		oldset = &current->blocked;

		return;



	signr = get_signal_to_deliver(&info, &ka, regs, NULL);

	if (syscall) {
@@ -298,11 +293,10 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset, int syscall) 
	if (signr == 0) {

		/* No signal to deliver -- put the saved sigmask back */

		restore_saved_sigmask();

		return 0;

		return;

	}



	handle_signal(signr, &ka, &info, oldset, regs, syscall);

	return 1;

	handle_signal(signr, &ka, &info, regs, syscall);

}



asmlinkage void do_notify_resume(struct pt_regs *regs, struct thread_info *ti)
@@ -313,7 +307,7 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, struct thread_info *ti) 
		syscall = 1;



	if (ti->flags & (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK))

		do_signal(regs, &current->blocked, syscall);

		do_signal(regs, syscall);



	if (ti->flags & _TIF_NOTIFY_RESUME) {

		clear_thread_flag(TIF_NOTIFY_RESUME);

arch/blackfin/kernel/signal.c

+3 −9
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ handle_restart(struct pt_regs *regs, struct k_sigaction *ka, int has_handler) 
 */

static int

handle_signal(int sig, siginfo_t *info, struct k_sigaction *ka,

	      sigset_t *oldset, struct pt_regs *regs)

	      struct pt_regs *regs)

{

	int ret;
@@ -259,7 +259,7 @@ handle_signal(int sig, siginfo_t *info, struct k_sigaction *ka, 
		handle_restart(regs, ka, 1);



	/* set up the stack frame */

	ret = setup_rt_frame(sig, ka, info, oldset, regs);

	ret = setup_rt_frame(sig, ka, info, sigmask_to_save(), regs);



	if (ret == 0)

		block_sigmask(ka, sig);
@@ -281,22 +281,16 @@ asmlinkage void do_signal(struct pt_regs *regs) 
	siginfo_t info;

	int signr;

	struct k_sigaction ka;

	sigset_t *oldset;



	current->thread.esp0 = (unsigned long)regs;



	if (try_to_freeze())

		goto no_signal;



	if (test_thread_flag(TIF_RESTORE_SIGMASK))

		oldset = &current->saved_sigmask;

	else

		oldset = &current->blocked;



	signr = get_signal_to_deliver(&info, &ka, regs, NULL);

	if (signr > 0) {

		/* Whee!  Actually deliver the signal.  */

		if (handle_signal(signr, &info, &ka, oldset, regs) == 0) {

		if (handle_signal(signr, &info, &ka, regs) == 0) {

			/* a signal was successfully delivered; the saved

			 * sigmask will have been stored in the signal frame,

			 * and will be restored by sigreturn, so we can simply

arch/c6x/kernel/signal.c

+3 −11
Original line number Diff line number Diff line
@@ -250,8 +250,7 @@ handle_restart(struct pt_regs *regs, struct k_sigaction *ka, int has_handler) 
 */

static int handle_signal(int sig,

			 siginfo_t *info, struct k_sigaction *ka,

			 sigset_t *oldset, struct pt_regs *regs,

			 int syscall)

			 struct pt_regs *regs, int syscall)

{

	int ret;
@@ -278,7 +277,7 @@ static int handle_signal(int sig, 
	}



	/* Set up the stack frame */

	ret = setup_rt_frame(sig, ka, info, oldset, regs);

	ret = setup_rt_frame(sig, ka, info, sigmask_to_save(), regs);

	if (ret == 0)

		block_sigmask(ka, sig);
@@ -292,7 +291,6 @@ static void do_signal(struct pt_regs *regs, int syscall) 
{

	struct k_sigaction ka;

	siginfo_t info;

	sigset_t *oldset;

	int signr;



	/* we want the common case to go fast, which is why we may in certain
@@ -300,15 +298,9 @@ static void do_signal(struct pt_regs *regs, int syscall) 
	if (!user_mode(regs))

		return;



	if (test_thread_flag(TIF_RESTORE_SIGMASK))

		oldset = &current->saved_sigmask;

	else

		oldset = &current->blocked;



	signr = get_signal_to_deliver(&info, &ka, regs, NULL);

	if (signr > 0) {

		if (handle_signal(signr, &info, &ka, oldset,

				  regs, syscall) == 0) {

		if (handle_signal(signr, &info, &ka, regs, syscall) == 0) {

			/* a signal was successfully delivered; the saved

			 * sigmask will have been stored in the signal frame,

			 * and will be restored by sigreturn, so we can simply