merge from head.

30 files changed, 117 insertions, 63 deletions

diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index b4d0581..ceb3859 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -29,8 +29,10 @@ MAN=	aac.4 \
 	aio.4 \
 	alc.4 \
 	ale.4 \
+	alpm.4 \
 	altq.4 \
 	amd.4 \
+	amdpm.4 \
 	${_amdsbwd.4} \
 	${_amdsmb.4} \
 	${_amdtemp.4} \
@@ -199,6 +201,7 @@ MAN=	aac.4 \
 	mac_stub.4 \
 	mac_test.4 \
 	malo.4 \
+	mcd.4 \
 	md.4 \
 	mem.4 \
 	meteor.4 \
@@ -297,10 +300,12 @@ MAN=	aac.4 \
 	${_nxge.4} \
 	ohci.4 \
 	orm.4 \
+	${_padlock.4} \
 	pass.4 \
 	patm.4 \
 	pccard.4 \
 	pccbb.4 \
+	pcf.4 \
 	pci.4 \
 	pcib.4 \
 	pcic.4 \
@@ -334,6 +339,7 @@ MAN=	aac.4 \
 	sbp.4 \
 	sbp_targ.4 \
 	scc.4 \
+	scd.4 \
 	sched_4bsd.4 \
 	sched_ule.4 \
 	screen.4 \
@@ -453,6 +459,7 @@ MAN=	aac.4 \
 	uvscom.4 \
 	vga.4 \
 	vge.4 \
+	viapm.4 \
 	vinum.4 \
 	vkbd.4 \
 	vlan.4 \
@@ -649,6 +656,7 @@ _nfsmb.4=	nfsmb.4
 _nve.4=		nve.4
 _nvram.4=	nvram.4
 _nxge.4=	nxge.4
+_padlock.4=	padlock.4
 _rr232x.4=	rr232x.4
 _speaker.4=	speaker.4
 _spkr.4=	spkr.4
diff --git a/share/man/man4/acpi_asus.4 b/share/man/man4/acpi_asus.4
index 3fa7765..f3b99da 100644
--- a/share/man/man4/acpi_asus.4
+++ b/share/man/man4/acpi_asus.4
@@ -25,8 +25,8 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 17, 2008
-.Dt ACPI_ASUS 4 i386
+.Dd February 8, 2010
+.Dt ACPI_ASUS 4
 .Os
 .Sh NAME
 .Nm acpi_asus
diff --git a/share/man/man4/acpi_fujitsu.4 b/share/man/man4/acpi_fujitsu.4
index 1959bf6..ef72fee 100644
--- a/share/man/man4/acpi_fujitsu.4
+++ b/share/man/man4/acpi_fujitsu.4
@@ -25,8 +25,8 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 20, 2005
-.Dt ACPI_FUJITSU 4 i386
+.Dd February 8, 2010
+.Dt ACPI_FUJITSU 4
 .Os
 .Sh NAME
 .Nm acpi_fujitsu
diff --git a/share/man/man4/acpi_hp.4 b/share/man/man4/acpi_hp.4
index efa9d0b..94828d7 100644
--- a/share/man/man4/acpi_hp.4
+++ b/share/man/man4/acpi_hp.4
@@ -24,8 +24,8 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 30, 2009
-.Dt ACPI_HP 4 i386
+.Dd February 8, 2010
+.Dt ACPI_HP 4
 .Os
 .Sh NAME
 .Nm acpi_hp
diff --git a/share/man/man4/acpi_ibm.4 b/share/man/man4/acpi_ibm.4
index f0c165d..376b64d 100644
--- a/share/man/man4/acpi_ibm.4
+++ b/share/man/man4/acpi_ibm.4
@@ -25,8 +25,8 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 14, 2006
-.Dt ACPI_IBM 4 i386
+.Dd February 8, 2010
+.Dt ACPI_IBM 4
 .Os
 .Sh NAME
 .Nm acpi_ibm
