diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-13 11:05:58 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-13 11:05:58 +0100 |
| commit | cd80a8142efa3468c2cd9fb52845f334c3220d54 (patch) | |
| tree | 919e88994bd3c09b34ce852d0a09bb0655d231d0 /arch/x86/include/asm/cpu.h | |
| parent | 641cd4cfcdc71ce01535b31cc4d57d59a1fae1fc (diff) | |
| parent | a98fe7f3425c6b4e90de16f8da63b0429a8fed08 (diff) | |
Merge branch 'x86/core' into core/ipi
Diffstat (limited to 'arch/x86/include/asm/cpu.h')
| -rw-r--r-- | arch/x86/include/asm/cpu.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/arch/x86/include/asm/cpu.h b/arch/x86/include/asm/cpu.h index bae482df6039..b185091bf19c 100644 --- a/arch/x86/include/asm/cpu.h +++ b/arch/x86/include/asm/cpu.h @@ -7,6 +7,20 @@ #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) {} + +#define cpu_physical_id(cpu) boot_cpu_physical_apicid +#define safe_smp_processor_id() 0 +#define stack_smp_processor_id() 0 + +#endif /* CONFIG_SMP */ + struct x86_cpu { struct cpu cpu; }; @@ -17,4 +31,7 @@ extern void arch_unregister_cpu(int); #endif DECLARE_PER_CPU(int, cpu_state); + +extern unsigned int boot_cpu_id; + #endif /* _ASM_X86_CPU_H */ |