summaryrefslogtreecommitdiff
path: root/sys/conf/GENERIC
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2010-09-20 07:18:04 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2010-09-20 07:18:04 +0000
commit55e7cdc38cb9ed52487fcd3c17cbbbe48002df05 (patch)
tree7f7158669a1b9561159ee9305410c3961f379f42 /sys/conf/GENERIC
parent658fee6f7e197e7851aac6d9578d0c7e99e7ef6b (diff)
Move getpeereid(2) into COMPAT_O47. In 4.8 and onwards it is library
code using socket options. ok matthew
Diffstat (limited to 'sys/conf/GENERIC')
-rw-r--r--sys/conf/GENERIC3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index 2bbbc0606c4..f65c40667fa 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.163 2010/08/13 12:31:33 phessler Exp $
+# $OpenBSD: GENERIC,v 1.164 2010/09/20 07:18:03 deraadt Exp $
#
# Machine-independent option; used by all architectures for their
# GENERIC kernel
@@ -29,6 +29,7 @@ option SYSVSHM # System V-like memory sharing
option UVM_SWAP_ENCRYPT# support encryption of pages going to swap
option COMPAT_43 # Kernel compatibility with 4.3BSD
+option COMPAT_O47 # Compatibility with OpenBSD 4.7
option LKM # loadable kernel modules