diff --git a/share/man/man4/acpi_panasonic.4 b/share/man/man4/acpi_panasonic.4
index 5d8c86a..4bd7038 100644
--- a/share/man/man4/acpi_panasonic.4
+++ b/share/man/man4/acpi_panasonic.4
@@ -25,8 +25,8 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 17, 2009
-.Dt ACPI_PANASONIC 4 i386
+.Dd February 8, 2010
+.Dt ACPI_PANASONIC 4
 .Os
 .Sh NAME
 .Nm acpi_panasonic
diff --git a/share/man/man4/acpi_sony.4 b/share/man/man4/acpi_sony.4
index 3a06070..f0fb0e0 100644
--- a/share/man/man4/acpi_sony.4
+++ b/share/man/man4/acpi_sony.4
@@ -24,8 +24,8 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 7, 2010
-.Dt ACPI_SONY 4 i386
+.Dd February 8, 2010
+.Dt ACPI_SONY 4
 .Os
 .Sh NAME
 .Nm acpi_sony
diff --git a/share/man/man4/acpi_toshiba.4 b/share/man/man4/acpi_toshiba.4
index cb26842..134ecc8 100644
--- a/share/man/man4/acpi_toshiba.4
+++ b/share/man/man4/acpi_toshiba.4
@@ -25,8 +25,8 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 19, 2004
-.Dt ACPI_TOSHIBA 4 i386
+.Dd February 8, 2010
+.Dt ACPI_TOSHIBA 4
 .Os
 .Sh NAME
 .Nm acpi_toshiba
diff --git a/share/man/man4/acpi_wmi.4 b/share/man/man4/acpi_wmi.4
index c73307c..cc61527 100644
--- a/share/man/man4/acpi_wmi.4
+++ b/share/man/man4/acpi_wmi.4
@@ -24,8 +24,8 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 30, 2009
-.Dt ACPI_WMI 4 i386
+.Dd February 8, 2010
+.Dt ACPI_WMI 4
 .Os
 .Sh NAME
 .Nm acpi_wmi
diff --git a/share/man/man4/man4.i386/alpm.4 b/share/man/man4/alpm.4
index f288b72..43ee459 100644
--- a/share/man/man4/man4.i386/alpm.4
+++ b/share/man/man4/alpm.4
@@ -25,7 +25,7 @@
 .\" $FreeBSD$
 .\"
 .Dd February 13, 1999
-.Dt ALPM 4 i386
+.Dt ALPM 4
 .Os
 .Sh NAME
 .Nm alpm
diff --git a/share/man/man4/man4.i386/amdpm.4 b/share/man/man4/amdpm.4
index f8937b3..f791a28 100644
--- a/share/man/man4/man4.i386/amdpm.4
+++ b/share/man/man4/amdpm.4
@@ -26,7 +26,7 @@
 .\" $FreeBSD$
 .\"
 .Dd December 31, 2005
-.Dt AMDPM 4 i386
+.Dt AMDPM 4
 .Os
 .Sh NAME
 .Nm amdpm
diff --git a/share/man/man4/io.4 b/share/man/man4/io.4
index 15c0c4d..a54b9fd 100644
--- a/share/man/man4/io.4
+++ b/share/man/man4/io.4
@@ -27,8 +27,8 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 3, 2004
-.Dt IO 4 i386
+.Dd February 8, 2010
+.Dt IO 4
 .Os
 .Sh NAME
 .Nm io
diff --git a/share/man/man4/iwn.4 b/share/man/man4/iwn.4
index 1edb425..b73331a 100644
--- a/share/man/man4/iwn.4
+++ b/share/man/man4/iwn.4
@@ -25,12 +25,13 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 25, 2009
+.Dd February 8, 2010
 .Os
 .Dt IWN 4
 .Sh NAME
 .Nm iwn
