Changeset 811770c in mainline for kernel/arch/amd64/src/smp/ap.S

Timestamp:

2016-05-05T12:06:04Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

57c2a87

Parents:

0f17bff

Message:

Avoid magic numbers and specialized functions to set/get register bits

File:

• kernel/arch/amd64/src/smp/ap.S (modified) (2 diffs)

kernel/arch/amd64/src/smp/ap.S

@@ -75 +75 @@
         
         movl %cr4, %eax
-        btsl $5, %eax
+        orl $CR4_PAE, %eax
         movl %eax, %cr4
         
@@ -82 +82 @@
         
         # Enable long mode
-        movl $EFER_MSR_NUM, %ecx  # EFER MSR number
+        movl $AMD_MSR_EFER, %ecx  # EFER MSR number
         rdmsr                     # Read EFER
-        btsl $AMD_LME_FLAG, %eax  # Set LME=1
+        orl $AMD_LME, %eax        # Set LME=1
         wrmsr                     # Write EFER
         
         # Enable paging to activate long mode (set CR0.PG = 1)
         movl %cr0, %eax
-        btsl $31, %eax
+        orl $CR0_PG, %eax
         movl %eax, %cr0