The patch titled Subject: virtio_balloon-introduce-migration-primitives-to-balloon-pages-fix-fix has been removed from the -mm tree. Its filename was virtio_balloon-introduce-migration-primitives-to-balloon-pages-fix-fix.patch This patch was dropped because it was folded into virtio_balloon-introduce-migration-primitives-to-balloon-pages.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: virtio_balloon-introduce-migration-primitives-to-balloon-pages-fix-fix avoid having multiple return points in fill_balloon() Cc: Wei Yongjun <yongjun_wei@xxxxxxxxxxxxxxxxx> Cc: Rafael Aquini <aquini@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/virtio/virtio_balloon.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff -puN drivers/virtio/virtio_balloon.c~virtio_balloon-introduce-migration-primitives-to-balloon-pages-fix-fix drivers/virtio/virtio_balloon.c --- a/drivers/virtio/virtio_balloon.c~virtio_balloon-introduce-migration-primitives-to-balloon-pages-fix-fix +++ a/drivers/virtio/virtio_balloon.c @@ -151,13 +151,9 @@ static void fill_balloon(struct virtio_b totalram_pages--; } - /* Didn't get any? Oh well. */ - if (vb->num_pfns == 0) { - mutex_unlock(&vb->balloon_lock); - return; - } - - tell_host(vb, vb->inflate_vq); + /* Did we get any? */ + if (vb->num_pfns != 0) + tell_host(vb, vb->inflate_vq); mutex_unlock(&vb->balloon_lock); } _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are mm-introduce-mm_find_pmd.patch memory-hotplug-update-mce_bad_pages-when-removing-the-memory.patch slub-hotplug-ignore-unrelated-nodes-hot-adding-and-hot-removing.patch mmvmscan-only-evict-file-pages-when-we-have-plenty.patch dmapool-make-dmapool_debug-detect-corruption-of-free-marker.patch mm-support-more-pagesizes-for-map_hugetlb-shm_hugetlb-v7.patch mm-check-rb_subtree_gap-correctness.patch mm-rearrange-vm_area_struct-for-fewer-cache-misses.patch mm-vm_unmapped_area-lookup-function.patch mm-use-vm_unmapped_area-in-hugetlbfs-on-i386-architecture.patch mm-use-vm_unmapped_area-on-mips-architecture.patch mm-use-vm_unmapped_area-on-arm-architecture.patch mm-use-vm_unmapped_area-on-sh-architecture.patch mm-use-vm_unmapped_area-on-sparc32-architecture.patch mm-use-vm_unmapped_area-in-hugetlbfs-on-tile-architecture.patch mm-use-vm_unmapped_area-on-sparc64-architecture.patch arch-sparc-kernel-sys_sparc_64c-s-colour-color.patch mm-introduce-a-common-interface-for-balloon-pages-mobility.patch virtio_balloon-introduce-migration-primitives-to-balloon-pages.patch virtio_balloon-introduce-migration-primitives-to-balloon-pages-fix-fix-fix.patch mm-cma-skip-watermarks-check-for-already-isolated-blocks-in-split_free_page-fix-fix.patch bootmem-fix-wrong-call-parameter-for-free_bootmem-fix.patch mm-memory-hotplug-dynamic-configure-movable-memory-and-portion-memory-fix.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html