aboutsummaryrefslogtreecommitdiff
path: root/drivers/s390/virtio/kvm_virtio.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-08-11 14:10:23 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-08-11 14:10:23 -0700
commit6da7e95326976c0bee625f642e1c8ffa970efa07 (patch)
treea7e61e93661331fe3114328bd81a9113285436f2 /drivers/s390/virtio/kvm_virtio.c
parent3b3ce01a57ad45d1ea4c63012d6f1e740d151d8d (diff)
parent3b2fbb3f06efe5bd2dfdce2a1db703e23c1a78af (diff)
downloadlinux-stericsson-6da7e95326976c0bee625f642e1c8ffa970efa07.tar.gz
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio/vhost fixes and cleanups from Michael Tsirkin: "Misc fixes and cleanups all over the place" * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: virtio/s390: deprecate old transport virtio/s390: keep early_put_chars virtio_blk: Fix a slient kernel panic virtio-vsock: fix include guard typo vhost/vsock: fix vhost virtio_vsock_pkt use-after-free 9p/trans_virtio: use kvfree() for iov_iter_get_pages_alloc() virtio: fix error handling for debug builds virtio: fix memory leak in virtqueue_add()
Diffstat (limited to 'drivers/s390/virtio/kvm_virtio.c')
-rw-r--r--drivers/s390/virtio/kvm_virtio.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/s390/virtio/kvm_virtio.c b/drivers/s390/virtio/kvm_virtio.c
index 1d060fd293a3..5e5c11f37b24 100644
--- a/drivers/s390/virtio/kvm_virtio.c
+++ b/drivers/s390/virtio/kvm_virtio.c
@@ -458,6 +458,8 @@ static int __init kvm_devices_init(void)
if (test_devices_support(total_memory_size) < 0)
return -ENODEV;
+ pr_warn("The s390-virtio transport is deprecated. Please switch to a modern host providing virtio-ccw.\n");
+
rc = vmem_add_mapping(total_memory_size, PAGE_SIZE);
if (rc)
return rc;
@@ -482,7 +484,7 @@ static int __init kvm_devices_init(void)
}
/* code for early console output with virtio_console */
-static __init int early_put_chars(u32 vtermno, const char *buf, int count)
+static int early_put_chars(u32 vtermno, const char *buf, int count)
{
char scratch[17];
unsigned int len = count;