]> www.infradead.org Git - users/willy/xarray.git/commit
Merge branch 'tip/sched/core' into for-6.12
authorTejun Heo <tj@kernel.org>
Tue, 3 Sep 2024 19:15:42 +0000 (09:15 -1000)
committerTejun Heo <tj@kernel.org>
Tue, 3 Sep 2024 22:49:18 +0000 (12:49 -1000)
commitd7b01aef9dbd50f190c2c340deaf324806d09885
treef6ddedc4cffb48f67d7f2279b0c9e45e7d2ee827
parent62607d033bb8dc417c2fd06f37f433d468023e66
parentb2d70222dbf2a2ff7a972a685d249a5d75afa87f
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 <tj@kernel.org>
include/linux/sched.h
kernel/sched/core.c
kernel/sched/ext.c
kernel/sched/fair.c
kernel/sched/idle.c
kernel/sched/sched.h