From a00dda60b24b61613ac1ffa388ba31f3118e502e Mon Sep 17 00:00:00 2001 From: Xiao Guangrong Date: Fri, 11 Jun 2010 21:32:34 +0800 Subject: [PATCH] --- yaml --- r: 202343 b: refs/heads/master c: ebdea638df04ae6293a9a5414d98ad843c69e82f h: refs/heads/master i: 202341: 1b2c9a18de8eb5362e5bfc28631a390400421e50 202339: 841c31a814f527eb58269c0631e23ef9dc4a4dc3 202335: b3703c6bcaa1ac839cc7b214421878d0a96aaa04 v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/mmu.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index eafc24ffca29..1d383f128936 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: be71e061d15c0aad4f8c2606f76c57b8a19792fd +refs/heads/master: ebdea638df04ae6293a9a5414d98ad843c69e82f diff --git a/trunk/arch/x86/kvm/mmu.c b/trunk/arch/x86/kvm/mmu.c index d1e09f3c5614..41e801b53064 100644 --- a/trunk/arch/x86/kvm/mmu.c +++ b/trunk/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; }