X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=include%2Fasm-sparc%2Fsmp.h;h=b9da9a600e356339dd146fff14bf54d96e7df3ff;hb=a99d726bd0574991245fe7d38e8b11c41089eee4;hp=580c51d011dfd56d6bf33ddcaf5e5355ea5b2b26;hpb=9dc263239bb2cfeb242d8ef758fca66a968822d5;p=powerpc.git

diff --git a/include/asm-sparc/smp.h b/include/asm-sparc/smp.h
index 580c51d011..b9da9a600e 100644
--- a/include/asm-sparc/smp.h
+++ b/include/asm-sparc/smp.h
@@ -6,7 +6,6 @@
 #ifndef _SPARC_SMP_H
 #define _SPARC_SMP_H
 
-#include <linux/config.h>
 #include <linux/threads.h>
 #include <asm/head.h>
 #include <asm/btfixup.h>
@@ -81,16 +80,9 @@ static inline int smp_call_function(void (*func)(void *info), void *info, int no
 	return 0;
 }
 
-extern __volatile__ int __cpu_number_map[NR_CPUS];
-extern __volatile__ int __cpu_logical_map[NR_CPUS];
-
 static inline int cpu_logical_map(int cpu)
 {
-	return __cpu_logical_map[cpu];
-}
-static inline int cpu_number_map(int cpu)
-{
-	return __cpu_number_map[cpu];
+	return cpu;
 }
 
 static inline int hard_smp4m_processor_id(void)
@@ -153,6 +145,8 @@ static inline int hard_smp_processor_id(void)
 #define prof_multiplier(__cpu)		cpu_data(__cpu).multiplier
 #define prof_counter(__cpu)		cpu_data(__cpu).counter
 
+void smp_setup_cpu_possible_map(void);
+
 #endif /* !(__ASSEMBLY__) */
 
 /* Sparc specific messages. */
@@ -169,7 +163,11 @@ static inline int hard_smp_processor_id(void)
 #define MBOX_IDLECPU2         0xFD
 #define MBOX_STOPCPU2         0xFE
 
-#endif /* SMP */
+#else /* SMP */
+
+#define smp_setup_cpu_possible_map() do { } while (0)
+
+#endif /* !(SMP) */
 
 #define NO_PROC_ID            0xFF