svn commit: r239950 - in user/mjacob/sys: amd64/amd64 amd64/conf amd64/ia32 amd64/include arm/arm arm/at91 arm/broadcom arm/conf arm/econa arm/include arm/lpc arm/mv arm/mv/armadaxp arm/mv/discover...

Matt Jacob mjacob at FreeBSD.org
Fri Aug 31 14:06:34 UTC 2012 

Author: mjacob
Date: Fri Aug 31 14:06:33 2012
New Revision: 239950
URL: http://svn.freebsd.org/changeset/base/239950

Log:
  IFC @239949

Added:
  user/mjacob/sys/arm/arm/busdma_machdep-v6.c
     - copied unchanged from r239949, head/sys/arm/arm/busdma_machdep-v6.c
  user/mjacob/sys/arm/arm/cpufunc_asm_armv6.S
     - copied unchanged from r239949, head/sys/arm/arm/cpufunc_asm_armv6.S
  user/mjacob/sys/arm/arm/cpufunc_asm_armv7.S
     - copied unchanged from r239949, head/sys/arm/arm/cpufunc_asm_armv7.S
  user/mjacob/sys/arm/arm/cpufunc_asm_pj4b.S
     - copied unchanged from r239949, head/sys/arm/arm/cpufunc_asm_pj4b.S
  user/mjacob/sys/arm/arm/gic.c
     - copied unchanged from r239949, head/sys/arm/arm/gic.c
  user/mjacob/sys/arm/arm/mp_machdep.c
     - copied unchanged from r239949, head/sys/arm/arm/mp_machdep.c
  user/mjacob/sys/arm/arm/mpcore_timer.c
     - copied unchanged from r239949, head/sys/arm/arm/mpcore_timer.c
  user/mjacob/sys/arm/arm/pl310.c
     - copied unchanged from r239949, head/sys/arm/arm/pl310.c
  user/mjacob/sys/arm/arm/pmap-v6.c
     - copied unchanged from r239949, head/sys/arm/arm/pmap-v6.c
  user/mjacob/sys/arm/arm/sc_machdep.c
     - copied unchanged from r239949, head/sys/arm/arm/sc_machdep.c
  user/mjacob/sys/arm/arm/vfp.c
     - copied unchanged from r239949, head/sys/arm/arm/vfp.c
  user/mjacob/sys/arm/at91/board_eb9200.c
     - copied unchanged from r239949, head/sys/arm/at91/board_eb9200.c
  user/mjacob/sys/arm/at91/std.eb9200
     - copied unchanged from r239949, head/sys/arm/at91/std.eb9200
  user/mjacob/sys/arm/broadcom/
     - copied from r239949, head/sys/arm/broadcom/
  user/mjacob/sys/arm/conf/ARMADAXP
     - copied unchanged from r239949, head/sys/arm/conf/ARMADAXP
  user/mjacob/sys/arm/conf/BEAGLEBONE
     - copied unchanged from r239949, head/sys/arm/conf/BEAGLEBONE
  user/mjacob/sys/arm/conf/EA3250
     - copied unchanged from r239949, head/sys/arm/conf/EA3250
  user/mjacob/sys/arm/conf/EA3250.hints
     - copied unchanged from r239949, head/sys/arm/conf/EA3250.hints
  user/mjacob/sys/arm/conf/EB9200
     - copied unchanged from r239949, head/sys/arm/conf/EB9200
  user/mjacob/sys/arm/conf/EB9200.hints
     - copied unchanged from r239949, head/sys/arm/conf/EB9200.hints
  user/mjacob/sys/arm/conf/PANDABOARD
     - copied unchanged from r239949, head/sys/arm/conf/PANDABOARD
  user/mjacob/sys/arm/conf/PANDABOARD.hints
     - copied unchanged from r239949, head/sys/arm/conf/PANDABOARD.hints
  user/mjacob/sys/arm/conf/RPI-B
     - copied unchanged from r239949, head/sys/arm/conf/RPI-B
  user/mjacob/sys/arm/include/pl310.h
     - copied unchanged from r239949, head/sys/arm/include/pl310.h
  user/mjacob/sys/arm/include/sc_machdep.h
     - copied unchanged from r239949, head/sys/arm/include/sc_machdep.h
  user/mjacob/sys/arm/include/vfp.h
     - copied unchanged from r239949, head/sys/arm/include/vfp.h
  user/mjacob/sys/arm/lpc/
     - copied from r239949, head/sys/arm/lpc/
  user/mjacob/sys/arm/mv/armadaxp/
     - copied from r239949, head/sys/arm/mv/armadaxp/
  user/mjacob/sys/arm/mv/mpic.c
     - copied unchanged from r239949, head/sys/arm/mv/mpic.c
  user/mjacob/sys/arm/mv/mv_ts.c
     - copied unchanged from r239949, head/sys/arm/mv/mv_ts.c
  user/mjacob/sys/arm/mv/std-pj4b.mv
     - copied unchanged from r239949, head/sys/arm/mv/std-pj4b.mv
  user/mjacob/sys/arm/tegra/
     - copied from r239949, head/sys/arm/tegra/
  user/mjacob/sys/arm/ti/
     - copied from r239949, head/sys/arm/ti/
  user/mjacob/sys/arm/xscale/std.xscale-be
     - copied unchanged from r239949, head/sys/arm/xscale/std.xscale-be
  user/mjacob/sys/boot/fdt/dts/bcm2835-rpi-b.dts
     - copied unchanged from r239949, head/sys/boot/fdt/dts/bcm2835-rpi-b.dts
  user/mjacob/sys/boot/fdt/dts/beaglebone.dts
     - copied unchanged from r239949, head/sys/boot/fdt/dts/beaglebone.dts
  user/mjacob/sys/boot/fdt/dts/db88f78160.dts
     - copied unchanged from r239949, head/sys/boot/fdt/dts/db88f78160.dts
  user/mjacob/sys/boot/fdt/dts/ea3250.dts
     - copied unchanged from r239949, head/sys/boot/fdt/dts/ea3250.dts
  user/mjacob/sys/boot/fdt/dts/pandaboard.dts
     - copied unchanged from r239949, head/sys/boot/fdt/dts/pandaboard.dts
  user/mjacob/sys/boot/fdt/dts/trimslice.dts
     - copied unchanged from r239949, head/sys/boot/fdt/dts/trimslice.dts
  user/mjacob/sys/contrib/dev/acpica/components/utilities/utxfinit.c
     - copied unchanged from r239949, head/sys/contrib/dev/acpica/components/utilities/utxfinit.c
  user/mjacob/sys/contrib/dev/acpica/include/acbuffer.h
     - copied unchanged from r239949, head/sys/contrib/dev/acpica/include/acbuffer.h
  user/mjacob/sys/dev/altera/
     - copied from r239949, head/sys/dev/altera/
  user/mjacob/sys/dev/ath/ath_hal/ar9003/ar9300_devid.h
     - copied unchanged from r239949, head/sys/dev/ath/ath_hal/ar9003/ar9300_devid.h
  user/mjacob/sys/dev/cxgbe/tom/t4_ddp.c
     - copied unchanged from r239949, head/sys/dev/cxgbe/tom/t4_ddp.c
  user/mjacob/sys/dev/drm2/drm_ioc32.c
     - copied unchanged from r239949, head/sys/dev/drm2/drm_ioc32.c
  user/mjacob/sys/dev/drm2/i915/i915_ioc32.c
     - copied unchanged from r239949, head/sys/dev/drm2/i915/i915_ioc32.c
  user/mjacob/sys/dev/iicbus/ds1631.c
     - copied unchanged from r239949, head/sys/dev/iicbus/ds1631.c
  user/mjacob/sys/dev/iicbus/s35390a.c
     - copied unchanged from r239949, head/sys/dev/iicbus/s35390a.c
  user/mjacob/sys/dev/isf/
     - copied from r239949, head/sys/dev/isf/
  user/mjacob/sys/dev/mii/smscphy.c
     - copied unchanged from r239949, head/sys/dev/mii/smscphy.c
  user/mjacob/sys/dev/sound/macio/onyx.c
     - copied unchanged from r239949, head/sys/dev/sound/macio/onyx.c
  user/mjacob/sys/dev/terasic/
     - copied from r239949, head/sys/dev/terasic/
  user/mjacob/sys/dev/uart/uart_dev_lpc.c
     - copied unchanged from r239949, head/sys/dev/uart/uart_dev_lpc.c
  user/mjacob/sys/dev/uart/uart_dev_pl011.c
     - copied unchanged from r239949, head/sys/dev/uart/uart_dev_pl011.c
  user/mjacob/sys/dev/usb/controller/dwc_otgreg.h
     - copied unchanged from r239949, head/sys/dev/usb/controller/dwc_otgreg.h
  user/mjacob/sys/dev/usb/net/if_smsc.c
     - copied unchanged from r239949, head/sys/dev/usb/net/if_smsc.c
  user/mjacob/sys/dev/usb/net/if_smscreg.h
     - copied unchanged from r239949, head/sys/dev/usb/net/if_smscreg.h
  user/mjacob/sys/mips/beri/
     - copied from r239949, head/sys/mips/beri/
  user/mjacob/sys/mips/conf/AP91
     - copied unchanged from r239949, head/sys/mips/conf/AP91
  user/mjacob/sys/mips/conf/AP91.hints
     - copied unchanged from r239949, head/sys/mips/conf/AP91.hints
  user/mjacob/sys/mips/conf/AR724X_BASE
     - copied unchanged from r239949, head/sys/mips/conf/AR724X_BASE
  user/mjacob/sys/mips/conf/AR724X_BASE.hints
     - copied unchanged from r239949, head/sys/mips/conf/AR724X_BASE.hints
  user/mjacob/sys/mips/conf/BERI_DE4.hints
     - copied unchanged from r239949, head/sys/mips/conf/BERI_DE4.hints
  user/mjacob/sys/mips/conf/BERI_DE4_MDROOT
     - copied unchanged from r239949, head/sys/mips/conf/BERI_DE4_MDROOT
  user/mjacob/sys/mips/conf/BERI_DE4_SDROOT
     - copied unchanged from r239949, head/sys/mips/conf/BERI_DE4_SDROOT
  user/mjacob/sys/mips/conf/BERI_SIM.hints
     - copied unchanged from r239949, head/sys/mips/conf/BERI_SIM.hints
  user/mjacob/sys/mips/conf/BERI_SIM_MDROOT
     - copied unchanged from r239949, head/sys/mips/conf/BERI_SIM_MDROOT
  user/mjacob/sys/mips/conf/BERI_TEMPLATE
     - copied unchanged from r239949, head/sys/mips/conf/BERI_TEMPLATE
  user/mjacob/sys/mips/conf/BERI_TPAD.hints
     - copied unchanged from r239949, head/sys/mips/conf/BERI_TPAD.hints
  user/mjacob/sys/mips/conf/DIR-825
     - copied unchanged from r239949, head/sys/mips/conf/DIR-825
  user/mjacob/sys/mips/conf/DIR-825.hints
     - copied unchanged from r239949, head/sys/mips/conf/DIR-825.hints
  user/mjacob/sys/mips/include/sc_machdep.h
     - copied unchanged from r239949, head/sys/mips/include/sc_machdep.h
  user/mjacob/sys/mips/mips/sc_machdep.c
     - copied unchanged from r239949, head/sys/mips/mips/sc_machdep.c
  user/mjacob/sys/modules/cpsw/
     - copied from r239949, head/sys/modules/cpsw/
  user/mjacob/sys/modules/usb/smsc/
     - copied from r239949, head/sys/modules/usb/smsc/
  user/mjacob/sys/powerpc/wii/
     - copied from r239949, head/sys/powerpc/wii/
