[folded-merged] sh-remove-use-of-pg_arch_1-on-individual-pages-fix.patch removed from -mm tree

[folded-merged] sh-remove-use-of-pg_arch_1-on-individual-pages-fix.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: sh-remove-use-of-pg_arch_1-on-individual-pages-fix
has been removed from the -mm tree.  Its filename was
     sh-remove-use-of-pg_arch_1-on-individual-pages-fix.patch

This patch was dropped because it was folded into sh-remove-use-of-pg_arch_1-on-individual-pages.patch

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: sh-remove-use-of-pg_arch_1-on-individual-pages-fix
Date: Thu Mar 28 11:44:56 AM PDT 2024

fix folio_flags call

Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/sh/mm/cache-sh4.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/arch/sh/mm/cache-sh4.c~sh-remove-use-of-pg_arch_1-on-individual-pages-fix
+++ a/arch/sh/mm/cache-sh4.c
@@ -247,7 +247,7 @@ static void sh4_flush_cache_page(void *a
 		 * another ASID than the current one.
 		 */
 		map_coherent = (current_cpu_data.dcache.n_aliases &&
-			test_bit(PG_dcache_clean, folio_flags(folio)) &&
+			test_bit(PG_dcache_clean, folio_flags(folio, 0)) &&
 			page_mapped(page));
 		if (map_coherent)
 			vaddr = kmap_coherent(page, address);
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

sh-remove-use-of-pg_arch_1-on-individual-pages.patch
mm-gup-drop-folio_fast_pin_allowed-in-hugepd-processing-fix.patch
mm-allow-anon-exclusive-check-over-hugetlb-tail-pages-fix.patch
arm-mm-drop-vm_fault_badmap-vm_fault_badaccess-checkpatch-fixes.patch
mm-hugetlb-rename-dissolve_free_huge_pages-to-dissolve_free_hugetlb_folios-fix.patch
__mod_memcg_lruvec_state-enhance-diagnostics.patch
__mod_memcg_lruvec_state-enhance-diagnostics-fix.patch
binfmt_elf_fdpic-fix-proc-pid-auxv-checkpatch-fixes.patch