X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86_64%2Fdesctab.asm;h=6e8aa6398ca7f64fa4491d7181793555b28035a0;hb=6d5880d56afb2c6a900e480c891fb40e05457ea3;hp=a69e06ada2e6be25d8c38c7a58303cbd92d4686d;hpb=9925620c56d546a91bf9934be1673afca680438b;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86_64/desctab.asm b/Kernel/arch/x86_64/desctab.asm
index a69e06ad..6e8aa639 100644
--- a/Kernel/arch/x86_64/desctab.asm
+++ b/Kernel/arch/x86_64/desctab.asm
@@ -104,12 +104,6 @@ Desctab_Init:
 	; Start interrupts
 	sti
 
-	; Initialise System Calls (SYSCALL/SYSRET)
-	; Set IA32_EFER.SCE
-	mov ecx, 0xC0000080
-	rdmsr
-	or eax, 1
-	wrmsr
 	; Set IA32_LSTAR (RIP of handler)
 	mov ecx, 0xC0000082	; IA32_LSTAR
 	mov eax, SyscallStub - 0xFFFFFFFF00000000
@@ -255,7 +249,7 @@ ErrorCommon:
 	;PUSH_XMM
 	
 	mov rdi, rsp
-	xchg bx, bx
+;	xchg bx, bx
 	call Error_Handler
 	
 	;POP_XMM
@@ -394,7 +388,7 @@ SyscallStub:
 	; R9
 	sub rsp, (6+2)*8
 	mov [rsp+0x00], rax	; Number
-;	mov [rsp+0x08], rax	; Errno (don't care really)
+;	mov [rsp+0x08], rax	; Errno (output only)
 	mov [rsp+0x10], rdi	; Arg1
 	mov [rsp+0x18], rsi	; Arg2
 	mov [rsp+0x20], rdx	; Arg3
@@ -440,3 +434,5 @@ gaIRQ_Handlers:
 	times	16*NUM_IRQ_CALLBACKS	dq	0
 gaIRQ_DataPtrs:
 	times	16*NUM_IRQ_CALLBACKS	dq	0
+
+; vim: ft=nasm