Merge tag 'renesas-fixes3-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / drivers / xen / gntdev.c

diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c
index eab5427c75f5df829eb964b1c592758fb67aa64e..e41c79c986ea1c43f21675ab5579475ba4e0dc93 100644 (file)
--- a/drivers/xen/gntdev.c
+++ b/drivers/xen/gntdev.c
@@ -272,19 +272,12 @@ static int map_grant_pages(struct grant_map *map)
                 * with find_grant_ptes.
                 */
                for (i = 0; i < map->count; i++) {
-                       unsigned level;
                        unsigned long address = (unsigned long)
                                pfn_to_kaddr(page_to_pfn(map->pages[i]));
-                       pte_t *ptep;
-                       u64 pte_maddr = 0;
                        BUG_ON(PageHighMem(map->pages[i]));
 
-                       ptep = lookup_address(address, &level);
-                       pte_maddr = arbitrary_virt_to_machine(ptep).maddr;
-                       gnttab_set_map_op(&map->kmap_ops[i], pte_maddr,
-                               map->flags |
-                               GNTMAP_host_map |
-                               GNTMAP_contains_pte,
+                       gnttab_set_map_op(&map->kmap_ops[i], address,
+                               map->flags | GNTMAP_host_map,
                                map->grants[i].ref,
                                map->grants[i].domid);
                }