dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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 <jaswinderrajput@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Jaswinder Singh Rajput 2009-01-07 18:11:35 +05:30 committed by Ingo Molnar
parent dacf733357
commit 6e5385d44b
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/x86/include/asm/cpu.h
View File

@ -7,6 +7,16 @@
#include <linux/nodemask.h> #include <linux/nodemask.h>
#include <linux/percpu.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 x86_cpu {
struct cpu cpu; struct cpu cpu;
}; };

6
arch/x86/include/asm/smp.h
View File

@ -138,8 +138,6 @@ void play_dead_common(void);
void native_send_call_func_ipi(const struct cpumask *mask); void native_send_call_func_ipi(const struct cpumask *mask);
void native_send_call_func_single_ipi(int cpu); void native_send_call_func_single_ipi(int cpu);
extern void prefill_possible_map(void);
void smp_store_cpu_info(int id); void smp_store_cpu_info(int id);
#define cpu_physical_id(cpu) per_cpu(x86_cpu_to_apicid, cpu) #define cpu_physical_id(cpu) per_cpu(x86_cpu_to_apicid, cpu)
@ -148,10 +146,6 @@ static inline int num_booting_cpus(void)
{ {
return cpus_weight(cpu_callout_map); return cpus_weight(cpu_callout_map);
} }
#else
static inline void prefill_possible_map(void)
{
}
#endif /* CONFIG_SMP */ #endif /* CONFIG_SMP */
extern unsigned disabled_cpus __cpuinitdata; extern unsigned disabled_cpus __cpuinitdata;

2
arch/x86/kernel/setup.c
View File

@ -89,7 +89,7 @@
#include <asm/system.h> #include <asm/system.h>
#include <asm/vsyscall.h> #include <asm/vsyscall.h>
#include <asm/smp.h> #include <asm/cpu.h>
#include <asm/desc.h> #include <asm/desc.h>
#include <asm/dma.h> #include <asm/dma.h>
#include <asm/iommu.h> #include <asm/iommu.h>

1
arch/x86/kernel/smpboot.c
View File

@ -53,7 +53,6 @@
#include <asm/nmi.h> #include <asm/nmi.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/idle.h> #include <asm/idle.h>
#include <asm/smp.h>
#include <asm/trampoline.h> #include <asm/trampoline.h>
#include <asm/cpu.h> #include <asm/cpu.h>
#include <asm/numa.h> #include <asm/numa.h>