X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=mm%2Fmremap.c;h=7c15cf3373ad0d0e94ba6f5b74145339da0052d3;hb=6fa0cb1141da80eed4f86155fb51931bc1c31888;hp=ddaeee9a0b69e5a5e5b232377ae97801fd6a438e;hpb=16e842a62a8ffcc2e51def6ef9fd6e0926539bc5;p=powerpc.git

diff --git a/mm/mremap.c b/mm/mremap.c
index ddaeee9a0b..7c15cf3373 100644
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -13,6 +13,7 @@
 #include <linux/shm.h>
 #include <linux/mman.h>
 #include <linux/swap.h>
+#include <linux/capability.h>
 #include <linux/fs.h>
 #include <linux/highmem.h>
 #include <linux/security.h>
@@ -96,7 +97,7 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
  	new_pte = pte_offset_map_nested(new_pmd, new_addr);
 	new_ptl = pte_lockptr(mm, new_pmd);
 	if (new_ptl != old_ptl)
-		spin_lock(new_ptl);
+		spin_lock_nested(new_ptl, SINGLE_DEPTH_NESTING);
 
 	for (; old_addr < old_end; old_pte++, old_addr += PAGE_SIZE,
 				   new_pte++, new_addr += PAGE_SIZE) {