---

yaml --- r: 97782 b: refs/heads/master c: 4647875 h: refs/heads/master v: v3
git-mirror · Jun 6, 2008 · 65f71fa · 65f71fa
1 parent 926c5f9
commit 65f71fa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e2d4ecafd24d6eee4ae6bdbede0cfd0e78423a33
+refs/heads/master: 4647875819aa210115d926242aa18e034517cece
diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c
@@ -785,7 +785,7 @@ int copy_hugetlb_page_range(struct mm_struct *dst, struct mm_struct *src,
 			continue;
 
 		spin_lock(&dst->page_table_lock);
-		spin_lock(&src->page_table_lock);
+		spin_lock_nested(&src->page_table_lock, SINGLE_DEPTH_NESTING);
 		if (!huge_pte_none(huge_ptep_get(src_pte))) {
 			if (cow)
 				huge_ptep_set_wrprotect(src, addr, src_pte);