Skip to content

Commit 7412a60

Browse files
jpoimboePeter Zijlstra
authored and
Peter Zijlstra
committed
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: Josh Poimboeuf <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Link: https://lore.kernel.org/r/92d76ab5c8bf660f04fdcd3da1084519212de248.1681342859.git.jpoimboe@kernel.org
1 parent 5ab6876 commit 7412a60

File tree

7 files changed

+6
-6
lines changed

7 files changed

+6
-6
lines changed

arch/arm/kernel/smp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -779,7 +779,7 @@ void smp_send_stop(void)
779779
* kdump fails. So split out the panic_smp_self_stop() and add
780780
* set_cpu_online(smp_processor_id(), false).
781781
*/
782-
void panic_smp_self_stop(void)
782+
void __noreturn panic_smp_self_stop(void)
783783
{
784784
pr_debug("CPU %u will stop doing anything useful since another CPU has paniced\n",
785785
smp_processor_id());

arch/arm64/include/asm/smp.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ bool cpus_are_stuck_in_kernel(void);
143143

144144
extern void crash_smp_send_stop(void);
145145
extern bool smp_crash_stop_failed(void);
146-
extern void panic_smp_self_stop(void);
147146

148147
#endif /* ifndef __ASSEMBLY__ */
149148

arch/arm64/kernel/smp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -830,7 +830,7 @@ static void __noreturn local_cpu_stop(void)
830830
* that cpu_online_mask gets correctly updated and smp_send_stop() can skip
831831
* CPUs that have already stopped themselves.
832832
*/
833-
void panic_smp_self_stop(void)
833+
void __noreturn panic_smp_self_stop(void)
834834
{
835835
local_cpu_stop();
836836
}

arch/powerpc/kernel/setup_64.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ void early_setup_secondary(void)
480480

481481
#endif /* CONFIG_SMP */
482482

483-
void panic_smp_self_stop(void)
483+
void __noreturn panic_smp_self_stop(void)
484484
{
485485
hard_irq_disable();
486486
spin_begin();

include/linux/smp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ int smp_call_function_single_async(int cpu, struct __call_single_data *csd);
5959
* Cpus stopping functions in panic. All have default weak definitions.
6060
* Architecture-dependent code may override them.
6161
*/
62-
void panic_smp_self_stop(void);
62+
void __noreturn panic_smp_self_stop(void);
6363
void nmi_panic_self_stop(struct pt_regs *regs);
6464
void crash_smp_send_stop(void);
6565

kernel/panic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ EXPORT_SYMBOL(panic_blink);
141141
/*
142142
* Stop ourself in panic -- architecture code may override this
143143
*/
144-
void __weak panic_smp_self_stop(void)
144+
void __weak __noreturn panic_smp_self_stop(void)
145145
{
146146
while (1)
147147
cpu_relax();

tools/objtool/check.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@ static bool __dead_end_function(struct objtool_file *file, struct symbol *func,
218218
"machine_real_restart",
219219
"make_task_dead",
220220
"panic",
221+
"panic_smp_self_stop",
221222
"rest_init",
222223
"rewind_stack_and_make_dead",
223224
"sev_es_terminate",

0 commit comments

Comments
 (0)