From a4b213cf49cccc8287e638badaac10d0521d5886 Mon Sep 17 00:00:00 2001
From: Frans Kaashoek <kaashoek@Frans-Kaashoeks-MacBook-Pro.local>
Date: Mon, 15 Aug 2011 20:11:13 -0400
Subject: Avoid "boot" in xv6

---
 entry.S | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'entry.S')

diff --git a/entry.S b/entry.S
index 46fcca6..cf45bf3 100644
--- a/entry.S
+++ b/entry.S
@@ -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
-- 
cgit v1.2.3