aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJorge Lucangeli Obes <jorgelo@google.com>2015-09-28 15:11:25 -0700
committerBruce Beare <bruce.j.beare@intel.com>2015-10-07 13:11:49 -0700
commitf87e4ada0acc7ae6046a66315a2f96a3e64aeffa (patch)
tree92c0160a1392c204e0dfc2ce4442c050113cf519
parent4a333994888f39ee3b380fe22092ef42cc1c06af (diff)
downloadedison-v3.10-f87e4ada0acc7ae6046a66315a2f96a3e64aeffa.tar.gz
edison: Add namespaces and seccomp to the kernel.
Bug: 24475250 Change-Id: Ib9678d7b3ee56b3c6e2854e2d1ac238e78083110
-rw-r--r--arch/x86/configs/i386_brillo_edison_defconfig6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/configs/i386_brillo_edison_defconfig b/arch/x86/configs/i386_brillo_edison_defconfig
index 6250e324514..148f852c8d9 100644
--- a/arch/x86/configs/i386_brillo_edison_defconfig
+++ b/arch/x86/configs/i386_brillo_edison_defconfig
@@ -149,10 +149,10 @@ CONFIG_BLK_CGROUP=y
# CONFIG_DEBUG_BLK_CGROUP is not set
# CONFIG_CHECKPOINT_RESTORE is not set
CONFIG_NAMESPACES=y
-# CONFIG_UTS_NS is not set
-# CONFIG_IPC_NS is not set
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
# CONFIG_USER_NS is not set
-# CONFIG_PID_NS is not set
+CONFIG_PID_NS=y
CONFIG_NET_NS=y
CONFIG_UIDGID_CONVERTED=y
# CONFIG_UIDGID_STRICT_TYPE_CHECKS is not set