From 5a1e7d59f60cde11e3fb4bfc694d96b25eba22b9 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: 136415 b: refs/heads/master c:
 a08c4743ed5b861c4fa3d75be00da7106c926296 h: refs/heads/master i:   136413:
 4a516bb903612a8205764b52e437dcf2bb1836f6   136411:
 f067b7765339b32f9b6afaa5db7dfe2ef9950360   136407:
 ed69a61fd9ae9661077c4e4fc16a4911651c95a3   136399:
 75be3e2afae4377beabbc18aceb72b1d5cbd042f   136383:
 77a03d9c33c7851f635dd1d32fc58fd2790265d2 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 3f1ad0409c8c..e4e639feb3db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f11826385b63566d98c02d35f592232ee77cd791
+refs/heads/master: a08c4743ed5b861c4fa3d75be00da7106c926296
diff --git a/trunk/arch/x86/kernel/apic.c b/trunk/arch/x86/kernel/apic.c
index c3dd64fabcf3..38d6aab2358d 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();
 
 	/*