1 files changed, 8 insertions, 1 deletions

diff --git a/mm/memory.c b/mm/memory.c
index 717aa0e3be2d..ce3c9e4492d8 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2711,6 +2711,13 @@ void print_vma_addr(char *prefix, unsigned long ip)
         struct mm_struct *mm = current->mm;
         struct vm_area_struct *vma;
 
+        /*
+         * Do not print if we are in atomic
+         * contexts (in exception stacks, etc.):
+         */
+        if (preempt_count())
+                return;
+
         down_read(&mm->mmap_sem);
         vma = find_vma(mm, ip);
         if (vma && vma->vm_file) {
@@ -2719,7 +2726,7 @@ void print_vma_addr(char *prefix, unsigned long ip)
                 if (buf) {
                         char *p, *s;
 
-                        p = d_path(f->f_dentry, f->f_vfsmnt, buf, PAGE_SIZE);
+                        p = d_path(&f->f_path, buf, PAGE_SIZE);
                         if (IS_ERR(p))
                                 p = "?";
                         s = strrchr(p, '/');