Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f76a183 authored by Rusty Russell's avatar Rusty Russell
Browse files

x86: unify cpu_callin_mask/cpu_callout_mask/cpu_initialized_mask/cpu_sibling_setup_mask 



Impact: cleanup

Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent 155dd720

arch/x86/include/asm/cpumask.h

+0 −18
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ 
#ifndef __ASSEMBLY__

#include <linux/cpumask.h>



#ifdef CONFIG_X86_64



extern cpumask_var_t cpu_callin_mask;

extern cpumask_var_t cpu_callout_mask;

extern cpumask_var_t cpu_initialized_mask;
@@ -12,21 +10,5 @@ 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;

extern cpumask_t cpu_callout_map;

extern cpumask_t cpu_initialized;

extern cpumask_t cpu_sibling_setup_map;



#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)

#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__ */

#endif /* _ASM_X86_CPUMASK_H */

arch/x86/kernel/cpu/common.c

+0 −12
Original line number Diff line number Diff line
@@ -41,8 +41,6 @@ 


#include "cpu.h"



#ifdef CONFIG_X86_64



/* all of these masks are initialized in setup_cpu_local_masks() */

cpumask_var_t cpu_callin_mask;

cpumask_var_t cpu_callout_mask;
@@ -60,16 +58,6 @@ void __init setup_cpu_local_masks(void) 
	alloc_bootmem_cpumask_var(&cpu_sibling_setup_mask);

}



#else /* CONFIG_X86_32 */



cpumask_t cpu_callin_map;

cpumask_t cpu_callout_map;

cpumask_t cpu_initialized;

cpumask_t cpu_sibling_setup_map;



#endif /* CONFIG_X86_32 */





static struct cpu_dev *this_cpu __cpuinitdata;



DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {