[tkreuzer] 64532: [NTOSKRNL] Remove obsolete FreePage parameter from MmDeleteVirtualMapping
Author: tkreuzer Date: Sun Oct 5 07:16:01 2014 New Revision: 64532
URL: http://svn.reactos.org/svn/reactos?rev=64532&view=rev Log: [NTOSKRNL] Remove obsolete FreePage parameter from MmDeleteVirtualMapping
Modified: trunk/reactos/ntoskrnl/cache/section/data.c trunk/reactos/ntoskrnl/cache/section/swapout.c trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/amd64/page.c trunk/reactos/ntoskrnl/mm/arm/page.c trunk/reactos/ntoskrnl/mm/arm/stubs.c trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/i386/pagepae.c trunk/reactos/ntoskrnl/mm/marea.c trunk/reactos/ntoskrnl/mm/powerpc/page.c trunk/reactos/ntoskrnl/mm/section.c
Modified: trunk/reactos/ntoskrnl/cache/section/data.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/data... ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] Sun Oct 5 07:16:01 2014 @@ -771,7 +771,7 @@ DPRINT("Removing page %p:%I64x -> %x\n", Segment, Offset.QuadPart, Entry); MmSetSavedSwapEntryPage(Page, 0); MmDeleteRmap(Page, Process, Address); - MmDeleteVirtualMapping(Process, Address, FALSE, NULL, NULL); + MmDeleteVirtualMapping(Process, Address, NULL, NULL); MmReleasePageMemoryConsumer(MC_CACHE, Page); } if (SwapEntry != 0)
Modified: trunk/reactos/ntoskrnl/cache/section/swapout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/swap... ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/swapout.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/swapout.c [iso-8859-1] Sun Oct 5 07:16:01 2014 @@ -309,7 +309,7 @@ }
MmDeleteRmap(Required->Page[0], Process, Address); - MmDeleteVirtualMapping(Process, Address, FALSE, Dirty, &OurPage); + MmDeleteVirtualMapping(Process, Address, Dirty, &OurPage); ASSERT(OurPage == Required->Page[0]);
/* Note: this releases the reference held by this address space only. */
Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/m... ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Sun Oct 5 07:16:01 2014 @@ -1158,7 +1158,6 @@ MmDeleteVirtualMapping( struct _EPROCESS *Process, PVOID Address, - BOOLEAN FreePage, BOOLEAN* WasDirty, PPFN_NUMBER Page );
Modified: trunk/reactos/ntoskrnl/mm/amd64/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/amd64/page.c?re... ============================================================================== --- trunk/reactos/ntoskrnl/mm/amd64/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/amd64/page.c [iso-8859-1] Sun Oct 5 07:16:01 2014 @@ -451,7 +451,6 @@ MmDeleteVirtualMapping( PEPROCESS Process, PVOID Address, - BOOLEAN FreePage, BOOLEAN* WasDirty, PPFN_NUMBER Page) { @@ -469,9 +468,6 @@ if (OldPte.u.Hard.Valid) { Pfn = OldPte.u.Hard.PageFrameNumber; - - //if (FreePage) - //MmReleasePageMemoryConsumer(MC_NPPOOL, Pfn); } else Pfn = 0;
Modified: trunk/reactos/ntoskrnl/mm/arm/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/arm/page.c?rev=... ============================================================================== --- trunk/reactos/ntoskrnl/mm/arm/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/arm/page.c [iso-8859-1] Sun Oct 5 07:16:01 2014 @@ -180,7 +180,6 @@ NTAPI MmDeleteVirtualMapping(IN PEPROCESS Process, IN PVOID Address, - IN BOOLEAN FreePage, OUT PBOOLEAN WasDirty, OUT PPFN_NUMBER Page) {
Modified: trunk/reactos/ntoskrnl/mm/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/arm/stubs.c?rev... ============================================================================== --- trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] Sun Oct 5 07:16:01 2014 @@ -474,7 +474,6 @@ NTAPI MmDeleteVirtualMapping(IN PEPROCESS Process, IN PVOID Address, - IN BOOLEAN FreePage, OUT PBOOLEAN WasDirty, OUT PPFN_NUMBER Page) {
Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?rev... ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Sun Oct 5 07:16:01 2014 @@ -358,7 +358,7 @@
VOID NTAPI -MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN FreePage, +MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN* WasDirty, PPFN_NUMBER Page) /* * FUNCTION: Delete a virtual mapping @@ -369,8 +369,8 @@ ULONG Pte; PULONG Pt;
- DPRINT("MmDeleteVirtualMapping(%p, %p, %u, %p, %p)\n", - Process, Address, FreePage, WasDirty, Page); + DPRINT("MmDeleteVirtualMapping(%p, %p, %p, %p)\n", + Process, Address, WasDirty, Page);
Pt = MmGetPageTableForProcess(Process, Address, FALSE);
@@ -410,12 +410,6 @@ }
Pfn = PTE_TO_PFN(Pte); - - if (FreePage) - { - MmReleasePageMemoryConsumer(MC_SYSTEM, Pfn); - Pfn = 0; - } } else {
Modified: trunk/reactos/ntoskrnl/mm/i386/pagepae.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/pagepae.c?... ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/pagepae.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/pagepae.c [iso-8859-1] Sun Oct 5 07:16:01 2014 @@ -622,7 +622,7 @@
VOID NTAPI -MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN FreePage, +MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN* WasDirty, PPFN_NUMBER Page) /* * FUNCTION: Delete a virtual mapping @@ -632,7 +632,7 @@ PFN_NUMBER Pfn;
DPRINT("MmDeleteVirtualMapping(%x, %x, %d, %x, %x)\n", - Process, Address, FreePage, WasDirty, Page); + Process, Address, WasDirty, Page); if (Ke386Pae) { ULONGLONG Pte; @@ -671,11 +671,6 @@ Pfn = 0; }
- if (FreePage && WasValid) - { - MmReleasePageMemoryConsumer(MC_NPPOOL, Pfn); - } - /* * Return some information to the caller */ @@ -724,11 +719,6 @@ else { Pfn = 0; - } - - if (FreePage && WasValid) - { - MmReleasePageMemoryConsumer(MC_NPPOOL, Pfn); }
/*
Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=645... ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Sun Oct 5 07:16:01 2014 @@ -837,7 +837,7 @@ } else { - MmDeleteVirtualMapping(Process, (PVOID)Address, FALSE, &Dirty, &Page); + MmDeleteVirtualMapping(Process, (PVOID)Address, &Dirty, &Page); } if (FreePage != NULL) {
Modified: trunk/reactos/ntoskrnl/mm/powerpc/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/powerpc/page.c?... ============================================================================== --- trunk/reactos/ntoskrnl/mm/powerpc/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/powerpc/page.c [iso-8859-1] Sun Oct 5 07:16:01 2014 @@ -170,7 +170,7 @@
VOID NTAPI -MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN FreePage, +MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN* WasDirty, PPFN_NUMBER Page) /* * FUNCTION: Delete a virtual mapping @@ -179,16 +179,11 @@ ppc_map_info_t info = { 0 };
DPRINT("MmDeleteVirtualMapping(%x, %x, %d, %x, %x)\n", - Process, Address, FreePage, WasDirty, Page); + Process, Address, WasDirty, Page);
info.proc = Process ? (int)Process->UniqueProcessId : 0; info.addr = (vaddr_t)Address; MmuInqPage(&info, 1); - - if (FreePage && info.phys) - { - MmReleasePageMemoryConsumer(MC_NPPOOL, info.phys >> PAGE_SHIFT); - }
/* * Return some information to the caller
Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=6... ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sun Oct 5 07:16:01 2014 @@ -1763,7 +1763,7 @@ }
MmDeleteRmap(OldPage, Process, PAddress); - MmDeleteVirtualMapping(Process, PAddress, FALSE, NULL, NULL); + MmDeleteVirtualMapping(Process, PAddress, NULL, NULL); MmCreatePageFileMapping(Process, PAddress, MM_WAIT_ENTRY);
/* @@ -1836,7 +1836,6 @@
MmDeleteVirtualMapping(Process, Address, - FALSE, &WasDirty, &Page); if (WasDirty)
-
tkreuzer＠svn.reactos.org