svn commit: r319478 - in projects/pnfs-planb-server/sys: . amd64/acpica amd64/amd64 amd64/include amd64/linux arm/arm arm/conf arm/include arm/mv arm/mv/armada arm/mv/armada38x arm64/arm64 arm64/co...

Thu Jun 1 22:13:50 UTC 2017

Author: rmacklem
Date: Thu Jun  1 22:13:46 2017
New Revision: 319478
URL: https://svnweb.freebsd.org/changeset/base/319478

Log:
  Update the kernel to the one in head.

Added:
  projects/pnfs-planb-server/sys/arm/mv/armada/wdt.c
     - copied unchanged from r319477, head/sys/arm/mv/armada/wdt.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/common/dmswitch.c
     - copied unchanged from r319477, head/sys/contrib/dev/acpica/common/dmswitch.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/utilities/utresdecode.c
     - copied unchanged from r319477, head/sys/contrib/dev/acpica/components/utilities/utresdecode.c
  projects/pnfs-planb-server/sys/dev/acpica/acpi_container.c
     - copied unchanged from r319477, head/sys/dev/acpica/acpi_container.c
  projects/pnfs-planb-server/sys/dev/ath/ah_osdep_ar5210.c
     - copied unchanged from r319477, head/sys/dev/ath/ah_osdep_ar5210.c
  projects/pnfs-planb-server/sys/dev/ath/ah_osdep_ar5211.c
     - copied unchanged from r319477, head/sys/dev/ath/ah_osdep_ar5211.c
  projects/pnfs-planb-server/sys/dev/ath/ah_osdep_ar5212.c
     - copied unchanged from r319477, head/sys/dev/ath/ah_osdep_ar5212.c
  projects/pnfs-planb-server/sys/dev/ath/ah_osdep_ar5416.c
     - copied unchanged from r319477, head/sys/dev/ath/ah_osdep_ar5416.c
  projects/pnfs-planb-server/sys/dev/ath/ah_osdep_ar9300.c
     - copied unchanged from r319477, head/sys/dev/ath/ah_osdep_ar9300.c
  projects/pnfs-planb-server/sys/dev/ath/if_ath_dfs.c
     - copied unchanged from r319477, head/sys/dev/ath/if_ath_dfs.c
  projects/pnfs-planb-server/sys/dev/ath/if_ath_drv.c
     - copied unchanged from r319477, head/sys/dev/ath/if_ath_drv.c
  projects/pnfs-planb-server/sys/dev/ath/if_ath_rate.c
     - copied unchanged from r319477, head/sys/dev/ath/if_ath_rate.c
  projects/pnfs-planb-server/sys/dev/cxgbe/crypto/
     - copied from r319477, head/sys/dev/cxgbe/crypto/
  projects/pnfs-planb-server/sys/dev/cxgbe/firmware/t4fw-1.16.45.0.bin.uu
     - copied unchanged from r319477, head/sys/dev/cxgbe/firmware/t4fw-1.16.45.0.bin.uu
  projects/pnfs-planb-server/sys/dev/cxgbe/firmware/t5fw-1.16.45.0.bin.uu
     - copied unchanged from r319477, head/sys/dev/cxgbe/firmware/t5fw-1.16.45.0.bin.uu
  projects/pnfs-planb-server/sys/dev/cxgbe/firmware/t6fw-1.16.45.0.bin.uu
     - copied unchanged from r319477, head/sys/dev/cxgbe/firmware/t6fw-1.16.45.0.bin.uu
  projects/pnfs-planb-server/sys/dev/ena/
     - copied from r319477, head/sys/dev/ena/
  projects/pnfs-planb-server/sys/dev/hyperv/vmbus/vmbus_res.c
     - copied unchanged from r319477, head/sys/dev/hyperv/vmbus/vmbus_res.c
  projects/pnfs-planb-server/sys/dev/iwm/if_iwm_constants.h
     - copied unchanged from r319477, head/sys/dev/iwm/if_iwm_constants.h
  projects/pnfs-planb-server/sys/dev/iwm/if_iwm_sta.c
     - copied unchanged from r319477, head/sys/dev/iwm/if_iwm_sta.c
  projects/pnfs-planb-server/sys/dev/iwm/if_iwm_sta.h
     - copied unchanged from r319477, head/sys/dev/iwm/if_iwm_sta.h
  projects/pnfs-planb-server/sys/dev/mpr/mpi/mpi2_pci.h
     - copied unchanged from r319477, head/sys/dev/mpr/mpi/mpi2_pci.h
  projects/pnfs-planb-server/sys/fs/ext2fs/ext2_acl.c
     - copied unchanged from r319477, head/sys/fs/ext2fs/ext2_acl.c
  projects/pnfs-planb-server/sys/fs/ext2fs/ext2_acl.h
     - copied unchanged from r319477, head/sys/fs/ext2fs/ext2_acl.h
  projects/pnfs-planb-server/sys/mips/atheros/ar71xx_caldata.c
     - copied unchanged from r319477, head/sys/mips/atheros/ar71xx_caldata.c
  projects/pnfs-planb-server/sys/mips/conf/std.AR724X
     - copied unchanged from r319477, head/sys/mips/conf/std.AR724X
  projects/pnfs-planb-server/sys/modules/ath_dfs/
     - copied from r319477, head/sys/modules/ath_dfs/
  projects/pnfs-planb-server/sys/modules/ath_hal/
     - copied from r319477, head/sys/modules/ath_hal/
  projects/pnfs-planb-server/sys/modules/ath_hal_ar5210/
     - copied from r319477, head/sys/modules/ath_hal_ar5210/
  projects/pnfs-planb-server/sys/modules/ath_hal_ar5211/
     - copied from r319477, head/sys/modules/ath_hal_ar5211/
  projects/pnfs-planb-server/sys/modules/ath_hal_ar5212/
     - copied from r319477, head/sys/modules/ath_hal_ar5212/
  projects/pnfs-planb-server/sys/modules/ath_hal_ar5416/
     - copied from r319477, head/sys/modules/ath_hal_ar5416/
  projects/pnfs-planb-server/sys/modules/ath_hal_ar9300/
     - copied from r319477, head/sys/modules/ath_hal_ar9300/
  projects/pnfs-planb-server/sys/modules/ath_main/
     - copied from r319477, head/sys/modules/ath_main/
  projects/pnfs-planb-server/sys/modules/ath_rate/
     - copied from r319477, head/sys/modules/ath_rate/
  projects/pnfs-planb-server/sys/modules/cxgbe/ccr/
     - copied from r319477, head/sys/modules/cxgbe/ccr/
  projects/pnfs-planb-server/sys/modules/dtb/mv/
     - copied from r319477, head/sys/modules/dtb/mv/
  projects/pnfs-planb-server/sys/modules/ena/
     - copied from r319477, head/sys/modules/ena/
  projects/pnfs-planb-server/sys/modules/tests/Makefile
     - copied unchanged from r319477, head/sys/modules/tests/Makefile
Deleted:
  projects/pnfs-planb-server/sys/dev/cxgbe/firmware/t4fw-1.16.26.0.bin.uu
  projects/pnfs-planb-server/sys/dev/cxgbe/firmware/t5fw-1.16.26.0.bin.uu
  projects/pnfs-planb-server/sys/dev/cxgbe/firmware/t6fw-1.16.26.0.bin.uu
  projects/pnfs-planb-server/sys/mips/conf/AR724X_BASE
