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;