Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 25 Nov 2014 20:20:28 GMT
From:      John-Mark Gurney <jmg@FreeBSD.org>
To:        Perforce Change Reviews <perforce@FreeBSD.org>
Subject:   PERFORCE change 1203255 for review
Message-ID:  <201411252020.sAPKKSec074733@skunkworks.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@1203255?ac=10

Change 1203255 by jmg@jmg_carbon2 on 2014/11/25 20:19:36

	IFC @ 1203252
	
	Sponsored by:	FreeBSD Foundation
	Sponsored by:	Netgate

Affected files ...

.. //depot/projects/opencrypto/etc/mtree/BSD.tests.dist#4 integrate
.. //depot/projects/opencrypto/share/man/man4/acpi.4#2 integrate
.. //depot/projects/opencrypto/share/man/man4/gre.4#3 integrate
.. //depot/projects/opencrypto/share/man/man4/iicbus.4#2 integrate
.. //depot/projects/opencrypto/share/man/man4/man4.arm/cgem.4#2 integrate
.. //depot/projects/opencrypto/share/man/man4/me.4#2 integrate
.. //depot/projects/opencrypto/share/man/man4/netmap.4#2 integrate
.. //depot/projects/opencrypto/share/man/man4/rsu.4#2 integrate
.. //depot/projects/opencrypto/share/man/man4/splash.4#3 integrate
.. //depot/projects/opencrypto/share/man/man9/Makefile#6 integrate
.. //depot/projects/opencrypto/share/man/man9/get_cyclecount.9#2 integrate
.. //depot/projects/opencrypto/share/man/man9/malloc.9#2 integrate
.. //depot/projects/opencrypto/share/man/man9/sleepqueue.9#3 integrate
.. //depot/projects/opencrypto/share/man/man9/timeout.9#4 integrate
.. //depot/projects/opencrypto/share/man/man9/vnet.9#1 branch
.. //depot/projects/opencrypto/sys/amd64/amd64/elf_machdep.c#2 integrate
.. //depot/projects/opencrypto/sys/amd64/amd64/fpu.c#5 integrate
.. //depot/projects/opencrypto/sys/amd64/amd64/pmap.c#7 integrate
.. //depot/projects/opencrypto/sys/amd64/amd64/ptrace_machdep.c#2 integrate
.. //depot/projects/opencrypto/sys/amd64/amd64/support.S#5 integrate
.. //depot/projects/opencrypto/sys/amd64/include/asm.h#2 integrate
.. //depot/projects/opencrypto/sys/amd64/vmm/vmm.c#6 integrate
.. //depot/projects/opencrypto/sys/arm/allwinner/a10_gpio.c#3 integrate
.. //depot/projects/opencrypto/sys/arm/altera/socfpga/files.socfpga#5 integrate
.. //depot/projects/opencrypto/sys/arm/altera/socfpga/socfpga_machdep.c#3 integrate
.. //depot/projects/opencrypto/sys/arm/arm/busdma_machdep-v6.c#5 integrate
.. //depot/projects/opencrypto/sys/arm/arm/stdatomic.c#2 integrate
.. //depot/projects/opencrypto/sys/arm/broadcom/bcm2835/bcm2835_common.c#2 integrate
.. //depot/projects/opencrypto/sys/arm/broadcom/bcm2835/bcm2835_gpio.c#3 integrate
.. //depot/projects/opencrypto/sys/arm/broadcom/bcm2835/bcm2835_machdep.c#2 integrate
.. //depot/projects/opencrypto/sys/arm/conf/SOCKIT-BERI#3 integrate
.. //depot/projects/opencrypto/sys/arm/freescale/imx/imx_common.c#2 integrate
.. //depot/projects/opencrypto/sys/arm/freescale/imx/imx_gpio.c#3 integrate
.. //depot/projects/opencrypto/sys/arm/freescale/imx/imx_i2c.c#2 integrate
.. //depot/projects/opencrypto/sys/arm/freescale/vybrid/vf_gpio.c#3 integrate
.. //depot/projects/opencrypto/sys/arm/include/asm.h#4 integrate
.. //depot/projects/opencrypto/sys/arm/include/asmacros.h#3 integrate
.. //depot/projects/opencrypto/sys/arm/include/cpuconf.h#3 integrate
.. //depot/projects/opencrypto/sys/arm/mv/mv_common.c#2 integrate
.. //depot/projects/opencrypto/sys/arm/rockchip/rk30xx_gpio.c#4 integrate
.. //depot/projects/opencrypto/sys/arm/samsung/exynos/exynos5_pad.c#4 integrate
.. //depot/projects/opencrypto/sys/arm/ti/ti_common.c#2 integrate
.. //depot/projects/opencrypto/sys/arm/ti/ti_gpio.c#5 integrate
.. //depot/projects/opencrypto/sys/arm/ti/ti_i2c.c#5 integrate
.. //depot/projects/opencrypto/sys/arm/versatile/versatile_common.c#2 integrate
.. //depot/projects/opencrypto/sys/arm/versatile/versatile_machdep.c#2 integrate
.. //depot/projects/opencrypto/sys/arm/xilinx/uart_dev_cdnc.c#2 integrate
.. //depot/projects/opencrypto/sys/arm/xilinx/zy7_machdep.c#2 integrate
.. //depot/projects/opencrypto/sys/arm/xscale/ixp425/avila_gpio.c#3 integrate
.. //depot/projects/opencrypto/sys/arm/xscale/ixp425/cambria_gpio.c#3 integrate
.. //depot/projects/opencrypto/sys/boot/common/zfsloader.8#2 integrate
.. //depot/projects/opencrypto/sys/boot/fdt/dts/arm/socfpga-sockit-beri.dts#3 integrate
.. //depot/projects/opencrypto/sys/boot/fdt/dts/mips/beri-sim.dts#2 integrate
.. //depot/projects/opencrypto/sys/boot/fdt/dts/mips/beripad-de4.dts#2 integrate
.. //depot/projects/opencrypto/sys/boot/ficl/amd64/sysdep.c#2 integrate
.. //depot/projects/opencrypto/sys/boot/ficl/arm/sysdep.c#2 integrate
.. //depot/projects/opencrypto/sys/boot/ficl/i386/sysdep.c#2 integrate
.. //depot/projects/opencrypto/sys/boot/ficl/mips/sysdep.c#2 integrate
.. //depot/projects/opencrypto/sys/boot/ficl/mips64/sysdep.c#2 integrate
.. //depot/projects/opencrypto/sys/boot/ficl/powerpc/sysdep.c#2 integrate
.. //depot/projects/opencrypto/sys/boot/ficl/sparc64/sysdep.c#2 integrate
.. //depot/projects/opencrypto/sys/boot/i386/boot2/boot2.c#2 integrate
.. //depot/projects/opencrypto/sys/boot/i386/gptzfsboot/gptzfsboot.8#3 integrate
.. //depot/projects/opencrypto/sys/boot/pc98/loader/conf.c#2 integrate
.. //depot/projects/opencrypto/sys/cam/cam_xpt.c#3 integrate
.. //depot/projects/opencrypto/sys/cam/ctl/ctl.c#8 integrate
.. //depot/projects/opencrypto/sys/cam/ctl/ctl_backend_block.c#6 integrate
.. //depot/projects/opencrypto/sys/cam/ctl/ctl_backend_ramdisk.c#3 integrate
.. //depot/projects/opencrypto/sys/cam/ctl/ctl_cmd_table.c#6 integrate
.. //depot/projects/opencrypto/sys/cam/ctl/ctl_frontend.c#3 integrate
.. //depot/projects/opencrypto/sys/cam/ctl/ctl_frontend.h#2 integrate
.. //depot/projects/opencrypto/sys/cam/ctl/ctl_frontend_cam_sim.c#3 integrate
.. //depot/projects/opencrypto/sys/cam/ctl/ctl_frontend_internal.c#2 integrate
.. //depot/projects/opencrypto/sys/cam/ctl/ctl_frontend_iscsi.c#5 integrate
.. //depot/projects/opencrypto/sys/cam/ctl/ctl_frontend_iscsi.h#3 integrate
.. //depot/projects/opencrypto/sys/cam/ctl/ctl_ha.h#2 integrate
.. //depot/projects/opencrypto/sys/cam/ctl/ctl_io.h#4 integrate
.. //depot/projects/opencrypto/sys/cam/ctl/ctl_private.h#8 integrate
.. //depot/projects/opencrypto/sys/cam/ctl/ctl_tpc.c#5 integrate
.. //depot/projects/opencrypto/sys/cam/ctl/ctl_tpc_local.c#2 integrate
.. //depot/projects/opencrypto/sys/cam/ctl/scsi_ctl.c#4 integrate
.. //depot/projects/opencrypto/sys/cam/scsi/scsi_low.c#3 integrate
.. //depot/projects/opencrypto/sys/cam/scsi/scsi_low.h#2 integrate
.. //depot/projects/opencrypto/sys/cam/scsi/scsi_xpt.c#3 integrate
.. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#5 integrate
.. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#4 integrate
.. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#4 integrate
.. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c#2 integrate
.. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#5 integrate
.. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#3 integrate
.. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#3 integrate
.. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate
.. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#3 integrate
.. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#4 integrate
.. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#2 integrate
.. //depot/projects/opencrypto/sys/compat/ia32/ia32_sysvec.c#2 integrate
.. //depot/projects/opencrypto/sys/conf/files#12 integrate
.. //depot/projects/opencrypto/sys/conf/files.amd64#8 integrate
.. //depot/projects/opencrypto/sys/conf/files.arm#5 integrate
.. //depot/projects/opencrypto/sys/conf/files.i386#9 integrate
.. //depot/projects/opencrypto/sys/conf/kern.opts.mk#4 integrate
.. //depot/projects/opencrypto/sys/conf/newvers.sh#4 integrate
.. //depot/projects/opencrypto/sys/conf/options.arm#4 integrate
.. //depot/projects/opencrypto/sys/contrib/dev/ral/Makefile#2 integrate
.. //depot/projects/opencrypto/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate
.. //depot/projects/opencrypto/sys/contrib/ngatm/netnatm/saal/saal_sscop.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/advansys/advansys.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/advansys/adwcam.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/aha/aha.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/ahb/ahb.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/ahci/ahci.c#5 integrate
.. //depot/projects/opencrypto/sys/dev/aic/aic.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/altera/avgen/altera_avgen.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/altera/jtag_uart/altera_jtag_uart_cons.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/altera/jtag_uart/altera_jtag_uart_tty.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/altera/pio/pio.c#1 branch
.. //depot/projects/opencrypto/sys/dev/altera/pio/pio.h#1 branch
.. //depot/projects/opencrypto/sys/dev/altera/pio/pio_if.m#1 branch
.. //depot/projects/opencrypto/sys/dev/arcmsr/arcmsr.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/asr/asr.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/ath/if_ath.c#6 integrate
.. //depot/projects/opencrypto/sys/dev/beri/virtio/virtio.c#1 branch
.. //depot/projects/opencrypto/sys/dev/beri/virtio/virtio.h#1 branch
.. //depot/projects/opencrypto/sys/dev/beri/virtio/virtio_block.c#1 branch
.. //depot/projects/opencrypto/sys/dev/beri/virtio/virtio_mmio_platform.c#1 branch
.. //depot/projects/opencrypto/sys/dev/beri/virtio/virtio_mmio_platform.h#1 branch
.. //depot/projects/opencrypto/sys/dev/buslogic/bt.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/ciss/ciss.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/ct/bshw_machdep.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/ct/ct.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/ct/ct_isa.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/ct/ct_machdep.h#2 integrate
.. //depot/projects/opencrypto/sys/dev/ct/ctvar.h#2 integrate
.. //depot/projects/opencrypto/sys/dev/cxgbe/common/common.h#3 integrate
.. //depot/projects/opencrypto/sys/dev/cxgbe/t4_main.c#6 integrate
.. //depot/projects/opencrypto/sys/dev/dpt/dpt_scsi.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/drm2/radeon/radeon_connectors.c#3 integrate
.. //depot/projects/opencrypto/sys/dev/fdt/fdt_common.c#4 integrate
.. //depot/projects/opencrypto/sys/dev/ffec/if_ffec.c#4 integrate
.. //depot/projects/opencrypto/sys/dev/firewire/sbp.c#3 integrate
.. //depot/projects/opencrypto/sys/dev/glxiic/glxiic.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/gpio/gpio_if.m#2 integrate
.. //depot/projects/opencrypto/sys/dev/gpio/gpiobus.c#4 integrate
.. //depot/projects/opencrypto/sys/dev/gpio/gpiobusvar.h#4 integrate
.. //depot/projects/opencrypto/sys/dev/gpio/gpioc.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/gpio/ofw_gpiobus.c#4 integrate
.. //depot/projects/opencrypto/sys/dev/hpt27xx/hpt27xx_os_bsd.c#3 integrate
.. //depot/projects/opencrypto/sys/dev/hptnr/hptnr_os_bsd.c#4 integrate
.. //depot/projects/opencrypto/sys/dev/hptrr/hptrr_os_bsd.c#3 integrate
.. //depot/projects/opencrypto/sys/dev/hwpmc/hwpmc_mod.c#4 integrate
.. //depot/projects/opencrypto/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c#3 integrate
.. //depot/projects/opencrypto/sys/dev/iicbus/iicbus.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/iicbus/iicbus.h#3 integrate
.. //depot/projects/opencrypto/sys/dev/iicbus/iicbus_if.m#2 integrate
.. //depot/projects/opencrypto/sys/dev/iir/iir.c#3 integrate
.. //depot/projects/opencrypto/sys/dev/isci/isci_io_request.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/isci/isci_timer.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/iscsi/icl.c#5 integrate
.. //depot/projects/opencrypto/sys/dev/iscsi/iscsi.c#6 integrate
.. //depot/projects/opencrypto/sys/dev/isp/isp_freebsd.c#3 integrate
.. //depot/projects/opencrypto/sys/dev/isp/isp_freebsd.h#3 integrate
.. //depot/projects/opencrypto/sys/dev/ixgbe/ixgbe.c#6 integrate
.. //depot/projects/opencrypto/sys/dev/joy/joy_pccard.c#2 delete
.. //depot/projects/opencrypto/sys/dev/mcd/mcd.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/mcd/mcd_isa.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/mcd/mcdvar.h#2 integrate
.. //depot/projects/opencrypto/sys/dev/mly/mly.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/mly/mlyvar.h#2 integrate
.. //depot/projects/opencrypto/sys/dev/mpr/mpr_sas.c#3 integrate
.. //depot/projects/opencrypto/sys/dev/mps/mps_sas.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/mpt/mpt.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/mpt/mpt.h#2 integrate
.. //depot/projects/opencrypto/sys/dev/mpt/mpt_cam.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/mrsas/mrsas_cam.c#4 integrate
.. //depot/projects/opencrypto/sys/dev/mvs/mvs.c#3 integrate
.. //depot/projects/opencrypto/sys/dev/ncv/ncr53c500.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/ncv/ncr53c500_pccard.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/ncv/ncr53c500var.h#2 integrate
.. //depot/projects/opencrypto/sys/dev/nsp/nsp.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/nsp/nsp_pccard.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/nsp/nspvar.h#2 integrate
.. //depot/projects/opencrypto/sys/dev/ofw/ofw_iicbus.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/pccard/pccardvar.h#2 integrate
.. //depot/projects/opencrypto/sys/dev/pccbb/pccbb.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/pci/pci.c#6 integrate
.. //depot/projects/opencrypto/sys/dev/pst/pst-pci.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/pst/pst-raid.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/scd/scd.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/scd/scd_isa.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/scd/scdvar.h#2 integrate
.. //depot/projects/opencrypto/sys/dev/siis/siis.c#3 integrate
.. //depot/projects/opencrypto/sys/dev/sound/usb/uaudio.c#4 integrate
.. //depot/projects/opencrypto/sys/dev/stg/tmc18c30.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/stg/tmc18c30_isa.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/stg/tmc18c30_pccard.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/stg/tmc18c30_pci.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/stg/tmc18c30_subr.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/stg/tmc18c30var.h#2 integrate
.. //depot/projects/opencrypto/sys/dev/sym/sym_hipd.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/terasic/mtl/terasic_mtl.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/terasic/mtl/terasic_mtl.h#2 integrate
.. //depot/projects/opencrypto/sys/dev/terasic/mtl/terasic_mtl_fdt.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/terasic/mtl/terasic_mtl_nexus.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/terasic/mtl/terasic_mtl_reg.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/terasic/mtl/terasic_mtl_text.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/terasic/mtl/terasic_mtl_vt.c#1 branch
.. //depot/projects/opencrypto/sys/dev/trm/trm.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/tws/tws_cam.c#3 integrate
.. //depot/projects/opencrypto/sys/dev/usb/controller/ohci_pci.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/usb/controller/saf1761_otg.c#3 integrate
.. //depot/projects/opencrypto/sys/dev/usb/controller/saf1761_otg_reg.h#2 integrate
.. //depot/projects/opencrypto/sys/dev/usb/usbdevs#8 integrate
.. //depot/projects/opencrypto/sys/dev/usb/wlan/if_rsu.c#3 integrate
.. //depot/projects/opencrypto/sys/dev/virtio/block/virtio_blk.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/virtio/mmio/virtio_mmio.c#1 branch
.. //depot/projects/opencrypto/sys/dev/virtio/mmio/virtio_mmio.h#1 branch
.. //depot/projects/opencrypto/sys/dev/virtio/mmio/virtio_mmio_if.m#1 branch
.. //depot/projects/opencrypto/sys/dev/virtio/scsi/virtio_scsi.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/wds/wd7000.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/wi/if_wi_pccard.c#2 integrate
.. //depot/projects/opencrypto/sys/dev/wl/if_wl.c#3 integrate
.. //depot/projects/opencrypto/sys/dev/wl/if_wl.h#2 integrate
.. //depot/projects/opencrypto/sys/dev/xen/netback/netback.c#5 integrate
.. //depot/projects/opencrypto/sys/fs/autofs/autofs.c#4 integrate
.. //depot/projects/opencrypto/sys/fs/autofs/autofs.h#4 integrate
.. //depot/projects/opencrypto/sys/fs/autofs/autofs_vfsops.c#3 integrate
.. //depot/projects/opencrypto/sys/fs/smbfs/smbfs_vfsops.c#2 integrate
.. //depot/projects/opencrypto/sys/geom/part/g_part.c#2 integrate
.. //depot/projects/opencrypto/sys/geom/part/g_part_bsd.c#2 integrate
.. //depot/projects/opencrypto/sys/geom/part/g_part_if.m#2 integrate
.. //depot/projects/opencrypto/sys/i386/i386/elf_machdep.c#2 integrate
.. //depot/projects/opencrypto/sys/i386/i386/machdep.c#7 integrate
.. //depot/projects/opencrypto/sys/i386/i386/pmap.c#6 integrate
.. //depot/projects/opencrypto/sys/i386/i386/ptrace_machdep.c#3 integrate
.. //depot/projects/opencrypto/sys/i386/include/asm.h#2 integrate
.. //depot/projects/opencrypto/sys/i386/include/vmparam.h#3 integrate
.. //depot/projects/opencrypto/sys/i386/isa/npx.c#4 integrate
.. //depot/projects/opencrypto/sys/i386/isa/spic.c#2 integrate
.. //depot/projects/opencrypto/sys/i386/xen/locore.s#2 integrate
.. //depot/projects/opencrypto/sys/kern/imgact_elf.c#4 integrate
.. //depot/projects/opencrypto/sys/kern/kern_cons.c#4 integrate
.. //depot/projects/opencrypto/sys/kern/kern_descrip.c#7 integrate
.. //depot/projects/opencrypto/sys/kern/kern_event.c#3 integrate
.. //depot/projects/opencrypto/sys/kern/kern_mutex.c#3 integrate
.. //depot/projects/opencrypto/sys/kern/kern_resource.c#3 integrate
.. //depot/projects/opencrypto/sys/kern/subr_bus.c#4 integrate
.. //depot/projects/opencrypto/sys/kern/uipc_socket.c#5 integrate
.. //depot/projects/opencrypto/sys/kern/vfs_default.c#3 integrate
.. //depot/projects/opencrypto/sys/kern/vnode_if.src#3 integrate
.. //depot/projects/opencrypto/sys/libkern/strncmp.c#2 integrate
.. //depot/projects/opencrypto/sys/mips/atheros/ar71xx_gpio.c#3 integrate
.. //depot/projects/opencrypto/sys/mips/beri/files.beri#2 integrate
.. //depot/projects/opencrypto/sys/mips/cavium/octeon_gpio.c#3 integrate
.. //depot/projects/opencrypto/sys/mips/conf/BERI_DE4_BASE#2 integrate
.. //depot/projects/opencrypto/sys/mips/conf/MALTA#2 integrate
.. //depot/projects/opencrypto/sys/mips/conf/MALTA64#2 integrate
.. //depot/projects/opencrypto/sys/mips/conf/WZR-HPAG300H#1 branch
.. //depot/projects/opencrypto/sys/mips/conf/WZR-HPAG300H.hints#1 branch
.. //depot/projects/opencrypto/sys/mips/include/asm.h#2 integrate
.. //depot/projects/opencrypto/sys/mips/include/cache_mipsNN.h#2 integrate
.. //depot/projects/opencrypto/sys/mips/include/cpuinfo.h#2 integrate
.. //depot/projects/opencrypto/sys/mips/include/cpuregs.h#2 integrate
.. //depot/projects/opencrypto/sys/mips/mips/cache.c#2 integrate
.. //depot/projects/opencrypto/sys/mips/mips/cache_mipsNN.c#2 integrate
.. //depot/projects/opencrypto/sys/mips/mips/cpu.c#2 integrate
.. //depot/projects/opencrypto/sys/mips/mips/stdatomic.c#2 integrate
.. //depot/projects/opencrypto/sys/mips/mips/trap.c#2 integrate
.. //depot/projects/opencrypto/sys/mips/rt305x/rt305x_gpio.c#3 integrate
.. //depot/projects/opencrypto/sys/modules/cxgb/tom/Makefile#3 integrate
.. //depot/projects/opencrypto/sys/modules/geom/geom_part/geom_part_bsd/Makefile#2 integrate
.. //depot/projects/opencrypto/sys/modules/if_gif/Makefile#5 integrate
.. //depot/projects/opencrypto/sys/modules/if_gre/Makefile#4 integrate
.. //depot/projects/opencrypto/sys/modules/joy/Makefile#2 integrate
.. //depot/projects/opencrypto/sys/modules/lmc/Makefile#3 integrate
.. //depot/projects/opencrypto/sys/net/if.c#6 integrate
.. //depot/projects/opencrypto/sys/net/if_tap.c#3 integrate
.. //depot/projects/opencrypto/sys/net/route.c#4 integrate
.. //depot/projects/opencrypto/sys/net/route.h#3 integrate
.. //depot/projects/opencrypto/sys/netinet/ip_output.c#5 integrate
.. //depot/projects/opencrypto/sys/netinet/tcp_var.h#5 integrate
.. //depot/projects/opencrypto/sys/netinet6/ip6_output.c#5 integrate
.. //depot/projects/opencrypto/sys/netinet6/nd6.c#4 integrate
.. //depot/projects/opencrypto/sys/netpfil/pf/pf_ioctl.c#4 integrate
.. //depot/projects/opencrypto/sys/powerpc/aim/trap_subr32.S#2 integrate
.. //depot/projects/opencrypto/sys/powerpc/aim/trap_subr64.S#2 integrate
.. //depot/projects/opencrypto/sys/powerpc/include/asm.h#2 integrate
.. //depot/projects/opencrypto/sys/powerpc/include/profile.h#2 integrate
.. //depot/projects/opencrypto/sys/powerpc/powermac/pmu.c#4 integrate
.. //depot/projects/opencrypto/sys/powerpc/powermac/pmuvar.h#2 integrate
.. //depot/projects/opencrypto/sys/powerpc/powerpc/db_trace.c#2 integrate
.. //depot/projects/opencrypto/sys/powerpc/wii/wii_gpio.c#3 integrate
.. //depot/projects/opencrypto/sys/sparc64/include/asm.h#2 integrate
.. //depot/projects/opencrypto/sys/sys/buf.h#2 integrate
.. //depot/projects/opencrypto/sys/sys/bus.h#4 integrate
.. //depot/projects/opencrypto/sys/sys/callout.h#3 integrate
.. //depot/projects/opencrypto/sys/sys/elf_common.h#4 integrate
.. //depot/projects/opencrypto/sys/sys/event.h#3 integrate
.. //depot/projects/opencrypto/sys/sys/imgact_elf.h#3 integrate
.. //depot/projects/opencrypto/sys/sys/racct.h#3 integrate
.. //depot/projects/opencrypto/sys/sys/resourcevar.h#2 integrate
.. //depot/projects/opencrypto/sys/sys/vnode.h#5 integrate
.. //depot/projects/opencrypto/sys/ufs/ffs/ffs_suspend.c#2 integrate
.. //depot/projects/opencrypto/sys/ufs/ffs/ffs_vnops.c#3 integrate
.. //depot/projects/opencrypto/sys/ufs/ufs/ufs_acl.c#2 integrate
.. //depot/projects/opencrypto/sys/ufs/ufs/ufs_dirhash.c#3 integrate
.. //depot/projects/opencrypto/sys/ufs/ufs/ufs_gjournal.c#2 integrate
.. //depot/projects/opencrypto/sys/ufs/ufs/ufsmount.h#2 integrate
.. //depot/projects/opencrypto/sys/vm/swap_pager.c#3 integrate
.. //depot/projects/opencrypto/sys/vm/vm_page.c#6 integrate
.. //depot/projects/opencrypto/sys/vm/vm_pager.h#4 integrate
.. //depot/projects/opencrypto/sys/vm/vm_phys.c#3 integrate
.. //depot/projects/opencrypto/sys/vm/vm_phys.h#2 integrate
.. //depot/projects/opencrypto/sys/vm/vm_reserv.c#3 integrate
.. //depot/projects/opencrypto/sys/vm/vnode_pager.c#3 integrate
.. //depot/projects/opencrypto/sys/vm/vnode_pager.h#3 integrate
.. //depot/projects/opencrypto/sys/x86/include/fpu.h#3 integrate
.. //depot/projects/opencrypto/sys/x86/include/ptrace.h#2 integrate
.. //depot/projects/opencrypto/sys/xen/gnttab.c#2 integrate

