diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-07-28 04:30:20 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-07-28 04:30:20 -0400 |
commit | 661299d9d0437a0ff72240f3d60016ac3a361a6e (patch) | |
tree | 765512576314fc3612b503f182b9ae4e60fcf849 /arch/sh/kernel/signal.c | |
parent | 05caac585f8abd6c0113856bc8858e3ef214d8a6 (diff) | |
parent | 41c018b7ecb60b1c2c4d5dee0cd37d32a94c45af (diff) |
Merge with Linus' 2.6 tree
Diffstat (limited to 'arch/sh/kernel/signal.c')
-rw-r--r-- | arch/sh/kernel/signal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/signal.c b/arch/sh/kernel/signal.c index 06f1b47eded9..8022243f0178 100644 --- a/arch/sh/kernel/signal.c +++ b/arch/sh/kernel/signal.c | |||
@@ -579,7 +579,7 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset) | |||
579 | if (!user_mode(regs)) | 579 | if (!user_mode(regs)) |
580 | return 1; | 580 | return 1; |
581 | 581 | ||
582 | if (try_to_freeze(0)) | 582 | if (try_to_freeze()) |
583 | goto no_signal; | 583 | goto no_signal; |
584 | 584 | ||
585 | if (!oldset) | 585 | if (!oldset) |