Merge tag 'for-5.11/dm-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/device...

[linux-2.6-microblaze.git] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index a08999d..78c6f05 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -976,16 +976,16 @@ config VMAP_STACK
        default y
        bool "Use a virtually-mapped stack"
        depends on HAVE_ARCH_VMAP_STACK
-       depends on !KASAN || KASAN_VMALLOC
+       depends on !KASAN || KASAN_HW_TAGS || KASAN_VMALLOC
        help
          Enable this if you want the use virtually-mapped kernel stacks
          with guard pages.  This causes kernel stack overflows to be
          caught immediately rather than causing difficult-to-diagnose
          corruption.
 
-         To use this with KASAN, the architecture must support backing
-         virtual mappings with real shadow memory, and KASAN_VMALLOC must
-         be enabled.
+         To use this with software KASAN modes, the architecture must support
+         backing virtual mappings with real shadow memory, and KASAN_VMALLOC
+         must be enabled.
 
 config ARCH_OPTIONAL_KERNEL_RWX
        def_bool n