diff options
author | Frans Kaashoek <[email protected]> | 2011-08-15 20:11:13 -0400 |
---|---|---|
committer | Frans Kaashoek <[email protected]> | 2011-08-15 20:11:13 -0400 |
commit | a4b213cf49cccc8287e638badaac10d0521d5886 (patch) | |
tree | 095d550b12eeb48d224193a7401e6793fe7c1d50 /entry.S | |
parent | 944964685325aa63a59e5e84d8fd0ba5af45ec8c (diff) | |
download | xv6-labs-a4b213cf49cccc8287e638badaac10d0521d5886.tar.gz xv6-labs-a4b213cf49cccc8287e638badaac10d0521d5886.tar.bz2 xv6-labs-a4b213cf49cccc8287e638badaac10d0521d5886.zip |
Avoid "boot" in xv6
Diffstat (limited to 'entry.S')
-rw-r--r-- | entry.S | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -34,17 +34,17 @@ multiboot_header: .long multiboot_header .long edata .long end - .long multiboot_entry + .long entry -# Multiboot entry point. Machine is mostly set up. -.globl multiboot_entry -multiboot_entry: +# Entering xv6 on boot processor. Machine is mostly set up. +.globl entry +entry: # Turn on page size extension for 4Mbyte pages movl %cr4, %eax orl $(CR4_PSE), %eax movl %eax, %cr4 # Set page directory - movl $(V2P_WO(bootpgdir)), %eax + movl $(V2P_WO(enterpgdir)), %eax movl %eax, %cr3 # Turn on paging. movl %cr0, %eax |