From 65f71fa5f5ae8573e57efe394d0348457ee3c3ee Mon Sep 17 00:00:00 2001
From: Nick Piggin <npiggin@suse.de>
Date: Thu, 5 Jun 2008 22:45:57 -0700
Subject: [PATCH] --- yaml --- r: 97782 b: refs/heads/master c:
 4647875819aa210115d926242aa18e034517cece h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 0d066b70a11b..d2d6eff8de21 100644
--- 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
index bbf953eeb58b..ab171274ef21 100644
--- 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);