X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Farch%2Fx86%2Fmm_virt.c;h=13562f2853560af1fed15dc48dca13cc77059c05;hb=9a135546ed260546b4903424232faf1a3c3a8be5;hp=868fe86a55d2039c64e8ca52558fe0de84378dfa;hpb=e02f66c7125bf18f77c6c53587238cbd49da2c89;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/arch/x86/mm_virt.c b/KernelLand/Kernel/arch/x86/mm_virt.c
index 868fe86a..13562f28 100644
--- a/KernelLand/Kernel/arch/x86/mm_virt.c
+++ b/KernelLand/Kernel/arch/x86/mm_virt.c
@@ -1080,7 +1080,7 @@ tVAddr MM_AllocDMA(int Pages, int MaxBits, tPAddr *PhysAddr)
 		MaxBits = PHYS_BITS;
 	
 	// Sanity Check
-	if(MaxBits < 12 || !PhysAddr) {
+	if(MaxBits < 12) {
 		LEAVE('i', 0);
 		return 0;
 	}
@@ -1089,11 +1089,11 @@ tVAddr MM_AllocDMA(int Pages, int MaxBits, tPAddr *PhysAddr)
 	if(Pages == 1 && MaxBits >= PHYS_BITS)
 	{
 		phys = MM_AllocPhys();
+		if( PhysAddr )
+			*PhysAddr = phys;
 		if( !phys ) {
-			*PhysAddr = 0;
 			LEAVE_RET('i', 0);
 		}
-		*PhysAddr = phys;
 		ret = MM_MapHWPages(phys, 1);
 		if(ret == 0) {
 			MM_DerefPhys(phys);
@@ -1122,7 +1122,8 @@ tVAddr MM_AllocDMA(int Pages, int MaxBits, tPAddr *PhysAddr)
 		return 0;
 	}
 	
-	*PhysAddr = phys;
+	if( PhysAddr )
+		*PhysAddr = phys;
 	LEAVE('x', ret);
 	return ret;
 }
@@ -1148,6 +1149,7 @@ void MM_UnmapHWPages(tVAddr VAddr, Uint Number)
 	{
 		MM_DerefPhys( gaPageTable[ i + j ] & ~0xFFF );
 		gaPageTable[ i + j ] = 0;
+		INVLPG( (tVAddr)(i+j) << 12 );
 	}
 	
 	Mutex_Release( &glTempMappings );