Changes in kernel/arch/amd64/src/boot/multiboot.S [811770c:3b0f1b9a] in mainline

File:

• kernel/arch/amd64/src/boot/multiboot.S (modified) (2 diffs)

kernel/arch/amd64/src/boot/multiboot.S

@@ -168 +168 @@
         
         movl %cr4, %eax
-        orl $CR4_PAE, %eax
+        btsl $5, %eax
         movl %eax, %cr4
         
@@ -176 +176 @@
         
         /* Enable long mode */
-        movl $AMD_MSR_EFER, %ecx
+        movl $EFER_MSR_NUM, %ecx
         rdmsr                     /* read EFER */
-        orl $AMD_LME, %eax        /* set LME = 1 */
+        btsl $AMD_LME_FLAG, %eax  /* set LME = 1 */
         wrmsr
         
         /* Enable paging to activate long mode (set CR0.PG = 1) */
         movl %cr0, %eax
-        orl $CR0_PG, %eax
+        btsl $31, %eax
         movl %eax, %cr0