diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2012-01-12 00:14:42 -0500 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2012-01-12 00:14:42 -0500 |
commit | f96fde41f7f9af6cf20f6a1919f5d9670f84d574 (patch) | |
tree | 14b8a0343b255989ac8ba0ea34e18dca419723df /drivers/virtio/virtio_balloon.c | |
parent | 5dfc17628d57f9e62043ed0cba03a6e3eb019a78 (diff) |
virtio: rename virtqueue_add_buf_gfp to virtqueue_add_buf
Remove wrapper functions. This makes the allocation type explicit in
all callers; I used GPF_KERNEL where it seemed obvious, left it at
GFP_ATOMIC otherwise.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/virtio/virtio_balloon.c')
-rw-r--r-- | drivers/virtio/virtio_balloon.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c index f64ff185b8b5..0a6425aadf95 100644 --- a/drivers/virtio/virtio_balloon.c +++ b/drivers/virtio/virtio_balloon.c | |||
@@ -88,7 +88,7 @@ static void tell_host(struct virtio_balloon *vb, struct virtqueue *vq) | |||
88 | init_completion(&vb->acked); | 88 | init_completion(&vb->acked); |
89 | 89 | ||
90 | /* We should always be able to add one buffer to an empty queue. */ | 90 | /* We should always be able to add one buffer to an empty queue. */ |
91 | if (virtqueue_add_buf(vq, &sg, 1, 0, vb) < 0) | 91 | if (virtqueue_add_buf(vq, &sg, 1, 0, vb, GFP_KERNEL) < 0) |
92 | BUG(); | 92 | BUG(); |
93 | virtqueue_kick(vq); | 93 | virtqueue_kick(vq); |
94 | 94 | ||
@@ -220,7 +220,7 @@ static void stats_handle_request(struct virtio_balloon *vb) | |||
220 | 220 | ||
221 | vq = vb->stats_vq; | 221 | vq = vb->stats_vq; |
222 | sg_init_one(&sg, vb->stats, sizeof(vb->stats)); | 222 | sg_init_one(&sg, vb->stats, sizeof(vb->stats)); |
223 | if (virtqueue_add_buf(vq, &sg, 1, 0, vb) < 0) | 223 | if (virtqueue_add_buf(vq, &sg, 1, 0, vb, GFP_KERNEL) < 0) |
224 | BUG(); | 224 | BUG(); |
225 | virtqueue_kick(vq); | 225 | virtqueue_kick(vq); |
226 | } | 226 | } |
@@ -313,7 +313,8 @@ static int virtballoon_probe(struct virtio_device *vdev) | |||
313 | * use it to signal us later. | 313 | * use it to signal us later. |
314 | */ | 314 | */ |
315 | sg_init_one(&sg, vb->stats, sizeof vb->stats); | 315 | sg_init_one(&sg, vb->stats, sizeof vb->stats); |
316 | if (virtqueue_add_buf(vb->stats_vq, &sg, 1, 0, vb) < 0) | 316 | if (virtqueue_add_buf(vb->stats_vq, &sg, 1, 0, vb, GFP_KERNEL) |
317 | < 0) | ||
317 | BUG(); | 318 | BUG(); |
318 | virtqueue_kick(vb->stats_vq); | 319 | virtqueue_kick(vb->stats_vq); |
319 | } | 320 | } |