summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel De Graaf <dgdegra@tycho.nsa.gov>2011-02-23 14:11:36 +0100
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2011-02-23 16:10:34 +0100
commitf4ee4af447b67135de7eb8a6615811c13ce938e2 (patch)
treeeb91f7ba09659e4ab183fa4259cb33d2b7eb8d87
parentxen-gntdev: Fix incorrect use of zero handle (diff)
downloadlinux-f4ee4af447b67135de7eb8a6615811c13ce938e2.tar.xz
linux-f4ee4af447b67135de7eb8a6615811c13ce938e2.zip
xen-gntdev: Add cast to pointer
Signed-off-by: Daniel De Graaf <dgdegra@tycho.nsa.gov> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-rw-r--r--drivers/xen/gntdev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c
index cdc28dc8b5d9..d43ff3072c99 100644
--- a/drivers/xen/gntdev.c
+++ b/drivers/xen/gntdev.c
@@ -298,8 +298,8 @@ static int __unmap_grant_pages(struct grant_map *map, int offset, int pages)
if (map->notify.flags & UNMAP_NOTIFY_CLEAR_BYTE) {
int pgno = (map->notify.addr >> PAGE_SHIFT);
if (pgno >= offset && pgno < offset + pages && use_ptemod) {
- void __user *tmp;
- tmp = map->vma->vm_start + map->notify.addr;
+ void __user *tmp = (void __user *)
+ map->vma->vm_start + map->notify.addr;
err = copy_to_user(tmp, &err, 1);
if (err)
return err;