aboutsummaryrefslogtreecommitdiff
path: root/src/kernel/fs/load.c
diff options
context:
space:
mode:
authorMarvin Borner2020-02-16 17:29:19 +0100
committerMarvin Borner2020-02-16 17:29:50 +0100
commit45184af20936cb889b658e69e00a0bb3d522757f (patch)
tree4b6c3408e526fe733ccfa960726c37e70dc6f989 /src/kernel/fs/load.c
parentf5b995586e28f7db426f4707a4348dc067df41c0 (diff)
Revert to good ol' paging
Diffstat (limited to 'src/kernel/fs/load.c')
-rw-r--r--src/kernel/fs/load.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/kernel/fs/load.c b/src/kernel/fs/load.c
index be7d5b8..cd422d0 100644
--- a/src/kernel/fs/load.c
+++ b/src/kernel/fs/load.c
@@ -4,11 +4,11 @@
#include <kernel/fs/atapi_pio.h>
#include <kernel/system.h>
#include <kernel/fs/iso9660/iso9660.h>
-#include <kernel/memory/kheap.h>
+#include <kernel/memory/alloc.h>
void load_binaries()
{
- userspace = kmalloc(10000);
+ userspace = (uint32_t) kmalloc(10000);
font = (struct font *) kmalloc(100000);; // High quality shit
uint8_t boot_drive_id = (uint8_t) (*((uint8_t *) 0x9000));