Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933069AbbFIPdH (ORCPT ); Tue, 9 Jun 2015 11:33:07 -0400 Received: from mga09.intel.com ([134.134.136.24]:43588 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932874AbbFIPdD (ORCPT ); Tue, 9 Jun 2015 11:33:03 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,581,1427785200"; d="scan'208";a="740178545" Message-ID: <1433863978.26331.100.camel@linux.intel.com> Subject: Re: [PATCH v11 1/5] x86/setup: introduce setup_bultin_cmdline From: Andy Shevchenko To: Alexander Kuleshov Cc: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , LKML , Greg Kroah-Hartman , Borislav Petkov , Mark Rustad , Yinghai Lu Date: Tue, 09 Jun 2015 18:32:58 +0300 In-Reply-To: <1433848274-4332-1-git-send-email-kuleshovmail@gmail.com> References: <1433848247-3550-1-git-send-email-kuleshovmail@gmail.com> <1433848274-4332-1-git-send-email-kuleshovmail@gmail.com> Organization: Intel Finland Oy Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.12.9-1+b1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3298 Lines: 92 On Tue, 2015-06-09 at 17:11 +0600, Alexander Kuleshov wrote: > This patch introduces the setup_builtin_cmdline function which appends or > overrides boot_command_line with the builtin_cmdline if CONFIG_CMDLINE_BOOL > is set. > Previously this functional was in the setup_arch, but we need to move > it for getting actual command line as early as possible in the > arch/x86/kernel/head{32,64}.c for the earlyprintk setup. This paragraph not related to the changes in the patch. So, remove it or replace by something like "The patch is a preparation for further improvements". > > Signed-off-by: Alexander Kuleshov > --- > arch/x86/include/asm/setup.h | 1 + > arch/x86/kernel/setup.c | 30 +++++++++++++++++------------- > 2 files changed, 18 insertions(+), 13 deletions(-) > > diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h > index f69e06b..59efd0d 100644 > --- a/arch/x86/include/asm/setup.h > +++ b/arch/x86/include/asm/setup.h > @@ -119,6 +119,7 @@ asmlinkage void __init x86_64_start_kernel(char *real_mode); > asmlinkage void __init x86_64_start_reservations(char *real_mode_data); > > #endif /* __i386__ */ > +void __init setup_builtin_cmdline(void); > #endif /* _SETUP */ > #else > #define RESERVE_BRK(name,sz) \ > diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c > index d74ac33..edd4857 100644 > --- a/arch/x86/kernel/setup.c > +++ b/arch/x86/kernel/setup.c > @@ -845,6 +845,22 @@ dump_kernel_offset(struct notifier_block *self, unsigned long v, void *p) > return 0; > } > > +void __init setup_builtin_cmdline(void) > +{ > +#ifdef CONFIG_CMDLINE_BOOL > +#ifdef CONFIG_CMDLINE_OVERRIDE > + strlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE); > +#else > + if (builtin_cmdline[0]) { > + /* append boot loader cmdline to builtin */ > + strlcat(builtin_cmdline, " ", COMMAND_LINE_SIZE); > + strlcat(builtin_cmdline, boot_command_line, COMMAND_LINE_SIZE); > + strlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE); > + } > +#endif > +#endif > +} > + > /* > * Determine if we were loaded by an EFI loader. If so, then we have also been > * passed the efi memmap, systab, etc., so we should use these data structures > @@ -973,19 +989,7 @@ void __init setup_arch(char **cmdline_p) > bss_resource.start = __pa_symbol(__bss_start); > bss_resource.end = __pa_symbol(__bss_stop)-1; > > -#ifdef CONFIG_CMDLINE_BOOL > -#ifdef CONFIG_CMDLINE_OVERRIDE > - strlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE); > -#else > - if (builtin_cmdline[0]) { > - /* append boot loader cmdline to builtin */ > - strlcat(builtin_cmdline, " ", COMMAND_LINE_SIZE); > - strlcat(builtin_cmdline, boot_command_line, COMMAND_LINE_SIZE); > - strlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE); > - } > -#endif > -#endif > - > + setup_builtin_cmdline(); > strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE); > *cmdline_p = command_line; > -- Andy Shevchenko Intel Finland Oy -- 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/