diff options
| author | Jon Medhurst <tixy@linaro.org> | 2017-01-10 17:23:27 +0000 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2017-01-10 17:23:27 +0000 |
| commit | fb269d0bd5092c3ae87f1330cfbf6c1434861ed6 (patch) | |
| tree | d1f25be023e70ba3e66e69f0959f45de1d31690c | |
| parent | 1e062f95d6cdd3df4a35d2f08b9164fc9ce2874c (diff) | |
| parent | 8523f080d500f5784699322115c593f95783fd2b (diff) | |
Merge branch 'lsk-4.4-armlt-eas-fixes' into lsk-4.4-armltlsk-4.4-armlt-20170110
| -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 079b18802f17..58f988a10b68 100644 --- a/kernel/sched/tune.c +++ b/kernel/sched/tune.c @@ -872,7 +872,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) )); |