linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Oleg Nesterov <oleg@redhat.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Joonsoo Kim <js1304@gmail.com>, Benjamin LaHaise <bcrl@kvack.org>,
	Fengguang Wu <fengguang.wu@intel.com>,
	Jeff Moyer <jmoyer@redhat.com>,
	Johannes Weiner <hannes@cmpxchg.org>,
	Stephen Rothwell <sfr@canb.auug.org.au>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2] mm-move-mremap-from-file_operations-to-vm_operations_struct-fix
Date: Tue, 21 Jul 2015 17:29:03 +0200	[thread overview]
Message-ID: <20150721152903.GA10180@redhat.com> (raw)
In-Reply-To: <20150716231405.GA25147@redhat.com>

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@intel.com>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
---
 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



  parent reply	other threads:[~2015-07-21 15:30 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-16 23:14 [PATCH] mm-move-mremap-from-file_operations-to-vm_operations_struct-fix Oleg Nesterov
2015-07-16 23:22 ` Stephen Rothwell
2015-07-16 23:24 ` Andrew Morton
2015-07-16 23:52   ` Oleg Nesterov
2015-07-17 14:06     ` Benjamin LaHaise
2015-07-17 17:27       ` Oleg Nesterov
2015-07-17 17:37         ` Benjamin LaHaise
2015-07-17 17:55           ` Oleg Nesterov
2015-07-17 18:12             ` Austin S Hemmelgarn
2015-07-17 18:19               ` Oleg Nesterov
2015-07-17 18:39                 ` Austin S Hemmelgarn
2015-07-17 18:54                   ` Oleg Nesterov
2015-07-17 19:09                     ` Austin S Hemmelgarn
2015-07-17 22:56             ` Oleg Nesterov
2015-07-17 22:31       ` Oleg Nesterov
2015-07-20 14:22         ` Jeff Moyer
2015-07-20 17:33           ` Oleg Nesterov
2015-07-20 17:51             ` Benjamin LaHaise
2015-07-20 18:30               ` Jeff Moyer
2015-07-20 18:31               ` Oleg Nesterov
2015-07-20 19:24                 ` Oleg Nesterov
2015-07-20 19:39                   ` Benjamin LaHaise
2015-07-20 20:03                     ` Oleg Nesterov
2015-07-21 15:29 ` Oleg Nesterov [this message]
2015-07-21 15:38   ` [PATCH v2] mm-move-mremap-from-file_operations-to-vm_operations_struct-fix Benjamin LaHaise
2015-07-21 16:18     ` Oleg Nesterov
2015-07-21 16:20 ` [PATCH v3] mm-move-mremap-from-file_operations-to-vm_operations_struct-fix Oleg Nesterov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150721152903.GA10180@redhat.com \
    --to=oleg@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=bcrl@kvack.org \
    --cc=fengguang.wu@intel.com \
    --cc=hannes@cmpxchg.org \
    --cc=jmoyer@redhat.com \
    --cc=js1304@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).