PERFORCE change 158085 for review
Julian Elischer
julian at FreeBSD.org
Sun Feb 22 11:40:02 PST 2009
http://perforce.freebsd.org/chv.cgi?CH=158085
Change 158085 by julian at julian_trafmon1 on 2009/02/22 19:39:29
IFC at 158084
Affected files ...
.. //depot/projects/vimage/src/share/man/man4/geom.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/iwi.4#2 integrate
.. //depot/projects/vimage/src/share/man/man5/src.conf.5#2 integrate
.. //depot/projects/vimage/src/share/man/man9/Makefile#2 integrate
.. //depot/projects/vimage/src/share/man/man9/disk.9#2 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/local_apic.c#16 integrate
.. //depot/projects/vimage/src/sys/amd64/linux32/linux32_machdep.c#16 integrate
.. //depot/projects/vimage/src/sys/arm/conf/AVILA#12 integrate
.. //depot/projects/vimage/src/sys/arm/conf/CAMBRIA#2 integrate
.. //depot/projects/vimage/src/sys/boot/Makefile#8 integrate
.. //depot/projects/vimage/src/sys/boot/Makefile.inc#2 integrate
.. //depot/projects/vimage/src/sys/boot/ficl/mips/sysdep.c#1 branch
.. //depot/projects/vimage/src/sys/boot/ficl/mips/sysdep.h#1 branch
.. //depot/projects/vimage/src/sys/boot/i386/loader/Makefile#5 integrate
.. //depot/projects/vimage/src/sys/boot/ia64/common/Makefile#3 integrate
.. //depot/projects/vimage/src/sys/boot/ia64/efi/Makefile#3 integrate
.. //depot/projects/vimage/src/sys/boot/ia64/ski/Makefile#3 integrate
.. //depot/projects/vimage/src/sys/boot/pc98/loader/Makefile#3 integrate
.. //depot/projects/vimage/src/sys/boot/powerpc/ofw/Makefile#4 integrate
.. //depot/projects/vimage/src/sys/boot/sparc64/loader/Makefile#3 integrate
.. //depot/projects/vimage/src/sys/compat/linux/linux_stats.c#11 integrate
.. //depot/projects/vimage/src/sys/conf/files#55 integrate
.. //depot/projects/vimage/src/sys/conf/files.powerpc#18 integrate
.. //depot/projects/vimage/src/sys/conf/kern.mk#7 integrate
.. //depot/projects/vimage/src/sys/dev/aac/aac.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/aac/aac_debug.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/aac/aac_pci.c#10 integrate
.. //depot/projects/vimage/src/sys/dev/aac/aacreg.h#4 integrate
.. //depot/projects/vimage/src/sys/dev/aac/aacvar.h#5 integrate
.. //depot/projects/vimage/src/sys/dev/acpica/acpi_cpu.c#9 integrate
.. //depot/projects/vimage/src/sys/dev/arcmsr/arcmsr.c#11 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata-all.c#12 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata-all.h#11 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata-card.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata-cbus.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata-disk.c#10 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata-dma.c#9 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata-isa.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata-pci.c#10 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata-pci.h#20 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata-queue.c#9 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata-raid-ddf.h#1 branch
.. //depot/projects/vimage/src/sys/dev/ata/ata-raid.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata-raid.h#4 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata-sata.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata-usb.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/ata/atapi-cd.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/ata/atapi-fd.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/ata/atapi-tape.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-acard.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-acerlabs.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-ahci.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-highpoint.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-intel.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-jmicron.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-marvell.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-netcell.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-nvidia.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-promise.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-serverworks.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-siliconimage.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-sis.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-via.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah_internal.h#5 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ath/if_ath.c#29 integrate
.. //depot/projects/vimage/src/sys/dev/ath/if_athvar.h#17 integrate
.. //depot/projects/vimage/src/sys/dev/cfi/cfi_bus_ixp4xx.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ciss/ciss.c#15 integrate
.. //depot/projects/vimage/src/sys/dev/cx/if_cx.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/firewire/sbp.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/md/md.c#10 integrate
.. //depot/projects/vimage/src/sys/dev/mxge/eth_z8e.h#6 integrate
.. //depot/projects/vimage/src/sys/dev/mxge/ethp_z8e.h#6 integrate
.. //depot/projects/vimage/src/sys/dev/mxge/if_mxge.c#15 integrate
.. //depot/projects/vimage/src/sys/dev/mxge/if_mxge_var.h#10 integrate
.. //depot/projects/vimage/src/sys/dev/mxge/mxge_mcp.h#8 integrate
.. //depot/projects/vimage/src/sys/dev/mxge/rss_eth_z8e.h#4 integrate
.. //depot/projects/vimage/src/sys/dev/mxge/rss_ethp_z8e.h#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/bluetooth/ng_ubt2.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/bluetooth/ubtbcmfw2.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/controller/usb2_bus.h#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/controller/usb2_controller.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_device.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_aue2.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_axe2.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_cdce2.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_cue2.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_kue2.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_rue2.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_udav2.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/image/uscanner2.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/include/Makefile#3 delete
.. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_devid.h#8 delete
.. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_devtable.h#8 delete
.. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_standard.h#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/input/uhid2.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/input/ums2.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/misc/udbp2.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/misc/ufm2.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/quirk/usb2_quirk.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/u3g2.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/uark2.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/ubsa2.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/uchcom2.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/ucycom2.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/ufoma2.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/uftdi2.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/ugensa2.c#9 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/uipaq2.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/ulpt2.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/umct2.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/umodem2.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/umoscom2.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/uplcom2.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/uslcom2.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/uvisor2.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/uvscom2.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/sound/uaudio2.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/storage/ata-usb2.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/storage/umass2.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/storage/urio2.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/storage/ustorage2_fs.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_rum2.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_ural2.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_zyd2.c#6 integrate
.. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs_vnops.c#16 integrate
.. //depot/projects/vimage/src/sys/fs/udf/udf_vnops.c#12 integrate
.. //depot/projects/vimage/src/sys/geom/geom_dev.c#9 integrate
.. //depot/projects/vimage/src/sys/geom/part/g_part.c#15 integrate
.. //depot/projects/vimage/src/sys/geom/part/g_part_bsd.c#10 integrate
.. //depot/projects/vimage/src/sys/geom/part/g_part_ebr.c#2 integrate
.. //depot/projects/vimage/src/sys/geom/part/g_part_if.m#5 integrate
.. //depot/projects/vimage/src/sys/i386/acpica/acpi_wakeup.c#4 integrate
.. //depot/projects/vimage/src/sys/i386/i386/local_apic.c#16 integrate
.. //depot/projects/vimage/src/sys/i386/linux/linux_machdep.c#12 integrate
.. //depot/projects/vimage/src/sys/kern/kern_osd.c#2 integrate
.. //depot/projects/vimage/src/sys/kern/kern_proc.c#23 integrate
.. //depot/projects/vimage/src/sys/kern/tty_pts.c#12 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_cache.c#19 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_syscalls.c#23 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/bluetooth_fw/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/bluetooth_ng/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/core/Makefile#3 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/ethernet_aue/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/ethernet_axe/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/ethernet_cdce/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/ethernet_cue/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/ethernet_dav/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/ethernet_kue/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/ethernet_rue/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/input_hid/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/input_kbd/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/input_ms/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/misc_dbp/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/misc_fm/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/quirk/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/scanner/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/serial_3g/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/serial_ark/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/serial_bsa/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/serial_bser/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/serial_chcom/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/serial_cycom/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/serial_foma/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/serial_ftdi/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/serial_gensa/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/serial_ipaq/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/serial_lpt/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/serial_mct/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/serial_modem/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/serial_moscom/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/serial_plcom/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/serial_slcom/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/serial_visor/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/serial_vscom/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/sound/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/storage_ata/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/storage_fs/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/storage_mass/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/storage_rio/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/template/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/wlan_ral/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/wlan_rum/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/wlan_zyd/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/net80211/_ieee80211.h#13 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211.c#29 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_ioctl.c#20 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_node.c#19 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_phy.c#4 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_proto.c#14 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_regdomain.c#9 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_scan.c#8 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_scan_sta.c#12 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_tdma.c#4 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_constants.h#27 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_header.h#9 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_input.c#31 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_output.c#37 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_output.h#14 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_pcb.c#37 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_structs.h#19 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_uio.h#21 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_usrreq.c#35 integrate
.. //depot/projects/vimage/src/sys/netinet/sctputil.c#36 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfs_vnops.c#28 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfsnode.h#6 integrate
.. //depot/projects/vimage/src/sys/powerpc/aim/machdep.c#8 integrate
.. //depot/projects/vimage/src/sys/powerpc/aim/swtch.S#4 integrate
.. //depot/projects/vimage/src/sys/powerpc/aim/trap.c#4 integrate
.. //depot/projects/vimage/src/sys/powerpc/aim/trap_subr.S#4 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/altivec.h#1 branch
.. //depot/projects/vimage/src/sys/powerpc/include/pcb.h#3 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/pcpu.h#7 integrate
.. //depot/projects/vimage/src/sys/powerpc/powerpc/altivec.c#1 branch
.. //depot/projects/vimage/src/sys/powerpc/powerpc/genassym.c#7 integrate
.. //depot/projects/vimage/src/sys/sys/disk.h#4 integrate
.. //depot/projects/vimage/src/sys/sys/osd.h#2 integrate
.. //depot/projects/vimage/src/sys/sys/param.h#41 integrate
.. //depot/projects/vimage/src/sys/sys/syscallsubr.h#8 integrate
.. //depot/projects/vimage/src/sys/sys/vnode.h#18 integrate
.. //depot/projects/vimage/src/sys/vm/swap_pager.c#16 integrate
.. //depot/projects/vimage/src/sys/vm/vm_object.c#20 integrate
Differences ...
==== //depot/projects/vimage/src/share/man/man4/geom.4#2 (text+ko) ====
@@ -32,7 +32,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/geom.4,v 1.16 2006/05/25 13:39:27 ceri Exp $
+.\" $FreeBSD: src/share/man/man4/geom.4,v 1.17 2009/02/22 13:37:22 trasz Exp $
.\"
.Dd May 25, 2006
.Os
@@ -249,7 +249,7 @@
which will propagate all the way down through the mesh.
It will then detach and destroy its geom.
.It
-The geom whose provider is now attached will destroy the provider,
+The geom whose provider is now detached will destroy the provider,
detach and destroy its consumer and destroy its geom.
.It
This process percolates all the way down through the mesh, until
@@ -431,6 +431,18 @@
.It 0x80 Pq Dv G_F_CTLDUMP
Dump contents of gctl requests.
.El
+.Sh SEE ALSO
+.Xr disk 9 ,
+.Xr DECLARE_GEOM_CLASS 9 ,
+.Xr g_access 9 ,
+.Xr g_attach 9 ,
+.Xr g_bio 9 ,
+.Xr g_consumer 9 ,
+.Xr g_data 9 ,
+.Xr g_event 9 ,
+.Xr g_geom 9 ,
+.Xr g_provider 9 ,
+.Xr g_provider_by_name 9
.Sh HISTORY
This software was developed for the
.Fx
==== //depot/projects/vimage/src/share/man/man4/iwi.4#2 (text+ko) ====
@@ -23,9 +23,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/iwi.4,v 1.20 2008/04/20 20:35:45 sam Exp $
+.\" $FreeBSD: src/share/man/man4/iwi.4,v 1.21 2009/02/22 12:40:58 rpaulo Exp $
.\"
-.Dd Apri 13, 2008
+.Dd April 13, 2008
.Os
.Dt IWI 4
.Sh NAME
==== //depot/projects/vimage/src/share/man/man5/src.conf.5#2 (text) ====
@@ -1,6 +1,6 @@
.\" DO NOT EDIT-- this file is automatically generated.
.\" from FreeBSD: head/tools/build/options/makeman 174548 2007-12-12 16:39:32Z ru
-.\" $FreeBSD: src/share/man/man5/src.conf.5,v 1.31 2008/09/23 16:18:15 sam Exp $
+.\" $FreeBSD: src/share/man/man5/src.conf.5,v 1.32 2009/02/19 13:45:25 mtm Exp $
.Dd September 23, 2008
.Dt SRC.CONF 5
.Os
@@ -62,7 +62,7 @@
.Fl D
option of
.Xr make 1
-or in environment; see
+or in its environment; see
.Xr environ 7 .
.Pp
The values of variables are ignored regardless of their setting;
@@ -463,13 +463,10 @@
runtime linker.
.It Va WITHOUT_LIBPTHREAD
.\" from FreeBSD: head/tools/build/options/WITHOUT_LIBPTHREAD 172498 2007-10-09 17:53:33Z obrien
-Set to not build either of the
+Set to not build the
.Nm libpthread
-providing libraries
-.Nm ( libthr
-(1:1) &
-.Nm libkse
-(M:N)).
+providing library,
+.Nm libthr .
When set, it also enforces the following options:
.Pp
.Bl -item -compact
==== //depot/projects/vimage/src/share/man/man9/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/man/man9/Makefile,v 1.345 2008/12/12 01:08:28 marcus Exp $
+# $FreeBSD: src/share/man/man9/Makefile,v 1.346 2009/02/22 13:38:16 trasz Exp $
MAN= accept_filter.9 \
accf_data.9 \
@@ -575,7 +575,9 @@
devstat.9 devstat_end_transaction.9 \
devstat.9 devstat_remove_entry.9 \
devstat.9 devstat_start_transaction.9
-MLINKS+=disk.9 disk_create.9 \
+MLINKS+=disk.9 disk_alloc.9 \
+ disk.9 disk_create.9 \
+ disk.9 disk_gone.9 \
disk.9 disk_destroy.9
MLINKS+=domain.9 DOMAIN_SET.9 \
domain.9 net_add_domain.9 \
==== //depot/projects/vimage/src/share/man/man9/disk.9#2 (text+ko) ====
@@ -25,7 +25,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
.\" DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man9/disk.9,v 1.10 2007/05/05 17:12:15 pjd Exp $
+.\" $FreeBSD: src/share/man/man9/disk.9,v 1.11 2009/02/22 13:38:16 trasz Exp $
.\"
.Dd February 18, 2004
.Dt DISK 9
@@ -40,6 +40,8 @@
.Ft void
.Fn disk_create "struct disk *disk" "int version"
.Ft void
+.Fn disk_gone "struct disk *disk"
+.Ft void
.Fn disk_destroy "struct disk *disk"
.Sh DESCRIPTION
The disk storage API permits kernel device drivers providing access to
@@ -65,6 +67,11 @@
fill in the fields and call
.Fn disk_create
when the device is ready to service requests.
+.Fn disk_gone
+orphans all of the providers associated with the drive, setting an error
+condition of ENXIO in each one.
+In addition, it prevents a re-taste on last close for writing if an error
+condition has been set in the provider.
After calling
.Fn disk_destroy ,
the device driver is not allowed to access the contents of
==== //depot/projects/vimage/src/sys/amd64/amd64/local_apic.c#16 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.51 2009/01/29 09:22:56 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.52 2009/02/21 23:15:34 jeff Exp $");
#include "opt_hwpmc_hooks.h"
#include "opt_kdtrace.h"
@@ -900,7 +900,13 @@
KASSERT(vector != IDT_SYSCALL, ("Attempt to overwrite syscall entry"));
KASSERT(ioint_handlers[vector / 32] != NULL,
("No ISR handler for vector %u", vector));
+#ifdef notyet
+ /*
+ * We can not currently clear the idt entry because other cpus
+ * may have a valid vector at this offset.
+ */
setidt(vector, &IDTVEC(rsvd), SDT_SYSIGT, SEL_KPL, 0);
+#endif
}
/* Release an APIC vector when it's no longer in use. */
@@ -924,9 +930,11 @@
if (sched_is_bound(td))
panic("apic_free_vector: Thread already bound.\n");
sched_bind(td, apic_cpuid(apic_id));
+ thread_unlock(td);
mtx_lock_spin(&icu_lock);
lapics[apic_id].la_ioint_irqs[vector - APIC_IO_INTS] = 0;
mtx_unlock_spin(&icu_lock);
+ thread_lock(td);
sched_unbind(td);
thread_unlock(td);
==== //depot/projects/vimage/src/sys/amd64/linux32/linux32_machdep.c#16 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.51 2008/11/29 14:55:24 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.52 2009/02/18 16:11:39 kib Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -560,7 +560,7 @@
/* wait for the children to exit, ie. emulate vfork */
PROC_LOCK(p2);
while (p2->p_flag & P_PPWAIT)
- msleep(td->td_proc, &p2->p_mtx, PWAIT, "ppwait", 0);
+ cv_wait(&p2->p_pwait, &p2->p_mtx);
PROC_UNLOCK(p2);
return (0);
@@ -749,7 +749,7 @@
/* wait for the children to exit, ie. emulate vfork */
PROC_LOCK(p2);
while (p2->p_flag & P_PPWAIT)
- msleep(td->td_proc, &p2->p_mtx, PWAIT, "ppwait", 0);
+ cv_wait(&p2->p_pwait, &p2->p_mtx);
PROC_UNLOCK(p2);
}
==== //depot/projects/vimage/src/sys/arm/conf/AVILA#12 (text+ko) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/AVILA,v 1.22 2009/02/03 19:16:04 sam Exp $
+# $FreeBSD: src/sys/arm/conf/AVILA,v 1.23 2009/02/18 01:37:57 sam Exp $
ident AVILA
@@ -88,7 +88,7 @@
device npe_fw
device firmware
device qmgr # Q Manager (required by npe)
-device miibus # NB: required by npe
+device mii # NB: required by npe
device ether
device bpf
==== //depot/projects/vimage/src/sys/arm/conf/CAMBRIA#2 (text+ko) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/CAMBRIA,v 1.2 2008/12/27 19:02:01 sam Exp $
+# $FreeBSD: src/sys/arm/conf/CAMBRIA,v 1.3 2009/02/18 01:37:57 sam Exp $
ident CAMBRIA
@@ -87,7 +87,7 @@
device npe_fw
device firmware
device qmgr # Q Manager (required by npe)
-device miibus # NB: required by npe
+device mii # NB: required by npe
device ether
device bpf
==== //depot/projects/vimage/src/sys/boot/Makefile#8 (text+ko) ====
@@ -1,11 +1,7 @@
-# $FreeBSD: src/sys/boot/Makefile,v 1.38 2008/12/14 02:57:41 nyan Exp $
+# $FreeBSD: src/sys/boot/Makefile,v 1.39 2009/02/19 18:53:08 imp Exp $
.include <bsd.own.mk>
-.if ${MACHINE_ARCH} == "mips"
-MK_FORTH=no # not yet
-.endif
-
.if ${MK_FORTH} != "no"
# Build the add-in FORTH interpreter.
SUBDIR+= ficl
==== //depot/projects/vimage/src/sys/boot/Makefile.inc#2 (text+ko) ====
@@ -1,3 +1,3 @@
-# $FreeBSD: src/sys/boot/Makefile.inc,v 1.1 2008/06/25 21:33:28 ru Exp $
+# $FreeBSD: src/sys/boot/Makefile.inc,v 1.2 2009/02/21 15:04:31 ru Exp $
-WITHOUT_SSP=
+SSP_CFLAGS=
==== //depot/projects/vimage/src/sys/boot/i386/loader/Makefile#5 (text+ko) ====
@@ -1,8 +1,7 @@
-# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.88 2008/11/18 03:55:55 ache Exp $
+# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.89 2009/02/21 15:04:31 ru Exp $
-WITHOUT_SSP=
-
.include <bsd.own.mk>
+MK_SSP= no
PROG= loader.sym
INTERNALPROG=
==== //depot/projects/vimage/src/sys/boot/ia64/common/Makefile#3 (text+ko) ====
@@ -1,8 +1,7 @@
-# $FreeBSD: src/sys/boot/ia64/common/Makefile,v 1.2 2008/06/25 21:33:28 ru Exp $
+# $FreeBSD: src/sys/boot/ia64/common/Makefile,v 1.3 2009/02/21 15:04:31 ru Exp $
-WITHOUT_SSP=
-
.include <bsd.own.mk>
+MK_SSP= no
LIB= ia64
INTERNALLIB=
==== //depot/projects/vimage/src/sys/boot/ia64/efi/Makefile#3 (text+ko) ====
@@ -1,9 +1,9 @@
-# $FreeBSD: src/sys/boot/ia64/efi/Makefile,v 1.29 2008/06/25 21:33:28 ru Exp $
+# $FreeBSD: src/sys/boot/ia64/efi/Makefile,v 1.30 2009/02/21 15:04:31 ru Exp $
NO_MAN=
-WITHOUT_SSP=
.include <bsd.own.mk>
+MK_SSP= no
PROG= loader.sym
INTERNALPROG=
==== //depot/projects/vimage/src/sys/boot/ia64/ski/Makefile#3 (text+ko) ====
@@ -1,9 +1,9 @@
-# $FreeBSD: src/sys/boot/ia64/ski/Makefile,v 1.21 2008/06/25 21:33:28 ru Exp $
+# $FreeBSD: src/sys/boot/ia64/ski/Makefile,v 1.22 2009/02/21 15:04:31 ru Exp $
NO_MAN=
-WITHOUT_SSP=
.include <bsd.own.mk>
+MK_SSP= no
PROG= skiload
STRIP= # We must not strip skiload at install time.
==== //depot/projects/vimage/src/sys/boot/pc98/loader/Makefile#3 (text+ko) ====
@@ -1,8 +1,7 @@
-# $FreeBSD: src/sys/boot/pc98/loader/Makefile,v 1.42 2008/06/25 21:33:28 ru Exp $
+# $FreeBSD: src/sys/boot/pc98/loader/Makefile,v 1.43 2009/02/21 15:04:31 ru Exp $
-WITHOUT_SSP=
-
.include <bsd.own.mk>
+MK_SSP= no
PROG= loader.sym
INTERNALPROG=
==== //depot/projects/vimage/src/sys/boot/powerpc/ofw/Makefile#4 (text+ko) ====
@@ -1,8 +1,7 @@
-# $FreeBSD: src/sys/boot/powerpc/ofw/Makefile,v 1.24 2008/06/25 21:33:28 ru Exp $
+# $FreeBSD: src/sys/boot/powerpc/ofw/Makefile,v 1.25 2009/02/21 15:04:31 ru Exp $
-WITHOUT_SSP=
-
.include <bsd.own.mk>
+MK_SSP= no
PROG= loader
NEWVERSWHAT= "Open Firmware loader" ${MACHINE_ARCH}
==== //depot/projects/vimage/src/sys/boot/sparc64/loader/Makefile#3 (text+ko) ====
@@ -1,8 +1,7 @@
-# $FreeBSD: src/sys/boot/sparc64/loader/Makefile,v 1.21 2008/06/25 21:33:28 ru Exp $
+# $FreeBSD: src/sys/boot/sparc64/loader/Makefile,v 1.22 2009/02/21 15:04:31 ru Exp $
-WITHOUT_SSP=
-
.include <bsd.own.mk>
+MK_SSP= no
PROG= loader
NEWVERSWHAT= "bootstrap loader" sparc64
==== //depot/projects/vimage/src/sys/compat/linux/linux_stats.c#11 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.94 2009/01/28 17:57:16 ed Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.95 2009/02/20 13:05:29 ed Exp $");
#include "opt_compat.h"
#include "opt_mac.h"
@@ -62,6 +62,44 @@
#include <security/mac/mac_framework.h>
+static void
+translate_vnhook_major_minor(struct vnode *vp, struct stat *sb)
+{
+ int major, minor;
+
+ if (vp->v_type == VCHR && vp->v_rdev != NULL &&
+ linux_driver_get_major_minor(vp->v_rdev->si_name,
+ &major, &minor) == 0) {
+ sb->st_rdev = (major << 8 | minor);
+ }
+}
+
+static int
+linux_kern_statat(struct thread *td, int flag, int fd, char *path,
+ enum uio_seg pathseg, struct stat *sbp)
+{
+
+ return (kern_statat_vnhook(td, flag, fd, path, pathseg, sbp,
+ translate_vnhook_major_minor));
+}
+
+static int
+linux_kern_stat(struct thread *td, char *path, enum uio_seg pathseg,
+ struct stat *sbp)
+{
+
+ return (linux_kern_statat(td, 0, AT_FDCWD, path, pathseg, sbp));
+}
+
+static int
+linux_kern_lstat(struct thread *td, char *path, enum uio_seg pathseg,
+ struct stat *sbp)
+{
+
+ return (linux_kern_statat(td, AT_SYMLINK_NOFOLLOW, AT_FDCWD, path,
+ pathseg, sbp));
+}
+
/*
* XXX: This was removed from newstat_copyout(), and almost identical
* XXX: code was in stat64_copyout(). findcdev() needs to be replaced
@@ -102,14 +140,15 @@
translate_fd_major_minor(struct thread *td, int fd, struct stat *buf)
{
struct file *fp;
+ struct vnode *vp;
int major, minor;
if ((!S_ISCHR(buf->st_mode) && !S_ISBLK(buf->st_mode)) ||
fget(td, fd, &fp) != 0)
return;
- if (fp->f_vnode != NULL &&
- fp->f_vnode->v_un.vu_cdev != NULL &&
- linux_driver_get_major_minor(fp->f_vnode->v_un.vu_cdev->si_name,
+ vp = fp->f_vnode;
+ if (vp != NULL && vp->v_rdev != NULL &&
+ linux_driver_get_major_minor(vp->v_rdev->si_name,
&major, &minor) == 0) {
buf->st_rdev = (major << 8 | minor);
} else if (fp->f_type == DTYPE_PTS) {
@@ -124,32 +163,6 @@
fdrop(fp, td);
}
-static void
-translate_path_major_minor_at(struct thread *td, char *path,
- struct stat *buf, int dfd)
-{
- struct proc *p = td->td_proc;
- struct filedesc *fdp = p->p_fd;
- int fd;
- int temp;
-
- if (!S_ISCHR(buf->st_mode) && !S_ISBLK(buf->st_mode))
- return;
- temp = td->td_retval[0];
- if (kern_openat(td, dfd, path, UIO_SYSSPACE, O_RDONLY, 0) != 0)
- return;
- fd = td->td_retval[0];
- td->td_retval[0] = temp;
- translate_fd_major_minor(td, fd, buf);
- fdclose(fdp, fdp->fd_ofiles[fd], fd, td);
-}
-
-static inline void
-translate_path_major_minor(struct thread *td, char *path, struct stat *buf)
-{
- translate_path_major_minor_at(td, path, buf, AT_FDCWD);
-}
-
static int
newstat_copyout(struct stat *buf, void *ubuf)
{
@@ -187,9 +200,7 @@
printf(ARGS(newstat, "%s, *"), path);
#endif
- error = kern_stat(td, path, UIO_SYSSPACE, &buf);
- if (!error)
- translate_path_major_minor(td, path, &buf);
+ error = linux_kern_stat(td, path, UIO_SYSSPACE, &buf);
LFREEPATH(path);
if (error)
return (error);
@@ -210,9 +221,7 @@
printf(ARGS(newlstat, "%s, *"), path);
#endif
- error = kern_lstat(td, path, UIO_SYSSPACE, &sb);
- if (!error)
- translate_path_major_minor(td, path, &sb);
+ error = linux_kern_lstat(td, path, UIO_SYSSPACE, &sb);
LFREEPATH(path);
if (error)
return (error);
@@ -279,12 +288,11 @@
if (ldebug(stat))
printf(ARGS(stat, "%s, *"), path);
#endif
- error = kern_stat(td, path, UIO_SYSSPACE, &buf);
+ error = linux_kern_stat(td, path, UIO_SYSSPACE, &buf);
if (error) {
LFREEPATH(path);
return (error);
}
- translate_path_major_minor(td, path, &buf);
LFREEPATH(path);
return(stat_copyout(&buf, args->up));
}
@@ -302,12 +310,11 @@
if (ldebug(lstat))
printf(ARGS(lstat, "%s, *"), path);
#endif
- error = kern_lstat(td, path, UIO_SYSSPACE, &buf);
+ error = linux_kern_lstat(td, path, UIO_SYSSPACE, &buf);
if (error) {
LFREEPATH(path);
return (error);
}
- translate_path_major_minor(td, path, &buf);
LFREEPATH(path);
return(stat_copyout(&buf, args->up));
}
@@ -526,9 +533,7 @@
printf(ARGS(stat64, "%s, *"), filename);
#endif
- error = kern_stat(td, filename, UIO_SYSSPACE, &buf);
- if (!error)
- translate_path_major_minor(td, filename, &buf);
+ error = linux_kern_stat(td, filename, UIO_SYSSPACE, &buf);
LFREEPATH(filename);
if (error)
return (error);
@@ -549,9 +554,7 @@
printf(ARGS(lstat64, "%s, *"), args->filename);
#endif
- error = kern_lstat(td, filename, UIO_SYSSPACE, &sb);
- if (!error)
- translate_path_major_minor(td, filename, &sb);
+ error = linux_kern_lstat(td, filename, UIO_SYSSPACE, &sb);
LFREEPATH(filename);
if (error)
return (error);
@@ -597,8 +600,7 @@
printf(ARGS(fstatat64, "%i, %s, %i"), args->dfd, path, args->flag);
#endif
- error = kern_statat(td, flag, dfd, path, UIO_SYSSPACE, &buf);
- translate_path_major_minor_at(td, args->pathname, &buf, dfd);
+ error = linux_kern_statat(td, flag, dfd, path, UIO_SYSSPACE, &buf);
if (!error)
error = stat64_copyout(&buf, args->statbuf);
LFREEPATH(path);
==== //depot/projects/vimage/src/sys/conf/files#55 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1370 2009/02/15 03:50:27 marcel Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1371 2009/02/18 06:33:10 thompsa Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -80,12 +80,12 @@
compile-with "${AWK} -f $S/dev/syscons/teken/gensequences $S/dev/syscons/teken/sequences > teken_state.h" \
no-obj no-implicit-rule before-depend \
clean "teken_state.h"
-usbdevs.h optional usb \
+usbdevs.h optional usb | usb2_core \
dependency "$S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \
compile-with "${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs -h" \
no-obj no-implicit-rule before-depend \
clean "usbdevs.h"
-usbdevs_data.h optional usb \
+usbdevs_data.h optional usb | usb2_core \
dependency "$S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \
compile-with "${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs -d" \
no-obj no-implicit-rule before-depend \
==== //depot/projects/vimage/src/sys/conf/files.powerpc#18 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.powerpc,v 1.92 2009/01/25 18:20:15 nwhitehorn Exp $
+# $FreeBSD: src/sys/conf/files.powerpc,v 1.93 2009/02/21 02:15:08 nwhitehorn Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -126,6 +126,7 @@
powerpc/powermac/cuda.c optional powermac cuda
powerpc/powermac/pmu.c optional powermac pmu
powerpc/powermac/macgpio.c optional powermac pci
+powerpc/powerpc/altivec.c optional aim
powerpc/powerpc/atomic.S standard
powerpc/powerpc/autoconf.c standard
powerpc/powerpc/bcopy.c standard
==== //depot/projects/vimage/src/sys/conf/kern.mk#7 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/kern.mk,v 1.57 2008/07/23 06:16:34 imp Exp $
+# $FreeBSD: src/sys/conf/kern.mk,v 1.58 2009/02/22 18:45:30 nwhitehorn Exp $
#
# Warning flags for compiling the kernel and components of the kernel.
@@ -78,9 +78,10 @@
#
# For PowerPC we tell gcc to use floating point emulation. This avoids using
# floating point registers for integer operations which it has a tendency to do.
+# Also explicitly disable Altivec instructions inside the kernel.
#
.if ${MACHINE_ARCH} == "powerpc"
-CFLAGS+= -msoft-float
+CFLAGS+= -msoft-float -mno-altivec
INLINE_LIMIT?= 15000
.endif
==== //depot/projects/vimage/src/sys/dev/aac/aac.c#8 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.138 2008/06/24 03:26:41 emaste Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.140 2009/02/21 15:40:03 attilio Exp $");
/*
* Driver for the Adaptec 'FSA' family of PCI/SCSI RAID adapters.
@@ -71,6 +71,7 @@
static void aac_add_container(struct aac_softc *sc,
struct aac_mntinforesp *mir, int f);
static void aac_get_bus_info(struct aac_softc *sc);
+static void aac_daemon(void *arg);
/* Command Processing */
static void aac_timeout(struct aac_softc *sc);
@@ -292,6 +293,9 @@
TAILQ_INIT(&sc->aac_container_tqh);
TAILQ_INIT(&sc->aac_ev_cmfree);
+ /* Initialize the clock daemon callout. */
+ callout_init_mtx(&sc->aac_daemontime, &sc->aac_io_lock, 0);
+
/*
* Initialize the adapter.
*/
@@ -349,9 +353,34 @@
aac_get_bus_info(sc);
}
+ mtx_lock(&sc->aac_io_lock);
+ callout_reset(&sc->aac_daemontime, 30 * 60 * hz, aac_daemon, sc);
+ mtx_unlock(&sc->aac_io_lock);
+
return(0);
}
+static void
+aac_daemon(void *arg)
+{
+ struct timeval tv;
+ struct aac_softc *sc;
+ struct aac_fib *fib;
+
+ sc = arg;
+ mtx_assert(&sc->aac_io_lock, MA_OWNED);
+
+ if (callout_pending(&sc->aac_daemontime) ||
+ callout_active(&sc->aac_daemontime) == 0)
+ return;
+ getmicrotime(&tv);
+ aac_alloc_sync_fib(sc, &fib);
+ *(uint32_t *)fib->data = tv.tv_sec;
+ aac_sync_fib(sc, SendHostTime, 0, fib, sizeof(uint32_t));
+ aac_release_sync_fib(sc);
+ callout_schedule(&sc->aac_daemontime, 30 * 60 * hz);
+}
+
void
aac_add_event(struct aac_softc *sc, struct aac_event *event)
{
@@ -632,9 +661,12 @@
bus_dma_tag_destroy(sc->aac_parent_dmat);
/* release the register window mapping */
- if (sc->aac_regs_resource != NULL)
+ if (sc->aac_regs_res0 != NULL)
+ bus_release_resource(sc->aac_dev, SYS_RES_MEMORY,
+ sc->aac_regs_rid0, sc->aac_regs_res0);
+ if (sc->aac_hwif == AAC_HWIF_NARK && sc->aac_regs_res1 != NULL)
bus_release_resource(sc->aac_dev, SYS_RES_MEMORY,
- sc->aac_regs_rid, sc->aac_regs_resource);
+ sc->aac_regs_rid1, sc->aac_regs_res1);
}
/*
@@ -654,6 +686,8 @@
if (sc->aac_state & AAC_STATE_OPEN)
return(EBUSY);
+ callout_drain(&sc->aac_daemontime);
+
/* Remove the child containers */
while ((co = TAILQ_FIRST(&sc->aac_container_tqh)) != NULL) {
error = device_delete_child(dev, co->co_disk);
@@ -834,7 +868,7 @@
}
index &= ~2;
for (i = 0; i < sizeof(struct aac_fib)/4; ++i)
- ((u_int32_t *)fib)[i] = AAC_GETREG4(sc, index + i*4);
+ ((u_int32_t *)fib)[i] = AAC_MEM1_GETREG4(sc, index + i*4);
aac_handle_aif(sc, fib);
free(fib, M_AACBUF);
@@ -1754,26 +1788,33 @@
/* Remap mem. resource, if required */
if ((sc->flags & AAC_FLAGS_NEW_COMM) &&
- atu_size > rman_get_size(sc->aac_regs_resource)) {
+ atu_size > rman_get_size(sc->aac_regs_res1)) {
bus_release_resource(
sc->aac_dev, SYS_RES_MEMORY,
- sc->aac_regs_rid, sc->aac_regs_resource);
- sc->aac_regs_resource = bus_alloc_resource(
- sc->aac_dev, SYS_RES_MEMORY, &sc->aac_regs_rid,
+ sc->aac_regs_rid1, sc->aac_regs_res1);
+ sc->aac_regs_res1 = bus_alloc_resource(
+ sc->aac_dev, SYS_RES_MEMORY, &sc->aac_regs_rid1,
0ul, ~0ul, atu_size, RF_ACTIVE);
- if (sc->aac_regs_resource == NULL) {
- sc->aac_regs_resource = bus_alloc_resource_any(
+ if (sc->aac_regs_res1 == NULL) {
+ sc->aac_regs_res1 = bus_alloc_resource_any(
sc->aac_dev, SYS_RES_MEMORY,
- &sc->aac_regs_rid, RF_ACTIVE);
- if (sc->aac_regs_resource == NULL) {
+ &sc->aac_regs_rid1, RF_ACTIVE);
+ if (sc->aac_regs_res1 == NULL) {
device_printf(sc->aac_dev,
"couldn't allocate register window\n");
return (ENXIO);
}
sc->flags &= ~AAC_FLAGS_NEW_COMM;
}
- sc->aac_btag = rman_get_bustag(sc->aac_regs_resource);
- sc->aac_bhandle = rman_get_bushandle(sc->aac_regs_resource);
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list