diff options
author | 2020-05-08 14:58:28 +0200 | |
---|---|---|
committer | 2020-05-08 14:58:28 +0200 | |
commit | 97a9474aeb789183a1d0712e66a4283860279ac9 (patch) | |
tree | 4cd94285ef4a8e81c8d2e28f7dc9923cb60014e4 /tools/objtool | |
parent | Merge tag 'v5.7-rc1' into locking/kcsan, to resolve conflicts and refresh (diff) | |
parent | objtool, kcsan: Add kcsan_disable_current() and kcsan_enable_current_nowarn() (diff) | |
download | linux-97a9474aeb789183a1d0712e66a4283860279ac9.tar.gz linux-97a9474aeb789183a1d0712e66a4283860279ac9.tar.bz2 linux-97a9474aeb789183a1d0712e66a4283860279ac9.zip |
Merge branch 'kcsan-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into locking/kcsan
Pull KCSAN updates from Paul McKenney.
Diffstat (limited to 'tools/objtool')
-rw-r--r-- | tools/objtool/check.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/objtool/check.c b/tools/objtool/check.c index e3bb76358148..a22272c819f3 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -478,8 +478,12 @@ static const char *uaccess_safe_builtin[] = { "__asan_report_store8_noabort", "__asan_report_store16_noabort", /* KCSAN */ + "__kcsan_check_access", "kcsan_found_watchpoint", "kcsan_setup_watchpoint", + "kcsan_check_scoped_accesses", + "kcsan_disable_current", + "kcsan_enable_current_nowarn", /* KCSAN/TSAN */ "__tsan_func_entry", "__tsan_func_exit", |