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 9438535d7fd0f2bec51905538bd27b7f73f3ad25..a837ef536a93e92d867bb3e1d79bfc0c027e31ae 100644 (file)
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -112,6 +112,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