UBUNTU: SAUCE: Import aufs driver

[mirror_ubuntu-zesty-kernel.git] / fs / proc / nommu.c

diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
index d4a35746cab91f8967dc83b7466fd572a77ae8d4..7c0dc0ff48828181abea6530a23e81f51d156b94 100644 (file)
--- a/fs/proc/nommu.c
+++ b/fs/proc/nommu.c
@@ -25,7 +25,7 @@
 #include <linux/seq_file.h>
 #include <linux/hugetlb.h>
 #include <linux/vmalloc.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <asm/pgtable.h>
 #include <asm/tlb.h>
 #include <asm/div64.h>
@@ -45,7 +45,10 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
        file = region->vm_file;
 
        if (file) {
-               struct inode *inode = file_inode(region->vm_file);
+               struct inode *inode;
+
+               file = vmr_pr_or_file(region);
+               inode = file_inode(file);
                dev = inode->i_sb->s_dev;
                ino = inode->i_ino;
        }
@@ -64,7 +67,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
 
        if (file) {
                seq_pad(m, ' ');
-               seq_path(m, &file->f_path, "");
+               seq_file_path(m, file, "");
        }
 
        seq_putc(m, '\n');