Merge tag 'kbuild-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy...

[platform/kernel/linux-rpi.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 8d1667f..d7163fc 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -765,6 +765,10 @@ config ARCH_SUPPORTS_NUMA_BALANCING
 config ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH
        bool
 
+config CC_HAS_INT128
+       def_bool y
+       depends on !$(cc-option,-D__SIZEOF_INT128__=0)
+
 #
 # For architectures that know their GCC __int128 support is sound
 #
@@ -1352,23 +1356,6 @@ config SYSFS_SYSCALL
 
          If unsure say Y here.
 
-config SYSCTL_SYSCALL
-       bool "Sysctl syscall support" if EXPERT
-       depends on PROC_SYSCTL
-       default n
-       select SYSCTL
-       ---help---
-         sys_sysctl uses binary paths that have been found challenging
-         to properly maintain and use.  The interface in /proc/sys
-         using paths with ascii names is now the primary path to this
-         information.
-
-         Almost nothing using the binary sysctl interface so if you are
-         trying to save some space it is probably safe to disable this,
-         making your kernel marginally smaller.
-
-         If unsure say N here.
-
 config FHANDLE
        bool "open by fhandle syscalls" if EXPERT
        select EXPORTFS
@@ -1528,6 +1515,7 @@ config AIO
 config IO_URING
        bool "Enable IO uring support" if EXPERT
        select ANON_INODES
+       select IO_WQ
        default y
        help
          This option enables support for the io_uring interface, enabling