iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86, apic: Remove setup_portio_remap callback

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

Signed-off-by: David Rientjes <rientjes@google.com>
Link: http://lkml.kernel.org/r/alpine.DEB.2.02.1407302351480.17503@chino.kir.corp.google.com
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
David Rientjes 2014-07-30 23:53:47 -07:00 committed by H. Peter Anvin
parent e76661ba09
commit 11a8318ef5
10 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/include/asm/apic.h
View File

@ -302,7 +302,6 @@ struct apic {
void (*setup_apic_routing)(void); void (*setup_apic_routing)(void);
int (*cpu_present_to_apicid)(int mps_cpu); int (*cpu_present_to_apicid)(int mps_cpu);
void (*apicid_to_cpu_present)(int phys_apicid, physid_mask_t *retmap); 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); int (*check_phys_apicid_present)(int phys_apicid);
void (*enable_apic_mode)(void); void (*enable_apic_mode)(void);
int (*phys_pkg_id)(int cpuid_apic, int index_msb); int (*phys_pkg_id)(int cpuid_apic, int index_msb);

2
arch/x86/kernel/apic/apic_flat_64.c
View File

@ -176,7 +176,6 @@ static struct apic apic_flat = {
.setup_apic_routing = NULL, .setup_apic_routing = NULL,
.cpu_present_to_apicid = default_cpu_present_to_apicid, .cpu_present_to_apicid = default_cpu_present_to_apicid,
.apicid_to_cpu_present = NULL, .apicid_to_cpu_present = NULL,
.setup_portio_remap = NULL,
.check_phys_apicid_present = default_check_phys_apicid_present, .check_phys_apicid_present = default_check_phys_apicid_present,
.enable_apic_mode = NULL, .enable_apic_mode = NULL,
.phys_pkg_id = flat_phys_pkg_id, .phys_pkg_id = flat_phys_pkg_id,
@ -286,7 +285,6 @@ static struct apic apic_physflat = {
.setup_apic_routing = NULL, .setup_apic_routing = NULL,
.cpu_present_to_apicid = default_cpu_present_to_apicid, .cpu_present_to_apicid = default_cpu_present_to_apicid,
.apicid_to_cpu_present = NULL, .apicid_to_cpu_present = NULL,
.setup_portio_remap = NULL,
.check_phys_apicid_present = default_check_phys_apicid_present, .check_phys_apicid_present = default_check_phys_apicid_present,
.enable_apic_mode = NULL, .enable_apic_mode = NULL,
.phys_pkg_id = flat_phys_pkg_id, .phys_pkg_id = flat_phys_pkg_id,

1
arch/x86/kernel/apic/apic_noop.c
View File

@ -134,7 +134,6 @@ struct apic apic_noop = {
.cpu_present_to_apicid = default_cpu_present_to_apicid, .cpu_present_to_apicid = default_cpu_present_to_apicid,
.apicid_to_cpu_present = physid_set_mask_of_physid, .apicid_to_cpu_present = physid_set_mask_of_physid,
.setup_portio_remap = NULL,
.check_phys_apicid_present = default_check_phys_apicid_present, .check_phys_apicid_present = default_check_phys_apicid_present,
.enable_apic_mode = NULL, .enable_apic_mode = NULL,

1
arch/x86/kernel/apic/apic_numachip.c
View File

@ -225,7 +225,6 @@ static const struct apic apic_numachip __refconst = {
.setup_apic_routing = NULL, .setup_apic_routing = NULL,
.cpu_present_to_apicid = default_cpu_present_to_apicid, .cpu_present_to_apicid = default_cpu_present_to_apicid,
.apicid_to_cpu_present = NULL, .apicid_to_cpu_present = NULL,
.setup_portio_remap = NULL,
.check_phys_apicid_present = default_check_phys_apicid_present, .check_phys_apicid_present = default_check_phys_apicid_present,
.enable_apic_mode = NULL, .enable_apic_mode = NULL,
.phys_pkg_id = numachip_phys_pkg_id, .phys_pkg_id = numachip_phys_pkg_id,

1
arch/x86/kernel/apic/bigsmp_32.c
View File

@ -171,7 +171,6 @@ static struct apic apic_bigsmp = {
.setup_apic_routing = bigsmp_setup_apic_routing, .setup_apic_routing = bigsmp_setup_apic_routing,
.cpu_present_to_apicid = bigsmp_cpu_present_to_apicid, .cpu_present_to_apicid = bigsmp_cpu_present_to_apicid,
.apicid_to_cpu_present = physid_set_mask_of_physid, .apicid_to_cpu_present = physid_set_mask_of_physid,
.setup_portio_remap = NULL,
.check_phys_apicid_present = bigsmp_check_phys_apicid_present, .check_phys_apicid_present = bigsmp_check_phys_apicid_present,
.enable_apic_mode = NULL, .enable_apic_mode = NULL,
.phys_pkg_id = bigsmp_phys_pkg_id, .phys_pkg_id = bigsmp_phys_pkg_id,

1
arch/x86/kernel/apic/probe_32.c
View File

@ -96,7 +96,6 @@ static struct apic apic_default = {
.setup_apic_routing = setup_apic_flat_routing, .setup_apic_routing = setup_apic_flat_routing,
.cpu_present_to_apicid = default_cpu_present_to_apicid, .cpu_present_to_apicid = default_cpu_present_to_apicid,
.apicid_to_cpu_present = physid_set_mask_of_physid, .apicid_to_cpu_present = physid_set_mask_of_physid,
.setup_portio_remap = NULL,
.check_phys_apicid_present = default_check_phys_apicid_present, .check_phys_apicid_present = default_check_phys_apicid_present,
.enable_apic_mode = NULL, .enable_apic_mode = NULL,
.phys_pkg_id = default_phys_pkg_id, .phys_pkg_id = default_phys_pkg_id,

1
arch/x86/kernel/apic/x2apic_cluster.c
View File

@ -257,7 +257,6 @@ static struct apic apic_x2apic_cluster = {
.setup_apic_routing = NULL, .setup_apic_routing = NULL,
.cpu_present_to_apicid = default_cpu_present_to_apicid, .cpu_present_to_apicid = default_cpu_present_to_apicid,
.apicid_to_cpu_present = NULL, .apicid_to_cpu_present = NULL,
.setup_portio_remap = NULL,
.check_phys_apicid_present = default_check_phys_apicid_present, .check_phys_apicid_present = default_check_phys_apicid_present,
.enable_apic_mode = NULL, .enable_apic_mode = NULL,
.phys_pkg_id = x2apic_phys_pkg_id, .phys_pkg_id = x2apic_phys_pkg_id,

1
arch/x86/kernel/apic/x2apic_phys.c
View File

@ -111,7 +111,6 @@ static struct apic apic_x2apic_phys = {
.setup_apic_routing = NULL, .setup_apic_routing = NULL,
.cpu_present_to_apicid = default_cpu_present_to_apicid, .cpu_present_to_apicid = default_cpu_present_to_apicid,
.apicid_to_cpu_present = NULL, .apicid_to_cpu_present = NULL,
.setup_portio_remap = NULL,
.check_phys_apicid_present = default_check_phys_apicid_present, .check_phys_apicid_present = default_check_phys_apicid_present,
.enable_apic_mode = NULL, .enable_apic_mode = NULL,
.phys_pkg_id = x2apic_phys_pkg_id, .phys_pkg_id = x2apic_phys_pkg_id,

1
arch/x86/kernel/apic/x2apic_uv_x.c
View File

@ -373,7 +373,6 @@ static struct apic __refdata apic_x2apic_uv_x = {
.setup_apic_routing = NULL, .setup_apic_routing = NULL,
.cpu_present_to_apicid = default_cpu_present_to_apicid, .cpu_present_to_apicid = default_cpu_present_to_apicid,
.apicid_to_cpu_present = NULL, .apicid_to_cpu_present = NULL,
.setup_portio_remap = NULL,
.check_phys_apicid_present = default_check_phys_apicid_present, .check_phys_apicid_present = default_check_phys_apicid_present,
.enable_apic_mode = NULL, .enable_apic_mode = NULL,
.phys_pkg_id = uv_phys_pkg_id, .phys_pkg_id = uv_phys_pkg_id,

4
arch/x86/kernel/smpboot.c
View File

@ -1139,10 +1139,6 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus)
enable_IO_APIC(); enable_IO_APIC();
bsp_end_local_APIC_setup(); bsp_end_local_APIC_setup();
if (apic->setup_portio_remap)
apic->setup_portio_remap();
smpboot_setup_io_apic(); smpboot_setup_io_apic();
/* /*
* Set up local APIC timer on boot CPU. * Set up local APIC timer on boot CPU.