1 files changed, 3 insertions, 0 deletions
diff --git a/src/cpu/simple/atomic.cc b/src/cpu/simple/atomic.cc
index edba55b0d..b4ea4b216 100644
--- a/src/cpu/simple/atomic.cc
+++ b/src/cpu/simple/atomic.cc
@@ -234,6 +234,9 @@ AtomicSimpleCPU::activateContext(int thread_num, int delay)
     assert(!tickEvent.scheduled());
 
     notIdleFraction++;
+    //Make sure ticks are still on multiples of cycles
+    Tick nextTick = curTick + cycles(1) - 1;
+    nextTick -= (nextTick % (cycles(1)));
     tickEvent.schedule(curTick + cycles(delay));
     _status = Running;
 }