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 /drivers | |
| 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 'drivers')
| -rw-r--r-- | drivers/base/sys.c | 6 | ||||
| -rw-r--r-- | drivers/xen/events.c | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/drivers/base/sys.c b/drivers/base/sys.c index 3f202f71e4d0..0d903909af7e 100644 --- a/drivers/base/sys.c +++ b/drivers/base/sys.c @@ -471,12 +471,6 @@ int sysdev_resume(void) { struct sysdev_class *cls; - /* - * Called from syscore in mainline but called directly here - * since syscore does not exist in this tree. - */ - irq_pm_syscore_resume(); - WARN_ONCE(!irqs_disabled(), "Interrupts enabled while resuming system devices\n"); diff --git a/drivers/xen/events.c b/drivers/xen/events.c index 15ed43e47d78..009ca4e78df5 100644 --- a/drivers/xen/events.c +++ b/drivers/xen/events.c @@ -536,7 +536,7 @@ int bind_ipi_to_irqhandler(enum ipi_vector ipi, if (irq < 0) return irq; - irqflags |= IRQF_NO_SUSPEND | IRQF_FORCE_RESUME | IRQF_EARLY_RESUME; + irqflags |= IRQF_NO_SUSPEND | IRQF_FORCE_RESUME; retval = request_irq(irq, handler, irqflags, devname, dev_id); if (retval != 0) { unbind_from_irq(irq); |