aboutsummaryrefslogtreecommitdiff
path: root/linaro
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-01-22 12:33:23 +0000
committerMark Brown <broonie@linaro.org>2014-01-22 12:33:23 +0000
commit2305009118181260b45aab82f14bcbb659953ef1 (patch)
tree0c2c9469d7ae37f38449116971bf16b10355e19c /linaro
parent0e9b1909c3c660060d94a0a8a15c5299de97a4aa (diff)
parentb30814c74c184bbb231e24d6c857699af338468b (diff)
Merge branch 'for-lsk' of git://git.linaro.org/arm/big.LITTLE/mp into lsk-v3.10-big.LITTLEv3.10/topic/big.LITTLE
Conflicts: kernel/irq/irqdesc.c linaro/configs/big-LITTLE-MP.conf
Diffstat (limited to 'linaro')
-rw-r--r--linaro/configs/big-LITTLE-MP.conf1
1 files changed, 1 insertions, 0 deletions
diff --git a/linaro/configs/big-LITTLE-MP.conf b/linaro/configs/big-LITTLE-MP.conf
index 0bbc603a13e..ced3cf974f1 100644
--- a/linaro/configs/big-LITTLE-MP.conf
+++ b/linaro/configs/big-LITTLE-MP.conf
@@ -9,3 +9,4 @@ CONFIG_HMP_FAST_CPU_MASK=""
CONFIG_HMP_SLOW_CPU_MASK=""
CONFIG_HMP_VARIABLE_SCALE=y
CONFIG_HMP_FREQUENCY_INVARIANT_SCALE=y
+CONFIG_SCHED_HMP_LITTLE_PACKING=y