diff options
| author | danh-arm <dan.handley@arm.com> | 2016-11-23 18:15:36 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-23 18:15:36 +0000 |
| commit | 984d54bb6978f7897ce5ec7f7fa514a1475c4ab8 (patch) | |
| tree | 5920366479f1c8eee547c38583976765569a26de | |
| parent | 5c0df525aca2bdae8cf8c1215eb523c24567f559 (diff) | |
| parent | 48c1c39fef53b05d2e73a095b56616a4fc915b65 (diff) | |
Merge pull request #764 from sandrine-bailleux-arm/sb/fix-trusty-build
Minor fixes in the Trusty SPD code
| -rw-r--r-- | services/spd/trusty/trusty.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/services/spd/trusty/trusty.c b/services/spd/trusty/trusty.c index 4962d44a..4c688caa 100644 --- a/services/spd/trusty/trusty.c +++ b/services/spd/trusty/trusty.c @@ -229,7 +229,7 @@ static uint64_t trusty_smc_handler(uint32_t smc_fid, static int32_t trusty_init(void) { - void el3_exit(); + void el3_exit(void); entry_point_info_t *ep_info; struct trusty_cpu_ctx *ctx = get_trusty_ctx(); uint32_t cpu = plat_my_core_pos(); @@ -270,24 +270,22 @@ static int32_t trusty_init(void) static void trusty_cpu_suspend(void) { struct args ret; - unsigned int linear_id = plat_my_core_pos(); ret = trusty_context_switch(NON_SECURE, SMC_FC_CPU_SUSPEND, 0, 0, 0); if (ret.r0 != 0) { INFO("%s: cpu %d, SMC_FC_CPU_SUSPEND returned unexpected value, %ld\n", - __func__, linear_id, ret.r0); + __func__, plat_my_core_pos(), ret.r0); } } static void trusty_cpu_resume(void) { struct args ret; - unsigned int linear_id = plat_my_core_pos(); ret = trusty_context_switch(NON_SECURE, SMC_FC_CPU_RESUME, 0, 0, 0); if (ret.r0 != 0) { INFO("%s: cpu %d, SMC_FC_CPU_RESUME returned unexpected value, %ld\n", - __func__, linear_id, ret.r0); + __func__, plat_my_core_pos(), ret.r0); } } |