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

Signed-off-by: N Ingo Molnar <mingo@kernel.org>

Merge branch 'x86/apic' into x86/irq, to consolidate branches.
Signed-off-by: N Ingo Molnar <mingo@kernel.org>
820fca91 · Ingo Molnar · e179f691 · 79a51b25 · 820fca91
隐藏空白更改
内联并排

Showing with 2 addition and 2 deletion

arch/x86/include/asm/hw_irq.h arch/x86/include/asm/hw_irq.h +2 -2

未找到文件。
--- a/arch/x86/include/asm/hw_irq.h
+++ b/arch/x86/include/asm/hw_irq.h
@@ -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);