summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorXiao Guangrong <xiaoguangrong@cn.fujitsu.com>2010-06-11 21:32:34 +0800
committerAvi Kivity <avi@redhat.com>2010-08-01 10:46:43 +0300
commitebdea638df04ae6293a9a5414d98ad843c69e82f (patch)
treedc656eba6f0a0e0c9baa63c1b1116a19b913b349 /arch
parentbe71e061d15c0aad4f8c2606f76c57b8a19792fd (diff)
KVM: MMU: cleanup for __mmu_unsync_walk()
Decrease sp->unsync_children after clear unsync_child_bitmap bit Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kvm/mmu.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index d1e09f3c5614..41e801b53064 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -1160,9 +1160,11 @@ static int __mmu_unsync_walk(struct kvm_mmu_page *sp,
return -ENOSPC;
ret = __mmu_unsync_walk(child, pvec);
- if (!ret)
+ if (!ret) {
__clear_bit(i, sp->unsync_child_bitmap);
- else if (ret > 0)
+ sp->unsync_children--;
+ WARN_ON((int)sp->unsync_children < 0);
+ } else if (ret > 0)
nr_unsync_leaf += ret;
else
return ret;
@@ -1176,8 +1178,6 @@ static int __mmu_unsync_walk(struct kvm_mmu_page *sp,
}
}
- if (find_first_bit(sp->unsync_child_bitmap, 512) == 512)
- sp->unsync_children = 0;
return nr_unsync_leaf;
}