Author: tkreuzer
Date: Thu Jan 21 20:32:39 2010
New Revision: 45187
URL:
http://svn.reactos.org/svn/reactos?rev=45187&view=rev
Log:
[NTOS]
- Comment out NtRaiseException and NtContinue for now
- Use TrapFrame->PreviousMode like done for arm
Modified:
branches/ros-amd64-bringup/reactos/ntoskrnl/ke/except.c
branches/ros-amd64-bringup/reactos/ntoskrnl/ke/time.c
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/except.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
==============================================================================
--- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/except.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/except.c [iso-8859-1] Thu Jan 21
20:32:39 2010
@@ -167,6 +167,8 @@
/* SYSTEM CALLS ***************************************************************/
+#ifndef _M_AMD64
+
NTSTATUS
NTAPI
NtRaiseException(IN PEXCEPTION_RECORD ExceptionRecord,
@@ -239,5 +241,6 @@
/* We don't actually make it here */
return Status;
}
+#endif
/* EOF */
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/time.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
==============================================================================
--- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/time.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/time.c [iso-8859-1] Thu Jan 21 20:32:39
2010
@@ -133,7 +133,7 @@
Prcb->InterruptCount++;
/* Check if we came from user mode */
-#ifndef _M_ARM
+#if !defined(_M_ARM) && !defined(_M_AMD64)
if ((TrapFrame->SegCs & MODE_MASK) || (TrapFrame->EFlags &
EFLAGS_V86_MASK))
#else
if (TrapFrame->PreviousMode == UserMode)