From: Fernando Luis Vazquez Cao Make ia64's hard_smp_processor_id() implementation available to CONFIG_SMP=n builds. Cc: Fernando Luis Vazquez Cao Cc: Andi Kleen Cc: "Luck, Tony" Signed-off-by: Andrew Morton --- include/asm-ia64/smp.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff -puN include/asm-ia64/smp.h~remove-hardcoding-of-hard_smp_processor_id-on-up include/asm-ia64/smp.h --- a/include/asm-ia64/smp.h~remove-hardcoding-of-hard_smp_processor_id-on-up +++ a/include/asm-ia64/smp.h @@ -38,6 +38,8 @@ ia64_get_lid (void) return lid.f.id << 8 | lid.f.eid; } +#define hard_smp_processor_id() ia64_get_lid() + #ifdef CONFIG_SMP #define XTP_OFFSET 0x1e0008 @@ -110,8 +112,6 @@ max_xtp (void) writeb(0x0f, ipi_base_addr + XTP_OFFSET); /* Set XTP to max */ } -#define hard_smp_processor_id() ia64_get_lid() - /* Upping and downing of CPUs */ extern int __cpu_disable (void); extern void __cpu_die (unsigned int cpu); @@ -128,7 +128,7 @@ extern void unlock_ipi_calllock(void); extern void identify_siblings (struct cpuinfo_ia64 *); extern int is_multithreading_enabled(void); -#else +#else /* CONFIG_SMP */ #define cpu_logical_id(i) 0 #define cpu_physical_id(i) ia64_get_lid() _