diff options
| author | Tejun Heo <tj@kernel.org> | 2024-09-11 08:43:26 -1000 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2024-09-11 08:43:26 -1000 |
| commit | 0b1777f0fa045c561fd26c8fda61f5eb7a930ed3 (patch) | |
| tree | 7f61b85ef4ab6ba1f4d5b6ee477c9f5b36a92690 /drivers | |
| parent | 513ed0c7ccc103c2ff668154854ec410729a3170 (diff) | |
| parent | bc9057da1a220ff2cb6c8885fd5352558aceba2c (diff) | |
| download | linux-0b1777f0fa045c561fd26c8fda61f5eb7a930ed3.tar.gz linux-0b1777f0fa045c561fd26c8fda61f5eb7a930ed3.tar.bz2 linux-0b1777f0fa045c561fd26c8fda61f5eb7a930ed3.zip | |
Merge branch 'tip/sched/core' into sched_ext/for-6.12
Pull in tip/sched/core to resolve two merge conflicts:
- 96fd6c65efc6 ("sched: Factor out update_other_load_avgs() from __update_blocked_others()")
5d871a63997f ("sched/fair: Move effective_cpu_util() and effective_cpu_util() in fair.c")
A simple context conflict. The former added __update_blocked_others() in
the same #ifdef CONFIG_SMP block that effective_cpu_util() and
sched_cpu_util() are in and the latter moved those functions to fair.c.
This makes __update_blocked_others() more out of place. Will follow up
with a patch to relocate.
- 96fd6c65efc6 ("sched: Factor out update_other_load_avgs() from __update_blocked_others()")
84d265281d6c ("sched/pelt: Use rq_clock_task() for hw_pressure")
The former factored out the body of __update_blocked_others() into
update_other_load_avgs(). The latter changed how update_hw_load_avg() is
called in the body. Resolved by applying the change to
update_other_load_avgs() instead.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/cpufreq/cppc_cpufreq.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/cpufreq/cppc_cpufreq.c b/drivers/cpufreq/cppc_cpufreq.c index bafa32dd375d..1a5ad184d28f 100644 --- a/drivers/cpufreq/cppc_cpufreq.c +++ b/drivers/cpufreq/cppc_cpufreq.c @@ -224,9 +224,9 @@ static void __init cppc_freq_invariance_init(void) * Fake (unused) bandwidth; workaround to "fix" * priority inheritance. */ - .sched_runtime = 1000000, - .sched_deadline = 10000000, - .sched_period = 10000000, + .sched_runtime = NSEC_PER_MSEC, + .sched_deadline = 10 * NSEC_PER_MSEC, + .sched_period = 10 * NSEC_PER_MSEC, }; int ret; |