Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[karo-tx-linux.git] / drivers / s390 / virtio / kvm_virtio.c

diff --git a/drivers/s390/virtio/kvm_virtio.c b/drivers/s390/virtio/kvm_virtio.c
index dd65c8b4c7fe983336a7ff1596c7655837d851b7..53fb975c404b19b3f1d50f1f226cd0155accd683 100644 (file)
--- a/drivers/s390/virtio/kvm_virtio.c
+++ b/drivers/s390/virtio/kvm_virtio.c
@@ -450,7 +450,7 @@ static int __init test_devices_support(unsigned long addr)
 static int __init kvm_devices_init(void)
 {
        int rc;
-       unsigned long total_memory_size = sclp_get_rzm() * sclp_get_rnmax();
+       unsigned long total_memory_size = sclp.rzm * sclp.rnmax;
 
        if (!MACHINE_IS_KVM)
                return -ENODEV;
@@ -497,7 +497,7 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count)
 
 static int __init s390_virtio_console_init(void)
 {
-       if (sclp_has_vt220() || sclp_has_linemode())
+       if (sclp.has_vt220 || sclp.has_linemode)
                return -ENODEV;
        return virtio_cons_early_init(early_put_chars);
 }