Module Name: src
Committed By: martin
Date: Tue Jan 21 15:41:43 UTC 2020
Modified Files:
src/sys/arch/sun3/include [netbsd-9]: pmap.h pmap3.h pmap3x.h
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.32.68.1 src/sys/arch/sun3/include/pmap.h
cvs rdiff -u -r1.49 -r1.49.42.1 src/sys/arch/sun3/include/pmap3.h
cvs rdiff -u -r1.29 -r1.29.58.1 src/sys/arch/sun3/include/pmap3x.h
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/sun3/include/pmap.h
diff -u src/sys/arch/sun3/include/pmap.h:1.32 src/sys/arch/sun3/include/pmap.h:1.32.68.1
--- src/sys/arch/sun3/include/pmap.h:1.32 Fri Dec 11 18:31:27 2009
+++ src/sys/arch/sun3/include/pmap.h Tue Jan 21 15:41:43 2020
@@ -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
Index: src/sys/arch/sun3/include/pmap3.h
diff -u src/sys/arch/sun3/include/pmap3.h:1.49 src/sys/arch/sun3/include/pmap3.h:1.49.42.1
--- src/sys/arch/sun3/include/pmap3.h:1.49 Mon Jan 7 16:58:09 2013
+++ src/sys/arch/sun3/include/pmap3.h Tue Jan 21 15:41:43 2020
@@ -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 @@ extern segsz_t pmap_wired_pages(pmap_t);
/* 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);
Index: src/sys/arch/sun3/include/pmap3x.h
diff -u src/sys/arch/sun3/include/pmap3x.h:1.29 src/sys/arch/sun3/include/pmap3x.h:1.29.58.1
--- src/sys/arch/sun3/include/pmap3x.h:1.29 Fri Jun 3 17:03:52 2011
+++ src/sys/arch/sun3/include/pmap3x.h Tue Jan 21 15:41:43 2020
@@ -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 @@ segsz_t pmap_count(pmap_t, int);
/* 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);
