diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-07-19 18:47:55 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-07-19 18:47:55 -0700 |
| commit | 3a2dd33cfb6fe69b6c5c53229da6097e403e9189 (patch) | |
| tree | 34eaf18d06accbae153697309ebe0a9d10a9e424 | |
| parent | 83e5e75fabe4ca70b6a90706feeb0ed1a298195a (diff) | |
| parent | e3473cacaa2916b8e11fb2b26be2b675b9c23ee3 (diff) | |
Merge "sched/core: Fix null-pointer dereference"
| -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)); |