summaryrefslogtreecommitdiffstats
path: root/src/usr/diag/attn
diff options
context:
space:
mode:
Diffstat (limited to 'src/usr/diag/attn')
-rw-r--r--src/usr/diag/attn/common/attnprd.C3
-rw-r--r--src/usr/diag/attn/ipl/attn.C3
-rw-r--r--src/usr/diag/attn/ipl/attnsvc.C3
-rw-r--r--src/usr/diag/attn/ipl/attnsvc.H3
-rw-r--r--src/usr/diag/attn/runtime/attn_rt.C2
-rw-r--r--src/usr/diag/attn/runtime/test/attntestRtAttns.H10
6 files changed, 10 insertions, 14 deletions
diff --git a/src/usr/diag/attn/common/attnprd.C b/src/usr/diag/attn/common/attnprd.C
index 65f2fafd9..e3f98335a 100644
--- a/src/usr/diag/attn/common/attnprd.C
+++ b/src/usr/diag/attn/common/attnprd.C
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2014,2016 */
+/* Contributors Listed Below - COPYRIGHT 2014,2019 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -41,7 +41,6 @@
#include <errl/errlmanager.H>
// Custom compile configs
-#include <config.h>
#if !defined(__HOSTBOOT_RUNTIME) && defined(CONFIG_ENABLE_CHECKSTOP_ANALYSIS)
#include <prdf/prdfMain_ipl.H>
diff --git a/src/usr/diag/attn/ipl/attn.C b/src/usr/diag/attn/ipl/attn.C
index 7d59a3965..cd8762d49 100644
--- a/src/usr/diag/attn/ipl/attn.C
+++ b/src/usr/diag/attn/ipl/attn.C
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2014,2018 */
+/* Contributors Listed Below - COPYRIGHT 2014,2019 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -44,7 +44,6 @@
#include <targeting/common/utilFilter.H>
// Custom compile configs
-#include <config.h>
#ifdef CONFIG_ENABLE_CHECKSTOP_ANALYSIS
#include "ipl/attnfilereg.H"
diff --git a/src/usr/diag/attn/ipl/attnsvc.C b/src/usr/diag/attn/ipl/attnsvc.C
index 17d87100f..0f4bddbb3 100644
--- a/src/usr/diag/attn/ipl/attnsvc.C
+++ b/src/usr/diag/attn/ipl/attnsvc.C
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2014,2018 */
+/* Contributors Listed Below - COPYRIGHT 2014,2019 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -40,7 +40,6 @@
#include <initservice/initserviceif.H> // for hostboot TI
// Custom compile configs
-#include <config.h>
using namespace std;
using namespace PRDF;
diff --git a/src/usr/diag/attn/ipl/attnsvc.H b/src/usr/diag/attn/ipl/attnsvc.H
index 8e49fca1f..eabcb2176 100644
--- a/src/usr/diag/attn/ipl/attnsvc.H
+++ b/src/usr/diag/attn/ipl/attnsvc.H
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2014,2018 */
+/* Contributors Listed Below - COPYRIGHT 2014,2019 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -36,7 +36,6 @@
#include "common/attnsvc_common.H"
// Custom compile configs
-#include <config.h>
namespace ATTN
{
diff --git a/src/usr/diag/attn/runtime/attn_rt.C b/src/usr/diag/attn/runtime/attn_rt.C
index 810e79bbe..92b225c7d 100644
--- a/src/usr/diag/attn/runtime/attn_rt.C
+++ b/src/usr/diag/attn/runtime/attn_rt.C
@@ -28,7 +28,7 @@
#include "common/attnmem.H"
#include "common/attnbits.H"
#include <runtime/interface.h>
-#include <runtime/rt_targeting.H>
+#include <targeting/runtime/rt_targeting.H>
#include <targeting/common/target.H>
#include <targeting/common/targetservice.H>
#include <targeting/common/utilFilter.H>
diff --git a/src/usr/diag/attn/runtime/test/attntestRtAttns.H b/src/usr/diag/attn/runtime/test/attntestRtAttns.H
index 6e22b094e..b2bd1fd8e 100644
--- a/src/usr/diag/attn/runtime/test/attntestRtAttns.H
+++ b/src/usr/diag/attn/runtime/test/attntestRtAttns.H
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2014,2016 */
+/* Contributors Listed Below - COPYRIGHT 2014,2020 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -38,7 +38,7 @@
#include "../../common/attntrace.H"
#include "../../common/attntarget.H"
#include <runtime/interface.h>
-#include <runtime/rt_targeting.H>
+#include <targeting/runtime/rt_targeting.H>
#include <targeting/common/targetservice.H>
using namespace ATTN;
@@ -79,8 +79,8 @@ class AttnCheckForRtAttentionsTest : public CxxTest::TestSuite
}
proc = procList[0];
- RT_TARG::rtChipId_t chipId = 0;
- errlHndl_t err = RT_TARG::getRtTarget( proc, chipId );
+ TARGETING::rtChipId_t chipId = 0;
+ errlHndl_t err = TARGETING::getRtTarget( proc, chipId );
if( NULL != err )
{
TS_FAIL("getRtTarget() failed for 0x%08X",
@@ -153,7 +153,7 @@ class AttnCheckForRtAttentionsTest : public CxxTest::TestSuite
break;
}
- RT_TARG::rtChipId_t chipId = 0;
+ TARGETING::rtChipId_t chipId = 0;
errlHndl_t err = RT_TARG::getRtTarget( proc, chipId );
if( NULL != err )
{
OpenPOWER on IntegriCloud