update for HEAD-2003050101

[reactos.git] / ntoskrnl / ke / i386 / trap.s

diff --git a/ntoskrnl/ke/i386/trap.s b/ntoskrnl/ke/i386/trap.s
index 7a1acd2..a9d3553 100644 (file)
--- a/ntoskrnl/ke/i386/trap.s
+++ b/ntoskrnl/ke/i386/trap.s
@@ -104,6 +104,7 @@ _KiTrapProlog:
        
         /* Set the new previous mode based on the saved CS selector */
        movl     0x24(%esp), %ebx
+       andl     $0x0000FFFF, %ebx
        cmpl     $KERNEL_CS, %ebx
        jne      .L1
        movb     $KernelMode, %ss:KTHREAD_PREVIOUS_MODE(%edi)
@@ -170,7 +171,7 @@ _KiTrapProlog:
        addl    $4, %esp
 
        /* Get a pointer to the current thread */
-        movl   %fs:0x124, %esi
+        movl   %fs:KPCR_CURRENT_THREAD, %esi
        
         /* Restore the old trap frame pointer */
        popl    %ebx
@@ -318,6 +319,7 @@ _KiTrap14:
 
 .globl _KiTrap15
 _KiTrap15:
+       pushl   $0
        pushl   %ebp
        pushl   %ebx
        pushl   %esi
@@ -326,6 +328,7 @@ _KiTrap15:
 
 .globl _KiTrap16
 _KiTrap16:
+       pushl   $0
        pushl   %ebp
        pushl   %ebx
        pushl   %esi