diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-05 08:27:42 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-05 08:27:42 -0400 |
| commit | cf57a308436653f3094590202c77459aab250ff3 (patch) | |
| tree | 8a9e7096e494141911147a1f24865c3d79d583c1 /mm/memory.c | |
| parent | faac9bd0e3ce7cb0572ec66e0a426cacf6afa970 (diff) | |
| parent | ca78f6baca863afe2e6a244a0fe94b3a70211d46 (diff) | |
Merge branch 'master'
Diffstat (limited to 'mm/memory.c')
| -rw-r--r-- | mm/memory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memory.c b/mm/memory.c index 7e2a4b1580e3..c1e14c9e67e4 100644 --- a/mm/memory.c +++ b/mm/memory.c | |||
| @@ -503,7 +503,7 @@ again: | |||
| 503 | return -ENOMEM; | 503 | return -ENOMEM; |
| 504 | src_pte = pte_offset_map_nested(src_pmd, addr); | 504 | src_pte = pte_offset_map_nested(src_pmd, addr); |
| 505 | src_ptl = pte_lockptr(src_mm, src_pmd); | 505 | src_ptl = pte_lockptr(src_mm, src_pmd); |
| 506 | spin_lock(src_ptl); | 506 | spin_lock_nested(src_ptl, SINGLE_DEPTH_NESTING); |
| 507 | 507 | ||
| 508 | do { | 508 | do { |
| 509 | /* | 509 | /* |