summaryrefslogtreecommitdiffstats
path: root/drivers/s390/virtio/kvm_virtio.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2016-08-22 10:34:13 +0200
committerThomas Gleixner <tglx@linutronix.de>2016-08-22 10:34:13 +0200
commitd16c995fe43021c765186bf8b9f7e1cc4b043232 (patch)
tree67eed481534bc6c7102110e65ab4c6ee9e0b786a /drivers/s390/virtio/kvm_virtio.c
parentgenirq/msi: Make sure PCI MSIs are activated early (diff)
parentirqchip/gicv3-its: Disable the ITS before initializing it (diff)
downloadlinux-d16c995fe43021c765186bf8b9f7e1cc4b043232.tar.xz
linux-d16c995fe43021c765186bf8b9f7e1cc4b043232.zip
Merge tag 'irqchip-for-4.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgent
Pull genirq/irqchip fixes for 4.8-rc4 from Marc Zygnier - A critical fix for chained irqchip where we failed to configure the cascade interrupt trigger - A GIC fix for self-IPI in SMP-on-UP configurations - A PM fix for GICv3 - A initialization fix the the GICv3 ITS, triggered by kexec
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;