svn commit: r228482 - in user/mjacob/sys: amd64/amd64 amd64/conf amd64/include amd64/linux32 arm/conf arm/econa arm/include arm/mv arm/xscale/i80321 arm/xscale/i8134x arm/xscale/ixp425 boot/arm/at9...

Matt Jacob mjacob at FreeBSD.org
Tue Dec 13 23:49:34 UTC 2011 

Author: mjacob
Date: Tue Dec 13 23:49:32 2011
New Revision: 228482
URL: http://svn.freebsd.org/changeset/base/228482

Log:
  IFC @ 228481

Added:
  user/mjacob/sys/contrib/dev/acpica/compiler/aslrestype2s.c
     - copied unchanged from r228481, head/sys/contrib/dev/acpica/compiler/aslrestype2s.c
  user/mjacob/sys/contrib/dev/acpica/disassembler/dmresrcl2.c
     - copied unchanged from r228481, head/sys/contrib/dev/acpica/disassembler/dmresrcl2.c
  user/mjacob/sys/contrib/dev/acpica/include/actbl3.h
     - copied unchanged from r228481, head/sys/contrib/dev/acpica/include/actbl3.h
  user/mjacob/sys/contrib/dev/acpica/os_specific/
     - copied from r228481, head/sys/contrib/dev/acpica/os_specific/
  user/mjacob/sys/contrib/dev/acpica/resources/rsserial.c
     - copied unchanged from r228481, head/sys/contrib/dev/acpica/resources/rsserial.c
  user/mjacob/sys/contrib/dev/acpica/utilities/utxfmutex.c
     - copied unchanged from r228481, head/sys/contrib/dev/acpica/utilities/utxfmutex.c
  user/mjacob/sys/dev/cesa/
     - copied from r228481, head/sys/dev/cesa/
  user/mjacob/sys/dev/fb/splash_txt.c
     - copied unchanged from r228481, head/sys/dev/fb/splash_txt.c
  user/mjacob/sys/dev/viawd/
     - copied from r228481, head/sys/dev/viawd/
  user/mjacob/sys/dev/virtio/
     - copied from r228481, head/sys/dev/virtio/
  user/mjacob/sys/kern/kern_ffclock.c
     - copied unchanged from r228481, head/sys/kern/kern_ffclock.c
  user/mjacob/sys/libkern/iconv_ucs.c
     - copied unchanged from r228481, head/sys/libkern/iconv_ucs.c
  user/mjacob/sys/mips/conf/std.XLP
     - copied unchanged from r228481, head/sys/mips/conf/std.XLP
  user/mjacob/sys/mips/nlm/hal/nlm_hal.c
     - copied unchanged from r228481, head/sys/mips/nlm/hal/nlm_hal.c
  user/mjacob/sys/modules/splash/txt/
     - copied from r228481, head/sys/modules/splash/txt/
  user/mjacob/sys/modules/viawd/
     - copied from r228481, head/sys/modules/viawd/
  user/mjacob/sys/modules/virtio/
     - copied from r228481, head/sys/modules/virtio/
  user/mjacob/sys/sparc64/sparc64/cam_machdep.c
     - copied unchanged from r228481, head/sys/sparc64/sparc64/cam_machdep.c
  user/mjacob/sys/sys/_ffcounter.h
     - copied unchanged from r228481, head/sys/sys/_ffcounter.h
  user/mjacob/sys/sys/timeffc.h
     - copied unchanged from r228481, head/sys/sys/timeffc.h
Deleted:
  user/mjacob/sys/contrib/dev/acpica/osunixxf.c
  user/mjacob/sys/contrib/dev/acpica/tools/
  user/mjacob/sys/dev/amd/
  user/mjacob/sys/mips/nlm/uart_bus_xlp_iodi.c
  user/mjacob/sys/modules/amd/
