From edfd3b6f9f509471d2e6e1c7e129970cd11e11ef Mon Sep 17 00:00:00 2001
From: Nathan Lynch <nathanl@austin.ibm.com>
Date: Mon, 20 Mar 2006 18:37:15 -0600
Subject: [PATCH] --- yaml --- r: 22954 b: refs/heads/master c:
 2b2612272c77288b2bd53d5831df737cd669cd93 h: refs/heads/master v: v3

---
 [refs]                       |  2 +-
 trunk/arch/powerpc/mm/numa.c | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 51f33f7027b2..3c681ed0e664 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 482ec7c403d239bb4f1732faf9a14988094ce08b
+refs/heads/master: 2b2612272c77288b2bd53d5831df737cd669cd93
diff --git a/trunk/arch/powerpc/mm/numa.c b/trunk/arch/powerpc/mm/numa.c
index 7d6ebe3c3b9b..e89b22aa539e 100644
--- a/trunk/arch/powerpc/mm/numa.c
+++ b/trunk/arch/powerpc/mm/numa.c
@@ -321,10 +321,7 @@ static int cpu_numa_callback(struct notifier_block *nfb,
 
 	switch (action) {
 	case CPU_UP_PREPARE:
-		if (min_common_depth == -1 || !numa_enabled)
-			map_cpu_to_node(lcpu, 0);
-		else
-			numa_setup_cpu(lcpu);
+		numa_setup_cpu(lcpu);
 		ret = NOTIFY_OK;
 		break;
 #ifdef CONFIG_HOTPLUG_CPU
@@ -459,8 +456,6 @@ static int __init parse_numa_properties(void)
 			goto new_range;
 	}
 
-	numa_setup_cpu(boot_cpuid);
-
 	return 0;
 }
 
@@ -475,7 +470,6 @@ static void __init setup_nonnuma(void)
 	printk(KERN_INFO "Memory hole size: %ldMB\n",
 	       (top_of_ram - total_ram) >> 20);
 
-	map_cpu_to_node(boot_cpuid, 0);
 	for (i = 0; i < lmb.memory.cnt; ++i)
 		add_region(0, lmb.memory.region[i].base >> PAGE_SHIFT,
 			   lmb_size_pages(&lmb.memory, i));
@@ -612,6 +606,8 @@ void __init do_init_bootmem(void)
 		dump_numa_memory_topology();
 
 	register_cpu_notifier(&ppc64_numa_nb);
+	cpu_numa_callback(&ppc64_numa_nb, CPU_UP_PREPARE,
+			  (void *)(unsigned long)boot_cpuid);
 
 	for_each_online_node(nid) {
 		unsigned long start_pfn, end_pfn, pages_present;