From: Andi Kleen <andi@firstfloor.org>
To: mingo@elte.hu
Cc: linux-kernel@vger.kernel.org, lnxninja@linux.vnet.ibm.com,
Andi Kleen <ak@linux.intel.com>
Subject: [PATCH] Remove smp_callin_clear_local_apic hook
Date: Fri, 30 Jan 2009 11:17:12 +0100 [thread overview]
Message-ID: <1233310639-27916-7-git-send-email-andi@firstfloor.org> (raw)
In-Reply-To: <1233310639-27916-6-git-send-email-andi@firstfloor.org>
From: Andi Kleen <ak@linux.intel.com>
Only used by NUMAQ
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
arch/x86/include/asm/genapic.h | 1 -
arch/x86/kernel/bigsmp_32.c | 1 -
arch/x86/kernel/es7000_32.c | 1 -
arch/x86/kernel/genapic_flat_64.c | 2 --
arch/x86/kernel/genx2apic_cluster.c | 1 -
arch/x86/kernel/genx2apic_phys.c | 1 -
arch/x86/kernel/genx2apic_uv_x.c | 1 -
arch/x86/kernel/numaq_32.c | 10 ----------
arch/x86/kernel/probe_32.c | 1 -
arch/x86/kernel/smpboot.c | 2 --
arch/x86/kernel/summit_32.c | 1 -
11 files changed, 0 insertions(+), 22 deletions(-)
diff --git a/arch/x86/include/asm/genapic.h b/arch/x86/include/asm/genapic.h
index f57d4d4..07bab93 100644
--- a/arch/x86/include/asm/genapic.h
+++ b/arch/x86/include/asm/genapic.h
@@ -80,7 +80,6 @@ struct genapic {
int trampoline_phys_high;
void (*wait_for_init_deassert)(atomic_t *deassert);
- void (*smp_callin_clear_local_apic)(void);
void (*inquire_remote_apic)(int apicid);
};
diff --git a/arch/x86/kernel/bigsmp_32.c b/arch/x86/kernel/bigsmp_32.c
index f728f9d..85d72ee 100644
--- a/arch/x86/kernel/bigsmp_32.c
+++ b/arch/x86/kernel/bigsmp_32.c
@@ -258,6 +258,5 @@ struct genapic apic_bigsmp = {
.wait_for_init_deassert = default_wait_for_init_deassert,
- .smp_callin_clear_local_apic = NULL,
.inquire_remote_apic = default_inquire_remote_apic,
};
diff --git a/arch/x86/kernel/es7000_32.c b/arch/x86/kernel/es7000_32.c
index c0789b7..770205b 100644
--- a/arch/x86/kernel/es7000_32.c
+++ b/arch/x86/kernel/es7000_32.c
@@ -796,6 +796,5 @@ struct genapic apic_es7000 = {
.wait_for_init_deassert = es7000_wait_for_init_deassert,
/* Nothing to do for most platforms, since cleared by the INIT cycle: */
- .smp_callin_clear_local_apic = NULL,
.inquire_remote_apic = default_inquire_remote_apic,
};
diff --git a/arch/x86/kernel/genapic_flat_64.c b/arch/x86/kernel/genapic_flat_64.c
index c1bcf11..b42e724 100644
--- a/arch/x86/kernel/genapic_flat_64.c
+++ b/arch/x86/kernel/genapic_flat_64.c
@@ -226,7 +226,6 @@ struct genapic apic_flat = {
.trampoline_phys_low = DEFAULT_TRAMPOLINE_PHYS_LOW,
.trampoline_phys_high = DEFAULT_TRAMPOLINE_PHYS_HIGH,
.wait_for_init_deassert = NULL,
- .smp_callin_clear_local_apic = NULL,
.inquire_remote_apic = NULL,
};
@@ -370,6 +369,5 @@ struct genapic apic_physflat = {
.trampoline_phys_low = DEFAULT_TRAMPOLINE_PHYS_LOW,
.trampoline_phys_high = DEFAULT_TRAMPOLINE_PHYS_HIGH,
.wait_for_init_deassert = NULL,
- .smp_callin_clear_local_apic = NULL,
.inquire_remote_apic = NULL,
};
diff --git a/arch/x86/kernel/genx2apic_cluster.c b/arch/x86/kernel/genx2apic_cluster.c
index 49ae07e..6cccd3a 100644
--- a/arch/x86/kernel/genx2apic_cluster.c
+++ b/arch/x86/kernel/genx2apic_cluster.c
@@ -231,6 +231,5 @@ struct genapic apic_x2apic_cluster = {
.trampoline_phys_low = DEFAULT_TRAMPOLINE_PHYS_LOW,
.trampoline_phys_high = DEFAULT_TRAMPOLINE_PHYS_HIGH,
.wait_for_init_deassert = NULL,
- .smp_callin_clear_local_apic = NULL,
.inquire_remote_apic = NULL,
};
diff --git a/arch/x86/kernel/genx2apic_phys.c b/arch/x86/kernel/genx2apic_phys.c
index 2599aaf..17ff29a 100644
--- a/arch/x86/kernel/genx2apic_phys.c
+++ b/arch/x86/kernel/genx2apic_phys.c
@@ -217,6 +217,5 @@ struct genapic apic_x2apic_phys = {
.trampoline_phys_low = DEFAULT_TRAMPOLINE_PHYS_LOW,
.trampoline_phys_high = DEFAULT_TRAMPOLINE_PHYS_HIGH,
.wait_for_init_deassert = NULL,
- .smp_callin_clear_local_apic = NULL,
.inquire_remote_apic = NULL,
};
diff --git a/arch/x86/kernel/genx2apic_uv_x.c b/arch/x86/kernel/genx2apic_uv_x.c
index 1d4d503..d46531d 100644
--- a/arch/x86/kernel/genx2apic_uv_x.c
+++ b/arch/x86/kernel/genx2apic_uv_x.c
@@ -290,7 +290,6 @@ struct genapic apic_x2apic_uv_x = {
.trampoline_phys_low = DEFAULT_TRAMPOLINE_PHYS_LOW,
.trampoline_phys_high = DEFAULT_TRAMPOLINE_PHYS_HIGH,
.wait_for_init_deassert = NULL,
- .smp_callin_clear_local_apic = NULL,
.inquire_remote_apic = NULL,
};
diff --git a/arch/x86/kernel/numaq_32.c b/arch/x86/kernel/numaq_32.c
index be1fdd7..07954d1 100644
--- a/arch/x86/kernel/numaq_32.c
+++ b/arch/x86/kernel/numaq_32.c
@@ -381,15 +381,6 @@ extern void numaq_mps_oem_check(struct mpc_table *, char *, char *);
#define NUMAQ_TRAMPOLINE_PHYS_LOW (0x8)
#define NUMAQ_TRAMPOLINE_PHYS_HIGH (0xa)
-/*
- * Because we use NMIs rather than the INIT-STARTUP sequence to
- * bootstrap the CPUs, the APIC may be in a weird state. Kick it:
- */
-static inline void numaq_smp_callin_clear_local_apic(void)
-{
- clear_local_APIC();
-}
-
static inline const cpumask_t *numaq_target_cpus(void)
{
return &CPU_MASK_ALL;
@@ -594,6 +585,5 @@ struct genapic apic_numaq = {
/* We don't do anything here because we use NMI's to boot instead */
.wait_for_init_deassert = NULL,
- .smp_callin_clear_local_apic = numaq_smp_callin_clear_local_apic,
.inquire_remote_apic = NULL,
};
diff --git a/arch/x86/kernel/probe_32.c b/arch/x86/kernel/probe_32.c
index 7445f66..e96b6b2 100644
--- a/arch/x86/kernel/probe_32.c
+++ b/arch/x86/kernel/probe_32.c
@@ -124,7 +124,6 @@ struct genapic apic_default = {
.wait_for_init_deassert = default_wait_for_init_deassert,
- .smp_callin_clear_local_apic = NULL,
.inquire_remote_apic = default_inquire_remote_apic,
};
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 401b649..a04b219 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -243,8 +243,6 @@ static void __cpuinit smp_callin(void)
*/
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();
map_cpu_to_logical_apicid();
diff --git a/arch/x86/kernel/summit_32.c b/arch/x86/kernel/summit_32.c
index 17197fc..7b7eeb6 100644
--- a/arch/x86/kernel/summit_32.c
+++ b/arch/x86/kernel/summit_32.c
@@ -594,6 +594,5 @@ struct genapic apic_summit = {
.wait_for_init_deassert = default_wait_for_init_deassert,
- .smp_callin_clear_local_apic = NULL,
.inquire_remote_apic = default_inquire_remote_apic,
};
--
1.5.6.5
next prev parent reply other threads:[~2009-01-30 10:20 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-30 10:17 Genapic cleanup & NUMAQ/es7000 removal Andi Kleen
2009-01-30 10:17 ` [PATCH] Move wakeup_secondary_via_nmi into numaq_32.c Andi Kleen
2009-01-30 10:17 ` [PATCH] Remove empty setup_portio_remap inlines in bigsmp/summit Andi Kleen
2009-01-30 10:17 ` [PATCH] Mark NUMAQ broken Andi Kleen
2009-01-30 10:17 ` [PATCH] Mark ES7000 subarch broken Andi Kleen
2009-01-30 10:17 ` [PATCH] Remove store_NMI_vector in genapic Andi Kleen
2009-01-30 10:17 ` Andi Kleen [this message]
2009-01-30 10:17 ` [PATCH] Remove multi_timer_check Andi Kleen
2009-01-30 10:17 ` [PATCH] Remove setup_portio_remap Andi Kleen
2009-01-30 10:17 ` [PATCH] Remove wakeup_cpu genapic vector Andi Kleen
2009-01-30 10:17 ` [PATCH] Remove now unused default_update_genapic Andi Kleen
2009-01-30 10:17 ` [PATCH] Remove trampoline_phys_low/high genapic fields Andi Kleen
2009-01-30 10:17 ` [PATCH] Remove enable_apic_mode genapic hook Andi Kleen
2009-01-30 10:17 ` [PATCH] Remove setup_ioapic_ids x86_quirks hook Andi Kleen
2009-02-05 16:15 ` Genapic cleanup & NUMAQ/es7000 removal Tim Pepper
2009-02-05 17:29 ` Ingo Molnar
2009-02-05 20:27 ` Andi Kleen
2009-02-05 21:25 ` Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1233310639-27916-7-git-send-email-andi@firstfloor.org \
--to=andi@firstfloor.org \
--cc=ak@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lnxninja@linux.vnet.ibm.com \
--cc=mingo@elte.hu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®