svn commit: r211657 - in user/imp/tbemd/sys: ddb dev/acpi_support dev/acpica dev/acpica/Osd dev/agp dev/ahci dev/aic7xxx dev/aic7xxx/aicasm dev/alc dev/amr dev/arcmsr dev/ata dev/ata/chipsets dev/a...

Sun Aug 22 21:53:26 UTC 2010

Author: imp
Date: Sun Aug 22 21:53:24 2010
New Revision: 211657
URL: http://svn.freebsd.org/changeset/base/211657

Log:
  Merge to head @211636 -- with hand tweaks [given up] hoping for the best

Added:
  user/imp/tbemd/sys/dev/acpi_support/atk0110.c
     - copied unchanged from r211636, head/sys/dev/acpi_support/atk0110.c
  user/imp/tbemd/sys/dev/cfi/cfi_bus_fdt.c
     - copied unchanged from r211636, head/sys/dev/cfi/cfi_bus_fdt.c
  user/imp/tbemd/sys/dev/e1000/e1000_mbx.c
     - copied unchanged from r211636, head/sys/dev/e1000/e1000_mbx.c
  user/imp/tbemd/sys/dev/e1000/e1000_mbx.h
     - copied unchanged from r211636, head/sys/dev/e1000/e1000_mbx.h
  user/imp/tbemd/sys/dev/e1000/e1000_vf.c
     - copied unchanged from r211636, head/sys/dev/e1000/e1000_vf.c
  user/imp/tbemd/sys/dev/e1000/e1000_vf.h
     - copied unchanged from r211636, head/sys/dev/e1000/e1000_vf.h
  user/imp/tbemd/sys/dev/fdt/fdt_powerpc.c
     - copied unchanged from r211636, head/sys/dev/fdt/fdt_powerpc.c
  user/imp/tbemd/sys/dev/quicc/quicc_bfe_fdt.c
     - copied unchanged from r211636, head/sys/dev/quicc/quicc_bfe_fdt.c
  user/imp/tbemd/sys/dev/tpm/
     - copied from r211636, head/sys/dev/tpm/
  user/imp/tbemd/sys/dev/tsec/if_tsec_fdt.c
     - copied unchanged from r211636, head/sys/dev/tsec/if_tsec_fdt.c
  user/imp/tbemd/sys/dev/usb/controller/ehci_mv.c
     - copied unchanged from r211636, head/sys/dev/usb/controller/ehci_mv.c
  user/imp/tbemd/sys/kern/kern_clocksource.c
     - copied unchanged from r211636, head/sys/kern/kern_clocksource.c
  user/imp/tbemd/sys/kern/kern_et.c
     - copied unchanged from r211636, head/sys/kern/kern_et.c
  user/imp/tbemd/sys/mips/atheros/ar71xx_chip.c
     - copied unchanged from r211636, head/sys/mips/atheros/ar71xx_chip.c
  user/imp/tbemd/sys/mips/atheros/ar71xx_chip.h
     - copied unchanged from r211636, head/sys/mips/atheros/ar71xx_chip.h
  user/imp/tbemd/sys/mips/atheros/ar71xx_cpudef.h
     - copied unchanged from r211636, head/sys/mips/atheros/ar71xx_cpudef.h
  user/imp/tbemd/sys/mips/atheros/ar71xx_setup.c
     - copied unchanged from r211636, head/sys/mips/atheros/ar71xx_setup.c
  user/imp/tbemd/sys/mips/atheros/ar71xx_setup.h
     - copied unchanged from r211636, head/sys/mips/atheros/ar71xx_setup.h
  user/imp/tbemd/sys/mips/atheros/ar724x_chip.c
     - copied unchanged from r211636, head/sys/mips/atheros/ar724x_chip.c
  user/imp/tbemd/sys/mips/atheros/ar724x_chip.h
     - copied unchanged from r211636, head/sys/mips/atheros/ar724x_chip.h
  user/imp/tbemd/sys/mips/atheros/ar724xreg.h
     - copied unchanged from r211636, head/sys/mips/atheros/ar724xreg.h
  user/imp/tbemd/sys/mips/atheros/ar91xx_chip.c
     - copied unchanged from r211636, head/sys/mips/atheros/ar91xx_chip.c
  user/imp/tbemd/sys/mips/atheros/ar91xx_chip.h
     - copied unchanged from r211636, head/sys/mips/atheros/ar91xx_chip.h
  user/imp/tbemd/sys/mips/atheros/ar91xxreg.h
     - copied unchanged from r211636, head/sys/mips/atheros/ar91xxreg.h
  user/imp/tbemd/sys/mips/cavium/ciu.c
     - copied unchanged from r211636, head/sys/mips/cavium/ciu.c
  user/imp/tbemd/sys/mips/cavium/cryptocteon/
     - copied from r211636, head/sys/mips/cavium/cryptocteon/
  user/imp/tbemd/sys/mips/cavium/cvmx_config.h
     - copied unchanged from r211636, head/sys/mips/cavium/cvmx_config.h
  user/imp/tbemd/sys/mips/cavium/octe/
     - copied from r211636, head/sys/mips/cavium/octe/
  user/imp/tbemd/sys/mips/cavium/octeon_ds1337.c
     - copied unchanged from r211636, head/sys/mips/cavium/octeon_ds1337.c
  user/imp/tbemd/sys/mips/cavium/octeon_rnd.c
     - copied unchanged from r211636, head/sys/mips/cavium/octeon_rnd.c
  user/imp/tbemd/sys/mips/cavium/octeon_rtc.c
     - copied unchanged from r211636, head/sys/mips/cavium/octeon_rtc.c
  user/imp/tbemd/sys/mips/cavium/octopci.c
     - copied unchanged from r211636, head/sys/mips/cavium/octopci.c
  user/imp/tbemd/sys/mips/cavium/octopci_bus_space.c
     - copied unchanged from r211636, head/sys/mips/cavium/octopci_bus_space.c
  user/imp/tbemd/sys/mips/cavium/octopcireg.h
     - copied unchanged from r211636, head/sys/mips/cavium/octopcireg.h
  user/imp/tbemd/sys/mips/cavium/octopcivar.h
     - copied unchanged from r211636, head/sys/mips/cavium/octopcivar.h
  user/imp/tbemd/sys/mips/cavium/usb/
     - copied from r211636, head/sys/mips/cavium/usb/
  user/imp/tbemd/sys/mips/conf/XLR64
     - copied unchanged from r211636, head/sys/mips/conf/XLR64
  user/imp/tbemd/sys/mips/conf/XLRN32
     - copied unchanged from r211636, head/sys/mips/conf/XLRN32
  user/imp/tbemd/sys/mips/include/tlb.h
     - copied unchanged from r211636, head/sys/mips/include/tlb.h
  user/imp/tbemd/sys/mips/mips/tlb.c
     - copied unchanged from r211636, head/sys/mips/mips/tlb.c
  user/imp/tbemd/sys/modules/acpi/aibs/
     - copied from r211636, head/sys/modules/acpi/aibs/
  user/imp/tbemd/sys/modules/aesni/
     - copied from r211636, head/sys/modules/aesni/
  user/imp/tbemd/sys/modules/if_carp/
     - copied from r211636, head/sys/modules/if_carp/
  user/imp/tbemd/sys/modules/iwnfw/iwn6050/
     - copied from r211636, head/sys/modules/iwnfw/iwn6050/
  user/imp/tbemd/sys/modules/nfslock/
     - copied from r211636, head/sys/modules/nfslock/
  user/imp/tbemd/sys/modules/send/
     - copied from r211636, head/sys/modules/send/
  user/imp/tbemd/sys/modules/siftr/
     - copied from r211636, head/sys/modules/siftr/
  user/imp/tbemd/sys/modules/tpm/
     - copied from r211636, head/sys/modules/tpm/
  user/imp/tbemd/sys/netinet/siftr.c
     - copied unchanged from r211636, head/sys/netinet/siftr.c
  user/imp/tbemd/sys/netinet6/send.c
     - copied unchanged from r211636, head/sys/netinet6/send.c
  user/imp/tbemd/sys/netinet6/send.h
     - copied unchanged from r211636, head/sys/netinet6/send.h
  user/imp/tbemd/sys/nfs/nfs_lock.c
     - copied unchanged from r211636, head/sys/nfs/nfs_lock.c
  user/imp/tbemd/sys/nfs/nfs_lock.h
     - copied unchanged from r211636, head/sys/nfs/nfs_lock.h
  user/imp/tbemd/sys/powerpc/aim/locore32.S
     - copied unchanged from r211636, head/sys/powerpc/aim/locore32.S
  user/imp/tbemd/sys/powerpc/aim/locore64.S
     - copied unchanged from r211636, head/sys/powerpc/aim/locore64.S
  user/imp/tbemd/sys/powerpc/aim/slb.c
     - copied unchanged from r211636, head/sys/powerpc/aim/slb.c
  user/imp/tbemd/sys/powerpc/aim/swtch32.S
     - copied unchanged from r211636, head/sys/powerpc/aim/swtch32.S
  user/imp/tbemd/sys/powerpc/aim/swtch64.S
     - copied unchanged from r211636, head/sys/powerpc/aim/swtch64.S
  user/imp/tbemd/sys/powerpc/aim/trap_subr32.S
     - copied unchanged from r211636, head/sys/powerpc/aim/trap_subr32.S
  user/imp/tbemd/sys/powerpc/aim/trap_subr64.S
     - copied unchanged from r211636, head/sys/powerpc/aim/trap_subr64.S
  user/imp/tbemd/sys/powerpc/conf/GENERIC64
     - copied unchanged from r211636, head/sys/powerpc/conf/GENERIC64
  user/imp/tbemd/sys/powerpc/include/fdt.h
     - copied unchanged from r211636, head/sys/powerpc/include/fdt.h
  user/imp/tbemd/sys/powerpc/include/slb.h
     - copied unchanged from r211636, head/sys/powerpc/include/slb.h
  user/imp/tbemd/sys/powerpc/mambo/
     - copied from r211636, head/sys/powerpc/mambo/
  user/imp/tbemd/sys/powerpc/mpc85xx/ds1553_bus_fdt.c
     - copied unchanged from r211636, head/sys/powerpc/mpc85xx/ds1553_bus_fdt.c
  user/imp/tbemd/sys/powerpc/mpc85xx/openpic_fdt.c
     - copied unchanged from r211636, head/sys/powerpc/mpc85xx/openpic_fdt.c
  user/imp/tbemd/sys/powerpc/mpc85xx/pci_fdt.c
     - copied unchanged from r211636, head/sys/powerpc/mpc85xx/pci_fdt.c
  user/imp/tbemd/sys/powerpc/powerpc/elf32_machdep.c
     - copied unchanged from r211636, head/sys/powerpc/powerpc/elf32_machdep.c
  user/imp/tbemd/sys/powerpc/powerpc/elf64_machdep.c
     - copied unchanged from r211636, head/sys/powerpc/powerpc/elf64_machdep.c
  user/imp/tbemd/sys/powerpc/powerpc/exec_machdep.c
     - copied unchanged from r211636, head/sys/powerpc/powerpc/exec_machdep.c
  user/imp/tbemd/sys/powerpc/powerpc/sigcode32.S
     - copied unchanged from r211636, head/sys/powerpc/powerpc/sigcode32.S
  user/imp/tbemd/sys/powerpc/powerpc/sigcode64.S
     - copied unchanged from r211636, head/sys/powerpc/powerpc/sigcode64.S
  user/imp/tbemd/sys/sys/timeet.h
     - copied unchanged from r211636, head/sys/sys/timeet.h
  user/imp/tbemd/sys/x86/acpica/
     - copied from r211636, head/sys/x86/acpica/
Deleted:
  user/imp/tbemd/sys/dev/acpi_support/acpi_aiboost.c
  user/imp/tbemd/sys/dev/cfi/cfi_bus_lbc.c
  user/imp/tbemd/sys/dev/quicc/quicc_bfe_ocp.c
  user/imp/tbemd/sys/dev/tsec/if_tsec_ocp.c
  user/imp/tbemd/sys/dev/uart/uart_bus_mbus.c
  user/imp/tbemd/sys/dev/uart/uart_bus_ocp.c
  user/imp/tbemd/sys/dev/uart/uart_cpu_mv.c
  user/imp/tbemd/sys/dev/usb/controller/ehci_mbus.c
  user/imp/tbemd/sys/fs/nfsclient/nfs_cllock.c
  user/imp/tbemd/sys/fs/nfsclient/nfs_lock.h
  user/imp/tbemd/sys/mips/cavium/driveid.h
  user/imp/tbemd/sys/mips/cavium/octeon_ebt3000_cf.h
  user/imp/tbemd/sys/mips/include/_bus_octeon.h
  user/imp/tbemd/sys/mips/include/asmacros.h
  user/imp/tbemd/sys/mips/mips/tlb.S
  user/imp/tbemd/sys/modules/acpi/acpi_aiboost/
  user/imp/tbemd/sys/nfsclient/nfs_lock.c
  user/imp/tbemd/sys/nfsclient/nfs_lock.h
  user/imp/tbemd/sys/pc98/cbus/clock.c
  user/imp/tbemd/sys/powerpc/aim/swtch.S
  user/imp/tbemd/sys/powerpc/include/bootinfo.h
  user/imp/tbemd/sys/powerpc/include/intr.h
  user/imp/tbemd/sys/powerpc/include/ocpbus.h
  user/imp/tbemd/sys/powerpc/mpc85xx/ds1553_bus_lbc.c
  user/imp/tbemd/sys/powerpc/mpc85xx/ocpbus.c
  user/imp/tbemd/sys/powerpc/mpc85xx/ocpbus.h
  user/imp/tbemd/sys/powerpc/mpc85xx/opic.c
  user/imp/tbemd/sys/powerpc/mpc85xx/pci_ocp.c
  user/imp/tbemd/sys/powerpc/powerpc/elf_machdep.c
  user/imp/tbemd/sys/powerpc/powerpc/sigcode.S
