commit a491dba00c4ff5c76a6287f40d045aa9aedc0d61
parent d844f0f9d955d9ddb2cb4cda1b0e544e7f9ed6ce
Author: rsc <rsc>
Date: Tue, 28 Aug 2007 18:02:49 +0000
more cmain -> bootmain
Diffstat:
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git 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
@@ -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