summaryrefslogtreecommitdiff
path: root/arch/x86/boot
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2019-01-30 11:19:37 +0100
committerBorislav Petkov <bp@suse.de>2019-02-01 11:51:01 +0100
commitac09c5f43cf613939850cc38d7a34ae6556016ba (patch)
treed41eb439b0913a8efabb4d31f2bc13f5a0848406 /arch/x86/boot
parentaf0c9af1b3f66052c369d08be3f60fa9a9559e48 (diff)
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
Diffstat (limited to 'arch/x86/boot')
-rw-r--r--arch/x86/boot/compressed/cmdline.c4
1 files changed, 0 insertions, 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