[PATCH v5 3/3] x86/apic: Drop the logical_smp_processor_id()

[Dou Liyang]

The logical_smp_processor_id() which is only called in setup_local_APIC()
on x86_32 system looks redundant.

Drop it, then directly use GET_APIC_LOGICAL_ID() marco and more suitable
variable name for readability

Signed-off-by: Dou Liyang <douly.f...@cn.fujitsu.com>
---
 arch/x86/include/asm/smp.h  | 10 ----------
 arch/x86/kernel/apic/apic.c | 10 +++++-----
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
index 461f53d27708..e2057780d67f 100644
--- a/arch/x86/include/asm/smp.h
+++ b/arch/x86/include/asm/smp.h
@@ -176,16 +176,6 @@ static inline int wbinvd_on_all_cpus(void)
 extern unsigned disabled_cpus;
 
 #ifdef CONFIG_X86_LOCAL_APIC
-
-#ifndef CONFIG_X86_64
-static inline int logical_smp_processor_id(void)
-{
-       /* we don't want to mark this access volatile - bad code generation */
-       return GET_APIC_LOGICAL_ID(apic_read(APIC_LDR));
-}
-
-#endif
-
 extern int hard_smp_processor_id(void);
 
 #else /* CONFIG_X86_LOCAL_APIC */
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 7a347d7450b6..ce2066373922 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -1468,7 +1468,7 @@ static void setup_local_APIC(void)
        int cpu = smp_processor_id();
        unsigned int value;
 #ifdef CONFIG_X86_32
-       int i;
+       int logical_apicid, ldr_apicid;
 #endif
 
 
@@ -1507,11 +1507,11 @@ static void setup_local_APIC(void)
         * initialized during get_smp_config(), make sure it matches the
         * actual value.
         */
-       i = early_per_cpu(x86_cpu_to_logical_apicid, cpu);
-       WARN_ON(i != BAD_APICID && i != logical_smp_processor_id());
+       logical_apicid = early_per_cpu(x86_cpu_to_logical_apicid, cpu);
+       ldr_apicid = GET_APIC_LOGICAL_ID(apic_read(APIC_LDR));
+       WARN_ON(logical_apicid != BAD_APICID && logical_apicid != ldr_apicid);
        /* always use the value from LDR */
-       early_per_cpu(x86_cpu_to_logical_apicid, cpu) =
-               logical_smp_processor_id();
+       early_per_cpu(x86_cpu_to_logical_apicid, cpu) = ldr_apicid;
 #endif
 
        /*
-- 
2.14.3