diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2023-10-27 20:58:03 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2023-10-27 20:58:03 +1100 |
| commit | 303d77a6e1707498f09c9d8ee91b1dc07ca315a5 (patch) | |
| tree | 32832416e9a727c4f6c17b1500c28cf117ea4cea /arch/powerpc/kvm/book3s_64_vio.c | |
| parent | 36e826b568e412f61d68fedc02a67b4d8b7583cc (diff) | |
| parent | b7bce570430e42229fb63f775fcbb10f38b83c71 (diff) | |
Merge branch 'topic/ppc-kvm' into next
Merge our KVM topic branch, this has been independently included in linux-next
for most of the development cycle.
Diffstat (limited to 'arch/powerpc/kvm/book3s_64_vio.c')
| -rw-r--r-- | arch/powerpc/kvm/book3s_64_vio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kvm/book3s_64_vio.c b/arch/powerpc/kvm/book3s_64_vio.c index 15200d766fc5..14c6d7e318da 100644 --- a/arch/powerpc/kvm/book3s_64_vio.c +++ b/arch/powerpc/kvm/book3s_64_vio.c @@ -786,12 +786,12 @@ long kvmppc_h_get_tce(struct kvm_vcpu *vcpu, unsigned long liobn, idx = (ioba >> stt->page_shift) - stt->offset; page = stt->pages[idx / TCES_PER_PAGE]; if (!page) { - vcpu->arch.regs.gpr[4] = 0; + kvmppc_set_gpr(vcpu, 4, 0); return H_SUCCESS; } tbl = (u64 *)page_address(page); - vcpu->arch.regs.gpr[4] = tbl[idx % TCES_PER_PAGE]; + kvmppc_set_gpr(vcpu, 4, tbl[idx % TCES_PER_PAGE]); return H_SUCCESS; } |