summaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorFrans Kaashoek <[email protected]>2010-08-30 17:28:39 -0400
committerFrans Kaashoek <[email protected]>2010-08-30 17:28:39 -0400
commit791d81cadeb3b30ad6ec67c61086c6747f3d5ca2 (patch)
tree989981e6fce1479281968cf07dc932ec061097a9 /main.c
parent156b307e28c52597fddea68baa5ca1f052520657 (diff)
parent3c9ff073e09abf15f241aa1812e04d8587c9925d (diff)
downloadxv6-labs-791d81cadeb3b30ad6ec67c61086c6747f3d5ca2.tar.gz
xv6-labs-791d81cadeb3b30ad6ec67c61086c6747f3d5ca2.tar.bz2
xv6-labs-791d81cadeb3b30ad6ec67c61086c6747f3d5ca2.zip
Merge branch 'page' of git+ssh://amsterdam.csail.mit.edu/home/am0/6.828/xv6 into page
Diffstat (limited to 'main.c')
-rw-r--r--main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/main.c b/main.c
index a6088cb..1a49bc6 100644
--- a/main.c
+++ b/main.c
@@ -41,7 +41,7 @@ void
mainc(void)
{
cprintf("\ncpu%d: starting xv6\n\n", cpu->id);
- kvmalloc(); // initialze the kernel page table
+ kvmalloc(); // initialize the kernel page table
pinit(); // process table
tvinit(); // trap vectors
binit(); // buffer cache
@@ -67,7 +67,7 @@ mpmain(void)
ksegment();
lapicinit(cpunum());
}
- vminit(); // turn on paging
+ vmenable(); // turn on paging
cprintf("cpu%d: starting\n", cpu->id);
idtinit(); // load idt register
xchg(&cpu->booted, 1);