1 files changed, 6 insertions, 5 deletions

diff --git a/drivers/s390/kvm/kvm_virtio.c b/drivers/s390/kvm/kvm_virtio.c
index 6711e65764b5..2ea6165366b6 100644
--- a/drivers/s390/kvm/kvm_virtio.c
+++ b/drivers/s390/kvm/kvm_virtio.c
@@ -443,29 +443,30 @@ static int __init test_devices_support(unsigned long addr)
 }
 /*
  * Init function for virtio
- * devices are in a single page above top of "normal" mem
+ * devices are in a single page above top of "normal" + standby mem
  */
 static int __init kvm_devices_init(void)
 {
         int rc;
+        unsigned long total_memory_size = sclp_get_rzm() * sclp_get_rnmax();
 
         if (!MACHINE_IS_KVM)
                 return -ENODEV;
 
-        if (test_devices_support(real_memory_size) < 0)
+        if (test_devices_support(total_memory_size) < 0)
                 return -ENODEV;
 
-        rc = vmem_add_mapping(real_memory_size, PAGE_SIZE);
+        rc = vmem_add_mapping(total_memory_size, PAGE_SIZE);
         if (rc)
                 return rc;
 
-        kvm_devices = (void *) real_memory_size;
+        kvm_devices = (void *) total_memory_size;
 
         kvm_root = root_device_register("kvm_s390");
         if (IS_ERR(kvm_root)) {
                 rc = PTR_ERR(kvm_root);
                 printk(KERN_ERR "Could not register kvm_s390 root device");
-                vmem_remove_mapping(real_memory_size, PAGE_SIZE);
+                vmem_remove_mapping(total_memory_size, PAGE_SIZE);
                 return rc;
         }