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 d247a819de7f88c351b4af8eecdf3a75d801e88e..bd75945e10fffdec2715b444e71a694561dfb3f9 100644 (file)
--- a/include/asm-mips/sn/arch.h
+++ b/include/asm-mips/sn/arch.h
@@ -11,7 +11,6 @@
 #ifndef _ASM_SN_ARCH_H
 #define _ASM_SN_ARCH_H
 
-#include <linux/config.h>
 #include <linux/types.h>
 #include <asm/sn/types.h>
 #ifdef CONFIG_SGI_IP27
@@ -19,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))