NVMe: Allow user initiated rescan

[linux-2.6-block.git] / lib / Kconfig.kasan

diff --git a/lib/Kconfig.kasan b/lib/Kconfig.kasan
index 0fee5acd5aa09e2bd65ade1200cae5e48bacfa22..67d8c6838ba95fe244060e1d67362220e646514f 100644 (file)
--- a/lib/Kconfig.kasan
+++ b/lib/Kconfig.kasan
@@ -5,8 +5,9 @@ if HAVE_ARCH_KASAN
 
 config KASAN
        bool "KASan: runtime memory debugger"
-       depends on SLUB_DEBUG
+       depends on SLUB_DEBUG || (SLAB && !DEBUG_SLAB)
        select CONSTRUCTORS
+       select STACKDEPOT if SLAB
        help
          Enables kernel address sanitizer - runtime memory debugger,
          designed to find out-of-bounds accesses and use-after-free bugs.
@@ -16,6 +17,8 @@ config KASAN
          This feature consumes about 1/8 of available memory and brings about
          ~x3 performance slowdown.
          For better error detection enable CONFIG_STACKTRACE.
+         Currently CONFIG_KASAN doesn't work with CONFIG_DEBUG_SLAB
+         (the resulting kernel does not boot).
 
 choice
        prompt "Instrumentation type"