usb.patch, with conflicts and some warnings fixed

[pintos-anon] / src / userprog / pagedir.c

diff --git a/src/userprog/pagedir.c b/src/userprog/pagedir.c
index a6a87b827ba16a12157d94df6f2a7233b7c59e8e..83af90d67fffcb2994d1e6fa67ee16de1da998ca 100644 (file)
--- a/src/userprog/pagedir.c
+++ b/src/userprog/pagedir.c
@@ -74,7 +74,7 @@ lookup_page (uint32_t *pd, const void *vaddr, bool create)
           if (pt == NULL) 
             return NULL; 
       
-          *pde = pde_create (pt);
+          *pde = pde_create_user (pt);
         }
       else
         return NULL;