aboutsummaryrefslogtreecommitdiff
path: root/kernel/src/memory.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/src/memory.cpp')
-rw-r--r--kernel/src/memory.cpp15
1 files changed, 7 insertions, 8 deletions
diff --git a/kernel/src/memory.cpp b/kernel/src/memory.cpp
index 0f614f0..6a85c0e 100644
--- a/kernel/src/memory.cpp
+++ b/kernel/src/memory.cpp
@@ -1,16 +1,15 @@
-#include "kernel/memory.hpp"
+#include <kernel/memory.hpp>
-#include "kapi/memory.hpp"
-#include "kapi/system.hpp"
+#include <kernel/memory/block_list_allocator.hpp>
+#include <kernel/memory/heap_allocator.hpp>
-#include "kernel/memory/block_list_allocator.hpp"
-#include "kernel/memory/heap_allocator.hpp"
+#include <kapi/memory.hpp>
+#include <kapi/system.hpp>
#include <kstd/print>
+#include <kstd/units>
#include <atomic>
-#include <cstddef>
-#include <new>
#include <optional>
namespace kernel::memory
@@ -22,7 +21,7 @@ namespace kernel::memory
{
null_allocator static instance;
- [[nodiscard]] auto allocate(std::size_t, std::align_val_t) noexcept -> void * override
+ [[nodiscard]] auto allocate(kstd::units::bytes, kstd::units::bytes) noexcept -> void * override
{
kstd::print(kstd::print_sink::stderr, "Tried to allocate memory without an active heap!");
return nullptr;