From 3852f4f1366f837191fc90998570015b260707ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Holz?= Date: Thu, 30 Nov 2023 18:35:40 +0100 Subject: [PATCH] Kernel: Only try to use VGA text mode on x86_64 --- Kernel/Arch/init.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Kernel/Arch/init.cpp b/Kernel/Arch/init.cpp index 053ba74eed..9708833d5f 100644 --- a/Kernel/Arch/init.cpp +++ b/Kernel/Arch/init.cpp @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include @@ -63,6 +62,7 @@ # include # include # include +# include #elif ARCH(AARCH64) # include # include @@ -258,7 +258,11 @@ extern "C" [[noreturn]] UNMAP_AFTER_INIT void init([[maybe_unused]] BootInfo con if ((multiboot_flags & MULTIBOOT_INFO_FRAMEBUFFER_INFO) && !multiboot_framebuffer_addr.is_null() && multiboot_framebuffer_type == MULTIBOOT_FRAMEBUFFER_TYPE_RGB) { g_boot_console = &try_make_lock_ref_counted(multiboot_framebuffer_addr, multiboot_framebuffer_width, multiboot_framebuffer_height, multiboot_framebuffer_pitch).value().leak_ref(); } else { +#if ARCH(X86_64) g_boot_console = &Graphics::VGATextModeConsole::initialize().leak_ref(); +#else + dbgln("No early framebuffer console available"); +#endif } } dmesgln("Starting SerenityOS...");