The patch titled
Subject: mm-optimize-copy_page_to-from_iter_iovec-fix-fix
has been removed from the -mm tree. Its filename was
mm-optimize-copy_page_to-from_iter_iovec-fix-fix.patch
This patch was dropped because it was folded into mm-optimize-copy_page_to-from_iter_iovec.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-optimize-copy_page_to-from_iter_iovec-fix-fix
change copy_page_from_iter_iovec() as well
Cc: Alexander Viro <viro@xxxxxxxxxxxxxxxxxx>
Cc: Andi Kleen <andi@xxxxxxxxxxxxxx>
Cc: Hugh Dickins <hughd@xxxxxxxxxx>
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: Mel Gorman <mgorman@xxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxxxx>
Cc: Mikulas Patocka <mpatocka@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
lib/iov_iter.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff -puN lib/iov_iter.c~mm-optimize-copy_page_to-from_iter_iovec-fix-fix lib/iov_iter.c
--- a/lib/iov_iter.c~mm-optimize-copy_page_to-from_iter_iovec-fix-fix
+++ a/lib/iov_iter.c
@@ -227,8 +227,7 @@ static size_t copy_page_from_iter_iovec(
buf = iov->iov_base + skip;
copy = min(bytes, iov->iov_len - skip);
-#ifdef CONFIG_HIGHMEM
- if (!fault_in_pages_readable(buf, copy)) {
+ if (IS_ENABLED(CONFIG_HIGHMEM) && !fault_in_pages_readable(buf, copy)) {
kaddr = kmap_atomic(page);
to = kaddr + offset;
@@ -259,7 +258,6 @@ static size_t copy_page_from_iter_iovec(
copy = min(bytes, iov->iov_len - skip);
}
/* Too bad - revert to non-atomic kmap */
-#endif
kaddr = kmap(page);
to = kaddr + offset;
@@ -280,9 +278,7 @@ static size_t copy_page_from_iter_iovec(
}
kunmap(page);
-#ifdef CONFIG_HIGHMEM
done:
-#endif
if (skip == iov->iov_len) {
iov++;
skip = 0;
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
revert-mm-mempool-only-set-__gfp_nomemalloc-if-there-are-free-elements-checkpatch-fixes.patch
mm-optimize-copy_page_to-from_iter_iovec.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
