From: Nick Piggin <npiggin@suse.de>

Allow CONFIG_DEBUG_VM to switch off the prefaulting logic, to simulate the
Makes the race much easier to hit.

This probably needn't go upstream.

Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 mm/filemap.c |    2 ++
 1 file changed, 2 insertions(+)

diff -puN mm/filemap.c~mm-only-mm-debug-write-deadlocks mm/filemap.c
--- a/mm/filemap.c~mm-only-mm-debug-write-deadlocks
+++ a/mm/filemap.c
@@ -2106,6 +2106,7 @@ generic_file_buffered_write(struct kiocb
 		if (maxlen > bytes)
 			maxlen = bytes;
 
+#ifndef CONFIG_DEBUG_VM
 		/*
 		 * Bring in the user page that we will copy from _first_.
 		 * Otherwise there's a nasty deadlock on copying from the
@@ -2113,6 +2114,7 @@ generic_file_buffered_write(struct kiocb
 		 * up-to-date.
 		 */
 		fault_in_pages_readable(buf, maxlen);
+#endif
 
 		page = __grab_cache_page(mapping,index,&cached_page,&lru_pvec);
 		if (!page) {
_