From: David S. Miller <davem@davemloft.net>
Date: Sat, 25 Mar 2006 21:00:17 +0000 (-0800)
Subject: [SPARC64]: Keep cpu_present_map in sync with phys_cpu_present_map.
X-Git-Tag: v2.6.17-rc1~663
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7d3aee9a9686ffc235c343dcab85c3ebea78908a;p=linux-2.6-omap-h63xx.git

[SPARC64]: Keep cpu_present_map in sync with phys_cpu_present_map.

Don't rely on fixup_cpu_present_map() to do this as that function
is about to be removed.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c
index 1b6e2ade100..7dc28a48426 100644
--- a/arch/sparc64/kernel/smp.c
+++ b/arch/sparc64/kernel/smp.c
@@ -1298,6 +1298,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
 		while (!cpu_find_by_instance(instance, NULL, &mid)) {
 			if (mid != boot_cpu_id) {
 				cpu_clear(mid, phys_cpu_present_map);
+				cpu_clear(mid, cpu_present_map);
 				if (num_possible_cpus() <= max_cpus)
 					break;
 			}
@@ -1332,8 +1333,10 @@ void __init smp_setup_cpu_possible_map(void)
 
 	instance = 0;
 	while (!cpu_find_by_instance(instance, NULL, &mid)) {
-		if (mid < NR_CPUS)
+		if (mid < NR_CPUS) {
 			cpu_set(mid, phys_cpu_present_map);
+			cpu_set(mid, cpu_present_map);
+		}
 		instance++;
 	}
 }