From d9068eebb58694f511dfdcee4d6c257fef75d062 Mon Sep 17 00:00:00 2001 From: Bananymous Date: Fri, 21 Apr 2023 13:45:13 +0300 Subject: [PATCH] Kernel: kmalloc does not dump stack trace dump_stack_trace() page faults and i dont feel like debugging this now :) --- kernel/kernel/Memory/kmalloc.cpp | 2 +- kernel/kernel/kernel.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/kernel/kernel/Memory/kmalloc.cpp b/kernel/kernel/Memory/kmalloc.cpp index 74bd017c9..6c01e4766 100644 --- a/kernel/kernel/Memory/kmalloc.cpp +++ b/kernel/kernel/Memory/kmalloc.cpp @@ -315,7 +315,7 @@ no_memory: dwarnln("could not allocate {H} bytes ({} aligned)", size, align); dwarnln(" {6H} free (fixed)", s_kmalloc_fixed_info.free); dwarnln(" {6H} free", s_kmalloc_info.free); - Debug::dump_stack_trace(); + //Debug::dump_stack_trace(); ASSERT(!is_corrupted()); return nullptr; diff --git a/kernel/kernel/kernel.cpp b/kernel/kernel/kernel.cpp index 79a360087..0cd3f7225 100644 --- a/kernel/kernel/kernel.cpp +++ b/kernel/kernel/kernel.cpp @@ -189,7 +189,8 @@ static void init2(void* tty1) MUST(Process::create_kernel( [](void*) { - MUST(LibELF::ELF::load_from_file("/bin/test"sv)); + if (auto res = LibELF::ELF::load_from_file("/boot/banan-os.kernel"sv); res.is_error()) + dwarnln("{}", res.error()); Process::current().exit(); }, nullptr ));