x86: support for new UV apic, fix
authorJack Steiner <steiner@sgi.com>
Mon, 31 Mar 2008 02:02:07 +0000 (21:02 -0500)
committerIngo Molnar <mingo@elte.hu>
Thu, 17 Apr 2008 15:41:34 +0000 (17:41 +0200)
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>
arch/x86/kernel/genapic_64.c

index 910a4a777a4c26d668f00b7340faf5368e1c7300..c9eabe36ee364517dd99e2ea1832574bf02c01de 100644 (file)
@@ -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);
        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;
 }
 
        return id;
 }