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

Commit 1d9090e2 authored by Andi Kleen's avatar Andi Kleen Committed by H. Peter Anvin
Browse files

x86, asmlinkage: Make all interrupt handlers asmlinkage / __visible 



These handlers are all referenced from assembler stubs, so need
to be visible.

The handlers without arguments become asmlinkage, the others __visible
to not force regparms(0) on x86-32.

I put it all into a single patch, please let me know if you want
it it split up.

Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Link: http://lkml.kernel.org/r/1375740170-7446-4-git-send-email-andi@firstfloor.org


Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 9e1a431d

arch/x86/include/asm/hw_irq.h

+58 −62
Original line number Diff line number Diff line
@@ -26,56 +26,56 @@ 
#include <asm/sections.h>



/* Interrupt handlers registered during init_IRQ */

extern void apic_timer_interrupt(void);

extern void x86_platform_ipi(void);

extern void kvm_posted_intr_ipi(void);

extern void error_interrupt(void);

extern void irq_work_interrupt(void);



extern void spurious_interrupt(void);

extern void thermal_interrupt(void);

extern void reschedule_interrupt(void);



extern void invalidate_interrupt(void);

extern void invalidate_interrupt0(void);

extern void invalidate_interrupt1(void);

extern void invalidate_interrupt2(void);

extern void invalidate_interrupt3(void);

extern void invalidate_interrupt4(void);

extern void invalidate_interrupt5(void);

extern void invalidate_interrupt6(void);

extern void invalidate_interrupt7(void);

extern void invalidate_interrupt8(void);

extern void invalidate_interrupt9(void);

extern void invalidate_interrupt10(void);

extern void invalidate_interrupt11(void);

extern void invalidate_interrupt12(void);

extern void invalidate_interrupt13(void);

extern void invalidate_interrupt14(void);

extern void invalidate_interrupt15(void);

extern void invalidate_interrupt16(void);

extern void invalidate_interrupt17(void);

extern void invalidate_interrupt18(void);

extern void invalidate_interrupt19(void);

extern void invalidate_interrupt20(void);

extern void invalidate_interrupt21(void);

extern void invalidate_interrupt22(void);

extern void invalidate_interrupt23(void);

extern void invalidate_interrupt24(void);

extern void invalidate_interrupt25(void);

extern void invalidate_interrupt26(void);

extern void invalidate_interrupt27(void);

extern void invalidate_interrupt28(void);

extern void invalidate_interrupt29(void);

extern void invalidate_interrupt30(void);

extern void invalidate_interrupt31(void);



extern void irq_move_cleanup_interrupt(void);

extern void reboot_interrupt(void);

extern void threshold_interrupt(void);



extern void call_function_interrupt(void);

extern void call_function_single_interrupt(void);

extern asmlinkage void apic_timer_interrupt(void);

extern asmlinkage void x86_platform_ipi(void);

extern asmlinkage void kvm_posted_intr_ipi(void);

extern asmlinkage void error_interrupt(void);

extern asmlinkage void irq_work_interrupt(void);



extern asmlinkage void spurious_interrupt(void);

extern asmlinkage void thermal_interrupt(void);

extern asmlinkage void reschedule_interrupt(void);



extern asmlinkage void invalidate_interrupt(void);

extern asmlinkage void invalidate_interrupt0(void);

extern asmlinkage void invalidate_interrupt1(void);

extern asmlinkage void invalidate_interrupt2(void);

extern asmlinkage void invalidate_interrupt3(void);

extern asmlinkage void invalidate_interrupt4(void);

extern asmlinkage void invalidate_interrupt5(void);

extern asmlinkage void invalidate_interrupt6(void);

extern asmlinkage void invalidate_interrupt7(void);

extern asmlinkage void invalidate_interrupt8(void);

extern asmlinkage void invalidate_interrupt9(void);

extern asmlinkage void invalidate_interrupt10(void);

extern asmlinkage void invalidate_interrupt11(void);

extern asmlinkage void invalidate_interrupt12(void);

extern asmlinkage void invalidate_interrupt13(void);

