svn commit: r268070 - in projects/nfsv4.1-server/sys: amd64/acpica amd64/amd64 amd64/conf amd64/include amd64/linux32 amd64/pci amd64/vmm amd64/vmm/intel arm/arm arm/at91 arm/conf arm/freescale/imx...

Rick Macklem rmacklem at FreeBSD.org
Tue Jul 1 00:59:54 UTC 2014 

Author: rmacklem
Date: Tue Jul  1 00:59:45 2014
New Revision: 268070
URL: http://svnweb.freebsd.org/changeset/base/268070

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

Added:
  projects/nfsv4.1-server/sys/arm/freescale/vybrid/vf_adc.c
     - copied unchanged from r268069, head/sys/arm/freescale/vybrid/vf_adc.c
  projects/nfsv4.1-server/sys/arm/freescale/vybrid/vf_adc.h
     - copied unchanged from r268069, head/sys/arm/freescale/vybrid/vf_adc.h
  projects/nfsv4.1-server/sys/dev/cxgbe/firmware/t4fw-1.11.27.0.bin.uu
     - copied unchanged from r268069, head/sys/dev/cxgbe/firmware/t4fw-1.11.27.0.bin.uu
  projects/nfsv4.1-server/sys/dev/cxgbe/firmware/t5fw-1.11.27.0.bin.uu
     - copied unchanged from r268069, head/sys/dev/cxgbe/firmware/t5fw-1.11.27.0.bin.uu
  projects/nfsv4.1-server/sys/dev/vt/hw/vga/vt_vga.c
     - copied unchanged from r268069, head/sys/dev/vt/hw/vga/vt_vga.c
  projects/nfsv4.1-server/sys/dev/vt/hw/vga/vt_vga_reg.h
     - copied unchanged from r268069, head/sys/dev/vt/hw/vga/vt_vga_reg.h
  projects/nfsv4.1-server/sys/dev/xen/pvcpu/
     - copied from r268069, head/sys/dev/xen/pvcpu/
  projects/nfsv4.1-server/sys/x86/xen/xen_apic.c
     - copied unchanged from r268069, head/sys/x86/xen/xen_apic.c
  projects/nfsv4.1-server/sys/x86/xen/xen_nexus.c
     - copied unchanged from r268069, head/sys/x86/xen/xen_nexus.c
  projects/nfsv4.1-server/sys/x86/xen/xenpv.c
     - copied unchanged from r268069, head/sys/x86/xen/xenpv.c
  projects/nfsv4.1-server/sys/xen/xen_pv.h
     - copied unchanged from r268069, head/sys/xen/xen_pv.h
Deleted:
  projects/nfsv4.1-server/sys/amd64/conf/VT
  projects/nfsv4.1-server/sys/arm/conf/AC100
  projects/nfsv4.1-server/sys/arm/tegra/
  projects/nfsv4.1-server/sys/cddl/dev/dtrace/dtrace_clone.c
  projects/nfsv4.1-server/sys/dev/cxgbe/firmware/t4fw-1.9.12.0.bin.uu
  projects/nfsv4.1-server/sys/dev/cxgbe/firmware/t5fw-1.9.12.0.bin.uu
  projects/nfsv4.1-server/sys/dev/vt/hw/vga/vga.c
  projects/nfsv4.1-server/sys/dev/vt/hw/vga/vga_reg.h
  projects/nfsv4.1-server/sys/i386/conf/VT
