summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiod <miod@openbsd.org>2004-12-02 19:40:43 +0000
committermiod <miod@openbsd.org>2004-12-02 19:40:43 +0000
commit7455f144ffb77d58d178660fa8e9577882a7442b (patch)
treeb9392b418a4c0dbcd47fd933a2e4aff1cd3d0d5d
parentMake BUFCACHEPERCENT adjustable through UKC, like all other arches do. (diff)
downloadwireguard-openbsd-7455f144ffb77d58d178660fa8e9577882a7442b.tar.xz
wireguard-openbsd-7455f144ffb77d58d178660fa8e9577882a7442b.zip
We do not support 2MB machines, so don't bother taking them into account
in allocsys().
-rw-r--r--sys/arch/i386/i386/machdep.c9
-rw-r--r--sys/arch/mvme88k/mvme88k/machdep.c9
-rw-r--r--sys/arch/vax/vax/machdep.c5
3 files changed, 7 insertions, 16 deletions
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index 97875e8c0a5..e91332e6077 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.311 2004/11/09 19:17:01 claudio Exp $ */
+/* $OpenBSD: machdep.c,v 1.312 2004/12/02 19:40:43 miod Exp $ */
/* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */
/*-
@@ -545,11 +545,8 @@ allocsys(v)
* i/o buffers.
*/
if (bufpages == 0) {
- if (physmem < btoc(2 * 1024 * 1024))
- bufpages = physmem / 10;
- else
- bufpages = (btoc(2 * 1024 * 1024) + physmem) *
- bufcachepercent / 100;
+ bufpages = (btoc(2 * 1024 * 1024) + physmem) *
+ bufcachepercent / 100;
}
if (nbuf == 0) {
nbuf = bufpages;
diff --git a/sys/arch/mvme88k/mvme88k/machdep.c b/sys/arch/mvme88k/mvme88k/machdep.c
index 040cab59cb3..6817f11f0c1 100644
--- a/sys/arch/mvme88k/mvme88k/machdep.c
+++ b/sys/arch/mvme88k/mvme88k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.162 2004/11/09 18:25:24 miod Exp $ */
+/* $OpenBSD: machdep.c,v 1.163 2004/12/02 19:40:46 miod Exp $ */
/*
* Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
* Copyright (c) 1996 Nivas Madhur
@@ -551,11 +551,8 @@ allocsys(v)
* i/o buffers.
*/
if (bufpages == 0) {
- if (physmem < btoc(2 * 1024 * 1024))
- bufpages = physmem / 10;
- else
- bufpages = (btoc(2 * 1024 * 1024) + physmem) *
- bufcachepercent / 100;
+ bufpages = (btoc(2 * 1024 * 1024) + physmem) *
+ bufcachepercent / 100;
}
if (nbuf == 0) {
nbuf = bufpages;
diff --git a/sys/arch/vax/vax/machdep.c b/sys/arch/vax/vax/machdep.c
index 5f73af1cfbe..5baf596977e 100644
--- a/sys/arch/vax/vax/machdep.c
+++ b/sys/arch/vax/vax/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.70 2004/03/10 23:02:54 tom Exp $ */
+/* $OpenBSD: machdep.c,v 1.71 2004/12/02 19:40:46 miod Exp $ */
/* $NetBSD: machdep.c,v 1.108 2000/09/13 15:00:23 thorpej Exp $ */
/*
@@ -797,9 +797,6 @@ allocsys(v)
* at least 16 buffers.
*/
if (bufpages == 0) {
- if (physmem < btoc(2 * 1024 * 1024))
- bufpages = physmem / 10;
- else
bufpages = (btoc(2 * 1024 * 1024) + physmem) *
bufcachepercent / 100;
}