Differences ...

==== //depot/projects/opencrypto/etc/mtree/BSD.tests.dist#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: head/etc/mtree/BSD.tests.dist 274149 2014-11-05 22:50:33Z markj $
+# $FreeBSD: head/etc/mtree/BSD.tests.dist 274618 2014-11-17 09:19:09Z ngie $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
@@ -149,8 +149,16 @@
             ..
             libproc
             ..
+            librt
+            ..
+            libthr
+                dlopen
+                ..
+            ..
             libutil
             ..
+            msun
+            ..
         ..
         libexec
             atf

==== //depot/projects/opencrypto/share/man/man4/acpi.4#2 (text+ko) ====

@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/acpi.4 268351 2014-07-07 00:27:09Z marcel $
+.\" $FreeBSD: head/share/man/man4/acpi.4 274532 2014-11-14 22:01:14Z mav $
 .\"
 .Dd June 23, 2014
 .Dt ACPI 4
@@ -238,7 +238,8 @@
 .It Va hw.acpi.install_interface , hw.acpi.remove_interface
 Install or remove OS interface(s) to control return value of
 .Ql _OSI
-query method.  When an OS interface is specified in
+query method.
+When an OS interface is specified in
 .Va hw.acpi.install_interface ,
 .Li _OSI
 query for the interface returns it is
