x86: smp.h move cpu_callout_mask and cpu_callout_map declartion to cpumask.h

Impact: cleanup

Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

arch/x86/include/asm/cpumask.h

@@ -6,12 +6,15 @@
 #ifdef CONFIG_X86_64
 
 extern cpumask_var_t cpu_callin_mask;
+extern cpumask_var_t cpu_callout_mask;
 
 #else /* CONFIG_X86_32 */
 
 extern cpumask_t cpu_callin_map;
+extern cpumask_t cpu_callout_map;
 
 #define cpu_callin_mask		((struct cpumask *)&cpu_callin_map)
+#define cpu_callout_mask	((struct cpumask *)&cpu_callout_map)
 
 #endif /* CONFIG_X86_32 */
 

arch/x86/include/asm/smp.h

@@ -17,20 +17,18 @@
 #endif
 #include <asm/pda.h>
 #include <asm/thread_info.h>
+#include <asm/cpumask.h>
 
 #ifdef CONFIG_X86_64
 
-extern cpumask_var_t cpu_callout_mask;
 extern cpumask_var_t cpu_initialized_mask;
 extern cpumask_var_t cpu_sibling_setup_mask;
 
 #else /* CONFIG_X86_32 */
 
-extern cpumask_t cpu_callout_map;
 extern cpumask_t cpu_initialized;
 extern cpumask_t cpu_sibling_setup_map;
 
-#define cpu_callout_mask	((struct cpumask *)&cpu_callout_map)
 #define cpu_initialized_mask	((struct cpumask *)&cpu_initialized)
 #define cpu_sibling_setup_mask	((struct cpumask *)&cpu_sibling_setup_map)
 

arch/x86/kernel/smpboot.c

@@ -55,7 +55,6 @@
 #include <asm/idle.h>
 #include <asm/trampoline.h>
 #include <asm/cpu.h>
-#include <asm/cpumask.h>
 #include <asm/numa.h>
 #include <asm/pgtable.h>
 #include <asm/tlbflush.h>