[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]

On Wed, Jan 30, 2019 at 01:58:47PM +0800, Chao Fan wrote:
> I clone your branch and test some cases. Except the build issue of
> cmdline_find_option(), PATCHSET works well.
> Build in x86_64 and i386.
> Tested EFI/BIOS environment in x86_64 and BIOS environment in i386.
> Tested the 'acpi_rsdp=' and 'boot_params->acpi_rsdp_addr' issue, all
> work well.

Thanks.

Here's a fix for the build issue below, pushing a new branch.

---
From: Borislav Petkov <bp@xxxxxxx>
Subject: [PATCH] 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@xxxxxxx>
Cc: x86@xxxxxxxxxx
---
 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
-- 
2.19.1

-- 
Regards/Gruss,
    Boris.

Good mailing practices for 400: avoid top-posting and trim the reply.