diff --git a/[refs] b/[refs]
index 89ea98451df2..c39ce13a551c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae37461c70bc8c8416cad1bab13a9898ed030aa1
+refs/heads/master: 5fe172370687e03cc6ba8dca990b75db18ff9bb3
diff --git a/trunk/mm/filemap.c b/trunk/mm/filemap.c
index f74d05201862..0c54fc9b8e3d 100644
--- a/trunk/mm/filemap.c
+++ b/trunk/mm/filemap.c
@@ -1878,6 +1878,7 @@ generic_file_buffered_write(struct kiocb *iocb, const struct iovec *iov,
 		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
@@ -1885,6 +1886,7 @@ generic_file_buffered_write(struct kiocb *iocb, const struct iovec *iov,
 		 * up-to-date.
 		 */
 		fault_in_pages_readable(buf, maxlen);
+#endif
 
 		page = __grab_cache_page(mapping,index,&cached_page,&lru_pvec);
 		if (!page) {