diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-08 15:40:42 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-08 16:02:23 -0800 |
| commit | 758d61b4a76e6ad4224780771edbc6d3a0c29b16 (patch) | |
| tree | 85ef43b5521dc7beef0cba223ff126974b8ad408 /include | |
| parent | d3c80676325f3475ff8f0db079aa0a9cb6131a07 (diff) | |
Revert "genirq: Add IRQF_RESUME_EARLY and resume such IRQs earlier"
This reverts commit 0f12a6ad9fa3a03f2bcee36c9cb704821e244c40.
It causes too many build errors and needs to be done properly.
Reported-by: Jiri Slaby <jslaby@suse.cz>
Reported-by: Christoph Biedl <linux-kernel.bfrz@manchmal.in-ulm.de>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Jeremy Fitzhardinge <Jeremy.Fitzhardinge@citrix.com>
Cc: xen-devel <xen-devel@lists.xensource.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/interrupt.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index c7e1aa5a04b..4528f2947cd 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h @@ -54,8 +54,6 @@ * 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 - * IRQF_EARLY_RESUME - Resume IRQ early during syscore instead of at device - * resume time. */ #define IRQF_DISABLED 0x00000020 #define IRQF_SAMPLE_RANDOM 0x00000040 @@ -68,7 +66,6 @@ #define IRQF_ONESHOT 0x00002000 #define IRQF_NO_SUSPEND 0x00004000 #define IRQF_FORCE_RESUME 0x00008000 -#define IRQF_EARLY_RESUME 0x00020000 #define IRQF_TIMER (__IRQF_TIMER | IRQF_NO_SUSPEND) @@ -199,7 +196,6 @@ extern void enable_irq(unsigned int irq); #ifdef CONFIG_GENERIC_HARDIRQS extern void suspend_device_irqs(void); extern void resume_device_irqs(void); -extern void irq_pm_syscore_resume(void); #ifdef CONFIG_PM_SLEEP extern int check_wakeup_irqs(void); #else @@ -208,7 +204,6 @@ static inline int check_wakeup_irqs(void) { return 0; } #else static inline void suspend_device_irqs(void) { }; static inline void resume_device_irqs(void) { }; -static inline void irq_pm_syscore_resume(void) { }; static inline int check_wakeup_irqs(void) { return 0; } #endif |