diff options
| author | Ingo Molnar <mingo@kernel.org> | 2023-06-28 11:16:03 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-06-30 02:27:47 +0200 |
| commit | 06697ca69bcaa76046be14684f513a89d2c7a240 (patch) | |
| tree | 78f8cbde9b5d1eae3318bb441cac50779fcd6bcd /tools/objtool | |
| parent | Merge tag 'slab-for-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/vba... (diff) | |
| download | linux-06697ca69bcaa76046be14684f513a89d2c7a240.tar.xz linux-06697ca69bcaa76046be14684f513a89d2c7a240.zip | |
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 <dsterba@suse.com>
Cc: Josh Poimboeuf <jpoimboe@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'tools/objtool')
| -rw-r--r-- | tools/objtool/noreturns.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/objtool/noreturns.h b/tools/objtool/noreturns.h index 1514e84d5cc4..e45c7cb1d5bc 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) |