diff -r f634a34f2f0b -r 6c4d8b9cef21 configs/common/Simulation.py
--- a/configs/common/Simulation.py	Tue Oct 23 04:49:48 2012 -0400
+++ b/configs/common/Simulation.py	Wed Oct 24 17:21:37 2012 -0400
@@ -453,7 +453,6 @@
         # manually.  You DON'T need to resume after just switching
         # CPUs if you haven't changed anything on the system level.
 
-        m5.doDrain(testsys)
         m5.changeToTiming(testsys)
         m5.switchCpus(switch_cpu_list)
         m5.resume(testsys)
diff -r f634a34f2f0b -r 6c4d8b9cef21 src/python/m5/simulate.py
--- a/src/python/m5/simulate.py	Tue Oct 23 04:49:48 2012 -0400
+++ b/src/python/m5/simulate.py	Wed Oct 24 17:21:37 2012 -0400
@@ -207,6 +207,7 @@
               (type(system), objects.Root, objects.System)
 
     if system.getMemoryMode() != objects.params.timing:
+        doDrain(system)
         print "Changing memory mode to timing"
         system.setMemoryMode(objects.params.timing)