From d1838e6b5e112d3a2f930dbaf54fb08841bbbb18 Mon Sep 17 00:00:00 2001
From: Jan Beulich <jbeulich@novell.com>
Date: Wed, 14 Jan 2009 12:28:51 +0000
Subject: [PATCH] --- yaml --- r: 129949 b: refs/heads/master c:
 4a13ad0bd8869bb491c67918662f9b1852595af5 h: refs/heads/master i:   129947:
 e6122fb5135c48e22727bae35a4370941f1b08c7 v: v3

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

diff --git a/[refs] b/[refs]
index ab8a8a0f8b4f..49da1f640c15 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5cca0cf15a94417f49625ce52e23589eed0a1675
+refs/heads/master: 4a13ad0bd8869bb491c67918662f9b1852595af5
diff --git a/trunk/arch/x86/kernel/apic.c b/trunk/arch/x86/kernel/apic.c
index 0f830e4f5675..d19aa3aab62b 100644
--- a/trunk/arch/x86/kernel/apic.c
+++ b/trunk/arch/x86/kernel/apic.c
@@ -895,6 +895,10 @@ void disable_local_APIC(void)
 {
 	unsigned int value;
 
+	/* APIC hasn't been mapped yet */
+	if (!apic_phys)
+		return;
+
 	clear_local_APIC();
 
 	/*