Commit 582f9191 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86/entry: Convert SMP system vectors to IDTENTRY_SYSVEC 



Convert SMP system vectors to IDTENTRY_SYSVEC:

  - Implement the C entry point with DEFINE_IDTENTRY_SYSVEC
  - Emit the ASM stub with DECLARE_IDTENTRY_SYSVEC
  - Remove the ASM idtentries in 64-bit
  - Remove the BUILD_INTERRUPT entries in 32-bit
  - Remove the old prototypes

No functional change.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Acked-by: default avatarAndy Lutomirski <luto@kernel.org>
Link: https://lore.kernel.org/r/20200521202119.372234635@linutronix.de
parent db0338ee

arch/x86/entry/entry_64.S

+0 −7
Original line number Diff line number Diff line
@@ -956,11 +956,6 @@ apicinterrupt3 \num \sym \do_sym 
POP_SECTION_IRQENTRY

.endm



#ifdef CONFIG_SMP

apicinterrupt3 IRQ_MOVE_CLEANUP_VECTOR		irq_move_cleanup_interrupt	smp_irq_move_cleanup_interrupt

apicinterrupt3 REBOOT_VECTOR			reboot_interrupt		smp_reboot_interrupt

#endif



#ifdef CONFIG_X86_UV

apicinterrupt3 UV_BAU_MESSAGE			uv_bau_message_intr1		uv_bau_message_interrupt

#endif
@@ -984,8 +979,6 @@ apicinterrupt THERMAL_APIC_VECTOR thermal_interrupt smp_thermal_interrupt 
#endif



#ifdef CONFIG_SMP

apicinterrupt CALL_FUNCTION_SINGLE_VECTOR	call_function_single_interrupt	smp_call_function_single_interrupt

apicinterrupt CALL_FUNCTION_VECTOR		call_function_interrupt		smp_call_function_interrupt

apicinterrupt RESCHEDULE_VECTOR			reschedule_interrupt		smp_reschedule_interrupt

#endif

arch/x86/include/asm/entry_arch.h

+0 −4
Original line number Diff line number Diff line
@@ -12,10 +12,6 @@ 
 */

#ifdef CONFIG_SMP

BUILD_INTERRUPT(reschedule_interrupt,RESCHEDULE_VECTOR)

BUILD_INTERRUPT(call_function_interrupt,CALL_FUNCTION_VECTOR)

BUILD_INTERRUPT(call_function_single_interrupt,CALL_FUNCTION_SINGLE_VECTOR)

BUILD_INTERRUPT(irq_move_cleanup_interrupt, IRQ_MOVE_CLEANUP_VECTOR)

BUILD_INTERRUPT(reboot_interrupt, REBOOT_VECTOR)

#endif



#ifdef CONFIG_HAVE_KVM

arch/x86/include/asm/hw_irq.h

+0 −5
Original line number Diff line number Diff line
@@ -38,14 +38,9 @@ extern asmlinkage void uv_bau_message_intr1(void); 
extern asmlinkage void thermal_interrupt(void);

extern asmlinkage void reschedule_interrupt(void);



extern asmlinkage void irq_move_cleanup_interrupt(void);

extern asmlinkage void reboot_interrupt(void);

extern asmlinkage void threshold_interrupt(void);

extern asmlinkage void deferred_error_interrupt(void);



extern asmlinkage void call_function_interrupt(void);

extern asmlinkage void call_function_single_interrupt(void);



#ifdef	CONFIG_X86_LOCAL_APIC

struct irq_data;

struct pci_dev;

arch/x86/include/asm/idtentry.h

+7 −0
Original line number Diff line number Diff line
@@ -599,6 +599,13 @@ DECLARE_IDTENTRY_SYSVEC(LOCAL_TIMER_VECTOR, sysvec_apic_timer_interrupt); 
DECLARE_IDTENTRY_SYSVEC(X86_PLATFORM_IPI_VECTOR,	sysvec_x86_platform_ipi);

#endif



#ifdef CONFIG_SMP

DECLARE_IDTENTRY_SYSVEC(IRQ_MOVE_CLEANUP_VECTOR,	sysvec_irq_move_cleanup);

DECLARE_IDTENTRY_SYSVEC(REBOOT_VECTOR,			sysvec_reboot);

DECLARE_IDTENTRY_SYSVEC(CALL_FUNCTION_SINGLE_VECTOR,	sysvec_call_function_single);

DECLARE_IDTENTRY_SYSVEC(CALL_FUNCTION_VECTOR,		sysvec_call_function);

#endif



#undef X86_TRAP_OTHER



#endif

arch/x86/include/asm/traps.h

+0 −2
Original line number Diff line number Diff line
@@ -40,8 +40,6 @@ asmlinkage void smp_threshold_interrupt(struct pt_regs *regs); 
asmlinkage void smp_deferred_error_interrupt(struct pt_regs *regs);

#endif



asmlinkage void smp_irq_move_cleanup_interrupt(void);



#ifdef CONFIG_VMAP_STACK

void __noreturn handle_stack_overflow(const char *message,

				      struct pt_regs *regs,

CRA Git | Maintained and supported by SUSTech CRA and CCSE