Merge tag 'afs-fixes-20210315' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowe...

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

diff --git a/lib/Kconfig.kasan b/lib/Kconfig.kasan
index f5fa4ba..fba9909 100644 (file)
--- a/lib/Kconfig.kasan
+++ b/lib/Kconfig.kasan
@@ -156,6 +156,7 @@ config KASAN_STACK_ENABLE
 
 config KASAN_STACK
        int
+       depends on KASAN_GENERIC || KASAN_SW_TAGS
        default 1 if KASAN_STACK_ENABLE || CC_IS_GCC
        default 0
 
@@ -190,11 +191,11 @@ config KASAN_KUNIT_TEST
          kernel debugging features like KASAN.
 
          For more information on KUnit and unit tests in general, please refer
-         to the KUnit documentation in Documentation/dev-tools/kunit
+         to the KUnit documentation in Documentation/dev-tools/kunit.
 
-config TEST_KASAN_MODULE
+config KASAN_MODULE_TEST
        tristate "KUnit-incompatible tests of KASAN bug detection capabilities"
-       depends on m && KASAN
+       depends on m && KASAN && !KASAN_HW_TAGS
        help
          This is a part of the KASAN test suite that is incompatible with
          KUnit. Currently includes tests that do bad copy_from/to_user