[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] Patch "Revert "genirq: Add IRQF_RESUME_EARLY and resume such IRQs earlier"" has been added to the 2.6.32-longterm tree
This is a note to let you know that I've just added the patch titled Revert "genirq: Add IRQF_RESUME_EARLY and resume such IRQs earlier" to the 2.6.32-longterm tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/longterm/longterm-queue-2.6.32.git;a=summary The filename of the patch is: 0001-Revert-genirq-Add-IRQF_RESUME_EARLY-and-resume-such-.patch and it can be found in the queue-2.6.32 subdirectory. If you, or anyone else, feels it should not be added to the 2.6.32 longterm tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 402a1955b2c0072733b13500b7f6378149e1f72e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman <gregkh@xxxxxxx> 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 <jslaby@xxxxxxx> Reported-by: Christoph Biedl <linux-kernel.bfrz@xxxxxxxxxxxxxxxxxx> Cc: Ian Campbell <ian.campbell@xxxxxxxxxx> Cc: Rafael J. Wysocki <rjw@xxxxxxx> Cc: Jeremy Fitzhardinge <Jeremy.Fitzhardinge@xxxxxxxxxx> Cc: xen-devel <xen-devel@xxxxxxxxxxxxxxxxxxx> Cc: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx> --- drivers/base/sys.c | 6 ------ drivers/xen/events.c | 2 +- include/linux/interrupt.h | 5 ----- kernel/irq/pm.c | 35 +++++++---------------------------- 4 files changed, 8 insertions(+), 40 deletions(-) --- 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"); --- a/drivers/xen/events.c +++ b/drivers/xen/events.c @@ -536,7 +536,7 @@ int bind_ipi_to_irqhandler(enum ipi_vect 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); --- 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 #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 --- 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); /** Patches currently in longterm-queue-2.6.32 which might be from gregkh@xxxxxxx are /home/gregkh/linux/longterm/longterm-queue-2.6.32/queue-2.6.32/make-scsi_free_queue-kill-pending-scsi-commands.patch /home/gregkh/linux/longterm/longterm-queue-2.6.32/queue-2.6.32/0003-Revert-powerpc-mpic-Fix-problem-that-affinity-is-not.patch /home/gregkh/linux/longterm/longterm-queue-2.6.32/queue-2.6.32/netlink-validate-nla_msecs-length.patch /home/gregkh/linux/longterm/longterm-queue-2.6.32/queue-2.6.32/mtd-mtdchar-add-missing-initializer-on-raw-write.patch /home/gregkh/linux/longterm/longterm-queue-2.6.32/queue-2.6.32/pm-suspend-off-by-one-in-pm_suspend.patch /home/gregkh/linux/longterm/longterm-queue-2.6.32/queue-2.6.32/st-fix-race-in-st_scsi_execute_end.patch /home/gregkh/linux/longterm/longterm-queue-2.6.32/queue-2.6.32/0001-Revert-genirq-Add-IRQF_RESUME_EARLY-and-resume-such-.patch /home/gregkh/linux/longterm/longterm-queue-2.6.32/queue-2.6.32/nfs-sunrpc-don-t-use-a-credential-with-extra-groups.patch /home/gregkh/linux/longterm/longterm-queue-2.6.32/queue-2.6.32/0002-Revert-ASoC-wm8940-Properly-set-codec-dapm.bias_leve.patch _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxxxxxxxx http://lists.xensource.com/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |