Automated merge with ssh://daystrom.m5sim.org//z/repo/m5

1 files changed, 3 insertions, 3 deletions

diff --git a/src/sim/eventq.cc b/src/sim/eventq.cc
index f4fa0ac8b..dfff760a0 100644
--- a/src/sim/eventq.cc
+++ b/src/sim/eventq.cc
@@ -209,7 +209,8 @@ Event::serialize(std::ostream &os)
 void
 Event::unserialize(Checkpoint *cp, const string &section)
 {
-    assert(!scheduled() && "we used to deschedule these events");
+    if (scheduled())
+        mainEventQueue.deschedule(this);
 
     UNSERIALIZE_SCALAR(_when);
     UNSERIALIZE_SCALAR(_priority);
@@ -223,8 +224,7 @@ Event::unserialize(Checkpoint *cp, const string &section)
 
     if (wasScheduled) {
         DPRINTF(Config, "rescheduling at %d\n", _when);
-        panic("need to figure out how to unserialize scheduled events");
-        //schedule(_when);
+        mainEventQueue.schedule(this, _when);
     }
 }