aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/kernel/apic_32.c
diff options
context:
space:
mode:
authorCyrill Gorcunov <gorcunov@gmail.com>2008-08-15 13:51:21 +0200
committerIngo Molnar <mingo@elte.hu>2008-08-15 13:51:21 +0200
commit9ce122c6e55c44ae9a4c4c777579b87d83e7f898 (patch)
tree4f450986ed67385ffdecdca244f1bfba3d36367b /arch/x86/kernel/apic_32.c
parentf07f4f9046121ac803bc2f0ded3d77b7c2ab481b (diff)
x86: apic - do not clear APIC twice in lapic_shutdown
There is no need to clear APIC twice since disable_local_APIC will clear it anyway. 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.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
index 6af20dd12c9..a151d66f948 100644
--- a/arch/x86/kernel/apic_32.c
+++ b/arch/x86/kernel/apic_32.c
@@ -830,10 +830,11 @@ void lapic_shutdown(void)
return;
local_irq_save(flags);
- clear_local_APIC();
if (enabled_via_apicbase)
disable_local_APIC();
+ else
+ clear_local_APIC();
local_irq_restore(flags);
}