Date: Sat, 20 May 2006 16:35:26 GMT From: Kip Macy <kmacy@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 97518 for review Message-ID: <200605201635.k4KGZQnI065093@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=97518 Change 97518 by kmacy@kmacy_storage:sun4v_work on 2006/05/20 16:34:37 IFC Affected files ... .. //depot/projects/kmacy_sun4v/src/ObsoleteFiles.inc#4 integrate .. //depot/projects/kmacy_sun4v/src/sbin/rcorder/rcorder.c#3 integrate .. //depot/projects/kmacy_sun4v/src/share/examples/mdoc/example.4#4 integrate .. //depot/projects/kmacy_sun4v/src/share/man/man4/Makefile#4 integrate .. //depot/projects/kmacy_sun4v/src/share/man/man4/acpi_dock.4#1 branch .. //depot/projects/kmacy_sun4v/src/share/man/man4/aha.4#3 integrate .. //depot/projects/kmacy_sun4v/src/share/man/man4/ahb.4#3 integrate .. //depot/projects/kmacy_sun4v/src/share/man/man4/ahc.4#3 integrate .. //depot/projects/kmacy_sun4v/src/share/man/man4/ahd.4#3 integrate .. //depot/projects/kmacy_sun4v/src/share/man/man4/arcmsr.4#3 integrate .. //depot/projects/kmacy_sun4v/src/share/man/man4/ciss.4#3 integrate .. //depot/projects/kmacy_sun4v/src/share/man/man4/hptmv.4#3 integrate .. //depot/projects/kmacy_sun4v/src/share/man/man4/ida.4#3 integrate .. //depot/projects/kmacy_sun4v/src/share/man/man4/if_bridge.4#4 integrate .. //depot/projects/kmacy_sun4v/src/share/man/man4/isp.4#4 integrate .. //depot/projects/kmacy_sun4v/src/share/man/man4/ispfw.4#3 integrate .. //depot/projects/kmacy_sun4v/src/share/man/man4/mlx.4#3 integrate .. //depot/projects/kmacy_sun4v/src/share/man/man4/mly.4#3 integrate .. //depot/projects/kmacy_sun4v/src/share/man/man4/mpt.4#3 integrate .. //depot/projects/kmacy_sun4v/src/share/man/man4/pst.4#3 integrate .. //depot/projects/kmacy_sun4v/src/share/man/man4/trm.4#3 integrate .. //depot/projects/kmacy_sun4v/src/share/man/man4/twa.4#3 integrate .. //depot/projects/kmacy_sun4v/src/share/man/man4/twe.4#3 integrate .. //depot/projects/kmacy_sun4v/src/share/man/man5/nsswitch.conf.5#4 integrate .. //depot/projects/kmacy_sun4v/src/sys/kern/kern_shutdown.c#3 integrate .. //depot/projects/kmacy_sun4v/src/sys/netinet6/udp6_usrreq.c#5 integrate .. //depot/projects/kmacy_sun4v/src/sys/netipsec/key.c#4 integrate .. //depot/projects/kmacy_sun4v/src/tools/build/options/makeman#2 integrate .. //depot/projects/kmacy_sun4v/src/usr.bin/kdump/Makefile#3 integrate .. //depot/projects/kmacy_sun4v/src/usr.bin/kdump/kdump.c#3 integrate .. //depot/projects/kmacy_sun4v/src/usr.bin/kdump/kdump_subr.h#1 branch .. //depot/projects/kmacy_sun4v/src/usr.bin/kdump/mksubr#1 branch Differences ... ==== //depot/projects/kmacy_sun4v/src/ObsoleteFiles.inc#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.36 2006/05/17 09:33:05 phk Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.37 2006/05/20 00:30:06 marcel Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -75,6 +75,8 @@ OLD_FILES+=sbin/ip6fw OLD_FILES+=usr/include/netinet6/ip6_fw.h OLD_FILES+=usr/share/man/man8/ip6fw.8.gz +# 20060424: sab(4) removed +OLD_FILES+=usr/share/man/man4/sab.4.gz # 20060328: remove redundant rc.d script OLD_FILES+=etc/rc.d/ike # 20060127: revert libdisk to static-only ==== //depot/projects/kmacy_sun4v/src/sbin/rcorder/rcorder.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include <sys/types.h> -__FBSDID("$FreeBSD: src/sbin/rcorder/rcorder.c,v 1.2 2006/01/17 08:01:00 dougb Exp $"); +__FBSDID("$FreeBSD: src/sbin/rcorder/rcorder.c,v 1.3 2006/05/20 05:47:18 delphij Exp $"); #include <sys/stat.h> @@ -722,6 +722,10 @@ * is ok, we loop over the filenodes requirements, calling satisfy_req() * for each of them.. once we have done this, remove this filenode * from each provision table, as we are now done. + * + * NOTE: do_file() is called recursively from several places and cannot + * safely free() anything related to items that may be recursed on. + * Circular dependancies will cause problems if we do. */ void do_file(fnode) @@ -757,8 +761,10 @@ r_tmp = r; satisfy_req(r, fnode->filename); r = r->next; +#if 0 if (was_set == 0) - free(r_tmp); + free(r_tmp); +#endif } fnode->req_list = NULL; @@ -797,10 +803,12 @@ } DPRINTF((stderr, "nuking %s\n", fnode->filename)); +#if 0 if (was_set == 0) { free(fnode->filename); free(fnode); } +#endif } void ==== //depot/projects/kmacy_sun4v/src/share/examples/mdoc/example.4#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/examples/mdoc/example.4,v 1.22 2006/04/01 10:10:36 brueffer Exp $ +.\" $FreeBSD: src/share/examples/mdoc/example.4,v 1.23 2006/05/20 09:49:05 brueffer Exp $ .\" .\" Note: The date here should be updated whenever a non-trivial .\" change is made to the manual page. @@ -100,7 +100,7 @@ .Sh HISTORY The .Nm -manual page example first appeared in +device driver first appeared in .Fx 2.2 . .Pp Some other common ==== //depot/projects/kmacy_sun4v/src/share/man/man4/Makefile#4 (text+ko) ==== @@ -1,8 +1,9 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.350 2006/05/17 09:33:06 phk Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.351 2006/05/20 06:21:42 brueffer Exp $ MAN= aac.4 \ acpi.4 \ + ${_acpi_dock.4} \ acpi_thermal.4 \ acpi_video.4 \ adv.4 \ @@ -498,6 +499,7 @@ MLINKS+=xl.4 if_xl.4 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" +_acpi_dock.4= acpi_dock.4 _amdsmb.4= amdsmb.4 _if_nve.4= if_nve.4 _ipmi.4= ipmi.4 ==== //depot/projects/kmacy_sun4v/src/share/man/man4/aha.4#3 (text+ko) ==== @@ -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: src/share/man/man4/aha.4,v 1.26 2005/01/21 08:36:36 ru Exp $ +.\" $FreeBSD: src/share/man/man4/aha.4,v 1.27 2006/05/20 09:39:28 brueffer Exp $ .\" .Dd July 4, 2004 .Dt AHA 4 @@ -33,8 +33,20 @@ .Nm aha .Nd Adaptec SCSI host adapter driver .Sh SYNOPSIS -.Cd device aha -.Cd device scbus +To compile this driver into the kernel, +place the following lines in your +kernel configuration file: +.Bd -ragged -offset indent +.Cd "device scbus" +.Cd "device aha" +.Ed +.Pp +Alternatively, to load the driver as a +module at boot time, place the following line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +aha_load="YES" +.Ed .Pp In .Pa /boot/device.hints : ==== //depot/projects/kmacy_sun4v/src/share/man/man4/ahb.4#3 (text+ko) ==== @@ -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: src/share/man/man4/ahb.4,v 1.23 2004/07/04 14:17:41 simon Exp $ +.\" $FreeBSD: src/share/man/man4/ahb.4,v 1.24 2006/05/20 09:39:28 brueffer Exp $ .\" .Dd July 4, 2004 .Dt AHB 4 @@ -33,8 +33,20 @@ .Nm ahb .Nd Adaptec EISA SCSI host adapter driver .Sh SYNOPSIS -.Cd device ahb -.Cd device scbus +To compile this driver into the kernel, +place the following lines in your +kernel configuration file: +.Bd -ragged -offset indent +.Cd "device scbus" +.Cd "device ahb" +.Ed +.Pp +Alternatively, to load the driver as a +module at boot time, place the following line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +ahb_load="YES" +.Ed .Sh DESCRIPTION This driver provides access to the .Tn SCSI ==== //depot/projects/kmacy_sun4v/src/share/man/man4/ahc.4#3 (text+ko) ==== @@ -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: src/share/man/man4/ahc.4,v 1.38 2005/01/21 08:36:36 ru Exp $ +.\" $FreeBSD: src/share/man/man4/ahc.4,v 1.39 2006/05/20 09:39:28 brueffer Exp $ .\" .Dd July 4, 2004 .Dt AHC 4 @@ -33,22 +33,35 @@ .Nm ahc .Nd Adaptec VL/EISA/PCI SCSI host adapter driver .Sh SYNOPSIS +To compile this driver into the kernel, +place the following lines in your +kernel configuration file: +.Bd -ragged -offset indent +.Cd "device scbus" +.Cd "device ahc" +.Pp For one or more VL/EISA cards: -.Cd device eisa -.Cd device ahc +.Cd "device eisa" .Pp For one or more PCI cards: -.Cd device pci -.Cd device ahc +.Cd "device pci" .Pp To allow PCI adapters to use memory mapped I/O if enabled: .Cd options AHC_ALLOW_MEMIO .Pp To configure one or more controllers to assume the target role: .Cd options AHC_TMODE_ENABLE <bitmask of units> +.Ed .Pp -For one or more SCSI busses: -.Cd device scbus +Alternatively, to load the driver as a +module at boot time, place the following lines in +.Xr loader.conf 5 : +.Bd -literal -offset indent +ahc_load="YES" +ahc_eisa_load="YES" +ahc_isa_load="YES" +ahc_pci_load="YES" +.Ed .Sh DESCRIPTION This driver provides access to the .Tn SCSI ==== //depot/projects/kmacy_sun4v/src/share/man/man4/ahd.4#3 (text+ko) ==== @@ -26,7 +26,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: src/share/man/man4/ahd.4,v 1.6 2005/01/21 08:36:37 ru Exp $ +.\" $FreeBSD: src/share/man/man4/ahd.4,v 1.7 2006/05/20 09:39:28 brueffer Exp $ .\" .Dd July 4, 2004 .Dt AHD 4 @@ -35,29 +35,28 @@ .Nm ahd .Nd Adaptec PCI/PCI-X Ultra320 SCSI host adapter driver .Sh SYNOPSIS -For one or more PCI/PCI-X cards: -.Bd -ragged -offset indent -compact -.Cd device pci -.Cd device ahd -.Ed +To compile this driver into the kernel, +place the following lines in your +kernel configuration file: +.Bd -ragged -offset indent +.Cd "device pci" +.Cd "device scbus" +.Cd "device ahd" .Pp To compile in debugging code: -.Bd -ragged -offset indent -compact .Cd options AHD_DEBUG .Cd options AHD_DEBUG_OPTS=<bitmask of options> .Cd options AHD_REG_PRETTY_PRINT -.Ed .Pp To configure one or more controllers to assume the target role: -.Bd -ragged -offset indent -compact .Cd options AHD_TMODE_ENABLE=<bitmask of units> .Ed .Pp -For one or more -.Tn SCSI -busses: -.Bd -ragged -offset indent -compact -.Cd device scbus +Alternatively, to load the driver as a +module at boot time, place the following line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +ahd_load="YES" .Ed .Sh DESCRIPTION This driver provides access to the ==== //depot/projects/kmacy_sun4v/src/share/man/man4/arcmsr.4#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/arcmsr.4,v 1.3 2005/04/01 10:36:09 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/arcmsr.4,v 1.4 2006/05/20 09:39:28 brueffer Exp $ .\" .Dd March 31, 2005 .Dt ARCMSR 4 @@ -31,10 +31,22 @@ .Nm arcmsr .Nd Areca SATA II RAID Controller driver .Sh SYNOPSIS -.Cd "device arcmsr" +To compile this driver into the kernel, +place the following lines in your +kernel configuration file: +.Bd -ragged -offset indent .Cd "device pci" .Cd "device scbus" .Cd "device da" +.Cd "device arcmsr" +.Ed +.Pp +Alternatively, to load the driver as a +module at boot time, place the following line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +arcmsr_load="YES" +.Ed .Sh DESCRIPTION The .Nm ==== //depot/projects/kmacy_sun4v/src/share/man/man4/ciss.4#3 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/share/man/man4/ciss.4,v 1.13 2005/11/11 16:45:33 ps Exp $ +.\" $FreeBSD: src/share/man/man4/ciss.4,v 1.14 2006/05/20 09:39:28 brueffer Exp $ .\" Written by Tom Rhodes .\" This file is in the public domain. .\" @@ -9,8 +9,20 @@ .Nm ciss .Nd Common Interface for SCSI-3 Support driver .Sh SYNOPSIS +To compile this driver into the kernel, +place the following lines in your +kernel configuration file: +.Bd -ragged -offset indent .Cd "device scbus" .Cd "device ciss" +.Ed +.Pp +Alternatively, to load the driver as a +module at boot time, place the following line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +ciss_load="YES" +.Ed .Sh DESCRIPTION The .Nm ==== //depot/projects/kmacy_sun4v/src/share/man/man4/hptmv.4#3 (text+ko) ==== @@ -22,7 +22,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: src/share/man/man4/hptmv.4,v 1.6 2005/11/17 16:43:56 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/hptmv.4,v 1.7 2006/05/20 09:39:28 brueffer Exp $ .\" .Dd November 17, 2005 .Dt HPTMV 4 @@ -31,7 +31,19 @@ .Nm hptmv .Nd "HighPoint RocketRAID 182x device driver" .Sh SYNOPSIS +To compile this driver into the kernel, +place the following line in your +kernel configuration file: +.Bd -ragged -offset indent .Cd "device hptmv" +.Ed +.Pp +Alternatively, to load the driver as a +module at boot time, place the following line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +hptmv_load="YES" +.Ed .Sh DESCRIPTION The .Nm ==== //depot/projects/kmacy_sun4v/src/share/man/man4/ida.4#3 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/share/man/man4/ida.4,v 1.6 2005/01/12 10:14:42 ru Exp $ +.\" $FreeBSD: src/share/man/man4/ida.4,v 1.7 2006/05/20 09:39:28 brueffer Exp $ .\" Written by Tom Rhodes .\" This file is public domain .\" @@ -9,8 +9,20 @@ .Nm ida .Nd Compaq Intelligent Drive Array Controllers .Sh SYNOPSIS -.Cd device scbus -.Cd device ida +To compile this driver into the kernel, +place the following lines in your +kernel configuration file: +.Bd -ragged -offset indent +.Cd "device scbus" +.Cd "device ida" +.Ed +.Pp +Alternatively, to load the driver as a +module at boot time, place the following line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +ida_load="YES" +.Ed .Sh DESCRIPTION The Compaq Intelligent Drive Array (IDA) technology is used to distribute data across an array of hard drives. ==== //depot/projects/kmacy_sun4v/src/share/man/man4/if_bridge.4#4 (text+ko) ==== @@ -33,7 +33,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/if_bridge.4,v 1.16 2006/04/29 01:19:08 thompsa Exp $ +.\" $FreeBSD: src/share/man/man4/if_bridge.4,v 1.17 2006/05/20 10:19:53 brueffer Exp $ .\" .Dd June 10, 2005 .Dt IF_BRIDGE 4 @@ -241,6 +241,7 @@ driver first appeared in .Fx 6.0 . .Sh AUTHORS +.An -nosplit The .Nm bridge driver was originally written by ==== //depot/projects/kmacy_sun4v/src/share/man/man4/isp.4#4 (text+ko) ==== @@ -27,7 +27,7 @@ .\" .\" Additional Copyright (c) 2006 by Marcus Alves Grando .\" -.\" $FreeBSD: src/share/man/man4/isp.4,v 1.22 2006/05/17 13:17:02 csjp Exp $ +.\" $FreeBSD: src/share/man/man4/isp.4,v 1.23 2006/05/20 09:39:28 brueffer Exp $ .\" .Dd February 6, 2006 .Dt ISP 4 @@ -36,10 +36,20 @@ .Nm isp .Nd Qlogic based SCSI and FibreChannel SCSI Host Adapters .Sh SYNOPSIS +To compile this driver into the kernel, +place the following lines in your +kernel configuration file: +.Bd -ragged -offset indent +.Cd "device scbus" .Cd "device isp" +.Ed .Pp -For one or more SCSI busses: -.Cd device scbus0 +Alternatively, to load the driver as a +module at boot time, place the following line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +isp_load="YES" +.Ed .Sh DESCRIPTION This driver provides access to .Tn SCSI @@ -67,7 +77,7 @@ Fabric support is enabled by default (but may be contingent upon the correct firmware being loaded). .Sh FIRMWARE -Firmware is now available if the +Firmware is available if the .Xr ispfw 4 module is loaded during bootstrap (q.v.). .Pp ==== //depot/projects/kmacy_sun4v/src/share/man/man4/ispfw.4#3 (text+ko) ==== @@ -20,7 +20,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: src/share/man/man4/ispfw.4,v 1.6 2005/02/09 18:07:16 ru Exp $ +.\" $FreeBSD: src/share/man/man4/ispfw.4,v 1.7 2006/05/20 09:39:28 brueffer Exp $ .\" .Dd July 20, 2000 .Dt ISPFW 4 @@ -29,7 +29,19 @@ .Nm ispfw .Nd "Firmware Module for Qlogic based SCSI and FibreChannel SCSI Host Adapters" .Sh SYNOPSIS +To compile this driver into the kernel, +place the following line in your +kernel configuration file: +.Bd -ragged -offset indent .Cd "device ispfw" +.Ed +.Pp +Alternatively, to load the driver as a +module at boot time, place the following line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +ispfw_load="YES" +.Ed .Sh DESCRIPTION This trivial driver provides access to firmware sets for the Qlogic based SCSI and FibreChannel SCSI Host Adapters. ==== //depot/projects/kmacy_sun4v/src/share/man/man4/mlx.4#3 (text+ko) ==== @@ -23,7 +23,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: src/share/man/man4/mlx.4,v 1.18 2005/01/21 08:36:37 ru Exp $ +.\" $FreeBSD: src/share/man/man4/mlx.4,v 1.19 2006/05/20 09:39:28 brueffer Exp $ .\" .Dd August 10, 2004 .Dt MLX 4 @@ -32,8 +32,20 @@ .Nm mlx .Nd Mylex DAC-family RAID driver .Sh SYNOPSIS -.Cd device pci -.Cd device mlx +To compile this driver into the kernel, +place the following lines in your +kernel configuration file: +.Bd -ragged -offset indent +.Cd "device pci" +.Cd "device mlx" +.Ed +.Pp +Alternatively, to load the driver as a +module at boot time, place the following line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +mlx_load="YES" +.Ed .Sh DESCRIPTION The .Nm ==== //depot/projects/kmacy_sun4v/src/share/man/man4/mly.4#3 (text+ko) ==== @@ -22,7 +22,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: src/share/man/man4/mly.4,v 1.9 2005/01/21 08:36:37 ru Exp $ +.\" $FreeBSD: src/share/man/man4/mly.4,v 1.10 2006/05/20 09:39:28 brueffer Exp $ .\" .Dd August 10, 2004 .Dt MLY 4 @@ -31,10 +31,22 @@ .Nm mly .Nd Mylex AcceleRAID/eXtremeRAID family driver .Sh SYNOPSIS -.Cd device pci -.Cd device mly -.Cd device scbus -.Cd device da +To compile this driver into the kernel, +place the following lines in your +kernel configuration file: +.Bd -ragged -offset indent +.Cd "device pci" +.Cd "device scbus" +.Cd "device da" +.Cd "device mly" +.Ed +.Pp +Alternatively, to load the driver as a +module at boot time, place the following line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +mly_load="YES" +.Ed .Sh DESCRIPTION The .Nm ==== //depot/projects/kmacy_sun4v/src/share/man/man4/mpt.4#3 (text+ko) ==== @@ -33,7 +33,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/mpt.4,v 1.9 2006/01/13 17:41:41 jkoshy Exp $ +.\" $FreeBSD: src/share/man/man4/mpt.4,v 1.10 2006/05/20 09:39:28 brueffer Exp $ .\" .Dd August 15, 2004 .Dt MPT 4 @@ -42,8 +42,20 @@ .Nm mpt .Nd LSI Fusion-MPT SCSI/Fibre Channel driver .Sh SYNOPSIS +To compile this driver into the kernel, +place the following lines in your +kernel configuration file: +.Bd -ragged -offset indent +.Cd "device scbus" .Cd "device mpt" -.Cd "device scbus" +.Ed +.Pp +Alternatively, to load the driver as a +module at boot time, place the following line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +mpt_load="YES" +.Ed .Sh DESCRIPTION The .Nm ==== //depot/projects/kmacy_sun4v/src/share/man/man4/pst.4#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/pst.4,v 1.4 2004/12/14 22:20:41 simon Exp $ +.\" $FreeBSD: src/share/man/man4/pst.4,v 1.5 2006/05/20 09:39:28 brueffer Exp $ .\" .Dd December 14, 2004 .Dt PST 4 @@ -32,7 +32,19 @@ .Nm pst .Nd device driver for Promise Supertrak SX6000 .Sh SYNOPSIS -.Cd device pst +To compile this driver into the kernel, +place the following line in your +kernel configuration file: +.Bd -ragged -offset indent +.Cd "device pst" +.Ed +.Pp +Alternatively, to load the driver as a +module at boot time, place the following line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +pst_load="YES" +.Ed .Sh DESCRIPTION This driver is for the Promise Supertrak SX6000 ATA hardware RAID controller. It supports (in hardware) RAID levels 0, 1, 0+1, 3, 5 and JBOD on up to ==== //depot/projects/kmacy_sun4v/src/share/man/man4/trm.4#3 (text+ko) ==== @@ -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. .\" -.\" $FreeBSD: src/share/man/man4/trm.4,v 1.6 2004/08/15 19:48:27 simon Exp $ +.\" $FreeBSD: src/share/man/man4/trm.4,v 1.7 2006/05/20 09:39:28 brueffer Exp $ .\" .Dd December 8, 2002 .Dt TRM 4 @@ -34,7 +34,20 @@ .Nm trm .Nd Tekram TRM-S1040 ASIC based PCI SCSI host adapter driver .Sh SYNOPSIS +To compile this driver into the kernel, +place the following lines in your +kernel configuration file: +.Bd -ragged -offset indent +.Cd "device scbus" .Cd "device trm" +.Ed +.Pp +Alternatively, to load the driver as a +module at boot time, place the following line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +trm_load="YES" +.Ed .Sh DESCRIPTION The .Nm ==== //depot/projects/kmacy_sun4v/src/share/man/man4/twa.4#3 (text+ko) ==== @@ -23,7 +23,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: src/share/man/man4/twa.4,v 1.6 2006/02/20 19:42:04 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/twa.4,v 1.7 2006/05/20 09:39:28 brueffer Exp $ .\" .Dd February 20, 2006 .Dt TWA 4 @@ -32,7 +32,20 @@ .Nm twa .Nd 3ware 9000/9500/9550 series SATA RAID controllers driver .Sh SYNOPSIS +To compile this driver into the kernel, +place the following lines in your +kernel configuration file: +.Bd -ragged -offset indent +.Cd "device scbus" .Cd "device twa" +.Ed +.Pp +Alternatively, to load the driver as a +module at boot time, place the following line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +twa_load="YES" +.Ed .Sh DESCRIPTION The .Nm ==== //depot/projects/kmacy_sun4v/src/share/man/man4/twe.4#3 (text+ko) ==== @@ -22,7 +22,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: src/share/man/man4/twe.4,v 1.16 2005/08/06 13:05:45 hmp Exp $ +.\" $FreeBSD: src/share/man/man4/twe.4,v 1.17 2006/05/20 09:39:28 brueffer Exp $ .\" .Dd August 15, 2004 .Dt TWE 4 @@ -31,8 +31,20 @@ .Nm twe .Nd 3ware 5000/6000/7000/8000 series PATA/SATA RAID adapter driver .Sh SYNOPSIS -.Cd device pci -.Cd device twe +To compile this driver into the kernel, +place the following lines in your +kernel configuration file: +.Bd -ragged -offset indent +.Cd "device pci" +.Cd "device twe" +.Ed +.Pp +Alternatively, to load the driver as a +module at boot time, place the following line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +twe_load="YES" +.Ed .Sh DESCRIPTION The .Nm ==== //depot/projects/kmacy_sun4v/src/share/man/man5/nsswitch.conf.5#4 (text+ko) ==== @@ -31,9 +31,9 @@ .\" 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: src/share/man/man5/nsswitch.conf.5,v 1.14 2006/03/17 18:54:34 ru Exp $ +.\" $FreeBSD: src/share/man/man5/nsswitch.conf.5,v 1.16 2006/05/20 06:58:46 maxim Exp $ .\" -.Dd April 24, 2005 +.Dd May 20, 2006 .Dt NSSWITCH.CONF 5 .Os .Sh NAME @@ -48,9 +48,9 @@ .Pp The configuration file controls how a process looks up various databases containing information regarding hosts, users (passwords), groups, etc. -Each database comes from a source (such as local files, DNS, and -.Tn NIS ) , -and the order to look up the sources is specified in +Each database comes from a source (such as local files, DNS, +.Tn NIS , +and cache), and the order to look up the sources is specified in .Nm . .Pp Each entry in @@ -93,6 +93,10 @@ .Dq group databases. If this is present, it must be the only source for that entry. +.It cache +makes use of the +.Xr cached 8 +daemon. .El .Ss Databases The following databases are used by the following C library functions: @@ -110,6 +114,12 @@ .Xr getpwent 3 .It shells .Xr getusershell 3 +.It services +.Xr getservent 3 +.It rpc +.Xr getrpcent 3 +.It proto +.Xr getprotobyname 3 .El .Ss Status codes The following status codes are available: @@ -177,6 +187,25 @@ .Dq success , and continue on anything else (i.e, .Li "[success=return notfound=continue unavail=continue tryagain=continue]" ) . +.Ss Cache +You can enable caching for the particular database by specifying +.Dq cache +as the first source in the +.Xr nsswitch.conf 5 +file. +You should also enable caching for this database in +.Xr cached.conf 5 . +If for the particular query +.Dq cache +source returns success, no further sources are queried. +On the other hand, if there are no previously cached data, the +query result will be placed into the cache right after +all other sources are processed. +Note, that +.Dq cache +requires +.Xr cached 8 +daemon to be running. .Ss Compat mode: +/- syntax In historical multi-source implementations, the .Sq + @@ -231,7 +260,7 @@ for the requested database. Exceptions are: .Pp -.Bl -tag -width passwd_compat -compact +.Bl -tag -width services_compat -compact .It Sy Database .Sy "Default source list" .It group @@ -244,6 +273,10 @@ compat .It passwd_compat nis +.It services +compat +.It services_compat +nis .El .Sh FILES .Bl -tag -width /etc/nsswitch.conf -compact @@ -254,7 +287,7 @@ .Pa /etc . .El .Sh EXAMPLES -To lookup hosts in +To lookup hosts in cache, then in .Pa /etc/hosts and then from the DNS, and lookup user information from .Tn NIS @@ -262,7 +295,7 @@ .Pp .Bl -tag -width passwd: -compact .It hosts: -files dns +cache files dns .It passwd: nis [notfound=return] files .It group: @@ -282,7 +315,9 @@ entries. .Sh SEE ALSO .Xr nsdispatch 3 , +.Xr cached.conf 5 , .Xr resolv.conf 5 , +.Xr cached 8 , .Xr named 8 , .Xr ypbind 8 .Sh HISTORY ==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_shutdown.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/kern_shutdown.c,v 1.177 2006/02/06 10:12:00 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_shutdown.c,v 1.178 2006/04/10 10:03:40 pjd Exp $"); #include "opt_kdb.h" #include "opt_mac.h" @@ -68,6 +68,12 @@ #include <machine/pcb.h> #include <machine/smp.h> +#include <vm/vm.h> +#include <vm/vm_object.h> +#include <vm/vm_page.h> +#include <vm/vm_pager.h> +#include <vm/swap_pager.h> + #include <sys/signalvar.h> #ifndef PANIC_REBOOT_WAIT_TIME @@ -384,6 +390,7 @@ if (panicstr == 0) vfs_unmountall(); } + swapoff_all(); DELAY(100000); /* wait for console output to finish */ } ==== //depot/projects/kmacy_sun4v/src/sys/netinet6/udp6_usrreq.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/udp6_usrreq.c,v 1.64 2006/05/01 21:39:48 rwatson Exp $ */ +/* $FreeBSD: src/sys/netinet6/udp6_usrreq.c,v 1.65 2006/05/20 13:26:08 bz Exp $ */ /* $KAME: udp6_usrreq.c,v 1.27 2001/05/21 05:45:10 jinmei Exp $ */ /*- @@ -584,8 +584,10 @@ if (IN6_IS_ADDR_V4MAPPED(&sin6_p->sin6_addr)) { struct sockaddr_in sin; - if (inp->inp_faddr.s_addr != INADDR_ANY) - return EISCONN; + if (inp->inp_faddr.s_addr != INADDR_ANY) { + error = EISCONN; + goto out; + } in6_sin6_2_sin(&sin, sin6_p); error = in_pcbconnect(inp, (struct sockaddr *)&sin, td->td_ucred); ==== //depot/projects/kmacy_sun4v/src/sys/netipsec/key.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netipsec/key.c,v 1.21 2006/03/25 13:38:52 gnn Exp $ */ +/* $FreeBSD: src/sys/netipsec/key.c,v 1.22 2006/05/20 15:35:36 pjd Exp $ */ /* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */ /*- @@ -54,6 +54,7 @@ #include <sys/errno.h> #include <sys/proc.h> #include <sys/queue.h> +#include <sys/refcount.h> #include <sys/syslog.h> #include <net/if.h> @@ -502,14 +503,26 @@ static void key_sa_chgstate __P((struct secasvar *, u_int8_t)); static struct mbuf *key_alloc_mbuf __P((int)); -#define SA_ADDREF(p) do { \ - (p)->refcnt++; \ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200605201635.k4KGZQnI065093>