@@ -249,7 +250,8 @@
 query returns it is
 .Em not supported .
 Multiple interfaces can be specified in a comma-separated list and
-any leading white spaces will be ignored.  For example,
+any leading white spaces will be ignored.
+For example,
 .Qq Li FreeBSD, Linux
 is a valid list of two interfaces
 .Qq Li FreeBSD
@@ -626,13 +628,3 @@
 Upgrade your BIOS to the latest version available from the vendor before
 deciding it is a problem with
 .Nm .
-.Pp
-The
-.Nm
-CPU idle power management drive conflicts with the local APIC (LAPIC)
-timer.
-Disable the local APIC timer with
-.Va hint.apic.0.clock=0
-or do not use the
-.Li C3
-and deeper states if the local APIC timer is enabled.

==== //depot/projects/opencrypto/share/man/man4/gre.4#3 (text+ko) ====

@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/gre.4 274246 2014-11-07 19:13:19Z ae $
+.\" $FreeBSD: head/share/man/man4/gre.4 274925 2014-11-23 21:00:00Z joel $
 .\"
 .Dd November 7, 2014
 .Dt GRE 4
@@ -91,7 +91,6 @@
 Enables use of sequence number field in the GRE header for outgoing packets.
 .El
 .Sh EXAMPLES
-.Pp
 .Bd -literal
 192.168.1.* --- Router A  -------tunnel-------- Router B --- 192.168.2.*
                    \\                              /
