diff options
| author | Konrad Rzeszutek Wilk | 2014-02-03 12:43:59 +0100 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk | 2014-02-03 12:44:49 +0100 |
| commit | e85fc9805591a17ca8af50023ee8e2b61d9a123b (patch) | |
| tree | 95fbacb38701217f001adefa0abe6f8b65c5ce84 /drivers/xen/gntdev.c | |
| parent | xen/pvh: Fix misplaced kfree from xlated_setup_gnttab_pages (diff) | |
| download | kernel-qcow2-linux-e85fc9805591a17ca8af50023ee8e2b61d9a123b.tar.gz kernel-qcow2-linux-e85fc9805591a17ca8af50023ee8e2b61d9a123b.tar.xz kernel-qcow2-linux-e85fc9805591a17ca8af50023ee8e2b61d9a123b.zip | |
Revert "xen/grant-table: Avoid m2p_override during mapping"
This reverts commit 08ece5bb2312b4510b161a6ef6682f37f4eac8a1.
As it breaks ARM builds and needs more attention
on the ARM side.
Acked-by: David Vrabel <david.vrabel@citrix.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'drivers/xen/gntdev.c')
| -rw-r--r-- | drivers/xen/gntdev.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c index 34a2704fbc88..073b4a19a8b0 100644 --- a/drivers/xen/gntdev.c +++ b/drivers/xen/gntdev.c @@ -284,10 +284,8 @@ static int map_grant_pages(struct grant_map *map) } pr_debug("map %d+%d\n", map->index, map->count); - err = gnttab_map_refs_userspace(map->map_ops, - use_ptemod ? map->kmap_ops : NULL, - map->pages, - map->count); + err = gnttab_map_refs(map->map_ops, use_ptemod ? map->kmap_ops : NULL, + map->pages, map->count); if (err) return err; @@ -317,10 +315,9 @@ static int __unmap_grant_pages(struct grant_map *map, int offset, int pages) } } - err = gnttab_unmap_refs_userspace(map->unmap_ops + offset, - use_ptemod ? map->kmap_ops + offset : NULL, - map->pages + offset, - pages); + err = gnttab_unmap_refs(map->unmap_ops + offset, + use_ptemod ? map->kmap_ops + offset : NULL, map->pages + offset, + pages); if (err) return err; |