Commit d23c977f authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Dave Hansen
Browse files

x86/apic: Remove pointless x86_bios_cpu_apicid 



It's a useless copy of x86_cpu_to_apicid.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: default avatarMichael Kelley <mikelley@microsoft.com>
Tested-by: default avatarSohil Mehta <sohil.mehta@intel.com>
Tested-by: Juergen Gross <jgross@suse.com> # Xen PV (dom0 and unpriv. guest)
parent ecf600f8

arch/x86/include/asm/apic.h

+0 −2
Original line number Diff line number Diff line
@@ -477,8 +477,6 @@ extern void generic_bigsmp_probe(void); 


#define APIC_DFR_VALUE	(APIC_DFR_FLAT)



DECLARE_EARLY_PER_CPU_READ_MOSTLY(u16, x86_bios_cpu_apicid);



extern struct apic apic_noop;



static inline unsigned int read_apic_id(void)

arch/x86/include/asm/smp.h

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ DECLARE_PER_CPU_READ_MOSTLY(u16, cpu_l2c_id); 


DECLARE_EARLY_PER_CPU_READ_MOSTLY(u16, x86_cpu_to_apicid);

DECLARE_EARLY_PER_CPU_READ_MOSTLY(u32, x86_cpu_to_acpiid);

DECLARE_EARLY_PER_CPU_READ_MOSTLY(u16, x86_bios_cpu_apicid);

#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86_32)

DECLARE_EARLY_PER_CPU_READ_MOSTLY(int, x86_cpu_to_logical_apicid);

#endif

arch/x86/kernel/apic/apic.c

+1 −4
Original line number Diff line number Diff line
@@ -108,10 +108,8 @@ unsigned long apic_mmio_base __ro_after_init; 
 * Map cpu index to physical APIC ID

 */

DEFINE_EARLY_PER_CPU_READ_MOSTLY(u16, x86_cpu_to_apicid, BAD_APICID);

DEFINE_EARLY_PER_CPU_READ_MOSTLY(u16, x86_bios_cpu_apicid, BAD_APICID);

DEFINE_EARLY_PER_CPU_READ_MOSTLY(u32, x86_cpu_to_acpiid, U32_MAX);

EXPORT_EARLY_PER_CPU_SYMBOL(x86_cpu_to_apicid);

EXPORT_EARLY_PER_CPU_SYMBOL(x86_bios_cpu_apicid);

EXPORT_EARLY_PER_CPU_SYMBOL(x86_cpu_to_acpiid);



#ifdef CONFIG_X86_32
@@ -2511,7 +2509,7 @@ int generic_processor_info(int apicid, int version) 


	if (apicid == boot_cpu_physical_apicid) {

		/*

		 * x86_bios_cpu_apicid is required to have processors listed

		 * x86_cpu_to_apicid is required to have processors listed

		 * in same order as logical cpu numbers. Hence the first

		 * entry is BSP, and so on.

		 * boot_cpu_init() already hold bit 0 in cpu_present_mask
@@ -2548,7 +2546,6 @@ int generic_processor_info(int apicid, int version) 


#if defined(CONFIG_SMP) || defined(CONFIG_X86_64)

	early_per_cpu(x86_cpu_to_apicid, cpu) = apicid;

	early_per_cpu(x86_bios_cpu_apicid, cpu) = apicid;

#endif

#ifdef CONFIG_X86_32

	early_per_cpu(x86_cpu_to_logical_apicid, cpu) =

arch/x86/kernel/apic/apic_common.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ void default_ioapic_phys_id_map(physid_mask_t *phys_map, physid_mask_t *retmap) 
int default_cpu_present_to_apicid(int mps_cpu)

{

	if (mps_cpu < nr_cpu_ids && cpu_present(mps_cpu))

		return (int)per_cpu(x86_bios_cpu_apicid, mps_cpu);

		return (int)per_cpu(x86_cpu_to_apicid, mps_cpu);

	else

		return BAD_APICID;

}

arch/x86/kernel/apic/bigsmp_32.c

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static void bigsmp_setup_apic_routing(void) 
static int bigsmp_cpu_present_to_apicid(int mps_cpu)

{

	if (mps_cpu < nr_cpu_ids)

		return (int) per_cpu(x86_bios_cpu_apicid, mps_cpu);

		return (int) per_cpu(x86_cpu_to_apicid, mps_cpu);



	return BAD_APICID;

}