1 files changed, 2 insertions, 1 deletions

diff --git a/mm/filemap_xip.c b/mm/filemap_xip.c
index 13e013b1270c..91750227a191 100644
--- a/mm/filemap_xip.c
+++ b/mm/filemap_xip.c
@@ -305,6 +305,7 @@ out:
 static const struct vm_operations_struct xip_file_vm_ops = {
         .fault  = xip_file_fault,
         .page_mkwrite   = filemap_page_mkwrite,
+        .remap_pages = generic_file_remap_pages,
 };
 
 int xip_file_mmap(struct file * file, struct vm_area_struct * vma)
@@ -313,7 +314,7 @@ int xip_file_mmap(struct file * file, struct vm_area_struct * vma)
 
         file_accessed(file);
         vma->vm_ops = &xip_file_vm_ops;
-        vma->vm_flags |= VM_CAN_NONLINEAR | VM_MIXEDMAP;
+        vma->vm_flags |= VM_MIXEDMAP;
         return 0;
 }
 EXPORT_SYMBOL_GPL(xip_file_mmap);