From: Joerg Roedel Date: Wed, 26 Sep 2012 10:44:34 +0000 (+0200) Subject: x86, apic: Mask IO-APIC and PIC unconditionally on LAPIC resume X-Git-Tag: v3.9-rc1~169^2~1^2~17 X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=336224ba5e4fb42a95d02ab0aa0fdff21649bb38;p=~andy%2Flinux x86, apic: Mask IO-APIC and PIC unconditionally on LAPIC resume IO-APIC and PIC use the same resume routines when IRQ remapping is enabled or disabled. So it should be safe to mask the other APICs for the IRQ-remapping-disabled case too. Signed-off-by: Joerg Roedel Acked-by: Sebastian Andrzej Siewior Reviewed-by: Konrad Rzeszutek Wilk --- diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index 8d741e65ff6..a5b4dce1b7a 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -2266,16 +2266,15 @@ static void lapic_resume(void) return; local_irq_save(flags); - if (irq_remapping_enabled) { - /* - * IO-APIC and PIC have their own resume routines. - * We just mask them here to make sure the interrupt - * subsystem is completely quiet while we enable x2apic - * and interrupt-remapping. - */ - mask_ioapic_entries(); - legacy_pic->mask_all(); - } + + /* + * IO-APIC and PIC have their own resume routines. + * We just mask them here to make sure the interrupt + * subsystem is completely quiet while we enable x2apic + * and interrupt-remapping. + */ + mask_ioapic_entries(); + legacy_pic->mask_all(); if (x2apic_mode) enable_x2apic();