patch-2.4.0-test3 linux/include/asm-mips64/sn/addrs.h

Next file: linux/include/asm-mips64/sn/agent.h
Previous file: linux/include/asm-mips64/sfp-machine.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test2/linux/include/asm-mips64/sn/addrs.h linux/include/asm-mips64/sn/addrs.h
@@ -10,7 +10,6 @@
 #ifndef _ASM_SN_ADDRS_H
 #define _ASM_SN_ADDRS_H
 
-#include <linux/config.h>
 #if _LANGUAGE_C
 #include <linux/types.h>
 #endif /* _LANGUAGE_C */
@@ -146,7 +145,7 @@
 #define UALIAS_FLIP_BASE	UALIAS_BASE
 #define UALIAS_FLIP_SIZE	0x20000
 #define UALIAS_FLIP_BIT		0x10000
-#define UALIAS_FLIP_ADDR(_x)	(cputoslice(getcpuid()) ? \
+#define UALIAS_FLIP_ADDR(_x)	(cputoslice(smp_processor_id()) ? \
 				 (_x) ^ UALIAS_FLIP_BIT : (_x))
 
 #define LBOOT_BASE		(HSPEC_BASE + 0x10000000)

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)