From 93af394f5d55445b22fa50e99d8f8376cb34e8e1 Mon Sep 17 00:00:00 2001
From: Vegard Storheil Eriksen <zyp@jvnv.net>
Date: Mon, 11 Jan 2010 06:25:38 +0100
Subject: Switch to stack in virtual memory before calling main().

---
 kernel/entry.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kernel/entry.c b/kernel/entry.c
index d288027..2496d21 100644
--- a/kernel/entry.c
+++ b/kernel/entry.c
@@ -18,7 +18,7 @@ extern void main();
 asm(
 	".globl entry\n"
 	"entry:\n"
-	"mov $entry_stack_top,%esp\n"
+	"mov $entry_stack_top, %esp\n"
 	"push %ebx\n"
 	"push %eax\n"
 	"call entry_main\n"
@@ -83,6 +83,7 @@ void entry_main(uint32_t mb_magic, multiboot_info* mb_info) {
 	// TODO: Check that segments are loaded and mapped right.
 	
 	// Call main() in virtual memory.
+	asm volatile("mov $0, %esp");
 	main();
 	
 	stop:
-- 
cgit v1.2.3