Modified:
  user/mjacob/sys/amd64/amd64/legacy.c
  user/mjacob/sys/amd64/conf/NOTES
  user/mjacob/sys/amd64/include/_types.h
  user/mjacob/sys/amd64/linux32/linux32_proto.h
  user/mjacob/sys/amd64/linux32/linux32_syscall.h
  user/mjacob/sys/amd64/linux32/linux32_syscalls.c
  user/mjacob/sys/amd64/linux32/linux32_sysent.c
  user/mjacob/sys/amd64/linux32/linux32_systrace_args.c
  user/mjacob/sys/amd64/linux32/syscalls.master
  user/mjacob/sys/arm/conf/DB-88F6XXX
  user/mjacob/sys/arm/conf/SHEEVAPLUG
  user/mjacob/sys/arm/econa/ehci_ebus.c
  user/mjacob/sys/arm/econa/ohci_ec.c
  user/mjacob/sys/arm/include/_types.h
  user/mjacob/sys/arm/mv/common.c
  user/mjacob/sys/arm/mv/files.mv
  user/mjacob/sys/arm/mv/mv_machdep.c
  user/mjacob/sys/arm/mv/mv_pci.c
  user/mjacob/sys/arm/xscale/i80321/i80321_pci.c
  user/mjacob/sys/arm/xscale/i8134x/i81342_pci.c
  user/mjacob/sys/arm/xscale/ixp425/avila_ata.c
  user/mjacob/sys/arm/xscale/ixp425/ixp425_pci.c
  user/mjacob/sys/boot/arm/at91/libat91/sd-card.c
  user/mjacob/sys/boot/fdt/dts/db88f6281.dts
  user/mjacob/sys/boot/fdt/dts/sheevaplug.dts
  user/mjacob/sys/boot/forth/loader.conf
  user/mjacob/sys/boot/i386/loader/Makefile
  user/mjacob/sys/boot/i386/zfsboot/zfsboot.c
  user/mjacob/sys/boot/ofw/Makefile.inc
  user/mjacob/sys/boot/powerpc/Makefile.inc
  user/mjacob/sys/boot/uboot/Makefile.inc
  user/mjacob/sys/boot/zfs/zfsimpl.c
  user/mjacob/sys/cam/cam_sim.h
  user/mjacob/sys/cam/cam_xpt.c
  user/mjacob/sys/cam/scsi/scsi_sa.c
  user/mjacob/sys/cam/scsi/scsi_target.c
  user/mjacob/sys/cam/scsi/scsi_xpt.c
  user/mjacob/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c
  user/mjacob/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.h
  user/mjacob/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c
  user/mjacob/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
  user/mjacob/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  user/mjacob/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c
  user/mjacob/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
  user/mjacob/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
  user/mjacob/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
  user/mjacob/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deadlist.c
  user/mjacob/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c
  user/mjacob/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c
  user/mjacob/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
  user/mjacob/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c
  user/mjacob/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c
  user/mjacob/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
  user/mjacob/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h
  user/mjacob/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h
  user/mjacob/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_deleg.h
  user/mjacob/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h
  user/mjacob/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h
  user/mjacob/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
  user/mjacob/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
  user/mjacob/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c
  user/mjacob/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
  user/mjacob/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  user/mjacob/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h
  user/mjacob/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/eventdefs.h
  user/mjacob/sys/compat/freebsd32/freebsd32_proto.h
  user/mjacob/sys/compat/freebsd32/freebsd32_syscall.h
  user/mjacob/sys/compat/freebsd32/freebsd32_syscalls.c
  user/mjacob/sys/compat/freebsd32/freebsd32_sysent.c
  user/mjacob/sys/compat/freebsd32/freebsd32_systrace_args.c
  user/mjacob/sys/compat/freebsd32/syscalls.master
  user/mjacob/sys/compat/linprocfs/linprocfs.c
  user/mjacob/sys/compat/linux/linux_file.c
  user/mjacob/sys/compat/linux/linux_file.h
  user/mjacob/sys/compat/svr4/svr4_fcntl.c
  user/mjacob/sys/compat/svr4/svr4_proto.h
  user/mjacob/sys/compat/svr4/svr4_syscall.h
  user/mjacob/sys/compat/svr4/svr4_syscallnames.c
  user/mjacob/sys/compat/svr4/svr4_sysent.c
  user/mjacob/sys/compat/svr4/syscalls.master
  user/mjacob/sys/conf/NOTES
  user/mjacob/sys/conf/files
  user/mjacob/sys/conf/files.amd64
  user/mjacob/sys/conf/files.i386
  user/mjacob/sys/conf/files.sparc64
  user/mjacob/sys/conf/kern.mk
  user/mjacob/sys/conf/kern.post.mk
  user/mjacob/sys/conf/kern.pre.mk
  user/mjacob/sys/conf/kmod.mk
  user/mjacob/sys/conf/makeLINT.mk
  user/mjacob/sys/conf/newvers.sh
  user/mjacob/sys/conf/options
  user/mjacob/sys/contrib/dev/acpica/acpica_prep.sh
  user/mjacob/sys/contrib/dev/acpica/changes.txt
  user/mjacob/sys/contrib/dev/acpica/common/adisasm.c
  user/mjacob/sys/contrib/dev/acpica/common/adwalk.c
  user/mjacob/sys/contrib/dev/acpica/common/dmrestag.c
  user/mjacob/sys/contrib/dev/acpica/common/dmtable.c
  user/mjacob/sys/contrib/dev/acpica/common/dmtbdump.c
  user/mjacob/sys/contrib/dev/acpica/common/dmtbinfo.c
  user/mjacob/sys/contrib/dev/acpica/compiler/aslanalyze.c
  user/mjacob/sys/contrib/dev/acpica/compiler/aslcodegen.c
  user/mjacob/sys/contrib/dev/acpica/compiler/aslcompile.c
  user/mjacob/sys/contrib/dev/acpica/compiler/aslcompiler.h
  user/mjacob/sys/contrib/dev/acpica/compiler/aslcompiler.l
  user/mjacob/sys/contrib/dev/acpica/compiler/aslcompiler.y
  user/mjacob/sys/contrib/dev/acpica/compiler/asldefine.h
  user/mjacob/sys/contrib/dev/acpica/compiler/aslerror.c
  user/mjacob/sys/contrib/dev/acpica/compiler/aslfiles.c
  user/mjacob/sys/contrib/dev/acpica/compiler/aslglobal.h
  user/mjacob/sys/contrib/dev/acpica/compiler/asllisting.c
  user/mjacob/sys/contrib/dev/acpica/compiler/aslload.c
  user/mjacob/sys/contrib/dev/acpica/compiler/asllookup.c
  user/mjacob/sys/contrib/dev/acpica/compiler/aslmain.c
  user/mjacob/sys/contrib/dev/acpica/compiler/aslmap.c
  user/mjacob/sys/contrib/dev/acpica/compiler/aslmessages.h
  user/mjacob/sys/contrib/dev/acpica/compiler/aslopcodes.c
  user/mjacob/sys/contrib/dev/acpica/compiler/asloperands.c
  user/mjacob/sys/contrib/dev/acpica/compiler/aslpredef.c
  user/mjacob/sys/contrib/dev/acpica/compiler/aslresource.c
  user/mjacob/sys/contrib/dev/acpica/compiler/aslrestype1.c
  user/mjacob/sys/contrib/dev/acpica/compiler/aslrestype1i.c
  user/mjacob/sys/contrib/dev/acpica/compiler/aslrestype2.c
  user/mjacob/sys/contrib/dev/acpica/compiler/aslrestype2d.c
  user/mjacob/sys/contrib/dev/acpica/compiler/aslrestype2e.c
  user/mjacob/sys/contrib/dev/acpica/compiler/aslrestype2q.c
  user/mjacob/sys/contrib/dev/acpica/compiler/aslrestype2w.c
  user/mjacob/sys/contrib/dev/acpica/compiler/aslstubs.c
  user/mjacob/sys/contrib/dev/acpica/compiler/asltransform.c
  user/mjacob/sys/contrib/dev/acpica/compiler/asltree.c
  user/mjacob/sys/contrib/dev/acpica/compiler/asltypes.h
  user/mjacob/sys/contrib/dev/acpica/compiler/aslutils.c
  user/mjacob/sys/contrib/dev/acpica/compiler/aslwalks.c
  user/mjacob/sys/contrib/dev/acpica/compiler/dtcompile.c
  user/mjacob/sys/contrib/dev/acpica/compiler/dtcompiler.h
  user/mjacob/sys/contrib/dev/acpica/compiler/dtfield.c
  user/mjacob/sys/contrib/dev/acpica/compiler/dtsubtable.c
  user/mjacob/sys/contrib/dev/acpica/compiler/dttable.c
  user/mjacob/sys/contrib/dev/acpica/compiler/dttemplate.h
  user/mjacob/sys/contrib/dev/acpica/compiler/dtutils.c
  user/mjacob/sys/contrib/dev/acpica/debugger/dbcmds.c
  user/mjacob/sys/contrib/dev/acpica/debugger/dbdisply.c
  user/mjacob/sys/contrib/dev/acpica/debugger/dbfileio.c
  user/mjacob/sys/contrib/dev/acpica/debugger/dbinput.c
  user/mjacob/sys/contrib/dev/acpica/debugger/dbutils.c
  user/mjacob/sys/contrib/dev/acpica/disassembler/dmbuffer.c
  user/mjacob/sys/contrib/dev/acpica/disassembler/dmopcode.c
  user/mjacob/sys/contrib/dev/acpica/disassembler/dmresrc.c
  user/mjacob/sys/contrib/dev/acpica/disassembler/dmresrcl.c
  user/mjacob/sys/contrib/dev/acpica/disassembler/dmresrcs.c
  user/mjacob/sys/contrib/dev/acpica/disassembler/dmutils.c
  user/mjacob/sys/contrib/dev/acpica/disassembler/dmwalk.c
  user/mjacob/sys/contrib/dev/acpica/dispatcher/dsargs.c
  user/mjacob/sys/contrib/dev/acpica/dispatcher/dsfield.c
  user/mjacob/sys/contrib/dev/acpica/events/evevent.c
  user/mjacob/sys/contrib/dev/acpica/events/evglock.c
  user/mjacob/sys/contrib/dev/acpica/events/evregion.c
  user/mjacob/sys/contrib/dev/acpica/executer/exconfig.c
  user/mjacob/sys/contrib/dev/acpica/executer/excreate.c
  user/mjacob/sys/contrib/dev/acpica/executer/exdump.c
  user/mjacob/sys/contrib/dev/acpica/executer/exfield.c
  user/mjacob/sys/contrib/dev/acpica/executer/exfldio.c
  user/mjacob/sys/contrib/dev/acpica/executer/exprep.c
  user/mjacob/sys/contrib/dev/acpica/executer/exutils.c
  user/mjacob/sys/contrib/dev/acpica/hardware/hwvalid.c
  user/mjacob/sys/contrib/dev/acpica/include/acapps.h
  user/mjacob/sys/contrib/dev/acpica/include/acconfig.h
  user/mjacob/sys/contrib/dev/acpica/include/acdebug.h
  user/mjacob/sys/contrib/dev/acpica/include/acdisasm.h
  user/mjacob/sys/contrib/dev/acpica/include/acevents.h
  user/mjacob/sys/contrib/dev/acpica/include/acglobal.h
  user/mjacob/sys/contrib/dev/acpica/include/acinterp.h
  user/mjacob/sys/contrib/dev/acpica/include/aclocal.h
  user/mjacob/sys/contrib/dev/acpica/include/acnames.h
  user/mjacob/sys/contrib/dev/acpica/include/acobject.h
  user/mjacob/sys/contrib/dev/acpica/include/acopcode.h
  user/mjacob/sys/contrib/dev/acpica/include/acpixf.h
  user/mjacob/sys/contrib/dev/acpica/include/acpredef.h
  user/mjacob/sys/contrib/dev/acpica/include/acresrc.h
  user/mjacob/sys/contrib/dev/acpica/include/acrestyp.h
  user/mjacob/sys/contrib/dev/acpica/include/actbl.h
  user/mjacob/sys/contrib/dev/acpica/include/actbl1.h
  user/mjacob/sys/contrib/dev/acpica/include/actypes.h
  user/mjacob/sys/contrib/dev/acpica/include/acutils.h
  user/mjacob/sys/contrib/dev/acpica/include/amlcode.h
  user/mjacob/sys/contrib/dev/acpica/include/amlresrc.h
  user/mjacob/sys/contrib/dev/acpica/include/platform/acenv.h
  user/mjacob/sys/contrib/dev/acpica/namespace/nspredef.c
  user/mjacob/sys/contrib/dev/acpica/namespace/nsrepair.c
  user/mjacob/sys/contrib/dev/acpica/namespace/nsrepair2.c
  user/mjacob/sys/contrib/dev/acpica/parser/psargs.c
  user/mjacob/sys/contrib/dev/acpica/parser/psopcode.c
  user/mjacob/sys/contrib/dev/acpica/parser/pstree.c
  user/mjacob/sys/contrib/dev/acpica/resources/rscalc.c
  user/mjacob/sys/contrib/dev/acpica/resources/rscreate.c
  user/mjacob/sys/contrib/dev/acpica/resources/rsdump.c
  user/mjacob/sys/contrib/dev/acpica/resources/rsinfo.c
  user/mjacob/sys/contrib/dev/acpica/resources/rsirq.c
  user/mjacob/sys/contrib/dev/acpica/resources/rslist.c
  user/mjacob/sys/contrib/dev/acpica/resources/rsmisc.c
  user/mjacob/sys/contrib/dev/acpica/resources/rsutils.c
  user/mjacob/sys/contrib/dev/acpica/resources/rsxface.c
  user/mjacob/sys/contrib/dev/acpica/tables/tbfadt.c
  user/mjacob/sys/contrib/dev/acpica/tables/tbutils.c
  user/mjacob/sys/contrib/dev/acpica/utilities/utdecode.c
  user/mjacob/sys/contrib/dev/acpica/utilities/utmutex.c
  user/mjacob/sys/contrib/dev/acpica/utilities/utresrc.c
  user/mjacob/sys/contrib/ipfilter/netinet/ip_compat.h
  user/mjacob/sys/contrib/ipfilter/netinet/ip_proxy.c
  user/mjacob/sys/contrib/pf/net/pf.c
  user/mjacob/sys/ddb/db_thread.c
  user/mjacob/sys/dev/aac/aac_pci.c
  user/mjacob/sys/dev/acpi_support/acpi_wmi.c
  user/mjacob/sys/dev/acpica/acpi_battery.c
  user/mjacob/sys/dev/acpica/acpi_cpu.c
  user/mjacob/sys/dev/acpica/acpi_isab.c
  user/mjacob/sys/dev/acpica/acpi_pcib_acpi.c
  user/mjacob/sys/dev/acpica/acpi_thermal.c
  user/mjacob/sys/dev/ahci/ahci.c
  user/mjacob/sys/dev/amr/amr_pci.c
  user/mjacob/sys/dev/arcmsr/arcmsr.c
  user/mjacob/sys/dev/ata/ata-disk.c
  user/mjacob/sys/dev/ata/ata-pci.c
  user/mjacob/sys/dev/ata/chipsets/ata-ati.c
  user/mjacob/sys/dev/ata/chipsets/ata-nvidia.c
  user/mjacob/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c
  user/mjacob/sys/dev/ath/if_ath.c
  user/mjacob/sys/dev/ath/if_ath_sysctl.c
  user/mjacob/sys/dev/ath/if_ath_tx.c
  user/mjacob/sys/dev/ath/if_athioctl.h
  user/mjacob/sys/dev/ath/if_athvar.h
  user/mjacob/sys/dev/bce/if_bce.c
  user/mjacob/sys/dev/bce/if_bcereg.h
  user/mjacob/sys/dev/bfe/if_bfe.c
  user/mjacob/sys/dev/bge/if_bge.c
  user/mjacob/sys/dev/bge/if_bgereg.h
  user/mjacob/sys/dev/bm/if_bm.c
  user/mjacob/sys/dev/bwn/if_bwn.c
  user/mjacob/sys/dev/bwn/if_bwnvar.h
  user/mjacob/sys/dev/bxe/if_bxe.c
  user/mjacob/sys/dev/cas/if_cas.c
  user/mjacob/sys/dev/cm/smc90cx6.c
  user/mjacob/sys/dev/cpuctl/cpuctl.c
  user/mjacob/sys/dev/cxgb/cxgb_main.c
  user/mjacob/sys/dev/cxgbe/osdep.h
  user/mjacob/sys/dev/cxgbe/t4_main.c
  user/mjacob/sys/dev/dc/dcphy.c
  user/mjacob/sys/dev/dc/if_dc.c
  user/mjacob/sys/dev/dc/if_dcreg.h
  user/mjacob/sys/dev/dc/pnphy.c
  user/mjacob/sys/dev/de/if_de.c
  user/mjacob/sys/dev/drm/i915_drv.h
  user/mjacob/sys/dev/e1000/e1000_80003es2lan.c
  user/mjacob/sys/dev/e1000/e1000_80003es2lan.h
  user/mjacob/sys/dev/e1000/e1000_82540.c
  user/mjacob/sys/dev/e1000/e1000_82541.c
  user/mjacob/sys/dev/e1000/e1000_82543.c
  user/mjacob/sys/dev/e1000/e1000_82571.c
  user/mjacob/sys/dev/e1000/e1000_82575.c
  user/mjacob/sys/dev/e1000/e1000_82575.h
  user/mjacob/sys/dev/e1000/e1000_api.c
  user/mjacob/sys/dev/e1000/e1000_api.h
  user/mjacob/sys/dev/e1000/e1000_defines.h
  user/mjacob/sys/dev/e1000/e1000_hw.h
  user/mjacob/sys/dev/e1000/e1000_ich8lan.c
  user/mjacob/sys/dev/e1000/e1000_ich8lan.h
  user/mjacob/sys/dev/e1000/e1000_mac.c
  user/mjacob/sys/dev/e1000/e1000_nvm.c
  user/mjacob/sys/dev/e1000/e1000_nvm.h
  user/mjacob/sys/dev/e1000/e1000_osdep.h
  user/mjacob/sys/dev/e1000/e1000_phy.c
  user/mjacob/sys/dev/e1000/e1000_phy.h
  user/mjacob/sys/dev/e1000/e1000_regs.h
  user/mjacob/sys/dev/e1000/e1000_vf.c
  user/mjacob/sys/dev/e1000/if_em.c
  user/mjacob/sys/dev/e1000/if_em.h
  user/mjacob/sys/dev/e1000/if_igb.c
  user/mjacob/sys/dev/e1000/if_igb.h
  user/mjacob/sys/dev/e1000/if_lem.c
  user/mjacob/sys/dev/e1000/if_lem.h
  user/mjacob/sys/dev/ed/if_ed.c
  user/mjacob/sys/dev/eisa/eisaconf.c
  user/mjacob/sys/dev/esp/esp_pci.c
  user/mjacob/sys/dev/esp/esp_sbus.c
  user/mjacob/sys/dev/et/if_et.c
  user/mjacob/sys/dev/et/if_etreg.h
  user/mjacob/sys/dev/et/if_etvar.h
  user/mjacob/sys/dev/fb/fb.c
  user/mjacob/sys/dev/fdc/fdc.c
  user/mjacob/sys/dev/fdt/fdt_common.c
  user/mjacob/sys/dev/fdt/fdt_powerpc.c
  user/mjacob/sys/dev/fdt/fdtbus.c
  user/mjacob/sys/dev/firewire/firewire.c
  user/mjacob/sys/dev/firewire/fwohci_pci.c
  user/mjacob/sys/dev/gem/if_gem_pci.c
  user/mjacob/sys/dev/gem/if_gem_sbus.c
  user/mjacob/sys/dev/gpio/gpiobus.c
  user/mjacob/sys/dev/gpio/gpioiic.c
  user/mjacob/sys/dev/hifn/hifn7751.c
  user/mjacob/sys/dev/hme/if_hme_pci.c
  user/mjacob/sys/dev/hme/if_hme_sbus.c
  user/mjacob/sys/dev/hptiop/hptiop.c
  user/mjacob/sys/dev/hptmv/entry.c
  user/mjacob/sys/dev/hptrr/hptrr_osm_bsd.c
  user/mjacob/sys/dev/hwpmc/hwpmc_core.c
  user/mjacob/sys/dev/ichsmb/ichsmb_pci.c
  user/mjacob/sys/dev/ida/ida_pci.c
  user/mjacob/sys/dev/if_ndis/if_ndis_usb.c
  user/mjacob/sys/dev/iicbus/iicbus.c
  user/mjacob/sys/dev/iicbus/iicbus.h
  user/mjacob/sys/dev/iicbus/iiconf.c
  user/mjacob/sys/dev/iicbus/iicsmb.c
  user/mjacob/sys/dev/isp/isp_freebsd.c
  user/mjacob/sys/dev/iwn/if_iwn.c
  user/mjacob/sys/dev/iwn/if_iwnreg.h
  user/mjacob/sys/dev/ixgbe/ixgbe.c
  user/mjacob/sys/dev/ixgbe/ixgbe_osdep.h
  user/mjacob/sys/dev/ixgbe/ixv.c
  user/mjacob/sys/dev/lge/if_lge.c
  user/mjacob/sys/dev/mca/mca_bus.c
  user/mjacob/sys/dev/md/md.c
  user/mjacob/sys/dev/mfi/mfi_pci.c
  user/mjacob/sys/dev/mii/acphy.c
  user/mjacob/sys/dev/mii/amphy.c
  user/mjacob/sys/dev/mii/atphy.c
  user/mjacob/sys/dev/mii/axphy.c
  user/mjacob/sys/dev/mii/bmtphy.c
  user/mjacob/sys/dev/mii/brgphy.c
  user/mjacob/sys/dev/mii/ciphy.c
  user/mjacob/sys/dev/mii/e1000phy.c
  user/mjacob/sys/dev/mii/gentbi.c
  user/mjacob/sys/dev/mii/icsphy.c
  user/mjacob/sys/dev/mii/ip1000phy.c
  user/mjacob/sys/dev/mii/jmphy.c
  user/mjacob/sys/dev/mii/lxtphy.c
  user/mjacob/sys/dev/mii/mii.c
  user/mjacob/sys/dev/mii/miidevs
  user/mjacob/sys/dev/mii/miivar.h
  user/mjacob/sys/dev/mii/mlphy.c
  user/mjacob/sys/dev/mii/nsgphy.c
  user/mjacob/sys/dev/mii/nsphy.c
  user/mjacob/sys/dev/mii/nsphyter.c
  user/mjacob/sys/dev/mii/pnaphy.c
  user/mjacob/sys/dev/mii/qsphy.c
  user/mjacob/sys/dev/mii/rdcphy.c
  user/mjacob/sys/dev/mii/rgephy.c
  user/mjacob/sys/dev/mii/rlphy.c
  user/mjacob/sys/dev/mii/rlswitch.c
  user/mjacob/sys/dev/mii/smcphy.c
  user/mjacob/sys/dev/mii/tdkphy.c
  user/mjacob/sys/dev/mii/tlphy.c
  user/mjacob/sys/dev/mii/truephy.c
  user/mjacob/sys/dev/mii/ukphy.c
  user/mjacob/sys/dev/mii/xmphy.c
  user/mjacob/sys/dev/mlx/mlx_pci.c
  user/mjacob/sys/dev/mps/mps_pci.c
  user/mjacob/sys/dev/msk/if_msk.c
  user/mjacob/sys/dev/mvs/mvs_pci.c
  user/mjacob/sys/dev/mvs/mvs_soc.c
  user/mjacob/sys/dev/netmap/if_em_netmap.h
  user/mjacob/sys/dev/netmap/if_igb_netmap.h
  user/mjacob/sys/dev/netmap/if_lem_netmap.h
  user/mjacob/sys/dev/netmap/if_re_netmap.h
  user/mjacob/sys/dev/netmap/ixgbe_netmap.h
  user/mjacob/sys/dev/netmap/netmap.c
  user/mjacob/sys/dev/netmap/netmap_kern.h
  user/mjacob/sys/dev/nfe/if_nfe.c
  user/mjacob/sys/dev/nge/if_nge.c
  user/mjacob/sys/dev/nve/if_nve.c
  user/mjacob/sys/dev/ofw/ofw_fdt.c
  user/mjacob/sys/dev/ofw/ofw_iicbus.c
  user/mjacob/sys/dev/ofw/openfirm.c
  user/mjacob/sys/dev/pccard/pccardvar.h
  user/mjacob/sys/dev/pccbb/pccbb_isa.c
  user/mjacob/sys/dev/pccbb/pccbb_pci.c
  user/mjacob/sys/dev/pci/eisa_pci.c
  user/mjacob/sys/dev/pci/isa_pci.c
  user/mjacob/sys/dev/pci/pci_pci.c
  user/mjacob/sys/dev/pci/pcireg.h
  user/mjacob/sys/dev/pcn/if_pcn.c
  user/mjacob/sys/dev/ppbus/lpbb.c
  user/mjacob/sys/dev/ppbus/lpt.c
  user/mjacob/sys/dev/ppbus/ppb_base.c
  user/mjacob/sys/dev/ppbus/ppb_msq.c
  user/mjacob/sys/dev/ppbus/ppbconf.c
  user/mjacob/sys/dev/ppbus/vpo.c
  user/mjacob/sys/dev/ppc/ppc.c
  user/mjacob/sys/dev/puc/puc_pccard.c
  user/mjacob/sys/dev/puc/puc_pci.c
  user/mjacob/sys/dev/quicc/quicc_bfe_fdt.c
  user/mjacob/sys/dev/re/if_re.c
  user/mjacob/sys/dev/rt/if_rt.c
  user/mjacob/sys/dev/safe/safe.c
  user/mjacob/sys/dev/scc/scc_bfe_ebus.c
  user/mjacob/sys/dev/scc/scc_bfe_macio.c
  user/mjacob/sys/dev/scc/scc_bfe_quicc.c
  user/mjacob/sys/dev/scc/scc_bfe_sbus.c
  user/mjacob/sys/dev/sec/sec.c
  user/mjacob/sys/dev/sf/if_sf.c
  user/mjacob/sys/dev/sfxge/common/efsys.h
  user/mjacob/sys/dev/sfxge/common/efx.h   (contents, props changed)
  user/mjacob/sys/dev/sfxge/common/efx_bootcfg.c   (contents, props changed)
  user/mjacob/sys/dev/sfxge/common/efx_ev.c   (contents, props changed)
  user/mjacob/sys/dev/sfxge/common/efx_filter.c   (contents, props changed)
  user/mjacob/sys/dev/sfxge/common/efx_impl.h   (contents, props changed)
  user/mjacob/sys/dev/sfxge/common/efx_intr.c   (contents, props changed)
  user/mjacob/sys/dev/sfxge/common/efx_mac.c   (contents, props changed)
  user/mjacob/sys/dev/sfxge/common/efx_mcdi.c   (contents, props changed)
  user/mjacob/sys/dev/sfxge/common/efx_mcdi.h   (contents, props changed)
  user/mjacob/sys/dev/sfxge/common/efx_mon.c   (contents, props changed)
  user/mjacob/sys/dev/sfxge/common/efx_nic.c   (contents, props changed)
  user/mjacob/sys/dev/sfxge/common/efx_nvram.c   (contents, props changed)
  user/mjacob/sys/dev/sfxge/common/efx_phy.c   (contents, props changed)
  user/mjacob/sys/dev/sfxge/common/efx_port.c   (contents, props changed)
  user/mjacob/sys/dev/sfxge/common/efx_regs.h   (contents, props changed)
  user/mjacob/sys/dev/sfxge/common/efx_regs_ef10.h   (contents, props changed)
  user/mjacob/sys/dev/sfxge/common/efx_regs_mcdi.h   (contents, props changed)
  user/mjacob/sys/dev/sfxge/common/efx_regs_pci.h   (contents, props changed)
  user/mjacob/sys/dev/sfxge/common/efx_rx.c   (contents, props changed)
  user/mjacob/sys/dev/sfxge/common/efx_sram.c   (contents, props changed)
  user/mjacob/sys/dev/sfxge/common/efx_tx.c   (contents, props changed)
  user/mjacob/sys/dev/sfxge/common/efx_types.h   (contents, props changed)
  user/mjacob/sys/dev/sfxge/common/efx_vpd.c   (contents, props changed)
  user/mjacob/sys/dev/sfxge/common/efx_wol.c   (contents, props changed)
  user/mjacob/sys/dev/sfxge/common/siena_flash.h   (contents, props changed)
  user/mjacob/sys/dev/sfxge/common/siena_impl.h   (contents, props changed)
  user/mjacob/sys/dev/sfxge/common/siena_mac.c   (contents, props changed)
  user/mjacob/sys/dev/sfxge/common/siena_mon.c   (contents, props changed)
  user/mjacob/sys/dev/sfxge/common/siena_nic.c   (contents, props changed)
  user/mjacob/sys/dev/sfxge/common/siena_nvram.c   (contents, props changed)
  user/mjacob/sys/dev/sfxge/common/siena_phy.c   (contents, props changed)
  user/mjacob/sys/dev/sfxge/common/siena_sram.c   (contents, props changed)
  user/mjacob/sys/dev/sfxge/common/siena_vpd.c   (contents, props changed)
  user/mjacob/sys/dev/sfxge/sfxge.c
  user/mjacob/sys/dev/sfxge/sfxge.h
  user/mjacob/sys/dev/sfxge/sfxge_dma.c
  user/mjacob/sys/dev/sfxge/sfxge_intr.c
  user/mjacob/sys/dev/sfxge/sfxge_port.c
  user/mjacob/sys/dev/sfxge/sfxge_tx.c
  user/mjacob/sys/dev/sge/if_sge.c
  user/mjacob/sys/dev/siba/siba.c
  user/mjacob/sys/dev/siba/siba_bwn.c
  user/mjacob/sys/dev/siba/siba_cc.c
  user/mjacob/sys/dev/siba/siba_core.c
  user/mjacob/sys/dev/siba/siba_pcib.c
  user/mjacob/sys/dev/siis/siis.c
  user/mjacob/sys/dev/sis/if_sis.c
  user/mjacob/sys/dev/sk/if_sk.c
  user/mjacob/sys/dev/smbus/smbus.c
  user/mjacob/sys/dev/sound/isa/gusc.c
  user/mjacob/sys/dev/sound/isa/sbc.c
  user/mjacob/sys/dev/sound/pci/csa.c
  user/mjacob/sys/dev/sound/pci/fm801.c
  user/mjacob/sys/dev/sound/usb/uaudio.c
  user/mjacob/sys/dev/speaker/spkr.c
  user/mjacob/sys/dev/spibus/spibus.c
  user/mjacob/sys/dev/spibus/spibusvar.h
  user/mjacob/sys/dev/ste/if_ste.c
  user/mjacob/sys/dev/stge/if_stge.c
  user/mjacob/sys/dev/syscons/syscons.c
  user/mjacob/sys/dev/syscons/syscons.h
  user/mjacob/sys/dev/tl/if_tl.c
  user/mjacob/sys/dev/tsec/if_tsec_fdt.c
  user/mjacob/sys/dev/twa/tw_osl_freebsd.c
  user/mjacob/sys/dev/twe/twe_freebsd.c
  user/mjacob/sys/dev/tws/tws.c
  user/mjacob/sys/dev/tws/tws.h
  user/mjacob/sys/dev/uart/uart_bus_fdt.c
  user/mjacob/sys/dev/uart/uart_subr.c
  user/mjacob/sys/dev/ubsec/ubsec.c
  user/mjacob/sys/dev/usb/controller/at91dci_atmelarm.c
  user/mjacob/sys/dev/usb/controller/atmegadci_atmelarm.c
  user/mjacob/sys/dev/usb/controller/ehci_ixp4xx.c
  user/mjacob/sys/dev/usb/controller/ehci_mv.c
  user/mjacob/sys/dev/usb/controller/ehci_pci.c
  user/mjacob/sys/dev/usb/controller/musb_otg_atmelarm.c
  user/mjacob/sys/dev/usb/controller/ohci_atmelarm.c
  user/mjacob/sys/dev/usb/controller/ohci_pci.c
  user/mjacob/sys/dev/usb/controller/ohci_s3c24x0.c
  user/mjacob/sys/dev/usb/controller/uhci_pci.c
  user/mjacob/sys/dev/usb/controller/uss820dci_atmelarm.c
  user/mjacob/sys/dev/usb/controller/xhci.c
  user/mjacob/sys/dev/usb/controller/xhci_pci.c
  user/mjacob/sys/dev/usb/net/if_aue.c
  user/mjacob/sys/dev/usb/net/if_axe.c
  user/mjacob/sys/dev/usb/net/if_mos.c
  user/mjacob/sys/dev/usb/net/if_rue.c
  user/mjacob/sys/dev/usb/net/if_udav.c
  user/mjacob/sys/dev/usb/net/ruephy.c
  user/mjacob/sys/dev/usb/quirk/usb_quirk.c
  user/mjacob/sys/dev/usb/template/usb_template.c
  user/mjacob/sys/dev/usb/template/usb_template_kbd.c
  user/mjacob/sys/dev/usb/template/usb_template_modem.c
  user/mjacob/sys/dev/usb/template/usb_template_mouse.c
  user/mjacob/sys/dev/usb/usb_msctest.c
  user/mjacob/sys/dev/usb/usb_transfer.h
  user/mjacob/sys/dev/usb/usb_util.c
  user/mjacob/sys/dev/usb/usb_util.h
  user/mjacob/sys/dev/usb/usbdevs
  user/mjacob/sys/dev/usb/wlan/if_run.c
  user/mjacob/sys/dev/usb/wlan/if_urtw.c
  user/mjacob/sys/dev/usb/wlan/if_zyd.c
  user/mjacob/sys/dev/vge/if_vge.c
  user/mjacob/sys/dev/vr/if_vr.c
  user/mjacob/sys/dev/vr/if_vrreg.h
  user/mjacob/sys/dev/vte/if_vte.c
  user/mjacob/sys/dev/vxge/vxge-osdep.h
  user/mjacob/sys/dev/wb/if_wb.c
  user/mjacob/sys/dev/xen/netback/netback.c
  user/mjacob/sys/dev/xen/pcifront/pcifront.c
  user/mjacob/sys/dev/xl/if_xl.c
  user/mjacob/sys/dev/xl/xlphy.c
  user/mjacob/sys/fs/devfs/devfs_vnops.c
  user/mjacob/sys/fs/fifofs/fifo_vnops.c
  user/mjacob/sys/fs/msdosfs/msdosfs_conv.c
  user/mjacob/sys/fs/msdosfs/msdosfs_denode.c
  user/mjacob/sys/fs/msdosfs/msdosfs_fat.c
  user/mjacob/sys/fs/msdosfs/msdosfs_lookup.c
  user/mjacob/sys/fs/msdosfs/msdosfs_vfsops.c
  user/mjacob/sys/fs/nfs/nfs_var.h
  user/mjacob/sys/fs/nfs/nfsclstate.h
  user/mjacob/sys/fs/nfsclient/nfs_clbio.c
  user/mjacob/sys/fs/nfsclient/nfs_clrpcops.c
  user/mjacob/sys/fs/nfsclient/nfs_clstate.c
  user/mjacob/sys/fs/nfsserver/nfs_nfsdport.c
  user/mjacob/sys/fs/nfsserver/nfs_nfsdsubs.c
  user/mjacob/sys/fs/ntfs/ntfs_subr.c
  user/mjacob/sys/fs/ntfs/ntfs_subr.h
  user/mjacob/sys/fs/ntfs/ntfs_vnops.c
  user/mjacob/sys/fs/nullfs/null_subr.c
  user/mjacob/sys/fs/nullfs/null_vnops.c
  user/mjacob/sys/fs/nwfs/nwfs_io.c
  user/mjacob/sys/fs/procfs/procfs_status.c
  user/mjacob/sys/fs/pseudofs/pseudofs_vnops.c
  user/mjacob/sys/fs/smbfs/smbfs_io.c
  user/mjacob/sys/fs/smbfs/smbfs_smb.c
  user/mjacob/sys/fs/smbfs/smbfs_subr.c
  user/mjacob/sys/fs/tmpfs/tmpfs.h
  user/mjacob/sys/fs/tmpfs/tmpfs_vnops.c
  user/mjacob/sys/geom/geom_vfs.c
  user/mjacob/sys/geom/part/g_part_apm.c
  user/mjacob/sys/i386/conf/NOTES
  user/mjacob/sys/i386/conf/PAE
  user/mjacob/sys/i386/i386/legacy.c
  user/mjacob/sys/i386/ibcs2/ibcs2_fcntl.c
  user/mjacob/sys/i386/ibcs2/ibcs2_proto.h
  user/mjacob/sys/i386/ibcs2/ibcs2_syscall.h
  user/mjacob/sys/i386/ibcs2/ibcs2_sysent.c
  user/mjacob/sys/i386/ibcs2/syscalls.master
  user/mjacob/sys/i386/include/_types.h
  user/mjacob/sys/i386/include/vmparam.h
  user/mjacob/sys/i386/linux/linux_proto.h
  user/mjacob/sys/i386/linux/linux_syscall.h
  user/mjacob/sys/i386/linux/linux_syscalls.c
  user/mjacob/sys/i386/linux/linux_sysent.c
  user/mjacob/sys/i386/linux/linux_systrace_args.c
  user/mjacob/sys/i386/linux/syscalls.master
  user/mjacob/sys/ia64/include/_types.h
  user/mjacob/sys/isa/vga_isa.c
  user/mjacob/sys/kern/init_sysent.c
  user/mjacob/sys/kern/kern_cpuset.c
  user/mjacob/sys/kern/kern_ktrace.c
  user/mjacob/sys/kern/kern_lock.c
  user/mjacob/sys/kern/kern_malloc.c
  user/mjacob/sys/kern/kern_mutex.c
  user/mjacob/sys/kern/kern_ntptime.c
  user/mjacob/sys/kern/kern_proc.c
  user/mjacob/sys/kern/kern_racct.c
  user/mjacob/sys/kern/kern_resource.c
  user/mjacob/sys/kern/kern_rmlock.c
  user/mjacob/sys/kern/kern_rwlock.c
  user/mjacob/sys/kern/kern_shutdown.c
  user/mjacob/sys/kern/kern_switch.c
  user/mjacob/sys/kern/kern_sx.c
  user/mjacob/sys/kern/kern_synch.c
  user/mjacob/sys/kern/kern_tc.c
  user/mjacob/sys/kern/kern_thr.c
  user/mjacob/sys/kern/kern_thread.c
  user/mjacob/sys/kern/kern_umtx.c
  user/mjacob/sys/kern/makesyscalls.sh
  user/mjacob/sys/kern/subr_blist.c
  user/mjacob/sys/kern/subr_bus.c
  user/mjacob/sys/kern/subr_firmware.c
  user/mjacob/sys/kern/subr_kdb.c
  user/mjacob/sys/kern/subr_lock.c
  user/mjacob/sys/kern/subr_mchain.c
  user/mjacob/sys/kern/subr_rtc.c
  user/mjacob/sys/kern/subr_witness.c
  user/mjacob/sys/kern/sys_pipe.c
  user/mjacob/sys/kern/syscalls.c
  user/mjacob/sys/kern/syscalls.master
  user/mjacob/sys/kern/systrace_args.c
  user/mjacob/sys/kern/uipc_shm.c
  user/mjacob/sys/kern/uipc_sockbuf.c
  user/mjacob/sys/kern/vfs_bio.c
  user/mjacob/sys/kern/vfs_cache.c
  user/mjacob/sys/kern/vfs_default.c
  user/mjacob/sys/kern/vfs_syscalls.c
  user/mjacob/sys/libkern/iconv.c
  user/mjacob/sys/mips/adm5120/admpci.c
  user/mjacob/sys/mips/atheros/apb.c
  user/mjacob/sys/mips/atheros/ar71xx_chip.c
  user/mjacob/sys/mips/atheros/ar71xx_cpudef.h
  user/mjacob/sys/mips/atheros/ar71xx_ehci.c
  user/mjacob/sys/mips/atheros/ar71xx_machdep.c
  user/mjacob/sys/mips/atheros/ar71xx_ohci.c
  user/mjacob/sys/mips/atheros/ar71xx_pci.c
  user/mjacob/sys/mips/atheros/ar724x_chip.c
  user/mjacob/sys/mips/atheros/ar724x_pci.c
  user/mjacob/sys/mips/atheros/ar91xx_chip.c
  user/mjacob/sys/mips/atheros/if_arge.c
  user/mjacob/sys/mips/cavium/octeon_machdep.c
  user/mjacob/sys/mips/cavium/octopci.c
  user/mjacob/sys/mips/cavium/usb/octusb_octeon.c
  user/mjacob/sys/mips/conf/AR91XX_BASE
  user/mjacob/sys/mips/conf/AR91XX_BASE.hints
  user/mjacob/sys/mips/conf/OCTEON1
  user/mjacob/sys/mips/conf/PB92
  user/mjacob/sys/mips/conf/TP-WN1043ND
  user/mjacob/sys/mips/conf/TP-WN1043ND.hints
  user/mjacob/sys/mips/conf/XLP
  user/mjacob/sys/mips/conf/XLP64
  user/mjacob/sys/mips/conf/XLPN32
  user/mjacob/sys/mips/idt/idtpci.c
  user/mjacob/sys/mips/idt/if_kr.c
  user/mjacob/sys/mips/include/_types.h
  user/mjacob/sys/mips/include/asm.h
  user/mjacob/sys/mips/include/cpufunc.h
  user/mjacob/sys/mips/include/cpuregs.h
  user/mjacob/sys/mips/malta/gt.c
  user/mjacob/sys/mips/malta/gt_pci.c
  user/mjacob/sys/mips/mips/cache.c
  user/mjacob/sys/mips/mips/db_trace.c
  user/mjacob/sys/mips/nlm/cms.c
  user/mjacob/sys/mips/nlm/files.xlp
  user/mjacob/sys/mips/nlm/hal/bridge.h
  user/mjacob/sys/mips/nlm/hal/cop2.h
  user/mjacob/sys/mips/nlm/hal/cpucontrol.h
  user/mjacob/sys/mips/nlm/hal/fmn.c
  user/mjacob/sys/mips/nlm/hal/fmn.h
  user/mjacob/sys/mips/nlm/hal/haldefs.h
  user/mjacob/sys/mips/nlm/hal/iomap.h
  user/mjacob/sys/mips/nlm/hal/mips-extns.h
  user/mjacob/sys/mips/nlm/hal/mmu.h
  user/mjacob/sys/mips/nlm/hal/pcibus.h
  user/mjacob/sys/mips/nlm/hal/pic.h
  user/mjacob/sys/mips/nlm/hal/uart.h
  user/mjacob/sys/mips/nlm/mpreset.S
  user/mjacob/sys/mips/nlm/msgring.h
  user/mjacob/sys/mips/nlm/std.xlp
  user/mjacob/sys/mips/nlm/uart_pci_xlp.c
  user/mjacob/sys/mips/nlm/usb_init.c
  user/mjacob/sys/mips/nlm/xlp.h
  user/mjacob/sys/mips/nlm/xlp_machdep.c
  user/mjacob/sys/mips/nlm/xlp_pci.c
  user/mjacob/sys/mips/rmi/dev/nlge/if_nlge.c
  user/mjacob/sys/mips/rmi/dev/sec/rmisec.c
  user/mjacob/sys/mips/rmi/xlr_pci.c
  user/mjacob/sys/mips/rmi/xls_ehci.c
  user/mjacob/sys/mips/rt305x/rt305x_dotg.c
  user/mjacob/sys/modules/Makefile
  user/mjacob/sys/modules/acpi/acpi/Makefile
  user/mjacob/sys/modules/cam/Makefile
  user/mjacob/sys/modules/libiconv/Makefile
  user/mjacob/sys/modules/libmchain/Makefile
  user/mjacob/sys/modules/splash/Makefile
  user/mjacob/sys/net/if.c
  user/mjacob/sys/net/if_clone.c
  user/mjacob/sys/net/if_clone.h
  user/mjacob/sys/net/if_var.h
  user/mjacob/sys/net/if_vlan.c
  user/mjacob/sys/net/netmap.h
  user/mjacob/sys/netinet/if_ether.c
  user/mjacob/sys/netinet/in.c
  user/mjacob/sys/netinet/sctp.h
  user/mjacob/sys/netinet/sctp_constants.h
  user/mjacob/sys/netinet/sctp_header.h
  user/mjacob/sys/netinet/sctp_output.c
  user/mjacob/sys/netinet/sctp_pcb.c
  user/mjacob/sys/netinet/sctp_pcb.h
  user/mjacob/sys/netinet/sctp_structs.h
  user/mjacob/sys/netinet/sctp_sysctl.c
  user/mjacob/sys/netinet/sctp_sysctl.h
  user/mjacob/sys/netinet/sctp_uio.h
  user/mjacob/sys/netinet/sctp_usrreq.c
  user/mjacob/sys/netinet/sctputil.c
  user/mjacob/sys/netinet/tcp_reass.c
  user/mjacob/sys/netinet6/mld6.c
  user/mjacob/sys/netipsec/xform_ah.c
  user/mjacob/sys/netipsec/xform_esp.c
  user/mjacob/sys/netsmb/smb_conn.c
  user/mjacob/sys/netsmb/smb_conn.h
  user/mjacob/sys/netsmb/smb_smb.c
  user/mjacob/sys/netsmb/smb_subr.c
  user/mjacob/sys/nfs/bootp_subr.c
  user/mjacob/sys/nfsclient/nfs_bio.c
  user/mjacob/sys/nfsclient/nfs_krpc.c
  user/mjacob/sys/nfsserver/nfs_serv.c
  user/mjacob/sys/ofed/include/asm/types.h
  user/mjacob/sys/ofed/include/linux/types.h
  user/mjacob/sys/pc98/cbus/scterm-sck.c
  user/mjacob/sys/pc98/cbus/scvtb.c
  user/mjacob/sys/pc98/include/md_var.h
  user/mjacob/sys/pc98/pc98/pc98_machdep.h
  user/mjacob/sys/pci/if_rl.c
  user/mjacob/sys/pci/if_rlreg.h
  user/mjacob/sys/pci/intpm.c
  user/mjacob/sys/pci/viapm.c
  user/mjacob/sys/powerpc/aim/mmu_oea.c
  user/mjacob/sys/powerpc/aim/mmu_oea64.c
  user/mjacob/sys/powerpc/aim/nexus.c
  user/mjacob/sys/powerpc/booke/platform_bare.c
  user/mjacob/sys/powerpc/include/_types.h
  user/mjacob/sys/powerpc/include/pmap.h
  user/mjacob/sys/powerpc/include/vmparam.h
  user/mjacob/sys/powerpc/mambo/mambo.c
  user/mjacob/sys/powerpc/mpc85xx/nexus.c
  user/mjacob/sys/powerpc/mpc85xx/pci_fdt.c
  user/mjacob/sys/powerpc/ofw/ofw_cpu.c
  user/mjacob/sys/powerpc/ofw/ofw_pcib_pci.c
  user/mjacob/sys/powerpc/powermac/cpcht.c
  user/mjacob/sys/powerpc/powermac/cuda.c
  user/mjacob/sys/powerpc/powermac/grackle.c
  user/mjacob/sys/powerpc/powermac/platform_powermac.c
  user/mjacob/sys/powerpc/powermac/pmu.c
  user/mjacob/sys/powerpc/powermac/pmuvar.h
  user/mjacob/sys/powerpc/powermac/uninorthpci.c
  user/mjacob/sys/powerpc/ps3/ehci_ps3.c
  user/mjacob/sys/powerpc/ps3/ohci_ps3.c
  user/mjacob/sys/powerpc/ps3/ps3bus.c
  user/mjacob/sys/powerpc/ps3/ps3pic.c
  user/mjacob/sys/security/mac/mac_framework.c
  user/mjacob/sys/sparc64/central/central.c
  user/mjacob/sys/sparc64/conf/GENERIC
  user/mjacob/sys/sparc64/ebus/ebus.c
  user/mjacob/sys/sparc64/ebus/epic.c
  user/mjacob/sys/sparc64/fhc/fhc.c
  user/mjacob/sys/sparc64/include/_types.h
  user/mjacob/sys/sparc64/include/atomic.h
  user/mjacob/sys/sparc64/include/md_var.h
  user/mjacob/sys/sparc64/pci/apb.c
  user/mjacob/sys/sparc64/pci/fire.c
  user/mjacob/sys/sparc64/pci/ofw_pcib.c
  user/mjacob/sys/sparc64/pci/ofw_pcibus.c
  user/mjacob/sys/sparc64/pci/psycho.c
  user/mjacob/sys/sparc64/pci/sbbc.c
  user/mjacob/sys/sparc64/pci/schizo.c
  user/mjacob/sys/sparc64/sbus/dma_sbus.c
  user/mjacob/sys/sparc64/sbus/sbus.c
  user/mjacob/sys/sparc64/sparc64/ata_machdep.c
  user/mjacob/sys/sparc64/sparc64/eeprom.c
  user/mjacob/sys/sparc64/sparc64/jbusppm.c
  user/mjacob/sys/sparc64/sparc64/nexus.c
  user/mjacob/sys/sparc64/sparc64/ofw_machdep.c
  user/mjacob/sys/sparc64/sparc64/rtc.c
  user/mjacob/sys/sparc64/sparc64/sc_machdep.c
  user/mjacob/sys/sparc64/sparc64/schppm.c
  user/mjacob/sys/sparc64/sparc64/ssm.c
  user/mjacob/sys/sparc64/sparc64/upa.c
  user/mjacob/sys/sparc64/sparc64/vm_machdep.c
  user/mjacob/sys/sys/bus.h
  user/mjacob/sys/sys/cdefs.h
  user/mjacob/sys/sys/elf_common.h
  user/mjacob/sys/sys/iconv.h
  user/mjacob/sys/sys/mchain.h
  user/mjacob/sys/sys/mutex.h
  user/mjacob/sys/sys/param.h
  user/mjacob/sys/sys/proc.h
  user/mjacob/sys/sys/resource.h
  user/mjacob/sys/sys/sx.h
  user/mjacob/sys/sys/syscall.h
  user/mjacob/sys/sys/syscall.mk
  user/mjacob/sys/sys/sysctl.h
  user/mjacob/sys/sys/sysproto.h
  user/mjacob/sys/sys/systm.h
  user/mjacob/sys/sys/timepps.h
  user/mjacob/sys/sys/types.h
  user/mjacob/sys/sys/umtx.h
  user/mjacob/sys/vm/swap_pager.c
  user/mjacob/sys/vm/vm_map.c
  user/mjacob/sys/vm/vm_meter.c
  user/mjacob/sys/vm/vm_page.c
  user/mjacob/sys/vm/vm_page.h
  user/mjacob/sys/vm/vm_reserv.c
  user/mjacob/sys/vm/vm_reserv.h
  user/mjacob/sys/vm/vnode_pager.c
  user/mjacob/sys/x86/acpica/acpi_apm.c
  user/mjacob/sys/x86/pci/pci_bus.c
  user/mjacob/sys/x86/pci/qpi.c
  user/mjacob/sys/x86/x86/mptable_pci.c
  user/mjacob/sys/xen/evtchn/evtchn_dev.c
  user/mjacob/sys/xen/xenstore/xenstore.c
