Some minor compiling fixes.

src/cpu/o3/iew.hh:
    Non-debug compile fixes.
src/cpu/simple/atomic.cc:
src/cpu/simple/atomic.hh:
    Merge fix.

--HG--
extra : convert_revision : 38081925d2b74d8f64acdb65dba94b2bf465b16a

2 files changed, 2 insertions, 8 deletions

diff --git a/src/cpu/simple/atomic.cc b/src/cpu/simple/atomic.cc
index 6be188a96..c396f5033 100644
--- a/src/cpu/simple/atomic.cc
+++ b/src/cpu/simple/atomic.cc
@@ -178,6 +178,8 @@ AtomicSimpleCPU::unserialize(Checkpoint *cp, const string &section)
 void
 AtomicSimpleCPU::resume()
 {
+    assert(system->getMemoryMode() == System::Atomic);
+    changeState(SimObject::Running);
     if (thread->status() == ThreadContext::Active) {
         if (!tickEvent.scheduled())
             tickEvent.schedule(curTick);
@@ -185,13 +187,6 @@ AtomicSimpleCPU::resume()
 }
 
 void
-AtomicSimpleCPU::resume()
-{
-    assert(system->getMemoryMode() == System::Atomic);
-    changeState(SimObject::Running);
-}
-
-void
 AtomicSimpleCPU::switchOut()
 {
     assert(status() == Running || status() == Idle);
diff --git a/src/cpu/simple/atomic.hh b/src/cpu/simple/atomic.hh
index 895eb5bde..b602af558 100644
--- a/src/cpu/simple/atomic.hh
+++ b/src/cpu/simple/atomic.hh
@@ -128,7 +128,6 @@ class AtomicSimpleCPU : public BaseSimpleCPU
     virtual void unserialize(Checkpoint *cp, const std::string &section);
     virtual void resume();
 
-    virtual void resume();
     void switchOut();
     void takeOverFrom(BaseCPU *oldCPU);