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

[linux-2.6-microblaze.git] / lib / Makefile

diff --git a/lib/Makefile b/lib/Makefile
index 93217d4..135c6e4 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -24,6 +24,9 @@ KASAN_SANITIZE_string.o := n
 CFLAGS_string.o := $(call cc-option, -fno-stack-protector)
 endif
 
+# Used by KCSAN while enabled, avoid recursion.
+KCSAN_SANITIZE_random32.o := n
+
 lib-y := ctype.o string.o vsprintf.o cmdline.o \
         rbtree.o radix-tree.o timerqueue.o xarray.o \
         idr.o extable.o sha1.o irq_regs.o argv_split.o \