summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorPiotr Bartosiewicz <p.bartosiewi@partner.samsung.com>2014-09-24 10:13:53 +0200
committerPiotr Bartosiewicz <p.bartosiewi@partner.samsung.com>2014-09-24 10:33:55 +0200
commit201243a0adae8c3c234ef809cdb198c0fb90345c (patch)
tree93e4477a95e6f1e00bbdb21dc938b0c9f07339c5 /arch
parent098bf280850c7ab5da9ad31954416e945f1c4bd3 (diff)
downloadlinux-3.10-201243a0adae8c3c234ef809cdb198c0fb90345c.tar.gz
linux-3.10-201243a0adae8c3c234ef809cdb198c0fb90345c.tar.bz2
linux-3.10-201243a0adae8c3c234ef809cdb198c0fb90345c.zip
arm: tizen_odroid_defconfig: add support for containers
Add support for linux containers (lxc, libvirt-lxc) in odroid SoC. This patch turns on user namespace, cgroups, bridging, vlan and multiple devpts stuff. Change-Id: I78b79a20f06154d96517ecb714174a252f87466a Signed-off-by: Piotr Bartosiewicz <p.bartosiewi@partner.samsung.com>
Diffstat (limited to 'arch')
-rwxr-xr-xarch/arm/configs/tizen_odroid_defconfig35
1 files changed, 22 insertions, 13 deletions
diff --git a/arch/arm/configs/tizen_odroid_defconfig b/arch/arm/configs/tizen_odroid_defconfig
index d050565a92f..b9367d0fbc3 100755
--- a/arch/arm/configs/tizen_odroid_defconfig
+++ b/arch/arm/configs/tizen_odroid_defconfig
@@ -104,21 +104,26 @@ CONFIG_RCU_FANOUT_LEAF=16
CONFIG_LOG_BUF_SHIFT=17
CONFIG_CGROUPS=y
# CONFIG_CGROUP_DEBUG is not set
-# CONFIG_CGROUP_FREEZER is not set
-# CONFIG_CGROUP_DEVICE is not set
-# CONFIG_CPUSETS is not set
-# CONFIG_CGROUP_CPUACCT is not set
-# CONFIG_RESOURCE_COUNTERS is not set
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_RESOURCE_COUNTERS=y
+CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
+CONFIG_MEMCG_SWAP_ENABLED=y
+# CONFIG_MEMCG_KMEM is not set
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
-# CONFIG_CFS_BANDWIDTH is not set
+CONFIG_CFS_BANDWIDTH=y
# CONFIG_RT_GROUP_SCHED is not set
# CONFIG_BLK_CGROUP is not set
# CONFIG_CHECKPOINT_RESTORE is not set
CONFIG_NAMESPACES=y
CONFIG_UTS_NS=y
CONFIG_IPC_NS=y
-# CONFIG_USER_NS is not set
+CONFIG_USER_NS=y
CONFIG_PID_NS=y
CONFIG_NET_NS=y
CONFIG_UIDGID_CONVERTED=y
@@ -762,7 +767,7 @@ CONFIG_NETFILTER_XT_CONNMARK=y
#
# Xtables targets
#
-# CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=y
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
# CONFIG_NETFILTER_XT_TARGET_CT is not set
@@ -916,8 +921,11 @@ CONFIG_BRIDGE_EBT_BROUTE=y
CONFIG_STP=y
CONFIG_BRIDGE=y
CONFIG_BRIDGE_IGMP_SNOOPING=y
+CONFIG_BRIDGE_VLAN_FILTERING=y
CONFIG_HAVE_NET_DSA=y
-# CONFIG_VLAN_8021Q is not set
+CONFIG_VLAN_8021Q=y
+# CONFIG_VLAN_8021Q_GVRP is not set
+# CONFIG_VLAN_8021Q_MVRP is not set
# CONFIG_DECNET is not set
CONFIG_LLC=y
# CONFIG_LLC2 is not set
@@ -1270,13 +1278,14 @@ CONFIG_NET_CORE=y
CONFIG_MII=y
# CONFIG_IFB is not set
# CONFIG_NET_TEAM is not set
-# CONFIG_MACVLAN is not set
+CONFIG_MACVLAN=y
+# CONFIG_MACVTAP is not set
# CONFIG_VXLAN is not set
# CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_TUN is not set
-# CONFIG_VETH is not set
+CONFIG_TUN=y
+CONFIG_VETH=y
#
# CAIF transport drivers
@@ -1559,7 +1568,7 @@ CONFIG_VT_CONSOLE_SLEEP=y
CONFIG_HW_CONSOLE=y
CONFIG_VT_HW_CONSOLE_BINDING=y
CONFIG_UNIX98_PTYS=y
-# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256
# CONFIG_SERIAL_NONSTANDARD is not set