Subject: + mm-vmalloc-revert-mm-vmallocc-emit-the-failure-message-before-return.patch added to -mm tree To: liwanp@xxxxxxxxxxxxxxxxxx,iamjoonsoo.kim@xxxxxxx,kosaki.motohiro@xxxxxxxxxxxxxx,rientjes@xxxxxxxxxx,zhangyanfei@xxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Wed, 18 Sep 2013 13:40:08 -0700 The patch titled Subject: mm/vmalloc: revert "mm/vmalloc.c: emit the failure message before return" has been added to the -mm tree. Its filename is mm-vmalloc-revert-mm-vmallocc-emit-the-failure-message-before-return.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-vmalloc-revert-mm-vmallocc-emit-the-failure-message-before-return.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-vmalloc-revert-mm-vmallocc-emit-the-failure-message-before-return.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ 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 ksm-remove-redundant-__gfp_zero-from-kcalloc.patch mm-vmalloc-dont-set-area-caller-twice.patch mm-vmalloc-revert-mm-vmallocc-emit-the-failure-message-before-return.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-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