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 /kernel | |
| 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 'kernel')
| -rw-r--r-- | kernel/irq/pm.c | 35 |
1 files changed, 7 insertions, 28 deletions
diff --git a/kernel/irq/pm.c b/kernel/irq/pm.c index b1fc3ddaa82..0067abb3a9a 100644 --- a/kernel/irq/pm.c +++ b/kernel/irq/pm.c @@ -39,46 +39,25 @@ void suspend_device_irqs(void) } EXPORT_SYMBOL_GPL(suspend_device_irqs); -static void resume_irqs(bool want_early) +/** + * resume_device_irqs - enable interrupt lines disabled by suspend_device_irqs() + * + * Enable all interrupt lines previously disabled by suspend_device_irqs() that + * have the IRQ_SUSPENDED flag set. + */ +void resume_device_irqs(void) { struct irq_desc *desc; int irq; for_each_irq_desc(irq, desc) { unsigned long flags; - bool is_early = desc->action && - desc->action->flags & IRQF_EARLY_RESUME; - - if (is_early != want_early) - continue; spin_lock_irqsave(&desc->lock, flags); __enable_irq(desc, irq, true); spin_unlock_irqrestore(&desc->lock, flags); } } - -/** - * irq_pm_syscore_ops - enable interrupt lines early - * - * Enable all interrupt lines with %IRQF_EARLY_RESUME set. - */ -void irq_pm_syscore_resume(void) -{ - resume_irqs(true); -} - -/** - * resume_device_irqs - enable interrupt lines disabled by suspend_device_irqs() - * - * Enable all non-%IRQF_EARLY_RESUME interrupt lines previously - * disabled by suspend_device_irqs() that have the IRQS_SUSPENDED flag - * set as well as those with %IRQF_FORCE_RESUME. - */ -void resume_device_irqs(void) -{ - resume_irqs(false); -} EXPORT_SYMBOL_GPL(resume_device_irqs); /** |