arm64: efi: Don't include EFI fpsimd save/restore code in non-EFI kernels

[linux-2.6-block.git] / kernel / power / process.c

diff --git a/kernel/power/process.c b/kernel/power/process.c
index c7209f060eeb7c8672cf8f07ba9c83ac6c9460ac..50f25cb370c6e10769b3e7ee359113ea5b4013e2 100644 (file)
--- a/kernel/power/process.c
+++ b/kernel/power/process.c
@@ -20,8 +20,9 @@
 #include <linux/workqueue.h>
 #include <linux/kmod.h>
 #include <trace/events/power.h>
+#include <linux/cpuset.h>
 
-/* 
+/*
  * Timeout for stopping processes
  */
 unsigned int __read_mostly freeze_timeout_msecs = 20 * MSEC_PER_SEC;
@@ -132,7 +133,7 @@ int freeze_processes(void)
        if (!pm_freezing)
                atomic_inc(&system_freezing_cnt);
 
-       pm_wakeup_clear();
+       pm_wakeup_clear(true);
        pr_info("Freezing user space processes ... ");
        pm_freezing = true;
        error = try_to_freeze_tasks(true);
@@ -202,6 +203,8 @@ void thaw_processes(void)
        __usermodehelper_set_disable_depth(UMH_FREEZING);
        thaw_workqueues();
 
+       cpuset_wait_for_hotplug();
+
        read_lock(&tasklist_lock);
        for_each_process_thread(g, p) {
                /* No other threads should have PF_SUSPEND_TASK set */