Skip to content

Commit f697cb0

Browse files
committed
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 <[email protected]> Reviewed-by: Boris Ostrovsky <[email protected]> Acked-by: Peter Zijlstra (Intel) <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Juergen Gross <[email protected]>
1 parent 336f560 commit f697cb0

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

arch/x86/xen/smp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ void xen_smp_send_reschedule(int cpu);
2121
void xen_smp_send_call_function_ipi(const struct cpumask *mask);
2222
void xen_smp_send_call_function_single_ipi(int cpu);
2323

24-
void xen_cpu_bringup_again(unsigned long stack);
24+
void __noreturn xen_cpu_bringup_again(unsigned long stack);
2525

2626
struct xen_common_irq {
2727
int irq;

arch/x86/xen/smp_pv.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ static void xen_pv_cpu_die(unsigned int cpu)
381381
}
382382
}
383383

384-
static void xen_pv_play_dead(void) /* used only with HOTPLUG_CPU */
384+
static void __noreturn xen_pv_play_dead(void) /* used only with HOTPLUG_CPU */
385385
{
386386
play_dead_common();
387387
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)
400400
BUG();
401401
}
402402

403-
static void xen_pv_play_dead(void)
403+
static void __noreturn xen_pv_play_dead(void)
404404
{
405405
BUG();
406406
}

tools/objtool/check.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ static bool __dead_end_function(struct objtool_file *file, struct symbol *func,
186186
"snp_abort",
187187
"stop_this_cpu",
188188
"usercopy_abort",
189+
"xen_cpu_bringup_again",
189190
"xen_start_kernel",
190191
};
191192

0 commit comments

Comments
 (0)