diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2011-02-15 07:14:46 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2011-02-15 07:14:46 +0000 |
| commit | c4a46ebe7be68ef9c57319cdcd2d5cde8eb89ccc (patch) | |
| tree | ffa5b26ff71c59df675db6d98c0a16bc11320fee /sys/conf | |
| parent | 2a9f37ad9c45cc1478b3777c9d1e85a1b7772b78 (diff) | |
move us to real 4.9
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/conf/newvers.sh | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC index 262afab1c60..b1a5c25ce63 100644 --- a/sys/conf/GENERIC +++ b/sys/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.170 2011/01/19 21:37:03 thib Exp $ +# $OpenBSD: GENERIC,v 1.171 2011/02/15 07:14:45 deraadt 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 VFSDEBUG # VFS locking checks option CRYPTO # Cryptographic framework diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 22e3d11cc24..fadaf8fb1e0 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: newvers.sh,v 1.109 2011/01/13 23:17:50 deraadt Exp $ +# $OpenBSD: newvers.sh,v 1.110 2011/02/15 07:14:45 deraadt Exp $ # $NetBSD: newvers.sh,v 1.17.2.1 1995/10/12 05:17:11 jtc Exp $ # # Copyright (c) 1984, 1986, 1990, 1993 @@ -64,10 +64,10 @@ ost="OpenBSD" osr="4.9" cat >vers.c <<eof -#define STATUS "-beta" /* just before a release */ +#define STATUS "" /* release */ #if 0 +#define STATUS "-beta" /* just before a release */ #define STATUS "-current" /* just after a release */ -#define STATUS "" /* release */ #endif const char ostype[] = "${ost}"; |