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

Conflicts:
	vm.c

1 files changed, 6 insertions, 6 deletions

diff --git a/mmu.h b/mmu.h
index 0da30e7..5c9ab60 100644
--- a/mmu.h
+++ b/mmu.h
@@ -118,13 +118,13 @@ struct segdesc {
 #define PGADDR(d, t, o) ((uint)((d) << PDXSHIFT | (t) << PTXSHIFT | (o)))
 
 // Page directory and page table constants.
-#define NPDENTRIES      1024            // page directory entries per page directory
-#define NPTENTRIES      1024            // page table entries per page table
-#define PGSIZE          4096            // bytes mapped by a page
+#define NPDENTRIES      1024    // # directory entries per page directory
+#define NPTENTRIES      1024    // # PTEs per page table
+#define PGSIZE          4096    // bytes mapped by a page
 
-#define PGSHIFT         12              // log2(PGSIZE)
-#define PTXSHIFT        12              // offset of PTX in a linear address
-#define PDXSHIFT        22              // offset of PDX in a linear address
+#define PGSHIFT         12      // log2(PGSIZE)
+#define PTXSHIFT        12      // offset of PTX in a linear address
+#define PDXSHIFT        22      // offset of PDX in a linear address
 
 #define PGROUNDUP(sz)  (((sz)+PGSIZE-1) & ~(PGSIZE-1))
 #define PGROUNDDOWN(a) (((a)) & ~(PGSIZE-1))