Subject: [to-be-updated] mm-vmalloc-revert-mm-vmallocc-emit-the-failure-message-before-return.patch removed from -mm tree To: liwanp@xxxxxxxxxxxxxxxxxx,iamjoonsoo.kim@xxxxxxx,kosaki.motohiro@xxxxxxxxxxxxxx,rientjes@xxxxxxxxxx,zhangyanfei@xxxxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Mon, 23 Sep 2013 16:18:46 -0700 The patch titled Subject: mm/vmalloc: revert "mm/vmalloc.c: emit the failure message before return" has been removed from the -mm tree. Its filename was mm-vmalloc-revert-mm-vmallocc-emit-the-failure-message-before-return.patch This patch was dropped because an updated version will be merged ------------------------------------------------------ From: Wanpeng Li <liwanp@xxxxxxxxxxxxxxxxxx> Subject: mm/vmalloc: revert "mm/vmalloc.c: emit the failure message before return" Don't warn twice in __vmalloc_area_node and __vmalloc_node_range if __vmalloc_area_node allocation failure. This patch reverts 46c001a2 ("mm/vmalloc.c: emit the failure message before return"). Signed-off-by: Wanpeng Li <liwanp@xxxxxxxxxxxxxxxxxx> Reviewed-by: Zhang Yanfei <zhangyanfei@xxxxxxxxxxxxxx> Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx> Cc: David Rientjes <rientjes@xxxxxxxxxx> Cc: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/vmalloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN mm/vmalloc.c~mm-vmalloc-revert-mm-vmallocc-emit-the-failure-message-before-return mm/vmalloc.c --- a/mm/vmalloc.c~mm-vmalloc-revert-mm-vmallocc-emit-the-failure-message-before-return +++ a/mm/vmalloc.c @@ -1635,7 +1635,7 @@ void *__vmalloc_node_range(unsigned long addr = __vmalloc_area_node(area, gfp_mask, prot, node, caller); if (!addr) - goto fail; + return NULL; /* * In this function, newly allocated vm_struct has VM_UNINITIALIZED _ Patches currently in -mm which might be from liwanp@xxxxxxxxxxxxxxxxxx are revert-mm-memory-hotplug-fix-lowmem-count-overflow-when-offline-pages.patch mm-compactionc-periodically-schedule-when-freeing-pages.patch ksm-remove-redundant-__gfp_zero-from-kcalloc.patch mm-vmalloc-revert-mm-vmallocc-emit-the-failure-message-before-return-fix.patch mm-vmalloc-revert-mm-vmallocc-check-vm_uninitialized-flag-in-s_show-instead-of-show_numa_info.patch mm-vmalloc-fix-show-vmap_area-information-race-with-vmap_area-tear-down.patch mm-huge_memoryc-fix-stale-comments-of-transparent_hugepage_flags.patch mm-memory-failurec-move-set_migratetype_isolate-outside-get_any_page.patch mm-drop-actor-argument-of-do_generic_file_read.patch mm-drop-actor-argument-of-do_generic_file_read-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