Merge ktlim@zizzer:/bk/newmem

into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge

src/base/traceflags.py:
src/cpu/SConscript:
    Hand merge.
src/cpu/o3/alpha/params.hh:
    Hand merge.  This needs to get changed.

--HG--
rename : src/cpu/o3/alpha_cpu_builder.cc => src/cpu/o3/alpha/cpu_builder.cc
rename : src/cpu/o3/alpha_params.hh => src/cpu/o3/alpha/params.hh
rename : src/python/m5/objects/AlphaO3CPU.py => src/python/m5/objects/O3CPU.py
extra : convert_revision : 581f338f5bce35288f7d15d95cbd0ac3a9135e6a

1 files changed, 1 insertions, 0 deletions

diff --git a/src/cpu/simple/timing.cc b/src/cpu/simple/timing.cc
index d5bdcfa9b..877364eff 100644
--- a/src/cpu/simple/timing.cc
+++ b/src/cpu/simple/timing.cc
@@ -118,6 +118,7 @@ TimingSimpleCPU::quiesce(Event *quiesce_event)
     // an access to complete.
     if (status() == Idle || status() == Running || status() == SwitchedOut) {
         DPRINTF(Config, "Ready to quiesce\n");
+        changeState(SimObject::QuiescedTiming);
         return false;
     } else {
         DPRINTF(Config, "Waiting to quiesce\n");