| commit | 05c6693e50da0b4a2ca335b3f79d7a0130bf794f | [log] [tgz] |
|---|---|---|
| author | Antonio Niño Díaz <antonio.ninodiaz@arm.com> | Mon Apr 08 13:06:32 2019 +0000 |
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | Mon Apr 08 13:06:32 2019 +0000 |
| tree | a0755a040e0d8822fee6cda583109b51406604ff | |
| parent | 43c733b1f827f49bd97916d26eec5d1cdbafbf40 [diff] | |
| parent | 050136d4853f371479339b641b95249db1585a68 [diff] |
Merge "Fix restoration of PAuth context" into integration
diff --git a/bl31/aarch64/runtime_exceptions.S b/bl31/aarch64/runtime_exceptions.S index c295176..1734d7e 100644 --- a/bl31/aarch64/runtime_exceptions.S +++ b/bl31/aarch64/runtime_exceptions.S
@@ -420,7 +420,7 @@ mov x0, #SMC_UNK str x0, [sp, #CTX_GPREGS_OFFSET + CTX_GPREG_X0] #if CTX_INCLUDE_PAUTH_REGS - bl pauth_context_save + bl pauth_context_restore #endif b restore_gp_registers_eret