summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2020-04-03 11:32:13 -0400
committerTejun Heo <tj@kernel.org>2020-04-03 11:32:13 -0400
commit2b729fe7f3e9478a21a336231daf35768e7cf37b (patch)
tree46637b3b2e958100d505c86e2a43a65ccb4eefd4 /include
parent38aca3071cebc90e6b07abd697cba5c9d7b37a94 (diff)
downloadlwn-2b729fe7f3e9478a21a336231daf35768e7cf37b.tar.gz
lwn-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 'include')
-rw-r--r--include/linux/cpuset.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h
index cede4cb98b78..04c20de66afc 100644
--- a/include/linux/cpuset.h
+++ b/include/linux/cpuset.h
@@ -54,6 +54,7 @@ extern int cpuset_init(void);
extern void cpuset_init_smp(void);
extern void cpuset_force_rebuild(void);
extern void cpuset_update_active_cpus(void);
+extern void cpuset_wait_for_hotplug(void);
extern void cpuset_read_lock(void);
extern void cpuset_read_unlock(void);
extern void cpuset_cpus_allowed(struct task_struct *p, struct cpumask *mask);
@@ -175,6 +176,8 @@ static inline void cpuset_update_active_cpus(void)
partition_sched_domains(1, NULL, NULL);
}
+static inline void cpuset_wait_for_hotplug(void) { }
+
static inline void cpuset_read_lock(void) { }
static inline void cpuset_read_unlock(void) { }