Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c85e6b3 authored by Bharat Bhushan's avatar Bharat Bhushan Committed by Alexander Graf
Browse files

kvm: book3s: rename lookup_linux_pte() to lookup_linux_pte_and_update() 



lookup_linux_pte() is doing more than lookup, updating the pte,
so for clarity it is renamed to lookup_linux_pte_and_update()

Signed-off-by: default avatarBharat Bhushan <bharat.bhushan@freescale.com>
Reviewed-by: default avatarScott Wood <scottwood@freescale.com>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent 30a91fe2

arch/powerpc/kvm/book3s_hv_rm_mmu.c

+5 −3
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ static void remove_revmap_chain(struct kvm *kvm, long pte_index, 
	unlock_rmap(rmap);

}



static pte_t lookup_linux_pte(pgd_t *pgdir, unsigned long hva,

static pte_t lookup_linux_pte_and_update(pgd_t *pgdir, unsigned long hva,

			      int writing, unsigned long *pte_sizep)

{

	pte_t *ptep;
@@ -231,7 +231,8 @@ long kvmppc_do_h_enter(struct kvm *kvm, unsigned long flags, 


		/* Look up the Linux PTE for the backing page */

		pte_size = psize;

		pte = lookup_linux_pte(pgdir, hva, writing, &pte_size);

		pte = lookup_linux_pte_and_update(pgdir, hva, writing,

						  &pte_size);

		if (pte_present(pte)) {

			if (writing && !pte_write(pte))

				/* make the actual HPTE be read-only */
@@ -671,7 +672,8 @@ long kvmppc_h_protect(struct kvm_vcpu *vcpu, unsigned long flags, 
			memslot = __gfn_to_memslot(kvm_memslots(kvm), gfn);

			if (memslot) {

				hva = __gfn_to_hva_memslot(memslot, gfn);

				pte = lookup_linux_pte(pgdir, hva, 1, &psize);

				pte = lookup_linux_pte_and_update(pgdir, hva,

								  1, &psize);

				if (pte_present(pte) && !pte_write(pte))

					r = hpte_make_readonly(r);

			}