UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Andi Kleen <ak@linux.intel.com>
Link: http://lkml.kernel.org/r/1375740170-7446-4-git-send-email-andi@firstfloor.org
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
This commit is contained in:
Andi Kleen 2013-08-05 15:02:37 -07:00 committed by H. Peter Anvin
parent 9e1a431de0
commit 1d9090e2fb
6 changed files with 73 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
arch/x86/include/asm/hw_irq.h
View File

@ -26,56 +26,56 @@
#include <asm/sections.h> #include <asm/sections.h>
/* Interrupt handlers registered during init_IRQ */ /* Interrupt handlers registered during init_IRQ */
extern void apic_timer_interrupt(void); extern asmlinkage void apic_timer_interrupt(void);
extern void x86_platform_ipi(void); extern asmlinkage void x86_platform_ipi(void);
extern void kvm_posted_intr_ipi(void); extern asmlinkage void kvm_posted_intr_ipi(void);
extern void error_interrupt(void); extern asmlinkage void error_interrupt(void);
extern void irq_work_interrupt(void); extern asmlinkage void irq_work_interrupt(void);
extern void spurious_interrupt(void); extern asmlinkage void spurious_interrupt(void);
extern void thermal_interrupt(void); extern asmlinkage void thermal_interrupt(void);
extern void reschedule_interrupt(void); extern asmlinkage void reschedule_interrupt(void);
extern void invalidate_interrupt(void); extern asmlinkage void invalidate_interrupt(void);
extern void invalidate_interrupt0(void); extern asmlinkage void invalidate_interrupt0(void);
extern void invalidate_interrupt1(void); extern asmlinkage void invalidate_interrupt1(void);
extern void invalidate_interrupt2(void); extern asmlinkage void invalidate_interrupt2(void);
extern void invalidate_interrupt3(void); extern asmlinkage void invalidate_interrupt3(void);
extern void invalidate_interrupt4(void); extern asmlinkage void invalidate_interrupt4(void);
extern void invalidate_interrupt5(void); extern asmlinkage void invalidate_interrupt5(void);
extern void invalidate_interrupt6(void); extern asmlinkage void invalidate_interrupt6(void);
extern void invalidate_interrupt7(void); extern asmlinkage void invalidate_interrupt7(void);
extern void invalidate_interrupt8(void); extern asmlinkage void invalidate_interrupt8(void);
extern void invalidate_interrupt9(void); extern asmlinkage void invalidate_interrupt9(void);
extern void invalidate_interrupt10(void); extern asmlinkage void invalidate_interrupt10(void);
extern void invalidate_interrupt11(void); extern asmlinkage void invalidate_interrupt11(void);
extern void invalidate_interrupt12(void); extern asmlinkage void invalidate_interrupt12(void);
extern void invalidate_interrupt13(void); extern asmlinkage void invalidate_interrupt13(void);
extern void invalidate_interrupt14(void); extern asmlinkage void invalidate_interrupt14(void);
extern void invalidate_interrupt15(void); extern asmlinkage void invalidate_interrupt15(void);
extern void invalidate_interrupt16(void); extern asmlinkage void invalidate_interrupt16(void);
extern void invalidate_interrupt17(void); extern asmlinkage void invalidate_interrupt17(void);
extern void invalidate_interrupt18(void); extern asmlinkage void invalidate_interrupt18(void);
extern void invalidate_interrupt19(void); extern asmlinkage void invalidate_interrupt19(void);
extern void invalidate_interrupt20(void); extern asmlinkage void invalidate_interrupt20(void);
extern void invalidate_interrupt21(void); extern asmlinkage void invalidate_interrupt21(void);
extern void invalidate_interrupt22(void); extern asmlinkage void invalidate_interrupt22(void);
extern void invalidate_interrupt23(void); extern asmlinkage void invalidate_interrupt23(void);
extern void invalidate_interrupt24(void); extern asmlinkage void invalidate_interrupt24(void);
extern void invalidate_interrupt25(void); extern asmlinkage void invalidate_interrupt25(void);
extern void invalidate_interrupt26(void); extern asmlinkage void invalidate_interrupt26(void);
extern void invalidate_interrupt27(void); extern asmlinkage void invalidate_interrupt27(void);
extern void invalidate_interrupt28(void); extern asmlinkage void invalidate_interrupt28(void);
extern void invalidate_interrupt29(void); extern asmlinkage void invalidate_interrupt29(void);
extern void invalidate_interrupt30(void); extern asmlinkage void invalidate_interrupt30(void);
extern void invalidate_interrupt31(void); extern asmlinkage void invalidate_interrupt31(void);
extern void irq_move_cleanup_interrupt(void); extern asmlinkage void irq_move_cleanup_interrupt(void);
extern void reboot_interrupt(void); extern asmlinkage void reboot_interrupt(void);
extern void threshold_interrupt(void); extern asmlinkage void threshold_interrupt(void);
extern void call_function_interrupt(void); extern asmlinkage void call_function_interrupt(void);
extern void call_function_single_interrupt(void); extern asmlinkage void call_function_single_interrupt(void);
#ifdef CONFIG_TRACING #ifdef CONFIG_TRACING
/* Interrupt handlers registered during init_IRQ */ /* 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); extern void eisa_set_level_irq(unsigned int irq);
/* SMP */ /* SMP */
extern void smp_apic_timer_interrupt(struct pt_regs *); extern __visible void smp_apic_timer_interrupt(struct pt_regs *);
extern void smp_spurious_interrupt(struct pt_regs *); extern __visible void smp_spurious_interrupt(struct pt_regs *);
extern void smp_x86_platform_ipi(struct pt_regs *); extern __visible void smp_x86_platform_ipi(struct pt_regs *);
extern void smp_error_interrupt(struct pt_regs *); extern __visible void smp_error_interrupt(struct pt_regs *);
#ifdef CONFIG_X86_IO_APIC #ifdef CONFIG_X86_IO_APIC
extern asmlinkage void smp_irq_move_cleanup_interrupt(void); extern asmlinkage void smp_irq_move_cleanup_interrupt(void);
#endif #endif
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
extern void smp_reschedule_interrupt(struct pt_regs *); extern __visible void smp_reschedule_interrupt(struct pt_regs *);
extern void smp_call_function_interrupt(struct pt_regs *); extern __visible void smp_call_function_interrupt(struct pt_regs *);
extern void smp_call_function_single_interrupt(struct pt_regs *); extern __visible void smp_call_function_single_interrupt(struct pt_regs *);
#ifdef CONFIG_X86_32 extern __visible void smp_invalidate_interrupt(struct pt_regs *);
extern void smp_invalidate_interrupt(struct pt_regs *);
#else
extern asmlinkage void smp_invalidate_interrupt(struct pt_regs *);
#endif
#endif #endif
extern void (*__initconst interrupt[NR_VECTORS-FIRST_EXTERNAL_VECTOR])(void); extern void (*__initconst interrupt[NR_VECTORS-FIRST_EXTERNAL_VECTOR])(void);