@@ -151,7 +150,6 @@
 .An Andrey V. Elsukov Aq Mt ae@FreeBSD.org
 .An Heiko W.Rupp Aq Mt hwr@pilhuhn.de
 .Sh BUGS
-.Pp
 The current implementation uses the key only for outgoing packets.
 Incoming packets with a different key or without a key will be treated as if they
 would belong to this interface.

==== //depot/projects/opencrypto/share/man/man4/iicbus.4#2 (text+ko) ====

@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/iicbus.4 267834 2014-06-24 19:42:37Z loos $
+.\" $FreeBSD: head/share/man/man4/iicbus.4 274822 2014-11-21 21:30:08Z ian $
 .\"
-.Dd June 24, 2014
+.Dd November 17, 2014
 .Dt IICBUS 4
 .Os
 .Sh NAME
@@ -103,12 +103,59 @@
 .It Sy lpbb Ta "parallel port specific bit-banging interface"
 .It Sy bktr Ta "Brooktree848 video chipset, hardware and software master-only interface"
 .El
+.Sh BUS FREQUENCY CONFIGURATION
+The operating frequency of an I2C bus may be fixed or configurable.
+The bus may be used as part of some larger standard interface, and that
+interface specification may require a fixed frequency.  
+The driver for that hardware would not honor an attempt to configure a 
+different speed.
+A general purpose I2C bus, such as those found in many embedded systems,
+will often support multiple bus frequencies.  
+.Pp
+When a system supports multiple I2C busses, a different frequency can
+be configured for each bus by number, represented by the
+.Va %d
+in the variable names below.
+Busses can be configured using any combination of device hints,
+Flattened Device Tree (FDT) data, tunables set via
+.Xr loader 8 ,
+or at runtime using
+.Xr sysctl 8 .
+When configuration is supplied using more than one method, FDT and
+hint data will be overridden by a tunable, which can be overriden by
+.Xr sysctl 8 .
+.Ss Device Hints
+Set
+.Va hint.iicbus.%d.frequency
+to the frequency in Hz, on systems that use device hints to configure
+I2C devices.
+The hint is also honored by systems that use FDT data if
+no frequency is configured using FDT.
+.Ss Flattened Device Tree Data
+Configure the I2C bus speed using the FDT standard
+.Va clock-frequency
+property of the node describing the I2C controller hardware.
+.Ss Sysctl and Tunable
+Set
+.Va dev.iicbus.%d.frequency
+in
+.Xr loader.conf 5 .
+The same variable can be changed at any time with
+.Xr sysctl 8 .
+Reset the bus using
+.Xr i2c 8
+or the
+.Xr iic 4 
+.Va I2CRSTCARD
+ioctl to make the change take effect.
 .Sh SEE ALSO
 .Xr bktr 4 ,