Directory Properties:
  user/mjacob/sys/   (props changed)
  user/mjacob/sys/boot/   (props changed)
  user/mjacob/sys/cddl/contrib/opensolaris/   (props changed)
  user/mjacob/sys/conf/   (props changed)
  user/mjacob/sys/contrib/dev/acpica/   (props changed)
  user/mjacob/sys/contrib/pf/   (props changed)

Modified: user/mjacob/sys/amd64/amd64/legacy.c
==============================================================================
--- user/mjacob/sys/amd64/amd64/legacy.c	Tue Dec 13 21:26:33 2011	(r228481)
+++ user/mjacob/sys/amd64/amd64/legacy.c	Tue Dec 13 23:49:32 2011	(r228482)
@@ -237,19 +237,17 @@ static device_method_t cpu_methods[] = {
 	/* Bus interface */
 	DEVMETHOD(bus_add_child,	cpu_add_child),
 	DEVMETHOD(bus_read_ivar,	cpu_read_ivar),
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 	DEVMETHOD(bus_get_resource_list, cpu_get_rlist),
 	DEVMETHOD(bus_get_resource,	bus_generic_rl_get_resource),
 	DEVMETHOD(bus_set_resource,	bus_generic_rl_set_resource),
 	DEVMETHOD(bus_alloc_resource,	bus_generic_rl_alloc_resource),
 	DEVMETHOD(bus_release_resource,	bus_generic_rl_release_resource),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
 	DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
 	DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
 	DEVMETHOD(bus_setup_intr,	bus_generic_setup_intr),
 	DEVMETHOD(bus_teardown_intr,	bus_generic_teardown_intr),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t cpu_driver = {

Modified: user/mjacob/sys/amd64/conf/NOTES
==============================================================================
--- user/mjacob/sys/amd64/conf/NOTES	Tue Dec 13 21:26:33 2011	(r228481)
+++ user/mjacob/sys/amd64/conf/NOTES	Tue Dec 13 23:49:32 2011	(r228482)
@@ -294,6 +294,7 @@ options 	DRM_DEBUG	# Include debug print
 #	Requires the mwl firmware module
 # nfe:	nVidia nForce MCP on-board Ethernet Networking (BSD open source)
 # nve:	nVidia nForce MCP on-board Ethernet Networking
+# sfxge: Solarflare SFC9000 family 10Gb Ethernet adapters
 # wpi:	Intel 3945ABG Wireless LAN controller
 #	Requires the wpi firmware module
 
@@ -307,6 +308,7 @@ device		iwn
 device		mwl
 device		nfe
 device		nve
+device		sfxge
 device		wpi
 
 # IEEE 802.11 adapter firmware modules
@@ -456,6 +458,7 @@ device		tpm
 #
 device		ichwd
 device		amdsbwd
+device		viawd
 
 #
 # Temperature sensors:

Modified: user/mjacob/sys/amd64/include/_types.h
==============================================================================
--- user/mjacob/sys/amd64/include/_types.h	Tue Dec 13 21:26:33 2011	(r228481)
+++ user/mjacob/sys/amd64/include/_types.h	Tue Dec 13 23:49:32 2011	(r228482)
@@ -48,7 +48,7 @@
 /*
  * Basic types upon which most other types are built.
  */
-typedef	__signed char		__int8_t;
+typedef	signed char		__int8_t;
 typedef	unsigned char		__uint8_t;
 typedef	short			__int16_t;
 typedef	unsigned short		__uint16_t;

Modified: user/mjacob/sys/amd64/linux32/linux32_proto.h
==============================================================================
--- user/mjacob/sys/amd64/linux32/linux32_proto.h	Tue Dec 13 21:26:33 2011	(r228481)
+++ user/mjacob/sys/amd64/linux32/linux32_proto.h	Tue Dec 13 23:49:32 2011	(r228482)
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 220028 2011-03-26 10:51:56Z avg 
+ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 227693 2011-11-19 07:19:37Z ed 
  */
 
 #ifndef _LINUX_SYSPROTO_H_
@@ -12,6 +12,7 @@
 #include <sys/signal.h>
 #include <sys/acl.h>
 #include <sys/cpuset.h>
+#include <sys/_ffcounter.h>
 #include <sys/_semaphore.h>
 #include <sys/ucontext.h>
 
@@ -131,7 +132,7 @@ struct linux_utime_args {
 };
 struct linux_access_args {
 	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
+	char amode_l_[PADL_(l_int)]; l_int amode; char amode_r_[PADR_(l_int)];
 };
 struct linux_nice_args {
 	char inc_l_[PADL_(l_int)]; l_int inc; char inc_r_[PADR_(l_int)];
@@ -942,7 +943,7 @@ struct linux_linkat_args {
 	char oldname_l_[PADL_(const char *)]; const char * oldname; char oldname_r_[PADR_(const char *)];
 	char newdfd_l_[PADL_(l_int)]; l_int newdfd; char newdfd_r_[PADR_(l_int)];
 	char newname_l_[PADL_(const char *)]; const char * newname; char newname_r_[PADR_(const char *)];
-	char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)];
+	char flag_l_[PADL_(l_int)]; l_int flag; char flag_r_[PADR_(l_int)];
 };
 struct linux_symlinkat_args {
 	char oldname_l_[PADL_(const char *)]; const char * oldname; char oldname_r_[PADR_(const char *)];
@@ -963,7 +964,8 @@ struct linux_fchmodat_args {
 struct linux_faccessat_args {
 	char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)];
 	char filename_l_[PADL_(const char *)]; const char * filename; char filename_r_[PADR_(const char *)];
-	char mode_l_[PADL_(l_int)]; l_int mode; char mode_r_[PADR_(l_int)];
+	char amode_l_[PADL_(l_int)]; l_int amode; char amode_r_[PADR_(l_int)];
+	char flag_l_[PADL_(int)]; int flag; char flag_r_[PADR_(int)];
 };
 struct linux_pselect6_args {
 	register_t dummy;

Modified: user/mjacob/sys/amd64/linux32/linux32_syscall.h
==============================================================================
--- user/mjacob/sys/amd64/linux32/linux32_syscall.h	Tue Dec 13 21:26:33 2011	(r228481)
+++ user/mjacob/sys/amd64/linux32/linux32_syscall.h	Tue Dec 13 23:49:32 2011	(r228482)
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 220028 2011-03-26 10:51:56Z avg 
+ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 227693 2011-11-19 07:19:37Z ed 
  */
 
 #define	LINUX_SYS_exit	1

Modified: user/mjacob/sys/amd64/linux32/linux32_syscalls.c
==============================================================================
--- user/mjacob/sys/amd64/linux32/linux32_syscalls.c	Tue Dec 13 21:26:33 2011	(r228481)
+++ user/mjacob/sys/amd64/linux32/linux32_syscalls.c	Tue Dec 13 23:49:32 2011	(r228482)
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 220028 2011-03-26 10:51:56Z avg 
+ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 227693 2011-11-19 07:19:37Z ed 
  */
 
 const char *linux_syscallnames[] = {

Modified: user/mjacob/sys/amd64/linux32/linux32_sysent.c
==============================================================================
--- user/mjacob/sys/amd64/linux32/linux32_sysent.c	Tue Dec 13 21:26:33 2011	(r228481)
+++ user/mjacob/sys/amd64/linux32/linux32_sysent.c	Tue Dec 13 23:49:32 2011	(r228482)
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 220028 2011-03-26 10:51:56Z avg 
+ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 227693 2011-11-19 07:19:37Z ed 
  */
 
 #include "opt_compat.h"

Modified: user/mjacob/sys/amd64/linux32/linux32_systrace_args.c
==============================================================================
--- user/mjacob/sys/amd64/linux32/linux32_systrace_args.c	Tue Dec 13 21:26:33 2011	(r228481)
+++ user/mjacob/sys/amd64/linux32/linux32_systrace_args.c	Tue Dec 13 23:49:32 2011	(r228482)
@@ -230,7 +230,7 @@ systrace_args(int sysnum, void *params, 
 	case 33: {
 		struct linux_access_args *p = params;
 		uarg[0] = (intptr_t) p->path; /* char * */
-		iarg[1] = p->flags; /* l_int */
+		iarg[1] = p->amode; /* l_int */
 		*n_args = 2;
 		break;
 	}
@@ -1996,7 +1996,7 @@ systrace_args(int sysnum, void *params, 
 		uarg[1] = (intptr_t) p->oldname; /* const char * */
 		iarg[2] = p->newdfd; /* l_int */
 		uarg[3] = (intptr_t) p->newname; /* const char * */
-		iarg[4] = p->flags; /* l_int */
+		iarg[4] = p->flag; /* l_int */
 		*n_args = 5;
 		break;
 	}
@@ -2033,8 +2033,9 @@ systrace_args(int sysnum, void *params, 
 		struct linux_faccessat_args *p = params;
 		iarg[0] = p->dfd; /* l_int */
 		uarg[1] = (intptr_t) p->filename; /* const char * */
-		iarg[2] = p->mode; /* l_int */
-		*n_args = 3;
+		iarg[2] = p->amode; /* l_int */
+		iarg[3] = p->flag; /* int */
+		*n_args = 4;
 		break;
 	}
 	/* linux_pselect6 */
@@ -5064,6 +5065,9 @@ systrace_entry_setargdesc(int sysnum, in
 		case 2:
 			p = "l_int";
 			break;
+		case 3:
+			p = "int";
+			break;
 		default:
 			break;
 		};

Modified: user/mjacob/sys/amd64/linux32/syscalls.master
==============================================================================
--- user/mjacob/sys/amd64/linux32/syscalls.master	Tue Dec 13 21:26:33 2011	(r228481)
+++ user/mjacob/sys/amd64/linux32/syscalls.master	Tue Dec 13 23:49:32 2011	(r228482)
@@ -86,7 +86,7 @@
 				    struct l_utimbuf *times); }
 31	AUE_NULL	UNIMPL	stty
 32	AUE_NULL	UNIMPL	gtty
-33	AUE_ACCESS	STD	{ int linux_access(char *path, l_int flags); }
+33	AUE_ACCESS	STD	{ int linux_access(char *path, l_int amode); }
 34	AUE_NICE	STD	{ int linux_nice(l_int inc); }
 35	AUE_NULL	UNIMPL	ftime
 36	AUE_SYNC	NOPROTO	{ int sync(void); }
@@ -483,14 +483,14 @@
 302	AUE_RENAMEAT	STD	{ int linux_renameat(l_int olddfd, const char *oldname, \
 					l_int newdfd, const char *newname); }
 303	AUE_LINKAT	STD	{ int linux_linkat(l_int olddfd, const char *oldname, \
-					l_int newdfd, const char *newname, l_int flags); }
+					l_int newdfd, const char *newname, l_int flag); }
 304	AUE_SYMLINKAT	STD	{ int linux_symlinkat(const char *oldname, l_int newdfd, \
 					const char *newname); }
 305	AUE_READLINKAT	STD	{ int linux_readlinkat(l_int dfd, const char *path, \
 					char *buf, l_int bufsiz); }
 306	AUE_FCHMODAT	STD	{ int linux_fchmodat(l_int dfd, const char *filename, \
 					l_mode_t mode); }
