Date: Thu, 15 May 2025 15:27:58 GMT From: Andrew Turner <andrew@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 66886d9d9608 - main - subr_devmap: Add the function name to KASSERT Message-ID: <202505151527.54FFRwDZ071481@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=66886d9d960833a8fa6383976e546b3dfde96176 commit 66886d9d960833a8fa6383976e546b3dfde96176 Author: Andrew Turner <andrew@FreeBSD.org> AuthorDate: 2025-05-15 15:06:35 +0000 Commit: Andrew Turner <andrew@FreeBSD.org> CommitDate: 2025-05-15 15:09:46 +0000 subr_devmap: Add the function name to KASSERT These messages are almost identical, other than one has " 2" appended. Change this to include the function name at the start to make it more obvious which function the KASSERT is from. Reviewed by: mhorne, emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D50308 --- sys/kern/subr_devmap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/kern/subr_devmap.c b/sys/kern/subr_devmap.c index 609c9b142312..d9026dd97311 100644 --- a/sys/kern/subr_devmap.c +++ b/sys/kern/subr_devmap.c @@ -267,7 +267,7 @@ pmap_mapdev(vm_paddr_t pa, vm_size_t size) akva_devmap_vaddr = trunc_page(akva_devmap_vaddr - size); va = akva_devmap_vaddr; KASSERT(va >= VM_MAX_KERNEL_ADDRESS - PMAP_MAPDEV_EARLY_SIZE, - ("Too many early devmap mappings")); + ("%s: Too many early devmap mappings", __func__)); } else #endif #ifdef __aarch64__ @@ -306,8 +306,8 @@ pmap_mapdev_attr(vm_paddr_t pa, vm_size_t size, vm_memattr_t ma) if (early_boot) { akva_devmap_vaddr = trunc_page(akva_devmap_vaddr - size); va = akva_devmap_vaddr; - KASSERT(va >= (VM_MAX_KERNEL_ADDRESS - (PMAP_MAPDEV_EARLY_SIZE)), - ("Too many early devmap mappings 2")); + KASSERT(va >= (VM_MAX_KERNEL_ADDRESS - PMAP_MAPDEV_EARLY_SIZE), + ("%s: Too many early devmap mappings", __func__)); } else #ifdef __aarch64__ if (size >= L2_SIZE && (pa & L2_OFFSET) == 0)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202505151527.54FFRwDZ071481>