aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-10 08:48:46 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-10 08:48:46 -0800
commit9f99a2f0e44663517b99b69a3e4a499d0ba877df (patch)
tree92bbe9f9c9c6687a49e13e4e1bfe2a29bc736476 /arch
parent8c8ae4e8cd5a67467192f3361eeec463694f8ed8 (diff)
parent110e7c7e4f8a61a34e0ab88fc9bdf4d5c6d220b2 (diff)
Merge branch 'stable/bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
* 'stable/bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen/event: validate irq before get evtchn by irq xen/fb: fix potential memory leak xen/fb: fix xenfb suspend/resume race. xen: disable ACPI NUMA for PV guests xen/irq: Cleanup the find_unbound_irq
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/xen/enlighten.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 6aba2a23e2c..7e8d3bc80af 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1174,6 +1174,15 @@ asmlinkage void __init xen_start_kernel(void)
xen_smp_init();
+#ifdef CONFIG_ACPI_NUMA
+ /*
+ * The pages we from Xen are not related to machine pages, so
+ * any NUMA information the kernel tries to get from ACPI will
+ * be meaningless. Prevent it from trying.
+ */
+ acpi_numa = -1;
+#endif
+
pgd = (pgd_t *)xen_start_info->pt_base;
if (!xen_initial_domain())