From: "tip-bot2 for Borislav Petkov" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Borislav Petkov <bp@suse.de>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/urgent] Revert "x86/boot: Mark prepare_command_line() __init"
Date: Wed, 15 Dec 2021 13:05:49 -0000 [thread overview]
Message-ID: <163957354901.23020.2806694166507690379.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20211213112757.2612-2-bp@alien8.de>
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@suse.de>
AuthorDate: Mon, 13 Dec 2021 12:27:55 +01:00
Committer: Borislav Petkov <bp@suse.de>
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@suse.de>
Link: https://lore.kernel.org/r/20211213112757.2612-2-bp@alien8.de
---
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
next prev parent reply other threads:[~2021-12-15 13:05 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-20 12:04 [PATCH v2] x86/setup: call early_reserve_memory() earlier Juergen Gross
2021-09-21 0:01 ` Marek Marczykowski-Górecki
2021-09-21 3:59 ` Nathan Chancellor
2021-09-22 17:18 ` [tip: x86/urgent] x86/setup: Call " tip-bot2 for Juergen Gross
2021-11-04 5:38 ` Williams, Dan J
2021-11-04 11:40 ` Borislav Petkov
2021-11-04 17:36 ` Dan Williams
2021-11-15 11:36 ` [tip: x86/urgent] x86/boot: Pull up cmdline preparation and early param parsing tip-bot2 for Borislav Petkov
2021-12-09 14:38 ` John Dorminy
2021-12-09 15:19 ` Borislav Petkov
2021-12-09 15:26 ` Juergen Gross
2021-12-09 15:28 ` Borislav Petkov
2021-12-09 16:29 ` Mike Rapoport
2021-12-09 16:37 ` Borislav Petkov
2021-12-10 11:28 ` Borislav Petkov
2021-12-10 20:11 ` Hugh Dickins
2021-12-11 10:14 ` Borislav Petkov
2021-12-10 20:32 ` Patrick J. Volkerding
2021-12-11 10:29 ` Borislav Petkov
2021-12-11 5:24 ` John Dorminy
2021-12-11 10:30 ` Borislav Petkov
2021-12-13 8:20 ` Mike Rapoport
2021-12-13 9:33 ` Borislav Petkov
2021-12-13 11:27 ` [PATCH 0/3] x86: Fix boot ordering issues yet again Borislav Petkov
2021-12-13 11:27 ` [PATCH 1/3] Revert "x86/boot: Mark prepare_command_line() __init" Borislav Petkov
2021-12-15 13:05 ` tip-bot2 for Borislav Petkov [this message]
2021-12-13 11:27 ` [PATCH 2/3] Revert "x86/boot: Pull up cmdline preparation and early param parsing" Borislav Petkov
2021-12-15 13:05 ` [tip: x86/urgent] " tip-bot2 for Borislav Petkov
2021-12-13 11:27 ` [PATCH 3/3] x86/boot: Move EFI range reservation after cmdline parsing Borislav Petkov
2021-12-15 13:12 ` [tip: x86/urgent] " tip-bot2 for Mike Rapoport
[not found] ` <CANGBn69pGb-nscv8tXN1UKDEQGEMWRKuPVPLgg+q2m7V_sBvHw@mail.gmail.com>
2021-12-20 18:49 ` [tip: x86/urgent] x86/boot: Pull up cmdline preparation and early param parsing Patrick J. Volkerding
2021-12-20 18:59 ` Borislav Petkov
2021-12-20 19:08 ` Borislav Petkov
2021-12-09 15:49 ` John Dorminy
2021-12-09 16:07 ` Borislav Petkov
2021-12-15 13:05 ` [tip: x86/urgent] x86/boot: Move EFI range reservation after cmdline parsing tip-bot2 for Mike Rapoport
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=163957354901.23020.2806694166507690379.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=bp@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).