1 files changed, 5 insertions, 5 deletions

diff --git a/arch/x86/kvm/mmu_audit.c b/arch/x86/kvm/mmu_audit.c
index 715da5a19a5b..7d7d0b9e23eb 100644
--- a/arch/x86/kvm/mmu_audit.c
+++ b/arch/x86/kvm/mmu_audit.c
@@ -192,7 +192,8 @@ static void audit_write_protection(struct kvm *kvm, struct kvm_mmu_page *sp)
 {
         struct kvm_memory_slot *slot;
         unsigned long *rmapp;
-        u64 *spte;
+        u64 *sptep;
+        struct rmap_iterator iter;
 
         if (sp->role.direct || sp->unsync || sp->role.invalid)
                 return;
@@ -200,13 +201,12 @@ static void audit_write_protection(struct kvm *kvm, struct kvm_mmu_page *sp)
         slot = gfn_to_memslot(kvm, sp->gfn);
         rmapp = &slot->rmap[sp->gfn - slot->base_gfn];
 
-        spte = rmap_next(rmapp, NULL);
-        while (spte) {
-                if (is_writable_pte(*spte))
+        for (sptep = rmap_get_first(*rmapp, &iter); sptep;
+             sptep = rmap_get_next(&iter)) {
+                if (is_writable_pte(*sptep))
                         audit_printk(kvm, "shadow page has writable "
                                      "mappings: gfn %llx role %x\n",
                                      sp->gfn, sp->role.word);
-                spte = rmap_next(rmapp, spte);
         }
 }