From 9bf9ea0cdf2862c84477ece40b327a3c7e214fc6 Mon Sep 17 00:00:00 2001
From: Johannes Weiner <hannes@cmpxchg.org>
Date: Tue, 6 Jan 2009 14:40:31 -0800
Subject: [PATCH] --- yaml --- r: 126259 b: refs/heads/master c:
 dcd4a049b9751828c516c59709f3fdf50436df85 h: refs/heads/master i:   126257:
 415bc06624e6cfb81d395b6b4e2ae7be20e9c011   126255:
 c745e69eefc63f75aa2b1c5db2bb1556aadf9315 v: v3

---
 [refs]          | 2 +-
 trunk/mm/mmap.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

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) {