[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-ac09c5f43cf613939850cc38d7a34ae6556016ba@git.kernel.org>
Date: Fri, 1 Feb 2019 02:57:58 -0800
From: tip-bot for Borislav Petkov <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: tglx@...utronix.de, linux-kernel@...r.kernel.org, bp@...e.de,
hpa@...or.com, mingo@...nel.org
Subject: [tip:x86/boot] x86/boot: Build the command line parsing code
unconditionally
Commit-ID: ac09c5f43cf613939850cc38d7a34ae6556016ba
Gitweb: https://git.kernel.org/tip/ac09c5f43cf613939850cc38d7a34ae6556016ba
Author: Borislav Petkov <bp@...e.de>
AuthorDate: Wed, 30 Jan 2019 11:19:37 +0100
Committer: Borislav Petkov <bp@...e.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 <bp@...e.de>
Cc: bhe@...hat.com
Cc: hpa@...or.com
Cc: indou.takao@...fujitsu.com
Cc: kasong@...hat.com
Cc: keescook@...omium.org
Cc: mingo@...hat.com
Cc: msys.mizuma@...il.com
Cc: tglx@...utronix.de
Cc: x86@...nel.org
Link: https://lkml.kernel.org/r/20190130112238.GB18383@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
Powered by blists - more mailing lists