diff options
| author | Gary S. Robertson <gary.robertson@linaro.org> | 2014-06-02 14:21:59 -0500 |
|---|---|---|
| committer | Gary S. Robertson <gary.robertson@linaro.org> | 2014-06-02 14:21:59 -0500 |
| commit | 241afcbc79bfaa3a041226ed6a91c2df6d064647 (patch) | |
| tree | 7e089e3dcf68ffe44b5f17054d1c9328293b1320 | |
| parent | 73d20af6e40e9f0ddd21c373891a1d7368730d80 (diff) | |
| parent | d2a1210b03473f590d1c599f1465ca565a004ee1 (diff) | |
Merge branch 'linux-lng-v3.14.x' into linux-lng-preempt-rt-v3.14.xlinux-lng-preempt-rt-v3.14.0-rt1-finallinux-lng-preempt-rt-v3.14.0-rt1
| -rw-r--r-- | linaro/configs/no_hz_full.conf | 9 | ||||
| -rw-r--r-- | linaro/configs/ovs.conf | 11 | ||||
| -rw-r--r-- | linaro/configs/preempt-rt.conf | 9 | ||||
| -rw-r--r-- | linaro/configs/preemption.conf | 4 |
4 files changed, 18 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/ovs.conf b/linaro/configs/ovs.conf new file mode 100644 index 000000000000..9d11399f95ab --- /dev/null +++ b/linaro/configs/ovs.conf @@ -0,0 +1,11 @@ +CONFIG_NET_IPGRE_DEMUX=y +CONFIG_BRIDGE=m +CONFIG_NET_SCHED=y +CONFIG_NET_SCH_HTB=y +CONFIG_NET_SCH_HFSC=y +CONFIG_NET_SCH_INGRESS=y +CONFIG_NET_CLS_BASIC=y +CONFIG_NET_CLS_ACT=y +CONFIG_NET_ACT_POLICE=y +CONFIG_OPENVSWITCH=m +CONFIG_TUN=y 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 |