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

[platform/kernel/linux-starfive.git] / tools / objtool / check.c

diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index e3bb763..a22272c 100644 (file)
--- 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",