Module Name: src
Committed By: thorpej
Date: Tue Mar 2 01:47:45 UTC 2021
Modified Files:
src/sys/arch/powerpc/include/oea: pmap.h
src/sys/arch/powerpc/oea: pmap.c pmap_kernel.c
Log Message:
Complete the pmap symbol renaming shenanigans for pmap_bootstrap[12]().
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/powerpc/include/oea/pmap.h
cvs rdiff -u -r1.100 -r1.101 src/sys/arch/powerpc/oea/pmap.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/powerpc/oea/pmap_kernel.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/powerpc/include/oea/pmap.h
diff -u src/sys/arch/powerpc/include/oea/pmap.h:1.33 src/sys/arch/powerpc/include/oea/pmap.h:1.34
--- src/sys/arch/powerpc/include/oea/pmap.h:1.33 Mon Mar 1 01:53:46 2021
+++ src/sys/arch/powerpc/include/oea/pmap.h Tue Mar 2 01:47:44 2021
@@ -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 @@ struct pmap_ops {
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
Index: src/sys/arch/powerpc/oea/pmap.c
diff -u src/sys/arch/powerpc/oea/pmap.c:1.100 src/sys/arch/powerpc/oea/pmap.c:1.101
--- src/sys/arch/powerpc/oea/pmap.c:1.100 Tue Mar 2 00:28:55 2021
+++ src/sys/arch/powerpc/oea/pmap.c Tue Mar 2 01:47:44 2021
@@ -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 @@ const struct pmap_ops PMAPNAME(ops) = {
#endif
.pmapop_steal_memory = pmap_steal_memory,
.pmapop_bootstrap = pmap_bootstrap,
+ .pmapop_bootstrap1 = pmap_bootstrap1,
+ .pmapop_bootstrap2 = pmap_bootstrap2,
};
#endif /* !PMAPNAME */
Index: src/sys/arch/powerpc/oea/pmap_kernel.c
diff -u src/sys/arch/powerpc/oea/pmap_kernel.c:1.11 src/sys/arch/powerpc/oea/pmap_kernel.c:1.12
--- src/sys/arch/powerpc/oea/pmap_kernel.c:1.11 Mon Jul 6 09:34:17 2020
+++ src/sys/arch/powerpc/oea/pmap_kernel.c Tue Mar 2 01:47:44 2021
@@ -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 @@ void pmap_pvo_verify(void) __stub;
#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 @@ pmap_bootstrap(paddr_t startkernel, padd
{
(*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
