diff options
author | Tejun Heo <tj@kernel.org> | 2020-04-03 17:32:13 +0200 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2020-04-03 17:32:13 +0200 |
commit | 2b729fe7f3e9478a21a336231daf35768e7cf37b (patch) | |
tree | 46637b3b2e958100d505c86e2a43a65ccb4eefd4 /kernel/power | |
parent | cgroupfs: Support user xattrs (diff) | |
download | linux-2b729fe7f3e9478a21a336231daf35768e7cf37b.tar.xz linux-2b729fe7f3e9478a21a336231daf35768e7cf37b.zip |
Revert "cpuset: Make cpuset hotplug synchronous"
This reverts commit a49e4629b5ed ("cpuset: Make cpuset hotplug synchronous") as
it may deadlock with cpu hotplug path.
Link: http://lkml.kernel.org/r/F0388D99-84D7-453B-9B6B-EEFF0E7BE4CC@lca.pw
Signed-off-by: Tejun Heo <tj@kernel.org>
Reported-by: Qian Cai <cai@lca.pw>
Cc: Prateek Sood <prsood@codeaurora.org>
Diffstat (limited to '')
-rw-r--r-- | kernel/power/process.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/power/process.c b/kernel/power/process.c index 08f7019357ee..4b6a54da7e65 100644 --- a/kernel/power/process.c +++ b/kernel/power/process.c @@ -204,6 +204,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 */ |