From b802a185df7d437fde7b05be5fc3f3bbda9c22a1 Mon Sep 17 00:00:00 2001
From: Andi Kleen <andi@firstfloor.org>
Date: Thu, 4 Dec 2008 13:33:35 +0100
Subject: [PATCH] --- yaml --- r: 119699 b: refs/heads/master c:
 9adc13867ec5fe0cd35434f92954d90e42381f0b h: refs/heads/master i:   119697:
 75bc2d21645db35d9f1cf57daa90b89bae7e7c04   119695:
 3d0d911c965a77299b5e611c9f1c55cc4d515c11 v: v3

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

diff --git a/[refs] b/[refs]
index 070b92291ed8..b5865e1adc46 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66a05d6b47a299b6bdeb645bc2d536109cd800b4
+refs/heads/master: 9adc13867ec5fe0cd35434f92954d90e42381f0b
diff --git a/trunk/arch/x86/kernel/mpparse.c b/trunk/arch/x86/kernel/mpparse.c
index f98f4e1dba09..0f4c1fd5a1f4 100644
--- a/trunk/arch/x86/kernel/mpparse.c
+++ b/trunk/arch/x86/kernel/mpparse.c
@@ -604,6 +604,9 @@ static void __init __get_smp_config(unsigned int early)
 		printk(KERN_INFO "Using ACPI for processor (LAPIC) "
 		       "configuration information\n");
 
+	if (!mpf)
+		return;
+
 	printk(KERN_INFO "Intel MultiProcessor Specification v1.%d\n",
 	       mpf->mpf_specification);
 #if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86_32)