projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
mm
/
fremap.c
diff --git
a/mm/fremap.c
b/mm/fremap.c
index
3899a86
..
a0aaf0e
100644
(file)
--- a/
mm/fremap.c
+++ b/
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)