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

323d260b · Silas Boyd-Wickizer · 5d96798a · 96b3c5e7 · 323d260b · 323d260b
--- a/bin/mapbench.cc
+++ b/bin/mapbench.cc
@@ -12,7 +12,7 @@ enum { npg = 1 };

 static pthread_barrier_t bar;
 static pthread_barrier_t bar2;
-#define NITER 10  // 1000000
+#define NITER 1000000

 void*
 thr(void *arg)

--- a/kernel/vm.cc
+++ b/kernel/vm.cc
@@ -18,7 +18,7 @@
 #include "kmtrace.hh"

 enum { vm_debug = 0 };
-enum { tlb_lazy = 0 };
+enum { tlb_lazy = 1 };

 /*
 * vmnode