more cmain -> bootmain

diff --git a/bootmain.c b/bootmain.c
index 61f9a2a1b61135be87ba3aff09bef350c2ac7ed1..c891e1b0e0d667b9e7fd12b4531c9d7dfca54ba2 100644 (file)
--- a/bootmain.c
+++ b/bootmain.c
@@ -2,7 +2,7 @@
 // 
 // The BIOS loads boot sector (bootasm.S) from sector 1 of the disk
 // into memory and executes it.  The boot sector puts the processor
-// in 32-bit mode and calls cmain below, which loads an ELF kernel
+// in 32-bit mode and calls bootmain below, which loads an ELF kernel
 // image from the disk starting at sector 2 and then jumps to the
 // kernel entry routine.
 

diff --git a/bootother.S b/bootother.S
index f243f41ffdeb6ecb3da4380bef63fe1d8234bc46..b4a3107c858f651c72db2c0f8d205aaa4e28f999 100644 (file)
--- a/bootother.S
+++ b/bootother.S
@@ -16,7 +16,7 @@
 # This code is identical to bootasm.S except:
 #   - it does not need to enable A20
 #   - it uses the address at start-4 for the %esp
-#   - it jumps to the address at start-8 instead of calling cmain
+#   - it jumps to the address at start-8 instead of calling bootmain
 
 .set PROT_MODE_CSEG, 0x8         # kernel code segment selector
 .set PROT_MODE_DSEG, 0x10        # kernel data segment selector