Merge branch 'page' of git+ssh://amsterdam.csail.mit.edu/home/am0/6.828/xv6 into page

1 files changed, 3 insertions, 4 deletions

diff --git a/vm.c b/vm.c
index 98ac108..262f079 100644
--- a/vm.c
+++ b/vm.c
@@ -369,14 +369,13 @@ kvmalloc(void)
 
 // Turn on paging.
 void
-vminit(void)
+vmenable(void)
 {
   uint cr0;
 
-  lcr3(PADDR(kpgdir));
+  switchkvm(); // load kpgdir into cr3
   cr0 = rcr0();
-  cr0 |= CR0_PE|CR0_PG|CR0_AM|CR0_WP|CR0_NE|CR0_TS|CR0_EM|CR0_MP;
-  cr0 &= ~(CR0_TS|CR0_EM);
+  cr0 |= CR0_PG;
   lcr0(cr0);
 }