Modified:
  projects/pnfs-planb-server/sys/Makefile
  projects/pnfs-planb-server/sys/amd64/acpica/acpi_wakecode.S
  projects/pnfs-planb-server/sys/amd64/amd64/cpu_switch.S
  projects/pnfs-planb-server/sys/amd64/amd64/pmap.c
  projects/pnfs-planb-server/sys/amd64/amd64/sys_machdep.c
  projects/pnfs-planb-server/sys/amd64/amd64/vm_machdep.c
  projects/pnfs-planb-server/sys/amd64/include/vmparam.h
  projects/pnfs-planb-server/sys/amd64/linux/linux.h
  projects/pnfs-planb-server/sys/arm/arm/busdma_machdep-v4.c
  projects/pnfs-planb-server/sys/arm/arm/busdma_machdep-v6.c
  projects/pnfs-planb-server/sys/arm/arm/pmap-v6.c
  projects/pnfs-planb-server/sys/arm/arm/sys_machdep.c
  projects/pnfs-planb-server/sys/arm/arm/vm_machdep.c
  projects/pnfs-planb-server/sys/arm/conf/ARMADA38X
  projects/pnfs-planb-server/sys/arm/conf/NOTES
  projects/pnfs-planb-server/sys/arm/include/atomic-v4.h
  projects/pnfs-planb-server/sys/arm/include/pmap-v6.h
  projects/pnfs-planb-server/sys/arm/include/vmparam.h
  projects/pnfs-planb-server/sys/arm/mv/armada38x/armada38x.c
  projects/pnfs-planb-server/sys/arm/mv/armada38x/armada38x_mp.c
  projects/pnfs-planb-server/sys/arm/mv/armada38x/files.armada38x
  projects/pnfs-planb-server/sys/arm/mv/files.mv
  projects/pnfs-planb-server/sys/arm/mv/mpic.c
  projects/pnfs-planb-server/sys/arm/mv/mv_common.c
  projects/pnfs-planb-server/sys/arm/mv/mv_pci.c
  projects/pnfs-planb-server/sys/arm/mv/mvreg.h
  projects/pnfs-planb-server/sys/arm/mv/mvwin.h
  projects/pnfs-planb-server/sys/arm64/arm64/busdma_bounce.c
  projects/pnfs-planb-server/sys/arm64/conf/GENERIC
  projects/pnfs-planb-server/sys/arm64/include/armreg.h
  projects/pnfs-planb-server/sys/arm64/include/vm.h
  projects/pnfs-planb-server/sys/boot/common/dev_net.c
  projects/pnfs-planb-server/sys/boot/efi/loader/main.c
  projects/pnfs-planb-server/sys/boot/fdt/dts/arm/armada-38x.dtsi
  projects/pnfs-planb-server/sys/boot/i386/loader/Makefile
  projects/pnfs-planb-server/sys/boot/i386/loader/Makefile.depend
  projects/pnfs-planb-server/sys/boot/i386/pxeldr/pxeboot.8
  projects/pnfs-planb-server/sys/boot/i386/zfsloader/Makefile.depend
  projects/pnfs-planb-server/sys/boot/mips/beri/boot2/Makefile
  projects/pnfs-planb-server/sys/bsm/audit.h
  projects/pnfs-planb-server/sys/cam/ata/ata_xpt.c
  projects/pnfs-planb-server/sys/cam/scsi/scsi_da.c
  projects/pnfs-planb-server/sys/cam/scsi/scsi_xpt.c
  projects/pnfs-planb-server/sys/cddl/compat/opensolaris/sys/dirent.h
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_bookmark.c
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deadlist.c
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/multilist.c
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/multilist.h
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
  projects/pnfs-planb-server/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c
  projects/pnfs-planb-server/sys/cddl/dev/fbt/powerpc/fbt_isa.c
  projects/pnfs-planb-server/sys/cddl/dev/profile/profile.c
  projects/pnfs-planb-server/sys/compat/freebsd32/capabilities.conf
  projects/pnfs-planb-server/sys/compat/freebsd32/freebsd32.h
  projects/pnfs-planb-server/sys/compat/freebsd32/freebsd32_misc.c
  projects/pnfs-planb-server/sys/compat/freebsd32/freebsd32_proto.h
  projects/pnfs-planb-server/sys/compat/freebsd32/freebsd32_syscall.h
  projects/pnfs-planb-server/sys/compat/freebsd32/freebsd32_syscalls.c
  projects/pnfs-planb-server/sys/compat/freebsd32/freebsd32_sysent.c
  projects/pnfs-planb-server/sys/compat/freebsd32/freebsd32_systrace_args.c
  projects/pnfs-planb-server/sys/compat/freebsd32/syscalls.master
  projects/pnfs-planb-server/sys/compat/linux/linux_file.c
  projects/pnfs-planb-server/sys/compat/linux/linux_misc.c
  projects/pnfs-planb-server/sys/compat/linuxkpi/common/include/asm/smp.h
  projects/pnfs-planb-server/sys/compat/linuxkpi/common/include/linux/compiler.h
  projects/pnfs-planb-server/sys/compat/linuxkpi/common/include/linux/device.h
  projects/pnfs-planb-server/sys/compat/linuxkpi/common/include/linux/file.h
  projects/pnfs-planb-server/sys/compat/linuxkpi/common/include/linux/fs.h
  projects/pnfs-planb-server/sys/compat/linuxkpi/common/include/linux/idr.h
  projects/pnfs-planb-server/sys/compat/linuxkpi/common/include/linux/io.h
  projects/pnfs-planb-server/sys/compat/linuxkpi/common/include/linux/kernel.h
  projects/pnfs-planb-server/sys/compat/linuxkpi/common/include/linux/kthread.h
  projects/pnfs-planb-server/sys/compat/linuxkpi/common/include/linux/mm_types.h
  projects/pnfs-planb-server/sys/compat/linuxkpi/common/include/linux/module.h
  projects/pnfs-planb-server/sys/compat/linuxkpi/common/include/linux/pci.h
  projects/pnfs-planb-server/sys/compat/linuxkpi/common/include/linux/poll.h
  projects/pnfs-planb-server/sys/compat/linuxkpi/common/include/linux/preempt.h
  projects/pnfs-planb-server/sys/compat/linuxkpi/common/include/linux/printk.h
  projects/pnfs-planb-server/sys/compat/linuxkpi/common/include/linux/types.h
  projects/pnfs-planb-server/sys/compat/linuxkpi/common/src/linux_compat.c
  projects/pnfs-planb-server/sys/compat/linuxkpi/common/src/linux_current.c
  projects/pnfs-planb-server/sys/compat/linuxkpi/common/src/linux_idr.c
  projects/pnfs-planb-server/sys/compat/linuxkpi/common/src/linux_page.c
  projects/pnfs-planb-server/sys/compat/linuxkpi/common/src/linux_rcu.c
  projects/pnfs-planb-server/sys/compat/ndis/kern_ndis.c
  projects/pnfs-planb-server/sys/compat/ndis/subr_ndis.c
  projects/pnfs-planb-server/sys/conf/NOTES
  projects/pnfs-planb-server/sys/conf/config.mk
  projects/pnfs-planb-server/sys/conf/files
  projects/pnfs-planb-server/sys/conf/files.amd64
  projects/pnfs-planb-server/sys/conf/files.i386
  projects/pnfs-planb-server/sys/conf/kern.opts.mk
  projects/pnfs-planb-server/sys/conf/kern.post.mk
  projects/pnfs-planb-server/sys/conf/kern.pre.mk
  projects/pnfs-planb-server/sys/contrib/dev/acpica/acpica_prep.sh
  projects/pnfs-planb-server/sys/contrib/dev/acpica/changes.txt
  projects/pnfs-planb-server/sys/contrib/dev/acpica/common/acfileio.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/common/adfile.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/common/adisasm.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/common/adwalk.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/common/ahids.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/common/ahpredef.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/common/ahtable.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/common/ahuuids.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/common/dmextern.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/common/dmrestag.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/common/dmtable.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/common/dmtbdump.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/common/dmtbinfo.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslascii.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslcompile.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslcompiler.h
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslcompiler.l
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/asldefine.h
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslexternal.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslglobal.h
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslhelp.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslhelpers.y
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslload.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslmain.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslmap.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/asloffset.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/asloptions.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslparser.y
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslresource.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslresources.y
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslrestype2s.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslrules.y
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslstartup.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslsupport.l
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/asltokens.y
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/asltree.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/asltypes.y
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslutils.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/aslxref.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/cvcompiler.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/cvdisasm.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/cvparser.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/dtcompiler.h
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/dtfield.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/dttable1.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/dttable2.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/dttemplate.h
  projects/pnfs-planb-server/sys/contrib/dev/acpica/compiler/dtutils.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/debugger/dbexec.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/debugger/dbobject.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/debugger/dbxface.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/disassembler/dmbuffer.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/disassembler/dmdeferred.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/disassembler/dmopcode.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/disassembler/dmresrc.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/disassembler/dmresrcl2.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/disassembler/dmwalk.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/dispatcher/dsargs.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/dispatcher/dsdebug.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/dispatcher/dsmethod.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/dispatcher/dsopcode.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/dispatcher/dsutils.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/dispatcher/dswexec.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/dispatcher/dswload.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/dispatcher/dswload2.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/events/evxfevnt.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/executer/exdebug.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/executer/exdump.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/executer/exoparg1.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/executer/exresolv.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/namespace/nsaccess.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/namespace/nsnames.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/namespace/nsutils.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/namespace/nsxfeval.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/parser/psobject.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/parser/psopcode.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/parser/psparse.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/resources/rscalc.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/resources/rsdump.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/resources/rsdumpinfo.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/resources/rsinfo.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/resources/rsmisc.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/resources/rsserial.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/tables/tbfadt.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/tables/tbutils.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/utilities/utdecode.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/utilities/utownerid.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/utilities/utresrc.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/components/utilities/utxfmutex.c
  projects/pnfs-planb-server/sys/contrib/dev/acpica/include/acapps.h
  projects/pnfs-planb-server/sys/contrib/dev/acpica/include/acdisasm.h
  projects/pnfs-planb-server/sys/contrib/dev/acpica/include/acglobal.h
  projects/pnfs-planb-server/sys/contrib/dev/acpica/include/aclocal.h
  projects/pnfs-planb-server/sys/contrib/dev/acpica/include/acopcode.h
  projects/pnfs-planb-server/sys/contrib/dev/acpica/include/acpixf.h
  projects/pnfs-planb-server/sys/contrib/dev/acpica/include/acpredef.h
  projects/pnfs-planb-server/sys/contrib/dev/acpica/include/acresrc.h
  projects/pnfs-planb-server/sys/contrib/dev/acpica/include/acrestyp.h
  projects/pnfs-planb-server/sys/contrib/dev/acpica/include/actbl1.h
  projects/pnfs-planb-server/sys/contrib/dev/acpica/include/actbl2.h
  projects/pnfs-planb-server/sys/contrib/dev/acpica/include/actbl3.h
  projects/pnfs-planb-server/sys/contrib/dev/acpica/include/actypes.h
  projects/pnfs-planb-server/sys/contrib/dev/acpica/include/acutils.h
  projects/pnfs-planb-server/sys/contrib/dev/acpica/include/acuuid.h
  projects/pnfs-planb-server/sys/contrib/dev/acpica/include/amlcode.h
  projects/pnfs-planb-server/sys/contrib/dev/acpica/include/amlresrc.h
  projects/pnfs-planb-server/sys/contrib/dev/acpica/include/platform/acgcc.h
  projects/pnfs-planb-server/sys/contrib/dev/acpica/os_specific/service_layers/osunixxf.c
  projects/pnfs-planb-server/sys/contrib/ipfilter/netinet/ip_fil.h
  projects/pnfs-planb-server/sys/contrib/ipfilter/netinet/ip_nat.c
  projects/pnfs-planb-server/sys/contrib/ipfilter/netinet/ip_sync.c
  projects/pnfs-planb-server/sys/crypto/des/des_enc.c
  projects/pnfs-planb-server/sys/crypto/des/des_setkey.c
  projects/pnfs-planb-server/sys/ddb/db_access.c
  projects/pnfs-planb-server/sys/ddb/db_output.c
  projects/pnfs-planb-server/sys/ddb/db_sym.c
  projects/pnfs-planb-server/sys/dev/acpica/acpi_pcib_acpi.c
  projects/pnfs-planb-server/sys/dev/ath/ah_osdep.c
  projects/pnfs-planb-server/sys/dev/ath/ath_dfs/null/dfs_null.c
  projects/pnfs-planb-server/sys/dev/ath/ath_hal/ah.c
  projects/pnfs-planb-server/sys/dev/ath/ath_hal/ah_desc.h
  projects/pnfs-planb-server/sys/dev/ath/ath_hal/ah_internal.h
  projects/pnfs-planb-server/sys/dev/ath/ath_rate/sample/sample.c
  projects/pnfs-planb-server/sys/dev/ath/if_ath.c
  projects/pnfs-planb-server/sys/dev/ath/if_ath_ahb.c
  projects/pnfs-planb-server/sys/dev/ath/if_ath_pci.c
  projects/pnfs-planb-server/sys/dev/ath/if_ath_rx.c
  projects/pnfs-planb-server/sys/dev/atkbdc/psm.c
  projects/pnfs-planb-server/sys/dev/bhnd/cores/chipc/chipcreg.h
  projects/pnfs-planb-server/sys/dev/bhnd/cores/chipc/pwrctl/bhnd_pwrctl_subr.c
  projects/pnfs-planb-server/sys/dev/bhnd/nvram/bhnd_nvram_data_sprom.c
  projects/pnfs-planb-server/sys/dev/bhnd/nvram/bhnd_sprom.c
  projects/pnfs-planb-server/sys/dev/bnxt/if_bnxt.c
  projects/pnfs-planb-server/sys/dev/cesa/cesa.c
  projects/pnfs-planb-server/sys/dev/cesa/cesa.h
  projects/pnfs-planb-server/sys/dev/cs/if_cs.c
  projects/pnfs-planb-server/sys/dev/cxgbe/adapter.h
  projects/pnfs-planb-server/sys/dev/cxgbe/firmware/t4fw_cfg_uwire.txt
  projects/pnfs-planb-server/sys/dev/cxgbe/firmware/t4fw_interface.h
  projects/pnfs-planb-server/sys/dev/cxgbe/firmware/t5fw_cfg_uwire.txt
  projects/pnfs-planb-server/sys/dev/cxgbe/firmware/t6fw_cfg_uwire.txt
  projects/pnfs-planb-server/sys/dev/cxgbe/iw_cxgbe/cm.c
  projects/pnfs-planb-server/sys/dev/cxgbe/t4_main.c
  projects/pnfs-planb-server/sys/dev/cxgbe/t4_sge.c
  projects/pnfs-planb-server/sys/dev/dpaa/if_dtsec_rm.c
  projects/pnfs-planb-server/sys/dev/drm2/ttm/ttm_bo_vm.c
  projects/pnfs-planb-server/sys/dev/drm2/ttm/ttm_page_alloc.c
  projects/pnfs-planb-server/sys/dev/e1000/e1000_ich8lan.c
  projects/pnfs-planb-server/sys/dev/etherswitch/arswitch/arswitch_phy.c
  projects/pnfs-planb-server/sys/dev/etherswitch/e6000sw/e6000sw.c
  projects/pnfs-planb-server/sys/dev/etherswitch/e6000sw/e6000swreg.h
  projects/pnfs-planb-server/sys/dev/etherswitch/rtl8366/rtl8366rb.c
  projects/pnfs-planb-server/sys/dev/etherswitch/rtl8366/rtl8366rbvar.h
  projects/pnfs-planb-server/sys/dev/hyperv/vmbus/vmbus.c
  projects/pnfs-planb-server/sys/dev/if_ndis/if_ndis.c
  projects/pnfs-planb-server/sys/dev/if_ndis/if_ndisvar.h
  projects/pnfs-planb-server/sys/dev/iwm/if_iwm.c
  projects/pnfs-planb-server/sys/dev/iwm/if_iwm_7000.c
  projects/pnfs-planb-server/sys/dev/iwm/if_iwm_8000.c
  projects/pnfs-planb-server/sys/dev/iwm/if_iwm_binding.c
  projects/pnfs-planb-server/sys/dev/iwm/if_iwm_binding.h
  projects/pnfs-planb-server/sys/dev/iwm/if_iwm_fw.c
  projects/pnfs-planb-server/sys/dev/iwm/if_iwm_led.c
  projects/pnfs-planb-server/sys/dev/iwm/if_iwm_mac_ctxt.c
  projects/pnfs-planb-server/sys/dev/iwm/if_iwm_mac_ctxt.h
  projects/pnfs-planb-server/sys/dev/iwm/if_iwm_notif_wait.c
  projects/pnfs-planb-server/sys/dev/iwm/if_iwm_pcie_trans.c
  projects/pnfs-planb-server/sys/dev/iwm/if_iwm_phy_ctxt.c
  projects/pnfs-planb-server/sys/dev/iwm/if_iwm_phy_db.c
  projects/pnfs-planb-server/sys/dev/iwm/if_iwm_power.c
  projects/pnfs-planb-server/sys/dev/iwm/if_iwm_power.h
  projects/pnfs-planb-server/sys/dev/iwm/if_iwm_scan.c
  projects/pnfs-planb-server/sys/dev/iwm/if_iwm_time_event.c
  projects/pnfs-planb-server/sys/dev/iwm/if_iwm_time_event.h
  projects/pnfs-planb-server/sys/dev/iwm/if_iwm_util.c
  projects/pnfs-planb-server/sys/dev/iwm/if_iwm_util.h
  projects/pnfs-planb-server/sys/dev/iwm/if_iwmreg.h
  projects/pnfs-planb-server/sys/dev/iwm/if_iwmvar.h
  projects/pnfs-planb-server/sys/dev/ixgb/if_ixgb.c
  projects/pnfs-planb-server/sys/dev/lge/if_lge.c
  projects/pnfs-planb-server/sys/dev/md/md.c
  projects/pnfs-planb-server/sys/dev/mlx4/mlx4_core/mlx4_eq.c
  projects/pnfs-planb-server/sys/dev/mlx4/mlx4_core/mlx4_main.c
  projects/pnfs-planb-server/sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c
  projects/pnfs-planb-server/sys/dev/mlx4/mlx4_en/mlx4_en_tx.c
  projects/pnfs-planb-server/sys/dev/mpr/mpi/mpi2.h
  projects/pnfs-planb-server/sys/dev/mpr/mpi/mpi2_cnfg.h
  projects/pnfs-planb-server/sys/dev/mpr/mpi/mpi2_hbd.h
  projects/pnfs-planb-server/sys/dev/mpr/mpi/mpi2_history.txt
  projects/pnfs-planb-server/sys/dev/mpr/mpi/mpi2_init.h
  projects/pnfs-planb-server/sys/dev/mpr/mpi/mpi2_ioc.h
  projects/pnfs-planb-server/sys/dev/mpr/mpi/mpi2_tool.h
  projects/pnfs-planb-server/sys/dev/mpr/mpr.c
  projects/pnfs-planb-server/sys/dev/mpr/mpr_config.c
  projects/pnfs-planb-server/sys/dev/mpr/mpr_mapping.c
  projects/pnfs-planb-server/sys/dev/mpr/mpr_mapping.h
  projects/pnfs-planb-server/sys/dev/mpr/mpr_pci.c
  projects/pnfs-planb-server/sys/dev/mpr/mpr_sas.c
  projects/pnfs-planb-server/sys/dev/mpr/mpr_sas.h
  projects/pnfs-planb-server/sys/dev/mpr/mpr_sas_lsi.c
  projects/pnfs-planb-server/sys/dev/mpr/mpr_table.c
  projects/pnfs-planb-server/sys/dev/mpr/mpr_table.h
  projects/pnfs-planb-server/sys/dev/mpr/mpr_user.c
  projects/pnfs-planb-server/sys/dev/mpr/mprvar.h
  projects/pnfs-planb-server/sys/dev/mps/mps.c
  projects/pnfs-planb-server/sys/dev/mps/mps_mapping.c
  projects/pnfs-planb-server/sys/dev/mps/mps_sas.c
  projects/pnfs-planb-server/sys/dev/mps/mps_sas_lsi.c
  projects/pnfs-planb-server/sys/dev/mps/mps_user.c
  projects/pnfs-planb-server/sys/dev/mps/mpsvar.h
  projects/pnfs-planb-server/sys/dev/mse/mse_isa.c
  projects/pnfs-planb-server/sys/dev/my/if_my.c
  projects/pnfs-planb-server/sys/dev/pcn/if_pcn.c
  projects/pnfs-planb-server/sys/dev/ppbus/immio.c
  projects/pnfs-planb-server/sys/dev/ppbus/vpoio.c
  projects/pnfs-planb-server/sys/dev/ppc/ppc.c
  projects/pnfs-planb-server/sys/dev/qlnx/qlnxe/ecore_dev.c
  projects/pnfs-planb-server/sys/dev/qlnx/qlnxe/qlnx_def.h
  projects/pnfs-planb-server/sys/dev/qlnx/qlnxe/qlnx_ioctl.c
  projects/pnfs-planb-server/sys/dev/qlnx/qlnxe/qlnx_os.c
  projects/pnfs-planb-server/sys/dev/qlnx/qlnxe/qlnx_os.h
  projects/pnfs-planb-server/sys/dev/qlxgb/qla_os.c
  projects/pnfs-planb-server/sys/dev/qlxgbe/ql_isr.c
  projects/pnfs-planb-server/sys/dev/qlxgbe/ql_os.c
  projects/pnfs-planb-server/sys/dev/qlxge/qls_os.c
  projects/pnfs-planb-server/sys/dev/rl/if_rl.c
  projects/pnfs-planb-server/sys/dev/rtwn/if_rtwn.c
  projects/pnfs-planb-server/sys/dev/rtwn/rtl8192c/r92c_tx.c
  projects/pnfs-planb-server/sys/dev/rtwn/rtl8192e/usb/r92eu_attach.c
  projects/pnfs-planb-server/sys/dev/rtwn/rtl8812a/r12a_tx.c
  projects/pnfs-planb-server/sys/dev/sdhci/sdhci.c
  projects/pnfs-planb-server/sys/dev/sdhci/sdhci.h
  projects/pnfs-planb-server/sys/dev/sdhci/sdhci_acpi.c
  projects/pnfs-planb-server/sys/dev/sdhci/sdhci_fdt.c
  projects/pnfs-planb-server/sys/dev/sdhci/sdhci_pci.c
  projects/pnfs-planb-server/sys/dev/snp/snp.c
  projects/pnfs-planb-server/sys/dev/sound/pci/fm801.c
  projects/pnfs-planb-server/sys/dev/sound/pcm/buffer.c
  projects/pnfs-planb-server/sys/dev/sound/pcm/feeder_mixer.c
  projects/pnfs-planb-server/sys/dev/speaker/spkr.c
  projects/pnfs-planb-server/sys/dev/tl/if_tl.c
  projects/pnfs-planb-server/sys/dev/tws/tws.h
  projects/pnfs-planb-server/sys/dev/uart/uart_bus_pci.c
  projects/pnfs-planb-server/sys/dev/usb/controller/xhci_pci.c
  projects/pnfs-planb-server/sys/dev/usb/usb_busdma.c
  projects/pnfs-planb-server/sys/dev/vmware/vmxnet3/if_vmx.c
  projects/pnfs-planb-server/sys/dev/vt/vt_core.c
  projects/pnfs-planb-server/sys/dev/wb/if_wb.c
  projects/pnfs-planb-server/sys/dev/xen/blkfront/blkfront.c
  projects/pnfs-planb-server/sys/dev/xen/netfront/netfront.c
  projects/pnfs-planb-server/sys/dev/xl/if_xl.c
  projects/pnfs-planb-server/sys/fs/cd9660/cd9660_vfsops.c
  projects/pnfs-planb-server/sys/fs/cuse/cuse.c
  projects/pnfs-planb-server/sys/fs/devfs/devfs_devs.c
  projects/pnfs-planb-server/sys/fs/devfs/devfs_vnops.c
  projects/pnfs-planb-server/sys/fs/ext2fs/ext2_extattr.c
  projects/pnfs-planb-server/sys/fs/ext2fs/ext2_vnops.c
  projects/pnfs-planb-server/sys/fs/fdescfs/fdesc_vnops.c
  projects/pnfs-planb-server/sys/fs/fifofs/fifo_vnops.c
  projects/pnfs-planb-server/sys/fs/msdosfs/bootsect.h
  projects/pnfs-planb-server/sys/fs/msdosfs/bpb.h
  projects/pnfs-planb-server/sys/fs/msdosfs/denode.h
  projects/pnfs-planb-server/sys/fs/msdosfs/direntry.h
  projects/pnfs-planb-server/sys/fs/msdosfs/fat.h
  projects/pnfs-planb-server/sys/fs/msdosfs/msdosfs_conv.c
  projects/pnfs-planb-server/sys/fs/msdosfs/msdosfs_denode.c
  projects/pnfs-planb-server/sys/fs/msdosfs/msdosfs_fat.c
  projects/pnfs-planb-server/sys/fs/msdosfs/msdosfs_lookup.c
  projects/pnfs-planb-server/sys/fs/msdosfs/msdosfs_vfsops.c
  projects/pnfs-planb-server/sys/fs/msdosfs/msdosfs_vnops.c
  projects/pnfs-planb-server/sys/fs/msdosfs/msdosfsmount.h
  projects/pnfs-planb-server/sys/fs/nandfs/nandfs_fs.h
  projects/pnfs-planb-server/sys/fs/nandfs/nandfs_vnops.c
  projects/pnfs-planb-server/sys/fs/nfs/nfsport.h
  projects/pnfs-planb-server/sys/fs/nfsclient/nfs_clcomsubs.c
  projects/pnfs-planb-server/sys/fs/nfsclient/nfs_clport.c
  projects/pnfs-planb-server/sys/fs/nfsclient/nfs_clrpcops.c
  projects/pnfs-planb-server/sys/fs/nfsclient/nfs_clvnops.c
  projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdport.c
  projects/pnfs-planb-server/sys/geom/geom_vfs.c
  projects/pnfs-planb-server/sys/geom/uzip/g_uzip.c
  projects/pnfs-planb-server/sys/i386/i386/in_cksum.c
  projects/pnfs-planb-server/sys/i386/i386/k6_mem.c
  projects/pnfs-planb-server/sys/i386/i386/machdep.c
  projects/pnfs-planb-server/sys/i386/i386/sys_machdep.c
  projects/pnfs-planb-server/sys/i386/i386/vm_machdep.c
  projects/pnfs-planb-server/sys/i386/ibcs2/ibcs2_misc.c
  projects/pnfs-planb-server/sys/i386/ibcs2/ibcs2_other.c
  projects/pnfs-planb-server/sys/i386/ibcs2/ibcs2_signal.c
  projects/pnfs-planb-server/sys/i386/ibcs2/ibcs2_socksys.c
  projects/pnfs-planb-server/sys/i386/isa/ccbque.h
  projects/pnfs-planb-server/sys/i386/isa/elink.c
  projects/pnfs-planb-server/sys/kern/capabilities.conf
  projects/pnfs-planb-server/sys/kern/inflate.c
  projects/pnfs-planb-server/sys/kern/init_sysent.c
  projects/pnfs-planb-server/sys/kern/kern_acct.c
  projects/pnfs-planb-server/sys/kern/kern_clock.c
  projects/pnfs-planb-server/sys/kern/kern_cpuset.c
  projects/pnfs-planb-server/sys/kern/kern_descrip.c
  projects/pnfs-planb-server/sys/kern/kern_exec.c
  projects/pnfs-planb-server/sys/kern/kern_fail.c
  projects/pnfs-planb-server/sys/kern/kern_mutex.c
  projects/pnfs-planb-server/sys/kern/kern_proc.c
  projects/pnfs-planb-server/sys/kern/kern_prot.c
  projects/pnfs-planb-server/sys/kern/kern_resource.c
  projects/pnfs-planb-server/sys/kern/kern_sig.c
  projects/pnfs-planb-server/sys/kern/kern_timeout.c
  projects/pnfs-planb-server/sys/kern/kern_xxx.c
  projects/pnfs-planb-server/sys/kern/makesyscalls.sh
  projects/pnfs-planb-server/sys/kern/sched_4bsd.c
  projects/pnfs-planb-server/sys/kern/subr_kobj.c
  projects/pnfs-planb-server/sys/kern/subr_sglist.c
  projects/pnfs-planb-server/sys/kern/sys_socket.c
  projects/pnfs-planb-server/sys/kern/syscalls.c
  projects/pnfs-planb-server/sys/kern/syscalls.master
  projects/pnfs-planb-server/sys/kern/systrace_args.c
  projects/pnfs-planb-server/sys/kern/sysv_msg.c
  projects/pnfs-planb-server/sys/kern/tty.c
  projects/pnfs-planb-server/sys/kern/tty_pts.c
  projects/pnfs-planb-server/sys/kern/vfs_export.c
  projects/pnfs-planb-server/sys/kern/vfs_mount.c
  projects/pnfs-planb-server/sys/kern/vfs_subr.c
  projects/pnfs-planb-server/sys/kern/vfs_syscalls.c
  projects/pnfs-planb-server/sys/kern/vfs_vnops.c
  projects/pnfs-planb-server/sys/libkern/qsort.c
  projects/pnfs-planb-server/sys/libkern/zlib.c
  projects/pnfs-planb-server/sys/mips/atheros/ar71xx_fixup.c
  projects/pnfs-planb-server/sys/mips/atheros/ar71xx_machdep.c
  projects/pnfs-planb-server/sys/mips/atheros/ar71xxreg.h
  projects/pnfs-planb-server/sys/mips/atheros/files.ar71xx
  projects/pnfs-planb-server/sys/mips/broadcom/bcm_pmu.c
  projects/pnfs-planb-server/sys/mips/cavium/cryptocteon/cavium_crypto.c
  projects/pnfs-planb-server/sys/mips/conf/AP91
  projects/pnfs-planb-server/sys/mips/conf/AP93
  projects/pnfs-planb-server/sys/mips/conf/AP93.hints
  projects/pnfs-planb-server/sys/mips/conf/ENH200
  projects/pnfs-planb-server/sys/mips/conf/PICOSTATION_M2HP
  projects/pnfs-planb-server/sys/mips/conf/ROCKET_M2HP
  projects/pnfs-planb-server/sys/mips/conf/WZR-300HP
  projects/pnfs-planb-server/sys/mips/include/cpuinfo.h
  projects/pnfs-planb-server/sys/mips/include/frame.h
  projects/pnfs-planb-server/sys/mips/include/md_var.h
  projects/pnfs-planb-server/sys/mips/include/regnum.h
  projects/pnfs-planb-server/sys/mips/mips/busdma_machdep.c
  projects/pnfs-planb-server/sys/mips/mips/cpu.c
  projects/pnfs-planb-server/sys/mips/mips/pm_machdep.c
  projects/pnfs-planb-server/sys/mips/mips/swtch.S
  projects/pnfs-planb-server/sys/mips/mips/vm_machdep.c
  projects/pnfs-planb-server/sys/modules/Makefile
  projects/pnfs-planb-server/sys/modules/ath/Makefile
  projects/pnfs-planb-server/sys/modules/cxgbe/Makefile
  projects/pnfs-planb-server/sys/modules/cxgbe/t4_firmware/Makefile
  projects/pnfs-planb-server/sys/modules/cxgbe/t5_firmware/Makefile
  projects/pnfs-planb-server/sys/modules/cxgbe/t6_firmware/Makefile
  projects/pnfs-planb-server/sys/modules/dtrace/dtaudit/Makefile
  projects/pnfs-planb-server/sys/modules/ext2fs/Makefile
  projects/pnfs-planb-server/sys/modules/hyperv/vmbus/Makefile
  projects/pnfs-planb-server/sys/modules/ipsec/Makefile
  projects/pnfs-planb-server/sys/modules/iwm/Makefile
  projects/pnfs-planb-server/sys/modules/linux/Makefile
  projects/pnfs-planb-server/sys/modules/linux64/Makefile
  projects/pnfs-planb-server/sys/modules/mmcsd/Makefile
  projects/pnfs-planb-server/sys/modules/qlnx/qlnxe/Makefile
  projects/pnfs-planb-server/sys/net/altq/altq_rio.c
  projects/pnfs-planb-server/sys/net/altq/altq_rmclass.h
  projects/pnfs-planb-server/sys/net/bpf_filter.c
  projects/pnfs-planb-server/sys/net/ethernet.h
  projects/pnfs-planb-server/sys/net/ieee8023ad_lacp.c
  projects/pnfs-planb-server/sys/net/if.c
  projects/pnfs-planb-server/sys/net/if_ethersubr.c
  projects/pnfs-planb-server/sys/net/if_lagg.c
  projects/pnfs-planb-server/sys/net/if_lagg.h
  projects/pnfs-planb-server/sys/net/if_llatbl.c
  projects/pnfs-planb-server/sys/net/if_media.c
  projects/pnfs-planb-server/sys/net/if_media.h
  projects/pnfs-planb-server/sys/net/if_var.h
  projects/pnfs-planb-server/sys/net/if_vlan.c
  projects/pnfs-planb-server/sys/net/iflib.c
  projects/pnfs-planb-server/sys/net/slcompress.c
  projects/pnfs-planb-server/sys/net80211/ieee80211_adhoc.c
  projects/pnfs-planb-server/sys/net80211/ieee80211_hostap.c
  projects/pnfs-planb-server/sys/net80211/ieee80211_ht.c
  projects/pnfs-planb-server/sys/net80211/ieee80211_ht.h
  projects/pnfs-planb-server/sys/net80211/ieee80211_input.h
  projects/pnfs-planb-server/sys/net80211/ieee80211_mesh.c
  projects/pnfs-planb-server/sys/net80211/ieee80211_output.c
  projects/pnfs-planb-server/sys/net80211/ieee80211_radiotap.h
  projects/pnfs-planb-server/sys/net80211/ieee80211_sta.c
  projects/pnfs-planb-server/sys/net80211/ieee80211_wds.c
  projects/pnfs-planb-server/sys/netinet/in.c
  projects/pnfs-planb-server/sys/netinet/in_cksum.c
  projects/pnfs-planb-server/sys/netinet/in_mcast.c
  projects/pnfs-planb-server/sys/netinet/in_pcb.c
  projects/pnfs-planb-server/sys/netinet/in_pcb.h
  projects/pnfs-planb-server/sys/netinet/ip_divert.c
  projects/pnfs-planb-server/sys/netinet/ip_icmp.c
  projects/pnfs-planb-server/sys/netinet/libalias/alias.c
  projects/pnfs-planb-server/sys/netinet/raw_ip.c
  projects/pnfs-planb-server/sys/netinet/sctp_input.c
  projects/pnfs-planb-server/sys/netinet/sctp_os_bsd.h
  projects/pnfs-planb-server/sys/netinet/sctp_output.c
  projects/pnfs-planb-server/sys/netinet/sctp_pcb.c
  projects/pnfs-planb-server/sys/netinet/sctp_sysctl.c
  projects/pnfs-planb-server/sys/netinet/sctp_usrreq.c
  projects/pnfs-planb-server/sys/netinet/tcp_input.c
  projects/pnfs-planb-server/sys/netinet/tcp_reass.c
  projects/pnfs-planb-server/sys/netinet/tcp_stacks/fastpath.c
  projects/pnfs-planb-server/sys/netinet/tcp_subr.c
  projects/pnfs-planb-server/sys/netinet/tcp_usrreq.c
  projects/pnfs-planb-server/sys/netinet/udp_usrreq.c
  projects/pnfs-planb-server/sys/netinet6/icmp6.c
  projects/pnfs-planb-server/sys/netinet6/in6_mcast.c
  projects/pnfs-planb-server/sys/netinet6/in6_pcb.c
  projects/pnfs-planb-server/sys/netinet6/ip6_output.c
  projects/pnfs-planb-server/sys/netinet6/raw_ip6.c
  projects/pnfs-planb-server/sys/netinet6/udp6_usrreq.c
  projects/pnfs-planb-server/sys/netipsec/ipsec.h
  projects/pnfs-planb-server/sys/netipsec/ipsec_input.c
  projects/pnfs-planb-server/sys/netipsec/ipsec_mbuf.c
  projects/pnfs-planb-server/sys/netipsec/ipsec_output.c
  projects/pnfs-planb-server/sys/netipsec/key_debug.c
  projects/pnfs-planb-server/sys/netipsec/key_debug.h
  projects/pnfs-planb-server/sys/netipsec/xform_ah.c
  projects/pnfs-planb-server/sys/netipsec/xform_esp.c
  projects/pnfs-planb-server/sys/netipsec/xform_ipcomp.c
  projects/pnfs-planb-server/sys/netpfil/ipfw/dn_aqm_pie.c
  projects/pnfs-planb-server/sys/netpfil/ipfw/dn_sched_fq_pie.c
  projects/pnfs-planb-server/sys/nlm/nlm_advlock.c
  projects/pnfs-planb-server/sys/opencrypto/criov.c
  projects/pnfs-planb-server/sys/opencrypto/cryptodev.h
  projects/pnfs-planb-server/sys/powerpc/booke/trap_subr.S
  projects/pnfs-planb-server/sys/powerpc/conf/NOTES
  projects/pnfs-planb-server/sys/powerpc/include/pmap.h
  projects/pnfs-planb-server/sys/powerpc/powerpc/bus_machdep.c
  projects/pnfs-planb-server/sys/powerpc/powerpc/pmap_dispatch.c
  projects/pnfs-planb-server/sys/rpc/clnt.h
  projects/pnfs-planb-server/sys/rpc/rpc_generic.c
  projects/pnfs-planb-server/sys/rpc/rpcb_clnt.c
  projects/pnfs-planb-server/sys/rpc/rpcb_prot.c
  projects/pnfs-planb-server/sys/security/audit/audit_private.h
  projects/pnfs-planb-server/sys/sys/_termios.h
  projects/pnfs-planb-server/sys/sys/_types.h
  projects/pnfs-planb-server/sys/sys/acct.h
  projects/pnfs-planb-server/sys/sys/ata.h
  projects/pnfs-planb-server/sys/sys/bitset.h
  projects/pnfs-planb-server/sys/sys/dirent.h
  projects/pnfs-planb-server/sys/sys/kobj.h
  projects/pnfs-planb-server/sys/sys/mdioctl.h
  projects/pnfs-planb-server/sys/sys/mount.h
  projects/pnfs-planb-server/sys/sys/param.h
  projects/pnfs-planb-server/sys/sys/proc.h
  projects/pnfs-planb-server/sys/sys/sglist.h
  projects/pnfs-planb-server/sys/sys/sockio.h
  projects/pnfs-planb-server/sys/sys/stat.h
  projects/pnfs-planb-server/sys/sys/syscall.h
  projects/pnfs-planb-server/sys/sys/syscall.mk
  projects/pnfs-planb-server/sys/sys/syscallsubr.h
  projects/pnfs-planb-server/sys/sys/sysproto.h
  projects/pnfs-planb-server/sys/sys/tty.h
  projects/pnfs-planb-server/sys/sys/user.h
  projects/pnfs-planb-server/sys/sys/vnode.h
  projects/pnfs-planb-server/sys/tests/callout_test/callout_test.c
  projects/pnfs-planb-server/sys/tests/framework/kern_testfrwk.c
  projects/pnfs-planb-server/sys/tools/sound/snd_fxdiv_gen.awk
  projects/pnfs-planb-server/sys/vm/swap_pager.c
  projects/pnfs-planb-server/sys/vm/uma_core.c
  projects/pnfs-planb-server/sys/vm/vm_object.c
  projects/pnfs-planb-server/sys/vm/vm_param.h
  projects/pnfs-planb-server/sys/x86/acpica/acpi_wakeup.c
  projects/pnfs-planb-server/sys/x86/include/segments.h
  projects/pnfs-planb-server/sys/x86/x86/busdma_bounce.c
  projects/pnfs-planb-server/sys/x86/x86/identcpu.c
  projects/pnfs-planb-server/sys/xdr/xdr.c
