x86: smp.h move cpu_initialized_mask and cpu_initialized declartion to cpumask.h

Impact: cleanup

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

diff --git a/arch/x86/include/asm/cpumask.h b/arch/x86/include/asm/cpumask.h
index 9933fca..d4cfd12 100644 (file)
--- a/arch/x86/include/asm/cpumask.h
+++ b/arch/x86/include/asm/cpumask.h
@@ -7,14 +7,17 @@
 
 extern cpumask_var_t cpu_callin_mask;
 extern cpumask_var_t cpu_callout_mask;
+extern cpumask_var_t cpu_initialized_mask;
 
 #else /* CONFIG_X86_32 */
 
 extern cpumask_t cpu_callin_map;
 extern cpumask_t cpu_callout_map;
+extern cpumask_t cpu_initialized;
 
 #define cpu_callin_mask                ((struct cpumask *)&cpu_callin_map)
 #define cpu_callout_mask       ((struct cpumask *)&cpu_callout_map)
+#define cpu_initialized_mask   ((struct cpumask *)&cpu_initialized)
 
 #endif /* CONFIG_X86_32 */
 

diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
index a3afec5..7d2a803 100644 (file)
--- a/arch/x86/include/asm/smp.h
+++ b/arch/x86/include/asm/smp.h
@@ -21,15 +21,12 @@
 
 #ifdef CONFIG_X86_64
 
-extern cpumask_var_t cpu_initialized_mask;
 extern cpumask_var_t cpu_sibling_setup_mask;
 
 #else /* CONFIG_X86_32 */
 
-extern cpumask_t cpu_initialized;
 extern cpumask_t cpu_sibling_setup_map;
 
-#define cpu_initialized_mask   ((struct cpumask *)&cpu_initialized)
 #define cpu_sibling_setup_mask ((struct cpumask *)&cpu_sibling_setup_map)
 
 #endif /* CONFIG_X86_32 */