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>
This commit is contained in:
parent
7bd06ec63a
commit
3d5f597e93
|
@ -82,7 +82,6 @@ struct genapic {
|
|||
void (*wait_for_init_deassert)(atomic_t *deassert);
|
||||
void (*smp_callin_clear_local_apic)(void);
|
||||
void (*store_NMI_vector)(unsigned short *high, unsigned short *low);
|
||||
void (*restore_NMI_vector)(unsigned short *high, unsigned short *low);
|
||||
void (*inquire_remote_apic)(int apicid);
|
||||
};
|
||||
|
||||
|
|
|
@ -25,16 +25,6 @@ numaq_store_NMI_vector(unsigned short *high, unsigned short *low)
|
|||
*((volatile unsigned short *)phys_to_virt(NUMAQ_TRAMPOLINE_PHYS_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)) =
|
||||
*high;
|
||||
*((volatile unsigned short *)phys_to_virt(NUMAQ_TRAMPOLINE_PHYS_LOW)) =
|
||||
*low;
|
||||
}
|
||||
|
||||
static inline void inquire_remote_apic(int apicid)
|
||||
{
|
||||
}
|
||||
|
|
|
@ -229,7 +229,6 @@ struct genapic apic_flat = {
|
|||
.wait_for_init_deassert = NULL,
|
||||
.smp_callin_clear_local_apic = NULL,
|
||||
.store_NMI_vector = NULL,
|
||||
.restore_NMI_vector = NULL,
|
||||
.inquire_remote_apic = NULL,
|
||||
};
|
||||
|
||||
|
@ -375,6 +374,5 @@ struct genapic apic_physflat = {
|
|||
.wait_for_init_deassert = NULL,
|
||||
.smp_callin_clear_local_apic = NULL,
|
||||
.store_NMI_vector = NULL,
|
||||
.restore_NMI_vector = NULL,
|
||||
.inquire_remote_apic = NULL,
|
||||
};
|
||||
|
|
|
@ -233,6 +233,5 @@ struct genapic apic_x2apic_cluster = {
|
|||
.wait_for_init_deassert = NULL,
|
||||
.smp_callin_clear_local_apic = NULL,
|
||||
.store_NMI_vector = NULL,
|
||||
.restore_NMI_vector = NULL,
|
||||
.inquire_remote_apic = NULL,
|
||||
};
|
||||
|
|
|
@ -219,6 +219,5 @@ struct genapic apic_x2apic_phys = {
|
|||
.wait_for_init_deassert = NULL,
|
||||
.smp_callin_clear_local_apic = NULL,
|
||||
.store_NMI_vector = NULL,
|
||||
.restore_NMI_vector = NULL,
|
||||
.inquire_remote_apic = NULL,
|
||||
};
|
||||
|
|
|
@ -292,7 +292,6 @@ struct genapic apic_x2apic_uv_x = {
|
|||
.wait_for_init_deassert = NULL,
|
||||
.smp_callin_clear_local_apic = NULL,
|
||||
.store_NMI_vector = NULL,
|
||||
.restore_NMI_vector = NULL,
|
||||
.inquire_remote_apic = NULL,
|
||||
};
|
||||
|
||||
|
|
|
@ -111,6 +111,5 @@ struct genapic apic_bigsmp = {
|
|||
|
||||
.smp_callin_clear_local_apic = NULL,
|
||||
.store_NMI_vector = NULL,
|
||||
.restore_NMI_vector = NULL,
|
||||
.inquire_remote_apic = inquire_remote_apic,
|
||||
};
|
||||
|
|
|
@ -92,6 +92,5 @@ struct genapic apic_default = {
|
|||
|
||||
.smp_callin_clear_local_apic = NULL,
|
||||
.store_NMI_vector = NULL,
|
||||
.restore_NMI_vector = NULL,
|
||||
.inquire_remote_apic = inquire_remote_apic,
|
||||
};
|
||||
|
|
|
@ -148,6 +148,5 @@ 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 = NULL,
|
||||
.restore_NMI_vector = NULL,
|
||||
.inquire_remote_apic = inquire_remote_apic,
|
||||
};
|
||||
|
|
|
@ -112,6 +112,5 @@ struct genapic apic_numaq = {
|
|||
|
||||
.smp_callin_clear_local_apic = numaq_smp_callin_clear_local_apic,
|
||||
.store_NMI_vector = numaq_store_NMI_vector,
|
||||
.restore_NMI_vector = numaq_restore_NMI_vector,
|
||||
.inquire_remote_apic = inquire_remote_apic,
|
||||
};
|
||||
|
|
|
@ -91,6 +91,5 @@ struct genapic apic_summit = {
|
|||
|
||||
.smp_callin_clear_local_apic = NULL,
|
||||
.store_NMI_vector = NULL,
|
||||
.restore_NMI_vector = NULL,
|
||||
.inquire_remote_apic = inquire_remote_apic,
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue