Author: tkreuzer Date: Sun May 17 00:35:23 2015 New Revision: 67796
URL: http://svn.reactos.org/svn/reactos?rev=67796&view=rev Log: [NTOSKRNL] Get rid of MiRosTakeOverSharedUserPage. We don't need it anymore, since the user page is manually handled in the page fault handler and since it's outside the VAD region, we don't need to block that range. Now there should be no memory areas left at all in MmDeleteProcessAddressSpace.
Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c trunk/reactos/ntoskrnl/mm/marea.c
Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c?... ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Sun May 17 00:35:23 2015 @@ -23,25 +23,6 @@ SLIST_HEADER MmDeadStackSListHead;
/* PRIVATE FUNCTIONS **********************************************************/ - -VOID -NTAPI -MiRosTakeOverSharedUserPage(IN PEPROCESS Process) -{ - NTSTATUS Status; - PMEMORY_AREA MemoryArea; - PVOID AllocatedBase = (PVOID)MM_SHARED_USER_DATA_VA; - - Status = MmCreateMemoryArea(&Process->Vm, - MEMORY_AREA_OWNED_BY_ARM3, - &AllocatedBase, - PAGE_SIZE, - PAGE_READWRITE, - &MemoryArea, - 0, - PAGE_SIZE); - ASSERT(NT_SUCCESS(Status)); -}
NTSTATUS NTAPI @@ -973,9 +954,6 @@ /* Release PFN lock */ KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql);
- /* Lock the VAD, ARM3-owned ranges away */ - MiRosTakeOverSharedUserPage(Process); - /* Check if there's a Section Object */ if (SectionObject) { @@ -1077,7 +1055,6 @@ MmInitializeHandBuiltProcess2(IN PEPROCESS Process) { /* Lock the VAD, ARM3-owned ranges away */ - MiRosTakeOverSharedUserPage(Process); return STATUS_SUCCESS; }
Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=677... ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Sun May 17 00:35:23 2015 @@ -1173,7 +1173,6 @@ MmDeleteProcessAddressSpace(PEPROCESS Process) { PVOID Address; - PMEMORY_AREA MemoryArea;
DPRINT("MmDeleteProcessAddressSpace(Process %p (%s))\n", Process, Process->ImageFileName); @@ -1183,16 +1182,8 @@ #endif MmLockAddressSpace(&Process->Vm);
- while ((MemoryArea = (PMEMORY_AREA)Process->Vm.WorkingSetExpansionLinks.Flink) != NULL) - { - /* There should be nothing else left */ - ASSERT(MemoryArea->Type == MEMORY_AREA_OWNED_BY_ARM3); - - MmFreeMemoryArea(&Process->Vm, - MemoryArea, - NULL, - NULL); - } + /* There should not be any memory areas left! */ + ASSERT(Process->Vm.WorkingSetExpansionLinks.Flink == NULL);
#if (_MI_PAGING_LEVELS == 2) {