diff options
Diffstat (limited to 'share')
| -rw-r--r-- | share/man/man4/Makefile | 4 | ||||
| -rw-r--r-- | share/man/man4/ksyms.4 | 8 | ||||
| -rw-r--r-- | share/man/man4/lkm.4 | 171 | ||||
| -rw-r--r-- | share/man/man4/lmc.4 | 18 | ||||
| -rw-r--r-- | share/man/man4/options.4 | 22 | ||||
| -rw-r--r-- | share/man/man5/Makefile | 4 | ||||
| -rw-r--r-- | share/man/man5/lkm.conf.5 | 115 | ||||
| -rw-r--r-- | share/man/man5/mk.conf.5 | 21 | ||||
| -rw-r--r-- | share/man/man5/rc.conf.5 | 8 | ||||
| -rw-r--r-- | share/man/man7/hier.7 | 24 | ||||
| -rw-r--r-- | share/man/man7/sysctl.7 | 4 | ||||
| -rw-r--r-- | share/man/man8/MAKEDEV.8 | 5 | ||||
| -rw-r--r-- | share/man/man8/compat_pecoff.8 | 11 | ||||
| -rw-r--r-- | share/man/man9/accept_filter.9 | 5 | ||||
| -rw-r--r-- | share/man/man9/ioctl.9 | 4 | ||||
| -rw-r--r-- | share/man/man9/kauth.9 | 8 | ||||
| -rw-r--r-- | share/man/man9/malloc.9 | 16 | ||||
| -rw-r--r-- | share/man/man9/pci.9 | 5 | ||||
| -rw-r--r-- | share/man/man9/secmodel.9 | 12 | ||||
| -rw-r--r-- | share/man/man9/sysctl.9 | 6 | ||||
| -rw-r--r-- | share/man/man9/sysmon_envsys.9 | 5 | ||||
| -rw-r--r-- | share/mk/Makefile | 5 | ||||
| -rw-r--r-- | share/mk/bsd.README | 13 | ||||
| -rw-r--r-- | share/mk/bsd.kmod.mk | 136 | ||||
| -rw-r--r-- | share/mk/bsd.kmodule.mk | 4 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 9 |
26 files changed, 48 insertions, 595 deletions
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 7ffba07460f..fa1f4c1b0bd 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.483 2008/11/02 23:47:41 jnemeth Exp $ +# $NetBSD: Makefile,v 1.484 2008/11/12 12:35:53 ad Exp $ # @(#)Makefile 8.1 (Berkeley) 6/18/93 MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 acpidalb.4 \ @@ -30,7 +30,7 @@ MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 acpidalb.4 \ iso.4 isp.4 isv.4 itesio.4 iteide.4 iwi.4 iwn.4 ixpide.4 \ jme.4 jmide.4 joy.4 \ kloader.4 kse.4 ksyms.4 kttcp.4 \ - lc.4 ld.4 lii.4 lkm.4 lo.4 lxtphy.4 \ + lc.4 ld.4 lii.4 lo.4 lxtphy.4 \ mainbus.4 makphy.4 mbe.4 mca.4 mcclock.4 md.4 mfb.4 mfi.4 mhzc.4 \ midi.4 mii.4 mk48txx.4 mlx.4 mly.4 mpt.4 mpu.4 mtd.4 mtio.4 \ multicast.4 \ diff --git a/share/man/man4/ksyms.4 b/share/man/man4/ksyms.4 index 6754b285af1..7a4b15531f0 100644 --- a/share/man/man4/ksyms.4 +++ b/share/man/man4/ksyms.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: ksyms.4,v 1.5 2008/04/30 13:10:54 martin Exp $ +.\" $NetBSD: ksyms.4,v 1.6 2008/11/12 12:35:53 ad Exp $ .\" .\" Copyright (c) 2003 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -24,7 +24,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd April 29, 2003 +.Dd November 12, 2008 .Dt KSYMS 4 .Os .Sh NAME @@ -121,7 +121,3 @@ The .Nm driver first appeared in .Nx 2.0 . -.Sh BUGS -No LKM modules can be loaded or unloaded while -.Pa /dev/ksyms -is open. diff --git a/share/man/man4/lkm.4 b/share/man/man4/lkm.4 deleted file mode 100644 index 03aaa1e2faa..00000000000 --- a/share/man/man4/lkm.4 +++ /dev/null @@ -1,171 +0,0 @@ -.\" $NetBSD: lkm.4,v 1.21 2004/11/09 12:09:58 wiz 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. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed for the -.\" NetBSD Project. See http://www.NetBSD.org/ for -.\" information about NetBSD. -.\" 4. 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. -.\" -.\" <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>> -.\" -.Dd September 4, 1993 -.Dt LKM 4 -.Os -.Sh NAME -.Nm lkm -.Nd Loadable Kernel Modules interface -.Sh SYNOPSIS -.Cd "options 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. -.Sh MODULE TYPES -.Ss 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 by LKM code. -.Ss Virtual File System modules -Virtual file systems may be added via the -.Nm -interface. -.Ss Device Driver modules -New block and character device -drivers may be loaded into the system with -.Li "options LKM" . -A 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. -.Ss Emulation modules -Emulation modules allow to load an emulation support for foreign -operating systems. -.Ss Execution Interpreters -Execution Interpreters allow to load support for execution of new type -of binaries, not normally supported by kernel. -This also allows to load -support for executing foreign system binaries. -Execution Interpreters normally depend on -Emulation modules, in that appropriate Emulation module has to -be loaded before Execution Interpreter can be. -.Ss Miscellaneous modules -Miscellaneous modules are modules for which there are not currently -well-defined or well-used interfaces for extension. -They are provided for extension, and the user is expected to -write their own loader to handle the kernel pointer/table -manipulation to "wire in" their loaded module (and "unwire" -it on unload). -An example of a "miscellaneous module" might be a loader for -card-specific VGA drivers or alternate terminal emulations in -an appropriately layered console driver. -.Sh NOTES -.Ss Security considerations -Loaded kernel modules can do anything with kernel structures. -There is no memory protection between modules and the rest of the kernel. -Hence, a potential attacker controlling -.Pa /dev/lkm -can do anything they want with the system. -.Pp -To avoid associated security risks, new LKMs cannot be loaded when -.Pa securelevel -is higher than zero. -.Ss Module might crash system -Loading and using a buggy module is likely to crash operating system - -since the module becomes part of kernel, a code error is much more -fatal than for userland programs. -If you are doing kernel development, -this would hopefully end up happening -less frequently than changing, recompiling, installing, and -rebooting would normally occur. -This should speed development -considerably for a lot of the in-kernel work that is currently -taking place. -.Sh FILES -.Bl -tag -width /usr/include/sys/lkm.h -compact -.It Pa /dev/lkm -.Nm -interface device -.It Pa /usr/include/sys/lkm.h -file containing definitions of module types -.It Pa lkm/* -subdirectory -.Pa lkm -within kernel source tree contains many LKMs which are suitable as a base -for new ones -.El -.Sh SEE ALSO -.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 terry@cs.weber.edu diff --git a/share/man/man4/lmc.4 b/share/man/man4/lmc.4 index 96d9a48a578..2f980bc7710 100644 --- a/share/man/man4/lmc.4 +++ b/share/man/man4/lmc.4 @@ -53,7 +53,7 @@ .\" * PLEASE DO NOT "UN-IFDEF" THIS FILE! * .\" * * * * * * * * * * * * * * * * * * * * * .\" -.\" $NetBSD: lmc.4,v 1.14 2006/12/23 06:58:20 wiz Exp $ +.\" $NetBSD: lmc.4,v 1.15 2008/11/12 12:35:53 ad Exp $ .\" .Dd April 11, 2006 .Dt LMC 4 @@ -149,20 +149,6 @@ neither SPPP nor Netgraph are configured into the kernel. .if \n[allos] .Ss NetBSD & OpenBSD Synopsis .if (\n[nbsd] : \n[obsd]) \{\ This driver is built into the GENERIC kernel so it should "just work". -The driver can be loaded into a running kernel with -.Xr modload 8 . -.Bd -unfilled -offset indent -compact -.Ic modload if_lmc.o -.Ed -The kernel must be built with support for Loadable Kernel Modules, -.Xr lkm 8 . -.Bd -unfilled -offset indent -compact -.if \n[nbsd] .Cd options LKM -.if \n[obsd] .Cd option LKM -.Ed -.Ic securelevel -must be 0 to load modules; see -.Xr init 8 . .Pp The driver can be built into a kernel by adding the following to .Pa /sys/arch/ARCH/conf/YOURKERNEL : @@ -1300,8 +1286,6 @@ to the distant input signal. .if \n[nbsd] .Xr init 8 , .if \n[obsd] .Xr init 8 , .if \n[fbsd] .Xr kldload 8 , -.if \n[nbsd] .Xr lkm 8 , -.if \n[obsd] .Xr lkm 8 , .Xr lmcconfig 8 , .if \n[nbsd] .Xr modload 8 , .if \n[obsd] .Xr modload 8 , diff --git a/share/man/man4/options.4 b/share/man/man4/options.4 index 5fa4348a528..75b8d2df8dc 100644 --- a/share/man/man4/options.4 +++ b/share/man/man4/options.4 @@ -1,4 +1,4 @@ -.\" $NetBSD: options.4,v 1.370 2008/11/11 00:08:52 reed Exp $ +.\" $NetBSD: options.4,v 1.371 2008/11/12 12:35:53 ad Exp $ .\" .\" Copyright (c) 1996 .\" Perry E. Metzger. All rights reserved. @@ -30,7 +30,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" -.Dd September 11, 2008 +.Dd November 12, 2008 .Os .Dt OPTIONS 4 .Sh NAME @@ -1141,13 +1141,6 @@ Synonym of .El .Ss Miscellaneous Options .Bl -ohang -.It Cd options LKM -Enable loadable kernel modules. -See -.Xr lkm 4 -for details. -.Em NOTE : -not available on all architectures. .It Cd options MEMORY_DISK_DYNAMIC This option makes the .Xr md 4 @@ -1182,15 +1175,7 @@ Do not include the interface to a userland memory disk server process. Per default, this option is set to 1, including the support code. Useful for install media kernels. .It Cd options MODULAR -Enables the new framework for kernel modules, which will eventually -replace LKMs. -This adds an in-kernel linker and loader, and requires userland support -to be useful. -See the -.Sy MKMODULAR -variable in -.Xr mk.conf 5 -for more details. +Enables the framework for kernel modules. .It Cd options VND_COMPRESSION Enables the .Xr vnd 4 @@ -2807,7 +2792,6 @@ bolded .Xr ddb 4 , .Xr inet 4 , .Xr iso 4 , -.Xr lkm 4 , .Xr md 4 , .Xr ns 4 , .Xr pcibios 4 , diff --git a/share/man/man5/Makefile b/share/man/man5/Makefile index 3fe1c54e67d..f1b35ca7bd2 100644 --- a/share/man/man5/Makefile +++ b/share/man/man5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.60 2008/02/18 10:37:19 elad Exp $ +# $NetBSD: Makefile,v 1.61 2008/11/12 12:35:53 ad Exp $ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # missing: dump.5 plot.5 @@ -8,7 +8,7 @@ MAN= a.out.5 acct.5 ar.5 boot.cfg.5 \ ethers.5 forward.5 \ fs.5 fstab.5 genassym.cf.5 group.5 hesiod.conf.5 \ hosts.5 hosts.equiv.5 ifaliases.5 ifconfig.if.5 intro.5 \ - ipsec.conf.5 ld.so.conf.5 link.5 lkm.conf.5 locale.alias.5 \ + ipsec.conf.5 ld.so.conf.5 link.5 locale.alias.5 \ locate.conf.5 login.conf.5 mixerctl.conf.5 mk.conf.5 monthly.conf.5 \ motd.5 netconfig.5 netgroup.5 networks.5 nologin.5 \ nsswitch.conf.5 pam.conf.5 passwd.5 passwd.conf.5 phones.5 \ diff --git a/share/man/man5/lkm.conf.5 b/share/man/man5/lkm.conf.5 deleted file mode 100644 index 733ddb9b8e8..00000000000 --- a/share/man/man5/lkm.conf.5 +++ /dev/null @@ -1,115 +0,0 @@ -.\" $NetBSD: lkm.conf.5,v 1.8 2008/05/29 14:51:25 mrg Exp $ -.\" -.\" Copyright (c) 1996 Matthew R. Green -.\" 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. -.\" -.\" 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 November 8, 2000 -.Dt LKM.CONF 5 -.Os -.Sh NAME -.Nm lkm.conf -.Nd loadable kernel module configuration file -.Sh DESCRIPTION -The -.Nm -file specifies loadable kernel modules, see -.Xr lkm 4 , -that are to be loaded a boot time. -The -.Nm -file is processed by -.Pa /etc/rc.lkm -at system boot time, if it exists. -.Pp -Each line of the file is of the form -.Dl path options entry postinstall output when -.Pp -Except for the -.Em path , -all other fields can be "-" to indicate empty. -.Pp -The -.Em path -is either an absolute pathname, or the name of a file in -.Pa /lkm -or -.Pa /usr/lkm -that is the LKM to be loaded. -.Pp -The -.Em options -are some combination of the -d and -v options to -.Xr modload 8 . -.Pp -The -.Em entry -is the C symbol to call to initialize the module, defaulting to -.Fn xxxinit . -.Pp -The -.Em postinstall -script is run after the LKM is installed. -.Pp -The output of the -.Xr ld 1 -command is stored in -.Em output . -.Pp -The -.Em when -field specifies at which time in the startup process the LKM is loaded. -There are three predefined values which correspond to three points in -the processing of the system startup script -.Pa /etc/rc : -.Bl -tag -width XXX -.It BEFORENET -Before networking is started. This works only if the -.Pa /usr -file system can already be mounted at this time. -.It BEFOREMOUNT -Before all file systems listed in -.Pa /etc/fstab -are mounted (the -.Pa /usr -and -.Pa /var -file systems are already present). -.It AFTERMOUNT -After all file systems are mounted. -.El -.Pp -A "-" entry defaults to BEFORENET. -.Sh FILES -.Pa /etc/lkm.conf , -.Pa /etc/rc , -.Pa /etc/rc.d/lkm , -.Pa /etc/rc.lkm -.Sh SEE ALSO -.Xr lkm 4 , -.Xr modload 8 -.Sh HISTORY -The -.Nm -file appeared in -.Nx 1.3 . diff --git a/share/man/man5/mk.conf.5 b/share/man/man5/mk.conf.5 index 50b7fe9094b..59f570fc65b 100644 --- a/share/man/man5/mk.conf.5 +++ b/share/man/man5/mk.conf.5 @@ -1,4 +1,4 @@ -.\" $NetBSD: mk.conf.5,v 1.42 2008/11/09 23:02:29 mrg Exp $ +.\" $NetBSD: mk.conf.5,v 1.43 2008/11/12 12:35:53 ad Exp $ .\" .\" Copyright (c) 1999-2003 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd September 10, 2008 +.Dd November 12, 2008 .Dt MK.CONF 5 .Os .\" turn off hyphenation @@ -392,7 +392,7 @@ most of the compilation tools, will be built and installed. .YorN Indicates whether the .Xr ipf 4 -programs, headers and LKM will be built and installed. +programs, headers and other components will be built and installed. .DFLTy . .It Sy MKISCSI @@ -468,21 +468,6 @@ Indicates whether manual pages should be compressed with at installation time. .DFLTn . -.It Sy MKMODULAR -.YorN -Indicates whether support for the new kernel modules framework should be -built. -This will install new versions of -.Xr modload 8 , -.Xr modstat 8 -and -.Xr modunload 8 -that will not work with the ones used to manage LKMs. -You will also need a kernel built with -.Cd options MODULAR -for this to be useful. -.DFLTn -. .It Sy MKNLS .YorN Indicates whether Native Language System (NLS) locale zone files will be diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index d7e35b8cfe0..ca919732ad7 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -1,4 +1,4 @@ -.\" $NetBSD: rc.conf.5,v 1.121 2008/11/11 00:18:48 reed Exp $ +.\" $NetBSD: rc.conf.5,v 1.122 2008/11/12 12:35:53 ad Exp $ .\" .\" Copyright (c) 1996 Matthew R. Green .\" All rights reserved. @@ -309,12 +309,6 @@ from the output of .Xr dmesg 8 . Passes .Sy dmesg_flags . -.It Sy lkm -.Sq YES -or -.Sq NO . -Runs -.Pa /etc/rc.lkm . .It Sy mixerctl .Sq YES or diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 index d5ce1f7c67b..3f57e4fc8ce 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -1,4 +1,4 @@ -.\" $NetBSD: hier.7,v 1.81 2008/05/22 12:51:43 lukem Exp $ +.\" $NetBSD: hier.7,v 1.82 2008/11/12 12:35:53 ad Exp $ .\" .\" Copyright (c) 1990, 1993, 1994 .\" The Regents of the University of California. All rights reserved. @@ -461,8 +461,6 @@ system daemons \*[Am] system utilities (executed by other programs) UUCP binaries and scripts (historically placed; to be moved) .El .Pp -.It Sy lkm/ -loadable kernel modules .It Sy mdec/ boot blocks, etc. .It Sy obj/ @@ -547,8 +545,6 @@ text files used by various games .It Sy i18n/ internationalization databases; see .Xr iconv 3 -.It Sy lkm/ -documentation on the loadable kernel modules interface .It Sy locale/ locale databases and gettext message catalogs; see .Xr setlocale 3 @@ -935,24 +931,6 @@ machine independent stand alone kernel library compression library .El .Pp -.It Sy lkm/ -loadable kernel modules -.Pp -.Bl -tag -width "gdbscripts/" -compact -.It Sy compat/ -LKM support compatibility modules; currently unsupported. -.It Sy netinet/ -LKM support networking modules -.Pp -.Bl -tag -width "if_ipl/" -compact -.It Sy if_ipl/ -LKM for IP-Filter -.El -.Pp -.It Sy vfs/ -LKM support for file systems. -.El -.Pp .It Sy miscfs/ miscellaneous file systems .Pp diff --git a/share/man/man7/sysctl.7 b/share/man/man7/sysctl.7 index c8971545ee1..b43f70a74c0 100644 --- a/share/man/man7/sysctl.7 +++ b/share/man/man7/sysctl.7 @@ -1,4 +1,4 @@ -.\" $NetBSD: sysctl.7,v 1.16 2008/10/07 09:36:17 rmind Exp $ +.\" $NetBSD: sysctl.7,v 1.17 2008/11/12 12:35:53 ad Exp $ .\" .\" Copyright (c) 1993 .\" The Regents of the University of California. All rights reserved. @@ -1999,7 +1999,7 @@ PCBs), and .It Li security.models .Nx supports pluggable security models. -Every security model used, whether if loaded as an LKM or built with the system, +Every security model used, whether if loaded as a module or built with the system, is required to add an entry to this node with at least one element, .Dq name , indicating the name of the security model. diff --git a/share/man/man8/MAKEDEV.8 b/share/man/man8/MAKEDEV.8 index 9878e557b98..f37b08bd9f8 100644 --- a/share/man/man8/MAKEDEV.8 +++ b/share/man/man8/MAKEDEV.8 @@ -6,7 +6,7 @@ .\" *** DO NOT EDIT - any changes will be lost!!! .\" *** ------------------------------------------------------------------ .\" -.\" $NetBSD: MAKEDEV.8,v 1.32 2008/09/06 19:22:26 jmcneill Exp $ +.\" $NetBSD: MAKEDEV.8,v 1.33 2008/11/12 12:35:53 ad Exp $ .\" .\" Copyright (c) 2001, 2003, 2007, 2008 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -751,9 +751,6 @@ Joystick device, see . It Ar kttcp Kernel ttcp helper device, see .Xr \&kttcp 4 -. It Ar lkm -Loadable kernel modules interface, see -.Xr \&lkm 4 . It Ar lockstat Kernel locking statistics . It Ar magma# diff --git a/share/man/man8/compat_pecoff.8 b/share/man/man8/compat_pecoff.8 index 87673af64e6..c37e5a05375 100644 --- a/share/man/man8/compat_pecoff.8 +++ b/share/man/man8/compat_pecoff.8 @@ -1,4 +1,4 @@ -.\" $NetBSD: compat_pecoff.8,v 1.12 2005/06/20 13:25:25 peter Exp $ +.\" $NetBSD: compat_pecoff.8,v 1.13 2008/11/12 12:35:54 ad Exp $ .\" .\" Copyright (c) 2000 The PEACE Project. .\" All rights reserved. @@ -121,14 +121,7 @@ system call, just like other binary compatibility options. It is activated by enabling the .Dv COMPAT_PECOFF kernel option (see -.Xr options 4 ) , -or enabling -.Pa /usr/lkm/compat_pecoff.o -and -.Pa /usr/lkm/exec_pecoff.o -with -.Xr modload 8 . -.Pp +.Xr options 4 ) . The dynamic loader is the .Tn PE/COFF version of diff --git a/share/man/man9/accept_filter.9 b/share/man/man9/accept_filter.9 index 83b2bacd4a4..fe8a45c36af 100644 --- a/share/man/man9/accept_filter.9 +++ b/share/man/man9/accept_filter.9 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD: src/share/man/man9/accept_filter.9,v 1.13 2004/06/16 08:33:57 ru Exp $ .\" " -.Dd August 10, 2008 +.Dd November 12, 2008 .Os .Dt ACCEPT_FILTER 9 .Sh NAME @@ -39,7 +39,6 @@ .Fd #define ACCEPT_FILTER_MOD .In sys/param.h .In sys/kernel.h -.In sys/lkm.h .In sys/sysctl.h .In sys/signalvar.h .In sys/socketvar.h @@ -90,7 +89,7 @@ The accept filters currently provided with .Xr accf_http 9 ) are implemented as pseudo-devices, but an accept filter may use any supported means of initializing and registering itself at system startup -or later, including the LKM or module frameworks if they are supported +or later, including the module framework if supported by the running kernel. .Pp The fields of diff --git a/share/man/man9/ioctl.9 b/share/man/man9/ioctl.9 index 0c7ca5579aa..b35931ef564 100644 --- a/share/man/man9/ioctl.9 +++ b/share/man/man9/ioctl.9 @@ -1,4 +1,4 @@ -.\" $NetBSD: ioctl.9,v 1.25 2008/05/02 21:46:19 martin Exp $ +.\" $NetBSD: ioctl.9,v 1.26 2008/11/12 12:35:54 ad Exp $ .\" .\" Copyright (c) 1999 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -145,8 +145,6 @@ a (pseudo) interface ISA joystick interface .It 'k' Sun-compatible (and other) keyboards -.It 'K' -.Xr lkm 4 .It 'l' leo devices (atari) .It 'm' diff --git a/share/man/man9/kauth.9 b/share/man/man9/kauth.9 index 6adbf420a63..07a8a8b3977 100644 --- a/share/man/man9/kauth.9 +++ b/share/man/man9/kauth.9 @@ -1,4 +1,4 @@ -.\" $NetBSD: kauth.9,v 1.71 2008/09/23 22:40:46 pooka Exp $ +.\" $NetBSD: kauth.9,v 1.72 2008/11/12 12:35:54 ad Exp $ .\" .\" Copyright (c) 2005, 2006 Elad Efrat <elad@NetBSD.org> .\" All rights reserved. @@ -25,7 +25,7 @@ .\" (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 September 24, 2008 +.Dd November 12, 2008 .Dt KAUTH 9 .Os .Sh NAME @@ -203,8 +203,8 @@ is allowed. .El .It Dv KAUTH_SYSTEM_FILEHANDLE Check if filehandle operations allowed. -.It Dv KAUTH_SYSTEM_LKM -Check if an LKM request is allowed. +.It Dv KAUTH_SYSTEM_MODULE +Check if a module request is allowed. .Pp .Ar arg1 is the command. diff --git a/share/man/man9/malloc.9 b/share/man/man9/malloc.9 index 73e4fcc1f52..b25520e06ed 100644 --- a/share/man/man9/malloc.9 +++ b/share/man/man9/malloc.9 @@ -1,4 +1,4 @@ -.\" $NetBSD: malloc.9,v 1.42 2008/04/30 13:10:58 martin Exp $ +.\" $NetBSD: malloc.9,v 1.43 2008/11/12 12:35:54 ad Exp $ .\" .\" Copyright (c) 1996, 2003 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd March 24, 2008 +.Dd November 12, 2008 .Dt MALLOC 9 .Os .Sh NAME @@ -279,18 +279,6 @@ The function attaches the malloc type .Fa type to the kernel memory allocator. -This is intended for use by LKMs; malloc types included in modules -statically-linked into the kernel are automatically registered with -the kernel memory allocator. -However, it is possible to define malloc types without automatically -registering them using -.Fn MALLOC_JUSTDEFINE -or -.Fn MALLOC_JUSTDEFINE_LIMIT . -Apart from not automatically registering to the kernel a boot time, -these functions are equivalent to their counterparts. -They can be used when a separate LKM codepath for initialization is -not desired. .Pp The .Fn malloc_type_detach diff --git a/share/man/man9/pci.9 b/share/man/man9/pci.9 index 5ac9b850cc1..925c4317cf7 100644 --- a/share/man/man9/pci.9 +++ b/share/man/man9/pci.9 @@ -1,4 +1,4 @@ -.\" $NetBSD: pci.9,v 1.26 2008/05/11 14:15:53 he Exp $ +.\" $NetBSD: pci.9,v 1.27 2008/11/12 12:35:54 ad Exp $ .\" .\" Copyright (c) 2001, 2003 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -284,8 +284,7 @@ The argument is filled in if the device is matched. .Fn pci_find_device returns 1 if the device is matched, and zero otherwise. -This function is specifically for use by LKMs (see -.Xr lkm 4 ) +This function is specifically for use by kernel modules and its use otherwise is strongly discouraged. .It Fn pci_get_capability "pc" "tag" "capid" "offsetp" "valuep" Parse the device capability list in configuration space looking for diff --git a/share/man/man9/secmodel.9 b/share/man/man9/secmodel.9 index 08373b83d22..2669b13f90c 100644 --- a/share/man/man9/secmodel.9 +++ b/share/man/man9/secmodel.9 @@ -1,4 +1,4 @@ -.\" $NetBSD: secmodel.9,v 1.12 2008/05/28 00:29:12 snj Exp $ +.\" $NetBSD: secmodel.9,v 1.13 2008/11/12 12:35:54 ad Exp $ .\" .\" Copyright (c) 2006 Elad Efrat <elad@NetBSD.org> .\" All rights reserved. @@ -77,8 +77,8 @@ It allows us to maintain the existing security model (based on a single superuser and above-superuser restrictions known as securelevel) but easily decouple it from the system, given we want to use a different one. .Pp -The different security model can be implemented in the kernel or loaded as an -LKM, base its decisions on available information, dispatch the decision to a +The different security model can be implemented in the kernel or loaded as a +module, base its decisions on available information, dispatch the decision to a userspace daemon, or even to a centralized network authorization server. .Ss The kauth(9) KPI Before writing a new security model, one should be familiar with the @@ -148,7 +148,7 @@ compiled in it, a function called .Fn secmodel_start can be added to call the model's start routine. .Pp -If the security model is to be built and used as an LKM, another function +If the security model is to be built and used as a module, another function called .Fn secmodel_\*[Lt]model\*[Gt]_stop , to stop the security model in case the module is to be unloaded. @@ -162,7 +162,7 @@ All "knobs" for the model should be located under the new node, as well as a mandatory "name" variable, indicating a descriptive human-readable name for the model. .Pp -If the module is to be used as an LKM, explicit calls to the setup +If the module is to be used as a module, explicit calls to the setup routine and .Fn sysctl_teardown are to be used to create and destroy the @@ -182,7 +182,7 @@ the model intends to implement. .It Finally, a security model should register itself when loaded using .Fn secmodel_register -and deregister it when unloaded (if used as an LKM) using +and deregister it when unloaded (if used as a module) using .Fn secmodel_deregister . .El .Pp diff --git a/share/man/man9/sysctl.9 b/share/man/man9/sysctl.9 index cded4f19fb0..95d9a94ed63 100644 --- a/share/man/man9/sysctl.9 +++ b/share/man/man9/sysctl.9 @@ -1,4 +1,4 @@ -.\" $NetBSD: sysctl.9,v 1.12 2008/08/15 21:10:14 wiz Exp $ +.\" $NetBSD: sysctl.9,v 1.13 2008/11/12 12:35:54 ad Exp $ .\" .\" Copyright (c) 2004 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -596,7 +596,7 @@ autoconfiguration -- when devices are being probed at boot time device attachment -- when a PC-Card, USB, or other device is plugged in or attached .It -LKM initialization -- when an LKM is being loaded +module initialization -- when a module is being loaded .It .Dq run-time -- when a process creates a node via the @@ -618,7 +618,7 @@ any tree that is marked with at its root, and no nodes can be added at all if the main tree's root is so marked. .Pp -Nodes added by device drivers, LKMs, and at device insertion time can +Nodes added by device drivers, modules, and at device insertion time can be added to (and removed from) .Dq read-only parent nodes. diff --git a/share/man/man9/sysmon_envsys.9 b/share/man/man9/sysmon_envsys.9 index 642722dccc2..fbe62ec00c8 100644 --- a/share/man/man9/sysmon_envsys.9 +++ b/share/man/man9/sysmon_envsys.9 @@ -1,4 +1,4 @@ -.\" $NetBSD: sysmon_envsys.9,v 1.19 2008/04/30 13:10:58 martin Exp $ +.\" $NetBSD: sysmon_envsys.9,v 1.20 2008/11/12 12:35:54 ad Exp $ .\" .\" Copyright (c) 2007, 2008 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -615,9 +615,6 @@ framework is implemented within the files: .Pa sys/dev/sysmon/sysmon_envsys_tables.c .Pp .Pa sys/dev/sysmon/sysmon_envsys_util.c -.Pp -There's an example LKM driver that shows how the framework works in: -.Pa sys/lkm/misc/envsys2/lkminit_envsys2.c . .Sh SEE ALSO .Xr envsys 4 , .Xr envstat 8 diff --git a/share/mk/Makefile b/share/mk/Makefile index e69016f9101..3df3157eaa1 100644 --- a/share/mk/Makefile +++ b/share/mk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2008/05/02 14:20:50 ad Exp $ +# $NetBSD: Makefile,v 1.42 2008/11/12 12:35:54 ad Exp $ # @(#)Makefile 8.1 (Berkeley) 6/8/93 NOOBJ= # defined @@ -8,8 +8,7 @@ NOOBJ= # defined .if ${MKSHARE} != "no" FILES= bsd.README bsd.doc.mk bsd.dep.mk bsd.endian.mk bsd.files.mk \ bsd.gcc.mk bsd.hostlib.mk bsd.hostprog.mk bsd.inc.mk bsd.info.mk \ - bsd.init.mk bsd.kernobj.mk bsd.kinc.mk bsd.klinks.mk bsd.kmod.mk \ - bsd.kmodule.mk \ + bsd.init.mk bsd.kernobj.mk bsd.kinc.mk bsd.klinks.mk bsd.kmodule.mk \ bsd.lib.mk bsd.links.mk bsd.man.mk bsd.nls.mk bsd.obj.mk bsd.own.mk \ bsd.prog.mk bsd.rpc.mk bsd.shlib.mk bsd.subdir.mk bsd.sys.mk \ bsd.test.mk bsd.x11.mk sys.mk diff --git a/share/mk/bsd.README b/share/mk/bsd.README index 7c100323dd1..9dab65a62cf 100644 --- a/share/mk/bsd.README +++ b/share/mk/bsd.README @@ -1,4 +1,4 @@ -# $NetBSD: bsd.README,v 1.238 2008/11/09 23:07:22 mrg Exp $ +# $NetBSD: bsd.README,v 1.239 2008/11/12 12:35:54 ad Exp $ # @(#)bsd.README 8.2 (Berkeley) 4/2/94 This is the README file for the make "include" files for the NetBSD @@ -235,17 +235,6 @@ MKMAN If "no", don't build or install the man or catman pages, MKMANZ If not "no", compress manual pages at installation time. Default: no -MKMODULAR If "no", don't build the versions of modload(8), modstat(8) - and modunload(8) that use the new modules framework present - in the kernel (enabled separately using 'options MODULAR' - int the configuration file). Also don't build any other - stuff that may rely on this support, such as tests or kernel - modules. - Note: This flag will disappear when the new modules framework - is complete enough to replace the old LKM, effectively - switching it to "yes" by default. - Default: no - MKNLS If "no", don't build or install the NLS files and locale definition files. Default: yes diff --git a/share/mk/bsd.kmod.mk b/share/mk/bsd.kmod.mk deleted file mode 100644 index b0f8e1fdccc..00000000000 --- a/share/mk/bsd.kmod.mk +++ /dev/null @@ -1,136 +0,0 @@ -# $NetBSD: bsd.kmod.mk,v 1.89 2008/10/19 22:05:21 apb Exp $ - -.include <bsd.init.mk> -.include <bsd.klinks.mk> - -##### Basic targets -clean: cleankmod -realinstall: kmodinstall - -KERN= $S/kern - -CFLAGS+= -ffreestanding ${COPTS} -CPPFLAGS+= -nostdinc -I. -I${.CURDIR} -isystem $S -isystem $S/arch -CPPFLAGS+= -isystem ${S}/../common/include -CPPFLAGS+= -D_KERNEL -D_LKM - -# XXX until the kernel is fixed again... -.if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC) -CFLAGS+= -fno-strict-aliasing -Wno-pointer-sign -.endif - -_YKMSRCS= ${SRCS:M*.[ly]:C/\..$/.c/} ${YHEADER:D${SRCS:M*.y:.y=.h}} -DPSRCS+= ${_YKMSRCS} -CLEANFILES+= ${_YKMSRCS} -CLEANFILES+= tmp.o - -.if \ - ${MACHINE_CPU} == "arm" || \ - ${MACHINE_CPU} == "hppa" || \ - ${MACHINE_CPU} == "powerpc" -CLEANFILES+= ${KMOD}_tramp.o ${KMOD}_tramp.S tmp.S ${KMOD}_tmp.o -.endif - -OBJS+= ${SRCS:N*.h:N*.sh:R:S/$/.o/g} -PROG?= ${KMOD}.o -MAN?= ${KMOD}.4 - -##### Build rules -realall: ${PROG} - -${OBJS} ${LOBJS}: ${DPSRCS} - -.if \ - ${MACHINE_CPU} == "arm" || \ - ${MACHINE_CPU} == "hppa" || \ - ${MACHINE_CPU} == "powerpc" -${KMOD}_tmp.o: ${OBJS} ${DPADD} - ${_MKTARGET_COMPILE} - ${LD} -r -o tmp.o ${OBJS} - mv tmp.o ${.TARGET} - -${KMOD}_tramp.S: ${KMOD}_tmp.o $S/lkm/arch/${MACHINE_CPU}/lkmtramp.awk - ${_MKTARGET_CREATE} - ${OBJDUMP} --syms --reloc ${KMOD}_tmp.o | \ - ${TOOL_AWK} -f $S/lkm/arch/${MACHINE_CPU}/lkmtramp.awk \ - > tmp.S - mv tmp.S ${.TARGET} - -${PROG}: ${KMOD}_tmp.o ${KMOD}_tramp.o - ${_MKTARGET_LINK} - ${LD} -r \ - `${OBJDUMP} --syms --reloc ${KMOD}_tmp.o | \ - ${TOOL_AWK} -f $S/lkm/arch/${MACHINE_CPU}/lkmwrap.awk` \ - -o tmp.o ${KMOD}_tmp.o ${KMOD}_tramp.o -.if exists($S/lkm/arch/${MACHINE_CPU}/lkmhide.awk) - ${OBJCOPY} \ - `${NM} tmp.o | \ - ${TOOL_AWK} -f $S/lkm/arch/${MACHINE_CPU}/lkmhide.awk` \ - tmp.o tmp1.o - mv tmp1.o tmp.o -.endif - mv tmp.o ${.TARGET} -.else -${PROG}: ${OBJS} ${DPADD} - ${_MKTARGET_LINK} - ${LD} -r -o tmp.o ${OBJS} - mv tmp.o ${.TARGET} -.endif - -##### Install rules -.if !target(kmodinstall) -_PROG:= ${DESTDIR}${KMODDIR}/${PROG} # installed path - -.if ${MKUPDATE} == "no" -${_PROG}! ${PROG} # install rule -.if !defined(BUILD) && !make(all) && !make(${PROG}) -${_PROG}! .MADE # no build at install -.endif -.else -${_PROG}: ${PROG} # install rule -.if !defined(BUILD) && !make(all) && !make(${PROG}) -${_PROG}: .MADE # no build at install -.endif -.endif - ${_MKTARGET_INSTALL} - ${INSTALL_FILE} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \ - ${.ALLSRC} ${.TARGET} - -kmodinstall:: ${_PROG} -.PHONY: kmodinstall -.PRECIOUS: ${_PROG} # keep if install fails - -.undef _PROG -.endif # !target(kmodinstall) - -##### Clean rules -cleankmod: .PHONY - rm -f a.out [Ee]rrs mklog core *.core \ - ${PROG} ${OBJS} ${LOBJS} ${CLEANFILES} - -##### Custom rules -lint: ${LOBJS} -.if defined(LOBJS) && !empty(LOBJS) - ${LINT} ${LINTFLAGS} ${LDFLAGS:C/-L[ ]*/-L/Wg:M-L*} ${LOBJS} ${LDADD} -.endif - -.if !target(load) -load: ${PROG} - /sbin/modload ${KMOD_LOADFLAGS} -o ${KMOD} ${PROG} -.endif -.PHONY: load - -.if !target(unload) -unload: - /sbin/modunload -n ${KMOD} -.endif -.PHONY: unload - -##### Pull in related .mk logic -.include <bsd.man.mk> -.include <bsd.links.mk> -.include <bsd.sys.mk> -.include <bsd.dep.mk> - -.-include "$S/arch/${MACHINE_CPU}/include/Makefile.inc" -.-include "$S/arch/${MACHINE}/include/Makefile.inc" diff --git a/share/mk/bsd.kmodule.mk b/share/mk/bsd.kmodule.mk index 1d289f081a9..304673a65a9 100644 --- a/share/mk/bsd.kmodule.mk +++ b/share/mk/bsd.kmodule.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.kmodule.mk,v 1.14 2008/11/05 00:54:25 elad Exp $ +# $NetBSD: bsd.kmodule.mk,v 1.15 2008/11/12 12:35:54 ad Exp $ # We are not building this with PIE MKPIE=no @@ -73,7 +73,7 @@ ${_PROG}: .MADE # no build at install ${INSTALL_DIR} $$d; \ done ${INSTALL_DIR} ${KMODULEDIR} - ${INSTALL_FILE} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \ + ${INSTALL_FILE} -o ${KMODULEOWN} -g ${KMODULEGRP} -m ${KMODULEMODE} \ ${.ALLSRC} ${.TARGET} kmodinstall:: ${_PROG} diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index a266c7e8791..595451cf699 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.own.mk,v 1.546 2008/11/11 16:09:53 cube Exp $ +# $NetBSD: bsd.own.mk,v 1.547 2008/11/12 12:35:54 ad Exp $ .if !defined(_BSD_OWN_MK_) _BSD_OWN_MK_=1 @@ -431,11 +431,6 @@ NLSGRP?= wheel NLSOWN?= root NLSMODE?= ${NONBINMODE} -KMODDIR?= /usr/lkm -KMODGRP?= wheel -KMODOWN?= root -KMODMODE?= ${NONBINMODE} - KMODULEGRP?= wheel KMODULEOWN?= root KMODULEMODE?= ${NONBINMODE} @@ -660,7 +655,7 @@ ${var}?= yes # .for var in \ MKCRYPTO_IDEA MKCRYPTO_MDC2 MKCRYPTO_RC5 MKDEBUG MKDEBUGLIB \ - MKMANZ MKMODULAR MKOBJDIRS \ + MKMANZ MKOBJDIRS \ MKPCC MKPCCCMDS \ MKSOFTFLOAT MKSTRIPIDENT \ MKUNPRIVED MKUPDATE MKX11 |
