summaryrefslogtreecommitdiff
path: root/bootmain.c
diff options
context:
space:
mode:
authorAustin Clements <[email protected]>2011-09-04 15:51:46 -0400
committerAustin Clements <[email protected]>2011-09-04 15:51:46 -0400
commit2fc6c35b2fd64a15d7c4cc54c9e8733c3632039d (patch)
tree0e208790a58190b2f8daa57b365e3e72f20e84df /bootmain.c
parent68b58727166bbb339f4790ec779a5a16772557f6 (diff)
downloadxv6-labs-2fc6c35b2fd64a15d7c4cc54c9e8733c3632039d.tar.gz
xv6-labs-2fc6c35b2fd64a15d7c4cc54c9e8733c3632039d.tar.bz2
xv6-labs-2fc6c35b2fd64a15d7c4cc54c9e8733c3632039d.zip
Make the ELF entry point a physical address
This way, the bootloader doesn't have to translate the entry point. This also makes xv6 multiboot-compliant and follows the convention used by Linux.
Diffstat (limited to 'bootmain.c')
-rw-r--r--bootmain.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/bootmain.c b/bootmain.c
index 72f3927..d24bf66 100644
--- a/bootmain.c
+++ b/bootmain.c
@@ -43,7 +43,7 @@ bootmain(void)
// Call the entry point from the ELF header.
// Does not return!
- entry = (void(*)(void))(elf->entry - KERNBASE);
+ entry = (void(*)(void))(elf->entry);
entry();
}