diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-04-27 01:18:52 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-06-01 12:58:49 -0400 |
commit | bf343dfd877ebf16cfbc31ba121606c5b6cef01f (patch) | |
tree | 2829c831f6a517fb4e12b891bf03e12958fb1819 /arch/frv/kernel | |
parent | a610d6e672d6d3723e8da257ad4a8a288a8f2f89 (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/frv/kernel')
-rw-r--r-- | arch/frv/kernel/signal.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/frv/kernel/signal.c b/arch/frv/kernel/signal.c index 8dd0492bfb7..c4d9cfa0c8a 100644 --- a/arch/frv/kernel/signal.c +++ b/arch/frv/kernel/signal.c | |||
@@ -491,16 +491,12 @@ static void do_signal(void) | |||
491 | if (!user_mode(__frame)) | 491 | if (!user_mode(__frame)) |
492 | return; | 492 | return; |
493 | 493 | ||
494 | if (try_to_freeze()) | ||
495 | goto no_signal; | ||
496 | |||
497 | signr = get_signal_to_deliver(&info, &ka, __frame, NULL); | 494 | signr = get_signal_to_deliver(&info, &ka, __frame, NULL); |
498 | if (signr > 0) { | 495 | if (signr > 0) { |
499 | handle_signal(signr, &info, &ka); | 496 | handle_signal(signr, &info, &ka); |
500 | return; | 497 | return; |
501 | } | 498 | } |
502 | 499 | ||
503 | no_signal: | ||
504 | /* Did we come from a system call? */ | 500 | /* Did we come from a system call? */ |
505 | if (__frame->syscallno != -1) { | 501 | if (__frame->syscallno != -1) { |
506 | /* Restart the system call - no handlers present */ | 502 | /* Restart the system call - no handlers present */ |