diff options
| author | Wanpeng Li <liwanp@linux.vnet.ibm.com> | 2013-11-12 15:07:33 -0800 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2019-05-02 21:09:04 +0200 |
| commit | 82b90cf266ffc41476ee14af120b776c7f0f5226 (patch) | |
| tree | 9c2da7b2e2c0eefd5536579da2b44a5642eaf631 /mm/vmalloc.c | |
| parent | 9c75a2e7ad58d3c78e270d964a79e6593f3de703 (diff) | |
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
46c001a2753f ("mm/vmalloc.c: emit the failure message before return").
Signed-off-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>
Reviewed-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Mitsuo Hayasaka <mitsuo.hayasaka.hu@hitachi.com>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Change-Id: I161614fb47f3e054b3ea0432d1f67641f7f1d462
(cherry picked from commit f282271e1865ff8d1b4bd770cc73fb0eecd31132)
Diffstat (limited to 'mm/vmalloc.c')
| -rw-r--r-- | mm/vmalloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c index f1780c770..1aec6d967 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -1677,7 +1677,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 |