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

Commit ba5d1012 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Konrad Rzeszutek Wilk
Browse files

xen/gntdev: stop using "token" argument 



It's the struct page of the L1 pte page.  But we can get its mfn
by simply doing an arbitrary_virt_to_machine() on it anyway (which is
the safe conservative choice; since we no longer allow HIGHPTE pages,
we would never expect to be operating on a mapped pte page).

Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent 9329e760

drivers/xen/gntdev.c

+2 −2
Original line number Diff line number Diff line
@@ -209,8 +209,8 @@ static int find_grant_ptes(pte_t *pte, pgtable_t token, 
	u64 pte_maddr;



	BUG_ON(pgnr >= map->count);

	pte_maddr  = (u64)pfn_to_mfn(page_to_pfn(token)) << PAGE_SHIFT;

	pte_maddr += (unsigned long)pte & ~PAGE_MASK;

	pte_maddr = arbitrary_virt_to_machine(pte).maddr;



	gnttab_set_map_op(&map->map_ops[pgnr], pte_maddr,

			  GNTMAP_contains_pte | map->flags,

			  map->grants[pgnr].ref,