Commit 52668bad authored by Josh Poimboeuf's avatar Josh Poimboeuf Committed by Peter Zijlstra
Browse files

x86/cpu: Mark {hlt,resume}_play_dead() __noreturn 



Fixes the following warning:

  vmlinux.o: warning: objtool: resume_play_dead+0x21: unreachable instruction

Reported-by: default avatarkernel test robot <lkp@intel.com>
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/ce1407c4bf88b1334fe40413126343792a77ca50.1681342859.git.jpoimboe@kernel.org
parent 09c5ae30

arch/x86/include/asm/smp.h

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ int native_cpu_up(unsigned int cpunum, struct task_struct *tidle); 
int native_cpu_disable(void);

int common_cpu_die(unsigned int cpu);

void native_cpu_die(unsigned int cpu);

void hlt_play_dead(void);

void __noreturn hlt_play_dead(void);

void native_play_dead(void);

void play_dead_common(void);

void wbinvd_on_cpu(int cpu);

arch/x86/kernel/smpboot.c

+1 −1
Original line number Diff line number Diff line
@@ -1816,7 +1816,7 @@ static inline void mwait_play_dead(void) 
	}

}



void hlt_play_dead(void)

void __noreturn hlt_play_dead(void)

{

	if (__this_cpu_read(cpu_info.x86) >= 4)

		wbinvd();

arch/x86/power/cpu.c

+1 −1
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ EXPORT_SYMBOL(restore_processor_state); 
#endif



#if defined(CONFIG_HIBERNATION) && defined(CONFIG_HOTPLUG_CPU)

static void resume_play_dead(void)

static void __noreturn resume_play_dead(void)

{

	play_dead_common();

	tboot_shutdown(TB_SHUTDOWN_WFS);

tools/objtool/check.c

+2 −0
Original line number Diff line number Diff line
@@ -212,6 +212,7 @@ static bool __dead_end_function(struct objtool_file *file, struct symbol *func, 
		"do_task_dead",

		"ex_handler_msr_mce",

		"fortify_panic",

		"hlt_play_dead",

		"kthread_complete_and_exit",

		"kthread_exit",

		"kunit_try_catch_throw",
@@ -222,6 +223,7 @@ static bool __dead_end_function(struct objtool_file *file, struct symbol *func, 
		"panic",

		"panic_smp_self_stop",

		"rest_init",

		"resume_play_dead",

		"rewind_stack_and_make_dead",

		"sev_es_terminate",

		"snp_abort",