From 3e73d6384eeaf634286cb01e6ec93a57dbccd011 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <steffen.vogel@rwth-aachen.de>
Date: Thu, 17 Oct 2013 13:09:20 +0200
Subject: [PATCH] fixed regression
---
arch/x86/kernel/entry64.asm | 2 +-
mm/memory.c | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/x86/kernel/entry64.asm b/arch/x86/kernel/entry64.asm
index 0064a2c3..080c87d5 100644
--- a/arch/x86/kernel/entry64.asm
+++ b/arch/x86/kernel/entry64.asm
@@ -230,7 +230,7 @@ cpu_init:
ALIGN 4
stublet:
- mov esp, startup_stack
+ mov esp, startup_stack-4
; save pointer to the multiboot structure
push ebx
; initialize cpu features
diff --git a/mm/memory.c b/mm/memory.c
index b01cdb58..2b6a4c51 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -109,7 +109,6 @@ int mmu_init(void)
while (mmap < mmap_end) {
if (mmap->type == MULTIBOOT_MEMORY_AVAILABLE) {
- /
// set the available memory as "unused"
addr = mmap->addr;
end_addr = addr + mmap->len;