x86: smp.h move prefill_possible_map declartion to cpu.h
PATCH 3/7 x86: smp.h move prefill_possible_map declartion to cpu.h
Impact: cleanup, moving NON-SMP stuff from smp.h
Signed-off-by Jaswinder Singh Rajput <[email protected]>
--- arch/x86/include/asm/cpu.h | 10 ++++++++++ arch/x86/include/asm/smp.h | 6 ------ arch/x86/kernel/setup.c | 2 +- arch/x86/kernel/smpboot.c | 1 - 4 files changed, 11 insertions(+), 8 deletions(-)
arch/x86/include/asm/cpu.h +10 -0
@@ -7,6 +7,16 @@#include <linux/nodemask.h> #include <linux/percpu.h> +#ifdef CONFIG_SMP + +extern void prefill_possible_map (void ); + +#else /* CONFIG_SMP */ + +static inline void prefill_possible_map (void ) {} + +#endif /* CONFIG_SMP */ +struct x86_cpu {struct cpu cpu; };
arch/x86/include/asm/smp.h +0 -6
@@ -164,8 +164,6 @@ void play_dead_common(void);void native_send_call_func_ipi (const struct cpumask *mask);void native_send_call_func_single_ipi (int cpu); -extern void prefill_possible_map (void ); -void smp_store_cpu_info (int id);#define cpu_physical_id (cpu) per_cpu(x86_cpu_to_apicid, cpu)
@@ -174,10 +172,6 @@ static inline int num_booting_cpus(void) {return cpumask_weight (cpu_callout_mask); } -#else -static inline void prefill_possible_map (void ) -{ -}#endif /* CONFIG_SMP */ extern unsigned disabled_cpus__cpuinitdata ;
arch/x86/kernel/setup.c +1 -1
@@ -89,7 +89,7 @@#include <asm/system.h> #include <asm/vsyscall.h> -#include <asm/smp.h> +#include <asm/cpu.h> #include <asm/desc.h> #include <asm/dma.h> #include <asm/iommu.h>
arch/x86/kernel/smpboot.c +0 -1
@@ -53,7 +53,6 @@#include <asm/nmi.h> #include <asm/irq.h> #include <asm/idle.h> -#include <asm/smp.h> #include <asm/trampoline.h> #include <asm/cpu.h> #include <asm/numa.h>
Signature · 1 line
1.5.6.6