summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorWanpeng Li <liwanp@linux.vnet.ibm.com>2013-11-12 15:07:33 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-13 12:09:05 +0900
commitb82225f3ff5be4c52cb588a4a53686db50aa6eb6 (patch)
tree77d2e269a3abe53cd7548c4ac7c8b94c24e12acc /mm
parentaf12346cdacda36f0c35c657088282b8ecd0df72 (diff)
downloadlinux-stable-b82225f3ff5be4c52cb588a4a53686db50aa6eb6.tar.gz
linux-stable-b82225f3ff5be4c52cb588a4a53686db50aa6eb6.tar.bz2
linux-stable-b82225f3ff5be4c52cb588a4a53686db50aa6eb6.zip
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>
Diffstat (limited to 'mm')
-rw-r--r--mm/vmalloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 67535f87846c..745fa9567475 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -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