Merge tag 'docs-5.11-2' of git://git.lwn.net/linux

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

diff --git a/arch/Kconfig b/arch/Kconfig
index d4bdc19..78c6f05 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -143,6 +143,22 @@ config UPROBES
            managed by the kernel and kept transparent to the probed
            application. )
 
+config HAVE_64BIT_ALIGNED_ACCESS
+       def_bool 64BIT && !HAVE_EFFICIENT_UNALIGNED_ACCESS
+       help
+         Some architectures require 64 bit accesses to be 64 bit
+         aligned, which also requires structs containing 64 bit values
+         to be 64 bit aligned too. This includes some 32 bit
+         architectures which can do 64 bit accesses, as well as 64 bit
+         architectures without unaligned access.
+
+         This symbol should be selected by an architecture if 64 bit
+         accesses are required to be 64 bit aligned in this way even
+         though it is not a 64 bit architecture.
+
+         See Documentation/unaligned-memory-access.txt for more
+         information on the topic of unaligned memory accesses.
+
 config HAVE_EFFICIENT_UNALIGNED_ACCESS
        bool
        help
@@ -960,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