diff -r 86c0e6ca5e7c -r 9e1947477768 src/sim/system.cc
--- a/src/sim/system.cc	Wed Aug 15 10:38:08 2012 -0400
+++ b/src/sim/system.cc	Wed Aug 15 17:50:23 2012 -0500
@@ -257,9 +257,8 @@
 void
 System::initState()
 {
-    int i;
     if (FullSystem) {
-        for (i = 0; i < threadContexts.size(); i++)
+        for (int i = 0; i < threadContexts.size(); i++)
             TheISA::startupCPU(threadContexts[i], i);
         // Moved from the constructor to here since it relies on the
         // address map being resolved in the interconnect
@@ -278,12 +277,6 @@
     }
 
     activeCpus.clear();
-
-    if (!FullSystem)
-        return;
-
-    for (i = 0; i < threadContexts.size(); i++)
-        TheISA::startupCPU(threadContexts[i], i);
 }
 
 void