summaryrefslogtreecommitdiffstats
path: root/arch/x86/mach-generic
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-28 16:31:52 +0100
committerIngo Molnar <mingo@elte.hu>2009-01-28 23:20:33 +0100
commit7bd06ec63a1204ca44b9f1dc487b8632016162d1 (patch)
treef9c89011185f9ba4be2a20e7d9fed14f3b50ab7e /arch/x86/mach-generic
parentx86, smp: refactor ->smp_callin_clear_local_apic() methods (diff)
downloadlinux-7bd06ec63a1204ca44b9f1dc487b8632016162d1.tar.xz
linux-7bd06ec63a1204ca44b9f1dc487b8632016162d1.zip
x86, smp: refactor ->store/restore_NMI_vector() methods
Only NUMAQ does something substantial here, because it initializes via NMIs (not via INIT as standard SMP startup) - so it needs to store and restore the NMI vector. - extend the generic code to handle NULL methods - clear out dummy methods and replace them with NULL - clean up: remove wrapper macros, etc. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/mach-generic')
-rw-r--r--arch/x86/mach-generic/bigsmp.c5
-rw-r--r--arch/x86/mach-generic/default.c4
-rw-r--r--arch/x86/mach-generic/es7000.c5
-rw-r--r--arch/x86/mach-generic/numaq.c4
-rw-r--r--arch/x86/mach-generic/summit.c5
5 files changed, 10 insertions, 13 deletions
diff --git a/arch/x86/mach-generic/bigsmp.c b/arch/x86/mach-generic/bigsmp.c
index bd069e7b521c..ecdb230d0f2e 100644
--- a/arch/x86/mach-generic/bigsmp.c
+++ b/arch/x86/mach-generic/bigsmp.c
@@ -110,8 +110,7 @@ struct genapic apic_bigsmp = {
.wait_for_init_deassert = default_wait_for_init_deassert,
.smp_callin_clear_local_apic = NULL,
-
- .store_NMI_vector = store_NMI_vector,
- .restore_NMI_vector = restore_NMI_vector,
+ .store_NMI_vector = NULL,
+ .restore_NMI_vector = NULL,
.inquire_remote_apic = inquire_remote_apic,
};
diff --git a/arch/x86/mach-generic/default.c b/arch/x86/mach-generic/default.c
index a25e6eff048f..950925615a9e 100644
--- a/arch/x86/mach-generic/default.c
+++ b/arch/x86/mach-generic/default.c
@@ -91,7 +91,7 @@ struct genapic apic_default = {
.wait_for_init_deassert = default_wait_for_init_deassert,
.smp_callin_clear_local_apic = NULL,
- .store_NMI_vector = store_NMI_vector,
- .restore_NMI_vector = restore_NMI_vector,
+ .store_NMI_vector = NULL,
+ .restore_NMI_vector = NULL,
.inquire_remote_apic = inquire_remote_apic,
};
diff --git a/arch/x86/mach-generic/es7000.c b/arch/x86/mach-generic/es7000.c
index ab41b5439145..131907091380 100644
--- a/arch/x86/mach-generic/es7000.c
+++ b/arch/x86/mach-generic/es7000.c
@@ -147,8 +147,7 @@ struct genapic apic_es7000 = {
/* Nothing to do for most platforms, since cleared by the INIT cycle: */
.smp_callin_clear_local_apic = NULL,
-
- .store_NMI_vector = store_NMI_vector,
- .restore_NMI_vector = restore_NMI_vector,
+ .store_NMI_vector = NULL,
+ .restore_NMI_vector = NULL,
.inquire_remote_apic = inquire_remote_apic,
};
diff --git a/arch/x86/mach-generic/numaq.c b/arch/x86/mach-generic/numaq.c
index 4d3924f8cd0b..d7f7fcf21c39 100644
--- a/arch/x86/mach-generic/numaq.c
+++ b/arch/x86/mach-generic/numaq.c
@@ -111,7 +111,7 @@ struct genapic apic_numaq = {
.wait_for_init_deassert = NULL,
.smp_callin_clear_local_apic = numaq_smp_callin_clear_local_apic,
- .store_NMI_vector = store_NMI_vector,
- .restore_NMI_vector = restore_NMI_vector,
+ .store_NMI_vector = numaq_store_NMI_vector,
+ .restore_NMI_vector = numaq_restore_NMI_vector,
.inquire_remote_apic = inquire_remote_apic,
};
diff --git a/arch/x86/mach-generic/summit.c b/arch/x86/mach-generic/summit.c
index 2595baa7997e..46fca79f8310 100644
--- a/arch/x86/mach-generic/summit.c
+++ b/arch/x86/mach-generic/summit.c
@@ -90,8 +90,7 @@ struct genapic apic_summit = {
.wait_for_init_deassert = default_wait_for_init_deassert,
.smp_callin_clear_local_apic = NULL,
-
- .store_NMI_vector = store_NMI_vector,
- .restore_NMI_vector = restore_NMI_vector,
+ .store_NMI_vector = NULL,
+ .restore_NMI_vector = NULL,
.inquire_remote_apic = inquire_remote_apic,
};