- Don't put PAGED_CODE() before variable declarations -- this makes MSVC very, very...

svn path=/trunk/; revision=43722

diff --git a/reactos/ntoskrnl/mm/ARM3/drvmgmt.c b/reactos/ntoskrnl/mm/ARM3/drvmgmt.c
index 8b52c74..11ecbc1 100644 (file)
--- a/reactos/ntoskrnl/mm/ARM3/drvmgmt.c
+++ b/reactos/ntoskrnl/mm/ARM3/drvmgmt.c
@@ -116,44 +116,49 @@ PVOID
 NTAPI
 MmPageEntireDriver(IN PVOID AddressWithinSection)
 {
+    //PMMPTE StartPte, EndPte;
+    PLDR_DATA_TABLE_ENTRY LdrEntry;
     PAGED_CODE();
+
     //
-    // We should find the driver loader entry and return its base address
+    // Get the loader entry
     //
-    //PMMPTE StartPte, EndPte;
-    PLDR_DATA_TABLE_ENTRY pLdrDataTabEntry =
-        MiLookupDataTableEntry(AddressWithinSection);
-    if (pLdrDataTabEntry)
+    LdrEntry = MiLookupDataTableEntry(AddressWithinSection);
+    if (!LdrEntry) return NULL;
+
+    //
+    // Check if paging of kernel mode is disabled or if the driver is mapped as
+    // an image
+    //
+    if ((MmDisablePagingExecutive & 0x1) || (LdrEntry->SectionPointer))
     {
         //
-        //  Is Paging disabled or it's mapped as an image
+        // Don't do anything, just return the base address
         //
-        if ((MmDisablePagingExecutive & 1) || pLdrDataTabEntry->SectionPointer)
-           return pLdrDataTabEntry->DllBase;
+        return LdrEntry->DllBase;
+    }
 
-        //
-        // Flush all queued DPCs.
-        //
-        KeFlushQueuedDpcs();
+    //
+    // Wait for active DPCs to finish before we page out the driver
+    //
+    KeFlushQueuedDpcs();
 
-        //
-        // Get PTE range for this section
-        //
-        //StartPte = MiGetPteAddress(pLdrDataTabEntry->DllBase);
-        //EndPte = MiGetPteAddress(pLdrDataTabEntry->DllBase +
-        //                         pLdrDataTabEntry->SizeOfImage);
+    //
+    // Get the PTE range for the whole driver image
+    //
+    //StartPte = MiGetPteAddress(LdrEntry->DllBase);
+    //EndPte = MiGetPteAddress(LdrEntry->DllBase +
+    //                         LdrEntry->SizeOfImage);
 
-        //
-        // Set paging for specified PTE range
-        //
-        //MiSetPagingOfDriver(StartPte, EndPte);
+    //
+    // Enable paging for the PTE range
+    //
+    //MiSetPagingOfDriver(StartPte, EndPte);
 
-        //
-        // Return base address
-        //
-        return pLdrDataTabEntry->DllBase;
-    }
-    return NULL;
+    //
+    // Return the base address
+    //
+    return LdrEntry->DllBase;
 }
 
 /*