Merge tag 'dax-fixes-6.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm...

[platform/kernel/linux-starfive.git] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index 5dbf11a..8f138e5 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -355,6 +355,12 @@ config HAVE_RSEQ
          This symbol should be selected by an architecture if it
          supports an implementation of restartable sequences.
 
+config HAVE_RUST
+       bool
+       help
+         This symbol should be selected by an architecture if it
+         supports Rust.
+
 config HAVE_FUNCTION_ARG_ACCESS_API
        bool
        help
@@ -738,11 +744,13 @@ config ARCH_SUPPORTS_CFI_CLANG
          An architecture should select this option if it can support Clang's
          Control-Flow Integrity (CFI) checking.
 
+config ARCH_USES_CFI_TRAPS
+       bool
+
 config CFI_CLANG
        bool "Use Clang's Control Flow Integrity (CFI)"
-       depends on LTO_CLANG && ARCH_SUPPORTS_CFI_CLANG
-       depends on CLANG_VERSION >= 140000
-       select KALLSYMS
+       depends on ARCH_SUPPORTS_CFI_CLANG
+       depends on $(cc-option,-fsanitize=kcfi)
        help
          This option enables Clang’s forward-edge Control Flow Integrity
          (CFI) checking, where the compiler injects a runtime check to each
@@ -754,16 +762,6 @@ config CFI_CLANG
 
            https://clang.llvm.org/docs/ControlFlowIntegrity.html
 
-config CFI_CLANG_SHADOW
-       bool "Use CFI shadow to speed up cross-module checks"
-       default y
-       depends on CFI_CLANG && MODULES
-       help
-         If you select this option, the kernel builds a fast look-up table of
-         CFI check functions in loaded modules to reduce performance overhead.
-
-         If unsure, say Y.
-
 config CFI_PERMISSIVE
        bool "Use CFI in permissive mode"
        depends on CFI_CLANG
@@ -923,6 +921,9 @@ config HAVE_SOFTIRQ_ON_OWN_STACK
          Architecture provides a function to run __do_softirq() on a
          separate stack.
 
+config SOFTIRQ_ON_OWN_STACK
+       def_bool HAVE_SOFTIRQ_ON_OWN_STACK && !PREEMPT_RT
+
 config ALTERNATE_USER_ADDRESS_SPACE
        bool
        help
@@ -1415,6 +1416,14 @@ config DYNAMIC_SIGFRAME
 config HAVE_ARCH_NODE_DEV_GROUP
        bool
 
+config ARCH_HAS_NONLEAF_PMD_YOUNG
+       bool
+       help
+         Architectures that select this option are capable of setting the
+         accessed bit in non-leaf PMD entries when using them as part of linear
+         address translations. Page table walkers that clear the accessed bit
+         may use this capability to reduce their search space.
+
 source "kernel/gcov/Kconfig"
 
 source "scripts/gcc-plugins/Kconfig"