Prev: [PATCH] kvm x86 mmu: simplify kvm_mmu_unlink_parents()
Next: [PATCH 1/2] kvm: simplify kvm_vm_ioctl_set_memory_alias
From: Lai Jiangshan on 17 Apr 2010 05:10 cleanup: don not fail when cache is sufficient Signed-off-by: Lai Jiangshan <laijs(a)cn.fujitsu.com> --- diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index c8c074c..90f666e 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -304,7 +304,7 @@ static int mmu_topup_memory_cache(struct kvm_mmu_memory_cache *cache, while (cache->nobjs < ARRAY_SIZE(cache->objects)) { obj = kmem_cache_zalloc(base_cache, GFP_KERNEL); if (!obj) - return -ENOMEM; + return cache->nobjs >= min ? 0 : -ENOMEM; cache->objects[cache->nobjs++] = obj; } return 0; @@ -326,7 +326,7 @@ static int mmu_topup_memory_cache_page(struct kvm_mmu_memory_cache *cache, while (cache->nobjs < ARRAY_SIZE(cache->objects)) { page = alloc_page(GFP_KERNEL); if (!page) - return -ENOMEM; + return cache->nobjs >= min ? 0 : -ENOMEM; set_page_private(page, 0); cache->objects[cache->nobjs++] = page_address(page); } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |