even more explicit that entry.S is linked into kernel, unlike bootasm.S.

diff --git a/entry.S b/entry.S
index 5f4e12433e6222cf81851efacb9e2a1622641381..bc79babe5c94240b904f864d7611530fa98cb9fc 100644 (file)
--- a/entry.S
+++ b/entry.S
@@ -1,3 +1,7 @@
+# The xv6 kernel starts executing in this file. This file is linked with
+# the kernel C code, so it can refer to kernel symbols such as main().
+# The boot block (bootasm.S and bootmain.c) jumps to entry below.
+        
 # Multiboot header, for multiboot boot loaders like GNU Grub.
 # http://www.gnu.org/software/grub/manual/multiboot/multiboot.html
 #

diff --git a/entryother.S b/entryother.S
index 9f94cd3772625196bda3b228ac452eb57b1524b1..8a8a020864e357fa430685103cd0e23f6f459d59 100644 (file)
--- a/entryother.S
+++ b/entryother.S
@@ -53,7 +53,7 @@ start32:
   movl    %cr4, %eax
   orl     $(CR4_PSE), %eax
   movl    %eax, %cr4
-  # Use enterpgdir as our initial page table
+  # Use entrypgdir as our initial page table
   movl    (start-12), %eax
   movl    %eax, %cr3
   # Turn on paging.