Skip to content

Commit

Permalink
x86, apic: Remove enable_apic_mode callback
Browse files Browse the repository at this point in the history 
The enable_apic_mode() apic callback is never called, so remove it.

Signed-off-by: David Rientjes <rientjes@google.com>
Link: http://lkml.kernel.org/r/alpine.DEB.2.02.1407302352320.17503@chino.kir.corp.google.com
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
  • Loading branch information
David Rientjes authored and H. Peter Anvin committed Jul 31, 2014
1 parent 11a8318 commit 2f078b9
Show file tree
Hide file tree
Showing 10 changed files with 0 additions and 12 deletions.
1 change: 0 additions & 1 deletion arch/x86/include/asm/apic.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,6 @@ struct apic {
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);
void (*enable_apic_mode)(void);
int (*phys_pkg_id)(int cpuid_apic, int index_msb);

unsigned int (*get_apic_id)(unsigned long x);
Expand Down
2 changes: 0 additions & 2 deletions arch/x86/kernel/apic/apic.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2042,8 +2042,6 @@ void __init connect_bsp_APIC(void)
imcr_pic_to_apic();
}
#endif
if (apic->enable_apic_mode)
apic->enable_apic_mode();
}

/**
Expand Down
2 changes: 0 additions & 2 deletions arch/x86/kernel/apic/apic_flat_64.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,6 @@ static struct apic apic_flat = {
.cpu_present_to_apicid = default_cpu_present_to_apicid,
.apicid_to_cpu_present = NULL,
.check_phys_apicid_present = default_check_phys_apicid_present,
.enable_apic_mode = NULL,
.phys_pkg_id = flat_phys_pkg_id,

.get_apic_id = flat_get_apic_id,
Expand Down Expand Up @@ -286,7 +285,6 @@ static struct apic apic_physflat = {
.cpu_present_to_apicid = default_cpu_present_to_apicid,
.apicid_to_cpu_present = NULL,
.check_phys_apicid_present = default_check_phys_apicid_present,
.enable_apic_mode = NULL,
.phys_pkg_id = flat_phys_pkg_id,

.get_apic_id = flat_get_apic_id,
Expand Down
1 change: 0 additions & 1 deletion arch/x86/kernel/apic/apic_noop.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,6 @@ struct apic apic_noop = {
.apicid_to_cpu_present = physid_set_mask_of_physid,

.check_phys_apicid_present = default_check_phys_apicid_present,
.enable_apic_mode = NULL,

.phys_pkg_id = noop_phys_pkg_id,

Expand Down
1 change: 0 additions & 1 deletion arch/x86/kernel/apic/apic_numachip.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,6 @@ static const struct apic apic_numachip __refconst = {
.cpu_present_to_apicid = default_cpu_present_to_apicid,
.apicid_to_cpu_present = NULL,
.check_phys_apicid_present = default_check_phys_apicid_present,
.enable_apic_mode = NULL,
.phys_pkg_id = numachip_phys_pkg_id,

.get_apic_id = get_apic_id,
Expand Down
1 change: 0 additions & 1 deletion arch/x86/kernel/apic/bigsmp_32.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,6 @@ static struct apic apic_bigsmp = {
.cpu_present_to_apicid = bigsmp_cpu_present_to_apicid,
.apicid_to_cpu_present = physid_set_mask_of_physid,
.check_phys_apicid_present = bigsmp_check_phys_apicid_present,
.enable_apic_mode = NULL,
.phys_pkg_id = bigsmp_phys_pkg_id,

.get_apic_id = bigsmp_get_apic_id,
Expand Down
1 change: 0 additions & 1 deletion arch/x86/kernel/apic/probe_32.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ static struct apic apic_default = {
.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,
.enable_apic_mode = NULL,
.phys_pkg_id = default_phys_pkg_id,

.get_apic_id = default_get_apic_id,
Expand Down
1 change: 0 additions & 1 deletion arch/x86/kernel/apic/x2apic_cluster.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,6 @@ static struct apic apic_x2apic_cluster = {
.cpu_present_to_apicid = default_cpu_present_to_apicid,
.apicid_to_cpu_present = NULL,
.check_phys_apicid_present = default_check_phys_apicid_present,
.enable_apic_mode = NULL,
.phys_pkg_id = x2apic_phys_pkg_id,

.get_apic_id = x2apic_get_apic_id,
Expand Down
1 change: 0 additions & 1 deletion arch/x86/kernel/apic/x2apic_phys.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ static struct apic apic_x2apic_phys = {
.cpu_present_to_apicid = default_cpu_present_to_apicid,
.apicid_to_cpu_present = NULL,
.check_phys_apicid_present = default_check_phys_apicid_present,
.enable_apic_mode = NULL,
.phys_pkg_id = x2apic_phys_pkg_id,

.get_apic_id = x2apic_get_apic_id,
Expand Down
1 change: 0 additions & 1 deletion arch/x86/kernel/apic/x2apic_uv_x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,6 @@ static struct apic __refdata apic_x2apic_uv_x = {
.cpu_present_to_apicid = default_cpu_present_to_apicid,
.apicid_to_cpu_present = NULL,
.check_phys_apicid_present = default_check_phys_apicid_present,
.enable_apic_mode = NULL,
.phys_pkg_id = uv_phys_pkg_id,

.get_apic_id = x2apic_get_apic_id,
Expand Down

0 comments on commit 2f078b9

Please sign in to comment.