Date: Thu, 19 Jun 2025 16:08:36 GMT From: Alan Cox <alc@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: c7fe7912a623 - main - vm_page: eliminate a stale KASSERT Message-ID: <202506191608.55JG8aLw093455@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by alc: URL: https://cgit.FreeBSD.org/src/commit/?id=c7fe7912a623545c067625e76ae7e540584f37cb commit c7fe7912a623545c067625e76ae7e540584f37cb Author: Alan Cox <alc@FreeBSD.org> AuthorDate: 2025-06-19 15:56:42 +0000 Commit: Alan Cox <alc@FreeBSD.org> CommitDate: 2025-06-19 16:07:41 +0000 vm_page: eliminate a stale KASSERT With the elimination of VM_ALLOC_NOOBJ, it became illegal to pass VM_ALLOC_WAITOK to vm_page_alloc_contig() (and its helpers). So, there is no point in asserting that the caller didn't pass both VM_ALLOC_NORECLAIM and VM_ALLOC_WAITOK. --- sys/vm/vm_page.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 66aae45cb37e..5b05f0dc11c9 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -2327,9 +2327,6 @@ vm_page_alloc_contig_domain(vm_object_t object, vm_pindex_t pindex, int domain, KASSERT(((req & (VM_ALLOC_NOBUSY | VM_ALLOC_SBUSY)) != (VM_ALLOC_NOBUSY | VM_ALLOC_SBUSY)), ("invalid request %#x", req)); - KASSERT((req & (VM_ALLOC_WAITOK | VM_ALLOC_NORECLAIM)) != - (VM_ALLOC_WAITOK | VM_ALLOC_NORECLAIM), - ("invalid request %#x", req)); VM_OBJECT_ASSERT_WLOCKED(object); KASSERT((object->flags & OBJ_FICTITIOUS) == 0, ("vm_page_alloc_contig: object %p has fictitious pages",
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202506191608.55JG8aLw093455>