summaryrefslogtreecommitdiffstats
path: root/kernel/power
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-10-07 01:17:21 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-10-07 01:17:21 +0200
commit88b42a4883a7783972c8fc607e60bd3f027e24de (patch)
tree8c60a77610bfc7dc95aac4b0b56c7cf4d0185014 /kernel/power
parent1e765cd36bb8242a399f65501650bcfabc2229c9 (diff)
parent27f3d18630cd7fbb03b62bd78a74303cb8c88069 (diff)
downloadlinux-88b42a4883a7783972c8fc607e60bd3f027e24de.tar.bz2
Merge branch 'pm-genirq'
* pm-genirq: PM / genirq: Document rules related to system suspend and interrupts PCI / PM: Make PCIe PME interrupts wake up from suspend-to-idle x86 / PM: Set IRQCHIP_SKIP_SET_WAKE for IOAPIC IRQ chip objects genirq: Simplify wakeup mechanism genirq: Mark wakeup sources as armed on suspend genirq: Create helper for flow handler entry check genirq: Distangle edge handler entry genirq: Avoid double loop on suspend genirq: Move MASK_ON_SUSPEND handling into suspend_device_irqs() genirq: Make use of pm misfeature accounting genirq: Add sanity checks for PM options on shared interrupt lines genirq: Move suspend/resume logic into irq/pm code PM / sleep: Mechanism for aborting system suspends unconditionally
Diffstat (limited to 'kernel/power')
-rw-r--r--kernel/power/process.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/power/process.c b/kernel/power/process.c
index 4ee194eb524b..7b323221b9ee 100644
--- a/kernel/power/process.c
+++ b/kernel/power/process.c
@@ -129,6 +129,7 @@ int freeze_processes(void)
if (!pm_freezing)
atomic_inc(&system_freezing_cnt);
+ pm_wakeup_clear();
printk("Freezing user space processes ... ");
pm_freezing = true;
error = try_to_freeze_tasks(true);