diff options
| author |   Radim Krčmář <rkrcmar@redhat.com> | 2018-05-05 23:05:31 +0200 |
|---|---|---|
| committer | Radim Krčmář <rkrcmar@redhat.com> | 2018-05-05 23:05:31 +0200 |
| commit | f3351c609bbdcf3c519ff5c5451103aa48a5b804 (patch) | |
| tree | 5ec6d02df85f89340139d37307c321db39fe72bb /arch/arm64/include | |
| parent | Linux v4.17-rc3 (diff) | |
| parent | arm64: vgic-v2: Fix proxying of cpuif access (diff) | |
| download | linux-dev-f3351c609bbdcf3c519ff5c5451103aa48a5b804.tar.xz linux-dev-f3351c609bbdcf3c519ff5c5451103aa48a5b804.zip | |
Merge tag 'kvmarm-fixes-for-4.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm
KVM/arm fixes for 4.17, take #2
- Fix proxying of GICv2 CPU interface accesses
- Fix crash when switching to BE
- Track source vcpu git GICv2 SGIs
- Fix an outdated bit of documentation
Diffstat (limited to 'arch/arm64/include')
| -rw-r--r-- | arch/arm64/include/asm/kvm_emulate.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/kvm_emulate.h index 23b33e8ea03a..1dab3a984608 100644 --- a/arch/arm64/include/asm/kvm_emulate.h +++ b/arch/arm64/include/asm/kvm_emulate.h @@ -333,7 +333,7 @@ static inline void kvm_vcpu_set_be(struct kvm_vcpu *vcpu) } else { u64 sctlr = vcpu_read_sys_reg(vcpu, SCTLR_EL1); sctlr |= (1 << 25); - vcpu_write_sys_reg(vcpu, SCTLR_EL1, sctlr); + vcpu_write_sys_reg(vcpu, sctlr, SCTLR_EL1); } } |