From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Wed, 19 Sep 2012 15:02:41 +0000 (-0400)
Subject: Merge branch 'stable/for-linus-3.6.rebased' into uek2-merge
X-Git-Tag: v2.6.39-400.9.0~309^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f5463f8038384eeb7401c896e47d25cb87178cc7;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'stable/for-linus-3.6.rebased' into uek2-merge

* stable/for-linus-3.6.rebased:
  xen/boot: Disable BIOS SMP MP table search.
  xen/m2p: do not reuse kmap_op->dev_bus_addr
  xen/setup: Fix one-off error when adding for-balloon PFNs to the P2M.

Conflicts:
	arch/x86/xen/enlighten.c
---

f5463f8038384eeb7401c896e47d25cb87178cc7
diff --cc arch/x86/xen/enlighten.c
index 064bb98c6d82,2fd7ffe842bb..a2f7ab6b6383
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@@ -1492,9 -1342,10 +1492,13 @@@ asmlinkage void __init xen_start_kernel
  
  		/* Make sure ACS will be enabled */
  		pci_request_acs();
 +		
 +		xen_init_apic();
 +		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. */