x86, apic: Remove smp_callin_clear_local_apic callback

Since commit b5660ba76b41 ("x86, platforms: Remove NUMAQ") removed NUMAQ,
the smp_callin_clear_local_apic() 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.1407302349040.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 2201c262b00ce9fa4f96ed5ad2a98f2cfa814c99..b8c1380690e7a58e43c4866d318e6d04936c4448 100644 (file)
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -336,7 +336,6 @@ struct apic {
        int (*wakeup_secondary_cpu)(int apicid, unsigned long start_eip);
 
        bool wait_for_init_deassert;
-       void (*smp_callin_clear_local_apic)(void);
        void (*inquire_remote_apic)(int apicid);
 
        /* apic ops */

diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
index 7d56b65f3ddf232fb1e0e9e661ca4f1e39b3b356..a790497902e4d334b1e9deded9bb2c4c477fadb0 100644 (file)
--- a/arch/x86/kernel/apic/apic_flat_64.c
+++ b/arch/x86/kernel/apic/apic_flat_64.c
@@ -197,7 +197,6 @@ static struct apic apic_flat =  {
        .send_IPI_self                  = apic_send_IPI_self,
 
        .wait_for_init_deassert         = false,
-       .smp_callin_clear_local_apic    = NULL,
        .inquire_remote_apic            = default_inquire_remote_apic,
 
        .read                           = native_apic_mem_read,
@@ -311,7 +310,6 @@ static struct apic apic_physflat =  {
        .send_IPI_self                  = apic_send_IPI_self,
 
        .wait_for_init_deassert         = false,
-       .smp_callin_clear_local_apic    = NULL,
        .inquire_remote_apic            = default_inquire_remote_apic,
 
        .read                           = native_apic_mem_read,

diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
index c638efa6ad67947ee40664608b9a24a1d928f877..f05b4f0902146c06f531933ec364d4fc86a7d87e 100644 (file)
--- a/arch/x86/kernel/apic/apic_noop.c
+++ b/arch/x86/kernel/apic/apic_noop.c
@@ -169,7 +169,6 @@ struct apic apic_noop = {
        .wakeup_secondary_cpu           = noop_wakeup_secondary_cpu,
 
        .wait_for_init_deassert         = false,
-       .smp_callin_clear_local_apic    = NULL,
        .inquire_remote_apic            = NULL,
 
        .read                           = noop_apic_read,

diff --git a/arch/x86/kernel/apic/apic_numachip.c b/arch/x86/kernel/apic/apic_numachip.c
index c32f8827e3a4825120f4b09121bd0b91182f3b6e..c0d9165be0d71c6bc34fca213d9f576273bee961 100644 (file)
--- a/arch/x86/kernel/apic/apic_numachip.c
+++ b/arch/x86/kernel/apic/apic_numachip.c
@@ -247,7 +247,6 @@ static const struct apic apic_numachip __refconst = {
 
        .wakeup_secondary_cpu           = numachip_wakeup_secondary,
        .wait_for_init_deassert         = false,
-       .smp_callin_clear_local_apic    = NULL,
        .inquire_remote_apic            = NULL, /* REMRD not supported */
 
        .read                           = native_apic_mem_read,

diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c
index 74ffd3eb681e3962cbf1cd690dbc95b24e4adaf1..eb159163064c7ebd3b23983444faebe6da9c2212 100644 (file)
--- a/arch/x86/kernel/apic/bigsmp_32.c
+++ b/arch/x86/kernel/apic/bigsmp_32.c
@@ -197,7 +197,6 @@ static struct apic apic_bigsmp = {
        .send_IPI_self                  = default_send_IPI_self,
 
        .wait_for_init_deassert         = true,
-       .smp_callin_clear_local_apic    = NULL,
        .inquire_remote_apic            = default_inquire_remote_apic,
 
        .read                           = native_apic_mem_read,

diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
index 64248c7149e3fed60c96c72c7f0f536f45dc6e93..5b617a92af0e5b429b47cb5d98e912bbe3911113 100644 (file)
--- a/arch/x86/kernel/apic/probe_32.c
+++ b/arch/x86/kernel/apic/probe_32.c
@@ -117,7 +117,6 @@ static struct apic apic_default = {
        .send_IPI_self                  = default_send_IPI_self,
 
        .wait_for_init_deassert         = true,
-       .smp_callin_clear_local_apic    = NULL,
        .inquire_remote_apic            = default_inquire_remote_apic,
 
        .read                           = native_apic_mem_read,

diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
index 8b3200cc57e31237003328e7121dde9b1f7a806f..d96cab15f6f489a26d0f5c4afcf59a9300d5f4ff 100644 (file)
--- a/arch/x86/kernel/apic/x2apic_cluster.c
+++ b/arch/x86/kernel/apic/x2apic_cluster.c
@@ -278,7 +278,6 @@ static struct apic apic_x2apic_cluster = {
        .send_IPI_self                  = x2apic_send_IPI_self,
 
        .wait_for_init_deassert         = false,
-       .smp_callin_clear_local_apic    = NULL,
        .inquire_remote_apic            = NULL,
 
        .read                           = native_apic_msr_read,

diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c
index 14c189151910817d6dc31cba6ea721431a85d6c9..73d0fee6d0cd6e9f1eb90fae5a5c73e99bdb69d2 100644 (file)
--- a/arch/x86/kernel/apic/x2apic_phys.c
+++ b/arch/x86/kernel/apic/x2apic_phys.c
@@ -132,7 +132,6 @@ static struct apic apic_x2apic_phys = {
        .send_IPI_self                  = x2apic_send_IPI_self,
 
        .wait_for_init_deassert         = false,
-       .smp_callin_clear_local_apic    = NULL,
        .inquire_remote_apic            = NULL,
 
        .read                           = native_apic_msr_read,

diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index 58f0988800588dd31fa82209795763ec009c9620..cc5d40e6c85d4d8c23b80ec6b27e5da40ddf53bd 100644 (file)
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -395,7 +395,6 @@ static struct apic __refdata apic_x2apic_uv_x = {
 
        .wakeup_secondary_cpu           = uv_wakeup_secondary,
        .wait_for_init_deassert         = false,
-       .smp_callin_clear_local_apic    = NULL,
        .inquire_remote_apic            = NULL,
 
        .read                           = native_apic_msr_read,

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 5492798930ef4224675bae7704f6da8e6f94731e..f0f3b194e9f93995180a531eb70c67c0d2f39941 100644 (file)
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -168,10 +168,6 @@ static void smp_callin(void)
         * CPU, first the APIC. (this is probably redundant on most
         * boards)
         */
-
-       pr_debug("CALLIN, before setup_local_APIC()\n");
-       if (apic->smp_callin_clear_local_apic)
-               apic->smp_callin_clear_local_apic();
        setup_local_APIC();
        end_local_APIC_setup();