summaryrefslogtreecommitdiffstats
path: root/src/usr/isteps
diff options
context:
space:
mode:
Diffstat (limited to 'src/usr/isteps')
-rw-r--r--src/usr/isteps/nvdimm/nvdimm.C6
-rw-r--r--src/usr/isteps/nvdimm/runtime/nvdimm_rt.C2
-rw-r--r--src/usr/isteps/pm/runtime/rt_pm.C8
-rw-r--r--src/usr/isteps/pm/runtime/test/pmtestRt.H4
4 files changed, 10 insertions, 10 deletions
diff --git a/src/usr/isteps/nvdimm/nvdimm.C b/src/usr/isteps/nvdimm/nvdimm.C
index a7e263cf3..e93271e5e 100644
--- a/src/usr/isteps/nvdimm/nvdimm.C
+++ b/src/usr/isteps/nvdimm/nvdimm.C
@@ -50,7 +50,7 @@
#include <targeting/common/targetUtil.H>
#ifdef __HOSTBOOT_RUNTIME
#include <runtime/hbrt_utilities.H>
-#include <usr/runtime/rt_targeting.H>
+#include <targeting/runtime/rt_targeting.H>
#else
#include <initservice/istepdispatcherif.H>
#endif
@@ -3802,9 +3802,9 @@ errlHndl_t notifyNvdimmProtectionChange(Target* i_target,
// Send combined status notification
// Get the Proc Chip Id
- RT_TARG::rtChipId_t l_chipId = 0;
+ TARGETING::rtChipId_t l_chipId = 0;
- l_err = RT_TARG::getRtTarget(l_proc, l_chipId);
+ l_err = TARGETING::getRtTarget(l_proc, l_chipId);
if(l_err)
{
TRACFCOMP( g_trac_nvdimm,
diff --git a/src/usr/isteps/nvdimm/runtime/nvdimm_rt.C b/src/usr/isteps/nvdimm/runtime/nvdimm_rt.C
index f22c7d33a..e8ad1d9e9 100644
--- a/src/usr/isteps/nvdimm/runtime/nvdimm_rt.C
+++ b/src/usr/isteps/nvdimm/runtime/nvdimm_rt.C
@@ -43,7 +43,7 @@
#include <targeting/common/commontargeting.H>
#include <targeting/common/util.H>
#include <targeting/common/utilFilter.H>
-#include <usr/runtime/rt_targeting.H>
+#include <targeting/runtime/rt_targeting.H>
#include <runtime/interface.h>
#include <arch/ppc.H>
#include <isteps/nvdimm/nvdimmreasoncodes.H>
diff --git a/src/usr/isteps/pm/runtime/rt_pm.C b/src/usr/isteps/pm/runtime/rt_pm.C
index 7ee9e0924..58930bc67 100644
--- a/src/usr/isteps/pm/runtime/rt_pm.C
+++ b/src/usr/isteps/pm/runtime/rt_pm.C
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2016,2019 */
+/* Contributors Listed Below - COPYRIGHT 2016,2020 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -37,7 +37,6 @@
#include <runtime/interface.h> // g_hostInterfaces
#include <runtime/rt_fwreq_helper.H> // firmware_request_helper
-#include <runtime/rt_targeting.H>
#include <runtime/runtime_reasoncodes.H>
#include <initservice/isteps_trace.H>
@@ -46,6 +45,7 @@
#include <targeting/common/util.H>
#include <targeting/common/utilFilter.H>
#include <targeting/common/targetservice.H>
+#include <targeting/runtime/rt_targeting.H>
#include <scom/scomif.H>
#include <scom/wakeup.H>
@@ -400,9 +400,9 @@ namespace RTPM
}
// Get the Proc Chip Id
- RT_TARG::rtChipId_t l_chipId = 0;
+ TARGETING::rtChipId_t l_chipId = 0;
- l_err = RT_TARG::getRtTarget(l_pChipTarget, l_chipId);
+ l_err = TARGETING::getRtTarget(l_pChipTarget, l_chipId);
if(l_err)
{
TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
diff --git a/src/usr/isteps/pm/runtime/test/pmtestRt.H b/src/usr/isteps/pm/runtime/test/pmtestRt.H
index 1c29f7ab8..235cb8cec 100644
--- a/src/usr/isteps/pm/runtime/test/pmtestRt.H
+++ b/src/usr/isteps/pm/runtime/test/pmtestRt.H
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2017,2018 */
+/* Contributors Listed Below - COPYRIGHT 2017,2019 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -33,7 +33,7 @@
#include <cxxtest/TestSuite.H>
#include <runtime/interface.h>
-#include <runtime/rt_targeting.H>
+#include <targeting/runtime/rt_targeting.H>
#include <targeting/common/utilFilter.H>
#include <errl/errlmanager.H>
#include <devicefw/userif.H>
OpenPOWER on IntegriCloud