-.Nd "Intel Wireless WiFi Link 4965/5000 IEEE 802.11n driver"
+.Nd Intel Wireless WiFi Link 4965/1000/5000/5150/5300/6000/6050 
+IEEE 802.11n driver
 .Sh SYNOPSIS
 To compile this driver into the kernel,
 include the following lines in your
@@ -46,8 +47,10 @@ You also need to select a firmware for your device.
 Choose one from:
 .Bd -ragged -offset indent
 .Cd "device iwn4965fw"
+.Cd "device iwn1000fw"
 .Cd "device iwn5000fw"
-.Cd "device iwn5100fw"
+.Cd "device iwn5150fw"
+.Cd "device iwn6000fw"
 .Ed
 .Pp
 Or you can use
@@ -63,15 +66,18 @@ module at boot time, place the following lines in
 .Bd -literal -offset indent
 if_iwn_load="YES"
 iwn4965fw_load="YES"
+iwn1000fw_load="YES"
 iwn5000fw_load="YES"
-iwn5100fw_load="YES"
+iwn5150fw_load="YES"
+iwn6000fw_load="YES"
 .Ed
 .Sh DESCRIPTION
 The
 .Nm
 driver provides support for
 .Tn Intel
-Wireless WiFi Link 4965 and 5000 series of PCI-Express network adapters.
+Wireless WiFi Link 4965, 1000, 5000 and 6000 series of 
+PCI-Express network adapters.
 .Nm
 supports
 .Cm station ,
diff --git a/share/man/man4/iwnfw.4 b/share/man/man4/iwnfw.4
index 700d20a..b0450c6 100644
--- a/share/man/man4/iwnfw.4
+++ b/share/man/man4/iwnfw.4
@@ -22,7 +22,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 25, 2009
+.Dd February 7, 2010
 .Dt IWNFW 4
 .Os
 .Sh NAME
@@ -41,8 +41,10 @@ If you want to pick only the firmware image for your network adapter choose one
 of the following:
 .Bd -ragged -offset indent
 .Cd "device iwn4965fw"
+.Cd "device iwn1000fw"
 .Cd "device iwn5000fw"
-.Cd "device iwn5100fw"
+.Cd "device iwn5150fw"
+.Cd "device iwn6000fw"
 .Ed
 .Pp
 Alternatively, to load the driver as a
@@ -50,12 +52,15 @@ module at boot time, place the following line in
 .Xr loader.conf 5 :
 .Bd -literal -offset indent
 iwn4965fw_load="YES"
+iwn1000fw_load="YES"
 iwn5000fw_load="YES"
-iwn5100fw_load="YES"
+iwn5150fw_load="YES"
+iwn6000fw_load="YES"
 .Ed
 .Sh DESCRIPTION
 This module provides access to firmware sets for the
-Intel Wireless WiFi Link 4965 and 5000 series of IEEE 802.11n adapters.
+Intel Wireless WiFi Link 4965, 1000, 5000 and 6000 series of 
+IEEE 802.11n adapters.
 It may be
 statically linked into the kernel, or loaded as a module.
 .Sh SEE ALSO
diff --git a/share/man/man4/linux.4 b/share/man/man4/linux.4
index 8c368b3..f89b14bd 100644
--- a/share/man/man4/linux.4
+++ b/share/man/man4/linux.4
@@ -24,8 +24,8 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 17, 2008
-.Dt LINUX 4 i386
+.Dd February 8, 2010
+.Dt LINUX 4
 .Os
 .Sh NAME
 .Nm linux
diff --git a/share/man/man4/man4.i386/Makefile b/share/man/man4/man4.i386/Makefile
index c474399..0134d57 100644
--- a/share/man/man4/man4.i386/Makefile
+++ b/share/man/man4/man4.i386/Makefile
@@ -1,8 +1,6 @@
 # $FreeBSD$
 
 MAN=	aic.4 \
