git://scm.lunaixsky.com
/
lunaix-os.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement (half) simple semaphore & mutex lock, and ...
[lunaix-os.git]
/
lunaix-os
/
kernel
/
mm
/
kalloc.c
diff --git
a/lunaix-os/kernel/mm/kalloc.c
b/lunaix-os/kernel/mm/kalloc.c
index 6f04e2edebcabe6a2497e00b5288e4e1509af0bb..16c1d8286ba9164c7a5a0753b4a5853a2de01557 100644
(file)
--- a/
lunaix-os/kernel/mm/kalloc.c
+++ b/
lunaix-os/kernel/mm/kalloc.c
@@
-14,7
+14,7
@@
#include <lunaix/mm/kalloc.h>
#include <lunaix/mm/dmm.h>
#include <lunaix/mm/kalloc.h>
#include <lunaix/mm/dmm.h>
-#include <lunaix/co
nstants
.h>
+#include <lunaix/co
mmon
.h>
#include <lunaix/spike.h>
#include <klibc/string.h>
#include <lunaix/spike.h>
#include <klibc/string.h>
@@
-23,7
+23,8
@@
extern uint8_t __kernel_heap_start;
extern uint8_t __kernel_heap_start;
-heap_context_t __kalloc_kheap;
+// FIXME: This should go to PCB once we're started to support multitasking
+static heap_context_t __kalloc_kheap;
void*
lx_malloc_internal(heap_context_t* heap, size_t size);
void*
lx_malloc_internal(heap_context_t* heap, size_t size);