1 files changed, 34 insertions, 5 deletions

diff --git a/mm/memory.c b/mm/memory.c
index 4b0144b24c12..d902d0e25edc 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -513,8 +513,7 @@ again:
                 if (progress >= 32) {
                         progress = 0;
                         if (need_resched() ||
-                            need_lockbreak(src_ptl) ||
-                            need_lockbreak(dst_ptl))
+                            spin_needbreak(src_ptl) || spin_needbreak(dst_ptl))
                                 break;
                 }
                 if (pte_none(*src_pte)) {
@@ -853,7 +852,7 @@ unsigned long unmap_vmas(struct mmu_gather **tlbp,
                         tlb_finish_mmu(*tlbp, tlb_start, start);
 
                         if (need_resched() ||
-                                (i_mmap_lock && need_lockbreak(i_mmap_lock))) {
+                                (i_mmap_lock && spin_needbreak(i_mmap_lock))) {
                                 if (i_mmap_lock) {
                                         *tlbp = NULL;
                                         goto out;
@@ -1768,8 +1767,7 @@ again:
 
         restart_addr = zap_page_range(vma, start_addr,
                                         end_addr - start_addr, details);
-        need_break = need_resched() ||
-                        need_lockbreak(details->i_mmap_lock);
+        need_break = need_resched() || spin_needbreak(details->i_mmap_lock);
 
         if (restart_addr >= end_addr) {
                 /* We have now completed this vma: mark it so */
@@ -2756,3 +2754,34 @@ int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, in
 
         return buf - old_buf;
 }
+
+/*
+ * Print the name of a VMA.
+ */
+void print_vma_addr(char *prefix, unsigned long ip)
+{
+        struct mm_struct *mm = current->mm;
+        struct vm_area_struct *vma;
+
+        down_read(&mm->mmap_sem);
+        vma = find_vma(mm, ip);
+        if (vma && vma->vm_file) {
+                struct file *f = vma->vm_file;
+                char *buf = (char *)__get_free_page(GFP_KERNEL);
+                if (buf) {
+                        char *p, *s;
+
+                        p = d_path(f->f_dentry, f->f_vfsmnt, buf, PAGE_SIZE);
+                        if (IS_ERR(p))
+                                p = "?";
+                        s = strrchr(p, '/');
+                        if (s)
+                                p = s+1;
+                        printk("%s%s[%lx+%lx]", prefix, p,
+                                        vma->vm_start,
+                                        vma->vm_end - vma->vm_start);
+                        free_page((unsigned long)buf);
+                }
+        }
+        up_read(&current->mm->mmap_sem);
+}