Modified:
  user/imp/tbemd/sys/ddb/db_command.c
  user/imp/tbemd/sys/dev/acpi_support/acpi_asus.c
  user/imp/tbemd/sys/dev/acpi_support/acpi_fujitsu.c
  user/imp/tbemd/sys/dev/acpi_support/acpi_hp.c
  user/imp/tbemd/sys/dev/acpi_support/acpi_ibm.c
  user/imp/tbemd/sys/dev/acpica/Osd/OsdHardware.c
  user/imp/tbemd/sys/dev/acpica/Osd/OsdMemory.c
  user/imp/tbemd/sys/dev/acpica/acpi.c
  user/imp/tbemd/sys/dev/acpica/acpi_button.c
  user/imp/tbemd/sys/dev/acpica/acpi_cpu.c
  user/imp/tbemd/sys/dev/acpica/acpi_dock.c
  user/imp/tbemd/sys/dev/acpica/acpi_ec.c
  user/imp/tbemd/sys/dev/acpica/acpi_hpet.c
  user/imp/tbemd/sys/dev/acpica/acpi_hpet.h
  user/imp/tbemd/sys/dev/acpica/acpi_lid.c
  user/imp/tbemd/sys/dev/acpica/acpi_pcib.c
  user/imp/tbemd/sys/dev/acpica/acpi_pcib_acpi.c
  user/imp/tbemd/sys/dev/acpica/acpi_pcib_pci.c
  user/imp/tbemd/sys/dev/acpica/acpi_pcibvar.h
  user/imp/tbemd/sys/dev/acpica/acpi_thermal.c
  user/imp/tbemd/sys/dev/acpica/acpi_video.c
  user/imp/tbemd/sys/dev/acpica/acpivar.h
  user/imp/tbemd/sys/dev/agp/agp.c
  user/imp/tbemd/sys/dev/agp/agp_nvidia.c
  user/imp/tbemd/sys/dev/ahci/ahci.c
  user/imp/tbemd/sys/dev/aic7xxx/aic79xx.reg
  user/imp/tbemd/sys/dev/aic7xxx/aic7xxx.reg
  user/imp/tbemd/sys/dev/aic7xxx/aicasm/Makefile
  user/imp/tbemd/sys/dev/aic7xxx/aicasm/aicasm_gram.y
  user/imp/tbemd/sys/dev/alc/if_alc.c
  user/imp/tbemd/sys/dev/alc/if_alcreg.h
  user/imp/tbemd/sys/dev/alc/if_alcvar.h
  user/imp/tbemd/sys/dev/amr/amrvar.h
  user/imp/tbemd/sys/dev/arcmsr/arcmsr.c
  user/imp/tbemd/sys/dev/arcmsr/arcmsr.h
  user/imp/tbemd/sys/dev/ata/ata-all.c
  user/imp/tbemd/sys/dev/ata/ata-all.h
  user/imp/tbemd/sys/dev/ata/ata-card.c
  user/imp/tbemd/sys/dev/ata/ata-disk.c
  user/imp/tbemd/sys/dev/ata/ata-pci.c
  user/imp/tbemd/sys/dev/ata/chipsets/ata-acerlabs.c
  user/imp/tbemd/sys/dev/ata/chipsets/ata-amd.c
  user/imp/tbemd/sys/dev/ata/chipsets/ata-highpoint.c
  user/imp/tbemd/sys/dev/ata/chipsets/ata-intel.c
  user/imp/tbemd/sys/dev/ata/chipsets/ata-ite.c
  user/imp/tbemd/sys/dev/ata/chipsets/ata-jmicron.c
  user/imp/tbemd/sys/dev/ata/chipsets/ata-marvell.c
  user/imp/tbemd/sys/dev/ata/chipsets/ata-nvidia.c
  user/imp/tbemd/sys/dev/ata/chipsets/ata-promise.c
  user/imp/tbemd/sys/dev/ata/chipsets/ata-serverworks.c
  user/imp/tbemd/sys/dev/ata/chipsets/ata-siliconimage.c
  user/imp/tbemd/sys/dev/ata/chipsets/ata-sis.c
  user/imp/tbemd/sys/dev/ata/chipsets/ata-via.c
  user/imp/tbemd/sys/dev/ath/ath_hal/ar5212/ar5212.h
  user/imp/tbemd/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c
  user/imp/tbemd/sys/dev/ath/ath_hal/ar5416/ar5416.ini
  user/imp/tbemd/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c
  user/imp/tbemd/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c
  user/imp/tbemd/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c
  user/imp/tbemd/sys/dev/ath/ath_hal/ar5416/ar5416reg.h
  user/imp/tbemd/sys/dev/ath/ath_hal/ar5416/ar9160.ini
  user/imp/tbemd/sys/dev/ath/ath_hal/ar5416/ar9285_reset.c
  user/imp/tbemd/sys/dev/ath/if_ath.c
  user/imp/tbemd/sys/dev/ath/if_athioctl.h
  user/imp/tbemd/sys/dev/bce/if_bce.c
  user/imp/tbemd/sys/dev/bce/if_bcereg.h
  user/imp/tbemd/sys/dev/bge/if_bge.c
  user/imp/tbemd/sys/dev/bge/if_bgereg.h
  user/imp/tbemd/sys/dev/bktr/bktr_core.c
  user/imp/tbemd/sys/dev/bwi/if_bwi.c
  user/imp/tbemd/sys/dev/bwi/if_bwi_pci.c
  user/imp/tbemd/sys/dev/bwn/if_bwn.c
  user/imp/tbemd/sys/dev/cas/if_cas.c
  user/imp/tbemd/sys/dev/cfe/cfe_env.c
  user/imp/tbemd/sys/dev/coretemp/coretemp.c
  user/imp/tbemd/sys/dev/cxgb/common/cxgb_ael1002.c
  user/imp/tbemd/sys/dev/cxgb/common/cxgb_common.h
  user/imp/tbemd/sys/dev/cxgb/common/cxgb_t3_hw.c
  user/imp/tbemd/sys/dev/cxgb/common/cxgb_xgmac.c
  user/imp/tbemd/sys/dev/cxgb/cxgb_adapter.h
  user/imp/tbemd/sys/dev/cxgb/cxgb_main.c
  user/imp/tbemd/sys/dev/cxgb/cxgb_sge.c
  user/imp/tbemd/sys/dev/cxgb/ulp/tom/cxgb_vm.c
  user/imp/tbemd/sys/dev/drm/drm_pciids.h
  user/imp/tbemd/sys/dev/e1000/e1000_82575.h
  user/imp/tbemd/sys/dev/e1000/e1000_api.c
  user/imp/tbemd/sys/dev/e1000/e1000_api.h
  user/imp/tbemd/sys/dev/e1000/e1000_hw.h
  user/imp/tbemd/sys/dev/e1000/e1000_osdep.h
  user/imp/tbemd/sys/dev/e1000/e1000_regs.h
  user/imp/tbemd/sys/dev/e1000/if_em.c
  user/imp/tbemd/sys/dev/e1000/if_igb.c
  user/imp/tbemd/sys/dev/e1000/if_igb.h
  user/imp/tbemd/sys/dev/e1000/if_lem.c
  user/imp/tbemd/sys/dev/et/if_et.c
  user/imp/tbemd/sys/dev/et/if_etreg.h
  user/imp/tbemd/sys/dev/et/if_etvar.h
  user/imp/tbemd/sys/dev/fb/fbreg.h
  user/imp/tbemd/sys/dev/fb/vesa.c
  user/imp/tbemd/sys/dev/fdt/fdt_common.c
  user/imp/tbemd/sys/dev/fdt/fdt_common.h
  user/imp/tbemd/sys/dev/fdt/fdt_pci.c
  user/imp/tbemd/sys/dev/fdt/fdtbus.c
  user/imp/tbemd/sys/dev/fdt/simplebus.c
  user/imp/tbemd/sys/dev/flash/mx25l.c   (contents, props changed)
  user/imp/tbemd/sys/dev/flash/mx25lreg.h   (contents, props changed)
  user/imp/tbemd/sys/dev/gem/if_gem.c
  user/imp/tbemd/sys/dev/hme/if_hme.c
  user/imp/tbemd/sys/dev/hptiop/hptiop.c
  user/imp/tbemd/sys/dev/hptmv/entry.c
  user/imp/tbemd/sys/dev/hwpmc/hwpmc_core.c
  user/imp/tbemd/sys/dev/hwpmc/hwpmc_core.h
  user/imp/tbemd/sys/dev/ichwd/ichwd.c
  user/imp/tbemd/sys/dev/iicbus/iic.h
  user/imp/tbemd/sys/dev/iicbus/iicbus.c
  user/imp/tbemd/sys/dev/ipmi/ipmi_smbios.c
  user/imp/tbemd/sys/dev/iscsi/initiator/isc_cam.c
  user/imp/tbemd/sys/dev/iscsi/initiator/isc_sm.c
  user/imp/tbemd/sys/dev/iscsi/initiator/isc_soc.c
  user/imp/tbemd/sys/dev/iscsi/initiator/isc_subr.c
  user/imp/tbemd/sys/dev/iscsi/initiator/iscsi.c
  user/imp/tbemd/sys/dev/iscsi/initiator/iscsi.h
  user/imp/tbemd/sys/dev/iscsi/initiator/iscsi_subr.c
  user/imp/tbemd/sys/dev/iscsi/initiator/iscsivar.h
  user/imp/tbemd/sys/dev/iwn/if_iwn.c
  user/imp/tbemd/sys/dev/iwn/if_iwnreg.h
  user/imp/tbemd/sys/dev/iwn/if_iwnvar.h
  user/imp/tbemd/sys/dev/ixgbe/ixgbe.c
  user/imp/tbemd/sys/dev/ixgbe/ixgbe.h
  user/imp/tbemd/sys/dev/md/md.c
  user/imp/tbemd/sys/dev/mge/if_mge.c
  user/imp/tbemd/sys/dev/mge/if_mgevar.h
  user/imp/tbemd/sys/dev/mii/atphy.c
  user/imp/tbemd/sys/dev/mii/e1000phy.c
  user/imp/tbemd/sys/dev/mii/miidevs
  user/imp/tbemd/sys/dev/mpt/mpt.c
  user/imp/tbemd/sys/dev/mpt/mpt.h
  user/imp/tbemd/sys/dev/mpt/mpt_cam.c
  user/imp/tbemd/sys/dev/mpt/mpt_pci.c
  user/imp/tbemd/sys/dev/mpt/mpt_raid.c
  user/imp/tbemd/sys/dev/mvs/mvs.c
  user/imp/tbemd/sys/dev/null/null.c
  user/imp/tbemd/sys/dev/ofw/ofw_bus_subr.c
  user/imp/tbemd/sys/dev/ofw/ofw_bus_subr.h
  user/imp/tbemd/sys/dev/ofw/ofw_if.m
  user/imp/tbemd/sys/dev/ofw/ofw_standard.c
  user/imp/tbemd/sys/dev/ofw/openfirm.c
  user/imp/tbemd/sys/dev/ofw/openfirm.h
  user/imp/tbemd/sys/dev/pci/pci.c
  user/imp/tbemd/sys/dev/pci/pci_pci.c
  user/imp/tbemd/sys/dev/pci/pci_private.h
  user/imp/tbemd/sys/dev/pci/pci_user.c
  user/imp/tbemd/sys/dev/pci/pcib_if.m
  user/imp/tbemd/sys/dev/pci/pcib_private.h
  user/imp/tbemd/sys/dev/pci/pcireg.h
  user/imp/tbemd/sys/dev/pci/pcivar.h
  user/imp/tbemd/sys/dev/ral/rt2560.c
  user/imp/tbemd/sys/dev/ral/rt2661.c
  user/imp/tbemd/sys/dev/sec/sec.c
  user/imp/tbemd/sys/dev/sge/if_sge.c
  user/imp/tbemd/sys/dev/sge/if_sgereg.h
  user/imp/tbemd/sys/dev/siis/siis.c
  user/imp/tbemd/sys/dev/sk/if_sk.c
  user/imp/tbemd/sys/dev/sound/pci/hda/hdac.c
  user/imp/tbemd/sys/dev/sound/pcm/feeder_eq.c
  user/imp/tbemd/sys/dev/sound/pcm/feeder_rate.c
  user/imp/tbemd/sys/dev/sound/pcm/sound.c
  user/imp/tbemd/sys/dev/sound/usb/uaudio.c
  user/imp/tbemd/sys/dev/sound/usb/uaudioreg.h
  user/imp/tbemd/sys/dev/ste/if_ste.c
  user/imp/tbemd/sys/dev/syscons/scvgarndr.c
  user/imp/tbemd/sys/dev/tsec/if_tsec.c
  user/imp/tbemd/sys/dev/tsec/if_tsec.h
  user/imp/tbemd/sys/dev/twa/tw_cl.h
  user/imp/tbemd/sys/dev/twa/tw_cl_misc.c
  user/imp/tbemd/sys/dev/twa/tw_cl_share.h
  user/imp/tbemd/sys/dev/uart/uart_bus_fdt.c
  user/imp/tbemd/sys/dev/uart/uart_cpu_powerpc.c
  user/imp/tbemd/sys/dev/usb/controller/ehci.c
  user/imp/tbemd/sys/dev/usb/controller/ohci.c
  user/imp/tbemd/sys/dev/usb/controller/uhci.c
  user/imp/tbemd/sys/dev/usb/net/if_rue.c
  user/imp/tbemd/sys/dev/usb/net/uhso.c
  user/imp/tbemd/sys/dev/usb/quirk/usb_quirk.c
  user/imp/tbemd/sys/dev/usb/serial/u3g.c
  user/imp/tbemd/sys/dev/usb/serial/uftdi.c
  user/imp/tbemd/sys/dev/usb/serial/uipaq.c
  user/imp/tbemd/sys/dev/usb/serial/uplcom.c
  user/imp/tbemd/sys/dev/usb/serial/uslcom.c
  user/imp/tbemd/sys/dev/usb/usb_dev.c
  user/imp/tbemd/sys/dev/usb/usb_device.c
  user/imp/tbemd/sys/dev/usb/usb_process.c
  user/imp/tbemd/sys/dev/usb/usb_transfer.c
  user/imp/tbemd/sys/dev/usb/usbdevs
  user/imp/tbemd/sys/dev/usb/wlan/if_rum.c
  user/imp/tbemd/sys/dev/usb/wlan/if_run.c
  user/imp/tbemd/sys/dev/usb/wlan/if_runvar.h
  user/imp/tbemd/sys/dev/usb/wlan/if_upgt.c
  user/imp/tbemd/sys/dev/usb/wlan/if_ural.c
  user/imp/tbemd/sys/dev/usb/wlan/if_zyd.c
  user/imp/tbemd/sys/dev/wpi/if_wpi.c
  user/imp/tbemd/sys/fs/coda/coda.h
  user/imp/tbemd/sys/fs/coda/coda_venus.c
  user/imp/tbemd/sys/fs/coda/coda_vnops.c
  user/imp/tbemd/sys/fs/devfs/devfs.h
  user/imp/tbemd/sys/fs/devfs/devfs_devs.c
  user/imp/tbemd/sys/fs/devfs/devfs_rule.c
  user/imp/tbemd/sys/fs/devfs/devfs_vfsops.c
  user/imp/tbemd/sys/fs/devfs/devfs_vnops.c
  user/imp/tbemd/sys/fs/nfs/nfs_commonport.c
  user/imp/tbemd/sys/fs/nfsclient/nfs_clbio.c
  user/imp/tbemd/sys/fs/nfsclient/nfs_clcomsubs.c
  user/imp/tbemd/sys/fs/nfsclient/nfs_clnfsiod.c
  user/imp/tbemd/sys/fs/nfsclient/nfs_clnode.c
  user/imp/tbemd/sys/fs/nfsclient/nfs_clport.c
  user/imp/tbemd/sys/fs/nfsclient/nfs_clrpcops.c
  user/imp/tbemd/sys/fs/nfsclient/nfs_clsubs.c
  user/imp/tbemd/sys/fs/nfsclient/nfs_clvnops.c
  user/imp/tbemd/sys/fs/nfsclient/nfsnode.h
  user/imp/tbemd/sys/fs/nfsserver/nfs_nfsdport.c
  user/imp/tbemd/sys/fs/nfsserver/nfs_nfsdsocket.c
  user/imp/tbemd/sys/fs/nfsserver/nfs_nfsdstate.c
  user/imp/tbemd/sys/fs/nwfs/nwfs_io.c
  user/imp/tbemd/sys/fs/nwfs/nwfs_node.c
  user/imp/tbemd/sys/fs/procfs/procfs_type.c
  user/imp/tbemd/sys/fs/pseudofs/pseudofs_vncache.c
  user/imp/tbemd/sys/fs/smbfs/smbfs_io.c
  user/imp/tbemd/sys/fs/smbfs/smbfs_node.c
  user/imp/tbemd/sys/fs/tmpfs/tmpfs.h
  user/imp/tbemd/sys/fs/tmpfs/tmpfs_subr.c
  user/imp/tbemd/sys/fs/tmpfs/tmpfs_vnops.c
  user/imp/tbemd/sys/fs/udf/udf_vnops.c
  user/imp/tbemd/sys/fs/unionfs/union_subr.c
  user/imp/tbemd/sys/geom/cache/g_cache.h
  user/imp/tbemd/sys/geom/gate/g_gate.c
  user/imp/tbemd/sys/geom/geom_dev.c
  user/imp/tbemd/sys/geom/geom_disk.c
  user/imp/tbemd/sys/geom/geom_disk.h
  user/imp/tbemd/sys/geom/mirror/g_mirror.c
  user/imp/tbemd/sys/geom/part/g_part.c
  user/imp/tbemd/sys/geom/part/g_part.h
  user/imp/tbemd/sys/geom/part/g_part_mbr.c
  user/imp/tbemd/sys/geom/sched/g_sched.c
  user/imp/tbemd/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c
  user/imp/tbemd/sys/i386/acpica/Makefile
  user/imp/tbemd/sys/i386/acpica/acpi_wakeup.c
  user/imp/tbemd/sys/i386/acpica/madt.c
  user/imp/tbemd/sys/i386/conf/GENERIC
  user/imp/tbemd/sys/i386/conf/GENERIC.hints
  user/imp/tbemd/sys/i386/conf/NOTES
  user/imp/tbemd/sys/i386/i386/apic_vector.s
  user/imp/tbemd/sys/i386/i386/atpic_vector.s
  user/imp/tbemd/sys/i386/i386/exception.s
  user/imp/tbemd/sys/i386/i386/genassym.c
  user/imp/tbemd/sys/i386/i386/identcpu.c
  user/imp/tbemd/sys/i386/i386/initcpu.c
  user/imp/tbemd/sys/i386/i386/intr_machdep.c
  user/imp/tbemd/sys/i386/i386/legacy.c
  user/imp/tbemd/sys/i386/i386/machdep.c
  user/imp/tbemd/sys/i386/i386/mp_machdep.c
  user/imp/tbemd/sys/i386/i386/mptable_pci.c
  user/imp/tbemd/sys/i386/i386/pmap.c
  user/imp/tbemd/sys/i386/i386/support.s
  user/imp/tbemd/sys/i386/i386/swtch.s
  user/imp/tbemd/sys/i386/i386/trap.c
  user/imp/tbemd/sys/i386/i386/tsc.c
  user/imp/tbemd/sys/i386/i386/vm_machdep.c
  user/imp/tbemd/sys/i386/ibcs2/ibcs2_proto.h
  user/imp/tbemd/sys/i386/ibcs2/ibcs2_syscall.h
  user/imp/tbemd/sys/i386/ibcs2/ibcs2_sysent.c
  user/imp/tbemd/sys/i386/include/apicvar.h
  user/imp/tbemd/sys/i386/include/clock.h
  user/imp/tbemd/sys/i386/include/cpu.h
  user/imp/tbemd/sys/i386/include/elf.h
  user/imp/tbemd/sys/i386/include/mca.h
  user/imp/tbemd/sys/i386/include/md_var.h
  user/imp/tbemd/sys/i386/include/npx.h
  user/imp/tbemd/sys/i386/include/pcb.h
  user/imp/tbemd/sys/i386/include/pcpu.h
  user/imp/tbemd/sys/i386/include/pmap.h
  user/imp/tbemd/sys/i386/include/segments.h
  user/imp/tbemd/sys/i386/include/smp.h
  user/imp/tbemd/sys/i386/include/specialreg.h
  user/imp/tbemd/sys/i386/include/vm86.h
  user/imp/tbemd/sys/i386/include/vmparam.h
  user/imp/tbemd/sys/i386/isa/npx.c
  user/imp/tbemd/sys/i386/linux/linux_sysent.c
  user/imp/tbemd/sys/i386/linux/linux_sysvec.c
  user/imp/tbemd/sys/i386/pci/pci_bus.c
  user/imp/tbemd/sys/i386/xen/mp_machdep.c
  user/imp/tbemd/sys/i386/xen/pmap.c
  user/imp/tbemd/sys/ia64/acpica/acpi_machdep.c
  user/imp/tbemd/sys/ia64/conf/GENERIC
  user/imp/tbemd/sys/ia64/ia32/ia32_signal.c
  user/imp/tbemd/sys/ia64/ia64/autoconf.c
  user/imp/tbemd/sys/ia64/ia64/busdma_machdep.c
  user/imp/tbemd/sys/ia64/ia64/exception.S
  user/imp/tbemd/sys/ia64/ia64/machdep.c
  user/imp/tbemd/sys/ia64/ia64/mca.c
  user/imp/tbemd/sys/ia64/ia64/mp_machdep.c
  user/imp/tbemd/sys/ia64/ia64/pmap.c
  user/imp/tbemd/sys/ia64/ia64/trap.c
  user/imp/tbemd/sys/ia64/ia64/vm_machdep.c
  user/imp/tbemd/sys/ia64/include/asm.h
  user/imp/tbemd/sys/ia64/include/elf.h
  user/imp/tbemd/sys/ia64/include/mca.h
  user/imp/tbemd/sys/ia64/include/md_var.h
  user/imp/tbemd/sys/ia64/include/param.h
  user/imp/tbemd/sys/ia64/include/pcpu.h
  user/imp/tbemd/sys/ia64/include/profile.h
  user/imp/tbemd/sys/ia64/include/smp.h
  user/imp/tbemd/sys/ia64/include/vmparam.h
  user/imp/tbemd/sys/isa/rtc.h
  user/imp/tbemd/sys/isa/syscons_isa.c
  user/imp/tbemd/sys/kern/bus_if.m
  user/imp/tbemd/sys/kern/imgact_elf.c
  user/imp/tbemd/sys/kern/imgact_shell.c
  user/imp/tbemd/sys/kern/init_main.c
  user/imp/tbemd/sys/kern/init_sysent.c
  user/imp/tbemd/sys/kern/kern_acct.c
  user/imp/tbemd/sys/kern/kern_clock.c
  user/imp/tbemd/sys/kern/kern_conf.c
  user/imp/tbemd/sys/kern/kern_cons.c
  user/imp/tbemd/sys/kern/kern_context.c
  user/imp/tbemd/sys/kern/kern_cpu.c
  user/imp/tbemd/sys/kern/kern_dtrace.c
  user/imp/tbemd/sys/kern/kern_exec.c
  user/imp/tbemd/sys/kern/kern_exit.c
  user/imp/tbemd/sys/kern/kern_fork.c
  user/imp/tbemd/sys/kern/kern_ktr.c
  user/imp/tbemd/sys/kern/kern_ktrace.c
  user/imp/tbemd/sys/kern/kern_lock.c
  user/imp/tbemd/sys/kern/kern_malloc.c
  user/imp/tbemd/sys/kern/kern_mbuf.c
  user/imp/tbemd/sys/kern/kern_mib.c
  user/imp/tbemd/sys/kern/kern_module.c
  user/imp/tbemd/sys/kern/kern_priv.c
  user/imp/tbemd/sys/kern/kern_proc.c
  user/imp/tbemd/sys/kern/kern_resource.c
  user/imp/tbemd/sys/kern/kern_sdt.c
  user/imp/tbemd/sys/kern/kern_sig.c
  user/imp/tbemd/sys/kern/kern_switch.c
  user/imp/tbemd/sys/kern/kern_syscalls.c
  user/imp/tbemd/sys/kern/kern_tc.c
  user/imp/tbemd/sys/kern/kern_thr.c
  user/imp/tbemd/sys/kern/kern_thread.c
  user/imp/tbemd/sys/kern/kern_timeout.c
  user/imp/tbemd/sys/kern/kern_umtx.c
  user/imp/tbemd/sys/kern/link_elf_obj.c
  user/imp/tbemd/sys/kern/makesyscalls.sh
  user/imp/tbemd/sys/kern/sched_4bsd.c
  user/imp/tbemd/sys/kern/sched_ule.c
  user/imp/tbemd/sys/kern/subr_autoconf.c
  user/imp/tbemd/sys/kern/subr_bus.c
  user/imp/tbemd/sys/kern/subr_devstat.c
  user/imp/tbemd/sys/kern/subr_fattime.c
  user/imp/tbemd/sys/kern/subr_kdb.c
  user/imp/tbemd/sys/kern/subr_lock.c
  user/imp/tbemd/sys/kern/subr_mchain.c
  user/imp/tbemd/sys/kern/subr_module.c
  user/imp/tbemd/sys/kern/subr_param.c
  user/imp/tbemd/sys/kern/subr_pcpu.c
  user/imp/tbemd/sys/kern/subr_prf.c
  user/imp/tbemd/sys/kern/subr_rtc.c
  user/imp/tbemd/sys/kern/subr_sleepqueue.c
  user/imp/tbemd/sys/kern/subr_smp.c
  user/imp/tbemd/sys/kern/subr_taskqueue.c
  user/imp/tbemd/sys/kern/subr_trap.c
  user/imp/tbemd/sys/kern/subr_unit.c
  user/imp/tbemd/sys/kern/subr_witness.c
  user/imp/tbemd/sys/kern/sys_generic.c
  user/imp/tbemd/sys/kern/sys_process.c
  user/imp/tbemd/sys/kern/sys_socket.c
  user/imp/tbemd/sys/kern/syscalls.c
  user/imp/tbemd/sys/kern/syscalls.master
  user/imp/tbemd/sys/kern/systrace_args.c
  user/imp/tbemd/sys/kern/sysv_sem.c
  user/imp/tbemd/sys/kern/sysv_shm.c
  user/imp/tbemd/sys/kern/tty.c
  user/imp/tbemd/sys/kern/uipc_mbuf.c
  user/imp/tbemd/sys/kern/uipc_mbuf2.c
  user/imp/tbemd/sys/kern/uipc_mqueue.c
  user/imp/tbemd/sys/kern/uipc_socket.c
  user/imp/tbemd/sys/kern/uipc_syscalls.c
  user/imp/tbemd/sys/kern/uipc_usrreq.c
  user/imp/tbemd/sys/kern/vfs_bio.c
  user/imp/tbemd/sys/kern/vfs_cache.c
  user/imp/tbemd/sys/kern/vfs_cluster.c
  user/imp/tbemd/sys/kern/vfs_lookup.c
  user/imp/tbemd/sys/kern/vfs_subr.c
  user/imp/tbemd/sys/kern/vfs_syscalls.c
  user/imp/tbemd/sys/kern/vfs_vnops.c
  user/imp/tbemd/sys/mips/atheros/ar71xx_machdep.c
  user/imp/tbemd/sys/mips/atheros/ar71xx_pci.c
  user/imp/tbemd/sys/mips/atheros/ar71xx_wdog.c
  user/imp/tbemd/sys/mips/atheros/ar71xxreg.h
  user/imp/tbemd/sys/mips/atheros/files.ar71xx
  user/imp/tbemd/sys/mips/atheros/if_arge.c
  user/imp/tbemd/sys/mips/atheros/if_argevar.h
  user/imp/tbemd/sys/mips/atheros/uart_bus_ar71xx.c
  user/imp/tbemd/sys/mips/atheros/uart_cpu_ar71xx.c
  user/imp/tbemd/sys/mips/cavium/files.octeon1
  user/imp/tbemd/sys/mips/cavium/obio.c
  user/imp/tbemd/sys/mips/cavium/octeon_ebt3000_cf.c
  user/imp/tbemd/sys/mips/cavium/octeon_machdep.c
  user/imp/tbemd/sys/mips/cavium/octeon_mp.c
  user/imp/tbemd/sys/mips/cavium/octeon_pcmap_regs.h
  user/imp/tbemd/sys/mips/cavium/std.octeon1
  user/imp/tbemd/sys/mips/cavium/uart_bus_octeonusart.c
  user/imp/tbemd/sys/mips/cavium/uart_cpu_octeonusart.c
  user/imp/tbemd/sys/mips/cavium/uart_dev_oct16550.c
  user/imp/tbemd/sys/mips/conf/OCTEON1
  user/imp/tbemd/sys/mips/conf/OCTEON1-32
  user/imp/tbemd/sys/mips/conf/OCTEON1.hints
  user/imp/tbemd/sys/mips/conf/XLR
  user/imp/tbemd/sys/mips/include/_bus.h
  user/imp/tbemd/sys/mips/include/_stdint.h
  user/imp/tbemd/sys/mips/include/asm.h
  user/imp/tbemd/sys/mips/include/bus.h
  user/imp/tbemd/sys/mips/include/cache_mipsNN.h
  user/imp/tbemd/sys/mips/include/clock.h
  user/imp/tbemd/sys/mips/include/cpu.h
  user/imp/tbemd/sys/mips/include/cpufunc.h
  user/imp/tbemd/sys/mips/include/cpuregs.h
  user/imp/tbemd/sys/mips/include/db_machdep.h
  user/imp/tbemd/sys/mips/include/elf.h
  user/imp/tbemd/sys/mips/include/endian.h
  user/imp/tbemd/sys/mips/include/intr_machdep.h
  user/imp/tbemd/sys/mips/include/md_var.h
  user/imp/tbemd/sys/mips/include/param.h
  user/imp/tbemd/sys/mips/include/pmap.h
  user/imp/tbemd/sys/mips/include/profile.h
  user/imp/tbemd/sys/mips/include/pte.h
  user/imp/tbemd/sys/mips/include/runq.h
  user/imp/tbemd/sys/mips/include/setjmp.h
  user/imp/tbemd/sys/mips/include/smp.h
  user/imp/tbemd/sys/mips/include/vm.h
  user/imp/tbemd/sys/mips/include/vmparam.h
  user/imp/tbemd/sys/mips/mips/bus_space_generic.c
  user/imp/tbemd/sys/mips/mips/cache.c
  user/imp/tbemd/sys/mips/mips/cache_mipsNN.c
  user/imp/tbemd/sys/mips/mips/cpu.c
  user/imp/tbemd/sys/mips/mips/db_interface.c
  user/imp/tbemd/sys/mips/mips/db_trace.c
  user/imp/tbemd/sys/mips/mips/exception.S
  user/imp/tbemd/sys/mips/mips/fp.S
  user/imp/tbemd/sys/mips/mips/genassym.c
  user/imp/tbemd/sys/mips/mips/locore.S
  user/imp/tbemd/sys/mips/mips/machdep.c
  user/imp/tbemd/sys/mips/mips/mainbus.c
  user/imp/tbemd/sys/mips/mips/mp_machdep.c
  user/imp/tbemd/sys/mips/mips/mpboot.S
  user/imp/tbemd/sys/mips/mips/pm_machdep.c
  user/imp/tbemd/sys/mips/mips/pmap.c
  user/imp/tbemd/sys/mips/mips/psraccess.S
  user/imp/tbemd/sys/mips/mips/stack_machdep.c
  user/imp/tbemd/sys/mips/mips/support.S
  user/imp/tbemd/sys/mips/mips/swtch.S
  user/imp/tbemd/sys/mips/mips/tick.c
  user/imp/tbemd/sys/mips/mips/trap.c
  user/imp/tbemd/sys/mips/mips/vm_machdep.c
  user/imp/tbemd/sys/mips/rmi/board.c
  user/imp/tbemd/sys/mips/rmi/board.h
  user/imp/tbemd/sys/mips/rmi/dev/xlr/rge.c
  user/imp/tbemd/sys/mips/rmi/files.xlr
  user/imp/tbemd/sys/mips/rmi/intr_machdep.c
  user/imp/tbemd/sys/mips/rmi/iodi.c
  user/imp/tbemd/sys/mips/rmi/on_chip.c
  user/imp/tbemd/sys/mips/rmi/std.xlr
  user/imp/tbemd/sys/mips/rmi/tick.c
  user/imp/tbemd/sys/mips/rmi/xlr_machdep.c
  user/imp/tbemd/sys/mips/rmi/xlr_pci.c
  user/imp/tbemd/sys/mips/sibyte/sb_machdep.c
  user/imp/tbemd/sys/mips/sibyte/sb_scd.c
  user/imp/tbemd/sys/mips/sibyte/sb_zbpci.c
  user/imp/tbemd/sys/modules/Makefile
  user/imp/tbemd/sys/modules/acpi/Makefile
  user/imp/tbemd/sys/modules/acpi/acpi/Makefile
  user/imp/tbemd/sys/modules/ata/atacore/Makefile
  user/imp/tbemd/sys/modules/cas/Makefile
  user/imp/tbemd/sys/modules/dtrace/Makefile
  user/imp/tbemd/sys/modules/em/Makefile
  user/imp/tbemd/sys/modules/igb/Makefile
  user/imp/tbemd/sys/modules/iwnfw/Makefile
  user/imp/tbemd/sys/modules/iwnfw/iwn6000/Makefile
  user/imp/tbemd/sys/modules/ixgbe/Makefile
  user/imp/tbemd/sys/modules/mqueue/Makefile
  user/imp/tbemd/sys/modules/nfscl/Makefile
  user/imp/tbemd/sys/modules/nfsclient/Makefile
  user/imp/tbemd/sys/modules/opensolaris/Makefile
  user/imp/tbemd/sys/modules/sem/Makefile
  user/imp/tbemd/sys/modules/syscons/Makefile
  user/imp/tbemd/sys/modules/x86bios/Makefile
  user/imp/tbemd/sys/modules/zfs/Makefile
  user/imp/tbemd/sys/net/bpf.c
  user/imp/tbemd/sys/net/bpf.h
  user/imp/tbemd/sys/net/bpfdesc.h
  user/imp/tbemd/sys/net/flowtable.c
  user/imp/tbemd/sys/net/if.c
  user/imp/tbemd/sys/net/if_bridge.c
  user/imp/tbemd/sys/net/if_epair.c
  user/imp/tbemd/sys/net/if_ethersubr.c
  user/imp/tbemd/sys/net/if_llatbl.c
  user/imp/tbemd/sys/net/if_vlan.c
  user/imp/tbemd/sys/net/netisr.c
  user/imp/tbemd/sys/net/pfil.h
  user/imp/tbemd/sys/net/radix.c
  user/imp/tbemd/sys/net/rtsock.c
  user/imp/tbemd/sys/net/vnet.c
  user/imp/tbemd/sys/net80211/ieee80211.c
  user/imp/tbemd/sys/net80211/ieee80211_crypto.h
  user/imp/tbemd/sys/net80211/ieee80211_crypto_ccmp.c
  user/imp/tbemd/sys/net80211/ieee80211_crypto_tkip.c
  user/imp/tbemd/sys/net80211/ieee80211_hwmp.c
  user/imp/tbemd/sys/net80211/ieee80211_node.c
  user/imp/tbemd/sys/net80211/ieee80211_rssadapt.c
  user/imp/tbemd/sys/net80211/ieee80211_sta.c
  user/imp/tbemd/sys/net80211/ieee80211_var.h
  user/imp/tbemd/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h
  user/imp/tbemd/sys/netgraph/netflow/netflow.c
  user/imp/tbemd/sys/netgraph/ng_ipfw.c
  user/imp/tbemd/sys/netgraph/ng_patch.c
  user/imp/tbemd/sys/netgraph/ng_pipe.c
  user/imp/tbemd/sys/netgraph/ng_source.c
  user/imp/tbemd/sys/netgraph/ng_source.h
  user/imp/tbemd/sys/netinet/if_ether.c
  user/imp/tbemd/sys/netinet/in.c
  user/imp/tbemd/sys/netinet/in.h
  user/imp/tbemd/sys/netinet/in_proto.c
  user/imp/tbemd/sys/netinet/in_rmx.c
  user/imp/tbemd/sys/netinet/ip_carp.c
  user/imp/tbemd/sys/netinet/ip_carp.h
  user/imp/tbemd/sys/netinet/ip_divert.c
  user/imp/tbemd/sys/netinet/ip_icmp.c
  user/imp/tbemd/sys/netinet/ip_input.c
  user/imp/tbemd/sys/netinet/ipfw/dn_heap.c
  user/imp/tbemd/sys/netinet/ipfw/ip_fw2.c
  user/imp/tbemd/sys/netinet/ipfw/ip_fw_dynamic.c
  user/imp/tbemd/sys/netinet/ipfw/ip_fw_log.c
  user/imp/tbemd/sys/netinet/libalias/alias_db.c
  user/imp/tbemd/sys/netinet/libalias/alias_sctp.h
  user/imp/tbemd/sys/netinet/raw_ip.c
  user/imp/tbemd/sys/netinet/sctp.h
  user/imp/tbemd/sys/netinet/sctp_asconf.c
  user/imp/tbemd/sys/netinet/sctp_indata.c
  user/imp/tbemd/sys/netinet/sctp_output.c
  user/imp/tbemd/sys/netinet/sctp_pcb.c
  user/imp/tbemd/sys/netinet/sctp_structs.h
  user/imp/tbemd/sys/netinet/sctp_timer.c
  user/imp/tbemd/sys/netinet/sctp_usrreq.c
  user/imp/tbemd/sys/netinet/sctputil.c
  user/imp/tbemd/sys/netinet/tcp_input.c
  user/imp/tbemd/sys/netinet/tcp_output.c
  user/imp/tbemd/sys/netinet/tcp_subr.c
  user/imp/tbemd/sys/netinet/tcp_syncache.c
  user/imp/tbemd/sys/netinet/tcp_var.h
  user/imp/tbemd/sys/netinet/udp_usrreq.c
  user/imp/tbemd/sys/netinet6/icmp6.c
  user/imp/tbemd/sys/netinet6/in6_proto.c
  user/imp/tbemd/sys/netinet6/ip6_input.c
  user/imp/tbemd/sys/netinet6/nd6.c
  user/imp/tbemd/sys/netinet6/nd6_nbr.c
  user/imp/tbemd/sys/netinet6/raw_ip6.c
  user/imp/tbemd/sys/nfsclient/nfs_bio.c
  user/imp/tbemd/sys/nfsclient/nfs_nfsiod.c
  user/imp/tbemd/sys/nfsclient/nfs_node.c
  user/imp/tbemd/sys/nfsclient/nfs_subs.c
  user/imp/tbemd/sys/nfsclient/nfs_vfsops.c
  user/imp/tbemd/sys/nfsclient/nfs_vnops.c
  user/imp/tbemd/sys/nfsclient/nfsnode.h
  user/imp/tbemd/sys/opencrypto/cryptodev.c
  user/imp/tbemd/sys/opencrypto/deflate.c
  user/imp/tbemd/sys/pc98/conf/GENERIC
  user/imp/tbemd/sys/pc98/conf/GENERIC.hints
  user/imp/tbemd/sys/pc98/include/npx.h
  user/imp/tbemd/sys/pc98/pc98/machdep.c
  user/imp/tbemd/sys/pci/if_rl.c
  user/imp/tbemd/sys/powerpc/aim/clock.c
  user/imp/tbemd/sys/powerpc/aim/copyinout.c
  user/imp/tbemd/sys/powerpc/aim/interrupt.c
  user/imp/tbemd/sys/powerpc/aim/locore.S
  user/imp/tbemd/sys/powerpc/aim/machdep.c
  user/imp/tbemd/sys/powerpc/aim/mmu_oea.c
  user/imp/tbemd/sys/powerpc/aim/mmu_oea64.c
  user/imp/tbemd/sys/powerpc/aim/mp_cpudep.c
  user/imp/tbemd/sys/powerpc/aim/nexus.c
  user/imp/tbemd/sys/powerpc/aim/ofw_machdep.c
  user/imp/tbemd/sys/powerpc/aim/platform_chrp.c
  user/imp/tbemd/sys/powerpc/aim/trap.c
  user/imp/tbemd/sys/powerpc/aim/vm_machdep.c
  user/imp/tbemd/sys/powerpc/booke/clock.c
  user/imp/tbemd/sys/powerpc/booke/interrupt.c
  user/imp/tbemd/sys/powerpc/booke/locore.S
  user/imp/tbemd/sys/powerpc/booke/machdep.c
  user/imp/tbemd/sys/powerpc/booke/platform_bare.c
  user/imp/tbemd/sys/powerpc/booke/pmap.c
  user/imp/tbemd/sys/powerpc/booke/swtch.S
  user/imp/tbemd/sys/powerpc/booke/trap.c
  user/imp/tbemd/sys/powerpc/booke/vm_machdep.c
  user/imp/tbemd/sys/powerpc/conf/DEFAULTS
  user/imp/tbemd/sys/powerpc/conf/GENERIC
  user/imp/tbemd/sys/powerpc/conf/MPC85XX
  user/imp/tbemd/sys/powerpc/conf/Makefile
  user/imp/tbemd/sys/powerpc/conf/NOTES
  user/imp/tbemd/sys/powerpc/cpufreq/pcr.c
  user/imp/tbemd/sys/powerpc/include/_align.h
  user/imp/tbemd/sys/powerpc/include/_bus.h
  user/imp/tbemd/sys/powerpc/include/_inttypes.h
  user/imp/tbemd/sys/powerpc/include/_limits.h
  user/imp/tbemd/sys/powerpc/include/_stdint.h
  user/imp/tbemd/sys/powerpc/include/_types.h
  user/imp/tbemd/sys/powerpc/include/asm.h
  user/imp/tbemd/sys/powerpc/include/atomic.h
  user/imp/tbemd/sys/powerpc/include/bus.h
  user/imp/tbemd/sys/powerpc/include/cpufunc.h
  user/imp/tbemd/sys/powerpc/include/db_machdep.h
  user/imp/tbemd/sys/powerpc/include/elf.h
  user/imp/tbemd/sys/powerpc/include/frame.h
  user/imp/tbemd/sys/powerpc/include/hid.h
  user/imp/tbemd/sys/powerpc/include/intr_machdep.h
  user/imp/tbemd/sys/powerpc/include/md_var.h
  user/imp/tbemd/sys/powerpc/include/metadata.h
  user/imp/tbemd/sys/powerpc/include/openpicvar.h
  user/imp/tbemd/sys/powerpc/include/param.h
  user/imp/tbemd/sys/powerpc/include/pcb.h
  user/imp/tbemd/sys/powerpc/include/pcpu.h
  user/imp/tbemd/sys/powerpc/include/pmap.h
  user/imp/tbemd/sys/powerpc/include/proc.h
  user/imp/tbemd/sys/powerpc/include/profile.h
  user/imp/tbemd/sys/powerpc/include/psl.h
  user/imp/tbemd/sys/powerpc/include/pte.h
  user/imp/tbemd/sys/powerpc/include/reg.h
  user/imp/tbemd/sys/powerpc/include/runq.h
  user/imp/tbemd/sys/powerpc/include/smp.h
  user/imp/tbemd/sys/powerpc/include/spr.h
  user/imp/tbemd/sys/powerpc/include/sr.h
  user/imp/tbemd/sys/powerpc/include/trap_aim.h
  user/imp/tbemd/sys/powerpc/include/ucontext.h
  user/imp/tbemd/sys/powerpc/include/vmparam.h
  user/imp/tbemd/sys/powerpc/mpc85xx/atpic.c
  user/imp/tbemd/sys/powerpc/mpc85xx/i2c.c
  user/imp/tbemd/sys/powerpc/mpc85xx/isa.c
  user/imp/tbemd/sys/powerpc/mpc85xx/lbc.c
  user/imp/tbemd/sys/powerpc/mpc85xx/lbc.h
  user/imp/tbemd/sys/powerpc/mpc85xx/mpc85xx.c
  user/imp/tbemd/sys/powerpc/mpc85xx/mpc85xx.h
  user/imp/tbemd/sys/powerpc/mpc85xx/nexus.c
  user/imp/tbemd/sys/powerpc/ofw/ofw_pcib_pci.c
  user/imp/tbemd/sys/powerpc/ofw/ofw_pcibus.c
  user/imp/tbemd/sys/powerpc/ofw/ofw_real.c
  user/imp/tbemd/sys/powerpc/ofw/ofw_syscons.c
  user/imp/tbemd/sys/powerpc/powermac/cpcht.c
  user/imp/tbemd/sys/powerpc/powermac/cuda.c
  user/imp/tbemd/sys/powerpc/powermac/grackle.c
  user/imp/tbemd/sys/powerpc/powermac/hrowpic.c
  user/imp/tbemd/sys/powerpc/powermac/kiic.c
  user/imp/tbemd/sys/powerpc/powermac/macgpio.c
  user/imp/tbemd/sys/powerpc/powermac/macio.c
  user/imp/tbemd/sys/powerpc/powermac/openpic_macio.c
  user/imp/tbemd/sys/powerpc/powermac/pmu.c
  user/imp/tbemd/sys/powerpc/powermac/uninorth.c
  user/imp/tbemd/sys/powerpc/powermac/uninorthpci.c
  user/imp/tbemd/sys/powerpc/powerpc/bcopy.c
  user/imp/tbemd/sys/powerpc/powerpc/bus_machdep.c
  user/imp/tbemd/sys/powerpc/powerpc/busdma_machdep.c
  user/imp/tbemd/sys/powerpc/powerpc/cpu.c
  user/imp/tbemd/sys/powerpc/powerpc/db_interface.c
  user/imp/tbemd/sys/powerpc/powerpc/db_trace.c
  user/imp/tbemd/sys/powerpc/powerpc/genassym.c
  user/imp/tbemd/sys/powerpc/powerpc/in_cksum.c
  user/imp/tbemd/sys/powerpc/powerpc/intr_machdep.c
  user/imp/tbemd/sys/powerpc/powerpc/mp_machdep.c
  user/imp/tbemd/sys/powerpc/powerpc/openpic.c
  user/imp/tbemd/sys/powerpc/powerpc/pic_if.m
  user/imp/tbemd/sys/powerpc/powerpc/setjmp.S
  user/imp/tbemd/sys/powerpc/powerpc/stack_machdep.c
  user/imp/tbemd/sys/powerpc/powerpc/syncicache.c
  user/imp/tbemd/sys/powerpc/powerpc/sys_machdep.c
  user/imp/tbemd/sys/powerpc/psim/openpic_iobus.c
  user/imp/tbemd/sys/security/mac/mac_framework.c
  user/imp/tbemd/sys/security/mac/mac_internal.h
  user/imp/tbemd/sys/sparc64/conf/GENERIC
  user/imp/tbemd/sys/sparc64/ebus/ebus.c
  user/imp/tbemd/sys/sparc64/include/bus.h
  user/imp/tbemd/sys/sparc64/include/cache.h
  user/imp/tbemd/sys/sparc64/include/elf.h
  user/imp/tbemd/sys/sparc64/include/intr_machdep.h
  user/imp/tbemd/sys/sparc64/include/pcpu.h
  user/imp/tbemd/sys/sparc64/include/pmap.h
  user/imp/tbemd/sys/sparc64/include/smp.h
  user/imp/tbemd/sys/sparc64/include/tick.h
  user/imp/tbemd/sys/sparc64/include/vmparam.h
  user/imp/tbemd/sys/sparc64/isa/ofw_isa.c
  user/imp/tbemd/sys/sparc64/pci/fire.c
  user/imp/tbemd/sys/sparc64/pci/ofw_pcib_subr.c
  user/imp/tbemd/sys/sparc64/pci/psycho.c
  user/imp/tbemd/sys/sparc64/pci/schizo.c
  user/imp/tbemd/sys/sparc64/sparc64/cache.c
  user/imp/tbemd/sys/sparc64/sparc64/clock.c
  user/imp/tbemd/sys/sparc64/sparc64/exception.S
  user/imp/tbemd/sys/sparc64/sparc64/genassym.c
  user/imp/tbemd/sys/sparc64/sparc64/intr_machdep.c
  user/imp/tbemd/sys/sparc64/sparc64/machdep.c
  user/imp/tbemd/sys/sparc64/sparc64/mem.c
  user/imp/tbemd/sys/sparc64/sparc64/mp_exception.S
  user/imp/tbemd/sys/sparc64/sparc64/mp_locore.S
  user/imp/tbemd/sys/sparc64/sparc64/mp_machdep.c
  user/imp/tbemd/sys/sparc64/sparc64/pmap.c
  user/imp/tbemd/sys/sparc64/sparc64/tick.c
  user/imp/tbemd/sys/sparc64/sparc64/trap.c
  user/imp/tbemd/sys/sparc64/sparc64/tsb.c
  user/imp/tbemd/sys/sparc64/sparc64/uio_machdep.c
  user/imp/tbemd/sys/sparc64/sparc64/vm_machdep.c
  user/imp/tbemd/sys/sun4v/conf/DEFAULTS
  user/imp/tbemd/sys/sun4v/conf/GENERIC
  user/imp/tbemd/sys/sun4v/include/bus.h
  user/imp/tbemd/sys/sun4v/include/clock.h
  user/imp/tbemd/sys/sun4v/include/elf.h
  user/imp/tbemd/sys/sun4v/include/intr_machdep.h
  user/imp/tbemd/sys/sun4v/include/pcpu.h
  user/imp/tbemd/sys/sun4v/include/smp.h
  user/imp/tbemd/sys/sun4v/include/tick.h
  user/imp/tbemd/sys/sun4v/include/vmparam.h
  user/imp/tbemd/sys/sun4v/sun4v/clock.c
  user/imp/tbemd/sys/sun4v/sun4v/exception.S
  user/imp/tbemd/sys/sun4v/sun4v/hv_pci.c
  user/imp/tbemd/sys/sun4v/sun4v/intr_machdep.c
  user/imp/tbemd/sys/sun4v/sun4v/machdep.c
  user/imp/tbemd/sys/sun4v/sun4v/mp_machdep.c
  user/imp/tbemd/sys/sun4v/sun4v/pmap.c
  user/imp/tbemd/sys/sun4v/sun4v/tick.c
  user/imp/tbemd/sys/sun4v/sun4v/trap.c
  user/imp/tbemd/sys/sys/_task.h
  user/imp/tbemd/sys/sys/buf.h
  user/imp/tbemd/sys/sys/bus.h
  user/imp/tbemd/sys/sys/cdefs.h
  user/imp/tbemd/sys/sys/conf.h
  user/imp/tbemd/sys/sys/disk.h
  user/imp/tbemd/sys/sys/diskmbr.h
  user/imp/tbemd/sys/sys/elf_common.h
  user/imp/tbemd/sys/sys/file.h
  user/imp/tbemd/sys/sys/imgact.h
  user/imp/tbemd/sys/sys/imgact_elf.h
  user/imp/tbemd/sys/sys/kthread.h
  user/imp/tbemd/sys/sys/ktr.h
  user/imp/tbemd/sys/sys/ktrace.h
  user/imp/tbemd/sys/sys/lockmgr.h
  user/imp/tbemd/sys/sys/malloc.h
  user/imp/tbemd/sys/sys/mbuf.h
  user/imp/tbemd/sys/sys/param.h
  user/imp/tbemd/sys/sys/pcpu.h
  user/imp/tbemd/sys/sys/pmc.h
  user/imp/tbemd/sys/sys/priv.h
  user/imp/tbemd/sys/sys/proc.h
  user/imp/tbemd/sys/sys/ptrace.h
  user/imp/tbemd/sys/sys/resource.h
  user/imp/tbemd/sys/sys/resourcevar.h
  user/imp/tbemd/sys/sys/sdt.h
  user/imp/tbemd/sys/sys/signal.h
  user/imp/tbemd/sys/sys/signalvar.h
  user/imp/tbemd/sys/sys/smp.h
  user/imp/tbemd/sys/sys/syscall.h
  user/imp/tbemd/sys/sys/syscall.mk
  user/imp/tbemd/sys/sys/syscallsubr.h
  user/imp/tbemd/sys/sys/sysctl.h
  user/imp/tbemd/sys/sys/sysent.h
  user/imp/tbemd/sys/sys/sysproto.h
  user/imp/tbemd/sys/sys/systm.h
  user/imp/tbemd/sys/sys/taskqueue.h
  user/imp/tbemd/sys/sys/time.h
  user/imp/tbemd/sys/sys/types.h
  user/imp/tbemd/sys/sys/vnode.h
  user/imp/tbemd/sys/teken/teken_subr.h
  user/imp/tbemd/sys/tools/vnode_if.awk
  user/imp/tbemd/sys/ufs/ffs/ffs_alloc.c
  user/imp/tbemd/sys/ufs/ffs/ffs_inode.c
  user/imp/tbemd/sys/ufs/ffs/ffs_softdep.c
  user/imp/tbemd/sys/ufs/ffs/ffs_vfsops.c
  user/imp/tbemd/sys/ufs/ffs/ffs_vnops.c
  user/imp/tbemd/sys/ufs/ffs/softdep.h
  user/imp/tbemd/sys/ufs/ufs/inode.h
  user/imp/tbemd/sys/ufs/ufs/ufs_inode.c
  user/imp/tbemd/sys/ufs/ufs/ufs_lookup.c
  user/imp/tbemd/sys/ufs/ufs/ufs_vnops.c
  user/imp/tbemd/sys/vm/device_pager.c
  user/imp/tbemd/sys/vm/memguard.c
  user/imp/tbemd/sys/vm/memguard.h
  user/imp/tbemd/sys/vm/uma.h
  user/imp/tbemd/sys/vm/uma_core.c
  user/imp/tbemd/sys/vm/uma_int.h
  user/imp/tbemd/sys/vm/vm_contig.c
  user/imp/tbemd/sys/vm/vm_extern.h
  user/imp/tbemd/sys/vm/vm_fault.c
  user/imp/tbemd/sys/vm/vm_init.c
  user/imp/tbemd/sys/vm/vm_kern.c
  user/imp/tbemd/sys/vm/vm_map.c
  user/imp/tbemd/sys/vm/vm_mmap.c
  user/imp/tbemd/sys/vm/vm_object.c
  user/imp/tbemd/sys/vm/vm_page.c
  user/imp/tbemd/sys/vm/vm_page.h
  user/imp/tbemd/sys/vm/vm_pageout.c
  user/imp/tbemd/sys/vm/vm_pager.h
  user/imp/tbemd/sys/vm/vm_phys.c
  user/imp/tbemd/sys/vm/vm_phys.h
  user/imp/tbemd/sys/x86/cpufreq/est.c
  user/imp/tbemd/sys/x86/isa/atrtc.c
  user/imp/tbemd/sys/x86/isa/clock.c
  user/imp/tbemd/sys/x86/x86/local_apic.c
  user/imp/tbemd/sys/x86/x86/mca.c
  user/imp/tbemd/sys/x86/x86/msi.c
