diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-03 18:43:38 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-03 18:43:38 -0400 |
| commit | e30c631be68b3885aee1b813c427354c950f4146 (patch) | |
| tree | c2a3eaa79bbbe5dd1417390d7c92345e49a9e198 | |
| parent | 33ef765ea66f8464d6b65798b5aed3713420cced (diff) | |
| parent | 79a51b25badae79d2da6f7b54530adf56697f669 (diff) | |
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
Pull x86 irq cleanup from Ingo Molnar:
"A single, trivial cleanup"
* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/irq: Clean up VECTOR_UNDEFINED and VECTOR_RETRIGGERED definition
| -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); |