Merge tag 'iommu-updates-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro...

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

diff --git a/init/Kconfig b/init/Kconfig
index 5481b49e8c3f2a1e732fbe751e97b2d7b7d0bc0a..5b86082fa238a86462650deb6613772847b70c4e 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -285,7 +285,7 @@ config FHANDLE
 
 config USELIB
        bool "uselib syscall"
-       default y
+       def_bool ALPHA || M68K || SPARC || X86_32 || IA32_EMULATION
        help
          This option enables the uselib syscall, a system call used in the
          dynamic linker from libc5 and earlier.  glibc does not use this
@@ -299,20 +299,15 @@ config AUDIT
        help
          Enable auditing infrastructure that can be used with another
          kernel subsystem, such as SELinux (which requires this for
-         logging of avc messages output).  Does not do system-call
-         auditing without CONFIG_AUDITSYSCALL.
+         logging of avc messages output).  System call auditing is included
+         on architectures which support it.
 
 config HAVE_ARCH_AUDITSYSCALL
        bool
 
 config AUDITSYSCALL
-       bool "Enable system-call auditing support"
+       def_bool y
        depends on AUDIT && HAVE_ARCH_AUDITSYSCALL
-       default y if SECURITY_SELINUX
-       help
-         Enable low-overhead system-call auditing infrastructure that
-         can be used independently or with another kernel subsystem,
-         such as SELinux.
 
 config AUDIT_WATCH
        def_bool y