From 045fcf4bc98e37a81605b927213ea564afeb9d2e Mon Sep 17 00:00:00 2001
From: Ravikiran G Thirumalai <kiran@scalex86.org>
Date: Fri, 30 Sep 2005 11:59:21 -0700
Subject: [PATCH] --- yaml --- r: 9527 b: refs/heads/master c:
 e6a045a5b89037ae87c8c1bc84403f1d498e52a1 h: refs/heads/master i:   9525:
 a94f45cdd618b29e93e8496530084265b0c33d81   9523:
 8cea79118cb6a1f4ea7ac612aae44aaaa9b59f80   9519:
 42b1d986381ff516d911e4b86d3d8976062cf8e2 v: v3

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

diff --git a/[refs] b/[refs]
index da14c94bfafc..18ceb5229047 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2dd960d66bc12b6b206e63104636514e5da0ddb7
+refs/heads/master: e6a045a5b89037ae87c8c1bc84403f1d498e52a1
diff --git a/trunk/arch/x86_64/mm/numa.c b/trunk/arch/x86_64/mm/numa.c
index 80a49d9bd8a7..68ad75853510 100644
--- a/trunk/arch/x86_64/mm/numa.c
+++ b/trunk/arch/x86_64/mm/numa.c
@@ -178,7 +178,6 @@ void __init numa_init_array(void)
 		rr++; 
 	}
 
-	set_bit(0, &node_to_cpumask[cpu_to_node(0)]);
 }
 
 #ifdef CONFIG_NUMA_EMU
@@ -266,9 +265,7 @@ void __init numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn)
 
 __cpuinit void numa_add_cpu(int cpu)
 {
-	/* BP is initialized elsewhere */
-	if (cpu) 
-		set_bit(cpu, &node_to_cpumask[cpu_to_node(cpu)]);
+	set_bit(cpu, &node_to_cpumask[cpu_to_node(cpu)]);
 } 
 
 unsigned long __init numa_free_all_bootmem(void)