Modified:
  projects/nfsv4.1-server/sys/amd64/acpica/acpi_machdep.c
  projects/nfsv4.1-server/sys/amd64/amd64/amd64_mem.c
  projects/nfsv4.1-server/sys/amd64/amd64/fpu.c
  projects/nfsv4.1-server/sys/amd64/amd64/machdep.c
  projects/nfsv4.1-server/sys/amd64/amd64/mp_machdep.c
  projects/nfsv4.1-server/sys/amd64/amd64/mp_watchdog.c
  projects/nfsv4.1-server/sys/amd64/amd64/pmap.c
  projects/nfsv4.1-server/sys/amd64/amd64/sys_machdep.c
  projects/nfsv4.1-server/sys/amd64/amd64/trap.c
  projects/nfsv4.1-server/sys/amd64/conf/GENERIC
  projects/nfsv4.1-server/sys/amd64/conf/NOTES
  projects/nfsv4.1-server/sys/amd64/include/cpu.h
  projects/nfsv4.1-server/sys/amd64/include/fpu.h
  projects/nfsv4.1-server/sys/amd64/linux32/linux32_sysvec.c
  projects/nfsv4.1-server/sys/amd64/pci/pci_cfgreg.c
  projects/nfsv4.1-server/sys/amd64/vmm/intel/vmx.c
  projects/nfsv4.1-server/sys/amd64/vmm/vmm.c
  projects/nfsv4.1-server/sys/amd64/vmm/vmm_instruction_emul.c
  projects/nfsv4.1-server/sys/amd64/vmm/vmm_stat.c
  projects/nfsv4.1-server/sys/amd64/vmm/vmm_stat.h
  projects/nfsv4.1-server/sys/arm/arm/busdma_machdep-v6.c
  projects/nfsv4.1-server/sys/arm/arm/busdma_machdep.c
  projects/nfsv4.1-server/sys/arm/arm/cpufunc.c
  projects/nfsv4.1-server/sys/arm/arm/dump_machdep.c
  projects/nfsv4.1-server/sys/arm/arm/platform.c
  projects/nfsv4.1-server/sys/arm/arm/pmap-v6.c
  projects/nfsv4.1-server/sys/arm/at91/if_ate.c
  projects/nfsv4.1-server/sys/arm/freescale/imx/imx6_anatop.c
  projects/nfsv4.1-server/sys/arm/freescale/vybrid/files.vybrid
  projects/nfsv4.1-server/sys/arm/include/cpu.h
  projects/nfsv4.1-server/sys/arm/xscale/ixp425/if_npe.c
  projects/nfsv4.1-server/sys/arm/xscale/ixp425/ixp425_npe.c
  projects/nfsv4.1-server/sys/arm/xscale/ixp425/ixp425_qmgr.c
  projects/nfsv4.1-server/sys/cam/ata/ata_da.c
  projects/nfsv4.1-server/sys/cam/ata/ata_pmp.c
  projects/nfsv4.1-server/sys/cam/cam.c
  projects/nfsv4.1-server/sys/cam/cam_periph.c
  projects/nfsv4.1-server/sys/cam/cam_xpt.c
  projects/nfsv4.1-server/sys/cam/ctl/ctl.c
  projects/nfsv4.1-server/sys/cam/ctl/ctl.h
  projects/nfsv4.1-server/sys/cam/ctl/ctl_backend.c
  projects/nfsv4.1-server/sys/cam/ctl/ctl_backend.h
  projects/nfsv4.1-server/sys/cam/ctl/ctl_backend_block.c
  projects/nfsv4.1-server/sys/cam/ctl/ctl_backend_ramdisk.c
  projects/nfsv4.1-server/sys/cam/ctl/ctl_cmd_table.c
  projects/nfsv4.1-server/sys/cam/ctl/ctl_frontend_iscsi.c
  projects/nfsv4.1-server/sys/cam/ctl/ctl_frontend_iscsi.h
  projects/nfsv4.1-server/sys/cam/ctl/ctl_io.h
  projects/nfsv4.1-server/sys/cam/ctl/ctl_private.h
  projects/nfsv4.1-server/sys/cam/scsi/scsi_all.c
  projects/nfsv4.1-server/sys/cam/scsi/scsi_all.h
  projects/nfsv4.1-server/sys/cam/scsi/scsi_cd.c
  projects/nfsv4.1-server/sys/cam/scsi/scsi_da.c
  projects/nfsv4.1-server/sys/cam/scsi/scsi_da.h
  projects/nfsv4.1-server/sys/cam/scsi/scsi_enc_safte.c
  projects/nfsv4.1-server/sys/cam/scsi/scsi_sa.c
  projects/nfsv4.1-server/sys/cam/scsi/scsi_xpt.c
  projects/nfsv4.1-server/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c
  projects/nfsv4.1-server/sys/cddl/contrib/opensolaris/common/unicode/u8_textprep.c
  projects/nfsv4.1-server/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
  projects/nfsv4.1-server/sys/cddl/contrib/opensolaris/uts/common/dtrace/sdt_subr.c
  projects/nfsv4.1-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  projects/nfsv4.1-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/ddt.c
  projects/nfsv4.1-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
  projects/nfsv4.1-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c
  projects/nfsv4.1-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c
  projects/nfsv4.1-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
  projects/nfsv4.1-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c
  projects/nfsv4.1-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
  projects/nfsv4.1-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
  projects/nfsv4.1-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c
  projects/nfsv4.1-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
  projects/nfsv4.1-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c
  projects/nfsv4.1-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
  projects/nfsv4.1-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c
  projects/nfsv4.1-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c
  projects/nfsv4.1-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  projects/nfsv4.1-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
  projects/nfsv4.1-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
  projects/nfsv4.1-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
  projects/nfsv4.1-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
  projects/nfsv4.1-server/sys/cddl/contrib/opensolaris/uts/common/sys/ctf_api.h
  projects/nfsv4.1-server/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
  projects/nfsv4.1-server/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h
  projects/nfsv4.1-server/sys/cddl/dev/dtrace/amd64/dtrace_isa.c
  projects/nfsv4.1-server/sys/cddl/dev/dtrace/dtrace_cddl.h
  projects/nfsv4.1-server/sys/cddl/dev/dtrace/dtrace_ioctl.c
  projects/nfsv4.1-server/sys/cddl/dev/dtrace/dtrace_load.c
  projects/nfsv4.1-server/sys/cddl/dev/dtrace/dtrace_sysctl.c
  projects/nfsv4.1-server/sys/cddl/dev/dtrace/dtrace_unload.c
  projects/nfsv4.1-server/sys/cddl/dev/dtrace/i386/dtrace_asm.S
  projects/nfsv4.1-server/sys/cddl/dev/dtrace/i386/dtrace_isa.c
  projects/nfsv4.1-server/sys/cddl/dev/sdt/sdt.c
  projects/nfsv4.1-server/sys/compat/ia32/ia32_sysvec.c
  projects/nfsv4.1-server/sys/compat/x86bios/x86bios.c
  projects/nfsv4.1-server/sys/conf/NOTES
  projects/nfsv4.1-server/sys/conf/files
  projects/nfsv4.1-server/sys/conf/files.amd64
  projects/nfsv4.1-server/sys/conf/files.i386
  projects/nfsv4.1-server/sys/conf/options
  projects/nfsv4.1-server/sys/conf/options.mips
  projects/nfsv4.1-server/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c   (contents, props changed)
  projects/nfsv4.1-server/sys/crypto/aesni/aesni.c
  projects/nfsv4.1-server/sys/crypto/aesni/aesni.h
  projects/nfsv4.1-server/sys/crypto/aesni/aesni_wrap.c
  projects/nfsv4.1-server/sys/crypto/via/padlock.c
  projects/nfsv4.1-server/sys/crypto/via/padlock_cipher.c
  projects/nfsv4.1-server/sys/crypto/via/padlock_hash.c
  projects/nfsv4.1-server/sys/dev/aac/aac_pci.c
  projects/nfsv4.1-server/sys/dev/acpica/Osd/OsdSchedule.c
  projects/nfsv4.1-server/sys/dev/acpica/acpi.c
  projects/nfsv4.1-server/sys/dev/acpica/acpi_cpu.c
  projects/nfsv4.1-server/sys/dev/acpica/acpi_ec.c
  projects/nfsv4.1-server/sys/dev/acpica/acpi_powerres.c
  projects/nfsv4.1-server/sys/dev/adb/adb_buttons.c
  projects/nfsv4.1-server/sys/dev/adb/adb_kbd.c
  projects/nfsv4.1-server/sys/dev/agp/agp.c
  projects/nfsv4.1-server/sys/dev/agp/agp_i810.c
  projects/nfsv4.1-server/sys/dev/ahci/ahci.c
  projects/nfsv4.1-server/sys/dev/amr/amr_pci.c
  projects/nfsv4.1-server/sys/dev/ata/ata-all.c
  projects/nfsv4.1-server/sys/dev/ata/ata-dma.c
  projects/nfsv4.1-server/sys/dev/ath/ah_osdep.c
  projects/nfsv4.1-server/sys/dev/ath/if_ath.c
  projects/nfsv4.1-server/sys/dev/ath/if_ath_debug.c
  projects/nfsv4.1-server/sys/dev/bce/if_bce.c
  projects/nfsv4.1-server/sys/dev/bge/if_bge.c
  projects/nfsv4.1-server/sys/dev/bwn/if_bwn.c
  projects/nfsv4.1-server/sys/dev/bxe/bxe.c
  projects/nfsv4.1-server/sys/dev/cadence/if_cgem.c
  projects/nfsv4.1-server/sys/dev/cardbus/cardbus.c
  projects/nfsv4.1-server/sys/dev/ciss/ciss.c
  projects/nfsv4.1-server/sys/dev/ciss/cissreg.h
  projects/nfsv4.1-server/sys/dev/cpuctl/cpuctl.c
  projects/nfsv4.1-server/sys/dev/cs/if_cs.c
  projects/nfsv4.1-server/sys/dev/cxgb/cxgb_include.h
  projects/nfsv4.1-server/sys/dev/cxgb/cxgb_main.c
  projects/nfsv4.1-server/sys/dev/cxgb/cxgb_sge.c
  projects/nfsv4.1-server/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c
  projects/nfsv4.1-server/sys/dev/cxgbe/adapter.h
  projects/nfsv4.1-server/sys/dev/cxgbe/firmware/t4fw_cfg_uwire.txt
  projects/nfsv4.1-server/sys/dev/cxgbe/firmware/t4fw_interface.h
  projects/nfsv4.1-server/sys/dev/cxgbe/firmware/t5fw_cfg_uwire.txt
  projects/nfsv4.1-server/sys/dev/cxgbe/iw_cxgbe/cm.c
  projects/nfsv4.1-server/sys/dev/cxgbe/t4_netmap.c
  projects/nfsv4.1-server/sys/dev/cxgbe/t4_sge.c
  projects/nfsv4.1-server/sys/dev/cxgbe/tom/t4_ddp.c
  projects/nfsv4.1-server/sys/dev/de/if_de.c
  projects/nfsv4.1-server/sys/dev/drm/ati_pcigart.c
  projects/nfsv4.1-server/sys/dev/drm/drm_drv.c
  projects/nfsv4.1-server/sys/dev/drm/drm_pci.c
  projects/nfsv4.1-server/sys/dev/drm/drm_sysctl.c
  projects/nfsv4.1-server/sys/dev/drm/via_dmablit.c
  projects/nfsv4.1-server/sys/dev/drm2/drm_drv.c
  projects/nfsv4.1-server/sys/dev/drm2/drm_pci.c
  projects/nfsv4.1-server/sys/dev/drm2/drm_sysctl.c
  projects/nfsv4.1-server/sys/dev/drm2/i915/i915_gem.c
  projects/nfsv4.1-server/sys/dev/drm2/i915/i915_gem_gtt.c
  projects/nfsv4.1-server/sys/dev/drm2/ttm/ttm_page_alloc.c
  projects/nfsv4.1-server/sys/dev/e1000/e1000_82542.c
  projects/nfsv4.1-server/sys/dev/e1000/e1000_82571.c
  projects/nfsv4.1-server/sys/dev/e1000/e1000_82575.c
  projects/nfsv4.1-server/sys/dev/e1000/e1000_82575.h
  projects/nfsv4.1-server/sys/dev/e1000/e1000_api.c
  projects/nfsv4.1-server/sys/dev/e1000/e1000_api.h
  projects/nfsv4.1-server/sys/dev/e1000/e1000_defines.h
  projects/nfsv4.1-server/sys/dev/e1000/e1000_hw.h
  projects/nfsv4.1-server/sys/dev/e1000/e1000_i210.c
  projects/nfsv4.1-server/sys/dev/e1000/e1000_i210.h
  projects/nfsv4.1-server/sys/dev/e1000/e1000_ich8lan.c
  projects/nfsv4.1-server/sys/dev/e1000/e1000_ich8lan.h
  projects/nfsv4.1-server/sys/dev/e1000/e1000_mac.c
  projects/nfsv4.1-server/sys/dev/e1000/e1000_mac.h
  projects/nfsv4.1-server/sys/dev/e1000/e1000_manage.c
  projects/nfsv4.1-server/sys/dev/e1000/e1000_mbx.c
  projects/nfsv4.1-server/sys/dev/e1000/e1000_mbx.h
  projects/nfsv4.1-server/sys/dev/e1000/e1000_nvm.c
  projects/nfsv4.1-server/sys/dev/e1000/e1000_osdep.h
  projects/nfsv4.1-server/sys/dev/e1000/e1000_phy.c
  projects/nfsv4.1-server/sys/dev/e1000/e1000_phy.h
  projects/nfsv4.1-server/sys/dev/e1000/e1000_regs.h
  projects/nfsv4.1-server/sys/dev/e1000/e1000_vf.c
  projects/nfsv4.1-server/sys/dev/e1000/e1000_vf.h
  projects/nfsv4.1-server/sys/dev/e1000/if_em.c
  projects/nfsv4.1-server/sys/dev/e1000/if_igb.c
  projects/nfsv4.1-server/sys/dev/et/if_et.c
  projects/nfsv4.1-server/sys/dev/fb/vesa.c
  projects/nfsv4.1-server/sys/dev/firewire/fwohci.c
  projects/nfsv4.1-server/sys/dev/firewire/if_fwe.c
  projects/nfsv4.1-server/sys/dev/firewire/if_fwip.c
  projects/nfsv4.1-server/sys/dev/firewire/sbp.c
  projects/nfsv4.1-server/sys/dev/glxiic/glxiic.c
  projects/nfsv4.1-server/sys/dev/hptmv/hptproc.c
  projects/nfsv4.1-server/sys/dev/hwpmc/hwpmc_logging.c
  projects/nfsv4.1-server/sys/dev/hwpmc/hwpmc_mod.c
  projects/nfsv4.1-server/sys/dev/isci/isci.h
  projects/nfsv4.1-server/sys/dev/isci/isci_controller.c
  projects/nfsv4.1-server/sys/dev/isci/isci_sysctl.c
  projects/nfsv4.1-server/sys/dev/isci/isci_task_request.c
  projects/nfsv4.1-server/sys/dev/isci/scil/scic_sds_stp_request.c
  projects/nfsv4.1-server/sys/dev/iscsi/icl.c
  projects/nfsv4.1-server/sys/dev/iscsi/iscsi.c
  projects/nfsv4.1-server/sys/dev/iscsi/iscsi_ioctl.h
  projects/nfsv4.1-server/sys/dev/iscsi_initiator/iscsi.c
  projects/nfsv4.1-server/sys/dev/isp/isp_pci.c
  projects/nfsv4.1-server/sys/dev/iwn/if_iwn.c
  projects/nfsv4.1-server/sys/dev/iwn/if_iwn_chip_cfg.h
  projects/nfsv4.1-server/sys/dev/ixgbe/ixgbe.c
  projects/nfsv4.1-server/sys/dev/malo/if_malo.c
  projects/nfsv4.1-server/sys/dev/malo/if_malo_pci.c
  projects/nfsv4.1-server/sys/dev/mfi/mfi.c
  projects/nfsv4.1-server/sys/dev/mfi/mfi_cam.c
  projects/nfsv4.1-server/sys/dev/mfi/mfi_pci.c
  projects/nfsv4.1-server/sys/dev/mfi/mfi_tbolt.c
  projects/nfsv4.1-server/sys/dev/mlx/mlx.c
  projects/nfsv4.1-server/sys/dev/mpt/mpt_cam.c
  projects/nfsv4.1-server/sys/dev/mrsas/mrsas_fp.c
  projects/nfsv4.1-server/sys/dev/mvs/mvs.c
  projects/nfsv4.1-server/sys/dev/mwl/if_mwl.c
  projects/nfsv4.1-server/sys/dev/nand/nand.c
  projects/nfsv4.1-server/sys/dev/netfpga10g/nf10bmac/if_nf10bmac.c
  projects/nfsv4.1-server/sys/dev/netfpga10g/nf10bmac/if_nf10bmac_fdt.c
  projects/nfsv4.1-server/sys/dev/nfe/if_nfe.c
  projects/nfsv4.1-server/sys/dev/nxge/xge-osdep.h
  projects/nfsv4.1-server/sys/dev/oce/oce_hw.c
  projects/nfsv4.1-server/sys/dev/oce/oce_hw.h
  projects/nfsv4.1-server/sys/dev/oce/oce_if.c
  projects/nfsv4.1-server/sys/dev/oce/oce_if.h
  projects/nfsv4.1-server/sys/dev/oce/oce_mbox.c
  projects/nfsv4.1-server/sys/dev/oce/oce_util.c
  projects/nfsv4.1-server/sys/dev/pccard/pccard.c
  projects/nfsv4.1-server/sys/dev/pccbb/pccbb.c
  projects/nfsv4.1-server/sys/dev/pccbb/pccbb_isa.c
  projects/nfsv4.1-server/sys/dev/pci/pci.c
  projects/nfsv4.1-server/sys/dev/pci/pci_pci.c
  projects/nfsv4.1-server/sys/dev/pci/vga_pci.c
  projects/nfsv4.1-server/sys/dev/puc/puc_pci.c
  projects/nfsv4.1-server/sys/dev/random/ivy.c
  projects/nfsv4.1-server/sys/dev/rt/if_rt.c
  projects/nfsv4.1-server/sys/dev/sdhci/sdhci.c
  projects/nfsv4.1-server/sys/dev/sdhci/sdhci_pci.c
  projects/nfsv4.1-server/sys/dev/si/si.c
  projects/nfsv4.1-server/sys/dev/sio/sio.c
  projects/nfsv4.1-server/sys/dev/sis/if_sis.c
  projects/nfsv4.1-server/sys/dev/sound/pci/atiixp.c
  projects/nfsv4.1-server/sys/dev/sound/pci/emu10k1.c
  projects/nfsv4.1-server/sys/dev/sound/pci/emu10kx.c
  projects/nfsv4.1-server/sys/dev/sound/pci/envy24.c
  projects/nfsv4.1-server/sys/dev/sound/pci/envy24ht.c
  projects/nfsv4.1-server/sys/dev/sound/pci/hda/hdac.c
  projects/nfsv4.1-server/sys/dev/sound/pci/hdspe.c
  projects/nfsv4.1-server/sys/dev/sound/pci/maestro.c
  projects/nfsv4.1-server/sys/dev/sound/pci/via8233.c
  projects/nfsv4.1-server/sys/dev/sound/pci/via82c686.c
  projects/nfsv4.1-server/sys/dev/sound/pcm/buffer.c
  projects/nfsv4.1-server/sys/dev/sound/pcm/channel.c
  projects/nfsv4.1-server/sys/dev/sound/pcm/feeder_chain.c
  projects/nfsv4.1-server/sys/dev/sound/pcm/feeder_eq.c
  projects/nfsv4.1-server/sys/dev/sound/pcm/feeder_rate.c
  projects/nfsv4.1-server/sys/dev/sound/pcm/mixer.c
  projects/nfsv4.1-server/sys/dev/sound/pcm/sound.c
  projects/nfsv4.1-server/sys/dev/sound/usb/uaudio.c
  projects/nfsv4.1-server/sys/dev/syscons/syscons.c
  projects/nfsv4.1-server/sys/dev/syscons/sysmouse.c
  projects/nfsv4.1-server/sys/dev/ti/if_ti.c
  projects/nfsv4.1-server/sys/dev/txp/if_txp.c
  projects/nfsv4.1-server/sys/dev/uart/uart_bus_pci.c
  projects/nfsv4.1-server/sys/dev/uart/uart_dev_ns8250.c
  projects/nfsv4.1-server/sys/dev/ubsec/ubsec.c
  projects/nfsv4.1-server/sys/dev/usb/controller/dwc_otg.c
  projects/nfsv4.1-server/sys/dev/usb/controller/ehci.c
  projects/nfsv4.1-server/sys/dev/usb/controller/ohci.c
  projects/nfsv4.1-server/sys/dev/usb/controller/uhci.c
  projects/nfsv4.1-server/sys/dev/usb/controller/usb_controller.c
  projects/nfsv4.1-server/sys/dev/usb/controller/xhci.c
  projects/nfsv4.1-server/sys/dev/usb/input/ukbd.c
  projects/nfsv4.1-server/sys/dev/usb/net/if_axge.c
  projects/nfsv4.1-server/sys/dev/usb/serial/uftdi.c
  projects/nfsv4.1-server/sys/dev/usb/serial/usb_serial.c
  projects/nfsv4.1-server/sys/dev/usb/storage/umass.c
  projects/nfsv4.1-server/sys/dev/usb/usb_debug.c
  projects/nfsv4.1-server/sys/dev/usb/usb_dev.c
  projects/nfsv4.1-server/sys/dev/usb/usb_device.c
  projects/nfsv4.1-server/sys/dev/usb/usb_generic.c
  projects/nfsv4.1-server/sys/dev/usb/usb_hub.c
  projects/nfsv4.1-server/sys/dev/usb/usb_process.c
  projects/nfsv4.1-server/sys/dev/usb/wlan/if_uath.c
  projects/nfsv4.1-server/sys/dev/usb/wlan/if_upgt.c
  projects/nfsv4.1-server/sys/dev/usb/wlan/if_urtw.c
  projects/nfsv4.1-server/sys/dev/virtio/balloon/virtio_balloon.c
  projects/nfsv4.1-server/sys/dev/virtio/network/if_vtnet.c
  projects/nfsv4.1-server/sys/dev/virtio/network/if_vtnetvar.h
  projects/nfsv4.1-server/sys/dev/virtio/pci/virtio_pci.c
  projects/nfsv4.1-server/sys/dev/virtio/pci/virtio_pci.h
  projects/nfsv4.1-server/sys/dev/virtio/virtio.h
  projects/nfsv4.1-server/sys/dev/virtio/virtio_config.h
  projects/nfsv4.1-server/sys/dev/virtio/virtqueue.c
  projects/nfsv4.1-server/sys/dev/virtio/virtqueue.h
  projects/nfsv4.1-server/sys/dev/vmware/vmxnet3/if_vmx.c
  projects/nfsv4.1-server/sys/dev/vmware/vmxnet3/if_vmxvar.h
  projects/nfsv4.1-server/sys/dev/vt/vt.h
  projects/nfsv4.1-server/sys/dev/vt/vt_buf.c
  projects/nfsv4.1-server/sys/dev/vt/vt_consolectl.c
  projects/nfsv4.1-server/sys/dev/vt/vt_core.c
  projects/nfsv4.1-server/sys/dev/vt/vt_sysmouse.c
  projects/nfsv4.1-server/sys/dev/vxge/vxge-osdep.h
  projects/nfsv4.1-server/sys/dev/wpi/if_wpi.c
  projects/nfsv4.1-server/sys/dev/xen/balloon/balloon.c
  projects/nfsv4.1-server/sys/dev/xen/console/console.c
  projects/nfsv4.1-server/sys/dev/xen/control/control.c
  projects/nfsv4.1-server/sys/dev/xen/timer/timer.c
  projects/nfsv4.1-server/sys/dev/xen/xenpci/xenpci.c
  projects/nfsv4.1-server/sys/dev/xen/xenpci/xenpcivar.h
  projects/nfsv4.1-server/sys/fs/cuse/cuse.c
  projects/nfsv4.1-server/sys/fs/devfs/devfs_vnops.c
  projects/nfsv4.1-server/sys/fs/msdosfs/msdosfs_vnops.c
  projects/nfsv4.1-server/sys/fs/nfsclient/nfs_clstate.c
  projects/nfsv4.1-server/sys/fs/tmpfs/tmpfs.h
  projects/nfsv4.1-server/sys/fs/tmpfs/tmpfs_subr.c
  projects/nfsv4.1-server/sys/fs/tmpfs/tmpfs_vnops.c
  projects/nfsv4.1-server/sys/gdb/gdb_cons.c
  projects/nfsv4.1-server/sys/geom/concat/g_concat.c
  projects/nfsv4.1-server/sys/geom/eli/g_eli.c
  projects/nfsv4.1-server/sys/geom/eli/g_eli_key_cache.c
  projects/nfsv4.1-server/sys/geom/gate/g_gate.c
  projects/nfsv4.1-server/sys/geom/geom_disk.c
  projects/nfsv4.1-server/sys/geom/geom_kern.c
  projects/nfsv4.1-server/sys/geom/journal/g_journal.c
  projects/nfsv4.1-server/sys/geom/label/g_label.c
  projects/nfsv4.1-server/sys/geom/label/g_label.h
  projects/nfsv4.1-server/sys/geom/linux_lvm/g_linux_lvm.c
  projects/nfsv4.1-server/sys/geom/mirror/g_mirror.c
  projects/nfsv4.1-server/sys/geom/part/g_part.c
  projects/nfsv4.1-server/sys/geom/part/g_part_ldm.c
  projects/nfsv4.1-server/sys/geom/raid/g_raid.c
  projects/nfsv4.1-server/sys/geom/raid/g_raid.h
  projects/nfsv4.1-server/sys/geom/raid/tr_raid1.c
  projects/nfsv4.1-server/sys/geom/raid/tr_raid1e.c
  projects/nfsv4.1-server/sys/geom/raid3/g_raid3.c
  projects/nfsv4.1-server/sys/geom/shsec/g_shsec.c
  projects/nfsv4.1-server/sys/geom/stripe/g_stripe.c
  projects/nfsv4.1-server/sys/geom/vinum/geom_vinum.c
  projects/nfsv4.1-server/sys/geom/virstor/g_virstor.c
  projects/nfsv4.1-server/sys/i386/acpica/acpi_machdep.c
  projects/nfsv4.1-server/sys/i386/bios/apm.c
  projects/nfsv4.1-server/sys/i386/conf/GENERIC
  projects/nfsv4.1-server/sys/i386/conf/NOTES
  projects/nfsv4.1-server/sys/i386/i386/i686_mem.c
  projects/nfsv4.1-server/sys/i386/i386/machdep.c
  projects/nfsv4.1-server/sys/i386/i386/mp_machdep.c
  projects/nfsv4.1-server/sys/i386/i386/mp_watchdog.c
  projects/nfsv4.1-server/sys/i386/i386/pmap.c
  projects/nfsv4.1-server/sys/i386/i386/sys_machdep.c
  projects/nfsv4.1-server/sys/i386/i386/trap.c
  projects/nfsv4.1-server/sys/i386/include/cpu.h
  projects/nfsv4.1-server/sys/i386/include/npx.h
  projects/nfsv4.1-server/sys/i386/isa/npx.c
  projects/nfsv4.1-server/sys/i386/linux/linux_sysvec.c
  projects/nfsv4.1-server/sys/i386/pci/pci_cfgreg.c
  projects/nfsv4.1-server/sys/i386/pci/pci_pir.c
  projects/nfsv4.1-server/sys/i386/xen/pmap.c
  projects/nfsv4.1-server/sys/ia64/conf/NOTES
  projects/nfsv4.1-server/sys/ia64/ia64/dump_machdep.c
  projects/nfsv4.1-server/sys/ia64/ia64/pmap.c
  projects/nfsv4.1-server/sys/kern/imgact_elf.c
  projects/nfsv4.1-server/sys/kern/kern_clocksource.c
  projects/nfsv4.1-server/sys/kern/kern_cons.c
  projects/nfsv4.1-server/sys/kern/kern_cpu.c
  projects/nfsv4.1-server/sys/kern/kern_cpuset.c
  projects/nfsv4.1-server/sys/kern/kern_descrip.c
  projects/nfsv4.1-server/sys/kern/kern_exec.c
  projects/nfsv4.1-server/sys/kern/kern_fork.c
  projects/nfsv4.1-server/sys/kern/kern_intr.c
  projects/nfsv4.1-server/sys/kern/kern_ktr.c
  projects/nfsv4.1-server/sys/kern/kern_ktrace.c
  projects/nfsv4.1-server/sys/kern/kern_linker.c
  projects/nfsv4.1-server/sys/kern/kern_malloc.c
  projects/nfsv4.1-server/sys/kern/kern_mbuf.c
  projects/nfsv4.1-server/sys/kern/kern_mib.c
  projects/nfsv4.1-server/sys/kern/kern_ntptime.c
  projects/nfsv4.1-server/sys/kern/kern_osd.c
  projects/nfsv4.1-server/sys/kern/kern_pmc.c
  projects/nfsv4.1-server/sys/kern/kern_priv.c
  projects/nfsv4.1-server/sys/kern/kern_shutdown.c
  projects/nfsv4.1-server/sys/kern/kern_sig.c
  projects/nfsv4.1-server/sys/kern/kern_sysctl.c
  projects/nfsv4.1-server/sys/kern/kern_tc.c
  projects/nfsv4.1-server/sys/kern/kern_timeout.c
  projects/nfsv4.1-server/sys/kern/subr_bus.c
  projects/nfsv4.1-server/sys/kern/subr_capability.c
  projects/nfsv4.1-server/sys/kern/subr_kdb.c
  projects/nfsv4.1-server/sys/kern/subr_msgbuf.c
  projects/nfsv4.1-server/sys/kern/subr_param.c
  projects/nfsv4.1-server/sys/kern/subr_prf.c
  projects/nfsv4.1-server/sys/kern/subr_rman.c
  projects/nfsv4.1-server/sys/kern/subr_sleepqueue.c
  projects/nfsv4.1-server/sys/kern/subr_smp.c
  projects/nfsv4.1-server/sys/kern/subr_terminal.c
  projects/nfsv4.1-server/sys/kern/subr_witness.c
  projects/nfsv4.1-server/sys/kern/sys_generic.c
  projects/nfsv4.1-server/sys/kern/sys_pipe.c
  projects/nfsv4.1-server/sys/kern/sysv_msg.c
  projects/nfsv4.1-server/sys/kern/sysv_sem.c
  projects/nfsv4.1-server/sys/kern/sysv_shm.c
  projects/nfsv4.1-server/sys/kern/uipc_syscalls.c
  projects/nfsv4.1-server/sys/kern/uipc_usrreq.c
  projects/nfsv4.1-server/sys/kern/vfs_bio.c
  projects/nfsv4.1-server/sys/kern/vfs_init.c
  projects/nfsv4.1-server/sys/kern/vfs_lookup.c
  projects/nfsv4.1-server/sys/kern/vfs_syscalls.c
  projects/nfsv4.1-server/sys/kern/vfs_vnops.c
  projects/nfsv4.1-server/sys/mips/cavium/usb/octusb.c
  projects/nfsv4.1-server/sys/mips/conf/BERI_NETFPGA_MDROOT
  projects/nfsv4.1-server/sys/mips/mips/dump_machdep.c
  projects/nfsv4.1-server/sys/mips/mips/pmap.c
  projects/nfsv4.1-server/sys/mips/rmi/rootfs_list.txt
  projects/nfsv4.1-server/sys/mips/rt305x/uart_dev_rt305x.c
  projects/nfsv4.1-server/sys/modules/Makefile
  projects/nfsv4.1-server/sys/modules/cxgbe/t4_firmware/Makefile
  projects/nfsv4.1-server/sys/modules/cxgbe/t5_firmware/Makefile
  projects/nfsv4.1-server/sys/modules/dtrace/dtrace/Makefile
  projects/nfsv4.1-server/sys/modules/netfpga10g/nf10bmac/Makefile
  projects/nfsv4.1-server/sys/modules/svr4/README
  projects/nfsv4.1-server/sys/net/bpf_zerocopy.c
  projects/nfsv4.1-server/sys/net/ieee8023ad_lacp.c
  projects/nfsv4.1-server/sys/net/if.c
  projects/nfsv4.1-server/sys/net/if_bridge.c
  projects/nfsv4.1-server/sys/net/if_lagg.c
  projects/nfsv4.1-server/sys/net/if_stf.c
  projects/nfsv4.1-server/sys/net/if_tap.c
  projects/nfsv4.1-server/sys/net/if_tun.c
  projects/nfsv4.1-server/sys/net/netisr.c
  projects/nfsv4.1-server/sys/net/route.c
  projects/nfsv4.1-server/sys/netgraph/ng_base.c
  projects/nfsv4.1-server/sys/netgraph/ng_mppc.c
  projects/nfsv4.1-server/sys/netinet/in.h
  projects/nfsv4.1-server/sys/netinet/in_mcast.c
  projects/nfsv4.1-server/sys/netinet/in_rss.c
  projects/nfsv4.1-server/sys/netinet/in_rss.h
  projects/nfsv4.1-server/sys/netinet/ip_output.c
  projects/nfsv4.1-server/sys/netinet/sctp_asconf.c
  projects/nfsv4.1-server/sys/netinet/sctp_output.c
  projects/nfsv4.1-server/sys/netinet/sctp_pcb.c
  projects/nfsv4.1-server/sys/netinet/sctp_sysctl.c
  projects/nfsv4.1-server/sys/netinet/sctp_usrreq.c
  projects/nfsv4.1-server/sys/netinet/sctputil.c
  projects/nfsv4.1-server/sys/netinet/tcp_subr.c
  projects/nfsv4.1-server/sys/netinet/tcp_timer.c
  projects/nfsv4.1-server/sys/netinet6/in6_mcast.c
  projects/nfsv4.1-server/sys/netinet6/ip6protosw.h
  projects/nfsv4.1-server/sys/netinet6/mld6.c
  projects/nfsv4.1-server/sys/netinet6/nd6.c
  projects/nfsv4.1-server/sys/netpfil/ipfw/ip_fw2.c
  projects/nfsv4.1-server/sys/netpfil/pf/pf.c
  projects/nfsv4.1-server/sys/nfs/nfs_fha.c
  projects/nfsv4.1-server/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c
  projects/nfsv4.1-server/sys/ofed/drivers/net/mlx4/en_netdev.c
  projects/nfsv4.1-server/sys/ofed/include/linux/linux_compat.c
  projects/nfsv4.1-server/sys/pc98/cbus/sio.c
  projects/nfsv4.1-server/sys/pc98/pc98/canbus.c
  projects/nfsv4.1-server/sys/pc98/pc98/machdep.c
  projects/nfsv4.1-server/sys/pc98/pc98/pc98_machdep.c
  projects/nfsv4.1-server/sys/security/mac_biba/mac_biba.c
  projects/nfsv4.1-server/sys/security/mac_bsdextended/mac_bsdextended.c
  projects/nfsv4.1-server/sys/security/mac_ifoff/mac_ifoff.c
  projects/nfsv4.1-server/sys/security/mac_lomac/mac_lomac.c
  projects/nfsv4.1-server/sys/security/mac_mls/mac_mls.c
  projects/nfsv4.1-server/sys/security/mac_portacl/mac_portacl.c
  projects/nfsv4.1-server/sys/sparc64/pci/psycho.c
  projects/nfsv4.1-server/sys/sys/cons.h
  projects/nfsv4.1-server/sys/sys/cpuctl.h
  projects/nfsv4.1-server/sys/sys/cpuset.h
  projects/nfsv4.1-server/sys/sys/filedesc.h
  projects/nfsv4.1-server/sys/sys/imgact_elf.h
  projects/nfsv4.1-server/sys/sys/linker_set.h
  projects/nfsv4.1-server/sys/sys/malloc.h
  projects/nfsv4.1-server/sys/sys/mman.h
  projects/nfsv4.1-server/sys/sys/param.h
  projects/nfsv4.1-server/sys/sys/sysctl.h
  projects/nfsv4.1-server/sys/sys/terminal.h
  projects/nfsv4.1-server/sys/sys/time.h
  projects/nfsv4.1-server/sys/sys/vnode.h
  projects/nfsv4.1-server/sys/ufs/ufs/ufs_vnops.c
  projects/nfsv4.1-server/sys/vm/memguard.c
  projects/nfsv4.1-server/sys/vm/redzone.c
  projects/nfsv4.1-server/sys/vm/uma_core.c
  projects/nfsv4.1-server/sys/vm/vm_fault.c
  projects/nfsv4.1-server/sys/vm/vm_glue.c
  projects/nfsv4.1-server/sys/vm/vm_init.c
  projects/nfsv4.1-server/sys/vm/vm_kern.c
  projects/nfsv4.1-server/sys/vm/vm_map.c
  projects/nfsv4.1-server/sys/vm/vm_map.h
  projects/nfsv4.1-server/sys/vm/vm_mmap.c
  projects/nfsv4.1-server/sys/vm/vm_page.c
  projects/nfsv4.1-server/sys/vm/vm_page.h
  projects/nfsv4.1-server/sys/vm/vm_radix.c
  projects/nfsv4.1-server/sys/vm/vm_zeroidle.c
  projects/nfsv4.1-server/sys/x86/cpufreq/hwpstate.c
  projects/nfsv4.1-server/sys/x86/include/apicvar.h
  projects/nfsv4.1-server/sys/x86/iommu/intel_utils.c
  projects/nfsv4.1-server/sys/x86/isa/isa.c
  projects/nfsv4.1-server/sys/x86/pci/pci_bus.c
  projects/nfsv4.1-server/sys/x86/x86/dump_machdep.c
  projects/nfsv4.1-server/sys/x86/x86/io_apic.c
  projects/nfsv4.1-server/sys/x86/x86/local_apic.c
  projects/nfsv4.1-server/sys/x86/x86/mca.c
  projects/nfsv4.1-server/sys/x86/x86/tsc.c
  projects/nfsv4.1-server/sys/x86/xen/hvm.c
  projects/nfsv4.1-server/sys/x86/xen/pv.c
  projects/nfsv4.1-server/sys/xen/gnttab.c
  projects/nfsv4.1-server/sys/xen/gnttab.h
  projects/nfsv4.1-server/sys/xen/xenstore/xenstore.c
