From: Cyrill Gorcunov <gorcunov@gmail.com>
Date: Fri, 15 Aug 2008 11:51:21 +0000 (+0200)
Subject: x86: apic - do not clear APIC twice in lapic_shutdown
X-Git-Tag: v2.6.28-rc1~711^2~1^2~29
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=9ce122c6e55c44ae9a4c4c777579b87d83e7f898;p=linux-2.6-omap-h63xx.git

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>
---

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);
 }