diff options
author | Yinghai Lu <yinghai@kernel.org> | 2009-05-15 13:05:16 -0700 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-05-18 08:43:25 +0200 |
commit | 2759c3287de27266e06f1f4e82cbd2d65f6a044c (patch) | |
tree | 78fa6a205d2e1c5f010f62e2ad50a181df1e5f47 /arch/x86/kernel/apic | |
parent | e5198075c67a22ec9a09565b1ce88d3d3f5ba855 (diff) |
x86: don't call read_apic_id if !cpu_has_apic
should not call that if apic is disabled.
[ Impact: fix crash on certain UP configs ]
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Cyrill Gorcunov <gorcunov@gmail.com>
LKML-Reference: <4A09CCBB.2000306@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/apic')
-rw-r--r-- | arch/x86/kernel/apic/apic_flat_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c index 744e6d8af27b..d0c99abc26c3 100644 --- a/arch/x86/kernel/apic/apic_flat_64.c +++ b/arch/x86/kernel/apic/apic_flat_64.c @@ -161,7 +161,7 @@ static int flat_apic_id_registered(void) static int flat_phys_pkg_id(int initial_apic_id, int index_msb) { - return hard_smp_processor_id() >> index_msb; + return initial_apic_id >> index_msb; } struct apic apic_flat = { |