diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-05-20 14:06:24 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-05-20 14:08:05 -0400 |
| commit | 250f972d85effad5b6e10da4bbd877e6a4b503b6 (patch) | |
| tree | 007393a6fc6439af7e0121dd99a6f9f9fb8405bc /kernel/irq/debug.h | |
| parent | 7372b0b122af0f6675f3ab65bfd91c8a438e0480 (diff) | |
| parent | bbe7b8bef48c567f5ff3f6041c1fb011292e8f12 (diff) | |
Merge branch 'timers/urgent' into timers/core
Reason: Get upstream fixes and kfree_rcu which is necessary for a
follow up patch.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/irq/debug.h')
| -rw-r--r-- | kernel/irq/debug.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/irq/debug.h b/kernel/irq/debug.h index 306cba37e9a5..97a8bfadc88a 100644 --- a/kernel/irq/debug.h +++ b/kernel/irq/debug.h | |||
| @@ -27,6 +27,7 @@ static inline void print_irq_desc(unsigned int irq, struct irq_desc *desc) | |||
| 27 | P(IRQ_PER_CPU); | 27 | P(IRQ_PER_CPU); |
| 28 | P(IRQ_NOPROBE); | 28 | P(IRQ_NOPROBE); |
| 29 | P(IRQ_NOREQUEST); | 29 | P(IRQ_NOREQUEST); |
| 30 | P(IRQ_NOTHREAD); | ||
| 30 | P(IRQ_NOAUTOEN); | 31 | P(IRQ_NOAUTOEN); |
| 31 | 32 | ||
| 32 | PS(IRQS_AUTODETECT); | 33 | PS(IRQS_AUTODETECT); |