summaryrefslogtreecommitdiff
path: root/bl31
diff options
context:
space:
mode:
authordanh-arm <dan.handley@arm.com>2015-12-09 11:27:12 +0000
committerdanh-arm <dan.handley@arm.com>2015-12-09 11:27:12 +0000
commitc748896674010e9b398db78a609c87d134ba3f35 (patch)
tree1d4b1bb419041556b5ceebdfc0be0279aa56fd86 /bl31
parent4ca473db0d60c7b3e67c7ebd5096e41f3dc45bf2 (diff)
parent817ac8d19b6fa897997b58aec8cc98f448564594 (diff)
Merge pull request #457 from soby-mathew/sm/fix_fpregs_restore
Fix issue in Floating point register restore
Diffstat (limited to 'bl31')
-rw-r--r--bl31/aarch64/context.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/bl31/aarch64/context.S b/bl31/aarch64/context.S
index 70a1e5d6..a72879be 100644
--- a/bl31/aarch64/context.S
+++ b/bl31/aarch64/context.S
@@ -291,7 +291,7 @@ func fpregs_context_restore
ldr x9, [x0, #CTX_FP_FPSR]
msr fpsr, x9
- str x10, [x0, #CTX_FP_FPCR]
+ ldr x10, [x0, #CTX_FP_FPCR]
msr fpcr, x10
/*