summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2005-08-01 15:42:47 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2005-08-01 15:42:47 +0000
commit74ce77dc91600edc94c95e9caa8f22903047c0a1 (patch)
tree4ec45934e6a2cae30e98153974fc1286639da98a /sys/arch
parent9bdeaf2bb949cca11369b3917fe8fec0fa727768 (diff)
Kill more "memory might be 2MB or less" checks in bufpages computation.
ok deraadt@ otto@
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/amd64/amd64/machdep.c9
-rw-r--r--sys/arch/arm/arm/arm32_machdep.c9
-rw-r--r--sys/arch/luna88k/luna88k/machdep.c9
3 files changed, 9 insertions, 18 deletions
diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c
index ad47736e6a0..0101d66b34d 100644
--- a/sys/arch/amd64/amd64/machdep.c
+++ b/sys/arch/amd64/amd64/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.32 2005/07/26 08:38:29 art Exp $ */
+/* $OpenBSD: machdep.c,v 1.33 2005/08/01 15:42:39 miod Exp $ */
/* $NetBSD: machdep.c,v 1.3 2003/05/07 22:58:18 fvdl Exp $ */
/*-
@@ -373,11 +373,8 @@ allocsys(vaddr_t 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/arm/arm/arm32_machdep.c b/sys/arch/arm/arm/arm32_machdep.c
index 92ac339ce6e..2b7a44e17b3 100644
--- a/sys/arch/arm/arm/arm32_machdep.c
+++ b/sys/arch/arm/arm/arm32_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: arm32_machdep.c,v 1.13 2005/04/26 01:12:27 deraadt Exp $ */
+/* $OpenBSD: arm32_machdep.c,v 1.14 2005/08/01 15:42:46 miod Exp $ */
/* $NetBSD: arm32_machdep.c,v 1.42 2003/12/30 12:33:15 pk Exp $ */
/*
@@ -666,11 +666,8 @@ allocsys(caddr_t 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/luna88k/luna88k/machdep.c b/sys/arch/luna88k/luna88k/machdep.c
index e204b74e8d3..10ab2ef04d3 100644
--- a/sys/arch/luna88k/luna88k/machdep.c
+++ b/sys/arch/luna88k/luna88k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.20 2005/05/01 09:55:49 miod Exp $ */
+/* $OpenBSD: machdep.c,v 1.21 2005/08/01 15:42:46 miod Exp $ */
/*
* Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
* Copyright (c) 1996 Nivas Madhur
@@ -633,11 +633,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;