Merge trunk HEAD (r46369)

[reactos.git] / reactos / ntoskrnl / mm / ARM3 / iosup.c

diff --git a/reactos/ntoskrnl/mm/ARM3/iosup.c b/reactos/ntoskrnl/mm/ARM3/iosup.c
index 1a17450..b9f7eb6 100644 (file)
--- a/reactos/ntoskrnl/mm/ARM3/iosup.c
+++ b/reactos/ntoskrnl/mm/ARM3/iosup.c
@@ -50,11 +50,10 @@ MmMapIoSpace(IN PHYSICAL_ADDRESS PhysicalAddress,
              IN MEMORY_CACHING_TYPE CacheType)
 {
     
-    PFN_TYPE Pfn, PageCount;
+    PFN_NUMBER Pfn, PageCount;
     PMMPTE PointerPte;
     PVOID BaseAddress;
     MMPTE TempPte;
-    PMMPFN Pfn1 = NULL;
     MI_PFN_CACHE_ATTRIBUTE CacheAttribute;
     BOOLEAN IsIoMapping;
 
@@ -91,7 +90,6 @@ MmMapIoSpace(IN PHYSICAL_ADDRESS PhysicalAddress,
     //
     Pfn = (PFN_NUMBER)(PhysicalAddress.QuadPart >> PAGE_SHIFT);
     IsIoMapping = (Pfn > MmHighestPhysicalPage) ? TRUE : FALSE;
-    if (!IsIoMapping) Pfn1 = MiGetPfnEntry(Pfn);
     CacheAttribute = MiPlatformCacheAttributes[IsIoMapping][CacheType];
     
     //
@@ -159,10 +157,8 @@ MmMapIoSpace(IN PHYSICAL_ADDRESS PhysicalAddress,
     }
     
     //
-    // Sanity check and re-flush
+    // Re-flush
     //
-    Pfn = (PFN_NUMBER)(PhysicalAddress.QuadPart >> PAGE_SHIFT);
-    ASSERT((Pfn1 == MiGetPfnEntry(Pfn)) || (Pfn1 == NULL));
     KeFlushEntireTb(TRUE, TRUE);
     KeInvalidateAllCaches();
     
@@ -195,7 +191,7 @@ MmMapIoSpace(IN PHYSICAL_ADDRESS PhysicalAddress,
 VOID
 NTAPI
 MmUnmapIoSpace(IN PVOID BaseAddress,
-               IN ULONG NumberOfBytes)
+               IN SIZE_T NumberOfBytes)
 {    
     PFN_NUMBER PageCount, Pfn;
     PMMPTE PointerPte;
@@ -244,7 +240,7 @@ MmUnmapIoSpace(IN PVOID BaseAddress,
 PVOID
 NTAPI
 MmMapVideoDisplay(IN PHYSICAL_ADDRESS PhysicalAddress,
-                  IN ULONG NumberOfBytes,
+                  IN SIZE_T NumberOfBytes,
                   IN MEMORY_CACHING_TYPE CacheType)
 {
     PAGED_CODE();
@@ -261,7 +257,7 @@ MmMapVideoDisplay(IN PHYSICAL_ADDRESS PhysicalAddress,
 VOID
 NTAPI
 MmUnmapVideoDisplay(IN PVOID BaseAddress,
-                    IN ULONG NumberOfBytes)
+                    IN SIZE_T NumberOfBytes)
 {
     //
     // Call the real function