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 f33c804..9240b3b 100644 (file)
--- a/arch/x86/kvm/debugfs.c
+++ b/arch/x86/kvm/debugfs.c
@@ -110,9 +110,10 @@ static int kvm_mmu_rmaps_stat_show(struct seq_file *m, void *v)
        write_lock(&kvm->mmu_lock);
 
        for (i = 0; i < KVM_ADDRESS_SPACE_NUM; i++) {
+               int bkt;
+
                slots = __kvm_memslots(kvm, i);
-               for (j = 0; j < slots->used_slots; j++) {
-                       slot = &slots->memslots[j];
+               kvm_for_each_memslot(slot, bkt, slots)
                        for (k = 0; k < KVM_NR_PAGE_SIZES; k++) {
                                rmap = slot->arch.rmap[k];
                                lpage_size = kvm_mmu_slot_lpages(slot, k + 1);
@@ -124,7 +125,6 @@ static int kvm_mmu_rmaps_stat_show(struct seq_file *m, void *v)
                                        cur[index]++;
                                }
                        }
-               }
        }
 
        write_unlock(&kvm->mmu_lock);