From nobody Tue Apr 7 14:55:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 53276C433FE for ; Thu, 10 Nov 2022 13:09:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230205AbiKJNJy (ORCPT ); Thu, 10 Nov 2022 08:09:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35398 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230224AbiKJNJj (ORCPT ); Thu, 10 Nov 2022 08:09:39 -0500 Received: from mail.ispras.ru (mail.ispras.ru [83.149.199.84]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 024A710FCE for ; Thu, 10 Nov 2022 05:09:37 -0800 (PST) Received: from localhost.localdomain (unknown [83.149.199.65]) by mail.ispras.ru (Postfix) with ESMTPSA id EC73E40737B7; Thu, 10 Nov 2022 13:09:35 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 mail.ispras.ru EC73E40737B7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ispras.ru; s=default; t=1668085776; bh=IMZzqDsGqe80LCdtrLJ2hWF1Y/2kWqXMkN9RKfL+9hU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AtC3FqEayeP++jRNm0DOfsflkG9yKFxgY7kxZXP5Vsfa04ihWpLyzL3oarSwkGdCm SSCH8fxSb9/D+yVyySJIxiiB7Rh+znkLG3fa/lY/epl6gaDnJ8pAqpU7Qd5Tcgy8Op +q7rcqoCc5cyOo0bwOCIOQGkzQoKO7Q7jnTpNWfY= From: Evgeniy Baskov To: Borislav Petkov Cc: Evgeniy Baskov , Dave Hansen , Ingo Molnar , Thomas Gleixner , linux-kernel@vger.kernel.org, x86@kernel.org, Alexey Khoroshilov Subject: [PATCH v8 3/5] x86/setup: Use cmdline_prepare() in setup.c Date: Thu, 10 Nov 2022 16:09:31 +0300 Message-Id: X-Mailer: git-send-email 2.37.4 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use a common helper function for command line resolving in arch/x86/kernel/setup.c for code unification. Signed-off-by: Evgeniy Baskov --- arch/x86/kernel/setup.c | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index aacaa96f0195..f23a49f62b71 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -50,6 +50,7 @@ #include #include #include +#include #include #include #include @@ -168,9 +169,6 @@ unsigned long saved_video_mode; #define RAMDISK_LOAD_FLAG 0x4000 =20 static char __initdata command_line[COMMAND_LINE_SIZE]; -#ifdef CONFIG_CMDLINE_BOOL -static char __initdata builtin_cmdline[COMMAND_LINE_SIZE] =3D CONFIG_CMDLI= NE; -#endif =20 #if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE) struct edd edd; @@ -970,20 +968,8 @@ void __init setup_arch(char **cmdline_p) bss_resource.start =3D __pa_symbol(__bss_start); bss_resource.end =3D __pa_symbol(__bss_stop)-1; =20 -#ifdef CONFIG_CMDLINE_BOOL -#ifdef CONFIG_CMDLINE_OVERRIDE - strscpy(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); - strscpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE); - } -#endif -#endif - - strscpy(command_line, boot_command_line, COMMAND_LINE_SIZE); + cmdline_prepare(command_line, boot_command_line); + strscpy(boot_command_line, command_line, COMMAND_LINE_SIZE); *cmdline_p =3D command_line; =20 /* --=20 2.37.4