Commit 7412a60d authored by Josh Poimboeuf's avatar Josh Poimboeuf Committed by Peter Zijlstra
Browse files

cpu: Mark panic_smp_self_stop() __noreturn 



In preparation for improving objtool's handling of weak noreturn
functions, mark panic_smp_self_stop() __noreturn.

Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@kernel.org>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/92d76ab5c8bf660f04fdcd3da1084519212de248.1681342859.git.jpoimboe@kernel.org
parent 5ab6876c

arch/arm/kernel/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -779,7 +779,7 @@ void smp_send_stop(void) 
 * kdump fails. So split out the panic_smp_self_stop() and add

 * set_cpu_online(smp_processor_id(), false).

 */

void panic_smp_self_stop(void)

void __noreturn panic_smp_self_stop(void)

{

	pr_debug("CPU %u will stop doing anything useful since another CPU has paniced\n",

	         smp_processor_id());

arch/arm64/include/asm/smp.h

+0 −1
Original line number Diff line number Diff line
@@ -143,7 +143,6 @@ bool cpus_are_stuck_in_kernel(void); 


extern void crash_smp_send_stop(void);

extern bool smp_crash_stop_failed(void);

extern void panic_smp_self_stop(void);



#endif /* ifndef __ASSEMBLY__ */

arch/arm64/kernel/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -830,7 +830,7 @@ static void __noreturn local_cpu_stop(void) 
 * that cpu_online_mask gets correctly updated and smp_send_stop() can skip

 * CPUs that have already stopped themselves.

 */

void panic_smp_self_stop(void)

void __noreturn panic_smp_self_stop(void)

{

	local_cpu_stop();

}

arch/powerpc/kernel/setup_64.c

+1 −1
Original line number Diff line number Diff line
@@ -480,7 +480,7 @@ void early_setup_secondary(void) 


#endif /* CONFIG_SMP */



void panic_smp_self_stop(void)

void __noreturn panic_smp_self_stop(void)

{

	hard_irq_disable();

	spin_begin();

include/linux/smp.h

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ int smp_call_function_single_async(int cpu, struct __call_single_data *csd); 
 * Cpus stopping functions in panic. All have default weak definitions.

 * Architecture-dependent code may override them.

 */

void panic_smp_self_stop(void);

void __noreturn panic_smp_self_stop(void);

void nmi_panic_self_stop(struct pt_regs *regs);

void crash_smp_send_stop(void);