diff options
| author | Alex AUVOLAT <alexis211@gmail.com> | 2012-05-01 17:42:36 +0200 |
|---|---|---|
| committer | Alex AUVOLAT <alexis211@gmail.com> | 2012-05-01 17:42:36 +0200 |
| commit | e9683297bf480f9590b0e5796f4520fb430e2e03 (patch) | |
| tree | 93ef75cd154edf4c342d0a22cd56eb3670feb2b5 /src/kernel/mem/paging.c | |
| parent | e8cf65c07d78e3cfbac953b1b97c51998a5900df (diff) | |
| download | TCE-e9683297bf480f9590b0e5796f4520fb430e2e03.tar.gz TCE-e9683297bf480f9590b0e5796f4520fb430e2e03.zip | |
Now using Doug Lea's malloc for userland too. And improved stability.
Diffstat (limited to 'src/kernel/mem/paging.c')
| -rw-r--r-- | src/kernel/mem/paging.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/kernel/mem/paging.c b/src/kernel/mem/paging.c index 5953fc6..0527f06 100644 --- a/src/kernel/mem/paging.c +++ b/src/kernel/mem/paging.c @@ -1,6 +1,6 @@ #include "paging.h" #include <bitset.h> -#include <stdlib.h> +#include <stdlib_common.h> #include <core/monitor.h> #include "mem.h" #include "seg.h" @@ -17,7 +17,7 @@ struct page_directory *kernel_pagedir, *current_pagedir; uint32_t frame_alloc() { uint32_t free = bitset_firstFree(&frames); if (free == (uint32_t) -1) { - PANIC("Out of memory!"); + PANIC("No more frames to allocate, system is out of memory!"); } bitset_set(&frames, free); return free; @@ -166,7 +166,6 @@ struct page *pagedir_getPage(struct page_directory *pd, uint32_t address, int ma pd->tablesPhysical[table_idx] |= 0x07; if (table_idx >= FIRST_KERNEL_PAGETABLE) { - monitor_write("UKPI "); tasking_updateKernelPagetable(table_idx, pd->tables[table_idx], pd->tablesPhysical[table_idx]); } |