From cdb9b56484a3369bb6578caaff68ccf1ce4605d8 Mon Sep 17 00:00:00 2001
From: Thomas Faber <thomas.faber@reactos.org>
Date: Fri, 1 Feb 2013 09:39:54 +0000
Subject: [PATCH] [NTOSKRNL:MM] - More effective debugging CORE-6929

svn path=/trunk/; revision=58258
---
 reactos/ntoskrnl/mm/ARM3/expool.c |  4 ++--
 reactos/ntoskrnl/mm/rmap.c        | 12 +++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/reactos/ntoskrnl/mm/ARM3/expool.c b/reactos/ntoskrnl/mm/ARM3/expool.c
index 73a4a8146fe..d496345e5d8 100644
--- a/reactos/ntoskrnl/mm/ARM3/expool.c
+++ b/reactos/ntoskrnl/mm/ARM3/expool.c
@@ -572,8 +572,8 @@ ExpRemovePoolTracker(IN ULONG Key,
         //
         if (!TableEntry->Key)
         {
-            DPRINT1("Empty item reached in tracker table. Tag=0x%08lx, NumberOfBytes=%lu, PoolType=%d\n",
-                    Key, (ULONG)NumberOfBytes, PoolType);
+            DPRINT1("Empty item reached in tracker table. Hash=0x%lx, TableMask=0x%lx, Tag=0x%08lx, NumberOfBytes=%lu, PoolType=%d\n",
+                    Hash, TableMask, Key, (ULONG)NumberOfBytes, PoolType);
             ASSERT(Hash == TableMask);
         }
 
diff --git a/reactos/ntoskrnl/mm/rmap.c b/reactos/ntoskrnl/mm/rmap.c
index 7d1c0b15901..cc35180478e 100644
--- a/reactos/ntoskrnl/mm/rmap.c
+++ b/reactos/ntoskrnl/mm/rmap.c
@@ -27,6 +27,16 @@ FAST_MUTEX RmapListLock;
 
 /* FUNCTIONS ****************************************************************/
 
+_IRQL_requires_max_(DISPATCH_LEVEL)
+static
+VOID
+NTAPI
+RmapListFree(
+    _In_ __drv_freesMem(Mem) PVOID P)
+{
+    ExFreePoolWithTag(P, TAG_RMAP);
+}
+
 VOID
 INIT_FUNCTION
 NTAPI
@@ -35,7 +45,7 @@ MmInitializeRmapList(VOID)
    ExInitializeFastMutex(&RmapListLock);
    ExInitializeNPagedLookasideList (&RmapLookasideList,
                                     NULL,
-                                    NULL,
+                                    RmapListFree,
                                     0,
                                     sizeof(MM_RMAP_ENTRY),
                                     TAG_RMAP,