diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h index 898cfe2eeb420ab8bf7201bf4b01dd315bdb265b..e74655d941b7ac7f10491933116359a5f0cefc5a 100644 --- a/include/linux/cpuset.h +++ b/include/linux/cpuset.h @@ -37,12 +37,6 @@ static inline bool cpusets_enabled(void) return static_branch_unlikely(&cpusets_enabled_key); } -static inline int nr_cpusets(void) -{ - /* jump label reference count + the top-level cpuset */ - return static_key_count(&cpusets_enabled_key.key) + 1; -} - static inline void cpuset_inc(void) { static_branch_inc(&cpusets_pre_enable_key); diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c index 8d51516885047c7807cb050979c1ebbdaec6dc07..9ed6a051a1b91d9689a1994fa62246ec0a890e2c 100644 --- a/kernel/cgroup/cpuset.c +++ b/kernel/cgroup/cpuset.c @@ -577,6 +577,13 @@ static void update_domain_attr_tree(struct sched_domain_attr *dattr, rcu_read_unlock(); } +/* Must be called with cpuset_mutex held. */ +static inline int nr_cpusets(void) +{ + /* jump label reference count + the top-level cpuset */ + return static_key_count(&cpusets_enabled_key.key) + 1; +} + /* * generate_sched_domains() *