From: Jack Steiner <steiner@sgi.com>
Date: Mon, 31 Mar 2008 02:02:07 +0000 (-0500)
Subject: x86: support for new UV apic, fix
X-Git-Tag: v2.6.26-rc1~1154^2~48
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=f5149a49f994e5c469ac398af7cdeb8eb612d3a4;p=linux-2.6-omap-h63xx.git

x86: support for new UV apic, fix

Yinghai Lu pointed out a bug in the previous patches,
fix double-shift of apicid.

Signed-off-by: Jack Steiner <steiner@sgi.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/kernel/genapic_64.c b/arch/x86/kernel/genapic_64.c
index 910a4a777a4..c9eabe36ee3 100644
--- a/arch/x86/kernel/genapic_64.c
+++ b/arch/x86/kernel/genapic_64.c
@@ -95,8 +95,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;
 }