X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86_64%2Fstart32.asm;h=52b133c6ec731636a75a45f5159ec405377dcaf4;hb=e7dd0e094f0c23bb20ddb0025f41d1c0c28f5ab2;hp=d38c993ee52f109bbdb2af49594bb001908902d3;hpb=b68b764267d33a45539b4c910db13fbdae48f193;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86_64/start32.asm b/Kernel/arch/x86_64/start32.asm
index d38c993e..52b133c6 100644
--- a/Kernel/arch/x86_64/start32.asm
+++ b/Kernel/arch/x86_64/start32.asm
@@ -62,10 +62,11 @@ start:
 	mov eax, gInitialPML4 - KERNEL_BASE
 	mov cr3, eax
 
-	; Enable long/compatability mode
+	; Enable IA-32e mode
+	; (Also enables SYSCALL and NX)
 	mov ecx, 0xC0000080
 	rdmsr
-	or ax, 0x100
+	or eax, (1 << 11)|(1 << 8)|(1 << 0)	; NXE, LME, SCE
 	wrmsr
 
 	; Enable paging
@@ -90,6 +91,8 @@ start:
 	jmp .loop
 	
 .hlt:
+	cli
+	hlt
 	jmp .hlt
 
 [section .data]