diff options
Diffstat (limited to 'mm/mmap.c')
-rw-r--r-- | mm/mmap.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -669,8 +669,7 @@ again: remove_next = 1 + (end > next->vm_end); | |||
669 | static inline int is_mergeable_vma(struct vm_area_struct *vma, | 669 | static inline int is_mergeable_vma(struct vm_area_struct *vma, |
670 | struct file *file, unsigned long vm_flags) | 670 | struct file *file, unsigned long vm_flags) |
671 | { | 671 | { |
672 | /* VM_CAN_NONLINEAR may get set later by f_op->mmap() */ | 672 | if (vma->vm_flags ^ vm_flags) |
673 | if ((vma->vm_flags ^ vm_flags) & ~VM_CAN_NONLINEAR) | ||
674 | return 0; | 673 | return 0; |
675 | if (vma->vm_file != file) | 674 | if (vma->vm_file != file) |
676 | return 0; | 675 | return 0; |