summaryrefslogtreecommitdiff
path: root/entryother.S
diff options
context:
space:
mode:
authorFrans Kaashoek <[email protected]>2011-08-15 17:41:58 -0400
committerFrans Kaashoek <[email protected]>2011-08-15 17:41:58 -0400
commit944964685325aa63a59e5e84d8fd0ba5af45ec8c (patch)
treef25a414730f9d5576666a89ead43a47ae387f6d8 /entryother.S
parent843eecfcd0c23f2b9466e5c3289c1819950ccb47 (diff)
downloadxv6-labs-944964685325aa63a59e5e84d8fd0ba5af45ec8c.tar.gz
xv6-labs-944964685325aa63a59e5e84d8fd0ba5af45ec8c.tar.bz2
xv6-labs-944964685325aa63a59e5e84d8fd0ba5af45ec8c.zip
Use 4Mbyte pages during boot
Diffstat (limited to 'entryother.S')
-rw-r--r--entryother.S6
1 files changed, 5 insertions, 1 deletions
diff --git a/entryother.S b/entryother.S
index 4f8e3ba..56651e6 100644
--- a/entryother.S
+++ b/entryother.S
@@ -50,6 +50,10 @@ start32:
movw %ax, %fs
movw %ax, %gs
+ # Turn on page size extension for 4Mbyte pages
+ movl %cr4, %eax
+ orl $(CR4_PSE), %eax
+ movl %eax, %cr4
# Use bootpgdir as our initial page table
movl (start-12), %eax
movl %eax, %cr3
@@ -58,7 +62,7 @@ start32:
orl $(CR0_PE|CR0_PG|CR0_WP), %eax
movl %eax, %cr0
- # Switch to the stack allocated by entryothers()
+ # Switch to the stack allocated by enterothers()
movl (start-4), %esp
# Call mpboot()
call *(start-8)