diff options
author | Jan Beulich <JBeulich@suse.com> | 2012-02-24 06:46:32 -0500 |
---|---|---|
committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-02-26 11:04:07 -0500 |
commit | 5ac0800143181a0fdae6a7c1b2fa0fa942c1cd06 (patch) | |
tree | 41bfdf0b64bf6d0091b38564e2ffd9b63bdee0e0 /drivers/xen | |
parent | 2113f4691663f033189bf43d7501c6d29cd685a5 (diff) |
xenbus: address compiler warnings
- casting pointers to integer types of different size is being warned on
- an uninitialized variable warning occurred on certain gcc versions
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'drivers/xen')
-rw-r--r-- | drivers/xen/xenbus/xenbus_client.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/xen/xenbus/xenbus_client.c b/drivers/xen/xenbus/xenbus_client.c index 566d2adbd6ea..b3e146edb51d 100644 --- a/drivers/xen/xenbus/xenbus_client.c +++ b/drivers/xen/xenbus/xenbus_client.c | |||
@@ -569,7 +569,7 @@ int xenbus_map_ring(struct xenbus_device *dev, int gnt_ref, | |||
569 | { | 569 | { |
570 | struct gnttab_map_grant_ref op; | 570 | struct gnttab_map_grant_ref op; |
571 | 571 | ||
572 | gnttab_set_map_op(&op, (phys_addr_t)vaddr, GNTMAP_host_map, gnt_ref, | 572 | gnttab_set_map_op(&op, (unsigned long)vaddr, GNTMAP_host_map, gnt_ref, |
573 | dev->otherend_id); | 573 | dev->otherend_id); |
574 | 574 | ||
575 | if (HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1)) | 575 | if (HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1)) |
@@ -662,7 +662,7 @@ static int xenbus_unmap_ring_vfree_hvm(struct xenbus_device *dev, void *vaddr) | |||
662 | goto found; | 662 | goto found; |
663 | } | 663 | } |
664 | } | 664 | } |
665 | node = NULL; | 665 | node = addr = NULL; |
666 | found: | 666 | found: |
667 | spin_unlock(&xenbus_valloc_lock); | 667 | spin_unlock(&xenbus_valloc_lock); |
668 | 668 | ||
@@ -698,7 +698,7 @@ int xenbus_unmap_ring(struct xenbus_device *dev, | |||
698 | { | 698 | { |
699 | struct gnttab_unmap_grant_ref op; | 699 | struct gnttab_unmap_grant_ref op; |
700 | 700 | ||
701 | gnttab_set_unmap_op(&op, (phys_addr_t)vaddr, GNTMAP_host_map, handle); | 701 | gnttab_set_unmap_op(&op, (unsigned long)vaddr, GNTMAP_host_map, handle); |
702 | 702 | ||
703 | if (HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, &op, 1)) | 703 | if (HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, &op, 1)) |
704 | BUG(); | 704 | BUG(); |