Directory Properties:
  projects/pnfs-planb-server/sys/   (props changed)
  projects/pnfs-planb-server/sys/cddl/contrib/opensolaris/   (props changed)
  projects/pnfs-planb-server/sys/contrib/dev/acpica/   (props changed)
  projects/pnfs-planb-server/sys/contrib/ipfilter/   (props changed)

Modified: projects/pnfs-planb-server/sys/Makefile
==============================================================================

--- projects/pnfs-planb-server/sys/Makefile	Thu Jun  1 21:23:04 2017	(r319477)
+++ projects/pnfs-planb-server/sys/Makefile	Thu Jun  1 22:13:46 2017	(r319478)
@@ -59,19 +59,7 @@ TAGS ${.CURDIR}/TAGS: ${.CURDIR}/cscope.files
 	rm -f ${.CURDIR}/TAGS
 	cd ${.CURDIR}; xargs etags -a < ${.CURDIR}/cscope.files
 
-# You need the textproc/glimpse ports for this.
-glimpse:
-.if !exists(${.CURDIR}/.glimpse_exclude)
-	echo .svn > ${.CURDIR}/.glimpse_exclude
-	echo /compile/ >> ${.CURDIR}/.glimpse_exclude
-.endif
-	cd ${.CURDIR}; glimpseindex -H . -B -f -o .
-
-glimpse-clean:
-	cd ${.CURDIR}; rm -f .glimpse_*
-
-.if !(make(cscope) || make(cscope-clean) || make(cscope-hook) || make(TAGS) || \
-    make(glimpse) || make(glimpse-clean))
+.if !(make(cscope) || make(cscope-clean) || make(cscope-hook) || make(TAGS))
 .include <src.opts.mk>
 
 # The boot loader

