From owner-svn-src-projects@FreeBSD.ORG Tue Apr 14 20:08:43 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A22781F7; Tue, 14 Apr 2015 20:08:43 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 88FAE98F; Tue, 14 Apr 2015 20:08:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3EK8h1U074462; Tue, 14 Apr 2015 20:08:43 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3EK8cFM074445; Tue, 14 Apr 2015 20:08:38 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201504142008.t3EK8cFM074445@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Tue, 14 Apr 2015 20:08:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r281539 - in projects/sendfile: . contrib/nvi contrib/nvi/catalog contrib/nvi/cl contrib/nvi/common contrib/nvi/docs contrib/nvi/docs/USD.doc contrib/nvi/docs/internals contrib/nvi/docs... 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, 14 Apr 2015 20:08:43 -0000 Author: glebius Date: Tue Apr 14 20:08:37 2015 New Revision: 281539 URL: https://svnweb.freebsd.org/changeset/base/281539 Log: Merge head r261119 through r281537. Added: projects/sendfile/contrib/nvi/docs/man/ - copied from r281537, head/contrib/nvi/docs/man/ projects/sendfile/sys/arm/conf/VIRT - copied unchanged from r281537, head/sys/arm/conf/VIRT projects/sendfile/sys/arm/qemu/ - copied from r281537, head/sys/arm/qemu/ projects/sendfile/sys/arm64/arm64/ - copied from r281537, head/sys/arm64/arm64/ projects/sendfile/sys/arm64/conf/ - copied from r281537, head/sys/arm64/conf/ projects/sendfile/sys/arm64/include/_bus.h - copied unchanged from r281537, head/sys/arm64/include/_bus.h projects/sendfile/sys/arm64/include/armreg.h - copied unchanged from r281537, head/sys/arm64/include/armreg.h projects/sendfile/sys/arm64/include/bus.h - copied unchanged from r281537, head/sys/arm64/include/bus.h projects/sendfile/sys/arm64/include/bus_dma.h - copied unchanged from r281537, head/sys/arm64/include/bus_dma.h projects/sendfile/sys/arm64/include/clock.h - copied unchanged from r281537, head/sys/arm64/include/clock.h projects/sendfile/sys/arm64/include/counter.h - copied unchanged from r281537, head/sys/arm64/include/counter.h projects/sendfile/sys/arm64/include/db_machdep.h - copied unchanged from r281537, head/sys/arm64/include/db_machdep.h projects/sendfile/sys/arm64/include/debug_monitor.h - copied unchanged from r281537, head/sys/arm64/include/debug_monitor.h projects/sendfile/sys/arm64/include/devmap.h - copied unchanged from r281537, head/sys/arm64/include/devmap.h projects/sendfile/sys/arm64/include/dump.h - copied unchanged from r281537, head/sys/arm64/include/dump.h projects/sendfile/sys/arm64/include/hypervisor.h - copied unchanged from r281537, head/sys/arm64/include/hypervisor.h projects/sendfile/sys/arm64/include/in_cksum.h - copied unchanged from r281537, head/sys/arm64/include/in_cksum.h projects/sendfile/sys/arm64/include/intr.h - copied unchanged from r281537, head/sys/arm64/include/intr.h projects/sendfile/sys/arm64/include/kdb.h - copied unchanged from r281537, head/sys/arm64/include/kdb.h projects/sendfile/sys/arm64/include/machdep.h - copied unchanged from r281537, head/sys/arm64/include/machdep.h projects/sendfile/sys/arm64/include/md_var.h - copied unchanged from r281537, head/sys/arm64/include/md_var.h projects/sendfile/sys/arm64/include/memdev.h - copied unchanged from r281537, head/sys/arm64/include/memdev.h projects/sendfile/sys/arm64/include/metadata.h - copied unchanged from r281537, head/sys/arm64/include/metadata.h projects/sendfile/sys/arm64/include/ofw_machdep.h - copied unchanged from r281537, head/sys/arm64/include/ofw_machdep.h projects/sendfile/sys/arm64/include/psl.h - copied unchanged from r281537, head/sys/arm64/include/psl.h projects/sendfile/sys/arm64/include/resource.h - copied unchanged from r281537, head/sys/arm64/include/resource.h projects/sendfile/sys/arm64/include/sf_buf.h - copied unchanged from r281537, head/sys/arm64/include/sf_buf.h projects/sendfile/sys/arm64/include/smp.h - copied unchanged from r281537, head/sys/arm64/include/smp.h projects/sendfile/sys/arm64/include/stack.h - copied unchanged from r281537, head/sys/arm64/include/stack.h projects/sendfile/sys/arm64/include/trap.h - copied unchanged from r281537, head/sys/arm64/include/trap.h projects/sendfile/sys/arm64/include/vfp.h - copied unchanged from r281537, head/sys/arm64/include/vfp.h projects/sendfile/sys/boot/Makefile.arm64 - copied unchanged from r281537, head/sys/boot/Makefile.arm64 projects/sendfile/sys/boot/arm64/ - copied from r281537, head/sys/boot/arm64/ projects/sendfile/sys/boot/efi/boot1/fat-arm64.tmpl.bz2.uu - copied unchanged from r281537, head/sys/boot/efi/boot1/fat-arm64.tmpl.bz2.uu projects/sendfile/sys/boot/efi/include/arm64/ - copied from r281537, head/sys/boot/efi/include/arm64/ projects/sendfile/sys/boot/efi/loader/arch/arm64/ - copied from r281537, head/sys/boot/efi/loader/arch/arm64/ projects/sendfile/sys/boot/efi/loader/arch/i386/Makefile.inc - copied unchanged from r281537, head/sys/boot/efi/loader/arch/i386/Makefile.inc projects/sendfile/sys/boot/fdt/dts/arm/meson8b.dtsi - copied unchanged from r281537, head/sys/boot/fdt/dts/arm/meson8b.dtsi projects/sendfile/sys/conf/Makefile.arm64 - copied unchanged from r281537, head/sys/conf/Makefile.arm64 projects/sendfile/sys/conf/files.arm64 - copied unchanged from r281537, head/sys/conf/files.arm64 projects/sendfile/sys/conf/ldscript.arm64 - copied unchanged from r281537, head/sys/conf/ldscript.arm64 projects/sendfile/sys/conf/options.arm64 - copied unchanged from r281537, head/sys/conf/options.arm64 projects/sendfile/sys/dev/fdt/fdt_arm64.c - copied unchanged from r281537, head/sys/dev/fdt/fdt_arm64.c projects/sendfile/sys/dev/psci/ - copied from r281537, head/sys/dev/psci/ Deleted: projects/sendfile/contrib/nvi/catalog/spell.ok projects/sendfile/contrib/nvi/docs/TODO projects/sendfile/contrib/nvi/docs/USD.doc/ projects/sendfile/contrib/nvi/docs/changelog projects/sendfile/contrib/nvi/docs/ev projects/sendfile/contrib/nvi/docs/features projects/sendfile/contrib/nvi/docs/help projects/sendfile/contrib/nvi/docs/internals/ projects/sendfile/contrib/nvi/docs/interp/ projects/sendfile/contrib/nvi/docs/spell.ok projects/sendfile/contrib/nvi/docs/tutorial/ projects/sendfile/share/doc/usd/10.exref/ projects/sendfile/share/doc/usd/11.vitut/ projects/sendfile/share/doc/usd/12.vi/ projects/sendfile/share/doc/usd/13.viref/ projects/sendfile/tools/regression/sockets/so_setfib/so_setfib.t Modified: projects/sendfile/ObsoleteFiles.inc projects/sendfile/README projects/sendfile/contrib/nvi/README projects/sendfile/contrib/nvi/catalog/dump.c projects/sendfile/contrib/nvi/cl/cl.h projects/sendfile/contrib/nvi/cl/cl_funcs.c projects/sendfile/contrib/nvi/cl/cl_main.c projects/sendfile/contrib/nvi/cl/cl_read.c projects/sendfile/contrib/nvi/cl/cl_screen.c projects/sendfile/contrib/nvi/cl/cl_term.c projects/sendfile/contrib/nvi/cl/extern.h projects/sendfile/contrib/nvi/common/common.h projects/sendfile/contrib/nvi/common/conv.c projects/sendfile/contrib/nvi/common/cut.c projects/sendfile/contrib/nvi/common/delete.c projects/sendfile/contrib/nvi/common/encoding.c projects/sendfile/contrib/nvi/common/exf.c projects/sendfile/contrib/nvi/common/extern.h projects/sendfile/contrib/nvi/common/gs.h projects/sendfile/contrib/nvi/common/key.c projects/sendfile/contrib/nvi/common/line.c projects/sendfile/contrib/nvi/common/log.c projects/sendfile/contrib/nvi/common/main.c projects/sendfile/contrib/nvi/common/mark.c projects/sendfile/contrib/nvi/common/msg.c projects/sendfile/contrib/nvi/common/options.c projects/sendfile/contrib/nvi/common/options.h projects/sendfile/contrib/nvi/common/options_f.c projects/sendfile/contrib/nvi/common/put.c projects/sendfile/contrib/nvi/common/recover.c projects/sendfile/contrib/nvi/common/screen.c projects/sendfile/contrib/nvi/common/search.c projects/sendfile/contrib/nvi/common/seq.c projects/sendfile/contrib/nvi/common/util.c projects/sendfile/contrib/nvi/ex/ex.c projects/sendfile/contrib/nvi/ex/ex.h projects/sendfile/contrib/nvi/ex/ex_abbrev.c projects/sendfile/contrib/nvi/ex/ex_append.c projects/sendfile/contrib/nvi/ex/ex_args.c projects/sendfile/contrib/nvi/ex/ex_argv.c projects/sendfile/contrib/nvi/ex/ex_at.c projects/sendfile/contrib/nvi/ex/ex_bang.c projects/sendfile/contrib/nvi/ex/ex_cd.c projects/sendfile/contrib/nvi/ex/ex_cscope.c projects/sendfile/contrib/nvi/ex/ex_delete.c projects/sendfile/contrib/nvi/ex/ex_display.c projects/sendfile/contrib/nvi/ex/ex_edit.c projects/sendfile/contrib/nvi/ex/ex_equal.c projects/sendfile/contrib/nvi/ex/ex_file.c projects/sendfile/contrib/nvi/ex/ex_filter.c projects/sendfile/contrib/nvi/ex/ex_global.c projects/sendfile/contrib/nvi/ex/ex_init.c projects/sendfile/contrib/nvi/ex/ex_join.c projects/sendfile/contrib/nvi/ex/ex_map.c projects/sendfile/contrib/nvi/ex/ex_mark.c projects/sendfile/contrib/nvi/ex/ex_mkexrc.c projects/sendfile/contrib/nvi/ex/ex_move.c projects/sendfile/contrib/nvi/ex/ex_open.c projects/sendfile/contrib/nvi/ex/ex_preserve.c projects/sendfile/contrib/nvi/ex/ex_print.c projects/sendfile/contrib/nvi/ex/ex_put.c projects/sendfile/contrib/nvi/ex/ex_quit.c projects/sendfile/contrib/nvi/ex/ex_read.c projects/sendfile/contrib/nvi/ex/ex_screen.c projects/sendfile/contrib/nvi/ex/ex_script.c projects/sendfile/contrib/nvi/ex/ex_set.c projects/sendfile/contrib/nvi/ex/ex_shell.c projects/sendfile/contrib/nvi/ex/ex_shift.c projects/sendfile/contrib/nvi/ex/ex_source.c projects/sendfile/contrib/nvi/ex/ex_stop.c projects/sendfile/contrib/nvi/ex/ex_subst.c projects/sendfile/contrib/nvi/ex/ex_tag.c projects/sendfile/contrib/nvi/ex/ex_txt.c projects/sendfile/contrib/nvi/ex/ex_undo.c projects/sendfile/contrib/nvi/ex/ex_usage.c projects/sendfile/contrib/nvi/ex/ex_util.c projects/sendfile/contrib/nvi/ex/ex_version.c projects/sendfile/contrib/nvi/ex/ex_visual.c projects/sendfile/contrib/nvi/ex/ex_write.c projects/sendfile/contrib/nvi/ex/ex_yank.c projects/sendfile/contrib/nvi/ex/ex_z.c projects/sendfile/contrib/nvi/ex/extern.h projects/sendfile/contrib/nvi/ex/version.h projects/sendfile/contrib/nvi/regex/COPYRIGHT projects/sendfile/contrib/nvi/regex/cclass.h projects/sendfile/contrib/nvi/regex/cname.h projects/sendfile/contrib/nvi/regex/engine.c projects/sendfile/contrib/nvi/regex/re_format.7 projects/sendfile/contrib/nvi/regex/regcomp.c projects/sendfile/contrib/nvi/regex/regerror.c projects/sendfile/contrib/nvi/regex/regex.3 projects/sendfile/contrib/nvi/regex/regex.h projects/sendfile/contrib/nvi/regex/regex2.h projects/sendfile/contrib/nvi/regex/regexec.c projects/sendfile/contrib/nvi/regex/regfree.c projects/sendfile/contrib/nvi/regex/utils.h projects/sendfile/contrib/nvi/vi/extern.h projects/sendfile/contrib/nvi/vi/getc.c projects/sendfile/contrib/nvi/vi/v_at.c projects/sendfile/contrib/nvi/vi/v_ch.c projects/sendfile/contrib/nvi/vi/v_delete.c projects/sendfile/contrib/nvi/vi/v_ex.c projects/sendfile/contrib/nvi/vi/v_increment.c projects/sendfile/contrib/nvi/vi/v_init.c projects/sendfile/contrib/nvi/vi/v_itxt.c projects/sendfile/contrib/nvi/vi/v_left.c projects/sendfile/contrib/nvi/vi/v_mark.c projects/sendfile/contrib/nvi/vi/v_match.c projects/sendfile/contrib/nvi/vi/v_paragraph.c projects/sendfile/contrib/nvi/vi/v_put.c projects/sendfile/contrib/nvi/vi/v_redraw.c projects/sendfile/contrib/nvi/vi/v_replace.c projects/sendfile/contrib/nvi/vi/v_right.c projects/sendfile/contrib/nvi/vi/v_screen.c projects/sendfile/contrib/nvi/vi/v_scroll.c projects/sendfile/contrib/nvi/vi/v_search.c projects/sendfile/contrib/nvi/vi/v_section.c projects/sendfile/contrib/nvi/vi/v_sentence.c projects/sendfile/contrib/nvi/vi/v_status.c projects/sendfile/contrib/nvi/vi/v_txt.c projects/sendfile/contrib/nvi/vi/v_ulcase.c projects/sendfile/contrib/nvi/vi/v_undo.c projects/sendfile/contrib/nvi/vi/v_util.c projects/sendfile/contrib/nvi/vi/v_word.c projects/sendfile/contrib/nvi/vi/v_xchar.c projects/sendfile/contrib/nvi/vi/v_yank.c projects/sendfile/contrib/nvi/vi/v_z.c projects/sendfile/contrib/nvi/vi/v_zexit.c projects/sendfile/contrib/nvi/vi/vi.c projects/sendfile/contrib/nvi/vi/vi.h projects/sendfile/contrib/nvi/vi/vs_line.c projects/sendfile/contrib/nvi/vi/vs_msg.c projects/sendfile/contrib/nvi/vi/vs_refresh.c projects/sendfile/contrib/nvi/vi/vs_relative.c projects/sendfile/contrib/nvi/vi/vs_smap.c projects/sendfile/contrib/nvi/vi/vs_split.c projects/sendfile/etc/mtree/BSD.usr.dist projects/sendfile/lib/libc/sys/mount.2 projects/sendfile/lib/liblzma/Makefile projects/sendfile/lib/liblzma/Symbol.map projects/sendfile/lib/liblzma/config.h projects/sendfile/share/doc/usd/Makefile projects/sendfile/share/mk/bsd.progs.mk projects/sendfile/share/mk/src.libnames.mk projects/sendfile/sys/amd64/include/metadata.h projects/sendfile/sys/arm/amlogic/aml8726/aml8726_clkmsr.c projects/sendfile/sys/arm/amlogic/aml8726/aml8726_i2c.c projects/sendfile/sys/arm/amlogic/aml8726/aml8726_identsoc.c projects/sendfile/sys/arm/amlogic/aml8726/aml8726_machdep.c projects/sendfile/sys/arm/amlogic/aml8726/aml8726_mmc.c projects/sendfile/sys/arm/amlogic/aml8726/aml8726_soc.h projects/sendfile/sys/arm/amlogic/aml8726/aml8726_timer.c projects/sendfile/sys/arm/amlogic/aml8726/aml8726_wdt.c projects/sendfile/sys/arm/amlogic/aml8726/uart_dev_aml8726.c projects/sendfile/sys/arm/arm/devmap.c projects/sendfile/sys/arm/arm/pmap-v6-new.c projects/sendfile/sys/arm/arm/pmap-v6.c projects/sendfile/sys/arm/arm/pmap.c projects/sendfile/sys/arm/freescale/vybrid/vf_uart.c projects/sendfile/sys/arm/include/pmap-v6.h projects/sendfile/sys/arm/include/pmap.h projects/sendfile/sys/arm/samsung/exynos/exynos_uart.c projects/sendfile/sys/arm/samsung/s3c2xx0/uart_dev_s3c2410.c projects/sendfile/sys/arm64/include/cpufunc.h projects/sendfile/sys/arm64/include/pmap.h projects/sendfile/sys/boot/Makefile.arm projects/sendfile/sys/boot/common/Makefile.inc projects/sendfile/sys/boot/efi/Makefile projects/sendfile/sys/boot/efi/boot1/Makefile projects/sendfile/sys/boot/efi/boot1/generate-fat.sh projects/sendfile/sys/boot/efi/fdt/Makefile projects/sendfile/sys/boot/efi/libefi/Makefile projects/sendfile/sys/boot/efi/loader/Makefile projects/sendfile/sys/boot/efi/loader/arch/amd64/Makefile.inc projects/sendfile/sys/boot/efi/loader/arch/arm/Makefile.inc projects/sendfile/sys/boot/efi/loader/arch/arm/ldscript.arm projects/sendfile/sys/boot/efi/loader/arch/arm/start.S projects/sendfile/sys/boot/efi/loader/arch/i386/elf32_freebsd.c projects/sendfile/sys/boot/efi/loader/bootinfo.c projects/sendfile/sys/boot/efi/loader/copy.c projects/sendfile/sys/boot/fdt/dts/arm/odroidc1.dts projects/sendfile/sys/boot/fdt/dts/arm/vsatv102-m6.dts projects/sendfile/sys/cam/cam_xpt.c projects/sendfile/sys/compat/svr4/svr4_stream.c projects/sendfile/sys/conf/files.arm projects/sendfile/sys/conf/options.i386 projects/sendfile/sys/contrib/dev/acpica/acpica_prep.sh projects/sendfile/sys/contrib/dev/acpica/changes.txt projects/sendfile/sys/contrib/dev/acpica/common/adfile.c projects/sendfile/sys/contrib/dev/acpica/common/adisasm.c projects/sendfile/sys/contrib/dev/acpica/common/dmtable.c projects/sendfile/sys/contrib/dev/acpica/common/dmtbdump.c projects/sendfile/sys/contrib/dev/acpica/common/dmtbinfo.c projects/sendfile/sys/contrib/dev/acpica/compiler/aslcodegen.c projects/sendfile/sys/contrib/dev/acpica/compiler/aslcompile.c projects/sendfile/sys/contrib/dev/acpica/compiler/aslcompiler.h projects/sendfile/sys/contrib/dev/acpica/compiler/asldefine.h projects/sendfile/sys/contrib/dev/acpica/compiler/aslfold.c projects/sendfile/sys/contrib/dev/acpica/compiler/asllisting.c projects/sendfile/sys/contrib/dev/acpica/compiler/aslmain.c projects/sendfile/sys/contrib/dev/acpica/compiler/aslmap.c projects/sendfile/sys/contrib/dev/acpica/compiler/aslmapenter.c projects/sendfile/sys/contrib/dev/acpica/compiler/asloptions.c projects/sendfile/sys/contrib/dev/acpica/compiler/aslrules.y projects/sendfile/sys/contrib/dev/acpica/compiler/aslstartup.c projects/sendfile/sys/contrib/dev/acpica/compiler/asltree.c projects/sendfile/sys/contrib/dev/acpica/compiler/asltypes.y projects/sendfile/sys/contrib/dev/acpica/compiler/aslutils.c projects/sendfile/sys/contrib/dev/acpica/compiler/aslwalks.c projects/sendfile/sys/contrib/dev/acpica/compiler/dtcompile.c projects/sendfile/sys/contrib/dev/acpica/compiler/dtcompiler.h projects/sendfile/sys/contrib/dev/acpica/compiler/dtio.c projects/sendfile/sys/contrib/dev/acpica/compiler/dttable.c projects/sendfile/sys/contrib/dev/acpica/compiler/dttemplate.h projects/sendfile/sys/contrib/dev/acpica/compiler/dtutils.c projects/sendfile/sys/contrib/dev/acpica/components/debugger/dbmethod.c projects/sendfile/sys/contrib/dev/acpica/components/debugger/dbxface.c projects/sendfile/sys/contrib/dev/acpica/components/disassembler/dmopcode.c projects/sendfile/sys/contrib/dev/acpica/components/disassembler/dmwalk.c projects/sendfile/sys/contrib/dev/acpica/components/dispatcher/dsopcode.c projects/sendfile/sys/contrib/dev/acpica/components/dispatcher/dsutils.c projects/sendfile/sys/contrib/dev/acpica/components/events/evregion.c projects/sendfile/sys/contrib/dev/acpica/components/events/evxfevnt.c projects/sendfile/sys/contrib/dev/acpica/components/executer/exdump.c projects/sendfile/sys/contrib/dev/acpica/components/executer/exfldio.c projects/sendfile/sys/contrib/dev/acpica/components/executer/exoparg3.c projects/sendfile/sys/contrib/dev/acpica/components/executer/exregion.c projects/sendfile/sys/contrib/dev/acpica/components/hardware/hwgpe.c projects/sendfile/sys/contrib/dev/acpica/components/hardware/hwvalid.c projects/sendfile/sys/contrib/dev/acpica/components/namespace/nsdump.c projects/sendfile/sys/contrib/dev/acpica/components/parser/psopcode.c projects/sendfile/sys/contrib/dev/acpica/components/parser/psopinfo.c projects/sendfile/sys/contrib/dev/acpica/components/resources/rsaddr.c projects/sendfile/sys/contrib/dev/acpica/components/resources/rsdump.c projects/sendfile/sys/contrib/dev/acpica/components/resources/rsdumpinfo.c projects/sendfile/sys/contrib/dev/acpica/components/resources/rsxface.c projects/sendfile/sys/contrib/dev/acpica/components/tables/tbdata.c projects/sendfile/sys/contrib/dev/acpica/components/tables/tbinstal.c projects/sendfile/sys/contrib/dev/acpica/components/tables/tbprint.c projects/sendfile/sys/contrib/dev/acpica/components/tables/tbxfroot.c projects/sendfile/sys/contrib/dev/acpica/components/utilities/utaddress.c projects/sendfile/sys/contrib/dev/acpica/components/utilities/utbuffer.c projects/sendfile/sys/contrib/dev/acpica/components/utilities/utglobal.c projects/sendfile/sys/contrib/dev/acpica/components/utilities/utmisc.c projects/sendfile/sys/contrib/dev/acpica/components/utilities/utosi.c projects/sendfile/sys/contrib/dev/acpica/components/utilities/utprint.c projects/sendfile/sys/contrib/dev/acpica/components/utilities/utstate.c projects/sendfile/sys/contrib/dev/acpica/components/utilities/utuuid.c projects/sendfile/sys/contrib/dev/acpica/include/acdebug.h projects/sendfile/sys/contrib/dev/acpica/include/acdisasm.h projects/sendfile/sys/contrib/dev/acpica/include/acglobal.h projects/sendfile/sys/contrib/dev/acpica/include/aclocal.h projects/sendfile/sys/contrib/dev/acpica/include/acmacros.h projects/sendfile/sys/contrib/dev/acpica/include/acopcode.h projects/sendfile/sys/contrib/dev/acpica/include/acpixf.h projects/sendfile/sys/contrib/dev/acpica/include/acresrc.h projects/sendfile/sys/contrib/dev/acpica/include/acrestyp.h projects/sendfile/sys/contrib/dev/acpica/include/acstruct.h projects/sendfile/sys/contrib/dev/acpica/include/actables.h projects/sendfile/sys/contrib/dev/acpica/include/actbl2.h projects/sendfile/sys/contrib/dev/acpica/include/actypes.h projects/sendfile/sys/contrib/dev/acpica/include/acutils.h projects/sendfile/sys/contrib/dev/acpica/include/amlcode.h projects/sendfile/sys/contrib/dev/acpica/include/platform/acenv.h projects/sendfile/sys/contrib/x86emu/x86emu.c projects/sendfile/sys/dev/acpica/acpi_pcib_acpi.c projects/sendfile/sys/dev/acpica/acpi_resource.c projects/sendfile/sys/dev/acpica/acpivar.h projects/sendfile/sys/dev/atkbdc/psm.c projects/sendfile/sys/dev/fdt/fdt_pinctrl.c projects/sendfile/sys/dev/hptnr/README projects/sendfile/sys/dev/hptnr/amd64-elf.hptnr_lib.o.uu projects/sendfile/sys/dev/hptnr/him.h projects/sendfile/sys/dev/hptnr/hptintf.h projects/sendfile/sys/dev/hptnr/hptnr_config.c projects/sendfile/sys/dev/hptnr/hptnr_config.h projects/sendfile/sys/dev/hptnr/hptnr_osm_bsd.c projects/sendfile/sys/dev/hptnr/i386-elf.hptnr_lib.o.uu projects/sendfile/sys/dev/hptnr/ldm.h projects/sendfile/sys/dev/hptnr/os_bsd.h projects/sendfile/sys/dev/iwn/if_iwn.c projects/sendfile/sys/dev/netmap/netmap.c projects/sendfile/sys/dev/streams/streams.c projects/sendfile/sys/dev/uart/uart_bus.h projects/sendfile/sys/dev/uart/uart_bus_fdt.c projects/sendfile/sys/dev/uart/uart_core.c projects/sendfile/sys/dev/uart/uart_cpu.h projects/sendfile/sys/dev/uart/uart_cpu_fdt.c projects/sendfile/sys/dev/uart/uart_dev_imx.c projects/sendfile/sys/dev/uart/uart_dev_lpc.c projects/sendfile/sys/dev/uart/uart_dev_msm.c projects/sendfile/sys/dev/uart/uart_dev_ns8250.c projects/sendfile/sys/dev/uart/uart_dev_pl011.c projects/sendfile/sys/dev/uart/uart_dev_quicc.c projects/sendfile/sys/dev/uart/uart_dev_sab82532.c projects/sendfile/sys/dev/uart/uart_dev_ti8250.c projects/sendfile/sys/dev/uart/uart_dev_z8530.c projects/sendfile/sys/dev/usb/controller/ehci_pci.c projects/sendfile/sys/dev/usb/controller/uhci_pci.c projects/sendfile/sys/dev/usb/controller/xhci_pci.c projects/sendfile/sys/dev/usb/serial/uftdi.c projects/sendfile/sys/dev/vt/vt_font.c projects/sendfile/sys/fs/tmpfs/tmpfs_vnops.c projects/sendfile/sys/gnu/dts/arm/meson.dtsi projects/sendfile/sys/gnu/dts/arm/meson6.dtsi projects/sendfile/sys/gnu/dts/arm/meson8.dtsi projects/sendfile/sys/i386/i386/bios.c projects/sendfile/sys/i386/i386/initcpu.c projects/sendfile/sys/i386/i386/locore.s projects/sendfile/sys/i386/i386/machdep.c projects/sendfile/sys/i386/i386/minidump_machdep.c projects/sendfile/sys/i386/i386/mpboot.s projects/sendfile/sys/i386/i386/pmap.c projects/sendfile/sys/i386/i386/swtch.s projects/sendfile/sys/i386/i386/trap.c projects/sendfile/sys/i386/i386/vm86bios.s projects/sendfile/sys/i386/i386/vm_machdep.c projects/sendfile/sys/i386/include/param.h projects/sendfile/sys/i386/include/pmap.h projects/sendfile/sys/i386/include/vmparam.h projects/sendfile/sys/kern/kern_descrip.c projects/sendfile/sys/kern/kern_fork.c projects/sendfile/sys/kern/kern_poll.c projects/sendfile/sys/kern/kern_timeout.c projects/sendfile/sys/kern/sys_pipe.c projects/sendfile/sys/kern/tty_pts.c projects/sendfile/sys/kern/uipc_mqueue.c projects/sendfile/sys/kern/uipc_sem.c projects/sendfile/sys/kern/uipc_shm.c projects/sendfile/sys/kern/uipc_syscalls.c projects/sendfile/sys/mips/adm5120/uart_dev_adm5120.c projects/sendfile/sys/mips/atheros/uart_dev_ar933x.c projects/sendfile/sys/mips/cavium/uart_dev_oct16550.c projects/sendfile/sys/mips/conf/CARAMBOLA2.hints projects/sendfile/sys/mips/rt305x/uart_dev_rt305x.c projects/sendfile/sys/net/if_types.h projects/sendfile/sys/net80211/ieee80211_mesh.c projects/sendfile/sys/netinet/ip_input.c projects/sendfile/sys/netinet/sctp_syscalls.c projects/sendfile/sys/netinet6/in6_mcast.c projects/sendfile/sys/netinet6/nd6.c projects/sendfile/sys/netpfil/pf/pf.c projects/sendfile/sys/netpfil/pf/pf_norm.c projects/sendfile/sys/ofed/include/linux/file.h projects/sendfile/sys/sparc64/pci/sbbc.c projects/sendfile/sys/sys/cdefs.h projects/sendfile/sys/sys/filedesc.h projects/sendfile/sys/sys/kerneldump.h projects/sendfile/sys/sys/module.h projects/sendfile/sys/sys/mouse.h projects/sendfile/sys/sys/socketvar.h projects/sendfile/sys/vm/uma_core.c projects/sendfile/sys/vm/uma_int.h projects/sendfile/sys/vm/vm_reserv.c projects/sendfile/sys/x86/acpica/OsdEnvironment.c projects/sendfile/sys/x86/acpica/acpi_wakeup.c projects/sendfile/tools/regression/sockets/pr_atomic/Makefile projects/sendfile/tools/regression/sockets/pr_atomic/pr_atomic.c projects/sendfile/tools/regression/sockets/reconnect/Makefile projects/sendfile/tools/regression/sockets/reconnect/reconnect.c projects/sendfile/tools/regression/sockets/rtsocket/Makefile projects/sendfile/tools/regression/sockets/rtsocket/rtsocket.c projects/sendfile/tools/regression/sockets/sblock/Makefile projects/sendfile/tools/regression/sockets/sblock/sblock.c projects/sendfile/tools/regression/sockets/sendfile/sendfile.c projects/sendfile/tools/regression/sockets/shutdown/Makefile projects/sendfile/tools/regression/sockets/shutdown/shutdown.c projects/sendfile/tools/regression/sockets/sigpipe/Makefile projects/sendfile/tools/regression/sockets/sigpipe/sigpipe.c projects/sendfile/tools/regression/sockets/so_setfib/Makefile projects/sendfile/tools/regression/sockets/so_setfib/so_setfib.c projects/sendfile/tools/regression/sockets/socketpair/Makefile projects/sendfile/tools/regression/sockets/socketpair/socketpair.c projects/sendfile/tools/regression/sockets/unix_bindconnect/Makefile projects/sendfile/tools/regression/sockets/unix_bindconnect/unix_bindconnect.c projects/sendfile/tools/regression/sockets/unix_close_race/Makefile projects/sendfile/tools/regression/sockets/unix_close_race/unix_close_race.c projects/sendfile/tools/regression/sockets/unix_sendtorace/Makefile projects/sendfile/tools/regression/sockets/unix_sendtorace/unix_sendtorace.c projects/sendfile/tools/regression/sockets/unix_socket/Makefile projects/sendfile/tools/regression/sockets/unix_socket/unix_socket.c projects/sendfile/tools/regression/sockets/unix_sorflush/Makefile projects/sendfile/tools/regression/sockets/unix_sorflush/unix_sorflush.c projects/sendfile/tools/regression/sockets/zerosend/zerosend.c projects/sendfile/usr.bin/Makefile projects/sendfile/usr.bin/gzip/gzip.1 projects/sendfile/usr.bin/gzip/gzip.c projects/sendfile/usr.bin/ipcs/Makefile projects/sendfile/usr.bin/ipcs/ipc.c projects/sendfile/usr.bin/ipcs/ipc.h projects/sendfile/usr.bin/ipcs/ipcs.c projects/sendfile/usr.bin/iscsictl/Makefile projects/sendfile/usr.bin/iscsictl/iscsictl.c projects/sendfile/usr.bin/iscsictl/parse.y projects/sendfile/usr.bin/iscsictl/periphs.c projects/sendfile/usr.bin/vi/Makefile projects/sendfile/usr.sbin/bluetooth/hccontrol/hccontrol.c projects/sendfile/usr.sbin/bluetooth/hccontrol/util.c projects/sendfile/usr.sbin/ctld/discovery.c projects/sendfile/usr.sbin/ctld/isns.c projects/sendfile/usr.sbin/ctld/keys.c projects/sendfile/usr.sbin/ctld/login.c projects/sendfile/usr.sbin/ctld/parse.y projects/sendfile/usr.sbin/ctld/pdu.c projects/sendfile/usr.sbin/ctld/token.l projects/sendfile/usr.sbin/fifolog/fifolog_reader/Makefile projects/sendfile/usr.sbin/fifolog/fifolog_writer/Makefile Directory Properties: projects/sendfile/ (props changed) projects/sendfile/contrib/nvi/ (props changed) projects/sendfile/etc/ (props changed) projects/sendfile/lib/libc/ (props changed) projects/sendfile/share/ (props changed) projects/sendfile/sys/ (props changed) projects/sendfile/sys/boot/ (props changed) projects/sendfile/sys/conf/ (props changed) projects/sendfile/sys/contrib/dev/acpica/ (props changed) projects/sendfile/sys/contrib/x86emu/ (props changed) projects/sendfile/sys/gnu/dts/ (props changed) projects/sendfile/sys/gnu/dts/arm/ (props changed) Modified: projects/sendfile/ObsoleteFiles.inc ============================================================================== --- projects/sendfile/ObsoleteFiles.inc Tue Apr 14 20:05:26 2015 (r281538) +++ projects/sendfile/ObsoleteFiles.inc Tue Apr 14 20:08:37 2015 (r281539) @@ -38,6 +38,18 @@ # xargs -n1 | sort | uniq -d; # done +# 20150410 +OLD_FILES+=usr/share/doc/usd/10.exref/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/10.exref/summary.ascii.gz +OLD_DIRS+=usr/share/doc/usd/10.exref +OLD_FILES+=usr/share/doc/usd/11.edit/paper.ascii.gz +OLD_DIRS+=usr/share/doc/usd/11.edit +OLD_FILES+=usr/share/doc/usd/12.vi/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/12.vi/summary.ascii.gz +OLD_FILES+=usr/share/doc/usd/12.vi/viapwh.ascii.gz +OLD_DIRS+=usr/share/doc/usd/12.vi +OLD_FILES+=usr/share/doc/usd/13.viref/paper.ascii.gz +OLD_DIRS+=usr/share/doc/usd/13.viref # 20150329 .if ${TARGET_ARCH} == "arm" OLD_FILES+=usr/include/bootconfig.h Modified: projects/sendfile/README ============================================================================== --- projects/sendfile/README Tue Apr 14 20:05:26 2015 (r281538) +++ projects/sendfile/README Tue Apr 14 20:08:37 2015 (r281539) @@ -34,9 +34,7 @@ The sample kernel configuration files re sub-directory (assuming that you've installed the kernel sources), the file named GENERIC being the one used to build your initial installation kernel. The file NOTES contains entries and documentation for all possible -devices, not just those commonly used. It is the successor of the ancient -LINT file, but in contrast to LINT, it is not buildable as a kernel but a -pure reference and documentation file. +devices, not just those commonly used. Source Roadmap: @@ -77,6 +75,9 @@ share Shared resources. sys Kernel sources. +tests Regression tests which can be run by Kyua. See tests/README + for additional information. + tools Utilities for regression testing and miscellaneous tasks. usr.bin User commands. Modified: projects/sendfile/contrib/nvi/README ============================================================================== --- projects/sendfile/contrib/nvi/README Tue Apr 14 20:05:26 2015 (r281538) +++ projects/sendfile/contrib/nvi/README Tue Apr 14 20:08:37 2015 (r281539) @@ -1,6 +1,6 @@ -# $Id: README,v 9.1 2013/11/02 02:50:23 zy Exp $ +# $Id: README,v 9.2 2015/04/08 17:18:56 zy Exp $ -This is version 2.1.2 (2012-11-02) of nex/nvi, a reimplementation of the ex/vi +This is version 2.1.3 (2015-04-08) of nex/nvi, a reimplementation of the ex/vi text editors originally distributed as part of the Fourth Berkeley Software Distribution (4BSD), by the University of California, Berkeley. Modified: projects/sendfile/contrib/nvi/catalog/dump.c ============================================================================== --- projects/sendfile/contrib/nvi/catalog/dump.c Tue Apr 14 20:05:26 2015 (r281538) +++ projects/sendfile/contrib/nvi/catalog/dump.c Tue Apr 14 20:08:37 2015 (r281539) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -32,12 +28,6 @@ */ #ifndef lint -static char copyright[] = -"@(#) Copyright (c) 1992, 1993, 1994\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#ifndef lint static char sccsid[] = "@(#)dump.c 8.1 (Berkeley) 8/31/94"; #endif /* not lint */ @@ -45,8 +35,7 @@ static char sccsid[] = "@(#)dump.c 8.1 ( #include static void -parse(fp) - FILE *fp; +parse(FILE *fp) { int ch, s1, s2, s3; @@ -96,9 +85,7 @@ parse(fp) } int -main(argc, argv) - int argc; - char *argv[]; +main(int argc, char *argv[]) { FILE *fp; Modified: projects/sendfile/contrib/nvi/cl/cl.h ============================================================================== --- projects/sendfile/contrib/nvi/cl/cl.h Tue Apr 14 20:05:26 2015 (r281538) +++ projects/sendfile/contrib/nvi/cl/cl.h Tue Apr 14 20:08:37 2015 (r281539) @@ -80,16 +80,4 @@ typedef enum { INP_OK=0, INP_EOF, INP_ER #define RCNO(sp, cno) (cno) #define RLNO(sp, lno) (lno) -/* - * XXX - * Some implementations of curses.h don't define these for us. Used for - * compatibility only. - */ -#ifndef TRUE -#define TRUE 1 -#endif -#ifndef FALSE -#define FALSE 0 -#endif - #include "extern.h" Modified: projects/sendfile/contrib/nvi/cl/cl_funcs.c ============================================================================== --- projects/sendfile/contrib/nvi/cl/cl_funcs.c Tue Apr 14 20:05:26 2015 (r281538) +++ projects/sendfile/contrib/nvi/cl/cl_funcs.c Tue Apr 14 20:08:37 2015 (r281539) @@ -33,7 +33,7 @@ static const char sccsid[] = "$Id: cl_fu #include "../vi/vi.h" #include "cl.h" -static void cl_rdiv __P((SCR *)); +static void cl_rdiv(SCR *); static int addstr4(SCR *sp, void *str, size_t len, int wide) @@ -76,31 +76,31 @@ addstr4(SCR *sp, void *str, size_t len, * cl_waddstr -- * Add len bytes from the string at the cursor, advancing the cursor. * - * PUBLIC: int cl_waddstr __P((SCR *, const CHAR_T *, size_t)); + * PUBLIC: int cl_waddstr(SCR *, const CHAR_T *, size_t); */ int cl_waddstr(SCR *sp, const CHAR_T *str, size_t len) { - return addstr4(sp, (void *)str, len, 1); + return addstr4(sp, (void *)str, len, 1); } /* * cl_addstr -- * Add len bytes from the string at the cursor, advancing the cursor. * - * PUBLIC: int cl_addstr __P((SCR *, const char *, size_t)); + * PUBLIC: int cl_addstr(SCR *, const char *, size_t); */ int cl_addstr(SCR *sp, const char *str, size_t len) { - return addstr4(sp, (void *)str, len, 0); + return addstr4(sp, (void *)str, len, 0); } /* * cl_attr -- * Toggle a screen attribute on/off. * - * PUBLIC: int cl_attr __P((SCR *, scr_attr_t, int)); + * PUBLIC: int cl_attr(SCR *, scr_attr_t, int); */ int cl_attr(SCR *sp, scr_attr_t attribute, int on) @@ -187,7 +187,7 @@ cl_attr(SCR *sp, scr_attr_t attribute, i * cl_baud -- * Return the baud rate. * - * PUBLIC: int cl_baud __P((SCR *, u_long *)); + * PUBLIC: int cl_baud(SCR *, u_long *); */ int cl_baud(SCR *sp, u_long *ratep) @@ -228,7 +228,7 @@ cl_baud(SCR *sp, u_long *ratep) * cl_bell -- * Ring the bell/flash the screen. * - * PUBLIC: int cl_bell __P((SCR *)); + * PUBLIC: int cl_bell(SCR *); */ int cl_bell(SCR *sp) @@ -252,7 +252,7 @@ cl_bell(SCR *sp) * cl_clrtoeol -- * Clear from the current cursor to the end of the line. * - * PUBLIC: int cl_clrtoeol __P((SCR *)); + * PUBLIC: int cl_clrtoeol(SCR *); */ int cl_clrtoeol(SCR *sp) @@ -281,7 +281,7 @@ cl_clrtoeol(SCR *sp) * cl_cursor -- * Return the current cursor position. * - * PUBLIC: int cl_cursor __P((SCR *, size_t *, size_t *)); + * PUBLIC: int cl_cursor(SCR *, size_t *, size_t *); */ int cl_cursor(SCR *sp, size_t *yp, size_t *xp) @@ -307,7 +307,7 @@ cl_cursor(SCR *sp, size_t *yp, size_t *x * cl_deleteln -- * Delete the current line, scrolling all lines below it. * - * PUBLIC: int cl_deleteln __P((SCR *)); + * PUBLIC: int cl_deleteln(SCR *); */ int cl_deleteln(SCR *sp) @@ -344,7 +344,7 @@ cl_deleteln(SCR *sp) * cl_discard -- * Discard a screen. * - * PUBLIC: int cl_discard __P((SCR *, SCR **)); + * PUBLIC: int cl_discard(SCR *, SCR **); */ int cl_discard(SCR *discardp, SCR **acquirep) @@ -385,7 +385,7 @@ cl_discard(SCR *discardp, SCR **acquirep * Adjust the screen for ex. This routine is purely for standalone * ex programs. All special purpose, all special case. * - * PUBLIC: int cl_ex_adjust __P((SCR *, exadj_t)); + * PUBLIC: int cl_ex_adjust(SCR *, exadj_t); */ int cl_ex_adjust(SCR *sp, exadj_t action) @@ -440,7 +440,7 @@ cl_ex_adjust(SCR *sp, exadj_t action) * cl_insertln -- * Push down the current line, discarding the bottom line. * - * PUBLIC: int cl_insertln __P((SCR *)); + * PUBLIC: int cl_insertln(SCR *); */ int cl_insertln(SCR *sp) @@ -458,7 +458,7 @@ cl_insertln(SCR *sp) * cl_keyval -- * Return the value for a special key. * - * PUBLIC: int cl_keyval __P((SCR *, scr_keyval_t, CHAR_T *, int *)); + * PUBLIC: int cl_keyval(SCR *, scr_keyval_t, CHAR_T *, int *); */ int cl_keyval(SCR *sp, scr_keyval_t val, CHAR_T *chp, int *dnep) @@ -496,7 +496,7 @@ cl_keyval(SCR *sp, scr_keyval_t val, CHA * cl_move -- * Move the cursor. * - * PUBLIC: int cl_move __P((SCR *, size_t, size_t)); + * PUBLIC: int cl_move(SCR *, size_t, size_t); */ int cl_move(SCR *sp, size_t lno, size_t cno) @@ -516,7 +516,7 @@ cl_move(SCR *sp, size_t lno, size_t cno) * cl_refresh -- * Refresh the screen. * - * PUBLIC: int cl_refresh __P((SCR *, int)); + * PUBLIC: int cl_refresh(SCR *, int); */ int cl_refresh(SCR *sp, int repaint) @@ -599,7 +599,7 @@ cl_rdiv(SCR *sp) * cl_rename -- * Rename the file. * - * PUBLIC: int cl_rename __P((SCR *, char *, int)); + * PUBLIC: int cl_rename(SCR *, char *, int); */ int cl_rename(SCR *sp, char *name, int on) @@ -621,7 +621,7 @@ cl_rename(SCR *sp, char *name, int on) if (on) { clp->focus = sp; if (!F_ISSET(clp, CL_RENAME_OK) || - strncmp(OG_STR(gp, GO_TERM), "xterm", 5)) + strncmp(OG_STR(gp, GO_TERM), "xterm", 5)) return (0); if (clp->oname == NULL && (wid = getenv("WINDOWID"))) { @@ -654,7 +654,7 @@ rename: cl_setname(gp, name); * cl_setname -- * Set a X11 icon/window name. * - * PUBLIC: void cl_setname __P((GS *, char *)); + * PUBLIC: void cl_setname(GS *, char *); */ void cl_setname(GS *gp, char *name) @@ -671,7 +671,7 @@ cl_setname(GS *gp, char *name) * cl_split -- * Split a screen. * - * PUBLIC: int cl_split __P((SCR *, SCR *)); + * PUBLIC: int cl_split(SCR *, SCR *); */ int cl_split(SCR *origp, SCR *newp) @@ -697,7 +697,7 @@ cl_split(SCR *origp, SCR *newp) * cl_suspend -- * Suspend a screen. * - * PUBLIC: int cl_suspend __P((SCR *, int *)); + * PUBLIC: int cl_suspend(SCR *, int *); */ int cl_suspend(SCR *sp, int *allowedp) @@ -825,7 +825,7 @@ cl_suspend(SCR *sp, int *allowedp) * cl_usage -- * Print out the curses usage messages. * - * PUBLIC: void cl_usage __P((void)); + * PUBLIC: void cl_usage(void); */ void cl_usage(void) Modified: projects/sendfile/contrib/nvi/cl/cl_main.c ============================================================================== --- projects/sendfile/contrib/nvi/cl/cl_main.c Tue Apr 14 20:05:26 2015 (r281538) +++ projects/sendfile/contrib/nvi/cl/cl_main.c Tue Apr 14 20:08:37 2015 (r281539) @@ -10,7 +10,7 @@ #include "config.h" #ifndef lint -static const char sccsid[] = "$Id: cl_main.c,v 10.55 2011/08/15 19:52:28 zy Exp $"; +static const char sccsid[] = "$Id: cl_main.c,v 10.56 2015/04/05 06:20:53 zy Exp $"; #endif /* not lint */ #include @@ -36,20 +36,20 @@ static const char sccsid[] = "$Id: cl_ma GS *__global_list; /* GLOBAL: List of screens. */ sigset_t __sigblockset; /* GLOBAL: Blocked signals. */ -static void cl_func_std __P((GS *)); -static CL_PRIVATE *cl_init __P((GS *)); -static GS *gs_init __P((char *)); -static void perr __P((char *, char *)); -static int setsig __P((int, struct sigaction *, void (*)(int))); -static void sig_end __P((GS *)); -static void term_init __P((char *, char *)); +static void cl_func_std(GS *); +static CL_PRIVATE *cl_init(GS *); +static GS *gs_init(char *); +static void perr(char *, char *); +static int setsig(int, struct sigaction *, void (*)(int)); +static void sig_end(GS *); +static void term_init(char *, char *); /* * main -- * This is the main loop for the standalone curses editor. */ int -main(int argc, char **argv) +main(int argc, char *argv[]) { static int reenter; CL_PRIVATE *clp; @@ -92,7 +92,7 @@ main(int argc, char **argv) * have to use termcap/terminfo to find out how big the screen is. */ if ((ttype = getenv("TERM")) == NULL) - ttype = "unknown"; + ttype = "ansi"; term_init(gp->progname, ttype); /* Add the terminal type to the global structure. */ @@ -146,7 +146,7 @@ main(int argc, char **argv) } /* Free the global and CL private areas. */ -#if defined(DEBUG) || defined(PURIFY) || defined(LIBRARY) +#if defined(DEBUG) || defined(PURIFY) if (clp->oname != NULL) free(clp->oname); free(clp); @@ -292,7 +292,7 @@ h_winch(int signo) * sig_init -- * Initialize signals. * - * PUBLIC: int sig_init __P((GS *, SCR *)); + * PUBLIC: int sig_init(GS *, SCR *); */ int sig_init(GS *gp, SCR *sp) @@ -337,7 +337,7 @@ sig_init(GS *gp, SCR *sp) * Set a signal handler. */ static int -setsig(int signo, struct sigaction *oactp, void (*handler) (int)) +setsig(int signo, struct sigaction *oactp, void (*handler)(int)) { struct sigaction act; @@ -345,21 +345,12 @@ setsig(int signo, struct sigaction *oact * Use sigaction(2), not signal(3), since we don't always want to * restart system calls. The example is when waiting for a command * mode keystroke and SIGWINCH arrives. Besides, you can't portably - * restart system calls (thanks, POSIX!). On the other hand, you - * can't portably NOT restart system calls (thanks, Sun!). SunOS - * used SA_INTERRUPT as their extension to NOT restart read calls. - * We sure hope nobody else used it for anything else. Mom told me - * there'd be days like this. She just never told me that there'd - * be so many. + * restart system calls (thanks, POSIX!). */ act.sa_handler = handler; sigemptyset(&act.sa_mask); -#ifdef SA_INTERRUPT - act.sa_flags = SA_INTERRUPT; -#else act.sa_flags = 0; -#endif return (sigaction(signo, &act, oactp)); } Modified: projects/sendfile/contrib/nvi/cl/cl_read.c ============================================================================== --- projects/sendfile/contrib/nvi/cl/cl_read.c Tue Apr 14 20:05:26 2015 (r281538) +++ projects/sendfile/contrib/nvi/cl/cl_read.c Tue Apr 14 20:08:37 2015 (r281539) @@ -35,15 +35,15 @@ static const char sccsid[] = "$Id: cl_re #undef columns #undef lines -static input_t cl_read __P((SCR *, - u_int32_t, char *, size_t, int *, struct timeval *)); -static int cl_resize __P((SCR *, size_t, size_t)); +static input_t cl_read(SCR *, + u_int32_t, char *, size_t, int *, struct timeval *); +static int cl_resize(SCR *, size_t, size_t); /* * cl_event -- * Return a single event. * - * PUBLIC: int cl_event __P((SCR *, EVENT *, u_int32_t, int)); + * PUBLIC: int cl_event(SCR *, EVENT *, u_int32_t, int); */ int cl_event(SCR *sp, EVENT *evp, u_int32_t flags, int ms) @@ -143,7 +143,8 @@ read: * Read characters from the input. */ static input_t -cl_read(SCR *sp, u_int32_t flags, char *bp, size_t blen, int *nrp, struct timeval *tp) +cl_read(SCR *sp, u_int32_t flags, char *bp, size_t blen, int *nrp, + struct timeval *tp) { struct termios term1, term2; CL_PRIVATE *clp; Modified: projects/sendfile/contrib/nvi/cl/cl_screen.c ============================================================================== --- projects/sendfile/contrib/nvi/cl/cl_screen.c Tue Apr 14 20:05:26 2015 (r281538) +++ projects/sendfile/contrib/nvi/cl/cl_screen.c Tue Apr 14 20:08:37 2015 (r281539) @@ -10,7 +10,7 @@ #include "config.h" #ifndef lint -static const char sccsid[] = "$Id: cl_screen.c,v 10.56 2002/05/03 19:59:44 skimo Exp $"; +static const char sccsid[] = "$Id: cl_screen.c,v 10.58 2015/04/08 02:12:11 zy Exp $"; #endif /* not lint */ #include @@ -32,18 +32,18 @@ static const char sccsid[] = "$Id: cl_sc #include "../common/common.h" #include "cl.h" -static int cl_ex_end __P((GS *)); -static int cl_ex_init __P((SCR *)); -static void cl_freecap __P((CL_PRIVATE *)); -static int cl_vi_end __P((GS *)); -static int cl_vi_init __P((SCR *)); -static int cl_putenv __P((char *, char *, u_long)); +static int cl_ex_end(GS *); +static int cl_ex_init(SCR *); +static void cl_freecap(CL_PRIVATE *); +static int cl_vi_end(GS *); +static int cl_vi_init(SCR *); +static int cl_putenv(char *, char *, u_long); /* * cl_screen -- * Switch screen types. * - * PUBLIC: int cl_screen __P((SCR *, u_int32_t)); + * PUBLIC: int cl_screen(SCR *, u_int32_t); */ int cl_screen(SCR *sp, u_int32_t flags) @@ -58,11 +58,9 @@ cl_screen(SCR *sp, u_int32_t flags) /* See if the current information is incorrect. */ if (F_ISSET(gp, G_SRESTART)) { - if (CLSP(sp)) { - delwin(CLSP(sp)); - sp->cl_private = NULL; - } - if (cl_quit(gp)) + if ((!F_ISSET(sp, SC_SCR_EX | SC_SCR_VI) || + resizeterm(O_VAL(sp, O_LINES), O_VAL(sp, O_COLUMNS))) && + cl_quit(gp)) return (1); F_CLR(gp, G_SRESTART); } @@ -131,7 +129,7 @@ cl_screen(SCR *sp, u_int32_t flags) * cl_quit -- * Shutdown the screens. * - * PUBLIC: int cl_quit __P((GS *)); + * PUBLIC: int cl_quit(GS *); */ int cl_quit(GS *gp) @@ -234,20 +232,15 @@ cl_vi_init(SCR *sp) cl_putenv("COLUMNS", NULL, (u_long)O_VAL(sp, O_COLUMNS)); /* - * We don't care about the SCREEN reference returned by newterm, we - * never have more than one SCREEN at a time. - * - * XXX - * The SunOS initscr() can't be called twice. Don't even think about - * using it. It fails in subtle ways (e.g. select(2) on fileno(stdin) - * stops working). (The SVID notes that applications should only call - * initscr() once.) - * - * XXX - * The HP/UX newterm doesn't support the NULL first argument, so we - * have to specify the terminal type. + * The terminal is aways initialized, either in `main`, or by a + * previous call to newterm(3X). */ (void)del_curterm(cur_term); + + /* + * We never have more than one SCREEN at a time, so set_term(NULL) will + * give us the last SCREEN. + */ errno = 0; if (newterm(ttype, stdout, stdin) == NULL) { if (errno) @@ -416,6 +409,9 @@ cl_vi_end(GS *gp) /* End curses window. */ (void)endwin(); + /* Free the SCREEN created by newterm(3X). */ + delscreen(set_term(NULL)); + /* * XXX * The screen TE sequence just got sent. See the comment in @@ -520,7 +516,7 @@ cl_ex_end(GS *gp) * cl_getcap -- * Retrieve termcap/terminfo strings. * - * PUBLIC: int cl_getcap __P((SCR *, char *, char **)); + * PUBLIC: int cl_getcap(SCR *, char *, char **); */ int cl_getcap(SCR *sp, char *name, char **elementp) Modified: projects/sendfile/contrib/nvi/cl/cl_term.c ============================================================================== --- projects/sendfile/contrib/nvi/cl/cl_term.c Tue Apr 14 20:05:26 2015 (r281538) +++ projects/sendfile/contrib/nvi/cl/cl_term.c Tue Apr 14 20:08:37 2015 (r281539) @@ -10,7 +10,7 @@ #include "config.h" #ifndef lint -static const char sccsid[] = "$Id: cl_term.c,v 10.34 2013/12/07 16:21:14 wjenkner Exp $"; +static const char sccsid[] = "$Id: cl_term.c,v 10.35 2015/04/08 02:12:11 zy Exp $"; #endif /* not lint */ #include @@ -34,7 +34,7 @@ static const char sccsid[] = "$Id: cl_te #include "../common/common.h" #include "cl.h" -static int cl_pfmap __P((SCR *, seq_t, CHAR_T *, size_t, CHAR_T *, size_t)); +static int cl_pfmap(SCR *, seq_t, CHAR_T *, size_t, CHAR_T *, size_t); /* * XXX @@ -81,7 +81,7 @@ static TKLIST const m2_tklist[] = { /* I * cl_term_init -- * Initialize the special keys defined by the termcap/terminfo entry. * - * PUBLIC: int cl_term_init __P((SCR *)); + * PUBLIC: int cl_term_init(SCR *); */ int cl_term_init(SCR *sp) @@ -182,7 +182,7 @@ cl_term_init(SCR *sp) * cl_term_end -- * End the special keys defined by the termcap/terminfo entry. * - * PUBLIC: int cl_term_end __P((GS *)); + * PUBLIC: int cl_term_end(GS *); */ int cl_term_end(GS *gp) @@ -206,7 +206,7 @@ cl_term_end(GS *gp) * cl_fmap -- * Map a function key. * - * PUBLIC: int cl_fmap __P((SCR *, seq_t, CHAR_T *, size_t, CHAR_T *, size_t)); + * PUBLIC: int cl_fmap(SCR *, seq_t, CHAR_T *, size_t, CHAR_T *, size_t); */ int cl_fmap(SCR *sp, seq_t stype, CHAR_T *from, size_t flen, CHAR_T *to, size_t tlen) @@ -258,7 +258,7 @@ cl_pfmap(SCR *sp, seq_t stype, CHAR_T *f * cl_optchange -- * Curses screen specific "option changed" routine. * - * PUBLIC: int cl_optchange __P((SCR *, int, char *, u_long *)); + * PUBLIC: int cl_optchange(SCR *, int, char *, u_long *); */ int cl_optchange(SCR *sp, int opt, char *str, u_long *valp) @@ -268,15 +268,16 @@ cl_optchange(SCR *sp, int opt, char *str clp = CLP(sp); switch (opt) { + case O_TERM: + F_CLR(sp, SC_SCR_EX | SC_SCR_VI); + /* FALLTHROUGH */ case O_COLUMNS: case O_LINES: - case O_TERM: /* - * Changing the columns, lines or terminal require that - * we restart the screen. + * Changing the terminal type requires that we reinitialize + * curses, while resizing does not. */ F_SET(sp->gp, G_SRESTART); - F_CLR(sp, SC_SCR_EX | SC_SCR_VI); break; case O_MESG: (void)cl_omesg(sp, clp, *valp); @@ -305,7 +306,7 @@ cl_optchange(SCR *sp, int opt, char *str * cl_omesg -- * Turn the tty write permission on or off. * - * PUBLIC: int cl_omesg __P((SCR *, CL_PRIVATE *, int)); + * PUBLIC: int cl_omesg(SCR *, CL_PRIVATE *, int); */ int cl_omesg(SCR *sp, CL_PRIVATE *clp, int on) @@ -351,7 +352,7 @@ cl_omesg(SCR *sp, CL_PRIVATE *clp, int o * cl_ssize -- * Return the terminal size. * - * PUBLIC: int cl_ssize __P((SCR *, int, size_t *, size_t *, int *)); + * PUBLIC: int cl_ssize(SCR *, int, size_t *, size_t *, int *); */ int cl_ssize(SCR *sp, int sigwinch, size_t *rowp, size_t *colp, int *changedp) @@ -467,7 +468,7 @@ noterm: if (row == 0) * cl_putchar -- * Function version of putchar, for tputs. * - * PUBLIC: int cl_putchar __P((int)); + * PUBLIC: int cl_putchar(int); */ int cl_putchar(int ch) Modified: projects/sendfile/contrib/nvi/cl/extern.h ============================================================================== --- projects/sendfile/contrib/nvi/cl/extern.h Tue Apr 14 20:05:26 2015 (r281538) +++ projects/sendfile/contrib/nvi/cl/extern.h Tue Apr 14 20:08:37 2015 (r281539) @@ -1,31 +1,31 @@ -int cl_waddstr __P((SCR *, const CHAR_T *, size_t)); -int cl_addstr __P((SCR *, const char *, size_t)); -int cl_attr __P((SCR *, scr_attr_t, int)); -int cl_baud __P((SCR *, u_long *)); -int cl_bell __P((SCR *)); -int cl_clrtoeol __P((SCR *)); -int cl_cursor __P((SCR *, size_t *, size_t *)); -int cl_deleteln __P((SCR *)); -int cl_discard __P((SCR *, SCR **)); -int cl_ex_adjust __P((SCR *, exadj_t)); -int cl_insertln __P((SCR *)); -int cl_keyval __P((SCR *, scr_keyval_t, CHAR_T *, int *)); -int cl_move __P((SCR *, size_t, size_t)); -int cl_refresh __P((SCR *, int)); -int cl_rename __P((SCR *, char *, int)); -void cl_setname __P((GS *, char *)); -int cl_split __P((SCR *, SCR *)); -int cl_suspend __P((SCR *, int *)); -void cl_usage __P((void)); -int sig_init __P((GS *, SCR *)); -int cl_event __P((SCR *, EVENT *, u_int32_t, int)); -int cl_screen __P((SCR *, u_int32_t)); -int cl_quit __P((GS *)); -int cl_getcap __P((SCR *, char *, char **)); -int cl_term_init __P((SCR *)); -int cl_term_end __P((GS *)); -int cl_fmap __P((SCR *, seq_t, CHAR_T *, size_t, CHAR_T *, size_t)); -int cl_optchange __P((SCR *, int, char *, u_long *)); -int cl_omesg __P((SCR *, CL_PRIVATE *, int)); -int cl_ssize __P((SCR *, int, size_t *, size_t *, int *)); -int cl_putchar __P((int)); +int cl_waddstr(SCR *, const CHAR_T *, size_t); +int cl_addstr(SCR *, const char *, size_t); +int cl_attr(SCR *, scr_attr_t, int); +int cl_baud(SCR *, u_long *); +int cl_bell(SCR *); +int cl_clrtoeol(SCR *); +int cl_cursor(SCR *, size_t *, size_t *); +int cl_deleteln(SCR *); +int cl_discard(SCR *, SCR **); +int cl_ex_adjust(SCR *, exadj_t); +int cl_insertln(SCR *); +int cl_keyval(SCR *, scr_keyval_t, CHAR_T *, int *); +int cl_move(SCR *, size_t, size_t); +int cl_refresh(SCR *, int); +int cl_rename(SCR *, char *, int); +void cl_setname(GS *, char *); +int cl_split(SCR *, SCR *); +int cl_suspend(SCR *, int *); +void cl_usage(void); +int sig_init(GS *, SCR *); +int cl_event(SCR *, EVENT *, u_int32_t, int); +int cl_screen(SCR *, u_int32_t); +int cl_quit(GS *); +int cl_getcap(SCR *, char *, char **); +int cl_term_init(SCR *); +int cl_term_end(GS *); +int cl_fmap(SCR *, seq_t, CHAR_T *, size_t, CHAR_T *, size_t); +int cl_optchange(SCR *, int, char *, u_long *); +int cl_omesg(SCR *, CL_PRIVATE *, int); +int cl_ssize(SCR *, int, size_t *, size_t *, int *); +int cl_putchar(int); Modified: projects/sendfile/contrib/nvi/common/common.h ============================================================================== --- projects/sendfile/contrib/nvi/common/common.h Tue Apr 14 20:05:26 2015 (r281538) +++ projects/sendfile/contrib/nvi/common/common.h Tue Apr 14 20:08:37 2015 (r281539) @@ -23,8 +23,8 @@ */ typedef struct _cb CB; typedef struct _csc CSC; -typedef struct _conv CONV; -typedef struct _conv_win CONVWIN; +typedef struct _conv CONV; +typedef struct _conv_win CONVWIN; typedef struct _event EVENT; typedef struct _excmd EXCMD; typedef struct _exf EXF; Modified: projects/sendfile/contrib/nvi/common/conv.c ============================================================================== --- projects/sendfile/contrib/nvi/common/conv.c Tue Apr 14 20:05:26 2015 (r281538) +++ projects/sendfile/contrib/nvi/common/conv.c Tue Apr 14 20:08:37 2015 (r281539) @@ -12,7 +12,7 @@ #include "config.h" #ifndef lint -static const char sccsid[] = "$Id: conv.c,v 2.39 2013/07/01 23:28:13 zy Exp $"; +static const char sccsid[] = "$Id: conv.c,v 2.40 2014/02/27 16:25:29 zy Exp $"; #endif /* not lint */ #include @@ -36,35 +36,37 @@ static const char sccsid[] = "$Id: conv. * codeset -- * Get the locale encoding. * - * PUBLIC: char * codeset __P((void)); + * PUBLIC: char * codeset(void); */ char * -codeset(void) { - static char *cs; +codeset(void) +{ + static char *cs; + + if (cs == NULL) + cs = nl_langinfo(CODESET); - if (cs == NULL) - cs = nl_langinfo(CODESET); - return cs; + return cs; } #ifdef USE_WIDECHAR static int -raw2int(SCR *sp, const char * str, ssize_t len, CONVWIN *cw, - size_t *tolen, CHAR_T **dst) +raw2int(SCR *sp, const char * str, ssize_t len, CONVWIN *cw, size_t *tolen, + CHAR_T **dst) { - int i; - CHAR_T **tostr = &cw->bp1.wc; - size_t *blen = &cw->blen1; + int i; + CHAR_T **tostr = &cw->bp1.wc; + size_t *blen = &cw->blen1; - BINC_RETW(NULL, *tostr, *blen, len); + BINC_RETW(NULL, *tostr, *blen, len); - *tolen = len; - for (i = 0; i < len; ++i) - (*tostr)[i] = (u_char) str[i]; + *tolen = len; + for (i = 0; i < len; ++i) + (*tostr)[i] = (u_char) str[i]; - *dst = cw->bp1.wc; + *dst = cw->bp1.wc; - return 0; + return 0; } #define CONV_BUFFER_SIZE 512 @@ -73,27 +75,27 @@ raw2int(SCR *sp, const char * str, ssize * len contains the number of bytes put in the buffer */ #ifdef USE_ICONV -#define CONVERT(str, left, src, len) \ - do { \ - size_t outleft; \ - char *bp = buffer; \ - outleft = CONV_BUFFER_SIZE; \ - errno = 0; \ - if (iconv(id, (iconv_src_t)&str, &left, &bp, &outleft) == -1 && \ - errno != E2BIG) \ - goto err; \ - if ((len = CONV_BUFFER_SIZE - outleft) == 0) { \ - error = -left; \ - goto err; \ - } \ - src = buffer; \ - } while (0) +#define CONVERT(str, left, src, len) \ + do { \ + size_t outleft; \ + char *bp = buffer; \ + outleft = CONV_BUFFER_SIZE; \ + errno = 0; \ + if (iconv(id, (iconv_src_t)&str, &left, &bp, &outleft) \ + == -1 && errno != E2BIG) \ + goto err; \ + if ((len = CONV_BUFFER_SIZE - outleft) == 0) { \ + error = -left; \ + goto err; \ + } \ + src = buffer; \ + } while (0) #define IC_RESET() \ - do { \ - if (id != (iconv_t)-1) \ - iconv(id, NULL, NULL, NULL, NULL); \ - } while(0) + do { \ + if (id != (iconv_t)-1) \ + iconv(id, NULL, NULL, NULL, NULL); \ + } while(0) #else #define CONVERT(str, left, src, len) #define IC_RESET() @@ -101,114 +103,116 @@ raw2int(SCR *sp, const char * str, ssize static int default_char2int(SCR *sp, const char * str, ssize_t len, CONVWIN *cw, - size_t *tolen, CHAR_T **dst, iconv_t id) + size_t *tolen, CHAR_T **dst, iconv_t id) { - size_t i = 0, j; - CHAR_T **tostr = &cw->bp1.wc; - size_t *blen = &cw->blen1; - mbstate_t mbs; - size_t n; - ssize_t nlen = len; - char *src = (char *)str; + size_t i = 0, j; + CHAR_T **tostr = &cw->bp1.wc; + size_t *blen = &cw->blen1; + mbstate_t mbs; + size_t n; + ssize_t nlen = len; + char *src = (char *)str; #ifdef USE_ICONV - char buffer[CONV_BUFFER_SIZE]; + char buffer[CONV_BUFFER_SIZE]; #endif - size_t left = len; - int error = 1; + size_t left = len; + int error = 1; - BZERO(&mbs, 1); - BINC_RETW(NULL, *tostr, *blen, nlen); + BZERO(&mbs, 1); + BINC_RETW(NULL, *tostr, *blen, nlen); #ifdef USE_ICONV - if (id != (iconv_t)-1) - CONVERT(str, left, src, len); + if (id != (iconv_t)-1) + CONVERT(str, left, src, len); #endif - for (i = 0, j = 0; j < len; ) { - n = mbrtowc((*tostr)+i, src+j, len-j, &mbs); - /* NULL character converted */ - if (n == -2) error = -(len-j); - if (n == -1 || n == -2) goto err; - if (n == 0) n = 1; - j += n; - if (++i >= *blen) { - nlen += 256; - BINC_RETW(NULL, *tostr, *blen, nlen); - } - if (id != (iconv_t)-1 && j == len && left) { - CONVERT(str, left, src, len); - j = 0; + for (i = 0, j = 0; j < len; ) { + n = mbrtowc((*tostr)+i, src+j, len-j, &mbs); + /* NULL character converted */ + if (n == -2) + error = -(len-j); + if (n == -1 || n == -2) + goto err; + if (n == 0) + n = 1; + j += n; + if (++i >= *blen) { + nlen += 256; + BINC_RETW(NULL, *tostr, *blen, nlen); + } + if (id != (iconv_t)-1 && j == len && left) { + CONVERT(str, left, src, len); + j = 0; + } } - } - error = 0; + error = 0; err: - *tolen = i; - *dst = cw->bp1.wc; - IC_RESET(); + *tolen = i; + *dst = cw->bp1.wc; + IC_RESET(); - return error; + return error; } static int -fe_char2int(SCR *sp, const char * str, ssize_t len, CONVWIN *cw, - size_t *tolen, CHAR_T **dst) +fe_char2int(SCR *sp, const char * str, ssize_t len, CONVWIN *cw, size_t *tolen, + CHAR_T **dst) { - return default_char2int(sp, str, len, cw, tolen, dst, - sp->conv.id[IC_FE_CHAR2INT]); + return default_char2int(sp, str, len, cw, tolen, dst, + sp->conv.id[IC_FE_CHAR2INT]); } static int -ie_char2int(SCR *sp, const char * str, ssize_t len, CONVWIN *cw, - size_t *tolen, CHAR_T **dst) +ie_char2int(SCR *sp, const char * str, ssize_t len, CONVWIN *cw, size_t *tolen, + CHAR_T **dst) { - return default_char2int(sp, str, len, cw, tolen, dst, - sp->conv.id[IC_IE_CHAR2INT]); + return default_char2int(sp, str, len, cw, tolen, dst, + sp->conv.id[IC_IE_CHAR2INT]); } static int -cs_char2int(SCR *sp, const char * str, ssize_t len, CONVWIN *cw, - size_t *tolen, CHAR_T **dst) +cs_char2int(SCR *sp, const char * str, ssize_t len, CONVWIN *cw, size_t *tolen, + CHAR_T **dst) { - return default_char2int(sp, str, len, cw, tolen, dst, - (iconv_t)-1); + return default_char2int(sp, str, len, cw, tolen, dst, (iconv_t)-1); } static int -int2raw(SCR *sp, const CHAR_T * str, ssize_t len, CONVWIN *cw, - size_t *tolen, char **dst) +int2raw(SCR *sp, const CHAR_T * str, ssize_t len, CONVWIN *cw, size_t *tolen, + char **dst) { - int i; - char **tostr = &cw->bp1.c; - size_t *blen = &cw->blen1; + int i; + char **tostr = &cw->bp1.c; + size_t *blen = &cw->blen1; - BINC_RETC(NULL, *tostr, *blen, len); + BINC_RETC(NULL, *tostr, *blen, len); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Thu Apr 16 06:23:59 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C4147CD0; Thu, 16 Apr 2015 06:23:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 AF0D6358; Thu, 16 Apr 2015 06:23:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3G6Nxb5062306; Thu, 16 Apr 2015 06:23:59 GMT (envelope-from sbruno@FreeBSD.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3G6NxEf062304; Thu, 16 Apr 2015 06:23:59 GMT (envelope-from sbruno@FreeBSD.org) Message-Id: <201504160623.t3G6NxEf062304@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sbruno set sender to sbruno@FreeBSD.org using -f From: Sean Bruno Date: Thu, 16 Apr 2015 06:23:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r281590 - projects/em_mq/sys/dev/e1000 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, 16 Apr 2015 06:23:59 -0000 Author: sbruno Date: Thu Apr 16 06:23:58 2015 New Revision: 281590 URL: https://svnweb.freebsd.org/changeset/base/281590 Log: Get 82574 tx queues working reliably via a few bits of stolen errata and a few bits of stolen igb(4) code. - Bind interrupts to specific CPUs (stolen from igb). - Don't ever let em_mq_start() have a negative value for its tx queue. - Allow the interrupt for the link status to be shareable. - Setup 2nd queue TXDCTL bits to enable it fully, without this, it times out. Values derived from linux e1000e driver, netdev.c. Committed due to apparent erratum. - When configuring RSS, use a modulo of the num_rx_queues, instead of magic number 2 - Add premptive comment when configuring RXDCTL indicating why the 2nd queue is not being configured here. - Revert enhanced queue status handling, from svn revision 281045 as it fails to handle watchdog events at all in this driver. Modified: projects/em_mq/sys/dev/e1000/if_em.c projects/em_mq/sys/dev/e1000/if_em.h Modified: projects/em_mq/sys/dev/e1000/if_em.c ============================================================================== --- projects/em_mq/sys/dev/e1000/if_em.c Thu Apr 16 06:12:25 2015 (r281589) +++ projects/em_mq/sys/dev/e1000/if_em.c Thu Apr 16 06:23:58 2015 (r281590) @@ -53,6 +53,7 @@ #include #include #include +#include #include #include #include @@ -401,6 +402,13 @@ SYSCTL_INT(_hw_em, OID_AUTO, num_tx_queu static int em_num_rx_queues = 1; SYSCTL_INT(_hw_em, OID_AUTO, num_rx_queues, CTLFLAG_RDTUN, &em_num_rx_queues, 0, "82574 only: Number of rx queues to configure, 0 indicates autoconfigure"); + +/* +** Global variable to store last used CPU when binding queues +** to CPUs in igb_allocate_msix. Starts at CPU_FIRST and increments when a +** queue is bound to a cpu. +*/ +static int em_last_bind_cpu = -1; #endif /* How many packets rxeof tries to clean at a time */ @@ -899,8 +907,7 @@ em_resume(device_t dev) for (int i = 0; i < adapter->num_tx_queues; i++, txr++) { EM_TX_LOCK(txr); #ifdef EM_MULTIQUEUE - if (((txr->queue_status & EM_QUEUE_DEPLETED) == 0) && - !drbr_empty(ifp, txr->br)) + if (!drbr_empty(ifp, txr->br)) em_mq_start_locked(ifp, txr); #else if (!if_sendq_empty(ifp)) @@ -958,7 +965,7 @@ em_start_locked(if_t ifp, struct tx_ring /* Set timeout in case hardware has problems transmitting. */ txr->watchdog_time = ticks; - txr->queue_status |= EM_QUEUE_WORKING; + txr->queue_status = EM_QUEUE_WORKING; } return; @@ -994,7 +1001,7 @@ em_mq_start(if_t ifp, struct mbuf *m) { struct adapter *adapter = if_getsoftc(ifp); struct tx_ring *txr = adapter->tx_rings; - int i, error; + unsigned int i, error; if (M_HASHTYPE_GET(m) != M_HASHTYPE_NONE) i = m->m_pkthdr.flowid % adapter->num_tx_queues; @@ -1058,14 +1065,15 @@ em_mq_start_locked(if_t ifp, struct tx_r if (enq > 0) { /* Set the watchdog */ - txr->queue_status |= EM_QUEUE_WORKING; + txr->queue_status = EM_QUEUE_WORKING; txr->watchdog_time = ticks; } - if (txr->tx_avail < (adapter->num_tx_desc / 8)) - em_txeof(txr); if (txr->tx_avail < EM_MAX_SCATTER) - txr->queue_status |= EM_QUEUE_DEPLETED; + em_txeof(txr); + if (txr->tx_avail < EM_MAX_SCATTER) { + if_setdrvflagbits(ifp, IFF_DRV_OACTIVE,0); + } return (err); } @@ -1549,9 +1557,9 @@ em_handle_que(void *context, int pending struct tx_ring *txr = adapter->tx_rings; struct rx_ring *rxr = adapter->rx_rings; - if (if_getdrvflags(ifp) & IFF_DRV_RUNNING) { bool more = em_rxeof(rxr, adapter->rx_process_limit, NULL); + EM_TX_LOCK(txr); em_txeof(txr); #ifdef EM_MULTIQUEUE @@ -1589,13 +1597,13 @@ em_msix_tx(void *arg) EM_TX_LOCK(txr); em_txeof(txr); #ifdef EM_MULTIQUEUE - if (((txr->queue_status & EM_QUEUE_DEPLETED) == 0) && - !drbr_empty(ifp, txr->br)) + if (!drbr_empty(ifp, txr->br)) em_mq_start_locked(ifp, txr); #else if (!if_sendq_empty(ifp)) em_start_locked(ifp, txr); #endif + /* Reenable this interrupt */ E1000_WRITE_REG(&adapter->hw, E1000_IMS, txr->ims); EM_TX_UNLOCK(txr); @@ -1621,9 +1629,10 @@ em_msix_rx(void *arg) more = em_rxeof(rxr, adapter->rx_process_limit, NULL); if (more) taskqueue_enqueue(rxr->tq, &rxr->rx_task); - else + else { /* Reenable this interrupt */ E1000_WRITE_REG(&adapter->hw, E1000_IMS, rxr->ims); + } return; } @@ -1660,9 +1669,10 @@ em_handle_rx(void *context, int pending) more = em_rxeof(rxr, adapter->rx_process_limit, NULL); if (more) taskqueue_enqueue(rxr->tq, &rxr->rx_task); - else + else { /* Reenable this interrupt */ E1000_WRITE_REG(&adapter->hw, E1000_IMS, rxr->ims); + } } static void @@ -2253,7 +2263,6 @@ em_local_timer(void *arg) struct tx_ring *txr = adapter->tx_rings; struct rx_ring *rxr = adapter->rx_rings; u32 trigger; - int hung = 0, busy = 0; EM_CORE_LOCK_ASSERT(adapter); @@ -2277,24 +2286,16 @@ em_local_timer(void *arg) ** and the HUNG state will be static if set. */ for (int i = 0; i < adapter->num_tx_queues; i++, txr++) { - if ((txr->queue_status & EM_QUEUE_HUNG) && - (adapter->pause_frames == 0)) - ++hung; - if (txr->queue_status & EM_QUEUE_DEPLETED) - ++busy; + if ((txr->queue_status == EM_QUEUE_HUNG) && + (adapter->pause_frames == 0)) { + em_print_debug_info(adapter); + goto hung; + } /* Schedule a TX tasklet if needed */ - if ((txr->queue_status & EM_QUEUE_IDLE) == 0) + if (txr->tx_avail <= EM_MAX_SCATTER) taskqueue_enqueue(txr->tq, &txr->tx_task); } - if (hung == adapter->num_tx_queues) - goto timeout; - if (busy == adapter->num_tx_queues) - if_setdrvflagbits(ifp, IFF_DRV_OACTIVE, 0); - else if ((if_getdrvflags(adapter->ifp) & IFF_DRV_OACTIVE) && - (busy < adapter->num_tx_queues)) - if_setdrvflagbits(ifp, 0, IFF_DRV_OACTIVE); - adapter->pause_frames = 0; callout_reset(&adapter->timer, hz, em_local_timer, adapter); #ifndef DEVICE_POLLING @@ -2302,7 +2303,7 @@ em_local_timer(void *arg) E1000_WRITE_REG(&adapter->hw, E1000_ICS, trigger); #endif return; -timeout: +hung: /* Looks like we're hung */ device_printf(adapter->dev, "Watchdog timeout -- resetting\n"); device_printf(adapter->dev, @@ -2312,11 +2313,16 @@ timeout: device_printf(adapter->dev,"TX(%d) desc avail = %d," "Next TX to Clean = %d\n", txr->me, txr->tx_avail, txr->next_to_clean); + + + em_print_debug_info(adapter); if_setdrvflagbits(ifp, 0, IFF_DRV_RUNNING); adapter->watchdog_events++; + adapter->pause_frames = 0; em_init_locked(adapter); } + static void em_update_link_status(struct adapter *adapter) { @@ -2381,11 +2387,10 @@ em_update_link_status(struct adapter *ad if (bootverbose) device_printf(dev, "Link is Down\n"); adapter->link_active = 0; - /* This can sleep */ - if_link_state_change(ifp, LINK_STATE_DOWN); - /* Reset queue state */ + /* Link down, disable watchdog */ for (int i = 0; i < adapter->num_tx_queues; i++, txr++) txr->queue_status = EM_QUEUE_IDLE; + if_link_state_change(ifp, LINK_STATE_DOWN); } } @@ -2553,13 +2558,14 @@ em_allocate_msix(struct adapter *adapter struct tx_ring *txr = adapter->tx_rings; struct rx_ring *rxr = adapter->rx_rings; int error, rid, vector = 0; + int cpu_id = 0; /* Make sure all interrupts are disabled */ E1000_WRITE_REG(&adapter->hw, E1000_IMC, 0xffffffff); /* First set up ring resources */ - for (int i = 0; i < adapter->num_rx_queues; i++, rxr++) { + for (int i = 0; i < adapter->num_rx_queues; i++, rxr++, vector++) { /* RX ring */ rid = vector + 1; @@ -2581,12 +2587,18 @@ em_allocate_msix(struct adapter *adapter #if __FreeBSD_version >= 800504 bus_describe_intr(dev, rxr->res, rxr->tag, "rx %d", i); #endif - rxr->msix = vector++; /* NOTE increment vector for TX */ + rxr->msix = vector; + + if (em_last_bind_cpu < 0) + em_last_bind_cpu = CPU_FIRST(); + cpu_id = em_last_bind_cpu; + bus_bind_intr(dev, rxr->res, cpu_id); + TASK_INIT(&rxr->rx_task, 0, em_handle_rx, rxr); rxr->tq = taskqueue_create_fast("em_rxq", M_NOWAIT, taskqueue_thread_enqueue, &rxr->tq); taskqueue_start_threads(&rxr->tq, 1, PI_NET, "%s rxq (qid %d)", - device_get_nameunit(adapter->dev), i); + device_get_nameunit(adapter->dev), cpu_id); /* ** Set the bit to enable interrupt ** in E1000_IMS -- bits 20 and 21 @@ -2595,9 +2607,11 @@ em_allocate_msix(struct adapter *adapter */ rxr->ims = 1 << (20 + i); adapter->ivars |= (8 | rxr->msix) << (i * 4); + + em_last_bind_cpu = CPU_NEXT(em_last_bind_cpu); } - for (int i = 0; i < adapter->num_tx_queues; i++, txr++) { + for (int i = 0; i < adapter->num_tx_queues; i++, txr++, vector++) { /* TX ring */ rid = vector + 1; txr->res = bus_alloc_resource_any(dev, @@ -2617,12 +2631,18 @@ em_allocate_msix(struct adapter *adapter #if __FreeBSD_version >= 800504 bus_describe_intr(dev, txr->res, txr->tag, "tx %d", i); #endif - txr->msix = vector++; /* Increment vector for next pass */ + txr->msix = vector; + + if (em_last_bind_cpu < 0) + em_last_bind_cpu = CPU_FIRST(); + cpu_id = em_last_bind_cpu; + bus_bind_intr(dev, txr->res, cpu_id); + TASK_INIT(&txr->tx_task, 0, em_handle_tx, txr); txr->tq = taskqueue_create_fast("em_txq", M_NOWAIT, taskqueue_thread_enqueue, &txr->tq); taskqueue_start_threads(&txr->tq, 1, PI_NET, "%s txq (qid %d)", - device_get_nameunit(adapter->dev), i); + device_get_nameunit(adapter->dev), cpu_id); /* ** Set the bit to enable interrupt ** in E1000_IMS -- bits 22 and 23 @@ -2631,12 +2651,14 @@ em_allocate_msix(struct adapter *adapter */ txr->ims = 1 << (22 + i); adapter->ivars |= (8 | txr->msix) << (8 + (i * 4)); + + em_last_bind_cpu = CPU_NEXT(em_last_bind_cpu); } /* Link interrupt */ - ++rid; + rid = vector + 1; adapter->res = bus_alloc_resource_any(dev, - SYS_RES_IRQ, &rid, RF_ACTIVE); + SYS_RES_IRQ, &rid, RF_SHAREABLE | RF_ACTIVE); if (!adapter->res) { device_printf(dev,"Unable to allocate " "bus resource: Link interrupt [%d]\n", rid); @@ -2652,7 +2674,7 @@ em_allocate_msix(struct adapter *adapter return (error); } #if __FreeBSD_version >= 800504 - bus_describe_intr(dev, adapter->res, adapter->tag, "link"); + bus_describe_intr(dev, adapter->res, adapter->tag, "link"); #endif adapter->linkvec = vector; adapter->ivars |= (8 | vector) << 16; @@ -3423,6 +3445,7 @@ em_setup_transmit_ring(struct tx_ring *t /* Set number of descriptors available */ txr->tx_avail = adapter->num_tx_desc; + txr->queue_status = EM_QUEUE_IDLE; /* Clear checksum offload context. */ txr->last_hw_offload = 0; @@ -3462,7 +3485,7 @@ em_initialize_transmit_unit(struct adapt { struct tx_ring *txr = adapter->tx_rings; struct e1000_hw *hw = &adapter->hw; - u32 tctl, tarc, tipg = 0; + u32 tctl, txdctl = 0, tarc, tipg = 0; INIT_DEBUGOUT("em_initialize_transmit_unit: begin"); @@ -3484,6 +3507,12 @@ em_initialize_transmit_unit(struct adapt E1000_READ_REG(&adapter->hw, E1000_TDLEN(i))); txr->queue_status = EM_QUEUE_IDLE; + txdctl = E1000_READ_REG(hw, E1000_TXDCTL(i)); + txdctl |= 0x1f; /* PTHRESH */ + txdctl |= 1 << 8; /* HTHRESH */ + txdctl |= 1 << 16;/* WTHRESH */ + txdctl |= E1000_TXDCTL_QUEUE_ENABLE; + E1000_WRITE_REG(hw, E1000_TXDCTL(i), txdctl); } /* Set the default values for the Tx Inter Packet Gap timer */ @@ -3943,10 +3972,18 @@ em_txeof(struct tx_ring *txr) ** will examine this and do a reset if needed. */ if ((!processed) && ((ticks - txr->watchdog_time) > EM_WATCHDOG)) - txr->queue_status |= EM_QUEUE_HUNG; + txr->queue_status = EM_QUEUE_HUNG; - if (txr->tx_avail >= (adapter->num_tx_desc / 8)) - txr->queue_status &= ~EM_QUEUE_DEPLETED; + /* + * If we have a minimum free, clear IFF_DRV_OACTIVE + * to tell the stack that it is OK to send packets. + * Notice that all writes of OACTIVE happen under the + * TX lock which, with a single queue, guarantees + * sanity. + */ + if (txr->tx_avail >= EM_MAX_SCATTER) { + if_setdrvflagbits(ifp, 0, IFF_DRV_OACTIVE); + } /* Disable watchdog if all clean */ if (txr->tx_avail == adapter->num_tx_desc) { @@ -4371,7 +4408,7 @@ em_initialize_receive_unit(struct adapte reta = 0; for (i = 0; i < 4; ++i) { uint32_t q; - q = (i % 2) << 7; + q = (i % adapter->num_rx_queues) << 7; reta |= q << (8 * i); } for (i = 0; i < 32; ++i) @@ -4419,7 +4456,14 @@ em_initialize_receive_unit(struct adapte #endif /* DEV_NETMAP */ E1000_WRITE_REG(hw, E1000_RDT(i), rdt); } - /* Set PTHRESH for improved jumbo performance */ + + /* + * Set PTHRESH for improved jumbo performance + * According to 10.2.5.11 of Intel 82574 Datasheet, + * RXDCTL(1) is written whenever RXDCTL(0) is written. + * Only write to RXDCTL(1) if there is a need for different + * settings. + */ if (((adapter->hw.mac.type == e1000_ich9lan) || (adapter->hw.mac.type == e1000_pch2lan) || (adapter->hw.mac.type == e1000_ich10lan)) && @@ -5860,21 +5904,25 @@ em_print_debug_info(struct adapter *adap else printf("and ACTIVE\n"); - device_printf(dev, "hw tdh = %d, hw tdt = %d\n", - E1000_READ_REG(&adapter->hw, E1000_TDH(0)), - E1000_READ_REG(&adapter->hw, E1000_TDT(0))); - device_printf(dev, "hw rdh = %d, hw rdt = %d\n", - E1000_READ_REG(&adapter->hw, E1000_RDH(0)), - E1000_READ_REG(&adapter->hw, E1000_RDT(0))); - device_printf(dev, "Tx Queue Status = %d\n", txr->queue_status); - device_printf(dev, "TX descriptors avail = %d\n", - txr->tx_avail); - device_printf(dev, "Tx Descriptors avail failure = %ld\n", - txr->no_desc_avail); - device_printf(dev, "RX discarded packets = %ld\n", - rxr->rx_discarded); - device_printf(dev, "RX Next to Check = %d\n", rxr->next_to_check); - device_printf(dev, "RX Next to Refresh = %d\n", rxr->next_to_refresh); + for (int i = 0; i < adapter->num_tx_queues; i++, txr++) { + device_printf(dev, "hw tdh = %d, hw tdt = %d\n", + E1000_READ_REG(&adapter->hw, E1000_TDH(i)), + E1000_READ_REG(&adapter->hw, E1000_TDT(i))); + device_printf(dev, "Tx Queue Status = %d\n", txr->queue_status); + device_printf(dev, "TX descriptors avail = %d\n", + txr->tx_avail); + device_printf(dev, "Tx Descriptors avail failure = %ld\n", + txr->no_desc_avail); + } + for (int i = 0; i < adapter->num_rx_queues; i++, rxr++) { + device_printf(dev, "hw rdh = %d, hw rdt = %d\n", + E1000_READ_REG(&adapter->hw, E1000_RDH(i)), + E1000_READ_REG(&adapter->hw, E1000_RDT(i))); + device_printf(dev, "RX discarded packets = %ld\n", + rxr->rx_discarded); + device_printf(dev, "RX Next to Check = %d\n", rxr->next_to_check); + device_printf(dev, "RX Next to Refresh = %d\n", rxr->next_to_refresh); + } } #ifdef EM_MULTIQUEUE Modified: projects/em_mq/sys/dev/e1000/if_em.h ============================================================================== --- projects/em_mq/sys/dev/e1000/if_em.h Thu Apr 16 06:12:25 2015 (r281589) +++ projects/em_mq/sys/dev/e1000/if_em.h Thu Apr 16 06:23:58 2015 (r281590) @@ -191,7 +191,6 @@ #define EM_QUEUE_IDLE 0 #define EM_QUEUE_WORKING 1 #define EM_QUEUE_HUNG 2 -#define EM_QUEUE_DEPLETED 4 /* * TDBA/RDBA should be aligned on 16 byte boundary. But TDLEN/RDLEN should be From owner-svn-src-projects@FreeBSD.ORG Thu Apr 16 18:47:40 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D19AE751; Thu, 16 Apr 2015 18:47:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 B7861829; Thu, 16 Apr 2015 18:47:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3GIleou013051; Thu, 16 Apr 2015 18:47:40 GMT (envelope-from sbruno@FreeBSD.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3GIlVVA013005; Thu, 16 Apr 2015 18:47:31 GMT (envelope-from sbruno@FreeBSD.org) Message-Id: <201504161847.t3GIlVVA013005@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sbruno set sender to sbruno@FreeBSD.org using -f From: Sean Bruno Date: Thu, 16 Apr 2015 18:47:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r281607 - in projects/em_mq: . bin/csh bin/sh/tests/expansion cddl/contrib/opensolaris/lib/libdtrace/common cddl/lib/libdtrace cddl/usr.bin/ctfmerge contrib/binutils/bfd contrib/binutil... 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, 16 Apr 2015 18:47:40 -0000 Author: sbruno Date: Thu Apr 16 18:47:28 2015 New Revision: 281607 URL: https://svnweb.freebsd.org/changeset/base/281607 Log: MFH at svn r 281606 Added: projects/em_mq/bin/sh/tests/expansion/ifs6.0 - copied unchanged from r281606, head/bin/sh/tests/expansion/ifs6.0 projects/em_mq/bin/sh/tests/expansion/ifs7.0 - copied unchanged from r281606, head/bin/sh/tests/expansion/ifs7.0 projects/em_mq/contrib/compiler-rt/lib/builtins/floatditf.c - copied unchanged from r281606, head/contrib/compiler-rt/lib/builtins/floatditf.c projects/em_mq/contrib/compiler-rt/lib/builtins/floatunditf.c - copied unchanged from r281606, head/contrib/compiler-rt/lib/builtins/floatunditf.c projects/em_mq/contrib/compiler-rt/lib/builtins/multc3.c - copied unchanged from r281606, head/contrib/compiler-rt/lib/builtins/multc3.c projects/em_mq/contrib/llvm/patches/patch-11-llvm-r231227-aarch64-tls-relocs.diff - copied unchanged from r281606, head/contrib/llvm/patches/patch-11-llvm-r231227-aarch64-tls-relocs.diff projects/em_mq/contrib/llvm/patches/patch-12-clang-r227115-constantarraytype.diff - copied unchanged from r281606, head/contrib/llvm/patches/patch-12-clang-r227115-constantarraytype.diff projects/em_mq/contrib/llvm/tools/llvm-cov/ - copied from r281606, head/contrib/llvm/tools/llvm-cov/ projects/em_mq/contrib/llvm/tools/llvm-profdata/ - copied from r281606, head/contrib/llvm/tools/llvm-profdata/ projects/em_mq/contrib/nvi/docs/man/ - copied from r281606, head/contrib/nvi/docs/man/ projects/em_mq/lib/libc/aarch64/SYS.h - copied unchanged from r281606, head/lib/libc/aarch64/SYS.h projects/em_mq/lib/libc/aarch64/Symbol.map - copied unchanged from r281606, head/lib/libc/aarch64/Symbol.map projects/em_mq/lib/libc/aarch64/_fpmath.h - copied unchanged from r281606, head/lib/libc/aarch64/_fpmath.h projects/em_mq/lib/libc/aarch64/arith.h - copied unchanged from r281606, head/lib/libc/aarch64/arith.h projects/em_mq/lib/libc/aarch64/gd_qnan.h - copied unchanged from r281606, head/lib/libc/aarch64/gd_qnan.h projects/em_mq/lib/libc/aarch64/gen/ - copied from r281606, head/lib/libc/aarch64/gen/ projects/em_mq/lib/libc/aarch64/sys/ - copied from r281606, head/lib/libc/aarch64/sys/ projects/em_mq/lib/libc/sys/trivial-vdso_tc.c - copied unchanged from r281606, head/lib/libc/sys/trivial-vdso_tc.c projects/em_mq/lib/libkvm/kvm_aarch64.c - copied unchanged from r281606, head/lib/libkvm/kvm_aarch64.c projects/em_mq/lib/libthr/arch/aarch64/include/ - copied from r281606, head/lib/libthr/arch/aarch64/include/ projects/em_mq/lib/libthread_db/arch/aarch64/ - copied from r281606, head/lib/libthread_db/arch/aarch64/ projects/em_mq/lib/msun/aarch64/fenv.c - copied unchanged from r281606, head/lib/msun/aarch64/fenv.c projects/em_mq/libexec/rtld-elf/aarch64/ - copied from r281606, head/libexec/rtld-elf/aarch64/ projects/em_mq/release/Makefile.ec2 - copied unchanged from r281606, head/release/Makefile.ec2 projects/em_mq/release/tools/ec2.conf - copied unchanged from r281606, head/release/tools/ec2.conf projects/em_mq/sys/arm/amlogic/ - copied from r281606, head/sys/arm/amlogic/ projects/em_mq/sys/arm/conf/ODROIDC1 - copied unchanged from r281606, head/sys/arm/conf/ODROIDC1 projects/em_mq/sys/arm/conf/SOCKIT.common - copied unchanged from r281606, head/sys/arm/conf/SOCKIT.common projects/em_mq/sys/arm/conf/VIRT - copied unchanged from r281606, head/sys/arm/conf/VIRT projects/em_mq/sys/arm/conf/VSATV102 - copied unchanged from r281606, head/sys/arm/conf/VSATV102 projects/em_mq/sys/arm/qemu/ - copied from r281606, head/sys/arm/qemu/ projects/em_mq/sys/arm64/arm64/ - copied from r281606, head/sys/arm64/arm64/ projects/em_mq/sys/arm64/conf/ - copied from r281606, head/sys/arm64/conf/ projects/em_mq/sys/arm64/include/_bus.h - copied unchanged from r281606, head/sys/arm64/include/_bus.h projects/em_mq/sys/arm64/include/armreg.h - copied unchanged from r281606, head/sys/arm64/include/armreg.h projects/em_mq/sys/arm64/include/bus.h - copied unchanged from r281606, head/sys/arm64/include/bus.h projects/em_mq/sys/arm64/include/bus_dma.h - copied unchanged from r281606, head/sys/arm64/include/bus_dma.h projects/em_mq/sys/arm64/include/clock.h - copied unchanged from r281606, head/sys/arm64/include/clock.h projects/em_mq/sys/arm64/include/counter.h - copied unchanged from r281606, head/sys/arm64/include/counter.h projects/em_mq/sys/arm64/include/db_machdep.h - copied unchanged from r281606, head/sys/arm64/include/db_machdep.h projects/em_mq/sys/arm64/include/debug_monitor.h - copied unchanged from r281606, head/sys/arm64/include/debug_monitor.h projects/em_mq/sys/arm64/include/devmap.h - copied unchanged from r281606, head/sys/arm64/include/devmap.h projects/em_mq/sys/arm64/include/dump.h - copied unchanged from r281606, head/sys/arm64/include/dump.h projects/em_mq/sys/arm64/include/hypervisor.h - copied unchanged from r281606, head/sys/arm64/include/hypervisor.h projects/em_mq/sys/arm64/include/in_cksum.h - copied unchanged from r281606, head/sys/arm64/include/in_cksum.h projects/em_mq/sys/arm64/include/intr.h - copied unchanged from r281606, head/sys/arm64/include/intr.h projects/em_mq/sys/arm64/include/kdb.h - copied unchanged from r281606, head/sys/arm64/include/kdb.h projects/em_mq/sys/arm64/include/machdep.h - copied unchanged from r281606, head/sys/arm64/include/machdep.h projects/em_mq/sys/arm64/include/md_var.h - copied unchanged from r281606, head/sys/arm64/include/md_var.h projects/em_mq/sys/arm64/include/memdev.h - copied unchanged from r281606, head/sys/arm64/include/memdev.h projects/em_mq/sys/arm64/include/metadata.h - copied unchanged from r281606, head/sys/arm64/include/metadata.h projects/em_mq/sys/arm64/include/ofw_machdep.h - copied unchanged from r281606, head/sys/arm64/include/ofw_machdep.h projects/em_mq/sys/arm64/include/psl.h - copied unchanged from r281606, head/sys/arm64/include/psl.h projects/em_mq/sys/arm64/include/resource.h - copied unchanged from r281606, head/sys/arm64/include/resource.h projects/em_mq/sys/arm64/include/sf_buf.h - copied unchanged from r281606, head/sys/arm64/include/sf_buf.h projects/em_mq/sys/arm64/include/smp.h - copied unchanged from r281606, head/sys/arm64/include/smp.h projects/em_mq/sys/arm64/include/stack.h - copied unchanged from r281606, head/sys/arm64/include/stack.h projects/em_mq/sys/arm64/include/trap.h - copied unchanged from r281606, head/sys/arm64/include/trap.h projects/em_mq/sys/arm64/include/vfp.h - copied unchanged from r281606, head/sys/arm64/include/vfp.h projects/em_mq/sys/boot/Makefile.arm64 - copied unchanged from r281606, head/sys/boot/Makefile.arm64 projects/em_mq/sys/boot/arm64/ - copied from r281606, head/sys/boot/arm64/ projects/em_mq/sys/boot/efi/boot1/ - copied from r281606, head/sys/boot/efi/boot1/ projects/em_mq/sys/boot/efi/fdt/ - copied from r281606, head/sys/boot/efi/fdt/ projects/em_mq/sys/boot/efi/include/arm/ - copied from r281606, head/sys/boot/efi/include/arm/ projects/em_mq/sys/boot/efi/include/arm64/ - copied from r281606, head/sys/boot/efi/include/arm64/ projects/em_mq/sys/boot/efi/loader/ - copied from r281606, head/sys/boot/efi/loader/ projects/em_mq/sys/boot/fdt/dts/arm/meson8b.dtsi - copied unchanged from r281606, head/sys/boot/fdt/dts/arm/meson8b.dtsi projects/em_mq/sys/boot/fdt/dts/arm/odroidc1.dts - copied unchanged from r281606, head/sys/boot/fdt/dts/arm/odroidc1.dts projects/em_mq/sys/boot/fdt/dts/arm/vsatv102-m6.dts - copied unchanged from r281606, head/sys/boot/fdt/dts/arm/vsatv102-m6.dts projects/em_mq/sys/boot/ficl/aarch64/ - copied from r281606, head/sys/boot/ficl/aarch64/ projects/em_mq/sys/boot/forth/Makefile - copied unchanged from r281606, head/sys/boot/forth/Makefile projects/em_mq/sys/boot/forth/Makefile.inc - copied unchanged from r281606, head/sys/boot/forth/Makefile.inc projects/em_mq/sys/boot/forth/brand-fbsd.4th - copied unchanged from r281606, head/sys/boot/forth/brand-fbsd.4th projects/em_mq/sys/boot/forth/logo-beastie.4th - copied unchanged from r281606, head/sys/boot/forth/logo-beastie.4th projects/em_mq/sys/boot/forth/logo-beastiebw.4th - copied unchanged from r281606, head/sys/boot/forth/logo-beastiebw.4th projects/em_mq/sys/boot/forth/logo-fbsdbw.4th - copied unchanged from r281606, head/sys/boot/forth/logo-fbsdbw.4th projects/em_mq/sys/boot/forth/logo-orb.4th - copied unchanged from r281606, head/sys/boot/forth/logo-orb.4th projects/em_mq/sys/boot/forth/logo-orbbw.4th - copied unchanged from r281606, head/sys/boot/forth/logo-orbbw.4th projects/em_mq/sys/boot/i386/libi386/smbios.h - copied unchanged from r281606, head/sys/boot/i386/libi386/smbios.h projects/em_mq/sys/conf/Makefile.arm64 - copied unchanged from r281606, head/sys/conf/Makefile.arm64 projects/em_mq/sys/conf/files.arm64 - copied unchanged from r281606, head/sys/conf/files.arm64 projects/em_mq/sys/conf/ldscript.arm64 - copied unchanged from r281606, head/sys/conf/ldscript.arm64 projects/em_mq/sys/conf/options.arm64 - copied unchanged from r281606, head/sys/conf/options.arm64 projects/em_mq/sys/crypto/aesni/aesni_os.h - copied unchanged from r281606, head/sys/crypto/aesni/aesni_os.h projects/em_mq/sys/dev/fdt/fdt_arm64.c - copied unchanged from r281606, head/sys/dev/fdt/fdt_arm64.c projects/em_mq/sys/dev/hwpmc/hwpmc_mips74k.c - copied unchanged from r281606, head/sys/dev/hwpmc/hwpmc_mips74k.c projects/em_mq/sys/dev/psci/ - copied from r281606, head/sys/dev/psci/ projects/em_mq/sys/netinet/ip_reass.c - copied unchanged from r281606, head/sys/netinet/ip_reass.c projects/em_mq/sys/powerpc/mpc85xx/mpc85xx_gpio.c - copied unchanged from r281606, head/sys/powerpc/mpc85xx/mpc85xx_gpio.c projects/em_mq/sys/powerpc/powerpc/trap.c - copied unchanged from r281606, head/sys/powerpc/powerpc/trap.c projects/em_mq/tools/debugscripts/netstat-anr.gdb - copied unchanged from r281606, head/tools/debugscripts/netstat-anr.gdb projects/em_mq/usr.bin/clang/llvm-cov/ - copied from r281606, head/usr.bin/clang/llvm-cov/ projects/em_mq/usr.bin/clang/llvm-profdata/ - copied from r281606, head/usr.bin/clang/llvm-profdata/ Deleted: projects/em_mq/contrib/ntp/ntpd/ntp_parser.y projects/em_mq/contrib/nvi/catalog/spell.ok projects/em_mq/contrib/nvi/docs/TODO projects/em_mq/contrib/nvi/docs/USD.doc/ projects/em_mq/contrib/nvi/docs/changelog projects/em_mq/contrib/nvi/docs/ev projects/em_mq/contrib/nvi/docs/features projects/em_mq/contrib/nvi/docs/help projects/em_mq/contrib/nvi/docs/internals/ projects/em_mq/contrib/nvi/docs/interp/ projects/em_mq/contrib/nvi/docs/spell.ok projects/em_mq/contrib/nvi/docs/tutorial/ projects/em_mq/lib/libc/arm/sys/__vdso_gettc.c projects/em_mq/lib/libc/mips/sys/__vdso_gettc.c projects/em_mq/lib/libc/powerpc/sys/__vdso_gettc.c projects/em_mq/lib/libc/powerpc64/sys/__vdso_gettc.c projects/em_mq/lib/libc/sparc64/sys/__vdso_gettc.c projects/em_mq/share/doc/usd/10.exref/ projects/em_mq/share/doc/usd/11.vitut/ projects/em_mq/share/doc/usd/12.vi/ projects/em_mq/share/doc/usd/13.viref/ projects/em_mq/sys/boot/amd64/ projects/em_mq/sys/boot/i386/efi/ projects/em_mq/sys/powerpc/aim/trap.c projects/em_mq/sys/powerpc/booke/trap.c projects/em_mq/tools/regression/sockets/so_setfib/so_setfib.t Modified: projects/em_mq/Makefile.inc1 projects/em_mq/ObsoleteFiles.inc projects/em_mq/README projects/em_mq/UPDATING projects/em_mq/bin/csh/config.h projects/em_mq/bin/csh/iconv_stub.h projects/em_mq/bin/sh/tests/expansion/Makefile projects/em_mq/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c projects/em_mq/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c projects/em_mq/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c projects/em_mq/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c projects/em_mq/cddl/lib/libdtrace/libproc_compat.h projects/em_mq/cddl/usr.bin/ctfmerge/Makefile projects/em_mq/contrib/binutils/bfd/elf-bfd.h projects/em_mq/contrib/binutils/bfd/elf32-arm.c projects/em_mq/contrib/binutils/include/elf/arm.h projects/em_mq/contrib/elftoolchain/addr2line/addr2line.c projects/em_mq/contrib/elftoolchain/common/_elftc.h projects/em_mq/contrib/elftoolchain/common/elfdefinitions.h projects/em_mq/contrib/elftoolchain/common/native-elf-format projects/em_mq/contrib/elftoolchain/cxxfilt/cxxfilt.c projects/em_mq/contrib/elftoolchain/elfcopy/archive.c projects/em_mq/contrib/elftoolchain/elfcopy/ascii.c projects/em_mq/contrib/elftoolchain/elfcopy/binary.c projects/em_mq/contrib/elftoolchain/elfcopy/elfcopy.1 projects/em_mq/contrib/elftoolchain/elfcopy/elfcopy.h projects/em_mq/contrib/elftoolchain/elfcopy/main.c projects/em_mq/contrib/elftoolchain/elfcopy/sections.c projects/em_mq/contrib/elftoolchain/elfcopy/segments.c projects/em_mq/contrib/elftoolchain/elfcopy/symbols.c projects/em_mq/contrib/elftoolchain/libdwarf/_libdwarf.h projects/em_mq/contrib/elftoolchain/libdwarf/libdwarf.h projects/em_mq/contrib/elftoolchain/libdwarf/libdwarf_lineno.c projects/em_mq/contrib/elftoolchain/libelf/_libelf.h projects/em_mq/contrib/elftoolchain/libelf/_libelf_config.h projects/em_mq/contrib/elftoolchain/libelf/elf_data.c projects/em_mq/contrib/elftoolchain/libelf/elf_end.c projects/em_mq/contrib/elftoolchain/libelf/elf_errmsg.c projects/em_mq/contrib/elftoolchain/libelf/elf_errno.c projects/em_mq/contrib/elftoolchain/libelf/elf_fill.c projects/em_mq/contrib/elftoolchain/libelf/elf_flag.c projects/em_mq/contrib/elftoolchain/libelf/elf_getarhdr.c projects/em_mq/contrib/elftoolchain/libelf/elf_getarsym.c projects/em_mq/contrib/elftoolchain/libelf/elf_getbase.c projects/em_mq/contrib/elftoolchain/libelf/elf_getident.c projects/em_mq/contrib/elftoolchain/libelf/elf_hash.c projects/em_mq/contrib/elftoolchain/libelf/elf_kind.c projects/em_mq/contrib/elftoolchain/libelf/elf_next.c projects/em_mq/contrib/elftoolchain/libelf/elf_phnum.c projects/em_mq/contrib/elftoolchain/libelf/elf_rand.c projects/em_mq/contrib/elftoolchain/libelf/elf_rawfile.c projects/em_mq/contrib/elftoolchain/libelf/elf_scn.c projects/em_mq/contrib/elftoolchain/libelf/elf_shnum.c projects/em_mq/contrib/elftoolchain/libelf/elf_shstrndx.c projects/em_mq/contrib/elftoolchain/libelf/elf_version.c projects/em_mq/contrib/elftoolchain/libelf/gelf.h projects/em_mq/contrib/elftoolchain/libelf/gelf_cap.c projects/em_mq/contrib/elftoolchain/libelf/gelf_checksum.c projects/em_mq/contrib/elftoolchain/libelf/gelf_dyn.c projects/em_mq/contrib/elftoolchain/libelf/gelf_ehdr.c projects/em_mq/contrib/elftoolchain/libelf/gelf_fsize.c projects/em_mq/contrib/elftoolchain/libelf/gelf_getclass.c projects/em_mq/contrib/elftoolchain/libelf/gelf_move.c projects/em_mq/contrib/elftoolchain/libelf/gelf_phdr.c projects/em_mq/contrib/elftoolchain/libelf/gelf_rel.c projects/em_mq/contrib/elftoolchain/libelf/gelf_rela.c projects/em_mq/contrib/elftoolchain/libelf/gelf_shdr.c projects/em_mq/contrib/elftoolchain/libelf/gelf_sym.c projects/em_mq/contrib/elftoolchain/libelf/gelf_syminfo.c projects/em_mq/contrib/elftoolchain/libelf/gelf_symshndx.c projects/em_mq/contrib/elftoolchain/libelf/gelf_xlate.c projects/em_mq/contrib/elftoolchain/libelf/libelf.h projects/em_mq/contrib/elftoolchain/libelf/libelf_align.c projects/em_mq/contrib/elftoolchain/libelf/libelf_allocate.c projects/em_mq/contrib/elftoolchain/libelf/libelf_ar.c projects/em_mq/contrib/elftoolchain/libelf/libelf_ar_util.c projects/em_mq/contrib/elftoolchain/libelf/libelf_checksum.c projects/em_mq/contrib/elftoolchain/libelf/libelf_convert.m4 projects/em_mq/contrib/elftoolchain/libelf/libelf_data.c projects/em_mq/contrib/elftoolchain/libelf/libelf_ehdr.c projects/em_mq/contrib/elftoolchain/libelf/libelf_extended.c projects/em_mq/contrib/elftoolchain/libelf/libelf_msize.m4 projects/em_mq/contrib/elftoolchain/libelf/libelf_phdr.c projects/em_mq/contrib/elftoolchain/libelf/libelf_shdr.c projects/em_mq/contrib/elftoolchain/libelf/libelf_xlate.c projects/em_mq/contrib/elftoolchain/libelftc/_libelftc.h projects/em_mq/contrib/elftoolchain/libelftc/elftc_bfdtarget.c projects/em_mq/contrib/elftoolchain/libelftc/elftc_demangle.c projects/em_mq/contrib/elftoolchain/libelftc/libelftc.h projects/em_mq/contrib/elftoolchain/libelftc/libelftc_bfdtarget.c projects/em_mq/contrib/elftoolchain/nm/nm.c projects/em_mq/contrib/elftoolchain/readelf/readelf.c projects/em_mq/contrib/elftoolchain/size/size.c projects/em_mq/contrib/elftoolchain/strings/strings.c projects/em_mq/contrib/gcc/unwind-dw2.c projects/em_mq/contrib/ipfilter/ipsend/44arp.c projects/em_mq/contrib/ipfilter/ipsend/ip.c projects/em_mq/contrib/ipfilter/ipsend/resend.c projects/em_mq/contrib/ipfilter/lib/kmem.c projects/em_mq/contrib/ipfilter/tools/ipfs.c projects/em_mq/contrib/ipfilter/tools/ipftest.c projects/em_mq/contrib/ipfilter/tools/ipnat.c projects/em_mq/contrib/ipfilter/tools/ipnat_y.y projects/em_mq/contrib/ipfilter/tools/ippool.c projects/em_mq/contrib/ipfilter/tools/ippool_y.y projects/em_mq/contrib/libarchive/libarchive/archive_read_disk_posix.c projects/em_mq/contrib/libc++/include/type_traits projects/em_mq/contrib/llvm/FREEBSD-Xlist projects/em_mq/contrib/llvm/lib/Target/AArch64/AArch64AsmPrinter.cpp projects/em_mq/contrib/llvm/lib/Target/AArch64/AArch64CleanupLocalDynamicTLSPass.cpp projects/em_mq/contrib/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp projects/em_mq/contrib/llvm/lib/Target/AArch64/AArch64ISelLowering.h projects/em_mq/contrib/llvm/lib/Target/AArch64/AArch64InstrInfo.td projects/em_mq/contrib/llvm/lib/Target/AArch64/AArch64MCInstLower.cpp projects/em_mq/contrib/llvm/lib/Target/AArch64/Utils/AArch64BaseInfo.h projects/em_mq/contrib/llvm/tools/clang/lib/Sema/SemaInit.cpp projects/em_mq/contrib/ntp/ntpd/ntp_crypto.c projects/em_mq/contrib/nvi/README projects/em_mq/contrib/nvi/catalog/dump.c projects/em_mq/contrib/nvi/cl/cl.h projects/em_mq/contrib/nvi/cl/cl_funcs.c projects/em_mq/contrib/nvi/cl/cl_main.c projects/em_mq/contrib/nvi/cl/cl_read.c projects/em_mq/contrib/nvi/cl/cl_screen.c projects/em_mq/contrib/nvi/cl/cl_term.c projects/em_mq/contrib/nvi/cl/extern.h projects/em_mq/contrib/nvi/common/common.h projects/em_mq/contrib/nvi/common/conv.c projects/em_mq/contrib/nvi/common/cut.c projects/em_mq/contrib/nvi/common/delete.c projects/em_mq/contrib/nvi/common/encoding.c projects/em_mq/contrib/nvi/common/exf.c projects/em_mq/contrib/nvi/common/extern.h projects/em_mq/contrib/nvi/common/gs.h projects/em_mq/contrib/nvi/common/key.c projects/em_mq/contrib/nvi/common/line.c projects/em_mq/contrib/nvi/common/log.c projects/em_mq/contrib/nvi/common/main.c projects/em_mq/contrib/nvi/common/mark.c projects/em_mq/contrib/nvi/common/msg.c projects/em_mq/contrib/nvi/common/options.c projects/em_mq/contrib/nvi/common/options.h projects/em_mq/contrib/nvi/common/options_f.c projects/em_mq/contrib/nvi/common/put.c projects/em_mq/contrib/nvi/common/recover.c projects/em_mq/contrib/nvi/common/screen.c projects/em_mq/contrib/nvi/common/search.c projects/em_mq/contrib/nvi/common/seq.c projects/em_mq/contrib/nvi/common/util.c projects/em_mq/contrib/nvi/ex/ex.c projects/em_mq/contrib/nvi/ex/ex.h projects/em_mq/contrib/nvi/ex/ex_abbrev.c projects/em_mq/contrib/nvi/ex/ex_append.c projects/em_mq/contrib/nvi/ex/ex_args.c projects/em_mq/contrib/nvi/ex/ex_argv.c projects/em_mq/contrib/nvi/ex/ex_at.c projects/em_mq/contrib/nvi/ex/ex_bang.c projects/em_mq/contrib/nvi/ex/ex_cd.c projects/em_mq/contrib/nvi/ex/ex_cscope.c projects/em_mq/contrib/nvi/ex/ex_delete.c projects/em_mq/contrib/nvi/ex/ex_display.c projects/em_mq/contrib/nvi/ex/ex_edit.c projects/em_mq/contrib/nvi/ex/ex_equal.c projects/em_mq/contrib/nvi/ex/ex_file.c projects/em_mq/contrib/nvi/ex/ex_filter.c projects/em_mq/contrib/nvi/ex/ex_global.c projects/em_mq/contrib/nvi/ex/ex_init.c projects/em_mq/contrib/nvi/ex/ex_join.c projects/em_mq/contrib/nvi/ex/ex_map.c projects/em_mq/contrib/nvi/ex/ex_mark.c projects/em_mq/contrib/nvi/ex/ex_mkexrc.c projects/em_mq/contrib/nvi/ex/ex_move.c projects/em_mq/contrib/nvi/ex/ex_open.c projects/em_mq/contrib/nvi/ex/ex_preserve.c projects/em_mq/contrib/nvi/ex/ex_print.c projects/em_mq/contrib/nvi/ex/ex_put.c projects/em_mq/contrib/nvi/ex/ex_quit.c projects/em_mq/contrib/nvi/ex/ex_read.c projects/em_mq/contrib/nvi/ex/ex_screen.c projects/em_mq/contrib/nvi/ex/ex_script.c projects/em_mq/contrib/nvi/ex/ex_set.c projects/em_mq/contrib/nvi/ex/ex_shell.c projects/em_mq/contrib/nvi/ex/ex_shift.c projects/em_mq/contrib/nvi/ex/ex_source.c projects/em_mq/contrib/nvi/ex/ex_stop.c projects/em_mq/contrib/nvi/ex/ex_subst.c projects/em_mq/contrib/nvi/ex/ex_tag.c projects/em_mq/contrib/nvi/ex/ex_txt.c projects/em_mq/contrib/nvi/ex/ex_undo.c projects/em_mq/contrib/nvi/ex/ex_usage.c projects/em_mq/contrib/nvi/ex/ex_util.c projects/em_mq/contrib/nvi/ex/ex_version.c projects/em_mq/contrib/nvi/ex/ex_visual.c projects/em_mq/contrib/nvi/ex/ex_write.c projects/em_mq/contrib/nvi/ex/ex_yank.c projects/em_mq/contrib/nvi/ex/ex_z.c projects/em_mq/contrib/nvi/ex/extern.h projects/em_mq/contrib/nvi/ex/version.h projects/em_mq/contrib/nvi/regex/COPYRIGHT projects/em_mq/contrib/nvi/regex/cclass.h projects/em_mq/contrib/nvi/regex/cname.h projects/em_mq/contrib/nvi/regex/engine.c projects/em_mq/contrib/nvi/regex/re_format.7 projects/em_mq/contrib/nvi/regex/regcomp.c projects/em_mq/contrib/nvi/regex/regerror.c projects/em_mq/contrib/nvi/regex/regex.3 projects/em_mq/contrib/nvi/regex/regex.h projects/em_mq/contrib/nvi/regex/regex2.h projects/em_mq/contrib/nvi/regex/regexec.c projects/em_mq/contrib/nvi/regex/regfree.c projects/em_mq/contrib/nvi/regex/utils.h projects/em_mq/contrib/nvi/vi/extern.h projects/em_mq/contrib/nvi/vi/getc.c projects/em_mq/contrib/nvi/vi/v_at.c projects/em_mq/contrib/nvi/vi/v_ch.c projects/em_mq/contrib/nvi/vi/v_delete.c projects/em_mq/contrib/nvi/vi/v_ex.c projects/em_mq/contrib/nvi/vi/v_increment.c projects/em_mq/contrib/nvi/vi/v_init.c projects/em_mq/contrib/nvi/vi/v_itxt.c projects/em_mq/contrib/nvi/vi/v_left.c projects/em_mq/contrib/nvi/vi/v_mark.c projects/em_mq/contrib/nvi/vi/v_match.c projects/em_mq/contrib/nvi/vi/v_paragraph.c projects/em_mq/contrib/nvi/vi/v_put.c projects/em_mq/contrib/nvi/vi/v_redraw.c projects/em_mq/contrib/nvi/vi/v_replace.c projects/em_mq/contrib/nvi/vi/v_right.c projects/em_mq/contrib/nvi/vi/v_screen.c projects/em_mq/contrib/nvi/vi/v_scroll.c projects/em_mq/contrib/nvi/vi/v_search.c projects/em_mq/contrib/nvi/vi/v_section.c projects/em_mq/contrib/nvi/vi/v_sentence.c projects/em_mq/contrib/nvi/vi/v_status.c projects/em_mq/contrib/nvi/vi/v_txt.c projects/em_mq/contrib/nvi/vi/v_ulcase.c projects/em_mq/contrib/nvi/vi/v_undo.c projects/em_mq/contrib/nvi/vi/v_util.c projects/em_mq/contrib/nvi/vi/v_word.c projects/em_mq/contrib/nvi/vi/v_xchar.c projects/em_mq/contrib/nvi/vi/v_yank.c projects/em_mq/contrib/nvi/vi/v_z.c projects/em_mq/contrib/nvi/vi/v_zexit.c projects/em_mq/contrib/nvi/vi/vi.c projects/em_mq/contrib/nvi/vi/vi.h projects/em_mq/contrib/nvi/vi/vs_line.c projects/em_mq/contrib/nvi/vi/vs_msg.c projects/em_mq/contrib/nvi/vi/vs_refresh.c projects/em_mq/contrib/nvi/vi/vs_relative.c projects/em_mq/contrib/nvi/vi/vs_smap.c projects/em_mq/contrib/nvi/vi/vs_split.c projects/em_mq/contrib/pjdfstest/tests/open/20.t projects/em_mq/contrib/pjdfstest/tests/truncate/11.t projects/em_mq/contrib/smbfs/include/netsmb/smb_lib.h projects/em_mq/contrib/smbfs/lib/smb/nls.c projects/em_mq/contrib/smbfs/lib/smb/print.c projects/em_mq/contrib/smbfs/lib/smb/rq.c projects/em_mq/contrib/xz/ChangeLog projects/em_mq/contrib/xz/THANKS projects/em_mq/contrib/xz/src/common/tuklib_cpucores.c projects/em_mq/contrib/xz/src/common/tuklib_integer.h projects/em_mq/contrib/xz/src/liblzma/api/lzma/version.h projects/em_mq/contrib/xz/src/liblzma/common/memcmplen.h projects/em_mq/contrib/xz/src/liblzma/lz/lz_encoder.c projects/em_mq/contrib/xz/src/liblzma/lzma/lzma_encoder_optimum_fast.c projects/em_mq/contrib/xz/src/xz/file_io.c projects/em_mq/crypto/openssh/clientloop.c projects/em_mq/etc/Makefile projects/em_mq/etc/login.conf projects/em_mq/etc/mtree/BSD.usr.dist projects/em_mq/etc/ntp.conf projects/em_mq/etc/rc.d/hostid_save projects/em_mq/etc/rc.d/pflog projects/em_mq/games/fortune/tools/do_uniq.py projects/em_mq/gnu/lib/libgcc/Makefile projects/em_mq/include/iconv.h projects/em_mq/include/pthread.h projects/em_mq/include/signal.h projects/em_mq/include/stdlib.h projects/em_mq/lib/csu/i386-elf/Makefile projects/em_mq/lib/libarchive/Makefile projects/em_mq/lib/libbluetooth/bluetooth.c projects/em_mq/lib/libbluetooth/dev.c projects/em_mq/lib/libbluetooth/hci.c projects/em_mq/lib/libc/Makefile projects/em_mq/lib/libc/aarch64/Makefile.inc projects/em_mq/lib/libc/arm/sys/Makefile.inc projects/em_mq/lib/libc/gen/fts.c projects/em_mq/lib/libc/gen/tls.c projects/em_mq/lib/libc/gen/wordexp.c projects/em_mq/lib/libc/iconv/__iconv.c projects/em_mq/lib/libc/iconv/bsd_iconv.c projects/em_mq/lib/libc/iconv/citrus_iconv.h projects/em_mq/lib/libc/iconv/citrus_iconv_local.h projects/em_mq/lib/libc/iconv/citrus_none.c projects/em_mq/lib/libc/iconv/citrus_stdenc.h projects/em_mq/lib/libc/iconv/citrus_stdenc_local.h projects/em_mq/lib/libc/iconv/citrus_stdenc_template.h projects/em_mq/lib/libc/iconv/iconv-internal.h projects/em_mq/lib/libc/iconv/iconv.3 projects/em_mq/lib/libc/iconv/iconv.c projects/em_mq/lib/libc/iconv/iconv_compat.c projects/em_mq/lib/libc/include/compat.h projects/em_mq/lib/libc/locale/cXXrtomb_iconv.h projects/em_mq/lib/libc/locale/mbrtocXX_iconv.h projects/em_mq/lib/libc/mips/sys/Makefile.inc projects/em_mq/lib/libc/net/getaddrinfo.c projects/em_mq/lib/libc/net/name6.c projects/em_mq/lib/libc/powerpc/Makefile.inc projects/em_mq/lib/libc/powerpc/gen/_setjmp.S projects/em_mq/lib/libc/powerpc/gen/setjmp.S projects/em_mq/lib/libc/powerpc/gen/sigsetjmp.S projects/em_mq/lib/libc/powerpc64/Makefile.inc projects/em_mq/lib/libc/sparc64/Makefile.inc projects/em_mq/lib/libc/string/strlcat.c projects/em_mq/lib/libc/string/strlcpy.c projects/em_mq/lib/libc/sys/fcntl.c projects/em_mq/lib/libc/sys/mount.2 projects/em_mq/lib/libc/sys/open.2 projects/em_mq/lib/libc/sys/vfork.2 projects/em_mq/lib/libc/xdr/xdr_float.c projects/em_mq/lib/libcompiler_rt/Makefile projects/em_mq/lib/libelftc/elftc_version.c projects/em_mq/lib/libiconv_modules/BIG5/citrus_big5.c projects/em_mq/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c projects/em_mq/lib/libiconv_modules/EUC/citrus_euc.c projects/em_mq/lib/libiconv_modules/EUCTW/citrus_euctw.c projects/em_mq/lib/libiconv_modules/GBK2K/citrus_gbk2k.c projects/em_mq/lib/libiconv_modules/HZ/citrus_hz.c projects/em_mq/lib/libiconv_modules/ISO2022/citrus_iso2022.c projects/em_mq/lib/libiconv_modules/JOHAB/citrus_johab.c projects/em_mq/lib/libiconv_modules/MSKanji/citrus_mskanji.c projects/em_mq/lib/libiconv_modules/UES/citrus_ues.c projects/em_mq/lib/libiconv_modules/UTF1632/citrus_utf1632.c projects/em_mq/lib/libiconv_modules/UTF7/citrus_utf7.c projects/em_mq/lib/libiconv_modules/UTF8/citrus_utf8.c projects/em_mq/lib/libiconv_modules/VIQR/citrus_viqr.c projects/em_mq/lib/libiconv_modules/ZW/citrus_zw.c projects/em_mq/lib/libiconv_modules/iconv_none/citrus_iconv_none.c projects/em_mq/lib/libiconv_modules/iconv_std/citrus_iconv_std.c projects/em_mq/lib/libkiconv/xlat16_iconv.c projects/em_mq/lib/liblzma/Symbol.map projects/em_mq/lib/liblzma/config.h projects/em_mq/lib/libmt/Makefile projects/em_mq/lib/libpmc/libpmc.c projects/em_mq/lib/libsdp/search.c projects/em_mq/lib/libsdp/service.c projects/em_mq/lib/libsdp/session.c projects/em_mq/lib/libsdp/util.c projects/em_mq/lib/libstand/Makefile projects/em_mq/lib/libvmmapi/Makefile projects/em_mq/lib/libvmmapi/vmmapi.c projects/em_mq/lib/libvmmapi/vmmapi.h projects/em_mq/libexec/rtld-elf/mips/reloc.c projects/em_mq/libexec/rtld-elf/rtld.c projects/em_mq/libexec/rtld-elf/rtld.h projects/em_mq/release/Makefile.vm projects/em_mq/release/tools/arm/crochet-BEAGLEBONE.conf projects/em_mq/release/tools/arm/crochet-PANDABOARD.conf projects/em_mq/release/tools/arm/crochet-RPI-B.conf projects/em_mq/release/tools/arm/crochet-WANDBOARD-QUAD.conf projects/em_mq/release/tools/arm/crochet-ZEDBOARD.conf projects/em_mq/release/tools/gce.conf projects/em_mq/sbin/ggate/ggatec/ggatec.8 projects/em_mq/sbin/ggate/ggatel/ggatel.8 projects/em_mq/sbin/ifconfig/af_inet.c projects/em_mq/sbin/ifconfig/af_inet6.c projects/em_mq/sbin/ifconfig/af_nd6.c projects/em_mq/sbin/ifconfig/carp.c projects/em_mq/sbin/ifconfig/ifconfig.c projects/em_mq/sbin/ifconfig/ifmedia.c projects/em_mq/sbin/ifconfig/ifvlan.c projects/em_mq/sbin/ifconfig/ifvxlan.c projects/em_mq/sbin/md5/md5.c projects/em_mq/sbin/newfs_msdos/newfs_msdos.8 projects/em_mq/share/doc/usd/Makefile projects/em_mq/share/man/man3/queue.3 projects/em_mq/share/man/man4/amdtemp.4 projects/em_mq/share/man/man4/ctl.4 projects/em_mq/share/man/man4/inet.4 projects/em_mq/share/man/man4/tap.4 projects/em_mq/share/man/man5/src.conf.5 projects/em_mq/share/mk/bsd.dep.mk projects/em_mq/share/mk/src.libnames.mk projects/em_mq/share/mk/src.opts.mk projects/em_mq/share/mk/sys.mk projects/em_mq/sys/amd64/amd64/mp_machdep.c projects/em_mq/sys/amd64/amd64/pmap.c projects/em_mq/sys/amd64/amd64/uma_machdep.c projects/em_mq/sys/amd64/include/metadata.h projects/em_mq/sys/amd64/include/vmm_instruction_emul.h (contents, props changed) projects/em_mq/sys/amd64/vmm/vmm.c projects/em_mq/sys/amd64/vmm/vmm_dev.c projects/em_mq/sys/amd64/vmm/vmm_instruction_emul.c projects/em_mq/sys/arm/allwinner/a10_clk.c projects/em_mq/sys/arm/allwinner/a10_common.c projects/em_mq/sys/arm/allwinner/a10_gpio.c projects/em_mq/sys/arm/allwinner/a10_sramc.c projects/em_mq/sys/arm/allwinner/a10_wdog.c projects/em_mq/sys/arm/allwinner/a20/a20_cpu_cfg.c projects/em_mq/sys/arm/allwinner/a20/a20_mp.c projects/em_mq/sys/arm/allwinner/timer.c projects/em_mq/sys/arm/altera/socfpga/socfpga_gpio.c projects/em_mq/sys/arm/altera/socfpga/socfpga_manager.c projects/em_mq/sys/arm/altera/socfpga/socfpga_mp.c projects/em_mq/sys/arm/arm/cpufunc.c projects/em_mq/sys/arm/arm/devmap.c projects/em_mq/sys/arm/arm/generic_timer.c projects/em_mq/sys/arm/arm/gic.c projects/em_mq/sys/arm/arm/intr.c projects/em_mq/sys/arm/arm/mpcore_timer.c projects/em_mq/sys/arm/arm/pl310.c projects/em_mq/sys/arm/arm/pmap-v6-new.c projects/em_mq/sys/arm/arm/pmap-v6.c projects/em_mq/sys/arm/arm/pmap.c projects/em_mq/sys/arm/arm/pmu.c projects/em_mq/sys/arm/at91/at91_common.c projects/em_mq/sys/arm/broadcom/bcm2835/bcm2835_common.c projects/em_mq/sys/arm/broadcom/bcm2835/bcm2835_fbd.c projects/em_mq/sys/arm/broadcom/bcm2835/bcm2835_spi.c projects/em_mq/sys/arm/broadcom/bcm2835/bcm2835_systimer.c projects/em_mq/sys/arm/broadcom/bcm2835/bcm2835_wdog.c projects/em_mq/sys/arm/conf/SOCKIT projects/em_mq/sys/arm/conf/SOCKIT-BERI projects/em_mq/sys/arm/freescale/imx/imx51_ccm.c projects/em_mq/sys/arm/freescale/imx/imx51_ipuv3.c projects/em_mq/sys/arm/freescale/imx/imx51_ipuv3_fbd.c projects/em_mq/sys/arm/freescale/imx/imx6_anatop.c projects/em_mq/sys/arm/freescale/imx/imx6_audmux.c projects/em_mq/sys/arm/freescale/imx/imx6_mp.c projects/em_mq/sys/arm/freescale/imx/imx6_sdma.c projects/em_mq/sys/arm/freescale/imx/imx6_ssi.c projects/em_mq/sys/arm/freescale/imx/imx_common.c projects/em_mq/sys/arm/freescale/imx/imx_gpt.c projects/em_mq/sys/arm/freescale/imx/imx_iomux.c projects/em_mq/sys/arm/freescale/imx/imx_wdog.c projects/em_mq/sys/arm/freescale/vybrid/vf_adc.c projects/em_mq/sys/arm/freescale/vybrid/vf_anadig.c projects/em_mq/sys/arm/freescale/vybrid/vf_ccm.c projects/em_mq/sys/arm/freescale/vybrid/vf_dcu4.c projects/em_mq/sys/arm/freescale/vybrid/vf_dmamux.c projects/em_mq/sys/arm/freescale/vybrid/vf_edma.c projects/em_mq/sys/arm/freescale/vybrid/vf_gpio.c projects/em_mq/sys/arm/freescale/vybrid/vf_i2c.c projects/em_mq/sys/arm/freescale/vybrid/vf_iomuxc.c projects/em_mq/sys/arm/freescale/vybrid/vf_mscm.c projects/em_mq/sys/arm/freescale/vybrid/vf_nfc.c projects/em_mq/sys/arm/freescale/vybrid/vf_port.c projects/em_mq/sys/arm/freescale/vybrid/vf_sai.c projects/em_mq/sys/arm/freescale/vybrid/vf_spi.c projects/em_mq/sys/arm/freescale/vybrid/vf_src.c projects/em_mq/sys/arm/freescale/vybrid/vf_tcon.c projects/em_mq/sys/arm/freescale/vybrid/vf_uart.c projects/em_mq/sys/arm/include/cpu-v6.h projects/em_mq/sys/arm/include/fdt.h projects/em_mq/sys/arm/include/metadata.h projects/em_mq/sys/arm/include/pmap-v6.h projects/em_mq/sys/arm/include/pmap.h projects/em_mq/sys/arm/include/sysreg.h projects/em_mq/sys/arm/mv/armadaxp/armadaxp_mp.c projects/em_mq/sys/arm/mv/gpio.c projects/em_mq/sys/arm/mv/mv_localbus.c projects/em_mq/sys/arm/mv/mv_ts.c projects/em_mq/sys/arm/mv/mvvar.h projects/em_mq/sys/arm/rockchip/rk30xx_common.c projects/em_mq/sys/arm/rockchip/rk30xx_gpio.c projects/em_mq/sys/arm/rockchip/rk30xx_grf.c projects/em_mq/sys/arm/rockchip/rk30xx_mp.c projects/em_mq/sys/arm/rockchip/rk30xx_pmu.c projects/em_mq/sys/arm/samsung/exynos/exynos5_mp.c projects/em_mq/sys/arm/samsung/exynos/exynos_uart.c projects/em_mq/sys/arm/samsung/s3c2xx0/uart_dev_s3c2410.c projects/em_mq/sys/arm/ti/am335x/am335x_dmtimer.c projects/em_mq/sys/arm/ti/am335x/am335x_prcm.c projects/em_mq/sys/arm/ti/omap4/omap4_mp.c projects/em_mq/sys/arm/ti/ti_common.c projects/em_mq/sys/arm/ti/ti_mbox.c projects/em_mq/sys/arm/ti/ti_pruss.c projects/em_mq/sys/arm/ti/ti_wdt.c projects/em_mq/sys/arm/versatile/pl050.c projects/em_mq/sys/arm/versatile/sp804.c projects/em_mq/sys/arm/versatile/versatile_clcd.c projects/em_mq/sys/arm/versatile/versatile_common.c projects/em_mq/sys/arm/versatile/versatile_pci.c projects/em_mq/sys/arm/versatile/versatile_timer.c projects/em_mq/sys/arm/xilinx/zy7_mp.c projects/em_mq/sys/arm64/include/atomic.h projects/em_mq/sys/arm64/include/cpufunc.h projects/em_mq/sys/arm64/include/param.h projects/em_mq/sys/arm64/include/pmap.h projects/em_mq/sys/arm64/include/ucontext.h projects/em_mq/sys/boot/Makefile projects/em_mq/sys/boot/Makefile.arm projects/em_mq/sys/boot/arm/uboot/Makefile projects/em_mq/sys/boot/common/Makefile.inc projects/em_mq/sys/boot/efi/Makefile projects/em_mq/sys/boot/efi/Makefile.inc projects/em_mq/sys/boot/efi/libefi/Makefile projects/em_mq/sys/boot/forth/beastie.4th projects/em_mq/sys/boot/forth/brand.4th projects/em_mq/sys/boot/forth/check-password.4th projects/em_mq/sys/boot/forth/delay.4th projects/em_mq/sys/boot/forth/frames.4th projects/em_mq/sys/boot/forth/loader.4th projects/em_mq/sys/boot/forth/loader.conf projects/em_mq/sys/boot/forth/menu-commands.4th projects/em_mq/sys/boot/forth/menu.4th projects/em_mq/sys/boot/forth/menu.rc projects/em_mq/sys/boot/forth/menusets.4th projects/em_mq/sys/boot/forth/pcibios.4th projects/em_mq/sys/boot/forth/pnp.4th projects/em_mq/sys/boot/forth/screen.4th projects/em_mq/sys/boot/forth/support.4th projects/em_mq/sys/boot/forth/version.4th projects/em_mq/sys/boot/i386/boot2/Makefile projects/em_mq/sys/boot/i386/gptboot/Makefile projects/em_mq/sys/boot/i386/gptzfsboot/Makefile projects/em_mq/sys/boot/i386/libi386/libi386.h projects/em_mq/sys/boot/i386/libi386/multiboot.c projects/em_mq/sys/boot/i386/libi386/smbios.c projects/em_mq/sys/boot/i386/loader/Makefile projects/em_mq/sys/boot/i386/loader/main.c projects/em_mq/sys/boot/i386/zfsboot/Makefile projects/em_mq/sys/boot/mips/beri/boot2/Makefile projects/em_mq/sys/boot/mips/beri/loader/Makefile projects/em_mq/sys/boot/pc98/boot0.5/Makefile projects/em_mq/sys/boot/pc98/boot0/Makefile projects/em_mq/sys/boot/pc98/boot2/Makefile projects/em_mq/sys/boot/pc98/loader/Makefile projects/em_mq/sys/boot/powerpc/kboot/Makefile projects/em_mq/sys/boot/powerpc/ofw/Makefile projects/em_mq/sys/boot/powerpc/ps3/Makefile projects/em_mq/sys/boot/sparc64/loader/Makefile projects/em_mq/sys/cam/cam_xpt.c projects/em_mq/sys/cddl/compat/opensolaris/sys/atomic.h projects/em_mq/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c projects/em_mq/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/em_mq/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h projects/em_mq/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h projects/em_mq/sys/cddl/dev/dtrace/dtrace_ioctl.c projects/em_mq/sys/compat/freebsd32/freebsd32.h projects/em_mq/sys/compat/freebsd32/freebsd32_misc.c projects/em_mq/sys/compat/linprocfs/linprocfs.c projects/em_mq/sys/compat/svr4/svr4_stream.c projects/em_mq/sys/conf/files projects/em_mq/sys/conf/files.arm projects/em_mq/sys/conf/files.mips projects/em_mq/sys/conf/files.powerpc projects/em_mq/sys/conf/newvers.sh projects/em_mq/sys/conf/options.arm projects/em_mq/sys/conf/options.i386 projects/em_mq/sys/contrib/dev/acpica/acpica_prep.sh projects/em_mq/sys/contrib/dev/acpica/changes.txt projects/em_mq/sys/contrib/dev/acpica/common/adfile.c projects/em_mq/sys/contrib/dev/acpica/common/adisasm.c projects/em_mq/sys/contrib/dev/acpica/common/dmtable.c projects/em_mq/sys/contrib/dev/acpica/common/dmtbdump.c projects/em_mq/sys/contrib/dev/acpica/common/dmtbinfo.c projects/em_mq/sys/contrib/dev/acpica/compiler/aslcodegen.c projects/em_mq/sys/contrib/dev/acpica/compiler/aslcompile.c projects/em_mq/sys/contrib/dev/acpica/compiler/aslcompiler.h projects/em_mq/sys/contrib/dev/acpica/compiler/asldefine.h projects/em_mq/sys/contrib/dev/acpica/compiler/aslfold.c projects/em_mq/sys/contrib/dev/acpica/compiler/asllisting.c projects/em_mq/sys/contrib/dev/acpica/compiler/aslmain.c projects/em_mq/sys/contrib/dev/acpica/compiler/aslmap.c projects/em_mq/sys/contrib/dev/acpica/compiler/aslmapenter.c projects/em_mq/sys/contrib/dev/acpica/compiler/asloptions.c projects/em_mq/sys/contrib/dev/acpica/compiler/aslrules.y projects/em_mq/sys/contrib/dev/acpica/compiler/aslstartup.c projects/em_mq/sys/contrib/dev/acpica/compiler/asltree.c projects/em_mq/sys/contrib/dev/acpica/compiler/asltypes.y projects/em_mq/sys/contrib/dev/acpica/compiler/aslutils.c projects/em_mq/sys/contrib/dev/acpica/compiler/aslwalks.c projects/em_mq/sys/contrib/dev/acpica/compiler/dtcompile.c projects/em_mq/sys/contrib/dev/acpica/compiler/dtcompiler.h projects/em_mq/sys/contrib/dev/acpica/compiler/dtio.c projects/em_mq/sys/contrib/dev/acpica/compiler/dttable.c projects/em_mq/sys/contrib/dev/acpica/compiler/dttemplate.h projects/em_mq/sys/contrib/dev/acpica/compiler/dtutils.c projects/em_mq/sys/contrib/dev/acpica/components/debugger/dbmethod.c projects/em_mq/sys/contrib/dev/acpica/components/debugger/dbxface.c projects/em_mq/sys/contrib/dev/acpica/components/disassembler/dmopcode.c projects/em_mq/sys/contrib/dev/acpica/components/disassembler/dmwalk.c projects/em_mq/sys/contrib/dev/acpica/components/dispatcher/dsopcode.c projects/em_mq/sys/contrib/dev/acpica/components/dispatcher/dsutils.c projects/em_mq/sys/contrib/dev/acpica/components/events/evregion.c projects/em_mq/sys/contrib/dev/acpica/components/events/evxfevnt.c projects/em_mq/sys/contrib/dev/acpica/components/executer/exdump.c projects/em_mq/sys/contrib/dev/acpica/components/executer/exfldio.c projects/em_mq/sys/contrib/dev/acpica/components/executer/exoparg3.c projects/em_mq/sys/contrib/dev/acpica/components/executer/exregion.c projects/em_mq/sys/contrib/dev/acpica/components/hardware/hwgpe.c projects/em_mq/sys/contrib/dev/acpica/components/hardware/hwvalid.c projects/em_mq/sys/contrib/dev/acpica/components/namespace/nsdump.c projects/em_mq/sys/contrib/dev/acpica/components/parser/psopcode.c projects/em_mq/sys/contrib/dev/acpica/components/parser/psopinfo.c projects/em_mq/sys/contrib/dev/acpica/components/resources/rsaddr.c projects/em_mq/sys/contrib/dev/acpica/components/resources/rsdump.c projects/em_mq/sys/contrib/dev/acpica/components/resources/rsdumpinfo.c projects/em_mq/sys/contrib/dev/acpica/components/resources/rsxface.c projects/em_mq/sys/contrib/dev/acpica/components/tables/tbdata.c projects/em_mq/sys/contrib/dev/acpica/components/tables/tbinstal.c projects/em_mq/sys/contrib/dev/acpica/components/tables/tbprint.c projects/em_mq/sys/contrib/dev/acpica/components/tables/tbxfroot.c projects/em_mq/sys/contrib/dev/acpica/components/utilities/utaddress.c projects/em_mq/sys/contrib/dev/acpica/components/utilities/utbuffer.c projects/em_mq/sys/contrib/dev/acpica/components/utilities/utglobal.c projects/em_mq/sys/contrib/dev/acpica/components/utilities/utmisc.c projects/em_mq/sys/contrib/dev/acpica/components/utilities/utosi.c projects/em_mq/sys/contrib/dev/acpica/components/utilities/utprint.c projects/em_mq/sys/contrib/dev/acpica/components/utilities/utstate.c projects/em_mq/sys/contrib/dev/acpica/components/utilities/utuuid.c projects/em_mq/sys/contrib/dev/acpica/include/acdebug.h projects/em_mq/sys/contrib/dev/acpica/include/acdisasm.h projects/em_mq/sys/contrib/dev/acpica/include/acglobal.h projects/em_mq/sys/contrib/dev/acpica/include/aclocal.h projects/em_mq/sys/contrib/dev/acpica/include/acmacros.h projects/em_mq/sys/contrib/dev/acpica/include/acopcode.h projects/em_mq/sys/contrib/dev/acpica/include/acpixf.h projects/em_mq/sys/contrib/dev/acpica/include/acresrc.h projects/em_mq/sys/contrib/dev/acpica/include/acrestyp.h projects/em_mq/sys/contrib/dev/acpica/include/acstruct.h projects/em_mq/sys/contrib/dev/acpica/include/actables.h projects/em_mq/sys/contrib/dev/acpica/include/actbl2.h projects/em_mq/sys/contrib/dev/acpica/include/actypes.h projects/em_mq/sys/contrib/dev/acpica/include/acutils.h projects/em_mq/sys/contrib/dev/acpica/include/amlcode.h projects/em_mq/sys/contrib/dev/acpica/include/platform/acenv.h projects/em_mq/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h projects/em_mq/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_ani.c projects/em_mq/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_misc.c projects/em_mq/sys/contrib/ipfilter/netinet/fil.c projects/em_mq/sys/contrib/ipfilter/netinet/ip_compat.h projects/em_mq/sys/contrib/ipfilter/netinet/ip_fil.h projects/em_mq/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c (contents, props changed) projects/em_mq/sys/contrib/ipfilter/netinet/ip_nat.c projects/em_mq/sys/contrib/x86emu/x86emu.c projects/em_mq/sys/crypto/aesni/aesencdec.h projects/em_mq/sys/crypto/aesni/aesni_ghash.c projects/em_mq/sys/dev/acpica/acpi.c projects/em_mq/sys/dev/acpica/acpi_pcib_acpi.c projects/em_mq/sys/dev/acpica/acpi_resource.c projects/em_mq/sys/dev/acpica/acpivar.h projects/em_mq/sys/dev/ath/ath_hal/ah.h projects/em_mq/sys/dev/ath/ath_hal/ar5212/ar5212.h projects/em_mq/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c projects/em_mq/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c projects/em_mq/sys/dev/atkbdc/psm.c projects/em_mq/sys/dev/bxe/bxe.c projects/em_mq/sys/dev/ciss/ciss.c projects/em_mq/sys/dev/cxgbe/tom/t4_cpl_io.c projects/em_mq/sys/dev/dwc/if_dwc.c projects/em_mq/sys/dev/e1000/if_em.c projects/em_mq/sys/dev/fdt/fdt_pinctrl.c projects/em_mq/sys/dev/gpio/gpioled.c projects/em_mq/sys/dev/hptnr/README projects/em_mq/sys/dev/hptnr/amd64-elf.hptnr_lib.o.uu projects/em_mq/sys/dev/hptnr/him.h projects/em_mq/sys/dev/hptnr/hptintf.h projects/em_mq/sys/dev/hptnr/hptnr_config.c projects/em_mq/sys/dev/hptnr/hptnr_config.h projects/em_mq/sys/dev/hptnr/hptnr_osm_bsd.c projects/em_mq/sys/dev/hptnr/i386-elf.hptnr_lib.o.uu projects/em_mq/sys/dev/hptnr/ldm.h projects/em_mq/sys/dev/hptnr/os_bsd.h projects/em_mq/sys/dev/hwpmc/hwpmc_core.c projects/em_mq/sys/dev/hwpmc/hwpmc_intel.c projects/em_mq/sys/dev/hwpmc/pmc_events.h projects/em_mq/sys/dev/ichsmb/ichsmb_pci.c projects/em_mq/sys/dev/iscsi/icl_conn_if.m projects/em_mq/sys/dev/iscsi/icl_soft.c projects/em_mq/sys/dev/iscsi/icl_wrappers.h projects/em_mq/sys/dev/iwn/if_iwn.c projects/em_mq/sys/dev/ixgbe/ix_txrx.c projects/em_mq/sys/dev/mmc/mmc.c projects/em_mq/sys/dev/nand/nfc_fsl.c projects/em_mq/sys/dev/netmap/netmap.c projects/em_mq/sys/dev/nvme/nvme.c projects/em_mq/sys/dev/nvme/nvme_ctrlr.c projects/em_mq/sys/dev/nvme/nvme_ns.c projects/em_mq/sys/dev/nvme/nvme_private.h projects/em_mq/sys/dev/nvme/nvme_qpair.c projects/em_mq/sys/dev/re/if_re.c projects/em_mq/sys/dev/sound/pci/hda/hdaa_patches.c projects/em_mq/sys/dev/sound/pci/hda/hdac.c projects/em_mq/sys/dev/sound/pci/hda/hdac.h projects/em_mq/sys/dev/sound/pci/hda/hdacc.c projects/em_mq/sys/dev/streams/streams.c projects/em_mq/sys/dev/uart/uart_bus.h projects/em_mq/sys/dev/uart/uart_bus_fdt.c projects/em_mq/sys/dev/uart/uart_core.c projects/em_mq/sys/dev/uart/uart_cpu.h projects/em_mq/sys/dev/uart/uart_cpu_fdt.c projects/em_mq/sys/dev/uart/uart_cpu_fdt.h projects/em_mq/sys/dev/uart/uart_dev_imx.c projects/em_mq/sys/dev/uart/uart_dev_lpc.c projects/em_mq/sys/dev/uart/uart_dev_msm.c projects/em_mq/sys/dev/uart/uart_dev_ns8250.c projects/em_mq/sys/dev/uart/uart_dev_pl011.c projects/em_mq/sys/dev/uart/uart_dev_quicc.c projects/em_mq/sys/dev/uart/uart_dev_sab82532.c projects/em_mq/sys/dev/uart/uart_dev_ti8250.c projects/em_mq/sys/dev/uart/uart_dev_z8530.c projects/em_mq/sys/dev/usb/controller/ehci_pci.c projects/em_mq/sys/dev/usb/controller/uhci_pci.c projects/em_mq/sys/dev/usb/controller/xhci_pci.c projects/em_mq/sys/dev/usb/net/if_axge.c projects/em_mq/sys/dev/usb/serial/uftdi.c projects/em_mq/sys/dev/usb/usbdevs projects/em_mq/sys/dev/usb/wlan/if_urtwn.c projects/em_mq/sys/dev/vt/vt_font.c projects/em_mq/sys/dev/wpi/if_wpi.c projects/em_mq/sys/fs/devfs/devfs_vnops.c projects/em_mq/sys/fs/ext2fs/ext2_vfsops.c projects/em_mq/sys/fs/fuse/fuse_vfsops.c projects/em_mq/sys/fs/msdosfs/msdosfs_fat.c projects/em_mq/sys/fs/msdosfs/msdosfs_vfsops.c projects/em_mq/sys/fs/nandfs/nandfs_vfsops.c projects/em_mq/sys/fs/nfsclient/nfs_clvfsops.c projects/em_mq/sys/fs/nfsserver/nfs_nfsdport.c projects/em_mq/sys/fs/nullfs/null_vfsops.c projects/em_mq/sys/fs/tmpfs/tmpfs_vnops.c projects/em_mq/sys/geom/geom_dev.c projects/em_mq/sys/geom/multipath/g_multipath.c projects/em_mq/sys/gnu/dts/arm/meson.dtsi projects/em_mq/sys/gnu/dts/arm/meson6.dtsi projects/em_mq/sys/gnu/dts/arm/meson8.dtsi projects/em_mq/sys/i386/i386/bios.c projects/em_mq/sys/i386/i386/initcpu.c projects/em_mq/sys/i386/i386/locore.s projects/em_mq/sys/i386/i386/machdep.c projects/em_mq/sys/i386/i386/minidump_machdep.c projects/em_mq/sys/i386/i386/mp_machdep.c projects/em_mq/sys/i386/i386/mpboot.s projects/em_mq/sys/i386/i386/pmap.c projects/em_mq/sys/i386/i386/swtch.s projects/em_mq/sys/i386/i386/trap.c projects/em_mq/sys/i386/i386/vm86bios.s projects/em_mq/sys/i386/i386/vm_machdep.c projects/em_mq/sys/i386/include/param.h projects/em_mq/sys/i386/include/pmap.h projects/em_mq/sys/i386/include/vmparam.h projects/em_mq/sys/kern/imgact_elf.c projects/em_mq/sys/kern/kern_descrip.c projects/em_mq/sys/kern/kern_exec.c projects/em_mq/sys/kern/kern_fork.c projects/em_mq/sys/kern/kern_mbuf.c projects/em_mq/sys/kern/kern_poll.c projects/em_mq/sys/kern/kern_resource.c projects/em_mq/sys/kern/kern_timeout.c projects/em_mq/sys/kern/link_elf_obj.c projects/em_mq/sys/kern/subr_bus.c projects/em_mq/sys/kern/subr_busdma_bufalloc.c projects/em_mq/sys/kern/subr_vmem.c projects/em_mq/sys/kern/sys_pipe.c projects/em_mq/sys/kern/sysv_shm.c projects/em_mq/sys/kern/tty_pts.c projects/em_mq/sys/kern/uipc_mqueue.c projects/em_mq/sys/kern/uipc_sem.c projects/em_mq/sys/kern/uipc_shm.c projects/em_mq/sys/kern/uipc_syscalls.c projects/em_mq/sys/kern/vfs_subr.c projects/em_mq/sys/kern/vfs_syscalls.c projects/em_mq/sys/kern/vnode_if.src projects/em_mq/sys/mips/adm5120/uart_dev_adm5120.c projects/em_mq/sys/mips/atheros/uart_dev_ar933x.c projects/em_mq/sys/mips/cavium/uart_dev_oct16550.c projects/em_mq/sys/mips/conf/CARAMBOLA2.hints projects/em_mq/sys/mips/conf/DIR-655A1.hints projects/em_mq/sys/mips/conf/DIR-825C1.hints projects/em_mq/sys/mips/conf/TL-WR1043NDv2.hints projects/em_mq/sys/mips/include/reg.h projects/em_mq/sys/mips/mips/uma_machdep.c projects/em_mq/sys/mips/rt305x/uart_dev_rt305x.c projects/em_mq/sys/modules/i2c/iicbb/Makefile projects/em_mq/sys/net/ieee8023ad_lacp.c projects/em_mq/sys/net/if.c projects/em_mq/sys/net/if_media.c projects/em_mq/sys/net/if_media.h projects/em_mq/sys/net/if_tap.c projects/em_mq/sys/net/if_types.h projects/em_mq/sys/net/pfvar.h projects/em_mq/sys/net/route.c projects/em_mq/sys/net80211/ieee80211_mesh.c projects/em_mq/sys/netgraph/bluetooth/hci/ng_hci_cmds.c projects/em_mq/sys/netgraph/bluetooth/hci/ng_hci_evnt.c projects/em_mq/sys/netgraph/bluetooth/hci/ng_hci_main.c projects/em_mq/sys/netgraph/bluetooth/hci/ng_hci_misc.c projects/em_mq/sys/netgraph/bluetooth/hci/ng_hci_misc.h projects/em_mq/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c projects/em_mq/sys/netgraph/bluetooth/hci/ng_hci_var.h projects/em_mq/sys/netgraph/bluetooth/include/ng_btsocket.h projects/em_mq/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h projects/em_mq/sys/netgraph/bluetooth/include/ng_hci.h projects/em_mq/sys/netgraph/bluetooth/include/ng_l2cap.h projects/em_mq/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c projects/em_mq/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h projects/em_mq/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c projects/em_mq/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c projects/em_mq/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h projects/em_mq/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c projects/em_mq/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h projects/em_mq/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c projects/em_mq/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h projects/em_mq/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c projects/em_mq/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c projects/em_mq/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c projects/em_mq/sys/netinet/igmp.c projects/em_mq/sys/netinet/in_var.h projects/em_mq/sys/netinet/ip_carp.c projects/em_mq/sys/netinet/ip_gre.c projects/em_mq/sys/netinet/ip_id.c projects/em_mq/sys/netinet/ip_input.c projects/em_mq/sys/netinet/ip_mroute.c projects/em_mq/sys/netinet/ip_output.c projects/em_mq/sys/netinet/ip_var.h projects/em_mq/sys/netinet/raw_ip.c projects/em_mq/sys/netinet/sctp_output.c projects/em_mq/sys/netinet/sctp_syscalls.c projects/em_mq/sys/netinet/tcp_subr.c projects/em_mq/sys/netinet/tcp_timer.c projects/em_mq/sys/netinet/tcp_timer.h projects/em_mq/sys/netinet/tcp_var.h projects/em_mq/sys/netinet6/in6_mcast.c projects/em_mq/sys/netinet6/ip6_forward.c projects/em_mq/sys/netinet6/ip6_mroute.c projects/em_mq/sys/netinet6/ip6_mroute.h projects/em_mq/sys/netinet6/ip6_output.c projects/em_mq/sys/netinet6/ip6_var.h projects/em_mq/sys/netinet6/nd6.c projects/em_mq/sys/netinet6/nd6_nbr.c projects/em_mq/sys/netinet6/nd6_rtr.c projects/em_mq/sys/netipsec/xform_ipip.c projects/em_mq/sys/netpfil/ipfw/ip_fw_log.c projects/em_mq/sys/netpfil/pf/if_pfsync.c projects/em_mq/sys/netpfil/pf/pf.c projects/em_mq/sys/netpfil/pf/pf_norm.c projects/em_mq/sys/ofed/include/linux/file.h projects/em_mq/sys/opencrypto/gmac.h projects/em_mq/sys/powerpc/aim/machdep.c projects/em_mq/sys/powerpc/aim/mmu_oea64.c projects/em_mq/sys/powerpc/aim/slb.c projects/em_mq/sys/powerpc/aim/uma_machdep.c projects/em_mq/sys/powerpc/booke/locore.S projects/em_mq/sys/powerpc/booke/machdep.c projects/em_mq/sys/powerpc/include/reg.h projects/em_mq/sys/powerpc/include/trap.h projects/em_mq/sys/rpc/svc.c projects/em_mq/sys/rpc/svc.h projects/em_mq/sys/rpc/svc_generic.c projects/em_mq/sys/rpc/svc_vc.c projects/em_mq/sys/sparc64/include/reg.h projects/em_mq/sys/sparc64/pci/sbbc.c projects/em_mq/sys/sparc64/sparc64/vm_machdep.c projects/em_mq/sys/sys/_callout.h projects/em_mq/sys/sys/buf.h projects/em_mq/sys/sys/busdma_bufalloc.h projects/em_mq/sys/sys/callout.h projects/em_mq/sys/sys/cdefs.h projects/em_mq/sys/sys/elf_common.h projects/em_mq/sys/sys/filedesc.h projects/em_mq/sys/sys/imgact.h projects/em_mq/sys/sys/kerneldump.h projects/em_mq/sys/sys/malloc.h projects/em_mq/sys/sys/mbuf.h projects/em_mq/sys/sys/module.h projects/em_mq/sys/sys/mount.h projects/em_mq/sys/sys/mouse.h projects/em_mq/sys/sys/param.h projects/em_mq/sys/sys/pmc.h projects/em_mq/sys/sys/procfs.h projects/em_mq/sys/sys/socketvar.h projects/em_mq/sys/sys/sockio.h projects/em_mq/sys/sys/syscallsubr.h projects/em_mq/sys/sys/vmem.h projects/em_mq/sys/ufs/ffs/ffs_vfsops.c projects/em_mq/sys/vm/swap_pager.c projects/em_mq/sys/vm/uma.h projects/em_mq/sys/vm/uma_core.c projects/em_mq/sys/vm/uma_int.h projects/em_mq/sys/vm/vm_fault.c projects/em_mq/sys/vm/vm_pageout.c projects/em_mq/sys/vm/vm_reserv.c projects/em_mq/sys/vm/vnode_pager.c projects/em_mq/sys/x86/acpica/OsdEnvironment.c projects/em_mq/sys/x86/acpica/acpi_wakeup.c projects/em_mq/sys/x86/include/reg.h projects/em_mq/sys/x86/iommu/busdma_dmar.c projects/em_mq/sys/x86/iommu/intel_dmar.h projects/em_mq/sys/x86/iommu/intel_gas.c projects/em_mq/tools/build/check-links.sh projects/em_mq/tools/build/mk/OptionalObsoleteFiles.inc projects/em_mq/tools/build/options/WITHOUT_CXX projects/em_mq/tools/regression/aio/aiotest/Makefile projects/em_mq/tools/regression/aio/aiotest/aiotest.c projects/em_mq/tools/regression/aio/kqueue/Makefile projects/em_mq/tools/regression/aio/kqueue/aio_kqueue.c projects/em_mq/tools/regression/aio/kqueue/lio/Makefile projects/em_mq/tools/regression/aio/kqueue/lio/lio_kqueue.c projects/em_mq/tools/regression/sockets/accept_fd_leak/Makefile projects/em_mq/tools/regression/sockets/accept_fd_leak/accept_fd_leak.c projects/em_mq/tools/regression/sockets/accf_data_attach/Makefile projects/em_mq/tools/regression/sockets/accf_data_attach/accf_data_attach.c projects/em_mq/tools/regression/sockets/fstat/Makefile projects/em_mq/tools/regression/sockets/fstat/fstat.c projects/em_mq/tools/regression/sockets/kqueue/Makefile projects/em_mq/tools/regression/sockets/kqueue/kqueue.c projects/em_mq/tools/regression/sockets/listen_backlog/Makefile projects/em_mq/tools/regression/sockets/listen_backlog/listen_backlog.c projects/em_mq/tools/regression/sockets/listenclose/Makefile projects/em_mq/tools/regression/sockets/listenclose/listenclose.c projects/em_mq/tools/regression/sockets/pr_atomic/Makefile projects/em_mq/tools/regression/sockets/pr_atomic/pr_atomic.c projects/em_mq/tools/regression/sockets/reconnect/Makefile projects/em_mq/tools/regression/sockets/reconnect/reconnect.c projects/em_mq/tools/regression/sockets/rtsocket/Makefile projects/em_mq/tools/regression/sockets/rtsocket/rtsocket.c projects/em_mq/tools/regression/sockets/sblock/Makefile projects/em_mq/tools/regression/sockets/sblock/sblock.c projects/em_mq/tools/regression/sockets/sendfile/sendfile.c projects/em_mq/tools/regression/sockets/shutdown/Makefile projects/em_mq/tools/regression/sockets/shutdown/shutdown.c projects/em_mq/tools/regression/sockets/sigpipe/Makefile projects/em_mq/tools/regression/sockets/sigpipe/sigpipe.c projects/em_mq/tools/regression/sockets/so_setfib/Makefile projects/em_mq/tools/regression/sockets/so_setfib/so_setfib.c projects/em_mq/tools/regression/sockets/socketpair/Makefile projects/em_mq/tools/regression/sockets/socketpair/socketpair.c projects/em_mq/tools/regression/sockets/unix_bindconnect/Makefile projects/em_mq/tools/regression/sockets/unix_bindconnect/unix_bindconnect.c projects/em_mq/tools/regression/sockets/unix_close_race/Makefile projects/em_mq/tools/regression/sockets/unix_close_race/unix_close_race.c projects/em_mq/tools/regression/sockets/unix_passfd/Makefile projects/em_mq/tools/regression/sockets/unix_passfd/unix_passfd.c projects/em_mq/tools/regression/sockets/unix_sendtorace/Makefile projects/em_mq/tools/regression/sockets/unix_sendtorace/unix_sendtorace.c projects/em_mq/tools/regression/sockets/unix_socket/Makefile projects/em_mq/tools/regression/sockets/unix_socket/unix_socket.c projects/em_mq/tools/regression/sockets/unix_sorflush/Makefile projects/em_mq/tools/regression/sockets/unix_sorflush/unix_sorflush.c projects/em_mq/tools/regression/sockets/zerosend/zerosend.c projects/em_mq/tools/tools/ath/athratestats/main.c projects/em_mq/tools/tools/ath/athstats/athstats.c projects/em_mq/tools/tools/cxgbtool/cxgbtool.c projects/em_mq/tools/tools/iwn/iwnstats/iwn_ioctl.c projects/em_mq/usr.bin/Makefile projects/em_mq/usr.bin/ar/read.c projects/em_mq/usr.bin/bluetooth/bthost/bthost.c projects/em_mq/usr.bin/bluetooth/btsockstat/btsockstat.c projects/em_mq/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c projects/em_mq/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c projects/em_mq/usr.bin/clang/Makefile projects/em_mq/usr.bin/col/col.c projects/em_mq/usr.bin/column/column.c projects/em_mq/usr.bin/gcore/elf32core.c projects/em_mq/usr.bin/gzip/gzip.1 projects/em_mq/usr.bin/gzip/gzip.c projects/em_mq/usr.bin/iconv/iconv.c projects/em_mq/usr.bin/ipcs/Makefile projects/em_mq/usr.bin/ipcs/ipc.c projects/em_mq/usr.bin/ipcs/ipc.h projects/em_mq/usr.bin/ipcs/ipcs.c projects/em_mq/usr.bin/iscsictl/Makefile projects/em_mq/usr.bin/iscsictl/iscsi.conf.5 projects/em_mq/usr.bin/iscsictl/iscsictl.c projects/em_mq/usr.bin/iscsictl/parse.y projects/em_mq/usr.bin/iscsictl/periphs.c projects/em_mq/usr.bin/jot/jot.1 projects/em_mq/usr.bin/kdump/mkioctls projects/em_mq/usr.bin/lam/lam.1 projects/em_mq/usr.bin/lockf/lockf.1 projects/em_mq/usr.bin/lockf/lockf.c projects/em_mq/usr.bin/mt/Makefile projects/em_mq/usr.bin/mt/mt.c projects/em_mq/usr.bin/netstat/bpf.c projects/em_mq/usr.bin/netstat/if.c projects/em_mq/usr.bin/netstat/inet6.c projects/em_mq/usr.bin/netstat/mroute6.c projects/em_mq/usr.bin/netstat/netstat.1 projects/em_mq/usr.bin/netstat/route.c projects/em_mq/usr.bin/patch/inp.c projects/em_mq/usr.bin/rs/rs.1 projects/em_mq/usr.bin/smbutil/Makefile projects/em_mq/usr.bin/sockstat/sockstat.1 projects/em_mq/usr.bin/sort/bwstring.c projects/em_mq/usr.bin/sort/coll.c projects/em_mq/usr.bin/sort/file.c projects/em_mq/usr.bin/sort/file.h projects/em_mq/usr.bin/sort/mem.c projects/em_mq/usr.bin/sort/radixsort.c projects/em_mq/usr.bin/sort/sort.1.in projects/em_mq/usr.bin/sort/sort.c projects/em_mq/usr.bin/vi/Makefile projects/em_mq/usr.sbin/acpi/acpiconf/acpiconf.c projects/em_mq/usr.sbin/acpi/acpidump/acpi.c projects/em_mq/usr.sbin/amd/include/config.h projects/em_mq/usr.sbin/ancontrol/ancontrol.c projects/em_mq/usr.sbin/arp/arp.c projects/em_mq/usr.sbin/authpf/Makefile projects/em_mq/usr.sbin/bhyve/Makefile projects/em_mq/usr.sbin/bhyve/bhyverun.c projects/em_mq/usr.sbin/bhyvectl/Makefile projects/em_mq/usr.sbin/bhyvectl/bhyvectl.c projects/em_mq/usr.sbin/bhyveload/Makefile projects/em_mq/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.c projects/em_mq/usr.sbin/bluetooth/bthidcontrol/hid.c projects/em_mq/usr.sbin/bluetooth/bthidcontrol/sdp.c projects/em_mq/usr.sbin/bluetooth/bthidd/bthidd.c projects/em_mq/usr.sbin/bluetooth/bthidd/client.c projects/em_mq/usr.sbin/bluetooth/bthidd/hid.c projects/em_mq/usr.sbin/bluetooth/bthidd/kbd.c projects/em_mq/usr.sbin/bluetooth/bthidd/lexer.l projects/em_mq/usr.sbin/bluetooth/bthidd/parser.y projects/em_mq/usr.sbin/bluetooth/bthidd/server.c projects/em_mq/usr.sbin/bluetooth/bthidd/session.c projects/em_mq/usr.sbin/bluetooth/btpand/bnep.c projects/em_mq/usr.sbin/bluetooth/btpand/btpand.c projects/em_mq/usr.sbin/bluetooth/btpand/channel.c projects/em_mq/usr.sbin/bluetooth/btpand/client.c projects/em_mq/usr.sbin/bluetooth/btpand/event.c projects/em_mq/usr.sbin/bluetooth/btpand/packet.c projects/em_mq/usr.sbin/bluetooth/btpand/sdp.c projects/em_mq/usr.sbin/bluetooth/btpand/server.c projects/em_mq/usr.sbin/bluetooth/btpand/tap.c projects/em_mq/usr.sbin/bluetooth/hccontrol/hccontrol.c projects/em_mq/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c projects/em_mq/usr.sbin/bluetooth/hccontrol/info.c projects/em_mq/usr.sbin/bluetooth/hccontrol/link_control.c projects/em_mq/usr.sbin/bluetooth/hccontrol/link_policy.c projects/em_mq/usr.sbin/bluetooth/hccontrol/node.c projects/em_mq/usr.sbin/bluetooth/hccontrol/util.c projects/em_mq/usr.sbin/bluetooth/hcsecd/hcsecd.c projects/em_mq/usr.sbin/bluetooth/hcsecd/parser.y projects/em_mq/usr.sbin/bluetooth/l2control/l2cap.c projects/em_mq/usr.sbin/bluetooth/l2control/l2control.c projects/em_mq/usr.sbin/bluetooth/l2ping/l2ping.c projects/em_mq/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c projects/em_mq/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.c projects/em_mq/usr.sbin/bluetooth/sdpcontrol/search.c projects/em_mq/usr.sbin/bluetooth/sdpd/bgd.c projects/em_mq/usr.sbin/bluetooth/sdpd/dun.c projects/em_mq/usr.sbin/bluetooth/sdpd/ftrn.c projects/em_mq/usr.sbin/bluetooth/sdpd/gn.c projects/em_mq/usr.sbin/bluetooth/sdpd/irmc.c projects/em_mq/usr.sbin/bluetooth/sdpd/irmc_command.c projects/em_mq/usr.sbin/bluetooth/sdpd/lan.c projects/em_mq/usr.sbin/bluetooth/sdpd/main.c projects/em_mq/usr.sbin/bluetooth/sdpd/nap.c projects/em_mq/usr.sbin/bluetooth/sdpd/opush.c projects/em_mq/usr.sbin/bluetooth/sdpd/panu.c projects/em_mq/usr.sbin/bluetooth/sdpd/profile.c projects/em_mq/usr.sbin/bluetooth/sdpd/provider.c projects/em_mq/usr.sbin/bluetooth/sdpd/sar.c projects/em_mq/usr.sbin/bluetooth/sdpd/scr.c projects/em_mq/usr.sbin/bluetooth/sdpd/sd.c projects/em_mq/usr.sbin/bluetooth/sdpd/server.c projects/em_mq/usr.sbin/bluetooth/sdpd/sp.c projects/em_mq/usr.sbin/bluetooth/sdpd/srr.c projects/em_mq/usr.sbin/bluetooth/sdpd/ssar.c projects/em_mq/usr.sbin/bluetooth/sdpd/ssr.c projects/em_mq/usr.sbin/bluetooth/sdpd/sur.c projects/em_mq/usr.sbin/bluetooth/sdpd/uuid.c projects/em_mq/usr.sbin/bsdconfig/share/geom.subr projects/em_mq/usr.sbin/bsdinstall/scripts/zfsboot projects/em_mq/usr.sbin/bsnmpd/tools/bsnmptools/Makefile projects/em_mq/usr.sbin/crashinfo/crashinfo.sh projects/em_mq/usr.sbin/ctld/ctld.c projects/em_mq/usr.sbin/ctld/discovery.c projects/em_mq/usr.sbin/ctld/isns.c projects/em_mq/usr.sbin/ctld/keys.c projects/em_mq/usr.sbin/ctld/login.c projects/em_mq/usr.sbin/ctld/parse.y projects/em_mq/usr.sbin/ctld/pdu.c projects/em_mq/usr.sbin/ctld/token.l projects/em_mq/usr.sbin/fifolog/fifolog_reader/Makefile projects/em_mq/usr.sbin/fifolog/fifolog_writer/Makefile projects/em_mq/usr.sbin/freebsd-update/freebsd-update.sh projects/em_mq/usr.sbin/ifmcstat/ifmcstat.c projects/em_mq/usr.sbin/ip6addrctl/ip6addrctl.c projects/em_mq/usr.sbin/mld6query/mld6.c projects/em_mq/usr.sbin/ndp/ndp.c projects/em_mq/usr.sbin/nfsd/nfsd.c projects/em_mq/usr.sbin/ntp/config.h projects/em_mq/usr.sbin/pkg/pkg.c projects/em_mq/usr.sbin/ppp/iface.c projects/em_mq/usr.sbin/rip6query/rip6query.c projects/em_mq/usr.sbin/route6d/route6d.c projects/em_mq/usr.sbin/rpc.lockd/Makefile projects/em_mq/usr.sbin/rrenumd/lexer.l projects/em_mq/usr.sbin/rrenumd/parser.y projects/em_mq/usr.sbin/rtadvctl/rtadvctl.c projects/em_mq/usr.sbin/rtadvd/config.c projects/em_mq/usr.sbin/rtadvd/if.c projects/em_mq/usr.sbin/rtadvd/rrenum.c projects/em_mq/usr.sbin/rtadvd/rtadvd.c projects/em_mq/usr.sbin/rtsold/Makefile projects/em_mq/usr.sbin/rtsold/if.c projects/em_mq/usr.sbin/rtsold/probe.c projects/em_mq/usr.sbin/rtsold/rtsold.c projects/em_mq/usr.sbin/uhsoctl/uhsoctl.c projects/em_mq/usr.sbin/vidcontrol/vidcontrol.c projects/em_mq/usr.sbin/wpa/ndis_events/ndis_events.c projects/em_mq/usr.sbin/wpa/wpa_supplicant/Packet32.c Directory Properties: projects/em_mq/ (props changed) projects/em_mq/cddl/ (props changed) projects/em_mq/cddl/contrib/opensolaris/ (props changed) projects/em_mq/contrib/binutils/ (props changed) projects/em_mq/contrib/compiler-rt/ (props changed) projects/em_mq/contrib/elftoolchain/ (props changed) projects/em_mq/contrib/gcc/ (props changed) projects/em_mq/contrib/ipfilter/ (props changed) projects/em_mq/contrib/libarchive/ (props changed) projects/em_mq/contrib/libarchive/libarchive/ (props changed) projects/em_mq/contrib/libc++/ (props changed) projects/em_mq/contrib/llvm/ (props changed) projects/em_mq/contrib/llvm/tools/clang/ (props changed) projects/em_mq/contrib/ntp/ (props changed) projects/em_mq/contrib/nvi/ (props changed) projects/em_mq/contrib/xz/ (props changed) projects/em_mq/crypto/openssh/ (props changed) projects/em_mq/etc/ (props changed) projects/em_mq/gnu/lib/ (props changed) projects/em_mq/include/ (props changed) projects/em_mq/lib/libc/ (props changed) projects/em_mq/lib/libvmmapi/ (props changed) projects/em_mq/sbin/ (props changed) projects/em_mq/share/ (props changed) projects/em_mq/share/man/man4/ (props changed) projects/em_mq/sys/ (props changed) projects/em_mq/sys/amd64/vmm/ (props changed) projects/em_mq/sys/boot/ (props changed) projects/em_mq/sys/boot/powerpc/kboot/ (props changed) projects/em_mq/sys/boot/powerpc/ofw/ (props changed) projects/em_mq/sys/cddl/contrib/opensolaris/ (props changed) projects/em_mq/sys/conf/ (props changed) projects/em_mq/sys/contrib/dev/acpica/ (props changed) projects/em_mq/sys/contrib/ipfilter/ (props changed) projects/em_mq/sys/contrib/x86emu/ (props changed) projects/em_mq/sys/gnu/dts/ (props changed) projects/em_mq/sys/gnu/dts/arm/ (props changed) projects/em_mq/usr.sbin/bhyve/ (props changed) projects/em_mq/usr.sbin/bhyvectl/ (props changed) projects/em_mq/usr.sbin/bhyveload/ (props changed) projects/em_mq/usr.sbin/rtadvctl/ (props changed) projects/em_mq/usr.sbin/rtadvd/ (props changed) projects/em_mq/usr.sbin/rtsold/ (props changed) Modified: projects/em_mq/Makefile.inc1 ============================================================================== --- projects/em_mq/Makefile.inc1 Thu Apr 16 17:42:52 2015 (r281606) +++ projects/em_mq/Makefile.inc1 Thu Apr 16 18:47:28 2015 (r281607) @@ -344,7 +344,8 @@ X${COMPILER}?= ${${COMPILER}} .endfor XBINUTILS= AS AR LD NM OBJCOPY OBJDUMP RANLIB SIZE STRINGS .for BINUTIL in ${XBINUTILS} -.if defined(CROSS_BINUTILS_PREFIX) +.if defined(CROSS_BINUTILS_PREFIX) && \ + exists(${CROSS_BINUTILS_PREFIX}${${BINUTIL}}) X${BINUTIL}?= ${CROSS_BINUTILS_PREFIX}${${BINUTIL}} .else X${BINUTIL}?= ${${BINUTIL}} @@ -411,8 +412,9 @@ LIB32CPUFLAGS= -march=${TARGET_CPUTYPE} LIB32WMAKEENV= MACHINE=i386 MACHINE_ARCH=i386 \ MACHINE_CPU="i686 mmx sse sse2" LIB32WMAKEFLAGS= \ - AS="${AS} --32" \ - LD="${LD} -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" + AS="${XAS} --32" \ + LD="${XLD} -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \ + OBJCOPY="${XOBJCOPY}" .elif ${TARGET_ARCH} == "powerpc64" .if empty(TARGET_CPUTYPE) @@ -422,7 +424,8 @@ LIB32CPUFLAGS= -mcpu=${TARGET_CPUTYPE} .endif LIB32WMAKEENV= MACHINE=powerpc MACHINE_ARCH=powerpc LIB32WMAKEFLAGS= \ - LD="${LD} -m elf32ppc_fbsd" + LD="${XLD} -m elf32ppc_fbsd" \ + OBJCOPY="${XOBJCOPY}" .endif Modified: projects/em_mq/ObsoleteFiles.inc ============================================================================== --- projects/em_mq/ObsoleteFiles.inc Thu Apr 16 17:42:52 2015 (r281606) +++ projects/em_mq/ObsoleteFiles.inc Thu Apr 16 18:47:28 2015 (r281607) @@ -38,6 +38,18 @@ # xargs -n1 | sort | uniq -d; # done +# 20150410 +OLD_FILES+=usr/share/doc/usd/10.exref/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/10.exref/summary.ascii.gz +OLD_DIRS+=usr/share/doc/usd/10.exref +OLD_FILES+=usr/share/doc/usd/11.edit/paper.ascii.gz +OLD_DIRS+=usr/share/doc/usd/11.edit +OLD_FILES+=usr/share/doc/usd/12.vi/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/12.vi/summary.ascii.gz +OLD_FILES+=usr/share/doc/usd/12.vi/viapwh.ascii.gz +OLD_DIRS+=usr/share/doc/usd/12.vi +OLD_FILES+=usr/share/doc/usd/13.viref/paper.ascii.gz +OLD_DIRS+=usr/share/doc/usd/13.viref # 20150329 .if ${TARGET_ARCH} == "arm" OLD_FILES+=usr/include/bootconfig.h Modified: projects/em_mq/README ============================================================================== --- projects/em_mq/README Thu Apr 16 17:42:52 2015 (r281606) +++ projects/em_mq/README Thu Apr 16 18:47:28 2015 (r281607) @@ -34,9 +34,7 @@ The sample kernel configuration files re sub-directory (assuming that you've installed the kernel sources), the file named GENERIC being the one used to build your initial installation kernel. The file NOTES contains entries and documentation for all possible -devices, not just those commonly used. It is the successor of the ancient -LINT file, but in contrast to LINT, it is not buildable as a kernel but a -pure reference and documentation file. +devices, not just those commonly used. Source Roadmap: @@ -77,6 +75,9 @@ share Shared resources. sys Kernel sources. +tests Regression tests which can be run by Kyua. See tests/README + for additional information. + tools Utilities for regression testing and miscellaneous tasks. usr.bin User commands. Modified: projects/em_mq/UPDATING ============================================================================== --- projects/em_mq/UPDATING Thu Apr 16 17:42:52 2015 (r281606) +++ projects/em_mq/UPDATING Thu Apr 16 18:47:28 2015 (r281607) @@ -31,6 +31,15 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20150415: + The const qualifier has been removed from iconv(3) to comply with + POSIX. The ports tree is aware of this from r384038 onwards. + +20150416: + Libraries specified by LIBADD in Makefiles must have a corresponding + DPADD_ variable to ensure correct dependencies. This is now + enforced in src.libnames.mk. + 20150324: From legacy ata(4) driver was removed support for SATA controllers supported by more functional drivers ahci(4), siis(4) and mvs(4). Modified: projects/em_mq/bin/csh/config.h ============================================================================== --- projects/em_mq/bin/csh/config.h Thu Apr 16 17:42:52 2015 (r281606) +++ projects/em_mq/bin/csh/config.h Thu Apr 16 18:47:28 2015 (r281607) @@ -198,7 +198,7 @@ #define HAVE_WCWIDTH 1 /* Define as const if the declaration of iconv() needs const. */ -#define ICONV_CONST const +#define ICONV_CONST /* Support NLS. */ #define NLS 1 Modified: projects/em_mq/bin/csh/iconv_stub.h ============================================================================== --- projects/em_mq/bin/csh/iconv_stub.h Thu Apr 16 17:42:52 2015 (r281606) +++ projects/em_mq/bin/csh/iconv_stub.h Thu Apr 16 18:47:28 2015 (r281607) @@ -30,7 +30,7 @@ #define _ICONV_H_ typedef void *iconv_t; -typedef size_t dl_iconv_t(iconv_t, const char **, size_t *, char **, size_t *); +typedef size_t dl_iconv_t(iconv_t, char **, size_t *, char **, size_t *); typedef int dl_iconv_close_t(iconv_t); extern iconv_t dl_iconv_open(const char *, const char *); Modified: projects/em_mq/bin/sh/tests/expansion/Makefile ============================================================================== --- projects/em_mq/bin/sh/tests/expansion/Makefile Thu Apr 16 17:42:52 2015 (r281606) +++ projects/em_mq/bin/sh/tests/expansion/Makefile Thu Apr 16 18:47:28 2015 (r281607) @@ -49,6 +49,8 @@ FILES+= ifs2.0 FILES+= ifs3.0 FILES+= ifs4.0 FILES+= ifs5.0 +FILES+= ifs6.0 +FILES+= ifs7.0 FILES+= length1.0 FILES+= length2.0 FILES+= length3.0 Copied: projects/em_mq/bin/sh/tests/expansion/ifs6.0 (from r281606, head/bin/sh/tests/expansion/ifs6.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/em_mq/bin/sh/tests/expansion/ifs6.0 Thu Apr 16 18:47:28 2015 (r281607, copy of r281606, head/bin/sh/tests/expansion/ifs6.0) @@ -0,0 +1,6 @@ +# $FreeBSD$ + +IFS=': ' +x=': :' +set -- $x +[ "$#|$1|$2|$3" = "2|||" ] Copied: projects/em_mq/bin/sh/tests/expansion/ifs7.0 (from r281606, head/bin/sh/tests/expansion/ifs7.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/em_mq/bin/sh/tests/expansion/ifs7.0 Thu Apr 16 18:47:28 2015 (r281607, copy of r281606, head/bin/sh/tests/expansion/ifs7.0) @@ -0,0 +1,5 @@ +# $FreeBSD$ + +IFS=2 +set -- $((123)) +[ "$#|$1|$2|$3" = "2|1|3|" ] Modified: projects/em_mq/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c ============================================================================== --- projects/em_mq/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c Thu Apr 16 17:42:52 2015 (r281606) +++ projects/em_mq/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c Thu Apr 16 18:47:28 2015 (r281607) @@ -147,6 +147,9 @@ dtrace_dof_init(void) dh.dofhp_dof = (uintptr_t)dof; dh.dofhp_addr = elf->e_type == ET_DYN ? (uintptr_t) lmp->l_addr : 0; +#ifdef __FreeBSD__ + dh.dofhp_pid = getpid(); +#endif if (lmid == 0) { (void) snprintf(dh.dofhp_mod, sizeof (dh.dofhp_mod), @@ -184,7 +187,7 @@ dtrace_dof_init(void) else { dprintf(1, "DTrace ioctl succeeded for DOF at %p\n", dof); #ifdef __FreeBSD__ - gen = dh.gen; + gen = dh.dofhp_gen; #endif } Modified: projects/em_mq/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c ============================================================================== --- projects/em_mq/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c Thu Apr 16 17:42:52 2015 (r281606) +++ projects/em_mq/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c Thu Apr 16 18:47:28 2015 (r281607) @@ -727,8 +727,8 @@ dt_print_packed(dtrace_hdl_t *dtp, FILE utf8 = B_TRUE; } else if ((term = getenv("TERM")) != NULL && (strcmp(term, "sun") == 0 || - strcmp(term, "sun-color") == 0) || - strcmp(term, "dumb") == 0) { + strcmp(term, "sun-color") == 0 || + strcmp(term, "dumb") == 0)) { utf8 = B_FALSE; } else { utf8 = B_TRUE; Modified: projects/em_mq/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c ============================================================================== --- projects/em_mq/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Thu Apr 16 17:42:52 2015 (r281606) +++ projects/em_mq/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Thu Apr 16 18:47:28 2015 (r281607) @@ -1785,11 +1785,17 @@ dtrace_program_link(dtrace_hdl_t *dtp, d "failed to open %s: %s", file, strerror(errno))); } #else - snprintf(tfile, sizeof(tfile), "%s.XXXXXX", file); - if ((fd = mkstemp(tfile)) == -1) - return (dt_link_error(dtp, NULL, -1, NULL, - "failed to create temporary file %s: %s", - tfile, strerror(errno))); + if (dtp->dt_lazyload) { + if ((fd = open(file, O_RDWR | O_CREAT | O_TRUNC, 0666)) < 0) + return (dt_link_error(dtp, NULL, -1, NULL, + "failed to open %s: %s", file, strerror(errno))); + } else { + snprintf(tfile, sizeof(tfile), "%s.XXXXXX", file); + if ((fd = mkstemp(tfile)) == -1) + return (dt_link_error(dtp, NULL, -1, NULL, + "failed to create temporary file %s: %s", + tfile, strerror(errno))); + } #endif /* Modified: projects/em_mq/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c ============================================================================== --- projects/em_mq/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c Thu Apr 16 17:42:52 2015 (r281606) +++ projects/em_mq/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c Thu Apr 16 18:47:28 2015 (r281607) @@ -44,10 +44,15 @@ #include #include #include +#include + #ifndef illumos +#include +#include #include +#include +#include #endif -#include typedef struct dt_pid_probe { dtrace_hdl_t *dpp_dtp; @@ -566,6 +571,12 @@ dt_pid_usdt_mapping(void *data, const pr prsyminfo_t sip; dof_helper_t dh; GElf_Half e_type; +#ifdef __FreeBSD__ + dof_hdr_t hdr; + size_t sz; + uint64_t dofmax; + void *dof; +#endif const char *mname; const char *syms[] = { "___SUNW_dof", "__SUNW_dof" }; int i, fd = -1; @@ -595,17 +606,61 @@ dt_pid_usdt_mapping(void *data, const pr continue; } - dh.dofhp_dof = sym.st_value; +#ifdef __FreeBSD__ dh.dofhp_addr = (e_type == ET_EXEC) ? 0 : pmp->pr_vaddr; + if (Pread(P, &hdr, sizeof (hdr), sym.st_value) != + sizeof (hdr)) { + dt_dprintf("read of DOF header failed\n"); + continue; + } + + sz = sizeof(dofmax); + if (sysctlbyname("kern.dtrace.dof_maxsize", &dofmax, &sz, + NULL, 0) != 0) { + dt_dprintf("failed to read dof_maxsize: %s\n", + strerror(errno)); + continue; + } + if (dofmax < hdr.dofh_loadsz) { + dt_dprintf("DOF load size exceeds maximum\n"); + continue; + } + + if ((dof = malloc(hdr.dofh_loadsz)) == NULL) + return (-1); + + if (Pread(P, dof, hdr.dofh_loadsz, sym.st_value) != + hdr.dofh_loadsz) { + free(dof); + dt_dprintf("read of DOF section failed\n"); + continue; + } + + dh.dofhp_dof = (uintptr_t)dof; + dh.dofhp_pid = proc_getpid(P); dt_pid_objname(dh.dofhp_mod, sizeof (dh.dofhp_mod), -#ifdef illumos sip.prs_lmid, mname); + + if (fd == -1 && + (fd = open("/dev/dtrace/helper", O_RDWR, 0)) < 0) { + dt_dprintf("open of helper device failed: %s\n", + strerror(errno)); + free(dof); + return (-1); /* errno is set for us */ + } + + if (ioctl(fd, DTRACEHIOC_ADDDOF, &dh, sizeof (dh)) < 0) + dt_dprintf("DOF was rejected for %s\n", dh.dofhp_mod); + + free(dof); #else - 0, mname); -#endif + dh.dofhp_dof = sym.st_value; + dh.dofhp_addr = (e_type == ET_EXEC) ? 0 : pmp->pr_vaddr; + + dt_pid_objname(dh.dofhp_mod, sizeof (dh.dofhp_mod), + sip.prs_lmid, mname); -#ifdef illumos if (fd == -1 && (fd = pr_open(P, "/dev/dtrace/helper", O_RDWR, 0)) < 0) { dt_dprintf("pr_open of helper device failed: %s\n", @@ -618,8 +673,10 @@ dt_pid_usdt_mapping(void *data, const pr #endif } -#ifdef illumos if (fd != -1) +#ifdef __FreeBSD__ + (void) close(fd); +#else (void) pr_close(P, fd); #endif @@ -634,7 +691,6 @@ dt_pid_create_usdt_probes(dtrace_probede int ret = 0; assert(DT_MUTEX_HELD(&dpr->dpr_lock)); -#ifdef illumos (void) Pupdate_maps(P); if (Pobject_iter(P, dt_pid_usdt_mapping, P) != 0) { ret = -1; @@ -646,9 +702,6 @@ dt_pid_create_usdt_probes(dtrace_probede (int)proc_getpid(P), strerror(errno)); #endif } -#else - ret = 0; -#endif /* * Put the module name in its canonical form. Modified: projects/em_mq/cddl/lib/libdtrace/libproc_compat.h ============================================================================== --- projects/em_mq/cddl/lib/libdtrace/libproc_compat.h Thu Apr 16 17:42:52 2015 (r281606) +++ projects/em_mq/cddl/lib/libdtrace/libproc_compat.h Thu Apr 16 18:47:28 2015 (r281607) @@ -59,6 +59,6 @@ #define Pstate proc_state #define Psymbol_iter_by_addr proc_iter_symbyaddr #define Punsetflags proc_clearflags -#define Pupdate_maps(p) do { } while (0) +#define Pupdate_maps proc_rdagent #define Pupdate_syms proc_updatesyms #define Pxecbkpt proc_bkptexec Modified: projects/em_mq/cddl/usr.bin/ctfmerge/Makefile ============================================================================== --- projects/em_mq/cddl/usr.bin/ctfmerge/Makefile Thu Apr 16 17:42:52 2015 (r281606) +++ projects/em_mq/cddl/usr.bin/ctfmerge/Makefile Thu Apr 16 18:47:28 2015 (r281607) @@ -33,7 +33,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common -DPADD= ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD} -LDADD= -ldwarf -lelf -lz -lpthread +LIBADD= elf z pthread .include Modified: projects/em_mq/contrib/binutils/bfd/elf-bfd.h ============================================================================== --- projects/em_mq/contrib/binutils/bfd/elf-bfd.h Thu Apr 16 17:42:52 2015 (r281606) +++ projects/em_mq/contrib/binutils/bfd/elf-bfd.h Thu Apr 16 18:47:28 2015 (r281607) @@ -1286,7 +1286,7 @@ struct elf_find_verdep_info }; /* The maximum number of known object attributes for any target. */ -#define NUM_KNOWN_OBJ_ATTRIBUTES 32 +#define NUM_KNOWN_OBJ_ATTRIBUTES 71 /* The value of an object attribute. type & 1 indicates whether there is an integer value; type & 2 indicates whether there is a string Modified: projects/em_mq/contrib/binutils/bfd/elf32-arm.c ============================================================================== --- projects/em_mq/contrib/binutils/bfd/elf32-arm.c Thu Apr 16 17:42:52 2015 (r281606) +++ projects/em_mq/contrib/binutils/bfd/elf32-arm.c Thu Apr 16 18:47:28 2015 (r281607) @@ -6835,6 +6835,8 @@ elf32_arm_merge_eabi_attributes (bfd *ib case Tag_ABI_FP_number_model: case Tag_ABI_align8_preserved: case Tag_ABI_HardFP_use: + case Tag_CPU_unaligned_access: + case Tag_FP_HP_extension: /* Use the largest value specified. */ if (in_attr[i].i > out_attr[i].i) out_attr[i].i = in_attr[i].i; @@ -6951,7 +6953,9 @@ elf32_arm_merge_eabi_attributes (bfd *ib } break; default: /* All known attributes should be explicitly covered. */ - abort (); + /* XXX Not now */ + /* abort (); */ + break; } } Modified: projects/em_mq/contrib/binutils/include/elf/arm.h ============================================================================== --- projects/em_mq/contrib/binutils/include/elf/arm.h Thu Apr 16 17:42:52 2015 (r281606) +++ projects/em_mq/contrib/binutils/include/elf/arm.h Thu Apr 16 18:47:28 2015 (r281607) @@ -271,7 +271,11 @@ enum Tag_ABI_optimization_goals, Tag_ABI_FP_optimization_goals, /* 32 is generic. */ - + Tag_CPU_unaligned_access = 34, + Tag_FP_HP_extension = 36, + Tag_ABI_FP_16bit_format = 38, + Tag_MPextension_use = 42, + Tag_DIV_use = 44, Tag_Virtualization_use = 68, }; Copied: projects/em_mq/contrib/compiler-rt/lib/builtins/floatditf.c (from r281606, head/contrib/compiler-rt/lib/builtins/floatditf.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/em_mq/contrib/compiler-rt/lib/builtins/floatditf.c Thu Apr 16 18:47:28 2015 (r281607, copy of r281606, head/contrib/compiler-rt/lib/builtins/floatditf.c) @@ -0,0 +1,52 @@ +//===-- lib/floatditf.c - integer -> quad-precision conversion ----*- C -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file is dual licensed under the MIT and the University of Illinois Open +// Source Licenses. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// +// +// This file implements di_int to quad-precision conversion for the +// compiler-rt library in the IEEE-754 default round-to-nearest, ties-to-even +// mode. +// +//===----------------------------------------------------------------------===// + +#define QUAD_PRECISION +#include "fp_lib.h" + +#if defined(CRT_HAS_128BIT) && defined(CRT_LDBL_128BIT) +COMPILER_RT_ABI fp_t __floatditf(di_int a) { + + const int aWidth = sizeof a * CHAR_BIT; + + // Handle zero as a special case to protect clz + if (a == 0) + return fromRep(0); + + // All other cases begin by extracting the sign and absolute value of a + rep_t sign = 0; + unsigned aAbs = (unsigned)a; + if (a < 0) { + sign = signBit; + aAbs += 0x80000000; + } + + // Exponent of (fp_t)a is the width of abs(a). + const int exponent = (aWidth - 1) - __builtin_clz(a); + rep_t result; + + // Shift a into the significand field and clear the implicit bit. Extra + // cast to unsigned int is necessary to get the correct behavior for + // the input INT_MIN. + const int shift = significandBits - exponent; + result = (rep_t)aAbs << shift ^ implicitBit; + + // Insert the exponent + result += (rep_t)(exponent + exponentBias) << significandBits; + // Insert the sign bit and return + return fromRep(result | sign); +} + +#endif Copied: projects/em_mq/contrib/compiler-rt/lib/builtins/floatunditf.c (from r281606, head/contrib/compiler-rt/lib/builtins/floatunditf.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/em_mq/contrib/compiler-rt/lib/builtins/floatunditf.c Thu Apr 16 18:47:28 2015 (r281607, copy of r281606, head/contrib/compiler-rt/lib/builtins/floatunditf.c) @@ -0,0 +1,40 @@ +//===-- lib/floatunditf.c - uint -> quad-precision conversion -----*- C -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file is dual licensed under the MIT and the University of Illinois Open +// Source Licenses. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// +// +// This file implements du_int to quad-precision conversion for the +// compiler-rt library in the IEEE-754 default round-to-nearest, ties-to-even +// mode. +// +//===----------------------------------------------------------------------===// + +#define QUAD_PRECISION +#include "fp_lib.h" + +#if defined(CRT_HAS_128BIT) && defined(CRT_LDBL_128BIT) +COMPILER_RT_ABI fp_t __floatunditf(du_int a) { + + const int aWidth = sizeof a * CHAR_BIT; + + // Handle zero as a special case to protect clz + if (a == 0) return fromRep(0); + + // Exponent of (fp_t)a is the width of abs(a). + const int exponent = (aWidth - 1) - __builtin_clz(a); + rep_t result; + + // Shift a into the significand field and clear the implicit bit. + const int shift = significandBits - exponent; + result = (rep_t)a << shift ^ implicitBit; + + // Insert the exponent + result += (rep_t)(exponent + exponentBias) << significandBits; + return fromRep(result); +} + +#endif Copied: projects/em_mq/contrib/compiler-rt/lib/builtins/multc3.c (from r281606, head/contrib/compiler-rt/lib/builtins/multc3.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/em_mq/contrib/compiler-rt/lib/builtins/multc3.c Thu Apr 16 18:47:28 2015 (r281607, copy of r281606, head/contrib/compiler-rt/lib/builtins/multc3.c) @@ -0,0 +1,73 @@ +/* ===-- multc3.c - Implement __multc3 -------------------------------------=== + * + * The LLVM Compiler Infrastructure + * + * This file is dual licensed under the MIT and the University of Illinois Open + * Source Licenses. See LICENSE.TXT for details. + * + * ===----------------------------------------------------------------------=== + * + * This file implements __multc3 for the compiler_rt library. + * + * ===----------------------------------------------------------------------=== + */ + +#include "int_lib.h" +#include "int_math.h" + +/* Returns: the product of a + ib and c + id */ + +COMPILER_RT_ABI long double _Complex +__multc3(long double __a, long double __b, long double __c, long double __d) +{ + long double __ac = __a * __c; + long double __bd = __b * __d; + long double __ad = __a * __d; + long double __bc = __b * __c; + long double _Complex z; + __real__ z = __ac - __bd; + __imag__ z = __ad + __bc; + if (crt_isnan(__real__ z) && crt_isnan(__imag__ z)) + { + int __recalc = 0; + if (crt_isinf(__a) || crt_isinf(__b)) + { + __a = crt_copysignl(crt_isinf(__a) ? 1 : 0, __a); + __b = crt_copysignl(crt_isinf(__b) ? 1 : 0, __b); + if (crt_isnan(__c)) + __c = crt_copysignl(0, __c); + if (crt_isnan(__d)) + __d = crt_copysignl(0, __d); + __recalc = 1; + } + if (crt_isinf(__c) || crt_isinf(__d)) + { + __c = crt_copysignl(crt_isinf(__c) ? 1 : 0, __c); + __d = crt_copysignl(crt_isinf(__d) ? 1 : 0, __d); + if (crt_isnan(__a)) + __a = crt_copysignl(0, __a); + if (crt_isnan(__b)) + __b = crt_copysignl(0, __b); + __recalc = 1; + } + if (!__recalc && (crt_isinf(__ac) || crt_isinf(__bd) || + crt_isinf(__ad) || crt_isinf(__bc))) + { + if (crt_isnan(__a)) + __a = crt_copysignl(0, __a); + if (crt_isnan(__b)) + __b = crt_copysignl(0, __b); + if (crt_isnan(__c)) + __c = crt_copysignl(0, __c); + if (crt_isnan(__d)) + __d = crt_copysignl(0, __d); + __recalc = 1; + } + if (__recalc) + { + __real__ z = CRT_INFINITY * (__a * __c - __b * __d); + __imag__ z = CRT_INFINITY * (__a * __d + __b * __c); + } + } + return z; +} Modified: projects/em_mq/contrib/elftoolchain/addr2line/addr2line.c ============================================================================== --- projects/em_mq/contrib/elftoolchain/addr2line/addr2line.c Thu Apr 16 17:42:52 2015 (r281606) +++ projects/em_mq/contrib/elftoolchain/addr2line/addr2line.c Thu Apr 16 18:47:28 2015 (r281607) @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include @@ -40,7 +39,7 @@ #include "_elftc.h" -ELFTC_VCSID("$Id: addr2line.c 3148 2015-02-15 18:47:39Z emaste $"); +ELFTC_VCSID("$Id: addr2line.c 3174 2015-03-27 17:13:41Z emaste $"); static struct option longopts[] = { {"target" , required_argument, NULL, 'b'}, Modified: projects/em_mq/contrib/elftoolchain/common/_elftc.h ============================================================================== --- projects/em_mq/contrib/elftoolchain/common/_elftc.h Thu Apr 16 17:42:52 2015 (r281606) +++ projects/em_mq/contrib/elftoolchain/common/_elftc.h Thu Apr 16 18:47:28 2015 (r281607) @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: _elftc.h 3139 2015-01-05 03:17:06Z kaiwang27 $ + * $Id: _elftc.h 3175 2015-03-27 17:21:24Z emaste $ */ /** @@ -294,7 +294,8 @@ struct name { \ #define ELFTC_VCSID(ID) __FBSDID(ID) #endif -#if defined(__linux__) || defined(__GNU__) || defined(__GLIBC__) +#if defined(__APPLE__) || defined(__GLIBC__) || defined(__GNU__) || \ + defined(__linux__) #if defined(__GNUC__) #define ELFTC_VCSID(ID) __asm__(".ident\t\"" ID "\"") #else @@ -330,8 +331,8 @@ struct name { \ #ifndef ELFTC_GETPROGNAME -#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__minix) || \ - defined(__NetBSD__) +#if defined(__APPLE__) || defined(__DragonFly__) || defined(__FreeBSD__) || \ + defined(__minix) || defined(__NetBSD__) #include @@ -340,7 +341,7 @@ struct name { \ #endif /* __DragonFly__ || __FreeBSD__ || __minix || __NetBSD__ */ -#if defined(__GLIBC__) +#if defined(__GLIBC__) || defined(__linux__) /* * GLIBC based systems have a global 'char *' pointer referencing @@ -350,7 +351,7 @@ extern const char *program_invocation_sh #define ELFTC_GETPROGNAME() program_invocation_short_name -#endif /* __GLIBC__ */ +#endif /* __GLIBC__ || __linux__ */ #if defined(__OpenBSD__) @@ -368,6 +369,21 @@ extern const char *__progname; ** Per-OS configuration. **/ +#if defined(__APPLE__) + +#include +#define roundup2 roundup + +#define ELFTC_BYTE_ORDER _BYTE_ORDER +#define ELFTC_BYTE_ORDER_LITTLE_ENDIAN _LITTLE_ENDIAN +#define ELFTC_BYTE_ORDER_BIG_ENDIAN _BIG_ENDIAN + +#define ELFTC_HAVE_MMAP 1 +#define ELFTC_HAVE_STRMODE 1 + +#endif /* __APPLE__ */ + + #if defined(__DragonFly__) #include @@ -381,7 +397,7 @@ extern const char *__progname; #endif -#if defined(__GLIBC__) +#if defined(__GLIBC__) || defined(__linux__) #include @@ -401,7 +417,7 @@ extern const char *__progname; #define roundup2 roundup -#endif /* __GLIBC__ */ +#endif /* __GLIBC__ || __linux__ */ #if defined(__FreeBSD__) Modified: projects/em_mq/contrib/elftoolchain/common/elfdefinitions.h ============================================================================== --- projects/em_mq/contrib/elftoolchain/common/elfdefinitions.h Thu Apr 16 17:42:52 2015 (r281606) +++ projects/em_mq/contrib/elftoolchain/common/elfdefinitions.h Thu Apr 16 18:47:28 2015 (r281607) @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: elfdefinitions.h 3149 2015-02-15 19:00:06Z emaste $ + * $Id: elfdefinitions.h 3178 2015-03-30 18:29:13Z emaste $ */ /* @@ -171,7 +171,7 @@ _ELF_DEFINE_DT(DT_MOVEENT, 0x6F "size of DT_MOVETAB entries") \ _ELF_DEFINE_DT(DT_MOVESZ, 0x6FFFFDFBUL, \ "total size of the MOVETAB table") \ -_ELF_DEFINE_DT(DT_FEATURE_1, 0x6FFFFDFCUL, "feature values") \ +_ELF_DEFINE_DT(DT_FEATURE, 0x6FFFFDFCUL, "feature values") \ _ELF_DEFINE_DT(DT_POSFLAG_1, 0x6FFFFDFDUL, \ "dynamic position flags") \ _ELF_DEFINE_DT(DT_SYMINSZ, 0x6FFFFDFEUL, \ Modified: projects/em_mq/contrib/elftoolchain/common/native-elf-format ============================================================================== --- projects/em_mq/contrib/elftoolchain/common/native-elf-format Thu Apr 16 17:42:52 2015 (r281606) +++ projects/em_mq/contrib/elftoolchain/common/native-elf-format Thu Apr 16 18:47:28 2015 (r281607) @@ -1,6 +1,6 @@ #!/bin/sh # -# $Id: native-elf-format 2064 2011-10-26 15:12:32Z jkoshy $ +# $Id: native-elf-format 3167 2015-02-24 19:10:08Z emaste $ # # Find the native ELF format for a host platform by compiling a # test object and examining the resulting object. @@ -19,7 +19,7 @@ touch ${tmp_c} echo "/* Generated by ${program} on `date` */" cc -c ${tmp_c} -o ${tmp_o} -readelf -h ${tmp_o} | awk ' +LC_ALL=C readelf -h ${tmp_o} | awk ' $1 ~ "Class:" { sub("ELF","",$2); elfclass = $2; } Modified: projects/em_mq/contrib/elftoolchain/cxxfilt/cxxfilt.c ============================================================================== --- projects/em_mq/contrib/elftoolchain/cxxfilt/cxxfilt.c Thu Apr 16 17:42:52 2015 (r281606) +++ projects/em_mq/contrib/elftoolchain/cxxfilt/cxxfilt.c Thu Apr 16 18:47:28 2015 (r281607) @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include @@ -36,7 +35,7 @@ #include "_elftc.h" -ELFTC_VCSID("$Id: cxxfilt.c 2185 2011-11-19 16:07:16Z jkoshy $"); +ELFTC_VCSID("$Id: cxxfilt.c 3174 2015-03-27 17:13:41Z emaste $"); #define STRBUFSZ 8192 Modified: projects/em_mq/contrib/elftoolchain/elfcopy/archive.c ============================================================================== --- projects/em_mq/contrib/elftoolchain/elfcopy/archive.c Thu Apr 16 17:42:52 2015 (r281606) +++ projects/em_mq/contrib/elftoolchain/elfcopy/archive.c Thu Apr 16 18:47:28 2015 (r281607) @@ -24,8 +24,6 @@ * SUCH DAMAGE. */ -#include - #include #include #include @@ -40,7 +38,7 @@ #include "elfcopy.h" -ELFTC_VCSID("$Id: archive.c 3102 2014-10-29 21:09:01Z jkoshy $"); +ELFTC_VCSID("$Id: archive.c 3174 2015-03-27 17:13:41Z emaste $"); #define _ARMAG_LEN 8 /* length of ar magic string */ #define _ARHDR_LEN 60 /* length of ar header */ Modified: projects/em_mq/contrib/elftoolchain/elfcopy/ascii.c ============================================================================== --- projects/em_mq/contrib/elftoolchain/elfcopy/ascii.c Thu Apr 16 17:42:52 2015 (r281606) +++ projects/em_mq/contrib/elftoolchain/elfcopy/ascii.c Thu Apr 16 18:47:28 2015 (r281607) @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include @@ -37,7 +36,7 @@ #include "elfcopy.h" -ELFTC_VCSID("$Id: ascii.c 2358 2011-12-19 18:22:32Z kaiwang27 $"); +ELFTC_VCSID("$Id: ascii.c 3177 2015-03-30 18:19:41Z emaste $"); static void append_data(struct section *s, const void *buf, size_t sz); static char hex_digit(uint8_t n); Modified: projects/em_mq/contrib/elftoolchain/elfcopy/binary.c ============================================================================== --- projects/em_mq/contrib/elftoolchain/elfcopy/binary.c Thu Apr 16 17:42:52 2015 (r281606) +++ projects/em_mq/contrib/elftoolchain/elfcopy/binary.c Thu Apr 16 18:47:28 2015 (r281607) @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include @@ -36,7 +35,7 @@ #include "elfcopy.h" -ELFTC_VCSID("$Id: binary.c 2358 2011-12-19 18:22:32Z kaiwang27 $"); +ELFTC_VCSID("$Id: binary.c 3174 2015-03-27 17:13:41Z emaste $"); /* * Convert ELF object to `binary'. Sections with SHF_ALLOC flag set Modified: projects/em_mq/contrib/elftoolchain/elfcopy/elfcopy.1 ============================================================================== --- projects/em_mq/contrib/elftoolchain/elfcopy/elfcopy.1 Thu Apr 16 17:42:52 2015 (r281606) +++ projects/em_mq/contrib/elftoolchain/elfcopy/elfcopy.1 Thu Apr 16 18:47:28 2015 (r281607) @@ -21,9 +21,9 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $Id: elfcopy.1 2373 2011-12-30 07:13:44Z jkoshy $ +.\" $Id: elfcopy.1 3173 2015-03-27 16:46:13Z emaste $ .\" -.Dd October 03, 2011 +.Dd March 27, 2015 .Os .Dt ELFCOPY 1 .Sh NAME @@ -63,7 +63,9 @@ .Op Fl -adjust-warnings | Fl -change-warnings .Op Fl -change-section-lma Ar section Ns {+|-|=} Ns Ar val .Op Fl -change-section-vma Ar section Ns {+|-|=} Ns Ar val +.Op Fl -extract-dwo .Op Fl -gap-fill Ns = Ns Ar val +.Op Fl -localize-hidden .Op Fl -no-adjust-warnings | Fl -no-change-warnings .Op Fl -only-keep-debug .Op Fl -pad-to Ns = Ns Ar address @@ -75,6 +77,7 @@ .Op Fl -set-start Ns = Ns Ar address .Op Fl -srec-forceS3 .Op Fl -srec-len Ns = Ns Ar val +.Op Fl -strip-dwo .Op Fl -strip-unneeded .Ar infile .Op Ar outfile @@ -220,10 +223,15 @@ Depending on the operator specified, the .Ar val will be used as an increment, a decrement or as the new value of the virtual memory address. +.It Fl -extract-dwo +Copy only .dwo debug sections to the output file. .It Fl -gap-fill Ns = Ns Ar val Fill the gaps between sections with the byte value specified by the argument .Ar val . +.It Fl -localize-hidden +Make all hidden symbols local to the output file. +This includes symbols with internal visiblity. .It Fl -no-adjust-warnings | Fl -no-change-warnings Do not issue a warning if the section specified by the options .Fl -change-section-address , @@ -304,6 +312,8 @@ Set the maximum length of an S-record li .Ar val . This option is only meaningful when the output target is set to .Dq srec . +.It Fl -strip-dwo +Do not copy .dwo debug sections to the output file. .It Fl -strip-unneeded Do not copy symbols that are not needed for relocation processing. .El Modified: projects/em_mq/contrib/elftoolchain/elfcopy/elfcopy.h ============================================================================== --- projects/em_mq/contrib/elftoolchain/elfcopy/elfcopy.h Thu Apr 16 17:42:52 2015 (r281606) +++ projects/em_mq/contrib/elftoolchain/elfcopy/elfcopy.h Thu Apr 16 18:47:28 2015 (r281607) @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: elfcopy.h 3134 2014-12-23 10:43:59Z kaiwang27 $ + * $Id: elfcopy.h 3173 2015-03-27 16:46:13Z emaste $ */ #include @@ -190,7 +190,9 @@ struct elfcopy { STRIP_NONE = 0, STRIP_ALL, STRIP_DEBUG, + STRIP_DWO, STRIP_NONDEBUG, + STRIP_NONDWO, STRIP_UNNEEDED } strip; @@ -216,6 +218,7 @@ struct elfcopy { #define SEC_REMOVE 0x00800000U #define SEC_COPY 0x01000000U #define DISCARD_LLABEL 0x02000000U +#define LOCALIZE_HIDDEN 0x04000000U int flags; /* elfcopy run control flags. */ int64_t change_addr; /* Section address adjustment. */ Modified: projects/em_mq/contrib/elftoolchain/elfcopy/main.c ============================================================================== --- projects/em_mq/contrib/elftoolchain/elfcopy/main.c Thu Apr 16 17:42:52 2015 (r281606) +++ projects/em_mq/contrib/elftoolchain/elfcopy/main.c Thu Apr 16 18:47:28 2015 (r281607) @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include @@ -40,7 +39,7 @@ #include "elfcopy.h" -ELFTC_VCSID("$Id: main.c 3156 2015-02-15 21:40:01Z emaste $"); +ELFTC_VCSID("$Id: main.c 3174 2015-03-27 17:13:41Z emaste $"); enum options { @@ -57,9 +56,11 @@ enum options ECP_GLOBALIZE_SYMBOLS, ECP_KEEP_SYMBOLS, ECP_KEEP_GLOBAL_SYMBOLS, + ECP_LOCALIZE_HIDDEN, ECP_LOCALIZE_SYMBOLS, ECP_NO_CHANGE_WARN, ECP_ONLY_DEBUG, + ECP_ONLY_DWO, ECP_PAD_TO, ECP_PREFIX_ALLOC, ECP_PREFIX_SEC, @@ -72,6 +73,7 @@ enum options ECP_SET_START, ECP_SREC_FORCE_S3, ECP_SREC_LEN, + ECP_STRIP_DWO, ECP_STRIP_SYMBOLS, ECP_STRIP_UNNEEDED, ECP_WEAKEN_ALL, @@ -124,6 +126,7 @@ static struct option elfcopy_longopts[] {"change-warnings", no_argument, NULL, ECP_CHANGE_WARN}, {"discard-all", no_argument, NULL, 'x'}, {"discard-locals", no_argument, NULL, 'X'}, + {"extract-dwo", no_argument, NULL, ECP_ONLY_DWO}, {"gap-fill", required_argument, NULL, ECP_GAP_FILL}, {"globalize-symbol", required_argument, NULL, ECP_GLOBALIZE_SYMBOL}, {"globalize-symbols", required_argument, NULL, ECP_GLOBALIZE_SYMBOLS}, @@ -134,6 +137,7 @@ static struct option elfcopy_longopts[] {"keep-global-symbol", required_argument, NULL, 'G'}, {"keep-global-symbols", required_argument, NULL, ECP_KEEP_GLOBAL_SYMBOLS}, + {"localize-hidden", no_argument, NULL, ECP_LOCALIZE_HIDDEN}, {"localize-symbol", required_argument, NULL, 'L'}, {"localize-symbols", required_argument, NULL, ECP_LOCALIZE_SYMBOLS}, {"no-adjust-warnings", no_argument, NULL, ECP_NO_CHANGE_WARN}, @@ -157,6 +161,7 @@ static struct option elfcopy_longopts[] {"srec-len", required_argument, NULL, ECP_SREC_LEN}, {"strip-all", no_argument, NULL, 'S'}, {"strip-debug", no_argument, 0, 'g'}, + {"strip-dwo", no_argument, NULL, ECP_STRIP_DWO}, {"strip-symbol", required_argument, NULL, 'N'}, {"strip-symbols", required_argument, NULL, ECP_STRIP_SYMBOLS}, {"strip-unneeded", no_argument, NULL, ECP_STRIP_UNNEEDED}, @@ -348,6 +353,7 @@ create_elf(struct elfcopy *ecp) if (ecp->strip == STRIP_DEBUG || ecp->strip == STRIP_UNNEEDED || ecp->flags & WEAKEN_ALL || + ecp->flags & LOCALIZE_HIDDEN || ecp->flags & DISCARD_LOCAL || ecp->flags & DISCARD_LLABEL || ecp->prefix_sym != NULL || @@ -870,6 +876,9 @@ elfcopy_main(struct elfcopy *ecp, int ar case ECP_KEEP_GLOBAL_SYMBOLS: parse_symlist_file(ecp, optarg, SYMOP_KEEPG); break; + case ECP_LOCALIZE_HIDDEN: + ecp->flags |= LOCALIZE_HIDDEN; + break; case ECP_LOCALIZE_SYMBOLS: parse_symlist_file(ecp, optarg, SYMOP_LOCALIZE); break; @@ -879,6 +888,9 @@ elfcopy_main(struct elfcopy *ecp, int ar case ECP_ONLY_DEBUG: ecp->strip = STRIP_NONDEBUG; break; + case ECP_ONLY_DWO: + ecp->strip = STRIP_NONDWO; + break; case ECP_PAD_TO: ecp->pad_to = (uint64_t) strtoull(optarg, NULL, 0); break; @@ -939,6 +951,9 @@ elfcopy_main(struct elfcopy *ecp, int ar ecp->flags |= SREC_FORCE_LEN; ecp->srec_len = strtoul(optarg, NULL, 0); break; + case ECP_STRIP_DWO: + ecp->strip = STRIP_DWO; + break; case ECP_STRIP_SYMBOLS: parse_symlist_file(ecp, optarg, SYMOP_STRIP); break; @@ -1379,6 +1394,8 @@ Usage: %s [options] infile [outfile]\n\ section by VAL.\n\ --gap-fill=VAL Fill the gaps between sections with bytes\n\ of value VAL.\n\ + --localize-hidden Make all hidden symbols local to the output\n\ + file.\n\ --no-adjust-warning| --no-change-warnings\n\ Do not issue warnings for non-existent\n\ sections.\n\ Modified: projects/em_mq/contrib/elftoolchain/elfcopy/sections.c ============================================================================== --- projects/em_mq/contrib/elftoolchain/elfcopy/sections.c Thu Apr 16 17:42:52 2015 (r281606) +++ projects/em_mq/contrib/elftoolchain/elfcopy/sections.c Thu Apr 16 18:47:28 2015 (r281607) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Fri Apr 17 05:55:15 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5BECD2FB; Fri, 17 Apr 2015 05:55:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 457DE5DF; Fri, 17 Apr 2015 05:55:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3H5tF5o055734; Fri, 17 Apr 2015 05:55:15 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3H5t9lC055708; Fri, 17 Apr 2015 05:55:09 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201504170555.t3H5t9lC055708@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Fri, 17 Apr 2015 05:55:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r281640 - in projects/ifnet: . bin/csh cddl/contrib/opensolaris/lib/libdtrace/common cddl/lib/libdtrace cddl/usr.bin/ctfmerge contrib/compiler-rt/lib/builtins contrib/nvi contrib/nvi/ca... 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: Fri, 17 Apr 2015 05:55:15 -0000 Author: glebius Date: Fri Apr 17 05:55:07 2015 New Revision: 281640 URL: https://svnweb.freebsd.org/changeset/base/281640 Log: Merge head r257698 through r281639. Added: projects/ifnet/contrib/compiler-rt/lib/builtins/floatditf.c - copied unchanged from r281639, head/contrib/compiler-rt/lib/builtins/floatditf.c projects/ifnet/contrib/compiler-rt/lib/builtins/floatunditf.c - copied unchanged from r281639, head/contrib/compiler-rt/lib/builtins/floatunditf.c projects/ifnet/contrib/compiler-rt/lib/builtins/multc3.c - copied unchanged from r281639, head/contrib/compiler-rt/lib/builtins/multc3.c projects/ifnet/contrib/nvi/docs/man/ - copied from r281639, head/contrib/nvi/docs/man/ projects/ifnet/lib/libc/aarch64/SYS.h - copied unchanged from r281639, head/lib/libc/aarch64/SYS.h projects/ifnet/lib/libc/aarch64/Symbol.map - copied unchanged from r281639, head/lib/libc/aarch64/Symbol.map projects/ifnet/lib/libc/aarch64/_fpmath.h - copied unchanged from r281639, head/lib/libc/aarch64/_fpmath.h projects/ifnet/lib/libc/aarch64/arith.h - copied unchanged from r281639, head/lib/libc/aarch64/arith.h projects/ifnet/lib/libc/aarch64/gd_qnan.h - copied unchanged from r281639, head/lib/libc/aarch64/gd_qnan.h projects/ifnet/lib/libc/aarch64/gen/ - copied from r281639, head/lib/libc/aarch64/gen/ projects/ifnet/lib/libc/aarch64/sys/ - copied from r281639, head/lib/libc/aarch64/sys/ projects/ifnet/sys/arm/conf/VIRT - copied unchanged from r281639, head/sys/arm/conf/VIRT projects/ifnet/sys/arm/qemu/ - copied from r281639, head/sys/arm/qemu/ projects/ifnet/sys/arm64/arm64/ - copied from r281639, head/sys/arm64/arm64/ projects/ifnet/sys/arm64/conf/ - copied from r281639, head/sys/arm64/conf/ projects/ifnet/sys/arm64/include/_bus.h - copied unchanged from r281639, head/sys/arm64/include/_bus.h projects/ifnet/sys/arm64/include/armreg.h - copied unchanged from r281639, head/sys/arm64/include/armreg.h projects/ifnet/sys/arm64/include/bus.h - copied unchanged from r281639, head/sys/arm64/include/bus.h projects/ifnet/sys/arm64/include/bus_dma.h - copied unchanged from r281639, head/sys/arm64/include/bus_dma.h projects/ifnet/sys/arm64/include/clock.h - copied unchanged from r281639, head/sys/arm64/include/clock.h projects/ifnet/sys/arm64/include/counter.h - copied unchanged from r281639, head/sys/arm64/include/counter.h projects/ifnet/sys/arm64/include/db_machdep.h - copied unchanged from r281639, head/sys/arm64/include/db_machdep.h projects/ifnet/sys/arm64/include/debug_monitor.h - copied unchanged from r281639, head/sys/arm64/include/debug_monitor.h projects/ifnet/sys/arm64/include/devmap.h - copied unchanged from r281639, head/sys/arm64/include/devmap.h projects/ifnet/sys/arm64/include/dump.h - copied unchanged from r281639, head/sys/arm64/include/dump.h projects/ifnet/sys/arm64/include/hypervisor.h - copied unchanged from r281639, head/sys/arm64/include/hypervisor.h projects/ifnet/sys/arm64/include/in_cksum.h - copied unchanged from r281639, head/sys/arm64/include/in_cksum.h projects/ifnet/sys/arm64/include/intr.h - copied unchanged from r281639, head/sys/arm64/include/intr.h projects/ifnet/sys/arm64/include/kdb.h - copied unchanged from r281639, head/sys/arm64/include/kdb.h projects/ifnet/sys/arm64/include/machdep.h - copied unchanged from r281639, head/sys/arm64/include/machdep.h projects/ifnet/sys/arm64/include/md_var.h - copied unchanged from r281639, head/sys/arm64/include/md_var.h projects/ifnet/sys/arm64/include/memdev.h - copied unchanged from r281639, head/sys/arm64/include/memdev.h projects/ifnet/sys/arm64/include/metadata.h - copied unchanged from r281639, head/sys/arm64/include/metadata.h projects/ifnet/sys/arm64/include/ofw_machdep.h - copied unchanged from r281639, head/sys/arm64/include/ofw_machdep.h projects/ifnet/sys/arm64/include/psl.h - copied unchanged from r281639, head/sys/arm64/include/psl.h projects/ifnet/sys/arm64/include/resource.h - copied unchanged from r281639, head/sys/arm64/include/resource.h projects/ifnet/sys/arm64/include/sf_buf.h - copied unchanged from r281639, head/sys/arm64/include/sf_buf.h projects/ifnet/sys/arm64/include/smp.h - copied unchanged from r281639, head/sys/arm64/include/smp.h projects/ifnet/sys/arm64/include/stack.h - copied unchanged from r281639, head/sys/arm64/include/stack.h projects/ifnet/sys/arm64/include/trap.h - copied unchanged from r281639, head/sys/arm64/include/trap.h projects/ifnet/sys/arm64/include/vfp.h - copied unchanged from r281639, head/sys/arm64/include/vfp.h projects/ifnet/sys/boot/Makefile.arm64 - copied unchanged from r281639, head/sys/boot/Makefile.arm64 projects/ifnet/sys/boot/arm64/ - copied from r281639, head/sys/boot/arm64/ projects/ifnet/sys/boot/efi/boot1/fat-arm64.tmpl.bz2.uu - copied unchanged from r281639, head/sys/boot/efi/boot1/fat-arm64.tmpl.bz2.uu projects/ifnet/sys/boot/efi/boot1/fat-i386.tmpl.bz2.uu - copied unchanged from r281639, head/sys/boot/efi/boot1/fat-i386.tmpl.bz2.uu projects/ifnet/sys/boot/efi/include/arm64/ - copied from r281639, head/sys/boot/efi/include/arm64/ projects/ifnet/sys/boot/efi/loader/arch/arm64/ - copied from r281639, head/sys/boot/efi/loader/arch/arm64/ projects/ifnet/sys/boot/efi/loader/arch/i386/Makefile.inc - copied unchanged from r281639, head/sys/boot/efi/loader/arch/i386/Makefile.inc projects/ifnet/sys/boot/efi/loader/reloc.c - copied unchanged from r281639, head/sys/boot/efi/loader/reloc.c projects/ifnet/sys/boot/fdt/dts/arm/meson8b.dtsi - copied unchanged from r281639, head/sys/boot/fdt/dts/arm/meson8b.dtsi projects/ifnet/sys/boot/ficl/aarch64/ - copied from r281639, head/sys/boot/ficl/aarch64/ projects/ifnet/sys/conf/Makefile.arm64 - copied unchanged from r281639, head/sys/conf/Makefile.arm64 projects/ifnet/sys/conf/files.arm64 - copied unchanged from r281639, head/sys/conf/files.arm64 projects/ifnet/sys/conf/ldscript.arm64 - copied unchanged from r281639, head/sys/conf/ldscript.arm64 projects/ifnet/sys/conf/options.arm64 - copied unchanged from r281639, head/sys/conf/options.arm64 projects/ifnet/sys/crypto/aesni/aesni_os.h - copied unchanged from r281639, head/sys/crypto/aesni/aesni_os.h projects/ifnet/sys/dev/fdt/fdt_arm64.c - copied unchanged from r281639, head/sys/dev/fdt/fdt_arm64.c projects/ifnet/sys/dev/psci/ - copied from r281639, head/sys/dev/psci/ projects/ifnet/sys/net/altq/ - copied from r281639, head/sys/net/altq/ projects/ifnet/sys/netinet/ip_reass.c - copied unchanged from r281639, head/sys/netinet/ip_reass.c projects/ifnet/sys/pc98/pc98/genassym.c - copied unchanged from r281639, head/sys/pc98/pc98/genassym.c projects/ifnet/tools/debugscripts/netstat-anr.gdb - copied unchanged from r281639, head/tools/debugscripts/netstat-anr.gdb Deleted: projects/ifnet/contrib/nvi/catalog/spell.ok projects/ifnet/contrib/nvi/docs/TODO projects/ifnet/contrib/nvi/docs/USD.doc/ projects/ifnet/contrib/nvi/docs/changelog projects/ifnet/contrib/nvi/docs/ev projects/ifnet/contrib/nvi/docs/features projects/ifnet/contrib/nvi/docs/help projects/ifnet/contrib/nvi/docs/internals/ projects/ifnet/contrib/nvi/docs/interp/ projects/ifnet/contrib/nvi/docs/spell.ok projects/ifnet/contrib/nvi/docs/tutorial/ projects/ifnet/share/doc/usd/10.exref/ projects/ifnet/share/doc/usd/11.vitut/ projects/ifnet/share/doc/usd/12.vi/ projects/ifnet/share/doc/usd/13.viref/ projects/ifnet/sys/boot/efi/loader/arch/amd64/reloc.c projects/ifnet/sys/boot/efi/loader/arch/arm/reloc.c projects/ifnet/sys/contrib/altq/ projects/ifnet/tools/regression/sockets/so_setfib/so_setfib.t Modified: projects/ifnet/Makefile projects/ifnet/Makefile.inc1 projects/ifnet/ObsoleteFiles.inc projects/ifnet/README projects/ifnet/UPDATING projects/ifnet/bin/csh/config.h projects/ifnet/bin/csh/iconv_stub.h projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c projects/ifnet/cddl/lib/libdtrace/libproc_compat.h projects/ifnet/cddl/usr.bin/ctfmerge/Makefile projects/ifnet/contrib/nvi/README projects/ifnet/contrib/nvi/catalog/dump.c projects/ifnet/contrib/nvi/cl/cl.h projects/ifnet/contrib/nvi/cl/cl_funcs.c projects/ifnet/contrib/nvi/cl/cl_main.c projects/ifnet/contrib/nvi/cl/cl_read.c projects/ifnet/contrib/nvi/cl/cl_screen.c projects/ifnet/contrib/nvi/cl/cl_term.c projects/ifnet/contrib/nvi/cl/extern.h projects/ifnet/contrib/nvi/common/common.h projects/ifnet/contrib/nvi/common/conv.c projects/ifnet/contrib/nvi/common/cut.c projects/ifnet/contrib/nvi/common/delete.c projects/ifnet/contrib/nvi/common/encoding.c projects/ifnet/contrib/nvi/common/exf.c projects/ifnet/contrib/nvi/common/extern.h projects/ifnet/contrib/nvi/common/gs.h projects/ifnet/contrib/nvi/common/key.c projects/ifnet/contrib/nvi/common/line.c projects/ifnet/contrib/nvi/common/log.c projects/ifnet/contrib/nvi/common/main.c projects/ifnet/contrib/nvi/common/mark.c projects/ifnet/contrib/nvi/common/msg.c projects/ifnet/contrib/nvi/common/options.c projects/ifnet/contrib/nvi/common/options.h projects/ifnet/contrib/nvi/common/options_f.c projects/ifnet/contrib/nvi/common/put.c projects/ifnet/contrib/nvi/common/recover.c projects/ifnet/contrib/nvi/common/screen.c projects/ifnet/contrib/nvi/common/search.c projects/ifnet/contrib/nvi/common/seq.c projects/ifnet/contrib/nvi/common/util.c projects/ifnet/contrib/nvi/ex/ex.c projects/ifnet/contrib/nvi/ex/ex.h projects/ifnet/contrib/nvi/ex/ex_abbrev.c projects/ifnet/contrib/nvi/ex/ex_append.c projects/ifnet/contrib/nvi/ex/ex_args.c projects/ifnet/contrib/nvi/ex/ex_argv.c projects/ifnet/contrib/nvi/ex/ex_at.c projects/ifnet/contrib/nvi/ex/ex_bang.c projects/ifnet/contrib/nvi/ex/ex_cd.c projects/ifnet/contrib/nvi/ex/ex_cscope.c projects/ifnet/contrib/nvi/ex/ex_delete.c projects/ifnet/contrib/nvi/ex/ex_display.c projects/ifnet/contrib/nvi/ex/ex_edit.c projects/ifnet/contrib/nvi/ex/ex_equal.c projects/ifnet/contrib/nvi/ex/ex_file.c projects/ifnet/contrib/nvi/ex/ex_filter.c projects/ifnet/contrib/nvi/ex/ex_global.c projects/ifnet/contrib/nvi/ex/ex_init.c projects/ifnet/contrib/nvi/ex/ex_join.c projects/ifnet/contrib/nvi/ex/ex_map.c projects/ifnet/contrib/nvi/ex/ex_mark.c projects/ifnet/contrib/nvi/ex/ex_mkexrc.c projects/ifnet/contrib/nvi/ex/ex_move.c projects/ifnet/contrib/nvi/ex/ex_open.c projects/ifnet/contrib/nvi/ex/ex_preserve.c projects/ifnet/contrib/nvi/ex/ex_print.c projects/ifnet/contrib/nvi/ex/ex_put.c projects/ifnet/contrib/nvi/ex/ex_quit.c projects/ifnet/contrib/nvi/ex/ex_read.c projects/ifnet/contrib/nvi/ex/ex_screen.c projects/ifnet/contrib/nvi/ex/ex_script.c projects/ifnet/contrib/nvi/ex/ex_set.c projects/ifnet/contrib/nvi/ex/ex_shell.c projects/ifnet/contrib/nvi/ex/ex_shift.c projects/ifnet/contrib/nvi/ex/ex_source.c projects/ifnet/contrib/nvi/ex/ex_stop.c projects/ifnet/contrib/nvi/ex/ex_subst.c projects/ifnet/contrib/nvi/ex/ex_tag.c projects/ifnet/contrib/nvi/ex/ex_txt.c projects/ifnet/contrib/nvi/ex/ex_undo.c projects/ifnet/contrib/nvi/ex/ex_usage.c projects/ifnet/contrib/nvi/ex/ex_util.c projects/ifnet/contrib/nvi/ex/ex_version.c projects/ifnet/contrib/nvi/ex/ex_visual.c projects/ifnet/contrib/nvi/ex/ex_write.c projects/ifnet/contrib/nvi/ex/ex_yank.c projects/ifnet/contrib/nvi/ex/ex_z.c projects/ifnet/contrib/nvi/ex/extern.h projects/ifnet/contrib/nvi/ex/version.h projects/ifnet/contrib/nvi/regex/COPYRIGHT projects/ifnet/contrib/nvi/regex/cclass.h projects/ifnet/contrib/nvi/regex/cname.h projects/ifnet/contrib/nvi/regex/engine.c projects/ifnet/contrib/nvi/regex/re_format.7 projects/ifnet/contrib/nvi/regex/regcomp.c projects/ifnet/contrib/nvi/regex/regerror.c projects/ifnet/contrib/nvi/regex/regex.3 projects/ifnet/contrib/nvi/regex/regex.h projects/ifnet/contrib/nvi/regex/regex2.h projects/ifnet/contrib/nvi/regex/regexec.c projects/ifnet/contrib/nvi/regex/regfree.c projects/ifnet/contrib/nvi/regex/utils.h projects/ifnet/contrib/nvi/vi/extern.h projects/ifnet/contrib/nvi/vi/getc.c projects/ifnet/contrib/nvi/vi/v_at.c projects/ifnet/contrib/nvi/vi/v_ch.c projects/ifnet/contrib/nvi/vi/v_delete.c projects/ifnet/contrib/nvi/vi/v_ex.c projects/ifnet/contrib/nvi/vi/v_increment.c projects/ifnet/contrib/nvi/vi/v_init.c projects/ifnet/contrib/nvi/vi/v_itxt.c projects/ifnet/contrib/nvi/vi/v_left.c projects/ifnet/contrib/nvi/vi/v_mark.c projects/ifnet/contrib/nvi/vi/v_match.c projects/ifnet/contrib/nvi/vi/v_paragraph.c projects/ifnet/contrib/nvi/vi/v_put.c projects/ifnet/contrib/nvi/vi/v_redraw.c projects/ifnet/contrib/nvi/vi/v_replace.c projects/ifnet/contrib/nvi/vi/v_right.c projects/ifnet/contrib/nvi/vi/v_screen.c projects/ifnet/contrib/nvi/vi/v_scroll.c projects/ifnet/contrib/nvi/vi/v_search.c projects/ifnet/contrib/nvi/vi/v_section.c projects/ifnet/contrib/nvi/vi/v_sentence.c projects/ifnet/contrib/nvi/vi/v_status.c projects/ifnet/contrib/nvi/vi/v_txt.c projects/ifnet/contrib/nvi/vi/v_ulcase.c projects/ifnet/contrib/nvi/vi/v_undo.c projects/ifnet/contrib/nvi/vi/v_util.c projects/ifnet/contrib/nvi/vi/v_word.c projects/ifnet/contrib/nvi/vi/v_xchar.c projects/ifnet/contrib/nvi/vi/v_yank.c projects/ifnet/contrib/nvi/vi/v_z.c projects/ifnet/contrib/nvi/vi/v_zexit.c projects/ifnet/contrib/nvi/vi/vi.c projects/ifnet/contrib/nvi/vi/vi.h projects/ifnet/contrib/nvi/vi/vs_line.c projects/ifnet/contrib/nvi/vi/vs_msg.c projects/ifnet/contrib/nvi/vi/vs_refresh.c projects/ifnet/contrib/nvi/vi/vs_relative.c projects/ifnet/contrib/nvi/vi/vs_smap.c projects/ifnet/contrib/nvi/vi/vs_split.c projects/ifnet/contrib/pjdfstest/tests/open/20.t projects/ifnet/contrib/pjdfstest/tests/truncate/11.t projects/ifnet/contrib/smbfs/include/netsmb/smb_lib.h projects/ifnet/contrib/smbfs/lib/smb/nls.c projects/ifnet/contrib/smbfs/lib/smb/print.c projects/ifnet/contrib/smbfs/lib/smb/rq.c projects/ifnet/contrib/xz/ChangeLog projects/ifnet/contrib/xz/THANKS projects/ifnet/contrib/xz/src/common/tuklib_cpucores.c projects/ifnet/contrib/xz/src/common/tuklib_integer.h projects/ifnet/contrib/xz/src/liblzma/api/lzma/version.h projects/ifnet/contrib/xz/src/liblzma/common/memcmplen.h projects/ifnet/contrib/xz/src/liblzma/lz/lz_encoder.c projects/ifnet/contrib/xz/src/liblzma/lzma/lzma_encoder_optimum_fast.c projects/ifnet/contrib/xz/src/xz/file_io.c projects/ifnet/etc/login.conf projects/ifnet/etc/mtree/BSD.include.dist projects/ifnet/etc/mtree/BSD.usr.dist projects/ifnet/etc/rc.d/hostid_save projects/ifnet/include/Makefile projects/ifnet/include/iconv.h projects/ifnet/lib/libarchive/Makefile projects/ifnet/lib/libbluetooth/bluetooth.c projects/ifnet/lib/libbluetooth/dev.c projects/ifnet/lib/libbluetooth/hci.c projects/ifnet/lib/libc/Makefile projects/ifnet/lib/libc/aarch64/Makefile.inc projects/ifnet/lib/libc/gen/tls.c projects/ifnet/lib/libc/iconv/__iconv.c projects/ifnet/lib/libc/iconv/bsd_iconv.c projects/ifnet/lib/libc/iconv/citrus_iconv.h projects/ifnet/lib/libc/iconv/citrus_iconv_local.h projects/ifnet/lib/libc/iconv/citrus_none.c projects/ifnet/lib/libc/iconv/citrus_stdenc.h projects/ifnet/lib/libc/iconv/citrus_stdenc_local.h projects/ifnet/lib/libc/iconv/citrus_stdenc_template.h projects/ifnet/lib/libc/iconv/iconv-internal.h projects/ifnet/lib/libc/iconv/iconv.3 projects/ifnet/lib/libc/iconv/iconv.c projects/ifnet/lib/libc/iconv/iconv_compat.c projects/ifnet/lib/libc/locale/cXXrtomb_iconv.h projects/ifnet/lib/libc/locale/mbrtocXX_iconv.h projects/ifnet/lib/libc/powerpc/gen/_setjmp.S projects/ifnet/lib/libc/powerpc/gen/setjmp.S projects/ifnet/lib/libc/powerpc/gen/sigsetjmp.S projects/ifnet/lib/libc/sys/mount.2 projects/ifnet/lib/libc/xdr/xdr_float.c projects/ifnet/lib/libcompiler_rt/Makefile projects/ifnet/lib/libiconv_modules/BIG5/citrus_big5.c projects/ifnet/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c projects/ifnet/lib/libiconv_modules/EUC/citrus_euc.c projects/ifnet/lib/libiconv_modules/EUCTW/citrus_euctw.c projects/ifnet/lib/libiconv_modules/GBK2K/citrus_gbk2k.c projects/ifnet/lib/libiconv_modules/HZ/citrus_hz.c projects/ifnet/lib/libiconv_modules/ISO2022/citrus_iso2022.c projects/ifnet/lib/libiconv_modules/JOHAB/citrus_johab.c projects/ifnet/lib/libiconv_modules/MSKanji/citrus_mskanji.c projects/ifnet/lib/libiconv_modules/UES/citrus_ues.c projects/ifnet/lib/libiconv_modules/UTF1632/citrus_utf1632.c projects/ifnet/lib/libiconv_modules/UTF7/citrus_utf7.c projects/ifnet/lib/libiconv_modules/UTF8/citrus_utf8.c projects/ifnet/lib/libiconv_modules/VIQR/citrus_viqr.c projects/ifnet/lib/libiconv_modules/ZW/citrus_zw.c projects/ifnet/lib/libiconv_modules/iconv_none/citrus_iconv_none.c projects/ifnet/lib/libiconv_modules/iconv_std/citrus_iconv_std.c projects/ifnet/lib/libkiconv/xlat16_iconv.c projects/ifnet/lib/liblzma/Symbol.map projects/ifnet/lib/liblzma/config.h projects/ifnet/lib/libmt/Makefile projects/ifnet/lib/libsdp/search.c projects/ifnet/lib/libsdp/service.c projects/ifnet/lib/libsdp/session.c projects/ifnet/lib/libsdp/util.c projects/ifnet/lib/libstand/Makefile projects/ifnet/lib/libvmmapi/Makefile projects/ifnet/libexec/rtld-elf/aarch64/reloc.c projects/ifnet/libexec/rtld-elf/rtld.c projects/ifnet/libexec/rtld-elf/rtld.h projects/ifnet/sbin/ggate/ggatel/ggatel.8 projects/ifnet/sbin/ifconfig/ifmedia.c projects/ifnet/sbin/newfs_msdos/newfs_msdos.8 projects/ifnet/sbin/pfctl/parse.y projects/ifnet/sbin/pfctl/pfctl.c projects/ifnet/sbin/pfctl/pfctl_altq.c projects/ifnet/sbin/pfctl/pfctl_qstats.c projects/ifnet/share/doc/usd/Makefile projects/ifnet/share/man/man3/queue.3 projects/ifnet/share/man/man4/amdtemp.4 projects/ifnet/share/man/man4/ctl.4 projects/ifnet/share/man/man4/inet.4 projects/ifnet/share/man/man4/tap.4 projects/ifnet/share/mk/bsd.dep.mk projects/ifnet/share/mk/bsd.progs.mk projects/ifnet/share/mk/src.libnames.mk projects/ifnet/share/mk/src.opts.mk projects/ifnet/share/mk/sys.mk projects/ifnet/sys/amd64/include/metadata.h projects/ifnet/sys/amd64/vmm/amd/svm.c projects/ifnet/sys/amd64/vmm/vmm_lapic.c projects/ifnet/sys/arm/allwinner/if_emac.c projects/ifnet/sys/arm/amlogic/aml8726/aml8726_clkmsr.c projects/ifnet/sys/arm/amlogic/aml8726/aml8726_i2c.c projects/ifnet/sys/arm/amlogic/aml8726/aml8726_identsoc.c projects/ifnet/sys/arm/amlogic/aml8726/aml8726_machdep.c projects/ifnet/sys/arm/amlogic/aml8726/aml8726_mmc.c projects/ifnet/sys/arm/amlogic/aml8726/aml8726_soc.h projects/ifnet/sys/arm/amlogic/aml8726/aml8726_timer.c projects/ifnet/sys/arm/amlogic/aml8726/aml8726_wdt.c projects/ifnet/sys/arm/amlogic/aml8726/uart_dev_aml8726.c projects/ifnet/sys/arm/arm/devmap.c projects/ifnet/sys/arm/arm/pmap-v6-new.c projects/ifnet/sys/arm/arm/pmap-v6.c projects/ifnet/sys/arm/arm/pmap.c projects/ifnet/sys/arm/freescale/vybrid/vf_uart.c projects/ifnet/sys/arm/include/pmap-v6.h projects/ifnet/sys/arm/include/pmap.h projects/ifnet/sys/arm/samsung/exynos/exynos_uart.c projects/ifnet/sys/arm/samsung/s3c2xx0/uart_dev_s3c2410.c projects/ifnet/sys/arm64/include/cpufunc.h projects/ifnet/sys/arm64/include/param.h projects/ifnet/sys/arm64/include/pmap.h projects/ifnet/sys/boot/Makefile.arm projects/ifnet/sys/boot/common/Makefile.inc projects/ifnet/sys/boot/efi/Makefile projects/ifnet/sys/boot/efi/boot1/Makefile projects/ifnet/sys/boot/efi/boot1/boot1.c projects/ifnet/sys/boot/efi/boot1/generate-fat.sh projects/ifnet/sys/boot/efi/fdt/Makefile projects/ifnet/sys/boot/efi/libefi/Makefile projects/ifnet/sys/boot/efi/loader/Makefile projects/ifnet/sys/boot/efi/loader/arch/amd64/Makefile.inc projects/ifnet/sys/boot/efi/loader/arch/arm/Makefile.inc projects/ifnet/sys/boot/efi/loader/arch/arm/ldscript.arm projects/ifnet/sys/boot/efi/loader/arch/arm/start.S projects/ifnet/sys/boot/efi/loader/arch/i386/bootinfo.c projects/ifnet/sys/boot/efi/loader/arch/i386/elf32_freebsd.c projects/ifnet/sys/boot/efi/loader/arch/i386/i386_copy.c projects/ifnet/sys/boot/efi/loader/arch/i386/start.S projects/ifnet/sys/boot/efi/loader/bootinfo.c projects/ifnet/sys/boot/efi/loader/copy.c projects/ifnet/sys/boot/fdt/dts/arm/odroidc1.dts projects/ifnet/sys/boot/fdt/dts/arm/vsatv102-m6.dts projects/ifnet/sys/boot/forth/check-password.4th projects/ifnet/sys/boot/forth/check-password.4th.8 projects/ifnet/sys/boot/forth/loader.4th projects/ifnet/sys/boot/forth/loader.conf projects/ifnet/sys/boot/forth/logo-beastie.4th projects/ifnet/sys/boot/forth/logo-orb.4th projects/ifnet/sys/boot/forth/menu.4th projects/ifnet/sys/boot/forth/menu.rc projects/ifnet/sys/boot/forth/version.4th projects/ifnet/sys/cam/cam_xpt.c projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h projects/ifnet/sys/cddl/dev/dtrace/dtrace_ioctl.c projects/ifnet/sys/compat/freebsd32/freebsd32.h projects/ifnet/sys/compat/freebsd32/freebsd32_misc.c projects/ifnet/sys/compat/linprocfs/linprocfs.c projects/ifnet/sys/compat/svr4/svr4_stream.c projects/ifnet/sys/conf/Makefile.pc98 projects/ifnet/sys/conf/files projects/ifnet/sys/conf/files.arm projects/ifnet/sys/conf/kern.pre.mk projects/ifnet/sys/conf/kmod.mk projects/ifnet/sys/conf/newvers.sh projects/ifnet/sys/conf/options.i386 projects/ifnet/sys/contrib/dev/acpica/acpica_prep.sh projects/ifnet/sys/contrib/dev/acpica/changes.txt projects/ifnet/sys/contrib/dev/acpica/common/adfile.c projects/ifnet/sys/contrib/dev/acpica/common/adisasm.c projects/ifnet/sys/contrib/dev/acpica/common/dmtable.c projects/ifnet/sys/contrib/dev/acpica/common/dmtbdump.c projects/ifnet/sys/contrib/dev/acpica/common/dmtbinfo.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslcodegen.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslcompile.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslcompiler.h projects/ifnet/sys/contrib/dev/acpica/compiler/asldefine.h projects/ifnet/sys/contrib/dev/acpica/compiler/aslfold.c projects/ifnet/sys/contrib/dev/acpica/compiler/asllisting.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslmain.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslmap.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslmapenter.c projects/ifnet/sys/contrib/dev/acpica/compiler/asloptions.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslrules.y projects/ifnet/sys/contrib/dev/acpica/compiler/aslstartup.c projects/ifnet/sys/contrib/dev/acpica/compiler/asltree.c projects/ifnet/sys/contrib/dev/acpica/compiler/asltypes.y projects/ifnet/sys/contrib/dev/acpica/compiler/aslutils.c projects/ifnet/sys/contrib/dev/acpica/compiler/aslwalks.c projects/ifnet/sys/contrib/dev/acpica/compiler/dtcompile.c projects/ifnet/sys/contrib/dev/acpica/compiler/dtcompiler.h projects/ifnet/sys/contrib/dev/acpica/compiler/dtio.c projects/ifnet/sys/contrib/dev/acpica/compiler/dttable.c projects/ifnet/sys/contrib/dev/acpica/compiler/dttemplate.h projects/ifnet/sys/contrib/dev/acpica/compiler/dtutils.c projects/ifnet/sys/contrib/dev/acpica/components/debugger/dbmethod.c projects/ifnet/sys/contrib/dev/acpica/components/debugger/dbxface.c projects/ifnet/sys/contrib/dev/acpica/components/disassembler/dmopcode.c projects/ifnet/sys/contrib/dev/acpica/components/disassembler/dmwalk.c projects/ifnet/sys/contrib/dev/acpica/components/dispatcher/dsopcode.c projects/ifnet/sys/contrib/dev/acpica/components/dispatcher/dsutils.c projects/ifnet/sys/contrib/dev/acpica/components/events/evregion.c projects/ifnet/sys/contrib/dev/acpica/components/events/evxfevnt.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exdump.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exfldio.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exoparg3.c projects/ifnet/sys/contrib/dev/acpica/components/executer/exregion.c projects/ifnet/sys/contrib/dev/acpica/components/hardware/hwgpe.c projects/ifnet/sys/contrib/dev/acpica/components/hardware/hwvalid.c projects/ifnet/sys/contrib/dev/acpica/components/namespace/nsdump.c projects/ifnet/sys/contrib/dev/acpica/components/parser/psopcode.c projects/ifnet/sys/contrib/dev/acpica/components/parser/psopinfo.c projects/ifnet/sys/contrib/dev/acpica/components/resources/rsaddr.c projects/ifnet/sys/contrib/dev/acpica/components/resources/rsdump.c projects/ifnet/sys/contrib/dev/acpica/components/resources/rsdumpinfo.c projects/ifnet/sys/contrib/dev/acpica/components/resources/rsxface.c projects/ifnet/sys/contrib/dev/acpica/components/tables/tbdata.c projects/ifnet/sys/contrib/dev/acpica/components/tables/tbinstal.c projects/ifnet/sys/contrib/dev/acpica/components/tables/tbprint.c projects/ifnet/sys/contrib/dev/acpica/components/tables/tbxfroot.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utaddress.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utbuffer.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utglobal.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utmisc.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utosi.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utprint.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utstate.c projects/ifnet/sys/contrib/dev/acpica/components/utilities/utuuid.c projects/ifnet/sys/contrib/dev/acpica/include/acdebug.h projects/ifnet/sys/contrib/dev/acpica/include/acdisasm.h projects/ifnet/sys/contrib/dev/acpica/include/acglobal.h projects/ifnet/sys/contrib/dev/acpica/include/aclocal.h projects/ifnet/sys/contrib/dev/acpica/include/acmacros.h projects/ifnet/sys/contrib/dev/acpica/include/acopcode.h projects/ifnet/sys/contrib/dev/acpica/include/acpixf.h projects/ifnet/sys/contrib/dev/acpica/include/acresrc.h projects/ifnet/sys/contrib/dev/acpica/include/acrestyp.h projects/ifnet/sys/contrib/dev/acpica/include/acstruct.h projects/ifnet/sys/contrib/dev/acpica/include/actables.h projects/ifnet/sys/contrib/dev/acpica/include/actbl2.h projects/ifnet/sys/contrib/dev/acpica/include/actypes.h projects/ifnet/sys/contrib/dev/acpica/include/acutils.h projects/ifnet/sys/contrib/dev/acpica/include/amlcode.h projects/ifnet/sys/contrib/dev/acpica/include/platform/acenv.h projects/ifnet/sys/contrib/x86emu/x86emu.c projects/ifnet/sys/crypto/aesni/aesencdec.h projects/ifnet/sys/crypto/aesni/aesni_ghash.c projects/ifnet/sys/dev/acpica/acpi_pcib_acpi.c projects/ifnet/sys/dev/acpica/acpi_resource.c projects/ifnet/sys/dev/acpica/acpivar.h projects/ifnet/sys/dev/atkbdc/psm.c projects/ifnet/sys/dev/fdt/fdt_pinctrl.c projects/ifnet/sys/dev/hptnr/README projects/ifnet/sys/dev/hptnr/amd64-elf.hptnr_lib.o.uu projects/ifnet/sys/dev/hptnr/him.h projects/ifnet/sys/dev/hptnr/hptintf.h projects/ifnet/sys/dev/hptnr/hptnr_config.c projects/ifnet/sys/dev/hptnr/hptnr_config.h projects/ifnet/sys/dev/hptnr/hptnr_osm_bsd.c projects/ifnet/sys/dev/hptnr/i386-elf.hptnr_lib.o.uu projects/ifnet/sys/dev/hptnr/ldm.h projects/ifnet/sys/dev/hptnr/os_bsd.h projects/ifnet/sys/dev/iwn/if_iwn.c projects/ifnet/sys/dev/netmap/netmap.c projects/ifnet/sys/dev/nvme/nvme.c projects/ifnet/sys/dev/nvme/nvme_ctrlr.c projects/ifnet/sys/dev/nvme/nvme_ns.c projects/ifnet/sys/dev/nvme/nvme_private.h projects/ifnet/sys/dev/nvme/nvme_qpair.c projects/ifnet/sys/dev/re/if_re.c projects/ifnet/sys/dev/sound/pci/hda/hdaa_patches.c projects/ifnet/sys/dev/sound/pci/hda/hdac.c projects/ifnet/sys/dev/sound/pci/hda/hdac.h projects/ifnet/sys/dev/sound/pci/hda/hdacc.c projects/ifnet/sys/dev/streams/streams.c projects/ifnet/sys/dev/uart/uart_bus.h projects/ifnet/sys/dev/uart/uart_bus_fdt.c projects/ifnet/sys/dev/uart/uart_core.c projects/ifnet/sys/dev/uart/uart_cpu.h projects/ifnet/sys/dev/uart/uart_cpu_fdt.c projects/ifnet/sys/dev/uart/uart_dev_imx.c projects/ifnet/sys/dev/uart/uart_dev_lpc.c projects/ifnet/sys/dev/uart/uart_dev_msm.c projects/ifnet/sys/dev/uart/uart_dev_ns8250.c projects/ifnet/sys/dev/uart/uart_dev_pl011.c projects/ifnet/sys/dev/uart/uart_dev_quicc.c projects/ifnet/sys/dev/uart/uart_dev_sab82532.c projects/ifnet/sys/dev/uart/uart_dev_ti8250.c projects/ifnet/sys/dev/uart/uart_dev_z8530.c projects/ifnet/sys/dev/usb/controller/ehci_pci.c projects/ifnet/sys/dev/usb/controller/uhci_pci.c projects/ifnet/sys/dev/usb/controller/xhci_pci.c projects/ifnet/sys/dev/usb/serial/uftdi.c projects/ifnet/sys/dev/usb/wlan/if_urtwn.c projects/ifnet/sys/dev/vt/vt_font.c projects/ifnet/sys/dev/wpi/if_wpi.c projects/ifnet/sys/fs/ext2fs/ext2_vfsops.c projects/ifnet/sys/fs/fuse/fuse_vfsops.c projects/ifnet/sys/fs/msdosfs/msdosfs_vfsops.c projects/ifnet/sys/fs/nandfs/nandfs_vfsops.c projects/ifnet/sys/fs/nfs/nfs.h projects/ifnet/sys/fs/nfs/nfs_commonport.c projects/ifnet/sys/fs/nfs/nfsproto.h projects/ifnet/sys/fs/nfsclient/nfs_clvfsops.c projects/ifnet/sys/fs/nfsserver/nfs_nfsdport.c projects/ifnet/sys/fs/nfsserver/nfs_nfsdserv.c projects/ifnet/sys/fs/nullfs/null_vfsops.c projects/ifnet/sys/fs/tmpfs/tmpfs_vnops.c projects/ifnet/sys/geom/geom_dev.c projects/ifnet/sys/geom/multipath/g_multipath.c projects/ifnet/sys/gnu/dts/arm/meson.dtsi projects/ifnet/sys/gnu/dts/arm/meson6.dtsi projects/ifnet/sys/gnu/dts/arm/meson8.dtsi projects/ifnet/sys/i386/i386/bios.c projects/ifnet/sys/i386/i386/initcpu.c projects/ifnet/sys/i386/i386/locore.s projects/ifnet/sys/i386/i386/machdep.c projects/ifnet/sys/i386/i386/minidump_machdep.c projects/ifnet/sys/i386/i386/mpboot.s projects/ifnet/sys/i386/i386/pmap.c projects/ifnet/sys/i386/i386/swtch.s projects/ifnet/sys/i386/i386/trap.c projects/ifnet/sys/i386/i386/vm86bios.s projects/ifnet/sys/i386/i386/vm_machdep.c projects/ifnet/sys/i386/include/param.h projects/ifnet/sys/i386/include/pmap.h projects/ifnet/sys/i386/include/vmparam.h projects/ifnet/sys/kern/imgact_elf.c projects/ifnet/sys/kern/init_main.c projects/ifnet/sys/kern/kern_descrip.c projects/ifnet/sys/kern/kern_exec.c projects/ifnet/sys/kern/kern_fork.c projects/ifnet/sys/kern/kern_resource.c projects/ifnet/sys/kern/kern_timeout.c projects/ifnet/sys/kern/subr_bus.c projects/ifnet/sys/kern/sys_pipe.c projects/ifnet/sys/kern/tty_pts.c projects/ifnet/sys/kern/uipc_mqueue.c projects/ifnet/sys/kern/uipc_sem.c projects/ifnet/sys/kern/uipc_shm.c projects/ifnet/sys/kern/uipc_syscalls.c projects/ifnet/sys/kern/vfs_subr.c projects/ifnet/sys/kern/vfs_syscalls.c projects/ifnet/sys/mips/adm5120/uart_dev_adm5120.c projects/ifnet/sys/mips/atheros/uart_dev_ar933x.c projects/ifnet/sys/mips/cavium/uart_dev_oct16550.c projects/ifnet/sys/mips/conf/CARAMBOLA2.hints projects/ifnet/sys/mips/include/reg.h projects/ifnet/sys/mips/rt305x/uart_dev_rt305x.c projects/ifnet/sys/net/ieee8023ad_lacp.c projects/ifnet/sys/net/if.c projects/ifnet/sys/net/if_media.c projects/ifnet/sys/net/if_media.h projects/ifnet/sys/net/if_tap.c projects/ifnet/sys/net/if_types.h projects/ifnet/sys/net/if_var.h projects/ifnet/sys/net/pfvar.h projects/ifnet/sys/net/route.c projects/ifnet/sys/net80211/ieee80211_mesh.c projects/ifnet/sys/netgraph/bluetooth/hci/ng_hci_cmds.c projects/ifnet/sys/netgraph/bluetooth/hci/ng_hci_evnt.c projects/ifnet/sys/netgraph/bluetooth/hci/ng_hci_main.c projects/ifnet/sys/netgraph/bluetooth/hci/ng_hci_misc.c projects/ifnet/sys/netgraph/bluetooth/hci/ng_hci_misc.h projects/ifnet/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c projects/ifnet/sys/netgraph/bluetooth/hci/ng_hci_var.h projects/ifnet/sys/netgraph/bluetooth/include/ng_btsocket.h projects/ifnet/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h projects/ifnet/sys/netgraph/bluetooth/include/ng_hci.h projects/ifnet/sys/netgraph/bluetooth/include/ng_l2cap.h projects/ifnet/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c projects/ifnet/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h projects/ifnet/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c projects/ifnet/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c projects/ifnet/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h projects/ifnet/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c projects/ifnet/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h projects/ifnet/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c projects/ifnet/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h projects/ifnet/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c projects/ifnet/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c projects/ifnet/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c projects/ifnet/sys/netinet/igmp.c projects/ifnet/sys/netinet/in_var.h projects/ifnet/sys/netinet/ip_input.c projects/ifnet/sys/netinet/sctp_syscalls.c projects/ifnet/sys/netinet/tcp_subr.c projects/ifnet/sys/netinet/tcp_timer.c projects/ifnet/sys/netinet/tcp_timer.h projects/ifnet/sys/netinet/tcp_var.h projects/ifnet/sys/netinet6/in6_mcast.c projects/ifnet/sys/netinet6/ip6_forward.c projects/ifnet/sys/netinet6/nd6.c projects/ifnet/sys/netinet6/nd6_nbr.c projects/ifnet/sys/netinet6/nd6_rtr.c projects/ifnet/sys/netpfil/pf/pf.c projects/ifnet/sys/netpfil/pf/pf_ioctl.c projects/ifnet/sys/netpfil/pf/pf_norm.c projects/ifnet/sys/ofed/include/linux/file.h projects/ifnet/sys/opencrypto/gmac.h projects/ifnet/sys/powerpc/booke/locore.S projects/ifnet/sys/powerpc/include/reg.h projects/ifnet/sys/powerpc/powerpc/trap.c projects/ifnet/sys/rpc/svc_generic.c projects/ifnet/sys/rpc/svc_vc.c projects/ifnet/sys/sparc64/include/reg.h projects/ifnet/sys/sparc64/pci/sbbc.c projects/ifnet/sys/sys/buf.h projects/ifnet/sys/sys/cdefs.h projects/ifnet/sys/sys/elf_common.h projects/ifnet/sys/sys/filedesc.h projects/ifnet/sys/sys/imgact.h projects/ifnet/sys/sys/kerneldump.h projects/ifnet/sys/sys/malloc.h projects/ifnet/sys/sys/module.h projects/ifnet/sys/sys/mount.h projects/ifnet/sys/sys/mouse.h projects/ifnet/sys/sys/param.h projects/ifnet/sys/sys/procfs.h projects/ifnet/sys/sys/socketvar.h projects/ifnet/sys/sys/sockio.h projects/ifnet/sys/sys/syscallsubr.h projects/ifnet/sys/ufs/ffs/ffs_vfsops.c projects/ifnet/sys/vm/swap_pager.c projects/ifnet/sys/vm/uma_core.c projects/ifnet/sys/vm/uma_int.h projects/ifnet/sys/vm/vm_reserv.c projects/ifnet/sys/x86/acpica/OsdEnvironment.c projects/ifnet/sys/x86/acpica/acpi_wakeup.c projects/ifnet/sys/x86/include/reg.h projects/ifnet/sys/x86/iommu/busdma_dmar.c projects/ifnet/sys/x86/iommu/intel_dmar.h projects/ifnet/sys/x86/iommu/intel_gas.c projects/ifnet/tools/build/check-links.sh projects/ifnet/tools/regression/sockets/accept_fd_leak/Makefile projects/ifnet/tools/regression/sockets/accept_fd_leak/accept_fd_leak.c projects/ifnet/tools/regression/sockets/accf_data_attach/Makefile projects/ifnet/tools/regression/sockets/accf_data_attach/accf_data_attach.c projects/ifnet/tools/regression/sockets/fstat/Makefile projects/ifnet/tools/regression/sockets/fstat/fstat.c projects/ifnet/tools/regression/sockets/kqueue/Makefile projects/ifnet/tools/regression/sockets/kqueue/kqueue.c projects/ifnet/tools/regression/sockets/listen_backlog/Makefile projects/ifnet/tools/regression/sockets/listen_backlog/listen_backlog.c projects/ifnet/tools/regression/sockets/listenclose/Makefile projects/ifnet/tools/regression/sockets/listenclose/listenclose.c projects/ifnet/tools/regression/sockets/pr_atomic/Makefile projects/ifnet/tools/regression/sockets/pr_atomic/pr_atomic.c projects/ifnet/tools/regression/sockets/reconnect/Makefile projects/ifnet/tools/regression/sockets/reconnect/reconnect.c projects/ifnet/tools/regression/sockets/rtsocket/Makefile projects/ifnet/tools/regression/sockets/rtsocket/rtsocket.c projects/ifnet/tools/regression/sockets/sblock/Makefile projects/ifnet/tools/regression/sockets/sblock/sblock.c projects/ifnet/tools/regression/sockets/sendfile/sendfile.c projects/ifnet/tools/regression/sockets/shutdown/Makefile projects/ifnet/tools/regression/sockets/shutdown/shutdown.c projects/ifnet/tools/regression/sockets/sigpipe/Makefile projects/ifnet/tools/regression/sockets/sigpipe/sigpipe.c projects/ifnet/tools/regression/sockets/so_setfib/Makefile projects/ifnet/tools/regression/sockets/so_setfib/so_setfib.c projects/ifnet/tools/regression/sockets/socketpair/Makefile projects/ifnet/tools/regression/sockets/socketpair/socketpair.c projects/ifnet/tools/regression/sockets/unix_bindconnect/Makefile projects/ifnet/tools/regression/sockets/unix_bindconnect/unix_bindconnect.c projects/ifnet/tools/regression/sockets/unix_close_race/Makefile projects/ifnet/tools/regression/sockets/unix_close_race/unix_close_race.c projects/ifnet/tools/regression/sockets/unix_passfd/Makefile projects/ifnet/tools/regression/sockets/unix_passfd/unix_passfd.c projects/ifnet/tools/regression/sockets/unix_sendtorace/Makefile projects/ifnet/tools/regression/sockets/unix_sendtorace/unix_sendtorace.c projects/ifnet/tools/regression/sockets/unix_socket/Makefile projects/ifnet/tools/regression/sockets/unix_socket/unix_socket.c projects/ifnet/tools/regression/sockets/unix_sorflush/Makefile projects/ifnet/tools/regression/sockets/unix_sorflush/unix_sorflush.c projects/ifnet/tools/regression/sockets/zerosend/zerosend.c projects/ifnet/usr.bin/Makefile projects/ifnet/usr.bin/ar/read.c projects/ifnet/usr.bin/bluetooth/bthost/bthost.c projects/ifnet/usr.bin/bluetooth/btsockstat/btsockstat.c projects/ifnet/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c projects/ifnet/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c projects/ifnet/usr.bin/gcore/elf32core.c projects/ifnet/usr.bin/gzip/gzip.1 projects/ifnet/usr.bin/gzip/gzip.c projects/ifnet/usr.bin/iconv/iconv.c projects/ifnet/usr.bin/ipcs/Makefile projects/ifnet/usr.bin/ipcs/ipc.c projects/ifnet/usr.bin/ipcs/ipc.h projects/ifnet/usr.bin/ipcs/ipcs.c projects/ifnet/usr.bin/iscsictl/Makefile projects/ifnet/usr.bin/iscsictl/iscsictl.c projects/ifnet/usr.bin/iscsictl/parse.y projects/ifnet/usr.bin/iscsictl/periphs.c projects/ifnet/usr.bin/jot/jot.1 projects/ifnet/usr.bin/lam/lam.1 projects/ifnet/usr.bin/lockf/lockf.c projects/ifnet/usr.bin/mt/Makefile projects/ifnet/usr.bin/mt/mt.c projects/ifnet/usr.bin/patch/inp.c projects/ifnet/usr.bin/rs/rs.1 projects/ifnet/usr.bin/smbutil/Makefile projects/ifnet/usr.bin/sockstat/sockstat.1 projects/ifnet/usr.bin/vi/Makefile projects/ifnet/usr.bin/w/Makefile projects/ifnet/usr.bin/w/w.c projects/ifnet/usr.bin/wc/wc.c projects/ifnet/usr.sbin/acpi/acpidump/acpi.c projects/ifnet/usr.sbin/authpf/Makefile projects/ifnet/usr.sbin/bhyve/Makefile projects/ifnet/usr.sbin/bhyve/bhyverun.c projects/ifnet/usr.sbin/bhyvectl/Makefile projects/ifnet/usr.sbin/bhyvectl/bhyvectl.c projects/ifnet/usr.sbin/bhyveload/Makefile projects/ifnet/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.c projects/ifnet/usr.sbin/bluetooth/bthidcontrol/hid.c projects/ifnet/usr.sbin/bluetooth/bthidcontrol/sdp.c projects/ifnet/usr.sbin/bluetooth/bthidd/bthidd.c projects/ifnet/usr.sbin/bluetooth/bthidd/client.c projects/ifnet/usr.sbin/bluetooth/bthidd/hid.c projects/ifnet/usr.sbin/bluetooth/bthidd/kbd.c projects/ifnet/usr.sbin/bluetooth/bthidd/lexer.l projects/ifnet/usr.sbin/bluetooth/bthidd/parser.y projects/ifnet/usr.sbin/bluetooth/bthidd/server.c projects/ifnet/usr.sbin/bluetooth/bthidd/session.c projects/ifnet/usr.sbin/bluetooth/btpand/bnep.c projects/ifnet/usr.sbin/bluetooth/btpand/btpand.c projects/ifnet/usr.sbin/bluetooth/btpand/channel.c projects/ifnet/usr.sbin/bluetooth/btpand/client.c projects/ifnet/usr.sbin/bluetooth/btpand/event.c projects/ifnet/usr.sbin/bluetooth/btpand/packet.c projects/ifnet/usr.sbin/bluetooth/btpand/sdp.c projects/ifnet/usr.sbin/bluetooth/btpand/server.c projects/ifnet/usr.sbin/bluetooth/btpand/tap.c projects/ifnet/usr.sbin/bluetooth/hccontrol/hccontrol.c projects/ifnet/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c projects/ifnet/usr.sbin/bluetooth/hccontrol/info.c projects/ifnet/usr.sbin/bluetooth/hccontrol/link_control.c projects/ifnet/usr.sbin/bluetooth/hccontrol/link_policy.c projects/ifnet/usr.sbin/bluetooth/hccontrol/node.c projects/ifnet/usr.sbin/bluetooth/hccontrol/util.c projects/ifnet/usr.sbin/bluetooth/hcsecd/hcsecd.c projects/ifnet/usr.sbin/bluetooth/hcsecd/parser.y projects/ifnet/usr.sbin/bluetooth/l2control/l2cap.c projects/ifnet/usr.sbin/bluetooth/l2control/l2control.c projects/ifnet/usr.sbin/bluetooth/l2ping/l2ping.c projects/ifnet/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c projects/ifnet/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.c projects/ifnet/usr.sbin/bluetooth/sdpcontrol/search.c projects/ifnet/usr.sbin/bluetooth/sdpd/bgd.c projects/ifnet/usr.sbin/bluetooth/sdpd/dun.c projects/ifnet/usr.sbin/bluetooth/sdpd/ftrn.c projects/ifnet/usr.sbin/bluetooth/sdpd/gn.c projects/ifnet/usr.sbin/bluetooth/sdpd/irmc.c projects/ifnet/usr.sbin/bluetooth/sdpd/irmc_command.c projects/ifnet/usr.sbin/bluetooth/sdpd/lan.c projects/ifnet/usr.sbin/bluetooth/sdpd/main.c projects/ifnet/usr.sbin/bluetooth/sdpd/nap.c projects/ifnet/usr.sbin/bluetooth/sdpd/opush.c projects/ifnet/usr.sbin/bluetooth/sdpd/panu.c projects/ifnet/usr.sbin/bluetooth/sdpd/profile.c projects/ifnet/usr.sbin/bluetooth/sdpd/provider.c projects/ifnet/usr.sbin/bluetooth/sdpd/sar.c projects/ifnet/usr.sbin/bluetooth/sdpd/scr.c projects/ifnet/usr.sbin/bluetooth/sdpd/sd.c projects/ifnet/usr.sbin/bluetooth/sdpd/server.c projects/ifnet/usr.sbin/bluetooth/sdpd/sp.c projects/ifnet/usr.sbin/bluetooth/sdpd/srr.c projects/ifnet/usr.sbin/bluetooth/sdpd/ssar.c projects/ifnet/usr.sbin/bluetooth/sdpd/ssr.c projects/ifnet/usr.sbin/bluetooth/sdpd/sur.c projects/ifnet/usr.sbin/bluetooth/sdpd/uuid.c projects/ifnet/usr.sbin/bsdinstall/scripts/zfsboot projects/ifnet/usr.sbin/bsnmpd/tools/bsnmptools/Makefile projects/ifnet/usr.sbin/crashinfo/crashinfo.sh projects/ifnet/usr.sbin/ctld/discovery.c projects/ifnet/usr.sbin/ctld/isns.c projects/ifnet/usr.sbin/ctld/keys.c projects/ifnet/usr.sbin/ctld/login.c projects/ifnet/usr.sbin/ctld/parse.y projects/ifnet/usr.sbin/ctld/pdu.c projects/ifnet/usr.sbin/ctld/token.l projects/ifnet/usr.sbin/fifolog/fifolog_reader/Makefile projects/ifnet/usr.sbin/fifolog/fifolog_writer/Makefile projects/ifnet/usr.sbin/freebsd-update/freebsd-update.sh projects/ifnet/usr.sbin/nfsd/nfsd.c projects/ifnet/usr.sbin/rpc.lockd/Makefile projects/ifnet/usr.sbin/rtsold/Makefile projects/ifnet/usr.sbin/vidcontrol/vidcontrol.c Directory Properties: projects/ifnet/ (props changed) projects/ifnet/cddl/ (props changed) projects/ifnet/cddl/contrib/opensolaris/ (props changed) projects/ifnet/contrib/compiler-rt/ (props changed) projects/ifnet/contrib/nvi/ (props changed) projects/ifnet/contrib/xz/ (props changed) projects/ifnet/etc/ (props changed) projects/ifnet/include/ (props changed) projects/ifnet/lib/libc/ (props changed) projects/ifnet/lib/libvmmapi/ (props changed) projects/ifnet/sbin/ (props changed) projects/ifnet/share/ (props changed) projects/ifnet/share/man/man4/ (props changed) projects/ifnet/sys/ (props changed) projects/ifnet/sys/amd64/vmm/ (props changed) projects/ifnet/sys/boot/ (props changed) projects/ifnet/sys/cddl/contrib/opensolaris/ (props changed) projects/ifnet/sys/conf/ (props changed) projects/ifnet/sys/contrib/dev/acpica/ (props changed) projects/ifnet/sys/contrib/x86emu/ (props changed) projects/ifnet/sys/gnu/dts/ (props changed) projects/ifnet/sys/gnu/dts/arm/ (props changed) projects/ifnet/usr.sbin/bhyve/ (props changed) projects/ifnet/usr.sbin/bhyvectl/ (props changed) projects/ifnet/usr.sbin/bhyveload/ (props changed) projects/ifnet/usr.sbin/rtsold/ (props changed) Modified: projects/ifnet/Makefile ============================================================================== --- projects/ifnet/Makefile Fri Apr 17 03:56:50 2015 (r281639) +++ projects/ifnet/Makefile Fri Apr 17 05:55:07 2015 (r281640) @@ -374,6 +374,17 @@ kernel-toolchains: # .if make(universe) || make(universe_kernels) || make(tinderbox) || make(targets) TARGETS?=amd64 arm i386 mips pc98 powerpc sparc64 +# XXX Add arm64 to universe only if we have an external binutils installed. +# It does not build with the in-tree linnker. +.if exists(/usr/local/aarch64-freebsd/bin/ld) +TARGETS+=arm64 +TARGET_ARCHES_arm64?= aarch64 +.else +universe: universe_arm64_skip +universe_epilogue: universe_arm64_skip +universe_arm64_skip: universe_prologue + @echo ">> arm64 skipped - install aarch64-binutils port or package to build" +.endif TARGET_ARCHES_arm?= arm armeb armv6 armv6hf TARGET_ARCHES_mips?= mipsel mips mips64el mips64 mipsn32 TARGET_ARCHES_powerpc?= powerpc powerpc64 Modified: projects/ifnet/Makefile.inc1 ============================================================================== --- projects/ifnet/Makefile.inc1 Fri Apr 17 03:56:50 2015 (r281639) +++ projects/ifnet/Makefile.inc1 Fri Apr 17 05:55:07 2015 (r281640) @@ -1304,12 +1304,10 @@ _lex= usr.bin/lex _awk= usr.bin/awk .endif -.if ${BOOTSTRAPPING} < 1001506 _yacc= lib/liby \ usr.bin/yacc ${_bt}-usr.bin/yacc: ${_bt}-lib/liby -.endif .if ${MK_BSNMP} != "no" _gensnmptree= usr.sbin/bsnmpd/gensnmptree @@ -1359,8 +1357,13 @@ _kerberos5_bootstrap_tools= \ kerberos5/tools/slc \ usr.bin/compile_et -${_bt}-kerberos5/tools/slc: ${_bt}-kerberos5/lib/libroken -${_bt}-kerberos5/tools/asn1_compile: ${_bt}-kerberos5/lib/libroken +${_bt}-kerberos5/lib/libroken: ${_bt}-kerberos5/tools/make-roken +${_bt}-kerberos5/tools/asn1_compile: \ + ${_bt}-kerberos5/lib/libroken ${_bt}-kerberos5/lib/libvers +${_bt}-kerberos5/tools/slc: \ + ${_bt}-kerberos5/lib/libroken ${_bt}-kerberos5/lib/libvers +${_bt}-usr.bin/compile_et: \ + ${_bt}-kerberos5/lib/libroken ${_bt}-kerberos5/lib/libvers .endif bootstrap-tools: .PHONY Modified: projects/ifnet/ObsoleteFiles.inc ============================================================================== --- projects/ifnet/ObsoleteFiles.inc Fri Apr 17 03:56:50 2015 (r281639) +++ projects/ifnet/ObsoleteFiles.inc Fri Apr 17 05:55:07 2015 (r281640) @@ -38,6 +38,33 @@ # xargs -n1 | sort | uniq -d; # done +# 20150416: ALTQ moved to net/altq +OLD_FILES+=usr/include/altq/altq_rmclass_debug.h +OLD_FILES+=usr/include/altq/altq.h +OLD_FILES+=usr/include/altq/altq_cdnr.h +OLD_FILES+=usr/include/altq/altq_hfsc.h +OLD_FILES+=usr/include/altq/altq_priq.h +OLD_FILES+=usr/include/altq/altqconf.h +OLD_FILES+=usr/include/altq/altq_classq.h +OLD_FILES+=usr/include/altq/altq_red.h +OLD_FILES+=usr/include/altq/if_altq.h +OLD_FILES+=usr/include/altq/altq_var.h +OLD_FILES+=usr/include/altq/altq_rmclass.h +OLD_FILES+=usr/include/altq/altq_cbq.h +OLD_FILES+=usr/include/altq/altq_rio.h +OLD_DIRS+=usr/include/altq +# 20150410 +OLD_FILES+=usr/share/doc/usd/10.exref/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/10.exref/summary.ascii.gz +OLD_DIRS+=usr/share/doc/usd/10.exref +OLD_FILES+=usr/share/doc/usd/11.edit/paper.ascii.gz +OLD_DIRS+=usr/share/doc/usd/11.edit +OLD_FILES+=usr/share/doc/usd/12.vi/paper.ascii.gz +OLD_FILES+=usr/share/doc/usd/12.vi/summary.ascii.gz +OLD_FILES+=usr/share/doc/usd/12.vi/viapwh.ascii.gz +OLD_DIRS+=usr/share/doc/usd/12.vi +OLD_FILES+=usr/share/doc/usd/13.viref/paper.ascii.gz +OLD_DIRS+=usr/share/doc/usd/13.viref # 20150329 .if ${TARGET_ARCH} == "arm" OLD_FILES+=usr/include/bootconfig.h Modified: projects/ifnet/README ============================================================================== --- projects/ifnet/README Fri Apr 17 03:56:50 2015 (r281639) +++ projects/ifnet/README Fri Apr 17 05:55:07 2015 (r281640) @@ -34,9 +34,7 @@ The sample kernel configuration files re sub-directory (assuming that you've installed the kernel sources), the file named GENERIC being the one used to build your initial installation kernel. The file NOTES contains entries and documentation for all possible -devices, not just those commonly used. It is the successor of the ancient -LINT file, but in contrast to LINT, it is not buildable as a kernel but a -pure reference and documentation file. +devices, not just those commonly used. Source Roadmap: @@ -77,6 +75,9 @@ share Shared resources. sys Kernel sources. +tests Regression tests which can be run by Kyua. See tests/README + for additional information. + tools Utilities for regression testing and miscellaneous tasks. usr.bin User commands. Modified: projects/ifnet/UPDATING ============================================================================== --- projects/ifnet/UPDATING Fri Apr 17 03:56:50 2015 (r281639) +++ projects/ifnet/UPDATING Fri Apr 17 05:55:07 2015 (r281640) @@ -31,6 +31,15 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20150415: + The const qualifier has been removed from iconv(3) to comply with + POSIX. The ports tree is aware of this from r384038 onwards. + +20150416: + Libraries specified by LIBADD in Makefiles must have a corresponding + DPADD_ variable to ensure correct dependencies. This is now + enforced in src.libnames.mk. + 20150324: From legacy ata(4) driver was removed support for SATA controllers supported by more functional drivers ahci(4), siis(4) and mvs(4). Modified: projects/ifnet/bin/csh/config.h ============================================================================== --- projects/ifnet/bin/csh/config.h Fri Apr 17 03:56:50 2015 (r281639) +++ projects/ifnet/bin/csh/config.h Fri Apr 17 05:55:07 2015 (r281640) @@ -198,7 +198,7 @@ #define HAVE_WCWIDTH 1 /* Define as const if the declaration of iconv() needs const. */ -#define ICONV_CONST const +#define ICONV_CONST /* Support NLS. */ #define NLS 1 Modified: projects/ifnet/bin/csh/iconv_stub.h ============================================================================== --- projects/ifnet/bin/csh/iconv_stub.h Fri Apr 17 03:56:50 2015 (r281639) +++ projects/ifnet/bin/csh/iconv_stub.h Fri Apr 17 05:55:07 2015 (r281640) @@ -30,7 +30,7 @@ #define _ICONV_H_ typedef void *iconv_t; -typedef size_t dl_iconv_t(iconv_t, const char **, size_t *, char **, size_t *); +typedef size_t dl_iconv_t(iconv_t, char **, size_t *, char **, size_t *); typedef int dl_iconv_close_t(iconv_t); extern iconv_t dl_iconv_open(const char *, const char *); Modified: projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c ============================================================================== --- projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c Fri Apr 17 03:56:50 2015 (r281639) +++ projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c Fri Apr 17 05:55:07 2015 (r281640) @@ -147,6 +147,9 @@ dtrace_dof_init(void) dh.dofhp_dof = (uintptr_t)dof; dh.dofhp_addr = elf->e_type == ET_DYN ? (uintptr_t) lmp->l_addr : 0; +#ifdef __FreeBSD__ + dh.dofhp_pid = getpid(); +#endif if (lmid == 0) { (void) snprintf(dh.dofhp_mod, sizeof (dh.dofhp_mod), @@ -184,7 +187,7 @@ dtrace_dof_init(void) else { dprintf(1, "DTrace ioctl succeeded for DOF at %p\n", dof); #ifdef __FreeBSD__ - gen = dh.gen; + gen = dh.dofhp_gen; #endif } Modified: projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c ============================================================================== --- projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Fri Apr 17 03:56:50 2015 (r281639) +++ projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Fri Apr 17 05:55:07 2015 (r281640) @@ -1785,11 +1785,17 @@ dtrace_program_link(dtrace_hdl_t *dtp, d "failed to open %s: %s", file, strerror(errno))); } #else - snprintf(tfile, sizeof(tfile), "%s.XXXXXX", file); - if ((fd = mkstemp(tfile)) == -1) - return (dt_link_error(dtp, NULL, -1, NULL, - "failed to create temporary file %s: %s", - tfile, strerror(errno))); + if (dtp->dt_lazyload) { + if ((fd = open(file, O_RDWR | O_CREAT | O_TRUNC, 0666)) < 0) + return (dt_link_error(dtp, NULL, -1, NULL, + "failed to open %s: %s", file, strerror(errno))); + } else { + snprintf(tfile, sizeof(tfile), "%s.XXXXXX", file); + if ((fd = mkstemp(tfile)) == -1) + return (dt_link_error(dtp, NULL, -1, NULL, + "failed to create temporary file %s: %s", + tfile, strerror(errno))); + } #endif /* Modified: projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c ============================================================================== --- projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c Fri Apr 17 03:56:50 2015 (r281639) +++ projects/ifnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c Fri Apr 17 05:55:07 2015 (r281640) @@ -44,10 +44,15 @@ #include #include #include +#include + #ifndef illumos +#include +#include #include +#include +#include #endif -#include typedef struct dt_pid_probe { dtrace_hdl_t *dpp_dtp; @@ -566,6 +571,12 @@ dt_pid_usdt_mapping(void *data, const pr prsyminfo_t sip; dof_helper_t dh; GElf_Half e_type; +#ifdef __FreeBSD__ + dof_hdr_t hdr; + size_t sz; + uint64_t dofmax; + void *dof; +#endif const char *mname; const char *syms[] = { "___SUNW_dof", "__SUNW_dof" }; int i, fd = -1; @@ -595,17 +606,61 @@ dt_pid_usdt_mapping(void *data, const pr continue; } - dh.dofhp_dof = sym.st_value; +#ifdef __FreeBSD__ dh.dofhp_addr = (e_type == ET_EXEC) ? 0 : pmp->pr_vaddr; + if (Pread(P, &hdr, sizeof (hdr), sym.st_value) != + sizeof (hdr)) { + dt_dprintf("read of DOF header failed\n"); + continue; + } + + sz = sizeof(dofmax); + if (sysctlbyname("kern.dtrace.dof_maxsize", &dofmax, &sz, + NULL, 0) != 0) { + dt_dprintf("failed to read dof_maxsize: %s\n", + strerror(errno)); + continue; + } + if (dofmax < hdr.dofh_loadsz) { + dt_dprintf("DOF load size exceeds maximum\n"); + continue; + } + + if ((dof = malloc(hdr.dofh_loadsz)) == NULL) + return (-1); + + if (Pread(P, dof, hdr.dofh_loadsz, sym.st_value) != + hdr.dofh_loadsz) { + free(dof); + dt_dprintf("read of DOF section failed\n"); + continue; + } + + dh.dofhp_dof = (uintptr_t)dof; + dh.dofhp_pid = proc_getpid(P); dt_pid_objname(dh.dofhp_mod, sizeof (dh.dofhp_mod), -#ifdef illumos sip.prs_lmid, mname); + + if (fd == -1 && + (fd = open("/dev/dtrace/helper", O_RDWR, 0)) < 0) { + dt_dprintf("open of helper device failed: %s\n", + strerror(errno)); + free(dof); + return (-1); /* errno is set for us */ + } + + if (ioctl(fd, DTRACEHIOC_ADDDOF, &dh, sizeof (dh)) < 0) + dt_dprintf("DOF was rejected for %s\n", dh.dofhp_mod); + + free(dof); #else - 0, mname); -#endif + dh.dofhp_dof = sym.st_value; + dh.dofhp_addr = (e_type == ET_EXEC) ? 0 : pmp->pr_vaddr; + + dt_pid_objname(dh.dofhp_mod, sizeof (dh.dofhp_mod), + sip.prs_lmid, mname); -#ifdef illumos if (fd == -1 && (fd = pr_open(P, "/dev/dtrace/helper", O_RDWR, 0)) < 0) { dt_dprintf("pr_open of helper device failed: %s\n", @@ -618,8 +673,10 @@ dt_pid_usdt_mapping(void *data, const pr #endif } -#ifdef illumos if (fd != -1) +#ifdef __FreeBSD__ + (void) close(fd); +#else (void) pr_close(P, fd); #endif @@ -634,7 +691,6 @@ dt_pid_create_usdt_probes(dtrace_probede int ret = 0; assert(DT_MUTEX_HELD(&dpr->dpr_lock)); -#ifdef illumos (void) Pupdate_maps(P); if (Pobject_iter(P, dt_pid_usdt_mapping, P) != 0) { ret = -1; @@ -646,9 +702,6 @@ dt_pid_create_usdt_probes(dtrace_probede (int)proc_getpid(P), strerror(errno)); #endif } -#else - ret = 0; -#endif /* * Put the module name in its canonical form. Modified: projects/ifnet/cddl/lib/libdtrace/libproc_compat.h ============================================================================== --- projects/ifnet/cddl/lib/libdtrace/libproc_compat.h Fri Apr 17 03:56:50 2015 (r281639) +++ projects/ifnet/cddl/lib/libdtrace/libproc_compat.h Fri Apr 17 05:55:07 2015 (r281640) @@ -59,6 +59,6 @@ #define Pstate proc_state #define Psymbol_iter_by_addr proc_iter_symbyaddr #define Punsetflags proc_clearflags -#define Pupdate_maps(p) do { } while (0) +#define Pupdate_maps proc_rdagent #define Pupdate_syms proc_updatesyms #define Pxecbkpt proc_bkptexec Modified: projects/ifnet/cddl/usr.bin/ctfmerge/Makefile ============================================================================== --- projects/ifnet/cddl/usr.bin/ctfmerge/Makefile Fri Apr 17 03:56:50 2015 (r281639) +++ projects/ifnet/cddl/usr.bin/ctfmerge/Makefile Fri Apr 17 05:55:07 2015 (r281640) @@ -33,7 +33,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common -DPADD= ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD} -LDADD= -ldwarf -lelf -lz -lpthread +LIBADD= elf z pthread .include Copied: projects/ifnet/contrib/compiler-rt/lib/builtins/floatditf.c (from r281639, head/contrib/compiler-rt/lib/builtins/floatditf.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ifnet/contrib/compiler-rt/lib/builtins/floatditf.c Fri Apr 17 05:55:07 2015 (r281640, copy of r281639, head/contrib/compiler-rt/lib/builtins/floatditf.c) @@ -0,0 +1,52 @@ +//===-- lib/floatditf.c - integer -> quad-precision conversion ----*- C -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file is dual licensed under the MIT and the University of Illinois Open +// Source Licenses. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// +// +// This file implements di_int to quad-precision conversion for the +// compiler-rt library in the IEEE-754 default round-to-nearest, ties-to-even +// mode. +// +//===----------------------------------------------------------------------===// + +#define QUAD_PRECISION +#include "fp_lib.h" + +#if defined(CRT_HAS_128BIT) && defined(CRT_LDBL_128BIT) +COMPILER_RT_ABI fp_t __floatditf(di_int a) { + + const int aWidth = sizeof a * CHAR_BIT; + + // Handle zero as a special case to protect clz + if (a == 0) + return fromRep(0); + + // All other cases begin by extracting the sign and absolute value of a + rep_t sign = 0; + unsigned aAbs = (unsigned)a; + if (a < 0) { + sign = signBit; + aAbs += 0x80000000; + } + + // Exponent of (fp_t)a is the width of abs(a). + const int exponent = (aWidth - 1) - __builtin_clz(a); + rep_t result; + + // Shift a into the significand field and clear the implicit bit. Extra + // cast to unsigned int is necessary to get the correct behavior for + // the input INT_MIN. + const int shift = significandBits - exponent; + result = (rep_t)aAbs << shift ^ implicitBit; + + // Insert the exponent + result += (rep_t)(exponent + exponentBias) << significandBits; + // Insert the sign bit and return + return fromRep(result | sign); +} + +#endif Copied: projects/ifnet/contrib/compiler-rt/lib/builtins/floatunditf.c (from r281639, head/contrib/compiler-rt/lib/builtins/floatunditf.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ifnet/contrib/compiler-rt/lib/builtins/floatunditf.c Fri Apr 17 05:55:07 2015 (r281640, copy of r281639, head/contrib/compiler-rt/lib/builtins/floatunditf.c) @@ -0,0 +1,40 @@ +//===-- lib/floatunditf.c - uint -> quad-precision conversion -----*- C -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file is dual licensed under the MIT and the University of Illinois Open +// Source Licenses. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// +// +// This file implements du_int to quad-precision conversion for the +// compiler-rt library in the IEEE-754 default round-to-nearest, ties-to-even +// mode. +// +//===----------------------------------------------------------------------===// + +#define QUAD_PRECISION +#include "fp_lib.h" + +#if defined(CRT_HAS_128BIT) && defined(CRT_LDBL_128BIT) +COMPILER_RT_ABI fp_t __floatunditf(du_int a) { + + const int aWidth = sizeof a * CHAR_BIT; + + // Handle zero as a special case to protect clz + if (a == 0) return fromRep(0); + + // Exponent of (fp_t)a is the width of abs(a). + const int exponent = (aWidth - 1) - __builtin_clz(a); + rep_t result; + + // Shift a into the significand field and clear the implicit bit. + const int shift = significandBits - exponent; + result = (rep_t)a << shift ^ implicitBit; + + // Insert the exponent + result += (rep_t)(exponent + exponentBias) << significandBits; + return fromRep(result); +} + +#endif Copied: projects/ifnet/contrib/compiler-rt/lib/builtins/multc3.c (from r281639, head/contrib/compiler-rt/lib/builtins/multc3.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ifnet/contrib/compiler-rt/lib/builtins/multc3.c Fri Apr 17 05:55:07 2015 (r281640, copy of r281639, head/contrib/compiler-rt/lib/builtins/multc3.c) @@ -0,0 +1,73 @@ +/* ===-- multc3.c - Implement __multc3 -------------------------------------=== + * + * The LLVM Compiler Infrastructure + * + * This file is dual licensed under the MIT and the University of Illinois Open + * Source Licenses. See LICENSE.TXT for details. + * + * ===----------------------------------------------------------------------=== + * + * This file implements __multc3 for the compiler_rt library. + * + * ===----------------------------------------------------------------------=== + */ + +#include "int_lib.h" +#include "int_math.h" + +/* Returns: the product of a + ib and c + id */ + +COMPILER_RT_ABI long double _Complex +__multc3(long double __a, long double __b, long double __c, long double __d) +{ + long double __ac = __a * __c; + long double __bd = __b * __d; + long double __ad = __a * __d; + long double __bc = __b * __c; + long double _Complex z; + __real__ z = __ac - __bd; + __imag__ z = __ad + __bc; + if (crt_isnan(__real__ z) && crt_isnan(__imag__ z)) + { + int __recalc = 0; + if (crt_isinf(__a) || crt_isinf(__b)) + { + __a = crt_copysignl(crt_isinf(__a) ? 1 : 0, __a); + __b = crt_copysignl(crt_isinf(__b) ? 1 : 0, __b); + if (crt_isnan(__c)) + __c = crt_copysignl(0, __c); + if (crt_isnan(__d)) + __d = crt_copysignl(0, __d); + __recalc = 1; + } + if (crt_isinf(__c) || crt_isinf(__d)) + { + __c = crt_copysignl(crt_isinf(__c) ? 1 : 0, __c); + __d = crt_copysignl(crt_isinf(__d) ? 1 : 0, __d); + if (crt_isnan(__a)) + __a = crt_copysignl(0, __a); + if (crt_isnan(__b)) + __b = crt_copysignl(0, __b); + __recalc = 1; + } + if (!__recalc && (crt_isinf(__ac) || crt_isinf(__bd) || + crt_isinf(__ad) || crt_isinf(__bc))) + { + if (crt_isnan(__a)) + __a = crt_copysignl(0, __a); + if (crt_isnan(__b)) + __b = crt_copysignl(0, __b); + if (crt_isnan(__c)) + __c = crt_copysignl(0, __c); + if (crt_isnan(__d)) + __d = crt_copysignl(0, __d); + __recalc = 1; + } + if (__recalc) + { + __real__ z = CRT_INFINITY * (__a * __c - __b * __d); + __imag__ z = CRT_INFINITY * (__a * __d + __b * __c); + } + } + return z; +} Modified: projects/ifnet/contrib/nvi/README ============================================================================== --- projects/ifnet/contrib/nvi/README Fri Apr 17 03:56:50 2015 (r281639) +++ projects/ifnet/contrib/nvi/README Fri Apr 17 05:55:07 2015 (r281640) @@ -1,6 +1,6 @@ -# $Id: README,v 9.1 2013/11/02 02:50:23 zy Exp $ +# $Id: README,v 9.2 2015/04/08 17:18:56 zy Exp $ -This is version 2.1.2 (2012-11-02) of nex/nvi, a reimplementation of the ex/vi +This is version 2.1.3 (2015-04-08) of nex/nvi, a reimplementation of the ex/vi text editors originally distributed as part of the Fourth Berkeley Software Distribution (4BSD), by the University of California, Berkeley. Modified: projects/ifnet/contrib/nvi/catalog/dump.c ============================================================================== --- projects/ifnet/contrib/nvi/catalog/dump.c Fri Apr 17 03:56:50 2015 (r281639) +++ projects/ifnet/contrib/nvi/catalog/dump.c Fri Apr 17 05:55:07 2015 (r281640) @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -32,12 +28,6 @@ */ #ifndef lint -static char copyright[] = -"@(#) Copyright (c) 1992, 1993, 1994\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#ifndef lint static char sccsid[] = "@(#)dump.c 8.1 (Berkeley) 8/31/94"; #endif /* not lint */ @@ -45,8 +35,7 @@ static char sccsid[] = "@(#)dump.c 8.1 ( #include static void -parse(fp) - FILE *fp; +parse(FILE *fp) { int ch, s1, s2, s3; @@ -96,9 +85,7 @@ parse(fp) } int -main(argc, argv) - int argc; - char *argv[]; +main(int argc, char *argv[]) { FILE *fp; Modified: projects/ifnet/contrib/nvi/cl/cl.h ============================================================================== --- projects/ifnet/contrib/nvi/cl/cl.h Fri Apr 17 03:56:50 2015 (r281639) +++ projects/ifnet/contrib/nvi/cl/cl.h Fri Apr 17 05:55:07 2015 (r281640) @@ -80,16 +80,4 @@ typedef enum { INP_OK=0, INP_EOF, INP_ER #define RCNO(sp, cno) (cno) #define RLNO(sp, lno) (lno) -/* - * XXX - * Some implementations of curses.h don't define these for us. Used for - * compatibility only. - */ -#ifndef TRUE -#define TRUE 1 -#endif -#ifndef FALSE -#define FALSE 0 -#endif - #include "extern.h" Modified: projects/ifnet/contrib/nvi/cl/cl_funcs.c ============================================================================== --- projects/ifnet/contrib/nvi/cl/cl_funcs.c Fri Apr 17 03:56:50 2015 (r281639) +++ projects/ifnet/contrib/nvi/cl/cl_funcs.c Fri Apr 17 05:55:07 2015 (r281640) @@ -33,7 +33,7 @@ static const char sccsid[] = "$Id: cl_fu #include "../vi/vi.h" #include "cl.h" -static void cl_rdiv __P((SCR *)); +static void cl_rdiv(SCR *); static int addstr4(SCR *sp, void *str, size_t len, int wide) @@ -76,31 +76,31 @@ addstr4(SCR *sp, void *str, size_t len, * cl_waddstr -- * Add len bytes from the string at the cursor, advancing the cursor. * - * PUBLIC: int cl_waddstr __P((SCR *, const CHAR_T *, size_t)); + * PUBLIC: int cl_waddstr(SCR *, const CHAR_T *, size_t); */ int cl_waddstr(SCR *sp, const CHAR_T *str, size_t len) { - return addstr4(sp, (void *)str, len, 1); + return addstr4(sp, (void *)str, len, 1); } /* * cl_addstr -- * Add len bytes from the string at the cursor, advancing the cursor. * - * PUBLIC: int cl_addstr __P((SCR *, const char *, size_t)); + * PUBLIC: int cl_addstr(SCR *, const char *, size_t); */ int cl_addstr(SCR *sp, const char *str, size_t len) { - return addstr4(sp, (void *)str, len, 0); + return addstr4(sp, (void *)str, len, 0); } /* * cl_attr -- * Toggle a screen attribute on/off. * - * PUBLIC: int cl_attr __P((SCR *, scr_attr_t, int)); + * PUBLIC: int cl_attr(SCR *, scr_attr_t, int); */ int cl_attr(SCR *sp, scr_attr_t attribute, int on) @@ -187,7 +187,7 @@ cl_attr(SCR *sp, scr_attr_t attribute, i * cl_baud -- * Return the baud rate. * - * PUBLIC: int cl_baud __P((SCR *, u_long *)); + * PUBLIC: int cl_baud(SCR *, u_long *); */ int cl_baud(SCR *sp, u_long *ratep) @@ -228,7 +228,7 @@ cl_baud(SCR *sp, u_long *ratep) * cl_bell -- * Ring the bell/flash the screen. * - * PUBLIC: int cl_bell __P((SCR *)); + * PUBLIC: int cl_bell(SCR *); */ int cl_bell(SCR *sp) @@ -252,7 +252,7 @@ cl_bell(SCR *sp) * cl_clrtoeol -- * Clear from the current cursor to the end of the line. * - * PUBLIC: int cl_clrtoeol __P((SCR *)); + * PUBLIC: int cl_clrtoeol(SCR *); */ int cl_clrtoeol(SCR *sp) @@ -281,7 +281,7 @@ cl_clrtoeol(SCR *sp) * cl_cursor -- * Return the current cursor position. * - * PUBLIC: int cl_cursor __P((SCR *, size_t *, size_t *)); + * PUBLIC: int cl_cursor(SCR *, size_t *, size_t *); */ int cl_cursor(SCR *sp, size_t *yp, size_t *xp) @@ -307,7 +307,7 @@ cl_cursor(SCR *sp, size_t *yp, size_t *x * cl_deleteln -- * Delete the current line, scrolling all lines below it. * - * PUBLIC: int cl_deleteln __P((SCR *)); + * PUBLIC: int cl_deleteln(SCR *); */ int cl_deleteln(SCR *sp) @@ -344,7 +344,7 @@ cl_deleteln(SCR *sp) * cl_discard -- * Discard a screen. * - * PUBLIC: int cl_discard __P((SCR *, SCR **)); + * PUBLIC: int cl_discard(SCR *, SCR **); */ int cl_discard(SCR *discardp, SCR **acquirep) @@ -385,7 +385,7 @@ cl_discard(SCR *discardp, SCR **acquirep * Adjust the screen for ex. This routine is purely for standalone * ex programs. All special purpose, all special case. * - * PUBLIC: int cl_ex_adjust __P((SCR *, exadj_t)); + * PUBLIC: int cl_ex_adjust(SCR *, exadj_t); */ int cl_ex_adjust(SCR *sp, exadj_t action) @@ -440,7 +440,7 @@ cl_ex_adjust(SCR *sp, exadj_t action) * cl_insertln -- * Push down the current line, discarding the bottom line. * - * PUBLIC: int cl_insertln __P((SCR *)); + * PUBLIC: int cl_insertln(SCR *); */ int cl_insertln(SCR *sp) @@ -458,7 +458,7 @@ cl_insertln(SCR *sp) * cl_keyval -- * Return the value for a special key. * - * PUBLIC: int cl_keyval __P((SCR *, scr_keyval_t, CHAR_T *, int *)); + * PUBLIC: int cl_keyval(SCR *, scr_keyval_t, CHAR_T *, int *); */ int cl_keyval(SCR *sp, scr_keyval_t val, CHAR_T *chp, int *dnep) @@ -496,7 +496,7 @@ cl_keyval(SCR *sp, scr_keyval_t val, CHA * cl_move -- * Move the cursor. * - * PUBLIC: int cl_move __P((SCR *, size_t, size_t)); + * PUBLIC: int cl_move(SCR *, size_t, size_t); */ int cl_move(SCR *sp, size_t lno, size_t cno) @@ -516,7 +516,7 @@ cl_move(SCR *sp, size_t lno, size_t cno) * cl_refresh -- * Refresh the screen. * - * PUBLIC: int cl_refresh __P((SCR *, int)); + * PUBLIC: int cl_refresh(SCR *, int); */ int cl_refresh(SCR *sp, int repaint) @@ -599,7 +599,7 @@ cl_rdiv(SCR *sp) * cl_rename -- * Rename the file. * - * PUBLIC: int cl_rename __P((SCR *, char *, int)); + * PUBLIC: int cl_rename(SCR *, char *, int); */ int cl_rename(SCR *sp, char *name, int on) @@ -621,7 +621,7 @@ cl_rename(SCR *sp, char *name, int on) if (on) { clp->focus = sp; if (!F_ISSET(clp, CL_RENAME_OK) || - strncmp(OG_STR(gp, GO_TERM), "xterm", 5)) + strncmp(OG_STR(gp, GO_TERM), "xterm", 5)) return (0); if (clp->oname == NULL && (wid = getenv("WINDOWID"))) { @@ -654,7 +654,7 @@ rename: cl_setname(gp, name); * cl_setname -- * Set a X11 icon/window name. * - * PUBLIC: void cl_setname __P((GS *, char *)); + * PUBLIC: void cl_setname(GS *, char *); */ void cl_setname(GS *gp, char *name) @@ -671,7 +671,7 @@ cl_setname(GS *gp, char *name) * cl_split -- * Split a screen. * - * PUBLIC: int cl_split __P((SCR *, SCR *)); + * PUBLIC: int cl_split(SCR *, SCR *); */ int cl_split(SCR *origp, SCR *newp) @@ -697,7 +697,7 @@ cl_split(SCR *origp, SCR *newp) * cl_suspend -- * Suspend a screen. * - * PUBLIC: int cl_suspend __P((SCR *, int *)); + * PUBLIC: int cl_suspend(SCR *, int *); */ int cl_suspend(SCR *sp, int *allowedp) @@ -825,7 +825,7 @@ cl_suspend(SCR *sp, int *allowedp) * cl_usage -- * Print out the curses usage messages. * - * PUBLIC: void cl_usage __P((void)); + * PUBLIC: void cl_usage(void); */ void cl_usage(void) Modified: projects/ifnet/contrib/nvi/cl/cl_main.c ============================================================================== --- projects/ifnet/contrib/nvi/cl/cl_main.c Fri Apr 17 03:56:50 2015 (r281639) +++ projects/ifnet/contrib/nvi/cl/cl_main.c Fri Apr 17 05:55:07 2015 (r281640) @@ -10,7 +10,7 @@ #include "config.h" #ifndef lint -static const char sccsid[] = "$Id: cl_main.c,v 10.55 2011/08/15 19:52:28 zy Exp $"; +static const char sccsid[] = "$Id: cl_main.c,v 10.56 2015/04/05 06:20:53 zy Exp $"; #endif /* not lint */ #include @@ -36,20 +36,20 @@ static const char sccsid[] = "$Id: cl_ma GS *__global_list; /* GLOBAL: List of screens. */ sigset_t __sigblockset; /* GLOBAL: Blocked signals. */ -static void cl_func_std __P((GS *)); -static CL_PRIVATE *cl_init __P((GS *)); -static GS *gs_init __P((char *)); -static void perr __P((char *, char *)); -static int setsig __P((int, struct sigaction *, void (*)(int))); -static void sig_end __P((GS *)); -static void term_init __P((char *, char *)); +static void cl_func_std(GS *); +static CL_PRIVATE *cl_init(GS *); +static GS *gs_init(char *); +static void perr(char *, char *); +static int setsig(int, struct sigaction *, void (*)(int)); +static void sig_end(GS *); +static void term_init(char *, char *); /* * main -- * This is the main loop for the standalone curses editor. */ int -main(int argc, char **argv) +main(int argc, char *argv[]) { static int reenter; CL_PRIVATE *clp; @@ -92,7 +92,7 @@ main(int argc, char **argv) * have to use termcap/terminfo to find out how big the screen is. */ if ((ttype = getenv("TERM")) == NULL) - ttype = "unknown"; + ttype = "ansi"; term_init(gp->progname, ttype); /* Add the terminal type to the global structure. */ @@ -146,7 +146,7 @@ main(int argc, char **argv) } /* Free the global and CL private areas. */ -#if defined(DEBUG) || defined(PURIFY) || defined(LIBRARY) +#if defined(DEBUG) || defined(PURIFY) if (clp->oname != NULL) free(clp->oname); free(clp); @@ -292,7 +292,7 @@ h_winch(int signo) * sig_init -- * Initialize signals. * - * PUBLIC: int sig_init __P((GS *, SCR *)); + * PUBLIC: int sig_init(GS *, SCR *); */ int sig_init(GS *gp, SCR *sp) @@ -337,7 +337,7 @@ sig_init(GS *gp, SCR *sp) * Set a signal handler. */ static int -setsig(int signo, struct sigaction *oactp, void (*handler) (int)) +setsig(int signo, struct sigaction *oactp, void (*handler)(int)) { struct sigaction act; @@ -345,21 +345,12 @@ setsig(int signo, struct sigaction *oact * Use sigaction(2), not signal(3), since we don't always want to * restart system calls. The example is when waiting for a command * mode keystroke and SIGWINCH arrives. Besides, you can't portably - * restart system calls (thanks, POSIX!). On the other hand, you - * can't portably NOT restart system calls (thanks, Sun!). SunOS - * used SA_INTERRUPT as their extension to NOT restart read calls. - * We sure hope nobody else used it for anything else. Mom told me - * there'd be days like this. She just never told me that there'd - * be so many. + * restart system calls (thanks, POSIX!). */ act.sa_handler = handler; sigemptyset(&act.sa_mask); -#ifdef SA_INTERRUPT - act.sa_flags = SA_INTERRUPT; -#else act.sa_flags = 0; -#endif return (sigaction(signo, &act, oactp)); } Modified: projects/ifnet/contrib/nvi/cl/cl_read.c ============================================================================== --- projects/ifnet/contrib/nvi/cl/cl_read.c Fri Apr 17 03:56:50 2015 (r281639) +++ projects/ifnet/contrib/nvi/cl/cl_read.c Fri Apr 17 05:55:07 2015 (r281640) @@ -35,15 +35,15 @@ static const char sccsid[] = "$Id: cl_re #undef columns #undef lines -static input_t cl_read __P((SCR *, - u_int32_t, char *, size_t, int *, struct timeval *)); -static int cl_resize __P((SCR *, size_t, size_t)); +static input_t cl_read(SCR *, + u_int32_t, char *, size_t, int *, struct timeval *); +static int cl_resize(SCR *, size_t, size_t); /* * cl_event -- * Return a single event. * - * PUBLIC: int cl_event __P((SCR *, EVENT *, u_int32_t, int)); + * PUBLIC: int cl_event(SCR *, EVENT *, u_int32_t, int); */ int cl_event(SCR *sp, EVENT *evp, u_int32_t flags, int ms) @@ -143,7 +143,8 @@ read: * Read characters from the input. */ static input_t -cl_read(SCR *sp, u_int32_t flags, char *bp, size_t blen, int *nrp, struct timeval *tp) +cl_read(SCR *sp, u_int32_t flags, char *bp, size_t blen, int *nrp, + struct timeval *tp) { struct termios term1, term2; CL_PRIVATE *clp; Modified: projects/ifnet/contrib/nvi/cl/cl_screen.c ============================================================================== --- projects/ifnet/contrib/nvi/cl/cl_screen.c Fri Apr 17 03:56:50 2015 (r281639) +++ projects/ifnet/contrib/nvi/cl/cl_screen.c Fri Apr 17 05:55:07 2015 (r281640) @@ -10,7 +10,7 @@ #include "config.h" #ifndef lint -static const char sccsid[] = "$Id: cl_screen.c,v 10.56 2002/05/03 19:59:44 skimo Exp $"; +static const char sccsid[] = "$Id: cl_screen.c,v 10.58 2015/04/08 02:12:11 zy Exp $"; #endif /* not lint */ #include @@ -32,18 +32,18 @@ static const char sccsid[] = "$Id: cl_sc #include "../common/common.h" #include "cl.h" -static int cl_ex_end __P((GS *)); -static int cl_ex_init __P((SCR *)); -static void cl_freecap __P((CL_PRIVATE *)); -static int cl_vi_end __P((GS *)); -static int cl_vi_init __P((SCR *)); -static int cl_putenv __P((char *, char *, u_long)); +static int cl_ex_end(GS *); +static int cl_ex_init(SCR *); +static void cl_freecap(CL_PRIVATE *); +static int cl_vi_end(GS *); +static int cl_vi_init(SCR *); +static int cl_putenv(char *, char *, u_long); /* * cl_screen -- * Switch screen types. * - * PUBLIC: int cl_screen __P((SCR *, u_int32_t)); + * PUBLIC: int cl_screen(SCR *, u_int32_t); */ int cl_screen(SCR *sp, u_int32_t flags) @@ -58,11 +58,9 @@ cl_screen(SCR *sp, u_int32_t flags) /* See if the current information is incorrect. */ if (F_ISSET(gp, G_SRESTART)) { - if (CLSP(sp)) { - delwin(CLSP(sp)); - sp->cl_private = NULL; - } - if (cl_quit(gp)) + if ((!F_ISSET(sp, SC_SCR_EX | SC_SCR_VI) || + resizeterm(O_VAL(sp, O_LINES), O_VAL(sp, O_COLUMNS))) && + cl_quit(gp)) return (1); F_CLR(gp, G_SRESTART); } @@ -131,7 +129,7 @@ cl_screen(SCR *sp, u_int32_t flags) * cl_quit -- * Shutdown the screens. * - * PUBLIC: int cl_quit __P((GS *)); + * PUBLIC: int cl_quit(GS *); */ int cl_quit(GS *gp) @@ -234,20 +232,15 @@ cl_vi_init(SCR *sp) cl_putenv("COLUMNS", NULL, (u_long)O_VAL(sp, O_COLUMNS)); /* - * We don't care about the SCREEN reference returned by newterm, we - * never have more than one SCREEN at a time. - * - * XXX *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Fri Apr 17 05:58:12 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5BB11412; Fri, 17 Apr 2015 05:58:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 4A63C5FA; Fri, 17 Apr 2015 05:58:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3H5wCwc056473; Fri, 17 Apr 2015 05:58:12 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3H5wC20056472; Fri, 17 Apr 2015 05:58:12 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201504170558.t3H5wC20056472@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Fri, 17 Apr 2015 05:58:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r281641 - projects/ifnet/sys/net 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: Fri, 17 Apr 2015 05:58:12 -0000 Author: glebius Date: Fri Apr 17 05:58:11 2015 New Revision: 281641 URL: https://svnweb.freebsd.org/changeset/base/281641 Log: Merge r281528 from head. Modified: projects/ifnet/sys/net/if_polling.c Modified: projects/ifnet/sys/net/if_polling.c ============================================================================== --- projects/ifnet/sys/net/if_polling.c Fri Apr 17 05:55:07 2015 (r281640) +++ projects/ifnet/sys/net/if_polling.c Fri Apr 17 05:58:11 2015 (r281641) @@ -387,6 +387,9 @@ netisr_pollmore() struct timeval t; int kern_load; + if (poll_handlers == 0) + return; + mtx_lock(&poll_mtx); if (!netisr_pollmore_scheduled) { mtx_unlock(&poll_mtx); @@ -444,6 +447,9 @@ netisr_poll(void) int i, cycles; enum poll_cmd arg = POLL_ONLY; + if (poll_handlers == 0) + return; + mtx_lock(&poll_mtx); if (!netisr_poll_scheduled) { mtx_unlock(&poll_mtx); From owner-svn-src-projects@FreeBSD.ORG Fri Apr 17 08:21:05 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2ED69842; Fri, 17 Apr 2015 08:21:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 1C0CF915; Fri, 17 Apr 2015 08:21:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3H8L5Du023962; Fri, 17 Apr 2015 08:21:05 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3H8L4km023959; Fri, 17 Apr 2015 08:21:04 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201504170821.t3H8L4km023959@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Fri, 17 Apr 2015 08:21:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r281646 - in projects/ifnet/sys: amd64/conf dev/alc i386/conf 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: Fri, 17 Apr 2015 08:21:05 -0000 Author: glebius Date: Fri Apr 17 08:21:04 2015 New Revision: 281646 URL: https://svnweb.freebsd.org/changeset/base/281646 Log: Convert alc(4). Not tested. Sponsored by: Netflix Sponsored by: Nginx, Inc. Modified: projects/ifnet/sys/amd64/conf/IFNET projects/ifnet/sys/dev/alc/if_alc.c projects/ifnet/sys/dev/alc/if_alcvar.h projects/ifnet/sys/i386/conf/IFNET Modified: projects/ifnet/sys/amd64/conf/IFNET ============================================================================== --- projects/ifnet/sys/amd64/conf/IFNET Fri Apr 17 07:11:10 2015 (r281645) +++ projects/ifnet/sys/amd64/conf/IFNET Fri Apr 17 08:21:04 2015 (r281646) @@ -40,7 +40,6 @@ nodevice ale nodevice age nodevice cas nodevice nge -nodevice alc nodevice sis nodevice sf nodevice ae Modified: projects/ifnet/sys/dev/alc/if_alc.c ============================================================================== --- projects/ifnet/sys/dev/alc/if_alc.c Fri Apr 17 07:11:10 2015 (r281645) +++ projects/ifnet/sys/dev/alc/if_alc.c Fri Apr 17 08:21:04 2015 (r281646) @@ -47,16 +47,10 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include -#include -#include -#include #include -#include #include -#include -#include +#include #include #include @@ -141,22 +135,21 @@ static struct alc_ident * alc_find_ident(device_t); #ifndef __NO_STRICT_ALIGNMENT static struct mbuf * - alc_fixup_rx(struct ifnet *, struct mbuf *); + alc_fixup_rx(if_t, struct mbuf *); #endif static void alc_get_macaddr(struct alc_softc *); static void alc_get_macaddr_813x(struct alc_softc *); static void alc_get_macaddr_816x(struct alc_softc *); static void alc_get_macaddr_par(struct alc_softc *); -static void alc_init(void *); static void alc_init_cmb(struct alc_softc *); -static void alc_init_locked(struct alc_softc *); +static void alc_init(struct alc_softc *); static void alc_init_rr_ring(struct alc_softc *); static int alc_init_rx_ring(struct alc_softc *); static void alc_init_smb(struct alc_softc *); static void alc_init_tx_ring(struct alc_softc *); static void alc_int_task(void *, int); static int alc_intr(void *); -static int alc_ioctl(struct ifnet *, u_long, caddr_t); +static int alc_ioctl(if_t, u_long, void *, struct thread *); static void alc_mac_config(struct alc_softc *); static uint32_t alc_mii_readreg_813x(struct alc_softc *, int, int); static uint32_t alc_mii_readreg_816x(struct alc_softc *, int, int); @@ -169,9 +162,9 @@ static uint32_t alc_miidbg_readreg(struc static uint32_t alc_miidbg_writereg(struct alc_softc *, int, int); static uint32_t alc_miiext_readreg(struct alc_softc *, int, int); static uint32_t alc_miiext_writereg(struct alc_softc *, int, int, int); -static int alc_mediachange(struct ifnet *); +static int alc_mediachange(if_t); static int alc_mediachange_locked(struct alc_softc *); -static void alc_mediastatus(struct ifnet *, struct ifmediareq *); +static void alc_mediastatus(if_t, struct ifmediareq *); static int alc_newbuf(struct alc_softc *, struct alc_rxdesc *); static void alc_osc_reset(struct alc_softc *); static void alc_phy_down(struct alc_softc *); @@ -190,8 +183,8 @@ static void alc_setwol(struct alc_softc static void alc_setwol_813x(struct alc_softc *); static void alc_setwol_816x(struct alc_softc *); static int alc_shutdown(device_t); -static void alc_start(struct ifnet *); -static void alc_start_locked(struct ifnet *); +static int alc_transmit(if_t, struct mbuf *); +static int alc_start(struct alc_softc *); static void alc_start_queue(struct alc_softc *); static void alc_stats_clear(struct alc_softc *); static void alc_stats_update(struct alc_softc *); @@ -235,6 +228,17 @@ static devclass_t alc_devclass; DRIVER_MODULE(alc, pci, alc_driver, alc_devclass, 0, 0); DRIVER_MODULE(miibus, alc, miibus_driver, miibus_devclass, 0, 0); +static struct ifdriver alc_ifdrv = { + .ifdrv_ops = { + .ifop_ioctl = alc_ioctl, + .ifop_transmit = alc_transmit, + }, + .ifdrv_name = "alc", + .ifdrv_type = IFT_ETHER, + .ifdrv_hdrlen = sizeof(struct ether_vlan_header), + .ifdrv_maxqlen = ALC_TX_RING_CNT - 1, +}; + static struct resource_spec alc_res_spec_mem[] = { { SYS_RES_MEMORY, PCIR_BAR(0), RF_ACTIVE }, { -1, 0, 0 } @@ -398,15 +402,11 @@ alc_miibus_statchg(device_t dev) { struct alc_softc *sc; struct mii_data *mii; - struct ifnet *ifp; uint32_t reg; sc = device_get_softc(dev); - mii = device_get_softc(sc->alc_miibus); - ifp = sc->alc_ifp; - if (mii == NULL || ifp == NULL || - (ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) + if (mii == NULL || (sc->alc_flags & ALC_FLAG_RUNNING) == 0) return; sc->alc_flags &= ~ALC_FLAG_LINK; @@ -593,14 +593,14 @@ alc_dsp_fixup(struct alc_softc *sc, int } static void -alc_mediastatus(struct ifnet *ifp, struct ifmediareq *ifmr) +alc_mediastatus(if_t ifp, struct ifmediareq *ifmr) { struct alc_softc *sc; struct mii_data *mii; - sc = ifp->if_softc; + sc = if_getsoftc(ifp, IF_DRIVER_SOFTC); ALC_LOCK(sc); - if ((ifp->if_flags & IFF_UP) == 0) { + if ((sc->alc_if_flags & IFF_UP) == 0) { ALC_UNLOCK(sc); return; } @@ -613,12 +613,12 @@ alc_mediastatus(struct ifnet *ifp, struc } static int -alc_mediachange(struct ifnet *ifp) +alc_mediachange(if_t ifp) { struct alc_softc *sc; int error; - sc = ifp->if_softc; + sc = if_getsoftc(ifp, IF_DRIVER_SOFTC); ALC_LOCK(sc); error = alc_mediachange_locked(sc); ALC_UNLOCK(sc); @@ -1246,7 +1246,7 @@ alc_aspm_816x(struct alc_softc *sc, int if (init != 0) pmcfg |= PM_CFG_ASPM_L0S_ENB | PM_CFG_ASPM_L1_ENB | PM_CFG_MAC_ASPM_CHK; - else if ((sc->alc_ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) + else if ((sc->alc_flags & ALC_FLAG_RUNNING) != 0) pmcfg |= PM_CFG_ASPM_L1_ENB | PM_CFG_MAC_ASPM_CHK; } CSR_WRITE_4(sc, ALC_PM_CFG, pmcfg); @@ -1360,8 +1360,16 @@ alc_config_msi(struct alc_softc *sc) static int alc_attach(device_t dev) { + struct if_attach_args ifat = { + .ifat_version = IF_ATTACH_VERSION, + .ifat_drv = &alc_ifdrv, + .ifat_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST, + .ifat_capabilities = IFCAP_TXCSUM | IFCAP_TSO4 | + IFCAP_VLAN_MTU | IFCAP_VLAN_HWTAGGING | + IFCAP_VLAN_HWCSUM | IFCAP_VLAN_HWTSO, + .ifat_hwassist = ALC_CSUM_FEATURES | CSUM_TSO, + }; struct alc_softc *sc; - struct ifnet *ifp; int base, error, i, msic, msixc; uint16_t burst; @@ -1538,33 +1546,8 @@ alc_attach(device_t dev) /* Load station address. */ alc_get_macaddr(sc); - ifp = sc->alc_ifp = if_alloc(IFT_ETHER); - if (ifp == NULL) { - device_printf(dev, "cannot allocate ifnet structure.\n"); - error = ENXIO; - goto fail; - } - - ifp->if_softc = sc; - if_initname(ifp, device_get_name(dev), device_get_unit(dev)); - ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; - ifp->if_ioctl = alc_ioctl; - ifp->if_start = alc_start; - ifp->if_init = alc_init; - ifp->if_snd.ifq_drv_maxlen = ALC_TX_RING_CNT - 1; - IFQ_SET_MAXLEN(&ifp->if_snd, ifp->if_snd.ifq_drv_maxlen); - IFQ_SET_READY(&ifp->if_snd); - ifp->if_capabilities = IFCAP_TXCSUM | IFCAP_TSO4; - ifp->if_hwassist = ALC_CSUM_FEATURES | CSUM_TSO; - if (pci_find_cap(dev, PCIY_PMG, &base) == 0) { - ifp->if_capabilities |= IFCAP_WOL_MAGIC | IFCAP_WOL_MCAST; - sc->alc_flags |= ALC_FLAG_PM; - sc->alc_pmcap = base; - } - ifp->if_capenable = ifp->if_capabilities; - /* Set up MII bus. */ - error = mii_attach(dev, &sc->alc_miibus, ifp, alc_mediachange, + error = mii_attach(dev, &sc->alc_miibus, alc_mediachange, alc_mediastatus, BMSR_DEFCAPMASK, sc->alc_phyaddr, MII_OFFSET_ANY, MIIF_DOPAUSE); if (error != 0) { @@ -1572,38 +1555,11 @@ alc_attach(device_t dev) goto fail; } - ether_ifattach(ifp, sc->alc_eaddr); - - /* VLAN capability setup. */ - ifp->if_capabilities |= IFCAP_VLAN_MTU | IFCAP_VLAN_HWTAGGING | - IFCAP_VLAN_HWCSUM | IFCAP_VLAN_HWTSO; - ifp->if_capenable = ifp->if_capabilities; - /* - * XXX - * It seems enabling Tx checksum offloading makes more trouble. - * Sometimes the controller does not receive any frames when - * Tx checksum offloading is enabled. I'm not sure whether this - * is a bug in Tx checksum offloading logic or I got broken - * sample boards. To safety, don't enable Tx checksum offloading - * by default but give chance to users to toggle it if they know - * their controllers work without problems. - * Fortunately, Tx checksum offloading for AR816x family - * seems to work. - */ - if ((sc->alc_flags & ALC_FLAG_AR816X_FAMILY) == 0) { - ifp->if_capenable &= ~IFCAP_TXCSUM; - ifp->if_hwassist &= ~ALC_CSUM_FEATURES; - } - - /* Tell the upper layer(s) we support long frames. */ - ifp->if_hdrlen = sizeof(struct ether_vlan_header); - /* Create local taskq. */ sc->alc_tq = taskqueue_create_fast("alc_taskq", M_WAITOK, taskqueue_thread_enqueue, &sc->alc_tq); if (sc->alc_tq == NULL) { device_printf(dev, "could not create taskqueue.\n"); - ether_ifdetach(ifp); error = ENXIO; goto fail; } @@ -1628,14 +1584,39 @@ alc_attach(device_t dev) device_printf(dev, "could not set up interrupt handler.\n"); taskqueue_free(sc->alc_tq); sc->alc_tq = NULL; - ether_ifdetach(ifp); goto fail; } -fail: - if (error != 0) - alc_detach(dev); + ifat.ifat_softc = sc; + ifat.ifat_dunit = device_get_unit(dev); + ifat.ifat_lla = sc->alc_eaddr; + if (pci_find_cap(dev, PCIY_PMG, &base) == 0) { + ifat.ifat_capabilities |= IFCAP_WOL_MAGIC | IFCAP_WOL_MCAST; + sc->alc_flags |= ALC_FLAG_PM; + sc->alc_pmcap = base; + } + ifat.ifat_capenable = ifat.ifat_capabilities; + /* + * XXX + * It seems enabling Tx checksum offloading makes more trouble. + * Sometimes the controller does not receive any frames when + * Tx checksum offloading is enabled. I'm not sure whether this + * is a bug in Tx checksum offloading logic or I got broken + * sample boards. To safety, don't enable Tx checksum offloading + * by default but give chance to users to toggle it if they know + * their controllers work without problems. + * Fortunately, Tx checksum offloading for AR816x family + * seems to work. + */ + if ((sc->alc_flags & ALC_FLAG_AR816X_FAMILY) == 0) { + ifat.ifat_capenable &= ~IFCAP_TXCSUM; + ifat.ifat_hwassist &= ~ALC_CSUM_FEATURES; + } + sc->alc_ifp = if_attach(&ifat); + return (0); +fail: + alc_detach(dev); return (error); } @@ -1643,14 +1624,11 @@ static int alc_detach(device_t dev) { struct alc_softc *sc; - struct ifnet *ifp; int i, msic; sc = device_get_softc(dev); - ifp = sc->alc_ifp; if (device_is_attached(dev)) { - ether_ifdetach(ifp); ALC_LOCK(sc); alc_stop(sc); ALC_UNLOCK(sc); @@ -1671,10 +1649,8 @@ alc_detach(device_t dev) bus_generic_detach(dev); alc_dma_free(sc); - if (ifp != NULL) { - if_free(ifp); - sc->alc_ifp = NULL; - } + if (sc->alc_ifp != NULL) + if_detach(sc->alc_ifp); if ((sc->alc_flags & ALC_FLAG_MSIX) != 0) msic = ALC_MSIX_MESSAGES; @@ -2495,14 +2471,12 @@ alc_setwol(struct alc_softc *sc) static void alc_setwol_813x(struct alc_softc *sc) { - struct ifnet *ifp; uint32_t reg, pmcs; uint16_t pmstat; ALC_LOCK_ASSERT(sc); alc_disable_l0s_l1(sc); - ifp = sc->alc_ifp; if ((sc->alc_flags & ALC_FLAG_PM) == 0) { /* Disable WOL. */ CSR_WRITE_4(sc, ALC_WOL_CFG, 0); @@ -2516,7 +2490,7 @@ alc_setwol_813x(struct alc_softc *sc) return; } - if ((ifp->if_capenable & IFCAP_WOL) != 0) { + if ((sc->alc_capenable & IFCAP_WOL) != 0) { if ((sc->alc_flags & ALC_FLAG_FASTETHER) == 0) alc_setlinkspeed(sc); CSR_WRITE_4(sc, ALC_MASTER_CFG, @@ -2524,22 +2498,22 @@ alc_setwol_813x(struct alc_softc *sc) } pmcs = 0; - if ((ifp->if_capenable & IFCAP_WOL_MAGIC) != 0) + if ((sc->alc_capenable & IFCAP_WOL_MAGIC) != 0) pmcs |= WOL_CFG_MAGIC | WOL_CFG_MAGIC_ENB; CSR_WRITE_4(sc, ALC_WOL_CFG, pmcs); reg = CSR_READ_4(sc, ALC_MAC_CFG); reg &= ~(MAC_CFG_DBG | MAC_CFG_PROMISC | MAC_CFG_ALLMULTI | MAC_CFG_BCAST); - if ((ifp->if_capenable & IFCAP_WOL_MCAST) != 0) + if ((sc->alc_capenable & IFCAP_WOL_MCAST) != 0) reg |= MAC_CFG_ALLMULTI | MAC_CFG_BCAST; - if ((ifp->if_capenable & IFCAP_WOL) != 0) + if ((sc->alc_capenable & IFCAP_WOL) != 0) reg |= MAC_CFG_RX_ENB; CSR_WRITE_4(sc, ALC_MAC_CFG, reg); reg = CSR_READ_4(sc, ALC_PCIE_PHYMISC); reg |= PCIE_PHYMISC_FORCE_RCV_DET; CSR_WRITE_4(sc, ALC_PCIE_PHYMISC, reg); - if ((ifp->if_capenable & IFCAP_WOL) == 0) { + if ((sc->alc_capenable & IFCAP_WOL) == 0) { /* WOL disabled, PHY power down. */ alc_phy_down(sc); CSR_WRITE_4(sc, ALC_MASTER_CFG, @@ -2549,7 +2523,7 @@ alc_setwol_813x(struct alc_softc *sc) pmstat = pci_read_config(sc->alc_dev, sc->alc_pmcap + PCIR_POWER_STATUS, 2); pmstat &= ~(PCIM_PSTAT_PME | PCIM_PSTAT_PMEENABLE); - if ((ifp->if_capenable & IFCAP_WOL) != 0) + if ((sc->alc_capenable & IFCAP_WOL) != 0) pmstat |= PCIM_PSTAT_PME | PCIM_PSTAT_PMEENABLE; pci_write_config(sc->alc_dev, sc->alc_pmcap + PCIR_POWER_STATUS, pmstat, 2); @@ -2558,13 +2532,11 @@ alc_setwol_813x(struct alc_softc *sc) static void alc_setwol_816x(struct alc_softc *sc) { - struct ifnet *ifp; uint32_t gphy, mac, master, pmcs, reg; uint16_t pmstat; ALC_LOCK_ASSERT(sc); - ifp = sc->alc_ifp; master = CSR_READ_4(sc, ALC_MASTER_CFG); master &= ~MASTER_CLK_SEL_DIS; gphy = CSR_READ_4(sc, ALC_GPHY_CFG); @@ -2576,21 +2548,21 @@ alc_setwol_816x(struct alc_softc *sc) gphy |= GPHY_CFG_PHY_IDDQ | GPHY_CFG_PWDOWN_HW; mac = CSR_READ_4(sc, ALC_MAC_CFG); } else { - if ((ifp->if_capenable & IFCAP_WOL) != 0) { + if ((sc->alc_capenable & IFCAP_WOL) != 0) { gphy |= GPHY_CFG_EXT_RESET; if ((sc->alc_flags & ALC_FLAG_FASTETHER) == 0) alc_setlinkspeed(sc); } pmcs = 0; - if ((ifp->if_capenable & IFCAP_WOL_MAGIC) != 0) + if ((sc->alc_capenable & IFCAP_WOL_MAGIC) != 0) pmcs |= WOL_CFG_MAGIC | WOL_CFG_MAGIC_ENB; CSR_WRITE_4(sc, ALC_WOL_CFG, pmcs); mac = CSR_READ_4(sc, ALC_MAC_CFG); mac &= ~(MAC_CFG_DBG | MAC_CFG_PROMISC | MAC_CFG_ALLMULTI | MAC_CFG_BCAST); - if ((ifp->if_capenable & IFCAP_WOL_MCAST) != 0) + if ((sc->alc_capenable & IFCAP_WOL_MCAST) != 0) mac |= MAC_CFG_ALLMULTI | MAC_CFG_BCAST; - if ((ifp->if_capenable & IFCAP_WOL) != 0) + if ((sc->alc_capenable & IFCAP_WOL) != 0) mac |= MAC_CFG_RX_ENB; alc_miiext_writereg(sc, MII_EXT_ANEG, MII_EXT_ANEG_S3DIG10, ANEG_S3DIG10_SL); @@ -2614,7 +2586,7 @@ alc_setwol_816x(struct alc_softc *sc) pmstat = pci_read_config(sc->alc_dev, sc->alc_pmcap + PCIR_POWER_STATUS, 2); pmstat &= ~(PCIM_PSTAT_PME | PCIM_PSTAT_PMEENABLE); - if ((ifp->if_capenable & IFCAP_WOL) != 0) + if ((sc->alc_capenable & IFCAP_WOL) != 0) pmstat |= PCIM_PSTAT_PME | PCIM_PSTAT_PMEENABLE; pci_write_config(sc->alc_dev, sc->alc_pmcap + PCIR_POWER_STATUS, pmstat, 2); @@ -2640,7 +2612,6 @@ static int alc_resume(device_t dev) { struct alc_softc *sc; - struct ifnet *ifp; uint16_t pmstat; sc = device_get_softc(dev); @@ -2658,10 +2629,9 @@ alc_resume(device_t dev) } /* Reset PHY. */ alc_phy_reset(sc); - ifp = sc->alc_ifp; - if ((ifp->if_flags & IFF_UP) != 0) { - ifp->if_drv_flags &= ~IFF_DRV_RUNNING; - alc_init_locked(sc); + if ((sc->alc_if_flags & IFF_UP) != 0) { + sc->alc_flags &= ~ALC_FLAG_RUNNING; + alc_init(sc); } ALC_UNLOCK(sc); @@ -2900,59 +2870,54 @@ alc_encap(struct alc_softc *sc, struct m return (0); } -static void -alc_start(struct ifnet *ifp) +static int +alc_transmit(if_t ifp, struct mbuf *m) { struct alc_softc *sc; + int error; - sc = ifp->if_softc; + if ((error = if_snd_enqueue(ifp, m)) != 0) + return (error); + + sc = if_getsoftc(ifp, IF_DRIVER_SOFTC); ALC_LOCK(sc); - alc_start_locked(ifp); + error = alc_start(sc); ALC_UNLOCK(sc); + return (error); } -static void -alc_start_locked(struct ifnet *ifp) +static int +alc_start(struct alc_softc *sc) { - struct alc_softc *sc; - struct mbuf *m_head; + struct mbuf *m; int enq; - sc = ifp->if_softc; - ALC_LOCK_ASSERT(sc); /* Reclaim transmitted frames. */ if (sc->alc_cdata.alc_tx_cnt >= ALC_TX_DESC_HIWAT) alc_txeof(sc); - if ((ifp->if_drv_flags & (IFF_DRV_RUNNING | IFF_DRV_OACTIVE)) != - IFF_DRV_RUNNING || (sc->alc_flags & ALC_FLAG_LINK) == 0) - return; + if ((sc->alc_flags & (ALC_FLAG_LINK | ALC_FLAG_RUNNING)) != + (ALC_FLAG_LINK | ALC_FLAG_RUNNING)) + return (ENETDOWN); - for (enq = 0; !IFQ_DRV_IS_EMPTY(&ifp->if_snd); ) { - IFQ_DRV_DEQUEUE(&ifp->if_snd, m_head); - if (m_head == NULL) - break; + enq = 0; + while ((m = if_snd_dequeue(sc->alc_ifp)) != NULL) { /* * Pack the data into the transmit ring. If we * don't have room, set the OACTIVE flag and wait * for the NIC to drain the ring. */ - if (alc_encap(sc, &m_head)) { - if (m_head == NULL) + if (alc_encap(sc, &m)) { + if (m == NULL) break; - IFQ_DRV_PREPEND(&ifp->if_snd, m_head); - ifp->if_drv_flags |= IFF_DRV_OACTIVE; + if_snd_prepend(sc->alc_ifp, m); break; } enq++; - /* - * If there's a BPF listener, bounce a copy of this frame - * to him. - */ - ETHER_BPF_MTAP(ifp, m_head); + if_mtap(sc->alc_ifp, m, NULL, 0); } if (enq > 0) { @@ -2971,12 +2936,14 @@ alc_start_locked(struct ifnet *ifp) /* Set a timeout in case the chip goes out to lunch. */ sc->alc_watchdog_timer = ALC_TX_TIMEOUT; } + + return (0); } static void alc_watchdog(struct alc_softc *sc) { - struct ifnet *ifp; + if_t ifp; ALC_LOCK_ASSERT(sc); @@ -2985,30 +2952,31 @@ alc_watchdog(struct alc_softc *sc) ifp = sc->alc_ifp; if ((sc->alc_flags & ALC_FLAG_LINK) == 0) { - if_printf(sc->alc_ifp, "watchdog timeout (lost link)\n"); + if_printf(ifp, "watchdog timeout (lost link)\n"); if_inc_counter(ifp, IFCOUNTER_OERRORS, 1); - ifp->if_drv_flags &= ~IFF_DRV_RUNNING; - alc_init_locked(sc); + sc->alc_flags &= ~ALC_FLAG_RUNNING; + alc_init(sc); return; } - if_printf(sc->alc_ifp, "watchdog timeout -- resetting\n"); + if_printf(ifp, "watchdog timeout -- resetting\n"); if_inc_counter(ifp, IFCOUNTER_OERRORS, 1); - ifp->if_drv_flags &= ~IFF_DRV_RUNNING; - alc_init_locked(sc); - if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) - alc_start_locked(ifp); + sc->alc_flags &= ~ALC_FLAG_RUNNING; + alc_init(sc); + if (if_snd_len(ifp)) + alc_start(sc); } static int -alc_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) +alc_ioctl(if_t ifp, u_long cmd, void *data, struct thread *td) { struct alc_softc *sc; struct ifreq *ifr; struct mii_data *mii; + uint32_t oflags; int error, mask; - sc = ifp->if_softc; - ifr = (struct ifreq *)data; + sc = if_getsoftc(ifp, IF_DRIVER_SOFTC); + ifr = data; error = 0; switch (cmd) { case SIOCSIFMTU: @@ -3017,38 +2985,37 @@ alc_ioctl(struct ifnet *ifp, u_long cmd, sizeof(struct ether_vlan_header) - ETHER_CRC_LEN) || ((sc->alc_flags & ALC_FLAG_JUMBO) == 0 && ifr->ifr_mtu > ETHERMTU)) - error = EINVAL; - else if (ifp->if_mtu != ifr->ifr_mtu) { - ALC_LOCK(sc); - ifp->if_mtu = ifr->ifr_mtu; - /* AR81[3567]x has 13 bits MSS field. */ - if (ifp->if_mtu > ALC_TSO_MTU && - (ifp->if_capenable & IFCAP_TSO4) != 0) { - ifp->if_capenable &= ~IFCAP_TSO4; - ifp->if_hwassist &= ~CSUM_TSO; - VLAN_CAPABILITIES(ifp); - } - ALC_UNLOCK(sc); + return (EINVAL); + /* AR81[3567]x has 13 bits MSS field. */ + if (ifr->ifr_mtu > ALC_TSO_MTU && + (sc->alc_capenable & IFCAP_TSO4) != 0) { + struct ifreq tmp; + + if_drvioctl(ifp, SIOCGIFCAP, &tmp, td); + tmp.ifr_reqcap &= ~IFCAP_TSO4; + if_drvioctl(ifp, SIOCSIFCAP, &tmp, td); } + sc->alc_mtu = ifr->ifr_mtu; break; case SIOCSIFFLAGS: ALC_LOCK(sc); - if ((ifp->if_flags & IFF_UP) != 0) { - if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0 && - ((ifp->if_flags ^ sc->alc_if_flags) & + oflags = sc->alc_if_flags; + sc->alc_if_flags = ifr->ifr_flags; + if ((sc->alc_if_flags & IFF_UP) != 0) { + if ((sc->alc_flags & ALC_FLAG_RUNNING) != 0 && + ((oflags ^ sc->alc_if_flags) & (IFF_PROMISC | IFF_ALLMULTI)) != 0) alc_rxfilter(sc); else - alc_init_locked(sc); - } else if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) + alc_init(sc); + } else if ((sc->alc_flags & ALC_FLAG_RUNNING) != 0) alc_stop(sc); - sc->alc_if_flags = ifp->if_flags; ALC_UNLOCK(sc); break; case SIOCADDMULTI: case SIOCDELMULTI: ALC_LOCK(sc); - if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) + if ((sc->alc_flags & ALC_FLAG_RUNNING) != 0) alc_rxfilter(sc); ALC_UNLOCK(sc); break; @@ -3059,53 +3026,26 @@ alc_ioctl(struct ifnet *ifp, u_long cmd, break; case SIOCSIFCAP: ALC_LOCK(sc); - mask = ifr->ifr_reqcap ^ ifp->if_capenable; - if ((mask & IFCAP_TXCSUM) != 0 && - (ifp->if_capabilities & IFCAP_TXCSUM) != 0) { - ifp->if_capenable ^= IFCAP_TXCSUM; - if ((ifp->if_capenable & IFCAP_TXCSUM) != 0) - ifp->if_hwassist |= ALC_CSUM_FEATURES; - else - ifp->if_hwassist &= ~ALC_CSUM_FEATURES; - } - if ((mask & IFCAP_TSO4) != 0 && - (ifp->if_capabilities & IFCAP_TSO4) != 0) { - ifp->if_capenable ^= IFCAP_TSO4; - if ((ifp->if_capenable & IFCAP_TSO4) != 0) { - /* AR81[3567]x has 13 bits MSS field. */ - if (ifp->if_mtu > ALC_TSO_MTU) { - ifp->if_capenable &= ~IFCAP_TSO4; - ifp->if_hwassist &= ~CSUM_TSO; - } else - ifp->if_hwassist |= CSUM_TSO; - } else - ifp->if_hwassist &= ~CSUM_TSO; + mask = ifr->ifr_reqcap ^ ifr->ifr_curcap; + ifr->ifr_hwassist = 0; + if ((ifr->ifr_reqcap & IFCAP_TXCSUM) != 0) + ifr->ifr_hwassist |= ALC_CSUM_FEATURES; + if ((ifr->ifr_reqcap & IFCAP_TSO4) != 0) { + /* AR81[3567]x has 13 bits MSS field. */ + if (sc->alc_mtu > ALC_TSO_MTU) { + error = EINVAL; + ALC_UNLOCK(sc); + break; + } + ifr->ifr_hwassist |= CSUM_TSO; } - if ((mask & IFCAP_WOL_MCAST) != 0 && - (ifp->if_capabilities & IFCAP_WOL_MCAST) != 0) - ifp->if_capenable ^= IFCAP_WOL_MCAST; - if ((mask & IFCAP_WOL_MAGIC) != 0 && - (ifp->if_capabilities & IFCAP_WOL_MAGIC) != 0) - ifp->if_capenable ^= IFCAP_WOL_MAGIC; - if ((mask & IFCAP_VLAN_HWTAGGING) != 0 && - (ifp->if_capabilities & IFCAP_VLAN_HWTAGGING) != 0) { - ifp->if_capenable ^= IFCAP_VLAN_HWTAGGING; + sc->alc_capenable = ifr->ifr_reqcap; + if ((mask & IFCAP_VLAN_HWTAGGING) != 0) alc_rxvlan(sc); - } - if ((mask & IFCAP_VLAN_HWCSUM) != 0 && - (ifp->if_capabilities & IFCAP_VLAN_HWCSUM) != 0) - ifp->if_capenable ^= IFCAP_VLAN_HWCSUM; - if ((mask & IFCAP_VLAN_HWTSO) != 0 && - (ifp->if_capabilities & IFCAP_VLAN_HWTSO) != 0) - ifp->if_capenable ^= IFCAP_VLAN_HWTSO; - if ((ifp->if_capenable & IFCAP_VLAN_HWTAGGING) == 0) - ifp->if_capenable &= - ~(IFCAP_VLAN_HWTSO | IFCAP_VLAN_HWCSUM); ALC_UNLOCK(sc); - VLAN_CAPABILITIES(ifp); break; default: - error = ether_ioctl(ifp, cmd, data); + error = EOPNOTSUPP; break; } @@ -3186,7 +3126,7 @@ alc_stats_update(struct alc_softc *sc) { struct alc_hw_stats *stat; struct smb sb, *smb; - struct ifnet *ifp; + if_t ifp; uint32_t *reg; int i; @@ -3319,7 +3259,7 @@ static void alc_int_task(void *arg, int pending) { struct alc_softc *sc; - struct ifnet *ifp; + if_t ifp; uint32_t status; int more; @@ -3339,14 +3279,14 @@ alc_int_task(void *arg, int pending) CSR_WRITE_4(sc, ALC_INTR_STATUS, status | INTR_DIS_INT); more = 0; - if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) { + if ((sc->alc_flags & ALC_FLAG_RUNNING) != 0) { if ((status & INTR_RX_PKT) != 0) { more = alc_rxintr(sc, sc->alc_process_limit); if (more == EAGAIN) sc->alc_morework = 1; else if (more == EIO) { - ifp->if_drv_flags &= ~IFF_DRV_RUNNING; - alc_init_locked(sc); + sc->alc_flags &= ~ALC_FLAG_RUNNING; + alc_init(sc); ALC_UNLOCK(sc); return; } @@ -3362,14 +3302,13 @@ alc_int_task(void *arg, int pending) if ((status & INTR_TXQ_TO_RST) != 0) device_printf(sc->alc_dev, "TxQ reset! -- resetting\n"); - ifp->if_drv_flags &= ~IFF_DRV_RUNNING; - alc_init_locked(sc); + sc->alc_flags &= ~ALC_FLAG_RUNNING; + alc_init(sc); ALC_UNLOCK(sc); return; } - if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0 && - !IFQ_DRV_IS_EMPTY(&ifp->if_snd)) - alc_start_locked(ifp); + if ((sc->alc_flags & ALC_FLAG_RUNNING) != 0 && if_snd_len(ifp)) + alc_start(sc); } if (more == EAGAIN || @@ -3380,7 +3319,7 @@ alc_int_task(void *arg, int pending) } done: - if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) { + if ((sc->alc_flags & ALC_FLAG_RUNNING) != 0) { /* Re-enable interrupts if we're running. */ CSR_WRITE_4(sc, ALC_INTR_STATUS, 0x7FFFFFFF); } @@ -3390,15 +3329,12 @@ done: static void alc_txeof(struct alc_softc *sc) { - struct ifnet *ifp; struct alc_txdesc *txd; uint32_t cons, prod; int prog; ALC_LOCK_ASSERT(sc); - ifp = sc->alc_ifp; - if (sc->alc_cdata.alc_tx_cnt == 0) return; bus_dmamap_sync(sc->alc_cdata.alc_tx_ring_tag, @@ -3427,7 +3363,6 @@ alc_txeof(struct alc_softc *sc) if (sc->alc_cdata.alc_tx_cnt <= 0) break; prog++; - ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; sc->alc_cdata.alc_tx_cnt--; txd = &sc->alc_cdata.alc_txdesc[cons]; if (txd->tx_m != NULL) { @@ -3494,7 +3429,6 @@ alc_newbuf(struct alc_softc *sc, struct static int alc_rxintr(struct alc_softc *sc, int count) { - struct ifnet *ifp; struct rx_rdesc *rrd; uint32_t nsegs, status; int rr_cons, prog; @@ -3505,8 +3439,7 @@ alc_rxintr(struct alc_softc *sc, int cou bus_dmamap_sync(sc->alc_cdata.alc_rx_ring_tag, sc->alc_cdata.alc_rx_ring_map, BUS_DMASYNC_POSTWRITE); rr_cons = sc->alc_cdata.alc_rr_cons; - ifp = sc->alc_ifp; - for (prog = 0; (ifp->if_drv_flags & IFF_DRV_RUNNING) != 0;) { + for (prog = 0; (sc->alc_flags & ALC_FLAG_RUNNING) != 0;) { if (count-- <= 0) break; rrd = &sc->alc_rdata.alc_rr_ring[rr_cons]; @@ -3565,7 +3498,7 @@ alc_rxintr(struct alc_softc *sc, int cou #ifndef __NO_STRICT_ALIGNMENT static struct mbuf * -alc_fixup_rx(struct ifnet *ifp, struct mbuf *m) +alc_fixup_rx(if_t ifp, struct mbuf *m) { struct mbuf *n; int i; @@ -3606,7 +3539,7 @@ static void alc_rxeof(struct alc_softc *sc, struct rx_rdesc *rrd) { struct alc_rxdesc *rxd; - struct ifnet *ifp; + if_t ifp; struct mbuf *mp, *m; uint32_t rdinfo, status, vtag; int count, nsegs, rx_cons; @@ -3701,7 +3634,7 @@ alc_rxeof(struct alc_softc *sc, struct r * Due to hardware bugs, Rx checksum offloading * was intentionally disabled. */ - if ((ifp->if_capenable & IFCAP_VLAN_HWTAGGING) != 0 && + if ((sc->alc_capenable & IFCAP_VLAN_HWTAGGING) != 0 && (status & RRD_VLAN_TAG) != 0) { vtag = RRD_VLAN(le32toh(rrd->vtag)); m->m_pkthdr.ether_vtag = ntohs(vtag); @@ -3714,7 +3647,7 @@ alc_rxeof(struct alc_softc *sc, struct r { /* Pass it on. */ ALC_UNLOCK(sc); - (*ifp->if_input)(ifp, m); + if_input(ifp, m); ALC_LOCK(sc); } } @@ -3872,20 +3805,8 @@ alc_reset(struct alc_softc *sc) } static void -alc_init(void *xsc) +alc_init(struct alc_softc *sc) { - struct alc_softc *sc; - - sc = (struct alc_softc *)xsc; - ALC_LOCK(sc); - alc_init_locked(sc); - ALC_UNLOCK(sc); -} - -static void -alc_init_locked(struct alc_softc *sc) -{ - struct ifnet *ifp; struct mii_data *mii; uint8_t eaddr[ETHER_ADDR_LEN]; bus_addr_t paddr; @@ -3893,10 +3814,9 @@ alc_init_locked(struct alc_softc *sc) ALC_LOCK_ASSERT(sc); - ifp = sc->alc_ifp; mii = device_get_softc(sc->alc_miibus); - if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) + if ((sc->alc_flags & ALC_FLAG_RUNNING) != 0) return; /* * Cancel any pending I/O. @@ -3931,7 +3851,7 @@ alc_init_locked(struct alc_softc *sc) CSR_WRITE_4(sc, ALC_CLK_GATING_CFG, 0); /* Reprogram the station address. */ - bcopy(IF_LLADDR(ifp), eaddr, ETHER_ADDR_LEN); + bcopy(if_lladdr(sc->alc_ifp), eaddr, ETHER_ADDR_LEN); CSR_WRITE_4(sc, ALC_PAR0, eaddr[2] << 24 | eaddr[3] << 16 | eaddr[4] << 8 | eaddr[5]); CSR_WRITE_4(sc, ALC_PAR1, eaddr[0] << 8 | eaddr[1]); @@ -4261,9 +4181,7 @@ alc_init_locked(struct alc_softc *sc) CSR_WRITE_4(sc, ALC_INTR_STATUS, 0xFFFFFFFF); CSR_WRITE_4(sc, ALC_INTR_STATUS, 0); - ifp->if_drv_flags |= IFF_DRV_RUNNING; - ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; - + sc->alc_flags |= ALC_FLAG_RUNNING; sc->alc_flags &= ~ALC_FLAG_LINK; /* Switch to the current media. */ alc_mediachange_locked(sc); @@ -4274,7 +4192,6 @@ alc_init_locked(struct alc_softc *sc) static void alc_stop(struct alc_softc *sc) { - struct ifnet *ifp; struct alc_txdesc *txd; struct alc_rxdesc *rxd; uint32_t reg; @@ -4284,9 +4201,7 @@ alc_stop(struct alc_softc *sc) /* * Mark the interface down and cancel the watchdog timer. */ - ifp = sc->alc_ifp; - ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); - sc->alc_flags &= ~ALC_FLAG_LINK; + sc->alc_flags &= ~(ALC_FLAG_LINK | ALC_FLAG_RUNNING); callout_stop(&sc->alc_tick_ch); sc->alc_watchdog_timer = 0; alc_stats_update(sc); @@ -4529,14 +4444,12 @@ alc_init_smb(struct alc_softc *sc) static void alc_rxvlan(struct alc_softc *sc) { - struct ifnet *ifp; uint32_t reg; ALC_LOCK_ASSERT(sc); - ifp = sc->alc_ifp; reg = CSR_READ_4(sc, ALC_MAC_CFG); - if ((ifp->if_capenable & IFCAP_VLAN_HWTAGGING) != 0) + if ((sc->alc_capenable & IFCAP_VLAN_HWTAGGING) != 0) reg |= MAC_CFG_VLAN_TAG_STRIP; else reg &= ~MAC_CFG_VLAN_TAG_STRIP; @@ -4544,43 +4457,42 @@ alc_rxvlan(struct alc_softc *sc) } static void +alc_hash_maddr(void *arg, struct sockaddr *maddr) +{ + struct sockaddr_dl *sdl = (struct sockaddr_dl *)maddr; + uint32_t *mchash, crc; + + if (sdl->sdl_family != AF_LINK) + return; + + mchash = arg; + crc = ether_crc32_be(LLADDR(sdl), ETHER_ADDR_LEN); + mchash[crc >> 31] |= 1 << ((crc >> 26) & 0x1f); +} + +static void alc_rxfilter(struct alc_softc *sc) { - struct ifnet *ifp; - struct ifmultiaddr *ifma; - uint32_t crc; uint32_t mchash[2]; uint32_t rxcfg; ALC_LOCK_ASSERT(sc); - ifp = sc->alc_ifp; - bzero(mchash, sizeof(mchash)); rxcfg = CSR_READ_4(sc, ALC_MAC_CFG); rxcfg &= ~(MAC_CFG_ALLMULTI | MAC_CFG_BCAST | MAC_CFG_PROMISC); - if ((ifp->if_flags & IFF_BROADCAST) != 0) + if ((sc->alc_if_flags & IFF_BROADCAST) != 0) rxcfg |= MAC_CFG_BCAST; - if ((ifp->if_flags & (IFF_PROMISC | IFF_ALLMULTI)) != 0) { - if ((ifp->if_flags & IFF_PROMISC) != 0) + if ((sc->alc_if_flags & (IFF_PROMISC | IFF_ALLMULTI)) != 0) { + if ((sc->alc_if_flags & IFF_PROMISC) != 0) rxcfg |= MAC_CFG_PROMISC; - if ((ifp->if_flags & IFF_ALLMULTI) != 0) + if ((sc->alc_if_flags & IFF_ALLMULTI) != 0) rxcfg |= MAC_CFG_ALLMULTI; mchash[0] = 0xFFFFFFFF; mchash[1] = 0xFFFFFFFF; goto chipit; } - - if_maddr_rlock(ifp); - TAILQ_FOREACH(ifma, &sc->alc_ifp->if_multiaddrs, ifma_link) { - if (ifma->ifma_addr->sa_family != AF_LINK) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Fri Apr 17 12:10:05 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B16DCED4; Fri, 17 Apr 2015 12:10:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 9DF57788; Fri, 17 Apr 2015 12:10:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3HCA51u032355; Fri, 17 Apr 2015 12:10:05 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3HCA0PH032297; Fri, 17 Apr 2015 12:10:00 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201504171210.t3HCA0PH032297@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Fri, 17 Apr 2015 12:10:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r281650 - in projects/ifnet/sys: arm/arm dev/cxgbe/tom dev/usb/video modules/usb net/altq netinet netinet6 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: Fri, 17 Apr 2015 12:10:05 -0000 Author: glebius Date: Fri Apr 17 12:10:00 2015 New Revision: 281650 URL: https://svnweb.freebsd.org/changeset/base/281650 Log: Merge head r257698 through r281649. Deleted: projects/ifnet/sys/net/altq/altqconf.h Modified: projects/ifnet/sys/arm/arm/trap-v6.c projects/ifnet/sys/arm/arm/vm_machdep.c projects/ifnet/sys/dev/cxgbe/tom/t4_listen.c projects/ifnet/sys/dev/usb/video/udl.c projects/ifnet/sys/dev/usb/video/udl.h projects/ifnet/sys/modules/usb/Makefile projects/ifnet/sys/net/altq/altq.h projects/ifnet/sys/net/altq/altq_cbq.c projects/ifnet/sys/net/altq/altq_cdnr.c projects/ifnet/sys/net/altq/altq_classq.h projects/ifnet/sys/net/altq/altq_hfsc.c projects/ifnet/sys/net/altq/altq_priq.c projects/ifnet/sys/net/altq/altq_red.c projects/ifnet/sys/net/altq/altq_rio.c projects/ifnet/sys/net/altq/altq_rmclass.c projects/ifnet/sys/net/altq/altq_rmclass_debug.h projects/ifnet/sys/net/altq/altq_subr.c projects/ifnet/sys/net/altq/altq_var.h projects/ifnet/sys/net/altq/if_altq.h projects/ifnet/sys/netinet/in.c projects/ifnet/sys/netinet/in.h projects/ifnet/sys/netinet6/in6.c projects/ifnet/sys/netinet6/in6.h Directory Properties: projects/ifnet/ (props changed) projects/ifnet/sys/ (props changed) Modified: projects/ifnet/sys/arm/arm/trap-v6.c ============================================================================== --- projects/ifnet/sys/arm/arm/trap-v6.c Fri Apr 17 11:57:06 2015 (r281649) +++ projects/ifnet/sys/arm/arm/trap-v6.c Fri Apr 17 12:10:00 2015 (r281650) @@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include @@ -287,7 +288,11 @@ abort_handler(struct trapframe *tf, int #endif td = curthread; fsr = (prefetch) ? cp15_ifsr_get(): cp15_dfsr_get(); +#if __ARM_ARCH >= 7 + far = (prefetch) ? cp15_ifar_get() : cp15_dfar_get(); +#else far = (prefetch) ? TRAPF_PC(tf) : cp15_dfar_get(); +#endif idx = FSR_TO_FAULT(fsr); usermode = TRAPF_USERMODE(tf); /* Abort came from user mode? */ Modified: projects/ifnet/sys/arm/arm/vm_machdep.c ============================================================================== --- projects/ifnet/sys/arm/arm/vm_machdep.c Fri Apr 17 11:57:06 2015 (r281649) +++ projects/ifnet/sys/arm/arm/vm_machdep.c Fri Apr 17 12:10:00 2015 (r281650) @@ -178,11 +178,7 @@ cpu_set_syscall_retval(struct thread *td * place the returned data into r1. As the lseek and frerebsd6_lseek * syscalls also return an off_t they do not need this fixup. */ -#ifdef __ARM_EABI__ call = frame->tf_r7; -#else - call = *(u_int32_t *)(frame->tf_pc - INSN_SIZE) & 0x000fffff; -#endif if (call == SYS___syscall) { register_t *ap = &frame->tf_r0; register_t code = ap[_QUAD_LOWWORD]; Modified: projects/ifnet/sys/dev/cxgbe/tom/t4_listen.c ============================================================================== --- projects/ifnet/sys/dev/cxgbe/tom/t4_listen.c Fri Apr 17 11:57:06 2015 (r281649) +++ projects/ifnet/sys/dev/cxgbe/tom/t4_listen.c Fri Apr 17 12:10:00 2015 (r281650) @@ -1090,35 +1090,6 @@ pass_accept_req_to_protohdrs(const struc } } -static int -ifnet_has_ip6(struct ifnet *ifp, struct in6_addr *ip6) -{ - struct ifaddr *ifa; - struct sockaddr_in6 *sin6; - int found = 0; - struct in6_addr in6 = *ip6; - - /* Just as in ip6_input */ - if (in6_clearscope(&in6) || in6_clearscope(&in6)) - return (0); - in6_setscope(&in6, ifp, NULL); - - if_addr_rlock(ifp); - TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) { - sin6 = (void *)ifa->ifa_addr; - if (sin6->sin6_family != AF_INET6) - continue; - - if (IN6_ARE_ADDR_EQUAL(&sin6->sin6_addr, &in6)) { - found = 1; - break; - } - } - if_addr_runlock(ifp); - - return (found); -} - static struct l2t_entry * get_l2te_for_nexthop(struct port_info *pi, struct ifnet *ifp, struct in_conninfo *inc) @@ -1166,29 +1137,6 @@ get_l2te_for_nexthop(struct port_info *p return (e); } -static int -ifnet_has_ip(struct ifnet *ifp, struct in_addr in) -{ - struct ifaddr *ifa; - struct sockaddr_in *sin; - int found = 0; - - if_addr_rlock(ifp); - TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) { - sin = (void *)ifa->ifa_addr; - if (sin->sin_family != AF_INET) - continue; - - if (sin->sin_addr.s_addr == in.s_addr) { - found = 1; - break; - } - } - if_addr_runlock(ifp); - - return (found); -} - #define REJECT_PASS_ACCEPT() do { \ reject_reason = __LINE__; \ goto reject; \ @@ -1281,7 +1229,7 @@ do_pass_accept_req(struct sge_iq *iq, co * SYN must be directed to an IP6 address on this ifnet. This * is more restrictive than in6_localip. */ - if (!ifnet_has_ip6(ifp, &inc.inc6_laddr)) + if (!in6_ifhasaddr(ifp, &inc.inc6_laddr)) REJECT_PASS_ACCEPT(); } else { @@ -1293,7 +1241,7 @@ do_pass_accept_req(struct sge_iq *iq, co * SYN must be directed to an IP address on this ifnet. This * is more restrictive than in_localip. */ - if (!ifnet_has_ip(ifp, inc.inc_laddr)) + if (!in_ifhasaddr(ifp, inc.inc_laddr)) REJECT_PASS_ACCEPT(); } Modified: projects/ifnet/sys/dev/usb/video/udl.c ============================================================================== --- projects/ifnet/sys/dev/usb/video/udl.c Fri Apr 17 11:57:06 2015 (r281649) +++ projects/ifnet/sys/dev/usb/video/udl.c Fri Apr 17 12:10:00 2015 (r281650) @@ -76,6 +76,11 @@ static int udl_fps = 25; SYSCTL_INT(_hw_usb_udl, OID_AUTO, fps, CTLFLAG_RWTUN, &udl_fps, 0, "Frames Per Second, 1-60"); +static struct mtx udl_buffer_mtx; +static struct udl_buffer_head udl_buffer_head; + +MALLOC_DEFINE(M_USB_DL, "USB", "USB DisplayLink"); + /* * Prototypes. */ @@ -175,6 +180,56 @@ static const STRUCT_USB_HOST_ID udl_devs {USB_VPI(USB_VENDOR_DISPLAYLINK, USB_PRODUCT_DISPLAYLINK_LT1421, DLUNK)} }; +static void +udl_buffer_init(void *arg) +{ + mtx_init(&udl_buffer_mtx, "USB", "UDL", MTX_DEF); + TAILQ_INIT(&udl_buffer_head); +} +SYSINIT(udl_buffer_init, SI_SUB_LOCK, SI_ORDER_FIRST, udl_buffer_init, NULL); + +CTASSERT(sizeof(struct udl_buffer) < PAGE_SIZE); + +static void * +udl_buffer_alloc(uint32_t size) +{ + struct udl_buffer *buf; + mtx_lock(&udl_buffer_mtx); + TAILQ_FOREACH(buf, &udl_buffer_head, entry) { + if (buf->size == size) { + TAILQ_REMOVE(&udl_buffer_head, buf, entry); + break; + } + } + mtx_unlock(&udl_buffer_mtx); + if (buf != NULL) { + /* wipe and recycle buffer */ + memset(buf, 0, size); + return (buf); + } + /* allocate new buffer */ + return (malloc(size, M_USB_DL, M_WAITOK | M_ZERO)); +} + +static void +udl_buffer_free(void *_buf, uint32_t size) +{ + struct udl_buffer *buf; + + buf = (struct udl_buffer *)_buf; + if (buf == NULL) + return; + + /* + * Memory mapped buffers should never be freed. + * Put display buffer into a recycle list. + */ + mtx_lock(&udl_buffer_mtx); + buf->size = size; + TAILQ_INSERT_TAIL(&udl_buffer_head, buf, entry); + mtx_unlock(&udl_buffer_mtx); +} + static uint32_t udl_get_fb_size(struct udl_softc *sc) { @@ -403,11 +458,11 @@ udl_detach(device_t dev) mtx_destroy(&sc->sc_mtx); cv_destroy(&sc->sc_cv); - /* - * Free framebuffer memory, if any. - */ - free(sc->sc_fb_addr, M_DEVBUF); - free(sc->sc_fb_copy, M_DEVBUF); + /* put main framebuffer into a recycle list, if any */ + udl_buffer_free(sc->sc_fb_addr, sc->sc_fb_size); + + /* free shadow framebuffer memory, if any */ + free(sc->sc_fb_copy, M_USB_DL); return (0); } @@ -782,13 +837,15 @@ udl_fbmem_alloc(struct udl_softc *sc) size = udl_get_fb_size(sc); size = round_page(size); - + /* check for zero size */ + if (size == 0) + size = PAGE_SIZE; /* * It is assumed that allocations above PAGE_SIZE bytes will * be PAGE_SIZE aligned for use with mmap() */ - sc->sc_fb_addr = malloc(size, M_DEVBUF, M_WAITOK | M_ZERO); - sc->sc_fb_copy = malloc(size, M_DEVBUF, M_WAITOK | M_ZERO); + sc->sc_fb_addr = udl_buffer_alloc(size); + sc->sc_fb_copy = malloc(size, M_USB_DL, M_WAITOK | M_ZERO); sc->sc_fb_size = size; } Modified: projects/ifnet/sys/dev/usb/video/udl.h ============================================================================== --- projects/ifnet/sys/dev/usb/video/udl.h Fri Apr 17 11:57:06 2015 (r281649) +++ projects/ifnet/sys/dev/usb/video/udl.h Fri Apr 17 12:10:00 2015 (r281650) @@ -34,6 +34,15 @@ #define UDL_FONT_HEIGHT 16 /* pixels */ #define UDL_MAX_MODES 25 /* units */ +MALLOC_DECLARE(M_USB_DL); + +struct udl_buffer { + TAILQ_ENTRY(udl_buffer) entry; + uint32_t size; +}; + +TAILQ_HEAD(udl_buffer_head, udl_buffer); + struct udl_cmd_buf { TAILQ_ENTRY(udl_cmd_buf) entry; uint32_t off; Modified: projects/ifnet/sys/modules/usb/Makefile ============================================================================== --- projects/ifnet/sys/modules/usb/Makefile Fri Apr 17 11:57:06 2015 (r281649) +++ projects/ifnet/sys/modules/usb/Makefile Fri Apr 17 12:10:00 2015 (r281650) @@ -56,6 +56,7 @@ SUBDIR += ${_urtwn} ${_urtwnfw} SUBDIR += atp uhid ukbd ums udbp ufm uep wsp uled SUBDIR += ucom u3g uark ubsa ubser uchcom ucycom ufoma uftdi ugensa uipaq ulpt \ umct umcs umodem umoscom uplcom uslcom uvisor uvscom +SUBDIR += udl SUBDIR += uether aue axe axge cdce cue ${_kue} mos rue smsc udav uhso ipheth SUBDIR += urndis SUBDIR += usfs umass urio Modified: projects/ifnet/sys/net/altq/altq.h ============================================================================== --- projects/ifnet/sys/net/altq/altq.h Fri Apr 17 11:57:06 2015 (r281649) +++ projects/ifnet/sys/net/altq/altq.h Fri Apr 17 12:10:00 2015 (r281650) @@ -1,7 +1,4 @@ -/* $FreeBSD$ */ -/* $KAME: altq.h,v 1.10 2003/07/10 12:07:47 kjc Exp $ */ - -/* +/*- * Copyright (C) 1998-2003 * Sony Computer Science Laboratories Inc. All rights reserved. * @@ -25,6 +22,9 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $KAME: altq.h,v 1.10 2003/07/10 12:07:47 kjc Exp $ + * $FreeBSD$ */ #ifndef _ALTQ_ALTQ_H_ #define _ALTQ_ALTQ_H_ Modified: projects/ifnet/sys/net/altq/altq_cbq.c ============================================================================== --- projects/ifnet/sys/net/altq/altq_cbq.c Fri Apr 17 11:57:06 2015 (r281649) +++ projects/ifnet/sys/net/altq/altq_cbq.c Fri Apr 17 12:10:00 2015 (r281650) @@ -1,7 +1,4 @@ -/* $FreeBSD$ */ -/* $KAME: altq_cbq.c,v 1.19 2003/09/17 14:23:25 kjc Exp $ */ - -/* +/*- * Copyright (c) Sun Microsystems, Inc. 1993-1998 All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -29,15 +26,14 @@ * provided "as is" without express or implied warranty of any kind. * * These notices must be retained in any copies of any part of this software. + * + * $KAME: altq_cbq.c,v 1.19 2003/09/17 14:23:25 kjc Exp $ + * $FreeBSD$ */ -#if defined(__FreeBSD__) || defined(__NetBSD__) #include "opt_altq.h" #include "opt_inet.h" -#ifdef __FreeBSD__ #include "opt_inet6.h" -#endif -#endif /* __FreeBSD__ || __NetBSD__ */ #ifdef ALTQ_CBQ /* cbq is enabled by ALTQ_CBQ option in opt_altq.h */ #include @@ -251,11 +247,7 @@ cbq_pfattach(struct pf_altq *a) if ((ifp = ifunit(a->ifname)) == NULL || a->altq_disc == NULL) return (EINVAL); -#ifdef __NetBSD__ s = splnet(); -#else - s = splimp(); -#endif error = altq_attach(&ifp->if_snd, ALTQT_CBQ, a->altq_disc, cbq_enqueue, cbq_dequeue, cbq_request, NULL, NULL); splx(s); Modified: projects/ifnet/sys/net/altq/altq_cdnr.c ============================================================================== --- projects/ifnet/sys/net/altq/altq_cdnr.c Fri Apr 17 11:57:06 2015 (r281649) +++ projects/ifnet/sys/net/altq/altq_cdnr.c Fri Apr 17 12:10:00 2015 (r281650) @@ -1,7 +1,4 @@ -/* $FreeBSD$ */ -/* $KAME: altq_cdnr.c,v 1.15 2005/04/13 03:44:24 suz Exp $ */ - -/* +/*- * Copyright (C) 1999-2002 * Sony Computer Science Laboratories Inc. All rights reserved. * @@ -25,15 +22,14 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $KAME: altq_cdnr.c,v 1.15 2005/04/13 03:44:24 suz Exp $ + * $FreeBSD$ */ -#if defined(__FreeBSD__) || defined(__NetBSD__) #include "opt_altq.h" #include "opt_inet.h" -#ifdef __FreeBSD__ #include "opt_inet6.h" -#endif -#endif /* __FreeBSD__ || __NetBSD__ */ #include #include @@ -1272,11 +1268,7 @@ cdnrioctl(dev, cmd, addr, flag, p) break; } -#ifdef __NetBSD__ s = splnet(); -#else - s = splimp(); -#endif switch (cmd) { case CDNR_IF_ATTACH: Modified: projects/ifnet/sys/net/altq/altq_classq.h ============================================================================== --- projects/ifnet/sys/net/altq/altq_classq.h Fri Apr 17 11:57:06 2015 (r281649) +++ projects/ifnet/sys/net/altq/altq_classq.h Fri Apr 17 12:10:00 2015 (r281650) @@ -1,6 +1,4 @@ -/* $KAME: altq_classq.h,v 1.6 2003/01/07 07:33:38 kjc Exp $ */ - -/* +/*- * Copyright (c) 1991-1997 Regents of the University of California. * All rights reserved. * @@ -31,6 +29,9 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $KAME: altq_classq.h,v 1.6 2003/01/07 07:33:38 kjc Exp $ + * $FreeBSD$ */ /* * class queue definitions extracted from rm_class.h. Modified: projects/ifnet/sys/net/altq/altq_hfsc.c ============================================================================== --- projects/ifnet/sys/net/altq/altq_hfsc.c Fri Apr 17 11:57:06 2015 (r281649) +++ projects/ifnet/sys/net/altq/altq_hfsc.c Fri Apr 17 12:10:00 2015 (r281650) @@ -1,7 +1,4 @@ -/* $FreeBSD$ */ -/* $KAME: altq_hfsc.c,v 1.24 2003/12/05 05:40:46 kjc Exp $ */ - -/* +/*- * Copyright (c) 1997-1999 Carnegie Mellon University. All Rights Reserved. * * Permission to use, copy, modify, and distribute this software and @@ -29,6 +26,9 @@ * software to return any improvements or extensions that they make, * and to grant Carnegie Mellon the rights to redistribute these * changes without encumbrance. + * + * $KAME: altq_hfsc.c,v 1.24 2003/12/05 05:40:46 kjc Exp $ + * $FreeBSD$ */ /* * H-FSC is described in Proceedings of SIGCOMM'97, @@ -42,13 +42,9 @@ * a class whose fit-time exceeds the current time. */ -#if defined(__FreeBSD__) || defined(__NetBSD__) #include "opt_altq.h" #include "opt_inet.h" -#ifdef __FreeBSD__ #include "opt_inet6.h" -#endif -#endif /* __FreeBSD__ || __NetBSD__ */ #ifdef ALTQ_HFSC /* hfsc is enabled by ALTQ_HFSC option in opt_altq.h */ @@ -177,11 +173,7 @@ hfsc_pfattach(struct pf_altq *a) if ((ifp = ifunit(a->ifname)) == NULL || a->altq_disc == NULL) return (EINVAL); -#ifdef __NetBSD__ s = splnet(); -#else - s = splimp(); -#endif error = altq_attach(&ifp->if_snd, ALTQT_HFSC, a->altq_disc, hfsc_enqueue, hfsc_dequeue, hfsc_request, NULL, NULL); splx(s); @@ -483,11 +475,7 @@ hfsc_class_create(struct hfsc_if *hif, s cl->cl_hif = hif; cl->cl_parent = parent; -#ifdef __NetBSD__ s = splnet(); -#else - s = splimp(); -#endif IFQ_LOCK(hif->hif_ifq); hif->hif_classes++; @@ -567,11 +555,7 @@ hfsc_class_destroy(struct hfsc_class *cl if (is_a_parent_class(cl)) return (EBUSY); -#ifdef __NetBSD__ s = splnet(); -#else - s = splimp(); -#endif IFQ_LOCK(cl->cl_hif->hif_ifq); #ifdef ALTQ3_COMPAT @@ -1771,11 +1755,7 @@ hfsc_class_modify(cl, rsc, fsc, usc) } cur_time = read_machclk(); -#ifdef __NetBSD__ s = splnet(); -#else - s = splimp(); -#endif IFQ_LOCK(cl->cl_hif->hif_ifq); if (rsc != NULL) { Modified: projects/ifnet/sys/net/altq/altq_priq.c ============================================================================== --- projects/ifnet/sys/net/altq/altq_priq.c Fri Apr 17 11:57:06 2015 (r281649) +++ projects/ifnet/sys/net/altq/altq_priq.c Fri Apr 17 12:10:00 2015 (r281650) @@ -1,6 +1,4 @@ -/* $FreeBSD$ */ -/* $KAME: altq_priq.c,v 1.11 2003/09/17 14:23:25 kjc Exp $ */ -/* +/*- * Copyright (C) 2000-2003 * Sony Computer Science Laboratories Inc. All rights reserved. * @@ -24,18 +22,17 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $KAME: altq_priq.c,v 1.11 2003/09/17 14:23:25 kjc Exp $ + * $FreeBSD$ */ /* * priority queue */ -#if defined(__FreeBSD__) || defined(__NetBSD__) #include "opt_altq.h" #include "opt_inet.h" -#ifdef __FreeBSD__ #include "opt_inet6.h" -#endif -#endif /* __FreeBSD__ || __NetBSD__ */ #ifdef ALTQ_PRIQ /* priq is enabled by ALTQ_PRIQ option in opt_altq.h */ @@ -113,11 +110,7 @@ priq_pfattach(struct pf_altq *a) if ((ifp = ifunit(a->ifname)) == NULL || a->altq_disc == NULL) return (EINVAL); -#ifdef __NetBSD__ s = splnet(); -#else - s = splimp(); -#endif error = altq_attach(&ifp->if_snd, ALTQT_PRIQ, a->altq_disc, priq_enqueue, priq_dequeue, priq_request, NULL, NULL); splx(s); @@ -300,11 +293,7 @@ priq_class_create(struct priq_if *pif, i if ((cl = pif->pif_classes[pri]) != NULL) { /* modify the class instead of creating a new one */ -#ifdef __NetBSD__ s = splnet(); -#else - s = splimp(); -#endif IFQ_LOCK(cl->cl_pif->pif_ifq); if (!qempty(cl->cl_q)) priq_purgeq(cl); @@ -407,11 +396,7 @@ priq_class_destroy(struct priq_class *cl struct priq_if *pif; int s, pri; -#ifdef __NetBSD__ s = splnet(); -#else - s = splimp(); -#endif IFQ_LOCK(cl->cl_pif->pif_ifq); #ifdef ALTQ3_CLFIER_COMPAT Modified: projects/ifnet/sys/net/altq/altq_red.c ============================================================================== --- projects/ifnet/sys/net/altq/altq_red.c Fri Apr 17 11:57:06 2015 (r281649) +++ projects/ifnet/sys/net/altq/altq_red.c Fri Apr 17 12:10:00 2015 (r281650) @@ -1,7 +1,4 @@ -/* $FreeBSD$ */ -/* $KAME: altq_red.c,v 1.18 2003/09/05 22:40:36 itojun Exp $ */ - -/* +/*- * Copyright (C) 1997-2003 * Sony Computer Science Laboratories Inc. All rights reserved. * @@ -27,7 +24,7 @@ * SUCH DAMAGE. * */ -/* +/*- * Copyright (c) 1990-1994 Regents of the University of California. * All rights reserved. * @@ -58,15 +55,14 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $KAME: altq_red.c,v 1.18 2003/09/05 22:40:36 itojun Exp $ + * $FreeBSD$ */ -#if defined(__FreeBSD__) || defined(__NetBSD__) #include "opt_altq.h" #include "opt_inet.h" -#ifdef __FreeBSD__ #include "opt_inet6.h" -#endif -#endif /* __FreeBSD__ || __NetBSD__ */ #ifdef ALTQ_RED /* red is enabled by ALTQ_RED option in opt_altq.h */ #include @@ -944,11 +940,7 @@ redioctl(dev, cmd, addr, flag, p) break; } -#ifdef __NetBSD__ s = splnet(); -#else - s = splimp(); -#endif red_purgeq(rqp); limit = fc->red_limit; if (limit < fc->red_thmax) Modified: projects/ifnet/sys/net/altq/altq_rio.c ============================================================================== --- projects/ifnet/sys/net/altq/altq_rio.c Fri Apr 17 11:57:06 2015 (r281649) +++ projects/ifnet/sys/net/altq/altq_rio.c Fri Apr 17 12:10:00 2015 (r281650) @@ -1,7 +1,4 @@ -/* $FreeBSD$ */ -/* $KAME: altq_rio.c,v 1.17 2003/07/10 12:07:49 kjc Exp $ */ - -/* +/*- * Copyright (C) 1998-2003 * Sony Computer Science Laboratories Inc. All rights reserved. * @@ -26,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* +/*- * Copyright (c) 1990-1994 Regents of the University of California. * All rights reserved. * @@ -57,15 +54,14 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $KAME: altq_rio.c,v 1.17 2003/07/10 12:07:49 kjc Exp $ + * $FreeBSD$ */ -#if defined(__FreeBSD__) || defined(__NetBSD__) #include "opt_altq.h" #include "opt_inet.h" -#ifdef __FreeBSD__ #include "opt_inet6.h" -#endif -#endif /* __FreeBSD__ || __NetBSD__ */ #ifdef ALTQ_RIO /* rio is enabled by ALTQ_RIO option in opt_altq.h */ #include @@ -684,11 +680,7 @@ rioioctl(dev, cmd, addr, flag, p) break; } -#ifdef __NetBSD__ s = splnet(); -#else - s = splimp(); -#endif _flushq(rqp->rq_q); limit = fc->rio_limit; if (limit < fc->q_params[RIO_NDROPPREC-1].th_max) Modified: projects/ifnet/sys/net/altq/altq_rmclass.c ============================================================================== --- projects/ifnet/sys/net/altq/altq_rmclass.c Fri Apr 17 11:57:06 2015 (r281649) +++ projects/ifnet/sys/net/altq/altq_rmclass.c Fri Apr 17 12:10:00 2015 (r281650) @@ -1,7 +1,4 @@ -/* $FreeBSD$ */ -/* $KAME: altq_rmclass.c,v 1.19 2005/04/13 03:44:25 suz Exp $ */ - -/* +/*- * Copyright (c) 1991-1997 Regents of the University of California. * All rights reserved. * @@ -37,14 +34,12 @@ * For questions and/or comments, please send mail to cbq@ee.lbl.gov * * @(#)rm_class.c 1.48 97/12/05 SMI + * $KAME: altq_rmclass.c,v 1.19 2005/04/13 03:44:25 suz Exp $ + * $FreeBSD$ */ -#if defined(__FreeBSD__) || defined(__NetBSD__) #include "opt_altq.h" #include "opt_inet.h" -#ifdef __FreeBSD__ #include "opt_inet6.h" -#endif -#endif /* __FreeBSD__ || __NetBSD__ */ #ifdef ALTQ_CBQ /* cbq is enabled by ALTQ_CBQ option in opt_altq.h */ #include @@ -306,11 +301,7 @@ rmc_newclass(int pri, struct rm_ifdat *i /* * put the class into the class tree */ -#ifdef __NetBSD__ s = splnet(); -#else - s = splimp(); -#endif IFQ_LOCK(ifd->ifq_); if ((peer = ifd->active_[pri]) != NULL) { /* find the last class at this pri */ @@ -359,11 +350,7 @@ rmc_modclass(struct rm_class *cl, u_int ifd = cl->ifdat_; old_allotment = cl->allotment_; -#ifdef __NetBSD__ s = splnet(); -#else - s = splimp(); -#endif IFQ_LOCK(ifd->ifq_); cl->allotment_ = RM_NS_PER_SEC / nsecPerByte; /* Bytes per sec */ cl->qthresh_ = 0; @@ -559,11 +546,7 @@ rmc_delete_class(struct rm_ifdat *ifd, s if (cl->sleeping_) CALLOUT_STOP(&cl->callout_); -#ifdef __NetBSD__ s = splnet(); -#else - s = splimp(); -#endif IFQ_LOCK(ifd->ifq_); /* * Free packets in the packet queue. @@ -1531,13 +1514,8 @@ rmc_delay_action(struct rm_class *cl, st * a 'backstop' to restart this class. */ if (delay > tick * 2) { -#ifdef __FreeBSD__ /* FreeBSD rounds up the tick */ t = hzto(&cl->undertime_); -#else - /* other BSDs round down the tick */ - t = hzto(&cl->undertime_) + 1; -#endif } else t = 2; CALLOUT_RESET(&cl->callout_, t, @@ -1568,11 +1546,7 @@ rmc_restart(struct rm_class *cl) struct rm_ifdat *ifd = cl->ifdat_; int s; -#ifdef __NetBSD__ s = splnet(); -#else - s = splimp(); -#endif IFQ_LOCK(ifd->ifq_); if (cl->sleeping_) { cl->sleeping_ = 0; Modified: projects/ifnet/sys/net/altq/altq_rmclass_debug.h ============================================================================== --- projects/ifnet/sys/net/altq/altq_rmclass_debug.h Fri Apr 17 11:57:06 2015 (r281649) +++ projects/ifnet/sys/net/altq/altq_rmclass_debug.h Fri Apr 17 12:10:00 2015 (r281650) @@ -1,6 +1,4 @@ -/* $KAME: altq_rmclass_debug.h,v 1.3 2002/11/29 04:36:24 kjc Exp $ */ - -/* +/*- * Copyright (c) Sun Microsystems, Inc. 1998 All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -28,6 +26,9 @@ * provided "as is" without express or implied warranty of any kind. * * These notices must be retained in any copies of any part of this software. + * + * $KAME: altq_rmclass_debug.h,v 1.3 2002/11/29 04:36:24 kjc Exp $ + * $FreeBSD$ */ #ifndef _ALTQ_ALTQ_RMCLASS_DEBUG_H_ Modified: projects/ifnet/sys/net/altq/altq_subr.c ============================================================================== --- projects/ifnet/sys/net/altq/altq_subr.c Fri Apr 17 11:57:06 2015 (r281649) +++ projects/ifnet/sys/net/altq/altq_subr.c Fri Apr 17 12:10:00 2015 (r281650) @@ -1,7 +1,4 @@ -/* $FreeBSD$ */ -/* $KAME: altq_subr.c,v 1.21 2003/11/06 06:32:53 kjc Exp $ */ - -/* +/*- * Copyright (C) 1997-2003 * Sony Computer Science Laboratories Inc. All rights reserved. * @@ -25,15 +22,14 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $KAME: altq_subr.c,v 1.21 2003/11/06 06:32:53 kjc Exp $ + * $FreeBSD$ */ -#if defined(__FreeBSD__) || defined(__NetBSD__) #include "opt_altq.h" #include "opt_inet.h" -#ifdef __FreeBSD__ #include "opt_inet6.h" -#endif -#endif /* __FreeBSD__ || __NetBSD__ */ #include #include @@ -52,9 +48,7 @@ #include #include #include -#ifdef __FreeBSD__ #include -#endif #include #include @@ -73,20 +67,14 @@ #endif /* machine dependent clock related includes */ -#ifdef __FreeBSD__ #include #include #include #include -#endif #if defined(__amd64__) || defined(__i386__) #include /* for pentium tsc */ #include /* for CPUID_TSC */ -#ifdef __FreeBSD__ #include /* for cpu_feature */ -#elif defined(__NetBSD__) || defined(__OpenBSD__) -#include /* for cpu_feature */ -#endif #endif /* __amd64 || __i386__ */ /* @@ -254,11 +242,7 @@ altq_enable(ifq) return 0; } -#ifdef __NetBSD__ s = splnet(); -#else - s = splimp(); -#endif IFQ_PURGE_NOLOCK(ifq); ASSERT(ifq->ifq_len == 0); ifq->ifq_drv_maxlen = 0; /* disable bulk dequeue */ @@ -283,11 +267,7 @@ altq_disable(ifq) return 0; } -#ifdef __NetBSD__ s = splnet(); -#else - s = splimp(); -#endif IFQ_PURGE_NOLOCK(ifq); ASSERT(ifq->ifq_len == 0); ifq->altq_flags &= ~(ALTQF_ENABLED|ALTQF_CLASSIFY); @@ -444,24 +424,16 @@ static void tbr_timeout(arg) void *arg; { -#ifdef __FreeBSD__ VNET_ITERATOR_DECL(vnet_iter); -#endif struct ifnet *ifp; int active, s; active = 0; -#ifdef __NetBSD__ s = splnet(); -#else - s = splimp(); -#endif -#ifdef __FreeBSD__ IFNET_RLOCK_NOSLEEP(); VNET_LIST_RLOCK_NOSLEEP(); VNET_FOREACH(vnet_iter) { CURVNET_SET(vnet_iter); -#endif for (ifp = TAILQ_FIRST(&V_ifnet); ifp; ifp = TAILQ_NEXT(ifp, if_list)) { /* read from if_snd unlocked */ @@ -472,12 +444,10 @@ tbr_timeout(arg) ifp->if_start != NULL) (*ifp->if_start)(ifp); } -#ifdef __FreeBSD__ CURVNET_RESTORE(); } VNET_LIST_RUNLOCK_NOSLEEP(); IFNET_RUNLOCK_NOSLEEP(); -#endif splx(s); if (active > 0) CALLOUT_RESET(&tbr_callout, 1, tbr_timeout, (void *)0); @@ -563,11 +533,7 @@ altq_pfdetach(struct pf_altq *a) if (a->altq_disc == NULL || a->altq_disc != ifp->if_snd.altq_disc) return (0); -#ifdef __NetBSD__ s = splnet(); -#else - s = splimp(); -#endif /* read unlocked from if_snd, _disable and _detach take care */ if (ALTQ_IS_ENABLED(&ifp->if_snd)) error = altq_disable(&ifp->if_snd); @@ -926,12 +892,8 @@ init_machclk_setup(void) #endif #if defined(__amd64__) || defined(__i386__) /* check if TSC is available */ -#ifdef __FreeBSD__ if ((cpu_feature & CPUID_TSC) == 0 || atomic_load_acq_64(&tsc_freq) == 0) -#else - if ((cpu_feature & CPUID_TSC) == 0) -#endif machclk_usepcc = 0; #endif } @@ -962,13 +924,7 @@ init_machclk(void) * accessible, just use it. */ #if defined(__amd64__) || defined(__i386__) -#ifdef __FreeBSD__ machclk_freq = atomic_load_acq_64(&tsc_freq); -#elif defined(__NetBSD__) - machclk_freq = (u_int32_t)cpu_tsc_freq; -#elif defined(__OpenBSD__) && (defined(I586_CPU) || defined(I686_CPU)) - machclk_freq = pentium_mhz * 1000000; -#endif #endif /* @@ -1449,11 +1405,7 @@ acc_add_filter(classifier, filter, class * add this filter to the filter list. * filters are ordered from the highest rule number. */ -#ifdef __NetBSD__ s = splnet(); -#else - s = splimp(); -#endif prev = NULL; LIST_FOREACH(tmp, &classifier->acc_filters[i], f_chain) { if (tmp->f_filter.ff_ruleno > afp->f_filter.ff_ruleno) @@ -1482,11 +1434,7 @@ acc_delete_filter(classifier, handle) if ((afp = filth_to_filtp(classifier, handle)) == NULL) return (EINVAL); -#ifdef __NetBSD__ s = splnet(); -#else - s = splimp(); -#endif LIST_REMOVE(afp, f_chain); splx(s); @@ -1510,11 +1458,7 @@ acc_discard_filters(classifier, class, a struct acc_filter *afp; int i, s; -#ifdef __NetBSD__ s = splnet(); -#else - s = splimp(); -#endif for (i = 0; i < ACC_FILTER_TABLESIZE; i++) { do { LIST_FOREACH(afp, &classifier->acc_filters[i], f_chain) Modified: projects/ifnet/sys/net/altq/altq_var.h ============================================================================== --- projects/ifnet/sys/net/altq/altq_var.h Fri Apr 17 11:57:06 2015 (r281649) +++ projects/ifnet/sys/net/altq/altq_var.h Fri Apr 17 12:10:00 2015 (r281650) @@ -1,7 +1,4 @@ -/* $FreeBSD$ */ -/* $KAME: altq_var.h,v 1.16 2003/10/03 05:05:15 kjc Exp $ */ - -/* +/*- * Copyright (C) 1998-2003 * Sony Computer Science Laboratories Inc. All rights reserved. * @@ -25,6 +22,9 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $KAME: altq_var.h,v 1.16 2003/10/03 05:05:15 kjc Exp $ + * $FreeBSD$ */ #ifndef _ALTQ_ALTQ_VAR_H_ #define _ALTQ_ALTQ_VAR_H_ @@ -161,7 +161,6 @@ typedef u_long ioctlcmd_t; #endif /* macro for timeout/untimeout */ -#if (__FreeBSD_version > 300000) || defined(__NetBSD__) /* use callout */ #include @@ -175,35 +174,6 @@ typedef u_long ioctlcmd_t; #if !defined(CALLOUT_INITIALIZER) && (__FreeBSD_version < 600000) #define CALLOUT_INITIALIZER { { { NULL } }, 0, NULL, NULL, 0 } #endif -#elif defined(__OpenBSD__) -#include -/* callout structure as a wrapper of struct timeout */ -struct callout { - struct timeout c_to; -}; -#define CALLOUT_INIT(c) do { bzero((c), sizeof(*(c))); } while (/*CONSTCOND*/ 0) -#define CALLOUT_RESET(c,t,f,a) do { if (!timeout_initialized(&(c)->c_to)) \ - timeout_set(&(c)->c_to, (f), (a)); \ - timeout_add(&(c)->c_to, (t)); } while (/*CONSTCOND*/ 0) -#define CALLOUT_STOP(c) timeout_del(&(c)->c_to) -#define CALLOUT_INITIALIZER { { { NULL }, NULL, NULL, 0, 0 } } -#else -/* use old-style timeout/untimeout */ -/* dummy callout structure */ -struct callout { - void *c_arg; /* function argument */ - void (*c_func)(void *); /* functiuon to call */ -}; -#define CALLOUT_INIT(c) do { bzero((c), sizeof(*(c))); } while (/*CONSTCOND*/ 0) -#define CALLOUT_RESET(c,t,f,a) do { (c)->c_arg = (a); \ - (c)->c_func = (f); \ - timeout((f),(a),(t)); } while (/*CONSTCOND*/ 0) -#define CALLOUT_STOP(c) untimeout((c)->c_func,(c)->c_arg) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Fri Apr 17 12:22:45 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A37402DE; Fri, 17 Apr 2015 12:22:45 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 9179F95C; Fri, 17 Apr 2015 12:22:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3HCMjKu040990; Fri, 17 Apr 2015 12:22:45 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3HCMjIa040989; Fri, 17 Apr 2015 12:22:45 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201504171222.t3HCMjIa040989@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Fri, 17 Apr 2015 12:22:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r281651 - projects/ifnet/sys/net 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: Fri, 17 Apr 2015 12:22:45 -0000 Author: glebius Date: Fri Apr 17 12:22:44 2015 New Revision: 281651 URL: https://svnweb.freebsd.org/changeset/base/281651 Log: Do not propagate SIOCSIFCAP on vlan(4) to parent, this leads to unexpected results. For more information see summary of https://reviews.freebsd.org/D2310. Modified: projects/ifnet/sys/net/if_vlan.c Modified: projects/ifnet/sys/net/if_vlan.c ============================================================================== --- projects/ifnet/sys/net/if_vlan.c Fri Apr 17 12:10:00 2015 (r281650) +++ projects/ifnet/sys/net/if_vlan.c Fri Apr 17 12:22:44 2015 (r281651) @@ -1642,26 +1642,6 @@ vlan_ioctl(if_t ifp, u_long cmd, void *d } break; - case SIOCSIFCAP: - VLAN_LOCK(); - if (TRUNK(ifv) != NULL) { - p = PARENT(ifv); - if ((if_type(p) != IFT_ETHER) && - (ifr->ifr_reqcap & IFCAP_VLAN_HWTAGGING) == 0) { - error = EINVAL; - break; - } - error = if_ioctl(p, cmd, data, td); - if (error) - break; - /* Propogate vlan interface capabilities */ - vlan_trunk_capabilities(p); - } else { - VLAN_UNLOCK(); - error = EINVAL; - } - break; - default: error = EOPNOTSUPP; break; From owner-svn-src-projects@FreeBSD.ORG Fri Apr 17 12:27:36 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AEDA951F; Fri, 17 Apr 2015 12:27:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 9CA6899B; Fri, 17 Apr 2015 12:27:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3HCRaDl041711; Fri, 17 Apr 2015 12:27:36 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3HCRZmN041706; Fri, 17 Apr 2015 12:27:35 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201504171227.t3HCRZmN041706@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Fri, 17 Apr 2015 12:27:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r281652 - projects/ifnet/sys/net 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: Fri, 17 Apr 2015 12:27:36 -0000 Author: glebius Date: Fri Apr 17 12:27:34 2015 New Revision: 281652 URL: https://svnweb.freebsd.org/changeset/base/281652 Log: - Instead of eventhandler for vlan child events, provide new ifop method. - Instead of macros to obtain ID of vlan, vlan of ID or trunk of vlan provide shim functions in if.c, and make the function pointers private between if.c and if_vlan.c. Modified: projects/ifnet/sys/net/if.c projects/ifnet/sys/net/if.h projects/ifnet/sys/net/if_var.h projects/ifnet/sys/net/if_vlan.c projects/ifnet/sys/net/if_vlan_var.h Modified: projects/ifnet/sys/net/if.c ============================================================================== --- projects/ifnet/sys/net/if.c Fri Apr 17 12:22:44 2015 (r281651) +++ projects/ifnet/sys/net/if.c Fri Apr 17 12:27:34 2015 (r281652) @@ -2232,11 +2232,15 @@ link_init_sdl(struct ifnet *ifp, struct return (sdl); } -void (*vlan_link_state_p)(struct ifnet *); /* XXX: private from if_vlan */ -void (*vlan_trunk_cap_p)(struct ifnet *); /* XXX: private from if_vlan */ +/* + * Function pointers to vlan(4) module. + * XXXGL: shouldn't we just make vlan(4) always in kernel? + */ +void (*vlan_link_state_p)(struct ifnet *); +void (*vlan_trunk_cap_p)(struct ifnet *); struct ifnet *(*vlan_trunkdev_p)(struct ifnet *); -struct ifnet *(*vlan_devat_p)(struct ifnet *, uint16_t); -int (*vlan_tag_p)(struct ifnet *, uint16_t *); +struct ifnet *(*vlan_dev_p)(struct ifnet *, uint16_t); +uint16_t (*vlan_vid_p)(struct ifnet *); /* * Handle a change in the interface link state. To avoid LORs @@ -3775,6 +3779,34 @@ if_snd_prepend(if_t ifp, struct mbuf *m) mtx_unlock(&ifq->ifq_mtx); } +int +if_vlanid(if_t vifp, uint16_t *vid) +{ + + if (if_type(vifp) != IFT_L2VLAN) + return (EINVAL); + *vid = (*vlan_vid_p)(vifp); + return (0); +} + +if_t +if_vlandev(if_t parent, uint16_t vid) +{ + + if (parent->if_vlantrunk == NULL) + return (NULL); + return ((*vlan_dev_p)(parent, vid)); +} + +if_t +if_vlantrunk(if_t vifp) +{ + + if (if_type(vifp) != IFT_L2VLAN) + return (NULL); + return ((*vlan_trunkdev_p)(vifp)); +} + /* * Implementation of if ops, that can be called from drivers. */ Modified: projects/ifnet/sys/net/if.h ============================================================================== --- projects/ifnet/sys/net/if.h Fri Apr 17 12:22:44 2015 (r281651) +++ projects/ifnet/sys/net/if.h Fri Apr 17 12:27:34 2015 (r281652) @@ -599,6 +599,7 @@ typedef void (*if_qflush_t)(if_t); typedef int (*if_resolvemulti_t)(if_t, struct sockaddr **, struct sockaddr *); typedef void (*if_reassign_t)(if_t, struct vnet *); +typedef void (*if_vlan_event_t)(if_t, uint16_t, if_t); enum poll_cmd { POLL_ONLY, POLL_AND_CHECK_STATUS }; typedef int (*if_poll_t)(if_t, enum poll_cmd, int); @@ -617,6 +618,7 @@ struct ifops { if_qflush_t ifop_qflush; /* flush any queue */ if_resolvemulti_t ifop_resolvemulti; /* validate/resolve multicast */ if_reassign_t ifop_reassign; /* reassign to vnet routine */ + if_vlan_event_t ifop_vlan_event;/* VLAN config/unconfig */ struct ifops *ifop_next; uint8_t ifop_origin; }; @@ -748,6 +750,13 @@ struct mbuf * if_snd_dequeue(if_t); void if_snd_prepend(if_t, struct mbuf *); /* + * vlan(4) interfaces extra API. + */ +int if_vlanid(if_t, uint16_t *); +if_t if_vlandev(if_t, uint16_t); +if_t if_vlantrunk(if_t); + +/* * Type-enforcing inliners over if_getsoftc(). */ static inline char * Modified: projects/ifnet/sys/net/if_var.h ============================================================================== --- projects/ifnet/sys/net/if_var.h Fri Apr 17 12:22:44 2015 (r281651) +++ projects/ifnet/sys/net/if_var.h Fri Apr 17 12:27:34 2015 (r281652) @@ -523,6 +523,14 @@ if_reassign(if_t ifp, struct vnet *new) return (ifp->if_ops->ifop_reassign(ifp, new)); } +static inline void +if_vlan_event(if_t ifp, uint16_t vid, if_t vifp) +{ + + if (ifp->if_ops->ifop_vlan_event != NULL) + ifp->if_ops->ifop_vlan_event(ifp, vid, vifp); +} + #ifdef DEVICE_POLLING static inline int if_poll(if_t ifp, enum poll_cmd cmd, int count) Modified: projects/ifnet/sys/net/if_vlan.c ============================================================================== --- projects/ifnet/sys/net/if_vlan.c Fri Apr 17 12:22:44 2015 (r281651) +++ projects/ifnet/sys/net/if_vlan.c Fri Apr 17 12:27:34 2015 (r281652) @@ -73,6 +73,11 @@ __FBSDID("$FreeBSD$"); #include #endif +extern struct ifnet *(*vlan_dev_p)(struct ifnet *, uint16_t); +extern uint16_t (*vlan_vid_p)(struct ifnet *); +extern void (*vlan_trunk_cap_p)(struct ifnet *); +extern struct ifnet *(*vlan_trunkdev_p)(struct ifnet *); + #define VLAN_DEF_HWIDTH 4 #define VLAN_IFFLAGS (IFF_BROADCAST | IFF_MULTICAST) @@ -662,18 +667,17 @@ vlan_ifdetach(void *arg __unused, struct /* * Return the trunk device for a virtual interface. */ -static struct ifnet * +static struct ifnet * vlan_trunkdev(struct ifnet *ifp) { struct ifvlan *ifv; - if (if_type(ifp) != IFT_L2VLAN) - return (NULL); ifv = ifp->if_softc; - ifp = NULL; VLAN_LOCK(); if (ifv->ifv_trunk) ifp = PARENT(ifv); + else + ifp = NULL; VLAN_UNLOCK(); return (ifp); } @@ -681,40 +685,35 @@ vlan_trunkdev(struct ifnet *ifp) /* * Return the 12-bit VLAN VID for this interface, for use by external * components such as Infiniband. - * - * XXXRW: Note that the function name here is historical; it should be named - * vlan_vid(). */ -static int -vlan_tag(struct ifnet *ifp, uint16_t *vidp) +static uint16_t +vlan_vid(struct ifnet *ifp) { struct ifvlan *ifv; - if (if_type(ifp) != IFT_L2VLAN) - return (EINVAL); + KASSERT(if_type(ifp) == IFT_L2VLAN, ("%s: %p is not a VLAN", + __func__, ifp)); ifv = ifp->if_softc; - *vidp = ifv->ifv_vid; - return (0); + return (ifv->ifv_vid); } /* * Return the vlan device present at the specific VID. */ static struct ifnet * -vlan_devat(struct ifnet *ifp, uint16_t vid) +vlan_dev(struct ifnet *ifp, uint16_t vid) { struct ifvlantrunk *trunk; struct ifvlan *ifv; TRUNK_LOCK_READER; trunk = ifp->if_vlantrunk; - if (trunk == NULL) - return (NULL); - ifp = NULL; TRUNK_RLOCK(trunk); ifv = vlan_gethash(trunk, vid); if (ifv) ifp = ifv->ifv_ifp; + else + ifp = NULL; TRUNK_RUNLOCK(trunk); return (ifp); } @@ -750,8 +749,8 @@ vlan_modevent(module_t mod, int type, vo vlan_link_state_p = vlan_link_state; vlan_trunk_cap_p = vlan_trunk_capabilities; vlan_trunkdev_p = vlan_trunkdev; - vlan_tag_p = vlan_tag; - vlan_devat_p = vlan_devat; + vlan_vid_p = vlan_vid; + vlan_dev_p = vlan_dev; #ifndef VIMAGE vlan_cloner = if_clone_advanced(vlanname, 0, vlan_clone_match, vlan_clone_create, vlan_clone_destroy); @@ -776,8 +775,8 @@ vlan_modevent(module_t mod, int type, vo vlan_link_state_p = NULL; vlan_trunk_cap_p = NULL; vlan_trunkdev_p = NULL; - vlan_tag_p = NULL; - vlan_devat_p = NULL; + vlan_vid_p = NULL; + vlan_dev_p = NULL; VLAN_LOCK_DESTROY(); if (bootverbose) printf("vlan: unloaded\n"); @@ -1257,7 +1256,7 @@ vlan_config(struct ifvlan *ifv, struct i (void)vlan_setmulti(ifp); /* XXX: VLAN lock held */ TRUNK_UNLOCK(trunk); - EVENTHANDLER_INVOKE(vlan_config, p, ifv->ifv_vid); + if_vlan_event(p, vid, ifp); return (error); } @@ -1342,7 +1341,7 @@ vlan_unconfig(struct ifnet *ifp, int dep * to cleanup anyway. */ if (parent != NULL) - EVENTHANDLER_INVOKE(vlan_unconfig, parent, ifv->ifv_vid); + if_vlan_event(parent, ifv->ifv_vid, NULL); } /* Handle a reference counted flag that should be set on the parent as well */ Modified: projects/ifnet/sys/net/if_vlan_var.h ============================================================================== --- projects/ifnet/sys/net/if_vlan_var.h Fri Apr 17 12:22:44 2015 (r281651) +++ projects/ifnet/sys/net/if_vlan_var.h Fri Apr 17 12:27:34 2015 (r281652) @@ -73,7 +73,6 @@ struct vlanreq { #define SIOCSETVLAN SIOCSIFGENERIC #define SIOCGETVLAN SIOCGIFGENERIC -#ifdef _KERNEL /* * Drivers that are capable of adding and removing the VLAN header * in hardware indicate they support this by marking IFCAP_VLAN_HWTAGGING @@ -109,27 +108,4 @@ struct vlanreq { * stripping/insertion by marking IFCAP_VLAN_HWTAGGING in * if_capabilities. */ - -#define VLAN_TRUNKDEV(_ifp) \ - (_ifp)->if_type == IFT_L2VLAN ? (*vlan_trunkdev_p)((_ifp)) : NULL -#define VLAN_TAG(_ifp, _vid) \ - (_ifp)->if_type == IFT_L2VLAN ? (*vlan_tag_p)((_ifp), (_vid)) : EINVAL -#define VLAN_DEVAT(_ifp, _vid) \ - (_ifp)->if_vlantrunk != NULL ? (*vlan_devat_p)((_ifp), (_vid)) : NULL - -extern void (*vlan_trunk_cap_p)(struct ifnet *); -extern struct ifnet *(*vlan_trunkdev_p)(struct ifnet *); -extern struct ifnet *(*vlan_devat_p)(struct ifnet *, uint16_t); -extern int (*vlan_tag_p)(struct ifnet *, uint16_t *); - -#ifdef _SYS_EVENTHANDLER_H_ -/* VLAN state change events */ -typedef void (*vlan_config_fn)(void *, struct ifnet *, uint16_t); -typedef void (*vlan_unconfig_fn)(void *, struct ifnet *, uint16_t); -EVENTHANDLER_DECLARE(vlan_config, vlan_config_fn); -EVENTHANDLER_DECLARE(vlan_unconfig, vlan_unconfig_fn); -#endif /* _SYS_EVENTHANDLER_H_ */ - -#endif /* _KERNEL */ - #endif /* _NET_IF_VLAN_VAR_H_ */ From owner-svn-src-projects@FreeBSD.ORG Fri Apr 17 12:40:32 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1E88174D; Fri, 17 Apr 2015 12:40:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 0AEF5ADA; Fri, 17 Apr 2015 12:40:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3HCeWJw046837; Fri, 17 Apr 2015 12:40:32 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3HCeS4g046814; Fri, 17 Apr 2015 12:40:28 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201504171240.t3HCeS4g046814@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Fri, 17 Apr 2015 12:40:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r281653 - in projects/ifnet/sys: dev/cxgbe dev/cxgbe/tom net netinet 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: Fri, 17 Apr 2015 12:40:32 -0000 Author: glebius Date: Fri Apr 17 12:40:27 2015 New Revision: 281653 URL: https://svnweb.freebsd.org/changeset/base/281653 Log: - TOEDEV is now a generic softc, available via if_getsoftc()/if_setsoftc(). - cxgbe(4) uses its own cookie to store its struct port_info pointer on a vlan(4) and on parent. - cxgbe(4) uses ifop_vlan_event to set the cookie. Not tested. XXX: the Chelsio TOE code still needs if_var.h Modified: projects/ifnet/sys/dev/cxgbe/t4_main.c projects/ifnet/sys/dev/cxgbe/tom/t4_connect.c projects/ifnet/sys/dev/cxgbe/tom/t4_cpl_io.c projects/ifnet/sys/dev/cxgbe/tom/t4_ddp.c projects/ifnet/sys/dev/cxgbe/tom/t4_listen.c projects/ifnet/sys/dev/cxgbe/tom/t4_tom.c projects/ifnet/sys/dev/cxgbe/tom/t4_tom_l2t.c projects/ifnet/sys/net/if.h projects/ifnet/sys/net/if_debug.c projects/ifnet/sys/net/if_var.h projects/ifnet/sys/net/if_vlan.c projects/ifnet/sys/netinet/tcp_offload.c projects/ifnet/sys/netinet/toecore.c Modified: projects/ifnet/sys/dev/cxgbe/t4_main.c ============================================================================== --- projects/ifnet/sys/dev/cxgbe/t4_main.c Fri Apr 17 12:27:34 2015 (r281652) +++ projects/ifnet/sys/dev/cxgbe/t4_main.c Fri Apr 17 12:40:27 2015 (r281653) @@ -153,6 +153,7 @@ static int cxgbe_ioctl(if_t, unsigned lo static int cxgbe_transmit(if_t, struct mbuf *); static void cxgbe_qflush(if_t); static uint64_t cxgbe_get_counter(if_t, ift_counter); +static void cxgbe_vlan_event(if_t, uint16_t, if_t); static int cxgbe_media_change(if_t); static void cxgbe_media_status(if_t, struct ifmediareq *); @@ -169,6 +170,7 @@ static struct ifdriver cxgbe_ifdrv = { .ifop_transmit = cxgbe_transmit, .ifop_qflush = cxgbe_qflush, .ifop_get_counter = cxgbe_get_counter, + .ifop_vlan_event = cxgbe_vlan_event, }, .ifdrv_name = "cxgbe", .ifdrv_type = IFT_ETHER, @@ -1133,6 +1135,7 @@ cxgbe_attach(device_t dev) ifat.ifat_softc = pi; ifat.ifat_dunit = device_get_unit(dev); pi->ifp = if_attach(&ifat); + if_setsoftc(pi->ifp, IF_CXGBE_PORT, pi); #ifdef DEV_NETMAP /* nm_media handled here to keep implementation private to this file */ @@ -4338,6 +4341,15 @@ cxgbe_tick(void *arg) PORT_UNLOCK(pi); } +static void +cxgbe_vlan_event(if_t trunk, uint16_t id, if_t vlan) +{ + struct port_info *pi; + + pi = if_getsoftc(trunk, IF_DRIVER_SOFTC); + if_setsoftc(vlan, IF_CXGBE_PORT, pi); +} + static int cpl_not_handled(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m) { Modified: projects/ifnet/sys/dev/cxgbe/tom/t4_connect.c ============================================================================== --- projects/ifnet/sys/dev/cxgbe/tom/t4_connect.c Fri Apr 17 12:27:34 2015 (r281652) +++ projects/ifnet/sys/dev/cxgbe/tom/t4_connect.c Fri Apr 17 12:40:27 2015 (r281653) @@ -43,8 +43,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include -#include #include #include #include @@ -320,7 +318,6 @@ t4_connect(struct toedev *tod, struct so struct tom_data *td = tod_td(tod); struct toepcb *toep = NULL; struct wrqe *wr = NULL; - struct ifnet *rt_ifp = rt->rt_ifp; struct port_info *pi; int mtu_idx, rscale, qid_atid, rc, isipv6; struct inpcb *inp = sotoinpcb(so); @@ -331,15 +328,12 @@ t4_connect(struct toedev *tod, struct so KASSERT(nam->sa_family == AF_INET || nam->sa_family == AF_INET6, ("%s: dest addr %p has family %u", __func__, nam, nam->sa_family)); - if (rt_ifp->if_type == IFT_ETHER) - pi = rt_ifp->if_softc; - else if (rt_ifp->if_type == IFT_L2VLAN) { - struct ifnet *ifp = VLAN_COOKIE(rt_ifp); - - pi = ifp->if_softc; - } else if (rt_ifp->if_type == IFT_IEEE8023ADLAG) - DONT_OFFLOAD_ACTIVE_OPEN(ENOSYS); /* XXX: implement lagg+TOE */ - else + /* + * Get port of a NIC or vlan(4). + * XXX: implement lagg+TOE + */ + pi = if_getsoftc(rt->rt_ifp, IF_CXGBE_PORT); + if (pi == NULL) DONT_OFFLOAD_ACTIVE_OPEN(ENOTSUP); toep = alloc_toepcb(pi, -1, -1, M_NOWAIT); @@ -350,7 +344,7 @@ t4_connect(struct toedev *tod, struct so if (toep->tid < 0) DONT_OFFLOAD_ACTIVE_OPEN(ENOMEM); - toep->l2te = t4_l2t_get(pi, rt_ifp, + toep->l2te = t4_l2t_get(pi, rt->rt_ifp, rt->rt_flags & RTF_GATEWAY ? rt->rt_gateway : nam); if (toep->l2te == NULL) DONT_OFFLOAD_ACTIVE_OPEN(ENOMEM); Modified: projects/ifnet/sys/dev/cxgbe/tom/t4_cpl_io.c ============================================================================== --- projects/ifnet/sys/dev/cxgbe/tom/t4_cpl_io.c Fri Apr 17 12:27:34 2015 (r281652) +++ projects/ifnet/sys/dev/cxgbe/tom/t4_cpl_io.c Fri Apr 17 12:40:27 2015 (r281653) @@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include Modified: projects/ifnet/sys/dev/cxgbe/tom/t4_ddp.c ============================================================================== --- projects/ifnet/sys/dev/cxgbe/tom/t4_ddp.c Fri Apr 17 12:27:34 2015 (r281652) +++ projects/ifnet/sys/dev/cxgbe/tom/t4_ddp.c Fri Apr 17 12:40:27 2015 (r281653) @@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include Modified: projects/ifnet/sys/dev/cxgbe/tom/t4_listen.c ============================================================================== --- projects/ifnet/sys/dev/cxgbe/tom/t4_listen.c Fri Apr 17 12:27:34 2015 (r281652) +++ projects/ifnet/sys/dev/cxgbe/tom/t4_listen.c Fri Apr 17 12:40:27 2015 (r281653) @@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -45,8 +46,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include -#include #include #include #include @@ -346,7 +345,7 @@ send_reset_synqe(struct toedev *tod, str struct adapter *sc = tod->tod_softc; struct mbuf *m = synqe->syn; struct ifnet *ifp = m->m_pkthdr.rcvif; - struct port_info *pi = ifp->if_softc; + struct port_info *pi = if_getsoftc(ifp, IF_DRIVER_SOFTC); struct l2t_entry *e = &sc->l2t->l2tab[synqe->l2e_idx]; struct wrqe *wr; struct fw_flowc_wr *flowc; @@ -541,7 +540,7 @@ t4_listen_start(struct toedev *tod, stru */ for_each_port(sc, i) { if (isset(&sc->open_device_map, i) && - sc->port[i]->ifp->if_capenable & IFCAP_TOE) + sc->port[i]->if_capenable & IFCAP_TOE) break; } KASSERT(i < sc->params.nports, @@ -822,11 +821,12 @@ done_with_synqe(struct adapter *sc, stru { struct listen_ctx *lctx = synqe->lctx; struct inpcb *inp = lctx->inp; - struct port_info *pi = synqe->syn->m_pkthdr.rcvif->if_softc; struct l2t_entry *e = &sc->l2t->l2tab[synqe->l2e_idx]; + struct port_info *pi; INP_WLOCK_ASSERT(inp); + pi = if_getsoftc(synqe->syn->m_pkthdr.rcvif, IF_DRIVER_SOFTC); TAILQ_REMOVE(&lctx->synq, synqe, link); inp = release_lctx(sc, lctx); if (inp) @@ -1195,7 +1195,7 @@ do_pass_accept_req(struct sge_iq *iq, co pi = sc->port[G_SYN_INTF(be16toh(cpl->l2info))]; hw_ifp = pi->ifp; /* the cxgbeX ifnet */ m->m_pkthdr.rcvif = hw_ifp; - tod = TOEDEV(hw_ifp); + tod = if_getsoftc(hw_ifp, IF_TOEDEV); /* * Figure out if there is a pseudo interface (vlan, lagg, etc.) @@ -1206,7 +1206,7 @@ do_pass_accept_req(struct sge_iq *iq, co */ vid = EVL_VLANOFTAG(be16toh(cpl->vlan)); if (vid != 0xfff) { - ifp = VLAN_DEVAT(hw_ifp, vid); + ifp = if_vlandev(hw_ifp, vid); if (ifp == NULL) REJECT_PASS_ACCEPT(); } else @@ -1222,7 +1222,7 @@ do_pass_accept_req(struct sge_iq *iq, co if (inc.inc_flags & INC_ISIPV6) { /* Don't offload if the ifcap isn't enabled */ - if ((ifp->if_capenable & IFCAP_TOE6) == 0) + if ((pi->if_capenable & IFCAP_TOE6) == 0) REJECT_PASS_ACCEPT(); /* @@ -1234,7 +1234,7 @@ do_pass_accept_req(struct sge_iq *iq, co } else { /* Don't offload if the ifcap isn't enabled */ - if ((ifp->if_capenable & IFCAP_TOE4) == 0) + if ((pi->if_capenable & IFCAP_TOE4) == 0) REJECT_PASS_ACCEPT(); /* @@ -1400,7 +1400,7 @@ reject: m->m_pkthdr.csum_flags |= (CSUM_IP_CHECKED | CSUM_IP_VALID | CSUM_DATA_VALID | CSUM_PSEUDO_HDR); m->m_pkthdr.csum_data = 0xffff; - hw_ifp->if_input(hw_ifp, m); + if_input(hw_ifp, m); } return (reject_reason); @@ -1480,7 +1480,7 @@ do_pass_establish(struct sge_iq *iq, con } ifp = synqe->syn->m_pkthdr.rcvif; - pi = ifp->if_softc; + pi = if_getsoftc(ifp, IF_DRIVER_SOFTC); KASSERT(pi->adapter == sc, ("%s: pi %p, sc %p mismatch", __func__, pi, sc)); @@ -1498,7 +1498,7 @@ reset: * we responded to the PASS_ACCEPT_REQ, and our response had the * L2T idx. */ - send_reset_synqe(TOEDEV(ifp), synqe); + send_reset_synqe(if_getsoftc(ifp, IF_TOEDEV), synqe); INP_WUNLOCK(inp); INP_INFO_WUNLOCK(&V_tcbinfo); return (0); @@ -1548,7 +1548,7 @@ reset: INP_WLOCK(new_inp); tcp_timer_activate(intotcpcb(new_inp), TT_KEEP, 0); - t4_offload_socket(TOEDEV(ifp), synqe, so); + t4_offload_socket(if_getsoftc(ifp, IF_TOEDEV), synqe, so); INP_WUNLOCK(new_inp); } Modified: projects/ifnet/sys/dev/cxgbe/tom/t4_tom.c ============================================================================== --- projects/ifnet/sys/dev/cxgbe/tom/t4_tom.c Fri Apr 17 12:27:34 2015 (r281652) +++ projects/ifnet/sys/dev/cxgbe/tom/t4_tom.c Fri Apr 17 12:40:27 2015 (r281653) @@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -1021,7 +1022,7 @@ t4_tom_activate(struct adapter *sc) tod->tod_ctloutput = t4_ctloutput; for_each_port(sc, i) - TOEDEV(sc->port[i]->ifp) = &td->tod; + if_setsoftc(sc->port[i]->ifp, IF_TOEDEV, &td->tod); sc->tom_softc = td; register_toedev(sc->tom_softc); Modified: projects/ifnet/sys/dev/cxgbe/tom/t4_tom_l2t.c ============================================================================== --- projects/ifnet/sys/dev/cxgbe/tom/t4_tom_l2t.c Fri Apr 17 12:27:34 2015 (r281652) +++ projects/ifnet/sys/dev/cxgbe/tom/t4_tom_l2t.c Fri Apr 17 12:40:27 2015 (r281653) @@ -43,9 +43,9 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include -#include #include #include #include @@ -381,11 +381,6 @@ t4_l2t_get(struct port_info *pi, struct ("%s: sa %p has unexpected sa_family %d", __func__, sa, sa->sa_family)); -#ifndef VLAN_TAG - if (ifp->if_type == IFT_L2VLAN) - return (NULL); -#endif - hash = l2_hash(d, sa, ifp->if_index); rw_wlock(&d->lock); for (e = d->l2tab[hash].first; e; e = e->next) { @@ -410,12 +405,8 @@ t4_l2t_get(struct port_info *pi, struct e->hash = hash; e->lport = pi->lport; atomic_store_rel_int(&e->refcnt, 1); -#ifdef VLAN_TAG - if (ifp->if_type == IFT_L2VLAN) - VLAN_TAG(ifp, &e->vlan); - else + if (if_vlanid(ifp, &e->vlan) != 0) e->vlan = VLAN_NONE; -#endif mtx_unlock(&e->lock); } done: Modified: projects/ifnet/sys/net/if.h ============================================================================== --- projects/ifnet/sys/net/if.h Fri Apr 17 12:27:34 2015 (r281652) +++ projects/ifnet/sys/net/if.h Fri Apr 17 12:40:27 2015 (r281653) @@ -577,14 +577,21 @@ typedef enum { IF_LLADDR, IF_BPF, IF_NAME, - IF_VLAN, /* * Values do matter, since we want to avoid aliasing of frequently * used features in if_sccache cache. */ - IF_AF_INET = 8, - IF_AF_INET6 = 9, - IF_CARP = 10, + IF_AF_INET = 100, + IF_AF_INET6, + IF_CARP, + IF_VLAN, + IF_TOEDEV, + /* + * Space above 99999 is split among different vendors. + * + * Chelsio 10000 - 10999 + */ + IF_CXGBE_PORT = 10000, } ift_feature; typedef struct ifnet * if_t; Modified: projects/ifnet/sys/net/if_debug.c ============================================================================== --- projects/ifnet/sys/net/if_debug.c Fri Apr 17 12:27:34 2015 (r281652) +++ projects/ifnet/sys/net/if_debug.c Fri Apr 17 12:40:27 2015 (r281653) @@ -65,7 +65,6 @@ if_show_ifnet(struct ifnet *ifp) IF_DB_PRINTF("%p", if_vnet); IF_DB_PRINTF("%p", if_home_vnet); IF_DB_PRINTF("%p", if_addr); - IF_DB_PRINTF("%p", if_llsoftc); IF_DB_PRINTF("%p", if_label); IF_DB_PRINTF("%u", if_pcount); IF_DB_PRINTF("0x%08x", if_flags); Modified: projects/ifnet/sys/net/if_var.h ============================================================================== --- projects/ifnet/sys/net/if_var.h Fri Apr 17 12:27:34 2015 (r281652) +++ projects/ifnet/sys/net/if_var.h Fri Apr 17 12:40:27 2015 (r281653) @@ -113,7 +113,6 @@ struct ifnet { LIST_ENTRY(ifnet) if_clones; /* on if_cloner list */ TAILQ_HEAD(, ifg_list) if_groups; /* groups of this ifnet */ - void *if_llsoftc; /* link layer softc */ void *if_l2com; /* pointer to protocol bits */ uint32_t if_nsoftcs; /* elements in if_scstore */ int if_dunit; /* unit or IF_DUNIT_NONE */ @@ -278,8 +277,6 @@ EVENTHANDLER_DECLARE(group_change_event, #define IF_MINMTU 72 #define IF_MAXMTU 65535 -#define TOEDEV(ifp) ((ifp)->if_llsoftc) - /* * The ifaddr structure contains information about one address * of an interface. They are maintained by the different address families, Modified: projects/ifnet/sys/net/if_vlan.c ============================================================================== --- projects/ifnet/sys/net/if_vlan.c Fri Apr 17 12:27:34 2015 (r281652) +++ projects/ifnet/sys/net/if_vlan.c Fri Apr 17 12:40:27 2015 (r281653) @@ -1473,7 +1473,7 @@ vlan_capabilities(struct ifvlan *ifv) if (p->if_capabilities & IFCAP_VLAN_TOE) ifp->if_capabilities |= p->if_capabilities & IFCAP_TOE; if (p->if_capenable & IFCAP_VLAN_TOE) { - TOEDEV(ifp) = TOEDEV(p); + if_setsoftc(ifp, IF_TOEDEV, if_getsoftc(p, IF_TOEDEV)); ifp->if_capenable |= p->if_capenable & IFCAP_TOE; } } Modified: projects/ifnet/sys/netinet/tcp_offload.c ============================================================================== --- projects/ifnet/sys/netinet/tcp_offload.c Fri Apr 17 12:27:34 2015 (r281652) +++ projects/ifnet/sys/netinet/tcp_offload.c Fri Apr 17 12:40:27 2015 (r281653) @@ -81,7 +81,7 @@ tcp_offload_connect(struct socket *so, s if (nam->sa_family == AF_INET6 && !(ifp->if_capenable & IFCAP_TOE6)) goto done; - tod = TOEDEV(ifp); + tod = if_getsoftc(ifp, IF_TOEDEV); if (tod != NULL) error = tod->tod_connect(tod, so, rt, nam); done: Modified: projects/ifnet/sys/netinet/toecore.c ============================================================================== --- projects/ifnet/sys/netinet/toecore.c Fri Apr 17 12:27:34 2015 (r281652) +++ projects/ifnet/sys/netinet/toecore.c Fri Apr 17 12:40:27 2015 (r281653) @@ -407,7 +407,7 @@ toe_lle_event(void *arg __unused, struct (sa->sa_family == AF_INET6 && !(ifp->if_capenable & IFCAP_TOE6))) return; - tod = TOEDEV(ifp); + tod = if_getsoftc(ifp, IF_TOEDEV); if (tod == NULL) return; @@ -426,9 +426,7 @@ toe_lle_event(void *arg __unused, struct ("%s: %p resolved but not valid?", __func__, lle)); lladdr = (uint8_t *)&lle->ll_addr; -#ifdef VLAN_TAG - VLAN_TAG(ifp, &vtag); -#endif + if_vlanid(ifp, &vtag); } tod->tod_l2_update(tod, ifp, sa, lladdr, vtag); @@ -493,7 +491,7 @@ restart: } if (lle->la_flags & LLE_VALID) { - memcpy(lladdr, &lle->ll_addr, ifp->if_addrlen); + memcpy(lladdr, &lle->ll_addr, if_addrlen(ifp)); rc = 0; } else rc = EWOULDBLOCK; @@ -534,9 +532,7 @@ toe_l2_resolve(struct toedev *tod, struc } if (rc == 0) { -#ifdef VLAN_TAG - if (VLAN_TAG(ifp, vtag) != 0) -#endif + if (if_vlanid(ifp, vtag) != 0) *vtag = 0xfff; } From owner-svn-src-projects@FreeBSD.ORG Fri Apr 17 19:54:47 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 131FD335; Fri, 17 Apr 2015 19:54:47 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 011D538B; Fri, 17 Apr 2015 19:54:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3HJskdM055547; Fri, 17 Apr 2015 19:54:46 GMT (envelope-from sbruno@FreeBSD.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3HJskmF055546; Fri, 17 Apr 2015 19:54:46 GMT (envelope-from sbruno@FreeBSD.org) Message-Id: <201504171954.t3HJskmF055546@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sbruno set sender to sbruno@FreeBSD.org using -f From: Sean Bruno Date: Fri, 17 Apr 2015 19:54:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r281665 - projects/em_mq/sys/dev/e1000 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: Fri, 17 Apr 2015 19:54:47 -0000 Author: sbruno Date: Fri Apr 17 19:54:46 2015 New Revision: 281665 URL: https://svnweb.freebsd.org/changeset/base/281665 Log: Remove some redundant debugging info from the watchdog function and ensure that we know which queue is firing the timeout watchdog. This seems to stabilize the TX behavior for MQ. Setup TXDCTL to mimic the linux driver configuration settings. - Clear txdctl. - Set a Prefetch Threshold o.f 31 - Set a Host Threshold of 1. - Set a WriteBack Threshold of 1. - Do not set E1000_TXDCTL_QUEUE_ENABLE, which apparently isn't needed. - Set bit 22 as it is required to be set. - Set Granulatiry to Descriptors. - Set TX Descriptor Low Threshold to 1. - Section 10.2.6.11 of 82574 Datasheet. Read RFCTL and bitwise OR E1000_RFCTL_ACK_DIS before writing it back. Setup RXDCTL for the 82574 only, to mimic the linux driver configuration settings. - Set a Prefetch Threshold of 32. - Set a Host Threshold of 4. - Set a WriteBack threshold of 4. - Set Granularity to Descriptors. - Section 10.2.5.11 of 82574 Datasheet Modified: projects/em_mq/sys/dev/e1000/if_em.c Modified: projects/em_mq/sys/dev/e1000/if_em.c ============================================================================== --- projects/em_mq/sys/dev/e1000/if_em.c Fri Apr 17 19:25:53 2015 (r281664) +++ projects/em_mq/sys/dev/e1000/if_em.c Fri Apr 17 19:54:46 2015 (r281665) @@ -2305,16 +2305,8 @@ em_local_timer(void *arg) return; hung: /* Looks like we're hung */ - device_printf(adapter->dev, "Watchdog timeout -- resetting\n"); - device_printf(adapter->dev, - "Queue(%d) tdh = %d, hw tdt = %d\n", txr->me, - E1000_READ_REG(&adapter->hw, E1000_TDH(txr->me)), - E1000_READ_REG(&adapter->hw, E1000_TDT(txr->me))); - device_printf(adapter->dev,"TX(%d) desc avail = %d," - "Next TX to Clean = %d\n", - txr->me, txr->tx_avail, txr->next_to_clean); - - + device_printf(adapter->dev, "Watchdog timeout Queue[%d]-- resetting\n", + txr->me); em_print_debug_info(adapter); if_setdrvflagbits(ifp, 0, IFF_DRV_RUNNING); adapter->watchdog_events++; @@ -3508,10 +3500,14 @@ em_initialize_transmit_unit(struct adapt txr->queue_status = EM_QUEUE_IDLE; txdctl = E1000_READ_REG(hw, E1000_TXDCTL(i)); + txdctl = 0; /* clear txdctl */ txdctl |= 0x1f; /* PTHRESH */ txdctl |= 1 << 8; /* HTHRESH */ txdctl |= 1 << 16;/* WTHRESH */ - txdctl |= E1000_TXDCTL_QUEUE_ENABLE; + txdctl |= 1 << 22; /* Reserved bit 22 must always be 1 */ + txdctl |= E1000_TXDCTL_GRAN; + txdctl |= 1 << 25; /* LWTHRESH */ + E1000_WRITE_REG(hw, E1000_TXDCTL(i), txdctl); } @@ -4367,11 +4363,14 @@ em_initialize_receive_unit(struct adapte ** using the EITR register (82574 only) */ if (hw->mac.type == e1000_82574) { + u32 rfctl; for (int i = 0; i < 4; i++) E1000_WRITE_REG(hw, E1000_EITR_82574(i), DEFAULT_ITR); /* Disable accelerated acknowledge */ - E1000_WRITE_REG(hw, E1000_RFCTL, E1000_RFCTL_ACK_DIS); + rfctl = E1000_READ_REG(hw, E1000_RFCTL); + rfctl |= E1000_RFCTL_ACK_DIS; + E1000_WRITE_REG(hw, E1000_RFCTL, rfctl); } rxcsum = E1000_READ_REG(hw, E1000_RXCSUM); @@ -4470,22 +4469,18 @@ em_initialize_receive_unit(struct adapte (if_getmtu(ifp) > ETHERMTU)) { u32 rxdctl = E1000_READ_REG(hw, E1000_RXDCTL(0)); E1000_WRITE_REG(hw, E1000_RXDCTL(0), rxdctl | 3); - } -#if 0 } else if ((adapter->hw.mac.type == e1000_82574) && (if_getmtu(ifp) > ETHERMTU)) { for (int i = 0; i < adapter->num_rx_queues; i++) { u32 rxdctl = E1000_READ_REG(hw, E1000_RXDCTL(i)); - rxdctl |= 0x1f; /* PTHRESH */ - rxdctl |= 1 << 8; /* HTHRESH */ - rxdctl |= 5 << 16;/* WTHRESH */ - rxdctl |= 0x00400000; /*Enable counting*/ - rxdctl |= 0x10000000; /* Switch to granularity */ + rxdctl |= 0x20; /* PTHRESH */ + rxdctl |= 4 << 8; /* HTHRESH */ + rxdctl |= 4 << 16;/* WTHRESH */ + rxdctl |= 1 << 24; /* Switch to granularity */ E1000_WRITE_REG(hw, E1000_RXDCTL(i), rxdctl); } } -#endif if (adapter->hw.mac.type >= e1000_pch2lan) { if (if_getmtu(ifp) > ETHERMTU) From owner-svn-src-projects@FreeBSD.ORG Fri Apr 17 22:26:05 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 31E8D42E; Fri, 17 Apr 2015 22:26:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 072BC854; Fri, 17 Apr 2015 22:26:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3HMQ4Id031402; Fri, 17 Apr 2015 22:26:04 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3HMQ4uN031401; Fri, 17 Apr 2015 22:26:04 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201504172226.t3HMQ4uN031401@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 17 Apr 2015 22:26:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r281671 - projects/release-arm64 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: Fri, 17 Apr 2015 22:26:05 -0000 Author: gjb Date: Fri Apr 17 22:26:04 2015 New Revision: 281671 URL: https://svnweb.freebsd.org/changeset/base/281671 Log: Copy head@r281667 to projects/release-arm64. This project branch will be used to add support for arm64 (aarch64) release builds. Sponsored by: The FreeBSD Foundation Added: projects/release-arm64/ - copied from r281667, head/ From owner-svn-src-projects@FreeBSD.ORG Sat Apr 18 23:08:53 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 85055A79; Sat, 18 Apr 2015 23:08:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 736EBE94; Sat, 18 Apr 2015 23:08:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3IN8rvE069009; Sat, 18 Apr 2015 23:08:53 GMT (envelope-from sbruno@FreeBSD.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3IN8rZu069008; Sat, 18 Apr 2015 23:08:53 GMT (envelope-from sbruno@FreeBSD.org) Message-Id: <201504182308.t3IN8rZu069008@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sbruno set sender to sbruno@FreeBSD.org using -f From: Sean Bruno Date: Sat, 18 Apr 2015 23:08:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r281717 - projects/em_mq/sys/dev/e1000 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: Sat, 18 Apr 2015 23:08:53 -0000 Author: sbruno Date: Sat Apr 18 23:08:52 2015 New Revision: 281717 URL: https://svnweb.freebsd.org/changeset/base/281717 Log: Acquire tx lock when attempting to insert into the buf ring. An rxeof can initiate a transmit and will have the same address of an mbuf as an already inserted entry. Attempt to not do that by only allowing one thread to insert into the tx buf ring per queue. Add queue information in a clearer output for the queue debug function. Modified: projects/em_mq/sys/dev/e1000/if_em.c Modified: projects/em_mq/sys/dev/e1000/if_em.c ============================================================================== --- projects/em_mq/sys/dev/e1000/if_em.c Sat Apr 18 21:54:00 2015 (r281716) +++ projects/em_mq/sys/dev/e1000/if_em.c Sat Apr 18 23:08:52 2015 (r281717) @@ -1010,7 +1010,9 @@ em_mq_start(if_t ifp, struct mbuf *m) txr = &adapter->tx_rings[i]; + EM_TX_LOCK(txr); error = drbr_enqueue(ifp, txr->br, m); + EM_TX_UNLOCK(txr); if (error) return (error); @@ -5915,6 +5917,7 @@ em_print_debug_info(struct adapter *adap printf("and ACTIVE\n"); for (int i = 0; i < adapter->num_tx_queues; i++, txr++) { + device_printf(dev, "TX Queue %d ------\n", i); device_printf(dev, "hw tdh = %d, hw tdt = %d\n", E1000_READ_REG(&adapter->hw, E1000_TDH(i)), E1000_READ_REG(&adapter->hw, E1000_TDT(i))); @@ -5925,6 +5928,7 @@ em_print_debug_info(struct adapter *adap txr->no_desc_avail); } for (int i = 0; i < adapter->num_rx_queues; i++, rxr++) { + device_printf(dev, "RX Queue %d ------\n", i); device_printf(dev, "hw rdh = %d, hw rdt = %d\n", E1000_READ_REG(&adapter->hw, E1000_RDH(i)), E1000_READ_REG(&adapter->hw, E1000_RDT(i)));