From 3453ca99cacdb1b46bdf865f483155c7bc80188d Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Thu, 15 Jul 2010 00:00:59 -0700
Subject: [PATCH] --- yaml --- r: 201049 b: refs/heads/master c:
 fd19dce7ac07973f700b0f13fb7f94b951414a4c h: refs/heads/master i:   201047:
 88c6ffcff9ef424afd4771c4a6628a27b42eae95 v: v3

---
 [refs]                            | 2 +-
 trunk/arch/x86/kernel/apic/apic.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index aeb65db3d866..6bee09ef8254 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 08be97962bf338161325d4901642f956ce8c1adb
+refs/heads/master: fd19dce7ac07973f700b0f13fb7f94b951414a4c
diff --git a/trunk/arch/x86/kernel/apic/apic.c b/trunk/arch/x86/kernel/apic/apic.c
index c02cc692985c..a96489ee6cab 100644
--- a/trunk/arch/x86/kernel/apic/apic.c
+++ b/trunk/arch/x86/kernel/apic/apic.c
@@ -921,7 +921,7 @@ void disable_local_APIC(void)
 	unsigned int value;
 
 	/* APIC hasn't been mapped yet */
-	if (!apic_phys)
+	if (!x2apic_mode && !apic_phys)
 		return;
 
 	clear_local_APIC();