]> git.itanic.dy.fi Git - linux-stable/commit
fs/proc: Skip bootloader comment if no embedded kernel parameters
authorMasami Hiramatsu <mhiramat@kernel.org>
Tue, 9 Apr 2024 04:43:58 +0000 (21:43 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 Apr 2024 09:23:36 +0000 (11:23 +0200)
commit786afd51e21481ee4430fe35f61c6b49bfb2cd50
treea7804fe6d88b3b4f7493d83d528d843d6f57c9a8
parent0f33fd80e8ff12b59a3465052fcf81a40f83ef2d
fs/proc: Skip bootloader comment if no embedded kernel parameters

commit c722cea208789d9e2660992bcd05fb9fac3adb56 upstream.

If the "bootconfig" kernel command-line argument was specified or if
the kernel was built with CONFIG_BOOT_CONFIG_FORCE, but if there are
no embedded kernel parameter, omit the "# Parameters from bootloader:"
comment from the /proc/bootconfig file.  This will cause automation
to fall back to the /proc/cmdline file, which will be identical to the
comment in this no-embedded-kernel-parameters case.

Link: https://lore.kernel.org/all/20240409044358.1156477-2-paulmck@kernel.org/
Fixes: 8b8ce6c75430 ("fs/proc: remove redundant comments from /proc/bootconfig")
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
Cc: stable@vger.kernel.org
Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/proc/bootconfig.c
include/linux/bootconfig.h
init/main.c