diff options
| author | Hendrik Brueckner <brueckner@linux.vnet.ibm.com> | 2009-09-11 10:28:56 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2009-09-11 10:29:52 +0200 |
| commit | c4de0c1a18237c2727dde8ad392e333539b0af3c (patch) | |
| tree | acd3d458f12f401317d751408a1c3c77a8004b43 /drivers/s390/kvm | |
| parent | 68d36bdbf6377d36129b2c6bcbe9d24c5fb1739a (diff) | |
| download | kernel_samsung_tuna-c4de0c1a18237c2727dde8ad392e333539b0af3c.zip kernel_samsung_tuna-c4de0c1a18237c2727dde8ad392e333539b0af3c.tar.gz kernel_samsung_tuna-c4de0c1a18237c2727dde8ad392e333539b0af3c.tar.bz2 | |
[S390] kvm: use console_initcall() to initialize s390 virtio console
Use a console_initcall() to initialize the s390 virtio console and
clean up s390 console initialization in setup.c.
Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Tested-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390/kvm')
| -rw-r--r-- | drivers/s390/kvm/kvm_virtio.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/s390/kvm/kvm_virtio.c b/drivers/s390/kvm/kvm_virtio.c index e38e5d3..2930fc7 100644 --- a/drivers/s390/kvm/kvm_virtio.c +++ b/drivers/s390/kvm/kvm_virtio.c @@ -403,10 +403,14 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count) return len; } -void __init s390_virtio_console_init(void) +static int __init s390_virtio_console_init(void) { - virtio_cons_early_init(early_put_chars); + if (!MACHINE_IS_KVM) + return -ENODEV; + return virtio_cons_early_init(early_put_chars); } +console_initcall(s390_virtio_console_init); + /* * We do this after core stuff, but before the drivers. |