---

yaml --- r: 230850 b: refs/heads/master c: ba5d101 h: refs/heads/master v: v3
git-mirror · Jan 11, 2011 · 96e8516 · 96e8516
1 parent 340f88b
commit 96e8516
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9329e7604fe915fd0201633d3c38adae307d56a5
+refs/heads/master: ba5d1012292403c8037adf4a54c4ec50dfe846c4
diff --git a/trunk/drivers/xen/gntdev.c b/trunk/drivers/xen/gntdev.c
@@ -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,