On Mon, Jun 29, 2026 at 08:25:29PM +0100, Lorenzo Stoakes wrote: >Update vm_pgprot_modify() to use the new VMA flags type vma_flags_t, and >rename to vma_pgprot_modify() accordingly. > >This is part of the ongoing work to convert vm_flags_t to vma_flags_t, in >order to eliminate the arbitrary limit of the number of bits in a system >word on available VMA flags. > >Update VMA userland tests accordingly, updating vma_set_page_prot() to no >longer inline vma_pgprot_modify(), rather we can simply define >vma_pgprot_modify() as a static inline function and the tests will pick it >up from vma.h. > >No functional change intended. > >Signed-off-by: Lorenzo Stoakes <[email protected]> >--- [...] >diff --git a/mm/vma.h b/mm/vma.h >index bcf0c2773449..6a8abb8ae937 100644 >--- a/mm/vma.h >+++ b/mm/vma.h >@@ -522,9 +522,11 @@ static inline bool >vma_wants_manual_pte_write_upgrade(struct vm_area_struct *vma > } > > #ifdef CONFIG_MMU >-static inline pgprot_t vm_pgprot_modify(pgprot_t oldprot, vm_flags_t vm_flags) >+static inline pgprot_t vma_pgprot_modify(pgprot_t oldprot, vma_flags_t >vma_flags) > { >- return pgprot_modify(oldprot, vm_get_page_prot(vm_flags)); >+ const pgprot_t prot = vma_get_page_prot(vma_flags); >+ >+ return pgprot_modify(oldprot, prot);
Nit: could this just stay as a single return? something like: return pgprot_modify(oldprot, vma_get_page_prot(vma_flags)); Otherwise, LGTM, feel free to add: Reviewed-by: Lance Yang <[email protected]> [...]
