svn commit: r232529 - in projects/nfsv4.1-client/sys: amd64/acpica amd64/amd64 amd64/conf amd64/include arm/arm arm/mv arm/xscale/i8134x boot/fdt/dts boot/forth boot/i386/boot0 boot/i386/boot2 boot...

Rick Macklem rmacklem at FreeBSD.org
Mon Mar 5 02:14:48 UTC 2012 

Author: rmacklem
Date: Mon Mar  5 02:14:47 2012
New Revision: 232529
URL: http://svn.freebsd.org/changeset/base/232529

Log:
  Merge in an up to date kernel from head.

Added:
  projects/nfsv4.1-client/sys/conf/WITHOUT_SOURCELESS
     - copied unchanged from r232528, head/sys/conf/WITHOUT_SOURCELESS
  projects/nfsv4.1-client/sys/conf/WITHOUT_SOURCELESS_HOST
     - copied unchanged from r232528, head/sys/conf/WITHOUT_SOURCELESS_HOST
  projects/nfsv4.1-client/sys/conf/WITHOUT_SOURCELESS_UCODE
     - copied unchanged from r232528, head/sys/conf/WITHOUT_SOURCELESS_UCODE
  projects/nfsv4.1-client/sys/contrib/dev/acpica/components/
     - copied from r232528, head/sys/contrib/dev/acpica/components/
  projects/nfsv4.1-client/sys/dev/ath/ath_hal/ar5416/ar5416_radar.c
     - copied unchanged from r232528, head/sys/dev/ath/ath_hal/ar5416/ar5416_radar.c
  projects/nfsv4.1-client/sys/dev/oce/
     - copied from r232528, head/sys/dev/oce/
  projects/nfsv4.1-client/sys/dev/sound/pci/hdspe-pcm.c
     - copied unchanged from r232528, head/sys/dev/sound/pci/hdspe-pcm.c
  projects/nfsv4.1-client/sys/dev/sound/pci/hdspe.c
     - copied unchanged from r232528, head/sys/dev/sound/pci/hdspe.c
  projects/nfsv4.1-client/sys/dev/sound/pci/hdspe.h
     - copied unchanged from r232528, head/sys/dev/sound/pci/hdspe.h
  projects/nfsv4.1-client/sys/mips/mips/freebsd32_machdep.c
     - copied unchanged from r232528, head/sys/mips/mips/freebsd32_machdep.c
  projects/nfsv4.1-client/sys/modules/oce/
     - copied from r232528, head/sys/modules/oce/
  projects/nfsv4.1-client/sys/modules/sound/driver/hdspe/
     - copied from r232528, head/sys/modules/sound/driver/hdspe/
  projects/nfsv4.1-client/sys/powerpc/powermac/atibl.c
     - copied unchanged from r232528, head/sys/powerpc/powermac/atibl.c
  projects/nfsv4.1-client/sys/x86/include/_limits.h
     - copied unchanged from r232528, head/sys/x86/include/_limits.h
  projects/nfsv4.1-client/sys/x86/include/_stdint.h
     - copied unchanged from r232528, head/sys/x86/include/_stdint.h
  projects/nfsv4.1-client/sys/x86/include/_types.h
     - copied unchanged from r232528, head/sys/x86/include/_types.h
  projects/nfsv4.1-client/sys/x86/include/endian.h
     - copied unchanged from r232528, head/sys/x86/include/endian.h
  projects/nfsv4.1-client/sys/x86/include/float.h
     - copied unchanged from r232528, head/sys/x86/include/float.h
  projects/nfsv4.1-client/sys/x86/include/ptrace.h
     - copied unchanged from r232528, head/sys/x86/include/ptrace.h
  projects/nfsv4.1-client/sys/x86/include/setjmp.h
     - copied unchanged from r232528, head/sys/x86/include/setjmp.h
  projects/nfsv4.1-client/sys/x86/include/stdarg.h
     - copied unchanged from r232528, head/sys/x86/include/stdarg.h
  projects/nfsv4.1-client/sys/x86/include/trap.h
     - copied unchanged from r232528, head/sys/x86/include/trap.h
Deleted:
  projects/nfsv4.1-client/sys/amd64/conf/WITHOUT_SOURCELESS
  projects/nfsv4.1-client/sys/amd64/conf/WITHOUT_SOURCELESS_HOST
  projects/nfsv4.1-client/sys/amd64/conf/WITHOUT_SOURCELESS_UCODE
  projects/nfsv4.1-client/sys/contrib/dev/acpica/debugger/
  projects/nfsv4.1-client/sys/contrib/dev/acpica/disassembler/
  projects/nfsv4.1-client/sys/contrib/dev/acpica/dispatcher/
  projects/nfsv4.1-client/sys/contrib/dev/acpica/events/
  projects/nfsv4.1-client/sys/contrib/dev/acpica/executer/
  projects/nfsv4.1-client/sys/contrib/dev/acpica/hardware/
  projects/nfsv4.1-client/sys/contrib/dev/acpica/namespace/
  projects/nfsv4.1-client/sys/contrib/dev/acpica/parser/
  projects/nfsv4.1-client/sys/contrib/dev/acpica/resources/
  projects/nfsv4.1-client/sys/contrib/dev/acpica/tables/
  projects/nfsv4.1-client/sys/contrib/dev/acpica/utilities/
  projects/nfsv4.1-client/sys/i386/conf/WITHOUT_SOURCELESS
  projects/nfsv4.1-client/sys/i386/conf/WITHOUT_SOURCELESS_HOST
  projects/nfsv4.1-client/sys/i386/conf/WITHOUT_SOURCELESS_UCODE
