diff options
| author | Jon Medhurst <tixy@linaro.org> | 2016-11-21 15:50:11 +0000 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2016-11-21 15:50:11 +0000 |
| commit | 11e4919ec42e030f74e5d968030bbe63f257b70a (patch) | |
| tree | 7fa28be775a438fd5256cfb2ffc995b8d43d37bc | |
| parent | 7a95469dec057117f9bc9bcb436e5a9a537f5ebc (diff) | |
| parent | 8523f080d500f5784699322115c593f95783fd2b (diff) | |
Merge branch 'lsk-4.4-armlt-eas-fixes' into lsk-4.4-armltlsk-4.4-armlt-20161121
| -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) )); |