From f8a9311089f304c8d52a9997b1732380bb6abf2c Mon Sep 17 00:00:00 2001 From: Dmitry Gorbachev Date: Mon, 23 Feb 2009 13:18:28 +0000 Subject: [PATCH] Remove a hack from KiTrap14. Put a hack in other place. svn path=/trunk/; revision=39723 --- reactos/ntoskrnl/ke/i386/ctxswitch.S | 3 +++ reactos/ntoskrnl/ke/i386/trap.s | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/reactos/ntoskrnl/ke/i386/ctxswitch.S b/reactos/ntoskrnl/ke/i386/ctxswitch.S index 7d3447ebfeb..20204abf5a1 100644 --- a/reactos/ntoskrnl/ke/i386/ctxswitch.S +++ b/reactos/ntoskrnl/ke/i386/ctxswitch.S @@ -389,6 +389,9 @@ SetStack: /* Checking NPX, disable interrupts now */ mov eax, [esi+KTHREAD_INITIAL_STACK] + + /* HACK */ + mov ecx, [eax - 4] cli /* Get the NPX State */ diff --git a/reactos/ntoskrnl/ke/i386/trap.s b/reactos/ntoskrnl/ke/i386/trap.s index 95a97a69e31..8f4997bed11 100644 --- a/reactos/ntoskrnl/ke/i386/trap.s +++ b/reactos/ntoskrnl/ke/i386/trap.s @@ -1924,10 +1924,6 @@ _KiTrap14: NoFixUp: mov edi, cr2 - /* ROS HACK: Sometimes we get called with INTS DISABLED! WTF? */ - test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_INTERRUPT_MASK - je HandlePf - /* Enable interrupts and check if we got here with interrupts disabled */ sti test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_INTERRUPT_MASK