diff options
| author | Olav Haugan <ohaugan@codeaurora.org> | 2016-07-16 10:39:06 -0700 |
|---|---|---|
| committer | Olav Haugan <ohaugan@codeaurora.org> | 2016-07-16 10:41:32 -0700 |
| commit | e3473cacaa2916b8e11fb2b26be2b675b9c23ee3 (patch) | |
| tree | f41f5a2730c58f182c13af7461cc7623360db5ff /kernel/sched | |
| parent | 4e24c748ee4b6fe59cce30afbe4e083a75ee43a9 (diff) | |
sched/core: Fix null-pointer dereference
Turning on sched_use_pelt causes a null-pointer dereference in
scheduler. Add correct checking of varable.
CRs-fixed: 1042656
Change-Id: I6e6a57e24b41e4b3d049bfcf694b9ad7e2144dd5
Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
Diffstat (limited to 'kernel/sched')
| -rw-r--r-- | kernel/sched/fair.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 859416724e5a..958d79e1933c 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -4343,7 +4343,7 @@ __update_load_avg(u64 now, int cpu, struct sched_avg *sa, return 0; sa->last_update_time = now; - if (sched_use_pelt && !cfs_rq && weight) { + if (sched_use_pelt && cfs_rq && weight) { se = container_of(sa, struct sched_entity, avg); if (entity_is_task(se) && se->on_rq) dec_hmp_sched_stats_fair(rq_of(cfs_rq), task_of(se)); |