diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 20:16:53 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 20:16:53 -0400 |
commit | 2031d0f586839bc68f35bcf8580b18947f8491d4 (patch) | |
tree | e317615b4cb62350edeea0afe0a4fc94152cee29 /arch/i386/kernel/io_apic.c | |
parent | 98e7f29418a4931f97e6b78d1ef3a47103fe6cd5 (diff) | |
parent | 3e1d1d28d99dabe63c64f7f40f1ca1d646de1f73 (diff) |
Merge Christoph's freeze cleanup patch
Diffstat (limited to 'arch/i386/kernel/io_apic.c')
-rw-r--r-- | arch/i386/kernel/io_apic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c index 060c4ca4d69f..35eb8e29c485 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) | |||
573 | for ( ; ; ) { | 573 | for ( ; ; ) { |
574 | set_current_state(TASK_INTERRUPTIBLE); | 574 | set_current_state(TASK_INTERRUPTIBLE); |
575 | time_remaining = schedule_timeout(time_remaining); | 575 | time_remaining = schedule_timeout(time_remaining); |
576 | try_to_freeze(PF_FREEZE); | 576 | try_to_freeze(); |
577 | if (time_after(jiffies, | 577 | if (time_after(jiffies, |
578 | prev_balance_time+balanced_irq_interval)) { | 578 | prev_balance_time+balanced_irq_interval)) { |
579 | preempt_disable(); | 579 | preempt_disable(); |