2021-11-28 16:37:25

by Thomas Gleixner

Subject: [GIT pull] x86/urgent for v5.16-rc3

Linus,

please pull the latest x86/urgent branch from:

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

up to: c0f2077baa41: x86/boot: Mark prepare_command_line() __init


A single fix for a missing __init annotation of prepare_command_line().

Thanks,

tglx

------------------>
Borislav Petkov (1):
x86/boot: Mark prepare_command_line() __init


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 c410be738ae7..6a190c7f4d71 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 *prepare_command_line(void)
+static char * __init prepare_command_line(void)
{
#ifdef CONFIG_CMDLINE_BOOL
#ifdef CONFIG_CMDLINE_OVERRIDE

2021-11-28 17:56:30

by pr-tracker-bot

Subject: Re: [GIT pull] x86/urgent for v5.16-rc3

The pull request you sent on Sun, 28 Nov 2021 17:35:21 +0100 (CET):

> git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-urgent-2021-11-28

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/9557e60b8c3521e43bf5f21db95b2b42d7c43ac9

Thank you!

--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html