diff options
Diffstat (limited to 'kernel/sched/fair.c')
-rw-r--r-- | kernel/sched/fair.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 9bbc303598ea..e6d82cae4910 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c | |||
@@ -2963,7 +2963,7 @@ static void dequeue_task_fair(struct rq *rq, struct task_struct *p, int flags) | |||
2963 | /* Used instead of source_load when we know the type == 0 */ | 2963 | /* Used instead of source_load when we know the type == 0 */ |
2964 | static unsigned long weighted_cpuload(const int cpu) | 2964 | static unsigned long weighted_cpuload(const int cpu) |
2965 | { | 2965 | { |
2966 | return cpu_rq(cpu)->load.weight; | 2966 | return cpu_rq(cpu)->cfs.runnable_load_avg; |
2967 | } | 2967 | } |
2968 | 2968 | ||
2969 | /* | 2969 | /* |
@@ -3008,9 +3008,10 @@ static unsigned long cpu_avg_load_per_task(int cpu) | |||
3008 | { | 3008 | { |
3009 | struct rq *rq = cpu_rq(cpu); | 3009 | struct rq *rq = cpu_rq(cpu); |
3010 | unsigned long nr_running = ACCESS_ONCE(rq->nr_running); | 3010 | unsigned long nr_running = ACCESS_ONCE(rq->nr_running); |
3011 | unsigned long load_avg = rq->cfs.runnable_load_avg; | ||
3011 | 3012 | ||
3012 | if (nr_running) | 3013 | if (nr_running) |
3013 | return rq->load.weight / nr_running; | 3014 | return load_avg / nr_running; |
3014 | 3015 | ||
3015 | return 0; | 3016 | return 0; |
3016 | } | 3017 | } |