diff options
| author | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2011-03-03 12:02:02 -0500 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2011-03-03 12:02:02 -0500 |
| commit | 8aef4857d26c46ca3d4f1a7f3a7aa4b51a72385e (patch) | |
| tree | cb1665891daf2a12b4028953e86dde5072b359e7 /include | |
| parent | f611f2da99420abc973c32cdbddbf5c365d0a20c (diff) | |
| parent | dc5f219e88294b93009eef946251251ffffb6d60 (diff) | |
Merge branch 'irq/for-xen' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into HEAD
* 'irq/for-xen' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
genirq: Add IRQF_FORCE_RESUME
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/interrupt.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index 55e0d4253e4..d746da19c6a 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h @@ -55,7 +55,7 @@ * Used by threaded interrupts which need to keep the * irq line disabled until the threaded handler has been run. * IRQF_NO_SUSPEND - Do not disable this IRQ during suspend - * + * IRQF_FORCE_RESUME - Force enable it on resume even if IRQF_NO_SUSPEND is set */ #define IRQF_DISABLED 0x00000020 #define IRQF_SAMPLE_RANDOM 0x00000040 @@ -67,6 +67,7 @@ #define IRQF_IRQPOLL 0x00001000 #define IRQF_ONESHOT 0x00002000 #define IRQF_NO_SUSPEND 0x00004000 +#define IRQF_FORCE_RESUME 0x00008000 #define IRQF_TIMER (__IRQF_TIMER | IRQF_NO_SUSPEND) |