diff options
| author | Christian Geddes <crgeddes@us.ibm.com> | 2017-10-11 09:20:40 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-10-13 00:03:49 -0400 |
| commit | 32e52b5ac64a6eaa934a6aa841e25aa597fdf23f (patch) | |
| tree | 0ee7de8ba84ddeaee1bd1c12e46969fa9ad64386 /src/usr/intr | |
| parent | 0cc7b8c179a5a3d349a1def66cdc1371803be00f (diff) | |
| download | talos-hostboot-32e52b5ac64a6eaa934a6aa841e25aa597fdf23f.tar.gz talos-hostboot-32e52b5ac64a6eaa934a6aa841e25aa597fdf23f.zip | |
Re-add errlog cleanup
Awhile ago we went through and made sure all of the error logs
were getting set to nullptr after being deleted. These changes
got removed accidentally after a bad rebase. This commit is just
adding them back in
Change-Id: I2a25f8dfbccfea6cc4f33ff6cf8ae7913ea2de2d
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/48238
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Matt Derksen <mderkse1@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/intr')
| -rw-r--r-- | src/usr/intr/intrrp.C | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/usr/intr/intrrp.C b/src/usr/intr/intrrp.C index 6e8d00f55..a898c2cf0 100644 --- a/src/usr/intr/intrrp.C +++ b/src/usr/intr/intrrp.C @@ -1886,6 +1886,7 @@ void IntrRp::shutDown(uint64_t i_status) if (l_err) { delete l_err; //errl comp already shutdown. Log error and continue + l_err = nullptr; TRACFCOMP(g_trac_intr, "IntrRp::shutDown() Error masking all interrupt sources."); } @@ -1906,6 +1907,7 @@ void IntrRp::shutDown(uint64_t i_status) if (l_err) { delete l_err; + l_err = nullptr; TRACFCOMP(g_trac_intr, "IntrRp::shutDown() Error re-enabling VPC Pull Err"); } //Disable common interrupt BARs @@ -1914,6 +1916,7 @@ void IntrRp::shutDown(uint64_t i_status) if (l_err) { delete l_err; //errl cmp already shutdown. Log error + continue + l_err = nullptr; TRACFCOMP(g_trac_intr, "IntrRp::shutDown() Error disabling Common Interrupt BARs"); } } @@ -1932,6 +1935,7 @@ void IntrRp::shutDown(uint64_t i_status) if (l_err) { delete l_err; + l_err = nullptr; TRACFCOMP(g_trac_intr, "IntrRp::shutDown() Error re-enabling VPC Pull Err"); } @@ -1940,6 +1944,7 @@ void IntrRp::shutDown(uint64_t i_status) if (l_err) { delete l_err; //errl cmp already shutdown. Log error + continue + l_err = nullptr; TRACFCOMP(g_trac_intr, "IntrRp::shutDown() Error disabling Common" " Interrupt BARs for master proc"); } @@ -1950,6 +1955,7 @@ void IntrRp::shutDown(uint64_t i_status) if (l_err) { delete l_err; //errl cmp already shutdown. Log error + continue + l_err = nullptr; TRACFCOMP(g_trac_intr, "IntrRp::shutDown() Error disabling Master Interrupt BARs"); } |
