The following commit has been merged into the x86/urgent branch of tip: Commit-ID: 58e138d62476fc5f889252dcf73848beeaa54789 Gitweb: https://git.kernel.org/tip/58e138d62476fc5f889252dcf73848beeaa54789 Author: Borislav Petkov <bp@xxxxxxx> AuthorDate: Mon, 13 Dec 2021 12:27:55 +01:00 Committer: Borislav Petkov <bp@xxxxxxx> CommitterDate: Wed, 15 Dec 2021 11:14:28 +01:00 Revert "x86/boot: Mark prepare_command_line() __init" This reverts commit c0f2077baa4113f38f008b8e912b9fb3ff8d43df. Signed-off-by: Borislav Petkov <bp@xxxxxxx> Link: https://lore.kernel.org/r/20211213112757.2612-2-bp@xxxxxxxxx --- arch/x86/kernel/setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 6a190c7..c410be7 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
![]() |