From: Borislav Petkov <bp@suse.de>
Date: Mon, 13 Dec 2021 11:27:55 +0000 (+0100)
Subject: Revert "x86/boot: Mark prepare_command_line() __init"
X-Git-Tag: v5.16-rc7~1^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=58e138d62476fc5f889252dcf73848beeaa54789;p=thirdparty%2Fkernel%2Flinux.git

Revert "x86/boot: Mark prepare_command_line() __init"

This reverts commit c0f2077baa4113f38f008b8e912b9fb3ff8d43df.

Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lore.kernel.org/r/20211213112757.2612-2-bp@alien8.de
---

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 6a190c7f4d71b..c410be738ae78 100644
--- 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 * __init prepare_command_line(void)
+static char *prepare_command_line(void)
 {
 #ifdef CONFIG_CMDLINE_BOOL
 #ifdef CONFIG_CMDLINE_OVERRIDE