mirror of https://gitee.com/openkylin/linux.git
x86, apic: Remove enable_apic_mode callback
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>
This commit is contained in:
parent
11a8318ef5
commit
2f078b9cb8
|
@ -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);
|
||||
|
|
|
@ -2042,8 +2042,6 @@ void __init connect_bsp_APIC(void)
|
|||
imcr_pic_to_apic();
|
||||
}
|
||||
#endif
|
||||
if (apic->enable_apic_mode)
|
||||
apic->enable_apic_mode();
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -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,
|
||||
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in New Issue