Changeset 0dc2fec in mainline for kernel/arch/amd64/src/boot/multiboot2.S

Timestamp:

2016-05-22T19:19:43Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b272c67a

Parents:

153c7a29 (diff), af2254ec (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

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

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

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