Merge git://git.infradead.org/users/eparis/audit

[cascardo/linux.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index d10a994..765018c 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -273,6 +273,16 @@ config FHANDLE
          get renamed. Enables open_by_handle_at(2) and name_to_handle_at(2)
          syscalls.
 
+config USELIB
+       bool "uselib syscall"
+       default y
+       help
+         This option enables the uselib syscall, a system call used in the
+         dynamic linker from libc5 and earlier.  glibc does not use this
+         system call.  If you intend to run programs built on libc5 or
+         earlier, you may need to enable this syscall.  Current systems
+         running glibc can safely disable this.
+
 config AUDIT
        bool "Auditing support"
        depends on NET
@@ -535,7 +545,7 @@ config CONTEXT_TRACKING_FORCE
          dynticks subsystem by forcing the context tracking on all
          CPUs in the system.
 
-         Say Y only if you're working on the developpement of an
+         Say Y only if you're working on the development of an
          architecture backend for the context tracking.
 
          Say N otherwise, this option brings an overhead that you
@@ -857,7 +867,7 @@ config NUMA_BALANCING
 
 menuconfig CGROUPS
        boolean "Control Group support"
-       depends on EVENTFD
+       select KERNFS
        help
          This option adds support for grouping sets of processes together, for
          use with process control subsystems such as Cpusets, CFS, memory
@@ -924,6 +934,7 @@ config MEMCG
        bool "Memory Resource Controller for Control Groups"
        depends on RESOURCE_COUNTERS
        select MM_OWNER
+       select EVENTFD
        help
          Provides a memory resource controller that manages both anonymous
          memory and page cache. (See Documentation/cgroups/memory.txt)
@@ -1119,8 +1130,6 @@ config IPC_NS
 
 config USER_NS
        bool "User namespace"
-       select UIDGID_STRICT_TYPE_CHECKS
-
        default n
        help
          This allows containers, i.e. vservers, to use user namespaces
@@ -1152,18 +1161,8 @@ config NET_NS
 
 endif # NAMESPACES
 
-config UIDGID_STRICT_TYPE_CHECKS
-       bool "Require conversions between uid/gids and their internal representation"
-       default n
-       help
-        While the nececessary conversions are being added to all subsystems this option allows
-        the code to continue to build for unconverted subsystems.
-
-        Say Y here if you want the strict type checking enabled
-
 config SCHED_AUTOGROUP
        bool "Automatic process group scheduling"
-       select EVENTFD
        select CGROUPS
        select CGROUP_SCHED
        select FAIR_GROUP_SCHED
@@ -1305,6 +1304,16 @@ config UID16
        help
          This enables the legacy 16-bit UID syscall wrappers.
 
+config SYSFS_SYSCALL
+       bool "Sysfs syscall support" if EXPERT
+       default y
+       ---help---
+         sys_sysfs is an obsolete system call no longer supported in libc.
+         Note that disabling this option is more secure but might break
+         compatibility with some systems.
+
+         If unsure say Y here.
+
 config SYSCTL_SYSCALL
        bool "Sysctl syscall support" if EXPERT
        depends on PROC_SYSCTL
@@ -1402,6 +1411,13 @@ config FUTEX
          support for "fast userspace mutexes".  The resulting kernel may not
          run glibc-based applications correctly.
 
+config HAVE_FUTEX_CMPXCHG
+       bool
+       help
+         Architectures should select this if futex_atomic_cmpxchg_inatomic()
+         is implemented and always working. This removes a couple of runtime
+         checks.
+
 config EPOLL
        bool "Enable eventpoll support" if EXPERT
        default y
@@ -1470,6 +1486,7 @@ config PCI_QUIRKS
 
 config EMBEDDED
        bool "Embedded system"
+       option allnoconfig_y
        select EXPERT
        help
          This option should be enabled if compiling the kernel for