Merge branch 'for-3.0' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc...

[~andy/linux] / security / Kconfig

diff --git a/security/Kconfig b/security/Kconfig
index 95accd442d55eeb5c81f6bcd39b63fc12e5a6f25..e0f08b52e4ab440933c9f72120092b8bcd527b46 100644 (file)
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -167,6 +167,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 65536
        help
          This is the portion of low virtual memory which should be protected