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

x86/apic: Remove check_phys_apicid_present() 



The only silly usage site is gone. Remove the gunk which was even outright
wrong in the bigsmp_32 case which returned true unconditionally.

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 55cc40d3

arch/x86/include/asm/apic.h

+0 −2
Original line number Diff line number Diff line
@@ -305,7 +305,6 @@ struct apic { 
	void	(*setup_apic_routing)(void);

	int	(*cpu_present_to_apicid)(int mps_cpu);

	void	(*apicid_to_cpu_present)(int phys_apicid, physid_mask_t *retmap);

	int	(*check_phys_apicid_present)(int phys_apicid);

	int	(*phys_pkg_id)(int cpuid_apic, int index_msb);



	u32	(*get_apic_id)(unsigned long x);
@@ -485,7 +484,6 @@ extern u32 apic_flat_calc_apicid(unsigned int cpu); 
extern bool default_check_apicid_used(physid_mask_t *map, int apicid);

extern void default_ioapic_phys_id_map(physid_mask_t *phys_map, physid_mask_t *retmap);

extern int default_cpu_present_to_apicid(int mps_cpu);

extern int default_check_phys_apicid_present(int phys_apicid);



#else /* CONFIG_X86_LOCAL_APIC */

arch/x86/kernel/apic/apic_common.c

+0 −5
Original line number Diff line number Diff line
@@ -35,11 +35,6 @@ int default_cpu_present_to_apicid(int mps_cpu) 
}

EXPORT_SYMBOL_GPL(default_cpu_present_to_apicid);



int default_check_phys_apicid_present(int phys_apicid)

{

	return physid_isset(phys_apicid, phys_cpu_present_map);

}



int default_apic_id_valid(u32 apicid)

{

	return (apicid < 255);

arch/x86/kernel/apic/apic_flat_64.c

+0 −2
Original line number Diff line number Diff line
@@ -124,7 +124,6 @@ static struct apic apic_flat __ro_after_init = { 
	.setup_apic_routing		= NULL,

	.cpu_present_to_apicid		= default_cpu_present_to_apicid,

	.apicid_to_cpu_present		= NULL,

	.check_phys_apicid_present	= default_check_phys_apicid_present,

	.phys_pkg_id			= flat_phys_pkg_id,



	.get_apic_id			= flat_get_apic_id,
@@ -213,7 +212,6 @@ static struct apic apic_physflat __ro_after_init = { 
	.setup_apic_routing		= NULL,

	.cpu_present_to_apicid		= default_cpu_present_to_apicid,

	.apicid_to_cpu_present		= NULL,

	.check_phys_apicid_present	= default_check_phys_apicid_present,

	.phys_pkg_id			= flat_phys_pkg_id,



	.get_apic_id			= flat_get_apic_id,

arch/x86/kernel/apic/apic_noop.c

+0 −2
Original line number Diff line number Diff line
@@ -107,8 +107,6 @@ struct apic apic_noop __ro_after_init = { 
	.cpu_present_to_apicid		= default_cpu_present_to_apicid,

	.apicid_to_cpu_present		= physid_set_mask_of_physid,



	.check_phys_apicid_present	= default_check_phys_apicid_present,



	.phys_pkg_id			= noop_phys_pkg_id,



	.get_apic_id			= noop_get_apic_id,

arch/x86/kernel/apic/apic_numachip.c

+0 −2
Original line number Diff line number Diff line
@@ -257,7 +257,6 @@ static const struct apic apic_numachip1 __refconst = { 
	.setup_apic_routing		= NULL,

	.cpu_present_to_apicid		= default_cpu_present_to_apicid,

	.apicid_to_cpu_present		= NULL,

	.check_phys_apicid_present	= default_check_phys_apicid_present,

	.phys_pkg_id			= numachip_phys_pkg_id,



	.get_apic_id			= numachip1_get_apic_id,
@@ -303,7 +302,6 @@ static const struct apic apic_numachip2 __refconst = { 
	.setup_apic_routing		= NULL,

	.cpu_present_to_apicid		= default_cpu_present_to_apicid,

	.apicid_to_cpu_present		= NULL,

	.check_phys_apicid_present	= default_check_phys_apicid_present,

	.phys_pkg_id			= numachip_phys_pkg_id,



	.get_apic_id			= numachip2_get_apic_id,