diff --git a/[refs] b/[refs]
index 3560fb3f98cb..28e6f58c10fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 56c176c9cac9a77249fa1736bfd792f379d61942
+refs/heads/master: 05f564849d49499ced97913a0914b5950577d07d
diff --git a/trunk/fs/proc/base.c b/trunk/fs/proc/base.c
index 3c231adf8450..9e28356a959a 100644
--- a/trunk/fs/proc/base.c
+++ b/trunk/fs/proc/base.c
@@ -1877,8 +1877,9 @@ static struct dentry *proc_map_files_lookup(struct inode *dir,
 	if (!vma)
 		goto out_no_vma;
 
-	result = proc_map_files_instantiate(dir, dentry, task,
-			(void *)(unsigned long)vma->vm_file->f_mode);
+	if (vma->vm_file)
+		result = proc_map_files_instantiate(dir, dentry, task,
+				(void *)(unsigned long)vma->vm_file->f_mode);
 
 out_no_vma:
 	up_read(&mm->mmap_sem);