From 51de801d45e406ac9d6f1ae831a605259914ff24 Mon Sep 17 00:00:00 2001 From: Stefan Ginsberg Date: Sat, 7 Apr 2012 01:18:36 +0000 Subject: [PATCH] - It seems the remaining page fault issue was fixed as well in 56333, so it should now be safe to enable this check. Finally, it is now illegal to page fault in ReactOS with interrupts disabled, as it should be. Previous attempts to fix this were likely hindered by the old memory manager, but ARM3 seems to do its job and doesn't fault on non-paged memory that I believe the old Mm was doing. - Hacks--; svn path=/trunk/; revision=56335 --- reactos/ntoskrnl/ke/i386/traphdlr.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/reactos/ntoskrnl/ke/i386/traphdlr.c b/reactos/ntoskrnl/ke/i386/traphdlr.c index 9222079d0af..ae5aeb34bd7 100644 --- a/reactos/ntoskrnl/ke/i386/traphdlr.c +++ b/reactos/ntoskrnl/ke/i386/traphdlr.c @@ -1190,8 +1190,7 @@ KiTrap0EHandler(IN PKTRAP_FRAME TrapFrame) /* Enable interupts */ _enable(); -#if 0 - /* Check if we faulted with interrupts disabled */ + /* Check if we came in with interrupts disabled */ if (!(TrapFrame->EFlags & EFLAGS_INTERRUPT_MASK)) { /* This is completely illegal, bugcheck the system */ @@ -1202,14 +1201,6 @@ KiTrap0EHandler(IN PKTRAP_FRAME TrapFrame) TrapFrame->Eip, TrapFrame); } -#else - if (!(TrapFrame->EFlags & EFLAGS_INTERRUPT_MASK)) - { - /* Warn and dump stack */ - DPRINT1("Page fault with interrupts disabled!\n"); - KeRosDumpStackFrames(NULL, 0); - } -#endif /* Check for S-LIST fault in kernel mode */ if (TrapFrame->Eip == (ULONG_PTR)ExpInterlockedPopEntrySListFault)