sh: Remove redundant try_to_freeze() invocations.
authorPaul Mundt <lethal@linux-sh.org>
Tue, 10 Jan 2012 07:37:06 +0000 (16:37 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Tue, 10 Jan 2012 07:37:06 +0000 (16:37 +0900)
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>
arch/sh/kernel/signal_32.c
arch/sh/kernel/signal_64.c

index 579cd2ca358d8b786fa6c38e109238c5685807e2..a7a55ed43a596ee3b372efaa849d19b8c10b3bfc 100644 (file)
@@ -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 */
index 5a9f1f10ebf4b359f573a35f3e70ea34b88fc388..6b5603fe274bdbca92a94b15331553388dc2488a 100644 (file)
@@ -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 */