Re: [PATCH 8/8] x86_64: V2 Support for new UV apic

[Jack Steiner <steiner@sgi.com>]

Fix double-shift of apicid in previous patch.

Signed-off-by: Jack Steiner <steiner@sgi.com>


---
The code is clearly wrong.  I booted on an 8p AMD box and
had no problems. Apparently the kernel (at least basic booting) is
not too sensitive to incorrect apicids being returned. Most
critical-to-boot code must use apicids from the ACPI tables.


 arch/x86/kernel/genapic_64.c |    2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: linux/arch/x86/kernel/genapic_64.c
===================================================================
--- linux.orig/arch/x86/kernel/genapic_64.c	2008-03-30 20:37:18.000000000 -0500
+++ linux/arch/x86/kernel/genapic_64.c	2008-03-30 20:48:30.000000000 -0500
@@ -98,8 +98,6 @@ unsigned int read_apic_id(void)
 	id = apic_read(APIC_ID);
 	if (uv_system_type >= UV_X2APIC)
 		id  |= __get_cpu_var(x2apic_extra_bits);
-	else
-		id = (id >> 24) & 0xFFu;;
 	return id;
 }