summaryrefslogtreecommitdiff
path: root/bootasm.S
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 /bootasm.S
parentfc210467548dabbbf196227ec279b3c3301c9951 (diff)
downloadxv6-labs-c35c064e0498db832a9440c5d031d5aaefd1f515.tar.gz
xv6-labs-c35c064e0498db832a9440c5d031d5aaefd1f515.tar.bz2
xv6-labs-c35c064e0498db832a9440c5d031d5aaefd1f515.zip
cmain -> bootmain
Diffstat (limited to 'bootasm.S')
-rw-r--r--bootasm.S4
1 files changed, 2 insertions, 2 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