diff -r 8879662a7b70 -r 5e0cf38b6419 build_opts/MIPS
--- a/build_opts/MIPS	Fri Dec 19 13:26:23 2014 +0000
+++ b/build_opts/MIPS	Fri Dec 19 13:27:15 2014 +0000
@@ -1,3 +1,3 @@
 TARGET_ISA = 'mips'
-CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU'
+CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU'
 PROTOCOL = 'MI_example'
diff -r 8879662a7b70 -r 5e0cf38b6419 build_opts/SPARC
--- a/build_opts/SPARC	Fri Dec 19 13:26:23 2014 +0000
+++ b/build_opts/SPARC	Fri Dec 19 13:27:15 2014 +0000
@@ -1,3 +1,3 @@
 TARGET_ISA = 'sparc'
-CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU'
+CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU'
 PROTOCOL = 'MI_example'
diff -r 8879662a7b70 -r 5e0cf38b6419 configs/common/CpuConfig.py
--- a/configs/common/CpuConfig.py	Fri Dec 19 13:26:23 2014 +0000
+++ b/configs/common/CpuConfig.py	Fri Dec 19 13:27:15 2014 +0000
@@ -50,7 +50,6 @@
 _cpu_aliases_all = [
     ("timing", "TimingSimpleCPU"),
     ("atomic", "AtomicSimpleCPU"),
-    ("inorder", "InOrderCPU"),
     ("minor", "MinorCPU"),
     ("detailed", "DerivO3CPU"),
     ("kvm", ("ArmKvmCPU", "X86KvmCPU")),
diff -r 8879662a7b70 -r 5e0cf38b6419 configs/example/se.py
--- a/configs/example/se.py	Fri Dec 19 13:26:23 2014 +0000
+++ b/configs/example/se.py	Fri Dec 19 13:27:15 2014 +0000
@@ -110,7 +110,7 @@
         idx += 1
 
     if options.smt:
-        assert(options.cpu_type == "detailed" or options.cpu_type == "inorder")
+        assert(options.cpu_type == "detailed")
         return multiprocesses, idx
     else:
         return multiprocesses, 1