summaryrefslogtreecommitdiffstats
path: root/drivers/xen
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2010-12-08 10:54:32 -0800
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2011-01-11 14:31:41 -0500
commitba5d1012292403c8037adf4a54c4ec50dfe846c4 (patch)
treef538a106dab612f2ac6c1cb072f8d7bc2040e71b /drivers/xen
parent9329e7604fe915fd0201633d3c38adae307d56a5 (diff)
downloadop-kernel-dev-ba5d1012292403c8037adf4a54c4ec50dfe846c4.zip
op-kernel-dev-ba5d1012292403c8037adf4a54c4ec50dfe846c4.tar.gz
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: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'drivers/xen')
-rw-r--r--drivers/xen/gntdev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c
index 888d763..a2ea533 100644
--- a/drivers/xen/gntdev.c
+++ b/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,
OpenPOWER on IntegriCloud