diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2025-10-28 15:04:17 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-10-29 08:42:28 +0100 |
| commit | 977b9a00541929973fddfbc2f5e932469f7cdc81 (patch) | |
| tree | 50885bdc977a6fa822b5419114e4ea44cfc1d480 /kernel/sched/sched.h | |
| parent | af13e5e437dc2eb8a3291aad70fc80d9cc78bc73 (diff) | |
| parent | fd57572253bc356330dbe5b233c2e1d8426c66fd (diff) | |
Merge branch 'linus/master' into sched/core, to resolve conflict
Conflicts:
kernel/sched/ext.c
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sched/sched.h')
| -rw-r--r-- | kernel/sched/sched.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index e7718f12bc55..d04e007608a3 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -782,6 +782,7 @@ enum scx_rq_flags { SCX_RQ_BAL_KEEP = 1 << 3, /* balance decided to keep current */ SCX_RQ_BYPASSING = 1 << 4, SCX_RQ_CLK_VALID = 1 << 5, /* RQ clock is fresh and valid */ + SCX_RQ_BAL_CB_PENDING = 1 << 6, /* must queue a cb after dispatching */ SCX_RQ_IN_WAKEUP = 1 << 16, SCX_RQ_IN_BALANCE = 1 << 17, @@ -3870,11 +3871,9 @@ static inline int mm_cid_get(struct rq *rq, struct task_struct *t, struct mm_struct *mm) { struct mm_cid __percpu *pcpu_cid = mm->pcpu_cid; - struct cpumask *cpumask; int cid; lockdep_assert_rq_held(rq); - cpumask = mm_cidmask(mm); cid = __this_cpu_read(pcpu_cid->cid); if (mm_cid_is_valid(cid)) { mm_cid_snapshot_time(rq, mm); |