Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[uclinux-h8/linux.git] / mm / memory.c

diff --git a/mm/memory.c b/mm/memory.c
index 11b9ca1..a84fbb7 100644 (file)
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -3726,7 +3726,7 @@ void print_vma_addr(char *prefix, unsigned long ip)
                if (buf) {
                        char *p;
 
-                       p = d_path(&f->f_path, buf, PAGE_SIZE);
+                       p = file_path(f, buf, PAGE_SIZE);
                        if (IS_ERR(p))
                                p = "?";
                        printk("%s%s[%lx+%lx]", prefix, kbasename(p),