Merge branch 'x86/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...

[pandora-kernel.git] / security / Kconfig

diff --git a/security/Kconfig b/security/Kconfig
index 5dfc206..62ed471 100644 (file)
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -73,17 +73,9 @@ config SECURITY_NETWORK_XFRM
          IPSec.
          If you are unsure how to answer this question, answer N.
 
-config SECURITY_CAPABILITIES
-       bool "Default Linux Capabilities"
-       depends on SECURITY
-       default y
-       help
-         This enables the "default" Linux capabilities functionality.
-         If you are unsure how to answer this question, answer Y.
-
 config SECURITY_FILE_CAPABILITIES
        bool "File POSIX Capabilities (EXPERIMENTAL)"
-       depends on (SECURITY=n || SECURITY_CAPABILITIES!=n) && EXPERIMENTAL
+       depends on EXPERIMENTAL
        default n
        help
          This enables filesystem capabilities, allowing you to give
@@ -113,10 +105,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.