Directory Properties:
  projects/nfsv4.1-server/sys/   (props changed)
  projects/nfsv4.1-server/sys/amd64/vmm/   (props changed)
  projects/nfsv4.1-server/sys/cddl/contrib/opensolaris/   (props changed)
  projects/nfsv4.1-server/sys/conf/   (props changed)
  projects/nfsv4.1-server/sys/contrib/ipfilter/   (props changed)

Modified: projects/nfsv4.1-server/sys/amd64/acpica/acpi_machdep.c
==============================================================================
--- projects/nfsv4.1-server/sys/amd64/acpica/acpi_machdep.c	Tue Jul  1 00:22:54 2014	(r268069)
+++ projects/nfsv4.1-server/sys/amd64/acpica/acpi_machdep.c	Tue Jul  1 00:59:45 2014	(r268070)
@@ -45,9 +45,8 @@ __FBSDID("$FreeBSD$");
 #include <machine/nexusvar.h>
 
 int acpi_resume_beep;
-TUNABLE_INT("debug.acpi.resume_beep", &acpi_resume_beep);
-SYSCTL_INT(_debug_acpi, OID_AUTO, resume_beep, CTLFLAG_RW, &acpi_resume_beep,
-    0, "Beep the PC speaker when resuming");
+SYSCTL_INT(_debug_acpi, OID_AUTO, resume_beep, CTLFLAG_RWTUN,
+    &acpi_resume_beep, 0, "Beep the PC speaker when resuming");
 
 int acpi_reset_video;
 TUNABLE_INT("hw.acpi.reset_video", &acpi_reset_video);

