summaryrefslogtreecommitdiff
path: root/kernel/kernel.c
diff options
context:
space:
mode:
authorMichal Idziorek <m.i@gmx.at>2014-12-03 22:54:35 +0100
committerMichal Idziorek <m.i@gmx.at>2014-12-03 22:54:35 +0100
commitb5d9da88991592d35d39dcae3829d2498b4e47e4 (patch)
tree2be1ec075f489dc045310cace60d4c09340903b9 /kernel/kernel.c
parent5435237fca6b7ab618bfc955e2973d7b325ff9dc (diff)
increased logger grnaularity and working on memory management
Diffstat (limited to 'kernel/kernel.c')
-rw-r--r--kernel/kernel.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/kernel/kernel.c b/kernel/kernel.c
index 8adbf37..64c87c0 100644
--- a/kernel/kernel.c
+++ b/kernel/kernel.c
@@ -45,7 +45,7 @@ void kernel_main(uint32_t initial_stack, int mp)
//
// Activate Virtual Memory (paging)
// 0x8048000 is where user programms start!
- vmem_init();
+ pdirectory *dir=vmem_init();
//
// init output to screen
@@ -93,12 +93,7 @@ void kernel_main(uint32_t initial_stack, int mp)
// Initialize Multitasking
//
- task_init(); //; this will never return!
-
-
-
-
-
+ task_init(dir); //; this will never return!
}