+.Xr fdt 4 ,
 .Xr iic 4 ,
 .Xr iicbb 4 ,
 .Xr lpbb 4 ,
-.Xr pcf 4
+.Xr pcf 4 ,
+.Xr i2c 8
 .Sh HISTORY
 The
 .Nm

==== //depot/projects/opencrypto/share/man/man4/man4.arm/cgem.4#2 (text+ko) ====

@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/man4.arm/cgem.4 271907 2014-09-20 15:45:29Z ian $
+.\" $FreeBSD: head/share/man/man4/man4.arm/cgem.4 274925 2014-11-23 21:00:00Z joel $
 .\"
 .Dd August 26, 2014
 .Dt CGEM 4
@@ -248,6 +248,23 @@
 Counter of frames discarded due to an incorrect UDP checksum when
 checksum offloading is enabled.
 .El
+.Sh SEE ALSO
+.Xr miibus 4 ,
+.Xr ifconfig 8
+.Rs
+.%T "Zynq-7000 SoC Technical Reference Manual (Xilinx doc UG585)"
+.%U http://www.xilinx.com/support/documentation/user_guides/\:ug585-Zynq-7000-TRM.pdf
+.Re
+.Sh HISTORY
+The
+.Nm
+device driver first appeared in
+.Fx 10.0 .
+.Sh AUTHORS
+The
+.Nm
+driver and this manual page was written by
+.An Thomas Skibo Aq Mt thomasskibo@yahoo.com .
 .Sh BUGS
 The GEM can perform TCP/UDP/IP checksum offloading.
 However, when transmit checksum offloading is enabled, the GEM generates and