extern asmlinkage void invalidate_interrupt14(void);

extern asmlinkage void invalidate_interrupt15(void);

extern asmlinkage void invalidate_interrupt16(void);

extern asmlinkage void invalidate_interrupt17(void);

extern asmlinkage void invalidate_interrupt18(void);

extern asmlinkage void invalidate_interrupt19(void);

extern asmlinkage void invalidate_interrupt20(void);

extern asmlinkage void invalidate_interrupt21(void);

extern asmlinkage void invalidate_interrupt22(void);

extern asmlinkage void invalidate_interrupt23(void);

extern asmlinkage void invalidate_interrupt24(void);

extern asmlinkage void invalidate_interrupt25(void);

extern asmlinkage void invalidate_interrupt26(void);

extern asmlinkage void invalidate_interrupt27(void);

extern asmlinkage void invalidate_interrupt28(void);

extern asmlinkage void invalidate_interrupt29(void);

extern asmlinkage void invalidate_interrupt30(void);

extern asmlinkage void invalidate_interrupt31(void);



extern asmlinkage void irq_move_cleanup_interrupt(void);

extern asmlinkage void reboot_interrupt(void);

extern asmlinkage void threshold_interrupt(void);



extern asmlinkage void call_function_interrupt(void);

extern asmlinkage void call_function_single_interrupt(void);



#ifdef CONFIG_TRACING

/* Interrupt handlers registered during init_IRQ */
@@ -172,22 +172,18 @@ extern atomic_t irq_mis_count; 
extern void eisa_set_level_irq(unsigned int irq);



/* SMP */

extern void smp_apic_timer_interrupt(struct pt_regs *);

extern void smp_spurious_interrupt(struct pt_regs *);

extern void smp_x86_platform_ipi(struct pt_regs *);

extern void smp_error_interrupt(struct pt_regs *);

extern __visible void smp_apic_timer_interrupt(struct pt_regs *);

extern __visible void smp_spurious_interrupt(struct pt_regs *);

extern __visible void smp_x86_platform_ipi(struct pt_regs *);

extern __visible void smp_error_interrupt(struct pt_regs *);

#ifdef CONFIG_X86_IO_APIC

extern asmlinkage void smp_irq_move_cleanup_interrupt(void);

#endif

#ifdef CONFIG_SMP

extern void smp_reschedule_interrupt(struct pt_regs *);

extern void smp_call_function_interrupt(struct pt_regs *);

extern void smp_call_function_single_interrupt(struct pt_regs *);

#ifdef CONFIG_X86_32

extern void smp_invalidate_interrupt(struct pt_regs *);

#else

extern asmlinkage void smp_invalidate_interrupt(struct pt_regs *);

#endif

extern __visible void smp_reschedule_interrupt(struct pt_regs *);

extern __visible void smp_call_function_interrupt(struct pt_regs *);

extern __visible void smp_call_function_single_interrupt(struct pt_regs *);

extern __visible void smp_invalidate_interrupt(struct pt_regs *);

#endif



extern void (*__initconst interrupt[NR_VECTORS-FIRST_EXTERNAL_VECTOR])(void);

arch/x86/include/asm/irq.h

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ extern void (*x86_platform_ipi_callback)(void); 
extern void native_init_IRQ(void);

extern bool handle_irq(unsigned irq, struct pt_regs *regs);



extern unsigned int do_IRQ(struct pt_regs *regs);

extern __visible unsigned int do_IRQ(struct pt_regs *regs);



/* Interrupt vector management */

extern DECLARE_BITMAP(used_vectors, NR_VECTORS);

arch/x86/kernel/apic/apic.c

+6 −6
Original line number Diff line number Diff line
@@ -913,7 +913,7 @@ static void local_apic_timer_interrupt(void) 
 * [ if a single-CPU system runs an SMP kernel then we call the local

 *   interrupt as well. Thus we cannot inline the local irq ... ]

 */

void __irq_entry smp_apic_timer_interrupt(struct pt_regs *regs)

