Merge tag 'v5.5-rc4' into locking/kcsan, to resolve conflicts

[platform/kernel/linux-starfive.git] / drivers / firmware / efi / libstub / Makefile

diff --git a/drivers/firmware/efi/libstub/Makefile b/drivers/firmware/efi/libstub/Makefile
index c35f893..d54b8ff 100644 (file)
--- a/drivers/firmware/efi/libstub/Makefile
+++ b/drivers/firmware/efi/libstub/Makefile
@@ -31,7 +31,9 @@ KBUILD_CFLAGS                 := $(cflags-y) -DDISABLE_BRANCH_PROFILING \
                                   -D__DISABLE_EXPORTS
 
 GCOV_PROFILE                   := n
+# Sanitizer runtimes are unavailable and cannot be linked here.
 KASAN_SANITIZE                 := n
+KCSAN_SANITIZE                 := n
 UBSAN_SANITIZE                 := n
 OBJECT_FILES_NON_STANDARD      := y