On x86_64, min was throwing a warning. ARRAY_SIZE is unsigned long so let's
switch to using that for num.
Signed-off-by: Anthony Liguori <aliguori@xxxxxxxxxx>
diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c
index 9de85ae..2f77bfe 100644
--- a/drivers/virtio/virtio_balloon.c
+++ b/drivers/virtio/virtio_balloon.c
@@ -82,7 +82,7 @@ static void tell_host(struct virtio_balloon *vb, struct virtqueue *vq)
wait_for_completion(&vb->acked);
}
-static void fill_balloon(struct virtio_balloon *vb, unsigned int num)
+static void fill_balloon(struct virtio_balloon *vb, unsigned long num)
{
/* We can only do one array worth at a time. */
num = min(num, ARRAY_SIZE(vb->pfns));
@@ -92,7 +92,7 @@ static void fill_balloon(struct virtio_balloon *vb, unsigned int num)
if (!page) {
if (printk_ratelimit())
dev_printk(KERN_INFO, &vb->vdev->dev,
- "Out of puff! Can't get %u pages\n",
+ "Out of puff! Can't get %lu pages\n",
num);
/* Sleep for at least 1/5 of a second before retry. */
msleep(200);
@@ -121,7 +121,7 @@ static void release_pages_by_pfn(const u32 pfns[], unsigned int num)
}
}
-static void leak_balloon(struct virtio_balloon *vb, unsigned int num)
+static void leak_balloon(struct virtio_balloon *vb, unsigned long num)
{
struct page *page;
_______________________________________________
Virtualization mailing list
Virtualization@xxxxxxxxxxxxxxxxxxxxxxxxxx
https://lists.linux-foundation.org/mailman/listinfo/virtualization
