x86: printk kernel version in WARN_ON and other dump_stack users

[linux-2.6] / arch / mips / sgi-ip27 / ip27-smp.c

diff --git a/arch/mips/sgi-ip27/ip27-smp.c b/arch/mips/sgi-ip27/ip27-smp.c
index fbb27728a76abb164a5fa02da92aae9c5e979d1d..a70656d421917704336744575a08723c58e536bc 100644 (file)
--- 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);
 }
 
@@ -176,7 +176,7 @@ void __cpuinit prom_boot_secondary(int cpu, struct task_struct *idle)
        unsigned long gp = (unsigned long)task_thread_info(idle);
        unsigned long sp = __KSTK_TOS(idle);
 
-       LAUNCH_SLAVE(cputonasid(cpu),cputoslice(cpu),
+       LAUNCH_SLAVE(cputonasid(cpu), cputoslice(cpu),
                (launch_proc_t)MAPPED_KERN_RW_TO_K0(smp_bootstrap),
                0, (void *) sp, (void *) gp);
 }