Merge git://oss.sgi.com:8090/xfs/xfs-2.6

[linux-drm-fsl-dcu.git] / include / asm-m32r / smp.h

diff --git a/include/asm-m32r/smp.h b/include/asm-m32r/smp.h
index 7885b7df84a2b5209d26bfd639f28082999f9728..abd937ac5239ae91503275cea548652bf020db23 100644 (file)
--- a/include/asm-m32r/smp.h
+++ b/include/asm-m32r/smp.h
@@ -1,10 +1,6 @@
 #ifndef _ASM_M32R_SMP_H
 #define _ASM_M32R_SMP_H
 
-/* $Id$ */
-
-#include <linux/config.h>
-
 #ifdef CONFIG_SMP
 #ifndef __ASSEMBLY__
 
@@ -67,7 +63,8 @@ extern volatile int cpu_2_physid[NR_CPUS];
 #define raw_smp_processor_id() (current_thread_info()->cpu)
 
 extern cpumask_t cpu_callout_map;
-#define cpu_possible_map cpu_callout_map
+extern cpumask_t cpu_possible_map;
+extern cpumask_t cpu_present_map;
 
 static __inline__ int hard_smp_processor_id(void)
 {