summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>2000-12-15 22:26:42 +0000
committerjkh <jkh@FreeBSD.org>2000-12-15 22:26:42 +0000
commit8a85dfc7bd6efdd40a3d7ce95122cc4f34f2a2d1 (patch)
treea7eef3973404dac6941d0237dcd0aa562c312e83 /sys
parente94f2430fb2b086b446da459becc9ea7f44ac5cd (diff)
downloadFreeBSD-src-8a85dfc7bd6efdd40a3d7ce95122cc4f34f2a2d1.zip
FreeBSD-src-8a85dfc7bd6efdd40a3d7ce95122cc4f34f2a2d1.tar.gz
SNAPDATE is an obsolete mechanism which has also been pretty much
of a no-op all along anyway. There are other ways to set this for release building, so nuke it. PR: 22979
Diffstat (limited to 'sys')
-rw-r--r--sys/conf/files2
-rw-r--r--sys/conf/newvers.sh4
-rw-r--r--sys/conf/options7
3 files changed, 9 insertions, 4 deletions
diff --git a/sys/conf/files b/sys/conf/files
index ce1f2a1..e7ea781 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -680,7 +680,9 @@ kern/tty_snoop.c count snp
kern/tty_subr.c standard
kern/tty_tty.c standard
kern/uipc_accf.c optional inet
+kern/uipc_cow.c optional zero_copy_sockets
kern/uipc_domain.c standard
+kern/uipc_jumbo.c standard
kern/uipc_mbuf.c standard
kern/uipc_mbuf2.c standard
kern/uipc_proto.c standard
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index f85b6cb..fd76146 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -38,10 +38,6 @@ TYPE="FreeBSD"
REVISION="5.0"
BRANCH="CURRENT"
RELEASE="${REVISION}-${BRANCH}"
-SNAPDATE=""
-if [ "X${SNAPDATE}" != "X" ]; then
- RELEASE="${RELEASE}-${SNAPDATE}"
-fi
VERSION="${TYPE} ${RELEASE}"
if [ "X${PARAMFILE}" != "X" ]; then
diff --git a/sys/conf/options b/sys/conf/options
index 098289e..53d75c7 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -298,6 +298,11 @@ NETGRAPH_TTY opt_netgraph.h
NETGRAPH_UI opt_netgraph.h
NETGRAPH_VJC opt_netgraph.h
+
+ZERO_COPY_SOCKETS opt_zero.h
+PRIVATE_JUMBOS opt_alteon.h
+TI_JUMBO_HDRSPLIT opt_alteon.h
+
# ATM (HARP version)
ATM_CORE opt_atm.h
ATM_IP opt_atm.h
@@ -357,6 +362,8 @@ INVARIANT_SUPPORT opt_global.h
INVARIANTS opt_global.h
SIMPLELOCK_DEBUG opt_global.h
VFS_BIO_DEBUG opt_global.h
+MSIZE opt_global.h
+MCLSHIFT opt_global.h
# These are VM related options
VM_KMEM_SIZE opt_vm.h
OpenPOWER on IntegriCloud