From b4600f2996c5f29dbcb17b3c33d3edf8a55ef5b5 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Tue, 20 Jul 2021 03:03:49 +0200 Subject: [PATCH] Kernel: Initialize serial debug after setting kernel command-line --- Kernel/init.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Kernel/init.cpp b/Kernel/init.cpp index ac2e15e5e1..f118dd2be8 100644 --- a/Kernel/init.cpp +++ b/Kernel/init.cpp @@ -124,7 +124,6 @@ const char* kernel_cmdline; extern "C" [[noreturn]] UNMAP_AFTER_INIT void init(BootInfo const& boot_info) { g_in_early_boot = true; - setup_serial_debug(); multiboot_info_ptr = boot_info.multiboot_info_ptr; start_of_prekernel_image = boot_info.start_of_prekernel_image; @@ -141,6 +140,8 @@ extern "C" [[noreturn]] UNMAP_AFTER_INIT void init(BootInfo const& boot_info) boot_pd_kernel_pt1023 = boot_info.boot_pd_kernel_pt1023; kernel_cmdline = boot_info.kernel_cmdline; + setup_serial_debug(); + // We need to copy the command line before kmalloc is initialized, // as it may overwrite parts of multiboot! CommandLine::early_initialize(kernel_cmdline);