From owner-p4-projects@FreeBSD.ORG Sat Dec 28 17:37:08 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8066061F; Sat, 28 Dec 2013 17:37:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2A20961D for ; Sat, 28 Dec 2013 17:37:08 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 120371D27 for ; Sat, 28 Dec 2013 17:37:08 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id rBSHb8jl026366 for ; Sat, 28 Dec 2013 17:37:08 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.7/Submit) id rBSHb7Zl026363 for perforce@freebsd.org; Sat, 28 Dec 2013 17:37:07 GMT (envelope-from jhb@freebsd.org) Date: Sat, 28 Dec 2013 17:37:07 GMT Message-Id: <201312281737.rBSHb7Zl026363@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1189570 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.17 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Dec 2013 17:37:08 -0000 http://p4web.freebsd.org/@@1189570?ac=10 Change 1189570 by jhb@jhb_pippin on 2013/12/28 17:36:48 IFC @1189568 Affected files ... .. //depot/projects/pci/sys/amd64/amd64/machdep.c#12 integrate .. //depot/projects/pci/sys/amd64/amd64/mp_machdep.c#10 integrate .. //depot/projects/pci/sys/amd64/amd64/pmap.c#12 integrate .. //depot/projects/pci/sys/amd64/include/cpu.h#6 integrate .. //depot/projects/pci/sys/amd64/include/pmap.h#9 integrate .. //depot/projects/pci/sys/amd64/include/vmm.h#6 integrate .. //depot/projects/pci/sys/amd64/include/vmm_dev.h#5 integrate .. //depot/projects/pci/sys/amd64/vmm/amd/amdv.c#3 integrate .. //depot/projects/pci/sys/amd64/vmm/intel/ept.c#4 integrate .. //depot/projects/pci/sys/amd64/vmm/intel/vmcs.c#5 integrate .. //depot/projects/pci/sys/amd64/vmm/intel/vmcs.h#5 integrate .. //depot/projects/pci/sys/amd64/vmm/intel/vmx.c#7 integrate .. //depot/projects/pci/sys/amd64/vmm/intel/vmx.h#4 integrate .. //depot/projects/pci/sys/amd64/vmm/intel/vmx_genassym.c#4 integrate .. //depot/projects/pci/sys/amd64/vmm/io/ppt.c#5 integrate .. //depot/projects/pci/sys/amd64/vmm/io/ppt.h#3 integrate .. //depot/projects/pci/sys/amd64/vmm/io/vhpet.c#2 integrate .. //depot/projects/pci/sys/amd64/vmm/io/vioapic.c#2 integrate .. //depot/projects/pci/sys/amd64/vmm/io/vlapic.c#4 integrate .. //depot/projects/pci/sys/amd64/vmm/io/vlapic.h#3 integrate .. //depot/projects/pci/sys/amd64/vmm/io/vlapic_priv.h#1 branch .. //depot/projects/pci/sys/amd64/vmm/vmm.c#6 integrate .. //depot/projects/pci/sys/amd64/vmm/vmm_dev.c#6 integrate .. //depot/projects/pci/sys/amd64/vmm/vmm_lapic.c#3 integrate .. //depot/projects/pci/sys/amd64/vmm/vmm_lapic.h#3 integrate .. //depot/projects/pci/sys/amd64/vmm/vmm_msr.c#3 integrate .. //depot/projects/pci/sys/amd64/vmm/vmm_msr.h#2 integrate .. //depot/projects/pci/sys/arm/arm/bus_space-v6.c#2 integrate .. //depot/projects/pci/sys/arm/arm/cpufunc.c#8 integrate .. //depot/projects/pci/sys/arm/arm/elf_trampoline.c#6 integrate .. //depot/projects/pci/sys/arm/arm/identcpu.c#8 integrate .. //depot/projects/pci/sys/arm/arm/locore.S#6 integrate .. //depot/projects/pci/sys/arm/arm/pmap-v6.c#8 integrate .. //depot/projects/pci/sys/arm/arm/swtch.S#6 integrate .. //depot/projects/pci/sys/arm/at91/if_ate.c#5 integrate .. //depot/projects/pci/sys/arm/at91/uart_dev_at91usart.c#5 integrate .. //depot/projects/pci/sys/arm/broadcom/bcm2835/bcm2835_fbd.c#1 branch .. //depot/projects/pci/sys/arm/broadcom/bcm2835/files.bcm2835#5 integrate .. //depot/projects/pci/sys/arm/conf/RPI-B#6 integrate .. //depot/projects/pci/sys/arm/freescale/imx/files.imx51#3 integrate .. //depot/projects/pci/sys/arm/freescale/imx/files.imx53#3 integrate .. //depot/projects/pci/sys/arm/freescale/imx/files.imx6#2 integrate .. //depot/projects/pci/sys/arm/freescale/imx/imx51_ipuv3_fbd.c#1 branch .. //depot/projects/pci/sys/arm/include/armreg.h#8 integrate .. //depot/projects/pci/sys/arm/include/cpuconf.h#3 integrate .. //depot/projects/pci/sys/arm/include/cpufunc.h#4 integrate .. //depot/projects/pci/sys/arm/include/intr.h#4 integrate .. //depot/projects/pci/sys/arm/include/md_var.h#3 integrate .. //depot/projects/pci/sys/arm/mv/mv_pci.c#5 integrate .. //depot/projects/pci/sys/arm/ti/am335x/am335x_dmtimer.c#4 integrate .. //depot/projects/pci/sys/arm/ti/files.ti#4 integrate .. //depot/projects/pci/sys/arm/versatile/bus_space.c#2 integrate .. //depot/projects/pci/sys/arm/xilinx/zy7_bus_space.c#2 integrate .. //depot/projects/pci/sys/boot/fdt/dts/beri-netfpga.dts#1 branch .. //depot/projects/pci/sys/boot/ficl/Makefile#3 integrate .. //depot/projects/pci/sys/boot/i386/Makefile.inc#4 integrate .. //depot/projects/pci/sys/boot/i386/boot2/Makefile#9 integrate .. //depot/projects/pci/sys/boot/ia64/efi/version#5 integrate .. //depot/projects/pci/sys/boot/pc98/Makefile.inc#3 integrate .. //depot/projects/pci/sys/boot/pc98/boot2/Makefile#4 integrate .. //depot/projects/pci/sys/boot/usb/Makefile#2 integrate .. //depot/projects/pci/sys/boot/usb/Makefile.test#2 integrate .. //depot/projects/pci/sys/boot/userboot/ficl/Makefile#3 integrate .. //depot/projects/pci/sys/boot/userboot/libstand/Makefile#5 integrate .. //depot/projects/pci/sys/boot/zfs/Makefile#3 integrate .. //depot/projects/pci/sys/cam/cam.h#7 integrate .. //depot/projects/pci/sys/cam/cam_ccb.h#11 integrate .. //depot/projects/pci/sys/cam/cam_compat.c#3 integrate .. //depot/projects/pci/sys/cam/cam_compat.h#3 integrate .. //depot/projects/pci/sys/cam/scsi/scsi_xpt.c#9 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c#5 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h#5 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c#5 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#9 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#3 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#4 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#8 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#4 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#9 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c#4 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#9 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#7 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c#7 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#7 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#9 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#6 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#4 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#5 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#6 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#4 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfeature.h#4 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#7 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#5 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c#4 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#10 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#8 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c#6 integrate .. //depot/projects/pci/sys/cddl/contrib/opensolaris/uts/powerpc/dtrace/fasttrap_isa.c#3 integrate .. //depot/projects/pci/sys/cddl/dev/fbt/fbt_powerpc.c#4 integrate .. //depot/projects/pci/sys/conf/Makefile.arm#7 integrate .. //depot/projects/pci/sys/conf/files#18 integrate .. //depot/projects/pci/sys/conf/files.arm#9 integrate .. //depot/projects/pci/sys/conf/files.powerpc#12 integrate .. //depot/projects/pci/sys/conf/kern.mk#10 integrate .. //depot/projects/pci/sys/conf/options.arm#6 integrate .. //depot/projects/pci/sys/dev/advansys/adwcam.c#4 integrate .. //depot/projects/pci/sys/dev/ae/if_ae.c#8 integrate .. //depot/projects/pci/sys/dev/ahci/ahciem.c#3 integrate .. //depot/projects/pci/sys/dev/aic7xxx/aic79xx.c#5 integrate .. //depot/projects/pci/sys/dev/aic7xxx/aic7xxx.c#5 integrate .. //depot/projects/pci/sys/dev/an/if_an.c#6 integrate .. //depot/projects/pci/sys/dev/an/if_an_pccard.c#3 integrate .. //depot/projects/pci/sys/dev/arcmsr/arcmsr.c#10 integrate .. //depot/projects/pci/sys/dev/arcmsr/arcmsr.h#6 integrate .. //depot/projects/pci/sys/dev/bxe/bxe.c#4 integrate .. //depot/projects/pci/sys/dev/cxgb/common/cxgb_mc5.c#3 integrate .. //depot/projects/pci/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#4 integrate .. //depot/projects/pci/sys/dev/cxgbe/common/common.h#10 integrate .. //depot/projects/pci/sys/dev/cxgbe/offload.h#8 integrate .. //depot/projects/pci/sys/dev/cxgbe/t4_main.c#13 integrate .. //depot/projects/pci/sys/dev/cxgbe/t4_sge.c#13 integrate .. //depot/projects/pci/sys/dev/cxgbe/tom/t4_cpl_io.c#5 integrate .. //depot/projects/pci/sys/dev/cxgbe/tom/t4_listen.c#5 integrate .. //depot/projects/pci/sys/dev/cxgbe/tom/t4_tom.h#5 integrate .. //depot/projects/pci/sys/dev/drm/mach64_dma.c#4 integrate .. //depot/projects/pci/sys/dev/drm2/drm_edid.c#4 integrate .. //depot/projects/pci/sys/dev/drm2/drm_fb_helper.c#4 integrate .. //depot/projects/pci/sys/dev/drm2/radeon/radeon_fence.c#2 integrate .. //depot/projects/pci/sys/dev/drm2/radeon/radeon_sa.c#2 integrate .. //depot/projects/pci/sys/dev/drm2/ttm/ttm_bo.c#4 integrate .. //depot/projects/pci/sys/dev/drm2/ttm/ttm_bo_vm.c#5 integrate .. //depot/projects/pci/sys/dev/drm2/ttm/ttm_lock.c#2 integrate .. //depot/projects/pci/sys/dev/e1000/if_lem.c#9 integrate .. //depot/projects/pci/sys/dev/fb/fbd.c#2 integrate .. //depot/projects/pci/sys/dev/fdt/fdt_common.h#6 integrate .. //depot/projects/pci/sys/dev/fdt/fdt_pci.c#5 integrate .. //depot/projects/pci/sys/dev/hwpmc/hwpmc_core.c#9 integrate .. //depot/projects/pci/sys/dev/hwpmc/hwpmc_core.h#3 integrate .. //depot/projects/pci/sys/dev/hwpmc/hwpmc_intel.c#5 integrate .. //depot/projects/pci/sys/dev/hwpmc/hwpmc_powerpc.c#5 integrate .. //depot/projects/pci/sys/dev/ie/if_ie.c#5 integrate .. //depot/projects/pci/sys/dev/iscsi/iscsi.c#3 integrate .. //depot/projects/pci/sys/dev/isp/isp.c#8 integrate .. //depot/projects/pci/sys/dev/isp/isp_freebsd.c#8 integrate .. //depot/projects/pci/sys/dev/iwn/if_iwn_chip_cfg.h#2 integrate .. //depot/projects/pci/sys/dev/ixgbe/ixgbe.c#11 integrate .. //depot/projects/pci/sys/dev/md/md.c#11 integrate .. //depot/projects/pci/sys/dev/mwl/if_mwl.c#7 integrate .. //depot/projects/pci/sys/dev/netmap/if_em_netmap.h#5 integrate .. //depot/projects/pci/sys/dev/netmap/if_igb_netmap.h#6 integrate .. //depot/projects/pci/sys/dev/netmap/if_lem_netmap.h#5 integrate .. //depot/projects/pci/sys/dev/netmap/if_re_netmap.h#5 integrate .. //depot/projects/pci/sys/dev/netmap/ixgbe_netmap.h#5 integrate .. //depot/projects/pci/sys/dev/netmap/netmap.c#5 integrate .. //depot/projects/pci/sys/dev/netmap/netmap_freebsd.c#1 branch .. //depot/projects/pci/sys/dev/netmap/netmap_generic.c#1 branch .. //depot/projects/pci/sys/dev/netmap/netmap_kern.h#5 integrate .. //depot/projects/pci/sys/dev/netmap/netmap_mbq.c#1 branch .. //depot/projects/pci/sys/dev/netmap/netmap_mbq.h#1 branch .. //depot/projects/pci/sys/dev/netmap/netmap_mem2.c#4 integrate .. //depot/projects/pci/sys/dev/netmap/netmap_mem2.h#2 integrate .. //depot/projects/pci/sys/dev/netmap/netmap_vale.c#1 branch .. //depot/projects/pci/sys/dev/nmdm/nmdm.c#4 integrate .. //depot/projects/pci/sys/dev/ofw/ofw_bus_subr.c#5 integrate .. //depot/projects/pci/sys/dev/ofw/ofw_bus_subr.h#4 integrate .. //depot/projects/pci/sys/dev/ofw/ofw_console.c#6 integrate .. //depot/projects/pci/sys/dev/ofw/ofw_fdt.c#5 integrate .. //depot/projects/pci/sys/dev/pci/vga_pci.c#6 integrate .. //depot/projects/pci/sys/dev/sym/sym_hipd.c#7 integrate .. //depot/projects/pci/sys/dev/syscons/scterm-teken.c#5 integrate .. //depot/projects/pci/sys/dev/uart/uart_bus_pci.c#9 integrate .. //depot/projects/pci/sys/dev/uart/uart_cpu.h#3 integrate .. //depot/projects/pci/sys/dev/uart/uart_tty.c#4 integrate .. //depot/projects/pci/sys/dev/usb/controller/at91dci.c#5 integrate .. //depot/projects/pci/sys/dev/usb/controller/atmegadci.c#5 integrate .. //depot/projects/pci/sys/dev/usb/controller/avr32dci.c#5 integrate .. //depot/projects/pci/sys/dev/usb/controller/dwc_otg.c#6 integrate .. //depot/projects/pci/sys/dev/usb/controller/ehci.c#8 integrate .. //depot/projects/pci/sys/dev/usb/controller/musb_otg.c#8 integrate .. //depot/projects/pci/sys/dev/usb/controller/ohci.c#5 integrate .. //depot/projects/pci/sys/dev/usb/controller/uhci.c#5 integrate .. //depot/projects/pci/sys/dev/usb/controller/uss820dci.c#5 integrate .. //depot/projects/pci/sys/dev/usb/controller/xhci.c#9 integrate .. //depot/projects/pci/sys/dev/usb/quirk/usb_quirk.c#7 integrate .. //depot/projects/pci/sys/dev/usb/template/usb_template.c#6 integrate .. //depot/projects/pci/sys/dev/usb/usb_bus.h#6 integrate .. //depot/projects/pci/sys/dev/usb/usb_device.c#7 integrate .. //depot/projects/pci/sys/dev/usb/usb_device.h#7 integrate .. //depot/projects/pci/sys/dev/usb/usb_hub.c#10 integrate .. //depot/projects/pci/sys/dev/usb/usb_transfer.c#7 integrate .. //depot/projects/pci/sys/dev/usb/usbdevs#15 integrate .. //depot/projects/pci/sys/dev/usb/usbdi.h#9 integrate .. //depot/projects/pci/sys/dev/usb/wlan/if_run.c#10 integrate .. //depot/projects/pci/sys/dev/usb/wlan/if_runreg.h#5 integrate .. //depot/projects/pci/sys/dev/usb/wlan/if_runvar.h#6 integrate .. //depot/projects/pci/sys/dev/vt/font/vt_font_default.c#2 integrate .. //depot/projects/pci/sys/dev/vt/hw/fb/vt_fb.c#2 integrate .. //depot/projects/pci/sys/dev/vt/vt.h#2 integrate .. //depot/projects/pci/sys/dev/vt/vt_consolectl.c#2 integrate .. //depot/projects/pci/sys/dev/vt/vt_core.c#2 integrate .. //depot/projects/pci/sys/dev/vt/vt_font.c#2 integrate .. //depot/projects/pci/sys/dev/vt/vt_sysmouse.c#2 integrate .. //depot/projects/pci/sys/fs/devfs/devfs_devs.c#5 integrate .. //depot/projects/pci/sys/fs/ext2fs/ext2_hash.c#3 integrate .. //depot/projects/pci/sys/fs/fifofs/fifo_vnops.c#5 integrate .. //depot/projects/pci/sys/fs/nfs/nfs_commonsubs.c#10 integrate .. //depot/projects/pci/sys/fs/nfs/nfs_var.h#10 integrate .. //depot/projects/pci/sys/fs/nfsclient/nfs_clstate.c#8 integrate .. //depot/projects/pci/sys/fs/nfsserver/nfs_fha_new.c#2 integrate .. //depot/projects/pci/sys/fs/nfsserver/nfs_nfsdcache.c#7 integrate .. //depot/projects/pci/sys/fs/nfsserver/nfs_nfsdport.c#11 integrate .. //depot/projects/pci/sys/fs/nfsserver/nfs_nfsdstate.c#8 integrate .. //depot/projects/pci/sys/geom/eli/g_eli.c#10 integrate .. //depot/projects/pci/sys/geom/eli/g_eli_crypto.c#3 integrate .. //depot/projects/pci/sys/geom/geom_dev.c#11 integrate .. //depot/projects/pci/sys/geom/mirror/g_mirror.c#9 integrate .. //depot/projects/pci/sys/geom/mirror/g_mirror.h#4 integrate .. //depot/projects/pci/sys/geom/mirror/g_mirror_ctl.c#4 integrate .. //depot/projects/pci/sys/geom/part/g_part.c#9 integrate .. //depot/projects/pci/sys/geom/part/g_part.h#4 integrate .. //depot/projects/pci/sys/geom/part/g_part_gpt.c#9 integrate .. //depot/projects/pci/sys/i386/i386/symbols.raw#4 delete .. //depot/projects/pci/sys/ia64/ia64/dump_machdep.c#6 integrate .. //depot/projects/pci/sys/ia64/ia64/pmap.c#13 integrate .. //depot/projects/pci/sys/kern/capabilities.conf#7 integrate .. //depot/projects/pci/sys/kern/init_sysent.c#9 integrate .. //depot/projects/pci/sys/kern/kern_clocksource.c#8 integrate .. //depot/projects/pci/sys/kern/kern_event.c#9 integrate .. //depot/projects/pci/sys/kern/kern_exit.c#11 integrate .. //depot/projects/pci/sys/kern/kern_fork.c#10 integrate .. //depot/projects/pci/sys/kern/kern_jail.c#13 integrate .. //depot/projects/pci/sys/kern/kern_linker.c#9 integrate .. //depot/projects/pci/sys/kern/kern_resource.c#9 integrate .. //depot/projects/pci/sys/kern/kern_rwlock.c#7 integrate .. //depot/projects/pci/sys/kern/makesyscalls.sh#8 integrate .. //depot/projects/pci/sys/kern/sched_ule.c#12 integrate .. //depot/projects/pci/sys/kern/subr_terminal.c#2 integrate .. //depot/projects/pci/sys/kern/subr_trap.c#7 integrate .. //depot/projects/pci/sys/kern/subr_vmem.c#3 integrate .. //depot/projects/pci/sys/kern/subr_witness.c#8 integrate .. //depot/projects/pci/sys/kern/tty.c#7 integrate .. //depot/projects/pci/sys/kern/uipc_syscalls.c#12 integrate .. //depot/projects/pci/sys/kern/vfs_bio.c#13 integrate .. //depot/projects/pci/sys/kern/vfs_cache.c#8 integrate .. //depot/projects/pci/sys/kern/vfs_mountroot.c#8 integrate .. //depot/projects/pci/sys/kern/vfs_vnops.c#11 integrate .. //depot/projects/pci/sys/mips/beri/beri_machdep.c#4 integrate .. //depot/projects/pci/sys/mips/conf/BERI_NETFPGA_MDROOT#1 branch .. //depot/projects/pci/sys/modules/netmap/Makefile#2 integrate .. //depot/projects/pci/sys/net/netmap.h#5 integrate .. //depot/projects/pci/sys/net/netmap_user.h#4 integrate .. //depot/projects/pci/sys/net/radix.c#4 integrate .. //depot/projects/pci/sys/netgraph/ng_ksocket.c#6 integrate .. //depot/projects/pci/sys/netinet/in.h#8 integrate .. //depot/projects/pci/sys/netinet/in_mcast.c#7 integrate .. //depot/projects/pci/sys/netinet/ip_output.c#11 integrate .. //depot/projects/pci/sys/netinet/libalias/alias.c#4 integrate .. //depot/projects/pci/sys/netinet/libalias/alias_cuseeme.c#3 integrate .. //depot/projects/pci/sys/netinet/libalias/alias_db.c#7 integrate .. //depot/projects/pci/sys/netinet/libalias/alias_dummy.c#3 integrate .. //depot/projects/pci/sys/netinet/libalias/alias_irc.c#3 integrate .. //depot/projects/pci/sys/netinet/libalias/alias_mod.c#3 integrate .. //depot/projects/pci/sys/netinet/libalias/alias_mod.h#3 integrate .. //depot/projects/pci/sys/netinet/libalias/alias_nbt.c#3 integrate .. //depot/projects/pci/sys/netinet/libalias/alias_pptp.c#3 integrate .. //depot/projects/pci/sys/netinet/libalias/alias_skinny.c#3 integrate .. //depot/projects/pci/sys/netinet/libalias/alias_smedia.c#3 integrate .. //depot/projects/pci/sys/netinet/libalias/libalias.3#7 integrate .. //depot/projects/pci/sys/netinet/sctp_usrreq.c#11 integrate .. //depot/projects/pci/sys/netinet/sctputil.c#11 integrate .. //depot/projects/pci/sys/netinet/tcp_input.c#13 integrate .. //depot/projects/pci/sys/netinet6/in6_mcast.c#6 integrate .. //depot/projects/pci/sys/netinet6/send.c#7 integrate .. //depot/projects/pci/sys/netpfil/ipfw/ip_fw_dynamic.c#4 integrate .. //depot/projects/pci/sys/netpfil/pf/pf.c#5 integrate .. //depot/projects/pci/sys/netpfil/pf/pf.h#2 integrate .. //depot/projects/pci/sys/nfs/nfs_fha.c#2 integrate .. //depot/projects/pci/sys/nfs/nfs_fha.h#2 integrate .. //depot/projects/pci/sys/nfsserver/nfs_fha_old.c#2 integrate .. //depot/projects/pci/sys/ofed/drivers/net/mlx4/en_netdev.c#7 integrate .. //depot/projects/pci/sys/ofed/drivers/net/mlx4/mlx4_en.h#4 integrate .. //depot/projects/pci/sys/powerpc/aim/mp_cpudep.c#7 integrate .. //depot/projects/pci/sys/powerpc/aim/trap.c#9 integrate .. //depot/projects/pci/sys/powerpc/aim/trap_subr32.S#8 integrate .. //depot/projects/pci/sys/powerpc/aim/trap_subr64.S#9 integrate .. //depot/projects/pci/sys/powerpc/cpufreq/pmufreq.c#1 branch .. //depot/projects/pci/sys/powerpc/include/cpu.h#4 integrate .. //depot/projects/pci/sys/powerpc/include/dbdma.h#3 integrate .. //depot/projects/pci/sys/powerpc/include/openpicreg.h#3 integrate .. //depot/projects/pci/sys/powerpc/include/openpicvar.h#4 integrate .. //depot/projects/pci/sys/powerpc/include/pcpu.h#7 integrate .. //depot/projects/pci/sys/powerpc/include/pmc_mdep.h#5 integrate .. //depot/projects/pci/sys/powerpc/include/spr.h#7 integrate .. //depot/projects/pci/sys/powerpc/ofw/ofw_pci.c#4 integrate .. //depot/projects/pci/sys/powerpc/ofw/ofw_pcib_pci.c#5 integrate .. //depot/projects/pci/sys/powerpc/ofw/openpic_ofw.c#2 integrate .. //depot/projects/pci/sys/powerpc/powermac/ata_macio.c#5 integrate .. //depot/projects/pci/sys/powerpc/powermac/atibl.c#4 integrate .. //depot/projects/pci/sys/powerpc/powermac/cpcht.c#4 integrate .. //depot/projects/pci/sys/powerpc/powermac/dbdma.c#4 integrate .. //depot/projects/pci/sys/powerpc/powermac/dbdmavar.h#3 integrate .. //depot/projects/pci/sys/powerpc/powermac/platform_powermac.c#7 integrate .. //depot/projects/pci/sys/powerpc/powermac/pmu.c#4 integrate .. //depot/projects/pci/sys/powerpc/powermac/pmuvar.h#4 integrate .. //depot/projects/pci/sys/powerpc/powermac/uninorth.c#4 integrate .. //depot/projects/pci/sys/powerpc/powermac/uninorthvar.h#5 integrate .. //depot/projects/pci/sys/powerpc/powermac/viareg.h#3 integrate .. //depot/projects/pci/sys/powerpc/powerpc/mp_machdep.c#9 integrate .. //depot/projects/pci/sys/powerpc/powerpc/openpic.c#4 integrate .. //depot/projects/pci/sys/powerpc/pseries/phyp_vscsi.c#3 integrate .. //depot/projects/pci/sys/powerpc/psim/openpic_iobus.c#3 integrate .. //depot/projects/pci/sys/rpc/clnt_dg.c#8 integrate .. //depot/projects/pci/sys/rpc/clnt_vc.c#6 integrate .. //depot/projects/pci/sys/rpc/rpcb_clnt.c#5 integrate .. //depot/projects/pci/sys/rpc/svc.c#5 integrate .. //depot/projects/pci/sys/rpc/svc.h#4 integrate .. //depot/projects/pci/sys/rpc/svc_vc.c#5 integrate .. //depot/projects/pci/sys/security/mac/mac_framework.c#6 integrate .. //depot/projects/pci/sys/sparc64/ebus/ebus.c#5 integrate .. //depot/projects/pci/sys/sparc64/isa/ofw_isa.c#4 integrate .. //depot/projects/pci/sys/sparc64/pci/fire.c#7 integrate .. //depot/projects/pci/sys/sparc64/pci/ofw_pcib_subr.c#4 integrate .. //depot/projects/pci/sys/sparc64/pci/psycho.c#7 integrate .. //depot/projects/pci/sys/sparc64/pci/schizo.c#7 integrate .. //depot/projects/pci/sys/sys/consio.h#5 integrate .. //depot/projects/pci/sys/sys/dtrace_bsd.h#6 integrate .. //depot/projects/pci/sys/sys/fbio.h#4 integrate .. //depot/projects/pci/sys/sys/gpt.h#3 integrate .. //depot/projects/pci/sys/sys/param.h#16 integrate .. //depot/projects/pci/sys/sys/terminal.h#2 integrate .. //depot/projects/pci/sys/sys/tty.h#5 integrate .. //depot/projects/pci/sys/teken/demo/teken_demo.c#4 integrate .. //depot/projects/pci/sys/teken/teken.h#5 integrate .. //depot/projects/pci/sys/teken/teken_subr.h#6 integrate .. //depot/projects/pci/sys/vm/vm_map.c#12 integrate .. //depot/projects/pci/sys/vm/vm_pageout.c#10 integrate .. //depot/projects/pci/sys/vm/vm_reserv.c#6 integrate .. //depot/projects/pci/sys/x86/acpica/acpi_wakeup.c#3 integrate .. //depot/projects/pci/sys/x86/cpufreq/est.c#4 integrate .. //depot/projects/pci/sys/x86/include/mptable.h#9 integrate .. //depot/projects/pci/sys/x86/x86/mptable.c#13 integrate Differences ... ==== //depot/projects/pci/sys/amd64/amd64/machdep.c#12 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/amd64/amd64/machdep.c 259015 2013-12-05 21:58:02Z jhb $"); +__FBSDID("$FreeBSD: head/sys/amd64/amd64/machdep.c 259782 2013-12-23 19:48:22Z jhb $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -215,6 +215,8 @@ struct mtx dt_lock; /* lock for GDT and LDT */ +void (*vmm_resume_p)(void); + static void cpu_startup(dummy) void *dummy; ==== //depot/projects/pci/sys/amd64/amd64/mp_machdep.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/amd64/amd64/mp_machdep.c 255744 2013-09-20 22:59:22Z gibbs $"); +__FBSDID("$FreeBSD: head/sys/amd64/amd64/mp_machdep.c 259782 2013-12-23 19:48:22Z jhb $"); #include "opt_cpu.h" #include "opt_ddb.h" @@ -1483,6 +1483,8 @@ if (cpu_ops.cpu_resume) cpu_ops.cpu_resume(); + if (vmm_resume_p) + vmm_resume_p(); /* Resume MCA and local APIC */ mca_resume(); ==== //depot/projects/pci/sys/amd64/amd64/pmap.c#12 (text+ko) ==== @@ -79,7 +79,7 @@ #define AMD64_NPT_AWARE #include -__FBSDID("$FreeBSD: head/sys/amd64/amd64/pmap.c 256645 2013-10-16 18:20:27Z neel $"); +__FBSDID("$FreeBSD: head/sys/amd64/amd64/pmap.c 259641 2013-12-20 05:50:22Z neel $"); /* * Manages physical address maps. @@ -1295,6 +1295,7 @@ static __inline void pmap_invalidate_ept(pmap_t pmap) { + int ipinum; sched_pin(); KASSERT(!CPU_ISSET(curcpu, &pmap->pm_active), @@ -1319,11 +1320,9 @@ /* * Force the vcpu to exit and trap back into the hypervisor. - * - * XXX this is not optimal because IPI_AST builds a trapframe - * whereas all we need is an 'eoi' followed by 'iret'. */ - ipi_selected(pmap->pm_active, IPI_AST); + ipinum = pmap->pm_flags & PMAP_NESTED_IPIMASK; + ipi_selected(pmap->pm_active, ipinum); sched_unpin(); } ==== //depot/projects/pci/sys/amd64/include/cpu.h#6 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * from: @(#)cpu.h 5.4 (Berkeley) 5/9/91 - * $FreeBSD: head/sys/amd64/include/cpu.h 255744 2013-09-20 22:59:22Z gibbs $ + * $FreeBSD: head/sys/amd64/include/cpu.h 259782 2013-12-23 19:48:22Z jhb $ */ #ifndef _MACHINE_CPU_H_ @@ -70,6 +70,9 @@ extern char btext[]; extern char etext[]; +/* Resume hook for VMM. */ +extern void (*vmm_resume_p)(void); + void cpu_halt(void); void cpu_reset(void); void fork_trampoline(void); ==== //depot/projects/pci/sys/amd64/include/pmap.h#9 (text+ko) ==== @@ -39,7 +39,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: head/sys/amd64/include/pmap.h 256072 2013-10-05 21:22:35Z neel $ + * $FreeBSD: head/sys/amd64/include/pmap.h 259641 2013-12-20 05:50:22Z neel $ */ #ifndef _MACHINE_PMAP_H_ @@ -312,9 +312,10 @@ }; /* flags */ -#define PMAP_PDE_SUPERPAGE (1 << 0) /* supports 2MB superpages */ -#define PMAP_EMULATE_AD_BITS (1 << 1) /* needs A/D bits emulation */ -#define PMAP_SUPPORTS_EXEC_ONLY (1 << 2) /* execute only mappings ok */ +#define PMAP_NESTED_IPIMASK 0xff +#define PMAP_PDE_SUPERPAGE (1 << 8) /* supports 2MB superpages */ +#define PMAP_EMULATE_AD_BITS (1 << 9) /* needs A/D bits emulation */ +#define PMAP_SUPPORTS_EXEC_ONLY (1 << 10) /* execute only mappings ok */ typedef struct pmap *pmap_t; ==== //depot/projects/pci/sys/amd64/include/vmm.h#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/include/vmm.h 259081 2013-12-07 22:18:36Z neel $ + * $FreeBSD: head/sys/amd64/include/vmm.h 259863 2013-12-25 06:46:31Z neel $ */ #ifndef _VMM_H_ @@ -49,6 +49,7 @@ typedef int (*vmm_init_func_t)(void); typedef int (*vmm_cleanup_func_t)(void); +typedef void (*vmm_resume_func_t)(void); typedef void * (*vmi_init_func_t)(struct vm *vm, struct pmap *pmap); typedef int (*vmi_run_func_t)(void *vmi, int vcpu, register_t rip, struct pmap *pmap); @@ -68,10 +69,13 @@ typedef int (*vmi_set_cap_t)(void *vmi, int vcpu, int num, int val); typedef struct vmspace * (*vmi_vmspace_alloc)(vm_offset_t min, vm_offset_t max); typedef void (*vmi_vmspace_free)(struct vmspace *vmspace); +typedef struct vlapic * (*vmi_vlapic_init)(void *vmi, int vcpu); +typedef void (*vmi_vlapic_cleanup)(void *vmi, struct vlapic *vlapic); struct vmm_ops { vmm_init_func_t init; /* module wide initialization */ vmm_cleanup_func_t cleanup; + vmm_resume_func_t resume; vmi_init_func_t vminit; /* vm-specific initialization */ vmi_run_func_t vmrun; @@ -85,6 +89,8 @@ vmi_set_cap_t vmsetcap; vmi_vmspace_alloc vmspace_alloc; vmi_vmspace_free vmspace_free; + vmi_vlapic_init vlapic_init; + vmi_vlapic_cleanup vlapic_cleanup; }; extern struct vmm_ops vmm_ops_intel; @@ -146,7 +152,8 @@ VCPU_SLEEPING, }; -int vcpu_set_state(struct vm *vm, int vcpu, enum vcpu_state state); +int vcpu_set_state(struct vm *vm, int vcpu, enum vcpu_state state, + bool from_idle); enum vcpu_state vcpu_get_state(struct vm *vm, int vcpu, int *hostcpu); static int __inline @@ -156,7 +163,7 @@ } void *vcpu_stats(struct vm *vm, int vcpu); -void vcpu_notify_event(struct vm *vm, int vcpuid); +void vcpu_notify_event(struct vm *vm, int vcpuid, bool lapic_intr); struct vmspace *vm_get_vmspace(struct vm *vm); int vm_assign_pptdev(struct vm *vm, int bus, int slot, int func); int vm_unassign_pptdev(struct vm *vm, int bus, int slot, int func); ==== //depot/projects/pci/sys/amd64/include/vmm_dev.h#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/include/vmm_dev.h 258579 2013-11-25 19:04:51Z neel $ + * $FreeBSD: head/sys/amd64/include/vmm_dev.h 259779 2013-12-23 19:29:07Z jhb $ */ #ifndef _VMM_DEV_H_ @@ -66,6 +66,11 @@ int error_code_valid; }; +struct vm_lapic_msi { + uint64_t msg; + uint64_t addr; +}; + struct vm_lapic_irq { int cpuid; int vector; @@ -103,8 +108,8 @@ int slot; int func; int numvec; /* 0 means disabled */ - int vector; - int destcpu; + uint64_t msg; + uint64_t addr; }; struct vm_pptdev_msix { @@ -113,7 +118,7 @@ int slot; int func; int idx; - uint32_t msg; + uint64_t msg; uint32_t vector_control; uint64_t addr; }; @@ -175,6 +180,8 @@ IOCNUM_IOAPIC_ASSERT_IRQ = 33, IOCNUM_IOAPIC_DEASSERT_IRQ = 34, IOCNUM_IOAPIC_PULSE_IRQ = 35, + IOCNUM_LAPIC_MSI = 36, + IOCNUM_LAPIC_LOCAL_IRQ = 37, /* PCI pass-thru */ IOCNUM_BIND_PPTDEV = 40, @@ -211,6 +218,10 @@ _IOW('v', IOCNUM_INJECT_EVENT, struct vm_event) #define VM_LAPIC_IRQ \ _IOW('v', IOCNUM_LAPIC_IRQ, struct vm_lapic_irq) +#define VM_LAPIC_LOCAL_IRQ \ + _IOW('v', IOCNUM_LAPIC_LOCAL_IRQ, struct vm_lapic_irq) +#define VM_LAPIC_MSI \ + _IOW('v', IOCNUM_LAPIC_MSI, struct vm_lapic_msi) #define VM_IOAPIC_ASSERT_IRQ \ _IOW('v', IOCNUM_IOAPIC_ASSERT_IRQ, struct vm_ioapic_irq) #define VM_IOAPIC_DEASSERT_IRQ \ ==== //depot/projects/pci/sys/amd64/vmm/amd/amdv.c#3 (text+ko) ==== @@ -23,11 +23,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/vmm/amd/amdv.c 256072 2013-10-05 21:22:35Z neel $ + * $FreeBSD: head/sys/amd64/vmm/amd/amdv.c 259863 2013-12-25 06:46:31Z neel $ */ #include -__FBSDID("$FreeBSD: head/sys/amd64/vmm/amd/amdv.c 256072 2013-10-05 21:22:35Z neel $"); +__FBSDID("$FreeBSD: head/sys/amd64/vmm/amd/amdv.c 259863 2013-12-25 06:46:31Z neel $"); #include #include @@ -53,6 +53,11 @@ return (ENXIO); } +static void +amdv_resume(void) +{ +} + static void * amdv_vminit(struct vm *vm, struct pmap *pmap) { @@ -150,9 +155,24 @@ return; } +static struct vlapic * +amdv_vlapic_init(void *arg, int vcpuid) +{ + + panic("amdv_vlapic_init: not implmented"); +} + +static void +amdv_vlapic_cleanup(void *arg, struct vlapic *vlapic) +{ + + panic("amdv_vlapic_cleanup: not implemented"); +} + struct vmm_ops vmm_ops_amd = { amdv_init, amdv_cleanup, + amdv_resume, amdv_vminit, amdv_vmrun, amdv_vmcleanup, @@ -165,6 +185,8 @@ amdv_setcap, amdv_vmspace_alloc, amdv_vmspace_free, + amdv_vlapic_init, + amdv_vlapic_cleanup, }; static int ==== //depot/projects/pci/sys/amd64/vmm/intel/ept.c#4 (text+ko) ==== @@ -23,11 +23,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/vmm/intel/ept.c 256072 2013-10-05 21:22:35Z neel $ + * $FreeBSD: head/sys/amd64/vmm/intel/ept.c 259641 2013-12-20 05:50:22Z neel $ */ #include -__FBSDID("$FreeBSD: head/sys/amd64/vmm/intel/ept.c 256072 2013-10-05 21:22:35Z neel $"); +__FBSDID("$FreeBSD: head/sys/amd64/vmm/intel/ept.c 259641 2013-12-20 05:50:22Z neel $"); #include #include @@ -43,6 +43,7 @@ #include #include "vmx_cpufunc.h" +#include "vmm_ipi.h" #include "vmx_msr.h" #include "ept.h" @@ -98,6 +99,8 @@ !INVEPT_ALL_TYPES_SUPPORTED(cap)) return (EINVAL); + ept_pmap_flags = vmm_ipinum & PMAP_NESTED_IPIMASK; + use_superpages = 1; TUNABLE_INT_FETCH("hw.vmm.ept.use_superpages", &use_superpages); if (use_superpages && EPT_PDE_SUPERPAGE(cap)) ==== //depot/projects/pci/sys/amd64/vmm/intel/vmcs.c#5 (text+ko) ==== @@ -23,13 +23,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/vmm/intel/vmcs.c 257297 2013-10-29 02:25:18Z neel $ + * $FreeBSD: head/sys/amd64/vmm/intel/vmcs.c 259542 2013-12-18 06:24:21Z neel $ */ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: head/sys/amd64/vmm/intel/vmcs.c 257297 2013-10-29 02:25:18Z neel $"); +__FBSDID("$FreeBSD: head/sys/amd64/vmm/intel/vmcs.c 259542 2013-12-18 06:24:21Z neel $"); #include #include @@ -41,8 +41,8 @@ #include #include #include "vmm_host.h" +#include "vmx_cpufunc.h" #include "vmcs.h" -#include "vmx_cpufunc.h" #include "ept.h" #include "vmx.h" @@ -454,19 +454,6 @@ return (error); } -uint64_t -vmcs_read(uint32_t encoding) -{ - int error; - uint64_t val; - - error = vmread(encoding, &val); - if (error != 0) - panic("vmcs_read(%u) error %d", encoding, error); - - return (val); -} - #ifdef DDB extern int vmxon_enabled[]; ==== //depot/projects/pci/sys/amd64/vmm/intel/vmcs.h#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/vmm/intel/vmcs.h 258780 2013-11-30 22:17:27Z eadler $ + * $FreeBSD: head/sys/amd64/vmm/intel/vmcs.h 259542 2013-12-18 06:24:21Z neel $ */ #ifndef _VMCS_H_ @@ -58,7 +58,26 @@ struct seg_desc *desc); int vmcs_setdesc(struct vmcs *vmcs, int ident, struct seg_desc *desc); -uint64_t vmcs_read(uint32_t encoding); + +static __inline uint64_t +vmcs_read(uint32_t encoding) +{ + int error; + uint64_t val; + + error = vmread(encoding, &val); + KASSERT(error == 0, ("vmcs_read(%u) error %d", encoding, error)); + return (val); +} + +static __inline void +vmcs_write(uint32_t encoding, uint64_t val) +{ + int error; + + error = vmwrite(encoding, val); + KASSERT(error == 0, ("vmcs_write(%u) error %d", encoding, error)); +} #define vmexit_instruction_length() vmcs_read(VMCS_EXIT_INSTRUCTION_LENGTH) #define vmcs_guest_rip() vmcs_read(VMCS_GUEST_RIP) ==== //depot/projects/pci/sys/amd64/vmm/intel/vmx.c#7 (text+ko) ==== @@ -23,11 +23,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/vmm/intel/vmx.c 259085 2013-12-07 23:11:12Z neel $ + * $FreeBSD: head/sys/amd64/vmm/intel/vmx.c 259942 2013-12-27 12:15:53Z dim $ */ #include -__FBSDID("$FreeBSD: head/sys/amd64/vmm/intel/vmx.c 259085 2013-12-07 23:11:12Z neel $"); +__FBSDID("$FreeBSD: head/sys/amd64/vmm/intel/vmx.c 259942 2013-12-27 12:15:53Z dim $"); #include #include @@ -50,10 +50,11 @@ #include #include "vmm_host.h" -#include "vmm_lapic.h" #include "vmm_msr.h" #include "vmm_ktr.h" #include "vmm_stat.h" +#include "vlapic.h" +#include "vlapic_priv.h" #include "vmx_msr.h" #include "ept.h" @@ -112,7 +113,8 @@ #define HANDLED 1 #define UNHANDLED 0 -MALLOC_DEFINE(M_VMX, "vmx", "vmx"); +static MALLOC_DEFINE(M_VMX, "vmx", "vmx"); +static MALLOC_DEFINE(M_VLAPIC, "vlapic", "vlapic"); SYSCTL_DECL(_hw_vmm); SYSCTL_NODE(_hw_vmm, OID_AUTO, vmx, CTLFLAG_RW, NULL, NULL); @@ -324,9 +326,8 @@ VCPU_CTR2((vmx)->vm, (vcpu), "setjmp return code %s(%d)", vmx_setjmp_rc2str(rc), rc); - host_rsp = host_rip = ~0; - vmread(VMCS_HOST_RIP, &host_rip); - vmread(VMCS_HOST_RSP, &host_rsp); + host_rip = vmcs_read(VMCS_HOST_RIP); + host_rsp = vmcs_read(VMCS_HOST_RSP); VCPU_CTR2((vmx)->vm, (vcpu), "vmcs host_rip 0x%016lx, host_rsp %#lx", host_rip, host_rsp); @@ -525,6 +526,14 @@ vmxon_enabled[curcpu] = 1; } +static void +vmx_restore(void) +{ + + if (vmxon_enabled[curcpu]) + vmxon(vmxon_region[curcpu]); +} + static int vmx_init(void) { @@ -909,10 +918,10 @@ #endif } -static int +static void vmx_set_pcpu_defaults(struct vmx *vmx, int vcpu) { - int error, lastcpu; + int lastcpu; struct vmxstate *vmxstate; struct invvpid_desc invvpid_desc = { 0 }; @@ -920,24 +929,14 @@ lastcpu = vmxstate->lastcpu; vmxstate->lastcpu = curcpu; - if (lastcpu == curcpu) { - error = 0; - goto done; - } + if (lastcpu == curcpu) + return; vmm_stat_incr(vmx->vm, vcpu, VCPU_MIGRATIONS, 1); - error = vmwrite(VMCS_HOST_TR_BASE, vmm_get_host_trbase()); - if (error != 0) - goto done; - - error = vmwrite(VMCS_HOST_GDTR_BASE, vmm_get_host_gdtrbase()); - if (error != 0) - goto done; - - error = vmwrite(VMCS_HOST_GS_BASE, vmm_get_host_gsbase()); - if (error != 0) - goto done; + vmcs_write(VMCS_HOST_TR_BASE, vmm_get_host_trbase()); + vmcs_write(VMCS_HOST_GDTR_BASE, vmm_get_host_gdtrbase()); + vmcs_write(VMCS_HOST_GS_BASE, vmm_get_host_gsbase()); /* * If we are using VPIDs then invalidate all mappings tagged with 'vpid' @@ -958,20 +957,8 @@ invvpid_desc.vpid = vmxstate->vpid; invvpid(INVVPID_TYPE_SINGLE_CONTEXT, invvpid_desc); } -done: - return (error); } -static void -vm_exit_update_rip(struct vm_exit *vmexit) -{ - int error; - - error = vmwrite(VMCS_GUEST_RIP, vmexit->rip + vmexit->inst_length); - if (error) - panic("vmx_run: error %d writing to VMCS_GUEST_RIP", error); -} - /* * We depend on 'procbased_ctls' to have the Interrupt Window Exiting bit set. */ @@ -980,66 +967,45 @@ static void __inline vmx_set_int_window_exiting(struct vmx *vmx, int vcpu) { - int error; vmx->cap[vcpu].proc_ctls |= PROCBASED_INT_WINDOW_EXITING; - - error = vmwrite(VMCS_PRI_PROC_BASED_CTLS, vmx->cap[vcpu].proc_ctls); - if (error) - panic("vmx_set_int_window_exiting: vmwrite error %d", error); + vmcs_write(VMCS_PRI_PROC_BASED_CTLS, vmx->cap[vcpu].proc_ctls); } static void __inline vmx_clear_int_window_exiting(struct vmx *vmx, int vcpu) { - int error; vmx->cap[vcpu].proc_ctls &= ~PROCBASED_INT_WINDOW_EXITING; - - error = vmwrite(VMCS_PRI_PROC_BASED_CTLS, vmx->cap[vcpu].proc_ctls); - if (error) - panic("vmx_clear_int_window_exiting: vmwrite error %d", error); + vmcs_write(VMCS_PRI_PROC_BASED_CTLS, vmx->cap[vcpu].proc_ctls); } static void __inline vmx_set_nmi_window_exiting(struct vmx *vmx, int vcpu) { - int error; vmx->cap[vcpu].proc_ctls |= PROCBASED_NMI_WINDOW_EXITING; - - error = vmwrite(VMCS_PRI_PROC_BASED_CTLS, vmx->cap[vcpu].proc_ctls); - if (error) - panic("vmx_set_nmi_window_exiting: vmwrite error %d", error); + vmcs_write(VMCS_PRI_PROC_BASED_CTLS, vmx->cap[vcpu].proc_ctls); } static void __inline vmx_clear_nmi_window_exiting(struct vmx *vmx, int vcpu) { - int error; vmx->cap[vcpu].proc_ctls &= ~PROCBASED_NMI_WINDOW_EXITING; - - error = vmwrite(VMCS_PRI_PROC_BASED_CTLS, vmx->cap[vcpu].proc_ctls); - if (error) - panic("vmx_clear_nmi_window_exiting: vmwrite error %d", error); + vmcs_write(VMCS_PRI_PROC_BASED_CTLS, vmx->cap[vcpu].proc_ctls); } static int vmx_inject_nmi(struct vmx *vmx, int vcpu) { - int error; uint64_t info, interruptibility; /* Bail out if no NMI requested */ if (!vm_nmi_pending(vmx->vm, vcpu)) return (0); - error = vmread(VMCS_GUEST_INTERRUPTIBILITY, &interruptibility); - if (error) { - panic("vmx_inject_nmi: vmread(interruptibility) %d", - error); - } + interruptibility = vmcs_read(VMCS_GUEST_INTERRUPTIBILITY); if (interruptibility & nmi_blocking_bits) goto nmiblocked; @@ -1049,10 +1015,7 @@ */ info = VMCS_INTERRUPTION_INFO_NMI | VMCS_INTERRUPTION_INFO_VALID; info |= IDT_NMI; - - error = vmwrite(VMCS_ENTRY_INTR_INFO, info); - if (error) - panic("vmx_inject_nmi: vmwrite(intrinfo) %d", error); + vmcs_write(VMCS_ENTRY_INTR_INFO, info); VCPU_CTR0(vmx->vm, vcpu, "Injecting vNMI"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Dec 28 17:42:14 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 75CE58CF; Sat, 28 Dec 2013 17:42:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 382CB8CD for ; Sat, 28 Dec 2013 17:42:14 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1FFB11D98 for ; Sat, 28 Dec 2013 17:42:14 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id rBSHgEbG027664 for ; Sat, 28 Dec 2013 17:42:14 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.7/Submit) id rBSHgD3H027661 for perforce@freebsd.org; Sat, 28 Dec 2013 17:42:13 GMT (envelope-from jhb@freebsd.org) Date: Sat, 28 Dec 2013 17:42:13 GMT Message-Id: <201312281742.rBSHgD3H027661@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1189571 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.17 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Dec 2013 17:42:14 -0000 http://p4web.freebsd.org/@@1189571?ac=10 Change 1189571 by jhb@jhb_pippin on 2013/12/28 17:41:16 IFC @1189568 Affected files ... .. //depot/projects/smpng/share/man/man9/Makefile#41 integrate .. //depot/projects/smpng/share/man/man9/mbuf.9#7 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#122 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#94 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#134 integrate .. //depot/projects/smpng/sys/amd64/include/cpu.h#16 integrate .. //depot/projects/smpng/sys/amd64/include/pmap.h#49 integrate .. //depot/projects/smpng/sys/amd64/include/vmm.h#7 integrate .. //depot/projects/smpng/sys/amd64/include/vmm_dev.h#6 integrate .. //depot/projects/smpng/sys/amd64/vmm/amd/amdv.c#4 integrate .. //depot/projects/smpng/sys/amd64/vmm/intel/ept.c#5 integrate .. //depot/projects/smpng/sys/amd64/vmm/intel/vmcs.c#6 integrate .. //depot/projects/smpng/sys/amd64/vmm/intel/vmcs.h#6 integrate .. //depot/projects/smpng/sys/amd64/vmm/intel/vmx.c#9 integrate .. //depot/projects/smpng/sys/amd64/vmm/intel/vmx.h#5 integrate .. //depot/projects/smpng/sys/amd64/vmm/intel/vmx_genassym.c#5 integrate .. //depot/projects/smpng/sys/amd64/vmm/io/ppt.c#7 integrate .. //depot/projects/smpng/sys/amd64/vmm/io/ppt.h#4 integrate .. //depot/projects/smpng/sys/amd64/vmm/io/vhpet.c#2 integrate .. //depot/projects/smpng/sys/amd64/vmm/io/vioapic.c#2 integrate .. //depot/projects/smpng/sys/amd64/vmm/io/vlapic.c#6 integrate .. //depot/projects/smpng/sys/amd64/vmm/io/vlapic.h#4 integrate .. //depot/projects/smpng/sys/amd64/vmm/io/vlapic_priv.h#1 branch .. //depot/projects/smpng/sys/amd64/vmm/vmm.c#7 integrate .. //depot/projects/smpng/sys/amd64/vmm/vmm_dev.c#8 integrate .. //depot/projects/smpng/sys/amd64/vmm/vmm_lapic.c#4 integrate .. //depot/projects/smpng/sys/amd64/vmm/vmm_lapic.h#4 integrate .. //depot/projects/smpng/sys/amd64/vmm/vmm_msr.c#5 integrate .. //depot/projects/smpng/sys/amd64/vmm/vmm_msr.h#3 integrate .. //depot/projects/smpng/sys/arm/arm/bus_space-v6.c#2 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc.c#32 integrate .. //depot/projects/smpng/sys/arm/arm/elf_trampoline.c#33 integrate .. //depot/projects/smpng/sys/arm/arm/identcpu.c#27 integrate .. //depot/projects/smpng/sys/arm/arm/locore.S#29 integrate .. //depot/projects/smpng/sys/arm/arm/pmap-v6.c#11 integrate .. //depot/projects/smpng/sys/arm/arm/swtch.S#27 integrate .. //depot/projects/smpng/sys/arm/at91/if_ate.c#34 integrate .. //depot/projects/smpng/sys/arm/at91/uart_dev_at91usart.c#26 integrate .. //depot/projects/smpng/sys/arm/broadcom/bcm2835/bcm2835_fbd.c#1 branch .. //depot/projects/smpng/sys/arm/broadcom/bcm2835/files.bcm2835#7 integrate .. //depot/projects/smpng/sys/arm/conf/RPI-B#6 integrate .. //depot/projects/smpng/sys/arm/freescale/imx/files.imx51#3 integrate .. //depot/projects/smpng/sys/arm/freescale/imx/files.imx53#4 integrate .. //depot/projects/smpng/sys/arm/freescale/imx/files.imx6#2 integrate .. //depot/projects/smpng/sys/arm/freescale/imx/imx51_ipuv3_fbd.c#1 branch .. //depot/projects/smpng/sys/arm/include/armreg.h#20 integrate .. //depot/projects/smpng/sys/arm/include/cpuconf.h#16 integrate .. //depot/projects/smpng/sys/arm/include/cpufunc.h#23 integrate .. //depot/projects/smpng/sys/arm/include/intr.h#18 integrate .. //depot/projects/smpng/sys/arm/include/md_var.h#11 integrate .. //depot/projects/smpng/sys/arm/mv/mv_pci.c#12 integrate .. //depot/projects/smpng/sys/arm/ti/am335x/am335x_dmtimer.c#5 integrate .. //depot/projects/smpng/sys/arm/ti/files.ti#5 integrate .. //depot/projects/smpng/sys/arm/versatile/bus_space.c#2 integrate .. //depot/projects/smpng/sys/arm/xilinx/zy7_bus_space.c#2 integrate .. //depot/projects/smpng/sys/boot/fdt/dts/beri-netfpga.dts#1 branch .. //depot/projects/smpng/sys/boot/ficl/Makefile#22 integrate .. //depot/projects/smpng/sys/boot/i386/Makefile.inc#14 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/Makefile#28 integrate .. //depot/projects/smpng/sys/boot/ia64/efi/version#8 integrate .. //depot/projects/smpng/sys/boot/pc98/Makefile.inc#11 integrate .. //depot/projects/smpng/sys/boot/pc98/boot2/Makefile#24 integrate .. //depot/projects/smpng/sys/boot/usb/Makefile#2 integrate .. //depot/projects/smpng/sys/boot/usb/Makefile.test#2 integrate .. //depot/projects/smpng/sys/boot/userboot/ficl/Makefile#3 integrate .. //depot/projects/smpng/sys/boot/userboot/libstand/Makefile#6 integrate .. //depot/projects/smpng/sys/boot/zfs/Makefile#9 integrate .. //depot/projects/smpng/sys/cam/cam.h#15 integrate .. //depot/projects/smpng/sys/cam/cam_ccb.h#32 integrate .. //depot/projects/smpng/sys/cam/cam_compat.c#3 integrate .. //depot/projects/smpng/sys/cam/cam_compat.h#3 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_xpt.c#19 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c#6 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h#6 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c#5 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#19 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#7 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#9 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#15 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#10 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#17 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c#6 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#13 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#15 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c#10 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#19 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#17 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#13 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#6 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#9 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#13 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#8 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfeature.h#5 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#22 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#10 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c#6 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#29 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#17 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c#8 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/powerpc/dtrace/fasttrap_isa.c#3 integrate .. //depot/projects/smpng/sys/cddl/dev/fbt/fbt_powerpc.c#4 integrate .. //depot/projects/smpng/sys/conf/Makefile.arm#45 integrate .. //depot/projects/smpng/sys/conf/files#294 integrate .. //depot/projects/smpng/sys/conf/files.arm#31 integrate .. //depot/projects/smpng/sys/conf/files.powerpc#84 integrate .. //depot/projects/smpng/sys/conf/kern.mk#40 integrate .. //depot/projects/smpng/sys/conf/options.arm#35 integrate .. //depot/projects/smpng/sys/dev/advansys/adwcam.c#23 integrate .. //depot/projects/smpng/sys/dev/ae/if_ae.c#19 integrate .. //depot/projects/smpng/sys/dev/ahci/ahciem.c#5 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.c#33 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.c#32 integrate .. //depot/projects/smpng/sys/dev/an/if_an.c#65 integrate .. //depot/projects/smpng/sys/dev/an/if_an_pccard.c#21 integrate .. //depot/projects/smpng/sys/dev/arcmsr/arcmsr.c#36 integrate .. //depot/projects/smpng/sys/dev/arcmsr/arcmsr.h#14 integrate .. //depot/projects/smpng/sys/dev/bxe/bxe.c#4 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_mc5.c#7 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#25 integrate .. //depot/projects/smpng/sys/dev/cxgbe/common/common.h#12 integrate .. //depot/projects/smpng/sys/dev/cxgbe/offload.h#11 integrate .. //depot/projects/smpng/sys/dev/cxgbe/t4_main.c#20 integrate .. //depot/projects/smpng/sys/dev/cxgbe/t4_sge.c#17 integrate .. //depot/projects/smpng/sys/dev/cxgbe/tom/t4_cpl_io.c#10 integrate .. //depot/projects/smpng/sys/dev/cxgbe/tom/t4_listen.c#8 integrate .. //depot/projects/smpng/sys/dev/cxgbe/tom/t4_tom.h#8 integrate .. //depot/projects/smpng/sys/dev/drm/mach64_dma.c#9 integrate .. //depot/projects/smpng/sys/dev/drm2/drm_edid.c#5 integrate .. //depot/projects/smpng/sys/dev/drm2/drm_fb_helper.c#5 integrate .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_fence.c#2 integrate .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_sa.c#2 integrate .. //depot/projects/smpng/sys/dev/drm2/ttm/ttm_bo.c#4 integrate .. //depot/projects/smpng/sys/dev/drm2/ttm/ttm_bo_vm.c#4 integrate .. //depot/projects/smpng/sys/dev/drm2/ttm/ttm_lock.c#2 integrate .. //depot/projects/smpng/sys/dev/e1000/if_lem.c#20 integrate .. //depot/projects/smpng/sys/dev/fb/fbd.c#2 integrate .. //depot/projects/smpng/sys/dev/fdt/fdt_common.h#10 integrate .. //depot/projects/smpng/sys/dev/fdt/fdt_pci.c#10 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_core.c#20 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_core.h#7 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_intel.c#14 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_powerpc.c#8 integrate .. //depot/projects/smpng/sys/dev/ie/if_ie.c#23 integrate .. //depot/projects/smpng/sys/dev/isp/isp.c#77 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#84 integrate .. //depot/projects/smpng/sys/dev/iwn/if_iwn_chip_cfg.h#2 integrate .. //depot/projects/smpng/sys/dev/ixgbe/ixgbe.c#40 integrate .. //depot/projects/smpng/sys/dev/mwl/if_mwl.c#16 integrate .. //depot/projects/smpng/sys/dev/netmap/if_em_netmap.h#7 integrate .. //depot/projects/smpng/sys/dev/netmap/if_igb_netmap.h#8 integrate .. //depot/projects/smpng/sys/dev/netmap/if_lem_netmap.h#6 integrate .. //depot/projects/smpng/sys/dev/netmap/if_re_netmap.h#7 integrate .. //depot/projects/smpng/sys/dev/netmap/ixgbe_netmap.h#8 integrate .. //depot/projects/smpng/sys/dev/netmap/netmap.c#10 integrate .. //depot/projects/smpng/sys/dev/netmap/netmap_freebsd.c#1 branch .. //depot/projects/smpng/sys/dev/netmap/netmap_generic.c#1 branch .. //depot/projects/smpng/sys/dev/netmap/netmap_kern.h#10 integrate .. //depot/projects/smpng/sys/dev/netmap/netmap_mbq.c#1 branch .. //depot/projects/smpng/sys/dev/netmap/netmap_mbq.h#1 branch .. //depot/projects/smpng/sys/dev/netmap/netmap_mem2.c#8 integrate .. //depot/projects/smpng/sys/dev/netmap/netmap_mem2.h#2 integrate .. //depot/projects/smpng/sys/dev/netmap/netmap_vale.c#1 branch .. //depot/projects/smpng/sys/dev/nmdm/nmdm.c#39 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_bus_subr.c#11 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_bus_subr.h#9 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_console.c#37 integrate .. //depot/projects/smpng/sys/dev/pci/vga_pci.c#16 integrate .. //depot/projects/smpng/sys/dev/sym/sym_hipd.c#46 integrate .. //depot/projects/smpng/sys/dev/syscons/scterm-teken.c#14 integrate .. //depot/projects/smpng/sys/dev/uart/uart_bus_pci.c#20 integrate .. //depot/projects/smpng/sys/dev/uart/uart_cpu.h#11 integrate .. //depot/projects/smpng/sys/dev/uart/uart_tty.c#30 integrate .. //depot/projects/smpng/sys/dev/usb/controller/at91dci.c#23 integrate .. //depot/projects/smpng/sys/dev/usb/controller/atmegadci.c#26 integrate .. //depot/projects/smpng/sys/dev/usb/controller/avr32dci.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/controller/dwc_otg.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ehci.c#32 integrate .. //depot/projects/smpng/sys/dev/usb/controller/musb_otg.c#27 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ohci.c#24 integrate .. //depot/projects/smpng/sys/dev/usb/controller/uhci.c#26 integrate .. //depot/projects/smpng/sys/dev/usb/controller/uss820dci.c#26 integrate .. //depot/projects/smpng/sys/dev/usb/controller/xhci.c#17 integrate .. //depot/projects/smpng/sys/dev/usb/quirk/usb_quirk.c#32 integrate .. //depot/projects/smpng/sys/dev/usb/template/usb_template.c#19 integrate .. //depot/projects/smpng/sys/dev/usb/usb_bus.h#15 integrate .. //depot/projects/smpng/sys/dev/usb/usb_device.c#37 integrate .. //depot/projects/smpng/sys/dev/usb/usb_device.h#26 integrate .. //depot/projects/smpng/sys/dev/usb/usb_hub.c#34 integrate .. //depot/projects/smpng/sys/dev/usb/usb_transfer.c#34 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#187 integrate .. //depot/projects/smpng/sys/dev/usb/usbdi.h#41 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_run.c#24 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_runreg.h#8 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_runvar.h#11 integrate .. //depot/projects/smpng/sys/dev/vt/font/vt_font_default.c#2 integrate .. //depot/projects/smpng/sys/dev/vt/hw/fb/vt_fb.c#2 integrate .. //depot/projects/smpng/sys/dev/vt/vt.h#2 integrate .. //depot/projects/smpng/sys/dev/vt/vt_consolectl.c#2 integrate .. //depot/projects/smpng/sys/dev/vt/vt_core.c#2 integrate .. //depot/projects/smpng/sys/dev/vt/vt_font.c#2 integrate .. //depot/projects/smpng/sys/dev/vt/vt_sysmouse.c#2 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_devs.c#44 integrate .. //depot/projects/smpng/sys/fs/ext2fs/ext2_hash.c#2 integrate .. //depot/projects/smpng/sys/fs/fifofs/fifo_vnops.c#60 integrate .. //depot/projects/smpng/sys/fs/nfs/nfs_commonsubs.c#18 integrate .. //depot/projects/smpng/sys/fs/nfs/nfs_var.h#24 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clstate.c#22 integrate .. //depot/projects/smpng/sys/fs/nfsserver/nfs_fha_new.c#2 integrate .. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdcache.c#10 integrate .. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdport.c#33 integrate .. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdstate.c#23 integrate .. //depot/projects/smpng/sys/geom/eli/g_eli.c#42 integrate .. //depot/projects/smpng/sys/geom/eli/g_eli_crypto.c#8 integrate .. //depot/projects/smpng/sys/geom/geom_dev.c#67 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror.c#56 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror.h#20 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror_ctl.c#19 integrate .. //depot/projects/smpng/sys/geom/part/g_part.c#48 integrate .. //depot/projects/smpng/sys/geom/part/g_part.h#17 integrate .. //depot/projects/smpng/sys/geom/part/g_part_gpt.c#30 integrate .. //depot/projects/smpng/sys/i386/i386/symbols.raw#5 delete .. //depot/projects/smpng/sys/ia64/ia64/dump_machdep.c#17 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#116 integrate .. //depot/projects/smpng/sys/kern/capabilities.conf#9 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#112 integrate .. //depot/projects/smpng/sys/kern/kern_clocksource.c#15 integrate .. //depot/projects/smpng/sys/kern/kern_event.c#77 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#164 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#145 integrate .. //depot/projects/smpng/sys/kern/kern_jail.c#97 integrate .. //depot/projects/smpng/sys/kern/kern_linker.c#120 integrate .. //depot/projects/smpng/sys/kern/kern_resource.c#96 integrate .. //depot/projects/smpng/sys/kern/kern_rwlock.c#42 integrate .. //depot/projects/smpng/sys/kern/makesyscalls.sh#41 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#129 integrate .. //depot/projects/smpng/sys/kern/subr_terminal.c#2 integrate .. //depot/projects/smpng/sys/kern/subr_trap.c#109 integrate .. //depot/projects/smpng/sys/kern/subr_vmem.c#3 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#198 integrate .. //depot/projects/smpng/sys/kern/tty.c#113 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#149 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#155 integrate .. //depot/projects/smpng/sys/kern/vfs_cache.c#72 integrate .. //depot/projects/smpng/sys/kern/vfs_mountroot.c#11 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#122 integrate .. //depot/projects/smpng/sys/mips/beri/beri_machdep.c#5 integrate .. //depot/projects/smpng/sys/mips/conf/BERI_NETFPGA_MDROOT#1 branch .. //depot/projects/smpng/sys/modules/netmap/Makefile#3 integrate .. //depot/projects/smpng/sys/net/netmap.h#8 integrate .. //depot/projects/smpng/sys/net/netmap_user.h#8 integrate .. //depot/projects/smpng/sys/net/radix.c#22 integrate .. //depot/projects/smpng/sys/netgraph/ng_ksocket.c#45 integrate .. //depot/projects/smpng/sys/netinet/in.h#63 integrate .. //depot/projects/smpng/sys/netinet/in_mcast.c#27 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#135 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias.c#14 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_cuseeme.c#5 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_db.c#18 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_dummy.c#4 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_irc.c#11 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_mod.c#6 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_mod.h#4 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_nbt.c#6 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_pptp.c#5 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_skinny.c#8 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_smedia.c#8 integrate .. //depot/projects/smpng/sys/netinet/libalias/libalias.3#11 integrate .. //depot/projects/smpng/sys/netinet/sctp_usrreq.c#53 integrate .. //depot/projects/smpng/sys/netinet/sctputil.c#61 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#158 integrate .. //depot/projects/smpng/sys/netinet6/in6_mcast.c#12 integrate .. //depot/projects/smpng/sys/netinet6/send.c#9 integrate .. //depot/projects/smpng/sys/netpfil/ipfw/ip_fw_dynamic.c#5 integrate .. //depot/projects/smpng/sys/netpfil/pf/pf.c#7 integrate .. //depot/projects/smpng/sys/netpfil/pf/pf.h#2 integrate .. //depot/projects/smpng/sys/nfs/nfs_fha.c#2 integrate .. //depot/projects/smpng/sys/nfs/nfs_fha.h#2 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_fha_old.c#2 integrate .. //depot/projects/smpng/sys/ofed/drivers/net/mlx4/en_netdev.c#8 integrate .. //depot/projects/smpng/sys/ofed/drivers/net/mlx4/mlx4_en.h#4 integrate .. //depot/projects/smpng/sys/powerpc/aim/mp_cpudep.c#14 integrate .. //depot/projects/smpng/sys/powerpc/aim/trap.c#26 integrate .. //depot/projects/smpng/sys/powerpc/aim/trap_subr32.S#9 integrate .. //depot/projects/smpng/sys/powerpc/aim/trap_subr64.S#12 integrate .. //depot/projects/smpng/sys/powerpc/cpufreq/pmufreq.c#1 branch .. //depot/projects/smpng/sys/powerpc/include/cpu.h#27 integrate .. //depot/projects/smpng/sys/powerpc/include/dbdma.h#5 integrate .. //depot/projects/smpng/sys/powerpc/include/openpicreg.h#6 integrate .. //depot/projects/smpng/sys/powerpc/include/openpicvar.h#12 integrate .. //depot/projects/smpng/sys/powerpc/include/pcpu.h#26 integrate .. //depot/projects/smpng/sys/powerpc/include/pmc_mdep.h#8 integrate .. //depot/projects/smpng/sys/powerpc/include/spr.h#30 integrate .. //depot/projects/smpng/sys/powerpc/ofw/ofw_pci.c#10 integrate .. //depot/projects/smpng/sys/powerpc/ofw/ofw_pcib_pci.c#14 integrate .. //depot/projects/smpng/sys/powerpc/ofw/openpic_ofw.c#2 integrate .. //depot/projects/smpng/sys/powerpc/powermac/ata_macio.c#22 integrate .. //depot/projects/smpng/sys/powerpc/powermac/atibl.c#5 integrate .. //depot/projects/smpng/sys/powerpc/powermac/cpcht.c#9 integrate .. //depot/projects/smpng/sys/powerpc/powermac/dbdma.c#7 integrate .. //depot/projects/smpng/sys/powerpc/powermac/dbdmavar.h#5 integrate .. //depot/projects/smpng/sys/powerpc/powermac/platform_powermac.c#7 integrate .. //depot/projects/smpng/sys/powerpc/powermac/pmu.c#11 integrate .. //depot/projects/smpng/sys/powerpc/powermac/pmuvar.h#5 integrate .. //depot/projects/smpng/sys/powerpc/powermac/uninorth.c#27 integrate .. //depot/projects/smpng/sys/powerpc/powermac/uninorthvar.h#12 integrate .. //depot/projects/smpng/sys/powerpc/powermac/viareg.h#3 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/mp_machdep.c#29 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/openpic.c#23 integrate .. //depot/projects/smpng/sys/powerpc/pseries/phyp_vscsi.c#3 integrate .. //depot/projects/smpng/sys/powerpc/psim/openpic_iobus.c#14 integrate .. //depot/projects/smpng/sys/rpc/clnt_dg.c#19 integrate .. //depot/projects/smpng/sys/rpc/clnt_vc.c#18 integrate .. //depot/projects/smpng/sys/rpc/rpcb_clnt.c#7 integrate .. //depot/projects/smpng/sys/rpc/svc.c#10 integrate .. //depot/projects/smpng/sys/rpc/svc.h#7 integrate .. //depot/projects/smpng/sys/rpc/svc_vc.c#13 integrate .. //depot/projects/smpng/sys/security/mac/mac_framework.c#15 integrate .. //depot/projects/smpng/sys/sparc64/ebus/ebus.c#33 integrate .. //depot/projects/smpng/sys/sparc64/isa/ofw_isa.c#16 integrate .. //depot/projects/smpng/sys/sparc64/pci/fire.c#13 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pcib_subr.c#14 integrate .. //depot/projects/smpng/sys/sparc64/pci/psycho.c#61 integrate .. //depot/projects/smpng/sys/sparc64/pci/schizo.c#22 integrate .. //depot/projects/smpng/sys/sys/consio.h#13 integrate .. //depot/projects/smpng/sys/sys/dtrace_bsd.h#11 integrate .. //depot/projects/smpng/sys/sys/fbio.h#12 integrate .. //depot/projects/smpng/sys/sys/gpt.h#15 integrate .. //depot/projects/smpng/sys/sys/param.h#188 integrate .. //depot/projects/smpng/sys/sys/terminal.h#2 integrate .. //depot/projects/smpng/sys/sys/tty.h#39 integrate .. //depot/projects/smpng/sys/teken/demo/teken_demo.c#4 integrate .. //depot/projects/smpng/sys/teken/teken.h#7 integrate .. //depot/projects/smpng/sys/teken/teken_subr.h#11 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#129 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#99 integrate .. //depot/projects/smpng/sys/vm/vm_reserv.c#16 integrate .. //depot/projects/smpng/sys/x86/acpica/acpi_wakeup.c#5 integrate .. //depot/projects/smpng/sys/x86/include/mptable.h#5 integrate .. //depot/projects/smpng/sys/x86/x86/mptable.c#7 integrate Differences ... ==== //depot/projects/smpng/share/man/man9/Makefile#41 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: head/share/man/man9/Makefile 256952 2013-10-23 03:27:42Z eadler $ +# $FreeBSD: head/share/man/man9/Makefile 259670 2013-12-20 23:57:05Z jmg $ MAN= accept_filter.9 \ accf_data.9 \ @@ -905,6 +905,7 @@ mbuf.9 m_freem.9 \ mbuf.9 MGET.9 \ mbuf.9 m_get.9 \ + mbuf.9 m_getjcl.9 \ mbuf.9 m_getcl.9 \ mbuf.9 m_getclr.9 \ mbuf.9 MGETHDR.9 \ ==== //depot/projects/smpng/share/man/man9/mbuf.9#7 (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/man9/mbuf.9 242998 2012-11-13 20:52:17Z andre $ +.\" $FreeBSD: head/share/man/man9/mbuf.9 259672 2013-12-21 00:15:37Z jmg $ .\" -.Dd November 13, 2012 +.Dd December 20, 2013 .Dt MBUF 9 .Os .\" @@ -74,6 +74,8 @@ .Ft struct mbuf * .Fn m_getm "struct mbuf *orig" "int len" "int how" "int type" .Ft struct mbuf * +.Fn m_getjcl "int how" "short type" "int flags" "int size" +.Ft struct mbuf * .Fn m_getcl "int how" "short type" "int flags" .Ft struct mbuf * .Fn m_getclr "int how" "int type" @@ -592,6 +594,12 @@ Returns .Dv NULL on failure. +.It Fn m_getjcl how type flags size +This is like +.Fn m_getcl +but it the size of the cluster allocated will be large enough for +.Fa size +bytes. .It Fn m_getclr how type Allocate an .Vt mbuf ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#122 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/amd64/amd64/machdep.c 259015 2013-12-05 21:58:02Z jhb $"); +__FBSDID("$FreeBSD: head/sys/amd64/amd64/machdep.c 259782 2013-12-23 19:48:22Z jhb $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -215,6 +215,8 @@ struct mtx dt_lock; /* lock for GDT and LDT */ +void (*vmm_resume_p)(void); + static void cpu_startup(dummy) void *dummy; ==== //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#94 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/amd64/amd64/mp_machdep.c 255744 2013-09-20 22:59:22Z gibbs $"); +__FBSDID("$FreeBSD: head/sys/amd64/amd64/mp_machdep.c 259782 2013-12-23 19:48:22Z jhb $"); #include "opt_cpu.h" #include "opt_ddb.h" @@ -1489,6 +1489,8 @@ if (cpu_ops.cpu_resume) cpu_ops.cpu_resume(); + if (vmm_resume_p) + vmm_resume_p(); /* Resume MCA and local APIC */ mca_resume(); ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#134 (text+ko) ==== @@ -79,7 +79,7 @@ #define AMD64_NPT_AWARE #include -__FBSDID("$FreeBSD: head/sys/amd64/amd64/pmap.c 256645 2013-10-16 18:20:27Z neel $"); +__FBSDID("$FreeBSD: head/sys/amd64/amd64/pmap.c 259641 2013-12-20 05:50:22Z neel $"); /* * Manages physical address maps. @@ -1295,6 +1295,7 @@ static __inline void pmap_invalidate_ept(pmap_t pmap) { + int ipinum; sched_pin(); KASSERT(!CPU_ISSET(curcpu, &pmap->pm_active), @@ -1319,11 +1320,9 @@ /* * Force the vcpu to exit and trap back into the hypervisor. - * - * XXX this is not optimal because IPI_AST builds a trapframe - * whereas all we need is an 'eoi' followed by 'iret'. */ - ipi_selected(pmap->pm_active, IPI_AST); + ipinum = pmap->pm_flags & PMAP_NESTED_IPIMASK; + ipi_selected(pmap->pm_active, ipinum); sched_unpin(); } ==== //depot/projects/smpng/sys/amd64/include/cpu.h#16 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * from: @(#)cpu.h 5.4 (Berkeley) 5/9/91 - * $FreeBSD: head/sys/amd64/include/cpu.h 255744 2013-09-20 22:59:22Z gibbs $ + * $FreeBSD: head/sys/amd64/include/cpu.h 259782 2013-12-23 19:48:22Z jhb $ */ #ifndef _MACHINE_CPU_H_ @@ -70,6 +70,9 @@ extern char btext[]; extern char etext[]; +/* Resume hook for VMM. */ +extern void (*vmm_resume_p)(void); + void cpu_halt(void); void cpu_reset(void); void fork_trampoline(void); ==== //depot/projects/smpng/sys/amd64/include/pmap.h#49 (text+ko) ==== @@ -39,7 +39,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: head/sys/amd64/include/pmap.h 256072 2013-10-05 21:22:35Z neel $ + * $FreeBSD: head/sys/amd64/include/pmap.h 259641 2013-12-20 05:50:22Z neel $ */ #ifndef _MACHINE_PMAP_H_ @@ -312,9 +312,10 @@ }; /* flags */ -#define PMAP_PDE_SUPERPAGE (1 << 0) /* supports 2MB superpages */ -#define PMAP_EMULATE_AD_BITS (1 << 1) /* needs A/D bits emulation */ -#define PMAP_SUPPORTS_EXEC_ONLY (1 << 2) /* execute only mappings ok */ +#define PMAP_NESTED_IPIMASK 0xff +#define PMAP_PDE_SUPERPAGE (1 << 8) /* supports 2MB superpages */ +#define PMAP_EMULATE_AD_BITS (1 << 9) /* needs A/D bits emulation */ +#define PMAP_SUPPORTS_EXEC_ONLY (1 << 10) /* execute only mappings ok */ typedef struct pmap *pmap_t; ==== //depot/projects/smpng/sys/amd64/include/vmm.h#7 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/include/vmm.h 259081 2013-12-07 22:18:36Z neel $ + * $FreeBSD: head/sys/amd64/include/vmm.h 259863 2013-12-25 06:46:31Z neel $ */ #ifndef _VMM_H_ @@ -49,6 +49,7 @@ typedef int (*vmm_init_func_t)(void); typedef int (*vmm_cleanup_func_t)(void); +typedef void (*vmm_resume_func_t)(void); typedef void * (*vmi_init_func_t)(struct vm *vm, struct pmap *pmap); typedef int (*vmi_run_func_t)(void *vmi, int vcpu, register_t rip, struct pmap *pmap); @@ -68,10 +69,13 @@ typedef int (*vmi_set_cap_t)(void *vmi, int vcpu, int num, int val); typedef struct vmspace * (*vmi_vmspace_alloc)(vm_offset_t min, vm_offset_t max); typedef void (*vmi_vmspace_free)(struct vmspace *vmspace); +typedef struct vlapic * (*vmi_vlapic_init)(void *vmi, int vcpu); +typedef void (*vmi_vlapic_cleanup)(void *vmi, struct vlapic *vlapic); struct vmm_ops { vmm_init_func_t init; /* module wide initialization */ vmm_cleanup_func_t cleanup; + vmm_resume_func_t resume; vmi_init_func_t vminit; /* vm-specific initialization */ vmi_run_func_t vmrun; @@ -85,6 +89,8 @@ vmi_set_cap_t vmsetcap; vmi_vmspace_alloc vmspace_alloc; vmi_vmspace_free vmspace_free; + vmi_vlapic_init vlapic_init; + vmi_vlapic_cleanup vlapic_cleanup; }; extern struct vmm_ops vmm_ops_intel; @@ -146,7 +152,8 @@ VCPU_SLEEPING, }; -int vcpu_set_state(struct vm *vm, int vcpu, enum vcpu_state state); +int vcpu_set_state(struct vm *vm, int vcpu, enum vcpu_state state, + bool from_idle); enum vcpu_state vcpu_get_state(struct vm *vm, int vcpu, int *hostcpu); static int __inline @@ -156,7 +163,7 @@ } void *vcpu_stats(struct vm *vm, int vcpu); -void vcpu_notify_event(struct vm *vm, int vcpuid); +void vcpu_notify_event(struct vm *vm, int vcpuid, bool lapic_intr); struct vmspace *vm_get_vmspace(struct vm *vm); int vm_assign_pptdev(struct vm *vm, int bus, int slot, int func); int vm_unassign_pptdev(struct vm *vm, int bus, int slot, int func); ==== //depot/projects/smpng/sys/amd64/include/vmm_dev.h#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/include/vmm_dev.h 258579 2013-11-25 19:04:51Z neel $ + * $FreeBSD: head/sys/amd64/include/vmm_dev.h 259779 2013-12-23 19:29:07Z jhb $ */ #ifndef _VMM_DEV_H_ @@ -66,6 +66,11 @@ int error_code_valid; }; +struct vm_lapic_msi { + uint64_t msg; + uint64_t addr; +}; + struct vm_lapic_irq { int cpuid; int vector; @@ -103,8 +108,8 @@ int slot; int func; int numvec; /* 0 means disabled */ - int vector; - int destcpu; + uint64_t msg; + uint64_t addr; }; struct vm_pptdev_msix { @@ -113,7 +118,7 @@ int slot; int func; int idx; - uint32_t msg; + uint64_t msg; uint32_t vector_control; uint64_t addr; }; @@ -175,6 +180,8 @@ IOCNUM_IOAPIC_ASSERT_IRQ = 33, IOCNUM_IOAPIC_DEASSERT_IRQ = 34, IOCNUM_IOAPIC_PULSE_IRQ = 35, + IOCNUM_LAPIC_MSI = 36, + IOCNUM_LAPIC_LOCAL_IRQ = 37, /* PCI pass-thru */ IOCNUM_BIND_PPTDEV = 40, @@ -211,6 +218,10 @@ _IOW('v', IOCNUM_INJECT_EVENT, struct vm_event) #define VM_LAPIC_IRQ \ _IOW('v', IOCNUM_LAPIC_IRQ, struct vm_lapic_irq) +#define VM_LAPIC_LOCAL_IRQ \ + _IOW('v', IOCNUM_LAPIC_LOCAL_IRQ, struct vm_lapic_irq) +#define VM_LAPIC_MSI \ + _IOW('v', IOCNUM_LAPIC_MSI, struct vm_lapic_msi) #define VM_IOAPIC_ASSERT_IRQ \ _IOW('v', IOCNUM_IOAPIC_ASSERT_IRQ, struct vm_ioapic_irq) #define VM_IOAPIC_DEASSERT_IRQ \ ==== //depot/projects/smpng/sys/amd64/vmm/amd/amdv.c#4 (text+ko) ==== @@ -23,11 +23,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/vmm/amd/amdv.c 256072 2013-10-05 21:22:35Z neel $ + * $FreeBSD: head/sys/amd64/vmm/amd/amdv.c 259863 2013-12-25 06:46:31Z neel $ */ #include -__FBSDID("$FreeBSD: head/sys/amd64/vmm/amd/amdv.c 256072 2013-10-05 21:22:35Z neel $"); +__FBSDID("$FreeBSD: head/sys/amd64/vmm/amd/amdv.c 259863 2013-12-25 06:46:31Z neel $"); #include #include @@ -53,6 +53,11 @@ return (ENXIO); } +static void +amdv_resume(void) +{ +} + static void * amdv_vminit(struct vm *vm, struct pmap *pmap) { @@ -150,9 +155,24 @@ return; } +static struct vlapic * +amdv_vlapic_init(void *arg, int vcpuid) +{ + + panic("amdv_vlapic_init: not implmented"); +} + +static void +amdv_vlapic_cleanup(void *arg, struct vlapic *vlapic) +{ + + panic("amdv_vlapic_cleanup: not implemented"); +} + struct vmm_ops vmm_ops_amd = { amdv_init, amdv_cleanup, + amdv_resume, amdv_vminit, amdv_vmrun, amdv_vmcleanup, @@ -165,6 +185,8 @@ amdv_setcap, amdv_vmspace_alloc, amdv_vmspace_free, + amdv_vlapic_init, + amdv_vlapic_cleanup, }; static int ==== //depot/projects/smpng/sys/amd64/vmm/intel/ept.c#5 (text+ko) ==== @@ -23,11 +23,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/vmm/intel/ept.c 256072 2013-10-05 21:22:35Z neel $ + * $FreeBSD: head/sys/amd64/vmm/intel/ept.c 259641 2013-12-20 05:50:22Z neel $ */ #include -__FBSDID("$FreeBSD: head/sys/amd64/vmm/intel/ept.c 256072 2013-10-05 21:22:35Z neel $"); +__FBSDID("$FreeBSD: head/sys/amd64/vmm/intel/ept.c 259641 2013-12-20 05:50:22Z neel $"); #include #include @@ -43,6 +43,7 @@ #include #include "vmx_cpufunc.h" +#include "vmm_ipi.h" #include "vmx_msr.h" #include "ept.h" @@ -98,6 +99,8 @@ !INVEPT_ALL_TYPES_SUPPORTED(cap)) return (EINVAL); + ept_pmap_flags = vmm_ipinum & PMAP_NESTED_IPIMASK; + use_superpages = 1; TUNABLE_INT_FETCH("hw.vmm.ept.use_superpages", &use_superpages); if (use_superpages && EPT_PDE_SUPERPAGE(cap)) ==== //depot/projects/smpng/sys/amd64/vmm/intel/vmcs.c#6 (text+ko) ==== @@ -23,13 +23,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/vmm/intel/vmcs.c 257297 2013-10-29 02:25:18Z neel $ + * $FreeBSD: head/sys/amd64/vmm/intel/vmcs.c 259542 2013-12-18 06:24:21Z neel $ */ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: head/sys/amd64/vmm/intel/vmcs.c 257297 2013-10-29 02:25:18Z neel $"); +__FBSDID("$FreeBSD: head/sys/amd64/vmm/intel/vmcs.c 259542 2013-12-18 06:24:21Z neel $"); #include #include @@ -41,8 +41,8 @@ #include #include #include "vmm_host.h" +#include "vmx_cpufunc.h" #include "vmcs.h" -#include "vmx_cpufunc.h" #include "ept.h" #include "vmx.h" @@ -454,19 +454,6 @@ return (error); } -uint64_t -vmcs_read(uint32_t encoding) -{ - int error; - uint64_t val; - - error = vmread(encoding, &val); - if (error != 0) - panic("vmcs_read(%u) error %d", encoding, error); - - return (val); -} - #ifdef DDB extern int vmxon_enabled[]; ==== //depot/projects/smpng/sys/amd64/vmm/intel/vmcs.h#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/vmm/intel/vmcs.h 258780 2013-11-30 22:17:27Z eadler $ + * $FreeBSD: head/sys/amd64/vmm/intel/vmcs.h 259542 2013-12-18 06:24:21Z neel $ */ #ifndef _VMCS_H_ @@ -58,7 +58,26 @@ struct seg_desc *desc); int vmcs_setdesc(struct vmcs *vmcs, int ident, struct seg_desc *desc); -uint64_t vmcs_read(uint32_t encoding); + +static __inline uint64_t +vmcs_read(uint32_t encoding) +{ + int error; + uint64_t val; + + error = vmread(encoding, &val); + KASSERT(error == 0, ("vmcs_read(%u) error %d", encoding, error)); + return (val); +} + +static __inline void +vmcs_write(uint32_t encoding, uint64_t val) +{ + int error; + + error = vmwrite(encoding, val); + KASSERT(error == 0, ("vmcs_write(%u) error %d", encoding, error)); +} #define vmexit_instruction_length() vmcs_read(VMCS_EXIT_INSTRUCTION_LENGTH) #define vmcs_guest_rip() vmcs_read(VMCS_GUEST_RIP) ==== //depot/projects/smpng/sys/amd64/vmm/intel/vmx.c#9 (text+ko) ==== @@ -23,11 +23,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/vmm/intel/vmx.c 259085 2013-12-07 23:11:12Z neel $ + * $FreeBSD: head/sys/amd64/vmm/intel/vmx.c 259942 2013-12-27 12:15:53Z dim $ */ #include -__FBSDID("$FreeBSD: head/sys/amd64/vmm/intel/vmx.c 259085 2013-12-07 23:11:12Z neel $"); +__FBSDID("$FreeBSD: head/sys/amd64/vmm/intel/vmx.c 259942 2013-12-27 12:15:53Z dim $"); #include #include @@ -50,10 +50,11 @@ #include #include "vmm_host.h" -#include "vmm_lapic.h" #include "vmm_msr.h" #include "vmm_ktr.h" #include "vmm_stat.h" +#include "vlapic.h" +#include "vlapic_priv.h" #include "vmx_msr.h" #include "ept.h" @@ -112,7 +113,8 @@ #define HANDLED 1 #define UNHANDLED 0 -MALLOC_DEFINE(M_VMX, "vmx", "vmx"); +static MALLOC_DEFINE(M_VMX, "vmx", "vmx"); +static MALLOC_DEFINE(M_VLAPIC, "vlapic", "vlapic"); SYSCTL_DECL(_hw_vmm); SYSCTL_NODE(_hw_vmm, OID_AUTO, vmx, CTLFLAG_RW, NULL, NULL); @@ -324,9 +326,8 @@ VCPU_CTR2((vmx)->vm, (vcpu), "setjmp return code %s(%d)", vmx_setjmp_rc2str(rc), rc); - host_rsp = host_rip = ~0; - vmread(VMCS_HOST_RIP, &host_rip); - vmread(VMCS_HOST_RSP, &host_rsp); + host_rip = vmcs_read(VMCS_HOST_RIP); + host_rsp = vmcs_read(VMCS_HOST_RSP); VCPU_CTR2((vmx)->vm, (vcpu), "vmcs host_rip 0x%016lx, host_rsp %#lx", host_rip, host_rsp); @@ -525,6 +526,14 @@ vmxon_enabled[curcpu] = 1; } +static void +vmx_restore(void) +{ + + if (vmxon_enabled[curcpu]) + vmxon(vmxon_region[curcpu]); +} + static int vmx_init(void) { @@ -909,10 +918,10 @@ #endif } -static int +static void vmx_set_pcpu_defaults(struct vmx *vmx, int vcpu) { - int error, lastcpu; + int lastcpu; struct vmxstate *vmxstate; struct invvpid_desc invvpid_desc = { 0 }; @@ -920,24 +929,14 @@ lastcpu = vmxstate->lastcpu; vmxstate->lastcpu = curcpu; - if (lastcpu == curcpu) { - error = 0; - goto done; - } + if (lastcpu == curcpu) + return; vmm_stat_incr(vmx->vm, vcpu, VCPU_MIGRATIONS, 1); - error = vmwrite(VMCS_HOST_TR_BASE, vmm_get_host_trbase()); - if (error != 0) - goto done; - - error = vmwrite(VMCS_HOST_GDTR_BASE, vmm_get_host_gdtrbase()); - if (error != 0) - goto done; - - error = vmwrite(VMCS_HOST_GS_BASE, vmm_get_host_gsbase()); - if (error != 0) - goto done; + vmcs_write(VMCS_HOST_TR_BASE, vmm_get_host_trbase()); + vmcs_write(VMCS_HOST_GDTR_BASE, vmm_get_host_gdtrbase()); + vmcs_write(VMCS_HOST_GS_BASE, vmm_get_host_gsbase()); /* * If we are using VPIDs then invalidate all mappings tagged with 'vpid' @@ -958,20 +957,8 @@ invvpid_desc.vpid = vmxstate->vpid; invvpid(INVVPID_TYPE_SINGLE_CONTEXT, invvpid_desc); } -done: - return (error); } -static void -vm_exit_update_rip(struct vm_exit *vmexit) -{ - int error; - - error = vmwrite(VMCS_GUEST_RIP, vmexit->rip + vmexit->inst_length); - if (error) - panic("vmx_run: error %d writing to VMCS_GUEST_RIP", error); -} - /* * We depend on 'procbased_ctls' to have the Interrupt Window Exiting bit set. */ @@ -980,66 +967,45 @@ static void __inline vmx_set_int_window_exiting(struct vmx *vmx, int vcpu) { - int error; vmx->cap[vcpu].proc_ctls |= PROCBASED_INT_WINDOW_EXITING; - - error = vmwrite(VMCS_PRI_PROC_BASED_CTLS, vmx->cap[vcpu].proc_ctls); - if (error) - panic("vmx_set_int_window_exiting: vmwrite error %d", error); + vmcs_write(VMCS_PRI_PROC_BASED_CTLS, vmx->cap[vcpu].proc_ctls); } static void __inline vmx_clear_int_window_exiting(struct vmx *vmx, int vcpu) { - int error; vmx->cap[vcpu].proc_ctls &= ~PROCBASED_INT_WINDOW_EXITING; - - error = vmwrite(VMCS_PRI_PROC_BASED_CTLS, vmx->cap[vcpu].proc_ctls); - if (error) - panic("vmx_clear_int_window_exiting: vmwrite error %d", error); + vmcs_write(VMCS_PRI_PROC_BASED_CTLS, vmx->cap[vcpu].proc_ctls); } static void __inline vmx_set_nmi_window_exiting(struct vmx *vmx, int vcpu) { - int error; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Dec 28 19:38:47 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 99DF879F; Sat, 28 Dec 2013 19:38:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3E00179D for ; Sat, 28 Dec 2013 19:38:47 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 270EE146F for ; Sat, 28 Dec 2013 19:38:47 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id rBSJclxL047932 for ; Sat, 28 Dec 2013 19:38:47 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.7/Submit) id rBSJcQa5047915 for perforce@freebsd.org; Sat, 28 Dec 2013 19:38:26 GMT (envelope-from jhb@freebsd.org) Date: Sat, 28 Dec 2013 19:38:26 GMT Message-Id: <201312281938.rBSJcQa5047915@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1189574 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.17 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Dec 2013 19:38:47 -0000 http://p4web.freebsd.org/@@1189574?ac=10 Change 1189574 by jhb@jhb_pippin on 2013/12/28 19:37:42 IFC @1189568 Affected files ... .. //depot/projects/multipass/share/man/man9/BUF_ISLOCKED.9#3 integrate .. //depot/projects/multipass/share/man/man9/BUF_LOCK.9#2 integrate .. //depot/projects/multipass/share/man/man9/BUF_LOCKFREE.9#2 integrate .. //depot/projects/multipass/share/man/man9/BUF_LOCKINIT.9#2 integrate .. //depot/projects/multipass/share/man/man9/BUF_RECURSED.9#3 integrate .. //depot/projects/multipass/share/man/man9/BUF_TIMELOCK.9#2 integrate .. //depot/projects/multipass/share/man/man9/BUF_UNLOCK.9#2 integrate .. //depot/projects/multipass/share/man/man9/BUS_ADD_CHILD.9#2 integrate .. //depot/projects/multipass/share/man/man9/BUS_BIND_INTR.9#2 integrate .. //depot/projects/multipass/share/man/man9/BUS_CHILD_DELETED.9#1 branch .. //depot/projects/multipass/share/man/man9/BUS_CHILD_DETACHED.9#1 branch .. //depot/projects/multipass/share/man/man9/BUS_CONFIG_INTR.9#2 integrate .. //depot/projects/multipass/share/man/man9/BUS_DESCRIBE_INTR.9#3 integrate .. //depot/projects/multipass/share/man/man9/BUS_NEW_PASS.9#3 integrate .. //depot/projects/multipass/share/man/man9/BUS_PRINT_CHILD.9#2 integrate .. //depot/projects/multipass/share/man/man9/BUS_READ_IVAR.9#2 integrate .. //depot/projects/multipass/share/man/man9/BUS_SETUP_INTR.9#3 integrate .. //depot/projects/multipass/share/man/man9/CTASSERT.9#3 integrate .. //depot/projects/multipass/share/man/man9/DB_COMMAND.9#3 integrate .. //depot/projects/multipass/share/man/man9/DECLARE_GEOM_CLASS.9#2 integrate .. //depot/projects/multipass/share/man/man9/DECLARE_MODULE.9#2 integrate .. //depot/projects/multipass/share/man/man9/DELAY.9#3 integrate .. //depot/projects/multipass/share/man/man9/DEVICE_ATTACH.9#2 integrate .. //depot/projects/multipass/share/man/man9/DEVICE_DETACH.9#2 integrate .. //depot/projects/multipass/share/man/man9/DEVICE_IDENTIFY.9#2 integrate .. //depot/projects/multipass/share/man/man9/DEVICE_PROBE.9#3 integrate .. //depot/projects/multipass/share/man/man9/DEVICE_SHUTDOWN.9#2 integrate .. //depot/projects/multipass/share/man/man9/DEV_MODULE.9#3 integrate .. //depot/projects/multipass/share/man/man9/DRIVER_MODULE.9#3 integrate .. //depot/projects/multipass/share/man/man9/EVENTHANDLER.9#2 integrate .. //depot/projects/multipass/share/man/man9/KASSERT.9#3 integrate .. //depot/projects/multipass/share/man/man9/LOCK_PROFILING.9#4 integrate .. //depot/projects/multipass/share/man/man9/MD5.9#3 integrate .. //depot/projects/multipass/share/man/man9/MODULE_DEPEND.9#2 integrate .. //depot/projects/multipass/share/man/man9/MODULE_VERSION.9#2 integrate .. //depot/projects/multipass/share/man/man9/Makefile#5 integrate .. //depot/projects/multipass/share/man/man9/SDT.9#1 branch .. //depot/projects/multipass/share/man/man9/SYSCALL_MODULE.9#2 integrate .. //depot/projects/multipass/share/man/man9/SYSINIT.9#2 integrate .. //depot/projects/multipass/share/man/man9/VFS.9#3 integrate .. //depot/projects/multipass/share/man/man9/VFS_CHECKEXP.9#3 integrate .. //depot/projects/multipass/share/man/man9/VFS_FHTOVP.9#3 integrate .. //depot/projects/multipass/share/man/man9/VFS_LOCK_GIANT.9#2 delete .. //depot/projects/multipass/share/man/man9/VFS_MOUNT.9#3 integrate .. //depot/projects/multipass/share/man/man9/VFS_QUOTACTL.9#3 integrate .. //depot/projects/multipass/share/man/man9/VFS_ROOT.9#3 integrate .. //depot/projects/multipass/share/man/man9/VFS_SET.9#2 integrate .. //depot/projects/multipass/share/man/man9/VFS_STATFS.9#3 integrate .. //depot/projects/multipass/share/man/man9/VFS_SYNC.9#3 integrate .. //depot/projects/multipass/share/man/man9/VFS_UNMOUNT.9#3 integrate .. //depot/projects/multipass/share/man/man9/VFS_VGET.9#3 integrate .. //depot/projects/multipass/share/man/man9/VOP_ACCESS.9#3 integrate .. //depot/projects/multipass/share/man/man9/VOP_ACLCHECK.9#3 integrate .. //depot/projects/multipass/share/man/man9/VOP_ADVISE.9#1 branch .. //depot/projects/multipass/share/man/man9/VOP_ADVLOCK.9#3 integrate .. //depot/projects/multipass/share/man/man9/VOP_ALLOCATE.9#1 branch .. //depot/projects/multipass/share/man/man9/VOP_ATTRIB.9#3 integrate .. //depot/projects/multipass/share/man/man9/VOP_BWRITE.9#3 integrate .. //depot/projects/multipass/share/man/man9/VOP_CREATE.9#3 integrate .. //depot/projects/multipass/share/man/man9/VOP_FSYNC.9#3 integrate .. //depot/projects/multipass/share/man/man9/VOP_GETACL.9#3 integrate .. //depot/projects/multipass/share/man/man9/VOP_GETEXTATTR.9#3 integrate .. //depot/projects/multipass/share/man/man9/VOP_GETPAGES.9#3 integrate .. //depot/projects/multipass/share/man/man9/VOP_GETVOBJECT.9#3 integrate .. //depot/projects/multipass/share/man/man9/VOP_INACTIVE.9#3 integrate .. //depot/projects/multipass/share/man/man9/VOP_IOCTL.9#3 integrate .. //depot/projects/multipass/share/man/man9/VOP_LINK.9#3 integrate .. //depot/projects/multipass/share/man/man9/VOP_LISTEXTATTR.9#3 integrate .. //depot/projects/multipass/share/man/man9/VOP_LOCK.9#3 integrate .. //depot/projects/multipass/share/man/man9/VOP_LOOKUP.9#3 integrate .. //depot/projects/multipass/share/man/man9/VOP_OPENCLOSE.9#4 integrate .. //depot/projects/multipass/share/man/man9/VOP_PATHCONF.9#3 integrate .. //depot/projects/multipass/share/man/man9/VOP_PRINT.9#3 integrate .. //depot/projects/multipass/share/man/man9/VOP_RDWR.9#3 integrate .. //depot/projects/multipass/share/man/man9/VOP_READDIR.9#3 integrate .. //depot/projects/multipass/share/man/man9/VOP_READLINK.9#3 integrate .. //depot/projects/multipass/share/man/man9/VOP_REALLOCBLKS.9#3 integrate .. //depot/projects/multipass/share/man/man9/VOP_REMOVE.9#3 integrate .. //depot/projects/multipass/share/man/man9/VOP_RENAME.9#3 integrate .. //depot/projects/multipass/share/man/man9/VOP_REVOKE.9#3 integrate .. //depot/projects/multipass/share/man/man9/VOP_SETACL.9#3 integrate .. //depot/projects/multipass/share/man/man9/VOP_SETEXTATTR.9#3 integrate .. //depot/projects/multipass/share/man/man9/VOP_STRATEGY.9#3 integrate .. //depot/projects/multipass/share/man/man9/VOP_VPTOCNP.9#3 integrate .. //depot/projects/multipass/share/man/man9/VOP_VPTOFH.9#3 integrate .. //depot/projects/multipass/share/man/man9/accept_filter.9#3 integrate .. //depot/projects/multipass/share/man/man9/accf_data.9#3 integrate .. //depot/projects/multipass/share/man/man9/accf_dns.9#3 integrate .. //depot/projects/multipass/share/man/man9/accf_http.9#3 integrate .. //depot/projects/multipass/share/man/man9/acl.9#3 integrate .. //depot/projects/multipass/share/man/man9/alq.9#3 integrate .. //depot/projects/multipass/share/man/man9/altq.9#2 integrate .. //depot/projects/multipass/share/man/man9/atomic.9#3 integrate .. //depot/projects/multipass/share/man/man9/bios.9#3 integrate .. //depot/projects/multipass/share/man/man9/boot.9#2 integrate .. //depot/projects/multipass/share/man/man9/bpf.9#2 integrate .. //depot/projects/multipass/share/man/man9/buf.9#2 integrate .. //depot/projects/multipass/share/man/man9/buf_ring.9#1 branch .. //depot/projects/multipass/share/man/man9/bus_activate_resource.9#2 integrate .. //depot/projects/multipass/share/man/man9/bus_adjust_resource.9#2 integrate .. //depot/projects/multipass/share/man/man9/bus_alloc_resource.9#3 integrate .. //depot/projects/multipass/share/man/man9/bus_child_present.9#2 integrate .. //depot/projects/multipass/share/man/man9/bus_dma.9#2 integrate .. //depot/projects/multipass/share/man/man9/bus_generic_attach.9#2 integrate .. //depot/projects/multipass/share/man/man9/bus_generic_detach.9#2 integrate .. //depot/projects/multipass/share/man/man9/bus_generic_new_pass.9#3 integrate .. //depot/projects/multipass/share/man/man9/bus_generic_print_child.9#2 integrate .. //depot/projects/multipass/share/man/man9/bus_generic_read_ivar.9#2 integrate .. //depot/projects/multipass/share/man/man9/bus_generic_shutdown.9#2 integrate .. //depot/projects/multipass/share/man/man9/bus_release_resource.9#2 integrate .. //depot/projects/multipass/share/man/man9/bus_set_pass.9#3 integrate .. //depot/projects/multipass/share/man/man9/bus_set_resource.9#2 integrate .. //depot/projects/multipass/share/man/man9/bus_space.9#3 integrate .. //depot/projects/multipass/share/man/man9/byteorder.9#2 integrate .. //depot/projects/multipass/share/man/man9/cd.9#2 integrate .. //depot/projects/multipass/share/man/man9/condvar.9#2 integrate .. //depot/projects/multipass/share/man/man9/config_intrhook.9#2 integrate .. //depot/projects/multipass/share/man/man9/contigmalloc.9#2 integrate .. //depot/projects/multipass/share/man/man9/copy.9#3 integrate .. //depot/projects/multipass/share/man/man9/counter.9#1 branch .. //depot/projects/multipass/share/man/man9/cr_cansee.9#3 integrate .. //depot/projects/multipass/share/man/man9/cr_seeothergids.9#3 integrate .. //depot/projects/multipass/share/man/man9/cr_seeotheruids.9#3 integrate .. //depot/projects/multipass/share/man/man9/critical_enter.9#2 integrate .. //depot/projects/multipass/share/man/man9/crypto.9#3 integrate .. //depot/projects/multipass/share/man/man9/dev_clone.9#2 integrate .. //depot/projects/multipass/share/man/man9/devclass.9#2 integrate .. //depot/projects/multipass/share/man/man9/devclass_find.9#2 integrate .. //depot/projects/multipass/share/man/man9/devclass_get_count.9#2 integrate .. //depot/projects/multipass/share/man/man9/devclass_get_device.9#2 integrate .. //depot/projects/multipass/share/man/man9/devclass_get_devices.9#2 integrate .. //depot/projects/multipass/share/man/man9/devclass_get_drivers.9#2 integrate .. //depot/projects/multipass/share/man/man9/devclass_get_maxunit.9#3 integrate .. //depot/projects/multipass/share/man/man9/devclass_get_name.9#2 integrate .. //depot/projects/multipass/share/man/man9/devclass_get_softc.9#2 integrate .. //depot/projects/multipass/share/man/man9/devfs_set_cdevpriv.9#3 integrate .. //depot/projects/multipass/share/man/man9/device.9#2 integrate .. //depot/projects/multipass/share/man/man9/device_add_child.9#2 integrate .. //depot/projects/multipass/share/man/man9/device_delete_child.9#2 integrate .. //depot/projects/multipass/share/man/man9/device_enable.9#2 integrate .. //depot/projects/multipass/share/man/man9/device_find_child.9#2 integrate .. //depot/projects/multipass/share/man/man9/device_get_children.9#2 integrate .. //depot/projects/multipass/share/man/man9/device_get_devclass.9#2 integrate .. //depot/projects/multipass/share/man/man9/device_get_driver.9#2 integrate .. //depot/projects/multipass/share/man/man9/device_get_ivars.9#2 integrate .. //depot/projects/multipass/share/man/man9/device_get_name.9#2 integrate .. //depot/projects/multipass/share/man/man9/device_get_parent.9#2 integrate .. //depot/projects/multipass/share/man/man9/device_get_softc.9#2 integrate .. //depot/projects/multipass/share/man/man9/device_get_state.9#2 integrate .. //depot/projects/multipass/share/man/man9/device_get_sysctl.9#3 integrate .. //depot/projects/multipass/share/man/man9/device_get_unit.9#2 integrate .. //depot/projects/multipass/share/man/man9/device_printf.9#2 integrate .. //depot/projects/multipass/share/man/man9/device_probe_and_attach.9#2 integrate .. //depot/projects/multipass/share/man/man9/device_quiet.9#2 integrate .. //depot/projects/multipass/share/man/man9/device_set_desc.9#2 integrate .. //depot/projects/multipass/share/man/man9/device_set_driver.9#2 integrate .. //depot/projects/multipass/share/man/man9/device_set_flags.9#2 integrate .. //depot/projects/multipass/share/man/man9/devstat.9#3 integrate .. //depot/projects/multipass/share/man/man9/devtoname.9#3 integrate .. //depot/projects/multipass/share/man/man9/disk.9#2 integrate .. //depot/projects/multipass/share/man/man9/domain.9#2 integrate .. //depot/projects/multipass/share/man/man9/drbr.9#1 branch .. //depot/projects/multipass/share/man/man9/driver.9#3 integrate .. //depot/projects/multipass/share/man/man9/eventtimers.9#2 integrate .. //depot/projects/multipass/share/man/man9/extattr.9#3 integrate .. //depot/projects/multipass/share/man/man9/fail.9#3 integrate .. //depot/projects/multipass/share/man/man9/fetch.9#3 integrate .. //depot/projects/multipass/share/man/man9/firmware.9#3 integrate .. //depot/projects/multipass/share/man/man9/g_access.9#2 integrate .. //depot/projects/multipass/share/man/man9/g_attach.9#2 integrate .. //depot/projects/multipass/share/man/man9/g_bio.9#2 integrate .. //depot/projects/multipass/share/man/man9/g_consumer.9#2 integrate .. //depot/projects/multipass/share/man/man9/g_data.9#2 integrate .. //depot/projects/multipass/share/man/man9/g_event.9#2 integrate .. //depot/projects/multipass/share/man/man9/g_geom.9#3 integrate .. //depot/projects/multipass/share/man/man9/g_provider.9#2 integrate .. //depot/projects/multipass/share/man/man9/g_provider_by_name.9#2 integrate .. //depot/projects/multipass/share/man/man9/g_wither_geom.9#3 integrate .. //depot/projects/multipass/share/man/man9/get_cyclecount.9#4 integrate .. //depot/projects/multipass/share/man/man9/getenv.9#1 branch .. //depot/projects/multipass/share/man/man9/getnewvnode.9#2 integrate .. //depot/projects/multipass/share/man/man9/groupmember.9#2 integrate .. //depot/projects/multipass/share/man/man9/hash.9#2 integrate .. //depot/projects/multipass/share/man/man9/hashinit.9#2 integrate .. //depot/projects/multipass/share/man/man9/hexdump.9#3 integrate .. //depot/projects/multipass/share/man/man9/hhook.9#2 integrate .. //depot/projects/multipass/share/man/man9/ieee80211.9#3 integrate .. //depot/projects/multipass/share/man/man9/ieee80211_amrr.9#2 integrate .. //depot/projects/multipass/share/man/man9/ieee80211_beacon.9#2 integrate .. //depot/projects/multipass/share/man/man9/ieee80211_bmiss.9#2 integrate .. //depot/projects/multipass/share/man/man9/ieee80211_crypto.9#3 integrate .. //depot/projects/multipass/share/man/man9/ieee80211_ddb.9#3 integrate .. //depot/projects/multipass/share/man/man9/ieee80211_input.9#2 integrate .. //depot/projects/multipass/share/man/man9/ieee80211_node.9#3 integrate .. //depot/projects/multipass/share/man/man9/ieee80211_output.9#3 integrate .. //depot/projects/multipass/share/man/man9/ieee80211_proto.9#2 integrate .. //depot/projects/multipass/share/man/man9/ieee80211_radiotap.9#3 integrate .. //depot/projects/multipass/share/man/man9/ieee80211_regdomain.9#2 integrate .. //depot/projects/multipass/share/man/man9/ieee80211_scan.9#3 integrate .. //depot/projects/multipass/share/man/man9/ieee80211_vap.9#3 integrate .. //depot/projects/multipass/share/man/man9/ifnet.9#4 integrate .. //depot/projects/multipass/share/man/man9/inittodr.9#2 integrate .. //depot/projects/multipass/share/man/man9/insmntque.9#3 integrate .. //depot/projects/multipass/share/man/man9/intro.9#2 integrate .. //depot/projects/multipass/share/man/man9/ithread.9#3 integrate .. //depot/projects/multipass/share/man/man9/kernacc.9#3 integrate .. //depot/projects/multipass/share/man/man9/kernel_mount.9#2 integrate .. //depot/projects/multipass/share/man/man9/khelp.9#2 integrate .. //depot/projects/multipass/share/man/man9/kobj.9#3 integrate .. //depot/projects/multipass/share/man/man9/kproc.9#3 integrate .. //depot/projects/multipass/share/man/man9/kqueue.9#3 integrate .. //depot/projects/multipass/share/man/man9/kthread.9#3 integrate .. //depot/projects/multipass/share/man/man9/ktr.9#2 integrate .. //depot/projects/multipass/share/man/man9/lock.9#3 integrate .. //depot/projects/multipass/share/man/man9/locking.9#3 integrate .. //depot/projects/multipass/share/man/man9/mac.9#3 integrate .. //depot/projects/multipass/share/man/man9/make_dev.9#3 integrate .. //depot/projects/multipass/share/man/man9/malloc.9#3 integrate .. //depot/projects/multipass/share/man/man9/mbchain.9#2 integrate .. //depot/projects/multipass/share/man/man9/mbpool.9#3 integrate .. //depot/projects/multipass/share/man/man9/mbuf.9#3 integrate .. //depot/projects/multipass/share/man/man9/mbuf_tags.9#2 integrate .. //depot/projects/multipass/share/man/man9/mdchain.9#2 integrate .. //depot/projects/multipass/share/man/man9/memcchr.9#2 integrate .. //depot/projects/multipass/share/man/man9/memguard.9#3 integrate .. //depot/projects/multipass/share/man/man9/mi_switch.9#3 integrate .. //depot/projects/multipass/share/man/man9/microseq.9#2 integrate .. //depot/projects/multipass/share/man/man9/microtime.9#2 integrate .. //depot/projects/multipass/share/man/man9/microuptime.9#2 integrate .. //depot/projects/multipass/share/man/man9/mod_cc.9#2 integrate .. //depot/projects/multipass/share/man/man9/module.9#2 integrate .. //depot/projects/multipass/share/man/man9/mtx_pool.9#3 integrate .. //depot/projects/multipass/share/man/man9/mutex.9#3 integrate .. //depot/projects/multipass/share/man/man9/namei.9#3 integrate .. //depot/projects/multipass/share/man/man9/netisr.9#3 integrate .. //depot/projects/multipass/share/man/man9/osd.9#2 integrate .. //depot/projects/multipass/share/man/man9/p_candebug.9#3 integrate .. //depot/projects/multipass/share/man/man9/p_cansee.9#3 integrate .. //depot/projects/multipass/share/man/man9/panic.9#2 integrate .. //depot/projects/multipass/share/man/man9/pbuf.9#2 integrate .. //depot/projects/multipass/share/man/man9/pci.9#3 integrate .. //depot/projects/multipass/share/man/man9/pfil.9#2 integrate .. //depot/projects/multipass/share/man/man9/pfind.9#3 integrate .. //depot/projects/multipass/share/man/man9/pgfind.9#3 integrate .. //depot/projects/multipass/share/man/man9/physio.9#3 integrate .. //depot/projects/multipass/share/man/man9/pmap.9#2 integrate .. //depot/projects/multipass/share/man/man9/pmap_activate.9#2 integrate .. //depot/projects/multipass/share/man/man9/pmap_change_wiring.9#2 integrate .. //depot/projects/multipass/share/man/man9/pmap_clear_modify.9#2 integrate .. //depot/projects/multipass/share/man/man9/pmap_copy.9#2 integrate .. //depot/projects/multipass/share/man/man9/pmap_enter.9#2 integrate .. //depot/projects/multipass/share/man/man9/pmap_extract.9#2 integrate .. //depot/projects/multipass/share/man/man9/pmap_growkernel.9#2 integrate .. //depot/projects/multipass/share/man/man9/pmap_init.9#2 integrate .. //depot/projects/multipass/share/man/man9/pmap_is_modified.9#2 integrate .. //depot/projects/multipass/share/man/man9/pmap_is_prefaultable.9#2 integrate .. //depot/projects/multipass/share/man/man9/pmap_map.9#2 integrate .. //depot/projects/multipass/share/man/man9/pmap_mincore.9#2 integrate .. //depot/projects/multipass/share/man/man9/pmap_object_init_pt.9#2 integrate .. //depot/projects/multipass/share/man/man9/pmap_page_exists_quick.9#2 integrate .. //depot/projects/multipass/share/man/man9/pmap_page_init.9#2 integrate .. //depot/projects/multipass/share/man/man9/pmap_page_protect.9#2 integrate .. //depot/projects/multipass/share/man/man9/pmap_pinit.9#2 integrate .. //depot/projects/multipass/share/man/man9/pmap_qenter.9#2 integrate .. //depot/projects/multipass/share/man/man9/pmap_release.9#2 integrate .. //depot/projects/multipass/share/man/man9/pmap_remove.9#2 integrate .. //depot/projects/multipass/share/man/man9/pmap_resident_count.9#2 integrate .. //depot/projects/multipass/share/man/man9/pmap_zero_page.9#2 integrate .. //depot/projects/multipass/share/man/man9/printf.9#2 integrate .. //depot/projects/multipass/share/man/man9/prison_check.9#3 integrate .. //depot/projects/multipass/share/man/man9/priv.9#2 integrate .. //depot/projects/multipass/share/man/man9/pseudofs.9#3 integrate .. //depot/projects/multipass/share/man/man9/psignal.9#3 integrate .. //depot/projects/multipass/share/man/man9/random.9#3 integrate .. //depot/projects/multipass/share/man/man9/random_harvest.9#2 integrate .. //depot/projects/multipass/share/man/man9/redzone.9#2 integrate .. //depot/projects/multipass/share/man/man9/refcount.9#2 integrate .. //depot/projects/multipass/share/man/man9/resettodr.9#2 integrate .. //depot/projects/multipass/share/man/man9/resource_int_value.9#2 integrate .. //depot/projects/multipass/share/man/man9/rijndael.9#3 integrate .. //depot/projects/multipass/share/man/man9/rman.9#3 integrate .. //depot/projects/multipass/share/man/man9/rmlock.9#3 integrate .. //depot/projects/multipass/share/man/man9/rtalloc.9#3 integrate .. //depot/projects/multipass/share/man/man9/rtentry.9#3 integrate .. //depot/projects/multipass/share/man/man9/runqueue.9#3 integrate .. //depot/projects/multipass/share/man/man9/rwlock.9#3 integrate .. //depot/projects/multipass/share/man/man9/sbuf.9#3 integrate .. //depot/projects/multipass/share/man/man9/scheduler.9#2 integrate .. //depot/projects/multipass/share/man/man9/securelevel_gt.9#2 integrate .. //depot/projects/multipass/share/man/man9/selrecord.9#3 integrate .. //depot/projects/multipass/share/man/man9/sema.9#2 integrate .. //depot/projects/multipass/share/man/man9/sf_buf.9#2 integrate .. //depot/projects/multipass/share/man/man9/sglist.9#3 integrate .. //depot/projects/multipass/share/man/man9/shm_map.9#2 integrate .. //depot/projects/multipass/share/man/man9/signal.9#2 integrate .. //depot/projects/multipass/share/man/man9/sleep.9#4 integrate .. //depot/projects/multipass/share/man/man9/sleepqueue.9#4 integrate .. //depot/projects/multipass/share/man/man9/socket.9#2 integrate .. //depot/projects/multipass/share/man/man9/spl.9#3 integrate .. //depot/projects/multipass/share/man/man9/stack.9#3 integrate .. //depot/projects/multipass/share/man/man9/store.9#3 integrate .. //depot/projects/multipass/share/man/man9/style.9#3 integrate .. //depot/projects/multipass/share/man/man9/swi.9#3 integrate .. //depot/projects/multipass/share/man/man9/sx.9#3 integrate .. //depot/projects/multipass/share/man/man9/sysctl.9#3 integrate .. //depot/projects/multipass/share/man/man9/sysctl_add_oid.9#3 integrate .. //depot/projects/multipass/share/man/man9/sysctl_ctx_init.9#3 integrate .. //depot/projects/multipass/share/man/man9/taskqueue.9#3 integrate .. //depot/projects/multipass/share/man/man9/thread_exit.9#2 integrate .. //depot/projects/multipass/share/man/man9/time.9#2 integrate .. //depot/projects/multipass/share/man/man9/timeout.9#3 integrate .. //depot/projects/multipass/share/man/man9/tvtohz.9#2 integrate .. //depot/projects/multipass/share/man/man9/ucred.9#2 integrate .. //depot/projects/multipass/share/man/man9/uidinfo.9#2 integrate .. //depot/projects/multipass/share/man/man9/uio.9#3 integrate .. //depot/projects/multipass/share/man/man9/unr.9#2 integrate .. //depot/projects/multipass/share/man/man9/usbdi.9#4 integrate .. //depot/projects/multipass/share/man/man9/utopia.9#2 integrate .. //depot/projects/multipass/share/man/man9/vaccess.9#3 integrate .. //depot/projects/multipass/share/man/man9/vaccess_acl_nfs4.9#3 integrate .. //depot/projects/multipass/share/man/man9/vaccess_acl_posix1e.9#3 integrate .. //depot/projects/multipass/share/man/man9/vcount.9#3 integrate .. //depot/projects/multipass/share/man/man9/vflush.9#3 integrate .. //depot/projects/multipass/share/man/man9/vfs_busy.9#3 integrate .. //depot/projects/multipass/share/man/man9/vfs_getnewfsid.9#2 integrate .. //depot/projects/multipass/share/man/man9/vfs_getopt.9#3 integrate .. //depot/projects/multipass/share/man/man9/vfs_getvfs.9#2 integrate .. //depot/projects/multipass/share/man/man9/vfs_mount.9#3 delete .. //depot/projects/multipass/share/man/man9/vfs_mountedfrom.9#3 integrate .. //depot/projects/multipass/share/man/man9/vfs_rootmountalloc.9#2 integrate .. //depot/projects/multipass/share/man/man9/vfs_suser.9#2 integrate .. //depot/projects/multipass/share/man/man9/vfs_timestamp.9#2 integrate .. //depot/projects/multipass/share/man/man9/vfs_unbusy.9#3 integrate .. //depot/projects/multipass/share/man/man9/vfs_unmountall.9#2 integrate .. //depot/projects/multipass/share/man/man9/vfsconf.9#2 integrate .. //depot/projects/multipass/share/man/man9/vget.9#3 integrate .. //depot/projects/multipass/share/man/man9/vgone.9#3 integrate .. //depot/projects/multipass/share/man/man9/vhold.9#2 integrate .. //depot/projects/multipass/share/man/man9/vinvalbuf.9#2 integrate .. //depot/projects/multipass/share/man/man9/vm_fault_prefault.9#2 integrate .. //depot/projects/multipass/share/man/man9/vm_map.9#3 integrate .. //depot/projects/multipass/share/man/man9/vm_map_check_protection.9#2 integrate .. //depot/projects/multipass/share/man/man9/vm_map_create.9#2 integrate .. //depot/projects/multipass/share/man/man9/vm_map_delete.9#2 integrate .. //depot/projects/multipass/share/man/man9/vm_map_entry_resize_free.9#3 integrate .. //depot/projects/multipass/share/man/man9/vm_map_find.9#2 integrate .. //depot/projects/multipass/share/man/man9/vm_map_findspace.9#2 integrate .. //depot/projects/multipass/share/man/man9/vm_map_inherit.9#2 integrate .. //depot/projects/multipass/share/man/man9/vm_map_init.9#2 integrate .. //depot/projects/multipass/share/man/man9/vm_map_insert.9#2 integrate .. //depot/projects/multipass/share/man/man9/vm_map_lock.9#2 integrate .. //depot/projects/multipass/share/man/man9/vm_map_lookup.9#2 integrate .. //depot/projects/multipass/share/man/man9/vm_map_madvise.9#2 integrate .. //depot/projects/multipass/share/man/man9/vm_map_max.9#2 integrate .. //depot/projects/multipass/share/man/man9/vm_map_protect.9#2 integrate .. //depot/projects/multipass/share/man/man9/vm_map_remove.9#2 integrate .. //depot/projects/multipass/share/man/man9/vm_map_simplify_entry.9#2 integrate .. //depot/projects/multipass/share/man/man9/vm_map_stack.9#2 integrate .. //depot/projects/multipass/share/man/man9/vm_map_submap.9#2 integrate .. //depot/projects/multipass/share/man/man9/vm_map_sync.9#2 integrate .. //depot/projects/multipass/share/man/man9/vm_map_wire.9#2 integrate .. //depot/projects/multipass/share/man/man9/vm_page_aflag.9#2 integrate .. //depot/projects/multipass/share/man/man9/vm_page_alloc.9#3 integrate .. //depot/projects/multipass/share/man/man9/vm_page_bits.9#3 integrate .. //depot/projects/multipass/share/man/man9/vm_page_busy.9#1 branch .. //depot/projects/multipass/share/man/man9/vm_page_cache.9#2 integrate .. //depot/projects/multipass/share/man/man9/vm_page_deactivate.9#2 integrate .. //depot/projects/multipass/share/man/man9/vm_page_dontneed.9#2 integrate .. //depot/projects/multipass/share/man/man9/vm_page_free.9#2 integrate .. //depot/projects/multipass/share/man/man9/vm_page_grab.9#2 integrate .. //depot/projects/multipass/share/man/man9/vm_page_hold.9#2 integrate .. //depot/projects/multipass/share/man/man9/vm_page_insert.9#2 integrate .. //depot/projects/multipass/share/man/man9/vm_page_io.9#3 delete .. //depot/projects/multipass/share/man/man9/vm_page_lookup.9#2 integrate .. //depot/projects/multipass/share/man/man9/vm_page_rename.9#2 integrate .. //depot/projects/multipass/share/man/man9/vm_page_sleep_if_busy.9#2 delete .. //depot/projects/multipass/share/man/man9/vm_page_wakeup.9#3 delete .. //depot/projects/multipass/share/man/man9/vm_page_wire.9#2 integrate .. //depot/projects/multipass/share/man/man9/vm_set_page_size.9#2 integrate .. //depot/projects/multipass/share/man/man9/vmem.9#1 branch .. //depot/projects/multipass/share/man/man9/vn_fullpath.9#2 integrate .. //depot/projects/multipass/share/man/man9/vn_isdisk.9#2 integrate .. //depot/projects/multipass/share/man/man9/vnode.9#3 integrate .. //depot/projects/multipass/share/man/man9/vref.9#3 integrate .. //depot/projects/multipass/share/man/man9/vrefcnt.9#3 integrate .. //depot/projects/multipass/share/man/man9/vrele.9#3 integrate .. //depot/projects/multipass/share/man/man9/vslock.9#3 integrate .. //depot/projects/multipass/share/man/man9/watchdog.9#3 integrate .. //depot/projects/multipass/share/man/man9/zero_copy.9#2 integrate .. //depot/projects/multipass/share/man/man9/zone.9#3 integrate .. //depot/projects/multipass/sys/Makefile#5 integrate .. //depot/projects/multipass/sys/amd64/Makefile#3 integrate .. //depot/projects/multipass/sys/amd64/acpica/acpi_machdep.c#7 integrate .. //depot/projects/multipass/sys/amd64/acpica/acpi_switch.S#4 delete .. //depot/projects/multipass/sys/amd64/acpica/acpi_wakecode.S#5 integrate .. //depot/projects/multipass/sys/amd64/acpica/acpi_wakeup.c#7 delete .. //depot/projects/multipass/sys/amd64/amd64/amd64_mem.c#4 integrate .. //depot/projects/multipass/sys/amd64/amd64/apic_vector.S#4 integrate .. //depot/projects/multipass/sys/amd64/amd64/atomic.c#2 integrate .. //depot/projects/multipass/sys/amd64/amd64/atpic_vector.S#2 integrate .. //depot/projects/multipass/sys/amd64/amd64/autoconf.c#2 integrate .. //depot/projects/multipass/sys/amd64/amd64/bios.c#2 integrate .. //depot/projects/multipass/sys/amd64/amd64/bpf_jit_machdep.c#4 integrate .. //depot/projects/multipass/sys/amd64/amd64/bpf_jit_machdep.h#4 integrate .. //depot/projects/multipass/sys/amd64/amd64/cpu_switch.S#5 integrate .. //depot/projects/multipass/sys/amd64/amd64/db_disasm.c#2 integrate .. //depot/projects/multipass/sys/amd64/amd64/db_interface.c#4 integrate .. //depot/projects/multipass/sys/amd64/amd64/db_trace.c#4 integrate .. //depot/projects/multipass/sys/amd64/amd64/elf_machdep.c#5 integrate .. //depot/projects/multipass/sys/amd64/amd64/exception.S#5 integrate .. //depot/projects/multipass/sys/amd64/amd64/fpu.c#4 integrate .. //depot/projects/multipass/sys/amd64/amd64/gdb_machdep.c#2 integrate .. //depot/projects/multipass/sys/amd64/amd64/genassym.c#5 integrate .. //depot/projects/multipass/sys/amd64/amd64/identcpu.c#8 integrate .. //depot/projects/multipass/sys/amd64/amd64/in_cksum.c#2 integrate .. //depot/projects/multipass/sys/amd64/amd64/initcpu.c#7 integrate .. //depot/projects/multipass/sys/amd64/amd64/intr_machdep.c#6 delete .. //depot/projects/multipass/sys/amd64/amd64/io.c#3 integrate .. //depot/projects/multipass/sys/amd64/amd64/legacy.c#4 delete .. //depot/projects/multipass/sys/amd64/amd64/locore.S#2 integrate .. //depot/projects/multipass/sys/amd64/amd64/machdep.c#11 integrate .. //depot/projects/multipass/sys/amd64/amd64/mem.c#3 integrate .. //depot/projects/multipass/sys/amd64/amd64/minidump_machdep.c#4 integrate .. //depot/projects/multipass/sys/amd64/amd64/mp_machdep.c#8 integrate .. //depot/projects/multipass/sys/amd64/amd64/mp_watchdog.c#3 integrate .. //depot/projects/multipass/sys/amd64/amd64/mpboot.S#2 integrate .. //depot/projects/multipass/sys/amd64/amd64/pmap.c#12 integrate .. //depot/projects/multipass/sys/amd64/amd64/prof_machdep.c#3 integrate .. //depot/projects/multipass/sys/amd64/amd64/ptrace_machdep.c#2 integrate .. //depot/projects/multipass/sys/amd64/amd64/sigtramp.S#2 integrate .. //depot/projects/multipass/sys/amd64/amd64/stack_machdep.c#2 integrate .. //depot/projects/multipass/sys/amd64/amd64/support.S#4 integrate .. //depot/projects/multipass/sys/amd64/amd64/sys_machdep.c#5 integrate .. //depot/projects/multipass/sys/amd64/amd64/trap.c#7 integrate .. //depot/projects/multipass/sys/amd64/amd64/uio_machdep.c#3 integrate .. //depot/projects/multipass/sys/amd64/amd64/uma_machdep.c#3 integrate .. //depot/projects/multipass/sys/amd64/amd64/vm_machdep.c#6 integrate .. //depot/projects/multipass/sys/amd64/compile/.cvsignore#2 delete .. //depot/projects/multipass/sys/amd64/conf/.cvsignore#2 delete .. //depot/projects/multipass/sys/amd64/conf/DEFAULTS#7 integrate .. //depot/projects/multipass/sys/amd64/conf/GENERIC#10 integrate .. //depot/projects/multipass/sys/amd64/conf/GENERIC.hints#5 integrate .. //depot/projects/multipass/sys/amd64/conf/Makefile#3 integrate .. //depot/projects/multipass/sys/amd64/conf/NOTES#9 integrate .. //depot/projects/multipass/sys/amd64/conf/XENHVM#5 delete .. //depot/projects/multipass/sys/amd64/ia32/ia32_exception.S#5 integrate .. //depot/projects/multipass/sys/amd64/ia32/ia32_misc.c#3 integrate .. //depot/projects/multipass/sys/amd64/ia32/ia32_reg.c#5 integrate .. //depot/projects/multipass/sys/amd64/ia32/ia32_signal.c#6 integrate .. //depot/projects/multipass/sys/amd64/ia32/ia32_sigtramp.S#4 integrate .. //depot/projects/multipass/sys/amd64/ia32/ia32_syscall.c#4 integrate .. //depot/projects/multipass/sys/amd64/include/_align.h#3 integrate .. //depot/projects/multipass/sys/amd64/include/_bus.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/_inttypes.h#3 integrate .. //depot/projects/multipass/sys/amd64/include/_limits.h#3 integrate .. //depot/projects/multipass/sys/amd64/include/_stdint.h#3 integrate .. //depot/projects/multipass/sys/amd64/include/_types.h#3 integrate .. //depot/projects/multipass/sys/amd64/include/acpica_machdep.h#3 integrate .. //depot/projects/multipass/sys/amd64/include/apicvar.h#6 integrate .. //depot/projects/multipass/sys/amd64/include/apm_bios.h#3 integrate .. //depot/projects/multipass/sys/amd64/include/asm.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/asmacros.h#4 integrate .. //depot/projects/multipass/sys/amd64/include/atomic.h#5 integrate .. //depot/projects/multipass/sys/amd64/include/bus.h#3 integrate .. //depot/projects/multipass/sys/amd64/include/bus_dma.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/clock.h#4 integrate .. //depot/projects/multipass/sys/amd64/include/counter.h#1 branch .. //depot/projects/multipass/sys/amd64/include/cpu.h#3 integrate .. //depot/projects/multipass/sys/amd64/include/cpufunc.h#6 integrate .. //depot/projects/multipass/sys/amd64/include/cputypes.h#3 integrate .. //depot/projects/multipass/sys/amd64/include/db_machdep.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/elf.h#5 integrate .. //depot/projects/multipass/sys/amd64/include/endian.h#4 integrate .. //depot/projects/multipass/sys/amd64/include/exec.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/fdt.h#1 branch .. //depot/projects/multipass/sys/amd64/include/float.h#3 integrate .. //depot/projects/multipass/sys/amd64/include/floatingpoint.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/fpu.h#4 integrate .. //depot/projects/multipass/sys/amd64/include/frame.h#4 integrate .. //depot/projects/multipass/sys/amd64/include/gdb_machdep.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/ieeefp.h#3 integrate .. //depot/projects/multipass/sys/amd64/include/in_cksum.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/intr_machdep.h#5 integrate .. //depot/projects/multipass/sys/amd64/include/iodev.h#3 integrate .. //depot/projects/multipass/sys/amd64/include/kdb.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/legacyvar.h#3 delete .. //depot/projects/multipass/sys/amd64/include/limits.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/md_var.h#6 integrate .. //depot/projects/multipass/sys/amd64/include/memdev.h#3 integrate .. //depot/projects/multipass/sys/amd64/include/metadata.h#3 integrate .. //depot/projects/multipass/sys/amd64/include/minidump.h#3 integrate .. //depot/projects/multipass/sys/amd64/include/mp_watchdog.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/nexusvar.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/npx.h#1 branch .. //depot/projects/multipass/sys/amd64/include/ofw_machdep.h#1 branch .. //depot/projects/multipass/sys/amd64/include/param.h#8 integrate .. //depot/projects/multipass/sys/amd64/include/pc/bios.h#3 integrate .. //depot/projects/multipass/sys/amd64/include/pc/display.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/pcb.h#5 integrate .. //depot/projects/multipass/sys/amd64/include/pci_cfgreg.h#3 integrate .. //depot/projects/multipass/sys/amd64/include/pcpu.h#5 integrate .. //depot/projects/multipass/sys/amd64/include/pmap.h#6 integrate .. //depot/projects/multipass/sys/amd64/include/pmc_mdep.h#5 integrate .. //depot/projects/multipass/sys/amd64/include/ppireg.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/proc.h#4 integrate .. //depot/projects/multipass/sys/amd64/include/profile.h#3 integrate .. //depot/projects/multipass/sys/amd64/include/psl.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/ptrace.h#3 integrate .. //depot/projects/multipass/sys/amd64/include/reg.h#4 integrate .. //depot/projects/multipass/sys/amd64/include/reloc.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/resource.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/runq.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/segments.h#4 integrate .. //depot/projects/multipass/sys/amd64/include/setjmp.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/sf_buf.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/sigframe.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/signal.h#4 integrate .. //depot/projects/multipass/sys/amd64/include/smp.h#6 integrate .. //depot/projects/multipass/sys/amd64/include/specialreg.h#7 integrate .. //depot/projects/multipass/sys/amd64/include/stack.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/stdarg.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/sysarch.h#4 integrate .. //depot/projects/multipass/sys/amd64/include/timerreg.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/trap.h#3 integrate .. //depot/projects/multipass/sys/amd64/include/tss.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/ucontext.h#4 integrate .. //depot/projects/multipass/sys/amd64/include/varargs.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/vdso.h#1 branch .. //depot/projects/multipass/sys/amd64/include/vm.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/vmm.h#1 branch .. //depot/projects/multipass/sys/amd64/include/vmm_dev.h#1 branch .. //depot/projects/multipass/sys/amd64/include/vmm_instruction_emul.h#1 branch .. //depot/projects/multipass/sys/amd64/include/vmparam.h#4 integrate .. //depot/projects/multipass/sys/amd64/include/xen/hypercall.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/xen/xen-os.h#2 integrate .. //depot/projects/multipass/sys/amd64/include/xen/xenfunc.h#3 integrate .. //depot/projects/multipass/sys/amd64/include/xen/xenvar.h#3 integrate .. //depot/projects/multipass/sys/amd64/linux32/Makefile#3 integrate .. //depot/projects/multipass/sys/amd64/linux32/linux.h#6 integrate .. //depot/projects/multipass/sys/amd64/linux32/linux32_dummy.c#3 integrate .. //depot/projects/multipass/sys/amd64/linux32/linux32_genassym.c#3 integrate .. //depot/projects/multipass/sys/amd64/linux32/linux32_ipc64.h#2 integrate .. //depot/projects/multipass/sys/amd64/linux32/linux32_locore.s#3 integrate .. //depot/projects/multipass/sys/amd64/linux32/linux32_machdep.c#5 integrate .. //depot/projects/multipass/sys/amd64/linux32/linux32_proto.h#5 integrate .. //depot/projects/multipass/sys/amd64/linux32/linux32_support.s#2 integrate .. //depot/projects/multipass/sys/amd64/linux32/linux32_syscall.h#4 integrate .. //depot/projects/multipass/sys/amd64/linux32/linux32_syscalls.c#2 integrate .. //depot/projects/multipass/sys/amd64/linux32/linux32_sysent.c#5 integrate .. //depot/projects/multipass/sys/amd64/linux32/linux32_systrace_args.c#2 integrate .. //depot/projects/multipass/sys/amd64/linux32/linux32_sysvec.c#7 integrate .. //depot/projects/multipass/sys/amd64/linux32/syscalls.conf#3 integrate .. //depot/projects/multipass/sys/amd64/linux32/syscalls.master#4 integrate .. //depot/projects/multipass/sys/amd64/pci/pci_cfgreg.c#5 integrate .. //depot/projects/multipass/sys/amd64/vmm/amd/amdv.c#1 branch .. //depot/projects/multipass/sys/amd64/vmm/intel/ept.c#1 branch .. //depot/projects/multipass/sys/amd64/vmm/intel/ept.h#1 branch .. //depot/projects/multipass/sys/amd64/vmm/intel/vmcs.c#1 branch .. //depot/projects/multipass/sys/amd64/vmm/intel/vmcs.h#1 branch .. //depot/projects/multipass/sys/amd64/vmm/intel/vmx.c#1 branch .. //depot/projects/multipass/sys/amd64/vmm/intel/vmx.h#1 branch .. //depot/projects/multipass/sys/amd64/vmm/intel/vmx_controls.h#1 branch .. //depot/projects/multipass/sys/amd64/vmm/intel/vmx_cpufunc.h#1 branch .. //depot/projects/multipass/sys/amd64/vmm/intel/vmx_genassym.c#1 branch .. //depot/projects/multipass/sys/amd64/vmm/intel/vmx_msr.c#1 branch .. //depot/projects/multipass/sys/amd64/vmm/intel/vmx_msr.h#1 branch .. //depot/projects/multipass/sys/amd64/vmm/intel/vmx_support.S#1 branch .. //depot/projects/multipass/sys/amd64/vmm/intel/vtd.c#1 branch .. //depot/projects/multipass/sys/amd64/vmm/io/iommu.c#1 branch .. //depot/projects/multipass/sys/amd64/vmm/io/iommu.h#1 branch .. //depot/projects/multipass/sys/amd64/vmm/io/ppt.c#1 branch .. //depot/projects/multipass/sys/amd64/vmm/io/ppt.h#1 branch .. //depot/projects/multipass/sys/amd64/vmm/io/vhpet.c#1 branch .. //depot/projects/multipass/sys/amd64/vmm/io/vhpet.h#1 branch .. //depot/projects/multipass/sys/amd64/vmm/io/vioapic.c#1 branch .. //depot/projects/multipass/sys/amd64/vmm/io/vioapic.h#1 branch .. //depot/projects/multipass/sys/amd64/vmm/io/vlapic.c#1 branch .. //depot/projects/multipass/sys/amd64/vmm/io/vlapic.h#1 branch .. //depot/projects/multipass/sys/amd64/vmm/io/vlapic_priv.h#1 branch .. //depot/projects/multipass/sys/amd64/vmm/vmm.c#1 branch .. //depot/projects/multipass/sys/amd64/vmm/vmm_dev.c#1 branch .. //depot/projects/multipass/sys/amd64/vmm/vmm_host.c#1 branch .. //depot/projects/multipass/sys/amd64/vmm/vmm_host.h#1 branch .. //depot/projects/multipass/sys/amd64/vmm/vmm_instruction_emul.c#1 branch .. //depot/projects/multipass/sys/amd64/vmm/vmm_ipi.c#1 branch .. //depot/projects/multipass/sys/amd64/vmm/vmm_ipi.h#1 branch .. //depot/projects/multipass/sys/amd64/vmm/vmm_ktr.h#1 branch .. //depot/projects/multipass/sys/amd64/vmm/vmm_lapic.c#1 branch .. //depot/projects/multipass/sys/amd64/vmm/vmm_lapic.h#1 branch .. //depot/projects/multipass/sys/amd64/vmm/vmm_mem.c#1 branch .. //depot/projects/multipass/sys/amd64/vmm/vmm_mem.h#1 branch .. //depot/projects/multipass/sys/amd64/vmm/vmm_msr.c#1 branch .. //depot/projects/multipass/sys/amd64/vmm/vmm_msr.h#1 branch .. //depot/projects/multipass/sys/amd64/vmm/vmm_stat.c#1 branch .. //depot/projects/multipass/sys/amd64/vmm/vmm_stat.h#1 branch .. //depot/projects/multipass/sys/amd64/vmm/vmm_support.S#1 branch .. //depot/projects/multipass/sys/amd64/vmm/vmm_util.c#1 branch .. //depot/projects/multipass/sys/amd64/vmm/vmm_util.h#1 branch .. //depot/projects/multipass/sys/amd64/vmm/x86.c#1 branch .. //depot/projects/multipass/sys/amd64/vmm/x86.h#1 branch .. //depot/projects/multipass/sys/arm/allwinner/a10_clk.c#1 branch .. //depot/projects/multipass/sys/arm/allwinner/a10_clk.h#1 branch .. //depot/projects/multipass/sys/arm/allwinner/a10_ehci.c#1 branch .. //depot/projects/multipass/sys/arm/allwinner/a10_gpio.c#1 branch .. //depot/projects/multipass/sys/arm/allwinner/a10_machdep.c#1 branch .. //depot/projects/multipass/sys/arm/allwinner/a10_wdog.c#1 branch .. //depot/projects/multipass/sys/arm/allwinner/a10_wdog.h#1 branch .. //depot/projects/multipass/sys/arm/allwinner/a20/a20_cpu_cfg.c#1 branch .. //depot/projects/multipass/sys/arm/allwinner/a20/a20_cpu_cfg.h#1 branch .. //depot/projects/multipass/sys/arm/allwinner/a20/files.a20#1 branch .. //depot/projects/multipass/sys/arm/allwinner/a20/std.a20#1 branch .. //depot/projects/multipass/sys/arm/allwinner/aintc.c#1 branch .. //depot/projects/multipass/sys/arm/allwinner/common.c#1 branch .. //depot/projects/multipass/sys/arm/allwinner/console.c#1 branch .. //depot/projects/multipass/sys/arm/allwinner/files.a10#1 branch .. //depot/projects/multipass/sys/arm/allwinner/std.a10#1 branch .. //depot/projects/multipass/sys/arm/allwinner/timer.c#1 branch .. //depot/projects/multipass/sys/arm/arm/autoconf.c#2 integrate .. //depot/projects/multipass/sys/arm/arm/bcopy_page.S#2 integrate .. //depot/projects/multipass/sys/arm/arm/bcopyinout.S#2 integrate .. //depot/projects/multipass/sys/arm/arm/bcopyinout_xscale.S#2 integrate .. //depot/projects/multipass/sys/arm/arm/blockio.S#2 integrate .. //depot/projects/multipass/sys/arm/arm/bootconfig.c#2 integrate .. //depot/projects/multipass/sys/arm/arm/bus_space-v6.c#1 branch .. //depot/projects/multipass/sys/arm/arm/bus_space_asm_generic.S#2 integrate .. //depot/projects/multipass/sys/arm/arm/bus_space_generic.c#2 integrate .. //depot/projects/multipass/sys/arm/arm/busdma_machdep-v6.c#1 branch .. //depot/projects/multipass/sys/arm/arm/busdma_machdep.c#6 integrate .. //depot/projects/multipass/sys/arm/arm/copystr.S#2 integrate .. //depot/projects/multipass/sys/arm/arm/cpufunc.c#7 integrate .. //depot/projects/multipass/sys/arm/arm/cpufunc_asm.S#2 integrate .. //depot/projects/multipass/sys/arm/arm/cpufunc_asm_arm10.S#2 integrate .. //depot/projects/multipass/sys/arm/arm/cpufunc_asm_arm11.S#2 integrate .. //depot/projects/multipass/sys/arm/arm/cpufunc_asm_arm11x6.S#1 branch .. //depot/projects/multipass/sys/arm/arm/cpufunc_asm_arm7tdmi.S#2 integrate .. //depot/projects/multipass/sys/arm/arm/cpufunc_asm_arm8.S#2 integrate .. //depot/projects/multipass/sys/arm/arm/cpufunc_asm_arm9.S#2 integrate .. //depot/projects/multipass/sys/arm/arm/cpufunc_asm_armv4.S#2 integrate .. //depot/projects/multipass/sys/arm/arm/cpufunc_asm_armv5.S#2 integrate .. //depot/projects/multipass/sys/arm/arm/cpufunc_asm_armv5_ec.S#3 integrate .. //depot/projects/multipass/sys/arm/arm/cpufunc_asm_armv6.S#1 branch .. //depot/projects/multipass/sys/arm/arm/cpufunc_asm_armv7.S#1 branch .. //depot/projects/multipass/sys/arm/arm/cpufunc_asm_fa526.S#2 integrate .. //depot/projects/multipass/sys/arm/arm/cpufunc_asm_ixp12x0.S#2 integrate .. //depot/projects/multipass/sys/arm/arm/cpufunc_asm_pj4b.S#1 branch .. //depot/projects/multipass/sys/arm/arm/cpufunc_asm_sa1.S#2 integrate .. //depot/projects/multipass/sys/arm/arm/cpufunc_asm_sa11x0.S#2 integrate .. //depot/projects/multipass/sys/arm/arm/cpufunc_asm_sheeva.S#4 integrate .. //depot/projects/multipass/sys/arm/arm/cpufunc_asm_xscale.S#2 integrate .. //depot/projects/multipass/sys/arm/arm/cpufunc_asm_xscale_c3.S#2 integrate .. //depot/projects/multipass/sys/arm/arm/db_disasm.c#2 integrate .. //depot/projects/multipass/sys/arm/arm/db_interface.c#2 integrate .. //depot/projects/multipass/sys/arm/arm/db_trace.c#4 integrate .. //depot/projects/multipass/sys/arm/arm/devmap.c#1 branch .. //depot/projects/multipass/sys/arm/arm/disassem.c#2 integrate .. //depot/projects/multipass/sys/arm/arm/dump_machdep.c#5 integrate .. //depot/projects/multipass/sys/arm/arm/elf_machdep.c#6 integrate .. //depot/projects/multipass/sys/arm/arm/elf_trampoline.c#5 integrate .. //depot/projects/multipass/sys/arm/arm/exception.S#2 integrate .. //depot/projects/multipass/sys/arm/arm/fiq.c#2 integrate .. //depot/projects/multipass/sys/arm/arm/fiq_subr.S#2 integrate .. //depot/projects/multipass/sys/arm/arm/fusu.S#2 integrate .. //depot/projects/multipass/sys/arm/arm/gdb_machdep.c#3 integrate .. //depot/projects/multipass/sys/arm/arm/genassym.c#3 integrate .. //depot/projects/multipass/sys/arm/arm/generic_timer.c#1 branch .. //depot/projects/multipass/sys/arm/arm/gic.c#1 branch .. //depot/projects/multipass/sys/arm/arm/identcpu.c#5 integrate .. //depot/projects/multipass/sys/arm/arm/in_cksum.c#2 integrate .. //depot/projects/multipass/sys/arm/arm/in_cksum_arm.S#2 integrate .. //depot/projects/multipass/sys/arm/arm/inckern.S#2 integrate .. //depot/projects/multipass/sys/arm/arm/intr.c#3 integrate .. //depot/projects/multipass/sys/arm/arm/irq_dispatch.S#3 integrate .. //depot/projects/multipass/sys/arm/arm/locore.S#5 integrate .. //depot/projects/multipass/sys/arm/arm/machdep.c#7 integrate .. //depot/projects/multipass/sys/arm/arm/mem.c#3 integrate .. //depot/projects/multipass/sys/arm/arm/minidump_machdep.c#4 integrate .. //depot/projects/multipass/sys/arm/arm/mp_machdep.c#1 branch .. //depot/projects/multipass/sys/arm/arm/mpcore_timer.c#1 branch .. //depot/projects/multipass/sys/arm/arm/nexus.c#3 integrate .. //depot/projects/multipass/sys/arm/arm/pl190.c#1 branch .. //depot/projects/multipass/sys/arm/arm/pl310.c#1 branch .. //depot/projects/multipass/sys/arm/arm/pmap-v6.c#1 branch .. //depot/projects/multipass/sys/arm/arm/pmap.c#10 integrate .. //depot/projects/multipass/sys/arm/arm/sc_machdep.c#1 branch .. //depot/projects/multipass/sys/arm/arm/setcpsr.S#2 integrate .. //depot/projects/multipass/sys/arm/arm/setstack.s#2 integrate .. //depot/projects/multipass/sys/arm/arm/stack_machdep.c#2 integrate .. //depot/projects/multipass/sys/arm/arm/stdatomic.c#1 branch .. //depot/projects/multipass/sys/arm/arm/support.S#3 integrate .. //depot/projects/multipass/sys/arm/arm/swtch.S#3 integrate .. //depot/projects/multipass/sys/arm/arm/sys_machdep.c#3 integrate .. //depot/projects/multipass/sys/arm/arm/trap.c#5 integrate .. //depot/projects/multipass/sys/arm/arm/uio_machdep.c#3 integrate .. //depot/projects/multipass/sys/arm/arm/undefined.c#3 integrate .. //depot/projects/multipass/sys/arm/arm/vectors.S#2 integrate .. //depot/projects/multipass/sys/arm/arm/vfp.c#1 branch .. //depot/projects/multipass/sys/arm/arm/vm_machdep.c#8 integrate .. //depot/projects/multipass/sys/arm/at91/at91.c#6 integrate .. //depot/projects/multipass/sys/arm/at91/at91_aicreg.h#2 integrate .. //depot/projects/multipass/sys/arm/at91/at91_cfata.c#3 integrate .. //depot/projects/multipass/sys/arm/at91/at91_machdep.c#7 integrate .. //depot/projects/multipass/sys/arm/at91/at91_mci.c#5 integrate .. //depot/projects/multipass/sys/arm/at91/at91_mcireg.h#3 integrate .. //depot/projects/multipass/sys/arm/at91/at91_pdcreg.h#3 integrate .. //depot/projects/multipass/sys/arm/at91/at91_pio.c#4 integrate .. //depot/projects/multipass/sys/arm/at91/at91_pio_rm9200.h#3 delete .. //depot/projects/multipass/sys/arm/at91/at91_pio_sam9g20.h#2 integrate .. //depot/projects/multipass/sys/arm/at91/at91_pio_sam9g45.h#1 branch .. //depot/projects/multipass/sys/arm/at91/at91_pioreg.h#4 integrate .. //depot/projects/multipass/sys/arm/at91/at91_piovar.h#3 integrate .. //depot/projects/multipass/sys/arm/at91/at91_pit.c#2 integrate .. //depot/projects/multipass/sys/arm/at91/at91_pitreg.h#2 integrate .. //depot/projects/multipass/sys/arm/at91/at91_pmc.c#4 integrate .. //depot/projects/multipass/sys/arm/at91/at91_pmcreg.h#4 integrate .. //depot/projects/multipass/sys/arm/at91/at91_pmcvar.h#4 integrate .. //depot/projects/multipass/sys/arm/at91/at91_reset.S#2 integrate .. //depot/projects/multipass/sys/arm/at91/at91_rst.c#2 integrate .. //depot/projects/multipass/sys/arm/at91/at91_rstreg.h#2 integrate .. //depot/projects/multipass/sys/arm/at91/at91_rtc.c#4 integrate .. //depot/projects/multipass/sys/arm/at91/at91_rtcreg.h#3 integrate .. //depot/projects/multipass/sys/arm/at91/at91_spi.c#5 integrate .. //depot/projects/multipass/sys/arm/at91/at91_spireg.h#3 integrate .. //depot/projects/multipass/sys/arm/at91/at91_ssc.c#4 integrate .. //depot/projects/multipass/sys/arm/at91/at91_sscreg.h#3 integrate .. //depot/projects/multipass/sys/arm/at91/at91_st.c#4 integrate .. //depot/projects/multipass/sys/arm/at91/at91_streg.h#3 integrate .. //depot/projects/multipass/sys/arm/at91/at91_twi.c#5 integrate .. //depot/projects/multipass/sys/arm/at91/at91_twiio.h#3 integrate .. //depot/projects/multipass/sys/arm/at91/at91_twireg.h#4 integrate .. //depot/projects/multipass/sys/arm/at91/at91_usartreg.h#3 integrate .. //depot/projects/multipass/sys/arm/at91/at91_wdt.c#2 integrate .. //depot/projects/multipass/sys/arm/at91/at91_wdtreg.h#2 integrate .. //depot/projects/multipass/sys/arm/at91/at91board.h#2 integrate .. //depot/projects/multipass/sys/arm/at91/at91reg.h#2 integrate .. //depot/projects/multipass/sys/arm/at91/at91rm9200.c#2 integrate .. //depot/projects/multipass/sys/arm/at91/at91rm9200_devices.c#1 branch .. //depot/projects/multipass/sys/arm/at91/at91rm9200var.h#1 branch .. //depot/projects/multipass/sys/arm/at91/at91rm92reg.h#5 integrate .. //depot/projects/multipass/sys/arm/at91/at91sam9260.c#2 integrate .. //depot/projects/multipass/sys/arm/at91/at91sam9260reg.h#2 integrate .. //depot/projects/multipass/sys/arm/at91/at91sam9g20.c#2 integrate .. //depot/projects/multipass/sys/arm/at91/at91sam9g20reg.h#2 integrate .. //depot/projects/multipass/sys/arm/at91/at91sam9g45.c#1 branch .. //depot/projects/multipass/sys/arm/at91/at91sam9g45reg.h#1 branch .. //depot/projects/multipass/sys/arm/at91/at91sam9x5.c#1 branch .. //depot/projects/multipass/sys/arm/at91/at91sam9x5reg.h#1 branch .. //depot/projects/multipass/sys/arm/at91/at91soc.c#1 branch .. //depot/projects/multipass/sys/arm/at91/at91soc.h#1 branch .. //depot/projects/multipass/sys/arm/at91/at91var.h#4 integrate .. //depot/projects/multipass/sys/arm/at91/board_bwct.c#2 integrate .. //depot/projects/multipass/sys/arm/at91/board_eb9200.c#1 branch .. //depot/projects/multipass/sys/arm/at91/board_ethernut5.c#1 branch .. //depot/projects/multipass/sys/arm/at91/board_hl200.c#2 integrate .. //depot/projects/multipass/sys/arm/at91/board_hl201.c#2 integrate .. //depot/projects/multipass/sys/arm/at91/board_kb920x.c#3 integrate .. //depot/projects/multipass/sys/arm/at91/board_qila9g20.c#2 integrate .. //depot/projects/multipass/sys/arm/at91/board_sam9260ek.c#1 branch .. //depot/projects/multipass/sys/arm/at91/board_sam9g20ek.c#2 integrate .. //depot/projects/multipass/sys/arm/at91/board_sam9x25ek.c#1 branch .. //depot/projects/multipass/sys/arm/at91/board_sn9g45.c#1 branch .. //depot/projects/multipass/sys/arm/at91/board_tsc4370.c#2 integrate .. //depot/projects/multipass/sys/arm/at91/files.at91#5 integrate .. //depot/projects/multipass/sys/arm/at91/files.at91sam9#2 delete .. //depot/projects/multipass/sys/arm/at91/hints.at91rm9200#2 delete .. //depot/projects/multipass/sys/arm/at91/hints.at91sam9261#2 delete .. //depot/projects/multipass/sys/arm/at91/if_ate.c#8 integrate .. //depot/projects/multipass/sys/arm/at91/if_atereg.h#4 integrate .. //depot/projects/multipass/sys/arm/at91/if_macb.c#2 integrate .. //depot/projects/multipass/sys/arm/at91/if_macbreg.h#2 integrate .. //depot/projects/multipass/sys/arm/at91/if_macbvar.h#2 integrate .. //depot/projects/multipass/sys/arm/at91/std.at91#3 integrate .. //depot/projects/multipass/sys/arm/at91/std.at91sam9#2 integrate .. //depot/projects/multipass/sys/arm/at91/std.at91sam9g45#1 branch .. //depot/projects/multipass/sys/arm/at91/std.atmel#1 branch .. //depot/projects/multipass/sys/arm/at91/std.bwct#2 integrate .. //depot/projects/multipass/sys/arm/at91/std.eb9200#1 branch .. //depot/projects/multipass/sys/arm/at91/std.ethernut5#1 branch .. //depot/projects/multipass/sys/arm/at91/std.hl200#2 integrate .. //depot/projects/multipass/sys/arm/at91/std.hl201#2 integrate .. //depot/projects/multipass/sys/arm/at91/std.kb920x#4 integrate .. //depot/projects/multipass/sys/arm/at91/std.qila9g20#2 integrate .. //depot/projects/multipass/sys/arm/at91/std.sam9260ek#1 branch .. //depot/projects/multipass/sys/arm/at91/std.sam9g20ek#2 integrate .. //depot/projects/multipass/sys/arm/at91/std.sam9x25ek#1 branch .. //depot/projects/multipass/sys/arm/at91/std.sn9g45#1 branch .. //depot/projects/multipass/sys/arm/at91/std.tsc4370#2 integrate .. //depot/projects/multipass/sys/arm/at91/uart_bus_at91usart.c#4 integrate .. //depot/projects/multipass/sys/arm/at91/uart_cpu_at91rm9200usart.c#4 delete .. //depot/projects/multipass/sys/arm/at91/uart_cpu_at91usart.c#1 branch .. //depot/projects/multipass/sys/arm/at91/uart_dev_at91usart.c#5 integrate .. //depot/projects/multipass/sys/arm/broadcom/bcm2835/bcm2835_bsc.c#1 branch .. //depot/projects/multipass/sys/arm/broadcom/bcm2835/bcm2835_bscreg.h#1 branch .. //depot/projects/multipass/sys/arm/broadcom/bcm2835/bcm2835_bscvar.h#1 branch .. //depot/projects/multipass/sys/arm/broadcom/bcm2835/bcm2835_dma.c#1 branch .. //depot/projects/multipass/sys/arm/broadcom/bcm2835/bcm2835_dma.h#1 branch .. //depot/projects/multipass/sys/arm/broadcom/bcm2835/bcm2835_fb.c#1 branch .. //depot/projects/multipass/sys/arm/broadcom/bcm2835/bcm2835_fbd.c#1 branch .. //depot/projects/multipass/sys/arm/broadcom/bcm2835/bcm2835_gpio.c#1 branch .. //depot/projects/multipass/sys/arm/broadcom/bcm2835/bcm2835_gpio.h#1 branch .. //depot/projects/multipass/sys/arm/broadcom/bcm2835/bcm2835_intr.c#1 branch .. //depot/projects/multipass/sys/arm/broadcom/bcm2835/bcm2835_machdep.c#1 branch .. //depot/projects/multipass/sys/arm/broadcom/bcm2835/bcm2835_mbox.c#1 branch .. //depot/projects/multipass/sys/arm/broadcom/bcm2835/bcm2835_mbox.h#1 branch .. //depot/projects/multipass/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c#1 branch .. //depot/projects/multipass/sys/arm/broadcom/bcm2835/bcm2835_spi.c#1 branch .. //depot/projects/multipass/sys/arm/broadcom/bcm2835/bcm2835_spireg.h#1 branch .. //depot/projects/multipass/sys/arm/broadcom/bcm2835/bcm2835_spivar.h#1 branch .. //depot/projects/multipass/sys/arm/broadcom/bcm2835/bcm2835_systimer.c#1 branch .. //depot/projects/multipass/sys/arm/broadcom/bcm2835/bcm2835_vcbus.h#1 branch .. //depot/projects/multipass/sys/arm/broadcom/bcm2835/bcm2835_wdog.c#1 branch .. //depot/projects/multipass/sys/arm/broadcom/bcm2835/bcm2835_wdog.h#1 branch .. //depot/projects/multipass/sys/arm/broadcom/bcm2835/common.c#1 branch .. //depot/projects/multipass/sys/arm/broadcom/bcm2835/files.bcm2835#1 branch .. //depot/projects/multipass/sys/arm/broadcom/bcm2835/std.bcm2835#1 branch .. //depot/projects/multipass/sys/arm/broadcom/bcm2835/std.rpi#1 branch .. //depot/projects/multipass/sys/arm/compile/.cvsignore#2 delete .. //depot/projects/multipass/sys/arm/conf/.cvsignore#2 delete .. //depot/projects/multipass/sys/arm/conf/AC100#1 branch .. //depot/projects/multipass/sys/arm/conf/ARMADAXP#1 branch .. //depot/projects/multipass/sys/arm/conf/ARNDALE#1 branch .. //depot/projects/multipass/sys/arm/conf/ATMEL#1 branch .. //depot/projects/multipass/sys/arm/conf/AVILA#8 integrate .. //depot/projects/multipass/sys/arm/conf/AVILA.hints#6 integrate .. //depot/projects/multipass/sys/arm/conf/BEAGLEBONE#1 branch .. //depot/projects/multipass/sys/arm/conf/BWCT#5 integrate .. //depot/projects/multipass/sys/arm/conf/BWCT.hints#4 integrate .. //depot/projects/multipass/sys/arm/conf/CAMBRIA#7 integrate .. //depot/projects/multipass/sys/arm/conf/CAMBRIA.hints#6 integrate .. //depot/projects/multipass/sys/arm/conf/CNS11XXNAS#2 integrate .. //depot/projects/multipass/sys/arm/conf/COSMIC#1 branch .. //depot/projects/multipass/sys/arm/conf/CRB#5 integrate .. //depot/projects/multipass/sys/arm/conf/CUBIEBOARD#1 branch .. //depot/projects/multipass/sys/arm/conf/CUBIEBOARD2#1 branch .. //depot/projects/multipass/sys/arm/conf/DB-78XXX#6 integrate .. //depot/projects/multipass/sys/arm/conf/DB-88F5XXX#6 integrate .. //depot/projects/multipass/sys/arm/conf/DB-88F6XXX#6 integrate .. //depot/projects/multipass/sys/arm/conf/DEFAULTS#5 integrate .. //depot/projects/multipass/sys/arm/conf/DIGI-CCWMX53#1 branch .. //depot/projects/multipass/sys/arm/conf/DOCKSTAR#2 integrate .. //depot/projects/multipass/sys/arm/conf/DREAMPLUG-1001#1 branch .. //depot/projects/multipass/sys/arm/conf/EA3250#1 branch .. //depot/projects/multipass/sys/arm/conf/EA3250.hints#1 branch .. //depot/projects/multipass/sys/arm/conf/EB9200#1 branch .. //depot/projects/multipass/sys/arm/conf/EB9200.hints#1 branch .. //depot/projects/multipass/sys/arm/conf/EFIKA_MX#1 branch .. //depot/projects/multipass/sys/arm/conf/EP80219#5 integrate .. //depot/projects/multipass/sys/arm/conf/ETHERNUT5#1 branch .. //depot/projects/multipass/sys/arm/conf/ETHERNUT5.hints#1 branch .. //depot/projects/multipass/sys/arm/conf/GUMSTIX#5 integrate .. //depot/projects/multipass/sys/arm/conf/GUMSTIX-QEMU#1 branch .. //depot/projects/multipass/sys/arm/conf/GUMSTIX.hints#2 integrate .. //depot/projects/multipass/sys/arm/conf/HL200#6 integrate .. //depot/projects/multipass/sys/arm/conf/HL201#2 integrate .. //depot/projects/multipass/sys/arm/conf/HL201.hints#2 integrate .. //depot/projects/multipass/sys/arm/conf/IMX53-QSB#1 branch .. //depot/projects/multipass/sys/arm/conf/IQ31244#5 integrate .. //depot/projects/multipass/sys/arm/conf/KB920X#6 integrate .. //depot/projects/multipass/sys/arm/conf/KB920X.hints#2 integrate .. //depot/projects/multipass/sys/arm/conf/LN2410SBC#2 integrate .. //depot/projects/multipass/sys/arm/conf/Makefile#1 branch .. //depot/projects/multipass/sys/arm/conf/NOTES#1 branch .. //depot/projects/multipass/sys/arm/conf/NSLU#5 integrate .. //depot/projects/multipass/sys/arm/conf/NSLU.hints#3 integrate .. //depot/projects/multipass/sys/arm/conf/PANDABOARD#1 branch .. //depot/projects/multipass/sys/arm/conf/PANDABOARD.hints#1 branch .. //depot/projects/multipass/sys/arm/conf/QILA9G20#2 integrate .. //depot/projects/multipass/sys/arm/conf/QILA9G20.hints#2 integrate .. //depot/projects/multipass/sys/arm/conf/RADXA#1 branch .. //depot/projects/multipass/sys/arm/conf/RPI-B#1 branch .. //depot/projects/multipass/sys/arm/conf/SAM9260EK#1 branch .. //depot/projects/multipass/sys/arm/conf/SAM9260EK.hints#1 branch .. //depot/projects/multipass/sys/arm/conf/SAM9G20EK#2 integrate .. //depot/projects/multipass/sys/arm/conf/SAM9G20EK.hints#2 integrate .. //depot/projects/multipass/sys/arm/conf/SAM9X25EK#1 branch .. //depot/projects/multipass/sys/arm/conf/SAM9X25EK.hints#1 branch .. //depot/projects/multipass/sys/arm/conf/SHEEVAPLUG#3 integrate .. //depot/projects/multipass/sys/arm/conf/SIMICS#5 integrate .. //depot/projects/multipass/sys/arm/conf/SN9G45#1 branch .. //depot/projects/multipass/sys/arm/conf/TS7800#2 integrate .. //depot/projects/multipass/sys/arm/conf/VERSATILEPB#1 branch .. //depot/projects/multipass/sys/arm/conf/WANDBOARD-DUAL#1 branch .. //depot/projects/multipass/sys/arm/conf/WANDBOARD-QUAD#1 branch .. //depot/projects/multipass/sys/arm/conf/WANDBOARD-SOLO#1 branch .. //depot/projects/multipass/sys/arm/conf/WANDBOARD.common#1 branch .. //depot/projects/multipass/sys/arm/conf/ZEDBOARD#1 branch .. //depot/projects/multipass/sys/arm/conf/genboardid.awk#1 branch .. //depot/projects/multipass/sys/arm/conf/mach-types#1 branch .. //depot/projects/multipass/sys/arm/econa/cfi_bus_econa.c#2 integrate .. //depot/projects/multipass/sys/arm/econa/econa.c#2 integrate .. //depot/projects/multipass/sys/arm/econa/econa_machdep.c#2 integrate .. //depot/projects/multipass/sys/arm/econa/econa_reg.h#2 integrate .. //depot/projects/multipass/sys/arm/econa/econa_var.h#2 integrate .. //depot/projects/multipass/sys/arm/econa/ehci_ebus.c#2 integrate .. //depot/projects/multipass/sys/arm/econa/files.econa#2 integrate .. //depot/projects/multipass/sys/arm/econa/if_ece.c#2 integrate .. //depot/projects/multipass/sys/arm/econa/if_ecereg.h#2 integrate .. //depot/projects/multipass/sys/arm/econa/if_ecevar.h#2 integrate .. //depot/projects/multipass/sys/arm/econa/ohci_ec.c#2 integrate .. //depot/projects/multipass/sys/arm/econa/std.econa#2 integrate .. //depot/projects/multipass/sys/arm/econa/timer.c#2 integrate .. //depot/projects/multipass/sys/arm/econa/uart_bus_ec.c#2 integrate .. //depot/projects/multipass/sys/arm/econa/uart_cpu_ec.c#2 integrate .. //depot/projects/multipass/sys/arm/freescale/imx/common.c#1 branch .. //depot/projects/multipass/sys/arm/freescale/imx/console.c#1 branch .. //depot/projects/multipass/sys/arm/freescale/imx/files.imx51#1 branch .. //depot/projects/multipass/sys/arm/freescale/imx/files.imx53#1 branch .. //depot/projects/multipass/sys/arm/freescale/imx/files.imx6#1 branch .. //depot/projects/multipass/sys/arm/freescale/imx/i2c.c#1 branch .. //depot/projects/multipass/sys/arm/freescale/imx/imx51_ccm.c#1 branch .. //depot/projects/multipass/sys/arm/freescale/imx/imx51_ccmreg.h#1 branch .. //depot/projects/multipass/sys/arm/freescale/imx/imx51_ccmvar.h#1 branch .. //depot/projects/multipass/sys/arm/freescale/imx/imx51_dpllreg.h#1 branch .. //depot/projects/multipass/sys/arm/freescale/imx/imx51_gpio.c#1 branch .. //depot/projects/multipass/sys/arm/freescale/imx/imx51_iomux.c#1 branch .. //depot/projects/multipass/sys/arm/freescale/imx/imx51_iomuxreg.h#1 branch .. //depot/projects/multipass/sys/arm/freescale/imx/imx51_iomuxvar.h#1 branch .. //depot/projects/multipass/sys/arm/freescale/imx/imx51_ipuv3.c#1 branch .. //depot/projects/multipass/sys/arm/freescale/imx/imx51_ipuv3_fbd.c#1 branch .. //depot/projects/multipass/sys/arm/freescale/imx/imx51_ipuv3reg.h#1 branch .. //depot/projects/multipass/sys/arm/freescale/imx/imx51_machdep.c#1 branch .. //depot/projects/multipass/sys/arm/freescale/imx/imx51_sdmareg.h#1 branch .. //depot/projects/multipass/sys/arm/freescale/imx/imx51_ssireg.h#1 branch .. //depot/projects/multipass/sys/arm/freescale/imx/imx51_tzicreg.h#1 branch .. //depot/projects/multipass/sys/arm/freescale/imx/imx53_machdep.c#1 branch .. //depot/projects/multipass/sys/arm/freescale/imx/imx6_anatop.c#1 branch .. //depot/projects/multipass/sys/arm/freescale/imx/imx6_anatopreg.h#1 branch .. //depot/projects/multipass/sys/arm/freescale/imx/imx6_anatopvar.h#1 branch .. //depot/projects/multipass/sys/arm/freescale/imx/imx6_ccm.c#1 branch .. //depot/projects/multipass/sys/arm/freescale/imx/imx6_ccmreg.h#1 branch .. //depot/projects/multipass/sys/arm/freescale/imx/imx6_machdep.c#1 branch .. //depot/projects/multipass/sys/arm/freescale/imx/imx6_pl310.c#1 branch .. //depot/projects/multipass/sys/arm/freescale/imx/imx6_usbphy.c#1 branch .. //depot/projects/multipass/sys/arm/freescale/imx/imx_gpt.c#1 branch .. //depot/projects/multipass/sys/arm/freescale/imx/imx_gptreg.h#1 branch .. //depot/projects/multipass/sys/arm/freescale/imx/imx_gptvar.h#1 branch .. //depot/projects/multipass/sys/arm/freescale/imx/imx_machdep.c#1 branch .. //depot/projects/multipass/sys/arm/freescale/imx/imx_machdep.h#1 branch .. //depot/projects/multipass/sys/arm/freescale/imx/imx_nop_usbphy.c#1 branch .. //depot/projects/multipass/sys/arm/freescale/imx/imx_sdhci.c#1 branch .. //depot/projects/multipass/sys/arm/freescale/imx/imx_wdog.c#1 branch .. //depot/projects/multipass/sys/arm/freescale/imx/imx_wdogreg.h#1 branch .. //depot/projects/multipass/sys/arm/freescale/imx/std.imx51#1 branch .. //depot/projects/multipass/sys/arm/freescale/imx/std.imx53#1 branch .. //depot/projects/multipass/sys/arm/freescale/imx/std.imx6#1 branch .. //depot/projects/multipass/sys/arm/freescale/imx/tzic.c#1 branch .. //depot/projects/multipass/sys/arm/freescale/vybrid/files.vybrid#1 branch .. //depot/projects/multipass/sys/arm/freescale/vybrid/std.vybrid#1 branch .. //depot/projects/multipass/sys/arm/freescale/vybrid/vf_anadig.c#1 branch .. //depot/projects/multipass/sys/arm/freescale/vybrid/vf_ccm.c#1 branch .. //depot/projects/multipass/sys/arm/freescale/vybrid/vf_common.c#1 branch .. //depot/projects/multipass/sys/arm/freescale/vybrid/vf_common.h#1 branch .. //depot/projects/multipass/sys/arm/freescale/vybrid/vf_ehci.c#1 branch .. //depot/projects/multipass/sys/arm/freescale/vybrid/vf_gpio.c#1 branch .. //depot/projects/multipass/sys/arm/freescale/vybrid/vf_iomuxc.c#1 branch .. //depot/projects/multipass/sys/arm/freescale/vybrid/vf_iomuxc.h#1 branch .. //depot/projects/multipass/sys/arm/freescale/vybrid/vf_machdep.c#1 branch .. //depot/projects/multipass/sys/arm/freescale/vybrid/vf_mscm.c#1 branch .. //depot/projects/multipass/sys/arm/freescale/vybrid/vf_nfc.c#1 branch .. //depot/projects/multipass/sys/arm/freescale/vybrid/vf_src.c#1 branch .. //depot/projects/multipass/sys/arm/freescale/vybrid/vf_src.h#1 branch .. //depot/projects/multipass/sys/arm/freescale/vybrid/vf_uart.c#1 branch .. //depot/projects/multipass/sys/arm/include/_align.h#2 integrate .. //depot/projects/multipass/sys/arm/include/_bus.h#2 integrate .. //depot/projects/multipass/sys/arm/include/_inttypes.h#3 integrate .. //depot/projects/multipass/sys/arm/include/_limits.h#3 integrate .. //depot/projects/multipass/sys/arm/include/_stdint.h#3 integrate .. //depot/projects/multipass/sys/arm/include/_types.h#3 integrate .. //depot/projects/multipass/sys/arm/include/armreg.h#4 integrate .. //depot/projects/multipass/sys/arm/include/asm.h#2 integrate .. //depot/projects/multipass/sys/arm/include/asmacros.h#3 integrate .. //depot/projects/multipass/sys/arm/include/at91_gpio.h#1 branch .. //depot/projects/multipass/sys/arm/include/atags.h#1 branch .. //depot/projects/multipass/sys/arm/include/atomic.h#3 integrate .. //depot/projects/multipass/sys/arm/include/blockio.h#2 integrate .. //depot/projects/multipass/sys/arm/include/board.h#1 branch .. //depot/projects/multipass/sys/arm/include/bootconfig.h#2 integrate .. //depot/projects/multipass/sys/arm/include/bus.h#3 integrate .. //depot/projects/multipass/sys/arm/include/bus_dma.h#3 integrate .. //depot/projects/multipass/sys/arm/include/clock.h#2 integrate .. //depot/projects/multipass/sys/arm/include/counter.h#1 branch .. //depot/projects/multipass/sys/arm/include/cpu.h#3 integrate .. //depot/projects/multipass/sys/arm/include/cpuconf.h#3 integrate .. //depot/projects/multipass/sys/arm/include/cpufunc.h#4 integrate .. //depot/projects/multipass/sys/arm/include/db_machdep.h#2 integrate .. //depot/projects/multipass/sys/arm/include/devmap.h#1 branch .. //depot/projects/multipass/sys/arm/include/disassem.h#3 integrate .. //depot/projects/multipass/sys/arm/include/elf.h#5 integrate .. //depot/projects/multipass/sys/arm/include/endian.h#2 integrate .. //depot/projects/multipass/sys/arm/include/exec.h#2 integrate .. //depot/projects/multipass/sys/arm/include/fdt.h#2 integrate .. //depot/projects/multipass/sys/arm/include/fiq.h#2 integrate .. //depot/projects/multipass/sys/arm/include/float.h#3 integrate .. //depot/projects/multipass/sys/arm/include/floatingpoint.h#2 integrate .. //depot/projects/multipass/sys/arm/include/fp.h#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Dec 28 19:40:50 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E5C438A9; Sat, 28 Dec 2013 19:40:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A79408A7 for ; Sat, 28 Dec 2013 19:40:49 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 932B514D6 for ; Sat, 28 Dec 2013 19:40:49 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id rBSJenkB048434 for ; Sat, 28 Dec 2013 19:40:49 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.7/Submit) id rBSJengw048431 for perforce@freebsd.org; Sat, 28 Dec 2013 19:40:49 GMT (envelope-from jhb@freebsd.org) Date: Sat, 28 Dec 2013 19:40:49 GMT Message-Id: <201312281940.rBSJengw048431@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1189575 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.17 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Dec 2013 19:40:50 -0000 http://p4web.freebsd.org/@@1189575?ac=10 Change 1189575 by jhb@jhb_pippin on 2013/12/28 19:40:11 Reapply this diff. Affected files ... .. //depot/projects/multipass/sys/x86/x86/legacy.c#2 edit Differences ... ==== //depot/projects/multipass/sys/x86/x86/legacy.c#2 (text+ko) ==== @@ -108,7 +108,8 @@ }; static devclass_t legacy_devclass; -DRIVER_MODULE(legacy, nexus, legacy_driver, legacy_devclass, 0, 0); +EARLY_DRIVER_MODULE(legacy, nexus, legacy_driver, legacy_devclass, 0, 0, + BUS_PASS_BUS); static int legacy_probe(device_t dev) @@ -296,7 +297,7 @@ 1, /* no softc */ }; static devclass_t cpu_devclass; -DRIVER_MODULE(cpu, legacy, cpu_driver, cpu_devclass, 0, 0); +EARLY_DRIVER_MODULE(cpu, legacy, cpu_driver, cpu_devclass, 0, 0, BUS_PASS_CPU); static void cpu_identify(driver_t *driver, device_t parent) @@ -304,13 +305,8 @@ device_t child; int i; - /* - * Attach a cpuX device for each CPU. We use an order of 150 - * so that these devices are attached after the Host-PCI - * bridges (which are added at order 100). - */ CPU_FOREACH(i) { - child = BUS_ADD_CHILD(parent, 150, "cpu", i); + child = BUS_ADD_CHILD(parent, 0, "cpu", i); if (child == NULL) panic("legacy_attach cpu"); }