Merge tag 'x86-urgent-2021-11-28' of git://git.kernel.org/pub/scm/lin…

…ux/kernel/git/tip/tip Pull x86 build fix from Thomas Gleixner: "A single fix for a missing __init annotation of prepare_command_line()" * tag 'x86-urgent-2021-11-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/boot: Mark prepare_command_line() __init
mariux64 · Nov 28, 2021 · 9557e60 · 9557e60
2 parents 97891bb + c0f2077
commit 9557e60
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
@@ -742,7 +742,7 @@ dump_kernel_offset(struct notifier_block *self, unsigned long v, void *p)
 	return 0;
 }
 
-static char *prepare_command_line(void)
+static char * __init prepare_command_line(void)
 {
 #ifdef CONFIG_CMDLINE_BOOL
 #ifdef CONFIG_CMDLINE_OVERRIDE