Module Name:    src
Committed By:   rin
Date:           Tue Mar  2 00:28:55 UTC 2021

Modified Files:
        src/sys/arch/powerpc/oea: pmap.c

Log Message:
Apply PMAPNAME() to pmap_bootstrap[12](); fix build for ofppc, which has
both pmap32 and pmap64bridge in a single kernel.


To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/sys/arch/powerpc/oea/pmap.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/oea/pmap.c
diff -u src/sys/arch/powerpc/oea/pmap.c:1.99 src/sys/arch/powerpc/oea/pmap.c:1.100
--- src/sys/arch/powerpc/oea/pmap.c:1.99	Mon Mar  1 01:53:46 2021
+++ src/sys/arch/powerpc/oea/pmap.c	Tue Mar  2 00:28:55 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.99 2021/03/01 01:53:46 thorpej Exp $	*/
+/*	$NetBSD: pmap.c,v 1.100 2021/03/02 00:28:55 rin 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.99 2021/03/01 01:53:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.100 2021/03/02 00:28:55 rin Exp $");
 
 #define	PMAP_NOOPNAMES
 
@@ -191,6 +191,8 @@ static u_int mem_cnt, avail_cnt;
 #endif
 #define pmap_steal_memory	PMAPNAME(steal_memory)
 #define pmap_bootstrap		PMAPNAME(bootstrap)
+#define pmap_bootstrap1		PMAPNAME(bootstrap1)
+#define pmap_bootstrap2		PMAPNAME(bootstrap2)
 #else
 #define	STATIC			/* nothing */
 #endif /* PMAPNAME */
@@ -234,6 +236,8 @@ STATIC void pmap_pvo_verify(void);
 #endif
 STATIC vaddr_t pmap_steal_memory(vsize_t, vaddr_t *, vaddr_t *);
 STATIC void pmap_bootstrap(paddr_t, paddr_t);
+STATIC void pmap_bootstrap1(paddr_t, paddr_t);
+STATIC void pmap_bootstrap2(void);
 
 #ifdef PMAPNAME
 const struct pmap_ops PMAPNAME(ops) = {

Reply via email to