Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d5f597e authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86, smp: remove ->restore_NMI_vector() 



Nothing actually restores the NMI vector - so remove this
logic altogether.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 7bd06ec6

arch/x86/include/asm/genapic.h

+0 −1
Original line number Diff line number Diff line
@@ -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);

};

arch/x86/include/asm/numaq/wakecpu.h

+0 −10
Original line number Diff line number Diff line
@@ -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)

{

}

arch/x86/kernel/genapic_flat_64.c

+0 −2
Original line number Diff line number Diff line
@@ -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,

};

arch/x86/kernel/genx2apic_cluster.c

+0 −1
Original line number Diff line number Diff line
@@ -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,

};

arch/x86/kernel/genx2apic_phys.c

+0 −1
Original line number Diff line number Diff line
@@ -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,

};