The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=4bae154fe8c7a84e3062bb0569ea190fc2e83182
commit 4bae154fe8c7a84e3062bb0569ea190fc2e83182 Author: Doug Moore <[email protected]> AuthorDate: 2021-12-24 22:10:30 +0000 Commit: Doug Moore <[email protected]> CommitDate: 2021-12-24 22:10:30 +0000 vm_page: Move a comment fb38b29b5609 (page_alloc_br) vm_page: Remove extra test, dup code from page alloc should have moved a comment block when it moved the function call that followed it. Move the comment block now. --- sys/vm/vm_page.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 89fa9df9ef42..07691c15d8ef 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -2185,6 +2185,10 @@ vm_page_find_contig_domain(int domain, int req, u_long npages, vm_paddr_t low, struct vm_domain *vmd; vm_page_t m_ret; + /* + * Can we allocate the pages without the number of free pages falling + * below the lower bound for the allocation class? + */ vmd = VM_DOMAIN(domain); if (!vm_domain_allocate(vmd, req, npages)) return (NULL); @@ -2238,11 +2242,6 @@ vm_page_alloc_contig_domain(vm_object_t object, vm_pindex_t pindex, int domain, mpred = vm_radix_lookup_le(&object->rtree, pindex); KASSERT(mpred == NULL || mpred->pindex != pindex, ("vm_page_alloc_contig: pindex already allocated")); - - /* - * Can we allocate the pages without the number of free pages falling - * below the lower bound for the allocation class? - */ for (;;) { #if VM_NRESERVLEVEL > 0 /*
