diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched/core.c | 2 | ||||
| -rw-r--r-- | kernel/sched/sched.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index f6bbfa1f5c15..9a114b6f6a6f 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -10402,7 +10402,7 @@ void sched_mm_cid_exit_signals(struct task_struct *t) guard(preempt)(); t->mm_cid.active = 0; if (t->mm_cid.cid != MM_CID_UNSET) { - cpumask_clear_cpu(t->mm_cid.cid, mm_cidmask(mm)); + clear_bit(t->mm_cid.cid, mm_cidmask(mm)); t->mm_cid.cid = MM_CID_UNSET; } } diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index a17f04f075e1..31f2e431db5e 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -3559,7 +3559,7 @@ static inline bool __mm_cid_get(struct task_struct *t, unsigned int cid, unsigne if (cid >= max_cids) return false; - if (cpumask_test_and_set_cpu(cid, mm_cidmask(mm))) + if (test_and_set_bit(cid, mm_cidmask(mm))) return false; t->mm_cid.cid = t->mm_cid.last_cid = cid; __this_cpu_write(mm->mm_cid.pcpu->cid, cid); @@ -3582,7 +3582,7 @@ static inline bool mm_cid_get(struct task_struct *t) return true; /* Try the first zero bit in the cidmask. */ - return __mm_cid_get(t, cpumask_first_zero(mm_cidmask(mm)), max_cids); + return __mm_cid_get(t, find_first_zero_bit(mm_cidmask(mm), num_possible_cpus()), max_cids); } static inline void mm_cid_select(struct task_struct *t) @@ -3603,7 +3603,7 @@ static inline void switch_mm_cid(struct task_struct *prev, struct task_struct *n { if (prev->mm_cid.active) { if (prev->mm_cid.cid != MM_CID_UNSET) - cpumask_clear_cpu(prev->mm_cid.cid, mm_cidmask(prev->mm)); + clear_bit(prev->mm_cid.cid, mm_cidmask(prev->mm)); prev->mm_cid.cid = MM_CID_UNSET; } |