From: Cedric Le Goater <clg@fr.ibm.com>

filemap_xip.c needs a fix also.

Signed-off-by: Cedric Le Goater <clg@fr.ibm.com>
Cc: Carsten Otte <cotte@freenet.de>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 mm/filemap_xip.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

diff -puN mm/filemap_xip.c~mm-fix-pagecache-write-deadlocks-xip mm/filemap_xip.c
--- a/mm/filemap_xip.c~mm-fix-pagecache-write-deadlocks-xip
+++ a/mm/filemap_xip.c
@@ -317,7 +317,8 @@ __xip_file_write(struct file *filp, cons
 			break;
 		}
 
-		copied = filemap_copy_from_user(page, offset, buf, bytes);
+		copied = filemap_copy_from_user_nonatomic(page, offset,
+							buf, bytes);
 		flush_dcache_page(page);
 		if (likely(copied > 0)) {
 			status = copied;
_