xx

ac090078 · Robert Morris · 4d972493 · ac090078 · ac090078 · ac090078
--- a/defs.h
+++ b/defs.h
@@ -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);

--- a/main.c
+++ b/main.c
@@ -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);

--- a/vm.c
+++ b/vm.c
@@ -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);