Merge branch 'kcsan-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck...

[sfrench/cifs-2.6.git] / tools / objtool / check.c

diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index 8dd01f986fbb5867ce4b24ebd0950eca401a01b5..a22272c819f30b536c24ef04aac4c6c595b44a03 100644 (file)
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -477,6 +477,28 @@ static const char *uaccess_safe_builtin[] = {
        "__asan_report_store4_noabort",
        "__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",
+       "__tsan_read_range",
+       "__tsan_write_range",
+       "__tsan_read1",
+       "__tsan_read2",
+       "__tsan_read4",
+       "__tsan_read8",
+       "__tsan_read16",
+       "__tsan_write1",
+       "__tsan_write2",
+       "__tsan_write4",
+       "__tsan_write8",
+       "__tsan_write16",
        /* KCOV */
        "write_comp_data",
        "__sanitizer_cov_trace_pc",