Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

cpuset: replace direct lockdep_assert_held() with lockdep_assert_cpuset_lock_held()

We already added lockdep_assert_cpuset_lock_held(), use this new function
to keep consistency.

Signed-off-by: Zhao Mengmeng <zhaomengmeng@kylinos.cn>
Signed-off-by: Tejun Heo <tj@kernel.org>

authored by

Zhao Mengmeng and committed by
Tejun Heo
090e0ae3 272bd818

+7 -7
+7 -7
kernel/cgroup/cpuset.c
··· 336 336 */ 337 337 static inline void dec_attach_in_progress_locked(struct cpuset *cs) 338 338 { 339 - lockdep_assert_held(&cpuset_mutex); 339 + lockdep_assert_cpuset_lock_held(); 340 340 341 341 cs->attach_in_progress--; 342 342 if (!cs->attach_in_progress) ··· 899 899 int cpu; 900 900 u64 cookie = ++dl_cookie; 901 901 902 - lockdep_assert_held(&cpuset_mutex); 902 + lockdep_assert_cpuset_lock_held(); 903 903 lockdep_assert_cpus_held(); 904 904 lockdep_assert_held(&sched_domains_mutex); 905 905 ··· 950 950 int i; 951 951 952 952 lockdep_assert_cpus_held(); 953 - lockdep_assert_held(&cpuset_mutex); 953 + lockdep_assert_cpuset_lock_held(); 954 954 force_sd_rebuild = false; 955 955 956 956 /* Generate domain masks and attrs */ ··· 1645 1645 int parent_prs = parent->partition_root_state; 1646 1646 bool nocpu; 1647 1647 1648 - lockdep_assert_held(&cpuset_mutex); 1648 + lockdep_assert_cpuset_lock_held(); 1649 1649 WARN_ON_ONCE(is_remote_partition(cs)); /* For local partition only */ 1650 1650 1651 1651 /* ··· 2213 2213 struct cpuset *sibling; 2214 2214 struct cgroup_subsys_state *pos_css; 2215 2215 2216 - lockdep_assert_held(&cpuset_mutex); 2216 + lockdep_assert_cpuset_lock_held(); 2217 2217 2218 2218 /* 2219 2219 * Check all its siblings and call update_cpumasks_hier() ··· 3047 3047 3048 3048 static void cpuset_attach_task(struct cpuset *cs, struct task_struct *task) 3049 3049 { 3050 - lockdep_assert_held(&cpuset_mutex); 3050 + lockdep_assert_cpuset_lock_held(); 3051 3051 3052 3052 if (cs != &top_cpuset) 3053 3053 guarantee_active_cpus(task, cpus_attach); ··· 3969 3969 */ 3970 3970 void cpuset_cpus_allowed_locked(struct task_struct *tsk, struct cpumask *pmask) 3971 3971 { 3972 - lockdep_assert_held(&cpuset_mutex); 3972 + lockdep_assert_cpuset_lock_held(); 3973 3973 __cpuset_cpus_allowed_locked(tsk, pmask); 3974 3974 } 3975 3975