[src/trunk]: src/sys/arch Remove SYSVSHM-specific code. The value of shminfo...

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

details:   https://anonhg.NetBSD.org/src/rev/13d0648f1094
branches:  trunk
changeset: 341411:13d0648f1094
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Thu Nov 05 06:26:15 2015 +0000

description:
Remove SYSVSHM-specific code.  The value of shminfo.shmall is zero at
the time this pmap initialization code is called, so the increment is
a no-op.  (Thanks christos@ for pointing it out.)

diffstat:

 sys/arch/alpha/alpha/pmap.c         |   8 ++------
 sys/arch/mips/mips/pmap.c           |  10 ++--------
 sys/arch/powerpc/booke/booke_pmap.c |   7 ++-----
 3 files changed, 6 insertions(+), 19 deletions(-)

diffs (102 lines):

diff -r d83fc4bd900a -r 13d0648f1094 sys/arch/alpha/alpha/pmap.c
--- a/sys/arch/alpha/alpha/pmap.c       Thu Nov 05 03:48:51 2015 +0000
+++ b/sys/arch/alpha/alpha/pmap.c       Thu Nov 05 06:26:15 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.259 2014/01/01 22:35:54 matt Exp $ */
+/* $NetBSD: pmap.c,v 1.260 2015/11/05 06:26:15 pgoyette Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2001, 2007, 2008 The NetBSD Foundation, Inc.
@@ -140,7 +140,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.259 2014/01/01 22:35:54 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.260 2015/11/05 06:26:15 pgoyette Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -149,7 +149,6 @@
 #include <sys/malloc.h>
 #include <sys/pool.h>
 #include <sys/buf.h>
-#include <sys/shm.h>
 #include <sys/atomic.h>
 #include <sys/cpu.h>
 
@@ -778,9 +777,6 @@
                 bufsz + 16 * NCARGS + pager_map_size) / PAGE_SIZE +
                (maxproc * UPAGES) + nkmempages;
 
-#ifdef SYSVSHM
-       lev3mapsize += shminfo.shmall;
-#endif
        lev3mapsize = roundup(lev3mapsize, NPTEPG);
 
        /*
diff -r d83fc4bd900a -r 13d0648f1094 sys/arch/mips/mips/pmap.c
--- a/sys/arch/mips/mips/pmap.c Thu Nov 05 03:48:51 2015 +0000
+++ b/sys/arch/mips/mips/pmap.c Thu Nov 05 06:26:15 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.219 2015/06/11 15:58:49 matt Exp $  */
+/*     $NetBSD: pmap.c,v 1.220 2015/11/05 06:26:15 pgoyette Exp $      */
 
 /*-
  * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.219 2015/06/11 15:58:49 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.220 2015/11/05 06:26:15 pgoyette Exp $");
 
 /*
  *     Manages physical address maps.
@@ -132,9 +132,6 @@
 #include <sys/atomic.h>
 #include <sys/mutex.h>
 #include <sys/atomic.h>
-#ifdef SYSVSHM
-#include <sys/shm.h>
-#endif
 #include <sys/socketvar.h>     /* XXX: for sock_loan_thresh */
 
 #include <uvm/uvm.h>
@@ -513,9 +510,6 @@
        }
 #endif
 
-#ifdef SYSVSHM
-       Sysmapsize += shminfo.shmall;
-#endif
 #ifdef KSEG2IOBUFSIZE
        Sysmapsize += (KSEG2IOBUFSIZE >> PGSHIFT);
 #endif
diff -r d83fc4bd900a -r 13d0648f1094 sys/arch/powerpc/booke/booke_pmap.c
--- a/sys/arch/powerpc/booke/booke_pmap.c       Thu Nov 05 03:48:51 2015 +0000
+++ b/sys/arch/powerpc/booke/booke_pmap.c       Thu Nov 05 06:26:15 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: booke_pmap.c,v 1.22 2015/01/26 04:47:53 nonaka Exp $   */
+/*     $NetBSD: booke_pmap.c,v 1.23 2015/11/05 06:26:15 pgoyette Exp $ */
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: booke_pmap.c,v 1.22 2015/01/26 04:47:53 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: booke_pmap.c,v 1.23 2015/11/05 06:26:15 pgoyette Exp $");
 
 #include <sys/param.h>
 #include <sys/kcore.h>
@@ -196,9 +196,6 @@
            + 16 * NCARGS
            + pager_map_size
            + maxproc * USPACE
-#ifdef SYSVSHM
-           + NBPG * shminfo.shmall
-#endif
            + NBPG * nkmempages) >> SEGSHIFT;
 
        /*