From df05ffab1289b26aab2a0eb71ee55dcb7f42e5e9 Mon Sep 17 00:00:00 2001
From: Ali Saidi <Ali.Saidi@ARM.com>
Date: Fri, 9 Mar 2012 09:59:26 -0500
Subject: [PATCH] ARM: Don't reset CPUs that are going to be switched in.

---
 src/arch/arm/utility.cc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/arch/arm/utility.cc b/src/arch/arm/utility.cc
index 0a1cefce7..07932e676 100644
--- a/src/arch/arm/utility.cc
+++ b/src/arch/arm/utility.cc
@@ -44,8 +44,10 @@
 #include "arch/arm/utility.hh"
 #include "arch/arm/vtophys.hh"
 #include "config/use_checker.hh"
+#include "cpu/base.hh"
 #include "cpu/thread_context.hh"
 #include "mem/fs_translating_port_proxy.hh"
+#include "params/BaseCPU.hh"
 #include "sim/full_system.hh"
 
 namespace ArmISA {
@@ -56,7 +58,9 @@ initCPU(ThreadContext *tc, int cpuId)
     // Reset CP15?? What does that mean -- ali
     
     // FPEXC.EN = 0
-    
+    if (tc->getCpuPtr()->params()->defer_registration)
+       return;
+
     static Fault reset = new Reset;
     reset->invoke(tc);
 }