Modified: projects/nfsv4.1-server/sys/amd64/amd64/amd64_mem.c
==============================================================================
--- projects/nfsv4.1-server/sys/amd64/amd64/amd64_mem.c	Tue Jul  1 00:22:54 2014	(r268069)
+++ projects/nfsv4.1-server/sys/amd64/amd64/amd64_mem.c	Tue Jul  1 00:59:45 2014	(r268070)
@@ -69,7 +69,6 @@ static char *mem_owner_bios = "BIOS";
 	(((curr) & ~MDF_ATTRMASK) | ((new) & MDF_ATTRMASK))
 
 static int mtrrs_disabled;
-TUNABLE_INT("machdep.disable_mtrrs", &mtrrs_disabled);
 SYSCTL_INT(_machdep, OID_AUTO, disable_mtrrs, CTLFLAG_RDTUN,
     &mtrrs_disabled, 0, "Disable amd64 MTRRs.");
 

Modified: projects/nfsv4.1-server/sys/amd64/amd64/fpu.c
==============================================================================
--- projects/nfsv4.1-server/sys/amd64/amd64/fpu.c	Tue Jul  1 00:22:54 2014	(r268069)
+++ projects/nfsv4.1-server/sys/amd64/amd64/fpu.c	Tue Jul  1 00:59:45 2014	(r268070)
@@ -890,6 +890,7 @@ static MALLOC_DEFINE(M_FPUKERN_CTX, "fpu
     "Kernel contexts for FPU state");
 
 #define	FPU_KERN_CTX_FPUINITDONE 0x01
