diff options
| author | Alex AUVOLAT <alexis211@gmail.com> | 2012-05-17 11:27:59 +0200 |
|---|---|---|
| committer | Alex AUVOLAT <alexis211@gmail.com> | 2012-05-17 11:27:59 +0200 |
| commit | 1c7c106b06b6a88502801e699ef99e72b7c625cd (patch) | |
| tree | 5708a229b0d66e8eb82a953861e017915f8176b6 /src/kernel/core | |
| parent | 5bc8549a8d7f5c9644f878fe3ca55761663a2fd0 (diff) | |
| download | TCE-1c7c106b06b6a88502801e699ef99e72b7c625cd.tar.gz TCE-1c7c106b06b6a88502801e699ef99e72b7c625cd.zip | |
Fixed some nasty bugs.
Diffstat (limited to 'src/kernel/core')
| -rw-r--r-- | src/kernel/core/kmain.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/kernel/core/kmain.cpp b/src/kernel/core/kmain.cpp index 0a5f2d8..8b77bcf 100644 --- a/src/kernel/core/kmain.cpp +++ b/src/kernel/core/kmain.cpp @@ -48,9 +48,9 @@ extern "C" void kmain(multiboot_info_t* mbd, int32_t magic) { totalRam = ((mbd->mem_upper + mbd->mem_lower) * 1024); paging_init(totalRam); - _no_more_ksbrk = true; gdt_init(); paging_cleanup(); + _no_more_ksbrk = true; //kheap_init(); timer_init(30); @@ -72,7 +72,7 @@ extern "C" void kmain(multiboot_info_t* mbd, int32_t magic) { } } - monitor_write("Modules now RULE THE WORLD !\n\n"); + monitor_write("Giving control to userland processes.\n\n"); sti(); schedule(); PANIC("Should never happen. Something probably went wrong with multitasking."); |