Skip to content

Commit

Permalink
more cmain -> bootmain
Browse files Browse the repository at this point in the history
  • Loading branch information
rsc committed Aug 28, 2007
1 parent d844f0f commit a491dba
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion bootmain.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion bootother.S
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit a491dba

Please sign in to comment.