[src/netbsd-1-5]: src/sys/arch Pullup from -current, requested by is, approve...

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

details:   https://anonhg.NetBSD.org/src/rev/24baeae70e20
branches:  netbsd-1-5
changeset: 489555:24baeae70e20
user:      is <is%NetBSD.org@localhost>
date:      Thu Sep 28 15:38:18 2000 +0000

description:
Pullup from -current, requested by is, approved by thorpej:

        sys/arch/arm32/include/pmap.h   1.18
        sys/arch/atari/include/pmap.h   1.21
        sys/arch/i386/include/pmap.h    1.50
        sys/arch/pc532/include/pmap.h   1.29
        sys/arch/sh3/include/pmap.h     1.6

These are architectures that do implemented wired page accounting;
advertize it to UVM, so that mlock() from non-root processes works.

diffstat:

 sys/arch/arm32/include/pmap.h |  3 ++-
 sys/arch/atari/include/pmap.h |  3 ++-
 sys/arch/i386/include/pmap.h  |  3 ++-
 sys/arch/pc532/include/pmap.h |  3 ++-
 sys/arch/sh3/include/pmap.h   |  3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diffs (85 lines):

diff -r 8e4a00603239 -r 24baeae70e20 sys/arch/arm32/include/pmap.h
--- a/sys/arch/arm32/include/pmap.h     Thu Sep 28 15:23:56 2000 +0000
+++ b/sys/arch/arm32/include/pmap.h     Thu Sep 28 15:38:18 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.h,v 1.17 1999/02/28 01:49:25 mark Exp $   */
+/*     $NetBSD: pmap.h,v 1.17.18.1 2000/09/28 15:38:18 is Exp $        */
 
 /*
  * Copyright (c) 1994,1995 Mark Brinicombe.
@@ -148,6 +148,7 @@
 #define pmap_kernel()                  (&kernel_pmap_store)
 #define pmap_update()                  /*cpu_tlb_flushID()*/
 #define        pmap_resident_count(pmap)       ((pmap)->pm_stats.resident_count)
+#define        pmap_wired_count(pmap)          ((pmap)->pm_stats.wired_count)
 
 #define pmap_phys_address(ppn)         (arm_page_to_byte((ppn)))
 
diff -r 8e4a00603239 -r 24baeae70e20 sys/arch/atari/include/pmap.h
--- a/sys/arch/atari/include/pmap.h     Thu Sep 28 15:23:56 2000 +0000
+++ b/sys/arch/atari/include/pmap.h     Thu Sep 28 15:38:18 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.h,v 1.20 1999/02/25 22:47:18 is Exp $     */
+/*     $NetBSD: pmap.h,v 1.20.18.1 2000/09/28 15:38:18 is Exp $        */
 
 /* 
  * Copyright (c) 1987 Carnegie-Mellon University
@@ -151,6 +151,7 @@
 
 #define        pmap_kernel()                   (&kernel_pmap_store)
 #define        pmap_resident_count(pmap)       ((pmap)->pm_stats.resident_count)
+#define        pmap_wired_count(pmap)          ((pmap)->pm_stats.wired_count)
 
 #define        active_user_pmap(pm) \
        (curproc && \
diff -r 8e4a00603239 -r 24baeae70e20 sys/arch/i386/include/pmap.h
--- a/sys/arch/i386/include/pmap.h      Thu Sep 28 15:23:56 2000 +0000
+++ b/sys/arch/i386/include/pmap.h      Thu Sep 28 15:38:18 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.h,v 1.45 2000/06/15 13:35:34 mycroft Exp $        */
+/*     $NetBSD: pmap.h,v 1.45.2.1 2000/09/28 15:38:18 is Exp $ */
 
 /*
  *
@@ -373,6 +373,7 @@
 
 #define        pmap_kernel()                   (&kernel_pmap_store)
 #define        pmap_resident_count(pmap)       ((pmap)->pm_stats.resident_count)
+#define        pmap_wired_count(pmap)          ((pmap)->pm_stats.wired_count)
 #define        pmap_update()                   tlbflush()
 
 #define pmap_clear_modify(pg)          pmap_change_attrs(pg, 0, PG_M)
diff -r 8e4a00603239 -r 24baeae70e20 sys/arch/pc532/include/pmap.h
--- a/sys/arch/pc532/include/pmap.h     Thu Sep 28 15:23:56 2000 +0000
+++ b/sys/arch/pc532/include/pmap.h     Thu Sep 28 15:38:18 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.h,v 1.27 1999/07/28 01:07:53 thorpej Exp $        */
+/*     $NetBSD: pmap.h,v 1.27.12.1 2000/09/28 15:38:19 is Exp $        */
 
 /*
  *
@@ -351,6 +351,7 @@
 
 #define        pmap_kernel()                   (&kernel_pmap_store)
 #define        pmap_resident_count(pmap)       ((pmap)->pm_stats.resident_count)
+#define        pmap_wired_count(pmap)          ((pmap)->pm_stats.wired_count)
 #define        pmap_update()                   tlbflush()
 
 #define pmap_clear_modify(pg)          pmap_change_attrs(pg, 0, PG_M)
diff -r 8e4a00603239 -r 24baeae70e20 sys/arch/sh3/include/pmap.h
--- a/sys/arch/sh3/include/pmap.h       Thu Sep 28 15:23:56 2000 +0000
+++ b/sys/arch/sh3/include/pmap.h       Thu Sep 28 15:38:18 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.h,v 1.5 2000/04/25 12:17:06 tsubai Exp $  */
+/*     $NetBSD: pmap.h,v 1.5.4.1 2000/09/28 15:38:19 is Exp $  */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -357,6 +357,7 @@
 
 #define        pmap_kernel()                   (&kernel_pmap_store)
 #define        pmap_resident_count(pmap)       ((pmap)->pm_stats.resident_count)
+#define        pmap_wired_count(pmap)          ((pmap)->pm_stats.wired_count)
 #ifdef SH4
 #define        pmap_update()                   (cacheflush(), tlbflush())
 #else