diff options
| author | Tejun Heo <tj@kernel.org> | 2026-03-09 22:59:36 +0300 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2026-03-09 22:59:36 +0300 |
| commit | 0e7cd9cef61fde36ebfb653fe9e7a9722185cb57 (patch) | |
| tree | 0eef127fa5f0bda6d0729a47ce5d3038c849b695 /include | |
| parent | bec10581e92289bdc3eed17e90200900ddb00594 (diff) | |
| parent | 54a66e431eeacf23e1dc47cb3507f2d0c068aaf0 (diff) | |
| download | linux-0e7cd9cef61fde36ebfb653fe9e7a9722185cb57.tar.xz | |
Merge branch 'sched/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into for-7.1
Pull sched/core to resolve conflicts between:
c2a57380df9dd ("sched: Replace use of system_unbound_wq with system_dfl_wq")
from the tip tree and commit:
cde94c032b32b ("sched_ext: Make watchdog sub-sched aware")
The latter moves around code modiefied by the former. Apply the changes in
the new locations.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/sched/topology.h | 1 | ||||
| -rw-r--r-- | include/uapi/linux/sched.h | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/sched/topology.h b/include/linux/sched/topology.h index 45c0022b91ce..a1e1032426dc 100644 --- a/include/linux/sched/topology.h +++ b/include/linux/sched/topology.h @@ -95,6 +95,7 @@ struct sched_domain { unsigned int newidle_call; unsigned int newidle_success; unsigned int newidle_ratio; + u64 newidle_stamp; u64 max_newidle_lb_cost; unsigned long last_decay_max_lb_cost; diff --git a/include/uapi/linux/sched.h b/include/uapi/linux/sched.h index 359a14cc76a4..52b69ce89368 100644 --- a/include/uapi/linux/sched.h +++ b/include/uapi/linux/sched.h @@ -146,4 +146,7 @@ struct clone_args { SCHED_FLAG_KEEP_ALL | \ SCHED_FLAG_UTIL_CLAMP) +/* Only for sched_getattr() own flag param, if task is SCHED_DEADLINE */ +#define SCHED_GETATTR_FLAG_DL_DYNAMIC 0x01 + #endif /* _UAPI_LINUX_SCHED_H */ |