diff options
| author | Bob Beck <beck@cvs.openbsd.org> | 2009-06-15 17:01:27 +0000 |
|---|---|---|
| committer | Bob Beck <beck@cvs.openbsd.org> | 2009-06-15 17:01:27 +0000 |
| commit | 2ad23154352bb286faa9d4e90c688c5bea78c525 (patch) | |
| tree | 74d852efc8530c595f03e7c280d4b345659b6e3e /sys/arch/amd64 | |
| parent | 53a176b4ab49f0631c3e478055286d9e4e625d32 (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/amd64')
| -rw-r--r-- | sys/arch/amd64/amd64/machdep.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c index 4631a8f8c3e..bb3c8e97c59 100644 --- a/sys/arch/amd64/amd64/machdep.c +++ b/sys/arch/amd64/amd64/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.95 2009/06/14 03:04:07 deraadt Exp $ */ +/* $OpenBSD: machdep.c,v 1.96 2009/06/15 17:01:25 beck Exp $ */ /* $NetBSD: machdep.c,v 1.3 2003/05/07 22:58:18 fvdl Exp $ */ /*- @@ -399,6 +399,12 @@ setup_buffers() */ if (bufpages == 0) bufpages = physmem * 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; } /* |