Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[linux-2.6] / include / asm-mips / sn / arch.h

diff --git a/include/asm-mips/sn/arch.h b/include/asm-mips/sn/arch.h
index 51174af6ac5213608f3f85a0ecc90749adabe421..bd75945e10fffdec2715b444e71a694561dfb3f9 100644 (file)
--- a/include/asm-mips/sn/arch.h
+++ b/include/asm-mips/sn/arch.h
@@ -18,10 +18,9 @@
 #endif
 
 typedef u64    hubreg_t;
-typedef u64    nic_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))