summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/conf/GENERIC8
-rw-r--r--sys/kern/subr_pool.c3
2 files changed, 7 insertions, 4 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index 27a73cef4fe..a742bf29569 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.148 2009/08/25 16:16:34 jsg Exp $
+# $OpenBSD: GENERIC,v 1.149 2009/08/26 00:37:17 thib Exp $
#
# Machine-independent option; used by all architectures for their
# GENERIC kernel
@@ -16,6 +16,11 @@ option ACCOUNTING # acct(2) process accounting
option KMEMSTATS # collect malloc(9) statistics
option PTRACE # ptrace(2) system call
+#option PAGEFASTRECYCLE # fast physical page recycling
+#option KVA_GUARDPAGES # slow virtual address recycling (+ guarding)
+option POOL_DEBUG # pool corruption detection
+#option VFSDEBUG # VFS locking checks
+
option CRYPTO # Cryptographic framework
option SYSVMSG # System V-like message queues
@@ -46,7 +51,6 @@ option TCP_SIGNATURE # TCP MD5 Signatures, for BGP routing sessions
option NFSCLIENT # Network File System client
option NFSSERVER # Network File System server
-#option VFSDEBUG # VFS debugging
option CD9660 # ISO 9660 + Rock Ridge file system
option UDF # UDF (DVD) file system
option MSDOSFS # MS-DOS file system
diff --git a/sys/kern/subr_pool.c b/sys/kern/subr_pool.c
index 6841200dca0..1d8fab6dd53 100644
--- a/sys/kern/subr_pool.c
+++ b/sys/kern/subr_pool.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: subr_pool.c,v 1.88 2009/08/13 13:49:20 thib Exp $ */
+/* $OpenBSD: subr_pool.c,v 1.89 2009/08/26 00:37:17 thib Exp $ */
/* $NetBSD: subr_pool.c,v 1.61 2001/09/26 07:14:56 chs Exp $ */
/*-
@@ -56,7 +56,6 @@
* the allocated pages themselves (for small pool items) or taken from
* an internal pool of page headers (`phpool').
*/
-#define POOL_DEBUG
/* List of all pools */
TAILQ_HEAD(,pool) pool_head = TAILQ_HEAD_INITIALIZER(pool_head);