Commit 2f2f52ba authored by Brian Gerst's avatar Brian Gerst Committed by Tejun Heo
Browse files

x86: move setup_cpu_local_masks() 



Impact: Code movement, no functional change.

Move setup_cpu_local_masks() to kernel/cpu/common.c, where the
masks are defined.

Signed-off-by: default avatarBrian Gerst <brgerst@gmail.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 6470aff6

arch/x86/include/asm/cpumask.h

+4 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ extern cpumask_var_t cpu_callout_mask; 
extern cpumask_var_t cpu_initialized_mask;

extern cpumask_var_t cpu_sibling_setup_mask;



extern void setup_cpu_local_masks(void);



#else /* CONFIG_X86_32 */



extern cpumask_t cpu_callin_map;
@@ -22,6 +24,8 @@ 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)



static inline void setup_cpu_local_masks(void) { }



#endif /* CONFIG_X86_32 */



#endif /* __ASSEMBLY__ */

arch/x86/kernel/cpu/common.c

+9 −0
Original line number Diff line number Diff line
@@ -52,6 +52,15 @@ cpumask_var_t cpu_initialized_mask; 
/* representing cpus for which sibling maps can be computed */

cpumask_var_t cpu_sibling_setup_mask;



/* correctly size the local cpu masks */

void setup_cpu_local_masks(void)

{

	alloc_bootmem_cpumask_var(&cpu_initialized_mask);

	alloc_bootmem_cpumask_var(&cpu_callin_mask);

	alloc_bootmem_cpumask_var(&cpu_callout_mask);

	alloc_bootmem_cpumask_var(&cpu_sibling_setup_mask);

}



#else /* CONFIG_X86_32 */



cpumask_t cpu_callin_map;

arch/x86/kernel/setup_percpu.c

+0 −19
Original line number Diff line number Diff line
@@ -51,25 +51,6 @@ DEFINE_EARLY_PER_CPU(u16, x86_bios_cpu_apicid, BAD_APICID); 
EXPORT_EARLY_PER_CPU_SYMBOL(x86_cpu_to_apicid);

EXPORT_EARLY_PER_CPU_SYMBOL(x86_bios_cpu_apicid);



#ifdef CONFIG_X86_64



/* correctly size the local cpu masks */

static void setup_cpu_local_masks(void)

{

	alloc_bootmem_cpumask_var(&cpu_initialized_mask);

	alloc_bootmem_cpumask_var(&cpu_callin_mask);

	alloc_bootmem_cpumask_var(&cpu_callout_mask);

	alloc_bootmem_cpumask_var(&cpu_sibling_setup_mask);

}



#else /* CONFIG_X86_32 */



static inline void setup_cpu_local_masks(void)

{

}



#endif /* CONFIG_X86_32 */



#ifdef CONFIG_HAVE_SETUP_PER_CPU_AREA



#ifdef CONFIG_X86_64

CRA Git | Maintained and supported by SUSTech CRA and CCSE