From e8137a85c12934248e5ed373e6a7c5ce0c391a43 Mon Sep 17 00:00:00 2001 From: Hugh Dickins Date: Wed, 30 Apr 2008 16:17:46 +0100 Subject: [PATCH] --- yaml --- r: 95629 b: refs/heads/master c: 5f464707c8c18fccd3c6278ad46ac94b5cf15a98 h: refs/heads/master i: 95627: 5623d1e3a9a17f4f3e4a82f98c2269878360a807 v: v3 --- [refs] | 2 +- trunk/include/asm-x86/mach-default/mach_apic.h | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 71defabc89f0..a508e54a4589 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5de8f68b43229cce3d457ca9ac6dab8372a35f18 +refs/heads/master: 5f464707c8c18fccd3c6278ad46ac94b5cf15a98 diff --git a/trunk/include/asm-x86/mach-default/mach_apic.h b/trunk/include/asm-x86/mach-default/mach_apic.h index 0a6634f62abe..21003b56ae95 100644 --- a/trunk/include/asm-x86/mach-default/mach_apic.h +++ b/trunk/include/asm-x86/mach-default/mach_apic.h @@ -109,13 +109,8 @@ static inline int cpu_to_logical_apicid(int cpu) static inline int cpu_present_to_apicid(int mps_cpu) { -#ifdef CONFIG_X86_64 - if (cpu_present(mps_cpu)) + if (mps_cpu < NR_CPUS && cpu_present(mps_cpu)) return (int)per_cpu(x86_bios_cpu_apicid, mps_cpu); -#else - if (mps_cpu < get_physical_broadcast()) - return mps_cpu; -#endif else return BAD_APICID; }