summaryrefslogtreecommitdiff
path: root/sys/conf
diff options
context:
space:
mode:
authorMatthew Dempsky <matthew@cvs.openbsd.org>2011-07-09 05:46:27 +0000
committerMatthew Dempsky <matthew@cvs.openbsd.org>2011-07-09 05:46:27 +0000
commit7f060b1bfc4d5b75a832544e92ed060710fc2043 (patch)
tree0361ee28b19fac27b4973a197f10182a20019f85 /sys/conf
parent57c352f0970dfab25dca4b72438aff877c2f6e31 (diff)
Fix up previous diff: use COMPAT_O48 instead of COMPAT_48, add option
to GENERIC, wrap compat_o48_sys_getdirentries() with an appropriate #ifdef, and use struct compat_o48_sys_getdirentries_args instead of struct sys_getdirentries_args.
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/GENERIC3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index e21b4da02bb..a944c21c6d2 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.180 2011/07/09 00:47:18 henning Exp $
+# $OpenBSD: GENERIC,v 1.181 2011/07/09 05:46:26 matthew 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_O48 # Kernel compatibility with OpenBSD 4.8
option LKM # loadable kernel modules