Commit 06879033 authored by Jaswinder Singh Rajput's avatar Jaswinder Singh Rajput Committed by Ingo Molnar
Browse files

x86: smp.h move cpu_callin_mask and cpu_callin_map declartion to cpumask.h 



Impact: cleanup

Signed-off-by: default avatarJaswinder Singh Rajput <jaswinderrajput@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 1de8cd3c

arch/x86/include/asm/cpumask.h

0 → 100644
+19 −0
Original line number Diff line number Diff line 
#ifndef _ASM_X86_CPUMASK_H

#define _ASM_X86_CPUMASK_H

#ifndef __ASSEMBLY__

#include <linux/cpumask.h>



#ifdef CONFIG_X86_64



extern cpumask_var_t cpu_callin_mask;



#else /* CONFIG_X86_32 */



extern cpumask_t cpu_callin_map;



#define cpu_callin_mask		((struct cpumask *)&cpu_callin_map)



#endif /* CONFIG_X86_32 */



#endif /* __ASSEMBLY__ */

#endif /* _ASM_X86_CPUMASK_H */

arch/x86/include/asm/smp.h

+0 −3
Original line number Diff line number Diff line
@@ -20,19 +20,16 @@ 


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

extern cpumask_var_t cpu_sibling_setup_mask;



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

arch/x86/kernel/cpu/common.c

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <asm/numa.h>

#include <asm/smp.h>

#include <asm/cpu.h>

#include <asm/cpumask.h>

#ifdef CONFIG_X86_LOCAL_APIC

#include <asm/mpspec.h>

#include <asm/apic.h>

arch/x86/kernel/setup_percpu.c

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <asm/mpspec.h>

#include <asm/apicdef.h>

#include <asm/highmem.h>

#include <asm/cpumask.h>



#ifdef CONFIG_X86_LOCAL_APIC

unsigned int num_processors;

arch/x86/kernel/smpboot.c

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ 
#include <asm/idle.h>

#include <asm/trampoline.h>

#include <asm/cpu.h>

#include <asm/cpumask.h>

#include <asm/numa.h>

#include <asm/pgtable.h>

#include <asm/tlbflush.h>