---

yaml --- r: 62442 b: refs/heads/master c: 1c05f09 h: refs/heads/master v: v3
git-mirror · Jul 22, 2007 · 9720fbd · 9720fbd
1 parent 599bd07
commit 9720fbd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a7e96629efcab1ccea3a376f3f5683c8d9e882c1
+refs/heads/master: 1c05f093c0721894bb60fd26d174815bb7ef2b7f
diff --git a/trunk/arch/x86_64/mm/numa.c b/trunk/arch/x86_64/mm/numa.c
@@ -473,9 +473,13 @@ static int __init numa_emulation(unsigned long start_pfn, unsigned long end_pfn)
 
 	/*
 	 * We need to vacate all active ranges that may have been registered by
-	 * SRAT.
+	 * SRAT and set acpi_numa to -1 so that srat_disabled() always returns
+	 * true.  NUMA emulation has succeeded so we will not scan ACPI nodes.
 	 */
 	remove_all_active_ranges();
+#ifdef CONFIG_ACPI_NUMA
+	acpi_numa = -1;
+#endif
 	for_each_node_mask(i, node_possible_map) {
 		e820_register_active_regions(i, nodes[i].start >> PAGE_SHIFT,
 						nodes[i].end >> PAGE_SHIFT);