Merge branch 'next' into for-linus

Prepare input updates for 3.16.

3 files changed, 6 insertions, 3 deletions

diff --git a/tools/virtio/linux/kmemleak.h b/tools/virtio/linux/kmemleak.h
new file mode 100644
index 000000000000..c07072270e2f
--- /dev/null
+++ b/tools/virtio/linux/kmemleak.h
@@ -0,0 +1,3 @@
+static inline void kmemleak_ignore(const void *ptr)
+{
+}
diff --git a/tools/virtio/linux/virtio.h b/tools/virtio/linux/virtio.h
index 844783040703..5a2d1f0f6bc7 100644
--- a/tools/virtio/linux/virtio.h
+++ b/tools/virtio/linux/virtio.h
@@ -63,7 +63,7 @@ int virtqueue_add_inbuf(struct virtqueue *vq,
                         void *data,
                         gfp_t gfp);
 
-void virtqueue_kick(struct virtqueue *vq);
+bool virtqueue_kick(struct virtqueue *vq);
 
 void *virtqueue_get_buf(struct virtqueue *vq, unsigned int *len);
 
@@ -79,7 +79,7 @@ struct virtqueue *vring_new_virtqueue(unsigned int index,
                                       struct virtio_device *vdev,
                                       bool weak_barriers,
                                       void *pages,
-                                      void (*notify)(struct virtqueue *vq),
+                                      bool (*notify)(struct virtqueue *vq),
                                       void (*callback)(struct virtqueue *vq),
                                       const char *name);
 void vring_del_virtqueue(struct virtqueue *vq);
diff --git a/tools/virtio/virtio_test.c b/tools/virtio/virtio_test.c
index bdb71a26ae35..00ea679b3826 100644
--- a/tools/virtio/virtio_test.c
+++ b/tools/virtio/virtio_test.c
@@ -172,7 +172,7 @@ static void run_test(struct vdev_info *dev, struct vq_info *vq,
                                                          GFP_ATOMIC);
                                 if (likely(r == 0)) {
                                         ++started;
-                                        if (unlikely(!virtqueue_kick(vq->vq))
+                                        if (unlikely(!virtqueue_kick(vq->vq)))
                                                 r = -1;
                                 }
                         } else