[Zrouter-src-freebsd] ZRouter.org: push to FreeBSD HEAD tree

zrouter-src-freebsd at zrouter.org zrouter-src-freebsd at zrouter.org
Wed Feb 1 10:56:53 UTC 2012


details:   http://zrouter.org/hg/FreeBSD/head//rev/7c66001cb7a6
changeset: 320:7c66001cb7a6
user:      ray at terran.dlink.ua
date:      Wed Feb 01 11:54:21 2012 +0200
description:
Update man pages

diffstat:

 head/share/man/man4/Makefile         |   15 +++-
 head/share/man/man4/bge.4            |    9 +-
 head/share/man/man4/carp.4           |   35 ++-----
 head/share/man/man4/ciss.4           |   16 +++-
 head/share/man/man4/ed.4             |   10 +-
 head/share/man/man4/h_ertt.4         |    6 +-
 head/share/man/man4/inet.4           |   51 +++++++----
 head/share/man/man4/inet6.4          |   82 +-------------------
 head/share/man/man4/isci.4           |  110 ++++++++++++++++++++++++++
 head/share/man/man4/lo.4             |   10 +-
 head/share/man/man4/netintro.4       |   19 +---
 head/share/man/man4/pcm.4            |   17 +++-
 head/share/man/man4/snd_hda.4        |   26 +++++-
 head/share/man/man4/tap.4            |   10 +-
 head/share/man/man4/txp.4            |   15 +---
 head/share/man/man4/umass.4          |    4 +-
 head/share/man/man4/virtio.4         |   23 ++--
 head/share/man/man4/virtio_balloon.4 |    8 +-
 head/share/man/man4/virtio_blk.4     |    8 +-
 head/share/man/man4/vtnet.4          |   17 ++-
 head/share/man/man4/xnb.4            |  140 +++++++++++++++++++++++++++++++++
 head/share/man/man5/Makefile         |    3 +-
 head/share/man/man9/DEV_MODULE.9     |    6 +-
 head/share/man/man9/Makefile         |   22 +++++-
 head/share/man/man9/buf_ring.9       |  144 ++++++++++++++++++++++++++++++++++
 head/share/man/man9/devtoname.9      |    8 +-
 head/share/man/man9/drbr.9           |  147 +++++++++++++++++++++++++++++++++++
 head/share/man/man9/ifnet.9          |   10 +-
 head/share/man/man9/malloc.9         |    7 +-
 head/share/man/man9/namei.9          |    6 +-
 head/share/man/man9/physio.9         |    6 +-
 head/share/man/man9/uio.9            |    6 +-
 head/share/man/man9/vcount.9         |    8 +-
 head/share/man/man9/vm_page_alloc.9  |   31 ++++---
 head/share/man/man9/vnode.9          |    6 +-
 35 files changed, 781 insertions(+), 260 deletions(-)

diffs (1796 lines):

diff -r 09f923a839c9 -r 7c66001cb7a6 head/share/man/man4/Makefile
--- a/head/share/man/man4/Makefile	Wed Feb 01 11:53:18 2012 +0200
+++ b/head/share/man/man4/Makefile	Wed Feb 01 11:54:21 2012 +0200
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/18/93
-# $FreeBSD: head/share/man/man4/Makefile 228940 2011-12-28 23:26:58Z delphij $
+# $FreeBSD: head/share/man/man4/Makefile 230843 2012-01-31 19:38:18Z jimharris $
 
 MAN=	aac.4 \
 	acpi.4 \
@@ -182,6 +182,7 @@
 	ipsec.4 \
 	ipw.4 \
 	ipwfw.4 \
+	isci.4 \
 	iscsi_initiator.4 \
 	isp.4 \
 	ispfw.4 \
@@ -505,11 +506,15 @@
 	viapm.4 \
 	${_viawd.4} \
 	vinum.4 \
+	${_virtio.4} \
+	${_virtio_balloon.4} \
+	${_virtio_blk.4} \
 	vkbd.4 \
 	vlan.4 \
 	vpo.4 \
 	vr.4 \
 	vte.4 \
+	${_vtnet.4} \
 	${_vxge.4} \
 	watchdog.4 \
 	wb.4 \
@@ -527,6 +532,7 @@
 	${_xen.4} \
 	xhci.4 \
 	xl.4 \
+	${_xnb.4} \
 	xpt.4 \
 	zero.4 \
 	zyd.4
@@ -656,6 +662,7 @@
 MLINKS+=vlan.4 if_vlan.4
 MLINKS+=vpo.4 imm.4
 MLINKS+=vr.4 if_vr.4
+MLINKS+=${_vtnet.4} ${_if_vtnet.4}
 MLINKS+=${_vxge.4} ${_if_vxge.4}
 MLINKS+=watchdog.4 SW_WATCHDOG.4
 MLINKS+=wb.4 if_wb.4
@@ -699,6 +706,7 @@
 _if_nve.4=	if_nve.4
 _if_nxge.4=	if_nxge.4
 _if_urtw.4=	if_urtw.4
+_if_vtnet.4=	if_vtnet.4
 _if_vxge.4=	if_vxge.4
 _if_wpi.4=	if_wpi.4
 _ipmi.4=	ipmi.4
@@ -711,6 +719,10 @@
 _nve.4=		nve.4
 _nvram.4=	nvram.4
 _nxge.4=	nxge.4
+_virtio.4=	virtio.4
+_virtio_balloon.4=virtio_balloon.4
+_virtio_blk.4=	virtio_blk.4
+_vtnet.4=	vtnet.4
 _vxge.4=	vxge.4
 _padlock.4=	padlock.4
 _rr232x.4=	rr232x.4
@@ -721,6 +733,7 @@
 _viawd.4=	viawd.4
 _wpi.4=		wpi.4
 _xen.4=		xen.4
+_xnb.4=		xnb.4
 
 MLINKS+=lindev.4 full.4
 .endif
diff -r 09f923a839c9 -r 7c66001cb7a6 head/share/man/man4/bge.4
--- a/head/share/man/man4/bge.4	Wed Feb 01 11:53:18 2012 +0200
+++ b/head/share/man/man4/bge.4	Wed Feb 01 11:54:21 2012 +0200
@@ -29,9 +29,9 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/bge.4 228205 2011-12-02 19:01:26Z yongari $
+.\" $FreeBSD: head/share/man/man4/bge.4 230339 2012-01-19 20:31:29Z yongari $
 .\"
-.Dd December 2, 2011
+.Dd January 19, 2012
 .Dt BGE 4
 .Os
 .Sh NAME
@@ -188,7 +188,7 @@
 SysKonnect SK-9D41 (1000baseSX)
 .El
 .Sh LOADER TUNABLES
-The following tunable can be set at the
+The following tunables can be set at the
 .Xr loader 8
 prompt before booting the kernel, or stored in
 .Xr loader.conf 5 .
@@ -197,6 +197,9 @@
 Allow the ASF feature for cooperating with IPMI.
 Can cause system lockup problems on a small number of systems.
 Enabled by default.
+.It Va dev.bge.%d.msi
+Non-zero value enables MSI support on the Ethernet hardware.
+The default value is 1.
 .El
 .Sh SYSCTL VARIABLES
 The following variables are available as both
diff -r 09f923a839c9 -r 7c66001cb7a6 head/share/man/man4/carp.4
--- a/head/share/man/man4/carp.4	Wed Feb 01 11:53:18 2012 +0200
+++ b/head/share/man/man4/carp.4	Wed Feb 01 11:54:21 2012 +0200
@@ -24,9 +24,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/carp.4 229657 2012-01-05 21:43:33Z uqs $
+.\" $FreeBSD: head/share/man/man4/carp.4 230594 2012-01-26 19:11:08Z glebius $
 .\"
-.Dd December 20, 2011
+.Dd January 26, 2012
 .Dt CARP 4
 .Os
 .Sh NAME
@@ -99,24 +99,14 @@
 Enabled by default.
 .It Va net.inet.carp.preempt
 Allow virtual hosts to preempt each other.
-It is also used to failover
-.Nm
-interfaces as a group.
-When the option is enabled and one of the
-.Nm
-enabled physical interfaces
-goes down,
-.Cm advskew
-is changed to 240 on all
-.Nm
-interfaces.
-See also the first example.
+When enabled, a vhid in a backup state would preempt a master that
+is announcing itself with a lower advskew.
 Disabled by default.
 .It Va net.inet.carp.log
 Value of 0 disables any logging.
 Value of 1 enables logging state changes of
 .Nm
