summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLisa Hsu <hsul@eecs.umich.edu>2003-11-07 01:39:17 -0500
committerLisa Hsu <hsul@eecs.umich.edu>2003-11-07 01:39:17 -0500
commit22679d3da880e4780bbb74b79f94ad1bf3e3cb33 (patch)
tree1ac2e52b6441f09274c8e939356f9a98337b0f2b
parentc5da35e8d59a717bc64c62f7447e7437d4d129ba (diff)
parent40820042f144b17024bfb09d52d8eae3dcc8d2d4 (diff)
downloadgem5-22679d3da880e4780bbb74b79f94ad1bf3e3cb33.tar.xz
Merge zizzer:/bk/m5 into zower.eecs.umich.edu:/z/hsul/bk/m5
--HG-- extra : convert_revision : 60b307d827220ba76b607d3f18d4fa00ab3fb1d5
-rw-r--r--base/statistics.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/base/statistics.cc b/base/statistics.cc
index 3af764609..cc7d60b0b 100644
--- a/base/statistics.cc
+++ b/base/statistics.cc
@@ -272,6 +272,8 @@ Database::reset()
++i;
}
+ MainBin *orig = MainBin::current();
+
list<GenBin *>::iterator bi = bins.begin();
list<GenBin *>::iterator be = bins.end();
while (bi != be) {
@@ -286,6 +288,8 @@ Database::reset()
}
++bi;
}
+
+ orig->activate();
}
void