From: Christoffer Dall <c.dall@xxxxxxxxxxxxxxxxxxxxxx> Make sure this compiles under debug options. Signed-off-by: Christoffer Dall <c.dall@xxxxxxxxxxxxxxxxxxxxxx> --- arch/arm/kvm/mmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c index 10cf62d..7783ff3 100644 --- a/arch/arm/kvm/mmu.c +++ b/arch/arm/kvm/mmu.c @@ -538,7 +538,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, return ret; new_pte = pfn_pte(pfn, PAGE_KVM_GUEST); if (writable) - new_pte |= L_PTE2_WRITE; + pte_val(new_pte) |= L_PTE2_WRITE; spin_lock(&vcpu->kvm->arch.pgd_lock); stage2_set_pte(vcpu->kvm, memcache, fault_ipa, &new_pte); spin_unlock(&vcpu->kvm->arch.pgd_lock); -- 1.7.9.5 _______________________________________________ kvmarm mailing list kvmarm@xxxxxxxxxxxxxxxxxxxxx https://lists.cs.columbia.edu/cucslists/listinfo/kvmarm