Replaced:
  user/mjacob/sys/arm/conf/HL201.hints
     - copied unchanged from r239949, head/sys/arm/conf/HL201.hints
Deleted:
  user/mjacob/sys/ia64/conf/SKI
  user/mjacob/sys/ia64/ia64/ssc.c
  user/mjacob/sys/ia64/ia64/sscdisk.c
Modified:
  user/mjacob/sys/amd64/amd64/mp_machdep.c
  user/mjacob/sys/amd64/amd64/pmap.c
  user/mjacob/sys/amd64/amd64/trap.c
  user/mjacob/sys/amd64/conf/GENERIC
  user/mjacob/sys/amd64/conf/NOTES
  user/mjacob/sys/amd64/conf/XENHVM
  user/mjacob/sys/amd64/ia32/ia32_sigtramp.S
  user/mjacob/sys/amd64/ia32/ia32_syscall.c
  user/mjacob/sys/amd64/include/param.h
  user/mjacob/sys/arm/arm/bcopyinout.S
  user/mjacob/sys/arm/arm/bcopyinout_xscale.S
  user/mjacob/sys/arm/arm/bus_space_asm_generic.S
  user/mjacob/sys/arm/arm/copystr.S
  user/mjacob/sys/arm/arm/cpufunc.c
  user/mjacob/sys/arm/arm/cpufunc_asm.S
  user/mjacob/sys/arm/arm/cpufunc_asm_arm11.S
  user/mjacob/sys/arm/arm/disassem.c
  user/mjacob/sys/arm/arm/elf_trampoline.c
  user/mjacob/sys/arm/arm/fusu.S
  user/mjacob/sys/arm/arm/genassym.c
  user/mjacob/sys/arm/arm/identcpu.c
  user/mjacob/sys/arm/arm/locore.S
  user/mjacob/sys/arm/arm/machdep.c
  user/mjacob/sys/arm/arm/pmap.c
  user/mjacob/sys/arm/arm/swtch.S
  user/mjacob/sys/arm/arm/sys_machdep.c
  user/mjacob/sys/arm/arm/trap.c
  user/mjacob/sys/arm/arm/undefined.c
  user/mjacob/sys/arm/arm/vm_machdep.c
  user/mjacob/sys/arm/at91/at91_machdep.c
  user/mjacob/sys/arm/at91/at91_mci.c
  user/mjacob/sys/arm/at91/at91_pmc.c
  user/mjacob/sys/arm/at91/at91_pmcreg.h
  user/mjacob/sys/arm/at91/at91_pmcvar.h
  user/mjacob/sys/arm/at91/at91_spi.c
  user/mjacob/sys/arm/at91/at91sam9260.c
  user/mjacob/sys/arm/at91/at91sam9g20.c
  user/mjacob/sys/arm/at91/at91sam9g45.c
  user/mjacob/sys/arm/at91/at91sam9x5.c
  user/mjacob/sys/arm/at91/files.at91
  user/mjacob/sys/arm/at91/std.at91
  user/mjacob/sys/arm/at91/std.at91sam9
  user/mjacob/sys/arm/at91/std.at91sam9g45
  user/mjacob/sys/arm/at91/std.atmel
  user/mjacob/sys/arm/conf/AVILA
  user/mjacob/sys/arm/conf/AVILA.hints
  user/mjacob/sys/arm/conf/CAMBRIA
  user/mjacob/sys/arm/conf/CAMBRIA.hints
  user/mjacob/sys/arm/conf/DEFAULTS
  user/mjacob/sys/arm/conf/LN2410SBC
  user/mjacob/sys/arm/conf/SAM9G20EK
  user/mjacob/sys/arm/econa/econa_machdep.c
  user/mjacob/sys/arm/econa/std.econa
  user/mjacob/sys/arm/include/armreg.h
  user/mjacob/sys/arm/include/asm.h
  user/mjacob/sys/arm/include/asmacros.h
  user/mjacob/sys/arm/include/atomic.h
  user/mjacob/sys/arm/include/cpuconf.h
  user/mjacob/sys/arm/include/cpufunc.h
  user/mjacob/sys/arm/include/fp.h
  user/mjacob/sys/arm/include/intr.h
  user/mjacob/sys/arm/include/md_var.h
  user/mjacob/sys/arm/include/param.h
  user/mjacob/sys/arm/include/pcb.h
  user/mjacob/sys/arm/include/pcpu.h
  user/mjacob/sys/arm/include/pmap.h
  user/mjacob/sys/arm/include/pte.h
  user/mjacob/sys/arm/include/smp.h
  user/mjacob/sys/arm/include/sysarch.h
  user/mjacob/sys/arm/include/vmparam.h
  user/mjacob/sys/arm/mv/common.c
  user/mjacob/sys/arm/mv/discovery/files.db78xxx
  user/mjacob/sys/arm/mv/files.mv
  user/mjacob/sys/arm/mv/gpio.c
  user/mjacob/sys/arm/mv/kirkwood/files.kirkwood
  user/mjacob/sys/arm/mv/mv_machdep.c
  user/mjacob/sys/arm/mv/mv_pci.c
  user/mjacob/sys/arm/mv/mvreg.h
  user/mjacob/sys/arm/mv/mvvar.h
  user/mjacob/sys/arm/mv/mvwin.h
  user/mjacob/sys/arm/mv/orion/files.db88f5xxx
  user/mjacob/sys/arm/mv/orion/files.ts7800
  user/mjacob/sys/arm/mv/std.mv
  user/mjacob/sys/arm/mv/timer.c
  user/mjacob/sys/arm/mv/twsi.c
  user/mjacob/sys/arm/s3c2xx0/s3c24x0_machdep.c
  user/mjacob/sys/arm/s3c2xx0/std.ln2410sbc
  user/mjacob/sys/arm/s3c2xx0/std.s3c2410
  user/mjacob/sys/arm/sa11x0/assabet_machdep.c
  user/mjacob/sys/arm/sa11x0/std.sa11x0
  user/mjacob/sys/arm/xscale/i80321/ep80219_machdep.c
  user/mjacob/sys/arm/xscale/i80321/iq31244_machdep.c
  user/mjacob/sys/arm/xscale/i80321/std.i80219
  user/mjacob/sys/arm/xscale/i80321/std.i80321
  user/mjacob/sys/arm/xscale/i8134x/crb_machdep.c
  user/mjacob/sys/arm/xscale/i8134x/std.i81342
  user/mjacob/sys/arm/xscale/ixp425/avila_machdep.c
  user/mjacob/sys/arm/xscale/ixp425/cambria_gpio.c
  user/mjacob/sys/arm/xscale/ixp425/std.ixp425
  user/mjacob/sys/arm/xscale/ixp425/std.ixp435
  user/mjacob/sys/arm/xscale/pxa/pxa_machdep.c
  user/mjacob/sys/arm/xscale/pxa/std.pxa
  user/mjacob/sys/arm/xscale/std.xscale
  user/mjacob/sys/boot/Makefile.ia64
  user/mjacob/sys/boot/common/disk.c
  user/mjacob/sys/boot/common/disk.h
  user/mjacob/sys/boot/common/loader.8
  user/mjacob/sys/boot/common/part.c
  user/mjacob/sys/boot/fdt/dts/xlp-basic.dts
  user/mjacob/sys/boot/i386/libi386/biosdisk.c
  user/mjacob/sys/boot/ia64/Makefile
  user/mjacob/sys/boot/zfs/zfs.c
  user/mjacob/sys/cam/scsi/scsi_all.h
  user/mjacob/sys/cam/scsi/scsi_da.c
  user/mjacob/sys/cam/scsi/scsi_enc.c
  user/mjacob/sys/cam/scsi/scsi_enc_safte.c
  user/mjacob/sys/cam/scsi/scsi_enc_ses.c
  user/mjacob/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c
  user/mjacob/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h
  user/mjacob/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
  user/mjacob/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c
  user/mjacob/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
  user/mjacob/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.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_dir.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_misc.c
  user/mjacob/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bpobj.h
  user/mjacob/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h
  user/mjacob/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.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_pool.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/sys/txg.h
  user/mjacob/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h
  user/mjacob/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h
  user/mjacob/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h
  user/mjacob/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_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/vdev_label.c
  user/mjacob/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c
  user/mjacob/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c
  user/mjacob/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
  user/mjacob/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
  user/mjacob/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
  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/conf/Makefile.arm
  user/mjacob/sys/conf/NOTES
  user/mjacob/sys/conf/files
  user/mjacob/sys/conf/files.arm
  user/mjacob/sys/conf/files.ia64
  user/mjacob/sys/conf/files.mips
  user/mjacob/sys/conf/files.powerpc
  user/mjacob/sys/conf/kern.mk
  user/mjacob/sys/conf/kern.pre.mk
  user/mjacob/sys/conf/kmod.mk
  user/mjacob/sys/conf/ldscript.arm
  user/mjacob/sys/conf/options
  user/mjacob/sys/conf/options.arm
  user/mjacob/sys/conf/options.ia64
  user/mjacob/sys/conf/options.mips
  user/mjacob/sys/conf/options.powerpc
  user/mjacob/sys/contrib/dev/acpica/acpica_prep.sh
  user/mjacob/sys/contrib/dev/acpica/changes.txt   (contents, props changed)
  user/mjacob/sys/contrib/dev/acpica/common/adisasm.c
  user/mjacob/sys/contrib/dev/acpica/common/ahpredef.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/aslcompiler.h
  user/mjacob/sys/contrib/dev/acpica/compiler/aslcompiler.y
  user/mjacob/sys/contrib/dev/acpica/compiler/aslfold.c
  user/mjacob/sys/contrib/dev/acpica/compiler/aslmessages.h
  user/mjacob/sys/contrib/dev/acpica/compiler/asltree.c
  user/mjacob/sys/contrib/dev/acpica/compiler/aslutils.c
  user/mjacob/sys/contrib/dev/acpica/components/debugger/dbcmds.c
  user/mjacob/sys/contrib/dev/acpica/components/debugger/dbexec.c
  user/mjacob/sys/contrib/dev/acpica/components/disassembler/dmbuffer.c
  user/mjacob/sys/contrib/dev/acpica/components/disassembler/dmopcode.c
  user/mjacob/sys/contrib/dev/acpica/components/dispatcher/dswload.c
  user/mjacob/sys/contrib/dev/acpica/components/dispatcher/dswload2.c
  user/mjacob/sys/contrib/dev/acpica/components/events/evgpe.c
  user/mjacob/sys/contrib/dev/acpica/components/events/evxfgpe.c
  user/mjacob/sys/contrib/dev/acpica/components/hardware/hwesleep.c
  user/mjacob/sys/contrib/dev/acpica/components/hardware/hwgpe.c
  user/mjacob/sys/contrib/dev/acpica/components/hardware/hwsleep.c
  user/mjacob/sys/contrib/dev/acpica/components/hardware/hwxfsleep.c
  user/mjacob/sys/contrib/dev/acpica/components/namespace/nsdump.c
  user/mjacob/sys/contrib/dev/acpica/components/utilities/utosi.c
  user/mjacob/sys/contrib/dev/acpica/components/utilities/utxface.c
  user/mjacob/sys/contrib/dev/acpica/components/utilities/utxferror.c
  user/mjacob/sys/contrib/dev/acpica/include/acdisasm.h
  user/mjacob/sys/contrib/dev/acpica/include/achware.h
  user/mjacob/sys/contrib/dev/acpica/include/aclocal.h
  user/mjacob/sys/contrib/dev/acpica/include/acmacros.h
  user/mjacob/sys/contrib/dev/acpica/include/acnames.h
  user/mjacob/sys/contrib/dev/acpica/include/acpixf.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/actbl2.h
  user/mjacob/sys/contrib/dev/acpica/include/actbl3.h
  user/mjacob/sys/contrib/dev/acpica/include/actypes.h
  user/mjacob/sys/contrib/dev/acpica/include/platform/acenv.h
  user/mjacob/sys/contrib/dev/acpica/os_specific/service_layers/osunixxf.c
  user/mjacob/sys/dev/acpica/acpi.c
  user/mjacob/sys/dev/acpica/acpivar.h
  user/mjacob/sys/dev/ahci/ahci.c
  user/mjacob/sys/dev/ahci/ahciem.c
  user/mjacob/sys/dev/amr/amr.c
  user/mjacob/sys/dev/amr/amrvar.h
  user/mjacob/sys/dev/ata/ata-pci.h
  user/mjacob/sys/dev/ata/chipsets/ata-jmicron.c
  user/mjacob/sys/dev/ath/ath_dfs/null/dfs_null.c
  user/mjacob/sys/dev/ath/ath_hal/ah.c
  user/mjacob/sys/dev/ath/ath_hal/ah.h
  user/mjacob/sys/dev/ath/ath_hal/ah_desc.h
  user/mjacob/sys/dev/ath/ath_hal/ah_diagcodes.h
  user/mjacob/sys/dev/ath/ath_hal/ah_eeprom.h
  user/mjacob/sys/dev/ath/ath_hal/ah_eeprom_9287.c
  user/mjacob/sys/dev/ath/ath_hal/ah_internal.h
  user/mjacob/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c
  user/mjacob/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c
  user/mjacob/sys/dev/ath/ath_hal/ar5212/ar5212.h
  user/mjacob/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c
  user/mjacob/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c
  user/mjacob/sys/dev/ath/ath_hal/ar5212/ar5212phy.h
  user/mjacob/sys/dev/ath/ath_hal/ar5416/ar5416.h
  user/mjacob/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c
  user/mjacob/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
  user/mjacob/sys/dev/ath/ath_hal/ar5416/ar5416_radar.c
  user/mjacob/sys/dev/ath/ath_hal/ar9002/ar9285.h
  user/mjacob/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c
  user/mjacob/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.c
  user/mjacob/sys/dev/ath/ath_hal/ar9002/ar9287_attach.c
  user/mjacob/sys/dev/ath/ath_rate/sample/sample.c
  user/mjacob/sys/dev/ath/ath_rate/sample/sample.h
  user/mjacob/sys/dev/ath/ath_rate/sample/tx_schedules.h
  user/mjacob/sys/dev/ath/if_ath.c
  user/mjacob/sys/dev/ath/if_ath_beacon.c
  user/mjacob/sys/dev/ath/if_ath_beacon.h
  user/mjacob/sys/dev/ath/if_ath_debug.c
  user/mjacob/sys/dev/ath/if_ath_misc.h
  user/mjacob/sys/dev/ath/if_ath_rx.c
  user/mjacob/sys/dev/ath/if_ath_rx_edma.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_ath_tx.h
  user/mjacob/sys/dev/ath/if_ath_tx_edma.c
  user/mjacob/sys/dev/ath/if_athvar.h
  user/mjacob/sys/dev/cxgb/cxgb_main.c
  user/mjacob/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c
  user/mjacob/sys/dev/cxgb/ulp/tom/cxgb_listen.c
  user/mjacob/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h
  user/mjacob/sys/dev/cxgbe/adapter.h
  user/mjacob/sys/dev/cxgbe/common/t4_hw.h
  user/mjacob/sys/dev/cxgbe/common/t4_msg.h
  user/mjacob/sys/dev/cxgbe/firmware/t4fw_cfg.txt
  user/mjacob/sys/dev/cxgbe/offload.h
  user/mjacob/sys/dev/cxgbe/t4_main.c
  user/mjacob/sys/dev/cxgbe/t4_sge.c
  user/mjacob/sys/dev/cxgbe/tom/t4_connect.c
  user/mjacob/sys/dev/cxgbe/tom/t4_cpl_io.c
  user/mjacob/sys/dev/cxgbe/tom/t4_listen.c
  user/mjacob/sys/dev/cxgbe/tom/t4_tom.c
  user/mjacob/sys/dev/cxgbe/tom/t4_tom.h
  user/mjacob/sys/dev/drm/drm_fops.c
  user/mjacob/sys/dev/drm2/drmP.h
  user/mjacob/sys/dev/drm2/drm_drv.c
  user/mjacob/sys/dev/drm2/drm_fops.c
  user/mjacob/sys/dev/drm2/i915/i915_dma.c
  user/mjacob/sys/dev/drm2/i915/i915_drv.h
  user/mjacob/sys/dev/e1000/if_em.c
  user/mjacob/sys/dev/fb/fbreg.h
  user/mjacob/sys/dev/fdt/fdt_common.c
  user/mjacob/sys/dev/fdt/fdt_common.h
  user/mjacob/sys/dev/fdt/fdtbus.c
  user/mjacob/sys/dev/fdt/simplebus.c
  user/mjacob/sys/dev/flash/mx25l.c
  user/mjacob/sys/dev/gxemul/cons/gxemul_cons.c
  user/mjacob/sys/dev/ida/ida.c
  user/mjacob/sys/dev/ida/ida_disk.c
  user/mjacob/sys/dev/ida/ida_eisa.c
  user/mjacob/sys/dev/ida/ida_pci.c
  user/mjacob/sys/dev/ida/idavar.h
  user/mjacob/sys/dev/iicbus/ad7417.c
  user/mjacob/sys/dev/iicbus/ds1775.c
  user/mjacob/sys/dev/iicbus/max6690.c
  user/mjacob/sys/dev/isci/isci.c
  user/mjacob/sys/dev/isci/isci.h
  user/mjacob/sys/dev/isci/isci_controller.c
  user/mjacob/sys/dev/isci/isci_remote_device.c
  user/mjacob/sys/dev/isci/scil/sati.c
  user/mjacob/sys/dev/isci/scil/sati_unmap.c
  user/mjacob/sys/dev/isci/scil/scif_sas_sati_binding.h
  user/mjacob/sys/dev/isci/scil/scif_sas_stp_io_request.c
  user/mjacob/sys/dev/isp/isp.c
  user/mjacob/sys/dev/isp/isp_freebsd.c
  user/mjacob/sys/dev/isp/isp_freebsd.h
  user/mjacob/sys/dev/isp/isp_pci.c
  user/mjacob/sys/dev/isp/isp_sbus.c
  user/mjacob/sys/dev/ixgbe/ixgbe.c
  user/mjacob/sys/dev/ixgbe/ixgbe.h
  user/mjacob/sys/dev/ixgbe/ixgbe_osdep.h
  user/mjacob/sys/dev/ksyms/ksyms.c
  user/mjacob/sys/dev/mge/if_mge.c
  user/mjacob/sys/dev/mge/if_mgevar.h
  user/mjacob/sys/dev/mii/miidevs
  user/mjacob/sys/dev/mii/smcphy.c
  user/mjacob/sys/dev/mmc/mmc.c
  user/mjacob/sys/dev/mmc/mmcsd.c
  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/ofw/ofw_bus_subr.c
  user/mjacob/sys/dev/ofw/ofw_bus_subr.h
  user/mjacob/sys/dev/ofw/ofw_iicbus.c
  user/mjacob/sys/dev/ofw/openfirm.c
  user/mjacob/sys/dev/ofw/openfirm.h
  user/mjacob/sys/dev/re/if_re.c
  user/mjacob/sys/dev/sound/macio/snapper.c
  user/mjacob/sys/dev/sound/pci/hda/hdaa.c
  user/mjacob/sys/dev/sound/pci/hda/hdac.c
  user/mjacob/sys/dev/sound/pci/hda/hdac.h
  user/mjacob/sys/dev/spibus/spi.h
  user/mjacob/sys/dev/spibus/spibus.c
  user/mjacob/sys/dev/syscons/schistory.c
  user/mjacob/sys/dev/syscons/scterm-teken.c
  user/mjacob/sys/dev/syscons/syscons.c
  user/mjacob/sys/dev/twe/twe.c
  user/mjacob/sys/dev/twe/twe_compat.h
  user/mjacob/sys/dev/twe/twe_freebsd.c
  user/mjacob/sys/dev/twe/twevar.h
  user/mjacob/sys/dev/uart/uart.h
  user/mjacob/sys/dev/uart/uart_bus_fdt.c
  user/mjacob/sys/dev/uart/uart_subr.c
  user/mjacob/sys/dev/usb/controller/at91dci.c
  user/mjacob/sys/dev/usb/controller/at91dci_atmelarm.c
  user/mjacob/sys/dev/usb/controller/atmegadci.c
  user/mjacob/sys/dev/usb/controller/avr32dci.c
  user/mjacob/sys/dev/usb/controller/dwc_otg.c
  user/mjacob/sys/dev/usb/controller/dwc_otg.h
  user/mjacob/sys/dev/usb/controller/musb_otg.c
  user/mjacob/sys/dev/usb/controller/ohci_atmelarm.c
  user/mjacob/sys/dev/usb/controller/uss820dci.c
  user/mjacob/sys/dev/usb/controller/xhci.c
  user/mjacob/sys/dev/usb/controller/xhci.h
  user/mjacob/sys/dev/usb/controller/xhci_pci.c
  user/mjacob/sys/dev/usb/net/if_usie.c
  user/mjacob/sys/dev/usb/net/uhso.c
  user/mjacob/sys/dev/usb/quirk/usb_quirk.c
  user/mjacob/sys/dev/usb/serial/u3g.c
  user/mjacob/sys/dev/usb/serial/uark.c
  user/mjacob/sys/dev/usb/serial/ubsa.c
  user/mjacob/sys/dev/usb/serial/ubser.c
  user/mjacob/sys/dev/usb/serial/uchcom.c
  user/mjacob/sys/dev/usb/serial/ucycom.c
  user/mjacob/sys/dev/usb/serial/ufoma.c
  user/mjacob/sys/dev/usb/serial/uftdi.c
  user/mjacob/sys/dev/usb/serial/ugensa.c
  user/mjacob/sys/dev/usb/serial/uipaq.c
  user/mjacob/sys/dev/usb/serial/ulpt.c
  user/mjacob/sys/dev/usb/serial/umcs.c
  user/mjacob/sys/dev/usb/serial/umct.c
  user/mjacob/sys/dev/usb/serial/umodem.c
  user/mjacob/sys/dev/usb/serial/umoscom.c
  user/mjacob/sys/dev/usb/serial/uplcom.c
  user/mjacob/sys/dev/usb/serial/usb_serial.c
  user/mjacob/sys/dev/usb/serial/usb_serial.h
  user/mjacob/sys/dev/usb/serial/uslcom.c
  user/mjacob/sys/dev/usb/serial/uvisor.c
  user/mjacob/sys/dev/usb/serial/uvscom.c
  user/mjacob/sys/dev/usb/usb.h
  user/mjacob/sys/dev/usb/usb_controller.h
  user/mjacob/sys/dev/usb/usb_core.h
  user/mjacob/sys/dev/usb/usb_debug.c
  user/mjacob/sys/dev/usb/usb_device.c
  user/mjacob/sys/dev/usb/usb_device.h
  user/mjacob/sys/dev/usb/usb_freebsd.h
  user/mjacob/sys/dev/usb/usb_generic.c
  user/mjacob/sys/dev/usb/usb_hub.c
  user/mjacob/sys/dev/usb/usb_ioctl.h
  user/mjacob/sys/dev/usb/usb_msctest.c
  user/mjacob/sys/dev/usb/usb_request.c
  user/mjacob/sys/dev/usb/usb_transfer.c
  user/mjacob/sys/dev/usb/usbdevs
  user/mjacob/sys/dev/usb/usbdi.h
  user/mjacob/sys/dev/usb/wlan/if_run.c
  user/mjacob/sys/dev/wtap/if_wtap.c
  user/mjacob/sys/fs/devfs/devfs_vnops.c
  user/mjacob/sys/fs/ext2fs/ext2_bmap.c
  user/mjacob/sys/fs/ext2fs/ext2_dinode.h
  user/mjacob/sys/fs/ext2fs/ext2fs.h
  user/mjacob/sys/fs/ext2fs/inode.h
  user/mjacob/sys/fs/nfsclient/nfs_clbio.c
  user/mjacob/sys/fs/nwfs/nwfs_io.c
  user/mjacob/sys/fs/smbfs/smbfs_io.c
  user/mjacob/sys/geom/bde/g_bde.c
  user/mjacob/sys/geom/eli/g_eli_key_cache.c
  user/mjacob/sys/geom/geom.h
  user/mjacob/sys/geom/geom_dev.c
  user/mjacob/sys/geom/geom_disk.c
  user/mjacob/sys/geom/geom_slice.c
  user/mjacob/sys/geom/geom_subr.c
  user/mjacob/sys/geom/multipath/g_multipath.c
  user/mjacob/sys/geom/part/g_part.c
  user/mjacob/sys/geom/raid/g_raid.c
  user/mjacob/sys/geom/uncompress/g_uncompress.c
  user/mjacob/sys/geom/uzip/g_uzip.c
  user/mjacob/sys/i386/bios/smapi_bios.S
  user/mjacob/sys/i386/conf/GENERIC
  user/mjacob/sys/i386/conf/NOTES
  user/mjacob/sys/i386/conf/PAE
  user/mjacob/sys/i386/conf/XENHVM   (contents, props changed)
  user/mjacob/sys/i386/i386/mp_machdep.c
  user/mjacob/sys/i386/include/param.h
  user/mjacob/sys/i386/xen/pmap.c
  user/mjacob/sys/ia64/conf/NOTES
  user/mjacob/sys/ia64/ia64/mem.c
  user/mjacob/sys/kern/bus_if.m
  user/mjacob/sys/kern/init_main.c
  user/mjacob/sys/kern/init_sysent.c
  user/mjacob/sys/kern/kern_conf.c
  user/mjacob/sys/kern/kern_cpuset.c
  user/mjacob/sys/kern/kern_environment.c
  user/mjacob/sys/kern/kern_fork.c
  user/mjacob/sys/kern/kern_ktr.c
  user/mjacob/sys/kern/kern_mbuf.c
  user/mjacob/sys/kern/kern_mib.c
  user/mjacob/sys/kern/kern_module.c
  user/mjacob/sys/kern/kern_ntptime.c
  user/mjacob/sys/kern/kern_proc.c
  user/mjacob/sys/kern/kern_sig.c
  user/mjacob/sys/kern/kern_thread.c
  user/mjacob/sys/kern/kern_time.c
  user/mjacob/sys/kern/kern_umtx.c
  user/mjacob/sys/kern/ksched.c
  user/mjacob/sys/kern/sched_4bsd.c
  user/mjacob/sys/kern/sched_ule.c
  user/mjacob/sys/kern/subr_bus.c
  user/mjacob/sys/kern/subr_param.c
  user/mjacob/sys/kern/subr_syscall.c
  user/mjacob/sys/kern/subr_taskqueue.c
  user/mjacob/sys/kern/subr_turnstile.c
  user/mjacob/sys/kern/subr_witness.c
  user/mjacob/sys/kern/syscalls.c
  user/mjacob/sys/kern/syscalls.master
  user/mjacob/sys/kern/systrace_args.c
  user/mjacob/sys/kern/vfs_cluster.c
  user/mjacob/sys/kern/vfs_subr.c
  user/mjacob/sys/mips/atheros/ar71xx_gpio.c
  user/mjacob/sys/mips/atheros/ar724x_pci.c
  user/mjacob/sys/mips/cavium/octeon_gpio.c
  user/mjacob/sys/mips/conf/AP93
  user/mjacob/sys/mips/conf/AP93.hints
  user/mjacob/sys/mips/conf/AP96
  user/mjacob/sys/mips/conf/PB47
  user/mjacob/sys/mips/conf/PB92
  user/mjacob/sys/mips/conf/ROUTERSTATION
  user/mjacob/sys/mips/conf/RSPRO
  user/mjacob/sys/mips/conf/RSPRO_STANDALONE
  user/mjacob/sys/mips/conf/TP-WN1043ND
  user/mjacob/sys/mips/include/pmap.h
  user/mjacob/sys/mips/mips/machdep.c
  user/mjacob/sys/mips/mips/pmap.c
  user/mjacob/sys/mips/mips/trap.c
  user/mjacob/sys/mips/mips/uma_machdep.c
  user/mjacob/sys/mips/nlm/bus_space_rmi.c
  user/mjacob/sys/mips/nlm/xlp_machdep.c
  user/mjacob/sys/mips/rt305x/rt305x_gpio.c
  user/mjacob/sys/modules/Makefile
  user/mjacob/sys/modules/acpi/acpi/Makefile
  user/mjacob/sys/modules/ath/Makefile
  user/mjacob/sys/modules/bwn/Makefile
  user/mjacob/sys/modules/cxgbe/if_cxgbe/Makefile
  user/mjacob/sys/modules/cxgbe/tom/Makefile
  user/mjacob/sys/modules/drm2/drm2/Makefile
  user/mjacob/sys/modules/drm2/i915kms/Makefile
  user/mjacob/sys/modules/ips/Makefile
  user/mjacob/sys/modules/mii/Makefile
  user/mjacob/sys/modules/mps/Makefile
  user/mjacob/sys/net/if_clone.c
  user/mjacob/sys/net/if_stf.c
  user/mjacob/sys/net/if_vlan.c
  user/mjacob/sys/net80211/ieee80211.h
  user/mjacob/sys/net80211/ieee80211_node.c
  user/mjacob/sys/net80211/ieee80211_node.h
  user/mjacob/sys/netinet/in.c
  user/mjacob/sys/netinet/khelp/h_ertt.c
  user/mjacob/sys/netinet/tcp_input.c
  user/mjacob/sys/netinet/toecore.c
  user/mjacob/sys/netinet/toecore.h
  user/mjacob/sys/netinet6/ip6_output.c
  user/mjacob/sys/netipsec/key.c
  user/mjacob/sys/nfs/bootp_subr.c
  user/mjacob/sys/nfsclient/nfs_bio.c
  user/mjacob/sys/nlm/nlm_advlock.c
  user/mjacob/sys/ofed/include/linux/linux_compat.c
  user/mjacob/sys/pc98/conf/GENERIC
  user/mjacob/sys/powerpc/aim/machdep.c
  user/mjacob/sys/powerpc/conf/GENERIC
  user/mjacob/sys/powerpc/conf/GENERIC64
  user/mjacob/sys/powerpc/conf/NOTES
  user/mjacob/sys/powerpc/include/spr.h
  user/mjacob/sys/powerpc/ofw/ofw_syscons.c
  user/mjacob/sys/powerpc/powermac/atibl.c
  user/mjacob/sys/powerpc/powermac/nvbl.c
  user/mjacob/sys/sparc64/conf/GENERIC
  user/mjacob/sys/sparc64/include/fsr.h
  user/mjacob/sys/sparc64/include/smp.h
  user/mjacob/sys/sparc64/pci/fire.c
  user/mjacob/sys/sparc64/pci/schizo.c
  user/mjacob/sys/sparc64/sparc64/mp_machdep.c
  user/mjacob/sys/sparc64/sparc64/support.S
  user/mjacob/sys/sparc64/sparc64/tick.c
  user/mjacob/sys/sys/_cpuset.h
  user/mjacob/sys/sys/buf.h
  user/mjacob/sys/sys/bus.h
  user/mjacob/sys/sys/conf.h
  user/mjacob/sys/sys/param.h
  user/mjacob/sys/sys/pmckern.h
  user/mjacob/sys/sys/proc.h
  user/mjacob/sys/sys/syscall.h
  user/mjacob/sys/sys/syscall.mk
  user/mjacob/sys/sys/sysproto.h
  user/mjacob/sys/sys/time.h
  user/mjacob/sys/sys/unistd.h
  user/mjacob/sys/sys/user.h
  user/mjacob/sys/ufs/ufs/inode.h
  user/mjacob/sys/ufs/ufs/ufs_bmap.c
  user/mjacob/sys/vm/swap_pager.c
  user/mjacob/sys/vm/uma_core.c
  user/mjacob/sys/vm/vm_glue.c
  user/mjacob/sys/vm/vm_mmap.c
  user/mjacob/sys/vm/vm_page.c
  user/mjacob/sys/vm/vm_page.h
  user/mjacob/sys/vm/vnode_pager.c
  user/mjacob/sys/x86/acpica/acpi_wakeup.c
  user/mjacob/sys/x86/x86/busdma_machdep.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/dev/acpica/common/   (props changed)
  user/mjacob/sys/contrib/dev/acpica/compiler/   (props changed)
  user/mjacob/sys/contrib/dev/acpica/components/debugger/   (props changed)
  user/mjacob/sys/contrib/dev/acpica/components/disassembler/   (props changed)
  user/mjacob/sys/contrib/dev/acpica/components/dispatcher/   (props changed)
  user/mjacob/sys/contrib/dev/acpica/components/events/   (props changed)
  user/mjacob/sys/contrib/dev/acpica/components/hardware/   (props changed)
  user/mjacob/sys/contrib/dev/acpica/components/namespace/   (props changed)
  user/mjacob/sys/contrib/dev/acpica/components/utilities/   (props changed)
  user/mjacob/sys/contrib/dev/acpica/include/   (props changed)
  user/mjacob/sys/contrib/dev/acpica/os_specific/   (props changed)

