[SPARC64]: Use machine description and OBP properly for cpu probing.

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

1 files changed, 18 insertions, 9 deletions

diff --git a/arch/sparc64/kernel/traps.c b/arch/sparc64/kernel/traps.c
index d0fde36395b4..00a9e3286c83 100644
--- a/arch/sparc64/kernel/traps.c
+++ b/arch/sparc64/kernel/traps.c
@@ -795,8 +795,7 @@ extern unsigned int cheetah_deferred_trap_vector[], cheetah_deferred_trap_vector
 void __init cheetah_ecache_flush_init(void)
 {
         unsigned long largest_size, smallest_linesize, order, ver;
-        struct device_node *dp;
-        int i, instance, sz;
+        int i, sz;
 
         /* Scan all cpu device tree nodes, note two values:
          * 1) largest E-cache size
@@ -805,18 +804,20 @@ void __init cheetah_ecache_flush_init(void)
         largest_size = 0UL;
         smallest_linesize = ~0UL;
 
-        instance = 0;
-        while (!cpu_find_by_instance(instance, &dp, NULL)) {
+        for (i = 0; i < NR_CPUS; i++) {
                 unsigned long val;
 
-                val = of_getintprop_default(dp, "ecache-size",
-                                            (2 * 1024 * 1024));
+                val = cpu_data(i).ecache_size;
+                if (!val)
+                        continue;
+
                 if (val > largest_size)
                         largest_size = val;
-                val = of_getintprop_default(dp, "ecache-line-size", 64);
+
+                val = cpu_data(i).ecache_line_size;
                 if (val < smallest_linesize)
                         smallest_linesize = val;
-                instance++;
+
         }
 
         if (largest_size == 0UL || smallest_linesize == ~0UL) {
@@ -2564,7 +2565,15 @@ void __init trap_init(void)
             (TRAP_PER_CPU_TSB_HUGE_TEMP !=
              offsetof(struct trap_per_cpu, tsb_huge_temp)) ||
             (TRAP_PER_CPU_IRQ_WORKLIST !=
-             offsetof(struct trap_per_cpu, irq_worklist)))
+             offsetof(struct trap_per_cpu, irq_worklist)) ||
+            (TRAP_PER_CPU_CPU_MONDO_QMASK !=
+             offsetof(struct trap_per_cpu, cpu_mondo_qmask)) ||
+            (TRAP_PER_CPU_DEV_MONDO_QMASK !=
+             offsetof(struct trap_per_cpu, dev_mondo_qmask)) ||
+            (TRAP_PER_CPU_RESUM_QMASK !=
+             offsetof(struct trap_per_cpu, resum_qmask)) ||
+            (TRAP_PER_CPU_NONRESUM_QMASK !=
+             offsetof(struct trap_per_cpu, nonresum_qmask)))
                 trap_per_cpu_offsets_are_bolixed_dave();
 
         if ((TSB_CONFIG_TSB !=