diff options
author | Ingo Molnar <mingo@kernel.org> | 2020-01-24 09:33:52 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2020-01-24 09:35:51 +0100 |
commit | 7add7875a8eb4ffe5eddaf8a11e409c9e1b6e3f3 (patch) | |
tree | 62f720dcb9326470c76a38afb1c61a2b8cecce45 /lib/Makefile | |
parent | Merge tag 'v5.5-rc7' into locking/kcsan, to refresh the tree (diff) | |
parent | kcsan: Add __no_kcsan function attribute (diff) | |
download | linux-7add7875a8eb4ffe5eddaf8a11e409c9e1b6e3f3.tar.xz linux-7add7875a8eb4ffe5eddaf8a11e409c9e1b6e3f3.zip |
Merge branch 'kcsan.2020.01.07a' into locking/kcsan
Pull KCSAN updates from Paul E. McKenney:
- UBSAN fixes
- inlining updates
- documentation updates
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'lib/Makefile')
-rw-r--r-- | lib/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/Makefile b/lib/Makefile index 135c6e468a54..e8fe705e720f 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -282,6 +282,7 @@ obj-$(CONFIG_UBSAN) += ubsan.o 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 |