From: Lisa Hsu <hsul@eecs.umich.edu>
Date: Thu, 12 Oct 2006 22:56:57 +0000 (-0400)
Subject: Merge zizzer:/bk/newmem
X-Git-Tag: m5_2.0_beta2~73^2~19
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=339b1f85165df0e2654f755cc921eded3db8977c;p=gem5.git

Merge zizzer:/bk/newmem
into  zed.eecs.umich.edu:/z/hsul/work/m5/newmem

src/cpu/simple/timing.cc:
    hand merge

--HG--
extra : convert_revision : 083bf102249ad9bc63c447dbf85d3863f935f647
---

339b1f85165df0e2654f755cc921eded3db8977c
diff --cc src/cpu/simple/timing.cc
index 33f673cbc,88aa882e3..ad5c0e5d6
--- a/src/cpu/simple/timing.cc
+++ b/src/cpu/simple/timing.cc
@@@ -160,9 -161,7 +162,8 @@@ TimingSimpleCPU::resume(
          fetchEvent->schedule(curTick);
      }
  
-     assert(system->getMemoryMode() == System::Timing);
      changeState(SimObject::Running);
 +    previousTick = curTick;
  }
  
  void