From: Jan Beulich <jbeulich@novell.com>
Date: Wed, 14 Jan 2009 12:28:51 +0000 (+0000)
Subject: x86: avoid early crash in disable_local_APIC()
X-Git-Tag: v2.6.29-rc3~42^2~25
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4a13ad0bd8869bb491c67918662f9b1852595af5;p=linux-2.6-omap-h63xx.git

x86: avoid early crash in disable_local_APIC()

E.g. when called due to an early panic.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/kernel/apic.c b/arch/x86/kernel/apic.c
index 0f830e4f567..d19aa3aab62 100644
--- a/arch/x86/kernel/apic.c
+++ b/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();
 
 	/*