diff options
| author | Jon Medhurst <tixy@linaro.org> | 2017-04-03 13:46:25 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2017-04-03 13:46:25 +0100 |
| commit | 457349a00449a9554151368e1dbdecf64c847219 (patch) | |
| tree | f5a3fbd044eb0142949d1b7e10d6c71de2accb12 | |
| parent | 3ac23bc8ef7314a058ec963952e6883cd35f85b8 (diff) | |
| parent | 8523f080d500f5784699322115c593f95783fd2b (diff) | |
Merge branch 'lsk-4.4-armlt-eas-fixes' into lsk-4.4-armltlsk-4.4-armlt-20170403
| -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) )); |