Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[linux-block.git] / drivers / s390 / virtio / virtio_ccw.c

diff --git a/drivers/s390/virtio/virtio_ccw.c b/drivers/s390/virtio/virtio_ccw.c
index 72500cd2dbf51702f971059a7fa6a56f89409633..896896e326645ef615cdba25bf399eeb3d75dced 100644 (file)
--- a/drivers/s390/virtio/virtio_ccw.c
+++ b/drivers/s390/virtio/virtio_ccw.c
@@ -33,6 +33,7 @@
 #include <asm/virtio-ccw.h>
 #include <asm/isc.h>
 #include <asm/airq.h>
+#include <asm/tpi.h>
 
 /*
  * virtio related functions
@@ -204,7 +205,8 @@ static void drop_airq_indicator(struct virtqueue *vq, struct airq_info *info)
        write_unlock_irqrestore(&info->lock, flags);
 }
 
-static void virtio_airq_handler(struct airq_struct *airq, bool floating)
+static void virtio_airq_handler(struct airq_struct *airq,
+                               struct tpi_info *tpi_info)
 {
        struct airq_info *info = container_of(airq, struct airq_info, airq);
        unsigned long ai;
@@ -240,7 +242,7 @@ static struct airq_info *new_airq_info(int index)
                return NULL;
        rwlock_init(&info->lock);
        info->aiv = airq_iv_create(VIRTIO_IV_BITS, AIRQ_IV_ALLOC | AIRQ_IV_PTR
-                                  | AIRQ_IV_CACHELINE);
+                                  | AIRQ_IV_CACHELINE, NULL);
        if (!info->aiv) {
                kfree(info);
                return NULL;