projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'kvm-amd-pmu-fixes' into HEAD
[linux-2.6-microblaze.git]
/
arch
/
powerpc
/
kvm
/
book3s_64_mmu_radix.c
diff --git
a/arch/powerpc/kvm/book3s_64_mmu_radix.c
b/arch/powerpc/kvm/book3s_64_mmu_radix.c
index
e4ce2a3
..
42851c3
100644
(file)
--- a/
arch/powerpc/kvm/book3s_64_mmu_radix.c
+++ b/
arch/powerpc/kvm/book3s_64_mmu_radix.c
@@
-168,9
+168,10
@@
int kvmppc_mmu_walk_radix_tree(struct kvm_vcpu *vcpu, gva_t eaddr,
return -EINVAL;
/* Read the entry from guest memory */
addr = base + (index * sizeof(rpte));
return -EINVAL;
/* Read the entry from guest memory */
addr = base + (index * sizeof(rpte));
- vcpu->srcu_idx = srcu_read_lock(&kvm->srcu);
+
+ kvm_vcpu_srcu_read_lock(vcpu);
ret = kvm_read_guest(kvm, addr, &rpte, sizeof(rpte));
ret = kvm_read_guest(kvm, addr, &rpte, sizeof(rpte));
-
srcu_read_unlock(&kvm->srcu, vcpu->srcu_idx
);
+
kvm_vcpu_srcu_read_unlock(vcpu
);
if (ret) {
if (pte_ret_p)
*pte_ret_p = addr;
if (ret) {
if (pte_ret_p)
*pte_ret_p = addr;
@@
-246,9
+247,9
@@
int kvmppc_mmu_radix_translate_table(struct kvm_vcpu *vcpu, gva_t eaddr,
/* Read the table to find the root of the radix tree */
ptbl = (table & PRTB_MASK) + (table_index * sizeof(entry));
/* Read the table to find the root of the radix tree */
ptbl = (table & PRTB_MASK) + (table_index * sizeof(entry));
-
vcpu->srcu_idx = srcu_read_lock(&kvm->src
u);
+
kvm_vcpu_srcu_read_lock(vcp
u);
ret = kvm_read_guest(kvm, ptbl, &entry, sizeof(entry));
ret = kvm_read_guest(kvm, ptbl, &entry, sizeof(entry));
-
srcu_read_unlock(&kvm->srcu, vcpu->srcu_idx
);
+
kvm_vcpu_srcu_read_unlock(vcpu
);
if (ret)
return ret;
if (ret)
return ret;