-	alpm.4 \
-	amdpm.4 \
 	apm.4 \
 	ce.4 \
 	cp.4 \
@@ -17,23 +15,18 @@ MAN=	aic.4 \
 	glxsb.4 \
 	ie.4 \
 	longrun.4 \
-	mcd.4 \
 	mse.4 \
 	npx.4 \
-	padlock.4 \
 	pae.4 \
 	pbio.4 \
-	pcf.4 \
 	perfmon.4 \
 	pnp.4 \
 	pnpbios.4 \
 	sbni.4 \
-	scd.4 \
 	smapi.4 \
 	snc.4 \
 	streams.4 \
 	svr4.4 \
-	viapm.4 \
 	vpd.4 \
 	vx.4 \
 	wl.4
diff --git a/share/man/man4/man4.i386/mcd.4 b/share/man/man4/mcd.4
index a4a93dd..8efa7db 100644
--- a/share/man/man4/man4.i386/mcd.4
+++ b/share/man/man4/mcd.4
@@ -27,7 +27,7 @@
 .\" $FreeBSD$
 .\"
 .Dd December 8, 1994
-.Dt MCD 4 i386
+.Dt MCD 4
 .Os
 .Sh NAME
 .Nm mcd
diff --git a/share/man/man4/ndis.4 b/share/man/man4/ndis.4
index 0abd0d5..71377ad 100644
--- a/share/man/man4/ndis.4
+++ b/share/man/man4/ndis.4
@@ -30,8 +30,8 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 13, 2006
-.Dt NDIS 4 i386
+.Dd February 8, 2010
+.Dt NDIS 4
 .Os
 .Sh NAME
 .Nm ndis
diff --git a/share/man/man4/nvram.4 b/share/man/man4/nvram.4
index a3a361e..25d6852 100644
--- a/share/man/man4/nvram.4
+++ b/share/man/man4/nvram.4
@@ -26,8 +26,8 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 27, 2010
-.Dt NVRAM 4 i386
+.Dd February 8, 2010
+.Dt NVRAM 4
 .Os
 .Sh NAME
 .Nm nvram
diff --git a/share/man/man4/man4.i386/padlock.4 b/share/man/man4/padlock.4
index e93d3d9..2a74f63 100644
--- a/share/man/man4/man4.i386/padlock.4
+++ b/share/man/man4/padlock.4
@@ -24,8 +24,8 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 1, 2007
-.Dt PADLOCK 4 i386
+.Dd February 8, 2010
+.Dt PADLOCK 4
 .Os
 .Sh NAME
 .Nm padlock
diff --git a/share/man/man4/man4.i386/pcf.4 b/share/man/man4/pcf.4
index f5e9088..cc8915f 100644
--- a/share/man/man4/man4.i386/pcf.4
+++ b/share/man/man4/pcf.4
@@ -25,7 +25,7 @@
 .\" $FreeBSD$
 .\"
 .Dd August 6, 1998
-.Dt PCF 4 i386
+.Dt PCF 4
 .Os
 .Sh NAME
 .Nm pcf
diff --git a/share/man/man4/man4.i386/scd.4 b/share/man/man4/scd.4
index daefa3c..dbbb18f 100644
--- a/share/man/man4/man4.i386/scd.4
+++ b/share/man/man4/scd.4
@@ -27,7 +27,7 @@
 .\" $FreeBSD$
 .\"
 .Dd March 17, 2008
-.Dt SCD 4 i386
+.Dt SCD 4
 .Os
 .Sh NAME
 .Nm scd
diff --git a/share/man/man4/sctp.4 b/share/man/man4/sctp.4
index 226fc3c..975192c 100644
--- a/share/man/man4/sctp.4
+++ b/share/man/man4/sctp.4
@@ -154,8 +154,8 @@ also supports the following extensions:
 This extension allows one to have message be skipped and
 not delivered based on some user specified parameters.
 .It "sctp dynamic addressing"
