From 94a5727bfd31ec9033453501e81ee82251611238 Mon Sep 17 00:00:00 2001
From: Jacob Pan <jacob.jun.pan@linux.intel.com>
Date: Fri, 14 May 2010 14:41:20 -0700
Subject: [PATCH] --- yaml --- r: 191541 b: refs/heads/master c:
 fea24e28c663e62663097f0ed3b8ff1f9a87f15e h: refs/heads/master i:   191539:
 0de2fafd5e809309e41638d068b43b5b679ab8f5 v: v3

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

diff --git a/[refs] b/[refs]
index dddaacb5e20b..f1ba7cc9ff2f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4af4268a34d8cd28c46a03161fc017cbd2db887
+refs/heads/master: fea24e28c663e62663097f0ed3b8ff1f9a87f15e
diff --git a/trunk/arch/x86/kernel/mrst.c b/trunk/arch/x86/kernel/mrst.c
index 0aad8670858e..e796448f0eb5 100644
--- a/trunk/arch/x86/kernel/mrst.c
+++ b/trunk/arch/x86/kernel/mrst.c
@@ -237,4 +237,9 @@ void __init x86_mrst_early_setup(void)
 	x86_init.pci.fixup_irqs = x86_init_noop;
 
 	legacy_pic = &null_legacy_pic;
+
+	/* Avoid searching for BIOS MP tables */
+	x86_init.mpparse.find_smp_config = x86_init_noop;
+	x86_init.mpparse.get_smp_config = x86_init_uint_noop;
+
 }