Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / security / Kconfig

diff --git a/security/Kconfig b/security/Kconfig
index 5dfc206748cfbd76f2e1f3114515aba7294cf67c..fb3425231927e6fdec4031a8162ae9e409f5d8b3 100644 (file)
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -104,6 +104,14 @@ config SECURITY_ROOTPLUG
          
          If you are unsure how to answer this question, answer N.
 
+config SECURITY_LOWMEM
+       tristate "Low memory watermark support"
+       depends on SECURITY
+       help
+         Implements low memory watermark support
+
+         If you are unsure how to answer this question, answer N.
+
 config SECURITY_DEFAULT_MMAP_MIN_ADDR
         int "Low address space to protect from user allocation"
         depends on SECURITY
@@ -113,10 +121,12 @@ config SECURITY_DEFAULT_MMAP_MIN_ADDR
          from userspace allocation.  Keeping a user from writing to low pages
          can help reduce the impact of kernel NULL pointer bugs.
 
-         For most users with lots of address space a value of 65536 is
-         reasonable and should cause no problems.  Programs which use vm86
-         functionality would either need additional permissions from either
-         the LSM or the capabilities module or have this protection disabled.
+         For most ia64, ppc64 and x86 users with lots of address space
+         a value of 65536 is reasonable and should cause no problems.
+         On arm and other archs it should not be higher than 32768.
+         Programs which use vm86 functionality would either need additional
+         permissions from either the LSM or the capabilities module or have
+         this protection disabled.
 
          This value can be changed after boot using the
          /proc/sys/vm/mmap_min_addr tunable.