diff options
| author | Chris Phan <cphan@us.ibm.com> | 2012-11-09 16:35:18 -0600 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2012-11-30 15:36:43 -0600 |
| commit | 3a0853d0a62b8533f1aaf150f2896b0d489d11d3 (patch) | |
| tree | c25cd9c3c8426bf64d6df7533fa041084595aaef /src/usr/diag | |
| parent | c9b54a8f0440d9d3cace48f5ca6a4c3ab732306b (diff) | |
| download | blackbird-hostboot-3a0853d0a62b8533f1aaf150f2896b0d489d11d3.tar.gz blackbird-hostboot-3a0853d0a62b8533f1aaf150f2896b0d489d11d3.zip | |
Fix callout checking issue in PRD simulator
Change-Id: I2e6bf2f09b4eb670aa19f7a5a3fd0467030dae07
RTC: 51614
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/2293
Reviewed-by: Christopher T. Phan <cphan@us.ibm.com>
Reviewed-by: Bradley W. Bishop <bradleyb@us.ibm.com>
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Reviewed-by: Zane Shelley <zshelle@us.ibm.com>
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/2474
Diffstat (limited to 'src/usr/diag')
| -rw-r--r-- | src/usr/diag/prdf/common/framework/resolution/prdfCalloutMap.H | 12 | ||||
| -rwxr-xr-x | src/usr/diag/prdf/common/plat/pegasus/Proc_acts_PB.rule | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/src/usr/diag/prdf/common/framework/resolution/prdfCalloutMap.H b/src/usr/diag/prdf/common/framework/resolution/prdfCalloutMap.H index a6b4ba8bf..19eee40ba 100644 --- a/src/usr/diag/prdf/common/framework/resolution/prdfCalloutMap.H +++ b/src/usr/diag/prdf/common/framework/resolution/prdfCalloutMap.H @@ -30,8 +30,10 @@ //------------------------------------------------------------------------------ +#ifndef PRDF_SIM_ENUMS // needed to compile prdfsimEnumMap.C namespace PRDF { +#endif //------------------------------------------------------------------------------ @@ -52,6 +54,10 @@ namespace PRDF { NULL , (SymbolicFru) 0 } \ }; +#elif defined PRDF_SIM_ENUMS + + // included from prdfsimEnumMap.C, nothing for now + #else #define PRDF_SYM_CALLOUT_MAP_BEGIN \ @@ -103,6 +109,10 @@ PRDF_SYM_CALLOUT_MAP_END { NULL , (CalloutPriorityEnum) 0 } \ }; +#elif defined PRDF_SIM_ENUMS + + // included from prdfsimEnumMap.C, nothing for now + #else #define PRDF_CALLOUT_PRIORITY_MAP_BEGIN \ @@ -134,7 +144,9 @@ PRDF_CALLOUT_PRIORITY_MAP_END //------------------------------------------------------------------------------ +#ifndef PRDF_SIM_ENUMS } // end namespace PRDF +#endif #endif // __prdfCalloutMap_H diff --git a/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_PB.rule b/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_PB.rule index 6c46c0e98..c44ec46d6 100755 --- a/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_PB.rule +++ b/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_PB.rule @@ -2457,5 +2457,6 @@ group gIomcFir_1 filter singlebit */ actionclass analyzeMpIPL { + TBDDefaultCallout; funccall("analyzeMpIPL"); }; |
