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>

diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index e776ed29b74c02473263b4c8ca0ddf93bf65a4f0..c31fded99cf40f73e6e13ebb15e377fff0a7506c 100644 (file)
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -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);

diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index d705bb7ed91b08d7c3cd4a4fa2528075d9c7aaf1..67760275544b4f548f98c5b18c098d481637995d 100644 (file)
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -2042,8 +2042,6 @@ void __init connect_bsp_APIC(void)
                imcr_pic_to_apic();
        }
 #endif
-       if (apic->enable_apic_mode)
-               apic->enable_apic_mode();
 }
 
 /**

diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
index 67d7a9da342c9faa16689ca5ee9bb4acdd4d603c..de918c410eaed69863e9b95d26566c638d388c45 100644 (file)
--- a/arch/x86/kernel/apic/apic_flat_64.c
+++ b/arch/x86/kernel/apic/apic_flat_64.c
@@ -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,

diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
index fe5d5e6b479e0dc01f792c8c6491c04cf27d0931..b205cdbdbe6a522e51bedc05f2bf86c39c141f66 100644 (file)
--- a/arch/x86/kernel/apic/apic_noop.c
+++ b/arch/x86/kernel/apic/apic_noop.c
@@ -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,
 

diff --git a/arch/x86/kernel/apic/apic_numachip.c b/arch/x86/kernel/apic/apic_numachip.c
index 6b55be3596b5141e3522bdaa4d741b696bf4c9cb..ae915391ebecdbe9d01abb63e5ab787f3c484381 100644 (file)
--- a/arch/x86/kernel/apic/apic_numachip.c
+++ b/arch/x86/kernel/apic/apic_numachip.c
@@ -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,

diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c
index 349465aa2454e68c1110dc8a6595368a4f6fd98a..c4a8d63f8220cf09880d7b3e8a6ad3f42e7a6a25 100644 (file)
--- a/arch/x86/kernel/apic/bigsmp_32.c
+++ b/arch/x86/kernel/apic/bigsmp_32.c
@@ -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,

diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
index 45ad6d894bb38fe4ba2bc1a04487d4885f89ef00..bda488680dbc1a42cdfe4fb175aa6dae73cb612d 100644 (file)
--- a/arch/x86/kernel/apic/probe_32.c
+++ b/arch/x86/kernel/apic/probe_32.c
@@ -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,

diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
index ac70128aa9e90be0fea732495d95e05c6076d23c..6ce600f9bc789e2ccf0fe53bd6cb61091ebd0340 100644 (file)
--- a/arch/x86/kernel/apic/x2apic_cluster.c
+++ b/arch/x86/kernel/apic/x2apic_cluster.c
@@ -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,

diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c
index 90eb77f811472797bd05caec37b5a4881b8a550b..6fae733e9194893dc761ccd06839df81232c7427 100644 (file)
--- a/arch/x86/kernel/apic/x2apic_phys.c
+++ b/arch/x86/kernel/apic/x2apic_phys.c
@@ -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,

diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index 480c05d8df225be20c9fe093f369265c73f1f8f3..004f017aa7b9e633923aa6d861bb964f7abbe658 100644 (file)
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -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,