details: https://anonhg.NetBSD.org/src/rev/07413041a951
branches: netbsd-9
changeset: 1001397:07413041a951
user: martin <martin%NetBSD.org@localhost>
date: Tue Jan 21 15:41:43 2020 +0000
description:
Pull up following revision(s) (requested by tsutsui in ticket #636):
sys/arch/sun3/include/pmap.h: revision 1.33
sys/arch/sun3/include/pmap3.h: revision 1.50
sys/arch/sun3/include/pmap3x.h: revision 1.30
Fix "modload nfsserver" failure on sun3. PR/54869
sun3 port has two definitions for different pmaps for sun3 (pmap3.h)
and sun3x (pmap3x.h) and they are selected by _SUN3_ or _SUN3X_ macro,
but neither of them is defined on module builds so common exported
definitions required by module(7) should be in a common header,
i.e. pmap.h.
Should be pulled up to netbsd-9.
diffstat:
sys/arch/sun3/include/pmap.h | 8 +++++++-
sys/arch/sun3/include/pmap3.h | 4 +---
sys/arch/sun3/include/pmap3x.h | 4 +---
3 files changed, 9 insertions(+), 7 deletions(-)
diffs (58 lines):
diff -r 4862451a4a3b -r 07413041a951 sys/arch/sun3/include/pmap.h
--- a/sys/arch/sun3/include/pmap.h Tue Jan 21 15:39:02 2020 +0000
+++ b/sys/arch/sun3/include/pmap.h Tue Jan 21 15:41:43 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.32 2009/12/11 18:31:27 tsutsui Exp $ */
+/* $NetBSD: pmap.h,v 1.32.68.1 2020/01/21 15:41:43 martin Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,6 +37,12 @@
#endif /* SUN3X */
#ifdef _KERNEL
+/*
+ * Some pmap(9) API macros should be defined here for module(7)
+ * because they are common between sun3 and sun3x. (see PR/54869)
+ */
+#define pmap_update(pmap) /* nothing (yet) */
+
void pmap_procwr(struct proc *, vaddr_t, size_t);
#endif
diff -r 4862451a4a3b -r 07413041a951 sys/arch/sun3/include/pmap3.h
--- a/sys/arch/sun3/include/pmap3.h Tue Jan 21 15:39:02 2020 +0000
+++ b/sys/arch/sun3/include/pmap3.h Tue Jan 21 15:41:43 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap3.h,v 1.49 2013/01/07 16:58:09 chs Exp $ */
+/* $NetBSD: pmap3.h,v 1.49.42.1 2020/01/21 15:41:43 martin Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -64,8 +64,6 @@
/* We use the PA plus some low bits for device mmap. */
#define pmap_phys_address(addr) (addr)
-#define pmap_update(pmap) /* nothing (yet) */
-
/* Map a given physical region to a virtual region */
extern vaddr_t pmap_map(vaddr_t, paddr_t, paddr_t, int);
diff -r 4862451a4a3b -r 07413041a951 sys/arch/sun3/include/pmap3x.h
--- a/sys/arch/sun3/include/pmap3x.h Tue Jan 21 15:39:02 2020 +0000
+++ b/sys/arch/sun3/include/pmap3x.h Tue Jan 21 15:41:43 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap3x.h,v 1.29 2011/06/03 17:03:52 tsutsui Exp $ */
+/* $NetBSD: pmap3x.h,v 1.29.58.1 2020/01/21 15:41:43 martin Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -53,8 +53,6 @@
/* We use the PA plus some low bits for device mmap. */
#define pmap_phys_address(addr) (addr)
-#define pmap_update(pmap) /* nothing (yet) */
-
/* Map a given physical region to a virtual region */
vaddr_t pmap_map(vaddr_t, paddr_t, paddr_t, int);