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

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

x86, apic: Remove setup_portio_remap callback 



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

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


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

arch/x86/include/asm/apic.h

+0 −1
Original line number Diff line number Diff line
@@ -302,7 +302,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);

	void (*setup_portio_remap)(void);

	int (*check_phys_apicid_present)(int phys_apicid);

	void (*enable_apic_mode)(void);

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

arch/x86/kernel/apic/apic_flat_64.c

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

	.cpu_present_to_apicid		= default_cpu_present_to_apicid,

	.apicid_to_cpu_present		= NULL,

	.setup_portio_remap		= NULL,

	.check_phys_apicid_present	= default_check_phys_apicid_present,

	.enable_apic_mode		= NULL,

	.phys_pkg_id			= flat_phys_pkg_id,
@@ -286,7 +285,6 @@ static struct apic apic_physflat = { 
	.setup_apic_routing		= NULL,

	.cpu_present_to_apicid		= default_cpu_present_to_apicid,

	.apicid_to_cpu_present		= NULL,

	.setup_portio_remap		= NULL,

	.check_phys_apicid_present	= default_check_phys_apicid_present,

	.enable_apic_mode		= NULL,

	.phys_pkg_id			= flat_phys_pkg_id,

arch/x86/kernel/apic/apic_noop.c

+0 −1
Original line number Diff line number Diff line
@@ -134,7 +134,6 @@ struct apic apic_noop = { 
	.cpu_present_to_apicid		= default_cpu_present_to_apicid,

	.apicid_to_cpu_present		= physid_set_mask_of_physid,



	.setup_portio_remap		= NULL,

	.check_phys_apicid_present	= default_check_phys_apicid_present,

	.enable_apic_mode		= NULL,

arch/x86/kernel/apic/apic_numachip.c

+0 −1
Original line number Diff line number Diff line
@@ -225,7 +225,6 @@ static const struct apic apic_numachip __refconst = { 
	.setup_apic_routing		= NULL,

	.cpu_present_to_apicid		= default_cpu_present_to_apicid,

	.apicid_to_cpu_present		= NULL,

	.setup_portio_remap		= NULL,

	.check_phys_apicid_present	= default_check_phys_apicid_present,

	.enable_apic_mode		= NULL,

	.phys_pkg_id			= numachip_phys_pkg_id,

arch/x86/kernel/apic/bigsmp_32.c

+0 −1
Original line number Diff line number Diff line
@@ -171,7 +171,6 @@ static struct apic apic_bigsmp = { 
	.setup_apic_routing		= bigsmp_setup_apic_routing,

	.cpu_present_to_apicid		= bigsmp_cpu_present_to_apicid,

	.apicid_to_cpu_present		= physid_set_mask_of_physid,

	.setup_portio_remap		= NULL,

	.check_phys_apicid_present	= bigsmp_check_phys_apicid_present,

	.enable_apic_mode		= NULL,

	.phys_pkg_id			= bigsmp_phys_pkg_id,