Index: conf/GENERIC
===================================================================
RCS file: /cvs/src/sys/conf/GENERIC,v
retrieving revision 1.248
diff -u -p -r1.248 GENERIC
--- conf/GENERIC	4 Oct 2017 19:28:56 -0000	1.248
+++ conf/GENERIC	5 Oct 2017 00:08:46 -0000
@@ -17,7 +17,6 @@ option		PTRACE		# ptrace(2) system call
 #option		WITNESS		# witness(4) lock checker
 
 #option		KVA_GUARDPAGES	# slow virtual address recycling (+ guarding)
-option		POOL_DEBUG	# pool corruption detection
 #option		VFSLCKDEBUG	# VFS locking checks
 
 option		CRYPTO		# Cryptographic framework
Index: conf/newvers.sh
===================================================================
RCS file: /cvs/src/sys/conf/newvers.sh,v
retrieving revision 1.157
diff -u -p -r1.157 newvers.sh
--- conf/newvers.sh	4 Oct 2017 17:59:41 -0000	1.157
+++ conf/newvers.sh	5 Oct 2017 00:08:46 -0000
@@ -61,9 +61,7 @@ id=`basename "${d}"`
 # -current and -beta tagging:
 #	For release, select STATUS ""
 #	Right after release unlock, select STATUS "-current"
-#	and enable POOL_DEBUG in sys/conf/GENERIC
 #	A month or so before release, select STATUS "-beta"
-#	and disable POOL_DEBUG in sys/conf/GENERIC
 
 ost="OpenBSD"
 osr="6.2"
Index: kern/subr_pool.c
===================================================================
RCS file: /cvs/src/sys/kern/subr_pool.c,v
retrieving revision 1.220
diff -u -p -r1.220 subr_pool.c
--- kern/subr_pool.c	13 Aug 2017 20:26:33 -0000	1.220
+++ kern/subr_pool.c	5 Oct 2017 00:08:46 -0000
@@ -201,11 +201,7 @@ void	 pool_cache_pool_info(struct pool *
 int	 pool_cache_info(struct pool *, void *, size_t *);
 int	 pool_cache_cpus_info(struct pool *, void *, size_t *);
 
-#ifdef POOL_DEBUG
 int	pool_debug = 1;
-#else
-int	pool_debug = 0;
-#endif
 
 #define POOL_INPGHDR(pp) ((pp)->pr_phoffset != 0)
 
@@ -1311,7 +1307,7 @@ db_show_all_pools(db_expr_t expr, int ha
 }
 #endif /* DDB */
 
-#if defined(POOL_DEBUG) || defined(DDB)
+#if defined(DDB)
 int
 pool_chk_page(struct pool *pp, struct pool_page_header *ph, int expected)
 {
@@ -1398,7 +1394,7 @@ pool_chk(struct pool *pp)
 
 	return (r);
 }
-#endif /* defined(POOL_DEBUG) || defined(DDB) */
+#endif /* defined(DDB) */
 
 #ifdef DDB
 void