x86/boot: Build the command line parsing code unconditionally
authorBorislav Petkov <bp@suse.de>
Wed, 30 Jan 2019 10:19:37 +0000 (11:19 +0100)
committerBorislav Petkov <bp@suse.de>
Fri, 1 Feb 2019 10:51:01 +0000 (11:51 +0100)
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

index af6cda0b7900f02ef9d975a3b484236c1dbaa0c9..f1add5d85da9d9881e44e2316a2f0018deb364f7 100644 (file)
@@ -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