Modified: user/mjacob/sys/amd64/amd64/mp_machdep.c
==============================================================================
--- user/mjacob/sys/amd64/amd64/mp_machdep.c	Fri Aug 31 12:08:31 2012	(r239949)
+++ user/mjacob/sys/amd64/amd64/mp_machdep.c	Fri Aug 31 14:06:33 2012	(r239950)
@@ -1036,26 +1036,15 @@ ipi_startup(int apic_id, int vector)
 {
 
 	/*
-	 * first we do an INIT/RESET IPI this INIT IPI might be run, reseting
+	 * first we do an INIT IPI: this INIT IPI might be run, resetting
 	 * and running the target CPU. OR this INIT IPI might be latched (P5
 	 * bug), CPU waiting for STARTUP IPI. OR this INIT IPI might be
 	 * ignored.
 	 */
-
-	/* do an INIT IPI: assert RESET */
 	lapic_ipi_raw(APIC_DEST_DESTFLD | APIC_TRIGMOD_EDGE |
 	    APIC_LEVEL_ASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_INIT, apic_id);
-
-	/* wait for pending status end */
 	lapic_ipi_wait(-1);
-
-	/* do an INIT IPI: deassert RESET */
-	lapic_ipi_raw(APIC_DEST_ALLESELF | APIC_TRIGMOD_LEVEL |
-	    APIC_LEVEL_DEASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_INIT, 0);
-
-	/* wait for pending status end */
 	DELAY(10000);		/* wait ~10mS */
-	lapic_ipi_wait(-1);
 
 	/*
 	 * next we do a STARTUP IPI: the previous INIT IPI might still be
@@ -1065,8 +1054,6 @@ ipi_startup(int apic_id, int vector)
 	 * run. OR the previous INIT IPI was ignored. and this STARTUP IPI
 	 * will run.
 	 */
-
-	/* do a STARTUP IPI */
 	lapic_ipi_raw(APIC_DEST_DESTFLD | APIC_TRIGMOD_EDGE |
 	    APIC_LEVEL_DEASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_STARTUP |
 	    vector, apic_id);
@@ -1079,7 +1066,6 @@ ipi_startup(int apic_id, int vector)
 	 * this STARTUP IPI will be ignored, as only ONE STARTUP IPI is
 	 * recognized after hardware RESET or INIT IPI.
 	 */
-
 	lapic_ipi_raw(APIC_DEST_DESTFLD | APIC_TRIGMOD_EDGE |
 	    APIC_LEVEL_DEASSERT | APIC_DESTMODE_PHY | APIC_DELMODE_STARTUP |
 	    vector, apic_id);

Modified: user/mjacob/sys/amd64/amd64/pmap.c
==============================================================================
--- user/mjacob/sys/amd64/amd64/pmap.c	Fri Aug 31 12:08:31 2012	(r239949)
+++ user/mjacob/sys/amd64/amd64/pmap.c	Fri Aug 31 14:06:33 2012	(r239950)
@@ -3445,7 +3445,6 @@ pmap_enter(pmap_t pmap, vm_offset_t va, 
 	KASSERT(va < UPT_MIN_ADDRESS || va >= UPT_MAX_ADDRESS,
 	    ("pmap_enter: invalid to pmap_enter page table pages (va: 0x%lx)",
 	    va));
-	KASSERT((prot & access) == access, ("pmap_enter: access not in prot"));
 	KASSERT((m->oflags & VPO_UNMANAGED) != 0 || va < kmi.clean_sva ||
 	    va >= kmi.clean_eva,
 	    ("pmap_enter: managed mapping within the clean submap"));
@@ -3458,6 +3457,8 @@ pmap_enter(pmap_t pmap, vm_offset_t va, 
 		newpte |= PG_M;
 	if ((prot & VM_PROT_WRITE) != 0)
 		newpte |= PG_RW;
+	KASSERT((newpte & (PG_M | PG_RW)) != PG_M,
+	    ("pmap_enter: access includes VM_PROT_WRITE but prot doesn't"));
 	if ((prot & VM_PROT_EXECUTE) == 0)
 		newpte |= pg_nx;
 	if (wired)

Modified: user/mjacob/sys/amd64/amd64/trap.c
==============================================================================
--- user/mjacob/sys/amd64/amd64/trap.c	Fri Aug 31 12:08:31 2012	(r239949)
+++ user/mjacob/sys/amd64/amd64/trap.c	Fri Aug 31 14:06:33 2012	(r239950)
@@ -176,9 +176,14 @@ static int panic_on_nmi = 1;
 SYSCTL_INT(_machdep, OID_AUTO, panic_on_nmi, CTLFLAG_RW,
 	&panic_on_nmi, 0, "Panic on NMI");
 TUNABLE_INT("machdep.panic_on_nmi", &panic_on_nmi);
-static int prot_fault_translation = 0;
+static int prot_fault_translation;
 SYSCTL_INT(_machdep, OID_AUTO, prot_fault_translation, CTLFLAG_RW,
-	&prot_fault_translation, 0, "Select signal to deliver on protection fault");
+    &prot_fault_translation, 0,
+    "Select signal to deliver on protection fault");
+static int uprintf_signal;
+SYSCTL_INT(_machdep, OID_AUTO, uprintf_signal, CTLFLAG_RW,
+    &uprintf_signal, 0,
+    "Print debugging information on trap signal to ctty");
 
 /*
  * Exception, fault, and trap interface to the FreeBSD kernel.
@@ -610,6 +615,19 @@ trap(struct trapframe *frame)
 	ksi.ksi_code = ucode;
 	ksi.ksi_trapno = type;
 	ksi.ksi_addr = (void *)addr;
+	if (uprintf_signal) {
+		uprintf("pid %d comm %s: signal %d err %lx code %d type %d "
+		    "addr 0x%lx <%02x %02x %02x %02x %02x %02x %02x %02x>\n",
+		    p->p_pid, p->p_comm, i, frame->tf_err, ucode, type, addr,
+		    fubyte((void *)(frame->tf_rip + 0)),
+		    fubyte((void *)(frame->tf_rip + 1)),
+		    fubyte((void *)(frame->tf_rip + 2)),
+		    fubyte((void *)(frame->tf_rip + 3)),
+		    fubyte((void *)(frame->tf_rip + 4)),
+		    fubyte((void *)(frame->tf_rip + 5)),
+		    fubyte((void *)(frame->tf_rip + 6)),
+		    fubyte((void *)(frame->tf_rip + 7)));
+	}
 	trapsignal(td, &ksi);
 
 user:

Modified: user/mjacob/sys/amd64/conf/GENERIC
==============================================================================
--- user/mjacob/sys/amd64/conf/GENERIC	Fri Aug 31 12:08:31 2012	(r239949)
+++ user/mjacob/sys/amd64/conf/GENERIC	Fri Aug 31 14:06:33 2012	(r239950)
@@ -270,7 +270,7 @@ device		wlan_ccmp	# 802.11 CCMP support
 device		wlan_tkip	# 802.11 TKIP support
 device		wlan_amrr	# AMRR transmit rate control algorithm
 device		an		# Aironet 4500/4800 802.11 wireless NICs.
-device		ath		# Atheros NIC's
+device		ath		# Atheros NICs
 device		ath_pci		# Atheros pci/cardbus glue
 device		ath_hal		# pci/cardbus chip support
 options 	AH_SUPPORT_AR5416	# enable AR5416 tx/rx descriptors

Modified: user/mjacob/sys/amd64/conf/NOTES
==============================================================================
--- user/mjacob/sys/amd64/conf/NOTES	Fri Aug 31 12:08:31 2012	(r239949)
+++ user/mjacob/sys/amd64/conf/NOTES	Fri Aug 31 14:06:33 2012	(r239950)
@@ -98,7 +98,7 @@ options 	OFED_DEBUG_INIT
 options 	SDP
 options 	SDP_DEBUG
 
-# IP over Inifiband
+# IP over Infiniband
 options 	IPOIB
 options 	IPOIB_DEBUG
 options 	IPOIB_CM

Modified: user/mjacob/sys/amd64/conf/XENHVM
==============================================================================
--- user/mjacob/sys/amd64/conf/XENHVM	Fri Aug 31 12:08:31 2012	(r239949)
+++ user/mjacob/sys/amd64/conf/XENHVM	Fri Aug 31 14:06:33 2012	(r239950)
@@ -6,8 +6,6 @@
 include		GENERIC
 ident		XENHVM
 
-makeoptions	MODULES_OVERRIDE=""
-
 #
 # Adaptive locks rely on a lock-free pointer read to determine the run state
 # of the thread holding a lock when under contention; under a virtualisation

Modified: user/mjacob/sys/amd64/ia32/ia32_sigtramp.S
==============================================================================
--- user/mjacob/sys/amd64/ia32/ia32_sigtramp.S	Fri Aug 31 12:08:31 2012	(r239949)
+++ user/mjacob/sys/amd64/ia32/ia32_sigtramp.S	Fri Aug 31 14:06:33 2012	(r239950)
@@ -91,8 +91,29 @@ ia32_osigcode:
  */
 	ALIGN_TEXT
 lcall_tramp:
+	.code64
+	/*
+	 * There, we are in 64bit mode and need to return to 32bit.
+	 * First, convert call frame from 64 to 32 bit format.
+	 */
+	pushq	%rax
+	movl	16(%rsp),%eax
+	movl	%eax,20(%rsp)	/* ret %cs */
+	movl	8(%rsp),%eax
+	movl	%eax,16(%rsp)	/* ret %rip -> %eip */
+	popq	%rax
+	addq	$8,%rsp
+	/* Now return to 32bit */
+	pushq	$0x33 /* _ucode32sel UPL */
+	callq	1f
+1:
+	addq	$2f-1b,(%rsp)
+	lretq
+2:
+	/* Back in 32bit mode */
+	.code32
 	cmpl	$SYS_vfork,%eax
-	je	2f
+	je	4f
 	pushl	%ebp
 	movl	%esp,%ebp
 	pushl	0x24(%ebp) /* arg 6 */
@@ -101,19 +122,19 @@ lcall_tramp:
 	pushl	0x18(%ebp)
 	pushl	0x14(%ebp)
 	pushl	0x10(%ebp) /* arg 1 */
-	pushl	0xc(%ebp) /* gap */
+	pushl	0xc(%ebp)  /* gap */
 	int	$0x80
 	leavel
-1:
+3:
 	lretl
-2:
+4:
 	/*
 	 * vfork handling is special and relies on the libc stub saving
 	 * the return ip in %ecx.  If vfork failed, then there is no
 	 * child which can corrupt the frame created by call gate.
 	 */
 	int	$0x80
-	jb	1b
+	jb	3b
 	addl	$8,%esp
 	jmpl	*%ecx
 #endif

Modified: user/mjacob/sys/amd64/ia32/ia32_syscall.c
==============================================================================
--- user/mjacob/sys/amd64/ia32/ia32_syscall.c	Fri Aug 31 12:08:31 2012	(r239949)
+++ user/mjacob/sys/amd64/ia32/ia32_syscall.c	Fri Aug 31 14:06:33 2012	(r239950)
@@ -244,7 +244,7 @@ setup_lcall_gate(void)
 	bzero(ssd, sizeof(*ssd));
 	ssd->gd_looffset = lcall_addr;
 	ssd->gd_hioffset = lcall_addr >> 16;
-	ssd->gd_selector = _ucode32sel;
+	ssd->gd_selector = _ucodesel;
 	ssd->gd_type = SDT_SYSCGT;
 	ssd->gd_dpl = SEL_UPL;
 	ssd->gd_p = 1;

Modified: user/mjacob/sys/amd64/include/param.h
==============================================================================
--- user/mjacob/sys/amd64/include/param.h	Fri Aug 31 12:08:31 2012	(r239949)
+++ user/mjacob/sys/amd64/include/param.h	Fri Aug 31 14:06:33 2012	(r239950)
@@ -123,14 +123,6 @@
 #define	KSTACK_GUARD_PAGES 1	/* pages of kstack guard; 0 disables */
 
 /*
- * Ceiling on amount of swblock kva space, can be changed via
- * the kern.maxswzone /boot/loader.conf variable.
- */
-#ifndef VM_SWZONE_SIZE_MAX
-#define	VM_SWZONE_SIZE_MAX	(32 * 1024 * 1024)
-#endif
-
-/*
  * Mach derived conversion macros
  */
 #define	round_page(x)	((((unsigned long)(x)) + PAGE_MASK) & ~(PAGE_MASK))

Modified: user/mjacob/sys/arm/arm/bcopyinout.S
==============================================================================
--- user/mjacob/sys/arm/arm/bcopyinout.S	Fri Aug 31 12:08:31 2012	(r239949)
+++ user/mjacob/sys/arm/arm/bcopyinout.S	Fri Aug 31 14:06:33 2012	(r239950)
@@ -54,14 +54,19 @@ __FBSDID("$FreeBSD$");
 	.text
 	.align	0
 
-#ifdef MULTIPROCESSOR
-.Lcpu_info:
-	.word	_C_LABEL(cpu_info)
+#ifdef _ARM_ARCH_6
+#define GET_PCB(tmp) \
+	mrc p15, 0, tmp, c13, c0, 4; \
+	add	tmp, tmp, #(PC_CURPCB)
 #else
 .Lcurpcb:
-	.word _C_LABEL(__pcpu) + PC_CURPCB
+	.word	_C_LABEL(__pcpu) + PC_CURPCB
+
+#define GET_PCB(tmp) \
+	ldr	tmp, .Lcurpcb
 #endif
 
+
 #define SAVE_REGS	stmfd	sp!, {r4-r11}
 #define RESTORE_REGS	ldmfd	sp!, {r4-r11}
 		
@@ -111,18 +116,9 @@ ENTRY(copyin)
 
 .Lnormal:
 	SAVE_REGS
-#ifdef MULTIPROCESSOR
-	/* XXX Probably not appropriate for non-Hydra SMPs */
-	stmfd	sp!, {r0-r2, r14}
-	bl	_C_LABEL(cpu_number)
-	ldr	r4, .Lcpu_info
-	ldr	r4, [r4, r0, lsl #2]
-	ldr	r4, [r4, #CI_CURPCB]
-	ldmfd	sp!, {r0-r2, r14}
-#else
-	ldr	r4, .Lcurpcb
+	GET_PCB(r4)
 	ldr	r4, [r4]
-#endif
+
 
 	ldr	r5, [r4, #PCB_ONFAULT]
 	adr	r3, .Lcopyfault
@@ -357,18 +353,8 @@ ENTRY(copyout)
 
 .Lnormale:
 	SAVE_REGS
-#ifdef MULTIPROCESSOR
-	/* XXX Probably not appropriate for non-Hydra SMPs */
-	stmfd	sp!, {r0-r2, r14}
-	bl	_C_LABEL(cpu_number)
-	ldr	r4, .Lcpu_info
-	ldr	r4, [r4, r0, lsl #2]
-	ldr	r4, [r4, #CI_CURPCB]
-	ldmfd	sp!, {r0-r2, r14}
-#else
-	ldr	r4, .Lcurpcb
+	GET_PCB(r4)
 	ldr	r4, [r4]
-#endif
 
 	ldr	r5, [r4, #PCB_ONFAULT]
 	adr	r3, .Lcopyfault
@@ -561,18 +547,9 @@ ENTRY(copyout)
  * else EFAULT if a page fault occurred.
  */
 ENTRY(badaddr_read_1)
-#ifdef MULTIPROCESSOR
-	/* XXX Probably not appropriate for non-Hydra SMPs */
-	stmfd	sp!, {r0-r1, r14}
-	bl	_C_LABEL(cpu_number)
-	ldr	r2, .Lcpu_info
-	ldr	r2, [r2, r0, lsl #2]
-	ldr	r2, [r2, #CI_CURPCB]
-	ldmfd	sp!, {r0-r1, r14}
-#else
-	ldr	r2, .Lcurpcb
+	GET_PCB(r2)
 	ldr	r2, [r2]
-#endif
+
 	ldr	ip, [r2, #PCB_ONFAULT]
 	adr	r3, 1f
 	str	r3, [r2, #PCB_ONFAULT]
@@ -595,18 +572,9 @@ ENTRY(badaddr_read_1)
  * else EFAULT if a page fault occurred.
  */
 ENTRY(badaddr_read_2)
-#ifdef MULTIPROCESSOR
-	/* XXX Probably not appropriate for non-Hydra SMPs */
-	stmfd	sp!, {r0-r1, r14}
-	bl	_C_LABEL(cpu_number)
-	ldr	r2, .Lcpu_info
-	ldr	r2, [r2, r0, lsl #2]
-	ldr	r2, [r2, #CI_CURPCB]
-	ldmfd	sp!, {r0-r1, r14}
-#else
-	ldr	r2, .Lcurpcb
+	GET_PCB(r2)
 	ldr	r2, [r2]
-#endif
+
 	ldr	ip, [r2, #PCB_ONFAULT]
 	adr	r3, 1f
 	str	r3, [r2, #PCB_ONFAULT]
@@ -629,18 +597,9 @@ ENTRY(badaddr_read_2)
  * else EFAULT if a page fault occurred.
  */
 ENTRY(badaddr_read_4)
-#ifdef MULTIPROCESSOR
-	/* XXX Probably not appropriate for non-Hydra SMPs */
-	stmfd	sp!, {r0-r1, r14}
-	bl	_C_LABEL(cpu_number)
-	ldr	r2, .Lcpu_info
-	ldr	r2, [r2, r0, lsl #2]
-	ldr	r2, [r2, #CI_CURPCB]
-	ldmfd	sp!, {r0-r1, r14}
-#else
-	ldr	r2, .Lcurpcb
+	GET_PCB(r2)
 	ldr	r2, [r2]
-#endif
+
 	ldr	ip, [r2, #PCB_ONFAULT]
 	adr	r3, 1f
 	str	r3, [r2, #PCB_ONFAULT]

Modified: user/mjacob/sys/arm/arm/bcopyinout_xscale.S
==============================================================================
--- user/mjacob/sys/arm/arm/bcopyinout_xscale.S	Fri Aug 31 12:08:31 2012	(r239949)
+++ user/mjacob/sys/arm/arm/bcopyinout_xscale.S	Fri Aug 31 14:06:33 2012	(r239950)
@@ -41,12 +41,15 @@ __FBSDID("$FreeBSD$");
 	.text
 	.align	0
 
-#ifdef MULTIPROCESSOR
-.Lcpu_info:
-	.word	_C_LABEL(cpu_info)
+#ifdef _ARM_ARCH_6
+#define GET_PCB(tmp) \
+	mrc p15, 0, tmp, c13, c0, 4; \
+	add	tmp, tmp, #(PC_CURPCB)
 #else
 .Lcurpcb:
 	.word	_C_LABEL(__pcpu) + PC_CURPCB
+#define GET_PCB(tmp) \
+	ldr	tmp, .Lcurpcb
 #endif
 
 /*
@@ -85,18 +88,8 @@ ENTRY(copyin)
 .Lnormal:
 	stmfd	sp!, {r10-r11, lr}
 
-#ifdef MULTIPROCESSOR
-	/* XXX Probably not appropriate for non-Hydra SMPs */
-	stmfd	sp!, {r0-r2}
-	bl	_C_LABEL(cpu_number)
-	ldr	r10, .Lcpu_info
-	ldmfd	sp!, {r0-r2}
-	ldr	r10, [r10, r0, lsl #2]
-	ldr	r10, [r10, #CI_CURPCB]
-#else
-	ldr	r10, .Lcurpcb
+	GET_PCB(r10)
 	ldr	r10, [r10]
-#endif
 
 	mov	r3, #0x00
 	adr	ip, .Lcopyin_fault
@@ -537,18 +530,8 @@ ENTRY(copyout)
 .Lnormale:									
 	stmfd	sp!, {r10-r11, lr}
 
-#ifdef MULTIPROCESSOR
-	/* XXX Probably not appropriate for non-Hydra SMPs */
-	stmfd	sp!, {r0-r2}
-	bl	_C_LABEL(cpu_number)
-	ldr	r10, .Lcpu_info
-	ldmfd	sp!, {r0-r2}
-	ldr	r10, [r10, r0, lsl #2]
-	ldr	r10, [r10, #CI_CURPCB]
-#else
-	ldr	r10, .Lcurpcb
+	GET_PCB(r10)
 	ldr	r10, [r10]
-#endif
 
 	mov	r3, #0x00
 	adr	ip, .Lcopyout_fault

Modified: user/mjacob/sys/arm/arm/bus_space_asm_generic.S
==============================================================================
--- user/mjacob/sys/arm/arm/bus_space_asm_generic.S	Fri Aug 31 12:08:31 2012	(r239949)
+++ user/mjacob/sys/arm/arm/bus_space_asm_generic.S	Fri Aug 31 14:06:33 2012	(r239950)
@@ -51,11 +51,9 @@ ENTRY(generic_bs_r_1)
 	ldrb	r0, [r1, r2]
 	RET
 
-#if (ARM_ARCH_4 + ARM_ARCH_5) > 0
 ENTRY(generic_armv4_bs_r_2)
 	ldrh	r0, [r1, r2]
 	RET
-#endif
 
 ENTRY(generic_bs_r_4)
 	ldr	r0, [r1, r2]
@@ -69,11 +67,9 @@ ENTRY(generic_bs_w_1)
 	strb	r3, [r1, r2]
 	RET
 
-#if (ARM_ARCH_4 + ARM_ARCH_5) > 0
 ENTRY(generic_armv4_bs_w_2)
 	strh	r3, [r1, r2]
 	RET
-#endif
 
 ENTRY(generic_bs_w_4)
 	str	r3, [r1, r2]
@@ -97,7 +93,6 @@ ENTRY(generic_bs_rm_1)
 
 	RET
 
-#if (ARM_ARCH_4 + ARM_ARCH_5) > 0
 ENTRY(generic_armv4_bs_rm_2)
 	add	r0, r1, r2
 	mov	r1, r3
@@ -111,7 +106,6 @@ ENTRY(generic_armv4_bs_rm_2)
 	bne	1b
 
 	RET
-#endif
 
 ENTRY(generic_bs_rm_4)
 	add	r0, r1, r2
@@ -145,7 +139,6 @@ ENTRY(generic_bs_wm_1)
 
 	RET
 
-#if (ARM_ARCH_4 + ARM_ARCH_5) > 0
 ENTRY(generic_armv4_bs_wm_2)
 	add	r0, r1, r2
 	mov	r1, r3
@@ -159,7 +152,6 @@ ENTRY(generic_armv4_bs_wm_2)
 	bne	1b
 
 	RET
-#endif
 
 ENTRY(generic_bs_wm_4)
 	add	r0, r1, r2
@@ -193,7 +185,6 @@ ENTRY(generic_bs_rr_1)
 
 	RET
 
-#if (ARM_ARCH_4 + ARM_ARCH_5) > 0
 ENTRY(generic_armv4_bs_rr_2)
 	add	r0, r1, r2
 	mov	r1, r3
@@ -207,7 +198,6 @@ ENTRY(generic_armv4_bs_rr_2)
 	bne	1b
 
 	RET
-#endif
 
 ENTRY(generic_bs_rr_4)
 	add	r0, r1, r2
@@ -241,7 +231,6 @@ ENTRY(generic_bs_wr_1)
 
 	RET
 
-#if (ARM_ARCH_4 + ARM_ARCH_5) > 0
 ENTRY(generic_armv4_bs_wr_2)
 	add	r0, r1, r2
 	mov	r1, r3
@@ -255,7 +244,6 @@ ENTRY(generic_armv4_bs_wr_2)
 	bne	1b
 
 	RET
-#endif
 
 ENTRY(generic_bs_wr_4)
 	add	r0, r1, r2
@@ -288,7 +276,6 @@ ENTRY(generic_bs_sr_1)
 
 	RET
 
-#if (ARM_ARCH_4 + ARM_ARCH_5) > 0
 ENTRY(generic_armv4_bs_sr_2)
 	add	r0, r1, r2
 	mov	r1, r3
@@ -301,7 +288,6 @@ ENTRY(generic_armv4_bs_sr_2)
 	bne	1b
 
 	RET
-#endif
 
 ENTRY(generic_bs_sr_4)
 	add	r0, r1, r2
@@ -320,7 +306,6 @@ ENTRY(generic_bs_sr_4)
  * copy region
  */
 
-#if (ARM_ARCH_4 + ARM_ARCH_5) > 0
 ENTRY(generic_armv4_bs_c_2)
 	add	r0, r1, r2
 	ldr	r2, [sp, #0]
@@ -350,4 +335,3 @@ ENTRY(generic_armv4_bs_c_2)
 	bne	3b
 
 	RET
-#endif

Copied: user/mjacob/sys/arm/arm/busdma_machdep-v6.c (from r239949, head/sys/arm/arm/busdma_machdep-v6.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/mjacob/sys/arm/arm/busdma_machdep-v6.c	Fri Aug 31 14:06:33 2012	(r239950, copy of r239949, head/sys/arm/arm/busdma_machdep-v6.c)
@@ -0,0 +1,1555 @@
+/*-
+ * Copyright (c) 2010 Mark Tinguely
+ * Copyright (c) 2004 Olivier Houchard
+ * Copyright (c) 2002 Peter Grehan
+ * Copyright (c) 1997, 1998 Justin T. Gibbs.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification, immediately at the beginning of the file.
+ * 2. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *  From i386/busdma_machdep.c 191438 2009-04-23 20:24:19Z jhb
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#define _ARM32_BUS_DMA_PRIVATE
+#include <sys/param.h>
+#include <sys/kdb.h>
+#include <ddb/ddb.h>
+#include <ddb/db_output.h>
+#include <sys/systm.h>
+#include <sys/malloc.h>
+#include <sys/bus.h>
+#include <sys/interrupt.h>
+#include <sys/kernel.h>
+#include <sys/ktr.h>
+#include <sys/lock.h>
+#include <sys/proc.h>
+#include <sys/mutex.h>
+#include <sys/mbuf.h>
+#include <sys/uio.h>
+#include <sys/sysctl.h>
+
+#include <vm/vm.h>
+#include <vm/vm_page.h>
+#include <vm/vm_map.h>
+
+#include <machine/atomic.h>
+#include <machine/bus.h>
+#include <machine/cpufunc.h>
+#include <machine/md_var.h>
+
+#define MAX_BPAGES 64
+#define BUS_DMA_COULD_BOUNCE	BUS_DMA_BUS3
+#define BUS_DMA_MIN_ALLOC_COMP	BUS_DMA_BUS4
+
+#define FIX_DMAP_BUS_DMASYNC_POSTREAD
+
+struct bounce_zone;
+
+struct bus_dma_tag {
+	bus_dma_tag_t	  parent;
+	bus_size_t	  alignment;
+	bus_size_t	  boundary;
+	bus_addr_t	  lowaddr;
+	bus_addr_t	  highaddr;
+	bus_dma_filter_t *filter;
+	void		 *filterarg;
+	bus_size_t	  maxsize;
+	u_int		  nsegments;
+	bus_size_t	  maxsegsz;
+	int		  flags;
+	int		  ref_count;
+	int		  map_count;
+	bus_dma_lock_t	 *lockfunc;
+	void		 *lockfuncarg;
+	bus_dma_segment_t *segments;
+	struct bounce_zone *bounce_zone;
+	/*
+	 * DMA range for this tag.  If the page doesn't fall within
+	 * one of these ranges, an error is returned.  The caller
+	 * may then decide what to do with the transfer.  If the
+	 * range pointer is NULL, it is ignored.
+	 */
+	struct arm32_dma_range	*ranges;
+	int			_nranges;
+
+};
+
+struct bounce_page {
+	vm_offset_t	vaddr;		/* kva of bounce buffer */
+	bus_addr_t	busaddr;	/* Physical address */
+	vm_offset_t	datavaddr;	/* kva of client data */
+	bus_size_t	datacount;	/* client data count */
+	STAILQ_ENTRY(bounce_page) links;
+};
+
+struct sync_list {
+	vm_offset_t	vaddr;		/* kva of bounce buffer */
+	bus_addr_t	busaddr;	/* Physical address */
+	bus_size_t	datacount;	/* client data count */
+	STAILQ_ENTRY(sync_list) slinks;
+};
+
+int busdma_swi_pending;
+
+struct bounce_zone {
+	STAILQ_ENTRY(bounce_zone) links;
+	STAILQ_HEAD(bp_list, bounce_page) bounce_page_list;
+	int		total_bpages;
+	int		free_bpages;
+	int		reserved_bpages;
+	int		active_bpages;
+	int		total_bounced;
+	int		total_deferred;
+	int		map_count;
+	bus_size_t	alignment;
+	bus_addr_t	lowaddr;
+	char		zoneid[8];
+	char		lowaddrid[20];
+	struct sysctl_ctx_list sysctl_tree;
+	struct sysctl_oid *sysctl_tree_top;
+};
+
+static struct mtx bounce_lock;
+static int total_bpages;
+static int busdma_zonecount;
+static STAILQ_HEAD(, bounce_zone) bounce_zone_list;
+
+SYSCTL_NODE(_hw, OID_AUTO, busdma, CTLFLAG_RD, 0, "Busdma parameters");
+SYSCTL_INT(_hw_busdma, OID_AUTO, total_bpages, CTLFLAG_RD, &total_bpages, 0,
+	   "Total bounce pages");
+
+struct bus_dmamap {
+	struct bp_list	       bpages;
+	int		       pagesneeded;
+	int		       pagesreserved;
+	bus_dma_tag_t	       dmat;
+	void		      *buf;		/* unmapped buffer pointer */
+	bus_size_t	       buflen;		/* unmapped buffer length */
+	pmap_t		       pmap;
+	bus_dmamap_callback_t *callback;
+	void		      *callback_arg;
+	STAILQ_ENTRY(bus_dmamap) links;
+	STAILQ_HEAD(,sync_list)	slist;
+};
+
+static STAILQ_HEAD(, bus_dmamap) bounce_map_waitinglist;
+static STAILQ_HEAD(, bus_dmamap) bounce_map_callbacklist;
+
+static void init_bounce_pages(void *dummy);
+static int alloc_bounce_zone(bus_dma_tag_t dmat);
+static int alloc_bounce_pages(bus_dma_tag_t dmat, u_int numpages);
+static int reserve_bounce_pages(bus_dma_tag_t dmat, bus_dmamap_t map,
+				int commit);
+static bus_addr_t add_bounce_page(bus_dma_tag_t dmat, bus_dmamap_t map,
+				   vm_offset_t vaddr, bus_size_t size);
+static void free_bounce_page(bus_dma_tag_t dmat, struct bounce_page *bpage);
+int run_filter(bus_dma_tag_t dmat, bus_addr_t paddr);
+static int _bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map,
+    void *buf, bus_size_t buflen, int flags);
+
+static __inline int
+_bus_dma_can_bounce(vm_offset_t lowaddr, vm_offset_t highaddr)
+{
+	int i;
+	for (i = 0; phys_avail[i] && phys_avail[i + 1]; i += 2) {
+		if ((lowaddr >= phys_avail[i] && lowaddr <= phys_avail[i + 1])
+		    || (lowaddr < phys_avail[i] &&
+		    highaddr > phys_avail[i]))
+			return (1);
+	}
+	return (0);
+}
+
+static __inline struct arm32_dma_range *
+_bus_dma_inrange(struct arm32_dma_range *ranges, int nranges,
+    bus_addr_t curaddr)
+{
+	struct arm32_dma_range *dr;
+	int i;
+
+	for (i = 0, dr = ranges; i < nranges; i++, dr++) {
+		if (curaddr >= dr->dr_sysbase &&
+		    round_page(curaddr) <= (dr->dr_sysbase + dr->dr_len))
+			return (dr);
+	}
+
+	return (NULL);
+}
+
+/*
+ * Return true if a match is made.
+ *
+ * To find a match walk the chain of bus_dma_tag_t's looking for 'paddr'.
+ *
+ * If paddr is within the bounds of the dma tag then call the filter callback
+ * to check for a match, if there is no filter callback then assume a match.
+ */
+int
+run_filter(bus_dma_tag_t dmat, bus_addr_t paddr)
+{
+	int retval;
+
+	retval = 0;
+
+	do {
+		if (((paddr > dmat->lowaddr && paddr <= dmat->highaddr)
+		 || ((paddr & (dmat->alignment - 1)) != 0))
+		 && (dmat->filter == NULL
+		  || (*dmat->filter)(dmat->filterarg, paddr) != 0))
+			retval = 1;
+
+		dmat = dmat->parent;
+	} while (retval == 0 && dmat != NULL);
+	return (retval);
+}
+
+/*
+ * Convenience function for manipulating driver locks from busdma (during
+ * busdma_swi, for example).  Drivers that don't provide their own locks
+ * should specify &Giant to dmat->lockfuncarg.  Drivers that use their own
+ * non-mutex locking scheme don't have to use this at all.
+ */
+void
+busdma_lock_mutex(void *arg, bus_dma_lock_op_t op)
+{
+	struct mtx *dmtx;
+
+	dmtx = (struct mtx *)arg;
+	switch (op) {
+	case BUS_DMA_LOCK:
+		mtx_lock(dmtx);
+		break;
+	case BUS_DMA_UNLOCK:
+		mtx_unlock(dmtx);
+		break;
+	default:
+		panic("Unknown operation 0x%x for busdma_lock_mutex!", op);
+	}
+}
+
+/*
+ * dflt_lock should never get called.  It gets put into the dma tag when
+ * lockfunc == NULL, which is only valid if the maps that are associated
+ * with the tag are meant to never be defered.
+ * XXX Should have a way to identify which driver is responsible here.
+ */
+static void
+dflt_lock(void *arg, bus_dma_lock_op_t op)
+{
+	panic("driver error: busdma dflt_lock called");
+}
+
+/*
+ * Allocate a device specific dma_tag.
+ */
+int
+bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment,
+		   bus_size_t boundary, bus_addr_t lowaddr,
+		   bus_addr_t highaddr, bus_dma_filter_t *filter,
+		   void *filterarg, bus_size_t maxsize, int nsegments,
+		   bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc,
+		   void *lockfuncarg, bus_dma_tag_t *dmat)
+{
+	bus_dma_tag_t newtag;
+	int error = 0;
+
+#if 0
+	if (!parent)
+		parent = arm_root_dma_tag;
+#endif
+
+	/* Basic sanity checking */
+	if (boundary != 0 && boundary < maxsegsz)
+		maxsegsz = boundary;
+
+	/* Return a NULL tag on failure */
+	*dmat = NULL;
+
+	if (maxsegsz == 0) {
+		return (EINVAL);
+	}
+
+	newtag = (bus_dma_tag_t)malloc(sizeof(*newtag), M_DEVBUF,
+	    M_ZERO | M_NOWAIT);
+	if (newtag == NULL) {
+		CTR4(KTR_BUSDMA, "%s returned tag %p tag flags 0x%x error %d",
+		    __func__, newtag, 0, error);
+		return (ENOMEM);
+	}
+
+	newtag->parent = parent;
+	newtag->alignment = alignment;
+	newtag->boundary = boundary;
+	newtag->lowaddr = trunc_page((vm_paddr_t)lowaddr) + (PAGE_SIZE - 1);
+	newtag->highaddr = trunc_page((vm_paddr_t)highaddr) +
+	    (PAGE_SIZE - 1);
+	newtag->filter = filter;
+	newtag->filterarg = filterarg;
+	newtag->maxsize = maxsize;
+	newtag->nsegments = nsegments;
+	newtag->maxsegsz = maxsegsz;
+	newtag->flags = flags;
+	newtag->ref_count = 1; /* Count ourself */
+	newtag->map_count = 0;
+	newtag->ranges = bus_dma_get_range();
+	newtag->_nranges = bus_dma_get_range_nb();
+	if (lockfunc != NULL) {
+		newtag->lockfunc = lockfunc;
+		newtag->lockfuncarg = lockfuncarg;
+	} else {
+		newtag->lockfunc = dflt_lock;
+		newtag->lockfuncarg = NULL;
+	}
+	newtag->segments = NULL;
+
+	/* Take into account any restrictions imposed by our parent tag */
+	if (parent != NULL) {
+		newtag->lowaddr = MIN(parent->lowaddr, newtag->lowaddr);
+		newtag->highaddr = MAX(parent->highaddr, newtag->highaddr);
+		if (newtag->boundary == 0)
+			newtag->boundary = parent->boundary;
+		else if (parent->boundary != 0)
+			newtag->boundary = MIN(parent->boundary,
+					       newtag->boundary);
+		if ((newtag->filter != NULL) ||
+		    ((parent->flags & BUS_DMA_COULD_BOUNCE) != 0))
+			newtag->flags |= BUS_DMA_COULD_BOUNCE;
+		if (newtag->filter == NULL) {
+			/*
+			 * Short circuit looking at our parent directly
+			 * since we have encapsulated all of its information
+			 */
+			newtag->filter = parent->filter;
+			newtag->filterarg = parent->filterarg;
+			newtag->parent = parent->parent;
+		}
+		if (newtag->parent != NULL)
+			atomic_add_int(&parent->ref_count, 1);
+	}
+
+	if (_bus_dma_can_bounce(newtag->lowaddr, newtag->highaddr)
+	 || newtag->alignment > 1)
+		newtag->flags |= BUS_DMA_COULD_BOUNCE;
+
+	if (((newtag->flags & BUS_DMA_COULD_BOUNCE) != 0) &&
+	    (flags & BUS_DMA_ALLOCNOW) != 0) {
+		struct bounce_zone *bz;
+
+		/* Must bounce */
+
+		if ((error = alloc_bounce_zone(newtag)) != 0) {
+			free(newtag, M_DEVBUF);
+			return (error);
+		}
+		bz = newtag->bounce_zone;
+
+		if (ptoa(bz->total_bpages) < maxsize) {
+			int pages;
+
+			pages = atop(maxsize) - bz->total_bpages;
+
+			/* Add pages to our bounce pool */
+			if (alloc_bounce_pages(newtag, pages) < pages)
+				error = ENOMEM;
+		}
+		/* Performed initial allocation */
+		newtag->flags |= BUS_DMA_MIN_ALLOC_COMP;
+	} else
+		newtag->bounce_zone = NULL;
+
+	if (error != 0) {
+		free(newtag, M_DEVBUF);
+	} else {
+		*dmat = newtag;
+	}
+	CTR4(KTR_BUSDMA, "%s returned tag %p tag flags 0x%x error %d",
+	    __func__, newtag, (newtag != NULL ? newtag->flags : 0), error);
+	return (error);
+}
+
+int
+bus_dma_tag_destroy(bus_dma_tag_t dmat)
+{
+	bus_dma_tag_t dmat_copy;
+	int error;
+
+	error = 0;
+	dmat_copy = dmat;
+
+	if (dmat != NULL) {
+
+		if (dmat->map_count != 0) {
+			error = EBUSY;
+			goto out;
+		}
+
+		while (dmat != NULL) {
+			bus_dma_tag_t parent;
+
+			parent = dmat->parent;
+			atomic_subtract_int(&dmat->ref_count, 1);
+			if (dmat->ref_count == 0) {
+				if (dmat->segments != NULL)
+					free(dmat->segments, M_DEVBUF);
+				free(dmat, M_DEVBUF);
+				/*
+				 * Last reference count, so
+				 * release our reference
+				 * count on our parent.
+				 */
+				dmat = parent;
+			} else
+				dmat = NULL;
+		}
+	}
+out:
+	CTR3(KTR_BUSDMA, "%s tag %p error %d", __func__, dmat_copy, error);
+	return (error);
+}
+
+/*
+ * Allocate a handle for mapping from kva/uva/physical
+ * address space into bus device space.
+ */
+int
+bus_dmamap_create(bus_dma_tag_t dmat, int flags, bus_dmamap_t *mapp)
+{
+	int error;
+
+	error = 0;
+
+	*mapp = (bus_dmamap_t)malloc(sizeof(**mapp), M_DEVBUF,
+					     M_NOWAIT | M_ZERO);
+	if (*mapp == NULL) {
+		CTR3(KTR_BUSDMA, "%s: tag %p error %d", __func__, dmat, ENOMEM);
+		return (ENOMEM);
+	}
+	STAILQ_INIT(&((*mapp)->slist));
+
+	if (dmat->segments == NULL) {
+		dmat->segments = (bus_dma_segment_t *)malloc(
+		    sizeof(bus_dma_segment_t) * dmat->nsegments, M_DEVBUF,
+		    M_NOWAIT);
+		if (dmat->segments == NULL) {
+			CTR3(KTR_BUSDMA, "%s: tag %p error %d",
+			    __func__, dmat, ENOMEM);
+			free(*mapp, M_DEVBUF);
+			*mapp = NULL;
+			return (ENOMEM);
+		}
+	}
+	/*
+	 * Bouncing might be required if the driver asks for an active

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

More information about the svn-src-user mailing list