Merge branch 'x86/kdump' into locking/kcsan, to resolve conflicts

[linux-2.6-microblaze.git] / arch / x86 / purgatory / Makefile

diff --git a/arch/x86/purgatory/Makefile b/arch/x86/purgatory/Makefile
index 54aadbb..b04e6e7 100644 (file)
--- a/arch/x86/purgatory/Makefile
+++ b/arch/x86/purgatory/Makefile
@@ -25,6 +25,7 @@ targets += purgatory.ro purgatory.chk
 GCOV_PROFILE   := n
 KASAN_SANITIZE := n
 UBSAN_SANITIZE := n
+KCSAN_SANITIZE := n
 KCOV_INSTRUMENT := n
 
 # These are adjustments to the compiler flags used for objects that