diff options
| author | Ryan Harkin <ryan.harkin@linaro.org> | 2017-07-13 11:48:12 +0100 |
|---|---|---|
| committer | Ryan Harkin <ryan.harkin@linaro.org> | 2017-07-13 11:48:12 +0100 |
| commit | 63b39d98145a9c7190eb4f2fbaa97802ef2e29da (patch) | |
| tree | 38917eeb68d8b276e626e4e0e0b03970326661c2 | |
| parent | 0cc8722a57027e46c00fe50489c09149f27c0d1a (diff) | |
| parent | 8523f080d500f5784699322115c593f95783fd2b (diff) | |
Merge branch 'lsk-4.4-armlt-eas-fixes' into lsk-4.4-armltlsk-4.4-armlt-20170713
| -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 86d04caf1684..02cf018cfb6e 100644 --- a/kernel/sched/tune.c +++ b/kernel/sched/tune.c @@ -880,7 +880,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) )); |