diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-04-01 21:14:04 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-04-01 21:14:04 +0200 |
commit | 5679027e74126e0dfc860869b0e7ceab1dd06318 (patch) | |
tree | 9a18b1a2f53be3bad8c9e4db01617fb51f067f64 /arch/powerpc/kernel/machine_kexec.c | |
parent | WARN_ON_SMP(): Add comment to explain ({0;}) (diff) | |
parent | rcu: create new rcu_access_index() and use in mce (diff) | |
download | linux-5679027e74126e0dfc860869b0e7ceab1dd06318.tar.xz linux-5679027e74126e0dfc860869b0e7ceab1dd06318.zip |
Merge branch 'rcu/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu into core/urgent
Diffstat (limited to 'arch/powerpc/kernel/machine_kexec.c')
-rw-r--r-- | arch/powerpc/kernel/machine_kexec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/machine_kexec.c b/arch/powerpc/kernel/machine_kexec.c index bd1e1ff17b2d..7ee50f0547cb 100644 --- a/arch/powerpc/kernel/machine_kexec.c +++ b/arch/powerpc/kernel/machine_kexec.c @@ -31,17 +31,17 @@ void machine_kexec_mask_interrupts(void) { if (!desc) continue; - chip = get_irq_desc_chip(desc); + chip = irq_desc_get_chip(desc); if (!chip) continue; - if (chip->irq_eoi && desc->status & IRQ_INPROGRESS) + if (chip->irq_eoi && irqd_irq_inprogress(&desc->irq_data)) chip->irq_eoi(&desc->irq_data); if (chip->irq_mask) chip->irq_mask(&desc->irq_data); - if (chip->irq_disable && !(desc->status & IRQ_DISABLED)) + if (chip->irq_disable && !irqd_irq_disabled(&desc->irq_data)) chip->irq_disable(&desc->irq_data); } } |