aboutsummaryrefslogtreecommitdiffstats
path: root/arch/frv
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-25 20:16:53 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-25 20:16:53 -0400
commit2031d0f586839bc68f35bcf8580b18947f8491d4 (patch)
treee317615b4cb62350edeea0afe0a4fc94152cee29 /arch/frv
parent98e7f29418a4931f97e6b78d1ef3a47103fe6cd5 (diff)
parent3e1d1d28d99dabe63c64f7f40f1ca1d646de1f73 (diff)
Merge Christoph's freeze cleanup patch
Diffstat (limited to 'arch/frv')
-rw-r--r--arch/frv/kernel/signal.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/frv/kernel/signal.c b/arch/frv/kernel/signal.c
index d8d8f3d4304d..36a2dffc8ebd 100644
--- a/arch/frv/kernel/signal.c
+++ b/arch/frv/kernel/signal.c
@@ -536,10 +536,8 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset)
536 if (!user_mode(regs)) 536 if (!user_mode(regs))
537 return 1; 537 return 1;
538 538
539 if (current->flags & PF_FREEZE) { 539 if (try_to_freeze())
540 refrigerator(0);
541 goto no_signal; 540 goto no_signal;
542 }
543 541
544 if (!oldset) 542 if (!oldset)
545 oldset = &current->blocked; 543 oldset = &current->blocked;