Modified: projects/pnfs-planb-server/sys/amd64/acpica/acpi_wakecode.S
==============================================================================
--- projects/pnfs-planb-server/sys/amd64/acpica/acpi_wakecode.S	Thu Jun  1 21:23:04 2017	(r319477)
+++ projects/pnfs-planb-server/sys/amd64/acpica/acpi_wakecode.S	Thu Jun  1 22:13:46 2017	(r319478)
@@ -156,11 +156,12 @@ wakeup_32:
 	/*
 	 * Enable EFER.LME so that we get long mode when all the prereqs are
 	 * in place.  In this case, it turns on when CR0_PG is finally enabled.
-	 * Pick up a few other EFER bits that we'll use need we're here.
+	 * Also it picks up a few other EFER bits that we'll use need we're
+	 * here, like SYSCALL and NX enable.
 	 */
 	movl	$MSR_EFER, %ecx
-	rdmsr
-	orl	$EFER_LME | EFER_SCE, %eax
+	movl	wakeup_efer - wakeup_start(%ebx), %eax
+	movl	wakeup_efer + 4 - wakeup_start(%ebx), %edx
 	wrmsr
 
 	/*
@@ -275,6 +276,8 @@ bootgdtdesc:
 wakeup_pcb:
 	.quad	0
 wakeup_ret:
+	.quad	0
+wakeup_efer:
 	.quad	0
 wakeup_gdt:
 	.word	0

Modified: projects/pnfs-planb-server/sys/amd64/amd64/cpu_switch.S
==============================================================================
--- projects/pnfs-planb-server/sys/amd64/amd64/cpu_switch.S	Thu Jun  1 21:23:04 2017	(r319477)
+++ projects/pnfs-planb-server/sys/amd64/amd64/cpu_switch.S	Thu Jun  1 22:13:46 2017	(r319478)
@@ -396,7 +396,7 @@ ENTRY(resumectx)
 	movl	4 + PCB_KGSBASE(%rdi),%edx
 	wrmsr
 
-	/* Restore EFER. */
+	/* Restore EFER one more time. */
 	movl	$MSR_EFER,%ecx
 	movl	PCB_EFER(%rdi),%eax
 	wrmsr

