From e7865175bde92f3e8da165712f12dfbdcadd6220 Mon Sep 17 00:00:00 2001
From: stefan <stefan@315a16e6-25f9-4109-90ae-ca3045a26c18>
Date: Wed, 8 Sep 2010 07:10:02 +0000
Subject: [PATCH] - add the SCC support in our memory management unit

git-svn-id: http://svn.lfbs.rwth-aachen.de/svn/scc/trunk/MetalSVM@147 315a16e6-25f9-4109-90ae-ca3045a26c18
---
 mm/memory.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/mm/memory.c b/mm/memory.c
index e4b3e044..cc510297 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -83,7 +83,7 @@ int mmu_init(void)
 {
 	size_t kernel_size;
 	unsigned int i; 
-	size_t addr;
+	size_t addr, end_addr;
 
 	/* set whole address space as occupied */
 	// array is already initialized (see declaration)
@@ -115,6 +115,10 @@ int mmu_init(void)
 		while(1) ;
 	}
 
+	/* 
+	 * Modules like init ram disk are already loaded.
+	 * Therefore, we set these pages as used.
+	 */
 	if (mb_info && (mb_info->flags & (1 << 3))) {
 		multiboot_module_t* mmodule = (multiboot_module_t*) mb_info->mods_addr;
 
@@ -125,21 +129,24 @@ int mmu_init(void)
 				atomic_int32_dec(&total_available_pages);
 			}
 		}
-	}
+	} 
 
 #elif defined(CONFIG_ROCKCREEK)
-	for(i=0; i< SCC_PMEM_REGIONS; i++){
+	for(i=0; i<SCC_PMEM_REGIONS; i++) {
 		addr = scc_info.private_mem[i].low;
+		end_addr = scc_info.private_mem[i].high;
 
-		while(addr < scc_info.private_mem[i].high) {
+		while(addr < end_addr) {
 			page_clear_mark(addr / PAGE_SIZE);
+			if (addr < addr + PAGE_SIZE)
+				break;
 			addr += PAGE_SIZE;
 			atomic_int32_inc(&total_pages);
 			atomic_int32_inc(&total_available_pages);
 		}
 	}
 #else
-	#error Currently, MetalSVM supports only Multiboot or the RockCreek processor!
+	#error Currently, MetalSVM supports only the Multiboot specification or the RockCreek processor!
 #endif
 
 	kernel_size = (size_t) &kernel_end - (size_t) &kernel_start;