-interfaces.
+vhids.
 Values above 1 enable logging of bad
 .Nm
 packets.
@@ -202,9 +192,9 @@
 section for more information.
 .Sh EXAMPLES
 For firewalls and routers with multiple interfaces, it is desirable to
-failover all of the
+failover all of the addresses running
 .Nm
-interfaces together, when one of the physical interfaces goes down.
+together, when one of the physical interfaces goes down.
 This is achieved by the preempt option.
 Enable it on both host A and B:
 .Pp
@@ -225,14 +215,13 @@
 ifconfig em1 vhid 2 advskew 100 pass mekmitasdigoat 192.168.2.1/24
 .Ed
 .Pp
-Because of the preempt option, when one of the physical interfaces of
-host A fails,
+When one of the physical interfaces of host A fails,
 .Cm advskew
-is adjusted to 240 on all its
+is demoted to a configured value on all its
 .Nm
-interfaces.
-This will cause host B to preempt on both interfaces instead of
-just the failed one.
+vhids.
+Due to the preempt option, host B would start announcing itself, and thus
+preempt host A on both interfaces instead of just the failed one.
 .\".Pp
 .\"In order to set up an ARP balanced virtual host, it is necessary to configure
 .\"one virtual host for each physical host which would respond to ARP requests
diff -r 09f923a839c9 -r 7c66001cb7a6 head/share/man/man4/ciss.4
--- a/head/share/man/man4/ciss.4	Wed Feb 01 11:53:18 2012 +0200
+++ b/head/share/man/man4/ciss.4	Wed Feb 01 11:54:21 2012 +0200
@@ -1,8 +1,8 @@
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/ciss.4 230588 2012-01-26 17:04:17Z sbruno $
 .\" Written by Tom Rhodes
 .\" This file is in the public domain.
 .\"
-.Dd November 3, 2005
+.Dd January 26, 2012
 .Dt CISS 4
 .Os
 .Sh NAME
@@ -121,6 +121,10 @@
 .It
 HP Smart Array P212
 .It
+HP Smart Array P220i
+.It
+HP Smart Array P222
+.It
 HP Smart Array P400
 .It
 HP Smart Array P400i
@@ -131,8 +135,16 @@
 .It
 HP Smart Array P411
 .It
+HP Smart Array P420
+.It
+HP Smart Array P420i
+.It
+HP Smart Array P421
+.It
 HP Smart Array P600
 .It
+HP Smart Array P721m
+.It
 HP Smart Array P800
 .It
 HP Smart Array P812
diff -r 09f923a839c9 -r 7c66001cb7a6 head/share/man/man4/ed.4
--- a/head/share/man/man4/ed.4	Wed Feb 01 11:53:18 2012 +0200
+++ b/head/share/man/man4/ed.4	Wed Feb 01 11:54:21 2012 +0200
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/ed.4 230525 2012-01-25 04:45:29Z imp $
 .\"
 .Dd April 9, 2009
 .Dt ED 4
@@ -139,7 +139,7 @@
 .It
 Allied Telesis SIU-98-D (flags 0x610000) (PC-98)
 .It
-AmbiCom 10BaseT card
+AmbiCom 10BaseT card (8002, 8002T, 8010 and 8610)
 .It
 Bay Networks NETGEAR FA410TXC Fast Ethernet
 .It
@@ -147,11 +147,15 @@
 .It
 Billionton LM5LT-10B Ethernet/Modem PC Card
 .It
+Billionton LNT-10TB, LNT-10TN Ethernet PC Card
+.It
 Bromax iPort 10/100 Ethernet PC Card
 .It
 Bromax iPort 10 Ethernet PC Card
 .It
-Buffalo LPC2-CLT, LPC3-CLT, LPC3-CLX, LPC4-TX PC Card
+Buffalo LPC2-CLT, LPC3-CLT, LPC3-CLX, LPC4-TX, LPC-CTX PC Card
+.It
+Buffalo LPC-CF-CLT CF Card
 .It
 CNet BC40 adapter
 .It
diff -r 09f923a839c9 -r 7c66001cb7a6 head/share/man/man4/h_ertt.4
--- a/head/share/man/man4/h_ertt.4	Wed Feb 01 11:53:18 2012 +0200
+++ b/head/share/man/man4/h_ertt.4	Wed Feb 01 11:54:21 2012 +0200
@@ -27,10 +27,10 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/h_ertt.4 225583 2011-09-15 12:15:36Z lstewart $
+.\" $FreeBSD: head/share/man/man4/h_ertt.4 230294 2012-01-18 03:03:21Z lstewart $
 .\"
-.Dd February 15, 2011
-.Dt H_ERTT 9
+.Dd January 18, 2012
+.Dt H_ERTT 4
 .Os
 .Sh NAME
 .Nm h_ertt
diff -r 09f923a839c9 -r 7c66001cb7a6 head/share/man/man4/inet.4
--- a/head/share/man/man4/inet.4	Wed Feb 01 11:53:18 2012 +0200
+++ b/head/share/man/man4/inet.4	Wed Feb 01 11:54:21 2012 +0200
@@ -30,9 +30,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)inet.4	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/inet.4 230576 2012-01-26 10:42:25Z glebius $
 .\"
-.Dd April 9, 2005
+.Dd January 26, 2012
 .Dt INET 4
 .Os
 .Sh NAME
@@ -130,25 +130,37 @@
 .Tn ICMP
 message protocol is accessible from a raw socket.
 .Pp
-The 32-bit Internet address contains both network and host parts.
-However, direct examination of addresses is discouraged.
-For those
-programs which absolutely need to break addresses into their component
-parts, the following
+The
+.Nm
+address on an interface consist of the address itself, the
+netmask, either broadcast address in case of a broadcast
+interface or peers address in case of point-to-point interface.
+The following
 .Xr ioctl 2
-commands are provided for a datagram socket in the Internet domain;
-they have the same form as the
-.Dv SIOCIFADDR
-command (see
-.Xr intro 4 ) .
-.Bl -tag -width SIOCSIFNETMASK
-.It Dv SIOCSIFNETMASK
-Set interface network mask.
-The network mask defines the network part of the address;
-if it contains more of the address than the address type would indicate,
-then subnets are in use.
+commands are provided for a datagram socket in the Internet domain:
+.Pp
+.Bl -tag -width ".Dv SIOCGIFBRDADDR" -offset indent -compact   
+.It Dv SIOCAIFADDR
+Add address to an interface.
+The command requires
+.Ft struct in_aliasreq
+as argument.
+.It Dv SIOCDIFADDR
+Delete address from an interface.
+The command requires
+.Ft struct ifreq
+as argument.
+.It Dv SIOCGIFADDR
+.It Dv SIOCGIFBRDADDR
+.It Dv SIOCGIFDSTADDR
 .It Dv SIOCGIFNETMASK
-Get interface network mask.
+Return address information from interface. The returned value
+is in
+.Ft struct ifreq .
+This way of address information retrieval is obsoleted, a
+preferred way is to use
+.Xr getifaddrs 3
+API.
 .El
 .Ss MIB Variables
 A number of variables are implemented in the net.inet branch of the
@@ -260,6 +272,7 @@
 .Sh SEE ALSO
 .Xr ioctl 2 ,
 .Xr socket 2 ,
+.Xr getifaddrs 3 ,
 .Xr sysctl 3 ,
 .Xr icmp 4 ,
 .Xr intro 4 ,
diff -r 09f923a839c9 -r 7c66001cb7a6 head/share/man/man4/inet6.4
--- a/head/share/man/man4/inet6.4	Wed Feb 01 11:53:18 2012 +0200
+++ b/head/share/man/man4/inet6.4	Wed Feb 01 11:54:21 2012 +0200
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/inet6.4 230578 2012-01-26 10:48:17Z glebius $
 .\"
 .Dd September 2, 2009
 .Dt INET6 4
@@ -184,86 +184,6 @@
 The
 .Tn ICMPv6
 message protocol is accessible from a raw socket.
