diff options
| author | James Morrissey <james.morrissey@arm.com> | 2014-02-10 14:24:36 +0000 |
|---|---|---|
| committer | Dan Handley <dan.handley@arm.com> | 2014-02-17 18:51:43 +0000 |
| commit | 40a6f64795847f2b96ec24e9b11cb7002f0b48bf (patch) | |
| tree | 114e57eca37970dddbb35e33538f7a75da515ca5 /common/psci/psci_common.c | |
| parent | df64a55b3a675a61b88bb4d0a357ba7085000cdc (diff) | |
Fix asserts appearing in release builds
Also fix warnings generated in release builds when assert code
is absent.
Change-Id: I45b9173d3888f9e93e98eb5b4fdc06727ba5cbf4
Diffstat (limited to 'common/psci/psci_common.c')
| -rw-r--r-- | common/psci/psci_common.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/common/psci/psci_common.c b/common/psci/psci_common.c index e6be2f86..193655dd 100644 --- a/common/psci/psci_common.c +++ b/common/psci/psci_common.c @@ -37,6 +37,7 @@ #include <psci.h> #include <psci_private.h> #include <runtime_svc.h> +#include "debug.h" /******************************************************************************* * Arrays that contains information needs to resume a cpu's execution when woken @@ -511,7 +512,8 @@ void psci_afflvl_power_on_finish(unsigned long mpidr, start_afflvl, end_afflvl, mpidr_nodes); - assert (rc == PSCI_E_SUCCESS); + if (rc != PSCI_E_SUCCESS) + panic(); /* * This function acquires the lock corresponding to each affinity @@ -529,7 +531,8 @@ void psci_afflvl_power_on_finish(unsigned long mpidr, end_afflvl, pon_handlers, mpidr); - assert (rc == PSCI_E_SUCCESS); + if (rc != PSCI_E_SUCCESS) + panic(); /* * This loop releases the lock corresponding to each affinity level |