diff options
Diffstat (limited to 'src/kern/mem.c')
-rw-r--r-- | src/kern/mem.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/kern/mem.c b/src/kern/mem.c index ac90f0d..eb4527e 100644 --- a/src/kern/mem.c +++ b/src/kern/mem.c @@ -1,7 +1,9 @@ #include "kern/mem.h" #include "arch.h" + #include "kern/common.h" +#include "kern/panic.h" #ifdef ARCH_STM32L4 /* Provide a definition for memset() when not provided for the @@ -146,22 +148,6 @@ static void coalesce(kalloc_node_t* cur) last_freed->size = ((uint8_t*)next_used - (last_freed->mem)) / 4; } -#ifdef FOR_TESTING -#include <assert.h> -#include <stdio.h> -void panic(const char* x) -{ - fprintf(stderr, "%s\n", x); - assert(0); -} -#else -void panic(const char* x) -{ - for (;;) - ; -} -#endif - void kfree(void* mem) { /* Like normal free(), do nothing on free'ing NULL */ |