Modified:
  projects/nfsv4.1-client/sys/amd64/acpica/acpi_wakecode.S
  projects/nfsv4.1-client/sys/amd64/acpica/acpi_wakeup.c
  projects/nfsv4.1-client/sys/amd64/amd64/cpu_switch.S
  projects/nfsv4.1-client/sys/amd64/amd64/machdep.c
  projects/nfsv4.1-client/sys/amd64/amd64/mp_machdep.c
  projects/nfsv4.1-client/sys/amd64/amd64/ptrace_machdep.c
  projects/nfsv4.1-client/sys/amd64/amd64/vm_machdep.c
  projects/nfsv4.1-client/sys/amd64/conf/GENERIC
  projects/nfsv4.1-client/sys/amd64/include/_limits.h
  projects/nfsv4.1-client/sys/amd64/include/_stdint.h
  projects/nfsv4.1-client/sys/amd64/include/_types.h
  projects/nfsv4.1-client/sys/amd64/include/cpufunc.h
  projects/nfsv4.1-client/sys/amd64/include/endian.h
  projects/nfsv4.1-client/sys/amd64/include/float.h
  projects/nfsv4.1-client/sys/amd64/include/ptrace.h
  projects/nfsv4.1-client/sys/amd64/include/segments.h
  projects/nfsv4.1-client/sys/amd64/include/setjmp.h
  projects/nfsv4.1-client/sys/amd64/include/stdarg.h
  projects/nfsv4.1-client/sys/amd64/include/trap.h
  projects/nfsv4.1-client/sys/arm/arm/busdma_machdep.c
  projects/nfsv4.1-client/sys/arm/mv/mv_machdep.c
  projects/nfsv4.1-client/sys/arm/mv/mvreg.h
  projects/nfsv4.1-client/sys/arm/xscale/i8134x/crb_machdep.c
  projects/nfsv4.1-client/sys/boot/fdt/dts/db78100.dts
  projects/nfsv4.1-client/sys/boot/forth/menu.4th.8
  projects/nfsv4.1-client/sys/boot/i386/boot0/Makefile
  projects/nfsv4.1-client/sys/boot/i386/boot2/Makefile
  projects/nfsv4.1-client/sys/boot/i386/btx/btx/Makefile
  projects/nfsv4.1-client/sys/boot/i386/btx/btxldr/Makefile
  projects/nfsv4.1-client/sys/boot/i386/gptboot/Makefile
  projects/nfsv4.1-client/sys/boot/i386/gptzfsboot/Makefile
  projects/nfsv4.1-client/sys/boot/i386/libi386/Makefile
  projects/nfsv4.1-client/sys/boot/i386/libi386/vidconsole.c
  projects/nfsv4.1-client/sys/boot/i386/pxeldr/Makefile
  projects/nfsv4.1-client/sys/boot/i386/zfsboot/Makefile
  projects/nfsv4.1-client/sys/boot/pc98/btx/btx/Makefile
  projects/nfsv4.1-client/sys/boot/pc98/btx/btxldr/Makefile
  projects/nfsv4.1-client/sys/boot/pc98/loader/Makefile
  projects/nfsv4.1-client/sys/boot/powerpc/boot1.chrp/Makefile
  projects/nfsv4.1-client/sys/boot/powerpc/boot1.chrp/boot1.c
  projects/nfsv4.1-client/sys/cam/ctl/ctl_private.h
  projects/nfsv4.1-client/sys/cam/scsi/scsi_xpt.c
  projects/nfsv4.1-client/sys/cddl/compat/opensolaris/sys/vnode.h
  projects/nfsv4.1-client/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
  projects/nfsv4.1-client/sys/compat/freebsd32/freebsd32.h
  projects/nfsv4.1-client/sys/compat/freebsd32/freebsd32_misc.c
  projects/nfsv4.1-client/sys/compat/freebsd32/freebsd32_proto.h
  projects/nfsv4.1-client/sys/compat/freebsd32/freebsd32_syscall.h
  projects/nfsv4.1-client/sys/compat/freebsd32/freebsd32_syscalls.c
  projects/nfsv4.1-client/sys/compat/freebsd32/freebsd32_sysent.c
  projects/nfsv4.1-client/sys/compat/freebsd32/freebsd32_systrace_args.c
  projects/nfsv4.1-client/sys/compat/freebsd32/syscalls.master
  projects/nfsv4.1-client/sys/compat/linprocfs/linprocfs.c
  projects/nfsv4.1-client/sys/compat/linsysfs/linsysfs.c
  projects/nfsv4.1-client/sys/compat/linux/linux_misc.c
  projects/nfsv4.1-client/sys/compat/linux/linux_stats.c
  projects/nfsv4.1-client/sys/compat/linux/linux_util.c
  projects/nfsv4.1-client/sys/compat/linux/linux_util.h
  projects/nfsv4.1-client/sys/compat/ndis/subr_hal.c
  projects/nfsv4.1-client/sys/compat/ndis/subr_ndis.c
  projects/nfsv4.1-client/sys/compat/svr4/imgact_svr4.c
  projects/nfsv4.1-client/sys/conf/Makefile.amd64
  projects/nfsv4.1-client/sys/conf/Makefile.i386
  projects/nfsv4.1-client/sys/conf/NOTES
  projects/nfsv4.1-client/sys/conf/files
  projects/nfsv4.1-client/sys/conf/files.mips
  projects/nfsv4.1-client/sys/conf/files.powerpc
  projects/nfsv4.1-client/sys/conf/kern.mk
  projects/nfsv4.1-client/sys/conf/kern.pre.mk
  projects/nfsv4.1-client/sys/conf/kmod.mk
  projects/nfsv4.1-client/sys/conf/newvers.sh
  projects/nfsv4.1-client/sys/conf/options.mips
  projects/nfsv4.1-client/sys/contrib/dev/acpica/acpica_prep.sh
  projects/nfsv4.1-client/sys/contrib/dev/acpica/changes.txt   (contents, props changed)
  projects/nfsv4.1-client/sys/contrib/dev/acpica/compiler/aslrestype2s.c
  projects/nfsv4.1-client/sys/contrib/dev/acpica/compiler/aslstubs.c
  projects/nfsv4.1-client/sys/contrib/dev/acpica/include/acconfig.h
  projects/nfsv4.1-client/sys/contrib/dev/acpica/include/acdebug.h
  projects/nfsv4.1-client/sys/contrib/dev/acpica/include/acevents.h
  projects/nfsv4.1-client/sys/contrib/dev/acpica/include/acexcep.h
  projects/nfsv4.1-client/sys/contrib/dev/acpica/include/acglobal.h
  projects/nfsv4.1-client/sys/contrib/dev/acpica/include/achware.h
  projects/nfsv4.1-client/sys/contrib/dev/acpica/include/acmacros.h
  projects/nfsv4.1-client/sys/contrib/dev/acpica/include/acpiosxf.h
  projects/nfsv4.1-client/sys/contrib/dev/acpica/include/acpixf.h
  projects/nfsv4.1-client/sys/contrib/dev/acpica/include/actables.h
  projects/nfsv4.1-client/sys/contrib/dev/acpica/include/actbl.h
  projects/nfsv4.1-client/sys/contrib/dev/acpica/include/actypes.h
  projects/nfsv4.1-client/sys/contrib/dev/acpica/os_specific/service_layers/osunixxf.c
  projects/nfsv4.1-client/sys/contrib/pf/net/pf.c
  projects/nfsv4.1-client/sys/contrib/pf/net/pf_ioctl.c
  projects/nfsv4.1-client/sys/contrib/pf/net/pf_lb.c
  projects/nfsv4.1-client/sys/contrib/pf/net/pf_norm.c
  projects/nfsv4.1-client/sys/contrib/pf/net/pfvar.h
  projects/nfsv4.1-client/sys/dev/aac/aac.c
  projects/nfsv4.1-client/sys/dev/acpi_support/atk0110.c
  projects/nfsv4.1-client/sys/dev/acpica/Osd/OsdMemory.c
  projects/nfsv4.1-client/sys/dev/acpica/Osd/OsdSchedule.c
  projects/nfsv4.1-client/sys/dev/acpica/Osd/OsdSynch.c
  projects/nfsv4.1-client/sys/dev/acpica/Osd/OsdTable.c
  projects/nfsv4.1-client/sys/dev/acpica/acpi.c
  projects/nfsv4.1-client/sys/dev/acpica/acpi_pci.c
  projects/nfsv4.1-client/sys/dev/acpica/acpi_timer.c
  projects/nfsv4.1-client/sys/dev/acpica/acpivar.h
  projects/nfsv4.1-client/sys/dev/ahci/ahci.c
  projects/nfsv4.1-client/sys/dev/amdtemp/amdtemp.c
  projects/nfsv4.1-client/sys/dev/amr/amr_pci.c
  projects/nfsv4.1-client/sys/dev/arcmsr/arcmsr.c
  projects/nfsv4.1-client/sys/dev/ata/ata-pci.h
  projects/nfsv4.1-client/sys/dev/ata/ata-queue.c
  projects/nfsv4.1-client/sys/dev/ata/chipsets/ata-ahci.c
  projects/nfsv4.1-client/sys/dev/ata/chipsets/ata-marvell.c
  projects/nfsv4.1-client/sys/dev/ath/ath_hal/ah.h
  projects/nfsv4.1-client/sys/dev/ath/ath_hal/ar5416/ar5416.h
  projects/nfsv4.1-client/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
  projects/nfsv4.1-client/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c
  projects/nfsv4.1-client/sys/dev/ath/ath_rate/sample/sample.c
  projects/nfsv4.1-client/sys/dev/ath/ath_rate/sample/sample.h
  projects/nfsv4.1-client/sys/dev/ath/if_ath.c
  projects/nfsv4.1-client/sys/dev/ath/if_ath_sysctl.c
  projects/nfsv4.1-client/sys/dev/ath/if_athvar.h
  projects/nfsv4.1-client/sys/dev/cardbus/cardbus.c
  projects/nfsv4.1-client/sys/dev/cxgb/cxgb_main.c
  projects/nfsv4.1-client/sys/dev/cxgb/cxgb_sge.c
  projects/nfsv4.1-client/sys/dev/cxgbe/common/t4_hw.c
  projects/nfsv4.1-client/sys/dev/dpt/dpt_scsi.c
  projects/nfsv4.1-client/sys/dev/e1000/if_em.c
  projects/nfsv4.1-client/sys/dev/e1000/if_igb.c
  projects/nfsv4.1-client/sys/dev/e1000/if_lem.c
  projects/nfsv4.1-client/sys/dev/fb/vesa.c
  projects/nfsv4.1-client/sys/dev/fb/vesa.h
  projects/nfsv4.1-client/sys/dev/fdt/fdt_common.c
  projects/nfsv4.1-client/sys/dev/fdt/fdt_common.h
  projects/nfsv4.1-client/sys/dev/hwpmc/hwpmc_core.c
  projects/nfsv4.1-client/sys/dev/hwpmc/hwpmc_intel.c
  projects/nfsv4.1-client/sys/dev/hwpmc/hwpmc_uncore.c
  projects/nfsv4.1-client/sys/dev/hwpmc/hwpmc_uncore.h
  projects/nfsv4.1-client/sys/dev/hwpmc/pmc_events.h
  projects/nfsv4.1-client/sys/dev/iicbus/ds1775.c
  projects/nfsv4.1-client/sys/dev/iicbus/iicbb.c
  projects/nfsv4.1-client/sys/dev/iicbus/iicbb_if.m
  projects/nfsv4.1-client/sys/dev/isci/isci.c
  projects/nfsv4.1-client/sys/dev/isci/isci.h
  projects/nfsv4.1-client/sys/dev/isci/isci_controller.c
  projects/nfsv4.1-client/sys/dev/isci/isci_io_request.c
  projects/nfsv4.1-client/sys/dev/isci/isci_remote_device.c
  projects/nfsv4.1-client/sys/dev/isci/scil/sati_abort_task_set.c
  projects/nfsv4.1-client/sys/dev/isci/scil/scic_sds_controller.c
  projects/nfsv4.1-client/sys/dev/isci/scil/scif_sas_controller.c
  projects/nfsv4.1-client/sys/dev/isci/scil/scif_sas_controller_state_handlers.c
  projects/nfsv4.1-client/sys/dev/isci/scil/scif_sas_io_request.c
  projects/nfsv4.1-client/sys/dev/isci/scil/scif_sas_remote_device_ready_substates.c
  projects/nfsv4.1-client/sys/dev/isci/scil/scif_sas_smp_remote_device.c
  projects/nfsv4.1-client/sys/dev/isci/scil/scif_sas_stp_io_request.c
  projects/nfsv4.1-client/sys/dev/isci/scil/scif_sas_stp_task_request.c
  projects/nfsv4.1-client/sys/dev/iscsi/initiator/isc_sm.c
  projects/nfsv4.1-client/sys/dev/isp/isp_freebsd.h
  projects/nfsv4.1-client/sys/dev/ixgbe/ixgbe.c
  projects/nfsv4.1-client/sys/dev/mge/if_mge.c
  projects/nfsv4.1-client/sys/dev/mge/if_mgevar.h
  projects/nfsv4.1-client/sys/dev/mii/brgphy.c
  projects/nfsv4.1-client/sys/dev/mii/miidevs
  projects/nfsv4.1-client/sys/dev/mii/nsphyter.c
  projects/nfsv4.1-client/sys/dev/mii/rgephy.c
  projects/nfsv4.1-client/sys/dev/mii/smcphy.c
  projects/nfsv4.1-client/sys/dev/mlx/mlx.c
  projects/nfsv4.1-client/sys/dev/mps/mps.c
  projects/nfsv4.1-client/sys/dev/mps/mps_pci.c
  projects/nfsv4.1-client/sys/dev/mps/mps_sas.c
  projects/nfsv4.1-client/sys/dev/mps/mps_sas.h
  projects/nfsv4.1-client/sys/dev/mps/mps_sas_lsi.c
  projects/nfsv4.1-client/sys/dev/mps/mps_user.c
  projects/nfsv4.1-client/sys/dev/mps/mpsvar.h
  projects/nfsv4.1-client/sys/dev/mpt/mpilib/mpi_type.h
  projects/nfsv4.1-client/sys/dev/mpt/mpt.c
  projects/nfsv4.1-client/sys/dev/mpt/mpt.h
  projects/nfsv4.1-client/sys/dev/mpt/mpt_cam.c
  projects/nfsv4.1-client/sys/dev/mpt/mpt_pci.c
  projects/nfsv4.1-client/sys/dev/mpt/mpt_reg.h
  projects/nfsv4.1-client/sys/dev/netmap/if_em_netmap.h
  projects/nfsv4.1-client/sys/dev/netmap/if_igb_netmap.h
  projects/nfsv4.1-client/sys/dev/netmap/if_lem_netmap.h
  projects/nfsv4.1-client/sys/dev/netmap/if_re_netmap.h
  projects/nfsv4.1-client/sys/dev/netmap/ixgbe_netmap.h
  projects/nfsv4.1-client/sys/dev/netmap/netmap.c
  projects/nfsv4.1-client/sys/dev/netmap/netmap_kern.h
  projects/nfsv4.1-client/sys/dev/pci/hostb_pci.c
  projects/nfsv4.1-client/sys/dev/pci/pci.c
  projects/nfsv4.1-client/sys/dev/pci/pci_if.m
  projects/nfsv4.1-client/sys/dev/pci/pci_private.h
  projects/nfsv4.1-client/sys/dev/pci/pcivar.h
  projects/nfsv4.1-client/sys/dev/pci/vga_pci.c
  projects/nfsv4.1-client/sys/dev/pcn/if_pcn.c
  projects/nfsv4.1-client/sys/dev/re/if_re.c
  projects/nfsv4.1-client/sys/dev/sdhci/sdhci.c
  projects/nfsv4.1-client/sys/dev/sdhci/sdhci.h
  projects/nfsv4.1-client/sys/dev/sf/if_sf.c
  projects/nfsv4.1-client/sys/dev/sf/if_sfreg.h
  projects/nfsv4.1-client/sys/dev/siba/siba_bwn.c
  projects/nfsv4.1-client/sys/dev/siba/siba_core.c
  projects/nfsv4.1-client/sys/dev/sound/pcm/mixer.c
  projects/nfsv4.1-client/sys/dev/sound/pcm/sound.c
  projects/nfsv4.1-client/sys/dev/sound/usb/uaudio.c
  projects/nfsv4.1-client/sys/dev/tsec/if_tsec.c
  projects/nfsv4.1-client/sys/dev/tsec/if_tsec.h
  projects/nfsv4.1-client/sys/dev/tsec/if_tsec_fdt.c
  projects/nfsv4.1-client/sys/dev/usb/controller/usb_controller.c
  projects/nfsv4.1-client/sys/dev/usb/net/if_mos.c
  projects/nfsv4.1-client/sys/dev/usb/net/if_mosreg.h
  projects/nfsv4.1-client/sys/dev/usb/serial/u3g.c
  projects/nfsv4.1-client/sys/dev/usb/storage/umass.c
  projects/nfsv4.1-client/sys/dev/usb/usb_dev.c
  projects/nfsv4.1-client/sys/dev/usb/usbdevs
  projects/nfsv4.1-client/sys/dev/vge/if_vge.c
  projects/nfsv4.1-client/sys/dev/virtio/pci/virtio_pci.c
  projects/nfsv4.1-client/sys/dev/wi/if_wi.c
  projects/nfsv4.1-client/sys/dev/wtap/if_wtap.c
  projects/nfsv4.1-client/sys/dev/wtap/if_wtap_module.c
  projects/nfsv4.1-client/sys/dev/xen/blkback/blkback.c
  projects/nfsv4.1-client/sys/dev/xen/blkfront/blkfront.c
  projects/nfsv4.1-client/sys/dev/xen/blkfront/block.h
  projects/nfsv4.1-client/sys/fs/cd9660/cd9660_vfsops.c
  projects/nfsv4.1-client/sys/fs/cd9660/cd9660_vnops.c
  projects/nfsv4.1-client/sys/fs/devfs/devfs.h
  projects/nfsv4.1-client/sys/fs/devfs/devfs_devs.c
  projects/nfsv4.1-client/sys/fs/devfs/devfs_rule.c
  projects/nfsv4.1-client/sys/fs/devfs/devfs_vfsops.c
  projects/nfsv4.1-client/sys/fs/devfs/devfs_vnops.c
  projects/nfsv4.1-client/sys/fs/ext2fs/ext2_lookup.c
  projects/nfsv4.1-client/sys/fs/fifofs/fifo.h
  projects/nfsv4.1-client/sys/fs/fifofs/fifo_vnops.c
  projects/nfsv4.1-client/sys/fs/hpfs/hpfs_vfsops.c
  projects/nfsv4.1-client/sys/fs/msdosfs/msdosfs_denode.c
  projects/nfsv4.1-client/sys/fs/msdosfs/msdosfs_lookup.c
  projects/nfsv4.1-client/sys/fs/msdosfs/msdosfs_vfsops.c
  projects/nfsv4.1-client/sys/fs/msdosfs/msdosfs_vnops.c
  projects/nfsv4.1-client/sys/fs/nfs/nfs_commonport.c
  projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clbio.c
  projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clport.c
  projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c
  projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clvfsops.c
  projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clvnops.c
  projects/nfsv4.1-client/sys/fs/nfsserver/nfs_nfsdcache.c
  projects/nfsv4.1-client/sys/fs/nfsserver/nfs_nfsdport.c
  projects/nfsv4.1-client/sys/fs/nfsserver/nfs_nfsdstate.c
  projects/nfsv4.1-client/sys/fs/ntfs/ntfs.h
  projects/nfsv4.1-client/sys/fs/ntfs/ntfs_vfsops.c
  projects/nfsv4.1-client/sys/fs/nullfs/null_subr.c
  projects/nfsv4.1-client/sys/fs/nullfs/null_vfsops.c
  projects/nfsv4.1-client/sys/fs/nullfs/null_vnops.c
  projects/nfsv4.1-client/sys/fs/procfs/procfs.c
  projects/nfsv4.1-client/sys/fs/pseudofs/pseudofs.h
  projects/nfsv4.1-client/sys/fs/pseudofs/pseudofs_vnops.c
  projects/nfsv4.1-client/sys/fs/tmpfs/tmpfs_vnops.c
  projects/nfsv4.1-client/sys/fs/udf/udf_vnops.c
  projects/nfsv4.1-client/sys/geom/part/g_part.c
  projects/nfsv4.1-client/sys/geom/part/g_part_apm.c
  projects/nfsv4.1-client/sys/geom/part/g_part_ebr.c
  projects/nfsv4.1-client/sys/geom/part/g_part_mbr.c
  projects/nfsv4.1-client/sys/i386/conf/GENERIC
  projects/nfsv4.1-client/sys/i386/conf/XBOX
  projects/nfsv4.1-client/sys/i386/i386/trap.c
  projects/nfsv4.1-client/sys/i386/ibcs2/imgact_coff.c
  projects/nfsv4.1-client/sys/i386/include/_limits.h
  projects/nfsv4.1-client/sys/i386/include/_stdint.h
  projects/nfsv4.1-client/sys/i386/include/_types.h
  projects/nfsv4.1-client/sys/i386/include/apicvar.h
  projects/nfsv4.1-client/sys/i386/include/endian.h
  projects/nfsv4.1-client/sys/i386/include/float.h
  projects/nfsv4.1-client/sys/i386/include/ptrace.h
  projects/nfsv4.1-client/sys/i386/include/segments.h
  projects/nfsv4.1-client/sys/i386/include/setjmp.h
  projects/nfsv4.1-client/sys/i386/include/stdarg.h
  projects/nfsv4.1-client/sys/i386/include/trap.h
  projects/nfsv4.1-client/sys/i386/linux/imgact_linux.c
  projects/nfsv4.1-client/sys/i386/linux/linux_sysvec.c
  projects/nfsv4.1-client/sys/ia64/ia64/busdma_machdep.c
  projects/nfsv4.1-client/sys/ia64/ia64/machdep.c
  projects/nfsv4.1-client/sys/ia64/ia64/vm_machdep.c
  projects/nfsv4.1-client/sys/kern/imgact_gzip.c
  projects/nfsv4.1-client/sys/kern/kern_conf.c
  projects/nfsv4.1-client/sys/kern/kern_ctf.c
  projects/nfsv4.1-client/sys/kern/kern_exit.c
  projects/nfsv4.1-client/sys/kern/kern_fork.c
  projects/nfsv4.1-client/sys/kern/kern_gzio.c
  projects/nfsv4.1-client/sys/kern/kern_jail.c
  projects/nfsv4.1-client/sys/kern/kern_ktrace.c
  projects/nfsv4.1-client/sys/kern/kern_linker.c
  projects/nfsv4.1-client/sys/kern/kern_malloc.c
  projects/nfsv4.1-client/sys/kern/kern_proc.c
  projects/nfsv4.1-client/sys/kern/kern_tc.c
  projects/nfsv4.1-client/sys/kern/kern_umtx.c
  projects/nfsv4.1-client/sys/kern/link_elf.c
  projects/nfsv4.1-client/sys/kern/link_elf_obj.c
  projects/nfsv4.1-client/sys/kern/sched_ule.c
  projects/nfsv4.1-client/sys/kern/subr_bus.c
  projects/nfsv4.1-client/sys/kern/subr_msgbuf.c
  projects/nfsv4.1-client/sys/kern/subr_syscall.c
  projects/nfsv4.1-client/sys/kern/subr_uio.c
  projects/nfsv4.1-client/sys/kern/sys_generic.c
  projects/nfsv4.1-client/sys/kern/sys_pipe.c
  projects/nfsv4.1-client/sys/kern/sys_process.c
  projects/nfsv4.1-client/sys/kern/sysv_shm.c
  projects/nfsv4.1-client/sys/kern/tty.c
  projects/nfsv4.1-client/sys/kern/tty_ttydisc.c
  projects/nfsv4.1-client/sys/kern/uipc_domain.c
  projects/nfsv4.1-client/sys/kern/uipc_mbuf.c
  projects/nfsv4.1-client/sys/kern/uipc_socket.c
  projects/nfsv4.1-client/sys/kern/uipc_syscalls.c
  projects/nfsv4.1-client/sys/kern/uipc_usrreq.c
  projects/nfsv4.1-client/sys/kern/vfs_bio.c
  projects/nfsv4.1-client/sys/kern/vfs_cache.c
  projects/nfsv4.1-client/sys/kern/vfs_cluster.c
  projects/nfsv4.1-client/sys/kern/vfs_default.c
  projects/nfsv4.1-client/sys/kern/vfs_extattr.c
  projects/nfsv4.1-client/sys/kern/vfs_mountroot.c
  projects/nfsv4.1-client/sys/kern/vfs_subr.c
  projects/nfsv4.1-client/sys/kern/vfs_syscalls.c
  projects/nfsv4.1-client/sys/kern/vfs_vnops.c
  projects/nfsv4.1-client/sys/kern/vnode_if.src
  projects/nfsv4.1-client/sys/mips/cavium/files.octeon1
  projects/nfsv4.1-client/sys/mips/cavium/if_octm.c
  projects/nfsv4.1-client/sys/mips/cavium/octe/ethernet-common.c
  projects/nfsv4.1-client/sys/mips/cavium/octe/ethernet-common.h
  projects/nfsv4.1-client/sys/mips/cavium/octe/ethernet-rgmii.c
  projects/nfsv4.1-client/sys/mips/cavium/octe/ethernet-sgmii.c
  projects/nfsv4.1-client/sys/mips/cavium/octe/ethernet-spi.c
  projects/nfsv4.1-client/sys/mips/cavium/octe/ethernet-xaui.c
  projects/nfsv4.1-client/sys/mips/cavium/octe/ethernet.c
  projects/nfsv4.1-client/sys/mips/cavium/octeon_machdep.c
  projects/nfsv4.1-client/sys/mips/cavium/octopci_bus_space.c
  projects/nfsv4.1-client/sys/mips/conf/OCTEON1
  projects/nfsv4.1-client/sys/mips/include/elf.h
  projects/nfsv4.1-client/sys/mips/include/md_var.h
  projects/nfsv4.1-client/sys/mips/include/mips_opcode.h
  projects/nfsv4.1-client/sys/mips/include/param.h
  projects/nfsv4.1-client/sys/mips/include/proc.h
  projects/nfsv4.1-client/sys/mips/include/reg.h
  projects/nfsv4.1-client/sys/mips/include/sigframe.h
  projects/nfsv4.1-client/sys/mips/include/ucontext.h
  projects/nfsv4.1-client/sys/mips/include/vmparam.h
  projects/nfsv4.1-client/sys/mips/mips/bus_space_generic.c
  projects/nfsv4.1-client/sys/mips/mips/busdma_machdep.c
  projects/nfsv4.1-client/sys/mips/mips/genassym.c
  projects/nfsv4.1-client/sys/mips/mips/locore.S
  projects/nfsv4.1-client/sys/mips/mips/swtch.S
  projects/nfsv4.1-client/sys/mips/mips/trap.c
  projects/nfsv4.1-client/sys/mips/mips/vm_machdep.c
  projects/nfsv4.1-client/sys/mips/rt305x/rt305x_sysctl.c
  projects/nfsv4.1-client/sys/modules/Makefile
  projects/nfsv4.1-client/sys/modules/acpi/acpi/Makefile
  projects/nfsv4.1-client/sys/modules/ath/Makefile
  projects/nfsv4.1-client/sys/modules/bios/smapi/Makefile
  projects/nfsv4.1-client/sys/modules/dtrace/dtrace/Makefile
  projects/nfsv4.1-client/sys/modules/hpt27xx/Makefile
  projects/nfsv4.1-client/sys/modules/ipdivert/Makefile
  projects/nfsv4.1-client/sys/modules/isci/Makefile
  projects/nfsv4.1-client/sys/modules/linux/Makefile
  projects/nfsv4.1-client/sys/modules/mii/Makefile
  projects/nfsv4.1-client/sys/modules/scc/Makefile
  projects/nfsv4.1-client/sys/modules/sound/driver/Makefile
  projects/nfsv4.1-client/sys/modules/wi/Makefile
  projects/nfsv4.1-client/sys/modules/wlan/Makefile
  projects/nfsv4.1-client/sys/net/bpf.c
  projects/nfsv4.1-client/sys/net/bridgestp.c
  projects/nfsv4.1-client/sys/net/bridgestp.h
  projects/nfsv4.1-client/sys/net/flowtable.c
  projects/nfsv4.1-client/sys/net/ieee8023ad_lacp.c
  projects/nfsv4.1-client/sys/net/if.c
  projects/nfsv4.1-client/sys/net/if.h
  projects/nfsv4.1-client/sys/net/if_bridge.c
  projects/nfsv4.1-client/sys/net/if_ethersubr.c
  projects/nfsv4.1-client/sys/net/if_faith.c
  projects/nfsv4.1-client/sys/net/if_lagg.c
  projects/nfsv4.1-client/sys/net/if_lagg.h
  projects/nfsv4.1-client/sys/net/if_llatbl.h
  projects/nfsv4.1-client/sys/net/if_var.h
  projects/nfsv4.1-client/sys/net/netmap.h
  projects/nfsv4.1-client/sys/net/netmap_user.h
  projects/nfsv4.1-client/sys/net/route.c
  projects/nfsv4.1-client/sys/net/route.h
  projects/nfsv4.1-client/sys/net/rtsock.c
  projects/nfsv4.1-client/sys/net/zlib.h
  projects/nfsv4.1-client/sys/net80211/ieee80211.h
  projects/nfsv4.1-client/sys/net80211/ieee80211_action.c
  projects/nfsv4.1-client/sys/net80211/ieee80211_alq.c
  projects/nfsv4.1-client/sys/net80211/ieee80211_alq.h
  projects/nfsv4.1-client/sys/net80211/ieee80211_hwmp.c
  projects/nfsv4.1-client/sys/net80211/ieee80211_input.c
  projects/nfsv4.1-client/sys/net80211/ieee80211_ioctl.h
  projects/nfsv4.1-client/sys/net80211/ieee80211_mesh.c
  projects/nfsv4.1-client/sys/net80211/ieee80211_mesh.h
  projects/nfsv4.1-client/sys/net80211/ieee80211_node.h
  projects/nfsv4.1-client/sys/net80211/ieee80211_output.c
  projects/nfsv4.1-client/sys/net80211/ieee80211_proto.c
  projects/nfsv4.1-client/sys/net80211/ieee80211_radiotap.h
  projects/nfsv4.1-client/sys/net80211/ieee80211_scan.c
  projects/nfsv4.1-client/sys/net80211/ieee80211_sta.c
  projects/nfsv4.1-client/sys/netatalk/aarp.c
  projects/nfsv4.1-client/sys/netgraph/netgraph.h
  projects/nfsv4.1-client/sys/netgraph/ng_base.c
  projects/nfsv4.1-client/sys/netgraph/ng_cisco.c
  projects/nfsv4.1-client/sys/netgraph/ng_cisco.h
  projects/nfsv4.1-client/sys/netgraph/ng_device.c
  projects/nfsv4.1-client/sys/netgraph/ng_socket.c
  projects/nfsv4.1-client/sys/netinet/icmp6.h
  projects/nfsv4.1-client/sys/netinet/in.c
  projects/nfsv4.1-client/sys/netinet/ip_carp.c
  projects/nfsv4.1-client/sys/netinet/ip_mroute.c
  projects/nfsv4.1-client/sys/netinet/ipfw/ip_fw2.c
  projects/nfsv4.1-client/sys/netinet/ipfw/ip_fw_dynamic.c
  projects/nfsv4.1-client/sys/netinet/ipfw/ip_fw_nat.c
  projects/nfsv4.1-client/sys/netinet/sctp_os_bsd.h
  projects/nfsv4.1-client/sys/netinet/sctp_output.c
  projects/nfsv4.1-client/sys/netinet/sctp_usrreq.c
  projects/nfsv4.1-client/sys/netinet/tcp_input.c
  projects/nfsv4.1-client/sys/netinet/tcp_output.c
  projects/nfsv4.1-client/sys/netinet/tcp_seq.h
  projects/nfsv4.1-client/sys/netinet/tcp_subr.c
  projects/nfsv4.1-client/sys/netinet/tcp_syncache.c
  projects/nfsv4.1-client/sys/netinet/tcp_timewait.c
  projects/nfsv4.1-client/sys/netinet6/icmp6.c
  projects/nfsv4.1-client/sys/netinet6/in6.c
  projects/nfsv4.1-client/sys/netinet6/in6_gif.c
  projects/nfsv4.1-client/sys/netinet6/in6_ifattach.c
  projects/nfsv4.1-client/sys/netinet6/in6_mcast.c
  projects/nfsv4.1-client/sys/netinet6/in6_rmx.c
  projects/nfsv4.1-client/sys/netinet6/in6_src.c
  projects/nfsv4.1-client/sys/netinet6/in6_var.h
  projects/nfsv4.1-client/sys/netinet6/ip6_forward.c
  projects/nfsv4.1-client/sys/netinet6/ip6_input.c
  projects/nfsv4.1-client/sys/netinet6/ip6_output.c
  projects/nfsv4.1-client/sys/netinet6/ip6_var.h
  projects/nfsv4.1-client/sys/netinet6/nd6.c
  projects/nfsv4.1-client/sys/netinet6/nd6_nbr.c
  projects/nfsv4.1-client/sys/netinet6/nd6_rtr.c
  projects/nfsv4.1-client/sys/netinet6/raw_ip6.c
  projects/nfsv4.1-client/sys/netinet6/sctp6_usrreq.c
  projects/nfsv4.1-client/sys/netipsec/ipsec_output.c
  projects/nfsv4.1-client/sys/nfs/bootp_subr.c
  projects/nfsv4.1-client/sys/nfsclient/nfs_bio.c
  projects/nfsv4.1-client/sys/nfsclient/nfs_krpc.c
  projects/nfsv4.1-client/sys/nfsclient/nfs_vfsops.c
  projects/nfsv4.1-client/sys/nfsclient/nfs_vnops.c
  projects/nfsv4.1-client/sys/pc98/conf/GENERIC
  projects/nfsv4.1-client/sys/pc98/include/_limits.h
  projects/nfsv4.1-client/sys/pc98/include/_stdint.h
  projects/nfsv4.1-client/sys/pc98/include/_types.h
  projects/nfsv4.1-client/sys/pc98/include/endian.h
  projects/nfsv4.1-client/sys/pc98/include/float.h
  projects/nfsv4.1-client/sys/pc98/include/ptrace.h
  projects/nfsv4.1-client/sys/pc98/include/setjmp.h
  projects/nfsv4.1-client/sys/pc98/include/stdarg.h
  projects/nfsv4.1-client/sys/pc98/include/trap.h
  projects/nfsv4.1-client/sys/pci/if_rl.c
  projects/nfsv4.1-client/sys/pci/if_rlreg.h
  projects/nfsv4.1-client/sys/powerpc/conf/DEFAULTS
  projects/nfsv4.1-client/sys/powerpc/conf/GENERIC
  projects/nfsv4.1-client/sys/powerpc/conf/GENERIC64
  projects/nfsv4.1-client/sys/powerpc/include/asm.h
  projects/nfsv4.1-client/sys/powerpc/ofw/ofw_pcibus.c
  projects/nfsv4.1-client/sys/powerpc/powermac/smu.c
  projects/nfsv4.1-client/sys/powerpc/powermac/smusat.c
  projects/nfsv4.1-client/sys/powerpc/powerpc/busdma_machdep.c
  projects/nfsv4.1-client/sys/powerpc/powerpc/iommu_if.m
  projects/nfsv4.1-client/sys/powerpc/ps3/ps3bus.c
  projects/nfsv4.1-client/sys/security/mac_biba/mac_biba.c
  projects/nfsv4.1-client/sys/security/mac_lomac/mac_lomac.c
  projects/nfsv4.1-client/sys/security/mac_mls/mac_mls.c
  projects/nfsv4.1-client/sys/sparc64/include/bus_dma.h
  projects/nfsv4.1-client/sys/sparc64/pci/ofw_pcibus.c
  projects/nfsv4.1-client/sys/sparc64/sparc64/bus_machdep.c
  projects/nfsv4.1-client/sys/sys/_umtx.h
  projects/nfsv4.1-client/sys/sys/buf.h
  projects/nfsv4.1-client/sys/sys/bus_dma.h
  projects/nfsv4.1-client/sys/sys/cdefs.h
  projects/nfsv4.1-client/sys/sys/conf.h
  projects/nfsv4.1-client/sys/sys/diskmbr.h
  projects/nfsv4.1-client/sys/sys/elf_common.h
  projects/nfsv4.1-client/sys/sys/jail.h
  projects/nfsv4.1-client/sys/sys/malloc.h
  projects/nfsv4.1-client/sys/sys/msgbuf.h
  projects/nfsv4.1-client/sys/sys/param.h
  projects/nfsv4.1-client/sys/sys/pipe.h
  projects/nfsv4.1-client/sys/sys/pmc.h
  projects/nfsv4.1-client/sys/sys/proc.h
  projects/nfsv4.1-client/sys/sys/ptrace.h
  projects/nfsv4.1-client/sys/sys/rman.h
  projects/nfsv4.1-client/sys/sys/socket.h
  projects/nfsv4.1-client/sys/sys/sysctl.h
  projects/nfsv4.1-client/sys/sys/systm.h
  projects/nfsv4.1-client/sys/sys/umtx.h
  projects/nfsv4.1-client/sys/sys/vnode.h
  projects/nfsv4.1-client/sys/tools/vnode_if.awk
  projects/nfsv4.1-client/sys/ufs/ffs/ffs_extern.h
  projects/nfsv4.1-client/sys/ufs/ffs/ffs_inode.c
  projects/nfsv4.1-client/sys/ufs/ffs/ffs_snapshot.c
  projects/nfsv4.1-client/sys/ufs/ffs/ffs_softdep.c
  projects/nfsv4.1-client/sys/ufs/ffs/ffs_vnops.c
  projects/nfsv4.1-client/sys/ufs/ufs/inode.h
  projects/nfsv4.1-client/sys/ufs/ufs/ufs_lookup.c
  projects/nfsv4.1-client/sys/ufs/ufs/ufs_quota.c
  projects/nfsv4.1-client/sys/ufs/ufs/ufs_vnops.c
  projects/nfsv4.1-client/sys/vm/swap_pager.c
  projects/nfsv4.1-client/sys/vm/vm_kern.c
  projects/nfsv4.1-client/sys/vm/vm_map.c
  projects/nfsv4.1-client/sys/vm/vm_map.h
  projects/nfsv4.1-client/sys/vm/vm_mmap.c
  projects/nfsv4.1-client/sys/vm/vm_object.h
  projects/nfsv4.1-client/sys/vm/vnode_pager.c
  projects/nfsv4.1-client/sys/vm/vnode_pager.h
  projects/nfsv4.1-client/sys/x86/cpufreq/p4tcc.c
  projects/nfsv4.1-client/sys/x86/x86/busdma_machdep.c
  projects/nfsv4.1-client/sys/x86/x86/local_apic.c
  projects/nfsv4.1-client/sys/xen/interface/io/blkif.h
  projects/nfsv4.1-client/sys/xen/xenbus/xenbusvar.h
