From: David S. Miller <davem@hutch.davemloft.net>
Date: Tue, 5 Jun 2007 04:35:18 +0000 (-0700)
Subject: [SPARC64]: Make core and sibling groups equal on UltraSPARC-IV.
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5cd342df96e911fb8135fb3d58f33c2c5af9ffab;p=openwrt%2Fstaging%2Fblogic.git

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

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

diff --git a/arch/sparc64/kernel/prom.c b/arch/sparc64/kernel/prom.c
index 928aba3d0db3..172387d1f660 100644
--- a/arch/sparc64/kernel/prom.c
+++ b/arch/sparc64/kernel/prom.c
@@ -1781,6 +1781,7 @@ static void __init of_fill_in_cpu_data(void)
 			}
 
 			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 @@ static void __init of_fill_in_cpu_data(void)
 				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);