From 9720fbd47e8892b0b9a6a6ce0fbe9a1fb1f2670a Mon Sep 17 00:00:00 2001
From: David Rientjes <rientjes@google.com>
Date: Sat, 21 Jul 2007 17:11:30 +0200
Subject: [PATCH] --- yaml --- r: 62442 b: refs/heads/master c:
 1c05f093c0721894bb60fd26d174815bb7ef2b7f h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/arch/x86_64/mm/numa.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 365ca62fb613..1fb877797d72 100644
--- 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
index 0191b1ca6aa4..6da235522269 100644
--- 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);