Skip to content

Commit

Permalink
revert mm/vmalloc.c: emit the failure message before return
Browse files Browse the repository at this point in the history
Don't warn twice in __vmalloc_area_node and __vmalloc_node_range if
__vmalloc_area_node allocation failure.  This patch reverts commit
46c001a ("mm/vmalloc.c: emit the failure message before return").

Signed-off-by: Wanpeng Li <[email protected]>
Reviewed-by: Zhang Yanfei <[email protected]>
Cc: Joonsoo Kim <[email protected]>
Cc: KOSAKI Motohiro <[email protected]>
Cc: Mitsuo Hayasaka <[email protected]>
Cc: David Rientjes <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Wanpeng Li authored and torvalds committed Nov 13, 2013
1 parent af12346 commit b82225f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion mm/vmalloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1635,7 +1635,7 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,

addr = __vmalloc_area_node(area, gfp_mask, prot, node);
if (!addr)
goto fail;
return NULL;

/*
* In this function, newly allocated vm_struct has VM_UNINITIALIZED
Expand Down

0 comments on commit b82225f

Please sign in to comment.