aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m32r
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-04-27 01:18:52 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2012-06-01 12:58:49 -0400
commitbf343dfd877ebf16cfbc31ba121606c5b6cef01f (patch)
tree2829c831f6a517fb4e12b891bf03e12958fb1819 /arch/m32r
parenta610d6e672d6d3723e8da257ad4a8a288a8f2f89 (diff)
don't call try_to_freeze() from do_signal()
get_signal_to_deliver() will handle it itself Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/m32r')
-rw-r--r--arch/m32r/kernel/signal.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/m32r/kernel/signal.c b/arch/m32r/kernel/signal.c
index 970f46dbf24f..7cbfa639fbfa 100644
--- a/arch/m32r/kernel/signal.c
+++ b/arch/m32r/kernel/signal.c
@@ -320,9 +320,6 @@ static void do_signal(struct pt_regs *regs)
320 if (!user_mode(regs)) 320 if (!user_mode(regs))
321 return; 321 return;
322 322
323 if (try_to_freeze())
324 goto no_signal;
325
326 signr = get_signal_to_deliver(&info, &ka, regs, NULL); 323 signr = get_signal_to_deliver(&info, &ka, regs, NULL);
327 if (signr > 0) { 324 if (signr > 0) {
328 /* Re-enable any watchpoints before delivering the 325 /* Re-enable any watchpoints before delivering the
@@ -337,7 +334,6 @@ static void do_signal(struct pt_regs *regs)
337 return; 334 return;
338 } 335 }
339 336
340 no_signal:
341 /* Did we come from a system call? */ 337 /* Did we come from a system call? */
342 if (regs->syscall_nr >= 0) { 338 if (regs->syscall_nr >= 0) {
343 /* Restart the system call - no handlers present */ 339 /* Restart the system call - no handlers present */