diff options
author | Gabe Black <gblack@eecs.umich.edu> | 2007-10-02 23:03:38 -0700 |
---|---|---|
committer | Gabe Black <gblack@eecs.umich.edu> | 2007-10-02 23:03:38 -0700 |
commit | 50e2d20cb876a054f53162e7b01306039c213457 (patch) | |
tree | 6e7de959159434e1501ab928bdfbebc91388b353 /src/cpu/memtest/memtest.cc | |
parent | c2d60abf52fc81119970ab0617f9a979f1377685 (diff) | |
parent | 7571e8346d0ebbc38806c30a75dbcf298d50f08e (diff) | |
download | gem5-50e2d20cb876a054f53162e7b01306039c213457.tar.xz |
Merge with head.
--HG--
extra : convert_revision : 1aa0e4569a7c10e6a395c2c951ac29275b5bcf59
Diffstat (limited to 'src/cpu/memtest/memtest.cc')
-rw-r--r-- | src/cpu/memtest/memtest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cpu/memtest/memtest.cc b/src/cpu/memtest/memtest.cc index 583fd5f8d..f8c8a0547 100644 --- a/src/cpu/memtest/memtest.cc +++ b/src/cpu/memtest/memtest.cc @@ -270,7 +270,7 @@ void MemTest::tick() { if (!tickEvent.scheduled()) - tickEvent.schedule(curTick + cycles(1)); + tickEvent.schedule(curTick + ticks(1)); if (++noResponseCycles >= 500000) { cerr << name() << ": deadlocked at cycle " << curTick << endl; |