tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
x86: unify cpu_callin_mask/cpu_callout_mask/cpu_initialized_mask/cpu_sibling_setup_mask
Impact: cleanup
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
-30
-18
arch/x86/include/asm/cpumask.h
-18
arch/x86/include/asm/cpumask.h
···
3
3
#ifndef __ASSEMBLY__
4
4
#include <linux/cpumask.h>
5
5
6
-
#ifdef CONFIG_X86_64
7
-
8
6
extern cpumask_var_t cpu_callin_mask;
9
7
extern cpumask_var_t cpu_callout_mask;
10
8
extern cpumask_var_t cpu_initialized_mask;
11
9
extern cpumask_var_t cpu_sibling_setup_mask;
12
10
13
11
extern void setup_cpu_local_masks(void);
14
-
15
-
#else /* CONFIG_X86_32 */
16
-
17
-
extern cpumask_t cpu_callin_map;
18
-
extern cpumask_t cpu_callout_map;
19
-
extern cpumask_t cpu_initialized;
20
-
extern cpumask_t cpu_sibling_setup_map;
21
-
22
-
#define cpu_callin_mask ((struct cpumask *)&cpu_callin_map)
23
-
#define cpu_callout_mask ((struct cpumask *)&cpu_callout_map)
24
-
#define cpu_initialized_mask ((struct cpumask *)&cpu_initialized)
25
-
#define cpu_sibling_setup_mask ((struct cpumask *)&cpu_sibling_setup_map)
26
-
27
-
static inline void setup_cpu_local_masks(void) { }
28
-
29
-
#endif /* CONFIG_X86_32 */
30
12
31
13
#endif /* __ASSEMBLY__ */
32
14
#endif /* _ASM_X86_CPUMASK_H */
-12
arch/x86/kernel/cpu/common.c
-12
arch/x86/kernel/cpu/common.c
···
41
41
42
42
#include "cpu.h"
43
43
44
-
#ifdef CONFIG_X86_64
45
-
46
44
/* all of these masks are initialized in setup_cpu_local_masks() */
47
45
cpumask_var_t cpu_callin_mask;
48
46
cpumask_var_t cpu_callout_mask;
···
57
59
alloc_bootmem_cpumask_var(&cpu_callout_mask);
58
60
alloc_bootmem_cpumask_var(&cpu_sibling_setup_mask);
59
61
}
60
-
61
-
#else /* CONFIG_X86_32 */
62
-
63
-
cpumask_t cpu_callin_map;
64
-
cpumask_t cpu_callout_map;
65
-
cpumask_t cpu_initialized;
66
-
cpumask_t cpu_sibling_setup_map;
67
-
68
-
#endif /* CONFIG_X86_32 */
69
-
70
62
71
63
static struct cpu_dev *this_cpu __cpuinitdata;
72
64