The patch titled
mm-fix-pagecache-write-deadlocks: xip
has been added to the -mm tree. Its filename is
mm-fix-pagecache-write-deadlocks-xip.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: mm-fix-pagecache-write-deadlocks: xip
From: Cedric Le Goater <clg@xxxxxxxxxx>
filemap_xip.c needs a fix also.
Signed-off-by: Cedric Le Goater <clg@xxxxxxxxxx>
Cc: Carsten Otte <cotte@xxxxxxxxxx>
Cc: Nick Piggin <nickpiggin@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
mm/filemap_xip.c | 2 +-
1 files changed, 1 insertion(+), 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,7 @@ __xip_file_write(struct file *filp, cons
break;
}
- copied = filemap_copy_from_user(page, offset, buf, bytes);
+ copied = filemap_copy_from_user_atomic(page, offset, buf, bytes);
flush_dcache_page(page);
if (likely(copied > 0)) {
status = copied;
_
Patches currently in -mm which might be from clg@xxxxxxxxxx are
mm-fix-pagecache-write-deadlocks-xip.patch
git-s390.patch
add-process_session-helper-routine.patch
rename-struct-namespace-to-struct-mnt_namespace.patch
add-an-identifier-to-nsproxy.patch
rename-struct-pspace-to-struct-pid_namespace.patch
add-pid_namespace-to-nsproxy.patch
use-current-nsproxy-pid_ns.patch
add-child-reaper-to-pid_namespace.patch
rename-struct-namespace-to-struct-mnt_namespace-cachefiles.patch
statistics-replace-inode-ugeneric_ip-with-i_private.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
