aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorJack Steiner <steiner@sgi.com>2008-03-30 21:02:07 -0500
committerIngo Molnar <mingo@elte.hu>2008-04-17 17:41:34 +0200
commitf5149a49f994e5c469ac398af7cdeb8eb612d3a4 (patch)
tree09a6213f31add52717d232f3a9ccf6f6cb16429b /arch
parent1725037f7232c1518b9be1832f5823b7c576c35c (diff)
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/genapic_64.c2
1 files changed, 0 insertions, 2 deletions
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;
}