Skip to content

GitLab

Commit 05c6693e authored by Antonio Niño Díaz's avatar Antonio Niño Díaz Committed by TrustedFirmware Code Review
Browse files

Merge "Fix restoration of PAuth context" into integration

parents 43c733b1 050136d4
master v2.5 v2.5-rc1 v2.5-rc0 v2.4 v2.4-rc2 v2.4-rc1 v2.4-rc0 v2.3 v2.3-rc2 v2.3-rc1 v2.3-rc0 v2.2 v2.2-rc2 v2.2-rc1 v2.2-rc0 arm_cca_v0.2 arm_cca_v0.1
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
+1 -1
bl31/aarch64/runtime_exceptions.S
View file @ 05c6693e
......@@ -420,7 +420,7 @@ smc_unknown:
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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment