From nobody Thu Jun 06 14:24:33 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 4Vw66935sFz5MmJK; Thu, 06 Jun 2024 14:24:33 +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 4Vw6692cDsz45vn; Thu, 6 Jun 2024 14:24:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717683873; 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=khPvQXx+KkFrR0JRbBUHz+55C38tXWf7WcVG604dSkg=; b=p/2e2IUNfvjBiYvjpRzGJVkQMNMIe5jyYBqtjm7Y2WaB8NV1pJXXYLtR6OzJHBPUkKxRzT +VZ06rZv0PVpMNfpdn3QWpCqm26TQA7yyKfw4WCP5Atdduh9Mm/dHy1d8pg7DKo7nVYviR 0cdh/4nd5DzhDVYOSHdCdThf5ZqY55tuUISKY9RWDwkyFYR4r0A1WqZ5sxKL3zSGqdIwlt h/IELnsx2CKAC8cDhsgkHw/KEpGM7NME3kpEIBDagogCIKsHXBTBE4nkqmRT10u75pffwM ca7MS8sj8Rsxwvw7+G07UnfJD0httpWzbnpzaj6HLI0j+2VyO6fcI21KwqsEzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717683873; a=rsa-sha256; cv=none; b=q8OJ2wzZoK0fNKmWpecXpoCRAWYooPyCSdRsY4ZXRDZTkLxmtHu/Rogs2aJMqEp2MRvoGs kxuwiRD24m6dQmfv+WG3VdKvtpUT23OzRZxon78uFtioSoq1n3dOgJKNqKwPCAXHx++HTX vqTHPYXvkGuotLR2Pt+aJYkkE0VzDELCG1JcuXRQN3jh3/FQuQ1BRIk0dAFjn8X8v7sGQB 8pTZxFh5kVn1+8gmtIV6OTBgE3a7pWg5Q0qjTKAJS7FounakjXzWql4i2OYB14CzNzm2m2 52TDSXhGglpVXBK/SA9W94NTfdmOzKhqf6WdgUm/NNa/z9BzX2TABLJerGjkXQ== 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=1717683873; 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=khPvQXx+KkFrR0JRbBUHz+55C38tXWf7WcVG604dSkg=; b=rhnX4IVhmPdgM2toAryr6+5IgUwGxOeYa+zZjAXixLWYKEIofk+b0HYcVEuIZgkliMapZb B7jdzdfMvCNUSE63AgjI8LtDvVxNfYNFJZnWBf9WmJUCbb1v78wsno6I+G71EhXVoD4kxY dgdsmi28TgTwTh/4MslnaMJ2tm3nwFGllOxWGoPUGfWwoKzlHv1IBxZVPno0cJ/dsasERt YXP9gkczEFBX6kIrlDtdPziMCD0vIBZo9PPRP4/PyUpaAHtsuIejer/8VfSpaBtYmDs4aU nNgiEzbmoQjD8pBrOlY+T3gYKO06vHbcdq7/r8opAk6h1Aiad73krBTB/1NKFg== 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 4Vw6692Cb3zpmg; Thu, 6 Jun 2024 14:24:33 +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 456EOXVw078199; Thu, 6 Jun 2024 14:24:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 456EOXgL078196; Thu, 6 Jun 2024 14:24:33 GMT (envelope-from git) Date: Thu, 6 Jun 2024 14:24:33 GMT Message-Id: <202406061424.456EOXgL078196@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: 227b486de44d - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 227b486de44d49a012e259a0934c4464e074c427 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=227b486de44d49a012e259a0934c4464e074c427 commit 227b486de44d49a012e259a0934c4464e074c427 Author: Mitchell Horne AuthorDate: 2024-05-27 21:37:40 +0000 Commit: Mitchell Horne CommitDate: 2024-06-06 14:23:01 +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 233069d37bfb..d6e9713f215a 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -1611,8 +1611,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 @@ -2451,7 +2451,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 92e992a4b25e..5cccb44a48f2 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 b372295d5d43..a5d037d7b71c 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -1536,7 +1536,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/i386/i386/pmap.c b/sys/i386/i386/pmap.c index 67810700e6ef..5e750b48ec5e 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -962,7 +962,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 07f59f733e6a..6e0d12983a2b 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -1268,7 +1268,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 f41ea24cd30c..00653fa6d90c 100644 --- a/sys/powerpc/booke/pmap.c +++ b/sys/powerpc/booke/pmap.c @@ -1050,8 +1050,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(void) diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index 45245fe54a59..d936cab09dbb 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -760,7 +760,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 4ca6e22f8a6d..82efb8236c1d 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