[folded-merged] mm-implement-for_each_valid_pfn-for-config_sparsemem-fix.patch removed from -mm tree

[folded-merged] mm-implement-for_each_valid_pfn-for-config_sparsemem-fix.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: mm-implement-for_each_valid_pfn-for-config_sparsemem-fix
has been removed from the -mm tree.  Its filename was
     mm-implement-for_each_valid_pfn-for-config_sparsemem-fix.patch

This patch was dropped because it was folded into mm-implement-for_each_valid_pfn-for-config_sparsemem.patch

------------------------------------------------------
From: David Woodhouse <dwmw2@infradead.org>
Subject: mm-implement-for_each_valid_pfn-for-config_sparsemem-fix
Date: Sat, 26 Apr 2025 00:04:46 +0100

fix next_valid_pfn() for sparsemem

Link: https://lkml.kernel.org/r/c15100fcf6781a60b852c4dbb43bdc98a678fcf0.camel@infradead.org
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Cc: Anshuman Khandual <anshuman.khandual@arm.com>
Cc: Ard Biesheuvel <ardb@kernel.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: David Woodhouse <dwmw@amazon.co.uk>
Cc: Marc Rutland <mark.rutland@arm.com>
Cc: Marc Zyngier <maz@kernel.org>
Cc: Mike Rapoport (Microsoft) <rppt@kernel.org>
Cc: Ruihan Li <lrh2000@pku.edu.cn>
Cc: Will Deacon <will@kernel.org>
Cc: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 include/linux/mmzone.h |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- a/include/linux/mmzone.h~mm-implement-for_each_valid_pfn-for-config_sparsemem-fix
+++ a/include/linux/mmzone.h
@@ -2190,10 +2190,10 @@ static inline unsigned long next_valid_p
 	/*
 	 * Either every PFN within the section (or subsection for VMEMMAP) is
 	 * valid, or none of them are. So there's no point repeating the check
-	 * for every PFN; only call first_valid_pfn() the first time, and when
-	 * crossing a (sub)section boundary (i.e. !(pfn & ~PFN_VALID_MASK)).
+	 * for every PFN; only call first_valid_pfn() again when crossing a
+	 * (sub)section boundary (i.e. !(pfn & ~PAGE_{SUB,}SECTION_MASK)).
 	 */
-	if (pfn & (IS_ENABLED(CONFIG_SPARSEMEM_VMEMMAP) ?
+	if (pfn & ~(IS_ENABLED(CONFIG_SPARSEMEM_VMEMMAP) ?
 		   PAGE_SUBSECTION_MASK : PAGE_SECTION_MASK))
 		return pfn;
 
_

Patches currently in -mm which might be from dwmw2@infradead.org are

mm-implement-for_each_valid_pfn-for-config_sparsemem.patch