Commit-ID: ac09c5f43cf613939850cc38d7a34ae6556016ba Gitweb: https://git.kernel.org/tip/ac09c5f43cf613939850cc38d7a34ae6556016ba Author: Borislav Petkov <b...@suse.de> AuthorDate: Wed, 30 Jan 2019 11:19:37 +0100 Committer: Borislav Petkov <b...@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 <b...@suse.de> Cc: b...@redhat.com Cc: h...@zytor.com Cc: indou.ta...@jp.fujitsu.com Cc: kas...@redhat.com Cc: keesc...@chromium.org Cc: mi...@redhat.com Cc: msys.miz...@gmail.com Cc: t...@linutronix.de Cc: x...@kernel.org Link: https://lkml.kernel.org/r/20190130112238.gb18...@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
