KVM: MMU: Remove walker argument to set_pte() (2fbf4cf1) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/kvm/paging_tmpl.h

+3 −4

Original line number	Original line	Diff line number	Diff line
	@@ -238,8 +238,7 @@ static int FNAME(walk_addr)(struct guest_walker *walker,
	static void FNAME(set_pte)(struct kvm_vcpu vcpu, u64 shadow_pte,		static void FNAME(set_pte)(struct kvm_vcpu vcpu, u64 shadow_pte,
	unsigned pt_access, unsigned pte_access,		unsigned pt_access, unsigned pte_access,
	int user_fault, int write_fault, int dirty,		int user_fault, int write_fault, int dirty,
	int ptwrite, struct guest_walker walker,		int *ptwrite, gfn_t gfn)
	gfn_t gfn)
	{		{
	u64 spte;		u64 spte;
	int was_rmapped = is_rmap_pte(*shadow_pte);		int was_rmapped = is_rmap_pte(*shadow_pte);
	@@ -337,7 +336,7 @@ static void FNAME(update_pte)(struct kvm_vcpu vcpu, struct kvm_mmu_page page,
	pgprintk("%s: gpte %llx spte %p\n", __FUNCTION__, (u64)gpte, spte);		pgprintk("%s: gpte %llx spte %p\n", __FUNCTION__, (u64)gpte, spte);
	pte_access = page->role.access & FNAME(gpte_access)(vcpu, gpte);		pte_access = page->role.access & FNAME(gpte_access)(vcpu, gpte);
	FNAME(set_pte)(vcpu, spte, page->role.access, pte_access, 0, 0,		FNAME(set_pte)(vcpu, spte, page->role.access, pte_access, 0, 0,
	gpte & PT_DIRTY_MASK, NULL, NULL, gpte_to_gfn(gpte));		gpte & PT_DIRTY_MASK, NULL, gpte_to_gfn(gpte));
	}		}

	/*		/*
	@@ -402,7 +401,7 @@ static u64 FNAME(fetch)(struct kvm_vcpu vcpu, gva_t addr,

	FNAME(set_pte)(vcpu, shadow_ent, access, walker->pte_access & access,		FNAME(set_pte)(vcpu, shadow_ent, access, walker->pte_access & access,
	user_fault, write_fault, walker->pte & PT_DIRTY_MASK,		user_fault, write_fault, walker->pte & PT_DIRTY_MASK,
	ptwrite, walker, walker->gfn);		ptwrite, walker->gfn);

	return shadow_ent;		return shadow_ent;
	}		}