diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2011-03-08 16:56:43 +0000 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2011-03-09 19:59:19 -0500 |
| commit | 38eaeb0fd8819dce424a61579500bd9987d5c930 (patch) | |
| tree | f6852cdbd6262f563a8ced56d5aa8fc0b5c46dec /drivers/xen/gntdev.c | |
| parent | dc4972a4e2f3fee1663bd0670dfc4cd798d5f9b2 (diff) | |
| download | olio-linux-3.10-38eaeb0fd8819dce424a61579500bd9987d5c930.tar.xz olio-linux-3.10-38eaeb0fd8819dce424a61579500bd9987d5c930.zip | |
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/gntdev.c')
| -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 d43ff3072c9..d96d311b858 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, |