---

yaml --- r: 31828 b: refs/heads/master c: ad33945 h: refs/heads/master v: v3
git-mirror · Jul 3, 2006 · eec789d · eec789d
1 parent c8c4c08
commit eec789d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d378834840907326ac9d448056d957d13cc3718f
+refs/heads/master: ad33945175bed649ca5fe0881269db005bbb449a
diff --git a/trunk/kernel/fork.c b/trunk/kernel/fork.c
@@ -193,7 +193,10 @@ static inline int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
 
 	down_write(&oldmm->mmap_sem);
 	flush_cache_mm(oldmm);
-	down_write(&mm->mmap_sem);
+	/*
+	 * Not linked in yet - no deadlock potential:
+	 */
+	down_write_nested(&mm->mmap_sem, SINGLE_DEPTH_NESTING);
 
 	mm->locked_vm = 0;
 	mm->mmap = NULL;