Import backup from 2005-06-02

kernel/mm/mm.c

@@ -50,10 +50,7 @@ void	mm_init()
 	{
 		mm_preserven(mb_modules[i].mod_start - VIRT_OFFSET, (mb_modules[i].mod_end - mb_modules[i].mod_start) >> 12);
 	}
-	if (mm_totalmem % 0x100000)
-		mm_megabytes = (mm_totalmem >> 20) + 1;
-	else
-		mm_megabytes = mm_totalmem >> 20;
+	mm_megabytes = (mm_totalmem >> 20) + ((mm_totalmem % 0x100000) ? 1 : 0);
 }
 
 

kernel/mm/vmm.c

@@ -11,7 +11,7 @@
 #include "mm/mm.h"
 
 int	vmm_map_range(void *virt_start, void *virt_end, u32_t phys_start);
-void *vmm_getFreeChunk(u32_t size);
+void	*vmm_getFreeChunk(u32_t size);
 void	vmm_removeHeapEntry(u32_t queue, HeapEntry_t *he);
 int	vmm_moreCore(u32_t size);
 int	vmm_coalesceEntry(u32_t queue, HeapEntry_t *newHE);