diff --git a/[refs] b/[refs]
index e37050866292..5ccd4e5dba8e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 917ec63b61720b177271450399bca2f8c5168c0d
+refs/heads/master: ce8fea7aa4ad9e3b40999a08622ef27c77159659
diff --git a/trunk/mm/mmap.c b/trunk/mm/mmap.c
index 22e1a0b2f70c..09ce2cae07ca 100644
--- a/trunk/mm/mmap.c
+++ b/trunk/mm/mmap.c
@@ -1266,8 +1266,9 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
 	vma->vm_pgoff = pgoff;
 	INIT_LIST_HEAD(&vma->anon_vma_chain);
 
+	error = -EINVAL;	/* when rejecting VM_GROWSDOWN|VM_GROWSUP */
+
 	if (file) {
-		error = -EINVAL;
 		if (vm_flags & (VM_GROWSDOWN|VM_GROWSUP))
 			goto free_vma;
 		if (vm_flags & VM_DENYWRITE) {