Date: Tue, 22 Sep 2009 16:27:21 GMT From: Hans Petter Selasky <hselasky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 168781 for review Message-ID: <200909221627.n8MGRLeC065908@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=168781 Change 168781 by hselasky@hselasky_laptop001 on 2009/09/22 16:26:34 IFC @ 168777 Affected files ... .. //depot/projects/usb/src/sys/amd64/amd64/identcpu.c#17 integrate .. //depot/projects/usb/src/sys/amd64/amd64/initcpu.c#7 integrate .. //depot/projects/usb/src/sys/amd64/amd64/msi.c#11 integrate .. //depot/projects/usb/src/sys/amd64/amd64/pmap.c#30 integrate .. //depot/projects/usb/src/sys/amd64/amd64/trap.c#17 integrate .. //depot/projects/usb/src/sys/amd64/conf/NOTES#21 integrate .. //depot/projects/usb/src/sys/amd64/include/_align.h#1 branch .. //depot/projects/usb/src/sys/amd64/include/param.h#9 integrate .. //depot/projects/usb/src/sys/amd64/include/specialreg.h#15 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_proto.h#10 integrate .. //depot/projects/usb/src/sys/arm/include/_align.h#1 branch .. //depot/projects/usb/src/sys/arm/include/param.h#5 integrate .. //depot/projects/usb/src/sys/boot/i386/libi386/pxe.c#3 integrate .. //depot/projects/usb/src/sys/boot/pc98/Makefile.inc#4 integrate .. //depot/projects/usb/src/sys/cam/cam_xpt.c#22 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_cd.c#11 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_target.c#7 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#5 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#7 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/proc.h#4 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/vfs.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#8 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#8 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#9 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#8 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#14 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#8 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_misc.c#21 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_proto.h#20 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_ioctl.c#19 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_misc.c#23 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_proto.h#5 integrate .. //depot/projects/usb/src/sys/conf/NOTES#46 integrate .. //depot/projects/usb/src/sys/conf/files#79 integrate .. //depot/projects/usb/src/sys/conf/files.amd64#24 integrate .. //depot/projects/usb/src/sys/conf/files.i386#29 integrate .. //depot/projects/usb/src/sys/conf/newvers.sh#12 integrate .. //depot/projects/usb/src/sys/conf/options#40 integrate .. //depot/projects/usb/src/sys/conf/options.amd64#10 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/acpica_prep.sh#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/changes.txt#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/common/dmrestag.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/common/dmtable.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/common/dmtbdump.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/common/dmtbinfo.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslcompiler.l#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslcompiler.y#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/asldefine.h#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslfiles.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslglobal.h#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslload.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/asllookup.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslmain.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslmap.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslstubs.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/asltypes.h#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/debugger/dbcmds.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/debugger/dbdisply.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/debugger/dbexec.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/dispatcher/dsfield.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/dispatcher/dsmethod.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/dispatcher/dsobject.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/dispatcher/dswload.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evgpe.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evgpeblk.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evrgnini.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exconfig.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exfield.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exfldio.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exstorob.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exutils.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/hardware/hwgpe.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/hardware/hwregs.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/hardware/hwsleep.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/hardware/hwtimer.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/hardware/hwxface.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acconfig.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acdebug.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acdisasm.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acglobal.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/achware.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acinterp.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/aclocal.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acmacros.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acnamesp.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acobject.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acparser.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acpixf.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acpredef.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/actbl.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/actbl1.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/actbl2.h#1 branch .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/actypes.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acutils.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/amlcode.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsalloc.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nseval.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsinit.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsload.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nspredef.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsrepair.c#1 branch .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsxfeval.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsxfname.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/parser/psloop.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/parser/psxface.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/tables/tbutils.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/uteval.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utglobal.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utids.c#1 branch .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utinit.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utmisc.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utxface.c#2 integrate .. //depot/projects/usb/src/sys/contrib/x86emu/x86emu.c#1 branch .. //depot/projects/usb/src/sys/contrib/x86emu/x86emu.h#1 branch .. //depot/projects/usb/src/sys/contrib/x86emu/x86emu_regs.h#1 branch .. //depot/projects/usb/src/sys/contrib/x86emu/x86emu_util.c#1 branch .. //depot/projects/usb/src/sys/dev/aac/aac.c#10 integrate .. //depot/projects/usb/src/sys/dev/aac/aacvar.h#5 integrate .. //depot/projects/usb/src/sys/dev/acpi_support/acpi_ibm.c#9 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi.c#22 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_cpu.c#13 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_pcib_acpi.c#8 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpivar.h#11 integrate .. //depot/projects/usb/src/sys/dev/ae/if_ae.c#5 integrate .. //depot/projects/usb/src/sys/dev/agp/agp_i810.c#9 integrate .. //depot/projects/usb/src/sys/dev/amdtemp/amdtemp.c#4 integrate .. //depot/projects/usb/src/sys/dev/amr/amr.c#11 integrate .. //depot/projects/usb/src/sys/dev/asmc/asmc.c#8 integrate .. //depot/projects/usb/src/sys/dev/asmc/asmcvar.h#5 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-raid.c#10 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-acerlabs.c#6 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-marvell.c#8 integrate .. //depot/projects/usb/src/sys/dev/ath/ah_osdep.c#10 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah.c#8 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah_eeprom_v3.c#2 integrate .. //depot/projects/usb/src/sys/dev/ath/if_ath.c#32 integrate .. //depot/projects/usb/src/sys/dev/atkbdc/atkbd.c#5 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bce.c#22 integrate .. //depot/projects/usb/src/sys/dev/ciss/ciss.c#17 integrate .. //depot/projects/usb/src/sys/dev/ciss/cissreg.h#4 integrate .. //depot/projects/usb/src/sys/dev/ciss/cissvar.h#5 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_sge.c#19 integrate .. //depot/projects/usb/src/sys/dev/dpms/dpms.c#1 branch .. //depot/projects/usb/src/sys/dev/drm/drm_pciids.h#11 integrate .. //depot/projects/usb/src/sys/dev/drm/r600_blit.c#2 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_em.c#13 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_igb.c#14 integrate .. //depot/projects/usb/src/sys/dev/ep/if_ep.c#5 integrate .. //depot/projects/usb/src/sys/dev/ep/if_epreg.h#3 integrate .. //depot/projects/usb/src/sys/dev/fb/s3_pci.c#3 integrate .. //depot/projects/usb/src/sys/dev/fb/vesa.c#1 branch .. //depot/projects/usb/src/sys/dev/fb/vesa.h#1 branch .. //depot/projects/usb/src/sys/dev/fb/vga.c#3 integrate .. //depot/projects/usb/src/sys/dev/firewire/fwcrom.c#2 integrate .. //depot/projects/usb/src/sys/dev/firewire/fwdev.c#8 integrate .. //depot/projects/usb/src/sys/dev/fxp/if_fxp.c#15 integrate .. //depot/projects/usb/src/sys/dev/hptiop/hptiop.c#5 integrate .. //depot/projects/usb/src/sys/dev/ichwd/ichwd.c#9 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis.c#32 integrate .. //depot/projects/usb/src/sys/dev/iir/iir.c#7 integrate .. //depot/projects/usb/src/sys/dev/isp/isp.c#9 integrate .. //depot/projects/usb/src/sys/dev/isp/isp_freebsd.c#12 integrate .. //depot/projects/usb/src/sys/dev/isp/isp_stds.h#4 integrate .. //depot/projects/usb/src/sys/dev/isp/isp_tpublic.h#6 delete .. //depot/projects/usb/src/sys/dev/isp/ispmbox.h#6 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe.c#13 integrate .. //depot/projects/usb/src/sys/dev/kbd/kbd.c#7 integrate .. //depot/projects/usb/src/sys/dev/mpt/mpt_raid.c#10 integrate .. //depot/projects/usb/src/sys/dev/msk/if_msk.c#14 integrate .. //depot/projects/usb/src/sys/dev/mwl/if_mwl.c#6 integrate .. //depot/projects/usb/src/sys/dev/mxge/if_mxge.c#16 integrate .. //depot/projects/usb/src/sys/dev/mxge/if_mxge_var.h#14 integrate .. //depot/projects/usb/src/sys/dev/pci/pci.c#26 integrate .. //depot/projects/usb/src/sys/dev/pci/pci_user.c#6 integrate .. //depot/projects/usb/src/sys/dev/pci/pcireg.h#14 integrate .. //depot/projects/usb/src/sys/dev/pci/pcivar.h#11 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/es137x.c#7 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/es137x.h#2 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac.c#36 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/t4dwave.c#6 integrate .. //depot/projects/usb/src/sys/dev/syscons/daemon/daemon_saver.c#7 integrate .. //depot/projects/usb/src/sys/dev/syscons/scterm-teken.c#8 integrate .. //depot/projects/usb/src/sys/dev/syscons/scvesactl.c#4 integrate .. //depot/projects/usb/src/sys/dev/syscons/syscons.c#15 integrate .. //depot/projects/usb/src/sys/dev/syscons/syscons.h#8 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#18 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_rumreg.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_urtw.c#8 integrate .. //depot/projects/usb/src/sys/dev/wi/if_wi.c#15 integrate .. //depot/projects/usb/src/sys/dev/x86bios/x86bios.c#1 branch .. //depot/projects/usb/src/sys/dev/x86bios/x86bios.h#1 branch .. //depot/projects/usb/src/sys/dev/x86bios/x86bios_alloc.c#1 branch .. //depot/projects/usb/src/sys/fs/fifofs/fifo_vnops.c#14 integrate .. //depot/projects/usb/src/sys/fs/msdosfs/msdosfs_conv.c#5 integrate .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clnode.c#5 integrate .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clport.c#4 integrate .. //depot/projects/usb/src/sys/geom/geom_dev.c#12 integrate .. //depot/projects/usb/src/sys/geom/geom_vfs.c#7 integrate .. //depot/projects/usb/src/sys/i386/acpica/acpi_machdep.c#12 integrate .. //depot/projects/usb/src/sys/i386/conf/NOTES#25 integrate .. //depot/projects/usb/src/sys/i386/cpufreq/hwpstate.c#4 integrate .. //depot/projects/usb/src/sys/i386/i386/identcpu.c#15 integrate .. //depot/projects/usb/src/sys/i386/i386/msi.c#11 integrate .. //depot/projects/usb/src/sys/i386/i386/pmap.c#27 integrate .. //depot/projects/usb/src/sys/i386/i386/trap.c#15 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_proto.h#5 integrate .. //depot/projects/usb/src/sys/i386/include/_align.h#1 branch .. //depot/projects/usb/src/sys/i386/include/param.h#8 integrate .. //depot/projects/usb/src/sys/i386/include/pc/vesa.h#3 delete .. //depot/projects/usb/src/sys/i386/include/specialreg.h#15 integrate .. //depot/projects/usb/src/sys/i386/include/xen/xen-os.h#4 integrate .. //depot/projects/usb/src/sys/i386/isa/dpms.c#2 delete .. //depot/projects/usb/src/sys/i386/isa/vesa.c#6 delete .. //depot/projects/usb/src/sys/i386/linux/linux_proto.h#9 integrate .. //depot/projects/usb/src/sys/i386/xen/locore.s#4 integrate .. //depot/projects/usb/src/sys/i386/xen/pmap.c#14 integrate .. //depot/projects/usb/src/sys/ia64/include/_align.h#1 branch .. //depot/projects/usb/src/sys/ia64/include/param.h#5 integrate .. //depot/projects/usb/src/sys/kern/kern_event.c#12 integrate .. //depot/projects/usb/src/sys/kern/kern_exec.c#21 integrate .. //depot/projects/usb/src/sys/kern/kern_jail.c#32 integrate .. //depot/projects/usb/src/sys/kern/kern_linker.c#21 integrate .. //depot/projects/usb/src/sys/kern/kern_lock.c#19 integrate .. //depot/projects/usb/src/sys/kern/kern_mib.c#16 integrate .. //depot/projects/usb/src/sys/kern/kern_mutex.c#17 integrate .. //depot/projects/usb/src/sys/kern/kern_shutdown.c#14 integrate .. //depot/projects/usb/src/sys/kern/kern_sig.c#17 integrate .. //depot/projects/usb/src/sys/kern/kern_timeout.c#11 integrate .. //depot/projects/usb/src/sys/kern/sched_ule.c#18 integrate .. //depot/projects/usb/src/sys/kern/subr_acl_nfs4.c#2 integrate .. //depot/projects/usb/src/sys/kern/subr_bus.c#30 integrate .. //depot/projects/usb/src/sys/kern/subr_devstat.c#3 integrate .. //depot/projects/usb/src/sys/kern/subr_smp.c#14 integrate .. //depot/projects/usb/src/sys/kern/sys_generic.c#18 integrate .. //depot/projects/usb/src/sys/kern/sys_pipe.c#14 integrate .. //depot/projects/usb/src/sys/kern/tty.c#30 integrate .. //depot/projects/usb/src/sys/kern/tty_pts.c#19 integrate .. //depot/projects/usb/src/sys/kern/uipc_mqueue.c#12 integrate .. //depot/projects/usb/src/sys/kern/uipc_socket.c#28 integrate .. //depot/projects/usb/src/sys/kern/uipc_syscalls.c#19 integrate .. //depot/projects/usb/src/sys/kern/vfs_aio.c#13 integrate .. //depot/projects/usb/src/sys/kern/vfs_subr.c#25 integrate .. //depot/projects/usb/src/sys/mips/include/_align.h#1 branch .. //depot/projects/usb/src/sys/mips/include/param.h#5 integrate .. //depot/projects/usb/src/sys/modules/Makefile#43 integrate .. //depot/projects/usb/src/sys/modules/acpi/acpi/Makefile#9 integrate .. //depot/projects/usb/src/sys/modules/dpms/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/dtrace/lockstat/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/vesa/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/x86bios/Makefile#1 branch .. //depot/projects/usb/src/sys/net/bpf.c#24 integrate .. //depot/projects/usb/src/sys/net/if.c#41 integrate .. //depot/projects/usb/src/sys/net/if_llatbl.c#8 integrate .. //depot/projects/usb/src/sys/net/if_var.h#29 integrate .. //depot/projects/usb/src/sys/net/if_vlan.c#19 integrate .. //depot/projects/usb/src/sys/net/route.h#12 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_action.c#3 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_proto.h#19 integrate .. //depot/projects/usb/src/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#3 integrate .. //depot/projects/usb/src/sys/netinet/if_ether.c#29 integrate .. //depot/projects/usb/src/sys/netinet/if_ether.h#5 integrate .. //depot/projects/usb/src/sys/netinet/in.c#36 integrate .. //depot/projects/usb/src/sys/netinet/in.h#13 integrate .. //depot/projects/usb/src/sys/netinet/in_mcast.c#19 integrate .. //depot/projects/usb/src/sys/netinet/in_pcb.c#32 integrate .. //depot/projects/usb/src/sys/netinet/in_proto.c#15 integrate .. //depot/projects/usb/src/sys/netinet/ip_mroute.c#18 integrate .. //depot/projects/usb/src/sys/netinet/raw_ip.c#29 integrate .. //depot/projects/usb/src/sys/netinet/sctp_asconf.c#12 integrate .. //depot/projects/usb/src/sys/netinet/sctp_bsd_addr.c#12 integrate .. //depot/projects/usb/src/sys/netinet/sctp_input.c#20 integrate .. //depot/projects/usb/src/sys/netinet/sctp_os_bsd.h#20 integrate .. //depot/projects/usb/src/sys/netinet/sctp_output.c#23 integrate .. //depot/projects/usb/src/sys/netinet/sctp_pcb.c#19 integrate .. //depot/projects/usb/src/sys/netinet/sctp_pcb.h#14 integrate .. //depot/projects/usb/src/sys/netinet/sctp_structs.h#13 integrate .. //depot/projects/usb/src/sys/netinet/sctp_sysctl.c#16 integrate .. //depot/projects/usb/src/sys/netinet/sctp_timer.c#15 integrate .. //depot/projects/usb/src/sys/netinet/sctp_usrreq.c#17 integrate .. //depot/projects/usb/src/sys/netinet/sctputil.c#25 integrate .. //depot/projects/usb/src/sys/netinet/tcp_subr.c#29 integrate .. //depot/projects/usb/src/sys/netinet/tcp_timer.c#19 integrate .. //depot/projects/usb/src/sys/netinet/tcp_timer.h#7 integrate .. //depot/projects/usb/src/sys/netinet/tcp_usrreq.c#24 integrate .. //depot/projects/usb/src/sys/netinet/tcp_var.h#23 integrate .. //depot/projects/usb/src/sys/netinet6/in6.c#34 integrate .. //depot/projects/usb/src/sys/netinet6/in6_ifattach.c#30 integrate .. //depot/projects/usb/src/sys/netinet6/in6_proto.c#20 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_input.c#30 integrate .. //depot/projects/usb/src/sys/netinet6/nd6.c#26 integrate .. //depot/projects/usb/src/sys/netinet6/nd6.h#10 integrate .. //depot/projects/usb/src/sys/netinet6/nd6_nbr.c#20 integrate .. //depot/projects/usb/src/sys/netinet6/nd6_rtr.c#24 integrate .. //depot/projects/usb/src/sys/netinet6/sctp6_usrreq.c#12 integrate .. //depot/projects/usb/src/sys/netipsec/key.c#26 integrate .. //depot/projects/usb/src/sys/netsmb/smb_dev.c#5 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_node.c#10 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_vfsops.c#20 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs_serv.c#16 integrate .. //depot/projects/usb/src/sys/pc98/include/_align.h#1 branch .. //depot/projects/usb/src/sys/pc98/include/pc/vesa.h#2 delete .. //depot/projects/usb/src/sys/pci/intpm.c#8 integrate .. //depot/projects/usb/src/sys/pci/intpmreg.h#4 integrate .. //depot/projects/usb/src/sys/powerpc/conf/GENERIC#23 integrate .. //depot/projects/usb/src/sys/powerpc/include/_align.h#1 branch .. //depot/projects/usb/src/sys/powerpc/include/param.h#6 integrate .. //depot/projects/usb/src/sys/security/audit/audit_bsm_token.c#15 integrate .. //depot/projects/usb/src/sys/sparc64/include/_align.h#1 branch .. //depot/projects/usb/src/sys/sparc64/include/param.h#7 integrate .. //depot/projects/usb/src/sys/sparc64/pci/ofw_pci.h#6 integrate .. //depot/projects/usb/src/sys/sparc64/pci/psycho.c#12 integrate .. //depot/projects/usb/src/sys/sparc64/pci/schizo.c#5 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/jbusppm.c#3 integrate .. //depot/projects/usb/src/sys/sun4v/include/_align.h#1 branch .. //depot/projects/usb/src/sys/sun4v/include/param.h#5 integrate .. //depot/projects/usb/src/sys/sys/_sockaddr_storage.h#1 branch .. //depot/projects/usb/src/sys/sys/bus.h#11 integrate .. //depot/projects/usb/src/sys/sys/event.h#7 integrate .. //depot/projects/usb/src/sys/sys/imgact_aout.h#2 integrate .. //depot/projects/usb/src/sys/sys/kbio.h#3 integrate .. //depot/projects/usb/src/sys/sys/mman.h#3 integrate .. //depot/projects/usb/src/sys/sys/param.h#45 integrate .. //depot/projects/usb/src/sys/sys/smp.h#8 integrate .. //depot/projects/usb/src/sys/sys/socket.h#10 integrate .. //depot/projects/usb/src/sys/sys/syscallsubr.h#13 integrate .. //depot/projects/usb/src/sys/sys/sysproto.h#16 integrate .. //depot/projects/usb/src/sys/sys/systm.h#19 integrate .. //depot/projects/usb/src/sys/sys/vnode.h#25 integrate .. //depot/projects/usb/src/sys/teken/teken.c#2 integrate .. //depot/projects/usb/src/sys/teken/teken.h#2 integrate .. //depot/projects/usb/src/sys/teken/teken_demo.c#2 integrate .. //depot/projects/usb/src/sys/teken/teken_subr.h#2 integrate .. //depot/projects/usb/src/sys/teken/teken_subr_compat.h#2 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_acl.c#5 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_vnops.c#20 integrate .. //depot/projects/usb/src/sys/vm/vm_mmap.c#21 integrate Differences ... ==== //depot/projects/usb/src/sys/amd64/amd64/identcpu.c#17 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.174 2009/06/30 11:16:32 avg Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.175 2009/09/10 17:27:36 jkim Exp $"); #include "opt_cpu.h" @@ -371,21 +371,21 @@ switch (cpu_vendor_id) { case CPU_VENDOR_AMD: if ((amd_pminfo & AMDPM_TSC_INVARIANT) || - AMD64_CPU_FAMILY(cpu_id) >= 0x10 || + CPUID_TO_FAMILY(cpu_id) >= 0x10 || cpu_id == 0x60fb2) tsc_is_invariant = 1; break; case CPU_VENDOR_INTEL: if ((amd_pminfo & AMDPM_TSC_INVARIANT) || - (AMD64_CPU_FAMILY(cpu_id) == 0x6 && - AMD64_CPU_MODEL(cpu_id) >= 0xe) || - (AMD64_CPU_FAMILY(cpu_id) == 0xf && - AMD64_CPU_MODEL(cpu_id) >= 0x3)) + (CPUID_TO_FAMILY(cpu_id) == 0x6 && + CPUID_TO_MODEL(cpu_id) >= 0xe) || + (CPUID_TO_FAMILY(cpu_id) == 0xf && + CPUID_TO_MODEL(cpu_id) >= 0x3)) tsc_is_invariant = 1; break; case CPU_VENDOR_CENTAUR: - if (AMD64_CPU_FAMILY(cpu_id) == 0x6 && - AMD64_CPU_MODEL(cpu_id) >= 0xf && + if (CPUID_TO_FAMILY(cpu_id) == 0x6 && + CPUID_TO_MODEL(cpu_id) >= 0xf && (rdmsr(0x1203) & 0x100000000ULL) == 0) tsc_is_invariant = 1; break; ==== //depot/projects/usb/src/sys/amd64/amd64/initcpu.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.54 2009/07/22 14:32:38 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.55 2009/09/10 17:27:36 jkim Exp $"); #include "opt_cpu.h" @@ -154,8 +154,8 @@ pg_nx = PG_NX; } if (cpu_vendor_id == CPU_VENDOR_CENTAUR && - AMD64_CPU_FAMILY(cpu_id) == 0x6 && - AMD64_CPU_MODEL(cpu_id) >= 0xf) + CPUID_TO_FAMILY(cpu_id) == 0x6 && + CPUID_TO_MODEL(cpu_id) >= 0xf) init_via(); /* ==== //depot/projects/usb/src/sys/amd64/amd64/msi.c#11 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.14 2009/07/06 18:23:00 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.15 2009/09/10 17:27:36 jkim Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -275,8 +275,8 @@ case CPU_VENDOR_AMD: break; case CPU_VENDOR_CENTAUR: - if (AMD64_CPU_FAMILY(cpu_id) == 0x6 && - AMD64_CPU_MODEL(cpu_id) >= 0xf) + if (CPUID_TO_FAMILY(cpu_id) == 0x6 && + CPUID_TO_MODEL(cpu_id) >= 0xf) break; /* FALLTHROUGH */ default: ==== //depot/projects/usb/src/sys/amd64/amd64/pmap.c#30 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.672 2009/09/02 16:47:10 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.673 2009/09/18 17:09:33 alc Exp $"); /* * Manages physical address maps. @@ -701,6 +701,11 @@ * Are large page mappings enabled? */ TUNABLE_INT_FETCH("vm.pmap.pg_ps_enabled", &pg_ps_enabled); + if (pg_ps_enabled) { + KASSERT(MAXPAGESIZES > 1 && pagesizes[1] == 0, + ("pmap_init: can't assign to pagesizes[1]")); + pagesizes[1] = NBPDR; + } /* * Calculate the size of the pv head table for superpages. ==== //depot/projects/usb/src/sys/amd64/amd64/trap.c#17 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.334 2009/08/24 16:19:47 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.335 2009/09/21 09:41:51 kib Exp $"); /* * AMD64 Trap and System call handling @@ -253,6 +253,11 @@ } #endif + if (type == T_RESERVED) { + trap_fatal(frame, 0); + goto out; + } + #ifdef HWPMC_HOOKS /* * CPU PMCs interrupt using an NMI. If the PMC module is ==== //depot/projects/usb/src/sys/amd64/conf/NOTES#21 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.92 2009/08/13 17:09:45 attilio Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.96 2009/09/21 23:58:29 delphij Exp $ # # @@ -154,6 +154,17 @@ ##################################################################### # HARDWARE DEVICE CONFIGURATION +# To include support for VGA VESA video modes +options VESA + +# Turn on extra debugging checks and output for VESA support. +options VESA_DEBUG + +device dpms # DPMS suspend & resume via VESA BIOS + +# x86 real mode BIOS emulator, required by atkbdc/dpms/vesa +options X86BIOS + # # Optional devices: # @@ -213,6 +224,9 @@ # Debugging. options VGA_DEBUG +# Linear framebuffer driver for S3 VESA 1.2 cards. Works on top of VESA. +device s3pci + # 3Dfx Voodoo Graphics, Voodoo II /dev/3dfx CDEV support. This will create # the /dev/3dfx0 device to work with glide implementations. This should get # linked to /dev/3dfx and /dev/voodoo. Note that this is not the same as ==== //depot/projects/usb/src/sys/amd64/include/param.h#9 (text+ko) ==== @@ -36,33 +36,23 @@ * SUCH DAMAGE. * * @(#)param.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/amd64/include/param.h,v 1.30 2009/07/05 17:45:48 sam Exp $ + * $FreeBSD: src/sys/amd64/include/param.h,v 1.33 2009/09/18 17:04:57 alc Exp $ */ + +#ifndef _AMD64_INCLUDE_PARAM_H_ +#define _AMD64_INCLUDE_PARAM_H_ + +#include <machine/_align.h> + /* * Machine dependent constants for AMD64. */ -/* - * Round p (pointer or byte index) up to a correctly-aligned value - * for all data types (int, long, ...). The result is u_long and - * must be cast to any desired pointer type. - */ -#ifndef _ALIGNBYTES -#define _ALIGNBYTES (sizeof(long) - 1) -#endif -#ifndef _ALIGN -#define _ALIGN(p) (((u_long)(p) + _ALIGNBYTES) &~ _ALIGNBYTES) -#endif -#ifndef _NO_NAMESPACE_POLLUTION - #define __HAVE_ACPI #define __PCI_REROUTE_INTERRUPT -#ifndef _MACHINE_PARAM_H_ -#define _MACHINE_PARAM_H_ - #ifndef MACHINE #define MACHINE "amd64" #endif @@ -118,6 +108,8 @@ #define NBPML4 (1ul<<PML4SHIFT)/* bytes/page map lev4 table */ #define PML4MASK (NBPML4-1) +#define MAXPAGESIZES 3 /* maximum number of supported page sizes */ + #define IOPAGES 2 /* pages of i/o permission bitmap */ #ifndef KSTACK_PAGES @@ -150,5 +142,4 @@ #define pgtok(x) ((unsigned long)(x) * (PAGE_SIZE / 1024)) -#endif /* !_MACHINE_PARAM_H_ */ -#endif /* !_NO_NAMESPACE_POLLUTION */ +#endif /* !_AMD64_INCLUDE_PARAM_H_ */ ==== //depot/projects/usb/src/sys/amd64/include/specialreg.h#15 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.55 2009/05/13 17:53:04 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.56 2009/09/10 17:27:36 jkim Exp $ */ #ifndef _MACHINE_SPECIALREG_H_ @@ -168,10 +168,10 @@ #define CPUID_FAMILY 0x00000f00 #define CPUID_EXT_MODEL 0x000f0000 #define CPUID_EXT_FAMILY 0x0ff00000 -#define AMD64_CPU_MODEL(id) \ +#define CPUID_TO_MODEL(id) \ ((((id) & CPUID_MODEL) >> 4) | \ (((id) & CPUID_EXT_MODEL) >> 12)) -#define AMD64_CPU_FAMILY(id) \ +#define CPUID_TO_FAMILY(id) \ ((((id) & CPUID_FAMILY) >> 8) + \ (((id) & CPUID_EXT_FAMILY) >> 20)) ==== //depot/projects/usb/src/sys/amd64/linux32/linux32_proto.h#10 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.39 2008/11/29 14:57:58 kib Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.40 2009/09/10 13:20:27 des Exp $ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 185438 2008-11-29 14:55:24Z kib */ @@ -1257,6 +1257,13 @@ #endif /* COMPAT_FREEBSD6 */ + +#ifdef COMPAT_FREEBSD7 + +#define nosys linux_nosys + +#endif /* COMPAT_FREEBSD7 */ + #define LINUX_SYS_AUE_linux_fork AUE_FORK #define LINUX_SYS_AUE_linux_open AUE_OPEN_RWTC #define LINUX_SYS_AUE_linux_waitpid AUE_WAIT4 ==== //depot/projects/usb/src/sys/arm/include/param.h#5 (text+ko) ==== @@ -35,35 +35,23 @@ * SUCH DAMAGE. * * from: @(#)param.h 5.8 (Berkeley) 6/28/91 - * $FreeBSD: src/sys/arm/include/param.h,v 1.16 2009/07/05 17:45:48 sam Exp $ + * $FreeBSD: src/sys/arm/include/param.h,v 1.18 2009/09/18 17:04:57 alc Exp $ */ +#ifndef _ARM_INCLUDE_PARAM_H_ +#define _ARM_INCLUDE_PARAM_H_ + /* * Machine dependent constants for StrongARM */ -/* - * Round p (pointer or byte index) up to a correctly-aligned value - * for all data types (int, long, ...). The result is unsigned int - * and must be cast to any desired pointer type. - */ -#ifndef _ALIGNBYTES -#define _ALIGNBYTES (sizeof(int) - 1) -#endif -#ifndef _ALIGN -#define _ALIGN(p) (((unsigned)(p) + _ALIGNBYTES) & ~_ALIGNBYTES) -#endif +#include <machine/_align.h> #define STACKALIGNBYTES (8 - 1) #define STACKALIGN(p) ((u_int)(p) & ~STACKALIGNBYTES) -#ifndef _NO_NAMESPACE_POLLUTION - #define __PCI_REROUTE_INTERRUPT -#ifndef _MACHINE_PARAM_H_ -#define _MACHINE_PARAM_H_ - #ifndef MACHINE #define MACHINE "arm" #endif @@ -104,6 +92,8 @@ #define NBPDR (1 << PDR_SHIFT) #define NPDEPG (1 << (32 - PDR_SHIFT)) +#define MAXPAGESIZES 1 /* maximum number of supported page sizes */ + #ifndef KSTACK_PAGES #define KSTACK_PAGES 2 #endif /* !KSTACK_PAGES */ @@ -136,5 +126,4 @@ #define pgtok(x) ((x) * (PAGE_SIZE / 1024)) -#endif /* !_MACHINE_PARAM_H_ */ -#endif /* !_NO_NAMESPACE_POLLUTION */ +#endif /* !_ARM_INCLUDE_PARAM_H_ */ ==== //depot/projects/usb/src/sys/boot/i386/libi386/pxe.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/pxe.c,v 1.23 2007/10/12 17:09:43 ps Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/pxe.c,v 1.24 2009/09/10 22:05:43 emaste Exp $"); #include <stand.h> #include <string.h> @@ -282,7 +282,7 @@ bootp(pxe_sock, BOOTP_PXE); if (rootip.s_addr == 0) rootip.s_addr = bootplayer.sip; - if (!rootpath[1]) + if (!rootpath[0]) strcpy(rootpath, PXENFSROOTPATH); for (i = 0; rootpath[i] != '\0' && i < FNAME_SIZE; i++) ==== //depot/projects/usb/src/sys/boot/pc98/Makefile.inc#4 (text+ko) ==== @@ -1,10 +1,10 @@ # Common defines for all of /sys/boot/pc98/ # -# $FreeBSD: src/sys/boot/pc98/Makefile.inc,v 1.8 2008/06/25 21:33:28 ru Exp $ +# $FreeBSD: src/sys/boot/pc98/Makefile.inc,v 1.9 2009/09/13 11:20:17 nyan Exp $ BINDIR?= /boot -LOADER_ADDRESS?=0x100000 +LOADER_ADDRESS?=0x200000 CFLAGS+= -ffreestanding -mpreferred-stack-boundary=2 \ -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 \ -Os ==== //depot/projects/usb/src/sys/cam/cam_xpt.c#22 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.223 2009/09/06 19:06:50 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.224 2009/09/15 00:15:24 ken Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -794,8 +794,9 @@ * processed. */ xpt_lock_buses(); - msleep(&xsoftc.ccb_scanq, &xsoftc.xpt_topo_lock, PRIBIO, - "ccb_scanq", 0); + if (TAILQ_EMPTY(&xsoftc.ccb_scanq)) + msleep(&xsoftc.ccb_scanq, &xsoftc.xpt_topo_lock, PRIBIO, + "ccb_scanq", 0); TAILQ_INIT(&queue); TAILQ_CONCAT(&queue, &xsoftc.ccb_scanq, sim_links.tqe); xpt_unlock_buses(); @@ -806,9 +807,12 @@ sim = ccb->ccb_h.path->bus->sim; CAM_SIM_LOCK(sim); - ccb->ccb_h.func_code = XPT_SCAN_BUS; + if( ccb->ccb_h.path->target->target_id == CAM_TARGET_WILDCARD ) + ccb->ccb_h.func_code = XPT_SCAN_BUS; + else + ccb->ccb_h.func_code = XPT_SCAN_LUN; ccb->ccb_h.cbfcnp = xptdone; - xpt_setup_ccb(&ccb->ccb_h, ccb->ccb_h.path, 5); + xpt_setup_ccb(&ccb->ccb_h, ccb->ccb_h.path, 1); cam_periph_runccb(ccb, NULL, 0, 0, NULL); xpt_free_path(ccb->ccb_h.path); xpt_free_ccb(ccb); @@ -828,6 +832,7 @@ xpt_lock_buses(); TAILQ_FOREACH(hdr, &xsoftc.ccb_scanq, sim_links.tqe) { if (xpt_path_comp(hdr->path, ccb->ccb_h.path) == 0) { + wakeup(&xsoftc.ccb_scanq); xpt_unlock_buses(); xpt_print(ccb->ccb_h.path, "rescan already queued\n"); xpt_free_path(ccb->ccb_h.path); ==== //depot/projects/usb/src/sys/cam/scsi/scsi_cd.c#11 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.107 2009/07/10 08:18:08 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.110 2009/09/08 16:09:28 scottl Exp $"); #include "opt_cd.h" @@ -2528,7 +2528,7 @@ error = cdgetmode(periph, ¶ms, AUDIO_PAGE); if (error) { - free(¶ms, M_SCSICD); + free(¶ms.mode_buf, M_SCSICD); cam_periph_unlock(periph); break; } ==== //depot/projects/usb/src/sys/cam/scsi/scsi_target.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.78 2009/06/25 18:46:30 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.80 2009/09/19 20:25:54 mjacob Exp $"); #include <sys/param.h> @@ -42,6 +42,9 @@ #include <sys/mutex.h> #include <sys/devicestat.h> #include <sys/proc.h> +/* Includes to support callout */ +#include <sys/types.h> +#include <sys/systm.h> #include <cam/cam.h> #include <cam/cam_ccb.h> @@ -50,6 +53,7 @@ #include <cam/cam_sim.h> #include <cam/scsi/scsi_targetio.h> + /* Transaction information attached to each CCB sent by the user */ struct targ_cmd_descr { struct cam_periph_map_info mapinfo; @@ -92,6 +96,8 @@ targ_state state; struct selinfo read_select; struct devstat device_stats; + struct callout destroy_dev_callout; + struct mtx destroy_mtx; }; static d_open_t targopen; @@ -103,8 +109,11 @@ static d_kqfilter_t targkqfilter; static void targreadfiltdetach(struct knote *kn); static int targreadfilt(struct knote *kn, long hint); -static struct filterops targread_filtops = - { 1, NULL, targreadfiltdetach, targreadfilt }; +static struct filterops targread_filtops = { + .f_isfd = 1, + .f_detach = targreadfiltdetach, + .f_event = targreadfilt, +}; static struct cdevsw targ_cdevsw = { .d_version = D_VERSION, @@ -151,6 +160,7 @@ static void notify_user(struct targ_softc *softc); static int targcamstatus(cam_status status); static size_t targccblen(xpt_opcode func_code); +static void targdestroy(void *); static struct periph_driver targdriver = { @@ -208,10 +218,18 @@ int error; softc = (struct targ_softc *)dev->si_drv1; - if ((softc->periph == NULL) || - (softc->state & TARG_STATE_LUN_ENABLED) == 0) { + mtx_init(&softc->destroy_mtx, "targ_destroy", "SCSI Target dev destroy", MTX_DEF); + callout_init_mtx(&softc->destroy_dev_callout, &softc->destroy_mtx, CALLOUT_RETURNUNLOCKED); + if (softc->periph == NULL) { +#if 0 destroy_dev(dev); free(softc, M_TARG); +#endif + printf("%s: destroying non-enabled target\n", __func__); + mtx_lock(&softc->destroy_mtx); + callout_reset(&softc->destroy_dev_callout, hz / 2, + (void *)targdestroy, (void *)dev); + mtx_unlock(&softc->destroy_mtx); return (0); } @@ -223,18 +241,23 @@ cam_periph_acquire(periph); cam_periph_lock(periph); error = targdisable(softc); - if (error == CAM_REQ_CMP) { - dev->si_drv1 = 0; - if (softc->periph != NULL) { - cam_periph_invalidate(softc->periph); - softc->periph = NULL; - } - destroy_dev(dev); - free(softc, M_TARG); + if (softc->periph != NULL) { + cam_periph_invalidate(softc->periph); + softc->periph = NULL; } cam_periph_unlock(periph); cam_periph_release(periph); +#if 0 + destroy_dev(dev); + free(softc, M_TARG); +#endif + + printf("%s: close finished error(%d)\n", __func__, error); + mtx_lock(&softc->destroy_mtx); + callout_reset(&softc->destroy_dev_callout, hz / 2, + (void *)targdestroy, (void *)dev); + mtx_unlock(&softc->destroy_mtx); return (error); } @@ -818,7 +841,9 @@ case XPT_CONT_TARGET_IO: TAILQ_INSERT_TAIL(&softc->user_ccb_queue, &done_ccb->ccb_h, periph_links.tqe); + cam_periph_unlock(softc->periph); notify_user(softc); + cam_periph_lock(softc->periph); break; default: panic("targdone: impossible xpt opcode %#x", @@ -966,13 +991,19 @@ int ccb_len; ccb_len = targccblen(type); - ccb = malloc(ccb_len, M_TARG, M_WAITOK); + ccb = malloc(ccb_len, M_TARG, M_NOWAIT); CAM_DEBUG(softc->path, CAM_DEBUG_PERIPH, ("getccb %p\n", ccb)); - + if (ccb == NULL) { + return (ccb); + } xpt_setup_ccb(&ccb->ccb_h, softc->path, priority); ccb->ccb_h.func_code = type; ccb->ccb_h.cbfcnp = targdone; ccb->ccb_h.targ_descr = targgetdescr(softc); + if (ccb->ccb_h.targ_descr == NULL) { + free (ccb, M_TARG); + ccb = NULL; + } return (ccb); } @@ -1010,8 +1041,10 @@ struct targ_cmd_descr *descr; descr = malloc(sizeof(*descr), M_TARG, - M_WAITOK); - descr->mapinfo.num_bufs_used = 0; + M_NOWAIT); + if (descr) { + descr->mapinfo.num_bufs_used = 0; + } return (descr); } @@ -1091,8 +1124,11 @@ /* If we aborted anything from the work queue, wakeup user. */ if (!TAILQ_EMPTY(&softc->user_ccb_queue) - || !TAILQ_EMPTY(&softc->abort_queue)) + || !TAILQ_EMPTY(&softc->abort_queue)) { + cam_periph_unlock(softc->periph); notify_user(softc); + cam_periph_lock(softc->periph); + } } /* Notify the user that data is ready */ @@ -1185,3 +1221,25 @@ return (len); } + +/* + * work around to destroy targ device + * outside of targclose + */ +static void +targdestroy(void *dev) +{ + struct cdev *device = (struct cdev *)dev; + struct targ_softc *softc = (struct targ_softc *)device->si_drv1; + +#if 0 + callout_stop(&softc->destroy_dev_callout); +#endif + + mtx_unlock(&softc->destroy_mtx); + mtx_destroy(&softc->destroy_mtx); + free(softc, M_TARG); + device->si_drv1 = 0; + destroy_dev(device); + printf("%s: destroyed dev\n", __func__); +} >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200909221627.n8MGRLeC065908>