From 82a990277ed850ee42947e40a0f56999aa278da4 Mon Sep 17 00:00:00 2001
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Wed, 19 Sep 2012 08:30:55 -0400
Subject: [PATCH] --- yaml --- r: 322987 b: refs/heads/master c:
 bd49940a35ec7d488ae63bd625639893b3385b97 h: refs/heads/master i:   322985:
 5151513acd9c4c0651a62e4045891f2388e411dd   322983:
 625a1f79c1e7b3a394caaf657d78f54bf8f06748 v: v3

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

diff --git a/[refs] b/[refs]
index 66886d739073..6e73b3948f96 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fc136eecd0c647a6b13fcd00d0c41a1a28f35a5
+refs/heads/master: bd49940a35ec7d488ae63bd625639893b3385b97
diff --git a/trunk/arch/x86/xen/enlighten.c b/trunk/arch/x86/xen/enlighten.c
index 9642d4a38602..1fbe75a95f15 100644
--- a/trunk/arch/x86/xen/enlighten.c
+++ b/trunk/arch/x86/xen/enlighten.c
@@ -1452,6 +1452,10 @@ asmlinkage void __init xen_start_kernel(void)
 		pci_request_acs();
 
 		xen_acpi_sleep_register();
+
+		/* 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;
 	}
 #ifdef CONFIG_PCI
 	/* PCI BIOS service won't work from a PV guest. */