From 3e18188847303fa0546d757ec22a0fb248851d50 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Fri, 19 Oct 2012 13:37:57 -0700 Subject: [PATCH] --- yaml --- r: 334592 b: refs/heads/master c: deb521c44fa529b24cc78a64702757a683f82487 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/fremap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ac60633666c3..27b7a00c5712 100644 --- 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 index 3899a86851ce..a0aaf0e56800 100644 --- 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)