diff options
author | Radim Krčmář <rkrcmar@redhat.com> | 2018-03-28 16:09:09 +0200 |
---|---|---|
committer | Radim Krčmář <rkrcmar@redhat.com> | 2018-03-28 16:09:09 +0200 |
commit | abe7a4586f0cf0ef35ed5f713ccfd4eb0770a5ac (patch) | |
tree | c5f5bae60fdd3973b0c5d14a6405a7b66dbb5121 /virt/kvm/arm/aarch32.c | |
parent | d32ef547fdbbeb9c4351f9d3bc84dec998a3be8c (diff) | |
parent | dc6ed61d2f824a595033744fc1f3bf4cb98768b5 (diff) | |
download | linux-abe7a4586f0cf0ef35ed5f713ccfd4eb0770a5ac.tar.bz2 |
Merge tag 'kvm-arm-for-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm
KVM/ARM updates for v4.17
- VHE optimizations
- EL2 address space randomization
- Variant 3a mitigation for Cortex-A57 and A72
- The usual vgic fixes
- Various minor tidying-up
Diffstat (limited to 'virt/kvm/arm/aarch32.c')
-rw-r--r-- | virt/kvm/arm/aarch32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/virt/kvm/arm/aarch32.c b/virt/kvm/arm/aarch32.c index 8bc479fa37e6..efc84cbe8277 100644 --- a/virt/kvm/arm/aarch32.c +++ b/virt/kvm/arm/aarch32.c @@ -178,7 +178,7 @@ static void prepare_fault32(struct kvm_vcpu *vcpu, u32 mode, u32 vect_offset) *vcpu_cpsr(vcpu) = cpsr; /* Note: These now point to the banked copies */ - *vcpu_spsr(vcpu) = new_spsr_value; + vcpu_write_spsr(vcpu, new_spsr_value); *vcpu_reg32(vcpu, 14) = *vcpu_pc(vcpu) + return_offset; /* Branch to exception vector */ |