Module Name: src
Committed By: skrll
Date: Mon Feb 13 09:46:30 UTC 2017
Modified Files:
src/share/man/man4: options.4
src/sys/arch/acorn26/include: vmparam.h
src/sys/arch/arm/include/arm32: vmparam.h
src/sys/arch/powerpc/include/ibm4xx: vmparam.h
src/sys/arch/powerpc/include/oea: vmparam.h
src/sys/arch/sparc/include: param.h
src/sys/arch/sparc64/include: param.h
Log Message:
G/C VM_MAX_KERNEL_BUF
To generate a diff of this commit:
cvs rdiff -u -r1.460 -r1.461 src/share/man/man4/options.4
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/acorn26/include/vmparam.h
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/arm/include/arm32/vmparam.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/powerpc/include/ibm4xx/vmparam.h
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/powerpc/include/oea/vmparam.h
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/sparc/include/param.h
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/sparc64/include/param.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man4/options.4
diff -u src/share/man/man4/options.4:1.460 src/share/man/man4/options.4:1.461
--- src/share/man/man4/options.4:1.460 Sun Jan 8 17:57:37 2017
+++ src/share/man/man4/options.4 Mon Feb 13 09:46:29 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: options.4,v 1.460 2017/01/08 17:57:37 christos Exp $
+.\" $NetBSD: options.4,v 1.461 2017/02/13 09:46:29 skrll Exp $
.\"
.\" Copyright (c) 1996
.\" Perry E. Metzger. All rights reserved.
@@ -2216,9 +2216,6 @@ Each buffer header
requires MAXBSIZE (machine dependent, but usually 65536) bytes.
The default value is machine dependent, but is usually equal to the
value of BUFPAGES.
-If an architecture dependent VM_MAX_KERNEL_BUF constant is defined
-then NBUF may be reduced at run time so that the storage allocated
-for buffer headers doesn't exceed that limit.
.It Cd options BUFPAGES=value
These options set the number of pages available for the buffer cache.
Their default value is a machine dependent value, often calculated as
Index: src/sys/arch/acorn26/include/vmparam.h
diff -u src/sys/arch/acorn26/include/vmparam.h:1.13 src/sys/arch/acorn26/include/vmparam.h:1.14
--- src/sys/arch/acorn26/include/vmparam.h:1.13 Sat Sep 13 18:08:38 2014
+++ src/sys/arch/acorn26/include/vmparam.h Mon Feb 13 09:46:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.13 2014/09/13 18:08:38 matt Exp $ */
+/* $NetBSD: vmparam.h,v 1.14 2017/02/13 09:46:29 skrll Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -88,12 +88,6 @@
#define VM_MAX_KERNEL_ADDRESS ((vaddr_t)0x02000000)
#define VM_MAXKERN_ADDRESS VM_MAX_KERNEL_ADDRESS
-/* XXX max. amount of KVM to be used by buffers. */
-#ifndef VM_MAX_KERNEL_BUF
-#define VM_MAX_KERNEL_BUF \
- ((VM_MAX_KERNEL_ADDRESS - VM_MIN_KERNEL_ADDRESS) / 4)
-#endif
-
/* Physical memory parameters */
#define VM_PHYSSEG_MAX 3
Index: src/sys/arch/arm/include/arm32/vmparam.h
diff -u src/sys/arch/arm/include/arm32/vmparam.h:1.40 src/sys/arch/arm/include/arm32/vmparam.h:1.41
--- src/sys/arch/arm/include/arm32/vmparam.h:1.40 Sun Oct 18 00:28:32 2015
+++ src/sys/arch/arm/include/arm32/vmparam.h Mon Feb 13 09:46:30 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.40 2015/10/18 00:28:32 jmcneill Exp $ */
+/* $NetBSD: vmparam.h,v 1.41 2017/02/13 09:46:30 skrll Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -99,17 +99,6 @@
#define VM_MIN_KERNEL_ADDRESS ((vaddr_t) KERNEL_BASE)
#define VM_MAX_KERNEL_ADDRESS ((vaddr_t) -(PAGE_SIZE+1))
-#ifndef __ASSEMBLER__
-/* XXX max. amount of KVM to be used by buffers. */
-#ifndef VM_MAX_KERNEL_BUF
-extern vaddr_t virtual_avail;
-extern vaddr_t virtual_end;
-
-#define VM_MAX_KERNEL_BUF \
- ((virtual_end - virtual_avail) * 4 / 10)
-#endif
-#endif /* __ASSEMBLER__ */
-
#endif /* _KERNEL || _KMEMUSER */
#endif /* _ARM_ARM32_VMPARAM_H_ */
Index: src/sys/arch/powerpc/include/ibm4xx/vmparam.h
diff -u src/sys/arch/powerpc/include/ibm4xx/vmparam.h:1.10 src/sys/arch/powerpc/include/ibm4xx/vmparam.h:1.11
--- src/sys/arch/powerpc/include/ibm4xx/vmparam.h:1.10 Mon Feb 23 20:34:38 2015
+++ src/sys/arch/powerpc/include/ibm4xx/vmparam.h Mon Feb 13 09:46:30 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.10 2015/02/23 20:34:38 joerg Exp $ */
+/* $NetBSD: vmparam.h,v 1.11 2017/02/13 09:46:30 skrll Exp $ */
/*-
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -90,11 +90,6 @@
#define VM_MAX_KERNEL_ADDRESS (VM_MIN_KERNEL_ADDRESS + SEGMENT_LENGTH - 1)
#endif
-/* XXX max. amount of KVM to be used by buffers. */
-#ifndef VM_MAX_KERNEL_BUF
-#define VM_MAX_KERNEL_BUF (0x10000000 * 7 / 10)
-#endif
-
#define VM_PHYS_SIZE (USRIOSIZE * PAGE_SIZE)
#define __HAVE_PMAP_PHYSSEG
Index: src/sys/arch/powerpc/include/oea/vmparam.h
diff -u src/sys/arch/powerpc/include/oea/vmparam.h:1.18 src/sys/arch/powerpc/include/oea/vmparam.h:1.19
--- src/sys/arch/powerpc/include/oea/vmparam.h:1.18 Fri Feb 28 05:33:53 2014
+++ src/sys/arch/powerpc/include/oea/vmparam.h Mon Feb 13 09:46:30 2017
@@ -197,8 +197,4 @@
#define VM_PHYS_SIZE (USRIOSIZE * PAGE_SIZE)
#endif
-#ifndef VM_MAX_KERNEL_BUF
-#define VM_MAX_KERNEL_BUF (SEGMENT_LENGTH * 3 / 4)
-#endif
-
#endif /* _POWERPC_OEA_VMPARAM_H_ */
Index: src/sys/arch/sparc/include/param.h
diff -u src/sys/arch/sparc/include/param.h:1.70 src/sys/arch/sparc/include/param.h:1.71
--- src/sys/arch/sparc/include/param.h:1.70 Fri Feb 10 17:35:48 2012
+++ src/sys/arch/sparc/include/param.h Mon Feb 13 09:46:30 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.70 2012/02/10 17:35:48 para Exp $ */
+/* $NetBSD: param.h,v 1.71 2017/02/13 09:46:30 skrll Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -81,8 +81,6 @@ extern int nbpg, pgofset, pgshift;
#define KERNBASE 0xe8000000
#endif
#define KERNEND 0xfe000000 /* end of kernel virtual space */
-/* Arbitrarily only use 1/4 of the kernel address space for buffers. */
-#define VM_MAX_KERNEL_BUF ((KERNEND - KERNBASE)/4)
#define PROM_LOADADDR 0x00004000 /* where the prom loads us */
#define KERNTEXTOFF (KERNBASE+PROM_LOADADDR)/* start of kernel text */
Index: src/sys/arch/sparc64/include/param.h
diff -u src/sys/arch/sparc64/include/param.h:1.57 src/sys/arch/sparc64/include/param.h:1.58
--- src/sys/arch/sparc64/include/param.h:1.57 Fri Apr 15 20:29:13 2016
+++ src/sys/arch/sparc64/include/param.h Mon Feb 13 09:46:30 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.57 2016/04/15 20:29:13 martin Exp $ */
+/* $NetBSD: param.h,v 1.58 2017/02/13 09:46:30 skrll Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -169,7 +169,6 @@ extern int nbpg, pgofset, pgshift;
*/
#define KERNBASE 0x001000000 /* start of kernel virtual space */
#define KERNEND 0x0e0000000 /* end of kernel virtual space */
-#define VM_MAX_KERNEL_BUF ((KERNEND-KERNBASE)/4)
#define _MAXNBPG 8192 /* fixed VAs, independent of actual NBPG */
