Merge tag 'timers-core-2020-08-14' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / scripts / Makefile.kasan

diff --git a/scripts/Makefile.kasan b/scripts/Makefile.kasan
index 03757cc..f4beee1 100644 (file)
--- a/scripts/Makefile.kasan
+++ b/scripts/Makefile.kasan
@@ -44,7 +44,8 @@ else
 endif
 
 CFLAGS_KASAN := -fsanitize=kernel-hwaddress \
-               -mllvm -hwasan-instrument-stack=0 \
+               -mllvm -hwasan-instrument-stack=$(CONFIG_KASAN_STACK) \
+               -mllvm -hwasan-use-short-granules=0 \
                $(instrumentation_flags)
 
 endif # CONFIG_KASAN_SW_TAGS