[tip: objtool/urgent] objtool: Remove btrfs_assertfail() from the noreturn exceptions list

[tip: objtool/urgent] objtool: Remove btrfs_assertfail() from the noreturn exceptions list

[tip-bot2 for Ingo Molnar]

The following commit has been merged into the objtool/urgent branch of tip:

Commit-ID:     cc592643a3ea1b2231628fb414dee203633a11c0
Gitweb:        https://git.kernel.org/tip/cc592643a3ea1b2231628fb414dee203633a11c0
Author:        Ingo Molnar <mingo@kernel.org>
AuthorDate:    Wed, 28 Jun 2023 11:16:03 +02:00
Committer:     Ingo Molnar <mingo@kernel.org>
CommitterDate: Wed, 28 Jun 2023 11:21:50 +02:00

objtool: Remove btrfs_assertfail() from the noreturn exceptions list

Upstream merge commit:

  6f612579be9d Merge tag 'objtool-core-2023-06-27' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

... generated a (minor) semantic conflict that was not resolved: the btrfs_assertfail()
entry that was removed from the list in tools/objtool/check.c in:

  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.

But the list was moved to a different file, in a different enumeration format:

  6245ce4ab670 ("objtool: Move noreturn function list to separate file")

And has to be removed from tools/objtool/noreturns.h post-merge as well.

Do it explicitly.

Cc: David Sterba <dsterba@suse.com>
Cc: Josh Poimboeuf <jpoimboe@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 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)