diff -r e5df5449a9e5 -r 8d95ef69cee3 configs/common/Simulation.py
--- a/configs/common/Simulation.py	Tue Jul 10 12:15:51 2012 +0100
+++ b/configs/common/Simulation.py	Tue Jul 10 12:15:54 2012 +0100
@@ -140,7 +140,7 @@
                 testsys.cpu[i].max_insts_any_thread = int(options.fast_forward)
             switch_cpus[i].system =  testsys
             switch_cpus[i].workload = testsys.cpu[i].workload
-            switch_cpus[i].clock = testsys.cpu[0].clock
+            switch_cpus[i].clock = testsys.cpu[i].clock
             # simulation period
             if options.maxinsts:
                 switch_cpus[i].max_insts_any_thread = options.maxinsts
@@ -167,8 +167,8 @@
             switch_cpus_1[i].system =  testsys
             switch_cpus[i].workload = testsys.cpu[i].workload
             switch_cpus_1[i].workload = testsys.cpu[i].workload
-            switch_cpus[i].clock = testsys.cpu[0].clock
-            switch_cpus_1[i].clock = testsys.cpu[0].clock
+            switch_cpus[i].clock = testsys.cpu[i].clock
+            switch_cpus_1[i].clock = testsys.cpu[i].clock
 
             # if restoring, make atomic cpu simulate only a few instructions
             if options.checkpoint_restore != None:
diff -r e5df5449a9e5 -r 8d95ef69cee3 configs/example/fs.py
--- a/configs/example/fs.py	Tue Jul 10 12:15:51 2012 +0100
+++ b/configs/example/fs.py	Tue Jul 10 12:15:54 2012 +0100
@@ -74,8 +74,8 @@
 # system under test can be any CPU
 (TestCPUClass, test_mem_mode, FutureClass) = Simulation.setCPUClass(options)
 
-TestCPUClass.clock = '2GHz'
-DriveCPUClass.clock = '2GHz'
+TestCPUClass.clock = options.clock
+DriveCPUClass.clock = options.clock
 
 if options.benchmark:
     try:
diff -r e5df5449a9e5 -r 8d95ef69cee3 configs/example/se.py
--- a/configs/example/se.py	Tue Jul 10 12:15:51 2012 +0100
+++ b/configs/example/se.py	Tue Jul 10 12:15:54 2012 +0100
@@ -146,7 +146,7 @@
     numThreads = len(workloads)
 
 (CPUClass, test_mem_mode, FutureClass) = Simulation.setCPUClass(options)
-CPUClass.clock = '2GHz'
+CPUClass.clock = options.clock
 CPUClass.numThreads = numThreads;
 
 np = options.num_cpus