diff options
author | rsc <rsc> | 2007-08-28 13:01:10 +0000 |
---|---|---|
committer | rsc <rsc> | 2007-08-28 13:01:10 +0000 |
commit | c35c064e0498db832a9440c5d031d5aaefd1f515 (patch) | |
tree | 5ebf919cd7c67a077f499c0bfdcfc69c98ed7c46 | |
parent | fc210467548dabbbf196227ec279b3c3301c9951 (diff) | |
download | xv6-labs-c35c064e0498db832a9440c5d031d5aaefd1f515.tar.gz xv6-labs-c35c064e0498db832a9440c5d031d5aaefd1f515.tar.bz2 xv6-labs-c35c064e0498db832a9440c5d031d5aaefd1f515.zip |
cmain -> bootmain
-rw-r--r-- | bootasm.S | 4 | ||||
-rw-r--r-- | bootmain.c | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -67,9 +67,9 @@ protcseg: # Set up the stack pointer and call into C. movl $start, %esp - call cmain + call bootmain - # If cmain returns (it shouldn't), loop. + # If bootmain returns (it shouldn't), loop. spin: jmp spin @@ -15,7 +15,7 @@ void readseg(uint, uint, uint); void -cmain(void) +bootmain(void) { struct elfhdr *elf; struct proghdr *ph, *eph; |