From f6aa6e01fbdbcb5fb9edc96fb26d6b185a82a51d Mon Sep 17 00:00:00 2001 From: Mel Gorman Date: Thu, 8 Dec 2011 14:34:30 -0800 Subject: [PATCH] --- yaml --- r: 276544 b: refs/heads/master c: 1368edf0647ac112d8cfa6ce47257dc950c50f5c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/vmalloc.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 423009b226da..371f97a8caad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d021563888312018ca65681096f62e36c20e63cc +refs/heads/master: 1368edf0647ac112d8cfa6ce47257dc950c50f5c diff --git a/trunk/mm/vmalloc.c b/trunk/mm/vmalloc.c index 3231bf332878..1d8b32f07139 100644 --- a/trunk/mm/vmalloc.c +++ b/trunk/mm/vmalloc.c @@ -1633,6 +1633,8 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align, goto fail; addr = __vmalloc_area_node(area, gfp_mask, prot, node, caller); + if (!addr) + return NULL; /* * In this function, newly allocated vm_struct is not added