aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-06-17 12:41:48 +0100
committerMark Brown <broonie@linaro.org>2014-06-17 12:41:48 +0100
commitd7610b8eafd543c7f75568dcaeead439f31ffa53 (patch)
tree22078326f9df8f90bf5d2e11ec0c203650f5a6b7
parent5997b6c787b91786620c65b768075ddc1fc44b20 (diff)
parent94f167639c8bc56e584f6e156babf8102449daf1 (diff)
downloadlinux-d7610b8eafd543c7f75568dcaeead439f31ffa53.tar.gz
Merge remote-tracking branch 'lsk/v3.10/topic/configs' into linux-linaro-lsk
-rw-r--r--linaro/configs/linaro-base.conf10
1 files changed, 10 insertions, 0 deletions
diff --git a/linaro/configs/linaro-base.conf b/linaro/configs/linaro-base.conf
index fa38b9e4436..1cdf0ba23e2 100644
--- a/linaro/configs/linaro-base.conf
+++ b/linaro/configs/linaro-base.conf
@@ -103,3 +103,13 @@ CONFIG_FTRACE_SYSCALLS=y
CONFIG_STACK_TRACER=y
CONFIG_FUNCTION_PROFILER=y
CONFIG_MAILBOX=y
+CONFIG_AUDIT=y
+CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y
+CONFIG_NETFILTER_XT_TARGET_SECMARK=y
+CONFIG_IP_NF_SECURITY=y
+CONFIG_SECURITY=y
+CONFIG_SECURITY_NETWORK=y
+CONFIG_LSM_MMAP_MIN_ADDR=4096
+CONFIG_SECURITY_SELINUX=y
+CONFIG_EXT4_FS_SECURITY=y