X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Farch%2Fx86%2Fmain.c;h=10cac71681b51fd9ed80cb8b4ec4c1af13004968;hb=56f9364724d8d04a8ffb6dec4213a5ae86968686;hp=822bf70b124934d4941eff3928f706e901595378;hpb=3b7ea9f98f32f0ca3a38f1667e544f29bf52efea;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/arch/x86/main.c b/KernelLand/Kernel/arch/x86/main.c
index 822bf70b..10cac716 100644
--- a/KernelLand/Kernel/arch/x86/main.c
+++ b/KernelLand/Kernel/arch/x86/main.c
@@ -9,6 +9,7 @@
 #include <init.h>
 #include <mm_virt.h>
 #include <pmemmap.h>
+#include <semaphore.h>
 
 #define	VGA_ERRORS	0
 
@@ -87,7 +88,7 @@ int kmain(Uint MbMagic, void *MbInfoPtr)
 			MbMagic, MULTIBOOT_MAGIC, MULTIBOOT2_MAGIC);
 		return 0;
 	}
-	
+
 	// Set up physical memory manager
 	MM_Install(nPMemMapEnts, pmemmap);
 	
@@ -133,20 +134,9 @@ void Arch_LoadBootModules(void)
 			Log_Warning("Arch", "Unable to load module");
 			continue ;
 		}
-		
-		#if 0
-		// Unmap and free
-		int numPages = (mod->Size + ((tVAddr)mod->Base&0xFFF) + 0xFFF) >> 12;
-		MM_UnmapHWPages( (tVAddr)gaArch_BootModules[i].Base, numPages );
-		
-		//for( int j = 0; j < numPages; j++ )
-		//	MM_DerefPhys( mod->PBase + (j << 12) );
-		
-		if( (tVAddr) mod->ArgString > MAX_ARGSTR_POS )
-			MM_UnmapHWPages( (tVAddr)mod->ArgString, 2 );
-		#endif
 	}
 	Log_Log("Arch", "Boot modules loaded");
-	if( gaArch_BootModules )
-		free( gaArch_BootModules );
+	Multiboot_FreeModules(giArch_NumBootModules, gaArch_BootModules);
+	giArch_NumBootModules = 0;
+	gaArch_BootModules = NULL;
 }