Kernel - Changed Threads_CloneTCB (removed Err ptr)

[tpg/acess2.git] / Kernel / arch / x86_64 / desctab.asm

diff --git a/Kernel/arch/x86_64/desctab.asm b/Kernel/arch/x86_64/desctab.asm
index 8ee4352..c9c217c 100644 (file)
--- a/Kernel/arch/x86_64/desctab.asm
+++ b/Kernel/arch/x86_64/desctab.asm
@@ -118,7 +118,7 @@ Desctab_Init:
        ; Set IA32_FMASK (flags mask)
        mov ecx, 0xC0000084
        rdmsr
-       mov eax, 0x202
+       mov eax, ~0x202
        wrmsr
        ; Set IA32_STAR (Kernel/User CS)
        mov ecx, 0xC0000081
@@ -255,7 +255,7 @@ ErrorCommon:
        ;PUSH_XMM
        
        mov rdi, rsp
-       xchg bx, bx
+;      xchg bx, bx
        call Error_Handler
        
        ;POP_XMM
@@ -386,8 +386,6 @@ SyscallStub:
        push rcx        ; RIP
        push r11        ; RFLAGS
 
-       sti     ; Start interrupts again
-
        ; RDI
        ; RSI
        ; RDX
@@ -442,3 +440,5 @@ gaIRQ_Handlers:
        times   16*NUM_IRQ_CALLBACKS    dq      0
 gaIRQ_DataPtrs:
        times   16*NUM_IRQ_CALLBACKS    dq      0
+
+; vim: ft=nasm