From 0f7ce9b7dabccd11363c54582d70c11c7d47799b Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Sat, 5 Sep 2009 11:17:07 -0700
Subject: [PATCH] --- yaml --- r: 157193 b: refs/heads/master c:
 a190887b58c32d19c2eee007c5eb8faa970a69ba h: refs/heads/master i:   157191:
 e30994aef75ad30ec99514c6086a3bcbda3173c3 v: v3

---
 [refs]           | 2 +-
 trunk/mm/nommu.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 9d48e9a73482..c3c9963da84b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e49627b9bc29a14b393c480e8c979e3bc922ef7
+refs/heads/master: a190887b58c32d19c2eee007c5eb8faa970a69ba
diff --git a/trunk/mm/nommu.c b/trunk/mm/nommu.c
index 4bde489ec431..66e81e7e9fe9 100644
--- a/trunk/mm/nommu.c
+++ b/trunk/mm/nommu.c
@@ -1352,6 +1352,7 @@ unsigned long do_mmap_pgoff(struct file *file,
 	}
 
 	vma->vm_region = region;
+	add_nommu_region(region);
 
 	/* set up the mapping */
 	if (file && vma->vm_flags & VM_SHARED)
@@ -1361,8 +1362,6 @@ unsigned long do_mmap_pgoff(struct file *file,
 	if (ret < 0)
 		goto error_put_region;
 
-	add_nommu_region(region);
-
 	/* okay... we have a mapping; now we have to register it */
 	result = vma->vm_start;