diff options
| author | Gary S. Robertson <gary.robertson@linaro.org> | 2014-02-19 13:26:40 -0600 |
|---|---|---|
| committer | Gary S. Robertson <gary.robertson@linaro.org> | 2014-02-19 13:26:40 -0600 |
| commit | f8c3b0b4ef3cb66c7f71c9861fbc91efd37108c8 (patch) | |
| tree | c980535032066fdf3f87b53de22f917e6685c9fd | |
| parent | a7fd051cd1119af788dd161a4c834b06377d76a8 (diff) | |
| parent | 605684ccd0b681dd86ae1857f82adb68bb0cad7f (diff) | |
Merge branch 'lng-core-configs' into linux-lng
| -rw-r--r-- | linaro/configs/no_hz_full.conf | 9 | ||||
| -rw-r--r-- | linaro/configs/preempt-rt.conf | 9 | ||||
| -rw-r--r-- | linaro/configs/preemption.conf | 4 |
3 files changed, 7 insertions, 15 deletions
diff --git a/linaro/configs/no_hz_full.conf b/linaro/configs/no_hz_full.conf index 8cfa2c61445c..6733ef7bddbf 100644 --- a/linaro/configs/no_hz_full.conf +++ b/linaro/configs/no_hz_full.conf @@ -1,8 +1,4 @@ ### config fragment to add NO_HZ_FULL support -### ASSUMES CONFIG_NO_HZ=y -### NOTE that boot command line options must be used to populate the set of -### CPU cores which will run with full no_hz enabled. Unlisted cores will -### run with no_hz idle only CONFIG_NO_HZ_FULL=y CONFIG_NO_HZ_FULL_ALL=y CONFIG_NO_HZ_COMMON=y @@ -15,3 +11,8 @@ CONFIG_VIRT_CPU_ACCOUNTING_GEN=y CONFIG_CONTEXT_TRACKING_FORCE=y CONFIG_IRQ_WORK=y CONFIG_CPUSETS=y +CONFIG_CGROUPS=y +CONFIG_MAGIC_SYSRQ=y +CONFIG_DEBUG_FS=y +CONFIG_THUMB2_KERNEL=n + diff --git a/linaro/configs/preempt-rt.conf b/linaro/configs/preempt-rt.conf index 967b46b530cd..f8873a6dfb32 100644 --- a/linaro/configs/preempt-rt.conf +++ b/linaro/configs/preempt-rt.conf @@ -1,11 +1,4 @@ CONFIG_PREEMPT=y CONFIG_PREEMPT_RT_FULL=y -# CONFIG_DEBUG_PREEMPT is not set -# CONFIG_DEBUG_SPINLOCK is not set -# CONFIG_DEBUG_MUTEXES is not set -# CONFIG_DEBUG_LOCK_ALLOC is not set -# CONFIG_PROVE_LOCKING is not set -# CONFIG_DEBUG_RT_MUTEXES is not set -### CONFIG_SLAB not set and CONFIG_SLUB=y has to be set for the 3.10.6-rt3 patchset -# CONFIG_SLAB is not set CONFIG_SLUB=y +CONFIG_CPU_FREQ=n diff --git a/linaro/configs/preemption.conf b/linaro/configs/preemption.conf index f4f8fbaba40d..cce050def957 100644 --- a/linaro/configs/preemption.conf +++ b/linaro/configs/preemption.conf @@ -1,4 +1,2 @@ CONFIG_PREEMPT=y -# CONFIG_DEBUG_PREEMPT is not set -# CONFIG_DEBUG_SPINLOCK is not set -# CONFIG_DEBUG_RT_MUTEXES is not set +CONFIG_CPU_FREQ=n |