@@ -277,21 +294,3 @@
 work-around can be disabled by setting the dev.cgem.%d.rxhangwar
 .Xr sysctl 8
 variable to 0.
-.Pp
-.Sh SEE ALSO
-.Xr miibus 4 ,
-.Xr ifconfig 8
-.Rs
-.%T "Zynq-7000 SoC Technical Reference Manual (Xilinx doc UG585)"
-.%U http://www.xilinx.com/support/documentation/user_guides/\:ug585-Zynq-7000-TRM.pdf
-.Re
-.Sh HISTORY
-The
-.Nm
-device driver first appeared in
-.Fx 10.0 .
-.Sh AUTHORS
-The
-.Nm
-driver and this manual page was written by
-.An Thomas Skibo Aq Mt thomasskibo@yahoo.com .

==== //depot/projects/opencrypto/share/man/man4/me.4#2 (text+ko) ====

@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man4/me.4 274246 2014-11-07 19:13:19Z ae $
+.\" $FreeBSD: head/share/man/man4/me.4 274925 2014-11-23 21:00:00Z joel $
 .\"
 .Dd November 7, 2014
 .Dt ME 4
@@ -67,7 +67,6 @@
 so modified header and the original payload.
 The protocol number 55 is used for outer header.
 .Sh NOTES
-.Pp
 For correct operation, the
 .Nm
 device needs a route to the decapsulating host that does not run over the tunnel,

==== //depot/projects/opencrypto/share/man/man4/netmap.4#2 (text+ko) ====

@@ -25,7 +25,7 @@
 .\" This document is derived in part from the enet man page (enet.4)
 .\" distributed with 4.3BSD Unix.
 .\"
-.\" $FreeBSD: head/share/man/man4/netmap.4 267001 2014-06-03 05:19:10Z sobomax $
+.\" $FreeBSD: head/share/man/man4/netmap.4 274925 2014-11-23 21:00:00Z joel $
 .\"
 .Dd February 13, 2014
 .Dt NETMAP 4
@@ -614,7 +614,7 @@
 (default) all hardware ring pairs
 .It NR_REG_SW            "netmap:foo^"
 the ``host rings'', connecting to the host stack.
-.It NR_REG_NIC_SW        "netmap:foo+
+.It NR_REG_NIC_SW        "netmap:foo+"
 all hardware rings and the host rings
 .It NR_REG_ONE_NIC       "netmap:foo-i"
 only the i-th hardware ring pair, where the number is in

==== //depot/projects/opencrypto/share/man/man4/rsu.4#2 (text+ko) ====

@@ -1,5 +1,5 @@
 .\" $OpenBSD: rsu.4,v 1.11 2013/02/14 07:40:42 jmc Exp $
-.\" $FreeBSD: head/share/man/man4/rsu.4 267938 2014-06-26 21:46:14Z bapt $
+.\" $FreeBSD: head/share/man/man4/rsu.4 274684 2014-11-19 05:38:45Z kevlo $
 .\"
 .\" Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
 .\"
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd May 3, 2014
+.Dd November 19, 2014
 .Dt RSU 4
 .Os
 .Sh NAME
@@ -119,6 +119,7 @@
 .It Sitecom WL-349 v1
 .It Sitecom WL-353
 .It Sweex LW154
+.It TRENDnet TEW-646UBH
 .It TRENDnet TEW-648UB
 .It TRENDnet TEW-649UB
 .El

==== //depot/projects/opencrypto/share/man/man4/splash.4#3 (text+ko) ====

@@ -24,7 +24,7 @@
 .\" (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: head/share/man/man4/splash.4 270660 2014-08-26 11:13:07Z se $
+.\" $FreeBSD: head/share/man/man4/splash.4 274749 2014-11-20 14:18:07Z emaste $
 .\"
 .Dd November 29, 2010
 .Dt SPLASH 4
@@ -66,7 +66,7 @@
 .Pp
 .Bl -tag -width splash_decoder -compact
 .It Pa splash_bmp.ko
-W*ndows BMP file decoder.
+Windows BMP file decoder.
 While the BMP file format allows images of various color depths, this
 decoder currently only handles 256 color bitmaps.
 Bitmaps of other color depths will not be displayed.

==== //depot/projects/opencrypto/share/man/man9/Makefile#6 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: head/share/man/man9/Makefile 273788 2014-10-28 16:19:02Z jkim $
+# $FreeBSD: head/share/man/man9/Makefile 275045 2014-11-25 15:21:21Z avg $
 
 MAN=	accept_filter.9 \
 	accf_data.9 \
