diff options
| author | Kanoj Sarcar <kanoj@engr.sgi.com> | 2000-04-08 03:03:47 +0000 |
|---|---|---|
| committer | Kanoj Sarcar <kanoj@engr.sgi.com> | 2000-04-08 03:03:47 +0000 |
| commit | af596347eec59caf53877afe3b9302f8beb7b6af (patch) | |
| tree | f23906e296c58cbc7bac50b1060cf5795ebae557 /arch | |
| parent | 40d148550ae7be909ab99a5c1be90e248de97d2c (diff) | |
Fix this UP/MP microoptimization business with cpu_data[] and
boot_cpu_data once and for all. Generic mips64/IP27 code wants
to do cpu_data[cpuid] everywhere ...
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips64/kernel/setup.c | 4 | ||||
| -rw-r--r-- | arch/mips64/sgi-ip27/ip27-init.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips64/kernel/setup.c b/arch/mips64/kernel/setup.c index 32b8fe847..fe4c750d4 100644 --- a/arch/mips64/kernel/setup.c +++ b/arch/mips64/kernel/setup.c @@ -41,7 +41,9 @@ #include <asm/sn/sn0/addrs.h> #endif -struct cpuinfo_mips boot_cpu_data; +#ifndef CONFIG_SMP +struct cpuinfo_mips cpu_data[1]; +#endif #ifdef CONFIG_VT struct screen_info screen_info; diff --git a/arch/mips64/sgi-ip27/ip27-init.c b/arch/mips64/sgi-ip27/ip27-init.c index 51e51cd90..b7f34c2bf 100644 --- a/arch/mips64/sgi-ip27/ip27-init.c +++ b/arch/mips64/sgi-ip27/ip27-init.c @@ -166,11 +166,9 @@ void alloc_cpupda(int i) node = get_cpu_cnode(i); nasid = COMPACT_TO_NASID_NODEID(node); -#ifdef CONFIG_SMP cputonasid(i) = nasid; cputocnode(i) = node; cputoslice(i) = get_cpu_slice(i); -#endif } int cpu_enabled(cpuid_t cpu) |