2
arch/x86/include/asm/irq.h
View File

@ -33,7 +33,7 @@ extern void (*x86_platform_ipi_callback)(void);
extern void native_init_IRQ(void); extern void native_init_IRQ(void);
extern bool handle_irq(unsigned irq, struct pt_regs *regs); 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 */ /* Interrupt vector management */
extern DECLARE_BITMAP(used_vectors, NR_VECTORS); extern DECLARE_BITMAP(used_vectors, NR_VECTORS);

12
arch/x86/kernel/apic/apic.c
View File

@ -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 * [ if a single-CPU system runs an SMP kernel then we call the local
* interrupt as well. Thus we cannot inline the local irq ... ] * 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); 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); 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); 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()); "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(); entering_irq();
__smp_spurious_interrupt(); __smp_spurious_interrupt();
exiting_irq(); exiting_irq();
} }
void smp_trace_spurious_interrupt(struct pt_regs *regs) __visible void smp_trace_spurious_interrupt(struct pt_regs *regs)
{ {
entering_irq(); entering_irq();
trace_spurious_apic_entry(SPURIOUS_APIC_VECTOR); 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(); entering_irq();
__smp_error_interrupt(regs); __smp_error_interrupt(regs);
exiting_irq(); exiting_irq();
} }
void smp_trace_error_interrupt(struct pt_regs *regs) __visible void smp_trace_error_interrupt(struct pt_regs *regs)
{ {
entering_irq(); entering_irq();
trace_error_apic_entry(ERROR_APIC_VECTOR); trace_error_apic_entry(ERROR_APIC_VECTOR);

8
arch/x86/kernel/irq.c
View File

@ -177,7 +177,7 @@ u64 arch_irq_stat(void)
* SMP cross-CPU interrupts have their own specific * SMP cross-CPU interrupts have their own specific
* handlers). * 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); struct pt_regs *old_regs = set_irq_regs(regs);
@ -215,7 +215,7 @@ void __smp_x86_platform_ipi(void)
x86_platform_ipi_callback(); 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); 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. * 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); struct pt_regs *old_regs = set_irq_regs(regs);
@ -247,7 +247,7 @@ void smp_kvm_posted_intr_ipi(struct pt_regs *regs)
} }
#endif #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); struct pt_regs *old_regs = set_irq_regs(regs);

