summaryrefslogtreecommitdiff
path: root/src/kernel/task
diff options
context:
space:
mode:
authorAlex AUVOLAT <alexis211@gmail.com>2012-05-01 14:55:18 +0200
committerAlex AUVOLAT <alexis211@gmail.com>2012-05-01 14:55:18 +0200
commite8cf65c07d78e3cfbac953b1b97c51998a5900df (patch)
tree7b75741a1d38b5da1ee79e877709b6b4723c4713 /src/kernel/task
parent5cac9acd3aedc8043d4272d93c56805c46ff6214 (diff)
downloadTCE-e8cf65c07d78e3cfbac953b1b97c51998a5900df.tar.gz
TCE-e8cf65c07d78e3cfbac953b1b97c51998a5900df.zip
Now using Doug Lea's malloc in kernel land. Next: same in userland.
Diffstat (limited to 'src/kernel/task')
-rw-r--r--src/kernel/task/idt.c1
-rw-r--r--src/kernel/task/task.c2
-rw-r--r--src/kernel/task/timer.c1
3 files changed, 3 insertions, 1 deletions
diff --git a/src/kernel/task/idt.c b/src/kernel/task/idt.c
index be5d152..ff129be 100644
--- a/src/kernel/task/idt.c
+++ b/src/kernel/task/idt.c
@@ -2,6 +2,7 @@
#include <core/monitor.h>
#include <core/sys.h>
#include <mem/paging.h>
+#include <mem/mem.h>
#include "task.h"
#include "syscall.h"
diff --git a/src/kernel/task/task.c b/src/kernel/task/task.c
index a6becdb..7071248 100644
--- a/src/kernel/task/task.c
+++ b/src/kernel/task/task.c
@@ -45,7 +45,7 @@ void tasking_init() {
/* Called by the paging functions when a page table is allocated in the kernel space (>K_HIGHHALF_ADDR).
Updates the page directories of all the processes. */
void tasking_updateKernelPagetable(uint32_t idx, struct page_table *table, uint32_t tablephysical) {
- if (idx < 896) return;
+ if (idx < FIRST_KERNEL_PAGETABLE) return;
struct process* it = processes;
while (it != 0) {
it->pagedir->tables[idx] = table;
diff --git a/src/kernel/task/timer.c b/src/kernel/task/timer.c
index 65ad06a..35a94f9 100644
--- a/src/kernel/task/timer.c
+++ b/src/kernel/task/timer.c
@@ -1,6 +1,7 @@
#include "timer.h"
#include "task.h"
#include "idt.h"
+#include <mem/mem.h>
#include <core/sys.h>
#include <core/monitor.h>