Andrew, this replaces mm-move-mremap-from-file_operations-to-vm_operations_struct-fix.patch in -mm tree nacked by Benjamin. fs/aio.c can't be compiled if CONFIG_MMU=n, filemap_page_mkwrite() is not defined in this case. Add ifdef(CONFIG_MMU) into aio_ring_vm_ops. Note that this only fixes the build error, currently aio doesn't work if !CONFIG_MMU anyway. Reported-by: Fengguang Wu <fengguang.wu@xxxxxxxxx> Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Signed-off-by: Oleg Nesterov <oleg@xxxxxxxxxx> --- fs/aio.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/fs/aio.c b/fs/aio.c index c122624..822c199 100644 --- a/fs/aio.c +++ b/fs/aio.c @@ -338,9 +338,11 @@ static int aio_ring_mremap(struct vm_area_struct *vma) static const struct vm_operations_struct aio_ring_vm_ops = { .mremap = aio_ring_mremap, +#ifdef CONFIG_MMU .fault = filemap_fault, .map_pages = filemap_map_pages, .page_mkwrite = filemap_page_mkwrite, +#endif }; static int aio_ring_mmap(struct file *file, struct vm_area_struct *vma) -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html