diff options
author | David S. Miller <davem@hutch.davemloft.net> | 2007-06-05 00:35:18 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-06-05 00:50:02 -0400 |
commit | 5cd342df96e911fb8135fb3d58f33c2c5af9ffab (patch) | |
tree | fd828ca9e65e0832b43d31d6f2a14d2f31a94ee9 | |
parent | f78eae2e6f5d1eb05f76a45486286445b916bd92 (diff) |
[SPARC64]: Make core and sibling groups equal on UltraSPARC-IV.
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | arch/sparc64/kernel/prom.c | 3 |
1 files changed, 2 insertions, 1 deletions
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) | |||
1781 | } | 1781 | } |
1782 | 1782 | ||
1783 | cpu_data(cpuid).core_id = portid + 1; | 1783 | cpu_data(cpuid).core_id = portid + 1; |
1784 | cpu_data(cpuid).proc_id = portid; | ||
1784 | } else { | 1785 | } else { |
1785 | cpu_data(cpuid).dcache_size = | 1786 | cpu_data(cpuid).dcache_size = |
1786 | of_getintprop_default(dp, "dcache-size", 16 * 1024); | 1787 | of_getintprop_default(dp, "dcache-size", 16 * 1024); |
@@ -1799,8 +1800,8 @@ static void __init of_fill_in_cpu_data(void) | |||
1799 | of_getintprop_default(dp, "ecache-line-size", 64); | 1800 | of_getintprop_default(dp, "ecache-line-size", 64); |
1800 | 1801 | ||
1801 | cpu_data(cpuid).core_id = 0; | 1802 | cpu_data(cpuid).core_id = 0; |
1803 | cpu_data(cpuid).proc_id = -1; | ||
1802 | } | 1804 | } |
1803 | cpu_data(cpuid).proc_id = -1; | ||
1804 | 1805 | ||
1805 | #ifdef CONFIG_SMP | 1806 | #ifdef CONFIG_SMP |
1806 | cpu_set(cpuid, cpu_present_map); | 1807 | cpu_set(cpuid, cpu_present_map); |