1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kvm/hyp.S b/arch/arm64/kvm/hyp.S
index 5945f3bdea7a..7874e022d077 100644
--- a/arch/arm64/kvm/hyp.S
+++ b/arch/arm64/kvm/hyp.S
@@ -762,7 +762,7 @@ el1_trap:
        mrs     x2, far_el2
 2:      mrs     x0, tpidr_el2
-        str     x1, [x0, #VCPU_ESR_EL2]
+        str     w1, [x0, #VCPU_ESR_EL2]
        str     x2, [x0, #VCPU_FAR_EL2]
        str     x3, [x0, #VCPU_HPFAR_EL2]

diff --git a/arch/arm64/kvm/hyp.S b/arch/arm64/kvm/hyp.S index 5945f3bdea7a..7874e022d077 100644 --- a/arch/arm64/kvm/hyp.S +++ b/arch/arm64/kvm/hyp.S
@@ -762,7 +762,7 @@ el1_trap:
762	mrs x2, far_el2	762	mrs x2, far_el2
763		763
764	2: mrs x0, tpidr_el2	764	2: mrs x0, tpidr_el2
765	str x1, [x0, #VCPU_ESR_EL2]	765	str w1, [x0, #VCPU_ESR_EL2]
766	str x2, [x0, #VCPU_FAR_EL2]	766	str x2, [x0, #VCPU_FAR_EL2]
767	str x3, [x0, #VCPU_HPFAR_EL2]	767	str x3, [x0, #VCPU_HPFAR_EL2]
768		768