diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-01-30 20:14:26 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-01-30 20:14:26 +0300 |
| commit | 1d5920c306f11db2c9e517f12843216b58c15046 (patch) | |
| tree | 167954031f8f30cd68e2afaeb92d353402c61050 /arch/powerpc/kvm/booke.c | |
| parent | 621ab20c06e0c0b45eb2382c048a0426bbff9b0e (diff) | |
| parent | fd24a8624eb29d3b6b7df68096ce0321b19b03c6 (diff) | |
| download | linux-1d5920c306f11db2c9e517f12843216b58c15046.tar.xz | |
Merge tag 'kvm-ppc-next-5.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into HEAD
Second KVM PPC update for 5.6
* Fix compile warning on 32-bit machines
* Fix locking error in secure VM support
Diffstat (limited to 'arch/powerpc/kvm/booke.c')
| -rw-r--r-- | arch/powerpc/kvm/booke.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c index 9cb8257b4118..7b27604adadf 100644 --- a/arch/powerpc/kvm/booke.c +++ b/arch/powerpc/kvm/booke.c @@ -775,7 +775,7 @@ int kvmppc_vcpu_run(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu) debug = current->thread.debug; current->thread.debug = vcpu->arch.dbg_reg; - vcpu->arch.pgdir = current->mm->pgd; + vcpu->arch.pgdir = vcpu->kvm->mm->pgd; kvmppc_fix_ee_before_entry(); ret = __kvmppc_vcpu_run(kvm_run, vcpu); |