Directory Properties:
  user/imp/tbemd/sys/dev/xen/xenpci/   (props changed)

Modified: user/imp/tbemd/sys/ddb/db_command.c
==============================================================================

--- user/imp/tbemd/sys/ddb/db_command.c	Sun Aug 22 21:52:38 2010	(r211656)
+++ user/imp/tbemd/sys/ddb/db_command.c	Sun Aug 22 21:53:24 2010	(r211657)
@@ -633,7 +633,7 @@ db_kill(dummy1, dummy2, dummy3, dummy4)
 	if (!db_expression(&pid))
 		DB_ERROR(("Missing process ID\n"));
 	db_skip_to_eol();
-	if (sig < 1 || sig > _SIG_MAXSIG)
+	if (!_SIG_VALID(sig))
 		DB_ERROR(("Signal number out of range\n"));
 
 	/*

Modified: user/imp/tbemd/sys/dev/acpi_support/acpi_asus.c
==============================================================================
--- user/imp/tbemd/sys/dev/acpi_support/acpi_asus.c	Sun Aug 22 21:52:38 2010	(r211656)
+++ user/imp/tbemd/sys/dev/acpi_support/acpi_asus.c	Sun Aug 22 21:53:24 2010	(r211657)
@@ -711,7 +711,7 @@ good:
 	sbuf_printf(sb, "Unsupported Asus laptop: %s\n", Obj->String.Pointer);
 	sbuf_finish(sb);
 
-	device_printf(dev, sbuf_data(sb));
+	device_printf(dev, "%s", sbuf_data(sb));
 
 	sbuf_delete(sb);
 	AcpiOsFree(Buf.Pointer);

Modified: user/imp/tbemd/sys/dev/acpi_support/acpi_fujitsu.c
==============================================================================
--- user/imp/tbemd/sys/dev/acpi_support/acpi_fujitsu.c	Sun Aug 22 21:52:38 2010	(r211656)
+++ user/imp/tbemd/sys/dev/acpi_support/acpi_fujitsu.c	Sun Aug 22 21:53:24 2010	(r211657)
@@ -380,7 +380,6 @@ acpi_fujitsu_init(struct acpi_fujitsu_so
 	    OID_AUTO, "fujitsu", CTLFLAG_RD, 0, "");
 
 	for (i = 0; sysctl_table[i].name != NULL; i++) {
-		exists = 0;
 		switch(sysctl_table[i].method) {
 			case METHOD_GMOU:
 				exists = sc->gmou.exists;
@@ -566,9 +565,6 @@ static uint8_t
 acpi_fujitsu_check_hardware(struct acpi_fujitsu_softc *sc)
 {
 	int val;
-	struct acpi_softc *acpi_sc;
-
-	acpi_sc = acpi_device_get_parent_softc(sc->dev);
 
 	ACPI_SERIAL_ASSERT(fujitsu);
 	/* save the hotkey bitmask */

