diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-11-10 17:31:49 -0800 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-11-10 17:31:49 -0800 |
| commit | 84cdda8a1966288de26be5cecf7702d378861ff9 (patch) | |
| tree | 914924b2a78ca756a35c3480d7abb2726f2db1f4 /include/asm-i386/smp.h | |
| parent | 3c50c61826d1e2e9354232f625216c8fcfef48db (diff) | |
| parent | 6e6ece5dc6022e8086c565498d23511bbceda811 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-i386/smp.h')
| -rw-r--r-- | include/asm-i386/smp.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/asm-i386/smp.h b/include/asm-i386/smp.h index 13250199976..61d3ab9db70 100644 --- a/include/asm-i386/smp.h +++ b/include/asm-i386/smp.h @@ -45,6 +45,8 @@ extern void unlock_ipi_call_lock(void); #define MAX_APICID 256 extern u8 x86_cpu_to_apicid[]; +#define cpu_physical_id(cpu) x86_cpu_to_apicid[cpu] + #ifdef CONFIG_HOTPLUG_CPU extern void cpu_exit_clear(void); extern void cpu_uninit(void); @@ -92,6 +94,10 @@ extern int __cpu_disable(void); extern void __cpu_die(unsigned int cpu); #endif /* !__ASSEMBLY__ */ +#else /* CONFIG_SMP */ + +#define cpu_physical_id(cpu) boot_cpu_physical_apicid + #define NO_PROC_ID 0xFF /* No processor magic marker */ #endif |