Skip to content

Commit

Permalink
x86/xen: mark xen_pv_play_dead() as __noreturn
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Juergen Gross committed Feb 13, 2023
1 parent 336f560 commit f697cb0
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion arch/x86/xen/smp.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions arch/x86/xen/smp_pv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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();
}
Expand Down
1 change: 1 addition & 0 deletions tools/objtool/check.c
Original file line number Diff line number Diff line change
Expand Up @@ -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",
};

Expand Down

0 comments on commit f697cb0

Please sign in to comment.