CVS commit: src/sys

[Nick Hudson]

Module Name:    src
Committed By:   skrll
Date:           Wed Dec 21 11:39:46 UTC 2022

Modified Files:
        src/sys/arch/aarch64/aarch64: pmap_machdep.c
        src/sys/arch/aarch64/include: pmap_machdep.h
        src/sys/uvm/pmap: pmap_segtab.c

Log Message:
Rename pmap_md_pdetab_destroy to pmap_md_pdetab_fini to match
pmap_md_pdetab_init.

Call pmap_md_pdetab_fini from pmap_segtab_destroy.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/aarch64/aarch64/pmap_machdep.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/aarch64/include/pmap_machdep.h
cvs rdiff -u -r1.30 -r1.31 src/sys/uvm/pmap/pmap_segtab.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/aarch64/aarch64/pmap_machdep.c
diff -u src/sys/arch/aarch64/aarch64/pmap_machdep.c:1.1 src/sys/arch/aarch64/aarch64/pmap_machdep.c:1.2
--- src/sys/arch/aarch64/aarch64/pmap_machdep.c:1.1	Thu Nov  3 09:04:56 2022
+++ src/sys/arch/aarch64/aarch64/pmap_machdep.c	Wed Dec 21 11:39:45 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap_machdep.c,v 1.1 2022/11/03 09:04:56 skrll Exp $	*/
+/*	$NetBSD: pmap_machdep.c,v 1.2 2022/12/21 11:39:45 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2022 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
 #define __PMAP_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_machdep.c,v 1.1 2022/11/03 09:04:56 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_machdep.c,v 1.2 2022/12/21 11:39:45 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -610,7 +610,7 @@ pmap_md_pdetab_init(struct pmap *pm)
 }
 
 void
-pmap_md_pdetab_destroy(struct pmap *pm)
+pmap_md_pdetab_fini(struct pmap *pm)
 {
 
 	KASSERT(pm != NULL);

Index: src/sys/arch/aarch64/include/pmap_machdep.h
diff -u src/sys/arch/aarch64/include/pmap_machdep.h:1.1 src/sys/arch/aarch64/include/pmap_machdep.h:1.2
--- src/sys/arch/aarch64/include/pmap_machdep.h:1.1	Thu Nov  3 09:04:56 2022
+++ src/sys/arch/aarch64/include/pmap_machdep.h	Wed Dec 21 11:39:46 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap_machdep.h,v 1.1 2022/11/03 09:04:56 skrll Exp $	*/
+/*	$NetBSD: pmap_machdep.h,v 1.2 2022/12/21 11:39:46 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2022 The NetBSD Foundation, Inc.
@@ -93,7 +93,7 @@ struct pmap_md {
 #define	pm_l0_pa	pm_md.pmd_l0_pa
 
 void pmap_md_pdetab_init(struct pmap *);
-void pmap_md_pdetab_destroy(struct pmap *);
+void pmap_md_pdetab_fini(struct pmap *);
 
 vaddr_t pmap_md_map_poolpage(paddr_t, size_t);
 paddr_t pmap_md_unmap_poolpage(vaddr_t, size_t);

Index: src/sys/uvm/pmap/pmap_segtab.c
diff -u src/sys/uvm/pmap/pmap_segtab.c:1.30 src/sys/uvm/pmap/pmap_segtab.c:1.31
--- src/sys/uvm/pmap/pmap_segtab.c:1.30	Thu Oct 27 06:49:51 2022
+++ src/sys/uvm/pmap/pmap_segtab.c	Wed Dec 21 11:39:46 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap_segtab.c,v 1.30 2022/10/27 06:49:51 skrll Exp $	*/
+/*	$NetBSD: pmap_segtab.c,v 1.31 2022/12/21 11:39:46 skrll Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: pmap_segtab.c,v 1.30 2022/10/27 06:49:51 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_segtab.c,v 1.31 2022/12/21 11:39:46 skrll Exp $");
 
 /*
  *	Manages physical address maps.
@@ -911,6 +911,7 @@ pmap_segtab_destroy(pmap_t pmap, pte_cal
 
 #if defined(PMAP_HWPAGEWALKER)
 	if (pmap->pm_pdetab != NULL) {
+		pmap_md_pdetab_fini(pmap);
 		pmap_pdetab_release(pmap, &pmap->pm_pdetab,
 		    true, pmap->pm_minaddr, vinc);
 	}