Commit a22a5cb8 authored by Ingo Molnar's avatar Ingo Molnar

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: default avatarIngo Molnar <mingo@kernel.org>
parents d2343cb8 1c35b07e
...@@ -3657,15 +3657,15 @@ update_cfs_rq_load_avg(u64 now, struct cfs_rq *cfs_rq) ...@@ -3657,15 +3657,15 @@ update_cfs_rq_load_avg(u64 now, struct cfs_rq *cfs_rq)
r = removed_load; r = removed_load;
sub_positive(&sa->load_avg, r); sub_positive(&sa->load_avg, r);
sub_positive(&sa->load_sum, r * divider); sa->load_sum = sa->load_avg * divider;
r = removed_util; r = removed_util;
sub_positive(&sa->util_avg, r); sub_positive(&sa->util_avg, r);
sub_positive(&sa->util_sum, r * divider); sa->util_sum = sa->util_avg * divider;
r = removed_runnable; r = removed_runnable;
sub_positive(&sa->runnable_avg, r); 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 * removed_runnable is the unweighted version of removed_load so we
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment