---

yaml --- r: 334592 b: refs/heads/master c: deb521c h: refs/heads/master v: v3
git-mirror · Oct 19, 2012 · 3e18188 · 3e18188
1 parent 83ecf23
commit 3e18188
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17dbe27d8446232fdc7c69e9818cce5bbc6b3e31
+refs/heads/master: deb521c44fa529b24cc78a64702757a683f82487
diff --git a/trunk/mm/fremap.c b/trunk/mm/fremap.c
@@ -169,7 +169,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
 	if (vma->vm_private_data && !(vma->vm_flags & VM_NONLINEAR))
 		goto out;
 
-	if (!vma->vm_ops->remap_pages)
+	if (!vma->vm_ops || !vma->vm_ops->remap_pages)
 		goto out;
 
 	if (start < vma->vm_start || start + size > vma->vm_end)