@@ -345,6 +345,7 @@
 	vmem.9 \
 	vn_fullpath.9 \
 	vn_isdisk.9 \
+	vnet.9 \
 	vnode.9 \
 	VOP_ACCESS.9 \
 	VOP_ACLCHECK.9 \
@@ -1575,12 +1576,16 @@
 	timeout.9 callout_pending.9 \
 	timeout.9 callout_reset.9 \
 	timeout.9 callout_reset_curcpu.9 \
+	timeout.9 callout_reset_on.9 \
 	timeout.9 callout_reset_sbt.9 \
-	timeout.9 callout_reset_on.9 \
+	timeout.9 callout_reset_sbt_curcpu.9 \
 	timeout.9 callout_reset_sbt_on.9 \
 	timeout.9 callout_schedule.9 \
 	timeout.9 callout_schedule_curcpu.9 \
 	timeout.9 callout_schedule_on.9 \
+	timeout.9 callout_schedule_sbt.9 \
+	timeout.9 callout_schedule_sbt_curcpu.9 \
+	timeout.9 callout_schedule_sbt_on.9 \
 	timeout.9 callout_stop.9 \
 	timeout.9 untimeout.9
 MLINKS+=ucred.9 cred_update_thread.9 \
@@ -1732,6 +1737,7 @@
 MLINKS+=VOP_RDWR.9 VOP_READ.9 \
 	VOP_RDWR.9 VOP_WRITE.9
 MLINKS+=VOP_REMOVE.9 VOP_RMDIR.9
+MLINKS+=vnet.9 vimage.9
 MLINKS+=vref.9 VREF.9
 MLINKS+=vrele.9 vput.9 \
 	vrele.9 vunref.9

==== //depot/projects/opencrypto/share/man/man9/get_cyclecount.9#2 (text+ko) ====

@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man9/get_cyclecount.9 268351 2014-07-07 00:27:09Z marcel $
+.\" $FreeBSD: head/share/man/man9/get_cyclecount.9 274925 2014-11-23 21:00:00Z joel $
 .\"
 .Dd March 15, 2011
 .Dt GET_CYCLECOUNT 9
@@ -77,7 +77,6 @@
 processors use the
 .Li TSC
 register.
-.Pp
 .Sh SEE ALSO
 .Xr binuptime 9
 .Sh HISTORY

==== //depot/projects/opencrypto/share/man/man9/malloc.9#2 (text+ko) ====

@@ -27,7 +27,7 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $NetBSD: malloc.9,v 1.3 1996/11/11 00:05:11 lukem Exp $
-.\" $FreeBSD: head/share/man/man9/malloc.9 260720 2014-01-16 13:58:55Z glebius $
+.\" $FreeBSD: head/share/man/man9/malloc.9 274925 2014-11-23 21:00:00Z joel $
 .\"
 .Dd January 16, 2014
 .Dt MALLOC 9
@@ -208,12 +208,6 @@
 .In sys/types.h )
 and
 .In sys/kernel.h .
-.Sh IMPLEMENTATION NOTES
-The memory allocator allocates memory in chunks that have size a power
-of two for requests up to the size of a page of memory.
-For larger requests, one or more pages is allocated.
-While it should not be relied upon, this information may be useful for
-optimizing the efficiency of memory use.
 .Sh CONTEXT
 .Fn malloc ,
 .Fn realloc
@@ -244,6 +238,12 @@
 .Xr vnode 9
 interlock, will cause a LOR (Lock Order Reversal) due to the
 intertwining of VM Objects and Vnodes.
+.Sh IMPLEMENTATION NOTES
+The memory allocator allocates memory in chunks that have size a power
+of two for requests up to the size of a page of memory.
+For larger requests, one or more pages is allocated.
+While it should not be relied upon, this information may be useful for
+optimizing the efficiency of memory use.
 .Sh RETURN VALUES
 The
 .Fn malloc ,

==== //depot/projects/opencrypto/share/man/man9/sleepqueue.9#3 (text+ko) ====

@@ -21,7 +21,7 @@
 .\" (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: head/share/man/man9/sleepqueue.9 272475 2014-10-03 15:03:44Z lwhsu $
+.\" $FreeBSD: head/share/man/man9/sleepqueue.9 274925 2014-11-23 21:00:00Z joel $
 .\"
 .Dd September 22, 2014
 .Dt SLEEPQUEUE 9
@@ -246,7 +246,6 @@
 .Fn callout_reset_sbt
 flags.
 .Pp
-.Pp
 Once the thread is ready to suspend,
 one of the wait functions is called to put the current thread to sleep
 until it is awakened and to context switch to another thread.

==== //depot/projects/opencrypto/share/man/man9/timeout.9#4 (text+ko) ====

@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/share/man/man9/timeout.9 272772 2014-10-08 21:56:00Z jhb $
+.\" $FreeBSD: head/share/man/man9/timeout.9 275045 2014-11-25 15:21:21Z avg $
 .\"
 .Dd October 8, 2014
 .Dt TIMEOUT 9
@@ -51,6 +51,9 @@
 .Nm callout_schedule ,
 .Nm callout_schedule_curcpu ,
 .Nm callout_schedule_on ,
+.Nm callout_schedule_sbt ,
+.Nm callout_schedule_sbt_curcpu ,
+.Nm callout_schedule_sbt_on ,
 .Nm callout_stop ,
 .Nm timeout ,
 .Nm untimeout
@@ -106,6 +109,15 @@
 .Ft int
 .Fn callout_schedule_on "struct callout *c" "int ticks" "int cpu"
 .Ft int
+.Fn callout_schedule_sbt "struct callout *c" "sbintime_t sbt" \
+"sbintime_t pr" "int flags"
+.Ft int
+.Fn callout_schedule_sbt_curcpu "struct callout *c" "sbintime_t sbt" \
+"sbintime_t pr" "int flags"
+.Ft int
+.Fn callout_schedule_sbt_on "struct callout *c" "sbintime_t sbt" \
+"sbintime_t pr" "int cpu" "int flags"
+.Ft int
 .Fn callout_stop "struct callout *c"
 .Ft struct callout_handle
 .Fn timeout "timeout_t *func" "void *arg" "int ticks"
@@ -386,21 +398,24 @@
 The
 .Fn callout_reset_on ,
 .Fn callout_reset_sbt_on ,
+.Fn callout_schedule_on
 and
