aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/numaq
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/include/asm/numaq
parent333344d94300500e401cffb4eea10a5ab6e5a41d (diff)
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/include/asm/numaq')
-rw-r--r--arch/x86/include/asm/numaq/wakecpu.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/include/asm/numaq/wakecpu.h b/arch/x86/include/asm/numaq/wakecpu.h
index 61d0a7d9613..123201712a9 100644
--- a/arch/x86/include/asm/numaq/wakecpu.h
+++ b/arch/x86/include/asm/numaq/wakecpu.h
@@ -15,7 +15,8 @@ static inline void numaq_smp_callin_clear_local_apic(void)
clear_local_APIC();
}
-static inline void store_NMI_vector(unsigned short *high, unsigned short *low)
+static inline void
+numaq_store_NMI_vector(unsigned short *high, unsigned short *low)
{
printk("Storing NMI vector\n");
*high =
@@ -24,7 +25,8 @@ static inline void store_NMI_vector(unsigned short *high, unsigned short *low)
*((volatile unsigned short *)phys_to_virt(NUMAQ_TRAMPOLINE_PHYS_LOW));
}
-static inline void restore_NMI_vector(unsigned short *high, unsigned short *low)
+static inline void
+numaq_restore_NMI_vector(unsigned short *high, unsigned short *low)
{
printk("Restoring NMI vector\n");
*((volatile unsigned short *)phys_to_virt(NUMAQ_TRAMPOLINE_PHYS_HIGH)) =