aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/lib/Makefile
diff options
context:
space:
mode:
authorMarco Elver <elver@google.com>2019-11-14 19:03:03 +0100
committerPaul E. McKenney <paulmck@kernel.org>2019-11-16 07:23:16 -0800
commit40d04110f87940b6a03bf0aa19cd29e84f465f20 (patch)
tree85a7f42366dc040bad8e13608ce21c01d0a2222f /arch/x86/lib/Makefile
parentlocking/atomics, kcsan: Add KCSAN instrumentation (diff)
downloadlinux-dev-40d04110f87940b6a03bf0aa19cd29e84f465f20.tar.xz
linux-dev-40d04110f87940b6a03bf0aa19cd29e84f465f20.zip
x86, kcsan: Enable KCSAN for x86
This patch enables KCSAN for x86, with updates to build rules to not use KCSAN for several incompatible compilation units. Signed-off-by: Marco Elver <elver@google.com> Acked-by: Paul E. McKenney <paulmck@kernel.org> Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
Diffstat (limited to 'arch/x86/lib/Makefile')
-rw-r--r--arch/x86/lib/Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile
index 5246db42de45..432a07705677 100644
--- a/arch/x86/lib/Makefile
+++ b/arch/x86/lib/Makefile
@@ -6,10 +6,14 @@
# Produces uninteresting flaky coverage.
KCOV_INSTRUMENT_delay.o := n
+# KCSAN uses udelay for introducing watchpoint delay; avoid recursion.
+KCSAN_SANITIZE_delay.o := n
+
# Early boot use of cmdline; don't instrument it
ifdef CONFIG_AMD_MEM_ENCRYPT
KCOV_INSTRUMENT_cmdline.o := n
KASAN_SANITIZE_cmdline.o := n
+KCSAN_SANITIZE_cmdline.o := n
ifdef CONFIG_FUNCTION_TRACER
CFLAGS_REMOVE_cmdline.o = -pg