-307	AUE_FACCESSAT	STD	{ int linux_faccessat(l_int dfd, const char *filename, l_int mode); }
+307	AUE_FACCESSAT	STD	{ int linux_faccessat(l_int dfd, const char *filename, l_int amode, int flag); }
 308	AUE_NULL	STD	{ int linux_pselect6(void); }
 309	AUE_NULL	STD	{ int linux_ppoll(void); }
 310	AUE_NULL	STD	{ int linux_unshare(void); }

Modified: user/mjacob/sys/arm/conf/DB-88F6XXX
==============================================================================
--- user/mjacob/sys/arm/conf/DB-88F6XXX	Tue Dec 13 21:26:33 2011	(r228481)
+++ user/mjacob/sys/arm/conf/DB-88F6XXX	Tue Dec 13 23:49:32 2011	(r228482)
@@ -66,6 +66,10 @@ device		mii
 device		e1000phy
 device		bpf
 
+device		cesa			# Marvell security engine
+device		crypto
+device		cryptodev
+
 # USB
 options 	USB_DEBUG	# enable debug msgs
 device		usb

Modified: user/mjacob/sys/arm/conf/SHEEVAPLUG
==============================================================================
--- user/mjacob/sys/arm/conf/SHEEVAPLUG	Tue Dec 13 21:26:33 2011	(r228481)
+++ user/mjacob/sys/arm/conf/SHEEVAPLUG	Tue Dec 13 23:49:32 2011	(r228482)
@@ -60,6 +60,10 @@ options		HZ=1000
 options		DEVICE_POLLING
 device		vlan
 
