[folded-merged] mm-optimize-copy_page_to-from_iter_iovec-fix.patch removed from -mm tree

[folded-merged] mm-optimize-copy_page_to-from_iter_iovec-fix.patch removed from -mm tree

[akpm]

The patch titled
     Subject: mm-optimize-copy_page_to-from_iter_iovec-fix
has been removed from the -mm tree.  Its filename was
     mm-optimize-copy_page_to-from_iter_iovec-fix.patch

This patch was dropped because it was folded into mm-optimize-copy_page_to-from_iter_iovec.patch

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: mm-optimize-copy_page_to-from_iter_iovec-fix

use IS_ENABLED(), per Andi

Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Hugh Dickins <hughd@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Mikulas Patocka <mpatocka@redhat.com>
Cc: Andi Kleen <andi@firstfloor.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 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 lib/iov_iter.c
--- a/lib/iov_iter.c~mm-optimize-copy_page_to-from_iter_iovec-fix
+++ a/lib/iov_iter.c
@@ -144,8 +144,7 @@ static size_t copy_page_to_iter_iovec(st
 	buf = iov->iov_base + skip;
 	copy = min(bytes, iov->iov_len - skip);
 
-#ifdef CONFIG_HIGHMEM
-	if (!fault_in_pages_writeable(buf, copy)) {
+	if (IS_ENABLED(CONFIG_HIGHMEM) && !fault_in_pages_writeable(buf, copy)) {
 		kaddr = kmap_atomic(page);
 		from = kaddr + offset;
 
@@ -176,7 +175,6 @@ static size_t copy_page_to_iter_iovec(st
 		copy = min(bytes, iov->iov_len - skip);
 	}
 	/* Too bad - revert to non-atomic kmap */
-#endif
 
 	kaddr = kmap(page);
 	from = kaddr + offset;
@@ -197,9 +195,7 @@ static size_t copy_page_to_iter_iovec(st
 	}
 	kunmap(page);
 
-#ifdef CONFIG_HIGHMEM
 done:
-#endif
 	if (skip == iov->iov_len) {
 		iov++;
 		skip = 0;
_

Patches currently in -mm which might be from akpm@linux-foundation.org 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
mm-optimize-copy_page_to-from_iter_iovec-fix-fix.patch