Merge ehallnor@zizzer:/bk/m5

into zizzer.eecs.umich.edu:/y/ehallnor/work/m5

--HG--
extra : convert_revision : de8422f1e91f1defabe3a021236c813504bd3cab

cpu/memtest/memtest.cc

@@ -223,6 +223,7 @@ MemTest::tick()
         req->paddr = ((base) ? baseAddr1 : baseAddr2) + offset1;
     }
     bool probe = (rand() % 2 == 1) && !req->isUncacheable();
+    probe = false;
 
     req->size = 1 << access_size;
     req->data = new uint8_t[req->size];

util/rundiff

@@ -49,9 +49,9 @@ use strict;
 # and generally quite adequate algorithm will be used instead.
 my $use_complexdiff = 0;
 
-if ($use_complexdiff) {
-    use Algorithm::Diff qw(traverse_sequences);
-};
+#if ($use_complexdiff) {
+#    use Algorithm::Diff qw(traverse_sequences);
+#};
 
 my $lookahead_lines = 200;
 my $precontext_lines = 3;