4
arch/x86/kernel/irq_work.c
View File

@ -22,14 +22,14 @@ static inline void __smp_irq_work_interrupt(void)
irq_work_run(); 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(); irq_work_entering_irq();
__smp_irq_work_interrupt(); __smp_irq_work_interrupt();
exiting_irq(); 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(); irq_work_entering_irq();
trace_irq_work_entry(IRQ_WORK_VECTOR); trace_irq_work_entry(IRQ_WORK_VECTOR);

12
arch/x86/kernel/smp.c
View File

@ -256,7 +256,7 @@ static inline void __smp_reschedule_interrupt(void)
scheduler_ipi(); scheduler_ipi();
} }
void smp_reschedule_interrupt(struct pt_regs *regs) __visible void smp_reschedule_interrupt(struct pt_regs *regs)
{ {
ack_APIC_irq(); ack_APIC_irq();
__smp_reschedule_interrupt(); __smp_reschedule_interrupt();
@ -271,7 +271,7 @@ static inline void smp_entering_irq(void)
irq_enter(); irq_enter();
} }
void smp_trace_reschedule_interrupt(struct pt_regs *regs) __visible void smp_trace_reschedule_interrupt(struct pt_regs *regs)
{ {
/* /*
* Need to call irq_enter() before calling the trace point. * Need to call irq_enter() before calling the trace point.
@ -295,14 +295,14 @@ static inline void __smp_call_function_interrupt(void)
inc_irq_stat(irq_call_count); inc_irq_stat(irq_call_count);
} }
void smp_call_function_interrupt(struct pt_regs *regs) __visible void smp_call_function_interrupt(struct pt_regs *regs)
{ {
smp_entering_irq(); smp_entering_irq();
__smp_call_function_interrupt(); __smp_call_function_interrupt();
exiting_irq(); exiting_irq();
} }
void smp_trace_call_function_interrupt(struct pt_regs *regs) __visible void smp_trace_call_function_interrupt(struct pt_regs *regs)
{ {
smp_entering_irq(); smp_entering_irq();
trace_call_function_entry(CALL_FUNCTION_VECTOR); trace_call_function_entry(CALL_FUNCTION_VECTOR);
@ -317,14 +317,14 @@ static inline void __smp_call_function_single_interrupt(void)
inc_irq_stat(irq_call_count); inc_irq_stat(irq_call_count);
} }
void smp_call_function_single_interrupt(struct pt_regs *regs) __visible void smp_call_function_single_interrupt(struct pt_regs *regs)
{ {
smp_entering_irq(); smp_entering_irq();
__smp_call_function_single_interrupt(); __smp_call_function_single_interrupt();
exiting_irq(); exiting_irq();
} }
void smp_trace_call_function_single_interrupt(struct pt_regs *regs) __visible void smp_trace_call_function_single_interrupt(struct pt_regs *regs)
{ {
smp_entering_irq(); smp_entering_irq();
trace_call_function_single_entry(CALL_FUNCTION_SINGLE_VECTOR); trace_call_function_single_entry(CALL_FUNCTION_SINGLE_VECTOR);