Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
arch
/
powerpc
/
kvm
/
book3s_hv_rm_mmu.c
diff --git
a/kernel/arch/powerpc/kvm/book3s_hv_rm_mmu.c
b/kernel/arch/powerpc/kvm/book3s_hv_rm_mmu.c
index
9170051
..
d509ff5
100644
(file)
--- a/
kernel/arch/powerpc/kvm/book3s_hv_rm_mmu.c
+++ b/
kernel/arch/powerpc/kvm/book3s_hv_rm_mmu.c
@@
-653,6
+653,8
@@
long kvmppc_h_protect(struct kvm_vcpu *vcpu, unsigned long flags,
HPTE_V_ABSENT);
do_tlbies(kvm, &rb, 1, global_invalidates(kvm, flags),
true);
HPTE_V_ABSENT);
do_tlbies(kvm, &rb, 1, global_invalidates(kvm, flags),
true);
+ /* Don't lose R/C bit updates done by hardware */
+ r |= be64_to_cpu(hpte[1]) & (HPTE_R_R | HPTE_R_C);
hpte[1] = cpu_to_be64(r);
}
}
hpte[1] = cpu_to_be64(r);
}
}