aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/apic_32.c
diff options
context:
space:
mode:
authorCyrill Gorcunov <gorcunov@gmail.com>2008-08-18 12:45:52 -0400
committerIngo Molnar <mingo@elte.hu>2008-08-18 20:07:13 -0400
commitfe4024dcb0c01e5399394d2807406a2c13fb1eb7 (patch)
treeb8d80e4c79b2b7fa058c788fb895f0414255ce87 /arch/x86/kernel/apic_32.c
parent990b183e58cb513a62492b6218987750e106cbfb (diff)
x86: apic - unify lapic_shutdown
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/apic_32.c')
-rw-r--r--arch/x86/kernel/apic_32.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
index 13c4b79441da..d4efe86adc72 100644
--- a/arch/x86/kernel/apic_32.c
+++ b/arch/x86/kernel/apic_32.c
@@ -838,10 +838,13 @@ void lapic_shutdown(void)
838 838
839 local_irq_save(flags); 839 local_irq_save(flags);
840 840
841 if (enabled_via_apicbase) 841#ifdef CONFIG_X86_32
842 disable_local_APIC(); 842 if (!enabled_via_apicbase)
843 else
844 clear_local_APIC(); 843 clear_local_APIC();
844 else
845#endif
846 disable_local_APIC();
847
845 848
846 local_irq_restore(flags); 849 local_irq_restore(flags);
847} 850}