Changeset 0dc2fec in mainline for kernel/arch/ia32/src/asm.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/ia32/src/asm.S (modified) (3 diffs)

kernel/arch/ia32/src/asm.S

@@ -36 +36 @@
 #include <arch/mm/page.h>
 #include <arch/istate_struct.h>
+#include <arch/smp/apic.h>
 
 .text
@@ -110 +111 @@
 FUNCTION_BEGIN(paging_on)
         movl %cr0, %edx
-        orl $(1 << 31), %edx  /* paging on */
+        orl $CR0_PG, %edx  /* paging on */
         
         /* Clear Cache Disable and not Write Though */
-        andl $~((1 << 30) | (1 << 29)), %edx
+        andl $~(CR0_CD | CR0_NW), %edx
         movl %edx, %cr0
         jmp 0f
@@ -127 +128 @@
  */
 FUNCTION_BEGIN(enable_l_apic_in_msr)
-        movl $0x1b, %ecx
+        movl $IA32_MSR_APIC_BASE, %ecx
         rdmsr
-        orl $(1 << 11), %eax
-        orl $(0xfee00000), %eax
+        orl $(L_APIC_BASE | IA32_APIC_BASE_GE), %eax
         wrmsr
         ret