Commit 300eddf9 authored by David Rientjes's avatar David Rientjes Committed by H. Peter Anvin

x86, apic: Remove smp_callin_clear_local_apic callback

Since commit b5660ba7 ("x86, platforms: Remove NUMAQ") removed NUMAQ,
the smp_callin_clear_local_apic() apic callback has been obsolete.
Remove it.
Signed-off-by: default avatarDavid Rientjes <rientjes@google.com>
Link: http://lkml.kernel.org/r/alpine.DEB.2.02.1407302349040.17503@chino.kir.corp.google.comSigned-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 6ab1b27c
...@@ -336,7 +336,6 @@ struct apic { ...@@ -336,7 +336,6 @@ struct apic {
int (*wakeup_secondary_cpu)(int apicid, unsigned long start_eip); int (*wakeup_secondary_cpu)(int apicid, unsigned long start_eip);
bool wait_for_init_deassert; bool wait_for_init_deassert;
void (*smp_callin_clear_local_apic)(void);
void (*inquire_remote_apic)(int apicid); void (*inquire_remote_apic)(int apicid);
/* apic ops */ /* apic ops */
......
...@@ -197,7 +197,6 @@ static struct apic apic_flat = { ...@@ -197,7 +197,6 @@ static struct apic apic_flat = {
.send_IPI_self = apic_send_IPI_self, .send_IPI_self = apic_send_IPI_self,
.wait_for_init_deassert = false, .wait_for_init_deassert = false,
.smp_callin_clear_local_apic = NULL,
.inquire_remote_apic = default_inquire_remote_apic, .inquire_remote_apic = default_inquire_remote_apic,
.read = native_apic_mem_read, .read = native_apic_mem_read,
...@@ -311,7 +310,6 @@ static struct apic apic_physflat = { ...@@ -311,7 +310,6 @@ static struct apic apic_physflat = {
.send_IPI_self = apic_send_IPI_self, .send_IPI_self = apic_send_IPI_self,
.wait_for_init_deassert = false, .wait_for_init_deassert = false,
.smp_callin_clear_local_apic = NULL,
.inquire_remote_apic = default_inquire_remote_apic, .inquire_remote_apic = default_inquire_remote_apic,
.read = native_apic_mem_read, .read = native_apic_mem_read,
......
...@@ -169,7 +169,6 @@ struct apic apic_noop = { ...@@ -169,7 +169,6 @@ struct apic apic_noop = {
.wakeup_secondary_cpu = noop_wakeup_secondary_cpu, .wakeup_secondary_cpu = noop_wakeup_secondary_cpu,
.wait_for_init_deassert = false, .wait_for_init_deassert = false,
.smp_callin_clear_local_apic = NULL,
.inquire_remote_apic = NULL, .inquire_remote_apic = NULL,
.read = noop_apic_read, .read = noop_apic_read,
......
...@@ -247,7 +247,6 @@ static const struct apic apic_numachip __refconst = { ...@@ -247,7 +247,6 @@ static const struct apic apic_numachip __refconst = {
.wakeup_secondary_cpu = numachip_wakeup_secondary, .wakeup_secondary_cpu = numachip_wakeup_secondary,
.wait_for_init_deassert = false, .wait_for_init_deassert = false,
.smp_callin_clear_local_apic = NULL,
.inquire_remote_apic = NULL, /* REMRD not supported */ .inquire_remote_apic = NULL, /* REMRD not supported */
.read = native_apic_mem_read, .read = native_apic_mem_read,
......
...@@ -197,7 +197,6 @@ static struct apic apic_bigsmp = { ...@@ -197,7 +197,6 @@ static struct apic apic_bigsmp = {
.send_IPI_self = default_send_IPI_self, .send_IPI_self = default_send_IPI_self,
.wait_for_init_deassert = true, .wait_for_init_deassert = true,
.smp_callin_clear_local_apic = NULL,
.inquire_remote_apic = default_inquire_remote_apic, .inquire_remote_apic = default_inquire_remote_apic,
.read = native_apic_mem_read, .read = native_apic_mem_read,
......
...@@ -117,7 +117,6 @@ static struct apic apic_default = { ...@@ -117,7 +117,6 @@ static struct apic apic_default = {
.send_IPI_self = default_send_IPI_self, .send_IPI_self = default_send_IPI_self,
.wait_for_init_deassert = true, .wait_for_init_deassert = true,
.smp_callin_clear_local_apic = NULL,
.inquire_remote_apic = default_inquire_remote_apic, .inquire_remote_apic = default_inquire_remote_apic,
.read = native_apic_mem_read, .read = native_apic_mem_read,
......
...@@ -278,7 +278,6 @@ static struct apic apic_x2apic_cluster = { ...@@ -278,7 +278,6 @@ static struct apic apic_x2apic_cluster = {
.send_IPI_self = x2apic_send_IPI_self, .send_IPI_self = x2apic_send_IPI_self,
.wait_for_init_deassert = false, .wait_for_init_deassert = false,
.smp_callin_clear_local_apic = NULL,
.inquire_remote_apic = NULL, .inquire_remote_apic = NULL,
.read = native_apic_msr_read, .read = native_apic_msr_read,
......
...@@ -132,7 +132,6 @@ static struct apic apic_x2apic_phys = { ...@@ -132,7 +132,6 @@ static struct apic apic_x2apic_phys = {
.send_IPI_self = x2apic_send_IPI_self, .send_IPI_self = x2apic_send_IPI_self,
.wait_for_init_deassert = false, .wait_for_init_deassert = false,
.smp_callin_clear_local_apic = NULL,
.inquire_remote_apic = NULL, .inquire_remote_apic = NULL,
.read = native_apic_msr_read, .read = native_apic_msr_read,
......
...@@ -395,7 +395,6 @@ static struct apic __refdata apic_x2apic_uv_x = { ...@@ -395,7 +395,6 @@ static struct apic __refdata apic_x2apic_uv_x = {
.wakeup_secondary_cpu = uv_wakeup_secondary, .wakeup_secondary_cpu = uv_wakeup_secondary,
.wait_for_init_deassert = false, .wait_for_init_deassert = false,
.smp_callin_clear_local_apic = NULL,
.inquire_remote_apic = NULL, .inquire_remote_apic = NULL,
.read = native_apic_msr_read, .read = native_apic_msr_read,
......
...@@ -168,10 +168,6 @@ static void smp_callin(void) ...@@ -168,10 +168,6 @@ static void smp_callin(void)
* CPU, first the APIC. (this is probably redundant on most * CPU, first the APIC. (this is probably redundant on most
* boards) * 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(); setup_local_APIC();
end_local_APIC_setup(); end_local_APIC_setup();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment