From: tip-bot for Borislav Petkov <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: tglx@linutronix.de, linux-kernel@vger.kernel.org, bp@suse.de,
hpa@zytor.com, mingo@kernel.org
Subject: [tip:x86/boot] x86/boot: Build the command line parsing code unconditionally
Date: Fri, 1 Feb 2019 02:57:58 -0800 [thread overview]
Message-ID: <tip-ac09c5f43cf613939850cc38d7a34ae6556016ba@git.kernel.org> (raw)
In-Reply-To: <20190130112238.GB18383@zn.tnic>
Commit-ID: ac09c5f43cf613939850cc38d7a34ae6556016ba
Gitweb: https://git.kernel.org/tip/ac09c5f43cf613939850cc38d7a34ae6556016ba
Author: Borislav Petkov <bp@suse.de>
AuthorDate: Wed, 30 Jan 2019 11:19:37 +0100
Committer: Borislav Petkov <bp@suse.de>
CommitDate: Fri, 1 Feb 2019 11:51:01 +0100
x86/boot: Build the command line parsing code unconditionally
Just drop the three-item ifdeffery and build it in unconditionally.
Early cmdline parsing is needed more often than not.
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: bhe@redhat.com
Cc: hpa@zytor.com
Cc: indou.takao@jp.fujitsu.com
Cc: kasong@redhat.com
Cc: keescook@chromium.org
Cc: mingo@redhat.com
Cc: msys.mizuma@gmail.com
Cc: tglx@linutronix.de
Cc: x86@kernel.org
Link: https://lkml.kernel.org/r/20190130112238.GB18383@zn.tnic
---
arch/x86/boot/compressed/cmdline.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/arch/x86/boot/compressed/cmdline.c b/arch/x86/boot/compressed/cmdline.c
index af6cda0b7900..f1add5d85da9 100644
--- a/arch/x86/boot/compressed/cmdline.c
+++ b/arch/x86/boot/compressed/cmdline.c
@@ -1,8 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
#include "misc.h"
-#if CONFIG_EARLY_PRINTK || CONFIG_RANDOMIZE_BASE || CONFIG_X86_5LEVEL
-
static unsigned long fs;
static inline void set_fs(unsigned long seg)
{
@@ -30,5 +28,3 @@ int cmdline_find_option_bool(const char *option)
{
return __cmdline_find_option_bool(get_cmd_line_ptr(), option);
}
-
-#endif
prev parent reply other threads:[~2019-02-01 10:58 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-23 11:08 [PATCH v16 0/7] Parse ACPI table and limit KASLR to choosing immovable memory Chao Fan
2019-01-23 11:08 ` [PATCH v16 1/7] x86/boot: Copy kstrtoull() to boot/string.c instead of simple_strtoull() Chao Fan
2019-02-01 10:58 ` [tip:x86/boot] x86/boot: Copy kstrtoull() to boot/string.c tip-bot for Chao Fan
2019-01-23 11:08 ` [PATCH v16 2/7] x86/boot: Introduce get_acpi_rsdp() to parse RSDP in cmdline from KEXEC Chao Fan
2019-02-01 10:59 ` [tip:x86/boot] x86/boot: Add "acpi_rsdp=" early parsing tip-bot for Chao Fan
2019-01-23 11:08 ` [PATCH v16 3/7] x86/boot: Introduce efi_get_rsdp_addr() to find RSDP from EFI table Chao Fan
2019-02-01 10:59 ` [tip:x86/boot] x86/boot: Search for RSDP in the EFI tables tip-bot for Chao Fan
2019-01-23 11:08 ` [PATCH v16 4/7] x86/boot: Introduce bios_get_rsdp_addr() to search RSDP in memory Chao Fan
2019-02-01 11:00 ` [tip:x86/boot] x86/boot: Search for " tip-bot for Chao Fan
2019-01-23 11:08 ` [PATCH v16 5/7] x86/boot: Early parse RSDP and fill in boot_params Chao Fan
2019-01-23 11:17 ` Chao Fan
2019-02-01 11:01 ` [tip:x86/boot] x86/boot: Early parse RSDP and save it " tip-bot for Chao Fan
2019-02-08 19:02 ` Guenter Roeck
2019-02-08 19:10 ` Borislav Petkov
2019-02-08 20:44 ` Guenter Roeck
2019-02-08 21:53 ` Borislav Petkov
2019-02-11 0:22 ` Borislav Petkov
2019-02-11 1:33 ` Chao Fan
2019-02-11 9:46 ` Ard Biesheuvel
2019-02-11 9:55 ` Chao Fan
2019-02-11 9:57 ` Ard Biesheuvel
2019-02-11 10:10 ` Chao Fan
2019-02-11 10:17 ` Ard Biesheuvel
2019-02-11 10:24 ` Borislav Petkov
2019-02-11 10:33 ` Ard Biesheuvel
2019-02-11 10:42 ` Borislav Petkov
2019-02-11 10:46 ` Ard Biesheuvel
2019-02-11 11:04 ` Borislav Petkov
2019-02-11 11:55 ` Ard Biesheuvel
2019-02-11 12:16 ` Borislav Petkov
2019-02-11 11:20 ` Borislav Petkov
2019-02-11 13:21 ` Chao Fan
2019-02-13 1:54 ` Chao Fan
2019-02-13 7:36 ` Boris Petkov
2019-02-13 7:58 ` Chao Fan
2019-02-13 8:01 ` Ard Biesheuvel
2019-02-13 8:12 ` Chao Fan
2019-02-13 8:50 ` Borislav Petkov
2019-02-13 8:57 ` Chao Fan
2019-02-11 1:07 ` Chao Fan
2019-02-11 9:30 ` Chao Fan
2019-02-11 10:08 ` Borislav Petkov
2019-02-11 13:03 ` Chao Fan
2019-02-11 14:08 ` Guenter Roeck
2019-02-13 9:06 ` [tip:x86/boot] x86/boot: Correct RSDP parsing with 32-bit EFI tip-bot for Borislav Petkov
2019-02-13 11:27 ` tip-bot for Borislav Petkov
2019-01-23 11:08 ` [PATCH v16 6/7] x86/boot: Parse SRAT address from RSDP and store immovable memory Chao Fan
2019-02-01 11:01 ` [tip:x86/boot] x86/boot: Parse SRAT table and count immovable memory regions tip-bot for Chao Fan
2019-01-23 11:08 ` [PATCH v16 7/7] x86/boot/KASLR: Limit KASLR to extracting kernel in immovable memory Chao Fan
2019-02-01 11:02 ` [tip:x86/boot] x86/boot/KASLR: Limit KASLR to extract the kernel in immovable memory only tip-bot for Chao Fan
2019-01-28 17:51 ` [PATCH v16 0/7] Parse ACPI table and limit KASLR to choosing immovable memory Borislav Petkov
2019-01-30 5:58 ` Chao Fan
2019-01-30 11:22 ` [PATCH] x86/boot: Build the command line parsing code unconditionally (was: Re: [PATCH v16 0/7] Parse ACPI table and limit KASLR to choosing immovable memory) Borislav Petkov
2019-02-01 10:57 ` tip-bot for Borislav Petkov [this message]
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=tip-ac09c5f43cf613939850cc38d7a34ae6556016ba@git.kernel.org \
--to=tipbot@zytor.com \
--cc=bp@suse.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
/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