Modified: projects/pnfs-planb-server/sys/amd64/amd64/pmap.c
==============================================================================
--- projects/pnfs-planb-server/sys/amd64/amd64/pmap.c	Thu Jun  1 21:23:04 2017	(r319477)
+++ projects/pnfs-planb-server/sys/amd64/amd64/pmap.c	Thu Jun  1 22:13:46 2017	(r319478)
@@ -6691,7 +6691,7 @@ pmap_change_attr_locked(vm_offset_t va, vm_size_t size
 				changed = TRUE;
 			}
 			if (tmpva >= VM_MIN_KERNEL_ADDRESS &&
-			    (*pte & PG_PS_FRAME) < dmaplimit) {
+			    (*pte & PG_FRAME) < dmaplimit) {
 				if (pa_start == pa_end) {
 					/* Start physical address run. */
 					pa_start = *pte & PG_FRAME;

Modified: projects/pnfs-planb-server/sys/amd64/amd64/sys_machdep.c
==============================================================================
--- projects/pnfs-planb-server/sys/amd64/amd64/sys_machdep.c	Thu Jun  1 21:23:04 2017	(r319477)
+++ projects/pnfs-planb-server/sys/amd64/amd64/sys_machdep.c	Thu Jun  1 22:13:46 2017	(r319478)
@@ -169,9 +169,7 @@ update_gdt_fsbase(struct thread *td, uint32_t base)
 }
 
 int
-sysarch(td, uap)
-	struct thread *td;
-	register struct sysarch_args *uap;
+sysarch(struct thread *td, struct sysarch_args *uap)
 {
 	int error = 0;
 	struct pcb *pcb = curthread->td_pcb;

Modified: projects/pnfs-planb-server/sys/amd64/amd64/vm_machdep.c
==============================================================================
--- projects/pnfs-planb-server/sys/amd64/amd64/vm_machdep.c	Thu Jun  1 21:23:04 2017	(r319477)
+++ projects/pnfs-planb-server/sys/amd64/amd64/vm_machdep.c	Thu Jun  1 22:13:46 2017	(r319478)
@@ -148,13 +148,9 @@ alloc_fpusave(int flags)
  * ready to run and return to user mode.
  */
 void
-cpu_fork(td1, p2, td2, flags)
-	register struct thread *td1;
-	register struct proc *p2;
-	struct thread *td2;
-	int flags;
+cpu_fork(struct thread *td1, struct proc *p2, struct thread *td2, int flags)
 {
-	register struct proc *p1;
+	struct proc *p1;
 	struct pcb *pcb2;
 	struct mdproc *mdp1, *mdp2;
 	struct proc_ldt *pldt;

Modified: projects/pnfs-planb-server/sys/amd64/include/vmparam.h
==============================================================================
--- projects/pnfs-planb-server/sys/amd64/include/vmparam.h	Thu Jun  1 21:23:04 2017	(r319477)
+++ projects/pnfs-planb-server/sys/amd64/include/vmparam.h	Thu Jun  1 22:13:46 2017	(r319478)
@@ -52,7 +52,7 @@
 /*
  * Virtual memory related constants, all in bytes
  */
-#define	MAXTSIZ		(128UL*1024*1024)	/* max text size */
+#define	MAXTSIZ		(32768UL*1024*1024)	/* max text size */
 #ifndef DFLDSIZ
 #define	DFLDSIZ		(32768UL*1024*1024)	/* initial data size limit */
 #endif

Modified: projects/pnfs-planb-server/sys/amd64/linux/linux.h
==============================================================================
--- projects/pnfs-planb-server/sys/amd64/linux/linux.h	Thu Jun  1 21:23:04 2017	(r319477)
+++ projects/pnfs-planb-server/sys/amd64/linux/linux.h	Thu Jun  1 22:13:46 2017	(r319478)
@@ -101,9 +101,6 @@ typedef struct {
 /*
  * Miscellaneous
  */
-#define	LINUX_NAME_MAX		255
-#define	LINUX_CTL_MAXNAME	10
-
 #define LINUX_AT_COUNT		19	/* Count of used aux entry types. */
 
 struct l___sysctl_args
@@ -117,11 +114,6 @@ struct l___sysctl_args
 	l_ulong		__spare[4];
 };
 
-/* Scheduling policies */
-#define	LINUX_SCHED_OTHER	0
-#define	LINUX_SCHED_FIFO	1
-#define	LINUX_SCHED_RR		2
-
 /* Resource limits */
 #define	LINUX_RLIMIT_CPU	0
 #define	LINUX_RLIMIT_FSIZE	1
@@ -455,20 +447,6 @@ struct l_pollfd {
 	l_short		events;
 	l_short		revents;
 };
-
-
-#define	LINUX_CLONE_VM			0x00000100
-#define	LINUX_CLONE_FS			0x00000200
-#define	LINUX_CLONE_FILES		0x00000400
-#define	LINUX_CLONE_SIGHAND		0x00000800
-#define	LINUX_CLONE_PID			0x00001000	/* No longer exist in Linux */
-#define	LINUX_CLONE_VFORK		0x00004000
-#define	LINUX_CLONE_PARENT		0x00008000
-#define	LINUX_CLONE_THREAD		0x00010000
-#define	LINUX_CLONE_SETTLS		0x00080000
-#define	LINUX_CLONE_PARENT_SETTID	0x00100000
-#define	LINUX_CLONE_CHILD_CLEARTID	0x00200000
-#define	LINUX_CLONE_CHILD_SETTID	0x01000000
 
 #define LINUX_ARCH_SET_GS		0x1001
 #define LINUX_ARCH_SET_FS		0x1002

Modified: projects/pnfs-planb-server/sys/arm/arm/busdma_machdep-v4.c
==============================================================================
--- projects/pnfs-planb-server/sys/arm/arm/busdma_machdep-v4.c	Thu Jun  1 21:23:04 2017	(r319477)
+++ projects/pnfs-planb-server/sys/arm/arm/busdma_machdep-v4.c	Thu Jun  1 22:13:46 2017	(r319478)
@@ -736,8 +736,10 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, void **vaddr, int
 	if (bufzone != NULL && dmat->alignment <= bufzone->size &&
 	    !_bus_dma_can_bounce(dmat->lowaddr, dmat->highaddr)) {
 		*vaddr = uma_zalloc(bufzone->umazone, mflags);
-	} else if (dmat->nsegments >= btoc(dmat->maxsize) &&
-	    dmat->alignment <= PAGE_SIZE && dmat->boundary == 0) {
+	} else if (dmat->nsegments >=
+	    howmany(dmat->maxsize, MIN(dmat->maxsegsz, PAGE_SIZE)) &&
+	    dmat->alignment <= PAGE_SIZE &&
+	    (dmat->boundary % PAGE_SIZE) == 0) {
 		*vaddr = (void *)kmem_alloc_attr(kernel_arena, dmat->maxsize,
 		    mflags, 0, dmat->lowaddr, memattr);
 	} else {

Modified: projects/pnfs-planb-server/sys/arm/arm/busdma_machdep-v6.c
==============================================================================
--- projects/pnfs-planb-server/sys/arm/arm/busdma_machdep-v6.c	Thu Jun  1 21:23:04 2017	(r319477)
+++ projects/pnfs-planb-server/sys/arm/arm/busdma_machdep-v6.c	Thu Jun  1 22:13:46 2017	(r319478)
@@ -779,7 +779,9 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, void **vaddr, int
 	 *    (the allocator aligns buffers to their size boundaries).
 	 *  - There's no need to handle lowaddr/highaddr exclusion zones.
 	 * else allocate non-contiguous pages if...
-	 *  - The page count that could get allocated doesn't exceed nsegments.
+	 *  - The page count that could get allocated doesn't exceed
+	 *    nsegments also when the maximum segment size is less
+	 *    than PAGE_SIZE.
 	 *  - The alignment constraint isn't larger than a page boundary.
 	 *  - There are no boundary-crossing constraints.
 	 * else allocate a block of contiguous pages because one or more of the
@@ -788,8 +790,10 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, void **vaddr, int
 	if (bufzone != NULL && dmat->alignment <= bufzone->size &&
 	    !exclusion_bounce(dmat)) {
 		*vaddr = uma_zalloc(bufzone->umazone, mflags);
-	} else if (dmat->nsegments >= btoc(dmat->maxsize) &&
-	    dmat->alignment <= PAGE_SIZE && dmat->boundary == 0) {
+	} else if (dmat->nsegments >=
+	    howmany(dmat->maxsize, MIN(dmat->maxsegsz, PAGE_SIZE)) &&
+	    dmat->alignment <= PAGE_SIZE &&
+	    (dmat->boundary % PAGE_SIZE) == 0) {
 		*vaddr = (void *)kmem_alloc_attr(kernel_arena, dmat->maxsize,
 		    mflags, 0, dmat->lowaddr, memattr);
 	} else {

Modified: projects/pnfs-planb-server/sys/arm/arm/pmap-v6.c
==============================================================================
--- projects/pnfs-planb-server/sys/arm/arm/pmap-v6.c	Thu Jun  1 21:23:04 2017	(r319477)
+++ projects/pnfs-planb-server/sys/arm/arm/pmap-v6.c	Thu Jun  1 22:13:46 2017	(r319478)
@@ -498,6 +498,42 @@ pmap_set_tex(void)
 }
 
 /*
+ * Remap one vm_meattr class to another one. This can be useful as
+ * workaround for SOC errata, e.g. if devices must be accessed using
+ * SO memory class.
+ *
+ * !!! Please note that this function is absolutely last resort thing.
+ * It should not be used under normal circumstances. !!!
+ *
+ * Usage rules:
+ * - it shall be called after pmap_bootstrap_prepare() and before
+ *   cpu_mp_start() (thus only on boot CPU). In practice, it's expected
+ *   to be called from platform_attach() or platform_late_init().
+ *
+ * - if remapping doesn't change caching mode, or until uncached class
+ *   is remapped to any kind of cached one, then no other restriction exists.
+ *
+ * - if pmap_remap_vm_attr() changes caching mode, but both (original and
+ *   remapped) remain cached, then caller is resposible for calling
+ *   of dcache_wbinv_poc_all().
+ *
+ * - remapping of any kind of cached class to uncached is not permitted.
+ */
+void
+pmap_remap_vm_attr(vm_memattr_t old_attr, vm_memattr_t new_attr)
+{
+	int old_idx, new_idx;
+	
+	/* Map VM memattrs to indexes to tex_class table. */
+	old_idx = pte2_attr_tab[(int)old_attr];
+	new_idx = pte2_attr_tab[(int)new_attr];
+	
+	/* Replace TEX attribute and apply it. */
+	tex_class[old_idx] = tex_class[new_idx];
+	pmap_set_tex();
+}
+
+/*
  * KERNBASE must be multiple of NPT2_IN_PG * PTE1_SIZE. In other words,
  * KERNBASE is mapped by first L2 page table in L2 page table page. It
  * meets same constrain due to PT2MAP being placed just under KERNBASE.

Modified: projects/pnfs-planb-server/sys/arm/arm/sys_machdep.c
==============================================================================
--- projects/pnfs-planb-server/sys/arm/arm/sys_machdep.c	Thu Jun  1 21:23:04 2017	(r319477)
+++ projects/pnfs-planb-server/sys/arm/arm/sys_machdep.c	Thu Jun  1 22:13:46 2017	(r319478)
@@ -188,9 +188,7 @@ arm32_get_tp(struct thread *td, void *args)
 }
 
 int
-sysarch(td, uap)
-	struct thread *td;
-	register struct sysarch_args *uap;
+sysarch(struct thread *td, struct sysarch_args *uap)
 {
 	int error;
 

Modified: projects/pnfs-planb-server/sys/arm/arm/vm_machdep.c
==============================================================================
--- projects/pnfs-planb-server/sys/arm/arm/vm_machdep.c	Thu Jun  1 21:23:04 2017	(r319477)
+++ projects/pnfs-planb-server/sys/arm/arm/vm_machdep.c	Thu Jun  1 22:13:46 2017	(r319478)
@@ -93,8 +93,7 @@ uint32_t initial_fpscr = VFPSCR_DN | VFPSCR_FZ;
  * ready to run and return to user mode.
  */
 void
-cpu_fork(register struct thread *td1, register struct proc *p2,
-    struct thread *td2, int flags)
+cpu_fork(struct thread *td1, struct proc *p2, struct thread *td2, int flags)
 {
 	struct pcb *pcb2;
 	struct trapframe *tf;

Modified: projects/pnfs-planb-server/sys/arm/conf/ARMADA38X
==============================================================================
--- projects/pnfs-planb-server/sys/arm/conf/ARMADA38X	Thu Jun  1 21:23:04 2017	(r319477)
+++ projects/pnfs-planb-server/sys/arm/conf/ARMADA38X	Thu Jun  1 22:13:46 2017	(r319478)
@@ -12,6 +12,7 @@ ident 	ARMADA38X
 options 	SOC_MV_ARMADA38X
 
 makeoptions 	WERROR="-Werror"
+makeoptions 	MODULES_EXTRA="dtb/mv"
 
 options 	MD_ROOT
 #makeoptions 	MFS_IMAGE=/path/to/miniroot
@@ -62,6 +63,11 @@ device		scbus
 device		pass
 device		da
 
+# MMC/SD/SDIO Card slot support
+device		mmc			# mmc/sd bus
+device		mmcsd			# mmc/sd flash cards
+device		sdhci			# mmc/sd host controller
+
 # SATA
 device		ahci
 
@@ -70,6 +76,14 @@ device		iic
 device		iicbus
 device		twsi
 
+# Wireless NIC cards
+device		wlan		# 802.11 support
+device		ath		# Atheros NIC's
+device		ath_pci		# Atheros pci/cardbus glue
+device		ath_hal
+device		ath_rate_sample
+options		ATH_ENABLE_11N
+
 # CESA
 device		cesa
 device		crypto
@@ -78,7 +92,5 @@ device		cryptodev
 # L2 Cache
 device		pl310
 
-#FDT
+# FDT
 options 	FDT
-options 	FDT_DTB_STATIC
-makeoptions 	FDT_DTS_FILE=armada-388-gp.dts

Modified: projects/pnfs-planb-server/sys/arm/conf/NOTES
==============================================================================
--- projects/pnfs-planb-server/sys/arm/conf/NOTES	Thu Jun  1 21:23:04 2017	(r319477)
+++ projects/pnfs-planb-server/sys/arm/conf/NOTES	Thu Jun  1 22:13:46 2017	(r319478)
@@ -79,6 +79,7 @@ nodevice	snake_saver
 nodevice	star_saver
 nodevice	warp_saver
 
+nodevice	ccr
 nodevice	cxgbe
 nodevice	cxgbev
 nodevice	snd_cmi

Modified: projects/pnfs-planb-server/sys/arm/include/atomic-v4.h
==============================================================================
--- projects/pnfs-planb-server/sys/arm/include/atomic-v4.h	Thu Jun  1 21:23:04 2017	(r319477)
+++ projects/pnfs-planb-server/sys/arm/include/atomic-v4.h	Thu Jun  1 22:13:46 2017	(r319478)
@@ -299,7 +299,7 @@ atomic_clear_32(volatile uint32_t *address, uint32_t c
 static __inline u_int32_t
 atomic_cmpset_32(volatile u_int32_t *p, volatile u_int32_t cmpval, volatile u_int32_t newval)
 {
-	register int done, ras_start = ARM_RAS_START;
+	int done, ras_start = ARM_RAS_START;
 
 	__asm __volatile("1:\n"
 	    "adr	%1, 1b\n"

Modified: projects/pnfs-planb-server/sys/arm/include/pmap-v6.h
==============================================================================
--- projects/pnfs-planb-server/sys/arm/include/pmap-v6.h	Thu Jun  1 21:23:04 2017	(r319477)
+++ projects/pnfs-planb-server/sys/arm/include/pmap-v6.h	Thu Jun  1 22:13:46 2017	(r319478)
@@ -188,6 +188,7 @@ vm_offset_t pmap_preboot_reserve_pages(u_int);
 vm_offset_t pmap_preboot_get_vpages(u_int);
 void pmap_preboot_map_attr(vm_paddr_t, vm_offset_t, vm_size_t, vm_prot_t,
     vm_memattr_t);
+void pmap_remap_vm_attr(vm_memattr_t old_attr, vm_memattr_t new_attr);
 
 #endif	/* _KERNEL */
 #endif	/* !_MACHINE_PMAP_V6_H_ */

Modified: projects/pnfs-planb-server/sys/arm/include/vmparam.h
==============================================================================
--- projects/pnfs-planb-server/sys/arm/include/vmparam.h	Thu Jun  1 21:23:04 2017	(r319477)
+++ projects/pnfs-planb-server/sys/arm/include/vmparam.h	Thu Jun  1 22:13:46 2017	(r319478)
@@ -42,7 +42,7 @@
  * Virtual memory related constants, all in bytes
  */
 #ifndef	MAXTSIZ
-#define	MAXTSIZ		(64UL*1024*1024)	/* max text size */
+#define	MAXTSIZ		(256UL*1024*1024)	/* max text size */
 #endif
 #ifndef	DFLDSIZ
 #define	DFLDSIZ		(128UL*1024*1024)	/* initial data size limit */

Copied: projects/pnfs-planb-server/sys/arm/mv/armada/wdt.c (from r319477, head/sys/arm/mv/armada/wdt.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/pnfs-planb-server/sys/arm/mv/armada/wdt.c	Thu Jun  1 22:13:46 2017	(r319478, copy of r319477, head/sys/arm/mv/armada/wdt.c)
@@ -0,0 +1,285 @@
+/*-
+ * Copyright (c) 2006 Benno Rice.
+ * Copyright (C) 2007-2008 MARVELL INTERNATIONAL LTD.
+ * All rights reserved.
+ *
+ * Adapted to Marvell SoC by Semihalf.
+ *
+ * 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 ``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 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: FreeBSD: //depot/projects/arm/src/sys/arm/xscale/pxa2x0/pxa2x0_timer.c, rev 1
+ */
+
+#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/kdb.h>
+#include <sys/timeet.h>
+#include <sys/timetc.h>
+#include <sys/watchdog.h>
+#include <machine/bus.h>
+#include <machine/cpu.h>
+
+#include <arm/mv/mvreg.h>
+#include <arm/mv/mvvar.h>
+
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+
+#define INITIAL_TIMECOUNTER	(0xffffffff)
+#define MAX_WATCHDOG_TICKS	(0xffffffff)
+
+#if defined(SOC_MV_ARMADAXP) || defined(SOC_MV_ARMADA38X)
+#define MV_CLOCK_SRC		25000000	/* Timers' 25MHz mode */
+#else
+#define MV_CLOCK_SRC		get_tclk()
+#endif
+
+#if defined(SOC_MV_ARMADA38X)
+#define	WATCHDOG_TIMER	4
+#else
+#define	WATCHDOG_TIMER	2
+#endif
+
+struct mv_wdt_softc {
+	struct resource	*	wdt_res;
+	struct mtx		wdt_mtx;
+};
+
+static struct resource_spec mv_wdt_spec[] = {
+	{ SYS_RES_MEMORY,	0,	RF_ACTIVE },
+	{ -1, 0 }
+};
+
+static struct ofw_compat_data mv_wdt_compat[] = {
+	{"marvell,armada-380-wdt",	true},
+	{NULL,				false}
+};
+
+static struct mv_wdt_softc *wdt_softc = NULL;
+int timers_initialized = 0;
+
+static int mv_wdt_probe(device_t);
+static int mv_wdt_attach(device_t);
+
+static uint32_t	mv_get_timer_control(void);
+static void mv_set_timer_control(uint32_t);
+static void mv_set_timer(uint32_t, uint32_t);
+
+static void mv_watchdog_enable(void);
+static void mv_watchdog_disable(void);
+static void mv_watchdog_event(void *, unsigned int, int *);
+
+static device_method_t mv_wdt_methods[] = {
+	DEVMETHOD(device_probe, mv_wdt_probe),
+	DEVMETHOD(device_attach, mv_wdt_attach),
+
+	{ 0, 0 }
+};
+
+static driver_t mv_wdt_driver = {
+	"wdt",
+	mv_wdt_methods,
+	sizeof(struct mv_wdt_softc),
+};
+
+static devclass_t mv_wdt_devclass;
+
+DRIVER_MODULE(wdt, simplebus, mv_wdt_driver, mv_wdt_devclass, 0, 0);
+static int
+mv_wdt_probe(device_t dev)
+{
+
+	if (!ofw_bus_status_okay(dev))
+		return (ENXIO);
+
+	if (!ofw_bus_search_compatible(dev, mv_wdt_compat)->ocd_data)
+		return (ENXIO);
+
+	device_set_desc(dev, "Marvell Watchdog Timer");
+	return (0);
+}
+
+static int
+mv_wdt_attach(device_t dev)
+{
+	struct mv_wdt_softc *sc;
+	int error;
+
+	if (wdt_softc != NULL)
+		return (ENXIO);
+
+	sc = device_get_softc(dev);
+	wdt_softc = sc;
+
+	error = bus_alloc_resources(dev, mv_wdt_spec, &sc->wdt_res);
+	if (error) {
+		device_printf(dev, "could not allocate resources\n");
+		return (ENXIO);
+	}
+
+	mtx_init(&sc->wdt_mtx, "watchdog", NULL, MTX_DEF);
+
+	mv_watchdog_disable();
+	EVENTHANDLER_REGISTER(watchdog_list, mv_watchdog_event, sc, 0);
+
+	return (0);
+}
+
+static __inline uint32_t
+mv_get_timer_control(void)
+{
+
+	return (bus_read_4(wdt_softc->wdt_res, CPU_TIMER_CONTROL));
+}
+
+static __inline void
+mv_set_timer_control(uint32_t val)
+{
+
+	bus_write_4(wdt_softc->wdt_res, CPU_TIMER_CONTROL, val);
+}
+
+static __inline void
+mv_set_timer(uint32_t timer, uint32_t val)
+{
+
+	bus_write_4(wdt_softc->wdt_res, CPU_TIMER0 + timer * 0x8, val);
+}
+
+static void
+mv_watchdog_enable(void)
+{
+	uint32_t val, irq_cause;
+#if !defined(SOC_MV_ARMADAXP) && !defined(SOC_MV_ARMADA38X)
+	uint32_t irq_mask;
+#endif
+
+	irq_cause = read_cpu_ctrl(BRIDGE_IRQ_CAUSE);
+	irq_cause &= IRQ_TIMER_WD_CLR;
+	write_cpu_ctrl(BRIDGE_IRQ_CAUSE, irq_cause);
+
+#if defined(SOC_MV_ARMADAXP) || defined(SOC_MV_ARMADA38X)
+	val = read_cpu_mp_clocks(WD_RSTOUTn_MASK);
+	val |= (WD_GLOBAL_MASK | WD_CPU0_MASK);
+	write_cpu_mp_clocks(WD_RSTOUTn_MASK, val);
+
+	val = read_cpu_misc(RSTOUTn_MASK);
+	val &= ~RSTOUTn_MASK_WD;
+	write_cpu_misc(RSTOUTn_MASK, val);
+#else
+	irq_mask = read_cpu_ctrl(BRIDGE_IRQ_MASK);
+	irq_mask |= IRQ_TIMER_WD_MASK;
+	write_cpu_ctrl(BRIDGE_IRQ_MASK, irq_mask);
+
+	val = read_cpu_ctrl(RSTOUTn_MASK);
+	val |= WD_RST_OUT_EN;
+	write_cpu_ctrl(RSTOUTn_MASK, val);
+#endif
+
+	val = mv_get_timer_control();
+#if defined(SOC_MV_ARMADA38X)
+	val |= CPU_TIMER_WD_EN | CPU_TIMER_WD_AUTO | CPU_TIMER_WD_25MHZ_EN;
+#elif defined(SOC_MV_ARMADAXP)
+	val |= CPU_TIMER2_EN | CPU_TIMER2_AUTO | CPU_TIMER_WD_25MHZ_EN;
+#else
+	val |= CPU_TIMER2_EN | CPU_TIMER2_AUTO;
+#endif
+	mv_set_timer_control(val);
+}
+
+static void
+mv_watchdog_disable(void)
+{
+	uint32_t val, irq_cause;
+#if !defined(SOC_MV_ARMADAXP) && !defined(SOC_MV_ARMADA38X)
+	uint32_t irq_mask;
+#endif
+
+	val = mv_get_timer_control();
+#if defined(SOC_MV_ARMADA38X)
+	val &= ~(CPU_TIMER_WD_EN | CPU_TIMER_WD_AUTO);
+#else
+	val &= ~(CPU_TIMER2_EN | CPU_TIMER2_AUTO);
+#endif
+	mv_set_timer_control(val);
+
+#if defined(SOC_MV_ARMADAXP) || defined(SOC_MV_ARMADA38X)
+	val = read_cpu_mp_clocks(WD_RSTOUTn_MASK);
+	val &= ~(WD_GLOBAL_MASK | WD_CPU0_MASK);
+	write_cpu_mp_clocks(WD_RSTOUTn_MASK, val);
+
+	val = read_cpu_misc(RSTOUTn_MASK);
+	val |= RSTOUTn_MASK_WD;
+	write_cpu_misc(RSTOUTn_MASK, RSTOUTn_MASK_WD);
+#else
+	val = read_cpu_ctrl(RSTOUTn_MASK);
+	val &= ~WD_RST_OUT_EN;
+	write_cpu_ctrl(RSTOUTn_MASK, val);
+
+	irq_mask = read_cpu_ctrl(BRIDGE_IRQ_MASK);
+	irq_mask &= ~(IRQ_TIMER_WD_MASK);
+	write_cpu_ctrl(BRIDGE_IRQ_MASK, irq_mask);
+#endif
+
+	irq_cause = read_cpu_ctrl(BRIDGE_IRQ_CAUSE);
+	irq_cause &= IRQ_TIMER_WD_CLR;
+	write_cpu_ctrl(BRIDGE_IRQ_CAUSE, irq_cause);
+}
+
+/*
+ * Watchdog event handler.
+ */
+static void
+mv_watchdog_event(void *arg, unsigned int cmd, int *error)
+{
+	struct mv_wdt_softc *sc;
+	uint64_t ns;
+	uint64_t ticks;
+
+	sc = arg;
+	mtx_lock(&sc->wdt_mtx);
+	if (cmd == 0)
+		mv_watchdog_disable();
+	else {
+		/*
+		 * Watchdog timeout is in nanosecs, calculation according to
+		 * watchdog(9)
+		 */
+		ns = (uint64_t)1 << (cmd & WD_INTERVAL);
+		ticks = (uint64_t)(ns * MV_CLOCK_SRC) / 1000000000;
+		if (ticks > MAX_WATCHDOG_TICKS)
+			mv_watchdog_disable();
+		else {
+			mv_set_timer(WATCHDOG_TIMER, ticks);
+			mv_watchdog_enable();
+			*error = 0;
+		}
+	}
+	mtx_unlock(&sc->wdt_mtx);
+}

Modified: projects/pnfs-planb-server/sys/arm/mv/armada38x/armada38x.c
==============================================================================
--- projects/pnfs-planb-server/sys/arm/mv/armada38x/armada38x.c	Thu Jun  1 21:23:04 2017	(r319477)
+++ projects/pnfs-planb-server/sys/arm/mv/armada38x/armada38x.c	Thu Jun  1 22:13:46 2017	(r319478)
@@ -173,9 +173,13 @@ armada38x_scu_enable(void)
 
 	/* Enable SCU */
 	val = bus_space_read_4(fdtbus_bs_tag, vaddr_scu, MV_SCU_REG_CTRL);
-	if (!(val & MV_SCU_ENABLE))
+	if (!(val & MV_SCU_ENABLE)) {
+		/* Enable SCU Speculative linefills to L2 */
+		val |= MV_SCU_SL_L2_ENABLE;
+
 		bus_space_write_4(fdtbus_bs_tag, vaddr_scu, 0,
 		    val | MV_SCU_ENABLE);
+	}
 
 	bus_space_unmap(fdtbus_bs_tag, vaddr_scu, MV_SCU_REGS_LEN);
 	return (0);

Modified: projects/pnfs-planb-server/sys/arm/mv/armada38x/armada38x_mp.c
==============================================================================
--- projects/pnfs-planb-server/sys/arm/mv/armada38x/armada38x_mp.c	Thu Jun  1 21:23:04 2017	(r319477)
+++ projects/pnfs-planb-server/sys/arm/mv/armada38x/armada38x_mp.c	Thu Jun  1 22:13:46 2017	(r319478)
@@ -127,7 +127,7 @@ platform_mp_setmaxid(void)
 
 	/* Armada38x family supports maximum 2 cores */
 	mp_ncpus = platform_cnt_cpus();
-	mp_maxid = 1;
+	mp_maxid = mp_ncpus - 1;
 }
 
 void

Modified: projects/pnfs-planb-server/sys/arm/mv/armada38x/files.armada38x
==============================================================================
--- projects/pnfs-planb-server/sys/arm/mv/armada38x/files.armada38x	Thu Jun  1 21:23:04 2017	(r319477)
+++ projects/pnfs-planb-server/sys/arm/mv/armada38x/files.armada38x	Thu Jun  1 22:13:46 2017	(r319478)
@@ -2,9 +2,11 @@
 arm/mv/mpic.c			standard
 
 arm/mv/armada/thermal.c		optional fdt
+arm/mv/armada/wdt.c		optional fdt
 
 arm/mv/armada38x/armada38x.c	standard
 arm/mv/armada38x/armada38x_mp.c	optional smp
 arm/mv/armada38x/pmsu.c		standard
 arm/mv/armada38x/rtc.c		standard
 arm/mv/armada38x/armada38x_pl310.c	optional pl310
+dev/sdhci/sdhci_fdt.c		optional sdhci

Modified: projects/pnfs-planb-server/sys/arm/mv/files.mv
==============================================================================
--- projects/pnfs-planb-server/sys/arm/mv/files.mv	Thu Jun  1 21:23:04 2017	(r319477)
+++ projects/pnfs-planb-server/sys/arm/mv/files.mv	Thu Jun  1 22:13:46 2017	(r319478)
@@ -18,7 +18,7 @@ arm/mv/mv_localbus.c		standard
 arm/mv/mv_machdep.c		standard
 arm/mv/mv_pci.c			optional	pci
 arm/mv/mv_ts.c			standard
-arm/mv/timer.c			standard
+arm/mv/timer.c			optional	!soc_mv_armada38x
 
 dev/cesa/cesa.c			optional	cesa
 dev/iicbus/twsi/mv_twsi.c	optional	twsi

Modified: projects/pnfs-planb-server/sys/arm/mv/mpic.c
==============================================================================
--- projects/pnfs-planb-server/sys/arm/mv/mpic.c	Thu Jun  1 21:23:04 2017	(r319477)
+++ projects/pnfs-planb-server/sys/arm/mv/mpic.c	Thu Jun  1 22:13:46 2017	(r319478)
@@ -148,12 +148,11 @@ static void	mpic_unmask_irq(uintptr_t nb);
 static void	mpic_mask_irq(uintptr_t nb);
 static void	mpic_mask_irq_err(uintptr_t nb);
 static void	mpic_unmask_irq_err(uintptr_t nb);
+static boolean_t mpic_irq_is_percpu(uintptr_t);
+#ifdef INTRNG
 static int	mpic_intr(void *arg);
-static void	mpic_unmask_msi(void);
-#ifndef INTRNG
-static void	arm_mask_irq_err(uintptr_t);
-static void	arm_unmask_irq_err(uintptr_t);
 #endif
+static void	mpic_unmask_msi(void);
 
 #define	MPIC_WRITE(softc, reg, val) \
     bus_space_write_4((softc)->mpic_bst, (softc)->mpic_bsh, (reg), (val))
@@ -260,8 +259,7 @@ mv_mpic_attach(device_t dev)
 		sc->drbl_bsh = rman_get_bushandle(sc->mpic_res[2]);
 	}
 
-	bus_space_write_4(mv_mpic_sc->mpic_bst, mv_mpic_sc->mpic_bsh,
-	    MPIC_CTRL, 1);
+	MPIC_WRITE(mv_mpic_sc, MPIC_CTRL, 1);
 	MPIC_CPU_WRITE(mv_mpic_sc, MPIC_CTP, 0);
 
 	val = MPIC_READ(mv_mpic_sc, MPIC_CTRL);
@@ -273,6 +271,9 @@ mv_mpic_attach(device_t dev)
 		bus_release_resources(dev, mv_mpic_spec, sc->mpic_res);
 		return (ENXIO);
 	}
+
+	OF_device_register_xref(OF_xref_from_node(ofw_bus_get_node(dev)), dev);
+
 	if (intr_pic_register(dev, OF_xref_from_device(dev)) == NULL) {
 		device_printf(dev, "could not register PIC\n");
 		bus_release_resources(dev, mv_mpic_spec, sc->mpic_res);
@@ -398,7 +399,7 @@ static driver_t mv_mpic_driver = {
 static devclass_t mv_mpic_devclass;
 
 EARLY_DRIVER_MODULE(mpic, simplebus, mv_mpic_driver, mv_mpic_devclass, 0, 0,
-    BUS_PASS_INTERRUPT);
+    BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE);
 
 #ifndef INTRNG
 int
@@ -432,27 +433,12 @@ arm_mask_irq(uintptr_t nb)
 	mpic_mask_irq(nb);
 }
 
-
-static void
-arm_mask_irq_err(uintptr_t nb)
-{
-
-	mpic_mask_irq_err(nb);
-}
-
 void
 arm_unmask_irq(uintptr_t nb)
 {
 
 	mpic_unmask_irq(nb);
 }
-
-void
-arm_unmask_irq_err(uintptr_t nb)
-{
-
-	mpic_unmask_irq_err(nb);
-}
 #endif
 
 static void
@@ -468,8 +454,7 @@ mpic_unmask_irq_err(uintptr_t nb)
 	uint32_t mask;
 	uint8_t bit_off;
 
-	bus_space_write_4(mv_mpic_sc->mpic_bst, mv_mpic_sc->mpic_bsh,
-	    MPIC_ISE, MPIC_INT_ERR);
+	MPIC_WRITE(mv_mpic_sc, MPIC_ISE, MPIC_INT_ERR);
 	MPIC_CPU_WRITE(mv_mpic_sc, MPIC_ICM, MPIC_INT_ERR);
 
 	bit_off = nb - ERR_IRQ;
@@ -490,15 +475,24 @@ mpic_mask_irq_err(uintptr_t nb)
 	MPIC_CPU_WRITE(mv_mpic_sc, MPIC_ERR_MASK, mask);
 }
 
+static boolean_t
+mpic_irq_is_percpu(uintptr_t nb)
+{
+	if (nb < MPIC_PPI)
+		return TRUE;
+
+	return FALSE;
+}
+
 static void
 mpic_unmask_irq(uintptr_t nb)
 {
 
-	if (nb < ERR_IRQ) {
-		bus_space_write_4(mv_mpic_sc->mpic_bst, mv_mpic_sc->mpic_bsh,
-		    MPIC_ISE, nb);
+	if (mpic_irq_is_percpu(nb))
 		MPIC_CPU_WRITE(mv_mpic_sc, MPIC_ICM, nb);
-	} else if (nb < MSI_IRQ)
+	else if (nb < ERR_IRQ)
+		MPIC_WRITE(mv_mpic_sc, MPIC_ISE, nb);
+	else if (nb < MSI_IRQ)
 		mpic_unmask_irq_err(nb);
 
 	if (nb == 0)
@@ -509,11 +503,11 @@ static void
 mpic_mask_irq(uintptr_t nb)
 {
 
-	if (nb < ERR_IRQ) {
-		bus_space_write_4(mv_mpic_sc->mpic_bst, mv_mpic_sc->mpic_bsh,
-		    MPIC_ICE, nb);
+	if (mpic_irq_is_percpu(nb))
 		MPIC_CPU_WRITE(mv_mpic_sc, MPIC_ISM, nb);
-	} else if (nb < MSI_IRQ)
+	else if (nb < ERR_IRQ)
+		MPIC_WRITE(mv_mpic_sc, MPIC_ICE, nb);
+	else if (nb < MSI_IRQ)
 		mpic_mask_irq_err(nb);
 }
 
@@ -530,8 +524,7 @@ mv_mpic_get_cause_err(void)
 	uint32_t err_cause;
 	uint8_t bit_off;
 
-	err_cause = bus_space_read_4(mv_mpic_sc->mpic_bst,
-	    mv_mpic_sc->mpic_bsh, MPIC_ERR_CAUSE);
+	err_cause = MPIC_READ(mv_mpic_sc, MPIC_ERR_CAUSE);
 
 	if (err_cause)
 		bit_off = ffs(err_cause) - 1;
@@ -612,8 +605,7 @@ pic_ipi_send(cpuset_t cpus, u_int ipi)
 		if (CPU_ISSET(i, &cpus))
 			val |= (1 << (8 + i));
 	val |= ipi;
-	bus_space_write_4(mv_mpic_sc->mpic_bst, mv_mpic_sc->mpic_bsh,
-	    MPIC_SOFT_INT, val);
+	MPIC_WRITE(mv_mpic_sc, MPIC_SOFT_INT, val);
 }
 
 int

Modified: projects/pnfs-planb-server/sys/arm/mv/mv_common.c
==============================================================================
--- projects/pnfs-planb-server/sys/arm/mv/mv_common.c	Thu Jun  1 21:23:04 2017	(r319477)
+++ projects/pnfs-planb-server/sys/arm/mv/mv_common.c	Thu Jun  1 22:13:46 2017	(r319478)
@@ -76,12 +76,14 @@ MALLOC_DEFINE(M_IDMA, "idma", "idma dma test memory");
 
 static int win_eth_can_remap(int i);
 
+static int decode_win_cesa_valid(void);
 static int decode_win_cpu_valid(void);
 static int decode_win_usb_valid(void);
 static int decode_win_usb3_valid(void);
 static int decode_win_eth_valid(void);
 static int decode_win_pcie_valid(void);
 static int decode_win_sata_valid(void);
+static int decode_win_sdhci_valid(void);
 
 static int decode_win_idma_valid(void);
 static int decode_win_xor_valid(void);
@@ -90,21 +92,25 @@ static void decode_win_cpu_setup(void);
 #ifdef SOC_MV_ARMADAXP
 static int decode_win_sdram_fixup(void);
 #endif
+static void decode_win_cesa_setup(u_long);
 static void decode_win_usb_setup(u_long);
 static void decode_win_usb3_setup(u_long);
 static void decode_win_eth_setup(u_long);
 static void decode_win_sata_setup(u_long);
 static void decode_win_ahci_setup(u_long);
+static void decode_win_sdhci_setup(u_long);
 
 static void decode_win_idma_setup(u_long);
 static void decode_win_xor_setup(u_long);
 
+static void decode_win_cesa_dump(u_long);
 static void decode_win_usb_dump(u_long);
 static void decode_win_usb3_dump(u_long);
 static void decode_win_eth_dump(u_long base);
 static void decode_win_idma_dump(u_long base);
 static void decode_win_xor_dump(u_long base);
 static void decode_win_ahci_dump(u_long base);
+static void decode_win_sdhci_dump(u_long);
 
 static int fdt_get_ranges(const char *, void *, int, int *, int *);
 #ifdef SOC_MV_ARMADA38X
@@ -127,6 +133,16 @@ const struct decode_win *cpu_wins = cpu_win_tbl;
 typedef void (*decode_win_setup_t)(u_long);
 typedef void (*dump_win_t)(u_long);
 
+/*
+ * The power status of device feature is only supported on
+ * Kirkwood and Discovery SoCs.
+ */
+#if defined(SOC_MV_KIRKWOOD) || defined(SOC_MV_DISCOVERY)
+#define	SOC_MV_POWER_STAT_SUPPORTED		1
+#else
+#define	SOC_MV_POWER_STAT_SUPPORTED		0
+#endif
+
 struct soc_node_spec {
 	const char		*compat;
 	decode_win_setup_t	decode_handler;
@@ -136,11 +152,14 @@ struct soc_node_spec {
 static struct soc_node_spec soc_nodes[] = {
 	{ "mrvl,ge", &decode_win_eth_setup, &decode_win_eth_dump },
 	{ "mrvl,usb-ehci", &decode_win_usb_setup, &decode_win_usb_dump },
+	{ "marvell,orion-ehci", &decode_win_usb_setup, &decode_win_usb_dump },
 	{ "marvell,armada-380-xhci", &decode_win_usb3_setup, &decode_win_usb3_dump },
 	{ "marvell,armada-380-ahci", &decode_win_ahci_setup, &decode_win_ahci_dump },
+	{ "marvell,armada-380-sdhci", &decode_win_sdhci_setup, &decode_win_sdhci_dump },
 	{ "mrvl,sata", &decode_win_sata_setup, NULL },
 	{ "mrvl,xor", &decode_win_xor_setup, &decode_win_xor_dump },
 	{ "mrvl,idma", &decode_win_idma_setup, &decode_win_idma_dump },
+	{ "mrvl,cesa", &decode_win_cesa_setup, &decode_win_cesa_dump },
 	{ "mrvl,pcie", &decode_win_pcie_setup, NULL },
 	{ NULL, NULL, NULL },
 };
@@ -165,10 +184,10 @@ static struct fdt_pm_mask_entry fdt_pm_mask_table[] = 
 static __inline int
 pm_is_disabled(uint32_t mask)
 {
-#if defined(SOC_MV_KIRKWOOD)
-	return (soc_power_ctrl_get(mask) == mask);
-#else
+#if SOC_MV_POWER_STAT_SUPPORTED
 	return (soc_power_ctrl_get(mask) == mask ? 0 : 1);
+#else
+	return (0);
 #endif
 }
 
@@ -355,7 +374,7 @@ uint32_t
 soc_power_ctrl_get(uint32_t mask)
 {
 
-#if !defined(SOC_MV_ORION)
+#if SOC_MV_POWER_STAT_SUPPORTED
 	if (mask != CPU_PM_CTRL_NONE)
 		mask &= read_cpu_ctrl(CPU_PM_CTRL);
 
@@ -568,7 +587,8 @@ soc_decode_win(void)
 	if (!decode_win_cpu_valid() || !decode_win_usb_valid() ||
 	    !decode_win_eth_valid() || !decode_win_idma_valid() ||
 	    !decode_win_pcie_valid() || !decode_win_sata_valid() ||
-	    !decode_win_xor_valid() || !decode_win_usb3_valid())
+	    !decode_win_xor_valid() || !decode_win_usb3_valid() ||
+	    !decode_win_sdhci_valid() || !decode_win_cesa_valid())
 		return (EINVAL);
 
 	decode_win_cpu_setup();
@@ -595,6 +615,11 @@ WIN_REG_IDX_WR(win_cpu, br, MV_WIN_CPU_BASE, MV_MBUS_B
 WIN_REG_IDX_WR(win_cpu, remap_l, MV_WIN_CPU_REMAP_LO, MV_MBUS_BRIDGE_BASE)
 WIN_REG_IDX_WR(win_cpu, remap_h, MV_WIN_CPU_REMAP_HI, MV_MBUS_BRIDGE_BASE)
 
+WIN_REG_BASE_IDX_RD(win_cesa, cr, MV_WIN_CESA_CTRL)
+WIN_REG_BASE_IDX_RD(win_cesa, br, MV_WIN_CESA_BASE)
+WIN_REG_BASE_IDX_WR(win_cesa, cr, MV_WIN_CESA_CTRL)
+WIN_REG_BASE_IDX_WR(win_cesa, br, MV_WIN_CESA_BASE)
+
 WIN_REG_BASE_IDX_RD(win_usb, cr, MV_WIN_USB_CTRL)
 WIN_REG_BASE_IDX_RD(win_usb, br, MV_WIN_USB_BASE)
 WIN_REG_BASE_IDX_WR(win_usb, cr, MV_WIN_USB_CTRL)
@@ -659,6 +684,11 @@ WIN_REG_BASE_IDX_RD(win_sata, sz, MV_WIN_SATA_SIZE);
 WIN_REG_BASE_IDX_WR(win_sata, sz, MV_WIN_SATA_SIZE);
 #endif
 
+WIN_REG_BASE_IDX_RD(win_sdhci, cr, MV_WIN_SDHCI_CTRL);
+WIN_REG_BASE_IDX_RD(win_sdhci, br, MV_WIN_SDHCI_BASE);
+WIN_REG_BASE_IDX_WR(win_sdhci, cr, MV_WIN_SDHCI_CTRL);
+WIN_REG_BASE_IDX_WR(win_sdhci, br, MV_WIN_SDHCI_BASE);
+
 #ifndef SOC_MV_DOVE
 WIN_REG_IDX_RD(ddr, br, MV_WIN_DDR_BASE, MV_DDR_CADR_BASE)
 WIN_REG_IDX_RD(ddr, sz, MV_WIN_DDR_SIZE, MV_DDR_CADR_BASE)
@@ -1060,6 +1090,78 @@ ddr_target(int i)
 }
 
 /**************************************************************************
+ * CESA windows routines
+ **************************************************************************/
+static int
+decode_win_cesa_valid(void)
+{
+
+	return (decode_win_can_cover_ddr(MV_WIN_CESA_MAX));
+}
+
+static void
+decode_win_cesa_dump(u_long base)
+{
+	int i;
+
+	for (i = 0; i < MV_WIN_CESA_MAX; i++)

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