Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c460b5d3 authored by David Rientjes's avatar David Rientjes Committed by H. Peter Anvin
Browse files

x86, apic: Remove mps_oem_check callback 



Since commit b5660ba7 ("x86, platforms: Remove NUMAQ") removed NUMAQ,
the mps_oem_check() apic callback has been obsolete.  Remove it.

This allows generic_mps_oem_check() to be removed as well.

Signed-off-by: default avatarDavid Rientjes <rientjes@google.com>
Link: http://lkml.kernel.org/r/alpine.DEB.2.02.1407302349390.17503@chino.kir.corp.google.com


Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 300eddf9

arch/x86/include/asm/apic.h

+0 −7
Original line number Diff line number Diff line
@@ -309,13 +309,6 @@ struct apic { 
	void (*enable_apic_mode)(void);

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



	/*

	 * When one of the next two hooks returns 1 the apic

	 * is switched to this. Essentially they are additional

	 * probe functions:

	 */

	int (*mps_oem_check)(struct mpc_table *mpc, char *oem, char *productid);



	unsigned int (*get_apic_id)(unsigned long x);

	unsigned long (*set_apic_id)(unsigned int id);

	unsigned long apic_id_mask;

arch/x86/include/asm/mpspec.h

+0 −2
Original line number Diff line number Diff line
@@ -150,6 +150,4 @@ static inline void physid_set_mask_of_physid(int physid, physid_mask_t *map) 


extern physid_mask_t phys_cpu_present_map;



extern int generic_mps_oem_check(struct mpc_table *, char *, char *);



#endif /* _ASM_X86_MPSPEC_H */

arch/x86/kernel/apic/apic_flat_64.c

+0 −2
Original line number Diff line number Diff line
@@ -182,7 +182,6 @@ static struct apic apic_flat = { 
	.check_phys_apicid_present	= default_check_phys_apicid_present,

	.enable_apic_mode		= NULL,

	.phys_pkg_id			= flat_phys_pkg_id,

	.mps_oem_check			= NULL,



	.get_apic_id			= flat_get_apic_id,

	.set_apic_id			= set_apic_id,
@@ -295,7 +294,6 @@ static struct apic apic_physflat = { 
	.check_phys_apicid_present	= default_check_phys_apicid_present,

	.enable_apic_mode		= NULL,

	.phys_pkg_id			= flat_phys_pkg_id,

	.mps_oem_check			= NULL,



	.get_apic_id			= flat_get_apic_id,

	.set_apic_id			= set_apic_id,

arch/x86/kernel/apic/apic_noop.c

+0 −2
Original line number Diff line number Diff line
@@ -152,8 +152,6 @@ struct apic apic_noop = { 


	.phys_pkg_id			= noop_phys_pkg_id,



	.mps_oem_check			= NULL,



	.get_apic_id			= noop_get_apic_id,

	.set_apic_id			= NULL,

	.apic_id_mask			= 0x0F << 24,

arch/x86/kernel/apic/apic_numachip.c

+0 −1
Original line number Diff line number Diff line
@@ -231,7 +231,6 @@ static const struct apic apic_numachip __refconst = { 
	.check_phys_apicid_present	= default_check_phys_apicid_present,

	.enable_apic_mode		= NULL,

	.phys_pkg_id			= numachip_phys_pkg_id,

	.mps_oem_check			= NULL,



	.get_apic_id			= get_apic_id,

	.set_apic_id			= set_apic_id,