summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrsc <rsc>2007-08-28 13:01:10 +0000
committerrsc <rsc>2007-08-28 13:01:10 +0000
commitc35c064e0498db832a9440c5d031d5aaefd1f515 (patch)
tree5ebf919cd7c67a077f499c0bfdcfc69c98ed7c46
parentfc210467548dabbbf196227ec279b3c3301c9951 (diff)
downloadxv6-labs-c35c064e0498db832a9440c5d031d5aaefd1f515.tar.gz
xv6-labs-c35c064e0498db832a9440c5d031d5aaefd1f515.tar.bz2
xv6-labs-c35c064e0498db832a9440c5d031d5aaefd1f515.zip
cmain -> bootmain
-rw-r--r--bootasm.S4
-rw-r--r--bootmain.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/bootasm.S b/bootasm.S
index 7abcb29..1831604 100644
--- a/bootasm.S
+++ b/bootasm.S
@@ -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
diff --git a/bootmain.c b/bootmain.c
index fe95fa3..61f9a2a 100644
--- a/bootmain.c
+++ b/bootmain.c
@@ -15,7 +15,7 @@
void readseg(uint, uint, uint);
void
-cmain(void)
+bootmain(void)
{
struct elfhdr *elf;
struct proghdr *ph, *eph;