Author: tkreuzer Date: Tue Feb 28 17:50:21 2012 New Revision: 55903
URL: http://svn.reactos.org/svn/reactos?rev=55903&view=rev Log: [NTSOKRNL] Remove a broken ASSERT. Fixes MSVC build
Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c
Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c... ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Tue Feb 28 17:50:21 2012 @@ -936,9 +936,6 @@ /* Right now, we only handle scenarios where the PDE is totally empty */ ASSERT(PointerPde->u.Long == 0);
- /* Right now, we expect a valid protection mask on the VAD */ - ASSERT(ProtectionCode != MM_NOACCESS); - /* And go dispatch the fault on the PDE. This should handle the demand-zero */ #if MI_TRACE_PFNS UserPdeFault = TRUE; @@ -976,7 +973,7 @@
/* Make sure it's not a prototype PTE */ ASSERT(TempPte.u.Soft.Prototype == 0); - + /* Check if this address range belongs to a valid allocation (VAD) */ ProtoPte = MiCheckVirtualAddress(Address, &ProtectionCode, &Vad); if (ProtectionCode == MM_NOACCESS) @@ -1108,37 +1105,37 @@ ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL);
*ExecuteOptions = 0; - + if (CurrentProcess->Flags.ExecuteDisable) { *ExecuteOptions |= MEM_EXECUTE_OPTION_DISABLE; } - + if (CurrentProcess->Flags.ExecuteEnable) { *ExecuteOptions |= MEM_EXECUTE_OPTION_ENABLE; } - + if (CurrentProcess->Flags.DisableThunkEmulation) { *ExecuteOptions |= MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION; } - + if (CurrentProcess->Flags.Permanent) { *ExecuteOptions |= MEM_EXECUTE_OPTION_PERMANENT; } - + if (CurrentProcess->Flags.ExecuteDispatchEnable) { *ExecuteOptions |= MEM_EXECUTE_OPTION_EXECUTE_DISPATCH_ENABLE; } - + if (CurrentProcess->Flags.ImageDispatchEnable) { *ExecuteOptions |= MEM_EXECUTE_OPTION_IMAGE_DISPATCH_ENABLE; } - + return STATUS_SUCCESS; }