Commit 8f156168 authored by Dou Liyang's avatar Dou Liyang Committed by Thomas Gleixner
Browse files

x86/apic: Drop logical_smp_processor_id() inline 



The logical_smp_processor_id() inline which is only called in
setup_local_APIC() on x86_32 systems has no real value.

Drop it and directly use GET_APIC_LOGICAL_ID() at the call site and use a
more suitable variable name for readability

Signed-off-by: default avatarDou Liyang <douly.fnst@cn.fujitsu.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: andy.shevchenko@gmail.com
Cc: bhe@redhat.com
Cc: ebiederm@xmission.com
Link: https://lkml.kernel.org/r/20180301055930.2396-4-douly.fnst@cn.fujitsu.com
parent 3ea9e7ae

arch/x86/include/asm/smp.h

+0 −10
Original line number Diff line number Diff line
@@ -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 */

arch/x86/kernel/apic/apic.c

+5 −5
Original line number Diff line number Diff line
@@ -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



	/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE