Merge branch 'pm-genirq' into acpi-pm

2014-09-30 20:46:13 +02:00
parent 905563ff47 27f3d18630
commit e4cb0c9e92
14 changed files with 419 additions and 121 deletions
--- 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);