Skip to content

Commit 4208d2d

Browse files
jpoimboePeter Zijlstra
authored andcommitted
x86/head: Mark *_start_kernel() __noreturn
Now that start_kernel() is __noreturn, mark its chain of callers __noreturn. Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Link: https://lore.kernel.org/r/c2525f96b88be98ee027ee0291d58003036d4120.1681342859.git.jpoimboe@kernel.org
1 parent 25a6917 commit 4208d2d

4 files changed

Lines changed: 8 additions & 6 deletions

File tree

arch/x86/include/asm/setup.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,11 @@ void clear_bss(void);
125125

126126
#ifdef __i386__
127127

128-
asmlinkage void __init i386_start_kernel(void);
128+
asmlinkage void __init __noreturn i386_start_kernel(void);
129129

130130
#else
131-
asmlinkage void __init x86_64_start_kernel(char *real_mode);
132-
asmlinkage void __init x86_64_start_reservations(char *real_mode_data);
131+
asmlinkage void __init __noreturn x86_64_start_kernel(char *real_mode);
132+
asmlinkage void __init __noreturn x86_64_start_reservations(char *real_mode_data);
133133

134134
#endif /* __i386__ */
135135
#endif /* _SETUP */

arch/x86/kernel/head32.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ static void __init i386_default_early_setup(void)
2929
x86_init.mpparse.setup_ioapic_ids = setup_ioapic_ids_from_mpc;
3030
}
3131

32-
asmlinkage __visible void __init i386_start_kernel(void)
32+
asmlinkage __visible void __init __noreturn i386_start_kernel(void)
3333
{
3434
/* Make sure IDT is set up before any exception happens */
3535
idt_setup_early_handler();

arch/x86/kernel/head64.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ static void __init copy_bootdata(char *real_mode_data)
471471
sme_unmap_bootdata(real_mode_data);
472472
}
473473

474-
asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data)
474+
asmlinkage __visible void __init __noreturn x86_64_start_kernel(char * real_mode_data)
475475
{
476476
/*
477477
* 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)
537537
x86_64_start_reservations(real_mode_data);
538538
}
539539

540-
void __init x86_64_start_reservations(char *real_mode_data)
540+
void __init __noreturn x86_64_start_reservations(char *real_mode_data)
541541
{
542542
/* version is always not zero if it is copied */
543543
if (!boot_params.hdr.version)

tools/objtool/check.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,8 @@ static bool __dead_end_function(struct objtool_file *file, struct symbol *func,
225225
"start_kernel",
226226
"stop_this_cpu",
227227
"usercopy_abort",
228+
"x86_64_start_kernel",
229+
"x86_64_start_reservations",
228230
"xen_cpu_bringup_again",
229231
"xen_start_kernel",
230232
};

0 commit comments

Comments
 (0)