X86: Condense the startupCPU code.

diff --git a/src/arch/x86/utility.cc b/src/arch/x86/utility.cc
index 43a5ca1a96c8863c0f2edbc2d4829e0b5606e2b0..18680165b3bb23f54ac8d2bc463acd576a68bc6f 100644 (file)
--- a/src/arch/x86/utility.cc
+++ b/src/arch/x86/utility.cc
@@ -280,26 +280,20 @@ void initCPU(ThreadContext *tc, int cpuId)
 
 #endif
 
-#if FULL_SYSTEM
 void startupCPU(ThreadContext *tc, int cpuId)
 {
+#if FULL_SYSTEM
     if (cpuId == 0) {
         tc->activate(0);
     } else {
         // This is an application processor (AP). It should be initialized to
         // look like only the BIOS POST has run on it and put then put it into
         // a halted state.
-        tc->suspend();
+        tc->suspend(0);
     }
-}
-
 #else
-
-void startupCPU(ThreadContext *tc, int cpuId)
-{
     tc->activate(0);
-}
-
 #endif
+}
 
 } //namespace X86_ISA