diff options
| author | Viresh Kumar <viresh.kumar@linaro.org> | 2012-08-23 11:11:16 +0530 |
|---|---|---|
| committer | Viresh Kumar <viresh.kumar@linaro.org> | 2012-08-23 11:15:36 +0530 |
| commit | 2dec8d25920d7b0d9d748219025ddf9c05ea5c92 (patch) | |
| tree | 9e36ccd0656ce75091602e23b38c7c9693c0f172 | |
| parent | 7cb2bbaab2f26d1b4d2e6fde48b5712d162ec2d8 (diff) | |
| parent | 88e36d1524af74074c41feb9a96b7522c688a781 (diff) | |
Merge branch 'arm-asymmetric-support-v3-v3.6-rc1' into big-LITTLE-MP-v6big-LITTLE-MP-v6
This gets Vincent's "enable ARCH_POWER" patch back into our tree.
$ git checkout big-LITTLE-MP-v6
$ git merge arm-asymmetric-support-v3-v3.6-rc1
| -rw-r--r-- | kernel/sched/features.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched/features.h b/kernel/sched/features.h index de00a486c5c6..d98ae909e321 100644 --- a/kernel/sched/features.h +++ b/kernel/sched/features.h @@ -42,7 +42,7 @@ SCHED_FEAT(CACHE_HOT_BUDDY, true) /* * Use arch dependent cpu power functions */ -SCHED_FEAT(ARCH_POWER, false) +SCHED_FEAT(ARCH_POWER, true) SCHED_FEAT(HRTICK, false) SCHED_FEAT(DOUBLE_TICK, false) |