Skip to content

Commit b82225f

Browse files
Wanpeng Litorvalds
authored andcommitted
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 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]>
1 parent af12346 commit b82225f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

mm/vmalloc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1635,7 +1635,7 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
16351635

16361636
addr = __vmalloc_area_node(area, gfp_mask, prot, node);
16371637
if (!addr)
1638-
goto fail;
1638+
return NULL;
16391639

16401640
/*
16411641
* In this function, newly allocated vm_struct has VM_UNINITIALIZED

0 commit comments

Comments
 (0)