xv6

commit c35c064e0498db832a9440c5d031d5aaefd1f515
parent fc210467548dabbbf196227ec279b3c3301c9951
Author: rsc <rsc>
Date:   Tue, 28 Aug 2007 13:01:10 +0000

cmain -> bootmain

Diffstat:
M
bootasm.S
 | 
4
++--
M
bootmain.c
 | 
2
+-

2 files changed, 3 insertions(+), 3 deletions(-)
diff --git 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
@@ -15,7 +15,7 @@
 void readseg(uint, uint, uint);
 
 void
-cmain(void)
+bootmain(void)
 {
   struct elfhdr *elf;
   struct proghdr *ph, *eph;