diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-04-16 07:29:54 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-04-16 07:29:54 -0400 |
| commit | 820fca91d4b927420861eba9d30dbd4e9d3e3939 (patch) | |
| tree | 45f3e4477615543ff0b247d9f209993d0168c6b3 /arch/x86 | |
| parent | e179f6914152eca9b338e7d8445684062f560c55 (diff) | |
| parent | 79a51b25badae79d2da6f7b54530adf56697f669 (diff) | |
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); | |||
| 190 | #define trace_interrupt interrupt | 190 | #define trace_interrupt interrupt |
| 191 | #endif | 191 | #endif |
| 192 | 192 | ||
| 193 | #define VECTOR_UNDEFINED -1 | 193 | #define VECTOR_UNDEFINED (-1) |
| 194 | #define VECTOR_RETRIGGERED -2 | 194 | #define VECTOR_RETRIGGERED (-2) |
| 195 | 195 | ||
| 196 | typedef int vector_irq_t[NR_VECTORS]; | 196 | typedef int vector_irq_t[NR_VECTORS]; |
| 197 | DECLARE_PER_CPU(vector_irq_t, vector_irq); | 197 | DECLARE_PER_CPU(vector_irq_t, vector_irq); |