From 758d61b4a76e6ad4224780771edbc6d3a0c29b16 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 8 Nov 2011 15:40:42 -0800 Subject: 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 Reported-by: Christoph Biedl Cc: Ian Campbell Cc: Rafael J. Wysocki Cc: Jeremy Fitzhardinge Cc: xen-devel Cc: Konrad Rzeszutek Wilk Cc: Thomas Gleixner Signed-off-by: Greg Kroah-Hartman --- drivers/base/sys.c | 6 ------ drivers/xen/events.c | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) (limited to 'drivers') 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); -- cgit v1.2.3