From 96e8516e9b0988340d14c4124ce169d6527f07aa Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Date: Wed, 8 Dec 2010 10:54:32 -0800
Subject: [PATCH] --- yaml --- r: 230850 b: refs/heads/master c:
 ba5d1012292403c8037adf4a54c4ec50dfe846c4 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/xen/gntdev.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4b636c93d06d..6e1550d650ba 100644
--- 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
index 888d76307d59..a2ea5335e152 100644
--- 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,