diff --git a/arch/x86/include/asm/cpumask.h b/arch/x86/include/asm/cpumask.h
index 9933fcad3c822646b00272b7543a95b8239369c3..d4cfd120b84dba84524528b5102b05e7b7bd39d1 100644
--- 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 a3afec5cad0be9576ff2bd1a4a9fcb8ede58cbb7..7d2a80319e82ed62320dd4ae2fc08fc51150cb15 100644
--- 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 */