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/i386/kernel | |
| parent | 98e7f29418a4931f97e6b78d1ef3a47103fe6cd5 (diff) | |
| parent | 3e1d1d28d99dabe63c64f7f40f1ca1d646de1f73 (diff) | |
| download | op-kernel-dev-2031d0f586839bc68f35bcf8580b18947f8491d4.zip op-kernel-dev-2031d0f586839bc68f35bcf8580b18947f8491d4.tar.gz | |
Merge Christoph's freeze cleanup patch
Diffstat (limited to 'arch/i386/kernel')
| -rw-r--r-- | arch/i386/kernel/io_apic.c | 2 | ||||
| -rw-r--r-- | arch/i386/kernel/signal.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c index 060c4ca..35eb8e2 100644 --- a/arch/i386/kernel/io_apic.c +++ b/arch/i386/kernel/io_apic.c @@ -573,7 +573,7 @@ static int balanced_irq(void *unused) for ( ; ; ) { set_current_state(TASK_INTERRUPTIBLE); time_remaining = schedule_timeout(time_remaining); - try_to_freeze(PF_FREEZE); + try_to_freeze(); if (time_after(jiffies, prev_balance_time+balanced_irq_interval)) { preempt_disable(); diff --git a/arch/i386/kernel/signal.c b/arch/i386/kernel/signal.c index b9b8f4e..ac5b1e9 100644 --- a/arch/i386/kernel/signal.c +++ b/arch/i386/kernel/signal.c @@ -608,10 +608,8 @@ int fastcall 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; |
