commit b76f16748fa61801b1a1fd3ffb6f25ee228a35e0
author Thomas Gleixner <tglx@linutronix.de> Fri Aug 29 13:54:09 2014 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> Mon Sep 01 13:48:51 2014 +0200
tree 50303dcc7296e35d0f382ee97ddf78d8df28b785
parent c7bd3ec0531aa636ad57ed9f27e637cbd247e64a

genirq: Mark wakeup sources as armed on suspend

This allows us to utilize this information in the irq_may_run() check
without adding another conditional to the fast path.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

kernel/irq/pm.c

diff --git a/kernel/irq/pm.c b/kernel/irq/pm.c
index cf0ce01..766930e 100644
--- a/kernel/irq/pm.c
+++ b/kernel/irq/pm.c
@@ -54,6 +54,9 @@
 	if (!desc->action || desc->no_suspend_depth)
 		return false;
 
+	if (irqd_is_wakeup_set(&desc->irq_data))
+		irqd_set(&desc->irq_data, IRQD_WAKEUP_ARMED);
+
 	desc->istate |= IRQS_SUSPENDED;
 	__disable_irq(desc, irq);
 
@@ -101,6 +104,8 @@
 
 static void resume_irq(struct irq_desc *desc, int irq)
 {
+	irqd_clear(&desc->irq_data, IRQD_WAKEUP_ARMED);
+
 	if (desc->istate & IRQS_SUSPENDED)
 		goto resume;