Module Name: src
Committed By: pgoyette
Date: Thu Nov 5 06:26:16 UTC 2015
Modified Files:
src/sys/arch/alpha/alpha: pmap.c
src/sys/arch/mips/mips: pmap.c
src/sys/arch/powerpc/booke: booke_pmap.c
Log Message:
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.)
To generate a diff of this commit:
cvs rdiff -u -r1.259 -r1.260 src/sys/arch/alpha/alpha/pmap.c
cvs rdiff -u -r1.219 -r1.220 src/sys/arch/mips/mips/pmap.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/powerpc/booke/booke_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/alpha/alpha/pmap.c
diff -u src/sys/arch/alpha/alpha/pmap.c:1.259 src/sys/arch/alpha/alpha/pmap.c:1.260
--- src/sys/arch/alpha/alpha/pmap.c:1.259 Wed Jan 1 22:35:54 2014
+++ src/sys/arch/alpha/alpha/pmap.c Thu Nov 5 06:26:15 2015
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.2
#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 @@ pmap_bootstrap(paddr_t ptaddr, u_int max
bufsz + 16 * NCARGS + pager_map_size) / PAGE_SIZE +
(maxproc * UPAGES) + nkmempages;
-#ifdef SYSVSHM
- lev3mapsize += shminfo.shmall;
-#endif
lev3mapsize = roundup(lev3mapsize, NPTEPG);
/*
Index: src/sys/arch/mips/mips/pmap.c
diff -u src/sys/arch/mips/mips/pmap.c:1.219 src/sys/arch/mips/mips/pmap.c:1.220
--- src/sys/arch/mips/mips/pmap.c:1.219 Thu Jun 11 15:58:49 2015
+++ src/sys/arch/mips/mips/pmap.c Thu Nov 5 06:26:15 2015
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.2
#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 @@ pmap_bootstrap(void)
}
#endif
-#ifdef SYSVSHM
- Sysmapsize += shminfo.shmall;
-#endif
#ifdef KSEG2IOBUFSIZE
Sysmapsize += (KSEG2IOBUFSIZE >> PGSHIFT);
#endif
Index: src/sys/arch/powerpc/booke/booke_pmap.c
diff -u src/sys/arch/powerpc/booke/booke_pmap.c:1.22 src/sys/arch/powerpc/booke/booke_pmap.c:1.23
--- src/sys/arch/powerpc/booke/booke_pmap.c:1.22 Mon Jan 26 04:47:53 2015
+++ src/sys/arch/powerpc/booke/booke_pmap.c Thu Nov 5 06:26:15 2015
@@ -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 @@ pmap_bootstrap(vaddr_t startkernel, vadd
+ 16 * NCARGS
+ pager_map_size
+ maxproc * USPACE
-#ifdef SYSVSHM
- + NBPG * shminfo.shmall
-#endif
+ NBPG * nkmempages) >> SEGSHIFT;
/*
