[Xen-devel] [PATCH 07/11] xen/gntdev: stop using "token" argument

[stefano.stabellini@xxxxxxxxxxxxx]

From: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>

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: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
---
 drivers/xen/gntdev.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c
index b916d6b..fc5e420 100644
--- a/drivers/xen/gntdev.c
+++ b/drivers/xen/gntdev.c
@@ -203,8 +203,8 @@ static int find_grant_ptes(pte_t *pte, pgtable_t token, 
unsigned long addr, void
        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,
-- 
1.5.6.5


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel