Commit 818563dc authored by Fernando Luis Vazquez Cao's avatar Fernando Luis Vazquez Cao Committed by Linus Torvalds
Browse files

Always ask the hardware to obtain hardware processor id - ia64 



Always ask the hardware to determine the hardware processor id in both UP and
SMP kernels.

Signed-off-by: default avatarFernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Andi Kleen <ak@suse.de>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent dd988528

include/asm-ia64/smp.h

+2 −3
Original line number Diff line number Diff line
@@ -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);
@@ -130,7 +130,6 @@ extern int is_multithreading_enabled(void); 


#else /* CONFIG_SMP */



#define hard_smp_processor_id()		0

#define cpu_logical_id(i)		0

#define cpu_physical_id(i)		ia64_get_lid()