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)
commit611d0a95d46b0977a530b4d538948c69d447b001
treea6067d4a5df741af7748de8f0749caae4c34ce45
parent8b1fac2e73e84ef0d6391051880a8e1d7044c847
bootconfig: Fix to prevent warning message if no bootconfig option

Commit de462e5f1071 ("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: de462e5f1071 ("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