Modified: user/imp/tbemd/sys/dev/acpi_support/acpi_hp.c
==============================================================================
--- user/imp/tbemd/sys/dev/acpi_support/acpi_hp.c	Sun Aug 22 21:52:38 2010	(r211656)
+++ user/imp/tbemd/sys/dev/acpi_support/acpi_hp.c	Sun Aug 22 21:53:24 2010	(r211657)
@@ -453,7 +453,6 @@ static int
 acpi_hp_attach(device_t dev)
 {
 	struct acpi_hp_softc	*sc;
-	struct acpi_softc	*acpi_sc;
 	devclass_t		wmi_devclass;
 	int			arg;
 
@@ -477,7 +476,6 @@ acpi_hp_attach(device_t dev)
 	sc->cmi_order_size = -1;
 	sc->verbose = 0;
 	memset(sc->cmi_order, 0, sizeof(sc->cmi_order));
-	acpi_sc = acpi_device_get_parent_softc(dev);
 
 	if (!(wmi_devclass = devclass_find ("acpi_wmi"))) {
 		device_printf(dev, "Couldn't find acpi_wmi devclass\n");
@@ -905,7 +903,7 @@ acpi_hp_get_cmi_block(device_t wmi_dev, 
 		return (-EINVAL);
 	}
 	obj = out.Pointer;
-	if (!obj && obj->Type != ACPI_TYPE_PACKAGE) {
+	if (!obj || obj->Type != ACPI_TYPE_PACKAGE) {
 		acpi_hp_free_buffer(&out);
 		return (-EINVAL);
 	}

Modified: user/imp/tbemd/sys/dev/acpi_support/acpi_ibm.c
==============================================================================
--- user/imp/tbemd/sys/dev/acpi_support/acpi_ibm.c	Sun Aug 22 21:52:38 2010	(r211656)
+++ user/imp/tbemd/sys/dev/acpi_support/acpi_ibm.c	Sun Aug 22 21:53:24 2010	(r211657)
@@ -743,8 +743,6 @@ acpi_ibm_sysctl_set(struct acpi_ibm_soft
 			return (status);
 
 		if (sc->cmos_handle) {
-			val = val_ec & IBM_EC_MASK_VOL;
-
 			Args.Count = 1;
 			Args.Pointer = &Arg;
 			Arg.Type = ACPI_TYPE_INTEGER;

Copied: user/imp/tbemd/sys/dev/acpi_support/atk0110.c (from r211636, head/sys/dev/acpi_support/atk0110.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/imp/tbemd/sys/dev/acpi_support/atk0110.c	Sun Aug 22 21:53:24 2010	(r211657, copy of r211636, head/sys/dev/acpi_support/atk0110.c)
@@ -0,0 +1,358 @@
+/*	$NetBSD: atk0110.c,v 1.4 2010/02/11 06:54:57 cnst Exp $	*/
+/*	$OpenBSD: atk0110.c,v 1.1 2009/07/23 01:38:16 cnst Exp $	*/
+
+/*
+ * Copyright (c) 2009, 2010 Constantine A. Murenin <cnst++ at FreeBSD.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <machine/_inttypes.h>
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/bus.h>
+#include <sys/module.h>
+#include <sys/malloc.h>
+#include <sys/sysctl.h>
+
+#include <contrib/dev/acpica/include/acpi.h>
+#include <dev/acpica/acpivar.h>
+
+/*
+ * ASUSTeK AI Booster (ACPI ASOC ATK0110).
+ *
+ * This code was originally written for OpenBSD after the techniques
+ * described in the Linux's asus_atk0110.c and FreeBSD's Takanori Watanabe's
+ * acpi_aiboost.c were verified to be accurate on the actual hardware kindly
+ * provided by Sam Fourman Jr.  It was subsequently ported from OpenBSD to
+ * DragonFly BSD, to NetBSD's sysmon_envsys(9) and to FreeBSD's sysctl(9).
+ *
+ *				  -- Constantine A. Murenin <http://cnst.su/>
+ */
+
+#define _COMPONENT	ACPI_OEM
+ACPI_MODULE_NAME("aibs");
+ACPI_SERIAL_DECL(aibs, "aibs");
+
+#define AIBS_MORE_SENSORS
+#define AIBS_VERBOSE
+
+enum aibs_type {
+	AIBS_VOLT,
+	AIBS_TEMP,
+	AIBS_FAN
+};
+
+struct aibs_sensor {
+	ACPI_INTEGER	v;
+	ACPI_INTEGER	i;
+	ACPI_INTEGER	l;
+	ACPI_INTEGER	h;
+	enum aibs_type	t;
+};
+
+struct aibs_softc {
+	struct device		*sc_dev;
+	ACPI_HANDLE		sc_ah;
+
+	struct aibs_sensor	*sc_asens_volt;
+	struct aibs_sensor	*sc_asens_temp;
+	struct aibs_sensor	*sc_asens_fan;
+};
+
+static int aibs_probe(device_t);
+static int aibs_attach(device_t);
+static int aibs_detach(device_t);
+static int aibs_sysctl(SYSCTL_HANDLER_ARGS);
+
+static void aibs_attach_sif(struct aibs_softc *, enum aibs_type);
+
+static device_method_t aibs_methods[] = {
+	DEVMETHOD(device_probe,		aibs_probe),
+	DEVMETHOD(device_attach,	aibs_attach),
+	DEVMETHOD(device_detach,	aibs_detach),
+	{ NULL, NULL }
+};
+
+static driver_t aibs_driver = {
+	"aibs",
+	aibs_methods,
+	sizeof(struct aibs_softc)
+};
+
+static devclass_t aibs_devclass;
+
+DRIVER_MODULE(aibs, acpi, aibs_driver, aibs_devclass, NULL, NULL);
+
+
+static char* aibs_hids[] = {
+	"ATK0110",
+	NULL
+};
+
+static int
+aibs_probe(device_t dev)
+{
+	if (acpi_disabled("aibs") ||
+	    ACPI_ID_PROBE(device_get_parent(dev), dev, aibs_hids) == NULL)
+		return ENXIO;
+
+	device_set_desc(dev, "ASUSTeK AI Booster (ACPI ASOC ATK0110)");
+	return 0;
+}
+
+static int
+aibs_attach(device_t dev)
+{
+	struct aibs_softc *sc = device_get_softc(dev);
+
+	sc->sc_dev = dev;
+	sc->sc_ah = acpi_get_handle(dev);
+
+	aibs_attach_sif(sc, AIBS_VOLT);
+	aibs_attach_sif(sc, AIBS_TEMP);
+	aibs_attach_sif(sc, AIBS_FAN);
+
+	return 0;
+}
+
+static void
+aibs_attach_sif(struct aibs_softc *sc, enum aibs_type st)
+{
+	ACPI_STATUS		s;
+	ACPI_BUFFER		b;
+	ACPI_OBJECT		*bp, *o;
+	int			i, n;
+	const char		*node;
+	char			name[] = "?SIF";
+	struct aibs_sensor	*as;
+	struct sysctl_oid	*so;
+
+	switch (st) {
+	case AIBS_VOLT:
+		node = "volt";
+		name[0] = 'V';
+		break;
+	case AIBS_TEMP:
+		node = "temp";
+		name[0] = 'T';
+		break;
+	case AIBS_FAN:
+		node = "fan";
+		name[0] = 'F';
+		break;
+	default:
+		return;
+	}
+
+	b.Length = ACPI_ALLOCATE_BUFFER;
+	s = AcpiEvaluateObjectTyped(sc->sc_ah, name, NULL, &b,
+	    ACPI_TYPE_PACKAGE);
+	if (ACPI_FAILURE(s)) {
+		device_printf(sc->sc_dev, "%s not found\n", name);
+		return;
+	}
+
+	bp = b.Pointer;
+	o = bp->Package.Elements;
+	if (o[0].Type != ACPI_TYPE_INTEGER) {
+		device_printf(sc->sc_dev, "%s[0]: invalid type\n", name);
+		AcpiOsFree(b.Pointer);
+		return;
+	}
+
+	n = o[0].Integer.Value;
+	if (bp->Package.Count - 1 < n) {
+		device_printf(sc->sc_dev, "%s: invalid package\n", name);
+		AcpiOsFree(b.Pointer);
+		return;
+	} else if (bp->Package.Count - 1 > n) {
+		int on = n;
+
+#ifdef AIBS_MORE_SENSORS
+		n = bp->Package.Count - 1;
+#endif
+		device_printf(sc->sc_dev, "%s: malformed package: %i/%i"
+		    ", assume %i\n", name, on, bp->Package.Count - 1, n);
+	}
+	if (n < 1) {
+		device_printf(sc->sc_dev, "%s: no members in the package\n",
+		    name);
+		AcpiOsFree(b.Pointer);
+		return;
+	}
+
+	as = malloc(sizeof(*as) * n, M_DEVBUF, M_NOWAIT | M_ZERO);
+	if (as == NULL) {
+		device_printf(sc->sc_dev, "%s: malloc fail\n", name);
+		AcpiOsFree(b.Pointer);
+		return;
+	}
+	switch (st) {
+	case AIBS_VOLT:
+		sc->sc_asens_volt = as;
+		break;
+	case AIBS_TEMP:
+		sc->sc_asens_temp = as;
+		break;
+	case AIBS_FAN:
+		sc->sc_asens_fan = as;
+		break;
+	}
+
+	/* sysctl subtree for sensors of this type */
+	so = SYSCTL_ADD_NODE(device_get_sysctl_ctx(sc->sc_dev),
+	    SYSCTL_CHILDREN(device_get_sysctl_tree(sc->sc_dev)), st,
+	    node, CTLFLAG_RD, NULL, NULL);
+
+	for (i = 0, o++; i < n; i++, o++) {
+		ACPI_OBJECT	*oi;
+		char		si[3];
+		const char	*desc;
+
+		/* acpica5 automatically evaluates the referenced package */
+		if (o[0].Type != ACPI_TYPE_PACKAGE) {
+			device_printf(sc->sc_dev,
+			    "%s: %i: not a package: %i type\n",
+			    name, i, o[0].Type);
+			continue;
+		}
+		oi = o[0].Package.Elements;
+		if (o[0].Package.Count != 5 ||
+		    oi[0].Type != ACPI_TYPE_INTEGER ||
+		    oi[1].Type != ACPI_TYPE_STRING ||
+		    oi[2].Type != ACPI_TYPE_INTEGER ||
+		    oi[3].Type != ACPI_TYPE_INTEGER ||
+		    oi[4].Type != ACPI_TYPE_INTEGER) {
+			device_printf(sc->sc_dev,
+			    "%s: %i: invalid package\n",
+			    name, i);
+			continue;
+		}
+		as[i].i = oi[0].Integer.Value;
+		desc = oi[1].String.Pointer;
+		as[i].l = oi[2].Integer.Value;
+		as[i].h = oi[3].Integer.Value;
+		as[i].t = st;
+#ifdef AIBS_VERBOSE
+		device_printf(sc->sc_dev, "%c%i: "
+		    "0x%08"PRIx64" %20s %5"PRIi64" / %5"PRIi64"  "
+		    "0x%"PRIx64"\n",
+		    name[0], i,
+		    as[i].i, desc, (int64_t)as[i].l, (int64_t)as[i].h,
+		    oi[4].Integer.Value);
+#endif
+		snprintf(si, sizeof(si), "%i", i);
+		SYSCTL_ADD_PROC(device_get_sysctl_ctx(sc->sc_dev),
+		    SYSCTL_CHILDREN(so), i, si, CTLTYPE_OPAQUE | CTLFLAG_RD,
+		    sc, st, aibs_sysctl, st == AIBS_TEMP ? "IK" : "I", desc);
+	}
+
+	AcpiOsFree(b.Pointer);
+}
+
+static int
+aibs_detach(device_t dev)
+{
+	struct aibs_softc	*sc = device_get_softc(dev);
+
+	if (sc->sc_asens_volt != NULL)
+		free(sc->sc_asens_volt, M_DEVBUF);
+	if (sc->sc_asens_temp != NULL)
+		free(sc->sc_asens_temp, M_DEVBUF);
+	if (sc->sc_asens_fan != NULL)
+		free(sc->sc_asens_fan, M_DEVBUF);
+	return 0;
+}
+
+#ifdef AIBS_VERBOSE
+#define ddevice_printf(x...) device_printf(x)
+#else
+#define ddevice_printf(x...)
+#endif
+
+static int
+aibs_sysctl(SYSCTL_HANDLER_ARGS)
+{
+	struct aibs_softc	*sc = arg1;
+	enum aibs_type		st = arg2;
+	int			i = oidp->oid_number;
+	ACPI_STATUS		rs;
+	ACPI_OBJECT		p, *bp;
+	ACPI_OBJECT_LIST	mp;
+	ACPI_BUFFER		b;
+	char			*name;
+	struct aibs_sensor	*as;
+	ACPI_INTEGER		v, l, h;
+	int			so[3];
+
+	switch (st) {
+	case AIBS_VOLT:
+		name = "RVLT";
+		as = sc->sc_asens_volt;
+		break;
+	case AIBS_TEMP:
+		name = "RTMP";
+		as = sc->sc_asens_temp;
+		break;
+	case AIBS_FAN:
+		name = "RFAN";
+		as = sc->sc_asens_fan;
+		break;
+	default:
+		return ENOENT;
+	}
+	if (as == NULL)
+		return ENOENT;
+	l = as[i].l;
+	h = as[i].h;
+	p.Type = ACPI_TYPE_INTEGER;
+	p.Integer.Value = as[i].i;
+	mp.Count = 1;
+	mp.Pointer = &p;
+	b.Length = ACPI_ALLOCATE_BUFFER;
+	ACPI_SERIAL_BEGIN(aibs);
+	rs = AcpiEvaluateObjectTyped(sc->sc_ah, name, &mp, &b,
+	    ACPI_TYPE_INTEGER);
+	if (ACPI_FAILURE(rs)) {
+		ddevice_printf(sc->sc_dev,
+		    "%s: %i: evaluation failed\n",
+		    name, i);
+		ACPI_SERIAL_END(aibs);
+		return EIO;
+	}
+	bp = b.Pointer;
+	v = bp->Integer.Value;
+	AcpiOsFree(b.Pointer);
+	ACPI_SERIAL_END(aibs);
+
+	switch (st) {
+	case AIBS_VOLT:
+		break;
+	case AIBS_TEMP:
+		v += 2732;
+		l += 2732;
+		h += 2732;
+		break;
+	case AIBS_FAN:
+		break;
+	}
+	so[0] = v;
+	so[1] = l;
+	so[2] = h;
+	return sysctl_handle_opaque(oidp, &so, sizeof(so), req);
+}

Modified: user/imp/tbemd/sys/dev/acpica/Osd/OsdHardware.c
==============================================================================
--- user/imp/tbemd/sys/dev/acpica/Osd/OsdHardware.c	Sun Aug 22 21:52:38 2010	(r211656)
+++ user/imp/tbemd/sys/dev/acpica/Osd/OsdHardware.c	Sun Aug 22 21:53:24 2010	(r211657)
@@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/bus.h>
 #include <sys/kernel.h>
-#include <machine/bus.h>
+#include <machine/iodev.h>
 #include <machine/pci_cfgreg.h>
 #include <dev/acpica/acpivar.h>
 #include <dev/pci/pcireg.h>
@@ -48,42 +48,21 @@ __FBSDID("$FreeBSD$");
  *
  * In order to deal with this, we ignore resource ownership entirely, and simply
  * use the native I/O space accessor functionality.  This is Evil, but it works.
- *
- * XXX use an intermediate #define for the tag/handle
  */
 
-#ifdef __i386__
-#define ACPI_BUS_SPACE_IO	I386_BUS_SPACE_IO
-#define ACPI_BUS_HANDLE		0
-#endif
-#ifdef __ia64__
-#define ACPI_BUS_SPACE_IO	IA64_BUS_SPACE_IO
-#define ACPI_BUS_HANDLE		0
-#endif
-#ifdef __amd64__
-#define ACPI_BUS_SPACE_IO	AMD64_BUS_SPACE_IO
-#define ACPI_BUS_HANDLE		0
-#endif
-
 ACPI_STATUS
 AcpiOsReadPort(ACPI_IO_ADDRESS InPort, UINT32 *Value, UINT32 Width)
 {
 
     switch (Width) {
     case 8:
-        *(u_int8_t *)Value = bus_space_read_1(ACPI_BUS_SPACE_IO,
-	    ACPI_BUS_HANDLE, InPort);
-        break;
+	*Value = iodev_read_1(InPort);
+	break;
     case 16:
-        *(u_int16_t *)Value = bus_space_read_2(ACPI_BUS_SPACE_IO,
-	    ACPI_BUS_HANDLE, InPort);
-        break;
+	*Value = iodev_read_2(InPort);
+	break;
     case 32:
-        *(u_int32_t *)Value = bus_space_read_4(ACPI_BUS_SPACE_IO,
-	    ACPI_BUS_HANDLE, InPort);
-        break;
-    default:
-        /* debug trap goes here */
+	*Value = iodev_read_4(InPort);
 	break;
     }
 
@@ -96,16 +75,13 @@ AcpiOsWritePort(ACPI_IO_ADDRESS OutPort,
 
     switch (Width) {
     case 8:
-        bus_space_write_1(ACPI_BUS_SPACE_IO, ACPI_BUS_HANDLE, OutPort, Value);
-        break;
+	iodev_write_1(OutPort, Value);
+	break;
     case 16:
-        bus_space_write_2(ACPI_BUS_SPACE_IO, ACPI_BUS_HANDLE, OutPort, Value);
-        break;
+	iodev_write_2(OutPort, Value);
+	break;
     case 32:
-        bus_space_write_4(ACPI_BUS_SPACE_IO, ACPI_BUS_HANDLE, OutPort, Value);
-        break;
-    default:
-        /* debug trap goes here */
+	iodev_write_4(OutPort, Value);
 	break;
     }
 
@@ -113,31 +89,18 @@ AcpiOsWritePort(ACPI_IO_ADDRESS OutPort,
 }
 
 ACPI_STATUS
-AcpiOsReadPciConfiguration(ACPI_PCI_ID *PciId, UINT32 Register, void *Value,
+AcpiOsReadPciConfiguration(ACPI_PCI_ID *PciId, UINT32 Register, UINT64 *Value,
     UINT32 Width)
 {
-    u_int32_t	byte_width = Width / 8;
-    u_int32_t	val;
+
+    if (Width == 64)
+	return (AE_SUPPORT);
 
     if (!pci_cfgregopen())
-        return (AE_NOT_EXIST);
+	return (AE_NOT_EXIST);
 
-    val = pci_cfgregread(PciId->Bus, PciId->Device, PciId->Function, Register,
-	byte_width);
-    switch (Width) {
-    case 8:
-	*(u_int8_t *)Value = val & 0xff;
-	break;
-    case 16:
-	*(u_int16_t *)Value = val & 0xffff;
-	break;
-    case 32:
-	*(u_int32_t *)Value = val;
-	break;
-    default:
-	/* debug trap goes here */
-	break;
-    }
+    *(UINT64 *)Value = pci_cfgregread(PciId->Bus, PciId->Device,
+	PciId->Function, Register, Width / 8);
 
     return (AE_OK);
 }
@@ -147,13 +110,15 @@ ACPI_STATUS
 AcpiOsWritePciConfiguration (ACPI_PCI_ID *PciId, UINT32 Register,
     UINT64 Value, UINT32 Width)
 {
-    u_int32_t	byte_width = Width / 8;
+
+    if (Width == 64)
+	return (AE_SUPPORT);
 
     if (!pci_cfgregopen())
     	return (AE_NOT_EXIST);
 
     pci_cfgregwrite(PciId->Bus, PciId->Device, PciId->Function, Register,
-	Value, byte_width);
+	Value, Width / 8);
 
     return (AE_OK);
 }

Modified: user/imp/tbemd/sys/dev/acpica/Osd/OsdMemory.c
==============================================================================
--- user/imp/tbemd/sys/dev/acpica/Osd/OsdMemory.c	Sun Aug 22 21:52:38 2010	(r211656)
+++ user/imp/tbemd/sys/dev/acpica/Osd/OsdMemory.c	Sun Aug 22 21:53:24 2010	(r211657)
@@ -74,12 +74,6 @@ AcpiOsGetPhysicalAddress(void *LogicalAd
     return (AE_BAD_ADDRESS);
 }
 
-ACPI_STATUS
-AcpiOsValidateInterface (char *Interface)
-{
-    return (AE_SUPPORT);
-}
-
 BOOLEAN
 AcpiOsReadable (void *Pointer, ACPI_SIZE Length)
 {
@@ -97,29 +91,23 @@ AcpiOsReadMemory(ACPI_PHYSICAL_ADDRESS A
 {
     void	*LogicalAddress;
 
-    LogicalAddress = AcpiOsMapMemory(Address, Width / 8);
+    LogicalAddress = pmap_mapdev(Address, Width / 8);
     if (LogicalAddress == NULL)
 	return (AE_NOT_EXIST);
 
     switch (Width) {
     case 8:
-	*(u_int8_t *)Value = (*(volatile u_int8_t *)LogicalAddress);
+	*Value = *(volatile uint8_t *)LogicalAddress;
 	break;
     case 16:
-	*(u_int16_t *)Value = (*(volatile u_int16_t *)LogicalAddress);
+	*Value = *(volatile uint16_t *)LogicalAddress;
 	break;
     case 32:
-	*(u_int32_t *)Value = (*(volatile u_int32_t *)LogicalAddress);
-	break;
-    case 64:
-	*(u_int64_t *)Value = (*(volatile u_int64_t *)LogicalAddress);
-	break;
-    default:
-	/* debug trap goes here */
+	*Value = *(volatile uint32_t *)LogicalAddress;
 	break;
     }
 
-    AcpiOsUnmapMemory(LogicalAddress, Width / 8);
+    pmap_unmapdev((vm_offset_t)LogicalAddress, Width / 8);
 
     return (AE_OK);
 }
@@ -129,29 +117,23 @@ AcpiOsWriteMemory(ACPI_PHYSICAL_ADDRESS 
 {
     void	*LogicalAddress;
 
-    LogicalAddress = AcpiOsMapMemory(Address, Width / 8);
+    LogicalAddress = pmap_mapdev(Address, Width / 8);
     if (LogicalAddress == NULL)
 	return (AE_NOT_EXIST);
 
     switch (Width) {
     case 8:
-	(*(volatile u_int8_t *)LogicalAddress) = Value & 0xff;
+	*(volatile uint8_t *)LogicalAddress = Value;
 	break;
     case 16:
-	(*(volatile u_int16_t *)LogicalAddress) = Value & 0xffff;
+	*(volatile uint16_t *)LogicalAddress = Value;
 	break;
     case 32:
-	(*(volatile u_int32_t *)LogicalAddress) = Value & 0xffffffff;
-	break;
-    case 64:
-	(*(volatile u_int64_t *)LogicalAddress) = Value;
-	break;
-    default:
-	/* debug trap goes here */
+	*(volatile uint32_t *)LogicalAddress = Value;
 	break;
     }
 
-    AcpiOsUnmapMemory(LogicalAddress, Width / 8);
+    pmap_unmapdev((vm_offset_t)LogicalAddress, Width / 8);
 
     return (AE_OK);
 }

Modified: user/imp/tbemd/sys/dev/acpica/acpi.c
==============================================================================
--- user/imp/tbemd/sys/dev/acpica/acpi.c	Sun Aug 22 21:52:38 2010	(r211656)
+++ user/imp/tbemd/sys/dev/acpica/acpi.c	Sun Aug 22 21:53:24 2010	(r211657)
@@ -46,9 +46,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/linker.h>
 #include <sys/power.h>
 #include <sys/sbuf.h>
-#ifdef SMP
 #include <sys/sched.h>
-#endif
 #include <sys/smp.h>
 #include <sys/timetc.h>
 
@@ -131,8 +129,6 @@ static char	*acpi_device_id_probe(device
 static ACPI_STATUS acpi_device_eval_obj(device_t bus, device_t dev,
 		    ACPI_STRING pathname, ACPI_OBJECT_LIST *parameters,
 		    ACPI_BUFFER *ret);
-static int	acpi_device_pwr_for_sleep(device_t bus, device_t dev,
-		    int *dstate);
 static ACPI_STATUS acpi_device_scan_cb(ACPI_HANDLE h, UINT32 level,
 		    void *context, void **retval);
 static ACPI_STATUS acpi_device_scan_children(device_t bus, device_t dev,
@@ -1417,7 +1413,7 @@ acpi_device_eval_obj(device_t bus, devic
     return (AcpiEvaluateObject(h, pathname, parameters, ret));
 }
 
-static int
+int
 acpi_device_pwr_for_sleep(device_t bus, device_t dev, int *dstate)
 {
     struct acpi_softc *sc;
@@ -2319,27 +2315,28 @@ acpi_ReqSleepState(struct acpi_softc *sc
 {
 #if defined(__amd64__) || defined(__i386__)
     struct apm_clone_data *clone;
+    ACPI_STATUS status;
 
     if (state < ACPI_STATE_S1 || state > ACPI_S_STATES_MAX)
 	return (EINVAL);
     if (!acpi_sleep_states[state])
 	return (EOPNOTSUPP);
 
-    /* S5 (soft-off) should be entered directly with no waiting. */
-    if (state == ACPI_STATE_S5) {
-	if (ACPI_SUCCESS(acpi_EnterSleepState(sc, state)))
-	    return (0);
-	else
-	    return (ENXIO);
-    }
+    ACPI_LOCK(acpi);
 
     /* If a suspend request is already in progress, just return. */
-    ACPI_LOCK(acpi);
     if (sc->acpi_next_sstate != 0) {
     	ACPI_UNLOCK(acpi);
 	return (0);
     }
 
+    /* S5 (soft-off) should be entered directly with no waiting. */
+    if (state == ACPI_STATE_S5) {
+    	ACPI_UNLOCK(acpi);
+	status = acpi_EnterSleepState(sc, state);
+	return (ACPI_SUCCESS(status) ? 0 : ENXIO);
+    }
+
     /* Record the pending state and notify all apm devices. */
     sc->acpi_next_sstate = state;
     STAILQ_FOREACH(clone, &sc->apm_cdevs, entries) {
@@ -2353,11 +2350,8 @@ acpi_ReqSleepState(struct acpi_softc *sc
     /* If devd(8) is not running, immediately enter the sleep state. */
     if (!devctl_process_running()) {
 	ACPI_UNLOCK(acpi);
-	if (ACPI_SUCCESS(acpi_EnterSleepState(sc, sc->acpi_next_sstate))) {
-	    return (0);
-	} else {
-	    return (ENXIO);
-	}
+	status = acpi_EnterSleepState(sc, state);
+	return (ACPI_SUCCESS(status) ? 0 : ENXIO);
     }
 
     /*
@@ -2523,11 +2517,11 @@ acpi_EnterSleepState(struct acpi_softc *
 	return_ACPI_STATUS (AE_OK);
     }
 
-#ifdef SMP
-    thread_lock(curthread);
-    sched_bind(curthread, 0);
-    thread_unlock(curthread);
-#endif
+    if (smp_started) {
+	thread_lock(curthread);
+	sched_bind(curthread, 0);
+	thread_unlock(curthread);
+    }
 
     /*
      * Be sure to hold Giant across DEVICE_SUSPEND/RESUME since non-MPSAFE
@@ -2594,7 +2588,6 @@ acpi_EnterSleepState(struct acpi_softc *
      * process.  This handles both the error and success cases.
      */
 backout:
-    sc->acpi_next_sstate = 0;
     if (slp_state >= ACPI_SS_GPE_SET) {
 	acpi_wake_prep_walk(state);
 	sc->acpi_sstate = ACPI_STATE_S0;
@@ -2605,14 +2598,15 @@ backout:
 	DEVICE_RESUME(root_bus);
     if (slp_state >= ACPI_SS_SLEPT)
 	acpi_enable_fixed_events(sc);
+    sc->acpi_next_sstate = 0;
 
     mtx_unlock(&Giant);
 
-#ifdef SMP
-    thread_lock(curthread);
-    sched_unbind(curthread);
-    thread_unlock(curthread);
-#endif
+    if (smp_started) {
+	thread_lock(curthread);
+	sched_unbind(curthread);
+	thread_unlock(curthread);
+    }
 
     /* Allow another sleep request after a while. */
     timeout(acpi_sleep_enable, sc, hz * ACPI_MINIMUM_AWAKETIME);
@@ -2653,16 +2647,14 @@ acpi_wake_set_enable(device_t dev, int e
 
     flags = acpi_get_flags(dev);
     if (enable) {
-	status = AcpiEnableGpe(prw.gpe_handle, prw.gpe_bit,
-	    ACPI_GPE_TYPE_WAKE_RUN);
+	status = AcpiGpeWakeup(prw.gpe_handle, prw.gpe_bit, ACPI_GPE_ENABLE);
 	if (ACPI_FAILURE(status)) {
 	    device_printf(dev, "enable wake failed\n");
 	    return (ENXIO);
 	}
 	acpi_set_flags(dev, flags | ACPI_FLAG_WAKE_ENABLED);
     } else {
-	status = AcpiDisableGpe(prw.gpe_handle, prw.gpe_bit,
-	    ACPI_GPE_TYPE_WAKE);
+	status = AcpiGpeWakeup(prw.gpe_handle, prw.gpe_bit, ACPI_GPE_DISABLE);
 	if (ACPI_FAILURE(status)) {
 	    device_printf(dev, "disable wake failed\n");
 	    return (ENXIO);
@@ -2692,7 +2684,7 @@ acpi_wake_sleep_prep(ACPI_HANDLE handle,
      * and set _PSW.
      */
     if (sstate > prw.lowest_wake) {
-	AcpiDisableGpe(prw.gpe_handle, prw.gpe_bit, ACPI_GPE_TYPE_WAKE);
+	AcpiGpeWakeup(prw.gpe_handle, prw.gpe_bit, ACPI_GPE_DISABLE);
 	if (bootverbose)
 	    device_printf(dev, "wake_prep disabled wake for %s (S%d)\n",
 		acpi_name(handle), sstate);
@@ -2729,7 +2721,7 @@ acpi_wake_run_prep(ACPI_HANDLE handle, i
      * clear _PSW and turn off any power resources it used.
      */
     if (sstate > prw.lowest_wake) {
-	AcpiEnableGpe(prw.gpe_handle, prw.gpe_bit, ACPI_GPE_TYPE_WAKE_RUN);
+	AcpiGpeWakeup(prw.gpe_handle, prw.gpe_bit, ACPI_GPE_ENABLE);
 	if (bootverbose)
 	    device_printf(dev, "run_prep re-enabled %s\n", acpi_name(handle));
     } else {

Modified: user/imp/tbemd/sys/dev/acpica/acpi_button.c
==============================================================================
--- user/imp/tbemd/sys/dev/acpica/acpi_button.c	Sun Aug 22 21:52:38 2010	(r211656)
+++ user/imp/tbemd/sys/dev/acpica/acpi_button.c	Sun Aug 22 21:53:24 2010	(r211657)
@@ -127,6 +127,7 @@ acpi_button_probe(device_t dev)
 static int
 acpi_button_attach(device_t dev)
 {
+    struct acpi_prw_data	prw;
     struct acpi_button_softc	*sc;
     ACPI_STATUS			status;
     int event;
@@ -165,6 +166,8 @@ acpi_button_attach(device_t dev)
 
     /* Enable the GPE for wake/runtime. */
     acpi_wake_set_enable(dev, 1);
+    if (acpi_parse_prw(sc->button_handle, &prw) == 0)
+	AcpiEnableGpe(prw.gpe_handle, prw.gpe_bit);
     
     return_VALUE (0);
 }

Modified: user/imp/tbemd/sys/dev/acpica/acpi_cpu.c
==============================================================================
--- user/imp/tbemd/sys/dev/acpica/acpi_cpu.c	Sun Aug 22 21:52:38 2010	(r211656)
+++ user/imp/tbemd/sys/dev/acpica/acpi_cpu.c	Sun Aug 22 21:53:24 2010	(r211657)
@@ -445,9 +445,7 @@ acpi_pcpu_get_id(uint32_t idx, uint32_t 
 
     KASSERT(acpi_id != NULL, ("Null acpi_id"));
     KASSERT(cpu_id != NULL, ("Null cpu_id"));
-    for (i = 0; i <= mp_maxid; i++) {
-	if (CPU_ABSENT(i))
-	    continue;
+    CPU_FOREACH(i) {
 	pcpu_data = pcpu_find(i);
 	KASSERT(pcpu_data != NULL, ("no pcpu data for %d", i));
 	if (idx-- == 0) {
@@ -930,12 +928,16 @@ acpi_cpu_idle()
 
     /*
      * Execute HLT (or equivalent) and wait for an interrupt.  We can't
-     * calculate the time spent in C1 since the place we wake up is an
-     * ISR.  Assume we slept half of quantum and return.
+     * precisely calculate the time spent in C1 since the place we wake up
+     * is an ISR.  Assume we slept no more then half of quantum.
      */
     if (cx_next->type == ACPI_STATE_C1) {
-	sc->cpu_prev_sleep = (sc->cpu_prev_sleep * 3 + 500000 / hz) / 4;
+	AcpiHwRead(&start_time, &AcpiGbl_FADT.XPmTimerBlock);
 	acpi_cpu_c1();
+	AcpiHwRead(&end_time, &AcpiGbl_FADT.XPmTimerBlock);
+        end_time = acpi_TimerDelta(end_time, start_time);
+	sc->cpu_prev_sleep = (sc->cpu_prev_sleep * 3 +
+	    min(PM_USEC(end_time), 500000 / hz)) / 4;
 	return;
     }
 
@@ -1009,6 +1011,8 @@ acpi_cpu_notify(ACPI_HANDLE h, UINT32 no
 	if (isc->cpu_cx_count > cpu_cx_count)
 	    cpu_cx_count = isc->cpu_cx_count;
     }
+    if (sc->cpu_cx_lowest < cpu_cx_lowest)
+	acpi_cpu_set_cx_lowest(sc, min(cpu_cx_lowest, sc->cpu_cx_count - 1));
     ACPI_SERIAL_END(cpu);
 }
 
@@ -1204,7 +1208,7 @@ acpi_cpu_global_cx_lowest_sysctl(SYSCTL_
     ACPI_SERIAL_BEGIN(cpu);
     for (i = 0; i < cpu_ndevices; i++) {
 	sc = device_get_softc(cpu_devices[i]);
-	acpi_cpu_set_cx_lowest(sc, val);
+	acpi_cpu_set_cx_lowest(sc, min(val, sc->cpu_cx_count - 1));
     }
     ACPI_SERIAL_END(cpu);
 

Modified: user/imp/tbemd/sys/dev/acpica/acpi_dock.c
==============================================================================
--- user/imp/tbemd/sys/dev/acpica/acpi_dock.c	Sun Aug 22 21:52:38 2010	(r211656)
+++ user/imp/tbemd/sys/dev/acpica/acpi_dock.c	Sun Aug 22 21:53:24 2010	(r211657)
@@ -257,12 +257,10 @@ static void
 acpi_dock_insert(device_t dev)
 {
 	struct acpi_dock_softc *sc;
-	ACPI_HANDLE	h;
 
 	ACPI_SERIAL_ASSERT(dock);
 
 	sc = device_get_softc(dev);
-	h = acpi_get_handle(dev);
 
 	if (sc->status == ACPI_DOCK_STATUS_UNDOCKED ||
 	    sc->status == ACPI_DOCK_STATUS_UNKNOWN) {
@@ -414,7 +412,6 @@ acpi_dock_status_sysctl(SYSCTL_HANDLER_A
 	device_t	dev;
 	int		status, err;
 
-	err = 0;
 	dev = (device_t)arg1;
 
 	sc = device_get_softc(dev);

Modified: user/imp/tbemd/sys/dev/acpica/acpi_ec.c
==============================================================================
--- user/imp/tbemd/sys/dev/acpica/acpi_ec.c	Sun Aug 22 21:52:38 2010	(r211656)
+++ user/imp/tbemd/sys/dev/acpica/acpi_ec.c	Sun Aug 22 21:53:24 2010	(r211657)
@@ -518,8 +518,7 @@ acpi_ec_attach(device_t dev)
     }
 
     /* Enable runtime GPEs for the handler. */
-    Status = AcpiEnableGpe(sc->ec_gpehandle, sc->ec_gpebit,
-	ACPI_GPE_TYPE_RUNTIME);
+    Status = AcpiEnableGpe(sc->ec_gpehandle, sc->ec_gpebit);
     if (ACPI_FAILURE(Status)) {
 	device_printf(dev, "AcpiEnableGpe failed: %s\n",
 		      AcpiFormatException(Status));
@@ -569,7 +568,7 @@ acpi_ec_shutdown(device_t dev)
 
     /* Disable the GPE so we don't get EC events during shutdown. */
     sc = device_get_softc(dev);
-    AcpiDisableGpe(sc->ec_gpehandle, sc->ec_gpebit, ACPI_GPE_TYPE_RUNTIME);
+    AcpiDisableGpe(sc->ec_gpehandle, sc->ec_gpebit);
     return (0);
 }
 
@@ -721,24 +720,19 @@ EcSpaceHandler(UINT32 Function, ACPI_PHY
 	       UINT64 *Value, void *Context, void *RegionContext)
 {
     struct acpi_ec_softc	*sc = (struct acpi_ec_softc *)Context;
-    ACPI_STATUS			Status;
+    ACPI_PHYSICAL_ADDRESS	EcAddr;
     UINT8			*EcData;
-    UINT8			EcAddr;
-    int				bytes, i;
+    ACPI_STATUS			Status;
 
     ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, (UINT32)Address);
 
+    if (Function != ACPI_READ && Function != ACPI_WRITE)
+	return_ACPI_STATUS (AE_BAD_PARAMETER);
     if (Width % 8 != 0 || Value == NULL || Context == NULL)
 	return_ACPI_STATUS (AE_BAD_PARAMETER);
-    bytes = Width / 8;
-    if (Address + bytes - 1 > 0xFF)
+    if (Address + Width / 8 > 256)
 	return_ACPI_STATUS (AE_BAD_ADDRESS);
 
-    if (Function == ACPI_READ)
-	*Value = 0;
-    EcAddr = Address;
-    EcData = (UINT8 *)Value;
-
     /*
      * If booting, check if we need to run the query handler.  If so, we
      * we call it directly here since our thread taskq is not active yet.
@@ -755,8 +749,21 @@ EcSpaceHandler(UINT32 Function, ACPI_PHY
     if (ACPI_FAILURE(Status))
 	return_ACPI_STATUS (Status);
 
+    /* If we can't start burst mode, continue anyway. */
+    Status = EcCommand(sc, EC_COMMAND_BURST_ENABLE);
+    if (ACPI_SUCCESS(Status)) {
+	if (EC_GET_DATA(sc) == EC_BURST_ACK) {
+	    CTR0(KTR_ACPI, "ec burst enabled");
+	    sc->ec_burstactive = TRUE;
+	}
+    }
+
     /* Perform the transaction(s), based on Width. */
-    for (i = 0; i < bytes; i++, EcAddr++, EcData++) {
+    EcAddr = Address;
+    EcData = (UINT8 *)Value;
+    if (Function == ACPI_READ)
+	*Value = 0;
+    do {
 	switch (Function) {
 	case ACPI_READ:
 	    Status = EcRead(sc, EcAddr, EcData);
@@ -764,14 +771,17 @@ EcSpaceHandler(UINT32 Function, ACPI_PHY
 	case ACPI_WRITE:
 	    Status = EcWrite(sc, EcAddr, *EcData);
 	    break;
-	default:

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