diff --git a/[refs] b/[refs]
index 155d5264b829..af0b3fda7b81 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 084f71ae5ceeb16734d8ac47559d3c718456a865
+refs/heads/master: dcd4a049b9751828c516c59709f3fdf50436df85
diff --git a/trunk/mm/mmap.c b/trunk/mm/mmap.c
index 1f97d8aa9b05..a910c045cfd4 100644
--- a/trunk/mm/mmap.c
+++ b/trunk/mm/mmap.c
@@ -2090,6 +2090,9 @@ void exit_mmap(struct mm_struct *mm)
 	arch_exit_mmap(mm);
 	mmu_notifier_release(mm);
 
+	if (!mm->mmap)	/* Can happen if dup_mmap() received an OOM */
+		return;
+
 	if (mm->locked_vm) {
 		vma = mm->mmap;
 		while (vma) {