diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-09-30 20:46:13 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-09-30 20:46:13 +0200 |
| commit | e4cb0c9e92f7b16db7a1e892ac6bcf2f736dfd50 (patch) | |
| tree | 35d66a4fc97aa642c14483966f050b5663ff02ca /kernel/power | |
| parent | 905563ff47db35dcb3f69e69d434207270ad1966 (diff) | |
| parent | 27f3d18630cd7fbb03b62bd78a74303cb8c88069 (diff) | |
| download | linux-stable-e4cb0c9e92f7b16db7a1e892ac6bcf2f736dfd50.tar.gz linux-stable-e4cb0c9e92f7b16db7a1e892ac6bcf2f736dfd50.tar.bz2 linux-stable-e4cb0c9e92f7b16db7a1e892ac6bcf2f736dfd50.zip | |
Merge branch 'pm-genirq' into acpi-pm
Diffstat (limited to 'kernel/power')
| -rw-r--r-- | kernel/power/process.c | 1 |
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); |