diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2007-08-04 20:27:23 -0700 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2007-08-04 20:27:23 -0700 |
| commit | cae8d20633c0f43fdae23576adfb894284a7ee86 (patch) | |
| tree | e9e232684d7fc024900d8a07d6b8a3add1f52e92 /src/cpu/base.cc | |
| parent | 30e777a5d3829975266ecccac965d2297a5f4985 (diff) | |
| parent | df015f17a45b18302565c43d3790d787e1b54c42 (diff) | |
| download | gem5-cae8d20633c0f43fdae23576adfb894284a7ee86.tar.xz | |
Merge with head.
--HG--
extra : convert_revision : 3edb9f03353b18b4c9f062bccf11e79cfb3c15f2
Diffstat (limited to 'src/cpu/base.cc')
| -rw-r--r-- | src/cpu/base.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/cpu/base.cc b/src/cpu/base.cc index 6c8bf65fa..a54ed9349 100644 --- a/src/cpu/base.cc +++ b/src/cpu/base.cc @@ -90,7 +90,7 @@ CPUProgressEvent::process() const char * CPUProgressEvent::description() { - return "CPU Progress event"; + return "CPU Progress"; } #if FULL_SYSTEM @@ -343,9 +343,8 @@ BaseCPU::takeOverFrom(BaseCPU *oldCPU, Port *ic, Port *dc) for (int i = 0; i < threadContexts.size(); ++i) threadContexts[i]->profileClear(); - // The Sampler must take care of this! -// if (profileEvent) -// profileEvent->schedule(curTick); + if (profileEvent) + profileEvent->schedule(curTick); #endif // Connect new CPU to old CPU's memory only if new CPU isn't |