diff options
author | Robert Morris <[email protected]> | 2010-08-30 10:13:49 -0400 |
---|---|---|
committer | Robert Morris <[email protected]> | 2010-08-30 10:13:49 -0400 |
commit | ac090078c63c9b467fd723f6bb7f949c05e9b04b (patch) | |
tree | 22e8df3ca5edb15f0a56c433d29ffae456b35181 | |
parent | 4d972493b66d4841c135cf56414f9f54bac948bc (diff) | |
download | xv6-labs-ac090078c63c9b467fd723f6bb7f949c05e9b04b.tar.gz xv6-labs-ac090078c63c9b467fd723f6bb7f949c05e9b04b.tar.bz2 xv6-labs-ac090078c63c9b467fd723f6bb7f949c05e9b04b.zip |
xx
-rw-r--r-- | defs.h | 2 | ||||
-rw-r--r-- | main.c | 2 | ||||
-rw-r--r-- | vm.c | 4 |
3 files changed, 4 insertions, 4 deletions
@@ -155,7 +155,7 @@ void uartputc(int); void pminit(void); void ksegment(void); void kvmalloc(void); -void vminit(void); +void vmenable(void); pde_t* setupkvm(void); char* uva2ka(pde_t*, char*); int allocuvm(pde_t*, char*, uint); @@ -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); @@ -369,11 +369,11 @@ kvmalloc(void) // Turn on paging. void -vminit(void) +vmenable(void) { uint cr0; - lcr3(PADDR(kpgdir)); + switchkvm(); // load kpgdir into cr3 cr0 = rcr0(); cr0 |= CR0_PG; lcr0(cr0); |