Big merge: thanks alex and greatlord. Not a complete merge but most

[reactos.git] / reactos / ntoskrnl / ke / kthread.c

diff --git a/reactos/ntoskrnl/ke/kthread.c b/reactos/ntoskrnl/ke/kthread.c
index 80e9753..f8c639d 100644 (file)
--- a/reactos/ntoskrnl/ke/kthread.c
+++ b/reactos/ntoskrnl/ke/kthread.c
@@ -862,12 +862,14 @@ KeInitThread(IN OUT PKTHREAD Thread,
     Status = STATUS_SUCCESS;
     _SEH_TRY
     {
+#ifdef _M_IX86
         /* Initalize the Thread Context */
         Ke386InitThreadWithContext(Thread,
                                    SystemRoutine,
                                    StartRoutine,
                                    StartContext,
                                    Context);
+#endif
     }
     _SEH_HANDLE
     {
@@ -901,7 +903,9 @@ KeStartThread(IN OUT PKTHREAD Thread)
     UCHAR IdealProcessor;
 
     /* Setup static fields from parent */
+#ifdef _M_IX86
     Thread->Iopl = Process->Iopl;
+#endif
     Thread->Quantum = Process->QuantumReset;
     Thread->QuantumReset = Process->QuantumReset;
     Thread->SystemAffinityActive = FALSE;