diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2018-06-14 18:42:54 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2018-06-14 18:42:54 +0300 |
| commit | 09027ab73b82ec773f6ab8ae9468d7e15b748dfa (patch) | |
| tree | dc418a7b8712b8591f0e2a5c0c81ee6e43c335b6 /arch/powerpc/kvm/booke_emulate.c | |
| parent | 273ba45796c14b4a2b669098f13d576b9e233dd8 (diff) | |
| parent | f61e0d3cc4aee194014074471658a5a037e311ce (diff) | |
| download | linux-09027ab73b82ec773f6ab8ae9468d7e15b748dfa.tar.xz | |
Merge tag 'kvm-ppc-next-4.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into HEAD
Diffstat (limited to 'arch/powerpc/kvm/booke_emulate.c')
| -rw-r--r-- | arch/powerpc/kvm/booke_emulate.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/kvm/booke_emulate.c b/arch/powerpc/kvm/booke_emulate.c index a82f64502de1..d23e582f0fee 100644 --- a/arch/powerpc/kvm/booke_emulate.c +++ b/arch/powerpc/kvm/booke_emulate.c @@ -34,19 +34,19 @@ static void kvmppc_emul_rfi(struct kvm_vcpu *vcpu) { - vcpu->arch.pc = vcpu->arch.shared->srr0; + vcpu->arch.regs.nip = vcpu->arch.shared->srr0; kvmppc_set_msr(vcpu, vcpu->arch.shared->srr1); } static void kvmppc_emul_rfdi(struct kvm_vcpu *vcpu) { - vcpu->arch.pc = vcpu->arch.dsrr0; + vcpu->arch.regs.nip = vcpu->arch.dsrr0; kvmppc_set_msr(vcpu, vcpu->arch.dsrr1); } static void kvmppc_emul_rfci(struct kvm_vcpu *vcpu) { - vcpu->arch.pc = vcpu->arch.csrr0; + vcpu->arch.regs.nip = vcpu->arch.csrr0; kvmppc_set_msr(vcpu, vcpu->arch.csrr1); } |