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

ac84a025 · Silas Boyd-Wickizer · 9e847cfe · bbacc5e4 · ac84a025 · ac84a025
--- a/bin/asharing.cc
+++ b/bin/asharing.cc
@@ -95,6 +95,9 @@ vm2sharing(void *arg)
                       MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0);
      if (res == MAP_FAILED)
        die("asharing: mmap failed");
+      // Fault
+      for (int i = lo; i < hi; i++)
+        base[i * 4096] = 42;
    } else {
      // Unmap
      int res = munmap(base + lo * 4096, (hi-lo) * 4096);

--- a/kernel/vm.cc
+++ b/kernel/vm.cc
@@ -132,10 +132,7 @@ vmnode::copy()
 int
 vmnode::loadpg(off_t off)
 {
-#ifdef MTRACE 
  mtreadavar("inode:%x.%x", ip->dev, ip->inum);
-  mtwriteavar("vmnode:%p", this);
-#endif

  assert(off <= sz);

@@ -685,8 +682,6 @@ vmap::pagefault(uptr va, u32 err)
    *pte = v2p(m->n->page[npg]) | PTE_P | PTE_U | PTE_W;
  }

-  mtreadavar("vmnode:%p", m->n);
-
  return 1;
 }

@@ -736,7 +731,6 @@ vmap::pagelookup(uptr va)
      throw_bad_alloc();

  char* kptr = (char*)(m->n->page[npg]);
-  mtreadavar("vmnode:%p", m->n);
  return &kptr[va & (PGSIZE-1)];
 }