aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/irq/pm.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-02-08 10:38:00 -0500
committerThomas Gleixner <tglx@linutronix.de>2011-02-08 10:38:21 -0500
commitc9a443cdf7726ce8b78c3177c6ae601ce37292fc (patch)
tree4191db70a690b8eb7c86d8c3c10f827e4f2ab32a /kernel/irq/pm.c
parent285c1a2c3a5f84ce1c811ab4cb1f8a17466e1a06 (diff)
parentdc5f219e88294b93009eef946251251ffffb6d60 (diff)
Merge branch 'irq/for-xen' into irq/core
irq/for-xen contains new functionality to avoid Xen private irq hackery. That branch has a single irq commit and is pulled by Xen to base their new features on. Merge it into irq/core as other patches modify the same code. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/irq/pm.c')
-rw-r--r--kernel/irq/pm.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/kernel/irq/pm.c b/kernel/irq/pm.c
index 0d4005d85b0..d6bfb89cce9 100644
--- a/kernel/irq/pm.c
+++ b/kernel/irq/pm.c
@@ -53,9 +53,6 @@ void resume_device_irqs(void)
53 for_each_irq_desc(irq, desc) { 53 for_each_irq_desc(irq, desc) {
54 unsigned long flags; 54 unsigned long flags;
55 55
56 if (!(desc->status & IRQ_SUSPENDED))
57 continue;
58
59 raw_spin_lock_irqsave(&desc->lock, flags); 56 raw_spin_lock_irqsave(&desc->lock, flags);
60 __enable_irq(desc, irq, true); 57 __enable_irq(desc, irq, true);
61 raw_spin_unlock_irqrestore(&desc->lock, flags); 58 raw_spin_unlock_irqrestore(&desc->lock, flags);