diff options
author | Ian Campbell <ian.campbell@citrix.com> | 2011-03-08 11:56:43 -0500 |
---|---|---|
committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2011-03-09 19:59:19 -0500 |
commit | 38eaeb0fd8819dce424a61579500bd9987d5c930 (patch) | |
tree | f6852cdbd6262f563a8ced56d5aa8fc0b5c46dec /drivers/xen | |
parent | dc4972a4e2f3fee1663bd0670dfc4cd798d5f9b2 (diff) |
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 <ian.campbell@citrix.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'drivers/xen')
-rw-r--r-- | drivers/xen/gntdev.c | 3 |
1 files changed, 1 insertions, 2 deletions
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, | |||
257 | static int map_grant_pages(struct grant_map *map) | 257 | static int map_grant_pages(struct grant_map *map) |
258 | { | 258 | { |
259 | int i, err = 0; | 259 | int i, err = 0; |
260 | phys_addr_t addr; | ||
261 | 260 | ||
262 | if (!use_ptemod) { | 261 | if (!use_ptemod) { |
263 | /* Note: it could already be mapped */ | 262 | /* Note: it could already be mapped */ |
264 | if (map->map_ops[0].handle != -1) | 263 | if (map->map_ops[0].handle != -1) |
265 | return 0; | 264 | return 0; |
266 | for (i = 0; i < map->count; i++) { | 265 | for (i = 0; i < map->count; i++) { |
267 | addr = (phys_addr_t) | 266 | unsigned long addr = (unsigned long) |
268 | pfn_to_kaddr(page_to_pfn(map->pages[i])); | 267 | pfn_to_kaddr(page_to_pfn(map->pages[i])); |
269 | gnttab_set_map_op(&map->map_ops[i], addr, map->flags, | 268 | gnttab_set_map_op(&map->map_ops[i], addr, map->flags, |
270 | map->grants[i].ref, | 269 | map->grants[i].ref, |