- This extension allows addresses to be added and deleted
-dynammically from an existing association.
+This extension allows addresses to be added and deleted
+dynamically from an existing association.
 .It "sctp authentication"
 This extension allows the user to authenticate specific
 peer chunks (including data) to validate that the peer
@@ -164,7 +164,7 @@ association.
 A shared key option is also provided for
 so that two stacks can pre-share keys.
 .It "packet drop"
- Some routers support a special satellite protocol that
+Some routers support a special satellite protocol that
 will report losses due to corruption.
 This allows retransmissions without subsequent loss in bandwidth
 utilization.
diff --git a/share/man/man4/man4.i386/viapm.4 b/share/man/man4/viapm.4
index 7457952..851c1fc 100644
--- a/share/man/man4/man4.i386/viapm.4
+++ b/share/man/man4/viapm.4
@@ -25,7 +25,7 @@
 .\" $FreeBSD$
 .\"
 .Dd April 20, 2002
-.Dt VIAPM 4 i386
+.Dt VIAPM 4
 .Os
 .Sh NAME
 .Nm viapm
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index 8dc6708..f8d265b 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -507,6 +507,10 @@ specifies a filename.
 .Pq Vt str
 The IPv6 equivalent of
 .Va firewall_flags .
+.It Va firewall_coscripts
+.Pq Vt str
+List of executables and/or rc scripts to run after firewall starts/stops.
+Default is empty.
 .\" ----- firewall_nat_enable setting --------------------------------
 .It Va firewall_nat_enable
 .Pq Vt bool
diff --git a/share/man/man9/VFS.9 b/share/man/man9/VFS.9
index 54bdd0c..30f8918 100644
--- a/share/man/man9/VFS.9
+++ b/share/man/man9/VFS.9
@@ -28,7 +28,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 4, 2010
+.Dd February 9, 2010
 .Os
 .Dt VFS 9
 .Sh NAME
@@ -53,7 +53,6 @@ rather than implementing empty functions or casting to
 .Xr VFS_SYNC 9 ,
 .Xr VFS_UNMOUNT 9 ,
 .Xr VFS_VGET 9 ,
-.Xr VOP_VPTOFH 9 ,
 .Xr vnode 9
 .Sh AUTHORS
 This manual page was written by
diff --git a/share/man/man9/alloc_unr.9 b/share/man/man9/alloc_unr.9
index ee805a3..2ba93e6 100644
--- a/share/man/man9/alloc_unr.9
+++ b/share/man/man9/alloc_unr.9
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 23, 2005
+.Dd February 7, 2010
 .Dt ALLOC_UNR 9
 .Os
 .Sh NAME
@@ -81,7 +81,7 @@ is returned.
 Same as
 .Fn alloc_unr
 except that mutex is assumed to be already locked and thus is not used.
-.It Fn free_unr uh
+.It Fn free_unr uh item
 Free a previously allocated unit number.
 This function may require allocating memory, and thus it can sleep.
 There is no pre-locked variant.
diff --git a/share/man/man9/locking.9 b/share/man/man9/locking.9
index 280140c..843ca6f 100644
--- a/share/man/man9/locking.9
+++ b/share/man/man9/locking.9
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 29, 2010
+.Dd February 10, 2010
 .Dt LOCKING 9
 .Os
 .Sh NAME
@@ -152,7 +152,8 @@ Shared/exclusive locks are similar to reader/writer locks; the main difference
 between them is that shared/exclusive locks may be held during unbounded sleep
 (and may thus perform an unbounded sleep).
 They are inherently less efficient than mutexes, reader/writer locks
-and read-mostly locks.  They don't support priority propagation.
+and read-mostly locks.
+They don't support priority propagation.
 They should be considered to be closely related to
 .Xr sleep 9 .
 In fact it could in some cases be 
@@ -191,13 +192,16 @@ Giant is an instance of a mutex, with some special characteristics:
 .It
 It is recursive.
 .It
