summaryrefslogtreecommitdiff
path: root/entry.S
diff options
context:
space:
mode:
authorFrans Kaashoek <[email protected]>2018-10-03 17:58:21 -0400
committerFrans Kaashoek <[email protected]>2018-10-03 17:58:21 -0400
commit23a58370a4fa441fd0ee152a3e1e7619e5d8bd6b (patch)
tree37b6fc8efcdf7d67eff07dd7bf60fa2e507265c6 /entry.S
parent020fc6a1c68c9e996a8ede395acf2d61cc030f57 (diff)
downloadxv6-labs-23a58370a4fa441fd0ee152a3e1e7619e5d8bd6b.tar.gz
xv6-labs-23a58370a4fa441fd0ee152a3e1e7619e5d8bd6b.tar.bz2
xv6-labs-23a58370a4fa441fd0ee152a3e1e7619e5d8bd6b.zip
Switch back bpmain back to main
Diffstat (limited to 'entry.S')
-rw-r--r--entry.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/entry.S b/entry.S
index 88ad92b..2de4fc3 100644
--- a/entry.S
+++ b/entry.S
@@ -84,8 +84,8 @@ start64:
# Clear frame pointer for stack walks
movl $0, %ebp
# Call into C code.
- call bpmain
- # should not return from bpmain
+ call main
+ # should not return from main
jmp .
.code32