From 05b5861419f3b7049b831f79bd67a55fa8c7f712 Mon Sep 17 00:00:00 2001
From: Gabe Black <gblack@eecs.umich.edu>
Date: Sun, 19 Apr 2009 02:20:57 -0700
Subject: [PATCH] X86: Condense the startupCPU code.

---
 src/arch/x86/utility.cc | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/arch/x86/utility.cc b/src/arch/x86/utility.cc
index 43a5ca1a9..18680165b 100644
--- 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
-- 
2.30.2