diff options
| author | Tejun Heo <[email protected]> | 2024-09-03 09:15:42 -1000 |
|---|---|---|
| committer | Tejun Heo <[email protected]> | 2024-09-03 12:49:18 -1000 |
| commit | d7b01aef9dbd50f190c2c340deaf324806d09885 (patch) | |
| tree | f6ddedc4cffb48f67d7f2279b0c9e45e7d2ee827 /include/linux | |
| parent | 62607d033bb8dc417c2fd06f37f433d468023e66 (diff) | |
| parent | b2d70222dbf2a2ff7a972a685d249a5d75afa87f (diff) | |
Merge branch 'tip/sched/core' into for-6.12
- Resolve trivial context conflicts from dl_server clearing being moved
around.
- Add @next to put_prev_task_scx() and @prev to pick_next_task_scx() to
match sched/core.
- Merge sched_class->switch_class() addition from sched_ext with
tip/sched/core changes in __pick_next_task().
- Make pick_next_task_scx() call put_prev_task_scx() to emulate the previous
behavior where sched_class->put_prev_task() was called before
sched_class->pick_next_task().
While this makes sched_ext build and function, the behavior is not in line
with other sched classes. The follow-up patches will address the
discrepancies and remove sched_class->switch_class().
Signed-off-by: Tejun Heo <[email protected]>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/sched.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 655a0ace6bfe..fd4127dd6455 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -694,7 +694,6 @@ struct sched_dl_entity { */ struct rq *rq; dl_server_has_tasks_f server_has_tasks; - dl_server_pick_f server_pick_next; dl_server_pick_f server_pick_task; #ifdef CONFIG_RT_MUTEXES |