diff options
| author | Christian Borntraeger <borntraeger@de.ibm.com> | 2016-07-07 11:07:56 -0400 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2016-08-09 06:42:40 -0400 |
| commit | 2ab0d56aadbcd120b8fa524b4a1142e8b06e13c8 (patch) | |
| tree | d5896899dda1815168377a20b73d9f63f931bb6e | |
| parent | 347a529398e8e723338cca5d8a8ae2d9e7e93448 (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>
| -rw-r--r-- | drivers/s390/virtio/kvm_virtio.c | 2 |
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) | |||
| 482 | } | 482 | } |
| 483 | 483 | ||
| 484 | /* code for early console output with virtio_console */ | 484 | /* code for early console output with virtio_console */ |
| 485 | static __init int early_put_chars(u32 vtermno, const char *buf, int count) | 485 | static int early_put_chars(u32 vtermno, const char *buf, int count) |
| 486 | { | 486 | { |
| 487 | char scratch[17]; | 487 | char scratch[17]; |
| 488 | unsigned int len = count; | 488 | unsigned int len = count; |