[src/trunk]: src/sys/arch/powerpc/oea Complete the pmap symbol renaming shena...

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/547307631682
branches:  trunk
changeset: 1019217:547307631682
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Tue Mar 02 01:47:44 2021 +0000

description:
Complete the pmap symbol renaming shenanigans for pmap_bootstrap[12]().

diffstat:

 sys/arch/powerpc/include/oea/pmap.h |   4 +++-
 sys/arch/powerpc/oea/pmap.c         |   6 ++++--
 sys/arch/powerpc/oea/pmap_kernel.c  |  18 ++++++++++++++++--
 3 files changed, 23 insertions(+), 5 deletions(-)

diffs (89 lines):

diff -r 73bc135f9971 -r 547307631682 sys/arch/powerpc/include/oea/pmap.h
--- a/sys/arch/powerpc/include/oea/pmap.h       Tue Mar 02 01:20:35 2021 +0000
+++ b/sys/arch/powerpc/include/oea/pmap.h       Tue Mar 02 01:47:44 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.h,v 1.33 2021/03/01 01:53:46 thorpej Exp $        */
+/*     $NetBSD: pmap.h,v 1.34 2021/03/02 01:47:44 thorpej Exp $        */
 
 /*-
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -107,6 +107,8 @@
        void (*pmapop_pvo_verify)(void);
        vaddr_t (*pmapop_steal_memory)(vsize_t, vaddr_t *, vaddr_t *);
        void (*pmapop_bootstrap)(paddr_t, paddr_t);
+       void (*pmapop_bootstrap1)(paddr_t, paddr_t);
+       void (*pmapop_bootstrap2)(void);
 };
 
 #ifdef _KERNEL
diff -r 73bc135f9971 -r 547307631682 sys/arch/powerpc/oea/pmap.c
--- a/sys/arch/powerpc/oea/pmap.c       Tue Mar 02 01:20:35 2021 +0000
+++ b/sys/arch/powerpc/oea/pmap.c       Tue Mar 02 01:47:44 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.100 2021/03/02 00:28:55 rin Exp $   */
+/*     $NetBSD: pmap.c,v 1.101 2021/03/02 01:47:44 thorpej Exp $       */
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -63,7 +63,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.100 2021/03/02 00:28:55 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.101 2021/03/02 01:47:44 thorpej Exp $");
 
 #define        PMAP_NOOPNAMES
 
@@ -284,6 +284,8 @@
 #endif
        .pmapop_steal_memory = pmap_steal_memory,
        .pmapop_bootstrap = pmap_bootstrap,
+       .pmapop_bootstrap1 = pmap_bootstrap1,
+       .pmapop_bootstrap2 = pmap_bootstrap2,
 };
 #endif /* !PMAPNAME */
 
diff -r 73bc135f9971 -r 547307631682 sys/arch/powerpc/oea/pmap_kernel.c
--- a/sys/arch/powerpc/oea/pmap_kernel.c        Tue Mar 02 01:20:35 2021 +0000
+++ b/sys/arch/powerpc/oea/pmap_kernel.c        Tue Mar 02 01:47:44 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap_kernel.c,v 1.11 2020/07/06 09:34:17 rin Exp $     */
+/*     $NetBSD: pmap_kernel.c,v 1.12 2021/03/02 01:47:44 thorpej Exp $ */
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -30,7 +30,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: pmap_kernel.c,v 1.11 2020/07/06 09:34:17 rin Exp $");
+__KERNEL_RCSID(1, "$NetBSD: pmap_kernel.c,v 1.12 2021/03/02 01:47:44 thorpej Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_altivec.h"
@@ -109,6 +109,8 @@
 #endif
 vaddr_t        pmap_steal_memory(vsize_t, vaddr_t *, vaddr_t *)        __stub;
 void   pmap_bootstrap(paddr_t, paddr_t)                        __stub;
+void   pmap_bootstrap1(paddr_t, paddr_t)                       __stub;
+void   pmap_bootstrap2(void)                                   __stub;
 
 int
 pmap_pte_spill(struct pmap *pm, vaddr_t va, bool exec)
@@ -300,4 +302,16 @@
 {
        (*pmapops->pmapop_bootstrap)(startkernel, endkernel);
 }
+
+void
+pmap_bootstrap1(paddr_t startkernel, paddr_t endkernel)
+{
+       (*pmapops->pmapop_bootstrap1)(startkernel, endkernel);
+}
+
+void
+pmap_bootstrap2(void)
+{
+       (*pmapops->pmapop_bootstrap2)();
+}
 #endif