From f687e69935f1c3879cf8ece33363d1424d38299d Mon Sep 17 00:00:00 2001
From: Kulikov Vasiliy <segooon@gmail.com>
Date: Mon, 9 Aug 2010 17:19:58 -0700
Subject: [PATCH] --- yaml --- r: 207277 b: refs/heads/master c:
 51980ac9e72fb5f22c81b7798d65b691125d70ee h: refs/heads/master i:   207275:
 fe83c7e5b201df4437e2126c966e137d236d113c v: v3

---
 [refs]             | 2 +-
 trunk/mm/vmalloc.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c6d8fa695463..e1632f670d71 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc8e970c3ce4d98afa8eb02dbd2526ce57f7611a
+refs/heads/master: 51980ac9e72fb5f22c81b7798d65b691125d70ee
diff --git a/trunk/mm/vmalloc.c b/trunk/mm/vmalloc.c
index 8b5e4370540b..918c51335d64 100644
--- a/trunk/mm/vmalloc.c
+++ b/trunk/mm/vmalloc.c
@@ -2437,8 +2437,11 @@ static int vmalloc_open(struct inode *inode, struct file *file)
 	unsigned int *ptr = NULL;
 	int ret;
 
-	if (NUMA_BUILD)
+	if (NUMA_BUILD) {
 		ptr = kmalloc(nr_node_ids * sizeof(unsigned int), GFP_KERNEL);
+		if (ptr == NULL)
+			return -ENOMEM;
+	}
 	ret = seq_open(file, &vmalloc_op);
 	if (!ret) {
 		struct seq_file *m = file->private_data;