aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/include/asm/cpumask.h3
-rw-r--r--arch/x86/include/asm/smp.h3
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/include/asm/cpumask.h b/arch/x86/include/asm/cpumask.h
index 9933fcad3c82..d4cfd120b84d 100644
--- a/arch/x86/include/asm/cpumask.h
+++ b/arch/x86/include/asm/cpumask.h
@@ -7,14 +7,17 @@
7 7
8extern cpumask_var_t cpu_callin_mask; 8extern cpumask_var_t cpu_callin_mask;
9extern cpumask_var_t cpu_callout_mask; 9extern cpumask_var_t cpu_callout_mask;
10extern cpumask_var_t cpu_initialized_mask;
10 11
11#else /* CONFIG_X86_32 */ 12#else /* CONFIG_X86_32 */
12 13
13extern cpumask_t cpu_callin_map; 14extern cpumask_t cpu_callin_map;
14extern cpumask_t cpu_callout_map; 15extern cpumask_t cpu_callout_map;
16extern cpumask_t cpu_initialized;
15 17
16#define cpu_callin_mask ((struct cpumask *)&cpu_callin_map) 18#define cpu_callin_mask ((struct cpumask *)&cpu_callin_map)
17#define cpu_callout_mask ((struct cpumask *)&cpu_callout_map) 19#define cpu_callout_mask ((struct cpumask *)&cpu_callout_map)
20#define cpu_initialized_mask ((struct cpumask *)&cpu_initialized)
18 21
19#endif /* CONFIG_X86_32 */ 22#endif /* CONFIG_X86_32 */
20 23
diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
index a3afec5cad0b..7d2a80319e82 100644
--- a/arch/x86/include/asm/smp.h
+++ b/arch/x86/include/asm/smp.h
@@ -21,15 +21,12 @@
21 21
22#ifdef CONFIG_X86_64 22#ifdef CONFIG_X86_64
23 23
24extern cpumask_var_t cpu_initialized_mask;
25extern cpumask_var_t cpu_sibling_setup_mask; 24extern cpumask_var_t cpu_sibling_setup_mask;
26 25
27#else /* CONFIG_X86_32 */ 26#else /* CONFIG_X86_32 */
28 27
29extern cpumask_t cpu_initialized;
30extern cpumask_t cpu_sibling_setup_map; 28extern cpumask_t cpu_sibling_setup_map;
31 29
32#define cpu_initialized_mask ((struct cpumask *)&cpu_initialized)
33#define cpu_sibling_setup_mask ((struct cpumask *)&cpu_sibling_setup_map) 30#define cpu_sibling_setup_mask ((struct cpumask *)&cpu_sibling_setup_map)
34 31
35#endif /* CONFIG_X86_32 */ 32#endif /* CONFIG_X86_32 */