summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Lim <ktlim@umich.edu>2006-05-25 17:56:23 -0400
committerKevin Lim <ktlim@umich.edu>2006-05-25 17:56:23 -0400
commit94eff2f4854ce23900bcc3d694ff4c290111bea7 (patch)
tree8648138cd873ada859aa3b236580e99bdf15958e
parentf5b5391cfbcf627bc2813042cb75726328338dd4 (diff)
parentf1fab2a4469d6cb2e55ebac15da02f8c1fcb7055 (diff)
downloadgem5-94eff2f4854ce23900bcc3d694ff4c290111bea7.tar.xz
Merge ktlim@zamp:/z/ktlim2/clean/m5-merge
into zamp.eecs.umich.edu:/z/ktlim2/clean/m5-o3 --HG-- extra : convert_revision : d3381ee4907c2b6f1747c4496c980e34913e81e7
-rw-r--r--sim/pseudo_inst.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sim/pseudo_inst.cc b/sim/pseudo_inst.cc
index 0c20a6a53..2d737c0a2 100644
--- a/sim/pseudo_inst.cc
+++ b/sim/pseudo_inst.cc
@@ -77,7 +77,7 @@ namespace AlphaPseudo
xc->suspend();
if (xc->getKernelStats())
- xc->getKernelStats()->arm();
+ xc->getKernelStats()->quiesce();
}
void