summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorPhilip Guenther <guenther@cvs.openbsd.org>2013-03-01 21:06:05 +0000
committerPhilip Guenther <guenther@cvs.openbsd.org>2013-03-01 21:06:05 +0000
commit868342314a10a6285ddb4ce7b51a0a140d71f2e3 (patch)
tree1fb5cd059e4f6a5dafcb4d42e440544141a63d66 /sys
parent847c6d482703c5b5a4f654d6e43b92bf5bb60117 (diff)
Antici
pation: back to -current
Diffstat (limited to 'sys')
-rw-r--r--sys/conf/GENERIC4
-rw-r--r--sys/conf/newvers.sh6
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index ae0eee30bc3..5cabd79c28c 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.193 2013/01/31 23:30:40 miod Exp $
+# $OpenBSD: GENERIC,v 1.194 2013/03/01 21:06:04 guenther Exp $
#
# Machine-independent option; used by all architectures for their
# GENERIC kernel
@@ -17,7 +17,7 @@ option KMEMSTATS # collect malloc(9) statistics
option PTRACE # ptrace(2) system call
#option KVA_GUARDPAGES # slow virtual address recycling (+ guarding)
-#option POOL_DEBUG # pool corruption detection
+option POOL_DEBUG # pool corruption detection
#option VFSLCKDEBUG # VFS locking checks
option CRYPTO # Cryptographic framework
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 339f1508bf4..ac88ebcbc61 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $OpenBSD: newvers.sh,v 1.123 2013/02/21 15:26:20 deraadt Exp $
+# $OpenBSD: newvers.sh,v 1.124 2013/03/01 21:06:04 guenther Exp $
# $NetBSD: newvers.sh,v 1.17.2.1 1995/10/12 05:17:11 jtc Exp $
#
# Copyright (c) 1984, 1986, 1990, 1993
@@ -64,11 +64,11 @@ ost="OpenBSD"
osr="5.3"
cat >vers.c <<eof
-#if 0
#define STATUS "-current" /* just after a release */
+#if 0
#define STATUS "-beta" /* just before a release */
-#endif
#define STATUS "" /* release */
+#endif
const char ostype[] = "${ost}";
const char osrelease[] = "${osr}";