diff options
| author | Jon Medhurst <tixy@linaro.org> | 2016-12-05 12:09:03 +0000 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2016-12-05 12:09:03 +0000 |
| commit | 13616a18984e042a59b235c5ec9b494aba141c39 (patch) | |
| tree | 839b025628a040a6e4358ef12baf556c65af596c | |
| parent | a5d0a66370362d0a025b4da071694e4abb06f668 (diff) | |
| parent | 8523f080d500f5784699322115c593f95783fd2b (diff) | |
Merge branch 'lsk-4.4-armlt-eas-fixes' into lsk-4.4-armltlsk-4.4-armlt-20161205
| -rw-r--r-- | kernel/sched/tune.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched/tune.c b/kernel/sched/tune.c index 68a24a044b0a..65cbc848a3ff 100644 --- a/kernel/sched/tune.c +++ b/kernel/sched/tune.c @@ -871,7 +871,7 @@ schedtune_add_cluster_nrg( * Assume we have EM data only at the CPU and * the upper CLUSTER level */ - BUG_ON(!cpumask_equal( + BUG_ON(sd2->parent && !cpumask_equal( sched_group_cpus(sg), sched_group_cpus(sd2->parent->groups) )); |