-Drivers can request that Giant be locked around them, but this is
-going away.
-.It
-You can sleep while it has recursed, but other recursive locks cannot.
+Drivers and filesystems can request that Giant be locked around them
+by not marking themselves MPSAFE.
+Note that infrastructure to do this is slowly going away as non-MPSAFE
+drivers either became properly locked or disappear.
 .It
 Giant must be locked first before other locks.
 .It
+It is OK to hold Giant while performing unbounded sleep; in such case,
+Giant will be dropped before sleeping and picked up after wakeup.
+.It
 There are places in the kernel that drop Giant and pick it back up
 again.
 Sleep locks will do this before sleeping.
@@ -315,6 +319,9 @@ If any caller above you has any mutex or
 rwlock, your sleep, will cause a panic.
 If the sleep only happens rarely it may be years before the 
 bad code path is found.
+.Pp
+It is an error to do any operation that could result in unbounded sleep when
+running inside an interrupt thread.
 .Ss Interaction table
 The following table shows what you can and can not do if you hold
 one of the synchronization primitives discussed here:
diff --git a/share/man/man9/vnode.9 b/share/man/man9/vnode.9
index b55b19b..96aec73 100644
--- a/share/man/man9/vnode.9
+++ b/share/man/man9/vnode.9
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 20, 2003
+.Dd February 9, 2010
 .Os
 .Dt VNODE 9
 .Sh NAME
@@ -161,6 +161,38 @@ interlock, will cause a LOR (Lock Order Reversal) due to the
 intertwining of VM Objects and Vnodes.
 .Sh SEE ALSO
 .Xr malloc 9 ,
+.Xr VOP_ACCESS 9 ,
+.Xr VOP_ACLCHECK 9 ,
+.Xr VOP_ADVLOCK 9 ,
+.Xr VOP_ATTRIB 9 ,
+.Xr VOP_BWRITE 9 ,
+.Xr VOP_CREATE 9 ,
+.Xr VOP_FSYNC 9 ,
+.Xr VOP_GETACL 9 ,
+.Xr VOP_GETEXTATTR 9 ,
+.Xr VOP_GETPAGES 9 ,
+.Xr VOP_GETVOBJECT 9 ,
+.Xr VOP_INACTIVE 9 ,
+.Xr VOP_IOCTL 9 ,
+.Xr VOP_LINK 9 ,
+.Xr VOP_LISTEXTATTR 9 ,
+.Xr VOP_LOCK 9 ,
+.Xr VOP_LOOKUP 9 ,
+.Xr VOP_OPENCLOSE 9 ,
+.Xr VOP_PATHCONF 9 ,
+.Xr VOP_PRINT 9 ,
+.Xr VOP_RDWR 9 ,
+.Xr VOP_READDIR 9 ,
+.Xr VOP_READLINK 9 ,
+.Xr VOP_REALLOCBLKS 9 ,
+.Xr VOP_REMOVE 9 ,
+.Xr VOP_RENAME 9 ,
+.Xr VOP_REVOKE 9 ,
+.Xr VOP_SETACL 9 ,
+.Xr VOP_SETEXTATTR 9 ,
+.Xr VOP_STRATEGY 9 ,
+.Xr VOP_VPTOCNP 9 ,
+.Xr VOP_VPTOFH 9 ,
 .Xr VFS 9
 .Sh AUTHORS
 This manual page was written by
diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile
index 326f3b4..6bbc989 100644
--- a/share/zoneinfo/Makefile
+++ b/share/zoneinfo/Makefile
@@ -68,7 +68,7 @@ afterinstall:
 				optC="-C ${DESTDIR}"; \
 			fi; \
 			echo "Updating /etc/localtime"; \
-			tzsetup ${optC} -r; \
+			tzsetup $${optC} -r; \
 		fi; \
 	else \
 		echo "Run tzsetup(8) manually to update /etc/localtime."; \