Directory Properties:
  projects/nfsv4.1-client/sys/   (props changed)
  projects/nfsv4.1-client/sys/boot/   (props changed)
  projects/nfsv4.1-client/sys/boot/powerpc/boot1.chrp/   (props changed)
  projects/nfsv4.1-client/sys/cddl/contrib/opensolaris/   (props changed)
  projects/nfsv4.1-client/sys/conf/   (props changed)
  projects/nfsv4.1-client/sys/contrib/dev/acpica/   (props changed)
  projects/nfsv4.1-client/sys/contrib/dev/acpica/common/   (props changed)
  projects/nfsv4.1-client/sys/contrib/dev/acpica/compiler/   (props changed)
  projects/nfsv4.1-client/sys/contrib/dev/acpica/components/debugger/   (props changed)
  projects/nfsv4.1-client/sys/contrib/dev/acpica/components/disassembler/   (props changed)
  projects/nfsv4.1-client/sys/contrib/dev/acpica/components/dispatcher/   (props changed)
  projects/nfsv4.1-client/sys/contrib/dev/acpica/components/events/   (props changed)
  projects/nfsv4.1-client/sys/contrib/dev/acpica/components/executer/   (props changed)
  projects/nfsv4.1-client/sys/contrib/dev/acpica/components/hardware/   (props changed)
  projects/nfsv4.1-client/sys/contrib/dev/acpica/components/namespace/   (props changed)
  projects/nfsv4.1-client/sys/contrib/dev/acpica/components/parser/   (props changed)
  projects/nfsv4.1-client/sys/contrib/dev/acpica/components/resources/   (props changed)
  projects/nfsv4.1-client/sys/contrib/dev/acpica/components/tables/   (props changed)
  projects/nfsv4.1-client/sys/contrib/dev/acpica/components/utilities/   (props changed)
  projects/nfsv4.1-client/sys/contrib/dev/acpica/include/   (props changed)
  projects/nfsv4.1-client/sys/contrib/dev/acpica/os_specific/   (props changed)
  projects/nfsv4.1-client/sys/contrib/pf/   (props changed)

