From: "tip-bot2 for Juergen Gross" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Juergen Gross <jgross@suse.com>,
Boris Ostrovsky <boris.ostrovsky@oracle.com>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: objtool/core] x86/xen: mark xen_pv_play_dead() as __noreturn
Date: Sun, 12 Feb 2023 10:03:43 -0000 [thread overview]
Message-ID: <167619622384.4906.15498256119270145523.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20221125063248.30256-3-jgross@suse.com>
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 1aff0d2658e5a5217d3168e06a90fbb99fa63e80
Gitweb: https://git.kernel.org/tip/1aff0d2658e5a5217d3168e06a90fbb99fa63e80
Author: Juergen Gross <jgross@suse.com>
AuthorDate: Fri, 25 Nov 2022 07:32:48 +01:00
Committer: Juergen Gross <jgross@suse.com>
CommitterDate: Tue, 17 Jan 2023 09:05:32 +01:00
x86/xen: mark xen_pv_play_dead() as __noreturn
Mark xen_pv_play_dead() and related to that xen_cpu_bringup_again()
as "__noreturn".
Signed-off-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20221125063248.30256-3-jgross@suse.com
Signed-off-by: Juergen Gross <jgross@suse.com>
---
arch/x86/xen/smp.h | 2 +-
arch/x86/xen/smp_pv.c | 4 ++--
tools/objtool/check.c | 1 +
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/arch/x86/xen/smp.h b/arch/x86/xen/smp.h
index 6e90a31..22fb982 100644
--- a/arch/x86/xen/smp.h
+++ b/arch/x86/xen/smp.h
@@ -21,7 +21,7 @@ void xen_smp_send_reschedule(int cpu);
void xen_smp_send_call_function_ipi(const struct cpumask *mask);
void xen_smp_send_call_function_single_ipi(int cpu);
-void xen_cpu_bringup_again(unsigned long stack);
+void __noreturn xen_cpu_bringup_again(unsigned long stack);
struct xen_common_irq {
int irq;
diff --git a/arch/x86/xen/smp_pv.c b/arch/x86/xen/smp_pv.c
index a97b050..a9cf8c8 100644
--- a/arch/x86/xen/smp_pv.c
+++ b/arch/x86/xen/smp_pv.c
@@ -381,7 +381,7 @@ static void xen_pv_cpu_die(unsigned int cpu)
}
}
-static void xen_pv_play_dead(void) /* used only with HOTPLUG_CPU */
+static void __noreturn xen_pv_play_dead(void) /* used only with HOTPLUG_CPU */
{
play_dead_common();
HYPERVISOR_vcpu_op(VCPUOP_down, xen_vcpu_nr(smp_processor_id()), NULL);
@@ -400,7 +400,7 @@ static void xen_pv_cpu_die(unsigned int cpu)
BUG();
}
-static void xen_pv_play_dead(void)
+static void __noreturn xen_pv_play_dead(void)
{
BUG();
}
diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index 4b7c8b3..68e87b4 100644
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -186,6 +186,7 @@ static bool __dead_end_function(struct objtool_file *file, struct symbol *func,
"snp_abort",
"stop_this_cpu",
"usercopy_abort",
+ "xen_cpu_bringup_again",
"xen_start_kernel",
};
next prev parent reply other threads:[~2023-02-12 10:04 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-25 6:32 [PATCH 0/2] x86/xen: don't return from xen_pv_play_dead() Juergen Gross
2022-11-25 6:32 ` [PATCH 1/2] x86/xen: don't let xen_pv_play_dead() return Juergen Gross
2023-02-12 10:03 ` [tip: objtool/core] " tip-bot2 for Juergen Gross
2022-11-25 6:32 ` [PATCH 2/2] x86/xen: mark xen_pv_play_dead() as __noreturn Juergen Gross
2023-02-12 10:03 ` tip-bot2 for Juergen Gross [this message]
2023-01-16 7:49 ` [PATCH 0/2] x86/xen: don't return from xen_pv_play_dead() Juergen Gross
2023-01-16 20:46 ` Boris Ostrovsky
2023-01-16 9:12 ` Peter Zijlstra
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=167619622384.4906.15498256119270145523.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=boris.ostrovsky@oracle.com \
--cc=jgross@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=peterz@infradead.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®