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

torvalds · torvalds · commit 9557e60b8c35 · 2021-11-28T09:24:50.000-08:00
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
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

Original file line number	Diff line number	Diff line change
`@@ -742,7 +742,7 @@ dump_kernel_offset(struct notifier_block self, unsigned long v, void p)`
`742`	`742`	`return 0;`
`743`	`743`	`}`
`744`	`744`
`745`		`-static char *prepare_command_line(void)`
	`745`	`+static char * __init prepare_command_line(void)`
`746`	`746`	`{`
`747`	`747`	`#ifdef CONFIG_CMDLINE_BOOL`
`748`	`748`	`#ifdef CONFIG_CMDLINE_OVERRIDE`