diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2021-06-30 12:31:41 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2021-06-30 12:31:41 +0200 |
| commit | a22a5cb81e20657194fde6c835e07d28c4dfddbe (patch) | |
| tree | 3cf09f0f93f1e070778374698c007105c2b61f67 /kernel | |
| parent | sched/core: Disable CONFIG_SCHED_CORE by default (diff) | |
| parent | sched/fair: Ensure _sum and _avg values stay consistent (diff) | |
| download | linux-dev-a22a5cb81e20657194fde6c835e07d28c4dfddbe.tar.xz linux-dev-a22a5cb81e20657194fde6c835e07d28c4dfddbe.zip | |
Merge branch 'sched/core' into sched/urgent, to pick up fix
Pick up a fix for a warning that several people reported.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched/fair.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 4a3e61a88acc..45edf61eed73 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -3657,15 +3657,15 @@ update_cfs_rq_load_avg(u64 now, struct cfs_rq *cfs_rq) r = removed_load; sub_positive(&sa->load_avg, r); - sub_positive(&sa->load_sum, r * divider); + sa->load_sum = sa->load_avg * divider; r = removed_util; sub_positive(&sa->util_avg, r); - sub_positive(&sa->util_sum, r * divider); + sa->util_sum = sa->util_avg * divider; r = removed_runnable; sub_positive(&sa->runnable_avg, r); - sub_positive(&sa->runnable_sum, r * divider); + sa->runnable_sum = sa->runnable_avg * divider; /* * removed_runnable is the unweighted version of removed_load so we |