From owner-svn-src-projects@freebsd.org Mon Nov 23 17:09:44 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A15F7A325CB for ; Mon, 23 Nov 2015 17:09:44 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4DDD414DC; Mon, 23 Nov 2015 17:09:44 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tANH9hrC043037; Mon, 23 Nov 2015 17:09:43 GMT (envelope-from nwhitehorn@FreeBSD.org) Received: (from nwhitehorn@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tANH9aLa042965; Mon, 23 Nov 2015 17:09:36 GMT (envelope-from nwhitehorn@FreeBSD.org) Message-Id: <201511231709.tANH9aLa042965@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: nwhitehorn set sender to nwhitehorn@FreeBSD.org using -f From: Nathan Whitehorn Date: Mon, 23 Nov 2015 17:09:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r291212 - in projects/powernv: amd64/amd64 amd64/linux arm/allwinner arm/allwinner/a20 arm/altera/socfpga arm/amlogic/aml8726 arm/annapurna/alpine arm/arm arm/at91 arm/broadcom/bcm2835 ... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Nov 2015 17:09:44 -0000 Author: nwhitehorn Date: Mon Nov 23 17:09:35 2015 New Revision: 291212 URL: https://svnweb.freebsd.org/changeset/base/291212 Log: Bring tree up to date. Deleted: projects/powernv/boot/i386/boot0/boot0ext.S projects/powernv/boot/i386/boot0ext/ projects/powernv/modules/ispfw/isp_1040_it/ projects/powernv/modules/ispfw/isp_1080_it/ projects/powernv/modules/ispfw/isp_12160_it/ Modified: projects/powernv/amd64/amd64/elf_machdep.c projects/powernv/amd64/linux/linux_dummy.c projects/powernv/arm/allwinner/a20/std.a20 projects/powernv/arm/allwinner/files.allwinner projects/powernv/arm/allwinner/std.a10 projects/powernv/arm/altera/socfpga/files.socfpga projects/powernv/arm/altera/socfpga/std.socfpga projects/powernv/arm/amlogic/aml8726/files.aml8726 projects/powernv/arm/annapurna/alpine/files.alpine projects/powernv/arm/annapurna/alpine/std.alpine projects/powernv/arm/arm/bus_space_base.c projects/powernv/arm/arm/exception.S projects/powernv/arm/arm/pmap-v6-new.c projects/powernv/arm/arm/pmu.c projects/powernv/arm/arm/trap-v6.c projects/powernv/arm/at91/files.at91 projects/powernv/arm/broadcom/bcm2835/files.bcm2836 projects/powernv/arm/broadcom/bcm2835/files.bcm283x projects/powernv/arm/broadcom/bcm2835/std.rpi projects/powernv/arm/cavium/cns11xx/files.econa projects/powernv/arm/conf/AML8726 projects/powernv/arm/conf/EXYNOS5.common projects/powernv/arm/conf/IMX6 projects/powernv/arm/conf/PANDABOARD projects/powernv/arm/conf/RK3188 projects/powernv/arm/conf/RPI2 projects/powernv/arm/conf/SOCKIT.common projects/powernv/arm/conf/VERSATILEPB projects/powernv/arm/conf/VIRT projects/powernv/arm/conf/VYBRID projects/powernv/arm/conf/ZEDBOARD projects/powernv/arm/freescale/imx/files.imx5 projects/powernv/arm/freescale/imx/files.imx6 projects/powernv/arm/freescale/imx/imx_machdep.c projects/powernv/arm/freescale/imx/std.imx51 projects/powernv/arm/freescale/imx/std.imx53 projects/powernv/arm/freescale/imx/std.imx6 projects/powernv/arm/freescale/vybrid/files.vybrid projects/powernv/arm/freescale/vybrid/std.vybrid projects/powernv/arm/include/bus.h projects/powernv/arm/lpc/files.lpc projects/powernv/arm/mv/armadaxp/std.armadaxp projects/powernv/arm/mv/files.mv projects/powernv/arm/qemu/files.qemu projects/powernv/arm/qemu/std.virt projects/powernv/arm/rockchip/files.rk30xx projects/powernv/arm/rockchip/std.rk30xx projects/powernv/arm/samsung/exynos/files.exynos5 projects/powernv/arm/samsung/exynos/std.exynos5250 projects/powernv/arm/samsung/exynos/std.exynos5420 projects/powernv/arm/ti/am335x/files.am335x projects/powernv/arm/ti/am335x/std.am335x projects/powernv/arm/ti/files.ti projects/powernv/arm/ti/omap4/files.omap4 projects/powernv/arm/ti/omap4/std.omap4 projects/powernv/arm/versatile/files.versatile projects/powernv/arm/versatile/versatile_pci.c projects/powernv/arm/xilinx/files.zynq7 projects/powernv/arm/xilinx/std.zynq7 projects/powernv/arm/xscale/i80321/files.i80219 projects/powernv/arm/xscale/i80321/files.i80321 projects/powernv/arm/xscale/i8134x/files.i81342 projects/powernv/arm/xscale/ixp425/files.ixp425 projects/powernv/arm/xscale/pxa/files.pxa projects/powernv/arm64/arm64/busdma_bounce.c projects/powernv/boot/i386/Makefile projects/powernv/boot/i386/boot0/Makefile projects/powernv/boot/uboot/common/main.c projects/powernv/cam/scsi/scsi_enc.c projects/powernv/cam/scsi/scsi_enc.h projects/powernv/cam/scsi/scsi_enc_ses.c projects/powernv/cddl/dev/dtrace/amd64/dtrace_isa.c projects/powernv/compat/ia32/ia32_sysvec.c projects/powernv/conf/NOTES projects/powernv/conf/files projects/powernv/conf/files.arm projects/powernv/conf/kern.opts.mk projects/powernv/contrib/vchiq/interface/vchiq_arm/vchiq_arm.c projects/powernv/dev/de/if_de.c projects/powernv/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c projects/powernv/dev/isp/isp.c projects/powernv/dev/isp/isp_freebsd.c projects/powernv/dev/isp/isp_freebsd.h projects/powernv/dev/isp/isp_library.c projects/powernv/dev/isp/isp_library.h projects/powernv/dev/isp/isp_pci.c projects/powernv/dev/isp/isp_sbus.c projects/powernv/dev/isp/isp_target.c projects/powernv/dev/isp/ispmbox.h projects/powernv/dev/isp/ispvar.h projects/powernv/dev/ispfw/asm_1040.h projects/powernv/dev/ispfw/asm_1080.h projects/powernv/dev/ispfw/asm_12160.h projects/powernv/dev/ispfw/asm_2200.h projects/powernv/dev/ispfw/asm_2300.h projects/powernv/dev/ispfw/asm_2322.h projects/powernv/dev/ispfw/ispfw.c projects/powernv/dev/mlx5/mlx5_en/en.h projects/powernv/dev/mlx5/mlx5_en/mlx5_en_ethtool.c projects/powernv/dev/mlx5/mlx5_en/mlx5_en_flow_table.c projects/powernv/dev/mlx5/mlx5_en/mlx5_en_main.c projects/powernv/dev/mlx5/mlx5_en/mlx5_en_rx.c projects/powernv/dev/mlx5/mlx5_en/mlx5_en_tx.c projects/powernv/dev/mlx5/mlx5_en/tcp_tlro.c projects/powernv/dev/mlx5/mlx5_en/tcp_tlro.h projects/powernv/dev/ntb/if_ntb/if_ntb.c projects/powernv/dev/ntb/ntb_hw/ntb_hw.h projects/powernv/dev/ntb/ntb_hw/ntb_regs.h projects/powernv/dev/usb/controller/uhci.h projects/powernv/dev/usb/input/ukbd.c projects/powernv/fs/nfs/nfs_var.h projects/powernv/fs/nfsclient/nfs_clrpcops.c projects/powernv/fs/nfsserver/nfs_nfsdkrpc.c projects/powernv/fs/nfsserver/nfs_nfsdstate.c projects/powernv/i386/i386/elf_machdep.c projects/powernv/kern/kern_malloc.c projects/powernv/kern/kern_sharedpage.c projects/powernv/kern/subr_prf.c projects/powernv/kern/subr_stack.c projects/powernv/kern/subr_witness.c projects/powernv/kern/vfs_subr.c projects/powernv/kern/vfs_syscalls.c projects/powernv/mips/malta/malta_machdep.c projects/powernv/modules/Makefile projects/powernv/modules/cryptodev/Makefile projects/powernv/modules/ipoib/Makefile projects/powernv/modules/ispfw/Makefile projects/powernv/modules/linux64/Makefile projects/powernv/netinet/sctp_pcb.c projects/powernv/netinet/sctp_usrreq.c projects/powernv/opencrypto/cryptodev.c projects/powernv/powerpc/booke/pmap.c projects/powernv/powerpc/include/asm.h projects/powernv/powerpc/include/bus.h projects/powernv/powerpc/include/md_var.h projects/powernv/powerpc/include/profile.h projects/powernv/powerpc/mpc85xx/pci_mpc85xx.c projects/powernv/powerpc/mpc85xx/pci_mpc85xx_pcib.c projects/powernv/powerpc/powerpc/elf64_machdep.c projects/powernv/powerpc/powerpc/exec_machdep.c projects/powernv/powerpc/powerpc/sigcode64.S projects/powernv/rpc/svc.c projects/powernv/sparc64/include/md_var.h projects/powernv/sparc64/sparc64/machdep.c projects/powernv/sparc64/sparc64/mp_machdep.c projects/powernv/sys/mount.h projects/powernv/sys/sysent.h projects/powernv/sys/systm.h projects/powernv/sys/vdso.h projects/powernv/vm/uma_core.c projects/powernv/vm/vm_pageout.c projects/powernv/vm/vnode_pager.c projects/powernv/x86/x86/busdma_bounce.c Directory Properties: projects/powernv/ (props changed) projects/powernv/boot/ (props changed) projects/powernv/conf/ (props changed) projects/powernv/dev/hyperv/ (props changed) Modified: projects/powernv/amd64/amd64/elf_machdep.c ============================================================================== --- projects/powernv/amd64/amd64/elf_machdep.c Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/amd64/amd64/elf_machdep.c Mon Nov 23 17:09:35 2015 (r291212) @@ -75,7 +75,7 @@ struct sysentvec elf64_freebsd_sysvec = .sv_setregs = exec_setregs, .sv_fixlimit = NULL, .sv_maxssiz = NULL, - .sv_flags = SV_ABI_FREEBSD | SV_LP64 | SV_SHP, + .sv_flags = SV_ABI_FREEBSD | SV_LP64 | SV_SHP | SV_TIMEKEEP, .sv_set_syscall_retval = cpu_set_syscall_retval, .sv_fetch_syscall_args = cpu_fetch_syscall_args, .sv_syscallnames = syscallnames, Modified: projects/powernv/amd64/linux/linux_dummy.c ============================================================================== --- projects/powernv/amd64/linux/linux_dummy.c Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/amd64/linux/linux_dummy.c Mon Nov 23 17:09:35 2015 (r291212) @@ -28,7 +28,6 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" -#include "opt_kdtrace.h" #include #include Modified: projects/powernv/arm/allwinner/a20/std.a20 ============================================================================== --- projects/powernv/arm/allwinner/a20/std.a20 Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/allwinner/a20/std.a20 Mon Nov 23 17:09:35 2015 (r291212) @@ -4,16 +4,7 @@ cpu CPU_CORTEXA machine arm armv6 makeoptions CONF_CFLAGS="-march=armv7a" -makeoption ARM_LITTLE_ENDIAN -# Physical memory starts at 0x40200000. We assume images are loaded at -# 0x40200000, e.g. from u-boot with 'fatload mmc 0 0x40200000 kernel' -# -# -options PHYSADDR=0x40000000 - -makeoptions KERNPHYSADDR=0x40200000 -options KERNPHYSADDR=0x40200000 makeoptions KERNVIRTADDR=0xc0200000 options KERNVIRTADDR=0xc0200000 Modified: projects/powernv/arm/allwinner/files.allwinner ============================================================================== --- projects/powernv/arm/allwinner/files.allwinner Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/allwinner/files.allwinner Mon Nov 23 17:09:35 2015 (r291212) @@ -1,10 +1,6 @@ # $FreeBSD$ kern/kern_clocksource.c standard -arm/arm/bus_space_base.c standard -arm/arm/bus_space_asm_generic.S standard -arm/arm/bus_space_generic.c standard - arm/allwinner/a10_ahci.c optional ahci arm/allwinner/a10_clk.c standard arm/allwinner/a10_common.c standard Modified: projects/powernv/arm/allwinner/std.a10 ============================================================================== --- projects/powernv/arm/allwinner/std.a10 Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/allwinner/std.a10 Mon Nov 23 17:09:35 2015 (r291212) @@ -4,16 +4,7 @@ cpu CPU_CORTEXA machine arm armv6 makeoptions CONF_CFLAGS="-march=armv7a" -makeoption ARM_LITTLE_ENDIAN -# Physical memory starts at 0x40200000. We assume images are loaded at -# 0x40200000, e.g. from u-boot with 'fatload mmc 0 0x40200000 kernel' -# -# -options PHYSADDR=0x40000000 - -makeoptions KERNPHYSADDR=0x40200000 -options KERNPHYSADDR=0x40200000 makeoptions KERNVIRTADDR=0xc0200000 options KERNVIRTADDR=0xc0200000 Modified: projects/powernv/arm/altera/socfpga/files.socfpga ============================================================================== --- projects/powernv/arm/altera/socfpga/files.socfpga Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/altera/socfpga/files.socfpga Mon Nov 23 17:09:35 2015 (r291212) @@ -2,12 +2,6 @@ kern/kern_clocksource.c standard -arm/arm/bus_space_generic.c standard -arm/arm/bus_space_asm_generic.S standard - -arm/arm/bus_space_base.c standard -arm/arm/mpcore_timer.c standard - arm/altera/socfpga/socfpga_common.c standard arm/altera/socfpga/socfpga_machdep.c standard arm/altera/socfpga/socfpga_manager.c standard Modified: projects/powernv/arm/altera/socfpga/std.socfpga ============================================================================== --- projects/powernv/arm/altera/socfpga/std.socfpga Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/altera/socfpga/std.socfpga Mon Nov 23 17:09:35 2015 (r291212) @@ -1,16 +1,9 @@ # $FreeBSD$ -makeoption ARM_LITTLE_ENDIAN - cpu CPU_CORTEXA machine arm armv6 makeoptions CONF_CFLAGS="-march=armv7a" -options PHYSADDR=0x00000000 - -makeoptions KERNPHYSADDR=0x00f00000 -options KERNPHYSADDR=0x00f00000 - makeoptions KERNVIRTADDR=0xc0f00000 options KERNVIRTADDR=0xc0f00000 Modified: projects/powernv/arm/amlogic/aml8726/files.aml8726 ============================================================================== --- projects/powernv/arm/amlogic/aml8726/files.aml8726 Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/amlogic/aml8726/files.aml8726 Mon Nov 23 17:09:35 2015 (r291212) @@ -2,10 +2,6 @@ kern/kern_clocksource.c standard -arm/arm/bus_space_base.c standard -arm/arm/bus_space_generic.c standard - -arm/arm/pl310.c standard arm/amlogic/aml8726/aml8726_l2cache.c standard arm/amlogic/aml8726/aml8726_machdep.c standard Modified: projects/powernv/arm/annapurna/alpine/files.alpine ============================================================================== --- projects/powernv/arm/annapurna/alpine/files.alpine Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/annapurna/alpine/files.alpine Mon Nov 23 17:09:35 2015 (r291212) @@ -2,10 +2,6 @@ kern/kern_clocksource.c standard -arm/arm/bus_space_base.c standard -arm/arm/bus_space_generic.c standard -arm/arm/bus_space_asm_generic.S standard - arm/versatile/sp804.c standard arm/versatile/versatile_timer.c standard dev/uart/uart_dev_ns8250.c optional uart Modified: projects/powernv/arm/annapurna/alpine/std.alpine ============================================================================== --- projects/powernv/arm/annapurna/alpine/std.alpine Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/annapurna/alpine/std.alpine Mon Nov 23 17:09:35 2015 (r291212) @@ -1,14 +1,9 @@ # $FreeBSD$ -makeoption ARM_LITTLE_ENDIAN - cpu CPU_CORTEXA machine arm armv6 makeoptions CONF_CFLAGS="-march=armv7a -DAL_HAVE_TYPES" -makeoptions KERNPHYSADDR=0x00200000 -options KERNPHYSADDR=0x00200000 - makeoptions KERNVIRTADDR=0xa0200000 options KERNVIRTADDR=0xa0200000 Modified: projects/powernv/arm/arm/bus_space_base.c ============================================================================== --- projects/powernv/arm/arm/bus_space_base.c Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/arm/bus_space_base.c Mon Nov 23 17:09:35 2015 (r291212) @@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include "opt_platform.h" @@ -156,4 +157,6 @@ static struct bus_space arm_base_bus_spa bus_space_tag_t fdtbus_bs_tag = &arm_base_bus_space; #endif +#if __ARM_ARCH < 6 bus_space_tag_t arm_base_bs_tag = &arm_base_bus_space; +#endif Modified: projects/powernv/arm/arm/exception.S ============================================================================== --- projects/powernv/arm/arm/exception.S Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/arm/exception.S Mon Nov 23 17:09:35 2015 (r291212) @@ -48,7 +48,6 @@ #include "assym.s" -#include "opt_kdtrace.h" #include #include #include Modified: projects/powernv/arm/arm/pmap-v6-new.c ============================================================================== --- projects/powernv/arm/arm/pmap-v6-new.c Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/arm/pmap-v6-new.c Mon Nov 23 17:09:35 2015 (r291212) @@ -5475,7 +5475,8 @@ pmap_page_set_memattr(vm_page_t m, vm_me oma = m->md.pat_mode; m->md.pat_mode = ma; - CTR5(KTR_PMAP, "%s: page %p - 0x%08X oma: %d, ma: %d, phys: 0x%08X", __func__, m, VM_PAGE_TO_PHYS(m), oma, ma); + CTR5(KTR_PMAP, "%s: page %p - 0x%08X oma: %d, ma: %d", __func__, m, + VM_PAGE_TO_PHYS(m), oma, ma); if ((m->flags & PG_FICTITIOUS) != 0) return; #if 0 Modified: projects/powernv/arm/arm/pmu.c ============================================================================== --- projects/powernv/arm/arm/pmu.c Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/arm/pmu.c Mon Nov 23 17:09:35 2015 (r291212) @@ -58,7 +58,11 @@ __FBSDID("$FreeBSD$"); #include #include +#ifdef notyet #define MAX_RLEN 8 +#else +#define MAX_RLEN 1 +#endif struct pmu_softc { struct resource *res[MAX_RLEN]; @@ -84,6 +88,8 @@ static struct ofw_compat_data compat_dat static struct resource_spec pmu_spec[] = { { SYS_RES_IRQ, 0, RF_ACTIVE }, + /* We don't currently handle pmu events, other than on cpu 0 */ +#if notyet { SYS_RES_IRQ, 1, RF_ACTIVE | RF_OPTIONAL }, { SYS_RES_IRQ, 2, RF_ACTIVE | RF_OPTIONAL }, { SYS_RES_IRQ, 3, RF_ACTIVE | RF_OPTIONAL }, @@ -91,6 +97,7 @@ static struct resource_spec pmu_spec[] = { SYS_RES_IRQ, 5, RF_ACTIVE | RF_OPTIONAL }, { SYS_RES_IRQ, 6, RF_ACTIVE | RF_OPTIONAL }, { SYS_RES_IRQ, 7, RF_ACTIVE | RF_OPTIONAL }, +#endif { -1, 0 } }; Modified: projects/powernv/arm/arm/trap-v6.c ============================================================================== --- projects/powernv/arm/arm/trap-v6.c Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/arm/trap-v6.c Mon Nov 23 17:09:35 2015 (r291212) @@ -302,8 +302,8 @@ abort_handler(struct trapframe *tf, int if (usermode) td->td_frame = tf; - CTR4(KTR_TRAP, "abort_handler: fsr %#x (idx %u) far %#x prefetch %u", - fsr, idx, far, prefetch); + CTR6(KTR_TRAP, "%s: fsr %#x (idx %u) far %#x prefetch %u usermode %d", + __func__, fsr, idx, far, prefetch, usermode); /* * Firstly, handle aborts that are not directly related to mapping. Modified: projects/powernv/arm/at91/files.at91 ============================================================================== --- projects/powernv/arm/at91/files.at91 Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/at91/files.at91 Mon Nov 23 17:09:35 2015 (r291212) @@ -1,5 +1,4 @@ # $FreeBSD$ -arm/arm/bus_space_generic.c standard arm/at91/at91_machdep.c standard arm/at91/at91_aic.c standard arm/at91/at91.c standard Modified: projects/powernv/arm/broadcom/bcm2835/files.bcm2836 ============================================================================== --- projects/powernv/arm/broadcom/bcm2835/files.bcm2836 Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/broadcom/bcm2835/files.bcm2836 Mon Nov 23 17:09:35 2015 (r291212) @@ -1,6 +1,4 @@ # $FreeBSD$ -arm/arm/generic_timer.c standard - arm/broadcom/bcm2835/bcm2836.c standard arm/broadcom/bcm2835/bcm2836_mp.c optional smp Modified: projects/powernv/arm/broadcom/bcm2835/files.bcm283x ============================================================================== --- projects/powernv/arm/broadcom/bcm2835/files.bcm283x Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/broadcom/bcm2835/files.bcm283x Mon Nov 23 17:09:35 2015 (r291212) @@ -16,10 +16,6 @@ arm/broadcom/bcm2835/bcm2835_vcio.c sta arm/broadcom/bcm2835/bcm2835_wdog.c standard arm/broadcom/bcm2835/bcm283x_dwc_fdt.c optional dwcotg fdt -arm/arm/bus_space_base.c standard -arm/arm/bus_space_generic.c standard -arm/arm/bus_space_asm_generic.S standard - kern/kern_clocksource.c standard dev/mbox/mbox_if.m standard Modified: projects/powernv/arm/broadcom/bcm2835/std.rpi ============================================================================== --- projects/powernv/arm/broadcom/bcm2835/std.rpi Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/broadcom/bcm2835/std.rpi Mon Nov 23 17:09:35 2015 (r291212) @@ -2,8 +2,5 @@ options KERNVIRTADDR=0xc0100000 makeoptions KERNVIRTADDR=0xc0100000 -options KERNPHYSADDR=0x00100000 -makeoptions KERNPHYSADDR=0x00100000 -options PHYSADDR=0x00000000 options FREEBSD_BOOT_LOADER options LINUX_BOOT_ABI Modified: projects/powernv/arm/cavium/cns11xx/files.econa ============================================================================== --- projects/powernv/arm/cavium/cns11xx/files.econa Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/cavium/cns11xx/files.econa Mon Nov 23 17:09:35 2015 (r291212) @@ -6,7 +6,6 @@ arm/cavium/cns11xx/uart_bus_ec.c option arm/cavium/cns11xx/uart_cpu_ec.c optional uart dev/uart/uart_dev_ns8250.c optional uart arm/arm/bus_space_base.c standard -arm/arm/bus_space_generic.c standard arm/cavium/cns11xx/ehci_ebus.c optional ehci arm/cavium/cns11xx/ohci_ec.c optional ohci arm/cavium/cns11xx/if_ece.c standard Modified: projects/powernv/arm/conf/AML8726 ============================================================================== --- projects/powernv/arm/conf/AML8726 Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/conf/AML8726 Mon Nov 23 17:09:35 2015 (r291212) @@ -61,6 +61,8 @@ device mmcsd # mmc/sd flash cards # Boot device is 2nd slice on MMC/SD card options ROOTDEVNAME=\"ufs:mmcsd0s2\" +device pl310 # PL310 L2 cache controller + # GPIO device gpio device gpioled Modified: projects/powernv/arm/conf/EXYNOS5.common ============================================================================== --- projects/powernv/arm/conf/EXYNOS5.common Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/conf/EXYNOS5.common Mon Nov 23 17:09:35 2015 (r291212) @@ -87,6 +87,8 @@ device dwmmc # Interrupt controller device gic +# ARM Generic Timer +device generic_timer # Pseudo devices Modified: projects/powernv/arm/conf/IMX6 ============================================================================== --- projects/powernv/arm/conf/IMX6 Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/conf/IMX6 Mon Nov 23 17:09:35 2015 (r291212) @@ -62,6 +62,10 @@ options ROOTDEVNAME=\"ufs:mmcsd0s2a\" # Interrupt controller device gic +# Cache controller +device pl310 # PL310 L2 cache controller +# ARM MPCore timer +device mpcore_timer # Pseudo devices. device loop # Network loopback Modified: projects/powernv/arm/conf/PANDABOARD ============================================================================== --- projects/powernv/arm/conf/PANDABOARD Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/conf/PANDABOARD Mon Nov 23 17:09:35 2015 (r291212) @@ -62,6 +62,8 @@ options DDB # Enable the kernel debug device fdt_pinctrl # Interrupt controller device gic +# ARM MPCore timer +device mpcore_timer # MMC/SD/SDIO Card slot support device mmc # mmc/sd bus Modified: projects/powernv/arm/conf/RK3188 ============================================================================== --- projects/powernv/arm/conf/RK3188 Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/conf/RK3188 Mon Nov 23 17:09:35 2015 (r291212) @@ -47,6 +47,8 @@ options ROOTDEVNAME=\"ufs:/dev/mmcsd0\" # Interrupt controller device gic +# ARM MPCore timer +device mpcore_timer # MMC/SD/SDIO Card slot support device mmc # mmc/sd bus Modified: projects/powernv/arm/conf/RPI2 ============================================================================== --- projects/powernv/arm/conf/RPI2 Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/conf/RPI2 Mon Nov 23 17:09:35 2015 (r291212) @@ -53,6 +53,9 @@ options INVARIANT_SUPPORT # Extra sanit options ROOTDEVNAME=\"ufs:mmcsd0s2\" +# ARM Generic Timer +device generic_timer + device bpf device loop device ether Modified: projects/powernv/arm/conf/SOCKIT.common ============================================================================== --- projects/powernv/arm/conf/SOCKIT.common Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/conf/SOCKIT.common Mon Nov 23 17:09:35 2015 (r291212) @@ -53,6 +53,8 @@ options INVARIANT_SUPPORT # Extra sanit # Interrupt controller device gic +# ARM MPCore timer +device mpcore_timer # MMC/SD/SDIO Card slot support device mmc # mmc/sd bus Modified: projects/powernv/arm/conf/VERSATILEPB ============================================================================== --- projects/powernv/arm/conf/VERSATILEPB Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/conf/VERSATILEPB Mon Nov 23 17:09:35 2015 (r291212) @@ -28,9 +28,6 @@ makeoptions MODULES_OVERRIDE="" options KERNVIRTADDR=0xc0100000 makeoptions KERNVIRTADDR=0xc0100000 -options KERNPHYSADDR=0x00100000 -makeoptions KERNPHYSADDR=0x00100000 -options PHYSADDR=0x00000000 options HZ=100 options SCHED_4BSD # 4BSD scheduler Modified: projects/powernv/arm/conf/VIRT ============================================================================== --- projects/powernv/arm/conf/VIRT Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/conf/VIRT Mon Nov 23 17:09:35 2015 (r291212) @@ -46,6 +46,8 @@ options INVARIANT_SUPPORT # Extra sanit # Interrupt controller device gic +# ARM Generic Timer +device generic_timer device bpf device loop Modified: projects/powernv/arm/conf/VYBRID ============================================================================== --- projects/powernv/arm/conf/VYBRID Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/conf/VYBRID Mon Nov 23 17:09:35 2015 (r291212) @@ -62,6 +62,8 @@ options NO_SWAPPING # Interrupt controller device gic +# ARM MPCore timer +device mpcore_timer # MMC/SD/SDIO Card slot support device mmc # mmc/sd bus Modified: projects/powernv/arm/conf/ZEDBOARD ============================================================================== --- projects/powernv/arm/conf/ZEDBOARD Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/conf/ZEDBOARD Mon Nov 23 17:09:35 2015 (r291212) @@ -52,6 +52,10 @@ options ROOTDEVNAME=\"ufs:mmcsd0s2a\" # Interrupt controller device gic +# Cache controller +device pl310 # PL310 L2 cache controller +# ARM MPCore timer +device mpcore_timer device loop device random Modified: projects/powernv/arm/freescale/imx/files.imx5 ============================================================================== --- projects/powernv/arm/freescale/imx/files.imx5 Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/freescale/imx/files.imx5 Mon Nov 23 17:09:35 2015 (r291212) @@ -1,6 +1,4 @@ # $FreeBSD$ -arm/arm/bus_space_asm_generic.S standard -arm/arm/bus_space_generic.c standard kern/kern_clocksource.c standard # Init @@ -8,7 +6,6 @@ arm/freescale/imx/imx_common.c standard arm/freescale/imx/imx_machdep.c standard arm/freescale/imx/imx51_machdep.c optional soc_imx51 arm/freescale/imx/imx53_machdep.c optional soc_imx53 -arm/arm/bus_space_base.c standard # Special serial console for debuging early boot code #arm/freescale/imx/console.c standard Modified: projects/powernv/arm/freescale/imx/files.imx6 ============================================================================== --- projects/powernv/arm/freescale/imx/files.imx6 Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/freescale/imx/files.imx6 Mon Nov 23 17:09:35 2015 (r291212) @@ -3,16 +3,11 @@ # # Standard ARM support. # -arm/arm/bus_space_asm_generic.S standard -arm/arm/bus_space_generic.c standard kern/kern_clocksource.c standard # # Standard imx6 devices and support. # -arm/arm/pl310.c standard -arm/arm/bus_space_base.c standard -arm/arm/mpcore_timer.c standard arm/freescale/fsl_ocotp.c standard arm/freescale/imx/imx6_anatop.c standard arm/freescale/imx/imx6_ccm.c standard Modified: projects/powernv/arm/freescale/imx/imx_machdep.c ============================================================================== --- projects/powernv/arm/freescale/imx/imx_machdep.c Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/freescale/imx/imx_machdep.c Mon Nov 23 17:09:35 2015 (r291212) @@ -72,16 +72,14 @@ imx_wdog_cpu_reset(vm_offset_t wdcr_phys volatile uint16_t * pcr; /* - * The deceptively simple write of WDOG_CR_WDE enables the watchdog, - * sets the timeout to its minimum value (half a second), and also - * clears the SRS bit which results in the SFTW (software-requested - * reset) bit being set in the watchdog status register after the reset. - * This is how software can distinguish a reset from a wdog timeout. + * Trigger an immediate reset by clearing the SRS bit in the watchdog + * control register. The reset happens on the next cycle of the wdog + * 32KHz clock, so hang out in a spin loop until the reset takes effect. */ if ((pcr = arm_devmap_ptov(wdcr_physaddr, sizeof(*pcr))) == NULL) { printf("cpu_reset() can't find its control register... locking up now."); } else { - *pcr = WDOG_CR_WDE; + *pcr &= ~WDOG_CR_SRS; } for (;;) continue; Modified: projects/powernv/arm/freescale/imx/std.imx51 ============================================================================== --- projects/powernv/arm/freescale/imx/std.imx51 Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/freescale/imx/std.imx51 Mon Nov 23 17:09:35 2015 (r291212) @@ -2,14 +2,10 @@ machine arm armv6 cpu CPU_CORTEXA makeoptions CONF_CFLAGS="-march=armv7a" -makeoptions ARM_LITTLE_ENDIAN options ARM_L2_PIPT options KERNVIRTADDR=0xc0100000 makeoptions KERNVIRTADDR=0xc0100000 -options KERNPHYSADDR=0x90100000 -makeoptions KERNPHYSADDR=0x90100000 -options PHYSADDR=0x90000000 device fdt_pinctrl Modified: projects/powernv/arm/freescale/imx/std.imx53 ============================================================================== --- projects/powernv/arm/freescale/imx/std.imx53 Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/freescale/imx/std.imx53 Mon Nov 23 17:09:35 2015 (r291212) @@ -2,14 +2,10 @@ machine arm armv6 cpu CPU_CORTEXA makeoptions CONF_CFLAGS="-march=armv7a" -makeoptions ARM_LITTLE_ENDIAN options ARM_L2_PIPT options KERNVIRTADDR=0xc0100000 makeoptions KERNVIRTADDR=0xc0100000 -options KERNPHYSADDR=0x70100000 -makeoptions KERNPHYSADDR=0x70100000 -options PHYSADDR=0x70000000 device fdt_pinctrl Modified: projects/powernv/arm/freescale/imx/std.imx6 ============================================================================== --- projects/powernv/arm/freescale/imx/std.imx6 Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/freescale/imx/std.imx6 Mon Nov 23 17:09:35 2015 (r291212) @@ -2,14 +2,10 @@ machine arm armv6 cpu CPU_CORTEXA makeoptions CONF_CFLAGS="-march=armv7a" -makeoptions ARM_LITTLE_ENDIAN options ARM_L2_PIPT options KERNVIRTADDR = 0xc2000000 makeoptions KERNVIRTADDR = 0xc2000000 -options KERNPHYSADDR = 0x12000000 -makeoptions KERNPHYSADDR = 0x12000000 -options PHYSADDR = 0x10000000 options IPI_IRQ_START=0 options IPI_IRQ_END=15 Modified: projects/powernv/arm/freescale/vybrid/files.vybrid ============================================================================== --- projects/powernv/arm/freescale/vybrid/files.vybrid Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/freescale/vybrid/files.vybrid Mon Nov 23 17:09:35 2015 (r291212) @@ -2,12 +2,6 @@ kern/kern_clocksource.c standard -arm/arm/bus_space_generic.c standard -arm/arm/bus_space_asm_generic.S standard - -arm/arm/bus_space_base.c standard -arm/arm/mpcore_timer.c standard - arm/freescale/vybrid/vf_machdep.c standard arm/freescale/vybrid/vf_common.c standard arm/freescale/vybrid/vf_ccm.c standard Modified: projects/powernv/arm/freescale/vybrid/std.vybrid ============================================================================== --- projects/powernv/arm/freescale/vybrid/std.vybrid Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/freescale/vybrid/std.vybrid Mon Nov 23 17:09:35 2015 (r291212) @@ -1,16 +1,9 @@ # $FreeBSD$ -makeoption ARM_LITTLE_ENDIAN - cpu CPU_CORTEXA machine arm armv6 makeoptions CONF_CFLAGS="-march=armv7a" -options PHYSADDR=0x80000000 - -makeoptions KERNPHYSADDR=0x80100000 -options KERNPHYSADDR=0x80100000 - makeoptions KERNVIRTADDR=0xc0100000 options KERNVIRTADDR=0xc0100000 Modified: projects/powernv/arm/include/bus.h ============================================================================== --- projects/powernv/arm/include/bus.h Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/include/bus.h Mon Nov 23 17:09:35 2015 (r291212) @@ -67,6 +67,7 @@ #define _MACHINE_BUS_H_ #include +#include /* * int bus_space_map (bus_space_tag_t t, bus_addr_t addr, @@ -252,7 +253,9 @@ struct bus_space { bus_size_t, const uint64_t *, bus_size_t); }; +#if __ARM_ARCH < 6 extern bus_space_tag_t arm_base_bs_tag; +#endif /* * Utility macros; INTERNAL USE ONLY. Modified: projects/powernv/arm/lpc/files.lpc ============================================================================== --- projects/powernv/arm/lpc/files.lpc Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/lpc/files.lpc Mon Nov 23 17:09:35 2015 (r291212) @@ -1,6 +1,4 @@ # $FreeBSD$ -arm/arm/bus_space_base.c standard -arm/arm/bus_space_generic.c standard arm/lpc/lpc_machdep.c standard arm/lpc/lpc_pwr.c standard arm/lpc/lpc_intc.c standard Modified: projects/powernv/arm/mv/armadaxp/std.armadaxp ============================================================================== --- projects/powernv/arm/mv/armadaxp/std.armadaxp Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/mv/armadaxp/std.armadaxp Mon Nov 23 17:09:35 2015 (r291212) @@ -1,16 +1,6 @@ # $FreeBSD$ -# kernel gets loaded at 0x00200000 by the loader, but runs at virtual address -# 0xc0200000. RAM starts at 0. We put the pagetable at a reasonable place -# in memory, but may need to bounce it higher if there's a problem with this. -# We could paper over this by loading the kernel at 0xc0000000 virtual, but -# that leads to other complications, so we'll just reclaim the lower region of -# ram after we're loaded. Put the page tables for startup at 1MB. -makeoptions KERNPHYSADDR=0x00200000 makeoptions KERNVIRTADDR=0xc0200000 - -options KERNPHYSADDR=0x00200000 options KERNVIRTADDR=0xc0200000 -options PHYSADDR=0x00000000 options ARM_L2_PIPT Modified: projects/powernv/arm/mv/files.mv ============================================================================== --- projects/powernv/arm/mv/files.mv Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/mv/files.mv Mon Nov 23 17:09:35 2015 (r291212) @@ -12,9 +12,6 @@ # - JTAG/ICE # - Vector Floating Point (VFP) unit # -arm/arm/bus_space_base.c standard -arm/arm/bus_space_generic.c standard - arm/mv/gpio.c standard arm/mv/mv_common.c standard arm/mv/mv_localbus.c standard Modified: projects/powernv/arm/qemu/files.qemu ============================================================================== --- projects/powernv/arm/qemu/files.qemu Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/qemu/files.qemu Mon Nov 23 17:09:35 2015 (r291212) @@ -3,14 +3,11 @@ # # Standard ARM support. # -arm/arm/bus_space_base.c standard -arm/arm/bus_space_generic.c standard kern/kern_clocksource.c standard # # Standard qemu virt devices and support. # -arm/arm/generic_timer.c standard arm/qemu/virt_common.c standard arm/qemu/virt_machdep.c standard arm/qemu/virt_mp.c optional smp Modified: projects/powernv/arm/qemu/std.virt ============================================================================== --- projects/powernv/arm/qemu/std.virt Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/qemu/std.virt Mon Nov 23 17:09:35 2015 (r291212) @@ -2,7 +2,6 @@ machine arm armv6 cpu CPU_CORTEXA makeoptions CONF_CFLAGS="-march=armv7a" -makeoptions ARM_LITTLE_ENDIAN options ARM_L2_PIPT options KERNVIRTADDR = 0xc1000000 Modified: projects/powernv/arm/rockchip/files.rk30xx ============================================================================== --- projects/powernv/arm/rockchip/files.rk30xx Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/rockchip/files.rk30xx Mon Nov 23 17:09:35 2015 (r291212) @@ -1,12 +1,6 @@ # $FreeBSD$ kern/kern_clocksource.c standard -arm/arm/bus_space_asm_generic.S standard -arm/arm/bus_space_generic.c standard - -arm/arm/mpcore_timer.c standard - -arm/arm/bus_space_base.c standard arm/rockchip/rk30xx_common.c standard arm/rockchip/rk30xx_machdep.c standard arm/rockchip/rk30xx_pmu.c standard Modified: projects/powernv/arm/rockchip/std.rk30xx ============================================================================== --- projects/powernv/arm/rockchip/std.rk30xx Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/rockchip/std.rk30xx Mon Nov 23 17:09:35 2015 (r291212) @@ -4,16 +4,6 @@ cpu CPU_CORTEXA machine arm armv6 makeoptions CONF_CFLAGS="-march=armv7a" -makeoption ARM_LITTLE_ENDIAN - -# Physical memory starts at 0x60400000. We assume images are loaded at -# 0x60400000. -# -# -options PHYSADDR=0x60000000 - -makeoptions KERNPHYSADDR=0x60400000 -options KERNPHYSADDR=0x60400000 makeoptions KERNVIRTADDR=0xc0400000 options KERNVIRTADDR=0xc0400000 Modified: projects/powernv/arm/samsung/exynos/files.exynos5 ============================================================================== --- projects/powernv/arm/samsung/exynos/files.exynos5 Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/samsung/exynos/files.exynos5 Mon Nov 23 17:09:35 2015 (r291212) @@ -2,12 +2,6 @@ kern/kern_clocksource.c standard -arm/arm/bus_space_generic.c standard -arm/arm/bus_space_asm_generic.S standard - -arm/arm/bus_space_base.c standard -arm/arm/generic_timer.c standard - arm/samsung/exynos/exynos5_mct.c standard arm/samsung/exynos/exynos5_mp.c optional smp arm/samsung/exynos/exynos5_common.c standard Modified: projects/powernv/arm/samsung/exynos/std.exynos5250 ============================================================================== --- projects/powernv/arm/samsung/exynos/std.exynos5250 Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/samsung/exynos/std.exynos5250 Mon Nov 23 17:09:35 2015 (r291212) @@ -1,16 +1,9 @@ # $FreeBSD$ -makeoption ARM_LITTLE_ENDIAN - cpu CPU_CORTEXA machine arm armv6 makeoptions CONF_CFLAGS="-march=armv7a" -options PHYSADDR=0x40000000 - -makeoptions KERNPHYSADDR=0x40f00000 -options KERNPHYSADDR=0x40f00000 - makeoptions KERNVIRTADDR=0xc0f00000 options KERNVIRTADDR=0xc0f00000 Modified: projects/powernv/arm/samsung/exynos/std.exynos5420 ============================================================================== --- projects/powernv/arm/samsung/exynos/std.exynos5420 Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/samsung/exynos/std.exynos5420 Mon Nov 23 17:09:35 2015 (r291212) @@ -1,16 +1,9 @@ # $FreeBSD$ -makeoption ARM_LITTLE_ENDIAN - cpu CPU_CORTEXA machine arm armv6 makeoptions CONF_CFLAGS="-march=armv7a" -options PHYSADDR=0x20000000 - -makeoptions KERNPHYSADDR=0x20f00000 -options KERNPHYSADDR=0x20f00000 - makeoptions KERNVIRTADDR=0xc0f00000 options KERNVIRTADDR=0xc0f00000 Modified: projects/powernv/arm/ti/am335x/files.am335x ============================================================================== --- projects/powernv/arm/ti/am335x/files.am335x Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/ti/am335x/files.am335x Mon Nov 23 17:09:35 2015 (r291212) @@ -17,7 +17,6 @@ arm/ti/am335x/am335x_scm_padconf.c stand arm/ti/am335x/am335x_usbss.c optional musb fdt arm/ti/am335x/am335x_musb.c optional musb fdt -arm/arm/hdmi_if.m optional hdmi arm/ti/am335x/tda19988.c optional hdmi arm/ti/ti_edma3.c standard Modified: projects/powernv/arm/ti/am335x/std.am335x ============================================================================== --- projects/powernv/arm/ti/am335x/std.am335x Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/ti/am335x/std.am335x Mon Nov 23 17:09:35 2015 (r291212) @@ -2,15 +2,7 @@ #$FreeBSD$ files "../ti/am335x/files.am335x" include "../ti/std.ti" -makeoption ARM_LITTLE_ENDIAN -# Physical memory starts at 0x80000000. We assume images are loaded at -# 0x80200000, e.g. from u-boot with 'fatload mmc 0 0x80200000 kernel.bin' -# -# -options PHYSADDR=0x80000000 -options KERNPHYSADDR=0x80200000 -makeoptions KERNPHYSADDR=0x80200000 options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm makeoptions KERNVIRTADDR=0xc0200000 Modified: projects/powernv/arm/ti/files.ti ============================================================================== --- projects/powernv/arm/ti/files.ti Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/ti/files.ti Mon Nov 23 17:09:35 2015 (r291212) @@ -2,10 +2,6 @@ kern/kern_clocksource.c standard -arm/arm/bus_space_base.c standard -arm/arm/bus_space_generic.c standard -arm/arm/bus_space_asm_generic.S standard - arm/ti/ti_common.c standard arm/ti/ti_cpuid.c standard arm/ti/ti_hwmods.c standard Modified: projects/powernv/arm/ti/omap4/files.omap4 ============================================================================== --- projects/powernv/arm/ti/omap4/files.omap4 Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/ti/omap4/files.omap4 Mon Nov 23 17:09:35 2015 (r291212) @@ -1,6 +1,5 @@ #$FreeBSD$ -arm/arm/mpcore_timer.c standard arm/ti/ti_smc.S standard arm/ti/usb/omap_ehci.c optional usb ehci Modified: projects/powernv/arm/ti/omap4/std.omap4 ============================================================================== --- projects/powernv/arm/ti/omap4/std.omap4 Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/ti/omap4/std.omap4 Mon Nov 23 17:09:35 2015 (r291212) @@ -2,15 +2,7 @@ #$FreeBSD$ files "../ti/omap4/files.omap4" include "../ti/std.ti" -makeoption ARM_LITTLE_ENDIAN -# Physical memory starts at 0x80000000. We assume images are loaded at -# 0x80200000, e.g. from u-boot with 'fatload mmc 0 0x80200000 kernel.bin' -# -# -options PHYSADDR=0x80000000 -options KERNPHYSADDR=0x80200000 -makeoptions KERNPHYSADDR=0x80200000 options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm makeoptions KERNVIRTADDR=0xc0200000 Modified: projects/powernv/arm/versatile/files.versatile ============================================================================== --- projects/powernv/arm/versatile/files.versatile Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/versatile/files.versatile Mon Nov 23 17:09:35 2015 (r291212) @@ -1,9 +1,5 @@ # $FreeBSD$ -arm/arm/bus_space_base.c standard -arm/arm/bus_space_asm_generic.S standard -arm/arm/bus_space_generic.c standard - arm/versatile/pl050.c optional sc arm/versatile/sp804.c standard arm/versatile/versatile_machdep.c standard Modified: projects/powernv/arm/versatile/versatile_pci.c ============================================================================== --- projects/powernv/arm/versatile/versatile_pci.c Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/versatile/versatile_pci.c Mon Nov 23 17:09:35 2015 (r291212) @@ -357,7 +357,7 @@ versatile_pci_activate_resource(device_t vaddr = (vm_offset_t)pmap_mapdev(rman_get_start(r), rman_get_size(r)); rman_set_bushandle(r, vaddr); - rman_set_bustag(r, arm_base_bs_tag); + rman_set_bustag(r, fdtbus_bs_tag); res = rman_activate_resource(r); break; case SYS_RES_IRQ: Modified: projects/powernv/arm/xilinx/files.zynq7 ============================================================================== --- projects/powernv/arm/xilinx/files.zynq7 Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/xilinx/files.zynq7 Mon Nov 23 17:09:35 2015 (r291212) @@ -5,13 +5,6 @@ kern/kern_clocksource.c standard -arm/arm/bus_space_base.c standard -arm/arm/bus_space_generic.c standard -arm/arm/bus_space_asm_generic.S standard - -arm/arm/mpcore_timer.c standard -arm/arm/pl310.c standard - arm/xilinx/zy7_machdep.c standard arm/xilinx/zy7_l2cache.c standard arm/xilinx/zy7_slcr.c standard Modified: projects/powernv/arm/xilinx/std.zynq7 ============================================================================== --- projects/powernv/arm/xilinx/std.zynq7 Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/xilinx/std.zynq7 Mon Nov 23 17:09:35 2015 (r291212) @@ -9,13 +9,6 @@ makeoptions CONF_CFLAGS="-march=armv7a" files "../xilinx/files.zynq7" -# Physical memory starts at 0x00000000. We assume images are loaded at -# 0x00100000, e.g. from u-boot with 'fatload mmc 0 0x100000 kernel.bin' -# -# -options PHYSADDR=0x00000000 -options KERNPHYSADDR=0x00100000 -makeoptions KERNPHYSADDR=0x00100000 options KERNVIRTADDR=0xc0100000 # Used in ldscript.arm makeoptions KERNVIRTADDR=0xc0100000 Modified: projects/powernv/arm/xscale/i80321/files.i80219 ============================================================================== --- projects/powernv/arm/xscale/i80321/files.i80219 Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/xscale/i80321/files.i80219 Mon Nov 23 17:09:35 2015 (r291212) @@ -2,8 +2,6 @@ # # IOP Specific # -arm/arm/bus_space_base.c standard -arm/arm/bus_space_generic.c standard arm/xscale/i80321/i80321.c standard arm/xscale/i80321/i80321_dma.c optional dma arm/xscale/i80321/i80321_mcu.c standard Modified: projects/powernv/arm/xscale/i80321/files.i80321 ============================================================================== --- projects/powernv/arm/xscale/i80321/files.i80321 Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/xscale/i80321/files.i80321 Mon Nov 23 17:09:35 2015 (r291212) @@ -1,6 +1,4 @@ #$FreeBSD$ -arm/arm/bus_space_base.c standard -arm/arm/bus_space_generic.c standard arm/xscale/i80321/i80321.c standard arm/xscale/i80321/i80321_aau.c optional aau arm/xscale/i80321/i80321_dma.c optional dma Modified: projects/powernv/arm/xscale/i8134x/files.i81342 ============================================================================== --- projects/powernv/arm/xscale/i8134x/files.i81342 Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/xscale/i8134x/files.i81342 Mon Nov 23 17:09:35 2015 (r291212) @@ -1,6 +1,5 @@ # $FreeBSD$ arm/arm/bus_space_base.c standard -arm/arm/bus_space_generic.c standard arm/xscale/i80321/i80321_timer.c standard arm/xscale/i80321/i80321_wdog.c optional iopwdog arm/xscale/i8134x/i81342.c standard Modified: projects/powernv/arm/xscale/ixp425/files.ixp425 ============================================================================== --- projects/powernv/arm/xscale/ixp425/files.ixp425 Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/xscale/ixp425/files.ixp425 Mon Nov 23 17:09:35 2015 (r291212) @@ -1,5 +1,4 @@ #$FreeBSD$ -arm/arm/bus_space_generic.c standard arm/xscale/ixp425/ixp425.c standard arm/xscale/ixp425/ixp425_mem.c standard arm/xscale/ixp425/ixp425_space.c standard Modified: projects/powernv/arm/xscale/pxa/files.pxa ============================================================================== --- projects/powernv/arm/xscale/pxa/files.pxa Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm/xscale/pxa/files.pxa Mon Nov 23 17:09:35 2015 (r291212) @@ -1,7 +1,5 @@ # $FreeBSD$ -arm/arm/bus_space_generic.c standard - arm/xscale/pxa/pxa_gpio.c standard arm/xscale/pxa/pxa_icu.c standard arm/xscale/pxa/pxa_machdep.c standard Modified: projects/powernv/arm64/arm64/busdma_bounce.c ============================================================================== --- projects/powernv/arm64/arm64/busdma_bounce.c Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/arm64/arm64/busdma_bounce.c Mon Nov 23 17:09:35 2015 (r291212) @@ -754,6 +754,9 @@ bounce_bus_dmamap_unload(bus_dma_tag_t d { struct bounce_page *bpage; + if (map == NULL) + return; + while ((bpage = STAILQ_FIRST(&map->bpages)) != NULL) { STAILQ_REMOVE_HEAD(&map->bpages, links); free_bounce_page(dmat, bpage); @@ -767,7 +770,7 @@ bounce_bus_dmamap_sync(bus_dma_tag_t dma struct bounce_page *bpage; vm_offset_t datavaddr, tempvaddr; - if ((bpage = STAILQ_FIRST(&map->bpages)) == NULL) + if (map == NULL || (bpage = STAILQ_FIRST(&map->bpages)) == NULL) return; /* @@ -836,12 +839,14 @@ SYSINIT(bpages, SI_SUB_LOCK, SI_ORDER_AN static struct sysctl_ctx_list * busdma_sysctl_tree(struct bounce_zone *bz) { + return (&bz->sysctl_tree); } static struct sysctl_oid * busdma_sysctl_tree_top(struct bounce_zone *bz) { + return (bz->sysctl_tree_top); } Modified: projects/powernv/boot/i386/Makefile ============================================================================== --- projects/powernv/boot/i386/Makefile Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/boot/i386/Makefile Mon Nov 23 17:09:35 2015 (r291212) @@ -2,7 +2,7 @@ .include -SUBDIR= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot kgzldr \ +SUBDIR= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot \ libi386 libfirewire loader # special boot programs, 'self-extracting boot2+loader' Modified: projects/powernv/boot/i386/boot0/Makefile ============================================================================== --- projects/powernv/boot/i386/boot0/Makefile Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/boot/i386/boot0/Makefile Mon Nov 23 17:09:35 2015 (r291212) @@ -80,5 +80,4 @@ LDFLAGS=-e start -Ttext ${BOOT_BOOT0_ORG # XXX: clang integrated-as doesn't grok .codeNN directives yet CFLAGS.boot0.S= ${CLANG_NO_IAS} -CFLAGS.boot0ext.S= ${CLANG_NO_IAS} CFLAGS+= ${CFLAGS.${.IMPSRC:T}} Modified: projects/powernv/boot/uboot/common/main.c ============================================================================== --- projects/powernv/boot/uboot/common/main.c Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/boot/uboot/common/main.c Mon Nov 23 17:09:35 2015 (r291212) @@ -315,7 +315,7 @@ print_disk_probe_info() else strcpy(slice, ""); - if (currdev.d_disk.partition > 0) + if (currdev.d_disk.partition >= 0) sprintf(partition, "%d", currdev.d_disk.partition); else strcpy(partition, ""); @@ -382,7 +382,7 @@ probe_disks(int devidx, int load_type, i printf("\n"); } - printf(" Requested disk type/unit not found\n"); + printf(" Requested disk type/unit/slice/partition not found\n"); return (-1); } @@ -392,7 +392,7 @@ main(void) struct api_signature *sig = NULL; int load_type, load_unit, load_slice, load_partition; int i; - const char * loaderdev; + const char *ldev; /* * If we can't find the magic signature and related info, exit with a @@ -485,10 +485,10 @@ main(void) return (0xbadef1ce); } - env_setenv("currdev", EV_VOLATILE, uboot_fmtdev(&currdev), - uboot_setcurrdev, env_nounset); - env_setenv("loaddev", EV_VOLATILE, uboot_fmtdev(&currdev), - env_noset, env_nounset); + ldev = uboot_fmtdev(&currdev); + env_setenv("currdev", EV_VOLATILE, ldev, uboot_setcurrdev, env_nounset); + env_setenv("loaddev", EV_VOLATILE, ldev, env_noset, env_nounset); + printf("Booting from %s %\n", ldev); setenv("LINES", "24", 1); /* optional */ setenv("prompt", "loader>", 1); Modified: projects/powernv/cam/scsi/scsi_enc.c ============================================================================== --- projects/powernv/cam/scsi/scsi_enc.c Mon Nov 23 17:07:51 2015 (r291211) +++ projects/powernv/cam/scsi/scsi_enc.c Mon Nov 23 17:09:35 2015 (r291212) @@ -407,6 +407,8 @@ enc_ioctl(struct cdev *dev, u_long cmd, *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@freebsd.org Tue Nov 24 01:07:58 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B65B3A358F0 for ; Tue, 24 Nov 2015 01:07:58 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 73A211C43; Tue, 24 Nov 2015 01:07:58 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAO17vAR088888; Tue, 24 Nov 2015 01:07:57 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAO17vp0088887; Tue, 24 Nov 2015 01:07:57 GMT (envelope-from np@FreeBSD.org) Message-Id: <201511240107.tAO17vp0088887@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Tue, 24 Nov 2015 01:07:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r291227 - projects/cxl_iscsi/sys/dev/iscsi X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Nov 2015 01:07:58 -0000 Author: np Date: Tue Nov 24 01:07:57 2015 New Revision: 291227 URL: https://svnweb.freebsd.org/changeset/base/291227 Log: s/is->is_conn/ic to shorten things a bit. Modified: projects/cxl_iscsi/sys/dev/iscsi/iscsi.c Modified: projects/cxl_iscsi/sys/dev/iscsi/iscsi.c ============================================================================== --- projects/cxl_iscsi/sys/dev/iscsi/iscsi.c Tue Nov 24 00:49:29 2015 (r291226) +++ projects/cxl_iscsi/sys/dev/iscsi/iscsi.c Tue Nov 24 01:07:57 2015 (r291227) @@ -1329,6 +1329,7 @@ iscsi_ioctl_daemon_handoff(struct iscsi_ struct iscsi_daemon_handoff *handoff) { struct iscsi_session *is; + struct icl_conn *ic; int error; sx_slock(&sc->sc_lock); @@ -1345,6 +1346,7 @@ iscsi_ioctl_daemon_handoff(struct iscsi_ return (ESRCH); } ISCSI_SESSION_LOCK(is); + ic = is->is_conn; if (is->is_conf.isc_discovery || is->is_terminating) { ISCSI_SESSION_UNLOCK(is); sx_sunlock(&sc->sc_lock); @@ -1374,13 +1376,13 @@ iscsi_ioctl_daemon_handoff(struct iscsi_ is->is_first_burst_length = handoff->idh_first_burst_length; if (handoff->idh_header_digest == ISCSI_DIGEST_CRC32C) - is->is_conn->ic_header_crc32c = true; + ic->ic_header_crc32c = true; else - is->is_conn->ic_header_crc32c = false; + ic->ic_header_crc32c = false; if (handoff->idh_data_digest == ISCSI_DIGEST_CRC32C) - is->is_conn->ic_data_crc32c = true; + ic->ic_data_crc32c = true; else - is->is_conn->ic_data_crc32c = false; + ic->ic_data_crc32c = false; is->is_cmdsn = 0; is->is_expcmdsn = 0; @@ -1399,7 +1401,7 @@ iscsi_ioctl_daemon_handoff(struct iscsi_ /* * Handoff without using ICL proxy. */ - error = icl_conn_handoff(is->is_conn, handoff->idh_socket); + error = icl_conn_handoff(ic, handoff->idh_socket); if (error != 0) { sx_sunlock(&sc->sc_lock); iscsi_session_terminate(is); From owner-svn-src-projects@freebsd.org Tue Nov 24 01:12:18 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DFDE1A35B11 for ; Tue, 24 Nov 2015 01:12:18 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id ADC7F1ECE; Tue, 24 Nov 2015 01:12:18 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAO1CHJp091595; Tue, 24 Nov 2015 01:12:17 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAO1CHRn091594; Tue, 24 Nov 2015 01:12:17 GMT (envelope-from np@FreeBSD.org) Message-Id: <201511240112.tAO1CHRn091594@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Tue, 24 Nov 2015 01:12:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r291228 - projects/cxl_iscsi/sys/dev/iscsi X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Nov 2015 01:12:19 -0000 Author: np Date: Tue Nov 24 01:12:17 2015 New Revision: 291228 URL: https://svnweb.freebsd.org/changeset/base/291228 Log: Do not generate PDUs with payload greater than max_data_segment_length. It is perhaps preferable to have a separate limit for send instead of reusing the receive limit. I'll discuss with trasz@ and mav@ before pulling this into head. Modified: projects/cxl_iscsi/sys/dev/iscsi/iscsi.c Modified: projects/cxl_iscsi/sys/dev/iscsi/iscsi.c ============================================================================== --- projects/cxl_iscsi/sys/dev/iscsi/iscsi.c Tue Nov 24 01:07:57 2015 (r291227) +++ projects/cxl_iscsi/sys/dev/iscsi/iscsi.c Tue Nov 24 01:12:17 2015 (r291228) @@ -1371,7 +1371,8 @@ iscsi_ioctl_daemon_handoff(struct iscsi_ is->is_statsn = handoff->idh_statsn; is->is_initial_r2t = handoff->idh_initial_r2t; is->is_immediate_data = handoff->idh_immediate_data; - is->is_max_data_segment_length = handoff->idh_max_data_segment_length; + is->is_max_data_segment_length = min(ic->ic_max_data_segment_length, + handoff->idh_max_data_segment_length); is->is_max_burst_length = handoff->idh_max_burst_length; is->is_first_burst_length = handoff->idh_first_burst_length; From owner-svn-src-projects@freebsd.org Tue Nov 24 02:01:02 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 605ACA3648D for ; Tue, 24 Nov 2015 02:01:02 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 31E4A127D; Tue, 24 Nov 2015 02:01:02 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAO211Vu005032; Tue, 24 Nov 2015 02:01:01 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAO2115n005030; Tue, 24 Nov 2015 02:01:01 GMT (envelope-from np@FreeBSD.org) Message-Id: <201511240201.tAO2115n005030@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Tue, 24 Nov 2015 02:01:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r291229 - projects/cxl_iscsi/sys/dev/cxgbe/cxgbei X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Nov 2015 02:01:02 -0000 Author: np Date: Tue Nov 24 02:01:01 2015 New Revision: 291229 URL: https://svnweb.freebsd.org/changeset/base/291229 Log: Allow an icl_cxgbei_pdu to be allocated without being associated with an icl_conn right at the time of allocation. Modified: projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei.c projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/icl_cxgbei.c Modified: projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei.c ============================================================================== --- projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei.c Tue Nov 24 01:12:17 2015 (r291228) +++ projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei.c Tue Nov 24 02:01:01 2015 (r291229) @@ -90,9 +90,9 @@ __FBSDID("$FreeBSD$"); #include "cxgbei.h" #include "cxgbei_ulp2_ddp.h" -/* XXX some header instead. */ -struct icl_pdu *icl_cxgbei_conn_new_pdu(struct icl_conn *, int); -void icl_cxgbei_conn_pdu_free(struct icl_conn *, struct icl_pdu *); +/* XXXNP some header instead. */ +struct icl_pdu *icl_cxgbei_new_pdu(int); +void icl_cxgbei_new_pdu_set_conn(struct icl_pdu *, struct icl_conn *); /* * Direct Data Placement - @@ -538,9 +538,10 @@ do_rx_iscsi_hdr(struct sge_iq *iq, const MPASS(icc->icc_signature == CXGBEI_CONN_SIGNATURE); M_ASSERTPKTHDR(m); - ip = icl_cxgbei_conn_new_pdu(&icc->ic, M_NOWAIT); + ip = icl_cxgbei_new_pdu(M_NOWAIT); if (ip == NULL) CXGBE_UNIMPLEMENTED("PDU allocation failure"); + icl_cxgbei_new_pdu_set_conn(ip, &icc->ic); icp = ip_to_icp(ip); bcopy(mtod(m, caddr_t) + sizeof(*cpl), icp->ip.ip_bhs, sizeof(struct iscsi_bhs)); Modified: projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/icl_cxgbei.c ============================================================================== --- projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/icl_cxgbei.c Tue Nov 24 01:12:17 2015 (r291228) +++ projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/icl_cxgbei.c Tue Nov 24 02:01:01 2015 (r291229) @@ -97,6 +97,9 @@ static volatile u_int icl_cxgbei_ncons; #define ICL_CONN_LOCK_ASSERT(X) mtx_assert(X->ic_lock, MA_OWNED) #define ICL_CONN_LOCK_ASSERT_NOT(X) mtx_assert(X->ic_lock, MA_NOTOWNED) +struct icl_pdu *icl_cxgbei_new_pdu(int); +void icl_cxgbei_new_pdu_set_conn(struct icl_pdu *, struct icl_conn *); + static icl_conn_new_pdu_t icl_cxgbei_conn_new_pdu; static icl_conn_pdu_free_t icl_cxgbei_conn_pdu_free; static icl_conn_pdu_data_segment_length_t @@ -138,7 +141,7 @@ DEFINE_CLASS(icl_cxgbei, icl_cxgbei_meth #define CXGBEI_MAX_PDU 16224 #define CXGBEI_MAX_DSL (CXGBEI_MAX_PDU - sizeof(struct iscsi_bhs) - 8) -void +static void icl_cxgbei_conn_pdu_free(struct icl_conn *ic, struct icl_pdu *ip) { #ifdef INVARIANTS @@ -154,15 +157,13 @@ icl_cxgbei_conn_pdu_free(struct icl_conn m_freem(ip->ip_bhs_mbuf); /* storage for icl_cxgbei_pdu itself */ #ifdef DIAGNOSTIC - refcount_release(&ic->ic_outstanding_pdus); + if (ic != NULL) + refcount_release(&ic->ic_outstanding_pdus); #endif } -/* - * Allocate icl_pdu with empty BHS to fill up by the caller. - */ struct icl_pdu * -icl_cxgbei_conn_new_pdu(struct icl_conn *ic, int flags) +icl_cxgbei_new_pdu(int flags) { struct icl_cxgbei_pdu *icp; struct icl_pdu *ip; @@ -170,7 +171,7 @@ icl_cxgbei_conn_new_pdu(struct icl_conn uintptr_t a; m = m_gethdr(flags, MT_DATA); - if (m == NULL) + if (__predict_false(m == NULL)) return (NULL); a = roundup2(mtod(m, uintptr_t), _Alignof(struct icl_cxgbei_pdu)); @@ -179,7 +180,6 @@ icl_cxgbei_conn_new_pdu(struct icl_conn icp->icp_signature = CXGBEI_PDU_SIGNATURE; ip = &icp->ip; - ip->ip_conn = ic; ip->ip_bhs_mbuf = m; a = roundup2((uintptr_t)(icp + 1), _Alignof(struct iscsi_bhs *)); @@ -195,10 +195,32 @@ icl_cxgbei_conn_new_pdu(struct icl_conn m->m_len = sizeof(struct iscsi_bhs); m->m_pkthdr.len = m->m_len; + return (ip); +} + +void +icl_cxgbei_new_pdu_set_conn(struct icl_pdu *ip, struct icl_conn *ic) +{ + ip->ip_conn = ic; #ifdef DIAGNOSTIC refcount_acquire(&ic->ic_outstanding_pdus); #endif +} + +/* + * Allocate icl_pdu with empty BHS to fill up by the caller. + */ +static struct icl_pdu * +icl_cxgbei_conn_new_pdu(struct icl_conn *ic, int flags) +{ + struct icl_pdu *ip; + + ip = icl_cxgbei_new_pdu(flags); + if (__predict_false(ip == NULL)) + return (NULL); + icl_cxgbei_new_pdu_set_conn(ip, ic); + return (ip); } From owner-svn-src-projects@freebsd.org Tue Nov 24 02:37:18 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 77B89A369D7 for ; Tue, 24 Nov 2015 02:37:18 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3ABCA131F; Tue, 24 Nov 2015 02:37:18 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAO2bHJD016101; Tue, 24 Nov 2015 02:37:17 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAO2bHZG016097; Tue, 24 Nov 2015 02:37:17 GMT (envelope-from np@FreeBSD.org) Message-Id: <201511240237.tAO2bHZG016097@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Tue, 24 Nov 2015 02:37:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r291232 - in projects/cxl_iscsi/sys/dev/cxgbe: cxgbei tom X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Nov 2015 02:37:18 -0000 Author: np Date: Tue Nov 24 02:37:16 2015 New Revision: 291232 URL: https://svnweb.freebsd.org/changeset/base/291232 Log: cxgbe/cxgbei: Various changes in the rx path. - In the iSCSI CPL handlers, do not rely on the ulpcb/icl_conn when in the middle of assembling a PDU. This is so we don't have to grab various locks and evaluate the kernel state of the connection multiple times. Instead, the state is evaluated once after the entire PDU is received. This requires another ULP specific item in toepcb (ulpcb2). - If there is data in the so_rcv sockbuf of a connection in iSCSI ULP mode it must be from before the connection got promoted to ULP mode. Convert the contents of the sockbuf to PDUs and deliver them to ICL. Do this before delivering the PDUs received on the "normal" ULP path. - The receive path within ICL is allowed to sleep so it's not appropriate to deliver PDUs to ICL from the driver's ithread, or from any other thread with any mutex held. Use worker threads (created back in r285650 but unused till now) to dispatch received PDUs to ICL. Assign a worker thread to each connection. For now everything goes to the first thread. - Prevent various bad races that are possible when more than one of a) rx ithread, b) worker thread, and c) icl_conn_close are active at the same time. Modified: projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei.c projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei.h projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/icl_cxgbei.c projects/cxl_iscsi/sys/dev/cxgbe/tom/t4_tom.h Modified: projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei.c ============================================================================== --- projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei.c Tue Nov 24 02:30:59 2015 (r291231) +++ projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei.c Tue Nov 24 02:37:16 2015 (r291232) @@ -93,6 +93,7 @@ __FBSDID("$FreeBSD$"); /* XXXNP some header instead. */ struct icl_pdu *icl_cxgbei_new_pdu(int); void icl_cxgbei_new_pdu_set_conn(struct icl_pdu *, struct icl_conn *); +void icl_cxgbei_conn_pdu_free(struct icl_conn *, struct icl_pdu *); /* * Direct Data Placement - @@ -530,27 +531,23 @@ do_rx_iscsi_hdr(struct sge_iq *iq, const struct cpl_iscsi_hdr *cpl = mtod(m, struct cpl_iscsi_hdr *); u_int tid = GET_TID(cpl); struct toepcb *toep = lookup_tid(sc, tid); - struct icl_cxgbei_conn *icc = toep->ulpcb; struct icl_pdu *ip; struct icl_cxgbei_pdu *icp; - MPASS(icc != NULL); - MPASS(icc->icc_signature == CXGBEI_CONN_SIGNATURE); M_ASSERTPKTHDR(m); ip = icl_cxgbei_new_pdu(M_NOWAIT); if (ip == NULL) CXGBE_UNIMPLEMENTED("PDU allocation failure"); - icl_cxgbei_new_pdu_set_conn(ip, &icc->ic); icp = ip_to_icp(ip); bcopy(mtod(m, caddr_t) + sizeof(*cpl), icp->ip.ip_bhs, sizeof(struct iscsi_bhs)); + icp->pdu_seq = ntohl(cpl->seq); icp->pdu_flags = SBUF_ULP_FLAG_HDR_RCVD; /* This is the start of a new PDU. There should be no old state. */ - MPASS(icc->icp == NULL); - icc->icp = icp; - icc->pdu_seq = ntohl(cpl->seq); + MPASS(toep->ulpcb2 == NULL); + toep->ulpcb2 = icp; #if 0 CTR4(KTR_CXGBE, "%s: tid %u, cpl->len hlen %u, m->m_len hlen %u", @@ -568,11 +565,8 @@ do_rx_iscsi_data(struct sge_iq *iq, cons struct cpl_iscsi_data *cpl = mtod(m, struct cpl_iscsi_data *); u_int tid = GET_TID(cpl); struct toepcb *toep = lookup_tid(sc, tid); - struct icl_cxgbei_conn *icc = toep->ulpcb; - struct icl_cxgbei_pdu *icp = icc->icp; + struct icl_cxgbei_pdu *icp = toep->ulpcb2; - MPASS(icc != NULL); - MPASS(icc->icc_signature == CXGBEI_CONN_SIGNATURE); M_ASSERTPKTHDR(m); /* Must already have received the header (but not the data). */ @@ -603,29 +597,49 @@ do_rx_iscsi_ddp(struct sge_iq *iq, const u_int tid = GET_TID(cpl); struct toepcb *toep = lookup_tid(sc, tid); struct inpcb *inp = toep->inp; + struct socket *so; + struct sockbuf *sb; struct tcpcb *tp; - struct icl_cxgbei_conn *icc = toep->ulpcb; - struct icl_conn *ic = &icc->ic; - struct icl_cxgbei_pdu *icp = icc->icp; + struct icl_cxgbei_conn *icc; + struct icl_conn *ic; + struct icl_cxgbei_pdu *icp = toep->ulpcb2; + struct icl_pdu *ip; u_int pdu_len, val; - MPASS(icc != NULL); - MPASS(icc->icc_signature == CXGBEI_CONN_SIGNATURE); MPASS(m == NULL); /* Must already be assembling a PDU. */ MPASS(icp != NULL); MPASS(icp->pdu_flags & SBUF_ULP_FLAG_HDR_RCVD); /* Data is optional. */ - + ip = &icp->ip; icp->pdu_flags |= SBUF_ULP_FLAG_STATUS_RCVD; - + val = ntohl(cpl->ddpvld); + if (val & F_DDP_PADDING_ERR) + icp->pdu_flags |= SBUF_ULP_FLAG_PAD_ERROR; + if (val & F_DDP_HDRCRC_ERR) + icp->pdu_flags |= SBUF_ULP_FLAG_HCRC_ERROR; + if (val & F_DDP_DATACRC_ERR) + icp->pdu_flags |= SBUF_ULP_FLAG_DCRC_ERROR; + if (ip->ip_data_mbuf == NULL) { + /* XXXNP: what should ip->ip_data_len be, and why? */ + icp->pdu_flags |= SBUF_ULP_FLAG_DATA_DDPED; + } pdu_len = ntohs(cpl->len); /* includes everything. */ INP_WLOCK(inp); - /* XXXNP: check inp for dropped etc., and toep for abort in progress. */ + if (__predict_false(inp->inp_flags & (INP_DROPPED | INP_TIMEWAIT))) { + CTR4(KTR_CXGBE, "%s: tid %u, rx (%d bytes), inp_flags 0x%x", + __func__, tid, pdu_len, inp->inp_flags); + INP_WUNLOCK(inp); + icl_cxgbei_conn_pdu_free(NULL, ip); +#ifdef INVARIANTS + toep->ulpcb2 = NULL; +#endif + return (0); + } tp = intotcpcb(inp); - MPASS(icc->pdu_seq == tp->rcv_nxt); + MPASS(icp->pdu_seq == tp->rcv_nxt); MPASS(tp->rcv_wnd >= pdu_len); tp->rcv_nxt += pdu_len; tp->rcv_wnd -= pdu_len; @@ -634,25 +648,93 @@ do_rx_iscsi_ddp(struct sge_iq *iq, const /* update rx credits */ toep->rx_credits += pdu_len; t4_rcvd(&toep->td->tod, tp); /* XXX: sc->tom_softc.tod */ - INP_WUNLOCK(inp); - val = ntohl(cpl->ddpvld); - if (val & F_DDP_PADDING_ERR) - icp->pdu_flags |= SBUF_ULP_FLAG_PAD_ERROR; - if (val & F_DDP_HDRCRC_ERR) - icp->pdu_flags |= SBUF_ULP_FLAG_HCRC_ERROR; - if (val & F_DDP_DATACRC_ERR) - icp->pdu_flags |= SBUF_ULP_FLAG_DCRC_ERROR; - if (icp->ip.ip_data_mbuf == NULL) - icp->pdu_flags |= SBUF_ULP_FLAG_DATA_DDPED; + so = inp->inp_socket; + sb = &so->so_rcv; + SOCKBUF_LOCK(sb); + + icc = toep->ulpcb; + if (__predict_false(icc == NULL || sb->sb_state & SBS_CANTRCVMORE)) { + CTR5(KTR_CXGBE, + "%s: tid %u, excess rx (%d bytes), icc %p, sb_state 0x%x", + __func__, tid, pdu_len, icc, sb->sb_state); + SOCKBUF_UNLOCK(sb); + INP_WUNLOCK(inp); + + INP_INFO_RLOCK(&V_tcbinfo); + INP_WLOCK(inp); + tp = tcp_drop(tp, ECONNRESET); + if (tp) + INP_WUNLOCK(inp); + INP_INFO_RUNLOCK(&V_tcbinfo); + + icl_cxgbei_conn_pdu_free(NULL, ip); +#ifdef INVARIANTS + toep->ulpcb2 = NULL; +#endif + return (0); + } + MPASS(icc->icc_signature == CXGBEI_CONN_SIGNATURE); + ic = &icc->ic; + icl_cxgbei_new_pdu_set_conn(ip, ic); + + MPASS(m == NULL); /* was unused, we'll use it now. */ + m = sbcut_locked(sb, sbused(sb)); /* XXXNP: toep->sb_cc accounting? */ + if (__predict_false(m != NULL)) { + int len = m_length(m, NULL); + + /* + * PDUs were received before the tid transitioned to ULP mode. + * Convert them to icl_cxgbei_pdus and send them to ICL before + * the PDU in icp/ip. + */ + CTR3(KTR_CXGBE, "%s: tid %u, %u bytes in so_rcv", __func__, tid, + len); + + /* XXXNP: needs to be rewritten. */ + if (len == sizeof(struct iscsi_bhs) || len == 4 + sizeof(struct + iscsi_bhs)) { + struct icl_cxgbei_pdu *icp0; + struct icl_pdu *ip0; + + ip0 = icl_cxgbei_new_pdu(M_NOWAIT); + icl_cxgbei_new_pdu_set_conn(ip0, ic); + if (ip0 == NULL) + CXGBE_UNIMPLEMENTED("PDU allocation failure"); + icp0 = ip_to_icp(ip0); + icp0->pdu_seq = 0; /* XXX */ + icp0->pdu_flags = SBUF_ULP_FLAG_HDR_RCVD | + SBUF_ULP_FLAG_STATUS_RCVD; + m_copydata(m, 0, sizeof(struct iscsi_bhs), (void *)ip0->ip_bhs); + STAILQ_INSERT_TAIL(&icc->rcvd_pdus, ip0, ip_next); + } + m_freem(m); + } #if 0 CTR4(KTR_CXGBE, "%s: tid %u, pdu_len %u, pdu_flags 0x%x", __func__, tid, pdu_len, icp->pdu_flags); #endif - icc->icp = NULL; - ic->ic_receive(&icp->ip); + STAILQ_INSERT_TAIL(&icc->rcvd_pdus, ip, ip_next); + if ((icc->rx_flags & RXF_ACTIVE) == 0) { + struct cxgbei_worker_thread_softc *cwt = icc->cwt; + + mtx_lock(&cwt->cwt_lock); + icc->rx_flags |= RXF_ACTIVE; + TAILQ_INSERT_TAIL(&cwt->rx_head, icc, rx_link); + if (cwt->cwt_state == CWT_SLEEPING) { + cwt->cwt_state = CWT_RUNNING; + cv_signal(&cwt->cwt_cv); + } + mtx_unlock(&cwt->cwt_lock); + } + SOCKBUF_UNLOCK(sb); + INP_WUNLOCK(inp); + +#ifdef INVARIANTS + toep->ulpcb2 = NULL; +#endif return (0); } @@ -802,19 +884,7 @@ static struct uld_info cxgbei_uld_info = .deactivate = cxgbei_deactivate, }; -enum { - CWT_RUNNING = 1, - CWT_STOP = 2, - CWT_STOPPED = 3, -}; - -struct cxgbei_worker_thread_softc { - struct mtx cwt_lock; - struct cv cwt_cv; - volatile int cwt_state; -} __aligned(CACHE_LINE_SIZE); - -int worker_thread_count; +static int worker_thread_count; static struct cxgbei_worker_thread_softc *cwt_softc; static struct proc *cxgbei_proc; @@ -822,6 +892,11 @@ static void cwt_main(void *arg) { struct cxgbei_worker_thread_softc *cwt = arg; + struct icl_cxgbei_conn *icc = NULL; + struct icl_conn *ic; + struct icl_pdu *ip; + struct sockbuf *sb; + STAILQ_HEAD(, icl_pdu) rx_pdus = STAILQ_HEAD_INITIALIZER(rx_pdus); MPASS(cwt != NULL); @@ -829,12 +904,61 @@ cwt_main(void *arg) MPASS(cwt->cwt_state == 0); cwt->cwt_state = CWT_RUNNING; cv_signal(&cwt->cwt_cv); - for (;;) { - cv_wait(&cwt->cwt_cv, &cwt->cwt_lock); - if (cwt->cwt_state == CWT_STOP) + + while (__predict_true(cwt->cwt_state != CWT_STOP)) { + cwt->cwt_state = CWT_RUNNING; + while ((icc = TAILQ_FIRST(&cwt->rx_head)) != NULL) { + TAILQ_REMOVE(&cwt->rx_head, icc, rx_link); + mtx_unlock(&cwt->cwt_lock); + + ic = &icc->ic; + sb = &ic->ic_socket->so_rcv; + + SOCKBUF_LOCK(sb); + MPASS(icc->rx_flags & RXF_ACTIVE); + if (__predict_true(!(sb->sb_state & SBS_CANTRCVMORE))) { + MPASS(STAILQ_EMPTY(&rx_pdus)); + STAILQ_SWAP(&icc->rcvd_pdus, &rx_pdus, icl_pdu); + SOCKBUF_UNLOCK(sb); + + /* Hand over PDUs to ICL. */ + while ((ip = STAILQ_FIRST(&rx_pdus)) != NULL) { + STAILQ_REMOVE_HEAD(&rx_pdus, ip_next); + ic->ic_receive(ip); + } + + SOCKBUF_LOCK(sb); + MPASS(STAILQ_EMPTY(&rx_pdus)); + } + MPASS(icc->rx_flags & RXF_ACTIVE); + if (STAILQ_EMPTY(&icc->rcvd_pdus) || + __predict_false(sb->sb_state & SBS_CANTRCVMORE)) { + icc->rx_flags &= ~RXF_ACTIVE; + } else { + /* + * More PDUs were received while we were busy + * handing over the previous batch to ICL. + * Re-add this connection to the end of the + * queue. + */ + mtx_lock(&cwt->cwt_lock); + TAILQ_INSERT_TAIL(&cwt->rx_head, icc, + rx_link); + mtx_unlock(&cwt->cwt_lock); + } + SOCKBUF_UNLOCK(sb); + + mtx_lock(&cwt->cwt_lock); + } + + /* Inner loop doesn't check for CWT_STOP, do that first. */ + if (__predict_false(cwt->cwt_state == CWT_STOP)) break; + cwt->cwt_state = CWT_SLEEPING; + cv_wait(&cwt->cwt_cv, &cwt->cwt_lock); } + MPASS(TAILQ_FIRST(&cwt->rx_head) == NULL); mtx_assert(&cwt->cwt_lock, MA_OWNED); cwt->cwt_state = CWT_STOPPED; cv_signal(&cwt->cwt_cv); @@ -856,6 +980,7 @@ start_worker_threads(void) for (i = 0, cwt = &cwt_softc[0]; i < worker_thread_count; i++, cwt++) { mtx_init(&cwt->cwt_lock, "cwt lock", NULL, MTX_DEF); cv_init(&cwt->cwt_cv, "cwt cv"); + TAILQ_INIT(&cwt->rx_head); rc = kproc_kthread_add(cwt_main, cwt, &cxgbei_proc, NULL, 0, 0, "cxgbei", "%d", i); if (rc != 0) { @@ -879,7 +1004,7 @@ start_worker_threads(void) /* Wait for thread to start before moving on to the next one. */ mtx_lock(&cwt->cwt_lock); - while (cwt->cwt_state != CWT_RUNNING) + while (cwt->cwt_state == 0) cv_wait(&cwt->cwt_cv, &cwt->cwt_lock); mtx_unlock(&cwt->cwt_lock); } @@ -899,7 +1024,8 @@ stop_worker_threads(void) for (i = 0, cwt = &cwt_softc[0]; i < worker_thread_count; i++, cwt++) { mtx_lock(&cwt->cwt_lock); - MPASS(cwt->cwt_state == CWT_RUNNING); + MPASS(cwt->cwt_state == CWT_RUNNING || + cwt->cwt_state == CWT_SLEEPING); cwt->cwt_state = CWT_STOP; cv_signal(&cwt->cwt_cv); do { Modified: projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei.h ============================================================================== --- projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei.h Tue Nov 24 02:30:59 2015 (r291231) +++ projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei.h Tue Nov 24 02:37:16 2015 (r291232) @@ -29,8 +29,27 @@ #include +enum { + CWT_SLEEPING = 1, + CWT_RUNNING = 2, + CWT_STOP = 3, + CWT_STOPPED = 4, +}; + +struct cxgbei_worker_thread_softc { + struct mtx cwt_lock; + struct cv cwt_cv; + volatile int cwt_state; + + TAILQ_HEAD(, icl_cxgbei_conn) rx_head; +} __aligned(CACHE_LINE_SIZE); + #define CXGBEI_CONN_SIGNATURE 0x56788765 +enum { + RXF_ACTIVE = 1 << 0, /* In the worker thread's queue */ +}; + struct icl_cxgbei_conn { struct icl_conn ic; @@ -40,10 +59,11 @@ struct icl_cxgbei_conn { struct adapter *sc; struct toepcb *toep; - /* PDU currently being assembled. */ - /* XXXNP: maybe just use ic->ic_receive_pdu instead? */ - struct icl_cxgbei_pdu *icp; - uint32_t pdu_seq; /* For debug only */ + /* Receive related. */ + u_int rx_flags; /* protected by so_rcv lock */ + STAILQ_HEAD(, icl_pdu) rcvd_pdus; /* protected by so_rcv lock */ + TAILQ_ENTRY(icl_cxgbei_conn) rx_link; /* protected by cwt lock */ + struct cxgbei_worker_thread_softc *cwt; }; static inline struct icl_cxgbei_conn * @@ -60,6 +80,7 @@ struct icl_cxgbei_pdu { /* cxgbei specific stuff goes here. */ uint32_t icp_signature; + uint32_t pdu_seq; /* For debug only */ u_int pdu_flags; }; Modified: projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/icl_cxgbei.c ============================================================================== --- projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/icl_cxgbei.c Tue Nov 24 02:30:59 2015 (r291231) +++ projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/icl_cxgbei.c Tue Nov 24 02:37:16 2015 (r291232) @@ -101,7 +101,7 @@ struct icl_pdu *icl_cxgbei_new_pdu(int); void icl_cxgbei_new_pdu_set_conn(struct icl_pdu *, struct icl_conn *); static icl_conn_new_pdu_t icl_cxgbei_conn_new_pdu; -static icl_conn_pdu_free_t icl_cxgbei_conn_pdu_free; +icl_conn_pdu_free_t icl_cxgbei_conn_pdu_free; static icl_conn_pdu_data_segment_length_t icl_cxgbei_conn_pdu_data_segment_length; static icl_conn_pdu_append_data_t icl_cxgbei_conn_pdu_append_data; @@ -141,7 +141,7 @@ DEFINE_CLASS(icl_cxgbei, icl_cxgbei_meth #define CXGBEI_MAX_PDU 16224 #define CXGBEI_MAX_DSL (CXGBEI_MAX_PDU - sizeof(struct iscsi_bhs) - 8) -static void +void icl_cxgbei_conn_pdu_free(struct icl_conn *ic, struct icl_pdu *ip) { #ifdef INVARIANTS @@ -157,7 +157,7 @@ icl_cxgbei_conn_pdu_free(struct icl_conn m_freem(ip->ip_bhs_mbuf); /* storage for icl_cxgbei_pdu itself */ #ifdef DIAGNOSTIC - if (ic != NULL) + if (__predict_true(ic != NULL)) refcount_release(&ic->ic_outstanding_pdus); #endif } @@ -417,6 +417,7 @@ icl_cxgbei_new_conn(const char *name, st icc = (struct icl_cxgbei_conn *)kobj_create(&icl_cxgbei_class, M_CXGBE, M_WAITOK | M_ZERO); icc->icc_signature = CXGBEI_CONN_SIGNATURE; + STAILQ_INIT(&icc->rcvd_pdus); ic = &icc->ic; ic->ic_lock = lock; @@ -560,6 +561,9 @@ set_ulp_mode_iscsi(struct adapter *sc, s t4_set_tcb_field(sc, toep, 1, 0, 0xfff, val); } +/* XXXNP */ +extern struct cxgbei_worker_thread_softc *cwt_softc; + /* * XXXNP: Who is responsible for cleaning up the socket if this returns with an * error? Review all error paths. @@ -641,6 +645,7 @@ icl_cxgbei_conn_handoff(struct icl_conn toep = tp->t_toe; icc->toep = toep; + icc->cwt = &cwt_softc[0]; /* XXXNP */ icc->ulp_submode = 0; if (ic->ic_header_crc32c) icc->ulp_submode |= ULP_CRC_HEADER; @@ -663,25 +668,25 @@ void icl_cxgbei_conn_close(struct icl_conn *ic) { struct icl_cxgbei_conn *icc = ic_to_icc(ic); + struct icl_pdu *ip; struct socket *so; + struct sockbuf *sb; + struct inpcb *inp; struct toepcb *toep = icc->toep; MPASS(icc->icc_signature == CXGBEI_CONN_SIGNATURE); ICL_CONN_LOCK_ASSERT_NOT(ic); - CTR3(KTR_CXGBE, "%s: tid %u, icc %p", __func__, toep->tid, icc); - ICL_CONN_LOCK(ic); so = ic->ic_socket; - if (so == NULL) { + if (ic->ic_disconnecting || so == NULL) { + CTR4(KTR_CXGBE, "%s: icc %p (disconnecting = %d), so %p", + __func__, icc, ic->ic_disconnecting, so); ICL_CONN_UNLOCK(ic); return; } - ic->ic_socket = NULL; ic->ic_disconnecting = true; - mbufq_drain(&toep->ulp_pduq); - /* These are unused in this driver right now. */ MPASS(STAILQ_EMPTY(&ic->ic_to_send)); MPASS(ic->ic_receive_pdu == NULL); @@ -693,6 +698,41 @@ icl_cxgbei_conn_close(struct icl_conn *i #endif ICL_CONN_UNLOCK(ic); + CTR3(KTR_CXGBE, "%s: tid %d, icc %p", __func__, toep ? toep->tid : -1, + icc); + inp = sotoinpcb(so); + sb = &so->so_rcv; + INP_WLOCK(inp); + if (toep != NULL) { /* NULL if connection was never offloaded. */ + toep->ulpcb = NULL; + mbufq_drain(&toep->ulp_pduq); + SOCKBUF_LOCK(sb); + if (icc->rx_flags & RXF_ACTIVE) { + volatile u_int *p = &icc->rx_flags; + + SOCKBUF_UNLOCK(sb); + INP_WUNLOCK(inp); + + while (*p & RXF_ACTIVE) + pause("conclo", 1); + + INP_WLOCK(inp); + SOCKBUF_LOCK(sb); + } + + while (!STAILQ_EMPTY(&icc->rcvd_pdus)) { + ip = STAILQ_FIRST(&icc->rcvd_pdus); + STAILQ_REMOVE_HEAD(&icc->rcvd_pdus, ip_next); + icl_cxgbei_conn_pdu_free(ic, ip); + } + SOCKBUF_UNLOCK(sb); + } + INP_WUNLOCK(inp); + + ICL_CONN_LOCK(ic); + ic->ic_socket = NULL; + ICL_CONN_UNLOCK(ic); + /* * XXXNP: we should send RST instead of FIN when PDUs held in various * queues were purged instead of delivered reliably but soabort isn't Modified: projects/cxl_iscsi/sys/dev/cxgbe/tom/t4_tom.h ============================================================================== --- projects/cxl_iscsi/sys/dev/cxgbe/tom/t4_tom.h Tue Nov 24 02:30:59 2015 (r291231) +++ projects/cxl_iscsi/sys/dev/cxgbe/tom/t4_tom.h Tue Nov 24 02:37:16 2015 (r291232) @@ -116,6 +116,7 @@ struct toepcb { u_int ulp_mode; /* ULP mode */ void *ulpcb; + void *ulpcb2; struct mbufq ulp_pduq; /* PDUs waiting to be sent out. */ struct mbufq ulp_pdu_reclaimq; From owner-svn-src-projects@freebsd.org Thu Nov 26 02:16:37 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7A04CA3656F for ; Thu, 26 Nov 2015 02:16:37 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EE88B19C1; Thu, 26 Nov 2015 02:16:36 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAQ2GaIn020173; Thu, 26 Nov 2015 02:16:36 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAQ2GQ3A020073; Thu, 26 Nov 2015 02:16:26 GMT (envelope-from np@FreeBSD.org) Message-Id: <201511260216.tAQ2GQ3A020073@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Thu, 26 Nov 2015 02:16:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r291354 - in projects/cxl_iscsi: . bin/rmail bin/sh cddl/lib/libavl cddl/lib/libctf cddl/lib/libdtrace cddl/lib/libnvpair cddl/lib/libumem cddl/lib/libuutil cddl/lib/libzfs cddl/lib/lib... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Nov 2015 02:16:37 -0000 Author: np Date: Thu Nov 26 02:16:25 2015 New Revision: 291354 URL: https://svnweb.freebsd.org/changeset/base/291354 Log: Catch up with head. Added: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/dtrace.test.mk - copied unchanged from r291335, head/cddl/usr.sbin/dtrace/tests/dtrace.test.mk projects/cxl_iscsi/share/ctypedef/Makefile.depend - copied unchanged from r291328, head/share/ctypedef/Makefile.depend projects/cxl_iscsi/share/dtrace/retval - copied unchanged from r291353, head/share/dtrace/retval projects/cxl_iscsi/share/monetdef/Makefile.depend - copied unchanged from r291328, head/share/monetdef/Makefile.depend projects/cxl_iscsi/share/msgdef/Makefile.depend - copied unchanged from r291328, head/share/msgdef/Makefile.depend projects/cxl_iscsi/share/numericdef/Makefile.depend - copied unchanged from r291328, head/share/numericdef/Makefile.depend projects/cxl_iscsi/share/timedef/Makefile.depend - copied unchanged from r291328, head/share/timedef/Makefile.depend projects/cxl_iscsi/sys/dev/ath/if_ath_descdma.c - copied unchanged from r291236, head/sys/dev/ath/if_ath_descdma.c projects/cxl_iscsi/sys/dev/ath/if_ath_descdma.h - copied unchanged from r291236, head/sys/dev/ath/if_ath_descdma.h projects/cxl_iscsi/sys/dev/ath/if_ath_ioctl.c - copied unchanged from r291236, head/sys/dev/ath/if_ath_ioctl.c projects/cxl_iscsi/sys/dev/ath/if_ath_ioctl.h - copied unchanged from r291236, head/sys/dev/ath/if_ath_ioctl.h projects/cxl_iscsi/sys/modules/if_enc/ - copied from r291328, head/sys/modules/if_enc/ projects/cxl_iscsi/tools/tools/indent_wrapper/ - copied from r291328, head/tools/tools/indent_wrapper/ - copied from r291236, head/usr.bin/colldef/ projects/cxl_iscsi/usr.bin/cxxfilt/Makefile.depend - copied unchanged from r291328, head/usr.bin/cxxfilt/Makefile.depend projects/cxl_iscsi/usr.bin/localedef/Makefile.depend - copied unchanged from r291328, head/usr.bin/localedef/Makefile.depend - copied from r291236, head/usr.bin/mklocale/ projects/cxl_iscsi/usr.sbin/bsdconfig/includes/includes.sh - copied unchanged from r291236, head/usr.sbin/bsdconfig/includes/includes.sh Directory Properties: projects/cxl_iscsi/usr.bin/colldef/ (props changed) projects/cxl_iscsi/usr.bin/mklocale/ (props changed) Deleted: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/Makefile.inc1 projects/cxl_iscsi/lib/libmd/Makefile.depend.host projects/cxl_iscsi/sys/boot/i386/boot0/boot0ext.S projects/cxl_iscsi/sys/boot/i386/boot0ext/ projects/cxl_iscsi/sys/modules/ispfw/isp_1040_it/ projects/cxl_iscsi/sys/modules/ispfw/isp_1080_it/ projects/cxl_iscsi/sys/modules/ispfw/isp_12160_it/ projects/cxl_iscsi/tools/build/options/WITH_OPENSSH_NONE_CIPHER projects/cxl_iscsi/usr.bin/xinstall/Makefile.depend.host projects/cxl_iscsi/usr.sbin/bsdconfig/includes/includes Modified: projects/cxl_iscsi/ObsoleteFiles.inc projects/cxl_iscsi/bin/rmail/Makefile projects/cxl_iscsi/bin/rmail/Makefile.depend projects/cxl_iscsi/bin/sh/mknodes.c projects/cxl_iscsi/bin/sh/nodes.c.pat projects/cxl_iscsi/cddl/lib/libavl/Makefile.depend projects/cxl_iscsi/cddl/lib/libctf/Makefile.depend projects/cxl_iscsi/cddl/lib/libdtrace/Makefile.depend projects/cxl_iscsi/cddl/lib/libnvpair/Makefile.depend projects/cxl_iscsi/cddl/lib/libumem/Makefile.depend projects/cxl_iscsi/cddl/lib/libuutil/Makefile.depend projects/cxl_iscsi/cddl/lib/libzfs/Makefile.depend projects/cxl_iscsi/cddl/lib/libzfs_core/Makefile.depend projects/cxl_iscsi/cddl/lib/libzpool/Makefile.depend projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/begin/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/cg/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/decls/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/drops/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/end/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/enum/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/error/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/exit/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/include/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/inline/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/io/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/ip/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/json/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/mib/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/misc/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/operators/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/pid/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/print/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/printa/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/printf/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/privs/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/probes/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/proc/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/providers/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/raise/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/rates/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/safety/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/sched/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/stability/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/stack/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/stop/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/struct/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/trace/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/translators/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/types/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/union/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/vars/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/version/Makefile projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh projects/cxl_iscsi/contrib/bmake/parse.c projects/cxl_iscsi/contrib/sendmail/include/sm/conf.h projects/cxl_iscsi/contrib/wpa/src/drivers/driver_bsd.c projects/cxl_iscsi/contrib/xz/ChangeLog projects/cxl_iscsi/contrib/xz/THANKS projects/cxl_iscsi/contrib/xz/src/common/tuklib_physmem.c projects/cxl_iscsi/contrib/xz/src/liblzma/api/lzma.h projects/cxl_iscsi/contrib/xz/src/liblzma/api/lzma/version.h projects/cxl_iscsi/contrib/xz/src/liblzma/common/index.c projects/cxl_iscsi/contrib/xz/src/liblzma/lz/lz_encoder.c projects/cxl_iscsi/contrib/xz/src/liblzma/lzma/lzma_encoder.c projects/cxl_iscsi/contrib/xz/src/xz/args.h projects/cxl_iscsi/contrib/xz/src/xz/file_io.c projects/cxl_iscsi/contrib/xz/src/xz/main.c projects/cxl_iscsi/contrib/xz/src/xz/message.c projects/cxl_iscsi/contrib/xz/src/xz/options.c projects/cxl_iscsi/contrib/xz/src/xz/xz.1 projects/cxl_iscsi/crypto/openssh/README.hpn projects/cxl_iscsi/crypto/openssh/cipher.c projects/cxl_iscsi/crypto/openssh/kex.c projects/cxl_iscsi/crypto/openssh/kex.h projects/cxl_iscsi/crypto/openssh/myproposal.h projects/cxl_iscsi/crypto/openssh/openbsd-compat/bsd-misc.h projects/cxl_iscsi/crypto/openssh/packet.c projects/cxl_iscsi/crypto/openssh/packet.h projects/cxl_iscsi/crypto/openssh/pathnames.h projects/cxl_iscsi/crypto/openssh/readconf.c projects/cxl_iscsi/crypto/openssh/readconf.h projects/cxl_iscsi/crypto/openssh/servconf.c projects/cxl_iscsi/crypto/openssh/servconf.h projects/cxl_iscsi/crypto/openssh/ssh.c projects/cxl_iscsi/crypto/openssh/sshconnect2.c projects/cxl_iscsi/crypto/openssh/sshd.c projects/cxl_iscsi/crypto/openssh/sshd_config projects/cxl_iscsi/gnu/lib/libdialog/Makefile.depend projects/cxl_iscsi/gnu/lib/libgcc/Makefile.depend projects/cxl_iscsi/gnu/lib/libgomp/Makefile.depend projects/cxl_iscsi/gnu/lib/libreadline/readline/Makefile projects/cxl_iscsi/gnu/lib/libregex/Makefile.depend projects/cxl_iscsi/gnu/lib/libstdc++/Makefile projects/cxl_iscsi/gnu/lib/libstdc++/Makefile.depend projects/cxl_iscsi/gnu/lib/libsupc++/Makefile projects/cxl_iscsi/gnu/lib/libsupc++/Makefile.depend projects/cxl_iscsi/gnu/usr.bin/binutils/ld/Makefile projects/cxl_iscsi/gnu/usr.bin/cc/cc1/Makefile projects/cxl_iscsi/gnu/usr.bin/cc/cc1plus/Makefile projects/cxl_iscsi/gnu/usr.bin/cc/cc_tools/Makefile projects/cxl_iscsi/include/Makefile projects/cxl_iscsi/include/mk-osreldate.sh projects/cxl_iscsi/kerberos5/lib/libasn1/Makefile.depend projects/cxl_iscsi/kerberos5/lib/libgssapi_krb5/Makefile.depend projects/cxl_iscsi/kerberos5/lib/libgssapi_ntlm/Makefile.depend projects/cxl_iscsi/kerberos5/lib/libgssapi_spnego/Makefile.depend projects/cxl_iscsi/kerberos5/lib/libhdb/Makefile.depend projects/cxl_iscsi/kerberos5/lib/libheimbase/Makefile.depend projects/cxl_iscsi/kerberos5/lib/libheimipcc/Makefile.depend projects/cxl_iscsi/kerberos5/lib/libheimipcs/Makefile.depend projects/cxl_iscsi/kerberos5/lib/libheimntlm/Makefile.depend projects/cxl_iscsi/kerberos5/lib/libhx509/Makefile.depend projects/cxl_iscsi/kerberos5/lib/libkadm5clnt/Makefile.depend projects/cxl_iscsi/kerberos5/lib/libkadm5srv/Makefile.depend projects/cxl_iscsi/kerberos5/lib/libkafs5/Makefile.depend projects/cxl_iscsi/kerberos5/lib/libkdc/Makefile.depend projects/cxl_iscsi/kerberos5/lib/libkrb5/Makefile.depend projects/cxl_iscsi/kerberos5/lib/libroken/Makefile.depend projects/cxl_iscsi/kerberos5/lib/libwind/Makefile.depend projects/cxl_iscsi/lib/Makefile projects/cxl_iscsi/lib/atf/libatf-c++/Makefile.depend projects/cxl_iscsi/lib/atf/libatf-c/Makefile.depend projects/cxl_iscsi/lib/clang/clang.build.mk projects/cxl_iscsi/lib/libalias/libalias/Makefile.depend projects/cxl_iscsi/lib/libarchive/Makefile.depend projects/cxl_iscsi/lib/libarchive/tests/Makefile projects/cxl_iscsi/lib/libauditd/Makefile.depend projects/cxl_iscsi/lib/libbegemot/Makefile.depend projects/cxl_iscsi/lib/libblocksruntime/Makefile.depend projects/cxl_iscsi/lib/libbluetooth/Makefile.depend projects/cxl_iscsi/lib/libbsm/Makefile.depend projects/cxl_iscsi/lib/libbsnmp/libbsnmp/Makefile.depend projects/cxl_iscsi/lib/libbz2/Makefile.depend projects/cxl_iscsi/lib/libc++/Makefile projects/cxl_iscsi/lib/libc/gdtoa/Makefile.inc projects/cxl_iscsi/lib/libc/gen/Makefile.inc projects/cxl_iscsi/lib/libc/gen/popen.c projects/cxl_iscsi/lib/libc/locale/Makefile.inc projects/cxl_iscsi/lib/libc/stdio/Makefile.inc projects/cxl_iscsi/lib/libc/stdio/fopen.3 projects/cxl_iscsi/lib/libc/stdlib/jemalloc/Makefile.inc projects/cxl_iscsi/lib/libc/tests/net/Makefile projects/cxl_iscsi/lib/libc/tests/rpc/Makefile projects/cxl_iscsi/lib/libcalendar/Makefile.depend projects/cxl_iscsi/lib/libcam/Makefile.depend projects/cxl_iscsi/lib/libcapsicum/Makefile.depend projects/cxl_iscsi/lib/libcom_err/Makefile.depend projects/cxl_iscsi/lib/libcrypt/Makefile projects/cxl_iscsi/lib/libcrypt/Makefile.depend projects/cxl_iscsi/lib/libcuse/Makefile.depend projects/cxl_iscsi/lib/libcxxrt/Makefile.depend projects/cxl_iscsi/lib/libdevinfo/Makefile.depend projects/cxl_iscsi/lib/libdevstat/Makefile.depend projects/cxl_iscsi/lib/libdpv/Makefile.depend projects/cxl_iscsi/lib/libdwarf/Makefile projects/cxl_iscsi/lib/libdwarf/Makefile.depend projects/cxl_iscsi/lib/libedit/Makefile.depend projects/cxl_iscsi/lib/libelf/Makefile projects/cxl_iscsi/lib/libelf/Makefile.depend projects/cxl_iscsi/lib/libexecinfo/Makefile.depend projects/cxl_iscsi/lib/libexpat/Makefile.depend projects/cxl_iscsi/lib/libfetch/Makefile.depend projects/cxl_iscsi/lib/libfigpar/Makefile.depend projects/cxl_iscsi/lib/libgeom/Makefile.depend projects/cxl_iscsi/lib/libgpio/Makefile.depend projects/cxl_iscsi/lib/libgssapi/Makefile.depend projects/cxl_iscsi/lib/libiconv_modules/BIG5/Makefile.depend projects/cxl_iscsi/lib/libiconv_modules/DECHanyu/Makefile.depend projects/cxl_iscsi/lib/libiconv_modules/EUC/Makefile.depend projects/cxl_iscsi/lib/libiconv_modules/EUCTW/Makefile.depend projects/cxl_iscsi/lib/libiconv_modules/GBK2K/Makefile.depend projects/cxl_iscsi/lib/libiconv_modules/HZ/Makefile.depend projects/cxl_iscsi/lib/libiconv_modules/ISO2022/Makefile.depend projects/cxl_iscsi/lib/libiconv_modules/JOHAB/Makefile.depend projects/cxl_iscsi/lib/libiconv_modules/MSKanji/Makefile.depend projects/cxl_iscsi/lib/libiconv_modules/UES/Makefile.depend projects/cxl_iscsi/lib/libiconv_modules/UTF1632/Makefile.depend projects/cxl_iscsi/lib/libiconv_modules/UTF7/Makefile.depend projects/cxl_iscsi/lib/libiconv_modules/UTF8/Makefile.depend projects/cxl_iscsi/lib/libiconv_modules/VIQR/Makefile.depend projects/cxl_iscsi/lib/libiconv_modules/ZW/Makefile.depend projects/cxl_iscsi/lib/libiconv_modules/iconv_none/Makefile.depend projects/cxl_iscsi/lib/libiconv_modules/iconv_std/Makefile.depend projects/cxl_iscsi/lib/libiconv_modules/mapper_646/Makefile.depend projects/cxl_iscsi/lib/libiconv_modules/mapper_none/Makefile.depend projects/cxl_iscsi/lib/libiconv_modules/mapper_parallel/Makefile.depend projects/cxl_iscsi/lib/libiconv_modules/mapper_serial/Makefile.depend projects/cxl_iscsi/lib/libiconv_modules/mapper_std/Makefile.depend projects/cxl_iscsi/lib/libiconv_modules/mapper_zone/Makefile.depend projects/cxl_iscsi/lib/libipsec/Makefile.depend projects/cxl_iscsi/lib/libjail/Makefile.depend projects/cxl_iscsi/lib/libkiconv/Makefile.depend projects/cxl_iscsi/lib/libkvm/Makefile.depend projects/cxl_iscsi/lib/libldns/Makefile.depend projects/cxl_iscsi/lib/liblzma/Makefile.depend projects/cxl_iscsi/lib/liblzma/config.h projects/cxl_iscsi/lib/libmagic/Makefile.depend projects/cxl_iscsi/lib/libmd/Makefile.depend projects/cxl_iscsi/lib/libmemstat/Makefile.depend projects/cxl_iscsi/lib/libmilter/Makefile projects/cxl_iscsi/lib/libmilter/Makefile.depend projects/cxl_iscsi/lib/libmp/Makefile.depend projects/cxl_iscsi/lib/libmt/Makefile.depend projects/cxl_iscsi/lib/libnetgraph/Makefile.depend projects/cxl_iscsi/lib/libngatm/Makefile.depend projects/cxl_iscsi/lib/libnv/Makefile.depend projects/cxl_iscsi/lib/libopie/Makefile.depend projects/cxl_iscsi/lib/libpam/libpam/Makefile.depend projects/cxl_iscsi/lib/libpcap/Makefile projects/cxl_iscsi/lib/libpcap/Makefile.depend projects/cxl_iscsi/lib/libpmc/Makefile.depend projects/cxl_iscsi/lib/libproc/Makefile projects/cxl_iscsi/lib/libproc/Makefile.depend projects/cxl_iscsi/lib/libprocstat/Makefile.depend projects/cxl_iscsi/lib/libradius/Makefile.depend projects/cxl_iscsi/lib/librpcsec_gss/Makefile.depend projects/cxl_iscsi/lib/librpcsvc/Makefile.depend projects/cxl_iscsi/lib/librt/Makefile.depend projects/cxl_iscsi/lib/librtld_db/Makefile projects/cxl_iscsi/lib/librtld_db/Makefile.depend projects/cxl_iscsi/lib/libsbuf/Makefile.depend projects/cxl_iscsi/lib/libsdp/Makefile.depend projects/cxl_iscsi/lib/libsm/Makefile projects/cxl_iscsi/lib/libsm/Makefile.depend projects/cxl_iscsi/lib/libsmb/Makefile.depend projects/cxl_iscsi/lib/libsmdb/Makefile projects/cxl_iscsi/lib/libsmdb/Makefile.depend projects/cxl_iscsi/lib/libsmutil/Makefile projects/cxl_iscsi/lib/libsmutil/Makefile.depend projects/cxl_iscsi/lib/libsqlite3/Makefile.depend projects/cxl_iscsi/lib/libstdbuf/Makefile.depend projects/cxl_iscsi/lib/libstdthreads/Makefile.depend projects/cxl_iscsi/lib/libthr/Makefile.depend projects/cxl_iscsi/lib/libthread_db/Makefile.depend projects/cxl_iscsi/lib/libucl/Makefile.depend projects/cxl_iscsi/lib/libufs/Makefile.depend projects/cxl_iscsi/lib/libugidfw/Makefile.depend projects/cxl_iscsi/lib/libulog/Makefile.depend projects/cxl_iscsi/lib/libunbound/Makefile.depend projects/cxl_iscsi/lib/libusb/Makefile.depend projects/cxl_iscsi/lib/libusbhid/Makefile.depend projects/cxl_iscsi/lib/libutil/Makefile.depend projects/cxl_iscsi/lib/libvgl/Makefile.depend projects/cxl_iscsi/lib/libvmmapi/Makefile.depend projects/cxl_iscsi/lib/libwrap/Makefile projects/cxl_iscsi/lib/libwrap/Makefile.depend projects/cxl_iscsi/lib/libxo/Makefile.depend projects/cxl_iscsi/lib/libypclnt/Makefile.depend projects/cxl_iscsi/lib/libz/Makefile.depend projects/cxl_iscsi/lib/msun/Makefile.depend projects/cxl_iscsi/lib/ncurses/form/Makefile.depend projects/cxl_iscsi/lib/ncurses/formw/Makefile.depend projects/cxl_iscsi/lib/ncurses/menu/Makefile.depend projects/cxl_iscsi/lib/ncurses/menuw/Makefile.depend projects/cxl_iscsi/lib/ncurses/ncurses/Makefile.depend projects/cxl_iscsi/lib/ncurses/ncursesw/Makefile.depend projects/cxl_iscsi/lib/ncurses/panel/Makefile.depend projects/cxl_iscsi/lib/ncurses/panelw/Makefile.depend projects/cxl_iscsi/libexec/hyperv/Makefile projects/cxl_iscsi/libexec/mail.local/Makefile projects/cxl_iscsi/libexec/mail.local/Makefile.depend projects/cxl_iscsi/libexec/rtld-elf/Makefile projects/cxl_iscsi/libexec/smrsh/Makefile projects/cxl_iscsi/libexec/smrsh/Makefile.depend projects/cxl_iscsi/libexec/tcpd/Makefile projects/cxl_iscsi/release/tools/arm.subr projects/cxl_iscsi/sbin/dumpon/dumpon.c projects/cxl_iscsi/sbin/ifconfig/ifieee80211.c projects/cxl_iscsi/sbin/ipf/ipf/Makefile projects/cxl_iscsi/sbin/ipf/ipftest/Makefile projects/cxl_iscsi/sbin/ipf/ipmon/Makefile projects/cxl_iscsi/sbin/ipf/ipnat/Makefile projects/cxl_iscsi/sbin/ipf/ippool/Makefile projects/cxl_iscsi/sbin/newfs_msdos/mkfs_msdos.c projects/cxl_iscsi/sbin/newfs_msdos/mkfs_msdos.h projects/cxl_iscsi/sbin/newfs_msdos/newfs_msdos.c projects/cxl_iscsi/secure/lib/libcrypto/Makefile.depend projects/cxl_iscsi/secure/lib/libssh/Makefile projects/cxl_iscsi/secure/lib/libssh/Makefile.depend projects/cxl_iscsi/secure/lib/libssl/Makefile.depend projects/cxl_iscsi/secure/usr.bin/ssh/Makefile projects/cxl_iscsi/secure/usr.sbin/sshd/Makefile projects/cxl_iscsi/share/colldef/Makefile.depend projects/cxl_iscsi/share/dtrace/Makefile projects/cxl_iscsi/share/examples/Makefile projects/cxl_iscsi/share/examples/ses/srcs/getencstat.c projects/cxl_iscsi/share/examples/smbfs/Makefile projects/cxl_iscsi/share/examples/smbfs/print/Makefile projects/cxl_iscsi/share/keys/pkg/trusted/Makefile projects/cxl_iscsi/share/man/man4/aue.4 projects/cxl_iscsi/share/man/man4/axe.4 projects/cxl_iscsi/share/man/man4/axge.4 projects/cxl_iscsi/share/man/man4/cdce.4 projects/cxl_iscsi/share/man/man4/cue.4 projects/cxl_iscsi/share/man/man4/ipheth.4 projects/cxl_iscsi/share/man/man4/isp.4 projects/cxl_iscsi/share/man/man4/kue.4 projects/cxl_iscsi/share/man/man4/mlx5en.4 projects/cxl_iscsi/share/man/man4/mos.4 projects/cxl_iscsi/share/man/man4/rue.4 projects/cxl_iscsi/share/man/man4/smsc.4 projects/cxl_iscsi/share/man/man4/udav.4 projects/cxl_iscsi/share/man/man4/urndis.4 projects/cxl_iscsi/share/man/man7/release.7 projects/cxl_iscsi/share/man/man9/style.9 projects/cxl_iscsi/share/misc/committers-src.dot projects/cxl_iscsi/share/mk/Makefile projects/cxl_iscsi/share/mk/bsd.cpu.mk projects/cxl_iscsi/share/mk/bsd.crunchgen.mk projects/cxl_iscsi/share/mk/bsd.libnames.mk projects/cxl_iscsi/share/mk/bsd.obj.mk projects/cxl_iscsi/share/mk/bsd.own.mk projects/cxl_iscsi/share/mk/bsd.progs.mk projects/cxl_iscsi/share/mk/bsd.sys.mk projects/cxl_iscsi/share/mk/local.dirdeps.mk projects/cxl_iscsi/share/mk/local.gendirdeps.mk projects/cxl_iscsi/share/mk/local.init.mk projects/cxl_iscsi/share/mk/local.meta.sys.mk projects/cxl_iscsi/share/mk/local.sys.mk projects/cxl_iscsi/share/mk/meta.autodep.mk projects/cxl_iscsi/share/mk/netbsd-tests.test.mk projects/cxl_iscsi/share/mk/src.libnames.mk projects/cxl_iscsi/share/mk/src.opts.mk projects/cxl_iscsi/share/mk/sys.mk projects/cxl_iscsi/share/security/Makefile projects/cxl_iscsi/share/vt/keymaps/Makefile projects/cxl_iscsi/sys/amd64/amd64/elf_machdep.c projects/cxl_iscsi/sys/amd64/linux/linux_dummy.c projects/cxl_iscsi/sys/arm/allwinner/a20/std.a20 projects/cxl_iscsi/sys/arm/allwinner/files.allwinner projects/cxl_iscsi/sys/arm/allwinner/std.a10 projects/cxl_iscsi/sys/arm/altera/socfpga/files.socfpga projects/cxl_iscsi/sys/arm/altera/socfpga/std.socfpga projects/cxl_iscsi/sys/arm/amlogic/aml8726/files.aml8726 projects/cxl_iscsi/sys/arm/annapurna/alpine/files.alpine projects/cxl_iscsi/sys/arm/annapurna/alpine/std.alpine projects/cxl_iscsi/sys/arm/arm/bus_space_base.c projects/cxl_iscsi/sys/arm/arm/exception.S projects/cxl_iscsi/sys/arm/arm/pmap-v6-new.c projects/cxl_iscsi/sys/arm/arm/pmu.c projects/cxl_iscsi/sys/arm/arm/trap-v6.c projects/cxl_iscsi/sys/arm/at91/files.at91 projects/cxl_iscsi/sys/arm/broadcom/bcm2835/files.bcm2836 projects/cxl_iscsi/sys/arm/broadcom/bcm2835/files.bcm283x projects/cxl_iscsi/sys/arm/broadcom/bcm2835/std.rpi projects/cxl_iscsi/sys/arm/cavium/cns11xx/files.econa projects/cxl_iscsi/sys/arm/conf/AML8726 projects/cxl_iscsi/sys/arm/conf/EXYNOS5.common projects/cxl_iscsi/sys/arm/conf/IMX6 projects/cxl_iscsi/sys/arm/conf/PANDABOARD projects/cxl_iscsi/sys/arm/conf/RK3188 projects/cxl_iscsi/sys/arm/conf/RPI2 projects/cxl_iscsi/sys/arm/conf/SOCKIT.common projects/cxl_iscsi/sys/arm/conf/VERSATILEPB projects/cxl_iscsi/sys/arm/conf/VIRT projects/cxl_iscsi/sys/arm/conf/VYBRID projects/cxl_iscsi/sys/arm/conf/ZEDBOARD projects/cxl_iscsi/sys/arm/freescale/imx/files.imx5 projects/cxl_iscsi/sys/arm/freescale/imx/files.imx6 projects/cxl_iscsi/sys/arm/freescale/imx/imx_machdep.c projects/cxl_iscsi/sys/arm/freescale/imx/std.imx51 projects/cxl_iscsi/sys/arm/freescale/imx/std.imx53 projects/cxl_iscsi/sys/arm/freescale/imx/std.imx6 projects/cxl_iscsi/sys/arm/freescale/vybrid/files.vybrid projects/cxl_iscsi/sys/arm/freescale/vybrid/std.vybrid projects/cxl_iscsi/sys/arm/include/bus.h projects/cxl_iscsi/sys/arm/include/sf_buf.h projects/cxl_iscsi/sys/arm/lpc/files.lpc projects/cxl_iscsi/sys/arm/mv/armadaxp/std.armadaxp projects/cxl_iscsi/sys/arm/mv/files.mv projects/cxl_iscsi/sys/arm/qemu/files.qemu projects/cxl_iscsi/sys/arm/qemu/std.virt projects/cxl_iscsi/sys/arm/rockchip/files.rk30xx projects/cxl_iscsi/sys/arm/rockchip/std.rk30xx projects/cxl_iscsi/sys/arm/samsung/exynos/files.exynos5 projects/cxl_iscsi/sys/arm/samsung/exynos/std.exynos5250 projects/cxl_iscsi/sys/arm/samsung/exynos/std.exynos5420 projects/cxl_iscsi/sys/arm/ti/am335x/files.am335x projects/cxl_iscsi/sys/arm/ti/am335x/std.am335x projects/cxl_iscsi/sys/arm/ti/files.ti projects/cxl_iscsi/sys/arm/ti/omap4/files.omap4 projects/cxl_iscsi/sys/arm/ti/omap4/std.omap4 projects/cxl_iscsi/sys/arm/versatile/files.versatile projects/cxl_iscsi/sys/arm/versatile/versatile_pci.c projects/cxl_iscsi/sys/arm/xilinx/files.zynq7 projects/cxl_iscsi/sys/arm/xilinx/std.zynq7 projects/cxl_iscsi/sys/arm/xscale/i80321/files.i80219 projects/cxl_iscsi/sys/arm/xscale/i80321/files.i80321 projects/cxl_iscsi/sys/arm/xscale/i8134x/files.i81342 projects/cxl_iscsi/sys/arm/xscale/ixp425/files.ixp425 projects/cxl_iscsi/sys/arm/xscale/pxa/files.pxa projects/cxl_iscsi/sys/arm64/arm64/busdma_bounce.c projects/cxl_iscsi/sys/arm64/arm64/pmap.c projects/cxl_iscsi/sys/arm64/include/vmparam.h projects/cxl_iscsi/sys/boot/i386/Makefile projects/cxl_iscsi/sys/boot/i386/boot0/Makefile projects/cxl_iscsi/sys/boot/i386/boot2/Makefile projects/cxl_iscsi/sys/boot/uboot/common/main.c projects/cxl_iscsi/sys/cam/scsi/scsi_enc.c projects/cxl_iscsi/sys/cam/scsi/scsi_enc.h projects/cxl_iscsi/sys/cam/scsi/scsi_enc_ses.c projects/cxl_iscsi/sys/compat/ia32/ia32_sysvec.c projects/cxl_iscsi/sys/conf/NOTES projects/cxl_iscsi/sys/conf/files projects/cxl_iscsi/sys/conf/files.arm projects/cxl_iscsi/sys/conf/kern.opts.mk projects/cxl_iscsi/sys/conf/newvers.sh projects/cxl_iscsi/sys/conf/options projects/cxl_iscsi/sys/contrib/vchiq/interface/vchiq_arm/vchiq_arm.c projects/cxl_iscsi/sys/dev/ath/if_ath.c projects/cxl_iscsi/sys/dev/ath/if_ath_misc.h projects/cxl_iscsi/sys/dev/ath/if_ath_rx.c projects/cxl_iscsi/sys/dev/ath/if_ath_rx_edma.c projects/cxl_iscsi/sys/dev/ath/if_ath_tx_edma.c projects/cxl_iscsi/sys/dev/de/if_de.c projects/cxl_iscsi/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c projects/cxl_iscsi/sys/dev/isp/isp.c projects/cxl_iscsi/sys/dev/isp/isp_freebsd.c projects/cxl_iscsi/sys/dev/isp/isp_freebsd.h projects/cxl_iscsi/sys/dev/isp/isp_library.c projects/cxl_iscsi/sys/dev/isp/isp_library.h projects/cxl_iscsi/sys/dev/isp/isp_pci.c projects/cxl_iscsi/sys/dev/isp/isp_sbus.c projects/cxl_iscsi/sys/dev/isp/isp_target.c projects/cxl_iscsi/sys/dev/isp/ispmbox.h projects/cxl_iscsi/sys/dev/isp/ispvar.h projects/cxl_iscsi/sys/dev/ispfw/asm_1040.h projects/cxl_iscsi/sys/dev/ispfw/asm_1080.h projects/cxl_iscsi/sys/dev/ispfw/asm_12160.h projects/cxl_iscsi/sys/dev/ispfw/asm_2200.h projects/cxl_iscsi/sys/dev/ispfw/asm_2300.h projects/cxl_iscsi/sys/dev/ispfw/asm_2322.h projects/cxl_iscsi/sys/dev/ispfw/ispfw.c projects/cxl_iscsi/sys/dev/ntb/if_ntb/if_ntb.c projects/cxl_iscsi/sys/dev/ntb/ntb_hw/ntb_hw.c projects/cxl_iscsi/sys/dev/ntb/ntb_hw/ntb_hw.h projects/cxl_iscsi/sys/dev/ntb/ntb_hw/ntb_regs.h projects/cxl_iscsi/sys/dev/pci/pcireg.h projects/cxl_iscsi/sys/dev/pci/pcivar.h projects/cxl_iscsi/sys/dev/usb/controller/uhci.h projects/cxl_iscsi/sys/dev/usb/input/ukbd.c projects/cxl_iscsi/sys/dev/usb/wlan/if_urtwn.c projects/cxl_iscsi/sys/dev/usb/wlan/if_urtwnreg.h projects/cxl_iscsi/sys/dev/usb/wlan/if_urtwnvar.h projects/cxl_iscsi/sys/fs/nfs/nfs_var.h projects/cxl_iscsi/sys/fs/nfsclient/nfs_clrpcops.c projects/cxl_iscsi/sys/fs/nfsserver/nfs_nfsdkrpc.c projects/cxl_iscsi/sys/fs/nfsserver/nfs_nfsdstate.c projects/cxl_iscsi/sys/i386/i386/elf_machdep.c projects/cxl_iscsi/sys/kern/kern_hhook.c projects/cxl_iscsi/sys/kern/kern_sharedpage.c projects/cxl_iscsi/sys/kern/subr_witness.c projects/cxl_iscsi/sys/kern/vfs_subr.c projects/cxl_iscsi/sys/kern/vfs_syscalls.c projects/cxl_iscsi/sys/mips/malta/malta_machdep.c projects/cxl_iscsi/sys/modules/Makefile projects/cxl_iscsi/sys/modules/ath/Makefile projects/cxl_iscsi/sys/modules/cryptodev/Makefile projects/cxl_iscsi/sys/modules/ipoib/Makefile projects/cxl_iscsi/sys/modules/ispfw/Makefile projects/cxl_iscsi/sys/modules/linux64/Makefile projects/cxl_iscsi/sys/net/if.c projects/cxl_iscsi/sys/net/if_enc.c projects/cxl_iscsi/sys/net/if_enc.h projects/cxl_iscsi/sys/net/if_var.h projects/cxl_iscsi/sys/net80211/ieee80211_ht.c projects/cxl_iscsi/sys/net80211/ieee80211_ioctl.c projects/cxl_iscsi/sys/netinet/in_pcb.c projects/cxl_iscsi/sys/netinet/ip_input.c projects/cxl_iscsi/sys/netinet/sctp_pcb.c projects/cxl_iscsi/sys/netinet/sctp_usrreq.c projects/cxl_iscsi/sys/netinet6/ip6_input.c projects/cxl_iscsi/sys/netipsec/ipsec.c projects/cxl_iscsi/sys/netipsec/ipsec.h projects/cxl_iscsi/sys/netipsec/ipsec_input.c projects/cxl_iscsi/sys/netipsec/ipsec_output.c projects/cxl_iscsi/sys/netpfil/ipfw/ip_fw_private.h projects/cxl_iscsi/sys/netpfil/ipfw/ip_fw_sockopt.c projects/cxl_iscsi/sys/ofed/include/rdma/ib_pma.h projects/cxl_iscsi/sys/opencrypto/cryptodev.c projects/cxl_iscsi/sys/powerpc/aim/slb.c projects/cxl_iscsi/sys/powerpc/booke/pmap.c projects/cxl_iscsi/sys/powerpc/include/asm.h projects/cxl_iscsi/sys/powerpc/include/atomic.h projects/cxl_iscsi/sys/powerpc/include/md_var.h projects/cxl_iscsi/sys/powerpc/include/profile.h projects/cxl_iscsi/sys/powerpc/mpc85xx/pci_mpc85xx.c projects/cxl_iscsi/sys/powerpc/mpc85xx/pci_mpc85xx_pcib.c projects/cxl_iscsi/sys/powerpc/powerpc/elf64_machdep.c projects/cxl_iscsi/sys/powerpc/powerpc/exec_machdep.c projects/cxl_iscsi/sys/powerpc/powerpc/sigcode64.S projects/cxl_iscsi/sys/sparc64/include/md_var.h projects/cxl_iscsi/sys/sparc64/sparc64/machdep.c projects/cxl_iscsi/sys/sparc64/sparc64/mp_machdep.c projects/cxl_iscsi/sys/sys/hhook.h projects/cxl_iscsi/sys/sys/mount.h projects/cxl_iscsi/sys/sys/sysent.h projects/cxl_iscsi/sys/sys/vdso.h projects/cxl_iscsi/sys/vm/vm_pageout.c projects/cxl_iscsi/sys/vm/vnode_pager.c projects/cxl_iscsi/sys/x86/x86/busdma_bounce.c projects/cxl_iscsi/sys/x86/x86/identcpu.c projects/cxl_iscsi/targets/pseudo/bootstrap-tools/Makefile projects/cxl_iscsi/targets/pseudo/hosttools/Makefile.depend projects/cxl_iscsi/targets/pseudo/stage/Makefile projects/cxl_iscsi/targets/pseudo/toolchain/Makefile.depend projects/cxl_iscsi/targets/pseudo/userland/Makefile.depend projects/cxl_iscsi/targets/pseudo/userland/misc/Makefile.depend projects/cxl_iscsi/targets/pseudo/userland/share/Makefile.depend projects/cxl_iscsi/tests/Makefile projects/cxl_iscsi/tests/README projects/cxl_iscsi/tests/sys/kern/Makefile projects/cxl_iscsi/tests/sys/kern/acct/Makefile projects/cxl_iscsi/tools/tools/README projects/cxl_iscsi/tools/tools/nanobsd/defaults.sh projects/cxl_iscsi/usr.bin/Makefile projects/cxl_iscsi/usr.bin/awk/Makefile projects/cxl_iscsi/usr.bin/bc/bc.1 projects/cxl_iscsi/usr.bin/bc/bc.y projects/cxl_iscsi/usr.bin/bc/extern.h projects/cxl_iscsi/usr.bin/bc/tty.c projects/cxl_iscsi/usr.bin/calendar/calendars/calendar.freebsd projects/cxl_iscsi/usr.bin/cpio/tests/Makefile projects/cxl_iscsi/usr.bin/kdump/Makefile projects/cxl_iscsi/usr.bin/m4/eval.c projects/cxl_iscsi/usr.bin/m4/extern.h projects/cxl_iscsi/usr.bin/m4/m4.1 projects/cxl_iscsi/usr.bin/m4/main.c projects/cxl_iscsi/usr.bin/m4/mdef.h projects/cxl_iscsi/usr.bin/m4/pathnames.h projects/cxl_iscsi/usr.bin/makewhatis/Makefile projects/cxl_iscsi/usr.bin/ministat/ministat.c projects/cxl_iscsi/usr.bin/netstat/Makefile projects/cxl_iscsi/usr.bin/netstat/if.c projects/cxl_iscsi/usr.bin/netstat/inet.c projects/cxl_iscsi/usr.bin/netstat/main.c projects/cxl_iscsi/usr.bin/netstat/route.c projects/cxl_iscsi/usr.bin/readelf/Makefile projects/cxl_iscsi/usr.bin/svn/svn/Makefile projects/cxl_iscsi/usr.bin/tar/tests/Makefile projects/cxl_iscsi/usr.bin/vacation/Makefile projects/cxl_iscsi/usr.bin/vacation/Makefile.depend projects/cxl_iscsi/usr.bin/vgrind/Makefile projects/cxl_iscsi/usr.bin/vmstat/Makefile projects/cxl_iscsi/usr.bin/vmstat/vmstat.8 projects/cxl_iscsi/usr.bin/vmstat/vmstat.c projects/cxl_iscsi/usr.bin/xinstall/xinstall.c projects/cxl_iscsi/usr.bin/xlint/lint1/Makefile projects/cxl_iscsi/usr.bin/xlint/lint2/Makefile projects/cxl_iscsi/usr.sbin/Makefile projects/cxl_iscsi/usr.sbin/Makefile.mips projects/cxl_iscsi/usr.sbin/acpi/iasl/Makefile projects/cxl_iscsi/usr.sbin/amd/include/Makefile.depend projects/cxl_iscsi/usr.sbin/bluetooth/bthidd/kbd.c projects/cxl_iscsi/usr.sbin/bsdconfig/console/Makefile projects/cxl_iscsi/usr.sbin/bsdconfig/console/include/Makefile projects/cxl_iscsi/usr.sbin/bsdconfig/diskmgmt/Makefile projects/cxl_iscsi/usr.sbin/bsdconfig/diskmgmt/include/Makefile projects/cxl_iscsi/usr.sbin/bsdconfig/docsinstall/Makefile projects/cxl_iscsi/usr.sbin/bsdconfig/docsinstall/include/Makefile projects/cxl_iscsi/usr.sbin/bsdconfig/dot/Makefile projects/cxl_iscsi/usr.sbin/bsdconfig/dot/include/Makefile projects/cxl_iscsi/usr.sbin/bsdconfig/examples/Makefile projects/cxl_iscsi/usr.sbin/bsdconfig/include/Makefile projects/cxl_iscsi/usr.sbin/bsdconfig/includes/Makefile projects/cxl_iscsi/usr.sbin/bsdconfig/includes/include/Makefile projects/cxl_iscsi/usr.sbin/bsdconfig/mouse/Makefile projects/cxl_iscsi/usr.sbin/bsdconfig/mouse/include/Makefile projects/cxl_iscsi/usr.sbin/bsdconfig/networking/Makefile projects/cxl_iscsi/usr.sbin/bsdconfig/networking/include/Makefile projects/cxl_iscsi/usr.sbin/bsdconfig/networking/share/Makefile projects/cxl_iscsi/usr.sbin/bsdconfig/packages/Makefile projects/cxl_iscsi/usr.sbin/bsdconfig/packages/include/Makefile projects/cxl_iscsi/usr.sbin/bsdconfig/password/Makefile projects/cxl_iscsi/usr.sbin/bsdconfig/password/include/Makefile projects/cxl_iscsi/usr.sbin/bsdconfig/password/share/Makefile projects/cxl_iscsi/usr.sbin/bsdconfig/security/Makefile projects/cxl_iscsi/usr.sbin/bsdconfig/security/include/Makefile projects/cxl_iscsi/usr.sbin/bsdconfig/share/Makefile projects/cxl_iscsi/usr.sbin/bsdconfig/share/media/Makefile projects/cxl_iscsi/usr.sbin/bsdconfig/share/packages/Makefile projects/cxl_iscsi/usr.sbin/bsdconfig/startup/Makefile projects/cxl_iscsi/usr.sbin/bsdconfig/startup/include/Makefile projects/cxl_iscsi/usr.sbin/bsdconfig/startup/share/Makefile projects/cxl_iscsi/usr.sbin/bsdconfig/timezone/Makefile projects/cxl_iscsi/usr.sbin/bsdconfig/timezone/include/Makefile projects/cxl_iscsi/usr.sbin/bsdconfig/timezone/share/Makefile projects/cxl_iscsi/usr.sbin/bsdconfig/ttys/Makefile projects/cxl_iscsi/usr.sbin/bsdconfig/ttys/include/Makefile projects/cxl_iscsi/usr.sbin/bsdconfig/usermgmt/Makefile projects/cxl_iscsi/usr.sbin/bsdconfig/usermgmt/include/Makefile projects/cxl_iscsi/usr.sbin/bsdconfig/usermgmt/share/Makefile projects/cxl_iscsi/usr.sbin/bsdinstall/distextract/Makefile projects/cxl_iscsi/usr.sbin/bsdinstall/distfetch/Makefile projects/cxl_iscsi/usr.sbin/bsdinstall/partedit/Makefile projects/cxl_iscsi/usr.sbin/bsdinstall/scripts/Makefile projects/cxl_iscsi/usr.sbin/bsnmpd/modules/snmp_atm/Makefile.depend projects/cxl_iscsi/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile.depend projects/cxl_iscsi/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile.depend projects/cxl_iscsi/usr.sbin/bsnmpd/modules/snmp_lm75/Makefile.depend projects/cxl_iscsi/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile.depend projects/cxl_iscsi/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile.depend projects/cxl_iscsi/usr.sbin/bsnmpd/modules/snmp_pf/Makefile.depend projects/cxl_iscsi/usr.sbin/bsnmpd/modules/snmp_target/Makefile.depend projects/cxl_iscsi/usr.sbin/bsnmpd/modules/snmp_usm/Makefile.depend projects/cxl_iscsi/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile.depend projects/cxl_iscsi/usr.sbin/bsnmpd/modules/snmp_wlan/Makefile.depend projects/cxl_iscsi/usr.sbin/bsnmpd/tools/libbsnmptools/Makefile.depend projects/cxl_iscsi/usr.sbin/editmap/Makefile projects/cxl_iscsi/usr.sbin/editmap/Makefile.depend projects/cxl_iscsi/usr.sbin/lpr/filters/Makefile projects/cxl_iscsi/usr.sbin/mailstats/Makefile projects/cxl_iscsi/usr.sbin/mailstats/Makefile.depend projects/cxl_iscsi/usr.sbin/makemap/Makefile projects/cxl_iscsi/usr.sbin/makemap/Makefile.depend projects/cxl_iscsi/usr.sbin/pciconf/pciconf.8 projects/cxl_iscsi/usr.sbin/pciconf/pciconf.c projects/cxl_iscsi/usr.sbin/praliases/Makefile projects/cxl_iscsi/usr.sbin/praliases/Makefile.depend projects/cxl_iscsi/usr.sbin/rpc.yppasswdd/Makefile projects/cxl_iscsi/usr.sbin/sendmail/Makefile projects/cxl_iscsi/usr.sbin/syslogd/syslogd.c projects/cxl_iscsi/usr.sbin/tcpdchk/Makefile projects/cxl_iscsi/usr.sbin/tcpdmatch/Makefile projects/cxl_iscsi/usr.sbin/uathload/Makefile Directory Properties: projects/cxl_iscsi/ (props changed) projects/cxl_iscsi/cddl/ (props changed) projects/cxl_iscsi/contrib/bmake/ (props changed) projects/cxl_iscsi/contrib/sendmail/ (props changed) projects/cxl_iscsi/contrib/wpa/ (props changed) projects/cxl_iscsi/contrib/xz/ (props changed) projects/cxl_iscsi/crypto/openssh/ (props changed) projects/cxl_iscsi/gnu/lib/ (props changed) projects/cxl_iscsi/gnu/usr.bin/binutils/ (props changed) projects/cxl_iscsi/gnu/usr.bin/cc/cc_tools/ (props changed) projects/cxl_iscsi/include/ (props changed) projects/cxl_iscsi/lib/libc/ (props changed) projects/cxl_iscsi/lib/libutil/ (props changed) projects/cxl_iscsi/lib/libvmmapi/ (props changed) projects/cxl_iscsi/lib/libz/ (props changed) projects/cxl_iscsi/sbin/ (props changed) projects/cxl_iscsi/sbin/dumpon/ (props changed) projects/cxl_iscsi/share/ (props changed) projects/cxl_iscsi/share/man/man4/ (props changed) projects/cxl_iscsi/sys/ (props changed) projects/cxl_iscsi/sys/boot/ (props changed) projects/cxl_iscsi/sys/conf/ (props changed) projects/cxl_iscsi/sys/dev/hyperv/ (props changed) projects/cxl_iscsi/targets/ (props changed) projects/cxl_iscsi/usr.bin/calendar/ (props changed) Modified: projects/cxl_iscsi/ObsoleteFiles.inc ============================================================================== --- projects/cxl_iscsi/ObsoleteFiles.inc Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/ObsoleteFiles.inc Thu Nov 26 02:16:25 2015 (r291354) @@ -142,10 +142,6 @@ OLD_FILES+=usr/share/locale/sr_YU.UTF-8/ OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_MESSAGES OLD_DIRS+=usr/share/locale/sr_YU.UTF-8 -OLD_FILES+=usr/bin/colldef -OLD_FILES+=usr/share/man/man1/colldef.1.gz -OLD_FILES+=usr/bin/mklocale -OLD_FILES+=usr/share/man/man1/mklocale.1.gz # 20151101: added missing _test suffix on multiple tests in lib/libc OLD_FILES+=usr/tests/lib/libc/c063/faccessat OLD_FILES+=usr/tests/lib/libc/c063/fchmodat Modified: projects/cxl_iscsi/bin/rmail/Makefile ============================================================================== --- projects/cxl_iscsi/bin/rmail/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/bin/rmail/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -29,7 +29,7 @@ LDFLAGS+=${SENDMAIL_LDFLAGS} # following: # CFLAGS+= -DQUEUE_ONLY -sm_os.h: - ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h +sm_os.h: ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h .NOMETA + ln -sf ${.ALLSRC} ${.TARGET} .include Modified: projects/cxl_iscsi/bin/rmail/Makefile.depend ============================================================================== --- projects/cxl_iscsi/bin/rmail/Makefile.depend Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/bin/rmail/Makefile.depend Thu Nov 26 02:16:25 2015 (r291354) @@ -10,7 +10,6 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ lib/libsm \ - lib/libutil \ .include Modified: projects/cxl_iscsi/bin/sh/mknodes.c ============================================================================== --- projects/cxl_iscsi/bin/sh/mknodes.c Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/bin/sh/mknodes.c Thu Nov 26 02:16:25 2015 (r291354) @@ -296,10 +296,10 @@ outfunc(FILE *cfile, int calcsize) else fputs(" return NULL;\n", cfile); if (calcsize) - fputs(" funcblocksize += nodesize[n->type];\n", cfile); + fputs(" result->blocksize += nodesize[n->type];\n", cfile); else { - fputs(" new = funcblock;\n", cfile); - fputs(" funcblock = (char *)funcblock + nodesize[n->type];\n", cfile); + fputs(" new = state->block;\n", cfile); + fputs(" state->block = (char *)state->block + nodesize[n->type];\n", cfile); } fputs(" switch (n->type) {\n", cfile); for (sp = str ; sp < &str[nstr] ; sp++) { @@ -313,33 +313,33 @@ outfunc(FILE *cfile, int calcsize) case T_NODE: if (calcsize) { indent(12, cfile); - fprintf(cfile, "calcsize(n->%s.%s);\n", + fprintf(cfile, "calcsize(n->%s.%s, result);\n", sp->tag, fp->name); } else { indent(12, cfile); - fprintf(cfile, "new->%s.%s = copynode(n->%s.%s);\n", + fprintf(cfile, "new->%s.%s = copynode(n->%s.%s, state);\n", sp->tag, fp->name, sp->tag, fp->name); } break; case T_NODELIST: if (calcsize) { indent(12, cfile); - fprintf(cfile, "sizenodelist(n->%s.%s);\n", + fprintf(cfile, "sizenodelist(n->%s.%s, result);\n", sp->tag, fp->name); } else { indent(12, cfile); - fprintf(cfile, "new->%s.%s = copynodelist(n->%s.%s);\n", + fprintf(cfile, "new->%s.%s = copynodelist(n->%s.%s, state);\n", sp->tag, fp->name, sp->tag, fp->name); } break; case T_STRING: if (calcsize) { indent(12, cfile); - fprintf(cfile, "funcstringsize += strlen(n->%s.%s) + 1;\n", + fprintf(cfile, "result->stringsize += strlen(n->%s.%s) + 1;\n", sp->tag, fp->name); } else { indent(12, cfile); - fprintf(cfile, "new->%s.%s = nodesavestr(n->%s.%s);\n", + fprintf(cfile, "new->%s.%s = nodesavestr(n->%s.%s, state);\n", sp->tag, fp->name, sp->tag, fp->name); } break; Modified: projects/cxl_iscsi/bin/sh/nodes.c.pat ============================================================================== --- projects/cxl_iscsi/bin/sh/nodes.c.pat Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/bin/sh/nodes.c.pat Thu Nov 26 02:16:25 2015 (r291354) @@ -46,19 +46,24 @@ #include "mystring.h" -static int funcblocksize; /* size of structures in function */ -static int funcstringsize; /* size of strings in node */ -static pointer funcblock; /* block to allocate function from */ -static char *funcstring; /* block to allocate strings from */ +struct nodesize { + int blocksize; /* size of structures in function */ + int stringsize; /* size of strings in node */ +}; + +struct nodecopystate { + pointer block; /* block to allocate function from */ + char *string; /* block to allocate strings from */ +}; %SIZES -static void calcsize(union node *); -static void sizenodelist(struct nodelist *); -static union node *copynode(union node *); -static struct nodelist *copynodelist(struct nodelist *); -static char *nodesavestr(const char *); +static void calcsize(union node *, struct nodesize *); +static void sizenodelist(struct nodelist *, struct nodesize *); +static union node *copynode(union node *, struct nodecopystate *); +static struct nodelist *copynodelist(struct nodelist *, struct nodecopystate *); +static char *nodesavestr(const char *, struct nodecopystate *); struct funcdef { @@ -73,18 +78,20 @@ struct funcdef { struct funcdef * copyfunc(union node *n) { + struct nodesize sz; + struct nodecopystate st; struct funcdef *fn; if (n == NULL) return NULL; - funcblocksize = offsetof(struct funcdef, n); - funcstringsize = 0; - calcsize(n); - fn = ckmalloc(funcblocksize + funcstringsize); + sz.blocksize = offsetof(struct funcdef, n); + sz.stringsize = 0; + calcsize(n, &sz); + fn = ckmalloc(sz.blocksize + sz.stringsize); fn->refcount = 1; - funcblock = (char *)fn + offsetof(struct funcdef, n); - funcstring = (char *)fn + funcblocksize; - copynode(n); + st.block = (char *)fn + offsetof(struct funcdef, n); + st.string = (char *)fn + sz.blocksize; + copynode(n, &st); return fn; } @@ -97,7 +104,7 @@ getfuncnode(struct funcdef *fn) static void -calcsize(union node *n) +calcsize(union node *n, struct nodesize *result) { %CALCSIZE } @@ -105,11 +112,11 @@ calcsize(union node *n) static void -sizenodelist(struct nodelist *lp) +sizenodelist(struct nodelist *lp, struct nodesize *result) { while (lp) { - funcblocksize += ALIGN(sizeof(struct nodelist)); - calcsize(lp->n); + result->blocksize += ALIGN(sizeof(struct nodelist)); + calcsize(lp->n, result); lp = lp->next; } } @@ -117,7 +124,7 @@ sizenodelist(struct nodelist *lp) static union node * -copynode(union node *n) +copynode(union node *n, struct nodecopystate *state) { union node *new; @@ -127,16 +134,17 @@ copynode(union node *n) static struct nodelist * -copynodelist(struct nodelist *lp) +copynodelist(struct nodelist *lp, struct nodecopystate *state) { struct nodelist *start; struct nodelist **lpp; lpp = &start; while (lp) { - *lpp = funcblock; - funcblock = (char *)funcblock + ALIGN(sizeof(struct nodelist)); - (*lpp)->n = copynode(lp->n); + *lpp = state->block; + state->block = (char *)state->block + + ALIGN(sizeof(struct nodelist)); + (*lpp)->n = copynode(lp->n, state); lp = lp->next; lpp = &(*lpp)->next; } @@ -147,15 +155,15 @@ copynodelist(struct nodelist *lp) static char * -nodesavestr(const char *s) +nodesavestr(const char *s, struct nodecopystate *state) { const char *p = s; - char *q = funcstring; - char *rtn = funcstring; + char *q = state->string; + char *rtn = state->string; while ((*q++ = *p++) != '\0') continue; - funcstring = q; + state->string = q; return rtn; } Modified: projects/cxl_iscsi/cddl/lib/libavl/Makefile.depend ============================================================================== --- projects/cxl_iscsi/cddl/lib/libavl/Makefile.depend Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/lib/libavl/Makefile.depend Thu Nov 26 02:16:25 2015 (r291354) @@ -8,7 +8,6 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - usr.bin/xinstall.host \ .include Modified: projects/cxl_iscsi/cddl/lib/libctf/Makefile.depend ============================================================================== --- projects/cxl_iscsi/cddl/lib/libctf/Makefile.depend Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/lib/libctf/Makefile.depend Thu Nov 26 02:16:25 2015 (r291354) @@ -11,7 +11,6 @@ DIRDEPS = \ lib/libcompiler_rt \ lib/libelf \ lib/libz \ - usr.bin/xinstall.host \ .include Modified: projects/cxl_iscsi/cddl/lib/libdtrace/Makefile.depend ============================================================================== --- projects/cxl_iscsi/cddl/lib/libdtrace/Makefile.depend Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/lib/libdtrace/Makefile.depend Thu Nov 26 02:16:25 2015 (r291354) @@ -15,7 +15,6 @@ DIRDEPS = \ lib/libproc \ lib/librtld_db \ lib/libthr \ - usr.bin/xinstall.host \ usr.bin/yacc.host \ Modified: projects/cxl_iscsi/cddl/lib/libnvpair/Makefile.depend ============================================================================== --- projects/cxl_iscsi/cddl/lib/libnvpair/Makefile.depend Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/lib/libnvpair/Makefile.depend Thu Nov 26 02:16:25 2015 (r291354) @@ -10,7 +10,6 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ lib/msun \ - usr.bin/xinstall.host \ .include Modified: projects/cxl_iscsi/cddl/lib/libumem/Makefile.depend ============================================================================== --- projects/cxl_iscsi/cddl/lib/libumem/Makefile.depend Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/lib/libumem/Makefile.depend Thu Nov 26 02:16:25 2015 (r291354) @@ -8,7 +8,6 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - usr.bin/xinstall.host \ .include Modified: projects/cxl_iscsi/cddl/lib/libuutil/Makefile.depend ============================================================================== --- projects/cxl_iscsi/cddl/lib/libuutil/Makefile.depend Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/lib/libuutil/Makefile.depend Thu Nov 26 02:16:25 2015 (r291354) @@ -9,7 +9,6 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ - usr.bin/xinstall.host \ .include Modified: projects/cxl_iscsi/cddl/lib/libzfs/Makefile.depend ============================================================================== --- projects/cxl_iscsi/cddl/lib/libzfs/Makefile.depend Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/lib/libzfs/Makefile.depend Thu Nov 26 02:16:25 2015 (r291354) @@ -20,7 +20,6 @@ DIRDEPS = \ lib/libthr \ lib/libutil \ lib/msun \ - usr.bin/xinstall.host \ .include Modified: projects/cxl_iscsi/cddl/lib/libzfs_core/Makefile.depend ============================================================================== --- projects/cxl_iscsi/cddl/lib/libzfs_core/Makefile.depend Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/lib/libzfs_core/Makefile.depend Thu Nov 26 02:16:25 2015 (r291354) @@ -11,7 +11,6 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ lib/msun \ - usr.bin/xinstall.host \ .include Modified: projects/cxl_iscsi/cddl/lib/libzpool/Makefile.depend ============================================================================== --- projects/cxl_iscsi/cddl/lib/libzpool/Makefile.depend Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/lib/libzpool/Makefile.depend Thu Nov 26 02:16:25 2015 (r291354) @@ -16,7 +16,6 @@ DIRDEPS = \ lib/libthr \ lib/libz \ lib/msun \ - usr.bin/xinstall.host \ .include Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -186,4 +186,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -29,4 +29,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -26,4 +26,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -29,4 +29,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/begin/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/begin/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/begin/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -19,4 +19,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -23,4 +23,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -34,4 +34,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -45,4 +45,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/cg/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/cg/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/cg/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -15,4 +15,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -23,4 +23,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -24,4 +24,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/decls/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/decls/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/decls/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -27,4 +27,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -29,4 +29,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/drops/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/drops/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/drops/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -21,4 +21,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -115,4 +115,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/end/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/end/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/end/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -18,4 +18,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/enum/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/enum/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/enum/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -18,4 +18,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/error/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/error/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/error/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -18,4 +18,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/exit/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/exit/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/exit/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -16,4 +16,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -23,4 +23,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -110,4 +110,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -17,4 +17,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/include/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/include/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/include/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -14,4 +14,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/inline/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/inline/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/inline/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -25,4 +25,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/io/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/io/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/io/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -15,4 +15,4 @@ CFILES= \ tst.fds.c \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/ip/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/ip/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/ip/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -33,4 +33,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -41,4 +41,4 @@ CFILES= \ tst.ProbeData.c \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/json/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/json/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/json/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -20,4 +20,4 @@ CFILES= \ tst.usdt.c \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -27,4 +27,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -47,4 +47,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -14,4 +14,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/mib/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/mib/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/mib/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -16,4 +16,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/misc/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/misc/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/misc/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -27,4 +27,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -31,4 +31,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -16,4 +16,4 @@ CFILES= \ tst.call3.c \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -25,4 +25,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/operators/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/operators/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/operators/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -15,4 +15,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/pid/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/pid/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/pid/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -66,4 +66,4 @@ CFILES= \ tst.weak2.c \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -16,4 +16,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -45,4 +45,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -27,4 +27,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -22,4 +22,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -50,4 +50,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/print/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/print/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/print/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -29,4 +29,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/printa/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/printa/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/printa/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -37,4 +37,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/printf/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/printf/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/printf/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -65,4 +65,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/privs/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/privs/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/privs/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -21,4 +21,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/probes/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/probes/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/probes/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -33,4 +33,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/proc/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/proc/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/proc/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -27,4 +27,4 @@ CFILES= \ LDADD.tst.sigwait.exe+= -lrt DPADD.tst.sigwait.exe+= ${LIBRT} -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -50,4 +50,4 @@ CFILES= \ tst.ufuncsort.c \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/providers/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/providers/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/providers/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -41,4 +41,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/raise/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/raise/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/raise/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -18,4 +18,4 @@ CFILES= \ tst.raise3.c \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/rates/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/rates/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/rates/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -18,4 +18,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/safety/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/safety/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/safety/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -51,4 +51,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -34,4 +34,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/sched/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/sched/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/sched/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -16,4 +16,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -46,4 +46,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -14,4 +14,4 @@ CFILES= \ tst.sdtargs.c \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -28,4 +28,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -72,4 +72,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/stability/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/stability/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/stability/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -14,4 +14,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/stack/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/stack/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/stack/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -19,4 +19,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -14,4 +14,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/stop/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/stop/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/stop/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -16,4 +16,4 @@ CFILES= \ tst.stop2.c \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -14,4 +14,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -17,4 +17,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/struct/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/struct/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/struct/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -28,4 +28,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -15,4 +15,4 @@ CFILES= \ tst.args.c \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -16,4 +16,4 @@ CFILES= \ tst.post_chan.c \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -35,4 +35,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/trace/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/trace/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/trace/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -21,4 +21,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -23,4 +23,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/translators/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/translators/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/translators/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -48,4 +48,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -18,4 +18,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/types/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/types/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/types/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -66,4 +66,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -38,4 +38,4 @@ CFILES= \ WITH_CTF=YES -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/union/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/union/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/union/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -24,4 +24,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -62,4 +62,4 @@ CFILES= \ tst.forker.c \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -17,4 +17,4 @@ CFILES= \ tst.spin.c \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/vars/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/vars/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/vars/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -20,4 +20,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/version/Makefile ============================================================================== --- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/version/Makefile Thu Nov 26 02:00:37 2015 (r291353) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/version/Makefile Thu Nov 26 02:16:25 2015 (r291354) @@ -14,4 +14,4 @@ CFILES= \ -.include "../../Makefile.inc1" +.include "../../dtrace.test.mk" Copied: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/dtrace.test.mk (from r291335, head/cddl/usr.sbin/dtrace/tests/dtrace.test.mk) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/dtrace.test.mk Thu Nov 26 02:16:25 2015 (r291354, copy of r291335, head/cddl/usr.sbin/dtrace/tests/dtrace.test.mk) @@ -0,0 +1,48 @@ +# $FreeBSD$ + +TESTGROUP= ${.CURDIR:H:T}/${.CURDIR:T} +TESTSRC= ${.CURDIR:H:H:H:H:H}/contrib/opensolaris/cmd/dtrace/test/tst/${TESTGROUP} +TESTSDIR= ${TESTSBASE}/cddl/usr.sbin/dtrace/${TESTGROUP} + +FILESGROUPS+= FILES ${TESTGROUP} ${TESTGROUP}EXE + +${TESTGROUP}= ${TESTFILES} +${TESTGROUP}EXE= ${TESTEXES} +${TESTGROUP}EXEMODE= 0555 + +TESTWRAPPER= t_dtrace_contrib +ATF_TESTS_SH+= ${TESTWRAPPER} +TEST_METADATA.t_dtrace_contrib+= required_files="/usr/local/bin/ksh" +TEST_METADATA.t_dtrace_contrib+= required_user="root" + +GENTEST?= ${.CURDIR:H:H}/tools/gentest.sh +EXCLUDE= ${.CURDIR:H:H}/tools/exclude.sh +${TESTWRAPPER}.sh: ${GENTEST} ${EXCLUDE} ${${TESTGROUP}} + sh ${GENTEST} -e ${EXCLUDE} ${TESTGROUP} ${${TESTGROUP}:S/ */ /} > ${.TARGET} + +CLEANFILES+= ${TESTWRAPPER}.sh + +.PATH: ${TESTSRC} + +PROGS= ${CFILES:T:S/.c$/.exe/g} +.for prog in ${PROGS} +SRCS.${prog}+= ${prog:S/.exe$/.c/} *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***