From 06697ca69bcaa76046be14684f513a89d2c7a240 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Wed, 28 Jun 2023 11:16:03 +0200 Subject: [PATCH] objtool: Remove btrfs_assertfail() from the noreturn exceptions list The objtool merge in commit 6f612579be9d ("Merge tag 'objtool-core ...") generated a semantic conflict that was not resolved. The btrfs_assertfail() entry was removed from the noreturn list in commit b831306b3b7d ("btrfs: print assertion failure report and stack trace from the same line") because btrfs_assertfail() was changed from a noreturn function into a macro. The noreturn list was then moved from check.c to noreturns.h in commit 6245ce4ab670 ("objtool: Move noreturn function list to separate file"), and should be removed from that post-merge as well. Do it explicitly. Cc: David Sterba Cc: Josh Poimboeuf Cc: Peter Zijlstra Cc: linux-kernel@vger.kernel.org Signed-off-by: Ingo Molnar Signed-off-by: Linus Torvalds --- tools/objtool/noreturns.h | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/objtool/noreturns.h b/tools/objtool/noreturns.h index 1514e84..e45c7cb 100644 --- a/tools/objtool/noreturns.h +++ b/tools/objtool/noreturns.h @@ -14,7 +14,6 @@ NORETURN(__stack_chk_fail) NORETURN(__ubsan_handle_builtin_unreachable) NORETURN(arch_call_rest_init) NORETURN(arch_cpu_idle_dead) -NORETURN(btrfs_assertfail) NORETURN(cpu_bringup_and_idle) NORETURN(cpu_startup_entry) NORETURN(do_exit) -- 2.7.4