Re: [PATCH v1 11/16] mm/memory: inline unmap_page_range() into __zap_vma_range()

"David Hildenbrand (Arm)" <[email protected]> Wed, 11 Mar 2026 10:20:13 +0100
Newsgroups org.kernel.vger.linux-sgx,org.freedesktop.lists.dri-devel,org.freedesktop.lists.intel-gfx,org.kernel.vger.bpf,org.kernel.vger.kvm,org.kernel.vger.linux-fsdevel,org.kernel.vger.linux-kernel,org.kernel.vger.linux-perf-users,org.kernel.vger.linux-rdma,org.kernel.vger.linux-s390,org.kernel.vger.netdev,org.kernel.vger.rust-for-linux,org.kvack.linux-mm,org.ozlabs.lists.linuxppc-dev
Message-ID <[email protected]>
>>
>> Tells me that "cur" is rather common.
>>
>>> It's not a big deal, but why not addr?
>>
>> Good question, I can just do that. :)
> 
> Thanks!


@Andrew, the following fixup on top

From 8470e94c57b89819753c8f31e23320f33c14cd58 Mon Sep 17 00:00:00 2001
From: "David Hildenbrand (Arm)" <[email protected]>
Date: Wed, 11 Mar 2026 10:19:00 +0100
Subject: [PATCH] fixup: mm/memory: inline unmap_page_range() into
 __zap_vma_range()

Let's call the local variable simply "addr".

Signed-off-by: David Hildenbrand (Arm) <[email protected]>
---
 mm/memory.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mm/memory.c b/mm/memory.c
index 1c0bcdfc73b7..5f7607140de1 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2081,17 +2081,17 @@ static void __zap_vma_range(struct mmu_gather *tlb, struct vm_area_struct *vma,
 			return;
 		__unmap_hugepage_range(tlb, vma, start, end, NULL, zap_flags);
 	} else {
-		unsigned long next, cur = start;
+		unsigned long next, addr = start;
 		pgd_t *pgd;
 
 		tlb_start_vma(tlb, vma);
-		pgd = pgd_offset(vma->vm_mm, cur);
+		pgd = pgd_offset(vma->vm_mm, addr);
 		do {
-			next = pgd_addr_end(cur, end);
+			next = pgd_addr_end(addr, end);
 			if (pgd_none_or_clear_bad(pgd))
 				continue;
-			next = zap_p4d_range(tlb, vma, pgd, cur, next, details);
-		} while (pgd++, cur = next, cur != end);
+			next = zap_p4d_range(tlb, vma, pgd, addr, next, details);
+		} while (pgd++, addr = next, addr != end);
 		tlb_end_vma(tlb, vma);
 	}
 }
-- 
2.43.0


-- 
Cheers,

David