no more lkms

3 files changed, 4 insertions, 152 deletions

diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index b67e878e494..94f3e5b9f17 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.583 2014/10/01 10:05:17 mpi Exp $
+#	$OpenBSD: Makefile,v 1.584 2014/10/09 04:41:36 tedu Exp $
 
 MAN=	aac.4 ac97.4 acphy.4 \
 	acpi.4 acpiac.4 acpiasus.4 acpibat.4 acpibtn.4 acpicpu.4 acpidock.4 \
@@ -31,7 +31,7 @@ MAN=	aac.4 ac97.4 acphy.4 \
 	ip.4 ip6.4 ipcomp.4 ipgphy.4 ipmi.4 ips.4 ipsec.4 ipw.4 \
 	isa.4 isagpio.4 isapnp.4 isp.4 it.4 itherm.4 iwi.4 iwn.4 ix.4 ixgb.4 \
 	jmb.4 jme.4 jmphy.4 \
-	kate.4 km.4 ksyms.4 kue.4 lc.4 lge.4 lii.4 lisa.4 lkm.4 lm.4 \
+	kate.4 km.4 ksyms.4 kue.4 lc.4 lge.4 lii.4 lisa.4 lm.4 \
 	lmc.4 lmenv.4 lmn.4 lmtemp.4 lo.4 lpt.4 lxtphy.4 luphy.4 \
 	maestro.4 mainbus.4 malo.4 maxds.4 maxtmp.4 mbg.4 midi.4 mii.4 mfi.4 \
 	mfii.4 mlphy.4 moscom.4 mos.4 mpe.4 mpath.4 mpi.4 mpii.4 mpu.4 msk.4 \
diff --git a/share/man/man4/lkm.4 b/share/man/man4/lkm.4
deleted file mode 100644
index 6e39478e2f7..00000000000
--- a/share/man/man4/lkm.4
+++ /dev/null
@@ -1,141 +0,0 @@
-.\"	$OpenBSD: lkm.4,v 1.17 2013/07/16 16:05:49 schwarze Exp $
-.\"	$NetBSD: lkm.4,v 1.4 1994/11/30 16:22:22 jtc Exp $
-.\"
-.\" Copyright (c) 1993 Christopher G. Demetriou
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd $Mdocdate: July 16 2013 $
-.Dt LKM 4
-.Os
-.Sh NAME
-.Nm LKM
-.Nd Loadable Kernel Modules interface
-.Sh SYNOPSIS
-.Cd "option LKM"
-.Sh DESCRIPTION
-Loadable kernel modules allow the system administrator to
-dynamically add and remove functionality from a running system.
-This ability also helps software developers to develop
-new parts of the kernel without constantly rebooting to
-test their changes.
-.Pp
-Various types of modules can be loaded into the system.
-There are several defined module types, listed below, which can
-be added to the system in a predefined way.
-In addition, there is a generic type, for which the module itself handles
-loading and unloading.
-.Pp
-The
-.Nm
-interface is used by performing
-.Xr ioctl 2
-calls on the
-.Pa /dev/lkm
-device.
-Normally all operations involving Loadable Kernel Modules are handled by the
-.Xr modload 8 ,
-.Xr modunload 8 ,
-and
-.Xr modstat 8
-programs.
-Users should never have to interact with
-.Pa /dev/lkm
-directly.
-The loading and unloading of modules is also
-dependent on the system
-.Xr securelevel 7 .
-.Sh MODULE TYPES
-.Bl -tag -width indent
-.It System Call modules
-System calls may be replaced by loading
-new ones via the
-.Nm
-interface.
-All system calls may be replaced, but special care should be taken with the
-.Xr ioctl 2
-system call, as it is used to load and
-unload modules.
-.Pp
-When a system call module is unloaded,
-the system call which
-was replaced by the loadable module
-is returned to its rightful place
-in the system call table.
-.It Virtual File System modules
-Virtual file systems may be added
-via the
-.Nm
-interface.
-.It Device Driver modules
-New block and character device
-drivers may be loaded into the system with
-.Nm LKM .
-The major problem with loading
-a device driver is that the driver's
-device nodes must exist for the
-devices to be accessed.
-They are usually created by instructing
-.Xr modload 8
-to run an appropriate program when
-the driver has been successfully loaded.
-.It Execution Interpreters
-Execution interpreters allow
-the loading and execution of
-binaries which are normally not
-usable by the operating system.
-.It Miscellaneous modules
-Miscellaneous modules are modules
-for which there are not currently
-well-defined or well-used interfaces
-for extension.
-The user is expected to write their own loader to manipulate
-whatever kernel data structures necessary to enable and disable the new module
-when it is loaded and unloaded.
-.El
-.Sh FILES
-.Bl -tag -width "/usr/include/sys/lkm.hXXX" -compact
-.It Pa /dev/lkm
-.Nm
-interface device.
-.It Pa /usr/include/sys/lkm.h
-File containing definitions of module types.
-.It Pa /usr/share/lkm
-Example source code implementing several of the modules types.
-.El
-.Sh SEE ALSO
-.Xr securelevel 7 ,
-.Xr modload 8 ,
-.Xr modstat 8 ,
-.Xr modunload 8
-.Sh HISTORY
-The
-.Nm
-facility was designed to be similar in functionality
-to the loadable kernel modules facility provided by
-.Tn "SunOS 4.1.3" .
-.Sh AUTHORS
-.An Terrence R. Lambert Aq Mt terry@cs.weber.edu
-.Sh BUGS
-Loading a bogus module is likely to kill your machine.
diff --git a/share/man/man4/options.4 b/share/man/man4/options.4
index d2ce69733fc..16620ca8b9f 100644
--- a/share/man/man4/options.4
+++ b/share/man/man4/options.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: options.4,v 1.237 2014/09/08 01:47:06 guenther Exp $
+.\"	$OpenBSD: options.4,v 1.238 2014/10/09 04:41:36 tedu Exp $
 .\"	$NetBSD: options.4,v 1.21 1997/06/25 03:13:00 thorpej Exp $
 .\"
 .\" Copyright (c) 1998 Theo de Raadt
@@ -34,7 +34,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd $Mdocdate: September 8 2014 $
+.Dd $Mdocdate: October 9 2014 $
 .Dt OPTIONS 4
 .Os
 .Sh NAME
@@ -386,13 +386,6 @@ will keep statistics on its performance if this option is enabled.
 Note that this option is silently turned on by the
 .Cm DEBUG
 option.
-.It Cd option LKM
-Enables support for loadable kernel modules.
-See
-.Xr lkm 4
-for details.
-.Em Note:
-This option is not yet available on all architectures.
 .It Cd option MACOBIOVERBOSE
 Makes the boot process more verbose for OBIO peripherals on the
 .Va macppc