Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming

[karo-tx-linux.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index a905b7301e10201103da5832c66edf55d2b4cce4..3b9df1aa35db366a7063bd5b0cfa0b88efb5fb00 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -394,6 +394,7 @@ endchoice
 
 config BSD_PROCESS_ACCT
        bool "BSD Process Accounting"
+       depends on MULTIUSER
        help
          If you say Y here, a user level program will be able to instruct the
          kernel (via a special system call) to write process accounting
@@ -420,6 +421,7 @@ config BSD_PROCESS_ACCT_V3
 config TASKSTATS
        bool "Export task/process statistics through netlink"
        depends on NET
+       depends on MULTIUSER
        default n
        help
          Export selected statistics for tasks/processes through the
@@ -1160,6 +1162,7 @@ config CHECKPOINT_RESTORE
 
 menuconfig NAMESPACES
        bool "Namespaces support" if EXPERT
+       depends on MULTIUSER
        default !EXPERT
        help
          Provides the way to make tasks work with different objects using
@@ -1356,11 +1359,25 @@ menuconfig EXPERT
 
 config UID16
        bool "Enable 16-bit UID system calls" if EXPERT
-       depends on HAVE_UID16
+       depends on HAVE_UID16 && MULTIUSER
        default y
        help
          This enables the legacy 16-bit UID syscall wrappers.
 
+config MULTIUSER
+       bool "Multiple users, groups and capabilities support" if EXPERT
+       default y
+       help
+         This option enables support for non-root users, groups and
+         capabilities.
+
+         If you say N here, all processes will run with UID 0, GID 0, and all
+         possible capabilities.  Saying N here also compiles out support for
+         system calls related to UIDs, GIDs, and capabilities, such as setuid,
+         setgid, and capset.
+
+         If unsure, say Y here.
+
 config SGETMASK_SYSCALL
        bool "sgetmask/ssetmask syscalls support" if EXPERT
        def_bool PARISC || MN10300 || BLACKFIN || M68K || PPC || MIPS || X86 || SPARC || CRIS || MICROBLAZE || SUPERH