diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2020-05-04 15:25:30 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2020-05-04 15:25:30 +0200 |
| commit | a8644aebec1152b992d5d54a05a538d338262944 (patch) | |
| tree | 5c0084fbcaf77545497d0ca92bc033693b185653 /lib/Makefile | |
| parent | 9e96e646e6f890308110cb7c81f200f5211cf082 (diff) | |
| parent | 3b02a051d25d9600e9d403ad3043aed7de00160e (diff) | |
Merge branch 'locking/kcsan' into x86/entryentry-base
Pull the pending KCSAN changes as the required changes vs. atomics to fixup
INT3 interfere with the KCSAN modifications of atomics.
Diffstat (limited to 'lib/Makefile')
| -rw-r--r-- | lib/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/Makefile b/lib/Makefile index 685aee60de1d..ab68a8674360 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -25,6 +25,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 \ @@ -292,6 +295,7 @@ endif UBSAN_SANITIZE_ubsan.o := n KASAN_SANITIZE_ubsan.o := n +KCSAN_SANITIZE_ubsan.o := n CFLAGS_ubsan.o := $(call cc-option, -fno-stack-protector) $(DISABLE_STACKLEAK_PLUGIN) obj-$(CONFIG_SBITMAP) += sbitmap.o |