From: "tip-bot2 for Ingo Molnar" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: David Sterba <dsterba@suse.com>,
Josh Poimboeuf <jpoimboe@kernel.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Peter Zijlstra <peterz@infradead.org>,
linux-kernel@vger.kernel.org, Ingo Molnar <mingo@kernel.org>,
x86@kernel.org
Subject: [tip: objtool/urgent] objtool: Remove btrfs_assertfail() from the noreturn exceptions list
Date: Wed, 28 Jun 2023 09:25:19 -0000 [thread overview]
Message-ID: <168794431960.404.13615748804101554026.tip-bot2@tip-bot2> (raw)
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)
reply other threads:[~2023-06-28 9:31 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=168794431960.404.13615748804101554026.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=dsterba@suse.com \
--cc=jpoimboe@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=torvalds@linux-foundation.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®