summaryrefslogtreecommitdiff
path: root/sys/arch/i386
diff options
context:
space:
mode:
authorBob Beck <beck@cvs.openbsd.org>2009-06-15 17:01:27 +0000
committerBob Beck <beck@cvs.openbsd.org>2009-06-15 17:01:27 +0000
commit2ad23154352bb286faa9d4e90c688c5bea78c525 (patch)
tree74d852efc8530c595f03e7c280d4b345659b6e3e /sys/arch/i386
parent53a176b4ab49f0631c3e478055286d9e4e625d32 (diff)
Back out all the buffer cache changes I committed during c2k9. This reverts three
commits: 1) The sysctl allowing bufcachepercent to be changed at boot time. 2) The change moving the buffer cache hash chains to a red-black tree 3) The dynamic buffer cache (Which depended on the earlier too). ok on the backout from marco and todd
Diffstat (limited to 'sys/arch/i386')
-rw-r--r--sys/arch/i386/i386/machdep.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index ad3a266aa0f..2969cc3413c 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.452 2009/06/03 21:30:19 beck Exp $ */
+/* $OpenBSD: machdep.c,v 1.453 2009/06/15 17:01:26 beck Exp $ */
/* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */
/*-
@@ -547,6 +547,11 @@ setup_buffers()
if (bufpages == 0)
bufpages = atop(avail_end) * bufcachepercent / 100;
+ /* Restrict to at most 25% filled kvm */
+ if (bufpages >
+ (VM_MAX_KERNEL_ADDRESS-VM_MIN_KERNEL_ADDRESS) / PAGE_SIZE / 4)
+ bufpages = (VM_MAX_KERNEL_ADDRESS-VM_MIN_KERNEL_ADDRESS) /
+ PAGE_SIZE / 4;
}
/*