+device		cesa			# Marvell security engine
+device		crypto
+device		cryptodev
+
 # USB
 options 	USB_DEBUG	# enable debug msgs
 device		usb

Modified: user/mjacob/sys/arm/econa/ehci_ebus.c
==============================================================================
--- user/mjacob/sys/arm/econa/ehci_ebus.c	Tue Dec 13 21:26:33 2011	(r228481)
+++ user/mjacob/sys/arm/econa/ehci_ebus.c	Tue Dec 13 23:49:32 2011	(r228482)
@@ -235,7 +235,7 @@ ehci_ebus_detach(device_t self)
 		device_delete_child(self, bdev);
 	}
 	/* during module unload there are lots of children leftover */
-	device_delete_all_children(self);
+	device_delete_children(self);
 
 	/*
 	 * disable interrupts that might have been switched on in
@@ -281,10 +281,7 @@ static device_method_t ehci_methods[] = 
 	DEVMETHOD(device_resume, ehci_ebus_resume),
 	DEVMETHOD(device_shutdown, ehci_ebus_shutdown),
 
-	/* Bus interface */
-	DEVMETHOD(bus_print_child, bus_generic_print_child),
-
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t ehci_driver = {

Modified: user/mjacob/sys/arm/econa/ohci_ec.c
==============================================================================
--- user/mjacob/sys/arm/econa/ohci_ec.c	Tue Dec 13 21:26:33 2011	(r228481)
+++ user/mjacob/sys/arm/econa/ohci_ec.c	Tue Dec 13 23:49:32 2011	(r228482)
@@ -185,7 +185,7 @@ ohci_ec_detach(device_t dev)
 		device_delete_child(dev, bdev);
 	}
 	/* during module unload there are lots of children leftover */
