Skip to content

Commit 06697ca

Browse files
Ingo Molnartorvalds
authored andcommitted
objtool: Remove btrfs_assertfail() from the noreturn exceptions list
The objtool merge in commit 6f61257 ("Merge tag 'objtool-core ...") generated a semantic conflict that was not resolved. The btrfs_assertfail() entry was removed from the noreturn list in commit b831306 ("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 6245ce4 ("objtool: Move noreturn function list to separate file"), and should be removed from that post-merge as well. Do it explicitly. Cc: David Sterba <[email protected]> Cc: Josh Poimboeuf <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: [email protected] Signed-off-by: Ingo Molnar <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 632f54b commit 06697ca

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

tools/objtool/noreturns.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ NORETURN(__stack_chk_fail)
1414
NORETURN(__ubsan_handle_builtin_unreachable)
1515
NORETURN(arch_call_rest_init)
1616
NORETURN(arch_cpu_idle_dead)
17-
NORETURN(btrfs_assertfail)
1817
NORETURN(cpu_bringup_and_idle)
1918
NORETURN(cpu_startup_entry)
2019
NORETURN(do_exit)

0 commit comments

Comments
 (0)