From 9d0d8d9c2259211741b1d88c225162e92912891d Mon Sep 17 00:00:00 2001 From: Nick Wang Date: Tue, 3 Jul 2012 11:28:36 -0400 Subject: [PATCH] --- yaml --- r: 373275 b: refs/heads/master c: edefc7107afedd6bd59e80bc0586ddb276edfcbe h: refs/heads/master i: 373273: 98164f0075092852f9df61f92f51a54c9cd59e8c 373271: b8efd69c4fc50a747ee33e67b121618a7ac18382 v: v3 --- [refs] | 2 +- trunk/drivers/s390/kvm/kvm_virtio.c | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 88060a61c42d..4fa3f13b53ee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7b1e427d685e2aee91f9a622f9c2691130f8e57d +refs/heads/master: edefc7107afedd6bd59e80bc0586ddb276edfcbe diff --git a/trunk/drivers/s390/kvm/kvm_virtio.c b/trunk/drivers/s390/kvm/kvm_virtio.c index 6711e65764b5..2ea6165366b6 100644 --- a/trunk/drivers/s390/kvm/kvm_virtio.c +++ b/trunk/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; }