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

[muen/linux.git] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index c88fa0eb49df4300269396fb03c1a48db012c817..8a7f7e1f2ca745dee2cac1d188a5389a46de406d 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -278,9 +278,6 @@ config HAVE_CLK
          The <linux/clk.h> calls support software clock gating and
          thus are a key power management tool on many systems.
 
-config HAVE_DMA_API_DEBUG
-       bool
-
 config HAVE_HW_BREAKPOINT
        bool
        depends on PERF_EVENTS
@@ -464,6 +461,10 @@ config GCC_PLUGIN_LATENT_ENTROPY
 config GCC_PLUGIN_STRUCTLEAK
        bool "Force initialization of variables containing userspace addresses"
        depends on GCC_PLUGINS
+       # Currently STRUCTLEAK inserts initialization out of live scope of
+       # variables from KASAN point of view. This leads to KASAN false
+       # positive reports. Prohibit this combination for now.
+       depends on !KASAN_EXTRA
        help
          This plugin zero-initializes any structures containing a
          __user attribute. This can prevent some classes of information
@@ -849,6 +850,21 @@ config OLD_SIGACTION
 config COMPAT_OLD_SIGACTION
        bool
 
+config 64BIT_TIME
+       def_bool ARCH_HAS_64BIT_TIME
+       help
+         This should be selected by all architectures that need to support
+         new system calls with a 64-bit time_t. This is relevant on all 32-bit
+         architectures, and 64-bit architectures as part of compat syscall
+         handling.
+
+config COMPAT_32BIT_TIME
+       def_bool (!64BIT && 64BIT_TIME) || COMPAT
+       help
+         This enables 32 bit time_t support in addition to 64 bit time_t support.
+         This is relevant on all 32-bit architectures, and 64-bit architectures
+         as part of compat syscall handling.
+
 config ARCH_NO_COHERENT_DMA_MMAP
        bool