Merge branch 'x86/apic' into x86/irq, to consolidate branches.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
commit
820fca91d4
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue