cmain -> bootmain

diff --git a/bootasm.S b/bootasm.S
index 7abcb29a68f5344522e4c83a6b21cdd74625a39b..1831604344a2413c37c156436e4420643cdce296 100644 (file)
--- 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 fe95fa338aba4f0232e7e458c6babecbaa6f0a41..61f9a2a1b61135be87ba3aff09bef350c2ac7ed1 100644 (file)
--- 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;