From f7b7b56dea28dd69a44a877f7b7073c4496ced9e Mon Sep 17 00:00:00 2001
From: Patrick Williams <iawillia@us.ibm.com>
Date: Tue, 23 Aug 2011 15:16:35 -0500
Subject: Ensure scratch operations happen on master core.

Change-Id: I970d645108de041d410599847edce877cb794015
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/275
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
---
 src/kernel/cpumgr.C | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

(limited to 'src/kernel/cpumgr.C')

diff --git a/src/kernel/cpumgr.C b/src/kernel/cpumgr.C
index 3e7a83a38..d8a9960f6 100644
--- a/src/kernel/cpumgr.C
+++ b/src/kernel/cpumgr.C
@@ -49,6 +49,15 @@ cpu_t* CpuManager::getCurrentCPU()
     return cv_cpus[getPIR()];
 }
 
+cpu_t* CpuManager::getMasterCPU()
+{
+    for (int i = 0; i < MAXCPUS; i++)
+        if (cv_cpus[i] != NULL)
+            if (cv_cpus[i]->master)
+                return cv_cpus[i];
+    return NULL;
+}
+
 void CpuManager::init()
 {
     // For the initial boot we only want to set up CPU objects for the threads
@@ -115,14 +124,14 @@ void CpuManager::startCPU(ssize_t i)
 
 	// Initialize CPU.
 	cpu->cpu = i;
-    if (currentCPU)
-    {
-        cpu->master = true;
-    }
-    else
-    {
-        cpu->master = false;
-    }
+        if (currentCPU)
+        {
+            cpu->master = true;
+        }
+        else
+        {
+            cpu->master = false;
+        }
 	cpu->scheduler = &Singleton<Scheduler>::instance();
         cpu->scheduler_extra = NULL;
 	cpu->kernel_stack =
-- 
cgit v1.2.1