diff -r a8d8937d5e1b -r a4503b22708a src/cpu/inorder/cpu.hh
--- a/src/cpu/inorder/cpu.hh	Tue Jan 04 13:21:50 2011 -0800
+++ b/src/cpu/inorder/cpu.hh	Tue Jan 04 14:41:50 2011 -0800
@@ -156,12 +156,7 @@
     /** Schedule tick event, regardless of its current state. */
     void scheduleTickEvent(int delay)
     {
-        Tick when = nextCycle(curTick + ticks(delay));
-
-        if (tickEvent.squashed())
-            reschedule(&tickEvent, when);
-        else if (!tickEvent.scheduled())
-            schedule(&tickEvent, when);
+        reschedule(&tickEvent, nextCycle(curTick + ticks(delay)), true);
     }
 
     /** Unschedule tick event, regardless of its current state. */
diff -r a8d8937d5e1b -r a4503b22708a src/cpu/inorder/cpu.cc
--- a/src/cpu/inorder/cpu.cc	Tue Jan 04 13:21:50 2011 -0800
+++ b/src/cpu/inorder/cpu.cc	Tue Jan 04 14:41:50 2011 -0800
@@ -157,12 +157,7 @@
 void
 InOrderCPU::CPUEvent::scheduleEvent(int delay)
 {
-    Tick when = cpu->nextCycle(curTick + cpu->ticks(delay));
-
-    if (squashed())
-        cpu->reschedule(this, when);
-    else if (!scheduled())
-        cpu->schedule(this, when);
+    cpu->reschedule(this, cpu->nextCycle(curTick + cpu->ticks(delay)), true);
 }
 
 void
diff -r a8d8937d5e1b -r a4503b22708a src/cpu/inorder/resource.cc
--- a/src/cpu/inorder/resource.cc	Tue Jan 04 13:21:50 2011 -0800
+++ b/src/cpu/inorder/resource.cc	Tue Jan 04 14:41:50 2011 -0800
@@ -502,11 +502,6 @@
 void
 ResourceEvent::scheduleEvent(int delay)
 {
-    InOrderCPU *cpu = resource->cpu;
-    Tick when = curTick + resource->ticks(delay);
-
-    if (squashed())
-        cpu->reschedule(this, when);
-    else if (!scheduled())
-        cpu->schedule(this, when);
+    resource->cpu->reschedule(this,
+                              curTick + resource->ticks(delay), true);
 }
diff -r a8d8937d5e1b -r a4503b22708a src/cpu/inorder/resource_pool.cc
--- a/src/cpu/inorder/resource_pool.cc	Tue Jan 04 13:21:50 2011 -0800
+++ b/src/cpu/inorder/resource_pool.cc	Tue Jan 04 14:41:50 2011 -0800
@@ -541,13 +541,7 @@
 ResourcePool::ResPoolEvent::scheduleEvent(int delay)
 {
     InOrderCPU *cpu = resPool->cpu;
-    Tick when = cpu->nextCycle(curTick + cpu->ticks(delay));
-
-    if (squashed()) {
-        cpu->reschedule(this, when);
-    } else if (!scheduled()) {
-        cpu->schedule(this, when);
-    }
+    cpu->reschedule(this, cpu->nextCycle(curTick + cpu->ticks(delay)), true);
 }
 
 /** Unschedule resource event, regardless of its current state. */