-.\" .Pp
-.\" The 128-bit IPv6 address contains both network and host parts.
-.\" However, direct examination of addresses is discouraged.
-.\" For those programs which absolutely need to break addresses
-.\" into their component parts, the following
-.\" .Xr ioctl 2
-.\" commands are provided for a datagram socket in the
-.\" .Nm
-.\" domain; they have the same form as the
-.\" .Dv SIOCIFADDR
-.\" command (see
-.\" .Xr intro 4 ) .
-.\" .Pp
-.\" .Bl -tag -width SIOCSIFNETMASK
-.\" .It Dv SIOCSIFNETMASK
-.\" Set interface network mask.
-.\" The network mask defines the network part of the address;
-.\" if it contains more of the address than the address type would indicate,
-.\" then subnets are in use.
-.\" .It Dv SIOCGIFNETMASK
-.\" Get interface network mask.
-.\" .El
-.\" .Sh ROUTING
-.\" The current implementation of Internet protocols includes some routing-table
-.\" adaptations to provide enhanced caching of certain end-to-end
-.\" information necessary for Transaction TCP and Path MTU Discovery.  The
-.\" following changes are the most significant:
-.\" .Bl -enum
-.\" .It
-.\" All IP routes, except those with the
-.\" .Dv RTF_CLONING
-.\" flag and those to multicast destinations, have the
-.\" .Dv RTF_PRCLONING
-.\" flag forcibly enabled (they are thus said to be
-.\" .Dq "protocol cloning" ).
-.\" .It
-.\" When the last reference to an IP route is dropped, the route is
-.\" examined to determine if it was created by cloning such a route.  If
-.\" this is the case, the
-.\" .Dv RTF_PROTO3
-.\" flag is turned on, and the expiration timer is initialized to go off
-.\" in net.inet.ip.rtexpire seconds.  If such a route is re-referenced,
-.\" the flag and expiration timer are reset.
-.\" .It
-.\" A kernel timeout runs once every ten minutes, or sooner if there are
-.\" soon-to-expire routes in the kernel routing table, and deletes the
-.\" expired routes.
-.\" .El
-.\" .Pp
-.\" A dynamic process is in place to modify the value of
-.\" net.inet.ip.rtexpire if the number of cached routes grows too large.
-.\" If after an expiration run there are still more than
-.\" net.inet.ip.rtmaxcache unreferenced routes remaining, the rtexpire
-.\" value is multiplied by 3/4, and any routes which have longer
-.\" expiration times have those times adjusted.  This process is damped
-.\" somewhat by specification of a minimum rtexpire value
-.\" (net.inet.ip.rtminexpire), and by restricting the reduction to once in
-.\" a ten-minute period.
-.\" .Pp
-.\" If some external process deletes the original route from which a
-.\" protocol-cloned route was generated, the ``child route'' is deleted.
-.\" (This is actually a generic mechanism in the routing code support for
-.\" protocol-requested cloning.)
-.\" .Pp
-.\" No attempt is made to manage routes which were not created by protocol
-.\" cloning; these are assumed to be static, under the management of an
-.\" external routing process, or under the management of a link layer
-.\" (e.g.,
-.\" .Tn ARP
-.\" for Ethernets).
-.\" .Pp
-.\" Only certain types of network activity will result in the cloning of a
-.\" route using this mechanism.  Specifically, those protocols (such as
-.\" .Tn TCP
-.\" and
-.\" .Tn UDP )
-.\" which themselves cache a long-lasting reference to route for a destination
-.\" will trigger the mechanism; whereas raw
-.\" .Tn IP
-.\" packets, whether locally-generated or forwarded, will not.
 .Ss MIB Variables
 A number of variables are implemented in the net.inet6 branch of the
 .Xr sysctl 3
diff -r 09f923a839c9 -r 7c66001cb7a6 head/share/man/man4/isci.4
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/head/share/man/man4/isci.4	Wed Feb 01 11:54:21 2012 +0200
@@ -0,0 +1,110 @@
+.\" 
+.\" Copyright (c) 2012 Intel Corporation
+.\" 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,
+.\"    without modification.
+.\" 2. Redistributions in binary form must reproduce at minimum a disclaimer
+.\"    substantially similar to the "NO WARRANTY" disclaimer below
+.\"    ("Disclaimer") and any redistribution must be conditioned upon
+.\"    including a substantially similar Disclaimer requirement for further
+.\"    binary redistribution.
+.\" 
+.\" NO WARRANTY
+.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+.\" "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+.\" LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+.\" A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+.\" HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES.
+.\" 
+.\" isci driver man page.
+.\"
+.\" Author: Jim Harris <jimharris at FreeBSD.org>
+.\"
+.\" $FreeBSD$
+.\"
+.Dd January 23, 2012
+.Dt ISCI 4
+.Os
+.Sh NAME
+.Nm isci
+.Nd Intel C600 Serial Attached SCSI driver
+.Sh SYNOPSIS
+To compile this driver into your kernel,
+place the following lines in your kernel configuration file:
+.Bd -ragged -offset indent
+.Cd "device scbus"
+.Cd "device isci"
+.Ed
+.Pp
+Or, to load the driver as a module at boot, place the following line in
+.Xr loader.conf 5 :
+.Bd -literal -offset indent
+isci_load="YES"
+.Ed
+.Sh DESCRIPTION
+The
+.Nm
+driver provides support for Intel C600
+.Tn SAS
+controller.
+.Sh CONFIGURATION
+To force legacy interrupts for all
+.Nm
+driver instances, set the following tunable value in
+.Xr loader.conf 5 :
+.Bd -literal -offset indent
+hw.isci.force_legacy_interrupts=1
+.Ed
+.Sh DEBUGGING
+To enable debugging prints from the
+.Nm
+driver, set the
+.Bd -literal -offset indent
+hw.isci.debug_level
+.Ed
+.Pp
+variable to a value between 1 and 4 in
+.Xr loader.conf 5 .
+.Pp
+The hardware layer in the isci driver has extensive logging capabilities
+which are disabled by default for performance reasons.  These can be enabled
+by adding
+.Bd -literal -offset indent
+options ISCI_LOGGING
+.Ed
+.Pp
+to the kernel configuration file. 
+.Sh SEE ALSO
+.Xr cd 4 ,
+.Xr ch 4 ,
+.Xr da 4 ,
+.Xr pci 4 ,
+.Xr sa 4 ,
+.Xr scsi 4 .
+.Sh HISTORY
+The
+.Nm
+driver first appeared in
+.Fx 10.0 .
+.Sh AUTHORS
+.An -nosplit
+The
+.Nm
+driver was developed by Intel and originally written by
+.An Jim Harris Aq jimharris at FreeBSD.org
+with contributions from Sohaib Ahsan and input from
+.An Scott Long Aq scottl at FreeBSD.org .
+.Pp
+This man page was written by
+.An Jim Harris Aq jimharris at FreeBSD.org .
diff -r 09f923a839c9 -r 7c66001cb7a6 head/share/man/man4/lo.4
--- a/head/share/man/man4/lo.4	Wed Feb 01 11:53:18 2012 +0200
+++ b/head/share/man/man4/lo.4	Wed Feb 01 11:54:21 2012 +0200
@@ -28,9 +28,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)lo.4	8.1 (Berkeley) 6/5/93
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/lo.4 230609 2012-01-27 08:46:32Z glebius $
 .\"
-.Dd March 15, 2009
+.Dd January 25, 2012
 .Dt LO 4
 .Os
 .Sh NAME
@@ -47,9 +47,9 @@
 As with other network interfaces, the loopback interface must have
 network addresses assigned for each address family with which it is to be used.
 These addresses
-may be set or changed with the
-.Dv SIOCSIFADDR
-.Xr ioctl 2 .
+may be set with the appropriate
+.Xr ioctl 2
+commands for corresponding address families.
 The loopback interface should be the last interface configured,
 as protocols may use the order of configuration as an indication of priority.
 The loopback should
diff -r 09f923a839c9 -r 7c66001cb7a6 head/share/man/man4/netintro.4
--- a/head/share/man/man4/netintro.4	Wed Feb 01 11:53:18 2012 +0200
+++ b/head/share/man/man4/netintro.4	Wed Feb 01 11:54:21 2012 +0200
@@ -30,9 +30,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)netintro.4	8.2 (Berkeley) 11/30/93
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/netintro.4 230577 2012-01-26 10:43:40Z glebius $
 .\"
-.Dd April 14, 2010
+.Dd January 26, 2012
 .Dt NETINTRO 4
 .Os
 .Sh NAME
@@ -231,19 +231,6 @@
 };
 .Ed
 .Pp
-Calls which are now deprecated are:
-.Bl -tag -width SIOCGIFBRDADDR
-.It Dv SIOCSIFADDR
-Set interface address for protocol family.
-Following the address assignment, the
-.Dq initialization
-routine for the interface is called.
-.It Dv SIOCSIFDSTADDR
-Set point to point address for protocol family and interface.
-.It Dv SIOCSIFBRDADDR
-Set broadcast address for protocol family and interface.
-.El
-.Pp
 .Fn Ioctl
 requests to obtain addresses and requests both to set and
 retrieve other data are still fully supported