Modified: projects/nfsv4.1-client/sys/amd64/acpica/acpi_wakecode.S
==============================================================================
--- projects/nfsv4.1-client/sys/amd64/acpica/acpi_wakecode.S	Mon Mar  5 00:49:07 2012	(r232528)
+++ projects/nfsv4.1-client/sys/amd64/acpica/acpi_wakecode.S	Mon Mar  5 02:14:47 2012	(r232529)
@@ -30,7 +30,9 @@
  */
 
 #include <machine/asmacros.h>
+#include <machine/ppireg.h>
 #include <machine/specialreg.h>
+#include <machine/timerreg.h>
 
 #include "assym.s"
 
@@ -71,13 +73,21 @@ wakeup_start:
 	testb	$~0, resume_beep - wakeup_start
 	jz	1f
 	movb	$0, resume_beep - wakeup_start
-	movb	$0xc0, %al
-	outb	%al, $0x42
-	movb	$0x04, %al
-	outb	%al, $0x42
-	inb	$0x61, %al
-	orb	$0x3, %al
-	outb	%al, $0x61
+
+	/* Set PIC timer2 to beep. */
+	movb	$(TIMER_SEL2 | TIMER_SQWAVE | TIMER_16BIT), %al
+	outb	%al, $TIMER_MODE
+
+	/* Turn on speaker. */
+	inb	$IO_PPI, %al
+	orb	$PIT_SPKR, %al
+	outb	%al, $IO_PPI
+
+	/* Set frequency. */
+	movw	$0x4c0, %ax
+	outb	%al, $TIMER_CNTR2
+	shrw	$8, %ax
+	outb	%al, $TIMER_CNTR2
 1:
 
 	/* Re-initialize video BIOS if the reset_video tunable is set. */

