Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753189AbbERIr1 (ORCPT ); Mon, 18 May 2015 04:47:27 -0400 Received: from mail-la0-f42.google.com ([209.85.215.42]:34074 "EHLO mail-la0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753143AbbERIrV (ORCPT ); Mon, 18 May 2015 04:47:21 -0400 From: Alexander Kuleshov To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" Cc: Alexander Kuleshov , Andy Shevchenko , LKML , Greg Kroah-Hartman , Borislav Petkov , Mark Rustad , Yinghai Lu Subject: [PATCH v6 2/3] x86/setup: handle builtin command line early Date: Mon, 18 May 2015 14:47:15 +0600 Message-Id: <1431938835-7114-1-git-send-email-kuleshovmail@gmail.com> X-Mailer: git-send-email 2.4.0 In-Reply-To: <1431938771-4109-1-git-send-email-kuleshovmail@gmail.com> References: <1431938771-4109-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: 1765 Lines: 55 This patch adds the call of the setup_builtin_cmdline to handle builtin command line before we will setup earlyprintk. 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 2b55ee6..346a042 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 28dea1c..12124df 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -989,8 +989,6 @@ 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 -- 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/