__visible void __irq_entry smp_apic_timer_interrupt(struct pt_regs *regs)

{

	struct pt_regs *old_regs = set_irq_regs(regs);
@@ -932,7 +932,7 @@ void __irq_entry smp_apic_timer_interrupt(struct pt_regs *regs) 
	set_irq_regs(old_regs);

}



void __irq_entry smp_trace_apic_timer_interrupt(struct pt_regs *regs)

__visible void __irq_entry smp_trace_apic_timer_interrupt(struct pt_regs *regs)

{

	struct pt_regs *old_regs = set_irq_regs(regs);
@@ -1946,14 +1946,14 @@ static inline void __smp_spurious_interrupt(void) 
		"should never happen.\n", smp_processor_id());

}



void smp_spurious_interrupt(struct pt_regs *regs)

__visible void smp_spurious_interrupt(struct pt_regs *regs)

{

	entering_irq();

	__smp_spurious_interrupt();

	exiting_irq();

}



void smp_trace_spurious_interrupt(struct pt_regs *regs)

__visible void smp_trace_spurious_interrupt(struct pt_regs *regs)

{

	entering_irq();

	trace_spurious_apic_entry(SPURIOUS_APIC_VECTOR);
@@ -2002,14 +2002,14 @@ static inline void __smp_error_interrupt(struct pt_regs *regs) 


}



void smp_error_interrupt(struct pt_regs *regs)

__visible void smp_error_interrupt(struct pt_regs *regs)

{

	entering_irq();

	__smp_error_interrupt(regs);

	exiting_irq();

}



void smp_trace_error_interrupt(struct pt_regs *regs)

__visible void smp_trace_error_interrupt(struct pt_regs *regs)

{

	entering_irq();

	trace_error_apic_entry(ERROR_APIC_VECTOR);

arch/x86/kernel/irq.c

+4 −4
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ u64 arch_irq_stat(void) 
 * SMP cross-CPU interrupts have their own specific

 * handlers).

 */

unsigned int __irq_entry do_IRQ(struct pt_regs *regs)

__visible unsigned int __irq_entry do_IRQ(struct pt_regs *regs)

{

	struct pt_regs *old_regs = set_irq_regs(regs);
@@ -215,7 +215,7 @@ void __smp_x86_platform_ipi(void) 
		x86_platform_ipi_callback();

}



void smp_x86_platform_ipi(struct pt_regs *regs)

__visible void smp_x86_platform_ipi(struct pt_regs *regs)

{

	struct pt_regs *old_regs = set_irq_regs(regs);
@@ -229,7 +229,7 @@ void smp_x86_platform_ipi(struct pt_regs *regs) 
/*

 * Handler for POSTED_INTERRUPT_VECTOR.

 */

void smp_kvm_posted_intr_ipi(struct pt_regs *regs)

__visible void smp_kvm_posted_intr_ipi(struct pt_regs *regs)

{

	struct pt_regs *old_regs = set_irq_regs(regs);
@@ -247,7 +247,7 @@ void smp_kvm_posted_intr_ipi(struct pt_regs *regs) 
}

#endif



void smp_trace_x86_platform_ipi(struct pt_regs *regs)

__visible void smp_trace_x86_platform_ipi(struct pt_regs *regs)

{

	struct pt_regs *old_regs = set_irq_regs(regs);

arch/x86/kernel/irq_work.c

+2 −2
Original line number Diff line number Diff line
@@ -22,14 +22,14 @@ static inline void __smp_irq_work_interrupt(void) 
	irq_work_run();

}



void smp_irq_work_interrupt(struct pt_regs *regs)

__visible void smp_irq_work_interrupt(struct pt_regs *regs)

{

	irq_work_entering_irq();

	__smp_irq_work_interrupt();

	exiting_irq();

}



void smp_trace_irq_work_interrupt(struct pt_regs *regs)

__visible void smp_trace_irq_work_interrupt(struct pt_regs *regs)

{

	irq_work_entering_irq();

	trace_irq_work_entry(IRQ_WORK_VECTOR);