Modified: projects/nfsv4.1-client/sys/amd64/acpica/acpi_wakeup.c
==============================================================================
--- projects/nfsv4.1-client/sys/amd64/acpica/acpi_wakeup.c	Mon Mar  5 00:49:07 2012	(r232528)
+++ projects/nfsv4.1-client/sys/amd64/acpica/acpi_wakeup.c	Mon Mar  5 02:14:47 2012	(r232529)
@@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/bus.h>
+#include <sys/eventhandler.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/memrange.h>
@@ -40,6 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
+#include <machine/clock.h>
 #include <machine/intr_machdep.h>
 #include <x86/mca.h>
 #include <machine/pcb.h>
@@ -92,11 +94,12 @@ static void		acpi_wakeup_cpus(struct acp
 	*addr = val;					\
 } while (0)
 
-/* Turn off bits 1&2 of the PIT, stopping the beep. */
 static void
 acpi_stop_beep(void *arg)
 {
-	outb(0x61, inb(0x61) & ~0x3);
+
+	if (acpi_resume_beep != 0)
+		timer_spkr_release();
 }
 
 #ifdef SMP
@@ -220,7 +223,6 @@ acpi_sleep_machdep(struct acpi_softc *sc
 #ifdef SMP
 	cpuset_t	wakeup_cpus;
 #endif
-	register_t	cr3, rf;
 	ACPI_STATUS	status;
 	int		ret;
 
@@ -234,19 +236,14 @@ acpi_sleep_machdep(struct acpi_softc *sc
 	CPU_CLR(PCPU_GET(cpuid), &wakeup_cpus);
 #endif
 
+	if (acpi_resume_beep != 0)
+		timer_spkr_acquire();
+
 	AcpiSetFirmwareWakingVector(WAKECODE_PADDR(sc));
 
-	rf = intr_disable();
+	spinlock_enter();
 	intr_suspend();
 
-	/*
-	 * Temporarily switch to the kernel pmap because it provides
-	 * an identity mapping (setup at boot) for the low physical
-	 * memory region containing the wakeup code.
-	 */
-	cr3 = rcr3();
-	load_cr3(KPML4phys);
-
 	if (savectx(susppcbs[0])) {
 		ctx_fpusave(suspfpusave[0]);
 #ifdef SMP
@@ -285,13 +282,13 @@ acpi_sleep_machdep(struct acpi_softc *sc
 			ia32_pause();
 	} else {
 		pmap_init_pat();
+		load_cr3(susppcbs[0]->pcb_cr3);
 		PCPU_SET(switchtime, 0);
 		PCPU_SET(switchticks, ticks);
 #ifdef SMP
 		if (!CPU_EMPTY(&wakeup_cpus))
 			acpi_wakeup_cpus(sc, &wakeup_cpus);
 #endif
-		acpi_resync_clock(sc);
 		ret = 0;
 	}
 
@@ -301,10 +298,9 @@ out:
 		restart_cpus(wakeup_cpus);
 #endif
 
-	load_cr3(cr3);
 	mca_resume();
 	intr_resume();
-	intr_restore(rf);
+	spinlock_exit();
 
 	AcpiSetFirmwareWakingVector(0);
 
@@ -312,10 +308,6 @@ out:
 	    mem_range_softc.mr_op->reinit != NULL)
 		mem_range_softc.mr_op->reinit(&mem_range_softc);
 
-	/* If we beeped, turn it off after a delay. */
-	if (acpi_resume_beep)
-		timeout(acpi_stop_beep, NULL, 3 * hz);
-
 	return (ret);
 }
 
@@ -332,12 +324,18 @@ acpi_alloc_wakeup_handler(void)
 	 * and ROM area (0xa0000 and above).  The temporary page tables must be
 	 * page-aligned.
 	 */
-	wakeaddr = contigmalloc(4 * PAGE_SIZE, M_DEVBUF, M_NOWAIT, 0x500,
+	wakeaddr = contigmalloc(4 * PAGE_SIZE, M_DEVBUF, M_WAITOK, 0x500,
 	    0xa0000, PAGE_SIZE, 0ul);
 	if (wakeaddr == NULL) {
 		printf("%s: can't alloc wake memory\n", __func__);
 		return (NULL);
 	}
+	if (EVENTHANDLER_REGISTER(power_resume, acpi_stop_beep, NULL,
+	    EVENTHANDLER_PRI_LAST) == NULL) {
+		printf("%s: can't register event handler\n", __func__);
+		contigfree(wakeaddr, 4 * PAGE_SIZE, M_DEVBUF);
+		return (NULL);
+	}
 	susppcbs = malloc(mp_ncpus * sizeof(*susppcbs), M_DEVBUF, M_WAITOK);
 	suspfpusave = malloc(mp_ncpus * sizeof(void *), M_DEVBUF, M_WAITOK);
 	for (i = 0; i < mp_ncpus; i++) {

Modified: projects/nfsv4.1-client/sys/amd64/amd64/cpu_switch.S
==============================================================================
--- projects/nfsv4.1-client/sys/amd64/amd64/cpu_switch.S	Mon Mar  5 00:49:07 2012	(r232528)
+++ projects/nfsv4.1-client/sys/amd64/amd64/cpu_switch.S	Mon Mar  5 02:14:47 2012	(r232529)
@@ -76,7 +76,7 @@ ENTRY(cpu_throw)
 	movq	PCPU(CURPMAP),%rdx
 	LK btrl	%eax,PM_ACTIVE(%rdx)		/* clear old */
 1:
-	movq	TD_PCB(%rsi),%r8		/* newtd->td_proc */
+	movq	TD_PCB(%rsi),%r8		/* newtd->td_pcb */
 	movq	PCB_CR3(%r8),%rdx
 	movq	%rdx,%cr3			/* new address space */
 	jmp	swact

Modified: projects/nfsv4.1-client/sys/amd64/amd64/machdep.c
==============================================================================
--- projects/nfsv4.1-client/sys/amd64/amd64/machdep.c	Mon Mar  5 00:49:07 2012	(r232528)
+++ projects/nfsv4.1-client/sys/amd64/amd64/machdep.c	Mon Mar  5 02:14:47 2012	(r232529)
@@ -1381,7 +1381,7 @@ getmemsize(caddr_t kmdp, u_int64_t first
 {
 	int i, physmap_idx, pa_indx, da_indx;
 	vm_paddr_t pa, physmap[PHYSMAP_SIZE];
-	u_long physmem_tunable, memtest;
+	u_long physmem_start, physmem_tunable, memtest;
 	pt_entry_t *pte;
 	struct bios_smap *smapbase, *smap, *smapend;
 	u_int32_t smapsize;
@@ -1469,8 +1469,19 @@ getmemsize(caddr_t kmdp, u_int64_t first
 
 	/*
 	 * Size up each available chunk of physical memory.
+	 *
+	 * XXX Some BIOSes corrupt low 64KB between suspend and resume.
+	 * By default, mask off the first 16 pages unless we appear to be
+	 * running in a VM.
 	 */
-	physmap[0] = PAGE_SIZE;		/* mask off page 0 */
+	physmem_start = (vm_guest > VM_GUEST_NO ? 1 : 16) << PAGE_SHIFT;
+	TUNABLE_ULONG_FETCH("hw.physmem.start", &physmem_start);
+	if (physmem_start < PAGE_SIZE)
+		physmap[0] = PAGE_SIZE;
+	else if (physmem_start >= physmap[1])
+		physmap[0] = round_page(physmap[1] - PAGE_SIZE);
+	else
+		physmap[0] = round_page(physmem_start);
 	pa_indx = 0;
 	da_indx = 1;
 	phys_avail[pa_indx++] = physmap[0];

Modified: projects/nfsv4.1-client/sys/amd64/amd64/mp_machdep.c
==============================================================================
--- projects/nfsv4.1-client/sys/amd64/amd64/mp_machdep.c	Mon Mar  5 00:49:07 2012	(r232528)
+++ projects/nfsv4.1-client/sys/amd64/amd64/mp_machdep.c	Mon Mar  5 02:14:47 2012	(r232529)
@@ -1414,20 +1414,17 @@ cpustop_handler(void)
 void
 cpususpend_handler(void)
 {
-	register_t cr3, rf;
 	u_int cpu;
 
 	cpu = PCPU_GET(cpuid);
 
-	rf = intr_disable();
-	cr3 = rcr3();
-
 	if (savectx(susppcbs[cpu])) {
 		ctx_fpusave(suspfpusave[cpu]);
 		wbinvd();
 		CPU_SET_ATOMIC(cpu, &stopped_cpus);
 	} else {
 		pmap_init_pat();
+		load_cr3(susppcbs[cpu]->pcb_cr3);
 		PCPU_SET(switchtime, 0);
 		PCPU_SET(switchticks, ticks);
 	}
@@ -1439,11 +1436,9 @@ cpususpend_handler(void)
 	CPU_CLR_ATOMIC(cpu, &started_cpus);
 	CPU_CLR_ATOMIC(cpu, &stopped_cpus);
 
-	/* Restore CR3 and enable interrupts */
-	load_cr3(cr3);
+	/* Resume MCA and local APIC */
 	mca_resume();
 	lapic_setup(0);
-	intr_restore(rf);
 }
 
 /*

Modified: projects/nfsv4.1-client/sys/amd64/amd64/ptrace_machdep.c
==============================================================================
--- projects/nfsv4.1-client/sys/amd64/amd64/ptrace_machdep.c	Mon Mar  5 00:49:07 2012	(r232528)
+++ projects/nfsv4.1-client/sys/amd64/amd64/ptrace_machdep.c	Mon Mar  5 02:14:47 2012	(r232529)
@@ -126,6 +126,12 @@ cpu_ptrace(struct thread *td, int req, v
 		return (cpu32_ptrace(td, req, addr, data));
 #endif
 
+	/* Support old values of PT_GETXSTATE and PT_SETXSTATE. */
+	if (req == PT_FIRSTMACH + 0)
+		req = PT_GETXSTATE;
+	if (req == PT_FIRSTMACH + 1)
+		req = PT_SETXSTATE;
+
 	switch (req) {
 	case PT_GETXSTATE:
 	case PT_SETXSTATE:

Modified: projects/nfsv4.1-client/sys/amd64/amd64/vm_machdep.c
==============================================================================
--- projects/nfsv4.1-client/sys/amd64/amd64/vm_machdep.c	Mon Mar  5 00:49:07 2012	(r232528)
+++ projects/nfsv4.1-client/sys/amd64/amd64/vm_machdep.c	Mon Mar  5 02:14:47 2012	(r232529)
@@ -552,6 +552,7 @@ cpu_set_user_tls(struct thread *td, void
 		return (EINVAL);
 
 	pcb = td->td_pcb;
+	set_pcb_flags(pcb, PCB_FULL_IRET);
 #ifdef COMPAT_FREEBSD32
 	if (SV_PROC_FLAG(td->td_proc, SV_ILP32)) {
 		pcb->pcb_gsbase = (register_t)tls_base;
@@ -559,7 +560,6 @@ cpu_set_user_tls(struct thread *td, void
 	}
 #endif
 	pcb->pcb_fsbase = (register_t)tls_base;
-	set_pcb_flags(pcb, PCB_FULL_IRET);
 	return (0);
 }
 

Modified: projects/nfsv4.1-client/sys/amd64/conf/GENERIC
==============================================================================
--- projects/nfsv4.1-client/sys/amd64/conf/GENERIC	Mon Mar  5 00:49:07 2012	(r232528)
+++ projects/nfsv4.1-client/sys/amd64/conf/GENERIC	Mon Mar  5 02:14:47 2012	(r232529)
@@ -168,6 +168,7 @@ device		psm		# PS/2 mouse
 device		kbdmux		# keyboard multiplexer
 
 device		vga		# VGA video card driver
+options		VESA		# add support for VESA BIOS Extensions
 
 device		splash		# Splash screen and screen saver support
 
@@ -302,39 +303,8 @@ device		ohci		# OHCI PCI->USB interface
 device		ehci		# EHCI PCI->USB interface (USB 2.0)
 device		xhci		# XHCI PCI->USB interface (USB 3.0)
 device		usb		# USB Bus (required)
-#device		udbp		# USB Double Bulk Pipe devices (needs netgraph)
-device		uhid		# "Human Interface Devices"
 device		ukbd		# Keyboard
-device		ulpt		# Printer
 device		umass		# Disks/Mass storage - Requires scbus and da
-device		ums		# Mouse
-device		urio		# Diamond Rio 500 MP3 player
-# USB Serial devices
-device		u3g		# USB-based 3G modems (Option, Huawei, Sierra)
-device		uark		# Technologies ARK3116 based serial adapters
-device		ubsa		# Belkin F5U103 and compatible serial adapters
-device		uftdi		# For FTDI usb serial adapters
-device		uipaq		# Some WinCE based devices
-device		uplcom		# Prolific PL-2303 serial adapters
-device		uslcom		# SI Labs CP2101/CP2102 serial adapters
-device		uvisor		# Visor and Palm devices
-device		uvscom		# USB serial support for DDI pocket's PHS
-# USB Ethernet, requires miibus
-device		aue		# ADMtek USB Ethernet
-device		axe		# ASIX Electronics USB Ethernet
-device		cdce		# Generic USB over Ethernet
-device		cue		# CATC USB Ethernet
-device		kue		# Kawasaki LSI USB Ethernet
-device		rue		# RealTek RTL8150 USB Ethernet
-device		udav		# Davicom DM9601E USB
-# USB Wireless
-device		rum		# Ralink Technology RT2501USB wireless NICs
-device		run		# Ralink Technology RT2700/RT2800/RT3000 NICs.
-device		uath		# Atheros AR5523 wireless NICs
-device		upgt		# Conexant/Intersil PrismGT wireless NICs.
-device		ural		# Ralink Technology RT2500USB wireless NICs
-device		urtw		# Realtek RTL8187B/L wireless NICs
-device		zyd		# ZyDAS zd1211/zd1211b wireless NICs
 
 # FireWire support
 device		firewire	# FireWire bus code
@@ -350,7 +320,6 @@ device		sound		# Generic sound driver (r
 device		snd_es137x	# Ensoniq AudioPCI ES137x
 device		snd_hda		# Intel High Definition Audio
 device		snd_ich		# Intel, NVidia and other ICH AC'97 Audio
-device		snd_uaudio	# USB Audio
 device		snd_via8233	# VIA VT8233x Audio
 
 # MMC/SD

Modified: projects/nfsv4.1-client/sys/amd64/include/_limits.h
==============================================================================
--- projects/nfsv4.1-client/sys/amd64/include/_limits.h	Mon Mar  5 00:49:07 2012	(r232528)
+++ projects/nfsv4.1-client/sys/amd64/include/_limits.h	Mon Mar  5 02:14:47 2012	(r232529)
@@ -1,87 +1,6 @@
 /*-
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  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.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
- *
- *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $FreeBSD$
+ * This file is in the public domain.
  */
+/* $FreeBSD$ */
 
-#ifndef	_MACHINE__LIMITS_H_
-#define	_MACHINE__LIMITS_H_
-
-/*
- * According to ANSI (section 2.2.4.2), the values below must be usable by
- * #if preprocessing directives.  Additionally, the expression must have the
- * same type as would an expression that is an object of the corresponding
- * type converted according to the integral promotions.  The subtraction for
- * INT_MIN, etc., is so the value is not unsigned; e.g., 0x80000000 is an
- * unsigned int for 32-bit two's complement ANSI compilers (section 3.1.3.2).
- */
-
-#define	__CHAR_BIT	8		/* number of bits in a char */
-
-#define	__SCHAR_MAX	0x7f		/* max value for a signed char */
-#define	__SCHAR_MIN	(-0x7f - 1)	/* min value for a signed char */
-
-#define	__UCHAR_MAX	0xff		/* max value for an unsigned char */
-
-#define	__USHRT_MAX	0xffff		/* max value for an unsigned short */
-#define	__SHRT_MAX	0x7fff		/* max value for a short */
-#define	__SHRT_MIN	(-0x7fff - 1)	/* min value for a short */
-
-#define	__UINT_MAX	0xffffffff	/* max value for an unsigned int */
-#define	__INT_MAX	0x7fffffff	/* max value for an int */
-#define	__INT_MIN	(-0x7fffffff - 1)	/* min value for an int */
-
-#define	__ULONG_MAX	0xffffffffffffffff	/* max for an unsigned long */
-#define	__LONG_MAX	0x7fffffffffffffff	/* max for a long */
-#define	__LONG_MIN	(-0x7fffffffffffffff - 1) /* min for a long */
-
-			/* max value for an unsigned long long */
-#define	__ULLONG_MAX	0xffffffffffffffffULL
-#define	__LLONG_MAX	0x7fffffffffffffffLL	/* max value for a long long */
-#define	__LLONG_MIN	(-0x7fffffffffffffffLL - 1)  /* min for a long long */
-
-#define	__SSIZE_MAX	__LONG_MAX	/* max value for a ssize_t */
-
-#define	__SIZE_T_MAX	__ULONG_MAX	/* max value for a size_t */
-
-#define	__OFF_MAX	__LONG_MAX	/* max value for an off_t */
-#define	__OFF_MIN	__LONG_MIN	/* min value for an off_t */
-
-/* Quads and longs are the same on the amd64.  Ensure they stay in sync. */
-#define	__UQUAD_MAX	__ULONG_MAX	/* max value for a uquad_t */
-#define	__QUAD_MAX	__LONG_MAX	/* max value for a quad_t */
-#define	__QUAD_MIN	__LONG_MIN	/* min value for a quad_t */
-
-#define	__LONG_BIT	64
-#define	__WORD_BIT	32
-
-/* Minimum signal stack size. */
-#define	__MINSIGSTKSZ	(512 * 4)
-
-#endif /* !_MACHINE__LIMITS_H_ */
+#include <x86/_limits.h>

Modified: projects/nfsv4.1-client/sys/amd64/include/_stdint.h
==============================================================================
--- projects/nfsv4.1-client/sys/amd64/include/_stdint.h	Mon Mar  5 00:49:07 2012	(r232528)
+++ projects/nfsv4.1-client/sys/amd64/include/_stdint.h	Mon Mar  5 02:14:47 2012	(r232529)
@@ -1,171 +1,6 @@
 /*-
- * Copyright (c) 2001, 2002 Mike Barcroft <mike at FreeBSD.org>
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Klaus Klein.
- *
- * 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.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- *
- * $FreeBSD$
+ * This file is in the public domain.
  */
+/* $FreeBSD$ */
 
-#ifndef _MACHINE__STDINT_H_
-#define	_MACHINE__STDINT_H_
-
-#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS)
-
-#define	INT8_C(c)		(c)
-#define	INT16_C(c)		(c)
-#define	INT32_C(c)		(c)
-#define	INT64_C(c)		(c ## L)
-
-#define	UINT8_C(c)		(c)
-#define	UINT16_C(c)		(c)
-#define	UINT32_C(c)		(c ## U)
-#define	UINT64_C(c)		(c ## UL)
-
-#define	INTMAX_C(c)		INT64_C(c)
-#define	UINTMAX_C(c)		UINT64_C(c)
-
-#endif /* !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) */
-
-#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS)
-
-/*
- * ISO/IEC 9899:1999
- * 7.18.2.1 Limits of exact-width integer types
- */
-/* Minimum values of exact-width signed integer types. */
-#define	INT8_MIN	(-0x7f-1)
-#define	INT16_MIN	(-0x7fff-1)
-#define	INT32_MIN	(-0x7fffffff-1)
-#define	INT64_MIN	(-0x7fffffffffffffffL-1)
-
-/* Maximum values of exact-width signed integer types. */
-#define	INT8_MAX	0x7f
-#define	INT16_MAX	0x7fff
-#define	INT32_MAX	0x7fffffff
-#define	INT64_MAX	0x7fffffffffffffffL
-
-/* Maximum values of exact-width unsigned integer types. */
-#define	UINT8_MAX	0xff
-#define	UINT16_MAX	0xffff
-#define	UINT32_MAX	0xffffffffU
-#define	UINT64_MAX	0xffffffffffffffffUL
-
-/*
- * ISO/IEC 9899:1999
- * 7.18.2.2  Limits of minimum-width integer types
- */
-/* Minimum values of minimum-width signed integer types. */
-#define	INT_LEAST8_MIN	INT8_MIN
-#define	INT_LEAST16_MIN	INT16_MIN
-#define	INT_LEAST32_MIN	INT32_MIN
-#define	INT_LEAST64_MIN	INT64_MIN
-
-/* Maximum values of minimum-width signed integer types. */
-#define	INT_LEAST8_MAX	INT8_MAX
-#define	INT_LEAST16_MAX	INT16_MAX
-#define	INT_LEAST32_MAX	INT32_MAX
-#define	INT_LEAST64_MAX	INT64_MAX
-
-/* Maximum values of minimum-width unsigned integer types. */
-#define	UINT_LEAST8_MAX	 UINT8_MAX
-#define	UINT_LEAST16_MAX UINT16_MAX
-#define	UINT_LEAST32_MAX UINT32_MAX
-#define	UINT_LEAST64_MAX UINT64_MAX
-
-/*
- * ISO/IEC 9899:1999
- * 7.18.2.3  Limits of fastest minimum-width integer types
- */
-/* Minimum values of fastest minimum-width signed integer types. */
-#define	INT_FAST8_MIN	INT32_MIN
-#define	INT_FAST16_MIN	INT32_MIN
-#define	INT_FAST32_MIN	INT32_MIN
-#define	INT_FAST64_MIN	INT64_MIN
-
-/* Maximum values of fastest minimum-width signed integer types. */
-#define	INT_FAST8_MAX	INT32_MAX
-#define	INT_FAST16_MAX	INT32_MAX
-#define	INT_FAST32_MAX	INT32_MAX
-#define	INT_FAST64_MAX	INT64_MAX
-
-/* Maximum values of fastest minimum-width unsigned integer types. */
-#define	UINT_FAST8_MAX	UINT32_MAX
-#define	UINT_FAST16_MAX	UINT32_MAX
-#define	UINT_FAST32_MAX	UINT32_MAX
-#define	UINT_FAST64_MAX	UINT64_MAX
-
-/*
- * ISO/IEC 9899:1999
- * 7.18.2.4  Limits of integer types capable of holding object pointers
- */
-#define	INTPTR_MIN	INT64_MIN
-#define	INTPTR_MAX	INT64_MAX
-#define	UINTPTR_MAX	UINT64_MAX
-
-/*
- * ISO/IEC 9899:1999
- * 7.18.2.5  Limits of greatest-width integer types
- */
-#define	INTMAX_MIN	INT64_MIN
-#define	INTMAX_MAX	INT64_MAX
-#define	UINTMAX_MAX	UINT64_MAX
-
-/*
- * ISO/IEC 9899:1999
- * 7.18.3  Limits of other integer types
- */
-/* Limits of ptrdiff_t. */
-#define	PTRDIFF_MIN	INT64_MIN	
-#define	PTRDIFF_MAX	INT64_MAX
-
-/* Limits of sig_atomic_t. */
-#define	SIG_ATOMIC_MIN	LONG_MIN
-#define	SIG_ATOMIC_MAX	LONG_MAX
-
-/* Limit of size_t. */
-#define	SIZE_MAX	UINT64_MAX
-
-#ifndef WCHAR_MIN /* Also possibly defined in <wchar.h> */
-/* Limits of wchar_t. */
-#define	WCHAR_MIN	INT32_MIN
-#define	WCHAR_MAX	INT32_MAX
-#endif
-
-/* Limits of wint_t. */
-#define	WINT_MIN	INT32_MIN
-#define	WINT_MAX	INT32_MAX
-
-#endif /* !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) */
-
-#endif /* !_MACHINE__STDINT_H_ */
+#include <x86/_stdint.h>

Modified: projects/nfsv4.1-client/sys/amd64/include/_types.h
==============================================================================
--- projects/nfsv4.1-client/sys/amd64/include/_types.h	Mon Mar  5 00:49:07 2012	(r232528)
+++ projects/nfsv4.1-client/sys/amd64/include/_types.h	Mon Mar  5 02:14:47 2012	(r232529)
@@ -1,116 +1,6 @@
 /*-
- * Copyright (c) 2002 Mike Barcroft <mike at FreeBSD.org>
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  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.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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: @(#)ansi.h	8.2 (Berkeley) 1/4/94
- *	From: @(#)types.h	8.3 (Berkeley) 1/5/94
- * $FreeBSD$
+ * This file is in the public domain.
  */
+/* $FreeBSD$ */
 
-#ifndef _MACHINE__TYPES_H_
-#define	_MACHINE__TYPES_H_
-
-#ifndef _SYS_CDEFS_H_
-#error this file needs sys/cdefs.h as a prerequisite
-#endif
-
-#define __NO_STRICT_ALIGNMENT
-
-/*
- * Basic types upon which most other types are built.
- */
-typedef	signed char		__int8_t;
-typedef	unsigned char		__uint8_t;
-typedef	short			__int16_t;
-typedef	unsigned short		__uint16_t;
-typedef	int			__int32_t;
-typedef	unsigned int		__uint32_t;
-typedef	long			__int64_t;
-typedef	unsigned long		__uint64_t;
-
-/*
- * Standard type definitions.
- */
-typedef	__int32_t	__clock_t;		/* clock()... */
-typedef	__int64_t	__critical_t;
-typedef	double		__double_t;
-typedef	float		__float_t;
-typedef	__int64_t	__intfptr_t;
-typedef	__int64_t	__intmax_t;
-typedef	__int64_t	__intptr_t;
-typedef	__int32_t	__int_fast8_t;
-typedef	__int32_t	__int_fast16_t;
-typedef	__int32_t	__int_fast32_t;
-typedef	__int64_t	__int_fast64_t;
-typedef	__int8_t	__int_least8_t;
-typedef	__int16_t	__int_least16_t;
-typedef	__int32_t	__int_least32_t;
-typedef	__int64_t	__int_least64_t;
-typedef	__int64_t	__ptrdiff_t;		/* ptr1 - ptr2 */
-typedef	__int64_t	__register_t;
-typedef	__int64_t	__segsz_t;		/* segment size (in pages) */
-typedef	__uint64_t	__size_t;		/* sizeof() */
-typedef	__int64_t	__ssize_t;		/* byte count or error */
-typedef	__int64_t	__time_t;		/* time()... */
-typedef	__uint64_t	__uintfptr_t;
-typedef	__uint64_t	__uintmax_t;
-typedef	__uint64_t	__uintptr_t;
-typedef	__uint32_t	__uint_fast8_t;
-typedef	__uint32_t	__uint_fast16_t;
-typedef	__uint32_t	__uint_fast32_t;
-typedef	__uint64_t	__uint_fast64_t;
-typedef	__uint8_t	__uint_least8_t;
-typedef	__uint16_t	__uint_least16_t;
-typedef	__uint32_t	__uint_least32_t;
-typedef	__uint64_t	__uint_least64_t;
-typedef	__uint64_t	__u_register_t;
-typedef	__uint64_t	__vm_offset_t;
-typedef	__int64_t	__vm_ooffset_t;
-typedef	__uint64_t	__vm_paddr_t;
-typedef	__uint64_t	__vm_pindex_t;
-typedef	__uint64_t	__vm_size_t;
-
-/*
- * Unusual type definitions.
- */
-#ifdef __GNUCLIKE_BUILTIN_VARARGS
-typedef	__builtin_va_list	__va_list;	/* internally known to gcc */
-#elif defined(lint)
-typedef	char *			__va_list;	/* pretend */
-#endif
-#if defined(__GNUC_VA_LIST_COMPATIBILITY) && !defined(__GNUC_VA_LIST) \
-    && !defined(__NO_GNUC_VA_LIST)
-#define __GNUC_VA_LIST
-typedef __va_list		__gnuc_va_list;	/* compatibility w/GNU headers*/
-#endif
-
-#endif /* !_MACHINE__TYPES_H_ */
+#include <x86/_types.h>

Modified: projects/nfsv4.1-client/sys/amd64/include/cpufunc.h
==============================================================================
--- projects/nfsv4.1-client/sys/amd64/include/cpufunc.h	Mon Mar  5 00:49:07 2012	(r232528)
+++ projects/nfsv4.1-client/sys/amd64/include/cpufunc.h	Mon Mar  5 02:14:47 2012	(r232529)
@@ -727,7 +727,7 @@ uint64_t rdr5(void);
 uint64_t rdr6(void);
 uint64_t rdr7(void);
 uint64_t rdtsc(void);
-u_int	read_rflags(void);
+u_long	read_rflags(void);
 u_int	rfs(void);
 u_int	rgs(void);
 void	wbinvd(void);

Modified: projects/nfsv4.1-client/sys/amd64/include/endian.h
==============================================================================
--- projects/nfsv4.1-client/sys/amd64/include/endian.h	Mon Mar  5 00:49:07 2012	(r232528)
+++ projects/nfsv4.1-client/sys/amd64/include/endian.h	Mon Mar  5 02:14:47 2012	(r232529)
@@ -1,145 +1,6 @@
 /*-
- * Copyright (c) 1987, 1991 Regents of the University of California.
- * 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.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
- *
- *	@(#)endian.h	7.8 (Berkeley) 4/3/91
- * $FreeBSD$
+ * This file is in the public domain.
  */
+/* $FreeBSD$ */
 
-#ifndef _MACHINE_ENDIAN_H_
-#define	_MACHINE_ENDIAN_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Define the order of 32-bit words in 64-bit words.
- */
-#define	_QUAD_HIGHWORD 1
-#define	_QUAD_LOWWORD 0
-
-/*
- * Definitions for byte order, according to byte significance from low
- * address to high.
- */
-#define	_LITTLE_ENDIAN	1234	/* LSB first: i386, vax */
-#define	_BIG_ENDIAN	4321	/* MSB first: 68000, ibm, net */
-#define	_PDP_ENDIAN	3412	/* LSB first in word, MSW first in long */
-
-#define	_BYTE_ORDER	_LITTLE_ENDIAN
-
-/*
- * Deprecated variants that don't have enough underscores to be useful in more
- * strict namespaces.
- */
-#if __BSD_VISIBLE
-#define	LITTLE_ENDIAN	_LITTLE_ENDIAN
-#define	BIG_ENDIAN	_BIG_ENDIAN
-#define	PDP_ENDIAN	_PDP_ENDIAN
-#define	BYTE_ORDER	_BYTE_ORDER
-#endif
-
-#if defined(__GNUCLIKE_ASM) && defined(__GNUCLIKE_BUILTIN_CONSTANT_P)
-
-#define	__bswap64_const(_x)			\
-	(((_x) >> 56) |				\
-	(((_x) >> 40) & (0xffUL << 8)) |	\
-	(((_x) >> 24) & (0xffUL << 16)) |	\
-	(((_x) >> 8) & (0xffUL << 24)) |	\
-	(((_x) << 8) & (0xffUL << 32)) |	\
-	(((_x) << 24) & (0xffUL << 40)) |	\
-	(((_x) << 40) & (0xffUL << 48)) |	\
-	((_x) << 56))
-
-#define	__bswap32_const(_x)			\
-	(((_x) >> 24) |				\
-	(((_x) & (0xff << 16)) >> 8) |		\
-	(((_x) & (0xff << 8)) << 8) |		\
-	((_x) << 24))
-
-#define __bswap16_const(_x)	(__uint16_t)((_x) << 8 | (_x) >> 8)
-
-static __inline __uint64_t
-__bswap64_var(__uint64_t _x)
-{
-
-	__asm ("bswap %0" : "+r" (_x));
-	return (_x);
-}
-
-static __inline __uint32_t
-__bswap32_var(__uint32_t _x)
-{
-
-	__asm ("bswap %0" : "+r" (_x));
-	return (_x);
-}
-
-static __inline __uint16_t
-__bswap16_var(__uint16_t _x)
-{
-
-	return (__bswap16_const(_x));
-}
-
-#define	__bswap64(_x)					\
-	(__builtin_constant_p(_x) ?			\
-	    __bswap64_const((__uint64_t)(_x)) : __bswap64_var(_x))
-
-#define	__bswap32(_x)					\
-	(__builtin_constant_p(_x) ?			\
-	    __bswap32_const((__uint32_t)(_x)) : __bswap32_var(_x))
-
-#define	__bswap16(_x)					\
-	(__builtin_constant_p(_x) ?			\
-	    __bswap16_const((__uint16_t)(_x)) : __bswap16_var(_x))
-
-#define	__htonl(x)	__bswap32(x)
-#define	__htons(x)	__bswap16(x)
-#define	__ntohl(x)	__bswap32(x)
-#define	__ntohs(x)	__bswap16(x)
-
-#else /* !(__GNUCLIKE_ASM && __GNUCLIKE_BUILTIN_CONSTANT_P) */
-
-/*
- * No optimizations are available for this compiler.  Fall back to
- * non-optimized functions by defining the constant usually used to prevent
- * redefinition.
- */
-#define	_BYTEORDER_FUNC_DEFINED
-
-#endif /* __GNUCLIKE_ASM && __GNUCLIKE_BUILTIN_CONSTANT_P */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_MACHINE_ENDIAN_H_ */
+#include <x86/endian.h>

Modified: projects/nfsv4.1-client/sys/amd64/include/float.h
==============================================================================
--- projects/nfsv4.1-client/sys/amd64/include/float.h	Mon Mar  5 00:49:07 2012	(r232528)
+++ projects/nfsv4.1-client/sys/amd64/include/float.h	Mon Mar  5 02:14:47 2012	(r232529)
@@ -1,94 +1,6 @@
 /*-
- * Copyright (c) 1989 Regents of the University of California.
- * 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.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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: @(#)float.h	7.1 (Berkeley) 5/8/90
- * $FreeBSD$
+ * This file is in the public domain.
  */
+/* $FreeBSD$ */
 
-#ifndef _MACHINE_FLOAT_H_
-#define _MACHINE_FLOAT_H_ 1
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-extern int __flt_rounds(void);
-__END_DECLS
-
-#define FLT_RADIX	2		/* b */
-#define FLT_ROUNDS	__flt_rounds()
-#if __ISO_C_VISIBLE >= 1999
-#define	FLT_EVAL_METHOD	0		/* no promotions */
-#define	DECIMAL_DIG	21		/* max precision in decimal digits */
-#endif
-
-#define FLT_MANT_DIG	24		/* p */
-#define FLT_EPSILON	1.19209290E-07F	/* b**(1-p) */
-#define FLT_DIG		6		/* floor((p-1)*log10(b))+(b == 10) */
-#define FLT_MIN_EXP	(-125)		/* emin */
-#define FLT_MIN		1.17549435E-38F	/* b**(emin-1) */
-#define FLT_MIN_10_EXP	(-37)		/* ceil(log10(b**(emin-1))) */
-#define FLT_MAX_EXP	128		/* emax */
-#define FLT_MAX		3.40282347E+38F	/* (1-b**(-p))*b**emax */
-#define FLT_MAX_10_EXP	38		/* floor(log10((1-b**(-p))*b**emax)) */
-#if __ISO_C_VISIBLE >= 2011
-#define	FLT_TRUE_MIN	1.40129846E-45F	/* b**(emin-p) */
-#define	FLT_DECIMAL_DIG	9		/* ceil(1+p*log10(b)) */
-#define	FLT_HAS_SUBNORM	1
-#endif /* __ISO_C_VISIBLE >= 2011 */
-
-#define DBL_MANT_DIG	53
-#define DBL_EPSILON	2.2204460492503131E-16
-#define DBL_DIG		15
-#define DBL_MIN_EXP	(-1021)
-#define DBL_MIN		2.2250738585072014E-308
-#define DBL_MIN_10_EXP	(-307)
-#define DBL_MAX_EXP	1024
-#define DBL_MAX		1.7976931348623157E+308
-#define DBL_MAX_10_EXP	308
-#if __ISO_C_VISIBLE >= 2011
-#define	DBL_TRUE_MIN	4.9406564584124654E-324
-#define	DBL_DECIMAL_DIG	17
-#define	DBL_HAS_SUBNORM	1
-#endif /* __ISO_C_VISIBLE >= 2011 */
-
-#define LDBL_MANT_DIG	64
-#define LDBL_EPSILON	1.0842021724855044340E-19L
-#define LDBL_DIG	18
-#define LDBL_MIN_EXP	(-16381)
-#define LDBL_MIN	3.3621031431120935063E-4932L
-#define LDBL_MIN_10_EXP	(-4931)
-#define LDBL_MAX_EXP	16384
-#define LDBL_MAX	1.1897314953572317650E+4932L
-#define LDBL_MAX_10_EXP	4932
-#if __ISO_C_VISIBLE >= 2011
-#define	LDBL_TRUE_MIN	3.6451995318824746025E-4951L
-#define	LDBL_DECIMAL_DIG 21
-#define	LDBL_HAS_SUBNORM 1
-#endif /* __ISO_C_VISIBLE >= 2011 */
-
-#endif /* _MACHINE_FLOAT_H_ */
+#include <x86/float.h>

Modified: projects/nfsv4.1-client/sys/amd64/include/ptrace.h
==============================================================================
--- projects/nfsv4.1-client/sys/amd64/include/ptrace.h	Mon Mar  5 00:49:07 2012	(r232528)
+++ projects/nfsv4.1-client/sys/amd64/include/ptrace.h	Mon Mar  5 02:14:47 2012	(r232529)
@@ -1,41 +1,6 @@
 /*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  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

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

More information about the svn-src-projects mailing list