summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-08-03 10:56:44 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-08-03 10:56:44 -0700
commit148311d2ade909a79afb85a853c7979eb499563f (patch)
tree6dde0ac8804b729e084c3bef7226b10d661f12da /include
parentd97e1dcde5e19ed1f828baff4ab5fd0e517c8dae (diff)
parentdc9b229a58dc0dfed34272ff26c6d5fd17c674e0 (diff)
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fix from Ingo Molnar. * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: genirq: Allow irq chips to mark themself oneshot safe
Diffstat (limited to 'include')
-rw-r--r--include/linux/irq.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/irq.h b/include/linux/irq.h
index 553fb66da130..216b0ba109d7 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -349,6 +349,7 @@ enum {
IRQCHIP_MASK_ON_SUSPEND = (1 << 2),
IRQCHIP_ONOFFLINE_ENABLED = (1 << 3),
IRQCHIP_SKIP_SET_WAKE = (1 << 4),
+ IRQCHIP_ONESHOT_SAFE = (1 << 5),
};
/* This include will go away once we isolated irq_desc usage to core code */