From 996a45d7f86fd6c17b7818d280fec85880d1470c Mon Sep 17 00:00:00 2001 From: ChUrl Date: Mon, 11 Jul 2022 19:22:43 +0200 Subject: [PATCH] enable list allocator until i fix the other one --- c_os/kernel/Globals.cc | 4 ++-- c_os/kernel/Globals.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/c_os/kernel/Globals.cc b/c_os/kernel/Globals.cc index 033d3e5..528ef87 100755 --- a/c_os/kernel/Globals.cc +++ b/c_os/kernel/Globals.cc @@ -22,8 +22,8 @@ Keyboard kb; // Tastatur PCSPK pcspk; // PC-Lautsprecher // BumpAllocator allocator; -// LinkedListAllocator allocator; -TreeAllocator allocator; +LinkedListAllocator allocator; +// TreeAllocator allocator; Scheduler scheduler; unsigned int total_mem; // RAM total diff --git a/c_os/kernel/Globals.h b/c_os/kernel/Globals.h index 10ca684..b2105cd 100755 --- a/c_os/kernel/Globals.h +++ b/c_os/kernel/Globals.h @@ -36,8 +36,8 @@ extern Keyboard kb; // Tastatur extern PCSPK pcspk; // PC-Lautsprecher // extern BumpAllocator allocator; -// extern LinkedListAllocator allocator; -extern TreeAllocator allocator; +extern LinkedListAllocator allocator; +// extern TreeAllocator allocator; extern Scheduler scheduler; constexpr bool DEBUG = true;