diff options
author | Paul Mundt <lethal@linux-sh.org> | 2012-01-10 02:37:06 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-10 02:37:06 -0500 |
commit | abef364050bcf8f46b0cb4bd47947ec2951664d3 (patch) | |
tree | 9775c7f8cb2b5f64d5bd71da6c4c0b86adcfc0d7 /arch/sh | |
parent | 6330c04bb455e10eb6cc6d2552a593af54c6dd96 (diff) |
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>
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/kernel/signal_32.c | 4 | ||||
-rw-r--r-- | arch/sh/kernel/signal_64.c | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/arch/sh/kernel/signal_32.c b/arch/sh/kernel/signal_32.c index 579cd2ca358d..a7a55ed43a59 100644 --- a/arch/sh/kernel/signal_32.c +++ b/arch/sh/kernel/signal_32.c | |||
@@ -588,9 +588,6 @@ static void do_signal(struct pt_regs *regs, unsigned int save_r0) | |||
588 | if (!user_mode(regs)) | 588 | if (!user_mode(regs)) |
589 | return; | 589 | return; |
590 | 590 | ||
591 | if (try_to_freeze()) | ||
592 | goto no_signal; | ||
593 | |||
594 | if (current_thread_info()->status & TS_RESTORE_SIGMASK) | 591 | if (current_thread_info()->status & TS_RESTORE_SIGMASK) |
595 | oldset = ¤t->saved_sigmask; | 592 | oldset = ¤t->saved_sigmask; |
596 | else | 593 | else |
@@ -618,7 +615,6 @@ static void do_signal(struct pt_regs *regs, unsigned int save_r0) | |||
618 | return; | 615 | return; |
619 | } | 616 | } |
620 | 617 | ||
621 | no_signal: | ||
622 | /* Did we come from a system call? */ | 618 | /* Did we come from a system call? */ |
623 | if (regs->tra >= 0) { | 619 | if (regs->tra >= 0) { |
624 | /* Restart the system call - no handlers present */ | 620 | /* Restart the system call - no handlers present */ |
diff --git a/arch/sh/kernel/signal_64.c b/arch/sh/kernel/signal_64.c index 5a9f1f10ebf4..6b5603fe274b 100644 --- a/arch/sh/kernel/signal_64.c +++ b/arch/sh/kernel/signal_64.c | |||
@@ -98,9 +98,6 @@ static int do_signal(struct pt_regs *regs, sigset_t *oldset) | |||
98 | if (!user_mode(regs)) | 98 | if (!user_mode(regs)) |
99 | return 1; | 99 | return 1; |
100 | 100 | ||
101 | if (try_to_freeze()) | ||
102 | goto no_signal; | ||
103 | |||
104 | if (current_thread_info()->status & TS_RESTORE_SIGMASK) | 101 | if (current_thread_info()->status & TS_RESTORE_SIGMASK) |
105 | oldset = ¤t->saved_sigmask; | 102 | oldset = ¤t->saved_sigmask; |
106 | else if (!oldset) | 103 | else if (!oldset) |
@@ -125,7 +122,6 @@ static int do_signal(struct pt_regs *regs, sigset_t *oldset) | |||
125 | } | 122 | } |
126 | } | 123 | } |
127 | 124 | ||
128 | no_signal: | ||
129 | /* Did we come from a system call? */ | 125 | /* Did we come from a system call? */ |
130 | if (regs->syscall_nr >= 0) { | 126 | if (regs->syscall_nr >= 0) { |
131 | /* Restart the system call - no handlers present */ | 127 | /* Restart the system call - no handlers present */ |