1 files changed, 8 insertions, 0 deletions
diff --git a/src/usr/hwpf/hwp/start_payload/start_payload.C b/src/usr/hwpf/hwp/start_payload/start_payload.C
index 0428000ac..12f62a331 100644
--- a/src/usr/hwpf/hwp/start_payload/start_payload.C
+++ b/src/usr/hwpf/hwp/start_payload/start_payload.C
@@ -1060,6 +1060,14 @@ errlHndl_t enableCoreCheckstops()
     void* l_slwPtr = NULL;
     int mm_rc = 0;
 
+    // for OpenPower systems, leave core checkstops as system checkstops
+    if( is_sapphire_load() && (!INITSERVICE::spBaseServicesEnabled()) )
+    {
+        TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "Leaving local core checkstops as escalating to system checkstop" );
+        return NULL;
+    }
+    //@todo-RTC:130092 Remove this when Opal support is in place
+
     // loop thru all proc and find all functional ex units
     TARGETING::TargetHandleList l_procTargetList;
     getAllChips(l_procTargetList, TYPE_PROC);