@@ -400,7 +387,7 @@
 .El
 .Bd -literal
 /*
-* Structure used in SIOCAIFCONF request.
+* Structure used in SIOCAIFADDR request.
 */
 struct ifaliasreq {
         char    ifra_name[IFNAMSIZ];   /* if name, e.g. "en0" */
diff -r 09f923a839c9 -r 7c66001cb7a6 head/share/man/man4/pcm.4
--- a/head/share/man/man4/pcm.4	Wed Feb 01 11:53:18 2012 +0200
+++ b/head/share/man/man4/pcm.4	Wed Feb 01 11:54:21 2012 +0200
@@ -23,9 +23,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/pcm.4 224580 2011-08-01 15:56:40Z joel $
+.\" $FreeBSD: head/share/man/man4/pcm.4 230464 2012-01-22 14:04:42Z stefanf $
 .\"
-.Dd July 31, 2011
+.Dd January 22, 2012
 .Dt SOUND 4
 .Os
 .Sh NAME
@@ -324,8 +324,17 @@
 Always allow PROT_EXEC page mappings.
 .El
 .It Va hw.snd.default_auto
-Enable to automatically assign default sound unit to the most recent
-attached device.
+Automatically assign the default sound unit.
+The following values are supported (default is 1):
+.Bl -tag -width 2n
+.It 0
+Do not assign the default sound unit automatically.
+.It 1
+Use the best available sound device based on playing and recording
+capabilities of the device.
+.It 2
+Use the most recently attached device.
+.El
 .It Va hw.snd.default_unit
 Default sound card for systems with multiple sound cards.
 When using
diff -r 09f923a839c9 -r 7c66001cb7a6 head/share/man/man4/snd_hda.4
--- a/head/share/man/man4/snd_hda.4	Wed Feb 01 11:53:18 2012 +0200
+++ b/head/share/man/man4/snd_hda.4	Wed Feb 01 11:54:21 2012 +0200
@@ -23,9 +23,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/snd_hda.4 230130 2012-01-15 13:21:36Z mav $
+.\" $FreeBSD: head/share/man/man4/snd_hda.4 230551 2012-01-25 20:46:10Z mav $
 .\"
-.Dd January 11, 2012
+.Dd January 25, 2012
 .Dt SND_HDA 4
 .Os
 .Sh NAME
@@ -182,6 +182,18 @@
 or as a set of space-separated
 .Dq Ar option Ns = Ns Ar value
 pairs.
+.It Va hint.pcm.%d.rec.autosrc
+Controls automatic recording source feature:
+.Bl -tag -compact
+.It 0
+disabled,
+.It 1
+once on attach,
+.It 2
+enabled.
+.El
+When enabled, driver will automatically set recording source of the mixer to
+connected input using jack presence detection statuses.
 .El
 .Pp
 Pin configuration is the UAA driver's main source of information about codec
@@ -357,6 +369,16 @@
 Setting this to a non-zero value makes driver to destroy existing pcm devices
 and process new pins configuration set via
 .Va dev.hdaa.%d.nid%d_config.
+.It Va dev.pcm.%d.play.32bit , dev.pcm.%d.rec.32bit
+HDA controller uses 32bit representation for all samples of more then 16 bits.
+These variables allow to specify how many bits of these 32 should be
+used by CODEC.
+Depending on codec capabilities, possible values are 20, 24 and 32 bit.
+The default value is 24.
+.It Va dev.pcm.%d.rec.autosrc
+Run-time equivalent of the
+.Va hint.pcm.%d.rec.autosrc
+tunable.
 .El
 .Sh EXAMPLES
 Taking HP Compaq DX2300 with Realtek ALC888 HDA codec for example.
diff -r 09f923a839c9 -r 7c66001cb7a6 head/share/man/man4/tap.4
--- a/head/share/man/man4/tap.4	Wed Feb 01 11:53:18 2012 +0200
+++ b/head/share/man/man4/tap.4	Wed Feb 01 11:54:21 2012 +0200
@@ -1,7 +1,7 @@
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/tap.4 230580 2012-01-26 10:53:39Z glebius $
 .\" Based on PR#2411
 .\"
-.Dd September 8, 2008
+.Dd January 26, 2012
 .Dt TAP 4
 .Os
 .Sh NAME
@@ -89,11 +89,7 @@
 is unloaded or the interface is destroyed.
 .Pp
 Each interface supports the usual Ethernet network interface
-.Xr ioctl 2 Ns s ,
-such as
-.Dv SIOCSIFADDR
-and
-.Dv SIOCSIFNETMASK ,
+.Xr ioctl 2 Ns s
 and thus can be used with
 .Xr ifconfig 8
 like any other Ethernet interface.
diff -r 09f923a839c9 -r 7c66001cb7a6 head/share/man/man4/txp.4
--- a/head/share/man/man4/txp.4	Wed Feb 01 11:53:18 2012 +0200
+++ b/head/share/man/man4/txp.4	Wed Feb 01 11:54:21 2012 +0200
@@ -24,9 +24,9 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/txp.4 230579 2012-01-26 10:51:41Z glebius $
 .\"
-.Dd March 12, 2009
+.Dd January 26, 2012
 .Dt TXP 4
 .Os
 .Sh NAME
@@ -77,17 +77,6 @@
 .Xr ipsec 4
 acceleration.
 .Pp
-Each of the host's network addresses
-is specified at boot time with an
-.Dv SIOCSIFADDR
-.Xr ioctl 2 .
-The
-.Nm
-interface employs the address resolution protocol described in
-.Xr arp 4
-to dynamically map between Internet and Ethernet addresses on the local
-network.
-.Pp
 When a
 .Nm
 interface is brought up, by default, it will attempt to auto-negotiate the
diff -r 09f923a839c9 -r 7c66001cb7a6 head/share/man/man4/umass.4
--- a/head/share/man/man4/umass.4	Wed Feb 01 11:53:18 2012 +0200
+++ b/head/share/man/man4/umass.4	Wed Feb 01 11:54:21 2012 +0200
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man4/umass.4 230656 2012-01-28 21:21:05Z scf $
 .\"
 .Dd October 22, 2009
 .Dt UMASS 4
@@ -231,7 +231,7 @@
 videos.
 These file systems can be accessed by specifying the file system
 type as
-.Cm msdos
+.Cm msdosfs
 when using
 .Xr mount 8 .
 .Sh SEE ALSO
diff -r 09f923a839c9 -r 7c66001cb7a6 head/share/man/man4/virtio.4
--- a/head/share/man/man4/virtio.4	Wed Feb 01 11:53:18 2012 +0200
+++ b/head/share/man/man4/virtio.4	Wed Feb 01 11:54:21 2012 +0200
@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/virtio.4 227652 2011-11-18 05:43:43Z grehan $
+.\" $FreeBSD: head/share/man/man4/virtio.4 230450 2012-01-22 10:16:24Z brueffer $
 .\"
-.Dd July 4, 2011
+.Dd January 22, 2012
 .Dt VIRTIO 4
 .Os
 .Sh NAME
@@ -48,24 +48,25 @@
 .Sh DESCRIPTION
 VirtIO is a specification for para-virtualized I/O in a virtual machine (VM).
 Traditionally, the hypervisor emulated real devices such as an Ethernet
-interface or disk controller to provide the VM with I/O. This emulation is
-often inefficient.
+interface or disk controller to provide the VM with I/O.
+This emulation is often inefficient.
 .Pp
 VirtIO defines an interface for efficient I/O between the hypervisor and VM.
-The 
-.Xr virtio 4 
+The
+.Xr virtio 4
 module provides a shared memory transport called a virtqueue.
 The
 .Xr virtio_pci 4
 device driver represents an emulated PCI device that the hypervisor makes
-available to the VM. This device provides the probing, configuration, and 
-interrupt notifications need to interact with the hypervisor.
+available to the VM.
+This device provides the probing, configuration, and 
+interrupt notifications needed to interact with the hypervisor.
 .Fx
 supports the following VirtIO devices:
 .Bl -hang -offset indent -width xxxxxxxx
 .It Nm Ethernet
 An emulated Ethernet device is provided by the
-.Xr if_vtnet 4
+.Xr vtnet 4
 device driver.
 .It Nm Block
 An emulated disk controller is provided by the
@@ -78,9 +79,9 @@
 device driver.
 .El
 .Sh SEE ALSO
-.Xr if_vtnet 4 ,
+.Xr virtio_balloon 4 ,
 .Xr virtio_blk 4 ,
-.Xr virtio_balloon 4
+.Xr vtnet 4
 .Sh HISTORY
 Support for VirtIO first appeared in
 .Fx 9.0 .
diff -r 09f923a839c9 -r 7c66001cb7a6 head/share/man/man4/virtio_balloon.4
--- a/head/share/man/man4/virtio_balloon.4	Wed Feb 01 11:53:18 2012 +0200
+++ b/head/share/man/man4/virtio_balloon.4	Wed Feb 01 11:54:21 2012 +0200
@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/virtio_balloon.4 227652 2011-11-18 05:43:43Z grehan $
+.\" $FreeBSD: head/share/man/man4/virtio_balloon.4 230450 2012-01-22 10:16:24Z brueffer $
 .\"
-.Dd July 4, 2011
+.Dd January 22, 2012
 .Dt VIRTIO_BALLOON 4
 .Os
 .Sh NAME
@@ -51,8 +51,8 @@
 .Pp
 The memory balloon allows the guest to, at the request of the
 hypervisor, return memory allocated to the hypervisor so it can
-be made available to other guests. The hypervisor can later
-signal the balloon to return the memory.
+be made available to other guests.
+The hypervisor can later signal the balloon to return the memory.
 .Sh SEE ALSO
 .Xr virtio 4
 .Sh HISTORY
diff -r 09f923a839c9 -r 7c66001cb7a6 head/share/man/man4/virtio_blk.4
--- a/head/share/man/man4/virtio_blk.4	Wed Feb 01 11:53:18 2012 +0200
+++ b/head/share/man/man4/virtio_blk.4	Wed Feb 01 11:54:21 2012 +0200
@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/virtio_blk.4 227652 2011-11-18 05:43:43Z grehan $
+.\" $FreeBSD: head/share/man/man4/virtio_blk.4 230450 2012-01-22 10:16:24Z brueffer $
 .\"
-.Dd July 4, 2011
+.Dd January 22, 2012
 .Dt VIRTIO_BLK 4
 .Os
 .Sh NAME
@@ -48,7 +48,6 @@
 The
 .Nm
 device driver provides support for VirtIO block devices.
-.Pp
 .Sh LOADER TUNABLES
 Tunables can be set at the
 .Xr loader 8
@@ -57,7 +56,8 @@
 .Bl -tag -width "xxxxxx"
 .It Va hw.vtblk.no_ident
 This tunable disables retrieving the device identification string
-from the hypervisor. The default value is 0.
+from the hypervisor.
+The default value is 0.
 .El
 .Sh SEE ALSO
 .Xr virtio 4
diff -r 09f923a839c9 -r 7c66001cb7a6 head/share/man/man4/vtnet.4
--- a/head/share/man/man4/vtnet.4	Wed Feb 01 11:53:18 2012 +0200
+++ b/head/share/man/man4/vtnet.4	Wed Feb 01 11:54:21 2012 +0200
@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/vtnet.4 227652 2011-11-18 05:43:43Z grehan $
+.\" $FreeBSD: head/share/man/man4/vtnet.4 230450 2012-01-22 10:16:24Z brueffer $
 .\"
-.Dd July 4, 2011
+.Dd January 22, 2012
 .Dt VTNET 4
 .Os
 .Sh NAME
@@ -62,7 +62,6 @@
 .Pp
 For more information on configuring this device, see
 .Xr ifconfig 8 .
-.El
 .Sh LOADER TUNABLES
 Tunables can be set at the
 .Xr loader 8
@@ -70,19 +69,21 @@
 .Xr loader.conf 5 .
 .Bl -tag -width "xxxxxx"
 .It Va hw.vtnet.csum_disable
-This tunable disables receive and send checksum offload. The default
-value is 0.
+This tunable disables receive and send checksum offload.
+The default value is 0.
 .It Va hw.vtnet.tso_disable
-This tunable disables TSO. The default value is 0.
+This tunable disables TSO.
+The default value is 0.
 .It Va hw.vtnet.lro_disable
-This tunable disables LRO. The default value is 0.
+This tunable disables LRO.
+The default value is 0.
 .El
 .Sh SEE ALSO
 .Xr arp 4 ,
 .Xr netintro 4 ,
 .Xr ng_ether 4 ,
+.Xr virtio 4 ,
 .Xr vlan 4 ,
-.Xr virtio 4 ,
 .Xr ifconfig 8
 .Sh HISTORY
 The
diff -r 09f923a839c9 -r 7c66001cb7a6 head/share/man/man4/xnb.4
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/head/share/man/man4/xnb.4	Wed Feb 01 11:54:21 2012 +0200
@@ -0,0 +1,140 @@
+.\" Copyright (c) 2012 Spectra Logic Corporation
+.\" 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,
+.\"    without modification.
+.\" 2. Redistributions in binary form must reproduce at minimum a disclaimer
+.\"    substantially similar to the "NO WARRANTY" disclaimer below
+.\"    ("Disclaimer") and any redistribution must be conditioned upon
+.\"    including a substantially similar Disclaimer requirement for further
+.\"    binary redistribution.
+.\" 
+.\" NO WARRANTY
+.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+.\" "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+.\" LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+.\" A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+.\" HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES.
+.\" 
+.\" Authors: Alan Somers         (Spectra Logic Corporation)
+.\" 
+.\" $FreeBSD: head/share/man/man4/xnb.4 230593 2012-01-26 18:18:47Z ken $
+.\" 
+.Dd January 6, 2012
+.Dt XNB 4
+.Os 
+.Sh NAME
+.Nm xnb
+.Nd "Xen Paravirtualized Backend Ethernet Driver"
+.Sh SYNOPSIS
+To compile this driver into the kernel, place the following lines in your
+kernel configuration file:
+.Bd -ragged -offset indent
+.Cd "options XENHVM"
+.Cd "device xenpci"
+.Ed
+.Sh DESCRIPTION
+The
+.Nm
+driver provides the back half of a paravirtualized
+.Xr xen 4
+network connection.
+The netback and netfront drivers appear to their respective operating
+systems as Ethernet devices linked by a crossover cable.
+Typically,
+.Nm
+will run on Domain 0 and the netfront driver will run on a guest domain.
+However, it is also possible to run
+.Nm
+on a guest domain.
+It may be bridged or routed to provide the netfront's
+domain access to other guest domains or to a physical network.
+.Pp
+In most respects, the
+.Nm
+device appears to the OS as an other Ethernet device.
+It can be configured at runtime entirely with
+.Xr ifconfig 8 .
+In particular, it supports MAC changing, arbitrary MTU sizes, checksum
+offload for IP, UDP, and TCP for both receive and transmit, and TSO.
+However, see
+.Sx CAVEATS
+before enabling txcsum, rxcsum, or tso.
+.Sh SYSCTL VARIABLES
+The following read-only variables are available via
+.Xr sysctl 8 :
+.Bl -tag -width indent
+.It Va dev.xnb.%d.dump_rings
+Displays information about the ring buffers used to pass requests between the
+netfront and netback.
+Mostly useful for debugging, but can also be used to
+get traffic statistics.
+.It Va dev.xnb.%d.unit_test_results
+Runs a builtin suite of unit tests and displays the results.
+Does not affect the operation of the driver in any way.
+Note that the test suite simulates error conditions; this will result in
+error messages being printed to the system system log.
+.Sh CAVEATS
+Packets sent through Xennet pass over shared memory, so the protocol includes
+no form of link-layer checksum or CRC.
+Furthermore, Xennet drivers always report to their hosts that they support
+receive and transmit checksum offloading.
+They "offload" the checksum calculation by simply skipping it.
+That works fine for packets that are exchanged between two domains on the same
+machine.
+However, when a Xennet interface is bridged to a physical interface,
+a correct checksum must be attached to any packets bound for that physical
+interface.
+Currently, FreeBSD lacks any mechanism for an ethernet device to
+inform the OS that newly received packets are valid even though their checksums
+are not.
+So if the netfront driver is configured to offload checksum calculations,
+it will pass non-checksumed packets to
+.Nm ,
+which must then calculate the checksum in software before passing the packet
+to the OS.
+.Pp
+For this reason, it is recommended that if
+.Nm
+is bridged to a physcal interface, then transmit checksum offloading should be
+disabled on the netfront.
+The Xennet protocol does not have any mechanism for the netback to request
+the netfront to do this; the operator must do it manually.
+.Sh SEE ALSO
+.Xr arp 4 ,
+.Xr netintro 4 ,
+.Xr ng_ether 4 ,
+.Xr xen 4 ,
+.Xr ifconfig 8
+.Sh HISTORY
+The
+.Nm
+device driver first appeared in
+.Fx 10.0 .
+.Sh AUTHORS
+The
+.Nm
+driver was written by
+.An Alan Somers
+.Aq alans at spectralogic.com
+and
+.An John Suykerbuyk
+.Aq johns at spectralogic.com
+.Sh BUGS
+The
+.Nm
+driver does not properly checksum UDP datagrams that span more than one
+Ethernet frame.
+Nor does it correctly checksum IPv6 packets.
+To workaround that bug, disable transmit checksum offloading on the
+netfront driver.
diff -r 09f923a839c9 -r 7c66001cb7a6 head/share/man/man5/Makefile
--- a/head/share/man/man5/Makefile	Wed Feb 01 11:53:18 2012 +0200
+++ b/head/share/man/man5/Makefile	Wed Feb 01 11:54:21 2012 +0200
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-#	$FreeBSD: head/share/man/man5/Makefile 220640 2011-04-14 18:37:27Z trasz $
+#	$FreeBSD: head/share/man/man5/Makefile 230328 2012-01-19 02:49:21Z kevlo $
 
 .include <bsd.own.mk>
 
@@ -76,6 +76,7 @@
 MLINKS+=hosts.equiv.5 rhosts.5
 MLINKS+=msdosfs.5 msdos.5
 MLINKS+=passwd.5 master.passwd.5
+MLINKS+=portindex.5 INDEX.5
 MLINKS+=quota.user.5 quota.group.5
 MLINKS+=rc.conf.5 rc.conf.local.5
 MLINKS+=resolver.5 resolv.conf.5
diff -r 09f923a839c9 -r 7c66001cb7a6 head/share/man/man9/DEV_MODULE.9
--- a/head/share/man/man9/DEV_MODULE.9	Wed Feb 01 11:53:18 2012 +0200
+++ b/head/share/man/man9/DEV_MODULE.9	Wed Feb 01 11:54:21 2012 +0200
@@ -26,9 +26,9 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man9/DEV_MODULE.9 230330 2012-01-19 09:51:07Z ed $
 .\"
-.Dd March 11, 2001
+.Dd January 19, 2012
 .Dt DEV_MODULE 9
 .Os
 .Sh NAME
@@ -68,7 +68,7 @@
 
 static struct cdevsw foo_devsw = { ... };
 
-static dev_t sdev;
+static struct cdev *sdev;
 
 static int
 foo_load(module_t mod, int cmd, void *arg)
diff -r 09f923a839c9 -r 7c66001cb7a6 head/share/man/man9/Makefile
--- a/head/share/man/man9/Makefile	Wed Feb 01 11:53:18 2012 +0200
+++ b/head/share/man/man9/Makefile	Wed Feb 01 11:54:21 2012 +0200
@@ -1,4 +1,4 @@
-# $FreeBSD: head/share/man/man9/Makefile 229206 2012-01-01 20:59:42Z ed $
+# $FreeBSD: head/share/man/man9/Makefile 230787 2012-01-30 21:02:25Z brueffer $
 
 MAN=	accept_filter.9 \
 	accf_data.9 \
@@ -12,6 +12,7 @@
 	boot.9 \
 	bpf.9 \
 	buf.9 \
+	buf_ring.9 \
 	BUF_ISLOCKED.9 \
 	BUF_LOCK.9 \
 	BUF_LOCKFREE.9 \
@@ -99,6 +100,7 @@
 	devtoname.9 \
 	disk.9 \
 	domain.9 \
+	drbr.9 \
 	driver.9 \
 	DRIVER_MODULE.9 \
 	EVENTHANDLER.9 \
@@ -410,6 +412,16 @@
 	bpf.9 bpf_tap.9 \
 	bpf.9 bpf_validate.9
 MLINKS+=buf.9 bp.9
+MLINKS+=buf_ring.9 buf_ring_alloc.9 \
+	buf_ring.9 buf_ring_free.9 \
+	buf_ring.9 buf_ring_enqueue.9 \
+	buf_ring.9 buf_ring_enqueue_bytes.9 \
+	buf_ring.9 buf_ring_dequeue_mc.9 \
+	buf_ring.9 buf_ring_dequeue_sc.9 \
+	buf_ring.9 buf_ring_count.9 \
+	buf_ring.9 buf_ring_empty.9 \
+	buf_ring.9 buf_ring_full.9 \
+	buf_ring.9 buf_ring_peek.9
 MLINKS+=bus_activate_resource.9 bus_deactivate_resource.9
 MLINKS+=bus_alloc_resource.9 bus_alloc_resource_any.9
 MLINKS+=BUS_BIND_INTR.9 bus_bind_intr.9
@@ -608,6 +620,14 @@
 	domain.9 pfctlinput2.9 \
 	domain.9 pffindproto.9 \
 	domain.9 pffindtype.9
+MLINKS+=drbr.9 drbr_free.9 \
+	drbr.9 drbr_enqueue.9 \
+	drbr.9 drbr_dequeue.9 \
+	drbr.9 drbr_dequeue_cond.9 \
+	drbr.9 drbr_flush.9 \
+	drbr.9 drbr_empty.9 \
+	drbr.9 drbr_inuse.9 \
+	drbr.9 drbr_stats_update.9
 MLINKS+=EVENTHANDLER.9 EVENTHANDLER_DECLARE.9 \
 	EVENTHANDLER.9 EVENTHANDLER_DEREGISTER.9 \
 	EVENTHANDLER.9 eventhandler_deregister.9 \
diff -r 09f923a839c9 -r 7c66001cb7a6 head/share/man/man9/buf_ring.9
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/head/share/man/man9/buf_ring.9	Wed Feb 01 11:54:21 2012 +0200
@@ -0,0 +1,144 @@
+.\" Copyright (c) 2009 Bitgravity Inc
+.\" Written by: Kip Macy <kmacy at FreeBSD.org>
+.\" 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
+.\"
+.\" $FreeBSD: head/share/man/man9/buf_ring.9 230787 2012-01-30 21:02:25Z brueffer $
+.\"
+.Dd January 30, 2012
+.Dt BUF_RING 9
+.Os
+.Sh NAME
+.Nm buf_ring ,
+.Nm buf_ring_alloc ,
+.Nm buf_ring_free ,
+.Nm buf_ring_enqueue ,
+.Nm buf_ring_enqueue_bytes ,
+.Nm buf_ring_dequeue_mc ,
+.Nm buf_ring_dequeue_sc ,
+.Nm buf_ring_count ,
+.Nm buf_ring_empty ,
+.Nm buf_ring_full ,
+.Nm buf_ring_peek ,
+.Nd multi-producer, {single, multi}-consumer lock-less ring buffer
+.Sh SYNOPSIS
+.In sys/param.h
+.In sys/buf_ring.h
+.Ft struct buf_ring *
+.Fn buf_ring_alloc "int count" "struct malloc_type *type" "int flags" "struct mtx *sc_lock"
+.Ft void
+.Fn buf_ring_free "struct buf_ring *br" "struct malloc_type *type"
+.Ft int
+.Fn buf_ring_enqueue "struct buf_ring *br" "void *buf"
+.Ft int
+.Fn buf_ring_enqueue_bytes "struct buf_ring *br" "void *buf" "int bytes"
+.Ft void *
+.Fn buf_ring_dequeue_mc "struct buf_ring *br"
+.Ft void *
+.Fn buf_ring_dequeue_sc "struct buf_ring *br"
+.Ft int
+.Fn buf_ring_count "struct buf_ring *br"
+.Ft int
+.Fn buf_ring_empty "struct buf_ring *br"
+.Ft int
+.Fn buf_ring_full "struct buf_ring *br"
+.Ft void *
+.Fn buf_ring_peek "struct buf_ring *br"
+.Sh DESCRIPTION
+The
+.Nm
+functions provide a lock-less multi-producer and lock-less multi-consumer as
+well as single-consumer ring buffer. 
+.Pp
+The
+.Fn buf_ring_alloc
+function is used to allocate a buf_ring ring buffer with
+.Fa count
+slots using malloc_type
+.Fa type
+and memory flags
+.Fa flags .
+The single consumer interface is protected by
+.Fa sc_lock .
+.Pp
+The
+.Fn buf_ring_free
+function is used to free a buf_ring.
+The user is responsible for freeing any enqueued items.
+.Pp
+The
+.Fn buf_ring_enqueue
+function is used to enqueue a buffer to a buf_ring.
+.Pp
+The
+.Fn buf_ring_enqueue_bytes
+function is used to enqueue a buffer to a buf_ring and increment the
+number of bytes enqueued by
+.Fa bytes .
+.Pp
+The
+.Fn buf_ring_dequeue_mc
+function is a multi-consumer safe way of dequeueing elements from a buf_ring.
+.Pp
+The
+.Fn buf_ring_dequeue_sc
+function is a single-consumer interface to dequeue elements - requiring
+the user to serialize accesses with a lock.
+.Pp
+The
+.Fn buf_ring_count
+function returns the number of elements in a buf_ring.
+.Pp
+The
+.Fn buf_ring_empty
+function returns
+.Dv TRUE
+if the buf_ring is empty,
+.Dv FALSE
+otherwise.
+.Pp
+The
+.Fn buf_ring_full
+function returns
+.Dv TRUE
+if no more items can be enqueued,
+.Dv FALSE
+otherwise.
+.Pp
+The
+.Fn buf_ring_peek
+function returns a pointer to the last element in the buf_ring if the
+buf_ring is not empty,
+.Dv NULL
+otherwise.
+.Sh RETURN VALUES
+The
+.Fn buf_ring_enqueue
+and
+.Fn buf_ring_enqueue_bytes
+functions return
+.Er ENOBUFS
+if there are no available slots in the buf_ring.
+.Sh HISTORY
+These functions were introduced in
+.Fx 8.0 .
diff -r 09f923a839c9 -r 7c66001cb7a6 head/share/man/man9/devtoname.9
--- a/head/share/man/man9/devtoname.9	Wed Feb 01 11:53:18 2012 +0200
+++ b/head/share/man/man9/devtoname.9	Wed Feb 01 11:54:21 2012 +0200
@@ -22,19 +22,19 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man9/devtoname.9 230330 2012-01-19 09:51:07Z ed $
 .\"
-.Dd September 25, 1999
+.Dd January 19, 2012
 .Dt DEVTONAME 9
 .Os
 .Sh NAME
 .Nm devtoname
-.Nd "converts dev_t data into a string indicating the device name"
+.Nd "converts character device into a string indicating the device name"
 .Sh SYNOPSIS
 .In sys/param.h
 .In sys/conf.h
 .Ft const char *
-.Fn devtoname "dev_t dev"
+.Fn devtoname "struct cdev *dev"
 .Sh DESCRIPTION
 The
 .Fn devtoname
diff -r 09f923a839c9 -r 7c66001cb7a6 head/share/man/man9/drbr.9
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/head/share/man/man9/drbr.9	Wed Feb 01 11:54:21 2012 +0200
@@ -0,0 +1,147 @@
+.\" Copyright (c) 2009 Bitgravity Inc
+.\" Written by: Kip Macy <[email protected]@FreeBSD.org>
+.\" 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
+.\"
+.\" $FreeBSD: head/share/man/man9/drbr.9 230787 2012-01-30 21:02:25Z brueffer $
+.\"
+.Dd January 30, 2012
+.Dt DRBR 9
+.Os
+.Sh NAME
+.Nm drbr ,
+.Nm drbr_free ,
+.Nm drbr_enqueue ,
+.Nm drbr_dequeue ,
+.Nm drbr_dequeue_cond ,
+.Nm drbr_flush ,
+.Nm drbr_empty ,
+.Nm drbr_inuse ,
+.Nm drbr_stats_update ,
+.Nd network driver interface to buf_ring
+.Sh SYNOPSIS
+.In sys/param.h
+.In net/if.h
+.In net/if_var.h
+.Ft void
+.Fn drbr_free "struct buf_ring *br" "struct malloc_type *type"
+.Ft int
+.Fn drbr_enqueue "struct ifnet *ifp" "struct buf_ring *br" "struct mbuf *m"
+.Ft struct mbuf *
+.Fn drbr_dequeue "struct ifnet *ifp" "struct buf_ring *br"
+.Ft struct mbuf *
+.Fn drbr_dequeue_cond "struct ifnet *ifp" "struct buf_ring *br" "int (*func) (struct mbuf *, void *)" "void *arg"
+.Ft void
+.Fn drbr_flush "struct ifnet *ifp" "struct buf_ring *br"
+.Ft int
+.Fn drbr_empty "struct ifnet *ifp" "struct buf_ring *br"
+.Ft int
+.Fn drbr_inuse "struct ifnet *ifp" "struct buf_ring *br"
+.Ft void
+.Fn drbr_stats_update "struct ifnet *ifp" "int len" "int mflags"
+.Sh DESCRIPTION
+The
+.Nm
+functions provide an API to network drivers for using
+.Xr buf_ring 9
+for enqueueing and dequeueing packets.
+This is meant as a replacement for the IFQ interface for packet queuing.
+It allows a packet to be enqueued with a single atomic and packet
+dequeue to be done without any per-packet atomics as it is protected
+by the driver's tx queue lock.
+If
+.Dv INVARIANTS
+is enabled,
+.Fn drbr_dequeue
+will assert that the tx queue lock is held when it is called.
+.Pp
+The
+.Fn drbr_free 
+function frees all the enqueued mbufs and then frees the buf_ring.
+.Pp
+The
+.Fn drbr_enqueue
+function is used to enqueue an mbuf to a buf_ring, falling back to the
+ifnet's IFQ if
+.Xr ALTQ 4
+is enabled.
+.Pp
+The
+.Fn drbr_dequeue
+function is used to dequeue an mbuf from a buf_ring or, if
+.Xr ALTQ 4
+is enabled, from the ifnet's IFQ.
+.Pp
+The
+.Fn drbr_dequeue_cond
+function is used to conditionally dequeue an mbuf from a buf_ring based
+on whether
+.Fa func
+returns
+.Dv TRUE
+or
+.Dv FALSE .
+.Pp
+The
+.Fn drbr_flush
+function frees all mbufs enqueued in the buf_ring and the ifnet's IFQ.
+.Pp
+The 
+.Fn drbr_empty
+function returns
+.Dv TRUE
+if there are no mbufs enqueued,
+.Dv FALSE
+otherwise.
+.Pp
+The
+.Fn drbr_inuse
+function returns the number of mbufs enqueued.
+Note to users that this is intrinsically racy as there is no guarantee that
+there will not be more mbufs when 
+.Fn drbr_dequeue
+is actually called.
+Provided the tx queue lock is held there will not be less.
+.Pp
+The
+.Fn drbr_stats_update
+function updates the number of bytes and the number of multicast packets sent.
+.Sh RETURN VALUES
+The
+.Fn drbr_enqueue
+function returns
+.Er ENOBUFS
+if there are no slots available in the buf_ring and
+.Dv 0
+on success.
+.Pp
+The
+.Fn drbr_dequeue
+and 
+.Fn drbr_dequeue_cond
+functions return an mbuf on success and
+.Dv NULL
+if the buf_ring is empty.
+.Sh HISTORY
+These functions were introduced in
+.Fx 8.0 .
diff -r 09f923a839c9 -r 7c66001cb7a6 head/share/man/man9/ifnet.9
--- a/head/share/man/man9/ifnet.9	Wed Feb 01 11:53:18 2012 +0200
+++ b/head/share/man/man9/ifnet.9	Wed Feb 01 11:54:21 2012 +0200
@@ -26,9 +26,9 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man9/ifnet.9 225776 2011-09-27 07:05:41Z pluknet $
+.\" $FreeBSD: head/share/man/man9/ifnet.9 230581 2012-01-26 11:08:55Z glebius $
 .\"
-.Dd July 3, 2011
+.Dd January 26, 2012
 .Dt IFNET 9
 .Os
 .Sh NAME
@@ -1245,10 +1245,8 @@
 .Fn if_delmulti
 function is called to perform the operation; qq.v.
 .Pp
-.It Dv SIOCSIFDSTADDR
-.It Dv SIOCSIFADDR
-.It Dv SIOCSIFBRDADDR
-.It Dv SIOCSIFNETMASK
+.It Dv SIOCAIFADDR
+.It Dv SIOCDIFADDR
 The socket's protocol control routine is called to implement the
 requested action.
 .Pp
diff -r 09f923a839c9 -r 7c66001cb7a6 head/share/man/man9/malloc.9
--- a/head/share/man/man9/malloc.9	Wed Feb 01 11:53:18 2012 +0200
+++ b/head/share/man/man9/malloc.9	Wed Feb 01 11:54:21 2012 +0200
@@ -27,9 +27,9 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $NetBSD: malloc.9,v 1.3 1996/11/11 00:05:11 lukem Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man9/malloc.9 230679 2012-01-28 23:30:39Z kmacy $
 .\"
-.Dd October 23, 2008
+.Dd January 28, 2012
 .Dt MALLOC 9
 .Os
 .Sh NAME
@@ -123,6 +123,9 @@
 .Bl -tag -width indent
 .It Dv M_ZERO
 Causes the allocated memory to be set to all zeros.
+.It Dv M_NODUMP
+For allocations greater than page size, causes the allocated 
+memory to be excluded from kernel core dumps.
 .It Dv M_NOWAIT
 Causes
 .Fn malloc ,
diff -r 09f923a839c9 -r 7c66001cb7a6 head/share/man/man9/namei.9
--- a/head/share/man/man9/namei.9	Wed Feb 01 11:53:18 2012 +0200
+++ b/head/share/man/man9/namei.9	Wed Feb 01 11:54:21 2012 +0200
@@ -31,7 +31,7 @@
 .\" If you integrate this manpage in another OS, I'd appreciate a note
 .\"	- eivind at FreeBSD.org
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man9/namei.9 230292 2012-01-18 02:29:11Z kevlo $
 .\"
 .Dd September 21, 2005
 .Dt NAMEI 9
@@ -196,10 +196,6 @@
 will follow the symbolic link if the last part
 of the path supplied is a symbolic link (i.e., it will return a vnode
 for whatever the link points at, instead for the link itself).
-.It Dv NOOBJ
-Do not call
-.Fn vfs_object_create
-for the returned vnode, even though it meets required criteria for VM support.
 .It Dv NOFOLLOW
 Do not follow symbolic links (pseudo).
 This flag is not looked for by the actual code, which looks for
diff -r 09f923a839c9 -r 7c66001cb7a6 head/share/man/man9/physio.9
--- a/head/share/man/man9/physio.9	Wed Feb 01 11:53:18 2012 +0200
+++ b/head/share/man/man9/physio.9	Wed Feb 01 11:54:21 2012 +0200
@@ -27,9 +27,9 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man9/physio.9 230330 2012-01-19 09:51:07Z ed $
 .\"
-.Dd July 8, 2004
+.Dd January 19, 2012
 .Dt PHYSIO 9
 .Os
 .Sh NAME
@@ -41,7 +41,7 @@
 .In sys/bio.h
 .In sys/buf.h
 .Ft int
-.Fn physio "dev_t dev" "struct uio *uio" "int ioflag"
+.Fn physio "struct cdev *dev" "struct uio *uio" "int ioflag"
 .Sh DESCRIPTION
 The
 .Fn physio
diff -r 09f923a839c9 -r 7c66001cb7a6 head/share/man/man9/uio.9
--- a/head/share/man/man9/uio.9	Wed Feb 01 11:53:18 2012 +0200
+++ b/head/share/man/man9/uio.9	Wed Feb 01 11:54:21 2012 +0200
@@ -23,9 +23,9 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man9/uio.9 223890 2011-07-09 15:24:12Z kib $
+.\" $FreeBSD: head/share/man/man9/uio.9 230330 2012-01-19 09:51:07Z ed $
 .\"
-.Dd July 9, 2011
+.Dd January 19, 2012
 .Dt UIO 9
 .Os
 .Sh NAME
@@ -154,7 +154,7 @@
 static int data_available;	/* amount of data that can be read */
 
 static int
-fooread(dev_t dev, struct uio *uio, int flag)
+fooread(struct cdev *dev, struct uio *uio, int flag)
 {
 	int rv, amnt;
 
diff -r 09f923a839c9 -r 7c66001cb7a6 head/share/man/man9/vcount.9
--- a/head/share/man/man9/vcount.9	Wed Feb 01 11:53:18 2012 +0200
+++ b/head/share/man/man9/vcount.9	Wed Feb 01 11:54:21 2012 +0200
@@ -30,9 +30,9 @@
 .\" FreeBSD) I would love to hear about it.
 .\"     Andrew <andrew at ugh.net.au>
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man9/vcount.9 230330 2012-01-19 09:51:07Z ed $
 .\"
-.Dd February 6, 2001
+.Dd January 19, 2012
 .Dt VCOUNT 9
 .Os
 .Sh NAME
@@ -47,7 +47,7 @@
 .Ft int
 .Fn vcount "struct vnode *vp"
 .Ft int
-.Fn count_dev "dev_t dev"
+.Fn count_dev "struct cdev *dev"
 .Sh DESCRIPTION
 .Fn vcount
 is used to get the number of references to a particular device.
@@ -56,7 +56,7 @@
 does the same thing as
 .Fn vcount ,
 but takes a
-.Vt dev_t
+.Vt "struct cdev"
 rather than a
 .Vt "struct vnode"
 pointer as an argument.
diff -r 09f923a839c9 -r 7c66001cb7a6 head/share/man/man9/vm_page_alloc.9
--- a/head/share/man/man9/vm_page_alloc.9	Wed Feb 01 11:53:18 2012 +0200
+++ b/head/share/man/man9/vm_page_alloc.9	Wed Feb 01 11:54:21 2012 +0200
@@ -24,9 +24,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man9/vm_page_alloc.9 230679 2012-01-28 23:30:39Z kmacy $
 .\"
-.Dd July 3, 2010
+.Dd January 28, 2012
 .Dt VM_PAGE_ALLOC 9
 .Os
 .Sh NAME
@@ -90,23 +90,18 @@
 .Pp
 The optional flags are:
 .Bl -tag -width ".Dv VM_ALLOC_IFNOTCACHED"
-.It Dv VM_ALLOC_ZERO
-Indicate a preference for a pre-zeroed page.
-There is no guarantee that the returned page will be zeroed, but it
-will have the
-.Dv PG_ZERO
-flag set if it is zeroed.
+.It Dv VM_ALLOC_NOBUSY
+The returned page will not have the
+.Dv VPO_BUSY
+flag set.
+.It Dv VM_ALLOC_NODUMP
+The returned page will not be included in any kernel core dumps
+regardless of whether or not it is mapped in to KVA.
 .It Dv VM_ALLOC_NOOBJ
 Do not associate the allocated page with a vm object.
 The
 .Fa object
 argument is ignored.
-.It Dv VM_ALLOC_NOBUSY
-The returned page will not have the
-.Dv VPO_BUSY
-flag set.
-.It Dv VM_ALLOC_WIRED
-The returned page will be wired.
 .It Dv VM_ALLOC_IFCACHED
 Allocate the page only if it is cached.
 Otherwise, return
@@ -117,6 +112,14 @@
 If the page at the specified
 .Fa pindex
 is cached, NULL is returned instead.
+.It Dv VM_ALLOC_WIRED
+The returned page will be wired.
+.It Dv VM_ALLOC_ZERO
+Indicate a preference for a pre-zeroed page.
+There is no guarantee that the returned page will be zeroed, but it
+will have the
+.Dv PG_ZERO
+flag set if it is zeroed.
 .El
 .El
 .Sh RETURN VALUES
diff -r 09f923a839c9 -r 7c66001cb7a6 head/share/man/man9/vnode.9
--- a/head/share/man/man9/vnode.9	Wed Feb 01 11:53:18 2012 +0200
+++ b/head/share/man/man9/vnode.9	Wed Feb 01 11:54:21 2012 +0200
@@ -24,7 +24,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.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: head/share/man/man9/vnode.9 230291 2012-01-18 02:27:09Z kevlo $
 .\"
 .Dd February 13, 2010
 .Dt VNODE 9
@@ -119,13 +119,13 @@
 .It Dv VREG
 A regular file; may be with or without VM object backing.
 If you want to make sure this get a backing object, call
-.Xr vfs_object_create 9 .
+.Fn vnode_create_vobject .
 .It Dv VDIR
 A directory.
 .It Dv VBLK
 A block device; may be with or without VM object backing.
 If you want to make sure this get a backing object, call
-.Xr vfs_object_create 9 .
+.Fn vnode_create_vobject .
 .It Dv VCHR
 A character device.
 .It Dv VLNK


More information about the Zrouter-src-freebsd mailing list