diff --git a/[refs] b/[refs] index c264f13c3fc4..3b379df74b38 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a58578e47f004017cf47803ad372490806630e58 +refs/heads/master: 024e6cb408307de41cbfcb1e5a170d9af60ab2a9 diff --git a/trunk/security/Kconfig b/trunk/security/Kconfig index bba92689b567..4c865345caa0 100644 --- a/trunk/security/Kconfig +++ b/trunk/security/Kconfig @@ -114,7 +114,7 @@ config SECURITY_ROOTPLUG If you are unsure how to answer this question, answer N. config LSM_MMAP_MIN_ADDR - int "Low address space for LSM to from user allocation" + int "Low address space for LSM to protect from user allocation" depends on SECURITY && SECURITY_SELINUX default 65536 help