diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 17:16:53 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 17:16:53 -0700 |
commit | 2031d0f586839bc68f35bcf8580b18947f8491d4 (patch) | |
tree | e317615b4cb62350edeea0afe0a4fc94152cee29 /arch/frv | |
parent | 98e7f29418a4931f97e6b78d1ef3a47103fe6cd5 (diff) | |
parent | 3e1d1d28d99dabe63c64f7f40f1ca1d646de1f73 (diff) | |
download | linux-3.10-2031d0f586839bc68f35bcf8580b18947f8491d4.tar.gz linux-3.10-2031d0f586839bc68f35bcf8580b18947f8491d4.tar.bz2 linux-3.10-2031d0f586839bc68f35bcf8580b18947f8491d4.zip |
Merge Christoph's freeze cleanup patch
Diffstat (limited to 'arch/frv')
-rw-r--r-- | arch/frv/kernel/signal.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/frv/kernel/signal.c b/arch/frv/kernel/signal.c index d8d8f3d4304..36a2dffc8eb 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) if (!user_mode(regs)) return 1; - if (current->flags & PF_FREEZE) { - refrigerator(0); + if (try_to_freeze()) goto no_signal; - } if (!oldset) oldset = ¤t->blocked; |