Commit 22dc12d1 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar
Browse files

x86: unify hwirq.h 



Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 97e7b6f5

include/asm-x86/hw_irq.h

+7 −4
Original line number Diff line number Diff line
@@ -89,12 +89,15 @@ extern asmlinkage void qic_reschedule_interrupt(void); 
extern asmlinkage void qic_enable_irq_interrupt(void);

extern asmlinkage void qic_call_function_interrupt(void);



#endif /* !ASSEMBLY_ */



#ifdef CONFIG_X86_32

# include "hw_irq_32.h"

extern void (*const interrupt[NR_IRQS])(void);

#else

# include "hw_irq_64.h"

typedef int vector_irq_t[NR_VECTORS];

DECLARE_PER_CPU(vector_irq_t, vector_irq);

extern void __setup_vector_irq(int cpu);

extern spinlock_t vector_lock;

#endif



#endif /* !ASSEMBLY_ */



#endif

include/asm-x86/hw_irq_32.h

deleted100644 → 0
+0 −5
Original line number Diff line number Diff line 


extern void (*const interrupt[NR_IRQS])(void);

include/asm-x86/hw_irq_64.h

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
#ifndef __ASSEMBLY__



typedef int vector_irq_t[NR_VECTORS];

DECLARE_PER_CPU(vector_irq_t, vector_irq);

extern void __setup_vector_irq(int cpu);

extern spinlock_t vector_lock;



/*

 * Various low-level irq details needed by irq.c, process.c,

 * time.c, io_apic.c and smp.c

 *

 * Interrupt entry/exit code at both C and assembly level

 */



#include <asm/ptrace.h>



#endif