Merge ../linus

Conflicts:

	drivers/cpufreq/cpufreq.c

1 files changed, 2 insertions, 2 deletions

diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
index 091aa8e48e02..fcc5caf93f55 100644
--- a/fs/proc/task_nommu.c
+++ b/fs/proc/task_nommu.c
@@ -126,8 +126,8 @@ int proc_exe_link(struct inode *inode, struct dentry **dentry, struct vfsmount *
         }
 
         if (vma) {
-                *mnt = mntget(vma->vm_file->f_vfsmnt);
-                *dentry = dget(vma->vm_file->f_dentry);
+                *mnt = mntget(vma->vm_file->f_path.mnt);
+                *dentry = dget(vma->vm_file->f_path.dentry);
                 result = 0;
         }