diff options
| author | Steve Reinhardt <stever@gmail.com> | 2008-02-11 08:31:26 -0800 |
|---|---|---|
| committer | Steve Reinhardt <stever@gmail.com> | 2008-02-11 08:31:26 -0800 |
| commit | 71835d42df8fb488380be8cc89be4298b268902a (patch) | |
| tree | 7c2e91d34de4a2306f45234fefa13ded7ea5d83f /src/cpu/memtest | |
| parent | 2f7421b12b4a557ff1a2e4dcebcfd3484778fb95 (diff) | |
| parent | 4c7eb211191055f72c6f157913cb384f47cf4334 (diff) | |
| download | gem5-71835d42df8fb488380be8cc89be4298b268902a.tar.xz | |
Automated merge with file:/home/stever/hg/m5-orig
--HG--
extra : convert_revision : 86a55cd98a9704f756a70aa0cbd2820cf92c821d
Diffstat (limited to 'src/cpu/memtest')
| -rw-r--r-- | src/cpu/memtest/memtest.cc | 3 | ||||
| -rw-r--r-- | src/cpu/memtest/memtest.hh | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/cpu/memtest/memtest.cc b/src/cpu/memtest/memtest.cc index 819b95e70..42889163a 100644 --- a/src/cpu/memtest/memtest.cc +++ b/src/cpu/memtest/memtest.cc @@ -39,12 +39,9 @@ #include "base/misc.hh" #include "base/statistics.hh" #include "cpu/memtest/memtest.hh" -//#include "cpu/simple_thread.hh" -//#include "mem/cache/base_cache.hh" #include "mem/mem_object.hh" #include "mem/port.hh" #include "mem/packet.hh" -//#include "mem/physical.hh" #include "mem/request.hh" #include "sim/sim_events.hh" #include "sim/stats.hh" diff --git a/src/cpu/memtest/memtest.hh b/src/cpu/memtest/memtest.hh index 1a330319f..ac2d0a058 100644 --- a/src/cpu/memtest/memtest.hh +++ b/src/cpu/memtest/memtest.hh @@ -77,7 +77,7 @@ class MemTest : public MemObject TickEvent(MemTest *c) : Event(&mainEventQueue, CPU_Tick_Pri), cpu(c) {} void process() {cpu->tick();} - virtual const char *description() { return "MemTest tick"; } + virtual const char *description() const { return "MemTest tick"; } }; TickEvent tickEvent; |