The patch titled Always ask the hardware to obtain hardware processor id - ia64 has been removed from the -mm tree. Its filename was always-ask-the-hardware-to-obtain-hardware-processor.patch This patch was dropped because it was folded into remove-hardcoding-of-hard_smp_processor_id-on-up.patch ------------------------------------------------------ Subject: Always ask the hardware to obtain hardware processor id - ia64 From: Fernando Luis Vazquez Cao <fernando@xxxxxxxxxxxxx> Always ask the hardware to determine the hardware processor id in both UP and SMP kernels. Signed-off-by: Fernando Luis Vazquez Cao <fernando@xxxxxxxxxxxxx> Cc: Andi Kleen <ak@xxxxxxx> Cc: Vivek Goyal <vgoyal@xxxxxxxxxx> Cc: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx> Cc: "Luck, Tony" <tony.luck@xxxxxxxxx> Acked-by: Simon Horman <horms@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/asm-ia64/smp.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff -puN include/asm-ia64/smp.h~always-ask-the-hardware-to-obtain-hardware-processor include/asm-ia64/smp.h --- a/include/asm-ia64/smp.h~always-ask-the-hardware-to-obtain-hardware-processor +++ 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() _ Patches currently in -mm which might be from fernando@xxxxxxxxxxxxx are remove-hardcoding-of-hard_smp_processor_id-on-up.patch always-ask-the-hardware-to-obtain-hardware-processor.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html