-	device_delete_all_children(dev);
+	device_delete_children(dev);
 
 	bus_space_write_4(sc->sc_ohci.sc_io_tag, sc->sc_ohci.sc_io_hdl,
 	    OHCI_CONTROL, 0);
@@ -222,10 +222,7 @@ static device_method_t ohci_methods[] = 
 	DEVMETHOD(device_detach, ohci_ec_detach),
 	DEVMETHOD(device_shutdown, bus_generic_shutdown),
 
-	/* Bus interface */
-	DEVMETHOD(bus_print_child, bus_generic_print_child),
-
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t ohci_driver = {

Modified: user/mjacob/sys/arm/include/_types.h
==============================================================================
--- user/mjacob/sys/arm/include/_types.h	Tue Dec 13 21:26:33 2011	(r228481)
+++ user/mjacob/sys/arm/include/_types.h	Tue Dec 13 23:49:32 2011	(r228482)
@@ -46,7 +46,7 @@
 /*
  * Basic types upon which most other types are built.
  */
-typedef	__signed char		__int8_t;
+typedef	signed char		__int8_t;
 typedef	unsigned char		__uint8_t;
 typedef	short			__int16_t;
 typedef	unsigned short		__uint16_t;

Modified: user/mjacob/sys/arm/mv/common.c
==============================================================================
--- user/mjacob/sys/arm/mv/common.c	Tue Dec 13 21:26:33 2011	(r228481)
+++ user/mjacob/sys/arm/mv/common.c	Tue Dec 13 23:49:32 2011	(r228482)
@@ -1693,7 +1693,7 @@ fdt_get_ranges(const char *nodename, voi
 	int len, tuple_size, tuples_count;
 
 	node = OF_finddevice(nodename);
-	if (node <= 0)
+	if (node == -1)
 		return (EINVAL);
 
 	if ((fdt_addrsize_cells(node, &addr_cells, &size_cells)) != 0)
@@ -1762,11 +1762,11 @@ win_cpu_from_dt(void)
 	/*
 	 * Retrieve CESA SRAM data.
 	 */
-	if ((node = OF_finddevice("sram")) != 0)
+	if ((node = OF_finddevice("sram")) != -1)
 		if (fdt_is_compatible(node, "mrvl,cesa-sram"))
 			goto moveon;
 
-	if ((node = OF_finddevice("/")) == 0)
+	if ((node = OF_finddevice("/")) != -1)
 		return (ENXIO);
 
 	if ((node = fdt_find_compatible(node, "mrvl,cesa-sram", 0)) == 0)
@@ -1796,7 +1796,7 @@ fdt_win_setup(void)
 	int err, i;
 
 	node = OF_finddevice("/");
-	if (node == 0)
+	if (node == -1)
 		panic("fdt_win_setup: no root node");
 
 	node = fdt_find_compatible(node, "simple-bus", 1);

Modified: user/mjacob/sys/arm/mv/files.mv
==============================================================================
--- user/mjacob/sys/arm/mv/files.mv	Tue Dec 13 21:26:33 2011	(r228481)
+++ user/mjacob/sys/arm/mv/files.mv	Tue Dec 13 23:49:32 2011	(r228482)
@@ -28,6 +28,7 @@ arm/mv/mv_sata.c		optional	ata | atamvsa
 arm/mv/timer.c			standard
 arm/mv/twsi.c			optional	iicbus
 
+dev/cesa/cesa.c			optional	cesa
 dev/mge/if_mge.c		optional	mge
 dev/mvs/mvs_soc.c		optional	mvs
 dev/uart/uart_dev_ns8250.c	optional	uart

Modified: user/mjacob/sys/arm/mv/mv_machdep.c
==============================================================================
--- user/mjacob/sys/arm/mv/mv_machdep.c	Tue Dec 13 21:26:33 2011	(r228481)
+++ user/mjacob/sys/arm/mv/mv_machdep.c	Tue Dec 13 23:49:32 2011	(r228482)
@@ -617,13 +617,13 @@ platform_mpp_init(void)
 	/*
 	 * Try to access the MPP node directly i.e. through /aliases/mpp.
 	 */
-	if ((node = OF_finddevice("mpp")) != 0)
+	if ((node = OF_finddevice("mpp")) != -1)
 		if (fdt_is_compatible(node, "mrvl,mpp"))
 			goto moveon;
 	/*
 	 * Find the node the long way.
 	 */
-	if ((node = OF_finddevice("/")) == 0)
+	if ((node = OF_finddevice("/")) == -1)
 		return (ENXIO);
 
 	if ((node = fdt_find_compatible(node, "simple-bus", 0)) == 0)
@@ -752,7 +752,7 @@ platform_devmap_init(void)
 	/*
 	 * PCI range(s).
 	 */
-	if ((root = OF_finddevice("/")) == 0)
+	if ((root = OF_finddevice("/")) == -1)
 		return (ENXIO);
 
 	for (child = OF_child(root); child != 0; child = OF_peer(child))
@@ -779,7 +779,7 @@ platform_devmap_init(void)
 	/*
 	 * CESA SRAM range.
 	 */
-	if ((child = OF_finddevice("sram")) != 0)
+	if ((child = OF_finddevice("sram")) != -1)
 		if (fdt_is_compatible(child, "mrvl,cesa-sram"))
 			goto moveon;
 

Modified: user/mjacob/sys/arm/mv/mv_pci.c
==============================================================================
--- user/mjacob/sys/arm/mv/mv_pci.c	Tue Dec 13 21:26:33 2011	(r228481)
+++ user/mjacob/sys/arm/mv/mv_pci.c	Tue Dec 13 23:49:32 2011	(r228482)
@@ -171,7 +171,6 @@ static device_method_t mv_pcib_methods[]
 	DEVMETHOD(device_attach,		mv_pcib_attach),
 
 	/* Bus interface */
-	DEVMETHOD(bus_print_child,		bus_generic_print_child),
 	DEVMETHOD(bus_read_ivar,		mv_pcib_read_ivar),
 	DEVMETHOD(bus_write_ivar,		mv_pcib_write_ivar),
 	DEVMETHOD(bus_alloc_resource,		mv_pcib_alloc_resource),
@@ -194,7 +193,7 @@ static device_method_t mv_pcib_methods[]
 	DEVMETHOD(ofw_bus_get_node,     ofw_bus_gen_get_node),
 	DEVMETHOD(ofw_bus_get_type,     ofw_bus_gen_get_type),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t mv_pcib_driver = {

Modified: user/mjacob/sys/arm/xscale/i80321/i80321_pci.c
==============================================================================
--- user/mjacob/sys/arm/xscale/i80321/i80321_pci.c	Tue Dec 13 21:26:33 2011	(r228481)
+++ user/mjacob/sys/arm/xscale/i80321/i80321_pci.c	Tue Dec 13 23:49:32 2011	(r228482)
@@ -373,7 +373,6 @@ static device_method_t i80321_pci_method
 	DEVMETHOD(device_resume,	bus_generic_resume),
 
 	/* Bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 	DEVMETHOD(bus_read_ivar,	i80321_read_ivar),
 	DEVMETHOD(bus_write_ivar,	i80321_write_ivar),
 	DEVMETHOD(bus_alloc_resource,	i80321_pci_alloc_resource),
@@ -389,7 +388,7 @@ static device_method_t i80321_pci_method
 	DEVMETHOD(pcib_write_config,	i80321_pci_write_config),
 	DEVMETHOD(pcib_route_interrupt,	machdep_pci_route_interrupt),
 
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t i80321_pci_driver = {

Modified: user/mjacob/sys/arm/xscale/i8134x/i81342_pci.c
==============================================================================
--- user/mjacob/sys/arm/xscale/i8134x/i81342_pci.c	Tue Dec 13 21:26:33 2011	(r228481)
+++ user/mjacob/sys/arm/xscale/i8134x/i81342_pci.c	Tue Dec 13 23:49:32 2011	(r228482)
@@ -516,7 +516,6 @@ static device_method_t i81342_pci_method
 	DEVMETHOD(device_resume,	bus_generic_resume),
 
 	/* Bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 	DEVMETHOD(bus_read_ivar,	i81342_read_ivar),
 	DEVMETHOD(bus_write_ivar,	i81342_write_ivar),
 	DEVMETHOD(bus_alloc_resource,	i81342_pci_alloc_resource),
@@ -532,7 +531,7 @@ static device_method_t i81342_pci_method
 	DEVMETHOD(pcib_write_config,	i81342_pci_write_config),
 	DEVMETHOD(pcib_route_interrupt,	i81342_pci_route_interrupt),
 
-	{0, 0}
+	DEVMETHOD_END
 };
 
 static driver_t i81342_pci_driver = {

Modified: user/mjacob/sys/arm/xscale/ixp425/avila_ata.c
==============================================================================
--- user/mjacob/sys/arm/xscale/ixp425/avila_ata.c	Tue Dec 13 21:26:33 2011	(r228481)
+++ user/mjacob/sys/arm/xscale/ixp425/avila_ata.c	Tue Dec 13 23:49:32 2011	(r228482)
@@ -259,17 +259,11 @@ static int
 ata_avila_detach(device_t dev)
 {
 	struct ata_avila_softc *sc = device_get_softc(dev);
-	device_t *children;
-	int nc;
 
 	/* XXX quiesce gpio? */
 
 	/* detach & delete all children */
-	if (device_get_children(dev, &children, &nc) == 0) {
-		if (nc > 0)
-			device_delete_child(dev, children[0]);
-		free(children, M_TEMP);
-	}
+	device_delete_children(dev);
 
 	bus_teardown_intr(dev, sc->sc_irq, sc->sc_ih);
 	bus_release_resource(dev, SYS_RES_IRQ, sc->sc_rid, sc->sc_irq);

Modified: user/mjacob/sys/arm/xscale/ixp425/ixp425_pci.c
==============================================================================
--- user/mjacob/sys/arm/xscale/ixp425/ixp425_pci.c	Tue Dec 13 21:26:33 2011	(r228481)
+++ user/mjacob/sys/arm/xscale/ixp425/ixp425_pci.c	Tue Dec 13 23:49:32 2011	(r228482)
@@ -445,7 +445,6 @@ static device_method_t ixppcib_methods[]
 	DEVMETHOD(device_attach,		ixppcib_attach),
 
 	/* Bus interface */
-	DEVMETHOD(bus_print_child,		bus_generic_print_child),
 	DEVMETHOD(bus_read_ivar,		ixppcib_read_ivar),
 	DEVMETHOD(bus_write_ivar,		ixppcib_write_ivar),
 	DEVMETHOD(bus_setup_intr,		ixppcib_setup_intr),
@@ -462,7 +461,7 @@ static device_method_t ixppcib_methods[]
 	DEVMETHOD(pcib_write_config,		ixppcib_write_config),
 	DEVMETHOD(pcib_route_interrupt,		ixppcib_route_interrupt),
 
-	{0, 0},
+	DEVMETHOD_END
 };
 
 static driver_t ixppcib_driver = {

Modified: user/mjacob/sys/boot/arm/at91/libat91/sd-card.c
==============================================================================
--- user/mjacob/sys/boot/arm/at91/libat91/sd-card.c	Tue Dec 13 21:26:33 2011	(r228481)
+++ user/mjacob/sys/boot/arm/at91/libat91/sd-card.c	Tue Dec 13 23:49:32 2011	(r228482)
@@ -94,14 +94,14 @@ MCIDeviceWaitReady(unsigned int timeout)
 	}	// End of if AT91C_MCI_RXBUFF
 }
 
-inline static unsigned int
+static inline unsigned int
 swap(unsigned int a)
 {
     return (((a & 0xff) << 24) | ((a & 0xff00) << 8) | ((a & 0xff0000) >> 8)
       | ((a & 0xff000000) >> 24));
 }
 
-inline static void
+static inline void
 wait_ready()
 {
 	int status;

Modified: user/mjacob/sys/boot/fdt/dts/db88f6281.dts
==============================================================================
--- user/mjacob/sys/boot/fdt/dts/db88f6281.dts	Tue Dec 13 21:26:33 2011	(r228481)
+++ user/mjacob/sys/boot/fdt/dts/db88f6281.dts	Tue Dec 13 23:49:32 2011	(r228482)
@@ -239,6 +239,8 @@
 			reg = <0x30000 0x10000>;
 			interrupts = <22>;
 			interrupt-parent = <&PIC>;
+
+			sram-handle = <&SRAM>;
 		};
 
 		usb at 50000 {

Modified: user/mjacob/sys/boot/fdt/dts/sheevaplug.dts
==============================================================================
--- user/mjacob/sys/boot/fdt/dts/sheevaplug.dts	Tue Dec 13 21:26:33 2011	(r228481)
+++ user/mjacob/sys/boot/fdt/dts/sheevaplug.dts	Tue Dec 13 23:49:32 2011	(r228482)
@@ -236,6 +236,8 @@
 			reg = <0x30000 0x10000>;
 			interrupts = <22>;
 			interrupt-parent = <&PIC>;
+
+			sram-handle = <&SRAM>;
 		};
 
 		usb at 50000 {

Modified: user/mjacob/sys/boot/forth/loader.conf
==============================================================================
--- user/mjacob/sys/boot/forth/loader.conf	Tue Dec 13 21:26:33 2011	(r228481)
+++ user/mjacob/sys/boot/forth/loader.conf	Tue Dec 13 23:49:32 2011	(r228482)
@@ -47,7 +47,7 @@ bitmap_type="splash_image_data" # and pl
 				# escape to the loader prompt, set to
 				# "NO" to disable autobooting
 #beastie_disable="NO"		# Turn the beastie boot menu on and off
-#loader_logo="fbsdbw"		# Desired logo: fbsdbw, beastiebw, beastie, none
+#loader_logo="orbbw"		# Desired logo: orbbw, orb, fbsdbw, beastiebw, beastie, none
 #comconsole_speed="9600"	# Set the current serial console speed
 #console="vidconsole"		# A comma separated list of console(s)
 #currdev="disk1s1a"		# Set the current device

Modified: user/mjacob/sys/boot/i386/loader/Makefile
==============================================================================
--- user/mjacob/sys/boot/i386/loader/Makefile	Tue Dec 13 21:26:33 2011	(r228481)
+++ user/mjacob/sys/boot/i386/loader/Makefile	Tue Dec 13 23:49:32 2011	(r228482)
@@ -56,7 +56,7 @@ CFLAGS+=	-DLOADER_GZIP_SUPPORT
 CFLAGS+=	-DLOADER_GPT_SUPPORT
 .endif
 
-# Always add MI sources 
+# Always add MI sources
 .PATH:		${.CURDIR}/../../common
 .include	"${.CURDIR}/../../common/Makefile.inc"
 CFLAGS+=	-I${.CURDIR}/../../common
@@ -101,7 +101,7 @@ FILES=	${LOADER}
 FILESMODE_${LOADER}= ${BINMODE} -b
 
 .if !defined(LOADER_ONLY)
-.PATH: ${.CURDIR}/../../forth 
+.PATH: ${.CURDIR}/../../forth
 FILES+=	loader.help loader.4th support.4th loader.conf
 FILES+= screen.4th frames.4th beastie.4th
 FILES+= brand.4th check-password.4th color.4th delay.4th
@@ -117,7 +117,7 @@ FILES+= menu.rc
 .endif
 
 # XXX crt0.o needs to be first for pxeboot(8) to work
-OBJS=	${BTXCRT} 
+OBJS=	${BTXCRT}
 
 DPADD=	${LIBFICL} ${LIBFIREWIRE} ${LIBZFS} ${LIBI386} ${LIBSTAND}
 LDADD=	${LIBFICL} ${LIBFIREWIRE} ${LIBZFS} ${LIBI386} ${LIBSTAND}

Modified: user/mjacob/sys/boot/i386/zfsboot/zfsboot.c
==============================================================================
--- user/mjacob/sys/boot/i386/zfsboot/zfsboot.c	Tue Dec 13 21:26:33 2011	(r228481)
+++ user/mjacob/sys/boot/i386/zfsboot/zfsboot.c	Tue Dec 13 23:49:32 2011	(r228482)
@@ -541,10 +541,10 @@ main(void)
     }
 
     if (*cmd) {
-	if (parse())
-	    autoboot = 0;
 	if (!OPT_CHECK(RBX_QUIET))
 	    printf("%s: %s", PATH_CONFIG, cmd);
+	if (parse())
+	    autoboot = 0;
 	/* Do not process this command twice */
 	*cmd = 0;
     }

Modified: user/mjacob/sys/boot/ofw/Makefile.inc
==============================================================================
--- user/mjacob/sys/boot/ofw/Makefile.inc	Tue Dec 13 21:26:33 2011	(r228481)
+++ user/mjacob/sys/boot/ofw/Makefile.inc	Tue Dec 13 23:49:32 2011	(r228482)
@@ -2,7 +2,7 @@
 
 .if ${MACHINE_ARCH} == "powerpc64"
 CFLAGS+=	-m32 -mcpu=powerpc
-LDFLAGS+=	-m elf32ppc
+LDFLAGS+=	-m elf32ppc_fbsd
 .endif
 
 .include "../Makefile.inc"

Modified: user/mjacob/sys/boot/powerpc/Makefile.inc
==============================================================================
--- user/mjacob/sys/boot/powerpc/Makefile.inc	Tue Dec 13 21:26:33 2011	(r228481)
+++ user/mjacob/sys/boot/powerpc/Makefile.inc	Tue Dec 13 23:49:32 2011	(r228482)
@@ -2,7 +2,7 @@
 
 .if ${MACHINE_ARCH} == "powerpc64"
 CFLAGS+=	-m32 -mcpu=powerpc
-LDFLAGS+=	-m elf32ppc
+LDFLAGS+=	-m elf32ppc_fbsd
 .endif
 
 .include "../Makefile.inc"

Modified: user/mjacob/sys/boot/uboot/Makefile.inc
==============================================================================
--- user/mjacob/sys/boot/uboot/Makefile.inc	Tue Dec 13 21:26:33 2011	(r228481)
+++ user/mjacob/sys/boot/uboot/Makefile.inc	Tue Dec 13 23:49:32 2011	(r228482)
@@ -2,7 +2,7 @@
 
 .if ${MACHINE_ARCH} == "powerpc64"
 CFLAGS+=	-m32 -mcpu=powerpc
-LDFLAGS+=	-m elf32ppc
+LDFLAGS+=	-m elf32ppc_fbsd
 .endif
 
 .include "../Makefile.inc"

Modified: user/mjacob/sys/boot/zfs/zfsimpl.c
==============================================================================
--- user/mjacob/sys/boot/zfs/zfsimpl.c	Tue Dec 13 21:26:33 2011	(r228481)
+++ user/mjacob/sys/boot/zfs/zfsimpl.c	Tue Dec 13 23:49:32 2011	(r228482)
@@ -458,6 +458,9 @@ vdev_init_from_nvlist(const unsigned cha
 
 	if (strcmp(type, VDEV_TYPE_MIRROR)
 	    && strcmp(type, VDEV_TYPE_DISK)
+#ifdef ZFS_TEST
+	    && strcmp(type, VDEV_TYPE_FILE)
+#endif
 	    && strcmp(type, VDEV_TYPE_RAIDZ)
 	    && strcmp(type, VDEV_TYPE_REPLACING)) {
 		printf("ZFS: can only boot from disk, mirror, raidz1, raidz2 and raidz3 vdevs\n");

Modified: user/mjacob/sys/cam/cam_sim.h
==============================================================================
--- user/mjacob/sys/cam/cam_sim.h	Tue Dec 13 21:26:33 2011	(r228481)
+++ user/mjacob/sys/cam/cam_sim.h	Tue Dec 13 23:49:32 2011	(r228482)
@@ -104,7 +104,8 @@ struct cam_sim {
 	u_int32_t		flags;
 #define	CAM_SIM_REL_TIMEOUT_PENDING	0x01
 #define	CAM_SIM_MPSAFE			0x02
-#define CAM_SIM_ON_DONEQ		0x04
+#define	CAM_SIM_ON_DONEQ		0x04
+#define	CAM_SIM_POLLED			0x08
 	struct callout		callout;
 	struct cam_devq 	*devq;	/* Device Queue to use for this SIM */
 	int			refcount; /* References to the SIM. */

Modified: user/mjacob/sys/cam/cam_xpt.c
==============================================================================
--- user/mjacob/sys/cam/cam_xpt.c	Tue Dec 13 21:26:33 2011	(r228481)
+++ user/mjacob/sys/cam/cam_xpt.c	Tue Dec 13 23:49:32 2011	(r228482)
@@ -48,10 +48,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 #include <sys/kthread.h>
 
-#ifdef PC98
-#include <pc98/pc98/pc98_machdep.h>	/* geometry translation */
-#endif
-
 #include <cam/cam.h>
 #include <cam/cam_ccb.h>
 #include <cam/cam_periph.h>
@@ -66,7 +62,10 @@ __FBSDID("$FreeBSD$");
 #include <cam/scsi/scsi_all.h>
 #include <cam/scsi/scsi_message.h>
 #include <cam/scsi/scsi_pass.h>
+
+#include <machine/md_var.h>	/* geometry translation */
 #include <machine/stdarg.h>	/* for xpt_print below */
+
 #include "opt_cam.h"
 
 /*
@@ -2456,7 +2455,7 @@ xpt_action_default(union ccb *start_ccb)
 			start_ccb->ccb_h.status = CAM_REQ_CMP;
 			break;
 		}
-#ifdef PC98
+#if defined(PC98) || defined(__sparc64__)
 		/*
 		 * In a PC-98 system, geometry translation depens on
 		 * the "real" device geometry obtained from mode page 4.
@@ -2465,6 +2464,9 @@ xpt_action_default(union ccb *start_ccb)
 		 * stored in host memory.  If the translation is available
 		 * in host memory, use it.  If not, rely on the default
 		 * translation the device driver performs.
+		 * For sparc64, we may need adjust the geometry of large
+		 * disks in order to fit the limitations of the 16-bit
+		 * fields of the VTOC8 disk label.
 		 */
 		if (scsi_da_bios_params(&start_ccb->ccg) != 0) {
 			start_ccb->ccb_h.status = CAM_REQ_CMP;
@@ -2957,6 +2959,9 @@ xpt_polled_action(union ccb *start_ccb)
 
 	mtx_assert(sim->mtx, MA_OWNED);
 
+	/* Don't use ISR for this SIM while polling. */
+	sim->flags |= CAM_SIM_POLLED;
+
 	/*
 	 * Steal an opening so that no other queued requests
 	 * can get it before us while we simulate interrupts.
@@ -2996,6 +3001,9 @@ xpt_polled_action(union ccb *start_ccb)
 	} else {
 		start_ccb->ccb_h.status = CAM_RESRC_UNAVAIL;
 	}
+
+	/* We will use CAM ISR for this SIM again. */
+	sim->flags &= ~CAM_SIM_POLLED;
 }
 
 /*
@@ -4224,7 +4232,7 @@ xpt_done(union ccb *done_ccb)
 		TAILQ_INSERT_TAIL(&sim->sim_doneq, &done_ccb->ccb_h,
 		    sim_links.tqe);
 		done_ccb->ccb_h.pinfo.index = CAM_DONEQ_INDEX;
-		if ((sim->flags & CAM_SIM_ON_DONEQ) == 0) {
+		if ((sim->flags & (CAM_SIM_ON_DONEQ | CAM_SIM_POLLED)) == 0) {
 			mtx_lock(&cam_simq_lock);
 			first = TAILQ_EMPTY(&cam_simq);
 			TAILQ_INSERT_TAIL(&cam_simq, sim, links);

Modified: user/mjacob/sys/cam/scsi/scsi_sa.c
==============================================================================
--- user/mjacob/sys/cam/scsi/scsi_sa.c	Tue Dec 13 21:26:33 2011	(r228481)
+++ user/mjacob/sys/cam/scsi/scsi_sa.c	Tue Dec 13 23:49:32 2011	(r228482)
@@ -334,6 +334,10 @@ static struct sa_quirk_entry sa_quirk_ta
 		"STT20000*", "*"}, SA_QUIRK_1FM, 0
 	},
 	{
+		{ T_SEQUENTIAL, SIP_MEDIA_REMOVABLE, "SEAGATE",
+		"DAT    06241-XXX", "*"}, SA_QUIRK_VARIABLE|SA_QUIRK_2FM, 0
+	},
+	{
 		{ T_SEQUENTIAL, SIP_MEDIA_REMOVABLE, "TANDBERG",
 		  " TDC 3600", "U07:"}, SA_QUIRK_NOCOMP|SA_QUIRK_1FM, 512
 	},

Modified: user/mjacob/sys/cam/scsi/scsi_target.c
==============================================================================
--- user/mjacob/sys/cam/scsi/scsi_target.c	Tue Dec 13 21:26:33 2011	(r228481)
+++ user/mjacob/sys/cam/scsi/scsi_target.c	Tue Dec 13 23:49:32 2011	(r228482)
@@ -96,12 +96,9 @@ struct targ_softc {
 	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;
-static d_close_t	targclose;
 static d_read_t		targread;
 static d_write_t	targwrite;
 static d_ioctl_t	targioctl;
@@ -119,7 +116,6 @@ static struct cdevsw targ_cdevsw = {
 	.d_version =	D_VERSION,
 	.d_flags =	D_NEEDGIANT,
 	.d_open =	targopen,
-	.d_close =	targclose,
 	.d_read =	targread,
 	.d_write =	targwrite,
 	.d_ioctl =	targioctl,
@@ -152,15 +148,12 @@ static void		targfreeccb(struct targ_sof
 static struct targ_cmd_descr *
 			targgetdescr(struct targ_softc *softc);
 static periph_init_t	targinit;
-static void		targclone(void *arg, struct ucred *cred, char *name,
-				  int namelen, struct cdev **dev);
 static void		targasync(void *callback_arg, u_int32_t code,
 				  struct cam_path *path, void *arg);
 static void		abort_all_pending(struct targ_softc *softc);
 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 =
 {
@@ -171,66 +164,18 @@ PERIPHDRIVER_DECLARE(targ, targdriver);
 
 static MALLOC_DEFINE(M_TARG, "TARG", "TARG data");
 
-/*
- * Create softc and initialize it. Only one proc can open each targ device.
- * There is no locking here because a periph doesn't get created until an
- * ioctl is issued to do so, and that can't happen until this method returns.
- */
-static int
-targopen(struct cdev *dev, int flags, int fmt, struct thread *td)
-{
-	struct targ_softc *softc;
-
-	if (dev->si_drv1 != 0) {
-		return (EBUSY);
-	}
-	
-	/* Mark device busy before any potentially blocking operations */
-	dev->si_drv1 = (void *)~0;
-
-	/* Create the targ device, allocate its softc, initialize it */
-	if ((dev->si_flags & SI_NAMED) == 0) {
-		make_dev(&targ_cdevsw, dev2unit(dev), UID_ROOT, GID_WHEEL, 0600,
-			 "targ%d", dev2unit(dev));
-	}
-	softc = malloc(sizeof(*softc), M_TARG,
-	       M_WAITOK | M_ZERO);
-	dev->si_drv1 = softc;
-	softc->state = TARG_STATE_OPENED;
-	softc->periph = NULL;
-	softc->path = NULL;
-
-	TAILQ_INIT(&softc->pending_ccb_queue);
-	TAILQ_INIT(&softc->work_queue);
-	TAILQ_INIT(&softc->abort_queue);
-	TAILQ_INIT(&softc->user_ccb_queue);
-	knlist_init_mtx(&softc->read_select.si_note, NULL);
-
-	return (0);
-}
-
 /* Disable LUN if enabled and teardown softc */
-static int
-targclose(struct cdev *dev, int flag, int fmt, struct thread *td)
+static void
+targcdevdtor(void *data)
 {
-	struct targ_softc     *softc;
-	struct cam_periph     *periph;
-	int    error;
+	struct targ_softc *softc;
+	struct cam_periph *periph;
 
-	softc = (struct targ_softc *)dev->si_drv1;
-	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);
+	softc = data;
 	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);
+		free(softc, M_TARG);
+		return;
 	}
 
 	/*
@@ -240,25 +185,41 @@ targclose(struct cdev *dev, int flag, in
 	periph = softc->periph;
 	cam_periph_acquire(periph);
 	cam_periph_lock(periph);
-	error = targdisable(softc);
+	(void)targdisable(softc);
 	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);
+/*
+ * Create softc and initialize it.  There is no locking here because a
+ * periph doesn't get created until an ioctl is issued to do so, and
+ * that can't happen until this method returns.
+ */
+static int
+targopen(struct cdev *dev, int flags, int fmt, struct thread *td)
+{
+	struct targ_softc *softc;
+
+	/* Allocate its softc, initialize it */
+	softc = malloc(sizeof(*softc), M_TARG,
+	       M_WAITOK | M_ZERO);
+	softc->state = TARG_STATE_OPENED;
+	softc->periph = NULL;
+	softc->path = NULL;
+
+	TAILQ_INIT(&softc->pending_ccb_queue);
+	TAILQ_INIT(&softc->work_queue);
+	TAILQ_INIT(&softc->abort_queue);
+	TAILQ_INIT(&softc->user_ccb_queue);
+	knlist_init_mtx(&softc->read_select.si_note, NULL);
+
+	devfs_set_cdevpriv(softc, targcdevdtor);
+	return (0);
 }
 
 /* Enable/disable LUNs, set debugging level */
@@ -268,7 +229,7 @@ targioctl(struct cdev *dev, u_long cmd, 
 	struct targ_softc *softc;
 	cam_status	   status;
 
-	softc = (struct targ_softc *)dev->si_drv1;
+	devfs_get_cdevpriv((void **)&softc);
 
 	switch (cmd) {
 	case TARGIOCENABLE:
@@ -346,7 +307,7 @@ targpoll(struct cdev *dev, int poll_even
 	struct targ_softc *softc;
 	int	revents;
 
-	softc = (struct targ_softc *)dev->si_drv1;
+	devfs_get_cdevpriv((void **)&softc);
 
 	/* Poll for write() is always ok. */
 	revents = poll_events & (POLLOUT | POLLWRNORM);
@@ -371,7 +332,7 @@ targkqfilter(struct cdev *dev, struct kn
 {
 	struct  targ_softc *softc;
 
-	softc = (struct targ_softc *)dev->si_drv1;
+	devfs_get_cdevpriv((void **)&softc);
 	kn->kn_hook = (caddr_t)softc;
 	kn->kn_fop = &targread_filtops;
 	knlist_add(&softc->read_select.si_note, kn, 0);
@@ -572,7 +533,7 @@ targwrite(struct cdev *dev, struct uio *
 	int write_len, error;
 	int func_code, priority;
 
-	softc = (struct targ_softc *)dev->si_drv1;
+	devfs_get_cdevpriv((void **)&softc);
 	write_len = error = 0;
 	CAM_DEBUG(softc->path, CAM_DEBUG_PERIPH,
 		  ("write - uio_resid %zd\n", uio->uio_resid));
@@ -866,7 +827,7 @@ targread(struct cdev *dev, struct uio *u
 
 	error = 0;
 	read_len = 0;
-	softc = (struct targ_softc *)dev->si_drv1;
+	devfs_get_cdevpriv((void **)&softc);
 	user_queue = &softc->user_ccb_queue;
 	abort_queue = &softc->abort_queue;
 	CAM_DEBUG(softc->path, CAM_DEBUG_PERIPH, ("targread\n"));
@@ -1051,23 +1012,11 @@ targgetdescr(struct targ_softc *softc)
 static void
 targinit(void)
 {
-	EVENTHANDLER_REGISTER(dev_clone, targclone, 0, 1000);
-}
-
-static void
-targclone(void *arg, struct ucred *cred, char *name, int namelen,
-    struct cdev **dev)
-{
-	int u;
+	struct cdev *dev;
 
-	if (*dev != NULL)
-		return;
-	if (dev_stdclone(name, NULL, "targ", &u) != 1)
-		return;
-	*dev = make_dev(&targ_cdevsw, u, UID_ROOT, GID_WHEEL,
-			0600, "targ%d", u);
-	dev_ref(*dev);
-	(*dev)->si_flags |= SI_CHEAPCLONE;
+	/* Add symbolic link to targ0 for compatibility. */
+	dev = make_dev(&targ_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "targ");
+	make_dev_alias(dev, "targ0");
 }
 
 static void
@@ -1221,25 +1170,3 @@ targccblen(xpt_opcode func_code)
 
 	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__);
-}

Modified: user/mjacob/sys/cam/scsi/scsi_xpt.c
==============================================================================
--- user/mjacob/sys/cam/scsi/scsi_xpt.c	Tue Dec 13 21:26:33 2011	(r228481)
+++ user/mjacob/sys/cam/scsi/scsi_xpt.c	Tue Dec 13 23:49:32 2011	(r228482)
@@ -1811,14 +1811,14 @@ scsi_find_quirk(struct cam_ed *device)
 static int
 sysctl_cam_search_luns(SYSCTL_HANDLER_ARGS)
 {
-	int error, bool;
+	int error, val;
 
-	bool = cam_srch_hi;
-	error = sysctl_handle_int(oidp, &bool, 0, req);
+	val = cam_srch_hi;
+	error = sysctl_handle_int(oidp, &val, 0, req);
 	if (error != 0 || req->newptr == NULL)
 		return (error);
-	if (bool == 0 || bool == 1) {
-		cam_srch_hi = bool;
+	if (val == 0 || val == 1) {
+		cam_srch_hi = val;
 		return (0);
 	} else {
 		return (EINVAL);

Modified: user/mjacob/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c
==============================================================================
--- user/mjacob/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c	Tue Dec 13 21:26:33 2011	(r228481)
+++ user/mjacob/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c	Tue Dec 13 23:49:32 2011	(r228482)
@@ -267,7 +267,7 @@ zfs_prop_init(void)
 	/* default index properties */
 	zprop_register_index(ZFS_PROP_VERSION, "version", 0, PROP_DEFAULT,

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-src-user mailing list