diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2021-06-30 15:37:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-06-30 15:37:49 -0700 |
| commit | a6eaf3850cb171c328a8b0db6d3c79286a1eba9d (patch) | |
| tree | 2cef5ef9d0c7ae61caba1c9d25c80b6c6d6c1254 /kernel/sched | |
| parent | Merge tag 'microblaze-v5.14' of git://git.monstr.eu/linux-2.6-microblaze (diff) | |
| parent | Merge branch 'sched/core' into sched/urgent, to pick up fix (diff) | |
| download | linux-dev-a6eaf3850cb171c328a8b0db6d3c79286a1eba9d.tar.xz linux-dev-a6eaf3850cb171c328a8b0db6d3c79286a1eba9d.zip | |
Merge tag 'sched-urgent-2021-06-30' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fixes from Ingo Molnar:
- Fix a small inconsistency (bug) in load tracking, caught by a new
warning that several people reported.
- Flip CONFIG_SCHED_CORE to default-disabled, and update the Kconfig
help text.
* tag 'sched-urgent-2021-06-30' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
sched/core: Disable CONFIG_SCHED_CORE by default
sched/fair: Ensure _sum and _avg values stay consistent
Diffstat (limited to 'kernel/sched')
| -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 e6d1dd4e9d68..fb469b26b00a 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -3685,15 +3685,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 |