diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-04-16 13:29:54 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-04-16 13:29:54 +0200 |
| commit | 820fca91d4b927420861eba9d30dbd4e9d3e3939 (patch) | |
| tree | 45f3e4477615543ff0b247d9f209993d0168c6b3 /arch/x86 | |
| parent | x86, irq, pic: Probe for legacy PIC and set legacy_pic appropriately (diff) | |
| parent | x86/irq: Clean up VECTOR_UNDEFINED and VECTOR_RETRIGGERED definition (diff) | |
| download | linux-820fca91d4b927420861eba9d30dbd4e9d3e3939.tar.xz linux-820fca91d4b927420861eba9d30dbd4e9d3e3939.zip | |
Merge branch 'x86/apic' into x86/irq, to consolidate branches.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/include/asm/hw_irq.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h index a307b7530e54..4615906d83df 100644 --- 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); |