diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-28 10:43:47 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-28 17:20:34 -0500 |
commit | 3d5f597e938c425554cb7668fd3c9d6a536a984a (patch) | |
tree | 6759f134706c4582b69cfcda1edc926b2b55705f /arch/x86/include/asm | |
parent | 7bd06ec63a1204ca44b9f1dc487b8632016162d1 (diff) |
x86, smp: remove ->restore_NMI_vector()
Nothing actually restores the NMI vector - so remove this
logic altogether.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm')
-rw-r--r-- | arch/x86/include/asm/genapic.h | 1 | ||||
-rw-r--r-- | arch/x86/include/asm/numaq/wakecpu.h | 10 |
2 files changed, 0 insertions, 11 deletions
diff --git a/arch/x86/include/asm/genapic.h b/arch/x86/include/asm/genapic.h index 90e83a769a1c..e5f9c5696fb6 100644 --- a/arch/x86/include/asm/genapic.h +++ b/arch/x86/include/asm/genapic.h | |||
@@ -82,7 +82,6 @@ struct genapic { | |||
82 | void (*wait_for_init_deassert)(atomic_t *deassert); | 82 | void (*wait_for_init_deassert)(atomic_t *deassert); |
83 | void (*smp_callin_clear_local_apic)(void); | 83 | void (*smp_callin_clear_local_apic)(void); |
84 | void (*store_NMI_vector)(unsigned short *high, unsigned short *low); | 84 | void (*store_NMI_vector)(unsigned short *high, unsigned short *low); |
85 | void (*restore_NMI_vector)(unsigned short *high, unsigned short *low); | ||
86 | void (*inquire_remote_apic)(int apicid); | 85 | void (*inquire_remote_apic)(int apicid); |
87 | }; | 86 | }; |
88 | 87 | ||
diff --git a/arch/x86/include/asm/numaq/wakecpu.h b/arch/x86/include/asm/numaq/wakecpu.h index 123201712a96..920dcfefa83a 100644 --- a/arch/x86/include/asm/numaq/wakecpu.h +++ b/arch/x86/include/asm/numaq/wakecpu.h | |||
@@ -25,16 +25,6 @@ numaq_store_NMI_vector(unsigned short *high, unsigned short *low) | |||
25 | *((volatile unsigned short *)phys_to_virt(NUMAQ_TRAMPOLINE_PHYS_LOW)); | 25 | *((volatile unsigned short *)phys_to_virt(NUMAQ_TRAMPOLINE_PHYS_LOW)); |
26 | } | 26 | } |
27 | 27 | ||
28 | static inline void | ||
29 | numaq_restore_NMI_vector(unsigned short *high, unsigned short *low) | ||
30 | { | ||
31 | printk("Restoring NMI vector\n"); | ||
32 | *((volatile unsigned short *)phys_to_virt(NUMAQ_TRAMPOLINE_PHYS_HIGH)) = | ||
33 | *high; | ||
34 | *((volatile unsigned short *)phys_to_virt(NUMAQ_TRAMPOLINE_PHYS_LOW)) = | ||
35 | *low; | ||
36 | } | ||
37 | |||
38 | static inline void inquire_remote_apic(int apicid) | 28 | static inline void inquire_remote_apic(int apicid) |
39 | { | 29 | { |
40 | } | 30 | } |