---

yaml --- r: 207277 b: refs/heads/master c: 51980ac h: refs/heads/master i: 207275: fe83c7e v: v3
git-mirror · Aug 10, 2010 · f687e69 · f687e69
1 parent 902c7f2
commit f687e69
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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;