From 38eaeb0fd8819dce424a61579500bd9987d5c930 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 8 Mar 2011 16:56:43 +0000 Subject: 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: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk --- drivers/xen/gntdev.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'drivers/xen/gntdev.c') diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c index d43ff3072c99..d96d311b858e 100644 --- a/drivers/xen/gntdev.c +++ b/drivers/xen/gntdev.c @@ -257,14 +257,13 @@ static int find_grant_ptes(pte_t *pte, pgtable_t token, static int map_grant_pages(struct grant_map *map) { int i, err = 0; - phys_addr_t addr; if (!use_ptemod) { /* Note: it could already be mapped */ if (map->map_ops[0].handle != -1) return 0; 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])); gnttab_set_map_op(&map->map_ops[i], addr, map->flags, map->grants[i].ref, -- cgit v1.2.3