path: root/drivers/s390/virtio
diff options
authorChristian Borntraeger <borntraeger@de.ibm.com>2016-07-07 17:07:56 +0200
committerMichael S. Tsirkin <mst@redhat.com>2016-08-09 13:42:40 +0300
commit2ab0d56aadbcd120b8fa524b4a1142e8b06e13c8 (patch)
treed5896899dda1815168377a20b73d9f63f931bb6e /drivers/s390/virtio
parentvirtio_blk: Fix a slient kernel panic (diff)
virtio/s390: keep early_put_chars
In case the registration of the hvc tty never happens AND the kernel thinks that hvc0 is the preferred console we should keep the early printk function to avoid a kernel panic due to code being removed. Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by: Jing Liu <liujbjl@linux.vnet.ibm.com> Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'drivers/s390/virtio')
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/virtio/kvm_virtio.c b/drivers/s390/virtio/kvm_virtio.c
index 1d060fd293a3..b0a849f02df3 100644
--- a/drivers/s390/virtio/kvm_virtio.c
+++ b/drivers/s390/virtio/kvm_virtio.c
@@ -482,7 +482,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;