[MIPS] Remove IP27 specific structures from struct cpuinfo_mips

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

5 files changed, 25 insertions, 22 deletions

diff --git a/arch/mips/sgi-ip27/ip27-init.c b/arch/mips/sgi-ip27/ip27-init.c
index 74158d349630..af08c41d6aa8 100644
--- a/arch/mips/sgi-ip27/ip27-init.c
+++ b/arch/mips/sgi-ip27/ip27-init.c
@@ -47,6 +47,9 @@ cnodeid_t	cpuid_to_compact_node[MAXCPUS];
 
 EXPORT_SYMBOL(nasid_to_compact_node);
 
+struct cpuinfo_ip27 sn_cpu_info[NR_CPUS];
+EXPORT_SYMBOL_GPL(sn_cpu_info);
+
 extern void pcibr_setup(cnodeid_t);
 
 extern void xtalk_probe_node(cnodeid_t nid);
diff --git a/arch/mips/sgi-ip27/ip27-smp.c b/arch/mips/sgi-ip27/ip27-smp.c
index fbb27728a76a..493777e39a01 100644
--- a/arch/mips/sgi-ip27/ip27-smp.c
+++ b/arch/mips/sgi-ip27/ip27-smp.c
@@ -33,7 +33,7 @@ static void alloc_cpupda(cpuid_t cpu, int cpunum)
         nasid_t nasid = COMPACT_TO_NASID_NODEID(node);
 
         cputonasid(cpunum) = nasid;
-        cpu_data[cpunum].p_nodeid = node;
+        sn_cpu_info[cpunum].p_nodeid = node;
         cputoslice(cpunum) = get_cpu_slice(cpu);
 }
 
diff --git a/include/asm-mips/cpu-info.h b/include/asm-mips/cpu-info.h
index 22fe8453fcc7..04689590eeed 100644
--- a/include/asm-mips/cpu-info.h
+++ b/include/asm-mips/cpu-info.h
@@ -14,10 +14,6 @@
 
 #include <asm/cache.h>
 
-#ifdef CONFIG_SGI_IP27
-#include <asm/sn/types.h>
-#endif
-
 /*
  * Descriptor for a cache
  */
@@ -43,20 +39,6 @@ struct cache_desc {
 struct cpuinfo_mips {
         unsigned long           udelay_val;
         unsigned long           asid_cache;
-#if defined(CONFIG_SGI_IP27)
-//      cpuid_t         p_cpuid;        /* PROM assigned cpuid */
-        cnodeid_t       p_nodeid;       /* my node ID in compact-id-space */
-        nasid_t         p_nasid;        /* my node ID in numa-as-id-space */
-        unsigned char   p_slice;        /* Physical position on node board */
-#endif
-#if 0
-        unsigned long           loops_per_sec;
-        unsigned long           ipi_count;
-        unsigned long           irq_attempt[NR_IRQS];
-        unsigned long           smp_local_irq_count;
-        unsigned long           prof_multiplier;
-        unsigned long           prof_counter;
-#endif
 
         /*
          * Capability and feature descriptor structure for MIPS CPU
diff --git a/include/asm-mips/mach-ip27/topology.h b/include/asm-mips/mach-ip27/topology.h
index 61d9be3f3175..372291f53fb9 100644
--- a/include/asm-mips/mach-ip27/topology.h
+++ b/include/asm-mips/mach-ip27/topology.h
@@ -2,9 +2,27 @@
 #define _ASM_MACH_TOPOLOGY_H    1
 
 #include <asm/sn/hub.h>
+#include <asm/sn/types.h>
 #include <asm/mmzone.h>
 
-#define cpu_to_node(cpu)        (cpu_data[(cpu)].p_nodeid)
+struct cpuinfo_ip27 {
+//      cpuid_t         p_cpuid;        /* PROM assigned cpuid */
+        cnodeid_t       p_nodeid;       /* my node ID in compact-id-space */
+        nasid_t         p_nasid;        /* my node ID in numa-as-id-space */
+        unsigned char   p_slice;        /* Physical position on node board */
+#if 0
+        unsigned long           loops_per_sec;
+        unsigned long           ipi_count;
+        unsigned long           irq_attempt[NR_IRQS];
+        unsigned long           smp_local_irq_count;
+        unsigned long           prof_multiplier;
+        unsigned long           prof_counter;
+#endif
+};
+
+extern struct cpuinfo_ip27 sn_cpu_info[NR_CPUS];
+
+#define cpu_to_node(cpu)        (sn_cpu_info[(cpu)].p_nodeid)
 #define parent_node(node)       (node)
 #define node_to_cpumask(node)   (hub_data(node)->h_cpus)
 #define node_to_first_cpu(node) (first_cpu(node_to_cpumask(node)))
diff --git a/include/asm-mips/sn/arch.h b/include/asm-mips/sn/arch.h
index da523de628be..bd75945e10ff 100644
--- a/include/asm-mips/sn/arch.h
+++ b/include/asm-mips/sn/arch.h
@@ -19,8 +19,8 @@
 
 typedef u64     hubreg_t;
 
-#define cputonasid(cpu)                 (cpu_data[(cpu)].p_nasid)
-#define cputoslice(cpu)                 (cpu_data[(cpu)].p_slice)
+#define cputonasid(cpu)         (sn_cpu_info[(cpu)].p_nasid)
+#define cputoslice(cpu)         (sn_cpu_info[(cpu)].p_slice)
 #define makespnum(_nasid, _slice)                                       \
                 (((_nasid) << CPUS_PER_NODE_SHFT) | (_slice))