Changeset 0dc2fec in mainline for kernel/arch/ia32/src/asm.S
- Timestamp:
- 2016-05-22T19:19:43Z (9 years ago)
- 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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/arch/ia32/src/asm.S
r153c7a29 r0dc2fec 36 36 #include <arch/mm/page.h> 37 37 #include <arch/istate_struct.h> 38 #include <arch/smp/apic.h> 38 39 39 40 .text … … 110 111 FUNCTION_BEGIN(paging_on) 111 112 movl %cr0, %edx 112 orl $ (1 << 31), %edx /* paging on */113 orl $CR0_PG, %edx /* paging on */ 113 114 114 115 /* Clear Cache Disable and not Write Though */ 115 andl $~( (1 << 30) | (1 << 29)), %edx116 andl $~(CR0_CD | CR0_NW), %edx 116 117 movl %edx, %cr0 117 118 jmp 0f … … 127 128 */ 128 129 FUNCTION_BEGIN(enable_l_apic_in_msr) 129 movl $ 0x1b, %ecx130 movl $IA32_MSR_APIC_BASE, %ecx 130 131 rdmsr 131 orl $(1 << 11), %eax 132 orl $(0xfee00000), %eax 132 orl $(L_APIC_BASE | IA32_APIC_BASE_GE), %eax 133 133 wrmsr 134 134 ret
Note:
See TracChangeset
for help on using the changeset viewer.