Merge tag 'dma-mapping-6.9-2024-03-24' of git://git.infradead.org/users/hch/dma-mapping

[thirdparty/linux.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index f3ea5dea9c8510db8148d0fb5f51fc6b441dbf06..aa02aec6aa7d29432f1974003900fce14bf14452 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1499,7 +1499,7 @@ config MULTIUSER
 
 config SGETMASK_SYSCALL
        bool "sgetmask/ssetmask syscalls support" if EXPERT
-       def_bool PARISC || M68K || PPC || MIPS || X86 || SPARC || MICROBLAZE || SUPERH
+       default PARISC || M68K || PPC || MIPS || X86 || SPARC || MICROBLAZE || SUPERH
        help
          sys_sgetmask and sys_ssetmask are obsolete system calls
          no longer supported in libc but still enabled by default in some
@@ -1986,6 +1986,9 @@ source "kernel/Kconfig.locks"
 config ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE
        bool
 
+config ARCH_HAS_PREPARE_SYNC_CORE_CMD
+       bool
+
 config ARCH_HAS_SYNC_CORE_BEFORE_USERMODE
        bool