Merge branch 'scale-amd64' into wq-rejig

6ba1797d · Silas Boyd-Wickizer · 75201ac0 · 9711731a · 6ba1797d
--- a/kernel/vm.cc
+++ b/kernel/vm.cc
@@ -627,6 +627,8 @@ vmap::pagefault(uptr va, u32 err)
      return -1;
    }

+  // XXX(sbw) If m->n->page[npg] has contents (e.g. was loaded in
+  // a parent before fork) we shouldn't call loadpg
  if (m->n && m->n->type == ONDEMAND)
    if (m->n->loadpg(npg*PGSIZE) < 0) {
      cprintf("pagefault: couldn't load\n");