From 6cc1573923754ecb406d03ab4d807f928737c294 Mon Sep 17 00:00:00 2001
From: Stephen Hines <hines@cs.fsu.edu>
Date: Wed, 6 Feb 2008 16:32:40 -0500
Subject: Make the Event::description() a const function

--HG--
extra : convert_revision : c7768d54d3f78685e93920069f5485083ca989c0
---
 src/cpu/memtest/memtest.hh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/cpu/memtest')

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;
-- 
cgit v1.2.3


From 9d7a69c582e87a2d461298fb32345686efe4113f Mon Sep 17 00:00:00 2001
From: Steve Reinhardt <stever@gmail.com>
Date: Sun, 10 Feb 2008 14:45:25 -0800
Subject: Fix #include lines for renamed cache files.

--HG--
extra : convert_revision : b5008115dc5b34958246608757e69a3fa43b85c5
---
 src/cpu/memtest/memtest.cc | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'src/cpu/memtest')

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"
-- 
cgit v1.2.3