X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=fs%2Fexec.c;h=cecee501ce78805c32c9d007c658fce1e87b0a97;hb=8ab7b66796920e785d27c88fcde1539fa661ae14;hp=9696bbf0f0b1c1b1bd4578fdbfac331fa62ffc48;hpb=375614422509c98a1f3dbef410206bf81775169b;p=linux-2.6-omap-h63xx.git

diff --git a/fs/exec.c b/fs/exec.c
index 9696bbf0f0b..cecee501ce7 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -32,6 +32,7 @@
 #include <linux/swap.h>
 #include <linux/string.h>
 #include <linux/init.h>
+#include <linux/pagemap.h>
 #include <linux/highmem.h>
 #include <linux/spinlock.h>
 #include <linux/key.h>
@@ -751,11 +752,11 @@ static int exec_mmap(struct mm_struct *mm)
 	tsk->active_mm = mm;
 	activate_mm(active_mm, mm);
 	task_unlock(tsk);
-	mm_update_next_owner(old_mm);
 	arch_pick_mmap_layout(mm);
 	if (old_mm) {
 		up_read(&old_mm->mmap_sem);
 		BUG_ON(active_mm != old_mm);
+		mm_update_next_owner(old_mm);
 		mmput(old_mm);
 		return 0;
 	}