summaryrefslogtreecommitdiff
path: root/kernel/main.c
diff options
context:
space:
mode:
authorVegard Storheil Eriksen <zyp@jvnv.net>2010-02-02 07:28:10 +0100
committerVegard Storheil Eriksen <zyp@jvnv.net>2010-02-02 07:28:10 +0100
commit8abb673efbc4cccda9ed564eeebe4660a879647e (patch)
tree9709fd49dbc70838b77d290a338a1d230ea27f27 /kernel/main.c
parent273967f16dad471478bbca2a14a5282faae95679 (diff)
Reinitialize paging.
Diffstat (limited to 'kernel/main.c')
-rw-r--r--kernel/main.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/kernel/main.c b/kernel/main.c
index db22f07..d6de534 100644
--- a/kernel/main.c
+++ b/kernel/main.c
@@ -1,6 +1,7 @@
#include "kernel.h"
#include "printf.h"
#include "palloc.h"
+#include "paging.h"
#include "gdt.h"
#include "idt.h"
#include "irq.h"
@@ -11,6 +12,9 @@ void main() {
palloc_init();
printf("Page allocator initiated.\n");
+ paging_reinit();
+ printf("Paging reinitialized.\n");
+
gdt_init();
printf("GDT set.\n");
@@ -27,6 +31,7 @@ void main() {
asm volatile("sti");
+ /*
asm volatile(
"push $0x23\n"
"push $entry_stack_top\n"
@@ -35,7 +40,7 @@ void main() {
"push %0\n"
"iret\n"
:: "r" (multiboot_info.mods_addr[0].mod_start)
- );
+ ); */
printf("Halting.\n");