diff options
| author | Kevin Lim <ktlim@umich.edu> | 2007-03-23 13:20:19 -0400 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2007-03-23 13:20:19 -0400 |
| commit | 047f77102b5e5d63549663ee94cd799cdcf63516 (patch) | |
| tree | 3c214a93043533716044b1c61c9d12aba3388c42 /src/cpu/base.cc | |
| parent | 2c47413a7a4563c724d8470971d1059bdfe01c92 (diff) | |
| parent | 2330adfa28ec39035beab8dae52873ecd0e28889 (diff) | |
| download | gem5-047f77102b5e5d63549663ee94cd799cdcf63516.tar.xz | |
Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/tmp/clean2
src/cpu/base_dyn_inst.hh:
Hand merge. Line is no longer needed because it's handled in the ISA.
--HG--
extra : convert_revision : 0be4067aa38759a5631c6940f0167d48fde2b680
Diffstat (limited to 'src/cpu/base.cc')
| -rw-r--r-- | src/cpu/base.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cpu/base.cc b/src/cpu/base.cc index 3e0be6ad8..4dccee0d3 100644 --- a/src/cpu/base.cc +++ b/src/cpu/base.cc @@ -226,7 +226,8 @@ BaseCPU::startup() #endif if (params->progress_interval) { - new CPUProgressEvent(&mainEventQueue, params->progress_interval, + new CPUProgressEvent(&mainEventQueue, + cycles(params->progress_interval), this); } } |