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

Commit b0423a0d authored by Paul E. McKenney's avatar Paul E. McKenney Committed by Linus Torvalds
Browse files

[PATCH] Remove duplicate code in signal.c 



Combine a bit of redundant code between force_sig_info() and
force_sig_specific().

Signed-off-by: default avatar <paulmck@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ae6866c3

kernel/signal.c

+5 −11
Original line number Diff line number Diff line
@@ -879,11 +879,13 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t) 
	int ret;



	spin_lock_irqsave(&t->sighand->siglock, flags);

	if (sigismember(&t->blocked, sig) || t->sighand->action[sig-1].sa.sa_handler == SIG_IGN) {

	if (t->sighand->action[sig-1].sa.sa_handler == SIG_IGN) {

		t->sighand->action[sig-1].sa.sa_handler = SIG_DFL;

	}

	if (sigismember(&t->blocked, sig)) {

		sigdelset(&t->blocked, sig);

		recalc_sigpending_tsk(t);

	}

	recalc_sigpending_tsk(t);

	ret = specific_send_sig_info(sig, info, t);

	spin_unlock_irqrestore(&t->sighand->siglock, flags);
@@ -893,15 +895,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t) 
void

force_sig_specific(int sig, struct task_struct *t)

{

	unsigned long int flags;



	spin_lock_irqsave(&t->sighand->siglock, flags);

	if (t->sighand->action[sig-1].sa.sa_handler == SIG_IGN)

		t->sighand->action[sig-1].sa.sa_handler = SIG_DFL;

	sigdelset(&t->blocked, sig);

	recalc_sigpending_tsk(t);

	specific_send_sig_info(sig, SEND_SIG_FORCED, t);

	spin_unlock_irqrestore(&t->sighand->siglock, flags);

	force_sig_info(sig, SEND_SIG_FORCED, t);

}



/*