x86/boot: Build the command line parsing code unconditionally

suryasaimadhu · suryasaimadhu · commit ac09c5f43cf6 · 2019-02-01T11:51:01.000+01:00
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
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`	`1`	`// SPDX-License-Identifier: GPL-2.0`
`2`	`2`	`#include "misc.h"`
`3`	`3`
`4`		`-#if CONFIG_EARLY_PRINTK \|\| CONFIG_RANDOMIZE_BASE \|\| CONFIG_X86_5LEVEL`
`5`		`-`
`6`	`4`	`static unsigned long fs;`
`7`	`5`	`static inline void set_fs(unsigned long seg)`
`8`	`6`	`{`
`@@ -30,5 +28,3 @@ int cmdline_find_option_bool(const char *option)`
`30`	`28`	`{`
`31`	`29`	`return __cmdline_find_option_bool(get_cmd_line_ptr(), option);`
`32`	`30`	`}`
`33`		`-`
`34`		`-#endif`