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

Commit abef3640 authored Jan 10, 2012 by Paul Mundt

sh: Remove redundant try_to_freeze() invocations.



get_signal_to_deliver() takes care of this, kill off the redundancies, as
per the avr32 change.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

parent 6330c04b

arch/sh/kernel/signal_32.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -588,9 +588,6 @@ static void do_signal(struct pt_regs *regs, unsigned int save_r0)
		if (!user_mode(regs))
		return;

		if (try_to_freeze())
		goto no_signal;

		if (current_thread_info()->status & TS_RESTORE_SIGMASK)
		oldset = &current->saved_sigmask;
		else
		@@ -618,7 +615,6 @@ static void do_signal(struct pt_regs *regs, unsigned int save_r0)
		return;
		}

		no_signal:
		/* Did we come from a system call? */
		if (regs->tra >= 0) {
		/* Restart the system call - no handlers present */

arch/sh/kernel/signal_64.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -98,9 +98,6 @@ static int do_signal(struct pt_regs regs, sigset_t oldset)
		if (!user_mode(regs))
		return 1;

		if (try_to_freeze())
		goto no_signal;

		if (current_thread_info()->status & TS_RESTORE_SIGMASK)
		oldset = &current->saved_sigmask;
		else if (!oldset)
		@@ -125,7 +122,6 @@ static int do_signal(struct pt_regs regs, sigset_t oldset)
		}
		}

		no_signal:
		/* Did we come from a system call? */
		if (regs->syscall_nr >= 0) {
		/* Restart the system call - no handlers present */