Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754272AbbGAJpo (ORCPT ); Wed, 1 Jul 2015 05:45:44 -0400 Received: from mail-lb0-f178.google.com ([209.85.217.178]:34411 "EHLO mail-lb0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753865AbbGAJnK (ORCPT ); Wed, 1 Jul 2015 05:43:10 -0400 From: Alexander Kuleshov To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" Cc: Greg Kroah-Hartman , Andy Shevchenko , Mark Einon , David Cohen , Borislav Petkov , linux-kernel@vger.kernel.org, Alexander Kuleshov Subject: [PATCH v14 2/4] x86/setup: handle builtin command line as early as possible Date: Wed, 1 Jul 2015 15:43:04 +0600 Message-Id: <1435743784-11490-1-git-send-email-kuleshovmail@gmail.com> X-Mailer: git-send-email 2.4.0.GIT In-Reply-To: <1435743760-11376-1-git-send-email-kuleshovmail@gmail.com> References: <1435743760-11376-1-git-send-email-kuleshovmail@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1927 Lines: 58 This patch adds the call of the setup_builtin_cmdline to handle builtin command line before we will setup earlyprintk. The earlyprintk command line option can be passed through the builtin command line, so we'll handle it before the setup_earlyprintk_console() will be called. Signed-off-by: Alexander Kuleshov --- arch/x86/kernel/head32.c | 1 + arch/x86/kernel/head64.c | 2 ++ arch/x86/kernel/setup.c | 1 - 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/head32.c b/arch/x86/kernel/head32.c index 2911ef3..92e8b5f 100644 --- a/arch/x86/kernel/head32.c +++ b/arch/x86/kernel/head32.c @@ -31,6 +31,7 @@ static void __init i386_default_early_setup(void) asmlinkage __visible void __init i386_start_kernel(void) { + setup_builtin_cmdline(); cr4_init_shadow(); sanitize_boot_params(&boot_params); diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c index 5a46681..1e5f064 100644 --- a/arch/x86/kernel/head64.c +++ b/arch/x86/kernel/head64.c @@ -172,6 +172,8 @@ asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data) copy_bootdata(__va(real_mode_data)); + setup_builtin_cmdline(); + /* * Load microcode early on BSP. */ diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 5622972..4b8d9cb 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -991,2 +991,2 @@ void __init setup_arch(char **cmdline_p) bss_resource.start = __pa_symbol(__bss_start); bss_resource.end = __pa_symbol(__bss_stop)-1; - setup_builtin_cmdline(); strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE); *cmdline_p = command_line; -- 2.4.0.GIT -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/