Commit 820fca91 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/apic' into x86/irq, to consolidate branches. 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents e179f691 79a51b25

arch/x86/include/asm/hw_irq.h

+2 −2
Original line number Diff line number Diff line
@@ -190,8 +190,8 @@ extern void (*__initconst interrupt[NR_VECTORS-FIRST_EXTERNAL_VECTOR])(void); 
#define trace_interrupt interrupt

#endif



#define VECTOR_UNDEFINED	-1

#define VECTOR_RETRIGGERED	-2

#define VECTOR_UNDEFINED	(-1)

#define VECTOR_RETRIGGERED	(-2)



typedef int vector_irq_t[NR_VECTORS];

DECLARE_PER_CPU(vector_irq_t, vector_irq);