summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/conf/NOTES14
-rw-r--r--sys/conf/files14
-rw-r--r--sys/conf/kern.post.mk3
-rw-r--r--sys/conf/options3
-rw-r--r--sys/modules/Makefile1
5 files changed, 1 insertions, 34 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 93907eb..a2d4312 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1093,20 +1093,6 @@ device md #Memory/malloc disk
device snp #Snoop device - to look at pty/vty/etc..
device ccd #Concatenated disk driver
-# Configuring Vinum into the kernel is not necessary, since the kld
-# module gets started automatically when vinum(8) starts. This
-# device is also untested. Use at your own risk.
-#
-# The option VINUMDEBUG must match the value set in CFLAGS
-# in src/sbin/vinum/Makefile. Failure to do so will result in
-# the following message from vinum(8):
-#
-# Can't get vinum config: Invalid argument
-#
-# see vinum(4) for more reasons not to use these options.
-device vinum #Vinum concat/mirror/raid driver
-options VINUMDEBUG #enable Vinum debugging hooks
-
# Kernel side iconv library
options LIBICONV
diff --git a/sys/conf/files b/sys/conf/files
index ec8de25..09c0243 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -829,20 +829,6 @@ dev/usb/usb_subr.c optional usb
dev/usb/usbdi.c optional usb
dev/usb/usbdi_util.c optional usb
dev/utopia/utopia.c optional utopia
-dev/vinum/vinum.c optional vinum
-dev/vinum/vinumconfig.c optional vinum
-dev/vinum/vinumdaemon.c optional vinum
-dev/vinum/vinuminterrupt.c optional vinum
-dev/vinum/vinumio.c optional vinum
-dev/vinum/vinumioctl.c optional vinum
-dev/vinum/vinumlock.c optional vinum
-dev/vinum/vinummemory.c optional vinum
-dev/vinum/vinumparser.c optional vinum
-dev/vinum/vinumraid5.c optional vinum
-dev/vinum/vinumrequest.c optional vinum
-dev/vinum/vinumrevive.c optional vinum
-dev/vinum/vinumstate.c optional vinum
-dev/vinum/vinumutil.c optional vinum
dev/vge/if_vge.c optional vge
dev/vx/if_vx.c optional vx
dev/vx/if_vx_eisa.c optional vx eisa
diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk
index 4fc4964..475f700 100644
--- a/sys/conf/kern.post.mk
+++ b/sys/conf/kern.post.mk
@@ -59,8 +59,7 @@ install.debug reinstall.debug: gdbinit
gdbinit:
grep -v '# XXX' ${S}/../tools/debugscripts/dot.gdbinit | \
sed "s:MODPATH:${.OBJDIR}/modules:" > .gdbinit
- cp ${S}/../tools/debugscripts/gdbinit.kernel \
- ${S}/../tools/debugscripts/gdbinit.vinum ${.CURDIR}
+ cp ${S}/../tools/debugscripts/gdbinit.kernel ${.CURDIR}
.if exists(${S}/../tools/debugscripts/gdbinit.${MACHINE_ARCH})
cp ${S}/../tools/debugscripts/gdbinit.${MACHINE_ARCH} \
${.CURDIR}/gdbinit.machine
diff --git a/sys/conf/options b/sys/conf/options
index 5820d72..6ecda32 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -570,9 +570,6 @@ UPLCOM_INTR_INTERVAL opt_uplcom.h
UVSCOM_DEFAULT_OPKTSIZE opt_uvscom.h
UVSCOM_INTR_INTERVAL opt_uvscom.h
-# Vinum options
-VINUMDEBUG opt_vinum.h
-
# Embedded system options
INIT_PATH opt_init_path.h
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 1aae7c6..1c2478d 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -241,7 +241,6 @@ SUBDIR= ${_3dfx} \
uvscom \
${_vesa} \
vge \
- vinum \
vpo \
vr \
vx \
OpenPOWER on IntegriCloud