Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753372AbbELKu3 (ORCPT ); Tue, 12 May 2015 06:50:29 -0400 Received: from mga02.intel.com ([134.134.136.20]:41175 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752608AbbELKu2 (ORCPT ); Tue, 12 May 2015 06:50:28 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,414,1427785200"; d="scan'208";a="492532290" Message-ID: <1431427815.28073.53.camel@linux.intel.com> Subject: Re: [PATCH v3 1/3] 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, 12 May 2015 13:50:15 +0300 In-Reply-To: <1431418183-1440-1-git-send-email-kuleshovmail@gmail.com> References: <1431418137-32320-1-git-send-email-kuleshovmail@gmail.com> <1431418183-1440-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: 3363 Lines: 97 On Tue, 2015-05-12 at 14:09 +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. > Couple of comments. First of all,6 is a property of each patch in the series, since series means the logically linked pieces of changes. So, Why v3 is here? > 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. > > Signed-off-by: Alexander Kuleshov > --- > arch/x86/include/asm/setup.h | 1 + > arch/x86/kernel/setup.c | 29 ++++++++++++++++------------- > 2 files changed, 17 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..0aeee0a 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,6 @@ 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 > - This one breaks kernel to work. You have to call setup_builtin_cmdline() here. > strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE); > *cmdline_p = command_line; > > -- > 2.4.0 -- 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/