aboutsummaryrefslogtreecommitdiff
path: root/src/kernel/syscall/actions/sys_get_pointers.c
diff options
context:
space:
mode:
authorMarvin Borner2020-01-26 18:41:23 +0100
committerGitHub2020-01-26 18:41:23 +0100
commit43f501c74aa09f18c904ace902dc4cc5d241c218 (patch)
treeea30b53ac6043faddd1cdb2fdea17f37178b1cc7 /src/kernel/syscall/actions/sys_get_pointers.c
parentd5d1749257ff8b9aa6b5ace4b4720b484a2860f3 (diff)
parentbb2a6b4d93512e8afc1b1999eb58f1f506cc27ae (diff)
Merged task-based userspace switching and updated heap/paging code
Awesome!
Diffstat (limited to 'src/kernel/syscall/actions/sys_get_pointers.c')
-rw-r--r--src/kernel/syscall/actions/sys_get_pointers.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/kernel/syscall/actions/sys_get_pointers.c b/src/kernel/syscall/actions/sys_get_pointers.c
index 554f4eb..bc00b3b 100644
--- a/src/kernel/syscall/actions/sys_get_pointers.c
+++ b/src/kernel/syscall/actions/sys_get_pointers.c
@@ -1,7 +1,7 @@
#include <stdint.h>
#include <kernel/graphics/vesa.h>
-#include <kernel/graphics/font.h>
-#include <kernel/lib/stdlib/liballoc.h>
+#include <kernel/fs/load.h>
+#include <kernel/memory/kheap.h>
struct userspace_pointers {
unsigned char *fb;
@@ -10,7 +10,7 @@ struct userspace_pointers {
uint32_t sys_get_pointers()
{
- struct userspace_pointers *pointers = (struct userspace_pointers *) umalloc(sizeof(struct userspace_pointers));
+ struct userspace_pointers *pointers = (struct userspace_pointers *) kmalloc(sizeof(struct userspace_pointers));
pointers->fb = fb;
pointers->font = font;
return (uint32_t) pointers;