summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>2000-12-16 00:54:50 +0000
committerjkh <jkh@FreeBSD.org>2000-12-16 00:54:50 +0000
commit55b774ba6e1a3e1f4755f6ddd840757227d2d7d0 (patch)
treeca90f164ee4b32af447c1074f22b059e7ed37766 /sys
parent82aa2600cc4e3cfc96e5448f398df3de50a2c4aa (diff)
downloadFreeBSD-src-55b774ba6e1a3e1f4755f6ddd840757227d2d7d0.zip
FreeBSD-src-55b774ba6e1a3e1f4755f6ddd840757227d2d7d0.tar.gz
Back out these two changes inadvertantly made with the last commit.
Diffstat (limited to 'sys')
-rw-r--r--sys/conf/files2
-rw-r--r--sys/conf/options7
2 files changed, 0 insertions, 9 deletions
diff --git a/sys/conf/files b/sys/conf/files
index e7ea781..ce1f2a1 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -680,9 +680,7 @@ 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/options b/sys/conf/options
index 53d75c7..098289e 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -298,11 +298,6 @@ 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
@@ -362,8 +357,6 @@ 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