From nobody Thu Jun 06 15:55:00 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vw86X4tldz5N2gy; Thu, 06 Jun 2024 15:55:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vw86X2LHfz4Rtl; Thu, 6 Jun 2024 15:55:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717689300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pPaMf5LphlcPIOsR7B1qo2kT/DMm5Z+fjftdmp5NpTI=; b=JROyNPiqTcnQGBssi1+GGmEMmywYpG1OV+ElT6fhG9lLpzbFLJT8auBww8I7cgYX/IaqtP I+kt4OpQ4kaPo1dbwzW5xhsdmFrf3JaKxq66hj2aAJNYrkNy1KY8slWDokYQ/HbWaEFbLW zSV4HZ2BjqwBFGiFw+LZP1TtvOUDeXa9owwqbQGqBTP8vIj69i0cPZfPWj0e/vLZJtBykk YOMoPFlj74l9h3JCAq71j6OlayR96u6eAQHm/Zsk/NzutFM9vK5KqJYcPvPlzzojC0nb33 wywLdjdtmPfgs6rkraNigdRqglggQsb9QcG7Kx068z3dvzjx7LIVvZbmA3qFXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717689300; a=rsa-sha256; cv=none; b=ugtLVKciqsorC3/zKYfGLmnoWaylJptwi2MqbX6nfz0IHcYwqn4qVxpuLddXlFxcWuTeOn X3QFcBFV1dzN7+j44ll+mkfBrQUEwBEa4itod7EeFjFEZaMMySAGqx9zJuWYn3y+K5o/W3 kI9rsZocAAva3kP8maz9JXPZk1j2EobQ0vL6EmZoXrciF9xwnv3VftGu4XqeOhJytdFY3P qT5Zjibu6Q7O52zFerSd8KN+5r9D1ha2pxzdMk4cui1xG2Jv5x+UNve9EjSb2u0HjwFzPW 4P/bZ8a8uFoxhaWHJxnEHVBWFd56FjpFaNdHGmimC2fIPqsS3KKenG+dbPDkhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717689300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pPaMf5LphlcPIOsR7B1qo2kT/DMm5Z+fjftdmp5NpTI=; b=GerLqXhT29mj9YRz0bTdpBlBE1lQdeD3qNwuFI3vOr9Kgumr7/EA4YhiOBHItTjqFfLhoJ 5MjiSyDH9l3l77FhplU8x17RlO1bEyXFjlARlOKW5bNg0TlYCfuhT0kHkCCBEBieSd+umG ckHFnppOhxPKzLI5wdinK+DGoS7NFgcwzxbB/SG6LnXu9GoXdLo/TcocLctcmnszeX27no YpJSt7662YD8hB34rkzU1mmujEdchywCz7o6pvViLwlwpt+8hww+01c6t1f8TRKZiph2wq aRfiMJYJ4INSgGy5SmRdN6ZbZle5A+o+CRX/3Pj3bX4D8hkrt2s23jvIbf+OiA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vw86X1sHjzrxR; Thu, 6 Jun 2024 15:55:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 456Ft009032362; Thu, 6 Jun 2024 15:55:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 456Ft0GR032359; Thu, 6 Jun 2024 15:55:00 GMT (envelope-from git) Date: Thu, 6 Jun 2024 15:55:00 GMT Message-Id: <202406061555.456Ft0GR032359@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 8490d5ec8e0e - stable/13 - Adjust comments referencing vm_mem_init() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8490d5ec8e0e642de1cf8d1ed474bdd45edb7dbc Auto-Submitted: auto-generated The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=8490d5ec8e0e642de1cf8d1ed474bdd45edb7dbc commit 8490d5ec8e0e642de1cf8d1ed474bdd45edb7dbc Author: Mitchell Horne AuthorDate: 2024-05-27 21:37:40 +0000 Commit: Mitchell Horne CommitDate: 2024-06-06 15:54:35 +0000 Adjust comments referencing vm_mem_init() I cannot find a time where the function was not named this. Reviewed by: kib, markj MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45383 (cherry picked from commit deab57178f0b06eab56d7811674176985a8ea98d) --- sys/amd64/amd64/pmap.c | 7 ++++--- sys/arm/arm/pmap-v6.c | 5 +++-- sys/arm64/arm64/pmap.c | 3 ++- sys/i386/i386/pmap.c | 3 ++- sys/kern/kern_malloc.c | 3 ++- sys/powerpc/booke/pmap.c | 5 +++-- sys/riscv/riscv/pmap.c | 3 ++- sys/vm/vm_init.c | 2 +- 8 files changed, 19 insertions(+), 12 deletions(-) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 8f1541bc8637..5d848cdd7aac 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -1573,8 +1573,8 @@ nkpt_init(vm_paddr_t addr) * Secondly, device memory mapped as part of setting up the low- * level console(s) is taken from KVA, starting at virtual_avail. * This is because cninit() is called after pmap_bootstrap() but - * before vm_init() and pmap_init(). 20MB for a frame buffer is - * not uncommon. + * before vm_mem_init() and pmap_init(). 20MB for a frame buffer + * is not uncommon. */ pt_pages += 32; /* 64MB additional slop. */ #endif @@ -2372,7 +2372,8 @@ pmap_init_pv_table(void) /* * Initialize the pmap module. - * Called by vm_init, to initialize any structures that the pmap + * + * Called by vm_mem_init(), to initialize any structures that the pmap * system needs to map virtual memory. */ void diff --git a/sys/arm/arm/pmap-v6.c b/sys/arm/arm/pmap-v6.c index 0446a67bdbcf..e553df3d9538 100644 --- a/sys/arm/arm/pmap-v6.c +++ b/sys/arm/arm/pmap-v6.c @@ -1707,8 +1707,9 @@ pmap_pt2pg_init(pmap_t pmap, vm_offset_t va, vm_page_t m) /* * Initialize the pmap module. - * Called by vm_init, to initialize any structures that the pmap - * system needs to map virtual memory. + * + * Called by vm_mem_init(), to initialize any structures that the pmap system + * needs to map virtual memory. */ void pmap_init(void) diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index 49ca89135883..cb5c2629fd3e 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -1199,7 +1199,8 @@ pmap_init_asids(struct asid_set *set, int bits) /* * Initialize the pmap module. - * Called by vm_init, to initialize any structures that the pmap + * + * Called by vm_mem_init(), to initialize any structures that the pmap * system needs to map virtual memory. */ void diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index 5913ea927d75..d969d97c35bc 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -961,7 +961,8 @@ pmap_ptelist_init(vm_offset_t *head, void *base, int npages) /* * Initialize the pmap module. - * Called by vm_init, to initialize any structures that the pmap + * + * Called by vm_mem_init(), to initialize any structures that the pmap * system needs to map virtual memory. */ static void diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index 318c47da2ab1..0720c36740ee 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -1251,7 +1251,8 @@ malloc_init(void *data) struct malloc_type_internal *mtip; struct malloc_type *mtp; - KASSERT(vm_cnt.v_page_count != 0, ("malloc_register before vm_init")); + KASSERT(vm_cnt.v_page_count != 0, + ("malloc_init() called before vm_mem_init()")); mtp = data; if (mtp->ks_version != M_VERSION) diff --git a/sys/powerpc/booke/pmap.c b/sys/powerpc/booke/pmap.c index f85bb8d56f74..20e582cc737a 100644 --- a/sys/powerpc/booke/pmap.c +++ b/sys/powerpc/booke/pmap.c @@ -1048,8 +1048,9 @@ mmu_booke_kextract(vm_offset_t va) /* * Initialize the pmap module. - * Called by vm_init, to initialize any structures that the pmap - * system needs to map virtual memory. + * + * Called by vm_mem_init(), to initialize any structures that the pmap system + * needs to map virtual memory. */ static void mmu_booke_init() diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index d1996dabbc2c..24d71dae8478 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -766,7 +766,8 @@ pmap_page_init(vm_page_t m) /* * Initialize the pmap module. - * Called by vm_init, to initialize any structures that the pmap + * + * Called by vm_mem_init(), to initialize any structures that the pmap * system needs to map virtual memory. */ void diff --git a/sys/vm/vm_init.c b/sys/vm/vm_init.c index 886e1765d45d..4476c9c79665 100644 --- a/sys/vm/vm_init.c +++ b/sys/vm/vm_init.c @@ -104,7 +104,7 @@ static void vm_mem_init(void *); SYSINIT(vm_mem, SI_SUB_VM, SI_ORDER_FIRST, vm_mem_init, NULL); /* - * vm_init initializes the virtual memory system. + * vm_mem_init() initializes the virtual memory system. * This is done only by the first cpu up. */ static void