-.Fn callout_schedule_on
+.Fn callout_schedule_sbt_on
 functions assign the callout to CPU
 .Fa cpu .
 The
 .Fn callout_reset_curcpu ,
 .Fn callout_reset_sbt_curpu ,
+.Fn callout_schedule_curcpu
 and
-.Fn callout_schedule_curcpu
+.Fn callout_schedule_sbt_curcpu
 functions assign the callout to the current CPU.
 The
 .Fn callout_reset ,
 .Fn callout_reset_sbt ,
+.Fn callout_schedule
 and
-.Fn callout_schedule
+.Fn callout_schedule_sbt
 functions schedule the callout to execute in the softclock thread of the CPU
 to which it is currently assigned.
 .Pp

==== //depot/projects/opencrypto/sys/amd64/amd64/elf_machdep.c#2 (text+ko) ====

@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/amd64/amd64/elf_machdep.c 239123 2012-08-07 05:46:36Z pluknet $");
+__FBSDID("$FreeBSD: head/sys/amd64/amd64/elf_machdep.c 274817 2014-11-21 20:53:17Z jhb $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -44,6 +44,7 @@
 #include <vm/vm_param.h>
 
 #include <machine/elf.h>
+#include <machine/fpu.h>
 #include <machine/md_var.h>
 
 struct sysentvec elf64_freebsd_sysvec = {
@@ -133,12 +134,27 @@
 	&kfreebsd_brand_info);
 
 void
-elf64_dump_thread(struct thread *td __unused, void *dst __unused,
-    size_t *off __unused)
+elf64_dump_thread(struct thread *td, void *dst, size_t *off)
 {
+	void *buf;
+	size_t len;
+
+	len = 0;
+	if (use_xsave) {
+		if (dst != NULL) {
+			fpugetregs(td);
+			len += elf64_populate_note(NT_X86_XSTATE,
+			    get_pcb_user_save_td(td), dst,
+			    cpu_max_ext_state_size, &buf);
+			*(uint64_t *)((char *)buf + X86_XSTATE_XCR0_OFFSET) =
+			    xsave_mask;
+		} else
+			len += elf64_populate_note(NT_X86_XSTATE, NULL, NULL,
+			    cpu_max_ext_state_size, NULL);
+	}
+	*off = len;
 }
 
-
 /* Process one elf relocation with addend. */
 static int
 elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data,

==== //depot/projects/opencrypto/sys/amd64/amd64/fpu.c#5 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/amd64/amd64/fpu.c 273377 2014-10-21 07:31:21Z hselasky $");
+__FBSDID("$FreeBSD: head/sys/amd64/amd64/fpu.c 274817 2014-11-21 20:53:17Z jhb $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -127,6 +127,13 @@
  */
 CTASSERT(sizeof(struct pcb) % XSAVE_AREA_ALIGN == 0);
 
+/*
+ * Ensure the copy of XCR0 saved in a core is contained in the padding
+ * area.
+ */
+CTASSERT(X86_XSTATE_XCR0_OFFSET >= offsetof(struct savefpu, sv_pad) &&
+    X86_XSTATE_XCR0_OFFSET + sizeof(uint64_t) <= sizeof(struct savefpu));
+
 static	void	fpu_clean_state(void);
 
 SYSCTL_INT(_hw, HW_FLOATINGPT, floatingpoint, CTLFLAG_RD,

==== //depot/projects/opencrypto/sys/amd64/amd64/pmap.c#7 (text+ko) ====

@@ -79,7 +79,7 @@
 #define	AMD64_NPT_AWARE
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/amd64/amd64/pmap.c 273701 2014-10-26 17:56:47Z alc $");
+__FBSDID("$FreeBSD: head/sys/amd64/amd64/pmap.c 274556 2014-11-15 23:40:44Z alc $");
 
 /*
  *	Manages physical address maps.
@@ -833,6 +833,15 @@
 	 */
 	create_pagetables(firstaddr);
 
+	/*
+	 * Add a physical memory segment (vm_phys_seg) corresponding to the
+	 * preallocated kernel page table pages so that vm_page structures
+	 * representing these pages will be created.  The vm_page structures
+	 * are required for promotion of the corresponding kernel virtual
+	 * addresses to superpage mappings.
+	 */
+	vm_phys_add_seg(KPTphys, KPTphys + ptoa(nkpt));
+
 	virtual_avail = (vm_offset_t) KERNBASE + *firstaddr;
 	virtual_avail = pmap_kmem_choose(virtual_avail);
 

==== //depot/projects/opencrypto/sys/amd64/amd64/ptrace_machdep.c#2 (text+ko) ====

@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/amd64/amd64/ptrace_machdep.c 238669 2012-07-21 13:06:37Z kib $");
+__FBSDID("$FreeBSD: head/sys/amd64/amd64/ptrace_machdep.c 274817 2014-11-21 20:53:17Z jhb $");
 
 #include "opt_compat.h"
 
@@ -42,6 +42,7 @@
 static int
 cpu_ptrace_xstate(struct thread *td, int req, void *addr, int data)
 {
+	struct ptrace_xstate_info info;
 	char *savefpu;
 	int error;
 
@@ -49,14 +50,14 @@
 		return (EOPNOTSUPP);
 
 	switch (req) {
-	case PT_GETXSTATE:
+	case PT_GETXSTATE_OLD:
 		fpugetregs(td);
 		savefpu = (char *)(get_pcb_user_save_td(td) + 1);
 		error = copyout(savefpu, addr,
 		    cpu_max_ext_state_size - sizeof(struct savefpu));
 		break;
 
-	case PT_SETXSTATE:
+	case PT_SETXSTATE_OLD:
 		if (data > cpu_max_ext_state_size - sizeof(struct savefpu)) {
 			error = EINVAL;
 			break;
@@ -70,6 +71,36 @@
 		free(savefpu, M_TEMP);
 		break;
 
+	case PT_GETXSTATE_INFO:
+		if (data != sizeof(info)) {
+			error  = EINVAL;
+			break;
+		}
+		info.xsave_len = cpu_max_ext_state_size;
+		info.xsave_mask = xsave_mask;
+		error = copyout(&info, addr, data);
+		break;
+
+	case PT_GETXSTATE:
+		fpugetregs(td);
+		savefpu = (char *)(get_pcb_user_save_td(td));
+		error = copyout(savefpu, addr, cpu_max_ext_state_size);

>>> TRUNCATED FOR MAIL (1000 lines) <<<



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411252020.sAPKKSec074733>