renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-11 14:53:56 +08:00
Code

init: Mark [arch_call_]rest_init() __noreturn

Browse Source 
In preparation for improving objtool's handling of weak noreturn
functions, mark start_kernel(), arch_call_rest_init(), and rest_init()
__noreturn.

Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Link: https://lore.kernel.org/r/7194ed8a989a85b98d92e62df660f4a90435a723.1681342859.git.jpoimboe@kernel.org
This commit is contained in:
Josh Poimboeuf 2023-04-12 16:49:31 -07:00 committed by Peter Zijlstra
parent 5743654f5e
commit 9ea7e6b62c
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/s390/kernel/setup.c
View File

@ -396,7 +396,7 @@ int __init arch_early_irq_init(void)
return 0;
}
void __init arch_call_rest_init(void)
void __init __noreturn arch_call_rest_init(void)
{
unsigned long stack;

4
include/linux/start_kernel.h
View File

@ -9,7 +9,7 @@
up something else. */
extern asmlinkage void __init start_kernel(void);
extern void __init arch_call_rest_init(void);
extern void __ref rest_init(void);
extern void __init __noreturn arch_call_rest_init(void);
extern void __ref __noreturn rest_init(void);
#endif /* _LINUX_START_KERNEL_H */

4
init/main.c
View File

@ -683,7 +683,7 @@ static void __init setup_command_line(char *command_line)
static __initdata DECLARE_COMPLETION(kthreadd_done);
noinline void __ref rest_init(void)
noinline void __ref __noreturn rest_init(void)
{
struct task_struct *tsk;
int pid;
@ -889,7 +889,7 @@ static int __init early_randomize_kstack_offset(char *buf)
early_param("randomize_kstack_offset", early_randomize_kstack_offset);
#endif
void __init __weak arch_call_rest_init(void)
void __init __weak __noreturn arch_call_rest_init(void)
{
rest_init();
}

2
tools/objtool/check.c
View File

@ -202,6 +202,7 @@ static bool __dead_end_function(struct objtool_file *file, struct symbol *func,
"__reiserfs_panic",
"__stack_chk_fail",
"__ubsan_handle_builtin_unreachable",
"arch_call_rest_init",
"arch_cpu_idle_dead",
"cpu_bringup_and_idle",
"cpu_startup_entry",
@ -217,6 +218,7 @@ static bool __dead_end_function(struct objtool_file *file, struct symbol *func,
"machine_real_restart",
"make_task_dead",
"panic",
"rest_init",
"rewind_stack_and_make_dead",
"sev_es_terminate",
"snp_abort",