Merge branch develop-3.10

[firefly-linux-kernel-4.4.55.git] / security / Kconfig

diff --git a/security/Kconfig b/security/Kconfig
index e9c6ac724fef153efb0c8ae3ceea6da99407ae7c..20a4e219f59bb1d56a0cab43378859d1eef720c5 100644 (file)
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -103,7 +103,7 @@ config INTEL_TXT
 config LSM_MMAP_MIN_ADDR
        int "Low address space for LSM to protect from user allocation"
        depends on SECURITY && SECURITY_SELINUX
-       default 32768 if ARM
+       default 32768 if ARM || (ARM64 && COMPAT)
        default 65536
        help
          This is the portion of low virtual memory which should be protected
@@ -122,6 +122,7 @@ source security/smack/Kconfig
 source security/tomoyo/Kconfig
 source security/apparmor/Kconfig
 source security/yama/Kconfig
+source security/tlk_driver/Kconfig
 
 source security/integrity/Kconfig