+#define	FPU_KERN_CTX_DUMMY	 0x02	/* avoided save for the kern thread */
 
 struct fpu_kern_ctx {
 	struct savefpu *prev;
@@ -933,6 +934,10 @@ fpu_kern_enter(struct thread *td, struct
 {
 	struct pcb *pcb;
 
+	if ((flags & FPU_KERN_KTHR) != 0 && is_fpu_kern_thread(0)) {
+		ctx->flags = FPU_KERN_CTX_DUMMY;
+		return (0);
+	}
 	pcb = td->td_pcb;
 	KASSERT(!PCB_USER_FPU(pcb) || pcb->pcb_save ==
 	    get_pcb_user_save_pcb(pcb), ("mangled pcb_save"));
@@ -952,6 +957,9 @@ fpu_kern_leave(struct thread *td, struct
 {
 	struct pcb *pcb;
 
+	if (is_fpu_kern_thread(0) && (ctx->flags & FPU_KERN_CTX_DUMMY) != 0)
+		return (0);
+	KASSERT((ctx->flags & FPU_KERN_CTX_DUMMY) == 0, ("dummy ctx"));
 	pcb = td->td_pcb;
 	critical_enter();
 	if (curthread == PCPU_GET(fpcurthread))

Modified: projects/nfsv4.1-server/sys/amd64/amd64/machdep.c
==============================================================================
--- projects/nfsv4.1-server/sys/amd64/amd64/machdep.c	Tue Jul  1 00:22:54 2014	(r268069)
+++ projects/nfsv4.1-server/sys/amd64/amd64/machdep.c	Tue Jul  1 00:59:45 2014	(r268070)
@@ -675,8 +675,7 @@ cpu_halt(void)
 void (*cpu_idle_hook)(sbintime_t) = NULL;	/* ACPI idle hook. */
 static int	cpu_ident_amdc1e = 0;	/* AMD C1E supported. */
 static int	idle_mwait = 1;		/* Use MONITOR/MWAIT for short idle. */
-TUNABLE_INT("machdep.idle_mwait", &idle_mwait);
-SYSCTL_INT(_machdep, OID_AUTO, idle_mwait, CTLFLAG_RW, &idle_mwait,
+SYSCTL_INT(_machdep, OID_AUTO, idle_mwait, CTLFLAG_RWTUN, &idle_mwait,
     0, "Use MONITOR/MWAIT for short idle");
 
 #define	STATE_RUNNING	0x0

Modified: projects/nfsv4.1-server/sys/amd64/amd64/mp_machdep.c
==============================================================================
--- projects/nfsv4.1-server/sys/amd64/amd64/mp_machdep.c	Tue Jul  1 00:22:54 2014	(r268069)
+++ projects/nfsv4.1-server/sys/amd64/amd64/mp_machdep.c	Tue Jul  1 00:59:45 2014	(r268070)
@@ -125,9 +125,7 @@ static u_long *ipi_hardclock_counts[MAXC
 #endif
 
 /* Default cpu_ops implementation. */
-struct cpu_ops cpu_ops = {
-	.ipi_vectored = lapic_ipi_vectored
-};
+struct cpu_ops cpu_ops;
 
 extern inthand_t IDTVEC(fast_syscall), IDTVEC(fast_syscall32);
 
@@ -1125,7 +1123,7 @@ ipi_send_cpu(int cpu, u_int ipi)
 		if (old_pending)
 			return;
 	}
-	cpu_ops.ipi_vectored(ipi, cpu_apic_ids[cpu]);
+	lapic_ipi_vectored(ipi, cpu_apic_ids[cpu]);
 }
 
 /*
@@ -1395,7 +1393,7 @@ ipi_all_but_self(u_int ipi)
 		CPU_OR_ATOMIC(&ipi_nmi_pending, &other_cpus);
 
 	CTR2(KTR_SMP, "%s: ipi: %x", __func__, ipi);
-	cpu_ops.ipi_vectored(ipi, APIC_IPI_DEST_OTHERS);
+	lapic_ipi_vectored(ipi, APIC_IPI_DEST_OTHERS);
 }
 
 int

Modified: projects/nfsv4.1-server/sys/amd64/amd64/mp_watchdog.c
==============================================================================
--- projects/nfsv4.1-server/sys/amd64/amd64/mp_watchdog.c	Tue Jul  1 00:22:54 2014	(r268069)
+++ projects/nfsv4.1-server/sys/amd64/amd64/mp_watchdog.c	Tue Jul  1 00:59:45 2014	(r268070)
@@ -68,8 +68,7 @@ static int	watchdog_dontfire = 1;
 static int	watchdog_timer = -1;
 static int	watchdog_nmi = 1;
 
-TUNABLE_INT("debug.watchdog", &watchdog_cpu);
-SYSCTL_INT(_debug, OID_AUTO, watchdog_nmi, CTLFLAG_RW, &watchdog_nmi, 0,
+SYSCTL_INT(_debug, OID_AUTO, watchdog_nmi, CTLFLAG_RWTUN, &watchdog_nmi, 0,
     "IPI the boot processor with an NMI to enter the debugger");
 
 static struct callout	watchdog_callout;

Modified: projects/nfsv4.1-server/sys/amd64/amd64/pmap.c
==============================================================================
--- projects/nfsv4.1-server/sys/amd64/amd64/pmap.c	Tue Jul  1 00:22:54 2014	(r268069)
+++ projects/nfsv4.1-server/sys/amd64/amd64/pmap.c	Tue Jul  1 00:59:45 2014	(r268070)
@@ -332,8 +332,8 @@ SYSCTL_INT(_vm_pmap, OID_AUTO, pat_works
     "Is page attribute table fully functional?");
 
 static int pg_ps_enabled = 1;
-SYSCTL_INT(_vm_pmap, OID_AUTO, pg_ps_enabled, CTLFLAG_RDTUN, &pg_ps_enabled, 0,
-    "Are large page mappings enabled?");
+SYSCTL_INT(_vm_pmap, OID_AUTO, pg_ps_enabled, CTLFLAG_RDTUN | CTLFLAG_NOFETCH,
+    &pg_ps_enabled, 0, "Are large page mappings enabled?");
 
 #define	PAT_INDEX_SIZE	8
 static int pat_index[PAT_INDEX_SIZE];	/* cache mode to PAT index conversion */
@@ -368,8 +368,8 @@ static int pmap_flags = PMAP_PDE_SUPERPA
 static struct unrhdr pcid_unr;
 static struct mtx pcid_mtx;
 int pmap_pcid_enabled = 0;
-SYSCTL_INT(_vm_pmap, OID_AUTO, pcid_enabled, CTLFLAG_RDTUN, &pmap_pcid_enabled,
-    0, "Is TLB Context ID enabled ?");
+SYSCTL_INT(_vm_pmap, OID_AUTO, pcid_enabled, CTLFLAG_RDTUN | CTLFLAG_NOFETCH,
+    &pmap_pcid_enabled, 0, "Is TLB Context ID enabled ?");
 int invpcid_works = 0;
 SYSCTL_INT(_vm_pmap, OID_AUTO, invpcid_works, CTLFLAG_RD, &invpcid_works, 0,
     "Is the invpcid instruction available ?");
@@ -2868,7 +2868,7 @@ free_pv_chunk(struct pv_chunk *pc)
 	/* entire chunk is free, return it */
 	m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)pc));
 	dump_drop_page(m->phys_addr);
-	vm_page_unwire(m, 0);
+	vm_page_unwire(m, PQ_INACTIVE);
 	vm_page_free(m);
 }
 

Modified: projects/nfsv4.1-server/sys/amd64/amd64/sys_machdep.c
==============================================================================
--- projects/nfsv4.1-server/sys/amd64/amd64/sys_machdep.c	Tue Jul  1 00:22:54 2014	(r268069)
+++ projects/nfsv4.1-server/sys/amd64/amd64/sys_machdep.c	Tue Jul  1 00:59:45 2014	(r268070)
@@ -73,7 +73,6 @@ static void
 max_ldt_segment_init(void *arg __unused)
 {
 
-	TUNABLE_INT_FETCH("machdep.max_ldt_segment", &max_ldt_segment);
 	if (max_ldt_segment <= 0)
 		max_ldt_segment = 1;
 	if (max_ldt_segment > MAX_LD)

Modified: projects/nfsv4.1-server/sys/amd64/amd64/trap.c
==============================================================================
--- projects/nfsv4.1-server/sys/amd64/amd64/trap.c	Tue Jul  1 00:22:54 2014	(r268069)
+++ projects/nfsv4.1-server/sys/amd64/amd64/trap.c	Tue Jul  1 00:59:45 2014	(r268070)
@@ -143,20 +143,18 @@ static char *trap_msg[] = {
 
 #ifdef KDB
 static int kdb_on_nmi = 1;
-SYSCTL_INT(_machdep, OID_AUTO, kdb_on_nmi, CTLFLAG_RW,
+SYSCTL_INT(_machdep, OID_AUTO, kdb_on_nmi, CTLFLAG_RWTUN,
 	&kdb_on_nmi, 0, "Go to KDB on NMI");
-TUNABLE_INT("machdep.kdb_on_nmi", &kdb_on_nmi);
 #endif
 static int panic_on_nmi = 1;
-SYSCTL_INT(_machdep, OID_AUTO, panic_on_nmi, CTLFLAG_RW,
+SYSCTL_INT(_machdep, OID_AUTO, panic_on_nmi, CTLFLAG_RWTUN,
 	&panic_on_nmi, 0, "Panic on NMI");
-TUNABLE_INT("machdep.panic_on_nmi", &panic_on_nmi);
 static int prot_fault_translation;
-SYSCTL_INT(_machdep, OID_AUTO, prot_fault_translation, CTLFLAG_RW,
+SYSCTL_INT(_machdep, OID_AUTO, prot_fault_translation, CTLFLAG_RWTUN,
     &prot_fault_translation, 0,
     "Select signal to deliver on protection fault");
 static int uprintf_signal;
-SYSCTL_INT(_machdep, OID_AUTO, uprintf_signal, CTLFLAG_RW,
+SYSCTL_INT(_machdep, OID_AUTO, uprintf_signal, CTLFLAG_RWTUN,
     &uprintf_signal, 0,
     "Print debugging information on trap signal to ctty");
 

Modified: projects/nfsv4.1-server/sys/amd64/conf/GENERIC
==============================================================================
--- projects/nfsv4.1-server/sys/amd64/conf/GENERIC	Tue Jul  1 00:22:54 2014	(r268069)
+++ projects/nfsv4.1-server/sys/amd64/conf/GENERIC	Tue Jul  1 00:59:45 2014	(r268070)
@@ -184,6 +184,11 @@ device		splash			# Splash screen and scr
 device		sc
 options 	SC_PIXEL_MODE		# add support for the raster text mode
 
+# vt is the new video console driver
+device		vt
+device		vt_vga
+device		vt_efifb
+
 device		agp			# support several AGP chipsets
 
 # PCCARD (PCMCIA) support

Modified: projects/nfsv4.1-server/sys/amd64/conf/NOTES
==============================================================================
--- projects/nfsv4.1-server/sys/amd64/conf/NOTES	Tue Jul  1 00:22:54 2014	(r268069)
+++ projects/nfsv4.1-server/sys/amd64/conf/NOTES	Tue Jul  1 00:59:45 2014	(r268070)
@@ -248,6 +248,10 @@ options 	VGA_WIDTH90		# support 90 colum
 # Debugging.
 options 	VGA_DEBUG
 
+# vt(4) drivers.
+device		vt_vga		# VGA
+device		vt_efifb	# EFI framebuffer
+
 # Linear framebuffer driver for S3 VESA 1.2 cards. Works on top of VESA.
 device		s3pci
 

Modified: projects/nfsv4.1-server/sys/amd64/include/cpu.h
==============================================================================
--- projects/nfsv4.1-server/sys/amd64/include/cpu.h	Tue Jul  1 00:22:54 2014	(r268069)
+++ projects/nfsv4.1-server/sys/amd64/include/cpu.h	Tue Jul  1 00:59:45 2014	(r268070)
@@ -63,7 +63,6 @@
 struct cpu_ops {
 	void (*cpu_init)(void);
 	void (*cpu_resume)(void);
-	void (*ipi_vectored)(u_int, int);
 };
 
 extern struct	cpu_ops cpu_ops;

Modified: projects/nfsv4.1-server/sys/amd64/include/fpu.h
==============================================================================
--- projects/nfsv4.1-server/sys/amd64/include/fpu.h	Tue Jul  1 00:22:54 2014	(r268069)
+++ projects/nfsv4.1-server/sys/amd64/include/fpu.h	Tue Jul  1 00:59:45 2014	(r268070)
@@ -84,6 +84,7 @@ void	fpu_save_area_reset(struct savefpu 
  */
 #define	FPU_KERN_NORMAL	0x0000
 #define	FPU_KERN_NOWAIT	0x0001
+#define	FPU_KERN_KTHR	0x0002
 
 #endif
 

Modified: projects/nfsv4.1-server/sys/amd64/linux32/linux32_sysvec.c
==============================================================================
--- projects/nfsv4.1-server/sys/amd64/linux32/linux32_sysvec.c	Tue Jul  1 00:22:54 2014	(r268069)
+++ projects/nfsv4.1-server/sys/amd64/linux32/linux32_sysvec.c	Tue Jul  1 00:59:45 2014	(r268070)
@@ -1083,7 +1083,7 @@ static Elf32_Brandinfo linux_brand = {
 	.sysvec		= &elf_linux_sysvec,
 	.interp_newpath	= NULL,
 	.brand_note	= &linux32_brandnote,
-	.flags		= BI_CAN_EXEC_DYN | BI_BRAND_NOTE | BI_CAN_EXEC_INTERP
+	.flags		= BI_CAN_EXEC_DYN | BI_BRAND_NOTE
 };
 
 static Elf32_Brandinfo linux_glibc2brand = {
@@ -1095,7 +1095,7 @@ static Elf32_Brandinfo linux_glibc2brand
 	.sysvec		= &elf_linux_sysvec,
 	.interp_newpath	= NULL,
 	.brand_note	= &linux32_brandnote,
-	.flags		= BI_CAN_EXEC_DYN | BI_BRAND_NOTE | BI_CAN_EXEC_INTERP
+	.flags		= BI_CAN_EXEC_DYN | BI_BRAND_NOTE
 };
 
 Elf32_Brandinfo *linux_brandlist[] = {

Modified: projects/nfsv4.1-server/sys/amd64/pci/pci_cfgreg.c
==============================================================================
--- projects/nfsv4.1-server/sys/amd64/pci/pci_cfgreg.c	Tue Jul  1 00:22:54 2014	(r268069)
+++ projects/nfsv4.1-server/sys/amd64/pci/pci_cfgreg.c	Tue Jul  1 00:59:45 2014	(r268070)
@@ -65,7 +65,6 @@ static int pcie_minbus, pcie_maxbus;
 static uint32_t pcie_badslots;
 static struct mtx pcicfg_mtx;
 static int mcfg_enable = 1;
-TUNABLE_INT("hw.pci.mcfg", &mcfg_enable);
 SYSCTL_INT(_hw_pci, OID_AUTO, mcfg, CTLFLAG_RDTUN, &mcfg_enable, 0,
     "Enable support for PCI-e memory mapped config access");
 

Modified: projects/nfsv4.1-server/sys/amd64/vmm/intel/vmx.c
==============================================================================
--- projects/nfsv4.1-server/sys/amd64/vmm/intel/vmx.c	Tue Jul  1 00:22:54 2014	(r268069)
+++ projects/nfsv4.1-server/sys/amd64/vmm/intel/vmx.c	Tue Jul  1 00:59:45 2014	(r268070)
@@ -1258,12 +1258,28 @@ vmx_inject_interrupts(struct vmx *vmx, i
 		/* Ask the local apic for a vector to inject */
 		if (!vlapic_pending_intr(vlapic, &vector))
 			return;
+
+		/*
+		 * From the Intel SDM, Volume 3, Section "Maskable
+		 * Hardware Interrupts":
+		 * - maskable interrupt vectors [16,255] can be delivered
+		 *   through the local APIC.
+		*/
+		KASSERT(vector >= 16 && vector <= 255,
+		    ("invalid vector %d from local APIC", vector));
 	} else {
 		/* Ask the legacy pic for a vector to inject */
 		vatpic_pending_intr(vmx->vm, &vector);
-	}
 
-	KASSERT(vector >= 32 && vector <= 255, ("invalid vector %d", vector));
+		/*
+		 * From the Intel SDM, Volume 3, Section "Maskable
+		 * Hardware Interrupts":
+		 * - maskable interrupt vectors [0,255] can be delivered
+		 *   through the INTR pin.
+		 */
+		KASSERT(vector >= 0 && vector <= 255,
+		    ("invalid vector %d from INTR", vector));
+	}
 
 	/* Check RFLAGS.IF and the interruptibility state of the guest */
 	rflags = vmcs_read(VMCS_GUEST_RFLAGS);

Modified: projects/nfsv4.1-server/sys/amd64/vmm/vmm.c
==============================================================================
--- projects/nfsv4.1-server/sys/amd64/vmm/vmm.c	Tue Jul  1 00:22:54 2014	(r268069)
+++ projects/nfsv4.1-server/sys/amd64/vmm/vmm.c	Tue Jul  1 00:59:45 2014	(r268070)
@@ -199,7 +199,6 @@ SYSCTL_NODE(_hw, OID_AUTO, vmm, CTLFLAG_
  * interrupts disabled.
  */
 static int halt_detection_enabled = 1;
-TUNABLE_INT("hw.vmm.halt_detection", &halt_detection_enabled);
 SYSCTL_INT(_hw_vmm, OID_AUTO, halt_detection, CTLFLAG_RDTUN,
     &halt_detection_enabled, 0,
     "Halt VM if all vcpus execute HLT with interrupts disabled");
@@ -1992,3 +1991,34 @@ vm_segment_name(int seg)
 	    ("%s: invalid segment encoding %d", __func__, seg));
 	return (seg_names[seg]);
 }
+
+
+/*
+ * Return the amount of in-use and wired memory for the VM. Since
+ * these are global stats, only return the values with for vCPU 0
+ */
+VMM_STAT_DECLARE(VMM_MEM_RESIDENT);
+VMM_STAT_DECLARE(VMM_MEM_WIRED);
+
+static void
+vm_get_rescnt(struct vm *vm, int vcpu, struct vmm_stat_type *stat)
+{
+
+	if (vcpu == 0) {
+		vmm_stat_set(vm, vcpu, VMM_MEM_RESIDENT,
+	       	    PAGE_SIZE * vmspace_resident_count(vm->vmspace));
+	}	
+}
+
+static void
+vm_get_wiredcnt(struct vm *vm, int vcpu, struct vmm_stat_type *stat)
+{
+
+	if (vcpu == 0) {
+		vmm_stat_set(vm, vcpu, VMM_MEM_WIRED,
+	      	    PAGE_SIZE * pmap_wired_count(vmspace_pmap(vm->vmspace)));
+	}	
+}
+
+VMM_STAT_FUNC(VMM_MEM_RESIDENT, "Resident memory", vm_get_rescnt);
+VMM_STAT_FUNC(VMM_MEM_WIRED, "Wired memory", vm_get_wiredcnt);

Modified: projects/nfsv4.1-server/sys/amd64/vmm/vmm_instruction_emul.c
==============================================================================
--- projects/nfsv4.1-server/sys/amd64/vmm/vmm_instruction_emul.c	Tue Jul  1 00:22:54 2014	(r268069)
+++ projects/nfsv4.1-server/sys/amd64/vmm/vmm_instruction_emul.c	Tue Jul  1 00:59:45 2014	(r268070)
@@ -104,6 +104,12 @@ static const struct vie_op one_byte_opco
 		.op_byte = 0x8B,
 		.op_type = VIE_OP_TYPE_MOV,
 	},
+	[0xC6] = {
+		/* XXX Group 11 extended opcode - not just MOV */
+		.op_byte = 0xC6,
+		.op_type = VIE_OP_TYPE_MOV,
+		.op_flags = VIE_OP_F_IMM8,
+	},
 	[0xC7] = {
 		.op_byte = 0xC7,
 		.op_type = VIE_OP_TYPE_MOV,
@@ -310,6 +316,15 @@ emulate_mov(void *vm, int vcpuid, uint64
 			error = vie_update_register(vm, vcpuid, reg, val, size);
 		}
 		break;
+	case 0xC6:
+		/*
+		 * MOV from imm8 to mem (ModRM:r/m)
+		 * C6/0		mov r/m8, imm8
+		 * REX + C6/0	mov r/m8, imm8
+		 */
+		size = 1;
+		error = memwrite(vm, vcpuid, gpa, vie->immediate, size, arg);
+		break;
 	case 0xC7:
 		/*
 		 * MOV from imm32 to mem (ModRM:r/m)

Modified: projects/nfsv4.1-server/sys/amd64/vmm/vmm_stat.c
==============================================================================
--- projects/nfsv4.1-server/sys/amd64/vmm/vmm_stat.c	Tue Jul  1 00:22:54 2014	(r268069)
+++ projects/nfsv4.1-server/sys/amd64/vmm/vmm_stat.c	Tue Jul  1 00:59:45 2014	(r268070)
@@ -83,12 +83,21 @@ vmm_stat_register(void *arg)
 int
 vmm_stat_copy(struct vm *vm, int vcpu, int *num_stats, uint64_t *buf)
 {
-	int i;
+	struct vmm_stat_type *vst;
 	uint64_t *stats;
+	int i;
 
 	if (vcpu < 0 || vcpu >= VM_MAXCPU)
 		return (EINVAL);
-		
+
+	/* Let stats functions update their counters */
+	for (i = 0; i < vst_num_types; i++) {
+		vst = vsttab[i];
+		if (vst->func != NULL)
+			(*vst->func)(vm, vcpu, vst);
+	}
+
+	/* Copy over the stats */
 	stats = vcpu_stats(vm, vcpu);
 	for (i = 0; i < vst_num_elems; i++)
 		buf[i] = stats[i];

Modified: projects/nfsv4.1-server/sys/amd64/vmm/vmm_stat.h
==============================================================================
--- projects/nfsv4.1-server/sys/amd64/vmm/vmm_stat.h	Tue Jul  1 00:22:54 2014	(r268069)
+++ projects/nfsv4.1-server/sys/amd64/vmm/vmm_stat.h	Tue Jul  1 00:59:45 2014	(r268070)
@@ -42,21 +42,29 @@ enum vmm_stat_scope {
 	VMM_STAT_SCOPE_AMD,		/* AMD SVM specific statistic */
 };
 
+struct vmm_stat_type;
+typedef void (*vmm_stat_func_t)(struct vm *vm, int vcpu,
+    struct vmm_stat_type *stat);
+
 struct vmm_stat_type {
 	int	index;			/* position in the stats buffer */
 	int	nelems;			/* standalone or array */
 	const char *desc;		/* description of statistic */
+	vmm_stat_func_t func;
 	enum vmm_stat_scope scope;
 };
 
 void	vmm_stat_register(void *arg);
 
-#define	VMM_STAT_DEFINE(type, nelems, desc, scope)			\
+#define	VMM_STAT_FDEFINE(type, nelems, desc, func, scope)		\
 	struct vmm_stat_type type[1] = {				\
-		{ -1, nelems, desc, scope }				\
+		{ -1, nelems, desc, func, scope }			\
 	};								\
 	SYSINIT(type##_stat, SI_SUB_KLD, SI_ORDER_ANY, vmm_stat_register, type)
 
+#define VMM_STAT_DEFINE(type, nelems, desc, scope) 			\
+	VMM_STAT_FDEFINE(type, nelems, desc, NULL, scope)
+
 #define	VMM_STAT_DECLARE(type)						\
 	extern struct vmm_stat_type type[1]
 
@@ -67,6 +75,9 @@ void	vmm_stat_register(void *arg);
 #define	VMM_STAT_AMD(type, desc)	\
 	VMM_STAT_DEFINE(type, 1, desc, VMM_STAT_SCOPE_AMD)
 
+#define	VMM_STAT_FUNC(type, desc, func)	\
+	VMM_STAT_FDEFINE(type, 1, desc, func, VMM_STAT_SCOPE_ANY)
+
 #define	VMM_STAT_ARRAY(type, nelems, desc)	\
 	VMM_STAT_DEFINE(type, nelems, desc, VMM_STAT_SCOPE_ANY)
 
@@ -93,9 +104,22 @@ vmm_stat_array_incr(struct vm *vm, int v
 		stats[vst->index + statidx] += x;
 #endif
 }
-		   
 
 static void __inline
+vmm_stat_array_set(struct vm *vm, int vcpu, struct vmm_stat_type *vst,
+		   int statidx, uint64_t val)
+{
+#ifdef VMM_KEEP_STATS
+	uint64_t *stats;
+	
+	stats = vcpu_stats(vm, vcpu);
+
+	if (vst->index >= 0 && statidx < vst->nelems)
+		stats[vst->index + statidx] = val;
+#endif
+}
+		   
+static void __inline
 vmm_stat_incr(struct vm *vm, int vcpu, struct vmm_stat_type *vst, uint64_t x)
 {
 
@@ -104,6 +128,15 @@ vmm_stat_incr(struct vm *vm, int vcpu, s
 #endif
 }
 
+static void __inline
+vmm_stat_set(struct vm *vm, int vcpu, struct vmm_stat_type *vst, uint64_t val)
+{
+
+#ifdef VMM_KEEP_STATS
+	vmm_stat_array_set(vm, vcpu, vst, 0, val);
+#endif
+}
+
 VMM_STAT_DECLARE(VCPU_MIGRATIONS);
 VMM_STAT_DECLARE(VMEXIT_COUNT);
 VMM_STAT_DECLARE(VMEXIT_EXTINT);

Modified: projects/nfsv4.1-server/sys/arm/arm/busdma_machdep-v6.c
==============================================================================
--- projects/nfsv4.1-server/sys/arm/arm/busdma_machdep-v6.c	Tue Jul  1 00:22:54 2014	(r268069)
+++ projects/nfsv4.1-server/sys/arm/arm/busdma_machdep-v6.c	Tue Jul  1 00:59:45 2014	(r268070)
@@ -224,10 +224,10 @@ busdma_init(void *dummy)
 /*
  * This init historically used SI_SUB_VM, but now the init code requires
  * malloc(9) using M_DEVBUF memory, which is set up later than SI_SUB_VM, by
- * SI_SUB_KMEM and SI_ORDER_SECOND, so we'll go right after that by using
- * SI_SUB_KMEM and SI_ORDER_THIRD.
+ * SI_SUB_KMEM and SI_ORDER_THIRD, so we'll go right after that by using
+ * SI_SUB_KMEM and SI_ORDER_FOURTH.
  */
-SYSINIT(busdma, SI_SUB_KMEM, SI_ORDER_THIRD, busdma_init, NULL);
+SYSINIT(busdma, SI_SUB_KMEM, SI_ORDER_FOURTH, busdma_init, NULL);
 
 static __inline int
 _bus_dma_can_bounce(vm_offset_t lowaddr, vm_offset_t highaddr)

Modified: projects/nfsv4.1-server/sys/arm/arm/busdma_machdep.c
==============================================================================
--- projects/nfsv4.1-server/sys/arm/arm/busdma_machdep.c	Tue Jul  1 00:22:54 2014	(r268069)
+++ projects/nfsv4.1-server/sys/arm/arm/busdma_machdep.c	Tue Jul  1 00:59:45 2014	(r268070)
@@ -276,10 +276,10 @@ busdma_init(void *dummy)
 /*
  * This init historically used SI_SUB_VM, but now the init code requires
  * malloc(9) using M_DEVBUF memory, which is set up later than SI_SUB_VM, by
- * SI_SUB_KMEM and SI_ORDER_SECOND, so we'll go right after that by using
- * SI_SUB_KMEM and SI_ORDER_THIRD.
+ * SI_SUB_KMEM and SI_ORDER_THIRD, so we'll go right after that by using
+ * SI_SUB_KMEM and SI_ORDER_FOURTH.
  */
-SYSINIT(busdma, SI_SUB_KMEM, SI_ORDER_THIRD, busdma_init, NULL);
+SYSINIT(busdma, SI_SUB_KMEM, SI_ORDER_FOURTH, busdma_init, NULL);
 
 /*
  * End block of code useful to transplant to other implementations.

Modified: projects/nfsv4.1-server/sys/arm/arm/cpufunc.c
==============================================================================
--- projects/nfsv4.1-server/sys/arm/arm/cpufunc.c	Tue Jul  1 00:22:54 2014	(r268069)
+++ projects/nfsv4.1-server/sys/arm/arm/cpufunc.c	Tue Jul  1 00:59:45 2014	(r268070)
@@ -1410,12 +1410,27 @@ cpu_scc_setup_ccnt(void)
  * you want!
  */
 #ifdef _PMC_USER_READ_WRITE_
+#if defined(CPU_ARM1136) || defined(CPU_ARM1176)
+	/* Use the Secure User and Non-secure Access Validation Control Register
+	 * to allow userland access
+	 */
+	__asm volatile ("mcr	p15, 0, %0, c15, c9, 0\n\t"
+			:
+			: "r"(0x00000001));
+#else
 	/* Set PMUSERENR[0] to allow userland access */
 	__asm volatile ("mcr	p15, 0, %0, c9, c14, 0\n\t"
 			:
 			: "r"(0x00000001));
 #endif
-        /* Set up the PMCCNTR register as a cyclecounter:
+#endif
+#if defined(CPU_ARM1136) || defined(CPU_ARM1176)
+	/* Set PMCR[2,0] to enable counters and reset CCNT */
+	__asm volatile ("mcr	p15, 0, %0, c15, c12, 0\n\t"
+			:
+			: "r"(0x00000005));
+#else
+	/* Set up the PMCCNTR register as a cyclecounter:
 	 * Set PMINTENCLR to 0xFFFFFFFF to block interrupts
 	 * Set PMCR[2,0] to enable counters and reset CCNT
 	 * Set PMCNTENSET to 0x80000000 to enable CCNT */
@@ -1426,6 +1441,7 @@ cpu_scc_setup_ccnt(void)
 			: "r"(0xFFFFFFFF),
 			  "r"(0x00000005),
 			  "r"(0x80000000));
+#endif
 }
 #endif
 

Modified: projects/nfsv4.1-server/sys/arm/arm/dump_machdep.c
==============================================================================
--- projects/nfsv4.1-server/sys/arm/arm/dump_machdep.c	Tue Jul  1 00:22:54 2014	(r268069)
+++ projects/nfsv4.1-server/sys/arm/arm/dump_machdep.c	Tue Jul  1 00:59:45 2014	(r268070)
@@ -50,8 +50,7 @@ __FBSDID("$FreeBSD$");
 CTASSERT(sizeof(struct kerneldumpheader) == 512);
 
 int do_minidump = 1;
-TUNABLE_INT("debug.minidump", &do_minidump);
-SYSCTL_INT(_debug, OID_AUTO, minidump, CTLFLAG_RW, &do_minidump, 0,
+SYSCTL_INT(_debug, OID_AUTO, minidump, CTLFLAG_RWTUN, &do_minidump, 0,
     "Enable mini crash dumps");
 
 /*

Modified: projects/nfsv4.1-server/sys/arm/arm/platform.c
==============================================================================
--- projects/nfsv4.1-server/sys/arm/arm/platform.c	Tue Jul  1 00:22:54 2014	(r268069)
+++ projects/nfsv4.1-server/sys/arm/arm/platform.c	Tue Jul  1 00:59:45 2014	(r268070)
@@ -65,8 +65,8 @@ static platform_t	plat_obj;
 static struct kobj_ops	plat_kernel_kops;
 static struct platform_kobj	plat_kernel_obj;
 
-static char plat_name[64] = "";
-SYSCTL_STRING(_hw, OID_AUTO, platform, CTLFLAG_RDTUN, plat_name, 0,
+static char plat_name[64];
+SYSCTL_STRING(_hw, OID_AUTO, platform, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, plat_name, 0,
     "Platform currently in use");
 
 /*

Modified: projects/nfsv4.1-server/sys/arm/arm/pmap-v6.c
==============================================================================
--- projects/nfsv4.1-server/sys/arm/arm/pmap-v6.c	Tue Jul  1 00:22:54 2014	(r268069)
+++ projects/nfsv4.1-server/sys/arm/arm/pmap-v6.c	Tue Jul  1 00:59:45 2014	(r268070)
@@ -465,7 +465,7 @@ static SYSCTL_NODE(_vm, OID_AUTO, pmap, 
 
 /* Superpages utilization enabled = 1 / disabled = 0 */
 static int sp_enabled = 1;
-SYSCTL_INT(_vm_pmap, OID_AUTO, sp_enabled, CTLFLAG_RDTUN, &sp_enabled, 0,
+SYSCTL_INT(_vm_pmap, OID_AUTO, sp_enabled, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &sp_enabled, 0,
     "Are large page mappings enabled?");
 
 SYSCTL_INT(_vm_pmap, OID_AUTO, pv_entry_count, CTLFLAG_RD, &pv_entry_count, 0,
@@ -4222,7 +4222,7 @@ pmap_free_pv_chunk(struct pv_chunk *pc)
 	/* entire chunk is free, return it */
 	m = PHYS_TO_VM_PAGE(pmap_kextract((vm_offset_t)pc));
 	pmap_qremove((vm_offset_t)pc, 1);
-	vm_page_unwire(m, 0);
+	vm_page_unwire(m, PQ_INACTIVE);
 	vm_page_free(m);
 	pmap_ptelist_free(&pv_vafree, (vm_offset_t)pc);
 

Modified: projects/nfsv4.1-server/sys/arm/at91/if_ate.c
==============================================================================
--- projects/nfsv4.1-server/sys/arm/at91/if_ate.c	Tue Jul  1 00:22:54 2014	(r268069)
+++ projects/nfsv4.1-server/sys/arm/at91/if_ate.c	Tue Jul  1 00:59:45 2014	(r268070)
@@ -671,7 +671,6 @@ ate_deactivate(struct ate_softc *sc)
 			bus_dmamem_free(sc->rx_tag, sc->rx_buf[i],
 			    sc->rx_map[i]);
 			sc->rx_buf[i] = NULL;
-			sc->rx_map[i] = NULL;
 		}
 		bus_dma_tag_destroy(sc->rx_tag);
 	}

Modified: projects/nfsv4.1-server/sys/arm/freescale/imx/imx6_anatop.c
==============================================================================
--- projects/nfsv4.1-server/sys/arm/freescale/imx/imx6_anatop.c	Tue Jul  1 00:22:54 2014	(r268069)
+++ projects/nfsv4.1-server/sys/arm/freescale/imx/imx6_anatop.c	Tue Jul  1 00:59:45 2014	(r268070)
@@ -375,12 +375,12 @@ cpufreq_initialize(struct imx6_anatop_so
 	    "CPU frequency");
 
 	SYSCTL_ADD_PROC(NULL, SYSCTL_STATIC_CHILDREN(_hw_imx6), 
-	    OID_AUTO, "cpu_minmhz", CTLTYPE_INT | CTLFLAG_RWTUN, sc, 0,
-	    cpufreq_sysctl_minmhz, "IU", "Minimum CPU frequency");
+	    OID_AUTO, "cpu_minmhz", CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_NOFETCH,
+	    sc, 0, cpufreq_sysctl_minmhz, "IU", "Minimum CPU frequency");
 
 	SYSCTL_ADD_PROC(NULL, SYSCTL_STATIC_CHILDREN(_hw_imx6),
-	    OID_AUTO, "cpu_maxmhz", CTLTYPE_INT | CTLFLAG_RWTUN, sc, 0,
-	    cpufreq_sysctl_maxmhz, "IU", "Maximum CPU frequency");
+	    OID_AUTO, "cpu_maxmhz", CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_NOFETCH,
+	    sc, 0, cpufreq_sysctl_maxmhz, "IU", "Maximum CPU frequency");
 
 	SYSCTL_ADD_INT(NULL, SYSCTL_STATIC_CHILDREN(_hw_imx6),
 	    OID_AUTO, "cpu_maxmhz_hw", CTLFLAG_RD, &sc->cpu_maxmhz_hw, 0, 
@@ -413,9 +413,6 @@ cpufreq_initialize(struct imx6_anatop_so
 	sc->cpu_maxmhz_hw = imx6_ocotp_mhz_tab[cfg3speed];
 	sc->cpu_maxmhz = sc->cpu_maxmhz_hw;
 
-	TUNABLE_INT_FETCH("hw.imx6.cpu_overclock_enable",
-	    &sc->cpu_overclock_enable);
-
 	TUNABLE_INT_FETCH("hw.imx6.cpu_minmhz", &sc->cpu_minmhz);
 	op = cpufreq_nearest_oppt(sc, sc->cpu_minmhz);
 	sc->cpu_minmhz = op->mhz;

Modified: projects/nfsv4.1-server/sys/arm/freescale/vybrid/files.vybrid
==============================================================================
--- projects/nfsv4.1-server/sys/arm/freescale/vybrid/files.vybrid	Tue Jul  1 00:22:54 2014	(r268069)
+++ projects/nfsv4.1-server/sys/arm/freescale/vybrid/files.vybrid	Tue Jul  1 00:59:45 2014	(r268070)
@@ -23,6 +23,7 @@ arm/freescale/vybrid/vf_src.c			standard
 arm/freescale/vybrid/vf_edma.c			standard
 arm/freescale/vybrid/vf_dmamux.c		standard
 arm/freescale/vybrid/vf_port.c			standard
+arm/freescale/vybrid/vf_adc.c			standard
 arm/freescale/vybrid/vf_i2c.c			optional	iicbus
 arm/freescale/vybrid/vf_tcon.c			optional	vt
 arm/freescale/vybrid/vf_dcu4.c			optional	vt

Copied: projects/nfsv4.1-server/sys/arm/freescale/vybrid/vf_adc.c (from r268069, head/sys/arm/freescale/vybrid/vf_adc.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/nfsv4.1-server/sys/arm/freescale/vybrid/vf_adc.c	Tue Jul  1 00:59:45 2014	(r268070, copy of r268069, head/sys/arm/freescale/vybrid/vf_adc.c)
@@ -0,0 +1,245 @@
+/*-
+ * Copyright (c) 2014 Ruslan Bukin <br at bsdpad.com>
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+ * Vybrid Family 12-bit Analog to Digital Converter (ADC)
+ * Chapter 37, Vybrid Reference Manual, Rev. 5, 07/2013
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
+#include <sys/malloc.h>
+#include <sys/rman.h>
+#include <sys/timeet.h>
+#include <sys/timetc.h>
+
+#include <dev/fdt/fdt_common.h>
+#include <dev/ofw/openfirm.h>
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+
+#include <machine/bus.h>
+#include <machine/fdt.h>
+#include <machine/cpu.h>
+#include <machine/intr.h>
+
+#include <arm/freescale/vybrid/vf_common.h>
+#include <arm/freescale/vybrid/vf_adc.h>
+
+#define	ADC_HC0		0x00		/* Ctrl reg for hardware triggers */
+#define	ADC_HC1		0x04		/* Ctrl reg for hardware triggers */
+#define	 HC_AIEN	(1 << 7)	/* Conversion Complete Int Control */
+#define	 HC_ADCH_M	0x1f		/* Input Channel Select Mask */
+#define	 HC_ADCH_S	0		/* Input Channel Select Shift */
+#define	ADC_HS		0x08		/* Status register for HW triggers */
+#define	 HS_COCO0	(1 << 0)	/* Conversion Complete Flag */
+#define	 HS_COCO1	(1 << 1)	/* Conversion Complete Flag */
+#define	ADC_R0		0x0C		/* Data result reg for HW triggers */
+#define	ADC_R1		0x10		/* Data result reg for HW triggers */
+#define	ADC_CFG		0x14		/* Configuration register */
+#define	 CFG_OVWREN	(1 << 16)	/* Data Overwrite Enable */
+#define	 CFG_AVGS_M	0x3		/* Hardware Average select Mask */
+#define	 CFG_AVGS_S	14		/* Hardware Average select Shift */
+#define	 CFG_ADTRG	(1 << 13)	/* Conversion Trigger Select */
+#define	 CFG_REFSEL_M	0x3		/* Voltage Reference Select Mask */
+#define	 CFG_REFSEL_S	11		/* Voltage Reference Select Shift */
+#define	 CFG_ADHSC	(1 << 10)	/* High Speed Configuration */
+#define	 CFG_ADSTS_M	0x3		/* Defines the sample time duration */
+#define	 CFG_ADSTS_S	8		/* Defines the sample time duration */
+#define	 CFG_ADLPC	(1 << 7)	/* Low-Power Configuration */
+#define	 CFG_ADIV_M	0x3		/* Clock Divide Select */
+#define	 CFG_ADIV_S	5		/* Clock Divide Select */
+#define	 CFG_ADLSMP	(1 << 4)	/* Long Sample Time Configuration */
+#define	 CFG_MODE_M	0x3		/* Conversion Mode Selection Mask */
+#define	 CFG_MODE_S	2		/* Conversion Mode Selection Shift */
+#define	 CFG_MODE_12	0x2		/* 12-bit mode */
+#define	 CFG_ADICLK_M	0x3		/* Input Clock Select Mask */
+#define	 CFG_ADICLK_S	0		/* Input Clock Select Shift */
+#define	ADC_GC		0x18		/* General control register */
+#define	 GC_CAL		(1 << 7)	/* Calibration */
+#define	 GC_ADCO	(1 << 6)	/* Continuous Conversion Enable */
+#define	 GC_AVGE	(1 << 5)	/* Hardware average enable */
+#define	 GC_ACFE	(1 << 4)	/* Compare Function Enable */
+#define	 GC_ACFGT	(1 << 3)	/* Compare Function Greater Than En */
+#define	 GC_ACREN	(1 << 2)	/* Compare Function Range En */
+#define	 GC_DMAEN	(1 << 1)	/* DMA Enable */
+#define	 GC_ADACKEN	(1 << 0)	/* Asynchronous clock output enable */
+#define	ADC_GS		0x1C		/* General status register */
+#define	 GS_AWKST	(1 << 2)	/* Asynchronous wakeup int status */
+#define	 GS_CALF	(1 << 1)	/* Calibration Failed Flag */
+#define	 GS_ADACT	(1 << 0)	/* Conversion Active */
+#define	ADC_CV		0x20		/* Compare value register */
+#define	 CV_CV2_M	0xfff		/* Compare Value 2 Mask */
+#define	 CV_CV2_S	16		/* Compare Value 2 Shift */
+#define	 CV_CV1_M	0xfff		/* Compare Value 1 Mask */
+#define	 CV_CV1_S	0		/* Compare Value 1 Shift */
+#define	ADC_OFS		0x24		/* Offset correction value register */
+#define	 OFS_SIGN	12		/* Sign bit */
+#define	 OFS_M		0xfff		/* Offset value Mask */
+#define	 OFS_S		0		/* Offset value Shift */
+#define	ADC_CAL		0x28		/* Calibration value register */
+#define	 CAL_CODE_M	0xf		/* Calibration Result Value Mask */
+#define	 CAL_CODE_S	0		/* Calibration Result Value Shift */
+#define	ADC_PCTL	0x30		/* Pin control register */
+
+struct adc_softc {
+	struct resource		*res[2];
+	bus_space_tag_t		bst;
+	bus_space_handle_t	bsh;
+	void			*ih;
+};
+
+struct adc_softc *adc_sc;
+
+static struct resource_spec adc_spec[] = {
+	{ SYS_RES_MEMORY,	0,	RF_ACTIVE },
+	{ SYS_RES_IRQ,		0,	RF_ACTIVE },
+	{ -1, 0 }
+};
+
+static int
+adc_probe(device_t dev)
+{
+
+	if (!ofw_bus_status_okay(dev))
+		return (ENXIO);
+
+	if (!ofw_bus_is_compatible(dev, "fsl,mvf600-adc"))
+		return (ENXIO);
+
+	device_set_desc(dev, "Vybrid Family "
+	    "12-bit Analog to Digital Converter");
+	return (BUS_PROBE_DEFAULT);
+}
+
+static void
+adc_intr(void *arg)
+{
+	struct adc_softc *sc;
+
+	sc = arg;
+
+	/* Conversation complete */
+}
+
+uint32_t
+adc_read(void)
+{
+	struct adc_softc *sc;
+
+	sc = adc_sc;
+	if (sc == NULL)
+		return (0);
+
+	return (READ4(sc, ADC_R0));
+}
+
+uint32_t
+adc_enable(int channel)
+{
+	struct adc_softc *sc;
+	int reg;
+
+	sc = adc_sc;
+	if (sc == NULL)
+		return (1);
+
+	reg = READ4(sc, ADC_HC0);
+	reg &= ~(HC_ADCH_M << HC_ADCH_S);
+	reg |= (channel << HC_ADCH_S);
+	WRITE4(sc, ADC_HC0, reg);
+
+	return (0);
+}
+
+static int
+adc_attach(device_t dev)
+{
+	struct adc_softc *sc;
+	int err;
+	int reg;
+
+	sc = device_get_softc(dev);
+
+	if (bus_alloc_resources(dev, adc_spec, sc->res)) {
+		device_printf(dev, "could not allocate resources\n");
+		return (ENXIO);
+	}
+
+	/* Memory interface */
+	sc->bst = rman_get_bustag(sc->res[0]);
+	sc->bsh = rman_get_bushandle(sc->res[0]);
+
+	adc_sc = sc;
+
+	/* Setup interrupt handler */
+	err = bus_setup_intr(dev, sc->res[1], INTR_TYPE_BIO | INTR_MPSAFE,
+	    NULL, adc_intr, sc, &sc->ih);
+	if (err) {
+		device_printf(dev, "Unable to alloc interrupt resource.\n");
+		return (ENXIO);
+	}
+
+	/* Configure 12-bit mode */
+	reg = READ4(sc, ADC_CFG);
+	reg &= ~(CFG_MODE_M << CFG_MODE_S);
+	reg |= (CFG_MODE_12 << CFG_MODE_S); /* 12bit */
+	WRITE4(sc, ADC_CFG, reg);
+
+	/* Configure for continuous conversion */
+	reg = READ4(sc, ADC_GC);
+	reg |= (GC_ADCO | GC_AVGE);
+	WRITE4(sc, ADC_GC, reg);
+
+	/* Disable interrupts */
+	reg = READ4(sc, ADC_HC0);
+	reg &= HC_AIEN;
+	WRITE4(sc, ADC_HC0, reg);
+
+	return (0);
+}
+
+static device_method_t adc_methods[] = {
+	DEVMETHOD(device_probe,		adc_probe),
+	DEVMETHOD(device_attach,	adc_attach),
+	{ 0, 0 }
+};
+
+static driver_t adc_driver = {
+	"adc",
+	adc_methods,
+	sizeof(struct adc_softc),
+};
+
+static devclass_t adc_devclass;
+
+DRIVER_MODULE(adc, simplebus, adc_driver, adc_devclass, 0, 0);

Copied: projects/nfsv4.1-server/sys/arm/freescale/vybrid/vf_adc.h (from r268069, head/sys/arm/freescale/vybrid/vf_adc.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/nfsv4.1-server/sys/arm/freescale/vybrid/vf_adc.h	Tue Jul  1 00:59:45 2014	(r268070, copy of r268069, head/sys/arm/freescale/vybrid/vf_adc.h)
@@ -0,0 +1,30 @@
+/*-
+ * Copyright (c) 2014 Ruslan Bukin <br at bsdpad.com>
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+uint32_t adc_read(void);
+uint32_t adc_enable(int);

Modified: projects/nfsv4.1-server/sys/arm/include/cpu.h
==============================================================================
--- projects/nfsv4.1-server/sys/arm/include/cpu.h	Tue Jul  1 00:22:54 2014	(r268069)
+++ projects/nfsv4.1-server/sys/arm/include/cpu.h	Tue Jul  1 00:59:45 2014	(r268070)
@@ -25,7 +25,16 @@ get_cyclecount(void)
 	 * Read PMCCNTR. Curses! Its only 32 bits.
 	 * TODO: Fix this by catching overflow with interrupt?
 	 */
+/* The ARMv6 vs ARMv7 divide is going to need a better way of
+ * distinguishing between them.
+ */
+#if defined(CPU_ARM1136) || defined(CPU_ARM1176)
+	/* ARMv6 - Earlier model SCCs */
+	__asm __volatile("mrc p15, 0, %0, c15, c12, 1": "=r" (ccnt));
+#else
+	/* ARMv7 - Later model SCCs */
 	__asm __volatile("mrc p15, 0, %0, c9, c13, 0": "=r" (ccnt));
+#endif
 	ccnt64 = (uint64_t)ccnt;
 	return (ccnt64);
 #else /* No performance counters, so use binuptime(9). This is slooooow */

Modified: projects/nfsv4.1-server/sys/arm/xscale/ixp425/if_npe.c
==============================================================================
--- projects/nfsv4.1-server/sys/arm/xscale/ixp425/if_npe.c	Tue Jul  1 00:22:54 2014	(r268069)
+++ projects/nfsv4.1-server/sys/arm/xscale/ixp425/if_npe.c	Tue Jul  1 00:59:45 2014	(r268070)
@@ -255,9 +255,8 @@ static SYSCTL_NODE(_hw, OID_AUTO, npe, C
     "IXP4XX NPE driver parameters");
 
 static int npe_debug = 0;
-SYSCTL_INT(_hw_npe, OID_AUTO, debug, CTLFLAG_RW, &npe_debug,
+SYSCTL_INT(_hw_npe, OID_AUTO, debug, CTLFLAG_RWTUN, &npe_debug,
 	   0, "IXP4XX NPE network interface debug msgs");
-TUNABLE_INT("hw.npe.debug", &npe_debug);
 #define	DPRINTF(sc, fmt, ...) do {					\
 	if (sc->sc_debug) device_printf(sc->sc_dev, fmt, __VA_ARGS__);	\
 } while (0)
@@ -265,18 +264,15 @@ TUNABLE_INT("hw.npe.debug", &npe_debug);
 	if (sc->sc_debug >= n) device_printf(sc->sc_dev, fmt, __VA_ARGS__);\
 } while (0)
 static int npe_tickinterval = 3;		/* npe_tick frequency (secs) */
-SYSCTL_INT(_hw_npe, OID_AUTO, tickinterval, CTLFLAG_RD, &npe_tickinterval,
+SYSCTL_INT(_hw_npe, OID_AUTO, tickinterval, CTLFLAG_RDTUN, &npe_tickinterval,
 	    0, "periodic work interval (secs)");
-TUNABLE_INT("hw.npe.tickinterval", &npe_tickinterval);
 
 static	int npe_rxbuf = 64;		/* # rx buffers to allocate */
-SYSCTL_INT(_hw_npe, OID_AUTO, rxbuf, CTLFLAG_RD, &npe_rxbuf,
+SYSCTL_INT(_hw_npe, OID_AUTO, rxbuf, CTLFLAG_RDTUN, &npe_rxbuf,
 	    0, "rx buffers allocated");
-TUNABLE_INT("hw.npe.rxbuf", &npe_rxbuf);
 static	int npe_txbuf = 128;		/* # tx buffers to allocate */
-SYSCTL_INT(_hw_npe, OID_AUTO, txbuf, CTLFLAG_RD, &npe_txbuf,
+SYSCTL_INT(_hw_npe, OID_AUTO, txbuf, CTLFLAG_RDTUN, &npe_txbuf,
 	    0, "tx buffers allocated");
-TUNABLE_INT("hw.npe.txbuf", &npe_txbuf);
 
 static int
 unit2npeid(int unit)

Modified: projects/nfsv4.1-server/sys/arm/xscale/ixp425/ixp425_npe.c
==============================================================================
--- projects/nfsv4.1-server/sys/arm/xscale/ixp425/ixp425_npe.c	Tue Jul  1 00:22:54 2014	(r268069)
+++ projects/nfsv4.1-server/sys/arm/xscale/ixp425/ixp425_npe.c	Tue Jul  1 00:59:45 2014	(r268070)
@@ -181,9 +181,8 @@ typedef struct {
 } IxNpeDlNpeMgrStateInfoBlock;
 
 static int npe_debug = 0;
-SYSCTL_INT(_debug, OID_AUTO, ixp425npe, CTLFLAG_RW, &npe_debug,
+SYSCTL_INT(_debug, OID_AUTO, ixp425npe, CTLFLAG_RWTUN, &npe_debug,
 	   0, "IXP4XX NPE debug msgs");
-TUNABLE_INT("debug.ixp425npe", &npe_debug);
 #define	DPRINTF(dev, fmt, ...) do {					\
 	if (npe_debug) device_printf(dev, fmt, __VA_ARGS__);		\
 } while (0)

Modified: projects/nfsv4.1-server/sys/arm/xscale/ixp425/ixp425_qmgr.c
==============================================================================
--- projects/nfsv4.1-server/sys/arm/xscale/ixp425/ixp425_qmgr.c	Tue Jul  1 00:22:54 2014	(r268069)
+++ projects/nfsv4.1-server/sys/arm/xscale/ixp425/ixp425_qmgr.c	Tue Jul  1 00:59:45 2014	(r268070)
@@ -159,10 +159,9 @@ struct ixpqmgr_softc {
 	uint32_t		aqmFreeSramAddress;	/* SRAM free space */
 };
 
-static int qmgr_debug = 0;
-SYSCTL_INT(_debug, OID_AUTO, qmgr, CTLFLAG_RW, &qmgr_debug,
+static int qmgr_debug;
+SYSCTL_INT(_debug, OID_AUTO, qmgr, CTLFLAG_RWTUN, &qmgr_debug,
 	   0, "IXP4XX Q-Manager debug msgs");

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

More information about the svn-src-projects mailing list