Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[platform/kernel/linux-rpi.git] / arch / x86 / kvm / debugfs.c

diff --git a/arch/x86/kvm/debugfs.c b/arch/x86/kvm/debugfs.c
index 543a8c0..9240b3b 100644 (file)
--- a/arch/x86/kvm/debugfs.c
+++ b/arch/x86/kvm/debugfs.c
@@ -95,6 +95,9 @@ static int kvm_mmu_rmaps_stat_show(struct seq_file *m, void *v)
        unsigned int *log[KVM_NR_PAGE_SIZES], *cur;
        int i, j, k, l, ret;
 
+       if (!kvm_memslots_have_rmaps(kvm))
+               return 0;
+
        ret = -ENOMEM;
        memset(log, 0, sizeof(log));
        for (i = 0; i < KVM_NR_PAGE_SIZES; i++) {