diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-03 09:03:02 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-03 09:03:02 -0400 |
| commit | a8cac817764a494705aebd99fd51bdf6cdc28ec9 (patch) | |
| tree | 202847337f42b188755a53a7b57b502a7cdc0ad3 /mm/hugetlb.c | |
| parent | b4b3bd96f26586e53ab5482f1869221dd1b5ac36 (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
Merge commit 'v2.6.26-rc8' into x86/mce
Diffstat (limited to 'mm/hugetlb.c')
| -rw-r--r-- | mm/hugetlb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index bbf953eeb58b..ab171274ef21 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c | |||
| @@ -785,7 +785,7 @@ int copy_hugetlb_page_range(struct mm_struct *dst, struct mm_struct *src, | |||
| 785 | continue; | 785 | continue; |
| 786 | 786 | ||
| 787 | spin_lock(&dst->page_table_lock); | 787 | spin_lock(&dst->page_table_lock); |
| 788 | spin_lock(&src->page_table_lock); | 788 | spin_lock_nested(&src->page_table_lock, SINGLE_DEPTH_NESTING); |
| 789 | if (!huge_pte_none(huge_ptep_get(src_pte))) { | 789 | if (!huge_pte_none(huge_ptep_get(src_pte))) { |
| 790 | if (cow) | 790 | if (cow) |
| 791 | huge_ptep_set_wrprotect(src, addr, src_pte); | 791 | huge_ptep_set_wrprotect(src, addr, src_pte); |