Commit 38eaeb0f authored by Ian Campbell's avatar Ian Campbell Committed by Konrad Rzeszutek Wilk

xen: gntdev: fix build warning

addr is actually a virtual address so use an unsigned long. Fixes:

  CC      drivers/xen/gntdev.o
drivers/xen/gntdev.c: In function 'map_grant_pages':
drivers/xen/gntdev.c:268: warning: cast from pointer to integer of different size

Reduce the scope of the variable at the same time.
Signed-off-by: default avatarIan Campbell <ian.campbell@citrix.com>
Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent dc4972a4
...@@ -257,14 +257,13 @@ static int find_grant_ptes(pte_t *pte, pgtable_t token, ...@@ -257,14 +257,13 @@ static int find_grant_ptes(pte_t *pte, pgtable_t token,
static int map_grant_pages(struct grant_map *map) static int map_grant_pages(struct grant_map *map)
{ {
int i, err = 0; int i, err = 0;
phys_addr_t addr;
if (!use_ptemod) { if (!use_ptemod) {
/* Note: it could already be mapped */ /* Note: it could already be mapped */
if (map->map_ops[0].handle != -1) if (map->map_ops[0].handle != -1)
return 0; return 0;
for (i = 0; i < map->count; i++) { for (i = 0; i < map->count; i++) {
addr = (phys_addr_t) unsigned long addr = (unsigned long)
pfn_to_kaddr(page_to_pfn(map->pages[i])); pfn_to_kaddr(page_to_pfn(map->pages[i]));
gnttab_set_map_op(&map->map_ops[i], addr, map->flags, gnttab_set_map_op(&map->map_ops[i], addr, map->flags,
map->grants[i].ref, map->grants[i].ref,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment