Merge tag 'ceph-for-4.17-rc1' of git://github.com/ceph/ceph-client

[sfrench/cifs-2.6.git] / arch / arm / kvm / emulate.c

diff --git a/arch/arm/kvm/emulate.c b/arch/arm/kvm/emulate.c
index cdff963f133a189e848929d831a5e88b9fb270d7..9046b53d87c198bb61890a8aefe08bf7a7b0660b 100644 (file)
--- a/arch/arm/kvm/emulate.c
+++ b/arch/arm/kvm/emulate.c
@@ -142,7 +142,7 @@ unsigned long *vcpu_reg(struct kvm_vcpu *vcpu, u8 reg_num)
 /*
  * Return the SPSR for the current mode of the virtual CPU.
  */
-unsigned long *vcpu_spsr(struct kvm_vcpu *vcpu)
+unsigned long *__vcpu_spsr(struct kvm_vcpu *vcpu)
 {
        unsigned long mode = *vcpu_cpsr(vcpu) & MODE_MASK;
        switch (mode) {
@@ -174,5 +174,5 @@ unsigned long *vcpu_spsr(struct kvm_vcpu *vcpu)
  */
 void kvm_inject_vabt(struct kvm_vcpu *vcpu)
 {
-       vcpu_set_hcr(vcpu, vcpu_get_hcr(vcpu) | HCR_VA);
+       *vcpu_hcr(vcpu) |= HCR_VA;
 }