]> git.baikalelectronics.ru Git - kernel.git/commit
bootconfig: Fix to prevent warning message if no bootconfig option
authorMasami Hiramatsu <mhiramat@kernel.org>
Mon, 11 May 2020 01:39:24 +0000 (10:39 +0900)
committerSteven Rostedt (VMware) <rostedt@goodmis.org>
Tue, 12 May 2020 14:42:51 +0000 (10:42 -0400)
commitd7b70480a5a1f6d29dd632cf38d896e69f19e47e
treea6067d4a5df741af7748de8f0749caae4c34ce45
parent27acb40bb841c8ae7fea8896d1ffc0fe2494c560
bootconfig: Fix to prevent warning message if no bootconfig option

Commit 4d0392c6440c ("bootconfig: Fix to remove bootconfig
data from initrd while boot") causes a cosmetic regression
on dmesg, which warns "no bootconfig data" message without
bootconfig cmdline option.

Fix setup_boot_config() by moving no bootconfig check after
commandline option check.

Link: http://lkml.kernel.org/r/9b1ba335-071d-c983-89a4-2677b522dcc8@molgen.mpg.de
Link: http://lkml.kernel.org/r/158916116468.21787.14558782332170588206.stgit@devnote2
Fixes: 4d0392c6440c ("bootconfig: Fix to remove bootconfig data from initrd while boot")
Reported-by: Paul Menzel <pmenzel@molgen.mpg.de>
Reviewed-by: Paul Menzel <pmenzel@molgen.mpg.de>
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
init/main.c