VisionFive2 Linux kernel

author: Kees Cook <keescook@chromium.org> 2020-04-06 20:12:27 -0700 committer: Linus Torvalds <torvalds@linux-foundation.org> 2020-04-07 10:43:44 -0700 commit: 0887a7ebc97770c7870abf3075a2e8cd502a7f52 parent: 7baf219982281034f8c3a806869873bf098fb611

Commit Summary:

ubsan: add trap instrumentation option

Diffstat:

1 file changed, 2 insertions, 0 deletions

diff --git a/lib/Makefile b/lib/Makefile
index 3fc06399295d..685aee60de1d 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -286,7 +286,9 @@ quiet_cmd_build_OID_registry = GEN     $@
 clean-files	+= oid_registry_data.c
 
 obj-$(CONFIG_UCS2_STRING) += ucs2_string.o
+ifneq ($(CONFIG_UBSAN_TRAP),y)
 obj-$(CONFIG_UBSAN) += ubsan.o
+endif
 
 UBSAN_SANITIZE_ubsan.o := n
 KASAN_SANITIZE_ubsan.o := n