1 files changed, 13 insertions, 10 deletions
diff --git a/src/usr/diag/prdf/common/prdfMain_common.C b/src/usr/diag/prdf/common/prdfMain_common.C
index b1a935f49..e3224105e 100755
--- a/src/usr/diag/prdf/common/prdfMain_common.C
+++ b/src/usr/diag/prdf/common/prdfMain_common.C
@@ -56,9 +56,13 @@
 
 #include <prdfPlatConfigurator.H>
 
+using namespace TARGETING;
+
 namespace PRDF
 {
 
+using namespace PlatServices;
+
 //------------------------------------------------------------------------------
 // Forward references
 //------------------------------------------------------------------------------
@@ -159,20 +163,19 @@ errlHndl_t noLock_initialize()
     #ifdef __HOSTBOOT_RUNTIME
 
     // Handle R/R scenario.
-    TARGETING::Target* masterProc = nullptr;
-    TARGETING::targetService().masterProcChipTargetHandle(masterProc);
-
-    if (TARGETING::MODEL_NIMBUS == masterProc->getAttr<TARGETING::ATTR_MODEL>())
+    TARGETING::MODEL procModel = getChipModel( getMasterProc() );
+    if ( MODEL_NIMBUS == procModel )
+    {
+        ((McbistDomain *)systemPtr->GetDomain(MCBIST_DOMAIN))->handleRrFo();
+    }
+    else if ( MODEL_CUMULUS == procModel )
     {
-        McbistDomain * domain =
-            (McbistDomain *)systemPtr->GetDomain(MCBIST_DOMAIN);
-        domain->handleRrFo();
+        ((MbaDomain *)systemPtr->GetDomain(MBA_DOMAIN))->handleRrFo();
     }
     else
     {
-        MbaDomain * domain =
-            (MbaDomain *)systemPtr->GetDomain(MBA_DOMAIN);
-        domain->handleRrFo();
+        PRDF_ERR( PRDF_FUNC "Master PROC model %d not supported", procModel );
+        PRDF_ASSERT(false);
     }
 
     #endif