summaryrefslogtreecommitdiffstats
path: root/arch/x86/include
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/include')
-rw-r--r--arch/x86/include/asm/cpumask.h3
-rw-r--r--arch/x86/include/asm/smp.h4
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86/include/asm/cpumask.h b/arch/x86/include/asm/cpumask.h
index 308dddd56329..9933fcad3c82 100644
--- a/arch/x86/include/asm/cpumask.h
+++ b/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 */
diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
index c35aa5c0dd11..a3afec5cad0b 100644
--- a/arch/x86/include/asm/smp.h
+++ b/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)