Commit 4208d2d7 authored by Josh Poimboeuf's avatar Josh Poimboeuf Committed by Peter Zijlstra
Browse files

x86/head: Mark *_start_kernel() __noreturn 



Now that start_kernel() is __noreturn, mark its chain of callers
__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/c2525f96b88be98ee027ee0291d58003036d4120.1681342859.git.jpoimboe@kernel.org
parent 25a6917c

arch/x86/include/asm/setup.h

+3 −3
Original line number Diff line number Diff line
@@ -125,11 +125,11 @@ void clear_bss(void); 


#ifdef __i386__



asmlinkage void __init i386_start_kernel(void);

asmlinkage void __init __noreturn i386_start_kernel(void);



#else

asmlinkage void __init x86_64_start_kernel(char *real_mode);

asmlinkage void __init x86_64_start_reservations(char *real_mode_data);

asmlinkage void __init __noreturn x86_64_start_kernel(char *real_mode);

asmlinkage void __init __noreturn x86_64_start_reservations(char *real_mode_data);



#endif /* __i386__ */

#endif /* _SETUP */

arch/x86/kernel/head32.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ static void __init i386_default_early_setup(void) 
	x86_init.mpparse.setup_ioapic_ids = setup_ioapic_ids_from_mpc;

}



asmlinkage __visible void __init i386_start_kernel(void)

asmlinkage __visible void __init __noreturn i386_start_kernel(void)

{

	/* Make sure IDT is set up before any exception happens */

	idt_setup_early_handler();

arch/x86/kernel/head64.c

+2 −2
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ static void __init copy_bootdata(char *real_mode_data) 
	sme_unmap_bootdata(real_mode_data);

}



asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data)

asmlinkage __visible void __init __noreturn x86_64_start_kernel(char * real_mode_data)

{

	/*

	 * Build-time sanity checks on the kernel image and module
@@ -537,7 +537,7 @@ asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data) 
	x86_64_start_reservations(real_mode_data);

}



void __init x86_64_start_reservations(char *real_mode_data)

void __init __noreturn x86_64_start_reservations(char *real_mode_data)

{

	/* version is always not zero if it is copied */

	if (!boot_params.hdr.version)

tools/objtool/check.c

+2 −0
Original line number Diff line number Diff line
@@ -225,6 +225,8 @@ static bool __dead_end_function(struct objtool_file *file, struct symbol *func, 
		"start_kernel",

		"stop_this_cpu",

		"usercopy_abort",

		"x86_64_start_kernel",

		"x86_64_start_reservations",

		"xen_cpu_bringup_again",

		"xen_start_kernel",

	};