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

x86/apic: Get rid of hard_smp_processor_id() 



No point in having a wrapper around read_apic_id().

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 d23c977f

arch/x86/include/asm/apic.h

+5 −1
Original line number Diff line number Diff line
@@ -503,7 +503,11 @@ extern void default_ioapic_phys_id_map(physid_mask_t *phys_map, physid_mask_t *r 
extern int default_cpu_present_to_apicid(int mps_cpu);

extern int default_check_phys_apicid_present(int phys_apicid);



#endif /* CONFIG_X86_LOCAL_APIC */

#else /* CONFIG_X86_LOCAL_APIC */



static inline unsigned int read_apic_id(void) { return 0; }



#endif /* !CONFIG_X86_LOCAL_APIC */



#ifdef CONFIG_SMP

void apic_smt_update(void);

arch/x86/include/asm/smp.h

+0 −7
Original line number Diff line number Diff line
@@ -185,13 +185,6 @@ static inline struct cpumask *cpu_llc_shared_mask(int cpu) 


extern unsigned disabled_cpus;



#ifdef CONFIG_X86_LOCAL_APIC

extern int hard_smp_processor_id(void);



#else /* CONFIG_X86_LOCAL_APIC */

#define hard_smp_processor_id()	0

#endif /* CONFIG_X86_LOCAL_APIC */



#ifdef CONFIG_DEBUG_NMI_SELFTEST

extern void nmi_selftest(void);

#else

arch/x86/kernel/apic/apic.c

+0 −5
Original line number Diff line number Diff line
@@ -2562,11 +2562,6 @@ int generic_processor_info(int apicid, int version) 
	return cpu;

}



int hard_smp_processor_id(void)

{

	return read_apic_id();

}



void __irq_msi_compose_msg(struct irq_cfg *cfg, struct msi_msg *msg,

			   bool dmar)

{

arch/x86/kernel/apic/io_apic.c

+1 −1
Original line number Diff line number Diff line
@@ -2095,7 +2095,7 @@ static inline void __init unlock_ExtINT_logic(void) 
	entry0 = ioapic_read_entry(apic, pin);

	clear_IO_APIC_pin(apic, pin);



	apic_id = hard_smp_processor_id();

	apic_id = read_apic_id();

	memset(&entry1, 0, sizeof(entry1));



	entry1.dest_mode_logical	= true;

arch/x86/kernel/apic/ipi.c

+1 −1
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ int safe_smp_processor_id(void) 
	if (!boot_cpu_has(X86_FEATURE_APIC))

		return 0;



	apicid = hard_smp_processor_id();

	apicid = read_apic_id();

	if (apicid == BAD_APICID)

		return 0;