---

yaml --- r: 69623 b: refs/heads/master c: 5fe1723 h: refs/heads/master i: 69621: b7138d4 69619: 8295df0 69615: 0e41831 v: v3
git-mirror · Oct 16, 2007 · 462d8a6 · 462d8a6
1 parent 796ff12
commit 462d8a6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -1878,13 +1878,15 @@ 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
 		 * same page as we're writing to, without it being marked
 		 * up-to-date.
 		 */
 		fault_in_pages_readable(buf, maxlen);
+#endif
 
 		page = __grab_cache_page(mapping,index,&cached_page,&lru_pvec);
 		if (!page) {