Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753851AbbF0SQd (ORCPT ); Sat, 27 Jun 2015 14:16:33 -0400 Received: from mail-yk0-f172.google.com ([209.85.160.172]:33946 "EHLO mail-yk0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752604AbbF0SQZ (ORCPT ); Sat, 27 Jun 2015 14:16:25 -0400 MIME-Version: 1.0 In-Reply-To: References: <1435412739-15615-1-git-send-email-kuleshovmail@gmail.com> <1435412771-15774-1-git-send-email-kuleshovmail@gmail.com> Date: Sat, 27 Jun 2015 21:16:24 +0300 Message-ID: Subject: Re: [PATCH 1/4] x86/setup: introduce setup_bultin_cmdline From: Andy Shevchenko To: Alexander Kuleshov Cc: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Greg Kroah-Hartman , Andy Shevchenko , Borislav Petkov , David Cohen , LKML Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4262 Lines: 112 On Sat, Jun 27, 2015 at 4:54 PM, Alexander Kuleshov wrote: > sorry, forgot to add version to this patch, please skip this patch. You may, for example, supply --subject-prefix="PATCH v13" to git format-patch command to create a nice version token. One comment below. > > 2015-06-27 19:46 GMT+06:00 Alexander Kuleshov : >> 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. I already once wrote you that commit message is not reflecting the contents of the patch. Please, align, i.e. remove second paragraph and add a line that there is no functional change. Please, read carefully what others comment. >> >> Signed-off-by: Alexander Kuleshov >> --- >> arch/x86/include/asm/setup.h | 2 +- >> arch/x86/kernel/setup.c | 29 +++++++++++++++++------------ >> 2 files changed, 18 insertions(+), 13 deletions(-) >> >> diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h >> index 11af24e..70dfa61 100644 >> --- a/arch/x86/include/asm/setup.h >> +++ b/arch/x86/include/asm/setup.h >> @@ -124,8 +124,8 @@ asmlinkage void __init i386_start_kernel(void); >> #else >> 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 d3b95b8..e528f12 100644 >> --- a/arch/x86/kernel/setup.c >> +++ b/arch/x86/kernel/setup.c >> @@ -847,6 +847,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 >> @@ -975,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; >> >> -#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; >> -- >> 2.4.4.410.gc71d752 >> > -- > 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/ -- With Best Regards, Andy Shevchenko -- 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/