---

yaml --- r: 227698 b: refs/heads/master c: c1f5db1 h: refs/heads/master v: v3
git-mirror · Jan 10, 2011 · 6b5e111 · 6b5e111
1 parent f4ba404
commit 6b5e111
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1b758ebc2a82d738092cb42e742470f9d0ea53e
+refs/heads/master: c1f5db1a53a7286f6c818f71016ae6aced814d27
diff --git a/trunk/arch/x86/xen/enlighten.c b/trunk/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())