commit 5cd342df96e911fb8135fb3d58f33c2c5af9ffab
author David S. Miller <davem@hutch.davemloft.net> Mon Jun 04 21:35:18 2007 -0700
committer David S. Miller <davem@sunset.davemloft.net> Mon Jun 04 21:50:02 2007 -0700
tree fd828ca9e65e0832b43d31d6f2a14d2f31a94ee9
parent f78eae2e6f5d1eb05f76a45486286445b916bd92

[SPARC64]: Make core and sibling groups equal on UltraSPARC-IV.

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

arch/sparc64/kernel/prom.c

diff --git a/arch/sparc64/kernel/prom.c b/arch/sparc64/kernel/prom.c
index 928aba3d..172387d 100644
--- a/arch/sparc64/kernel/prom.c
+++ b/arch/sparc64/kernel/prom.c
@@ -1781,6 +1781,7 @@
 			}
 
 			cpu_data(cpuid).core_id = portid + 1;
+			cpu_data(cpuid).proc_id = portid;
 		} else {
 			cpu_data(cpuid).dcache_size =
 				of_getintprop_default(dp, "dcache-size", 16 * 1024);
@@ -1799,8 +1800,8 @@
 				of_getintprop_default(dp, "ecache-line-size", 64);
 
 			cpu_data(cpuid).core_id = 0;
+			cpu_data(cpuid).proc_id = -1;
 		}
-		cpu_data(cpuid).proc_id = -1;
 
 #ifdef CONFIG_SMP
 		cpu_set(cpuid, cpu_present_map);