From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CD945C4338F for ; Thu, 5 Aug 2021 02:10:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A8C5561040 for ; Thu, 5 Aug 2021 02:10:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238247AbhHECLH (ORCPT ); Wed, 4 Aug 2021 22:11:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:32826 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232116AbhHECLG (ORCPT ); Wed, 4 Aug 2021 22:11:06 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C24E261073; Thu, 5 Aug 2021 02:10:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1628129453; bh=e4sEkXFMdDCll8XB9qCZ+VnHcmQ6GvRT0CFeXKa7oco=; h=From:To:Cc:Subject:Date:From; b=QPO24gT+5Qhkd1nT3cdsffaJCIiMlKIHW4CT3XN4ejoO/iTU+I3iVXgf+Nhcspbe0 H3uXuxHh4AElHWx59HVKZQFw0p4RcXnqDVOdZX3d4ni1aZwcM3eZ5NBjbrmggcHUpd jUFLj2nm7+tEJ9Hzfo32Tq0sMRwj3CtelFYcpOAcukpq7okUJgzbxP9hEJElEx5MxV OHsgj8tDOopbyf0msIiftFEjffyS09VRlqFZS4CMiCu8m+8Znx5g7iuODdHtpVJyjs LVgG7jrn+LlcWzzFvsyu3fg256PXXI7qnURSOJLuAlV6ZKP5f2TTmrBIK3FYx7jTTV s/1xSD16ztjew== From: Masami Hiramatsu To: Steven Rostedt Cc: linux-kernel@vger.kernel.org, Andrew Halaney , Masami Hiramatsu , Borislav Petkov Subject: [PATCH] init: Suppress wrong warning for bootconfig cmdline parameter Date: Thu, 5 Aug 2021 11:10:51 +0900 Message-Id: <162812945097.77369.1849780946468010448.stgit@devnote2> X-Mailer: git-send-email 2.25.1 User-Agent: StGit/0.19 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since the 'bootconfig' command line parameter is handled before parsing the command line, it doesn't use early_param(). But in this case, kernel shows a wrong warning message about it. [ 0.013714] Kernel command line: ro console=ttyS0 bootconfig console=tty0 [ 0.013741] Unknown command line parameters: bootconfig To suppress this message, add a dummy handler for 'bootconfig'. Fixes: 86d1919a4fb0 ("init: print out unknown kernel parameters") Signed-off-by: Masami Hiramatsu --- init/main.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/init/main.c b/init/main.c index f5b8246e8aa1..8d97aba78c3a 100644 --- a/init/main.c +++ b/init/main.c @@ -397,6 +397,12 @@ static int __init bootconfig_params(char *param, char *val, return 0; } +static int __init warn_bootconfig(char *str) +{ + /* The 'bootconfig' has been handled by bootconfig_params(). */ + return 0; +} + static void __init setup_boot_config(void) { static char tmp_cmdline[COMMAND_LINE_SIZE] __initdata; @@ -475,9 +481,8 @@ static int __init warn_bootconfig(char *str) pr_warn("WARNING: 'bootconfig' found on the kernel command line but CONFIG_BOOT_CONFIG is not set.\n"); return 0; } -early_param("bootconfig", warn_bootconfig); - #endif +early_param("bootconfig", warn_bootconfig); /* Change NUL term back to "=", to make "param" the whole string. */ static void __init repair_env_string(char *param, char *val)