From owner-svn-src-user@FreeBSD.ORG Mon Mar 9 06:02:07 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 264F41065670; Mon, 9 Mar 2009 06:02:07 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 105488FC0C; Mon, 9 Mar 2009 06:02:07 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n29627TI011353; Mon, 9 Mar 2009 06:02:07 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n29625Jg011323; Mon, 9 Mar 2009 06:02:05 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <200903090602.n29625Jg011323@svn.freebsd.org> From: Lawrence Stewart Date: Mon, 9 Mar 2009 06:02:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r189554 - in user/lstewart/alq_varlen_8.x: . contrib/bind9 contrib/bsnmp/snmp_mibII contrib/cpio contrib/csup contrib/file contrib/gdtoa contrib/ncurses contrib/netcat contrib/ntp contr... X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Mar 2009 06:02:07 -0000 Author: lstewart Date: Mon Mar 9 06:02:05 2009 New Revision: 189554 URL: http://svn.freebsd.org/changeset/base/189554 Log: Merge r188705:188939 from head. Added: user/lstewart/alq_varlen_8.x/sys/boot/ficl/mips/ - copied from r188939, head/sys/boot/ficl/mips/ user/lstewart/alq_varlen_8.x/sys/dev/ata/ata-raid-ddf.h - copied unchanged from r188939, head/sys/dev/ata/ata-raid-ddf.h user/lstewart/alq_varlen_8.x/sys/legacy/ - copied from r188939, head/sys/legacy/ user/lstewart/alq_varlen_8.x/sys/powerpc/include/altivec.h - copied unchanged from r188939, head/sys/powerpc/include/altivec.h user/lstewart/alq_varlen_8.x/sys/powerpc/powerpc/altivec.c - copied unchanged from r188939, head/sys/powerpc/powerpc/altivec.c Deleted: user/lstewart/alq_varlen_8.x/sys/dev/usb/ user/lstewart/alq_varlen_8.x/sys/dev/usb2/include/Makefile user/lstewart/alq_varlen_8.x/sys/dev/usb2/include/usb2_devid.h user/lstewart/alq_varlen_8.x/sys/dev/usb2/include/usb2_devtable.h user/lstewart/alq_varlen_8.x/sys/modules/aue/ user/lstewart/alq_varlen_8.x/sys/modules/axe/ user/lstewart/alq_varlen_8.x/sys/modules/cdce/ user/lstewart/alq_varlen_8.x/sys/modules/cue/ user/lstewart/alq_varlen_8.x/sys/modules/ehci/ user/lstewart/alq_varlen_8.x/sys/modules/kue/ user/lstewart/alq_varlen_8.x/sys/modules/ohci/ user/lstewart/alq_varlen_8.x/sys/modules/rue/ user/lstewart/alq_varlen_8.x/sys/modules/rum/ user/lstewart/alq_varlen_8.x/sys/modules/slhci/ user/lstewart/alq_varlen_8.x/sys/modules/u3g/ user/lstewart/alq_varlen_8.x/sys/modules/uark/ user/lstewart/alq_varlen_8.x/sys/modules/ubsa/ user/lstewart/alq_varlen_8.x/sys/modules/ucom/ user/lstewart/alq_varlen_8.x/sys/modules/udav/ user/lstewart/alq_varlen_8.x/sys/modules/udbp/ user/lstewart/alq_varlen_8.x/sys/modules/ufm/ user/lstewart/alq_varlen_8.x/sys/modules/ufoma/ user/lstewart/alq_varlen_8.x/sys/modules/uftdi/ user/lstewart/alq_varlen_8.x/sys/modules/ugen/ user/lstewart/alq_varlen_8.x/sys/modules/uhci/ user/lstewart/alq_varlen_8.x/sys/modules/uhid/ user/lstewart/alq_varlen_8.x/sys/modules/uipaq/ user/lstewart/alq_varlen_8.x/sys/modules/ukbd/ user/lstewart/alq_varlen_8.x/sys/modules/ulpt/ user/lstewart/alq_varlen_8.x/sys/modules/umass/ user/lstewart/alq_varlen_8.x/sys/modules/umct/ user/lstewart/alq_varlen_8.x/sys/modules/umodem/ user/lstewart/alq_varlen_8.x/sys/modules/ums/ user/lstewart/alq_varlen_8.x/sys/modules/upgt/ user/lstewart/alq_varlen_8.x/sys/modules/uplcom/ user/lstewart/alq_varlen_8.x/sys/modules/ural/ user/lstewart/alq_varlen_8.x/sys/modules/urio/ user/lstewart/alq_varlen_8.x/sys/modules/urtw/ user/lstewart/alq_varlen_8.x/sys/modules/usb/ user/lstewart/alq_varlen_8.x/sys/modules/uscanner/ user/lstewart/alq_varlen_8.x/sys/modules/uslcom/ user/lstewart/alq_varlen_8.x/sys/modules/uvisor/ user/lstewart/alq_varlen_8.x/sys/modules/uvscom/ user/lstewart/alq_varlen_8.x/sys/modules/zyd/ user/lstewart/alq_varlen_8.x/tools/tools/nanobsd/rescue/Files/root/change_password user/lstewart/alq_varlen_8.x/tools/tools/nanobsd/rescue/Files/root/save_cfg user/lstewart/alq_varlen_8.x/tools/tools/nanobsd/rescue/Files/root/save_sshkeys user/lstewart/alq_varlen_8.x/tools/tools/nanobsd/rescue/Files/root/updatep1 user/lstewart/alq_varlen_8.x/tools/tools/nanobsd/rescue/Files/root/updatep2 Modified: user/lstewart/alq_varlen_8.x/ (props changed) user/lstewart/alq_varlen_8.x/Makefile.inc1 user/lstewart/alq_varlen_8.x/UPDATING user/lstewart/alq_varlen_8.x/contrib/bind9/ (props changed) user/lstewart/alq_varlen_8.x/contrib/bsnmp/snmp_mibII/mibII.c user/lstewart/alq_varlen_8.x/contrib/cpio/ (props changed) user/lstewart/alq_varlen_8.x/contrib/csup/ (props changed) user/lstewart/alq_varlen_8.x/contrib/file/ (props changed) user/lstewart/alq_varlen_8.x/contrib/gdtoa/ (props changed) user/lstewart/alq_varlen_8.x/contrib/ncurses/ (props changed) user/lstewart/alq_varlen_8.x/contrib/netcat/ (props changed) user/lstewart/alq_varlen_8.x/contrib/ntp/ (props changed) user/lstewart/alq_varlen_8.x/contrib/openbsm/ (props changed) user/lstewart/alq_varlen_8.x/contrib/openpam/ (props changed) user/lstewart/alq_varlen_8.x/contrib/openpam/include/security/openpam.h user/lstewart/alq_varlen_8.x/contrib/openpam/lib/openpam_dynamic.c user/lstewart/alq_varlen_8.x/contrib/pf/ (props changed) user/lstewart/alq_varlen_8.x/contrib/sendmail/ (props changed) user/lstewart/alq_varlen_8.x/contrib/top/ (props changed) user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/ (props changed) user/lstewart/alq_varlen_8.x/crypto/openssh/ (props changed) user/lstewart/alq_varlen_8.x/crypto/openssl/ (props changed) user/lstewart/alq_varlen_8.x/etc/defaults/rc.conf user/lstewart/alq_varlen_8.x/etc/rc.d/defaultroute user/lstewart/alq_varlen_8.x/gnu/lib/csu/Makefile user/lstewart/alq_varlen_8.x/gnu/lib/libssp/Makefile user/lstewart/alq_varlen_8.x/lib/csu/Makefile.inc user/lstewart/alq_varlen_8.x/lib/libc/ (props changed) user/lstewart/alq_varlen_8.x/lib/libc/arm/sys/Ovfork.S user/lstewart/alq_varlen_8.x/lib/libc/mips/Symbol.map user/lstewart/alq_varlen_8.x/lib/libc/mips/sys/Ovfork.S user/lstewart/alq_varlen_8.x/lib/libc/stdtime/ (props changed) user/lstewart/alq_varlen_8.x/lib/libc/string/ffsll.c (props changed) user/lstewart/alq_varlen_8.x/lib/libc/string/flsll.c (props changed) user/lstewart/alq_varlen_8.x/lib/libpam/modules/Makefile.inc user/lstewart/alq_varlen_8.x/lib/libstand/Makefile user/lstewart/alq_varlen_8.x/lib/libthr/Makefile user/lstewart/alq_varlen_8.x/lib/libutil/ (props changed) user/lstewart/alq_varlen_8.x/libexec/rtld-elf/Makefile user/lstewart/alq_varlen_8.x/release/picobsd/bridge/PICOBSD user/lstewart/alq_varlen_8.x/release/picobsd/bridge/PICOBSD.hints user/lstewart/alq_varlen_8.x/release/picobsd/bridge/crunch.conf user/lstewart/alq_varlen_8.x/release/picobsd/build/picobsd user/lstewart/alq_varlen_8.x/release/picobsd/floppy.tree/etc/ttys user/lstewart/alq_varlen_8.x/rescue/librescue/Makefile user/lstewart/alq_varlen_8.x/rescue/rescue/Makefile user/lstewart/alq_varlen_8.x/sbin/ (props changed) user/lstewart/alq_varlen_8.x/sbin/atacontrol/atacontrol.8 user/lstewart/alq_varlen_8.x/sbin/atacontrol/atacontrol.c user/lstewart/alq_varlen_8.x/sbin/geom/class/journal/gjournal.8 user/lstewart/alq_varlen_8.x/sbin/ifconfig/ifieee80211.c user/lstewart/alq_varlen_8.x/share/man/man4/geom.4 user/lstewart/alq_varlen_8.x/share/man/man4/iwi.4 user/lstewart/alq_varlen_8.x/share/man/man5/rc.conf.5 user/lstewart/alq_varlen_8.x/share/man/man5/src.conf.5 user/lstewart/alq_varlen_8.x/share/man/man9/Makefile user/lstewart/alq_varlen_8.x/share/man/man9/disk.9 user/lstewart/alq_varlen_8.x/share/misc/bsd-family-tree user/lstewart/alq_varlen_8.x/share/misc/committers-ports.dot user/lstewart/alq_varlen_8.x/share/misc/committers-src.dot user/lstewart/alq_varlen_8.x/share/mk/bsd.cpu.mk user/lstewart/alq_varlen_8.x/share/zoneinfo/ (props changed) user/lstewart/alq_varlen_8.x/sys/ (props changed) user/lstewart/alq_varlen_8.x/sys/amd64/amd64/fpu.c user/lstewart/alq_varlen_8.x/sys/amd64/amd64/local_apic.c user/lstewart/alq_varlen_8.x/sys/amd64/amd64/pmap.c user/lstewart/alq_varlen_8.x/sys/amd64/linux32/linux32_machdep.c user/lstewart/alq_varlen_8.x/sys/arm/arm/cpufunc_asm_sheeva.S (props changed) user/lstewart/alq_varlen_8.x/sys/arm/conf/AVILA user/lstewart/alq_varlen_8.x/sys/arm/conf/CAMBRIA user/lstewart/alq_varlen_8.x/sys/boot/Makefile user/lstewart/alq_varlen_8.x/sys/boot/Makefile.inc user/lstewart/alq_varlen_8.x/sys/boot/i386/loader/Makefile user/lstewart/alq_varlen_8.x/sys/boot/ia64/common/Makefile user/lstewart/alq_varlen_8.x/sys/boot/ia64/efi/Makefile user/lstewart/alq_varlen_8.x/sys/boot/ia64/ski/Makefile user/lstewart/alq_varlen_8.x/sys/boot/pc98/loader/Makefile user/lstewart/alq_varlen_8.x/sys/boot/powerpc/ofw/Makefile user/lstewart/alq_varlen_8.x/sys/boot/sparc64/loader/Makefile user/lstewart/alq_varlen_8.x/sys/compat/linux/linux_stats.c user/lstewart/alq_varlen_8.x/sys/compat/ndis/kern_ndis.c user/lstewart/alq_varlen_8.x/sys/compat/ndis/kern_windrv.c user/lstewart/alq_varlen_8.x/sys/compat/ndis/subr_ndis.c user/lstewart/alq_varlen_8.x/sys/compat/ndis/subr_usbd.c user/lstewart/alq_varlen_8.x/sys/conf/files user/lstewart/alq_varlen_8.x/sys/conf/files.powerpc user/lstewart/alq_varlen_8.x/sys/conf/kern.mk user/lstewart/alq_varlen_8.x/sys/contrib/pf/ (props changed) user/lstewart/alq_varlen_8.x/sys/dev/aac/aac.c user/lstewart/alq_varlen_8.x/sys/dev/aac/aac_debug.c user/lstewart/alq_varlen_8.x/sys/dev/aac/aac_pci.c user/lstewart/alq_varlen_8.x/sys/dev/aac/aacreg.h user/lstewart/alq_varlen_8.x/sys/dev/aac/aacvar.h user/lstewart/alq_varlen_8.x/sys/dev/acpica/acpi_cpu.c user/lstewart/alq_varlen_8.x/sys/dev/arcmsr/arcmsr.c user/lstewart/alq_varlen_8.x/sys/dev/ata/ata-all.c user/lstewart/alq_varlen_8.x/sys/dev/ata/ata-all.h user/lstewart/alq_varlen_8.x/sys/dev/ata/ata-card.c user/lstewart/alq_varlen_8.x/sys/dev/ata/ata-cbus.c user/lstewart/alq_varlen_8.x/sys/dev/ata/ata-disk.c user/lstewart/alq_varlen_8.x/sys/dev/ata/ata-dma.c user/lstewart/alq_varlen_8.x/sys/dev/ata/ata-isa.c user/lstewart/alq_varlen_8.x/sys/dev/ata/ata-pci.c user/lstewart/alq_varlen_8.x/sys/dev/ata/ata-pci.h user/lstewart/alq_varlen_8.x/sys/dev/ata/ata-queue.c user/lstewart/alq_varlen_8.x/sys/dev/ata/ata-raid.c user/lstewart/alq_varlen_8.x/sys/dev/ata/ata-raid.h user/lstewart/alq_varlen_8.x/sys/dev/ata/ata-sata.c user/lstewart/alq_varlen_8.x/sys/dev/ata/ata-usb.c user/lstewart/alq_varlen_8.x/sys/dev/ata/atapi-cd.c user/lstewart/alq_varlen_8.x/sys/dev/ata/atapi-fd.c user/lstewart/alq_varlen_8.x/sys/dev/ata/atapi-tape.c user/lstewart/alq_varlen_8.x/sys/dev/ata/chipsets/ata-acard.c user/lstewart/alq_varlen_8.x/sys/dev/ata/chipsets/ata-acerlabs.c user/lstewart/alq_varlen_8.x/sys/dev/ata/chipsets/ata-ahci.c user/lstewart/alq_varlen_8.x/sys/dev/ata/chipsets/ata-highpoint.c user/lstewart/alq_varlen_8.x/sys/dev/ata/chipsets/ata-intel.c user/lstewart/alq_varlen_8.x/sys/dev/ata/chipsets/ata-jmicron.c user/lstewart/alq_varlen_8.x/sys/dev/ata/chipsets/ata-marvell.c user/lstewart/alq_varlen_8.x/sys/dev/ata/chipsets/ata-netcell.c user/lstewart/alq_varlen_8.x/sys/dev/ata/chipsets/ata-nvidia.c user/lstewart/alq_varlen_8.x/sys/dev/ata/chipsets/ata-promise.c user/lstewart/alq_varlen_8.x/sys/dev/ata/chipsets/ata-serverworks.c user/lstewart/alq_varlen_8.x/sys/dev/ata/chipsets/ata-siliconimage.c user/lstewart/alq_varlen_8.x/sys/dev/ata/chipsets/ata-sis.c user/lstewart/alq_varlen_8.x/sys/dev/ata/chipsets/ata-via.c user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_hal/ah.c user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_hal/ah.h user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_hal/ah_internal.h user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c user/lstewart/alq_varlen_8.x/sys/dev/ath/if_ath.c user/lstewart/alq_varlen_8.x/sys/dev/ath/if_athvar.h user/lstewart/alq_varlen_8.x/sys/dev/cfi/cfi_bus_ixp4xx.c user/lstewart/alq_varlen_8.x/sys/dev/ciss/ciss.c user/lstewart/alq_varlen_8.x/sys/dev/cx/if_cx.c user/lstewart/alq_varlen_8.x/sys/dev/firewire/firewire.c user/lstewart/alq_varlen_8.x/sys/dev/firewire/firewire.h user/lstewart/alq_varlen_8.x/sys/dev/firewire/sbp.c user/lstewart/alq_varlen_8.x/sys/dev/if_ndis/if_ndis.c user/lstewart/alq_varlen_8.x/sys/dev/if_ndis/if_ndis_pccard.c user/lstewart/alq_varlen_8.x/sys/dev/if_ndis/if_ndis_pci.c user/lstewart/alq_varlen_8.x/sys/dev/if_ndis/if_ndis_usb.c user/lstewart/alq_varlen_8.x/sys/dev/md/md.c user/lstewart/alq_varlen_8.x/sys/dev/mmc/mmcsd.c user/lstewart/alq_varlen_8.x/sys/dev/mxge/eth_z8e.h user/lstewart/alq_varlen_8.x/sys/dev/mxge/ethp_z8e.h user/lstewart/alq_varlen_8.x/sys/dev/mxge/if_mxge.c user/lstewart/alq_varlen_8.x/sys/dev/mxge/if_mxge_var.h user/lstewart/alq_varlen_8.x/sys/dev/mxge/mxge_mcp.h user/lstewart/alq_varlen_8.x/sys/dev/mxge/rss_eth_z8e.h user/lstewart/alq_varlen_8.x/sys/dev/mxge/rss_ethp_z8e.h user/lstewart/alq_varlen_8.x/sys/dev/sdhci/sdhci.c user/lstewart/alq_varlen_8.x/sys/dev/tsec/if_tsec.c user/lstewart/alq_varlen_8.x/sys/dev/tsec/if_tsec.h user/lstewart/alq_varlen_8.x/sys/dev/tsec/if_tsec_ocp.c user/lstewart/alq_varlen_8.x/sys/dev/tsec/if_tsecreg.h user/lstewart/alq_varlen_8.x/sys/dev/usb2/bluetooth/ng_ubt2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/bluetooth/ubtbcmfw2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/controller/usb2_bus.h user/lstewart/alq_varlen_8.x/sys/dev/usb2/controller/usb2_controller.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/core/usb2_device.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/ethernet/if_aue2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/ethernet/if_auereg.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb2/ethernet/if_axe2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/ethernet/if_axereg.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb2/ethernet/if_cdce2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/ethernet/if_cdcereg.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb2/ethernet/if_cue2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/ethernet/if_cuereg.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb2/ethernet/if_kue2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/ethernet/if_kuefw.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb2/ethernet/if_kuereg.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb2/ethernet/if_rue2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/ethernet/if_ruereg.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb2/ethernet/if_udav2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/ethernet/if_udavreg.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb2/image/uscanner2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/input/uhid2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/input/ums2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/misc/udbp2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/misc/ufm2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/quirk/usb2_quirk.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/serial/u3g2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/serial/uark2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/serial/ubsa2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/serial/uchcom2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/serial/ucycom2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/serial/ufoma2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/serial/uftdi2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/serial/ugensa2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/serial/uipaq2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/serial/ulpt2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/serial/umct2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/serial/umodem2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/serial/umoscom2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/serial/uplcom2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/serial/uslcom2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/serial/uvisor2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/serial/uvscom2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/sound/uaudio2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/storage/ata-usb2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/storage/umass2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/storage/urio2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/storage/ustorage2_fs.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/wlan/if_rum2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/wlan/if_rumfw.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb2/wlan/if_rumreg.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb2/wlan/if_rumvar.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb2/wlan/if_ural2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/wlan/if_uralreg.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb2/wlan/if_uralvar.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb2/wlan/if_zyd2.c user/lstewart/alq_varlen_8.x/sys/dev/usb2/wlan/if_zydfw.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb2/wlan/if_zydreg.h (props changed) user/lstewart/alq_varlen_8.x/sys/fs/tmpfs/tmpfs_vnops.c user/lstewart/alq_varlen_8.x/sys/fs/udf/udf_vnops.c user/lstewart/alq_varlen_8.x/sys/geom/geom_dev.c user/lstewart/alq_varlen_8.x/sys/geom/part/g_part.c user/lstewart/alq_varlen_8.x/sys/geom/part/g_part_bsd.c user/lstewart/alq_varlen_8.x/sys/geom/part/g_part_ebr.c user/lstewart/alq_varlen_8.x/sys/geom/part/g_part_if.m user/lstewart/alq_varlen_8.x/sys/i386/acpica/acpi_wakeup.c user/lstewart/alq_varlen_8.x/sys/i386/i386/local_apic.c user/lstewart/alq_varlen_8.x/sys/i386/i386/pmap.c user/lstewart/alq_varlen_8.x/sys/i386/ibcs2/ibcs2_sysi86.c user/lstewart/alq_varlen_8.x/sys/i386/isa/npx.c user/lstewart/alq_varlen_8.x/sys/i386/linux/linux_machdep.c user/lstewart/alq_varlen_8.x/sys/kern/kern_osd.c user/lstewart/alq_varlen_8.x/sys/kern/kern_proc.c user/lstewart/alq_varlen_8.x/sys/kern/tty_pts.c user/lstewart/alq_varlen_8.x/sys/kern/vfs_cache.c user/lstewart/alq_varlen_8.x/sys/kern/vfs_syscalls.c user/lstewart/alq_varlen_8.x/sys/legacy/dev/usb/ (props changed) user/lstewart/alq_varlen_8.x/sys/mips/mips/elf64_machdep.c (props changed) user/lstewart/alq_varlen_8.x/sys/modules/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/bluetooth_fw/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/bluetooth_ng/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/core/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/ethernet_aue/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/ethernet_axe/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/ethernet_cdce/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/ethernet_cue/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/ethernet_dav/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/ethernet_kue/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/ethernet_rue/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/input_hid/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/input_kbd/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/input_ms/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/misc_dbp/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/misc_fm/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/quirk/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/scanner/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/serial_3g/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/serial_ark/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/serial_bsa/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/serial_bser/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/serial_chcom/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/serial_cycom/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/serial_foma/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/serial_ftdi/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/serial_gensa/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/serial_ipaq/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/serial_lpt/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/serial_mct/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/serial_modem/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/serial_moscom/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/serial_plcom/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/serial_slcom/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/serial_visor/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/serial_vscom/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/sound/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/storage_ata/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/storage_fs/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/storage_mass/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/storage_rio/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/template/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/wlan_ral/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/wlan_rum/Makefile user/lstewart/alq_varlen_8.x/sys/modules/usb2/wlan_zyd/Makefile user/lstewart/alq_varlen_8.x/sys/net80211/_ieee80211.h user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211.c user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_ioctl.c user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_node.c user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_phy.c user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_proto.c user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_regdomain.c user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_scan.c user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_scan_sta.c user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_tdma.c user/lstewart/alq_varlen_8.x/sys/netinet/sctp_constants.h user/lstewart/alq_varlen_8.x/sys/netinet/sctp_header.h user/lstewart/alq_varlen_8.x/sys/netinet/sctp_input.c user/lstewart/alq_varlen_8.x/sys/netinet/sctp_output.c user/lstewart/alq_varlen_8.x/sys/netinet/sctp_output.h user/lstewart/alq_varlen_8.x/sys/netinet/sctp_pcb.c user/lstewart/alq_varlen_8.x/sys/netinet/sctp_structs.h user/lstewart/alq_varlen_8.x/sys/netinet/sctp_uio.h user/lstewart/alq_varlen_8.x/sys/netinet/sctp_usrreq.c user/lstewart/alq_varlen_8.x/sys/netinet/sctputil.c user/lstewart/alq_varlen_8.x/sys/nfsclient/nfs_vnops.c user/lstewart/alq_varlen_8.x/sys/nfsclient/nfsnode.h user/lstewart/alq_varlen_8.x/sys/powerpc/aim/machdep.c user/lstewart/alq_varlen_8.x/sys/powerpc/aim/swtch.S user/lstewart/alq_varlen_8.x/sys/powerpc/aim/trap.c user/lstewart/alq_varlen_8.x/sys/powerpc/aim/trap_subr.S user/lstewart/alq_varlen_8.x/sys/powerpc/conf/MPC85XX user/lstewart/alq_varlen_8.x/sys/powerpc/include/pcb.h user/lstewart/alq_varlen_8.x/sys/powerpc/include/pcpu.h user/lstewart/alq_varlen_8.x/sys/powerpc/powerpc/genassym.c user/lstewart/alq_varlen_8.x/sys/sys/disk.h user/lstewart/alq_varlen_8.x/sys/sys/jail.h user/lstewart/alq_varlen_8.x/sys/sys/osd.h user/lstewart/alq_varlen_8.x/sys/sys/param.h user/lstewart/alq_varlen_8.x/sys/sys/syscallsubr.h user/lstewart/alq_varlen_8.x/sys/sys/vnode.h user/lstewart/alq_varlen_8.x/sys/vm/swap_pager.c user/lstewart/alq_varlen_8.x/sys/vm/vm_object.c user/lstewart/alq_varlen_8.x/tools/build/options/WITHOUT_LIBPTHREAD user/lstewart/alq_varlen_8.x/tools/build/options/makeman user/lstewart/alq_varlen_8.x/tools/regression/fstest/fstest.c user/lstewart/alq_varlen_8.x/tools/regression/lib/msun/test-conj.t (props changed) user/lstewart/alq_varlen_8.x/tools/tools/net80211/wlantxtime/wlantxtime.c user/lstewart/alq_varlen_8.x/usr.bin/calendar/calendars/calendar.freebsd user/lstewart/alq_varlen_8.x/usr.bin/csup/ (props changed) user/lstewart/alq_varlen_8.x/usr.bin/ktrdump/ktrdump.c user/lstewart/alq_varlen_8.x/usr.bin/printenv/printenv.c user/lstewart/alq_varlen_8.x/usr.bin/procstat/ (props changed) user/lstewart/alq_varlen_8.x/usr.bin/talk/get_names.c user/lstewart/alq_varlen_8.x/usr.bin/truncate/truncate.c user/lstewart/alq_varlen_8.x/usr.bin/vmstat/vmstat.c user/lstewart/alq_varlen_8.x/usr.bin/window/compress.c user/lstewart/alq_varlen_8.x/usr.bin/window/context.c user/lstewart/alq_varlen_8.x/usr.bin/window/lcmd1.c user/lstewart/alq_varlen_8.x/usr.bin/window/lcmd2.c user/lstewart/alq_varlen_8.x/usr.bin/window/scanner.c user/lstewart/alq_varlen_8.x/usr.bin/window/startup.c user/lstewart/alq_varlen_8.x/usr.bin/window/string.c user/lstewart/alq_varlen_8.x/usr.bin/window/ttoutput.c user/lstewart/alq_varlen_8.x/usr.bin/window/tttermcap.c user/lstewart/alq_varlen_8.x/usr.bin/window/ttzapple.c user/lstewart/alq_varlen_8.x/usr.bin/window/var.c user/lstewart/alq_varlen_8.x/usr.bin/window/wwdump.c user/lstewart/alq_varlen_8.x/usr.bin/window/wwend.c user/lstewart/alq_varlen_8.x/usr.bin/window/wwenviron.c user/lstewart/alq_varlen_8.x/usr.bin/window/wwflush.c user/lstewart/alq_varlen_8.x/usr.bin/window/wwinit.c user/lstewart/alq_varlen_8.x/usr.bin/window/wwpty.c user/lstewart/alq_varlen_8.x/usr.bin/window/wwspawn.c user/lstewart/alq_varlen_8.x/usr.bin/window/xx.c user/lstewart/alq_varlen_8.x/usr.sbin/Makefile user/lstewart/alq_varlen_8.x/usr.sbin/dumpcis/cardinfo.h (props changed) user/lstewart/alq_varlen_8.x/usr.sbin/dumpcis/cis.h (props changed) user/lstewart/alq_varlen_8.x/usr.sbin/fwcontrol/fwcontrol.c user/lstewart/alq_varlen_8.x/usr.sbin/lmcconfig/lmcconfig.c user/lstewart/alq_varlen_8.x/usr.sbin/makefs/ffs/ffs_bswap.c (props changed) user/lstewart/alq_varlen_8.x/usr.sbin/makefs/ffs/ffs_subr.c (props changed) user/lstewart/alq_varlen_8.x/usr.sbin/makefs/ffs/ufs_bswap.h (props changed) user/lstewart/alq_varlen_8.x/usr.sbin/makefs/getid.c (props changed) user/lstewart/alq_varlen_8.x/usr.sbin/rpc.yppasswdd/yppasswdd_server.c user/lstewart/alq_varlen_8.x/usr.sbin/rtadvd/rrenum.c user/lstewart/alq_varlen_8.x/usr.sbin/zic/ (props changed) Modified: user/lstewart/alq_varlen_8.x/Makefile.inc1 ============================================================================== --- user/lstewart/alq_varlen_8.x/Makefile.inc1 Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/Makefile.inc1 Mon Mar 9 06:02:05 2009 (r189554) @@ -230,7 +230,7 @@ BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \ ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ DESTDIR= \ BOOTSTRAPPING=${OSRELDATE} \ - -DWITHOUT_SSP \ + SSP_CFLAGS= \ -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \ -DWITHOUT_NLS -DNO_PIC -DWITHOUT_PROFILE -DNO_SHARED \ -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF @@ -240,8 +240,9 @@ TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \ ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ DESTDIR= \ + SSP_CFLAGS= \ BOOTSTRAPPING=${OSRELDATE} -DNO_LINT -DNO_CPU_CFLAGS \ - -DNO_WARNS -DNO_CTF -DWITHOUT_SSP + -DNO_WARNS -DNO_CTF # cross-tools stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \ @@ -458,7 +459,7 @@ build32: .if ${MK_KERBEROS} != "no" .for _t in obj depend all cd ${.CURDIR}/kerberos5/tools; \ - MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} -DWITHOUT_SSP DESTDIR= \ + MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} SSP_CFLAGS= DESTDIR= \ ${_t} .endfor .endif @@ -481,7 +482,7 @@ build32: .endfor .for _dir in lib/ncurses/ncurses lib/ncurses/ncursesw lib/libmagic cd ${.CURDIR}/${_dir}; \ - MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} -DWITHOUT_SSP DESTDIR= \ + MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} SSP_CFLAGS= DESTDIR= \ build-tools .endfor cd ${.CURDIR}; \ @@ -782,14 +783,14 @@ buildkernel: @echo "--------------------------------------------------------------" cd ${KRNLOBJDIR}/${_kernel}; \ MAKESRCPATH=${KERNSRCDIR}/dev/aic7xxx/aicasm \ - ${MAKE} -DWITHOUT_SSP -DNO_CPU_CFLAGS -DNO_CTF \ + ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF \ -f ${KERNSRCDIR}/dev/aic7xxx/aicasm/Makefile # XXX - Gratuitously builds aicasm in the ``makeoptions NO_MODULES'' case. .if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KERNSRCDIR}/modules) .for target in obj depend all cd ${KERNSRCDIR}/modules/aic7xxx/aicasm; \ MAKEOBJDIRPREFIX=${KRNLOBJDIR}/${_kernel}/modules \ - ${MAKE} -DWITHOUT_SSP -DNO_CPU_CFLAGS -DNO_CTF ${target} + ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF ${target} .endfor .endif .if !defined(NO_KERNELDEPEND) Modified: user/lstewart/alq_varlen_8.x/UPDATING ============================================================================== --- user/lstewart/alq_varlen_8.x/UPDATING Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/UPDATING Mon Mar 9 06:02:05 2009 (r189554) @@ -22,13 +22,19 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8. to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090217: + The rc.conf(5) option if_up_delay has been renamed to + defaultroute_delay to better reflect its purpose. If you have + customized this setting in /etc/rc.conf you need to update it to + use the new name. + 20090216: xorg 7.4 wants to configure its input devices via hald which does not yet work with USB2. If the keyboard/mouse does not work in xorg then add Option "AllowEmptyInput" "off" to your ServerLayout section. This will cause X to use the configured - kbd and mouse sections from your xorg.conf + kbd and mouse sections from your xorg.conf. 20090215: The GENERIC kernels for all architectures now default to the new USB2 @@ -36,7 +42,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8. problem arises please report it and optionally revert to the old USB stack. If you are loading USB kernel modules or have a custom kernel that includes GENERIC then ensure that usb names are also changed over, - eg uftdi -> usb2_serial_ftdi + eg uftdi -> usb2_serial_ftdi. 20090203: The ichsmb(4) driver has been changed to require SMBus slave @@ -74,13 +80,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8. the base system (it was a port). 20081216: - The afdata and ifnet locks have been changed from mutexes to + The afdata and ifnet locks have been changed from mutexes to rwlocks, network modules will need to be re-compiled. 20081214: __FreeBSD_version 800059 incorporates the new arp-v2 rewrite. RTF_CLONING, RTF_LLINFO and RTF_WASCLONED flags are eliminated. - The new code reduced struct rtentry{} by 16 bytes on 32-bit + The new code reduced struct rtentry{} by 16 bytes on 32-bit architecture and 40 bytes on 64-bit architecture. The userland applications "arp" and "ndp" have been updated accordingly. The output from "netstat -r" shows only routing entries and Modified: user/lstewart/alq_varlen_8.x/contrib/bsnmp/snmp_mibII/mibII.c ============================================================================== --- user/lstewart/alq_varlen_8.x/contrib/bsnmp/snmp_mibII/mibII.c Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/contrib/bsnmp/snmp_mibII/mibII.c Mon Mar 9 06:02:05 2009 (r189554) @@ -1013,7 +1013,7 @@ handle_rtmsg(struct rt_msghdr *rtm) break; case RTM_IFINFO: - ifm = (struct if_msghdr *)rtm; + ifm = (struct if_msghdr *)(void *)rtm; mib_extract_addrs(ifm->ifm_addrs, (u_char *)(ifm + 1), addrs); if ((ifp = mib_find_if_sys(ifm->ifm_index)) == NULL) break; Modified: user/lstewart/alq_varlen_8.x/contrib/openpam/include/security/openpam.h ============================================================================== --- user/lstewart/alq_varlen_8.x/contrib/openpam/include/security/openpam.h Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/contrib/openpam/include/security/openpam.h Mon Mar 9 06:02:05 2009 (r189554) @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2007 Dag-Erling Smørgrav + * Copyright (c) 2004-2008 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam.h 408 2007-12-21 11:36:24Z des $ + * $Id: openpam.h 418 2008-12-13 22:39:24Z des $ */ #ifndef SECURITY_OPENPAM_H_INCLUDED @@ -309,18 +309,17 @@ struct pam_module { * Infrastructure for static modules using GCC linker sets. * You are not expected to understand this. */ -#if defined(__FreeBSD__) +#if !defined(PAM_SOEXT) # define PAM_SOEXT ".so" -#else -# undef NO_STATIC_MODULES -# define NO_STATIC_MODULES #endif -#if defined(__GNUC__) && !defined(__PIC__) && !defined(NO_STATIC_MODULES) +#if defined(OPENPAM_STATIC_MODULES) +# if !defined(__GNUC__) +# error "Don't know how to build static modules on non-GNU compilers" +# endif /* gcc, static linking */ # include # include -# define OPENPAM_STATIC_MODULES # define PAM_EXTERN static # define PAM_MODULE_ENTRY(name) \ static char _pam_name[] = name PAM_SOEXT; \ Modified: user/lstewart/alq_varlen_8.x/contrib/openpam/lib/openpam_dynamic.c ============================================================================== --- user/lstewart/alq_varlen_8.x/contrib/openpam/lib/openpam_dynamic.c Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/contrib/openpam/lib/openpam_dynamic.c Mon Mar 9 06:02:05 2009 (r189554) @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2007 Dag-Erling Smørgrav + * Copyright (c) 2004-2008 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,9 +32,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_dynamic.c 408 2007-12-21 11:36:24Z des $ + * $Id: openpam_dynamic.c 417 2008-02-14 18:36:22Z des $ */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include #include #include @@ -57,6 +61,7 @@ pam_module_t * openpam_dynamic(const char *path) { + const pam_module_t *dlmodule; pam_module_t *module; const char *prefix; char *vpath; @@ -64,8 +69,6 @@ openpam_dynamic(const char *path) int i; dlh = NULL; - if ((module = calloc(1, sizeof *module)) == NULL) - goto buf_err; /* Prepend the standard prefix if not an absolute pathname. */ if (path[0] != '/') @@ -75,33 +78,37 @@ openpam_dynamic(const char *path) /* try versioned module first, then unversioned module */ if (asprintf(&vpath, "%s%s.%d", prefix, path, LIB_MAJ) < 0) - goto buf_err; + goto err; if ((dlh = dlopen(vpath, RTLD_NOW)) == NULL) { openpam_log(PAM_LOG_DEBUG, "%s: %s", vpath, dlerror()); *strrchr(vpath, '.') = '\0'; if ((dlh = dlopen(vpath, RTLD_NOW)) == NULL) { openpam_log(PAM_LOG_DEBUG, "%s: %s", vpath, dlerror()); FREE(vpath); - FREE(module); return (NULL); } } FREE(vpath); + if ((module = calloc(1, sizeof *module)) == NULL) + goto buf_err; if ((module->path = strdup(path)) == NULL) goto buf_err; module->dlh = dlh; + dlmodule = dlsym(dlh, "_pam_module"); for (i = 0; i < PAM_NUM_PRIMITIVES; ++i) { - module->func[i] = (pam_func_t)dlsym(dlh, _pam_sm_func_name[i]); + module->func[i] = dlmodule ? dlmodule->func[i] : + (pam_func_t)dlsym(dlh, _pam_sm_func_name[i]); if (module->func[i] == NULL) openpam_log(PAM_LOG_DEBUG, "%s: %s(): %s", path, _pam_sm_func_name[i], dlerror()); } return (module); - buf_err: - openpam_log(PAM_LOG_ERROR, "%m"); +buf_err: if (dlh != NULL) dlclose(dlh); FREE(module); +err: + openpam_log(PAM_LOG_ERROR, "%m"); return (NULL); } Modified: user/lstewart/alq_varlen_8.x/etc/defaults/rc.conf ============================================================================== --- user/lstewart/alq_varlen_8.x/etc/defaults/rc.conf Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/etc/defaults/rc.conf Mon Mar 9 06:02:05 2009 (r189554) @@ -105,6 +105,7 @@ background_dhclient="YES" # Start dhcp c #background_dhclient_fxp0="YES" # Start dhcp client on fxp0 in the background. synchronous_dhclient="NO" # Start dhclient directly on configured # interfaces during startup. +defaultroute_delay="30" # Time to wait for a default route on a DHCP interface. wpa_supplicant_program="/usr/sbin/wpa_supplicant" wpa_supplicant_flags="-s" # Extra flags to pass to wpa_supplicant wpa_supplicant_conf_file="/etc/wpa_supplicant.conf" @@ -189,7 +190,6 @@ tcp_drop_synfin="NO" # Set to YES to dr icmp_drop_redirect="NO" # Set to YES to ignore ICMP REDIRECT packets icmp_log_redirect="NO" # Set to YES to log ICMP REDIRECT packets network_interfaces="auto" # List of network interfaces (or "auto"). -if_up_delay="30" # Time to wait for interfaces to come up. cloned_interfaces="" # List of cloned network interfaces to create. #cloned_interfaces="gif0 gif1 gif2 gif3" # Pre-cloning GENERIC config. ifconfig_lo0="inet 127.0.0.1" # default loopback device configuration. Modified: user/lstewart/alq_varlen_8.x/etc/rc.d/defaultroute ============================================================================== --- user/lstewart/alq_varlen_8.x/etc/rc.d/defaultroute Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/etc/rc.d/defaultroute Mon Mar 9 06:02:05 2009 (r189554) @@ -35,16 +35,16 @@ defaultroute_start() fi # Wait for a default route - delay=${if_up_delay} + delay=${defaultroute_delay} while [ ${delay} -gt 0 ]; do defif=`get_default_if -inet` if [ -n "${defif}" ]; then - if [ ${delay} -ne ${if_up_delay} ]; then + if [ ${delay} -ne ${defaultroute_delay} ]; then echo -n "($defif)" fi break fi - if [ ${delay} -eq ${if_up_delay} ]; then + if [ ${delay} -eq ${defaultroute_delay} ]; then echo -n "Waiting ${delay}s for the default route interface: " else echo -n . Modified: user/lstewart/alq_varlen_8.x/gnu/lib/csu/Makefile ============================================================================== --- user/lstewart/alq_varlen_8.x/gnu/lib/csu/Makefile Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/gnu/lib/csu/Makefile Mon Mar 9 06:02:05 2009 (r189554) @@ -1,5 +1,8 @@ # $FreeBSD$ +.include +MK_SSP= no + GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs CCDIR= ${.CURDIR}/../../usr.bin/cc @@ -19,7 +22,6 @@ CFLAGS+= -I${GCCLIB}/include -I${GCCDIR} -I${CCDIR}/cc_tools CRTS_CFLAGS= -DCRTSTUFFS_O -DSHARED ${PICFLAG} MKDEP= -DCRT_BEGIN -WITHOUT_SSP= .if ${MACHINE_ARCH} == "ia64" BEGINSRC= crtbegin.asm Modified: user/lstewart/alq_varlen_8.x/gnu/lib/libssp/Makefile ============================================================================== --- user/lstewart/alq_varlen_8.x/gnu/lib/libssp/Makefile Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/gnu/lib/libssp/Makefile Mon Mar 9 06:02:05 2009 (r189554) @@ -1,5 +1,8 @@ # $FreeBSD$ +.include +MK_SSP= no + GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs SRCDIR= ${GCCLIB}/libssp @@ -10,7 +13,6 @@ LIB= ssp SHLIB_MAJOR= 0 SHLIBDIR?= /lib NO_PROFILE= -WITHOUT_SSP= SRCS= ssp.c gets-chk.c memcpy-chk.c memmove-chk.c mempcpy-chk.c \ memset-chk.c snprintf-chk.c sprintf-chk.c stpcpy-chk.c \ Modified: user/lstewart/alq_varlen_8.x/lib/csu/Makefile.inc ============================================================================== --- user/lstewart/alq_varlen_8.x/lib/csu/Makefile.inc Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/lib/csu/Makefile.inc Mon Mar 9 06:02:05 2009 (r189554) @@ -1,3 +1,3 @@ # $FreeBSD$ -WITHOUT_SSP= +SSP_CFLAGS= Modified: user/lstewart/alq_varlen_8.x/lib/libc/arm/sys/Ovfork.S ============================================================================== --- user/lstewart/alq_varlen_8.x/lib/libc/arm/sys/Ovfork.S Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/lib/libc/arm/sys/Ovfork.S Mon Mar 9 06:02:05 2009 (r189554) @@ -35,9 +35,6 @@ __FBSDID("$FreeBSD$"); #include "SYS.h" -WARN_REFERENCES(vfork, \ - "warning: reference to compatibility vfork(); include for correct reference") - /* * pid = vfork(); * Modified: user/lstewart/alq_varlen_8.x/lib/libc/mips/Symbol.map ============================================================================== --- user/lstewart/alq_varlen_8.x/lib/libc/mips/Symbol.map Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/lib/libc/mips/Symbol.map Mon Mar 9 06:02:05 2009 (r189554) @@ -34,7 +34,6 @@ FBSD_1.0 { vfork; brk; cerror; /* XXX - Should this be .cerror (see sys/cerror.S)? */ - fork; sbrk; }; @@ -57,12 +56,9 @@ FBSDprivate_1.0 { __siglongjmp; __sys_vfork; _vfork; - _brk; end; /* XXX - Should this be _end (see sys/brk.S)? */ curbrk; minbrk; _brk; - __sys_fork; - _fork; _sbrk; }; Modified: user/lstewart/alq_varlen_8.x/lib/libc/mips/sys/Ovfork.S ============================================================================== --- user/lstewart/alq_varlen_8.x/lib/libc/mips/sys/Ovfork.S Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/lib/libc/mips/sys/Ovfork.S Mon Mar 9 06:02:05 2009 (r189554) @@ -41,9 +41,6 @@ __FBSDID("$FreeBSD$"); ASMSTR("$NetBSD: compat_Ovfork.S,v 1.1 2005/09/17 11:49:39 tsutsui Exp $") #endif /* LIBC_SCCS and not lint */ -WARN_REFERENCES(vfork, \ - "warning: reference to compatibility vfork(); include for correct reference") - /* * pid = vfork(); * Modified: user/lstewart/alq_varlen_8.x/lib/libpam/modules/Makefile.inc ============================================================================== --- user/lstewart/alq_varlen_8.x/lib/libpam/modules/Makefile.inc Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/lib/libpam/modules/Makefile.inc Mon Mar 9 06:02:05 2009 (r189554) @@ -19,4 +19,7 @@ DPADD+= ${LIBPAM} LDADD+= -lpam .endif +.c.o: + ${CC} ${CFLAGS} -DOPENPAM_STATIC_MODULES -c ${.IMPSRC} + .include "../Makefile.inc" Modified: user/lstewart/alq_varlen_8.x/lib/libstand/Makefile ============================================================================== --- user/lstewart/alq_varlen_8.x/lib/libstand/Makefile Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/lib/libstand/Makefile Mon Mar 9 06:02:05 2009 (r189554) @@ -6,13 +6,15 @@ # quite large. # +.include +MK_SSP= no + LIB= stand NO_PROFILE= NO_PIC= INCS= stand.h MAN= libstand.3 -WITHOUT_SSP= CFLAGS+= -ffreestanding -Wformat CFLAGS+= -I${.CURDIR} Modified: user/lstewart/alq_varlen_8.x/lib/libthr/Makefile ============================================================================== --- user/lstewart/alq_varlen_8.x/lib/libthr/Makefile Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/lib/libthr/Makefile Mon Mar 9 06:02:05 2009 (r189554) @@ -8,9 +8,8 @@ # (for system call stubs) to CFLAGS below. -DSYSLIBC_SCCS affects just the # system call stubs. -WITHOUT_SSP= - .include +MK_SSP= no .if ${SHLIBDIR} == "/usr/lib" SHLIBDIR= /lib Modified: user/lstewart/alq_varlen_8.x/libexec/rtld-elf/Makefile ============================================================================== --- user/lstewart/alq_varlen_8.x/libexec/rtld-elf/Makefile Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/libexec/rtld-elf/Makefile Mon Mar 9 06:02:05 2009 (r189554) @@ -1,8 +1,7 @@ # $FreeBSD$ -WITHOUT_SSP= - .include +MK_SSP= no PROG?= ld-elf.so.1 SRCS= rtld_start.S \ Modified: user/lstewart/alq_varlen_8.x/release/picobsd/bridge/PICOBSD ============================================================================== --- user/lstewart/alq_varlen_8.x/release/picobsd/bridge/PICOBSD Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/release/picobsd/bridge/PICOBSD Mon Mar 9 06:02:05 2009 (r189554) @@ -7,6 +7,10 @@ options MD_ROOT_SIZE=3200 # same as def_sz hints "PICOBSD.hints" + +# values accessible through getenv() +# env "PICOBSD.env" + cpu I486_CPU cpu I586_CPU cpu I686_CPU @@ -68,7 +72,7 @@ device sc device npx # Serial (COM) ports -device sio +device uart # Audio support #device pcm @@ -107,10 +111,10 @@ device pty # Pseudo-ttys (telnet etc) device md # Memory "disks" #device gif 4 # IPv6 and IPv4 tunneling #device faith 1 # IPv6-to-IPv4 relaying (translation) -#device tap +device tap -options DEVICE_POLLING +#options DEVICE_POLLING # The `bpf' device enables the Berkeley Packet Filter. # Be aware of the administrative consequences of enabling this! -#device bpf # Berkeley packet filter +device bpf # Berkeley packet filter Modified: user/lstewart/alq_varlen_8.x/release/picobsd/bridge/PICOBSD.hints ============================================================================== --- user/lstewart/alq_varlen_8.x/release/picobsd/bridge/PICOBSD.hints Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/release/picobsd/bridge/PICOBSD.hints Mon Mar 9 06:02:05 2009 (r189554) @@ -22,13 +22,13 @@ hint.sc.0.at="isa" hint.npx.0.at="nexus" hint.npx.0.port="0x0F0" hint.npx.0.irq="13" -hint.sio.0.at="isa" -hint.sio.0.port="0x3F8" -hint.sio.0.flags="0x10" -hint.sio.0.irq="4" -hint.sio.1.at="isa" -hint.sio.1.port="0x2F8" -hint.sio.1.irq="3" +hint.uart.0.at="isa" +hint.uart.0.port="0x3F8" +hint.uart.0.flags="0x10" +hint.uart.0.irq="4" +hint.uart.1.at="isa" +hint.uart.1.port="0x2F8" +hint.uart.1.irq="3" hint.ed.0.at="isa" hint.ed.0.port="0x280" hint.ed.0.irq="5" Modified: user/lstewart/alq_varlen_8.x/release/picobsd/bridge/crunch.conf ============================================================================== --- user/lstewart/alq_varlen_8.x/release/picobsd/bridge/crunch.conf Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/release/picobsd/bridge/crunch.conf Mon Mar 9 06:02:05 2009 (r189554) @@ -94,7 +94,7 @@ progs w # 0KB. progs msg # 0KB. ln msg dmesg progs reboot # 0KB. -#progs less # 36KB +progs less # 36KB #ln less more #progs more # 12KB special more srcdir /usr/ports/misc/44bsd-more/work @@ -181,4 +181,5 @@ libs -ledit -lutil -lmd -lcrypt -lmp -lm libs -lz -lpcap -lwrap libs -ltermcap -lgnuregex # -lcurses libs -lgeom +libs -lsbuf libs -lbsdxml # used by ifconfig Modified: user/lstewart/alq_varlen_8.x/release/picobsd/build/picobsd ============================================================================== --- user/lstewart/alq_varlen_8.x/release/picobsd/build/picobsd Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/release/picobsd/build/picobsd Mon Mar 9 06:02:05 2009 (r189554) @@ -21,7 +21,6 @@ # Makefile.conf Makefile used to build the kernel # config shell variables, sourced here. # mfs.mtree mtree config file -# # floppy.tree/ files which go on the floppy # mfs_tree/ files which go onto the mfs # @@ -29,10 +28,13 @@ # PICOBSD kernel config file # config shell variables, sourced here. # crunch.conf crunchgen configuration +# mfs.mtree overrides ${PICO_TREE}/mfs.mtree # floppy.tree.exclude files from floppy.tree/ which we do not need here. -# floppy.tree/ local additions to the floppy.tree +# floppy.tree/ local additions to ${PICO_TREE}/mfs_free # floppy.tree.${site}/ same as above, site specific. # mfs_tree/ local additions to the mfs_free +# buildtree.mk optional makefile to build an extension for floppy tree +# (generated in buildtree/ ) # #--- The main entry point is at the end. @@ -98,6 +100,7 @@ set_defaults() { EDITOR=${EDITOR:-vi} fd_size=${fd_size:-1440} + o_use_loader="yes" # use /boot/loader o_all_in_mfs="yes" # put all files in mfs so you can boot and run # the image via diskless boot. o_clean="" # do not clean @@ -127,6 +130,7 @@ set_defaults() { # mountpoint used to build memory filesystems c_fs=fs.PICOBSD # filename used for the memory filesystem c_img=picobsd.bin # filename used for the picobsd image + generate_iso="NO" # don't generate the iso image # select the right memory disk name case `uname -r` in @@ -146,6 +150,7 @@ set_defaults() { trap fail 15 } +# use the new build infrastructure create_includes_and_libraries2() { local no log "create_includes_and_libraries2() for ${SRC}" @@ -158,7 +163,7 @@ create_includes_and_libraries2() { export MAKEOBJDIRPREFIX ( cd ${SRC}; # make -DNOCLEAN -DNOPROFILE -DNOGAMES -DNOLIBC_R -DPICOBSD buildworld - make _+_= $no toolchain + make _+_= $no toolchain _includes _libraries ) } @@ -207,7 +212,7 @@ create_includes_and_libraries() { # set_type looks in user or system directories for the floppy type # specified as first argument, and sets variables according to the config. -# file. Sets THETYPE, SITE, name, MY_TREE and BUILDDIR +# file. Also sets MY_TREE and BUILDDIR and SITE set_type() { local a i @@ -255,6 +260,13 @@ set_msgs() { # OK \t3. Site-info: ${SITE}\n\t4. Full-path: ${MY_TREE}\n" } +# build the iso image +build_iso_image() { + log "build_iso_image()" + clear + set_msgs + printf "${MSG}---> Build the iso image not ready yet\n\n" +} # Main build procedure. build_image() { @@ -307,10 +319,6 @@ build_package() { echo "##############################################" >>build.status for z in bridge dial router net isp ; do set_type ${z} - if [ "${name}" = "" ] ; then - echo "*** TYPE=${z} not found" >>build.status - continue - fi echo "---------------------------------------------">>build.status echo "Building TYPE=${z}, SIZE=${MFS_SIZE}" >>build.status msg="(ok)" # error message @@ -484,10 +492,10 @@ populate_floppy_fs() { # OK dst=${BUILDDIR}/floppy.tree log "pwd=`pwd` Populating floppy filesystem..." - # clean relics from old compilations. - rm -rf ${dst} || true - mkdir ${dst} + rm -rf ${dst} || true # clean relics from old compilations. + mkdir ${dst} # create a clean tree + # compute exclude list for generic tree excl=${MY_TREE}/floppy.tree.exclude if [ -f ${excl} ] ; then log "Files excluded from generic tree: `echo;cat ${excl}`" @@ -495,29 +503,26 @@ populate_floppy_fs() { # OK else excl="" fi - (cd ${PICO_TREE}/floppy.tree ; tar -cf - --exclude CVS --exclude .svn \ - ${excl} . ) | \ + # copy from the floppy trees into the destination + for FLOPPY_TREE in ${PICO_TREE}/floppy.tree ${MY_TREE}/floppy.tree \ + ${MY_TREE}/floppy.tree.${SITE} ; do + if [ -d ${FLOPPY_TREE} ] ; then + (cd ${FLOPPY_TREE} ; tar -cf - --exclude CVS \ + --exclude .svn ${excl} . ) | \ (cd ${dst} ; tar x${o_tarv}f - ) - log "Copied from generic floppy-tree `echo; ls -laR ${dst}`" - - srcdir=${MY_TREE}/floppy.tree - if [ -d ${srcdir} ] ; then - log "update with type-specific files:" - (cd ${srcdir} ; tar -cf - --exclude CVS --exclude .svn . ) | \ - (cd ${dst} ; tar x${o_tarv}f - ) - log "Copied from type floppy-tree `echo; ls -laR ${dst}`" - else - log "No type-specific floppy-tree" - fi - if [ -d ${srcdir}.${SITE} ] ; then - log "Update with site-specific (${SITE}) files:" - (cd ${srcdir}.${SITE} ; tar -cf - --exclude CVS --exclude .svn . ) | \ - (cd ${dst} ; tar x${o_tarv}f - ) - log "Copied from site floppy-tree `echo; ls -laR ${dst}`" - else - log "No site-specific floppy-tree" - fi + log "Copied from ${FLOPPY_TREE}" + fi + excl="" # reset the exclude list. + done + # add local manipulation + if [ -f ${MY_TREE}/buildtree.mk ] ; then + log "building local floppy tree" + ${BINMAKE} -C ${dst} -f ${MY_TREE}/buildtree.mk floppy.tree + fi + + # compress the files in etc/, just in case + # XXX this should be done in the makefile. # gzip returns an error if it fails to compress some file (cd $dst ; gzip -9 etc/* log "Compressed files in etc/ `echo; ls -l etc`" @@ -532,13 +537,12 @@ populate_floppy_fs() { # OK # Finally, if required, make a copy of the floppy.tree onto /fd populate_mfs_tree() { - local a dst + local a dst MFS_TREE log "populate_mfs_tree()" dst=${BUILDDIR}/mfs.tree - # clean relics from old compilations. - rm -rf ${dst} || true - mkdir ${dst} + rm -rf ${dst} || true # clean relics from old compilations. + mkdir ${dst} # create a fresh tree log "pwd=`pwd`, Populating MFS tree..." @@ -555,7 +559,7 @@ populate_mfs_tree() { ln -s /dev/null ${dst}/var/run/log ln -s /etc/termcap ${dst}/usr/share/misc/termcap - + ### now build the crunched binaries ### ( cd ${BUILDDIR}/crunch log "Making and installing crunch1 from `pwd` src ${SRC}..." @@ -599,12 +603,18 @@ populate_mfs_tree() { fi done + if [ -f ${MY_TREE}/buildtree.mk ] ; then + log "building local floppy tree" + ${BINMAKE} -C ${dst} -f ${MY_TREE}/buildtree.mk mfs.tree + fi + if [ "${o_all_in_mfs}" = "yes" ]; then log "Copy generic floppy_tree into MFS..." - # this may fail in case the floppy is empty + # ignore failure in case the floppy is empty cp -Rp ${BUILDDIR}/floppy.tree/* ${dst}/fd || true fi + # 4.x compatibility - create device nodes if [ "${o_no_devfs}" != "" ] ; then # create device entries using MAKEDEV (cd ${dst}/dev @@ -623,19 +633,21 @@ populate_mfs_tree() { log "importing ${import_files} into mfs" # We do it in a chroot environment on the target so # symlinks are followed correctly. - cp `which tar` ${dst}/my_copy_of_tar + # Make sure we have a statically linked tar there. + mkdir -p ${dst}/rescue + cp /rescue/tar ${dst}/rescue (cd ${l_usrtree}/.. ; tar cf - ${import_files} ) | \ - (chroot ${dst} /my_copy_of_tar xf - ) - rm ${dst}/my_copy_of_tar + (chroot ${dst} /rescue/tar xPf - ) + rm -rf ${dst}/rescue fi (cd ${BUILDDIR} # override the owner echo "/set uid=0 gid=0" > mtree.out - mtree -c -p ${dst} -k "" >> mtree.out + mtree -ic -p ${dst} -k "" >> mtree.out log "mtre.out at ${BUILDDIR}/mtree.out" makefs -t ffs -o bsize=4096 -o fsize=512 \ - -s ${MFS_SIZE}k -f 100 -F mtree.out ${c_fs} ${dst} + -s ${MFS_SIZE}k -f 1000 -F mtree.out ${c_fs} ${dst} ls -l ${c_fs} ) log "done mfs image" } @@ -712,14 +724,16 @@ fill_floppy_image() { fi log "Labeling floppy image" - log "patch ${c_boot2} to boot /kernel right away" b2=${BUILDDIR}/boot2 # modified boot2 cp -f ${c_boot2} ${b2} chmod 0644 ${b2} - set `strings -at d ${b2} | grep "/boot/loader"` - echo -e "/kernel\0\0\0\0\0" | \ - dd of=${b2} obs=$1 oseek=1 conv=notrunc 2>/dev/null + if [ ${o_use_loader} = "no" ] ; then + log "patch ${c_boot2} to boot /kernel right away" + set `strings -at d ${b2} | grep "/boot/loader"` + echo -e "/kernel\0\0\0\0\0" | \ + dd of=${b2} obs=$1 oseek=1 conv=notrunc 2>/dev/null + fi chmod 0444 ${b2} dst=${BUILDDIR}/image.tree @@ -739,22 +753,39 @@ fill_floppy_image() { if [ ${mfs_start} -gt 0 -a ${mfs_size} -ge ${imgsize} ] ; then mfs_ofs=$((${mfs_start} + 8192)) log "Preload kernel with file ${c_fs} at ${mfs_ofs}" + logverbose "`ls -l ${c_fs}` to fit in ${mfs_size}" dd if=${c_fs} ibs=8192 iseek=1 of=kernel obs=${mfs_ofs} \ - oseek=1 conv=notrunc 2> /dev/null + oseek=1 conv=notrunc # 2> /dev/null else log "not loading mfs, size ${mfs_size} img ${imgsize}" fi log "Compress with kgzip and copy to floppy image" - kgzip -o kernel.gz kernel - cp -p kernel.gz ${dst}/kernel || fail $? no_space "copying kernel" + if [ ${o_use_loader} = "no" ] ; then + kgzip -o kernel.gz kernel + cp -p kernel.gz ${dst}/kernel || fail $? no_space "copying kernel" + else + gzip kernel + mkdir -p ${dst}/boot/kernel + echo "hint.acpi.0.disabled=\"1\"" > ${dst}/boot/loader.conf + echo "console=\"comconsole\"" >> ${dst}/boot/loader.conf + cp -p /boot/loader ${dst}/boot/loader || fail $? no_space "copying bootloader" + cp -p kernel.gz ${dst}/boot/kernel/kernel.gz || fail $? no_space "copying kernel" + fi - log "Now transfer floppy tree if not already in MFS image" # now transfer the floppy tree. If it is already in mfs, dont bother. if [ "${o_all_in_mfs}" != "yes" ] ; then + log "Now transfer floppy tree if not already in MFS image" cp -Rp floppy.tree/* ${dst} || \ fail $? no_space "copying floppy tree" fi ) + + # add local manipulation to the image + if [ -f ${MY_TREE}/buildtree.mk ] ; then + ${BINMAKE} -C ${dst} -f ${MY_TREE}/buildtree.mk image.tree + fi + + log "image used `du -s ${dst}` of ${blocks}k" (cd ${BUILDDIR} makefs -t ffs -o bsize=4096 -o fsize=512 \ -s ${blocks}k -f 50 ${c_img} ${dst} @@ -764,9 +795,19 @@ fill_floppy_image() { ${l_label} -f `pwd`/${c_img} | sed -e '/ c:/{p;s/c:/a:/;}' | \ ${l_label} -R -f `pwd`/${c_img} /dev/stdin ${l_label} -f `pwd`/${c_img} + ls -l ${c_img} - logverbose "after disklabel" - ) + ${l_label} -f `pwd`/${c_img} + logverbose "after disklabel" + ) + + echo "BUILDDIR ${BUILDDIR}" + if [ "${generate_iso}" = "YES" ]; then + echo "generate_iso ${generate_iso}" + #build_iso_image() + exit 1 + fi + # dump the primary and secondary boot # XXX primary is 512 bytes dd if=${c_boot1} of=${BUILDDIR}/${c_img} conv=notrunc 2>/dev/null @@ -781,7 +822,8 @@ fill_floppy_image() { rm -rf ${BUILDDIR}/floppy.tree || true # cleanup # df -ik ${dst} | colrm 70 > .build.reply rm -rf ${dst} - rm ${BUILDDIR}/kernel.gz ${BUILDDIR}/${c_fs} + rm ${BUILDDIR}/${c_fs} + # rm ${BUILDDIR}/kernel.gz } # This function creates variables which depend on the source tree in use: @@ -824,8 +866,7 @@ set_build_parameters() { # arguments. set_defaults -args="" -while [ x"$1" != x ]; do +while [ true ]; do case $1 in --src) # set the source path instead of /usr/src SRC=`(cd $2; pwd)` @@ -840,12 +881,17 @@ while [ x"$1" != x ]; do shift ;; + --no_loader) # omit /boot/loader, just rely on boot2 + # (it may have problems with kernels > 4MB) + o_use_loader="no" + ;; + --all_in_mfs) o_all_in_mfs="yes" ;; --no_all_in_mfs) - o_all_in_mfs="" + o_all_in_mfs="no" ;; --modules) # also build kernel modules @@ -865,21 +911,24 @@ while [ x"$1" != x ]; do o_tarv="v" # tar verbose flag o_makeopts="-d l" # be verbose ;; + + --iso) # generate iso image + generate_iso="YES" + ;; + *) - args="$args $1" # accumulate args + break ;; esac shift done set_build_parameters # things that depend on ${SRC} +set_type $1 $2 # type and site, respectively # If $1="package", it creates a neat set of floppies -set -- ${args} [ "$1" = "package" ] && build_package -set_type $args # type and site, respectively - [ "${o_interactive}" != "NO" ] && main_dialog if [ "${o_clean}" = "YES" ] ; then Modified: user/lstewart/alq_varlen_8.x/release/picobsd/floppy.tree/etc/ttys ============================================================================== --- user/lstewart/alq_varlen_8.x/release/picobsd/floppy.tree/etc/ttys Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/release/picobsd/floppy.tree/etc/ttys Mon Mar 9 06:02:05 2009 (r189554) @@ -1,6 +1,8 @@ # # @(#)ttys 5.1 (Berkeley) 4/17/89 # +# $FreeBSD$ +# # name getty type status comments # # This entry needed for asking password when init goes to single-user mode @@ -30,4 +32,4 @@ ttyp6 none network secure ttyp7 none network secure ttyp8 none network secure ttyp9 none network secure -ttyd0 "/usr/libexec/getty std.9600" dialup on secure +ttyu0 "/usr/libexec/getty std.9600" dialup on secure Modified: user/lstewart/alq_varlen_8.x/rescue/librescue/Makefile ============================================================================== --- user/lstewart/alq_varlen_8.x/rescue/librescue/Makefile Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/rescue/librescue/Makefile Mon Mar 9 06:02:05 2009 (r189554) @@ -2,9 +2,8 @@ # $FreeBSD$ # -WITHOUT_SSP= - .include +MK_SSP= no # Certain library entries have hard-coded references to # /bin, /sbin, etc, that require those entries to be Modified: user/lstewart/alq_varlen_8.x/rescue/rescue/Makefile ============================================================================== --- user/lstewart/alq_varlen_8.x/rescue/rescue/Makefile Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/rescue/rescue/Makefile Mon Mar 9 06:02:05 2009 (r189554) @@ -2,9 +2,9 @@ # @(#)Makefile 8.1 (Berkeley) 6/2/93 NO_MAN= -WITHOUT_SSP= .include +MK_SSP= no PROG= rescue BINDIR?=/rescue Modified: user/lstewart/alq_varlen_8.x/sbin/atacontrol/atacontrol.8 ============================================================================== --- user/lstewart/alq_varlen_8.x/sbin/atacontrol/atacontrol.8 Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/sbin/atacontrol/atacontrol.8 Mon Mar 9 06:02:05 2009 (r189554) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 14, 2008 +.Dd February 21, 2009 .Dt ATACONTROL 8 .Os .Sh NAME @@ -180,9 +180,7 @@ Modes are given like case does not matter. .Pp Currently supported modes are: -.Cm PIO0 , PIO1 , PIO2 , PIO3 , PIO4 , -.Cm WDMA2 , -.Cm UDMA2 +.Cm BIOSPIO , PIO0 , PIO1 , PIO2 , PIO3 , PIO4 , WDMA2 , UDMA2 (alias .Cm UDMA33 ) , .Cm UDMA4 @@ -190,11 +188,13 @@ Currently supported modes are: .Cm UDMA66 ) , .Cm UDMA5 (alias -.Cm UDMA100 ) -and +.Cm UDMA100 ) , .Cm UDMA6 (alias -.Cm UDMA133 ) . +.Cm UDMA133 ) , +.Cm SATA150 , SATA300 , USB , USB1 , USB2 +and +.Cm BIOSDMA . .It Ic cap Show detailed info about the device on .Ar device . Modified: user/lstewart/alq_varlen_8.x/sbin/atacontrol/atacontrol.c ============================================================================== --- user/lstewart/alq_varlen_8.x/sbin/atacontrol/atacontrol.c Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/sbin/atacontrol/atacontrol.c Mon Mar 9 06:02:05 2009 (r189554) @@ -82,6 +82,11 @@ str2mode(char *str) if (!strcasecmp(str, "UDMA100")) return ATA_UDMA5; if (!strcasecmp(str, "UDMA6")) return ATA_UDMA6; if (!strcasecmp(str, "UDMA133")) return ATA_UDMA6; + if (!strcasecmp(str, "SATA150")) return ATA_SA150; + if (!strcasecmp(str, "SATA300")) return ATA_SA300; + if (!strcasecmp(str, "USB")) return ATA_USB; + if (!strcasecmp(str, "USB1")) return ATA_USB1; + if (!strcasecmp(str, "USB2")) return ATA_USB2; if (!strcasecmp(str, "BIOSDMA")) return ATA_DMA; return -1; } @@ -364,6 +369,8 @@ main(int argc, char **argv) fd = open_dev(argv[2], O_RDONLY); if (argc == 4) { mode = str2mode(argv[3]); + if (mode == -1) + errx(1, "unknown mode"); if (ioctl(fd, IOCATASMODE, &mode) < 0) warn("ioctl(IOCATASMODE)"); } Modified: user/lstewart/alq_varlen_8.x/sbin/geom/class/journal/gjournal.8 ============================================================================== --- user/lstewart/alq_varlen_8.x/sbin/geom/class/journal/gjournal.8 Mon Mar 9 05:54:43 2009 (r189553) +++ user/lstewart/alq_varlen_8.x/sbin/geom/class/journal/gjournal.8 Mon Mar 9 06:02:05 2009 (r189554) @@ -1,4 +1,4 @@ -.\" Copyright (c) 2006-2007 Pawel Jakub Dawidek +.\" Copyright (c) 2006-2009 Pawel Jakub Dawidek .\" All rights reserved. .\" *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@FreeBSD.ORG Mon Mar 9 06:14:30 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 756B91065670; Mon, 9 Mar 2009 06:14:30 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E91588FC0A; Mon, 9 Mar 2009 06:14:29 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n296ETPk011686; Mon, 9 Mar 2009 06:14:29 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n296ESEo011658; Mon, 9 Mar 2009 06:14:28 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <200903090614.n296ESEo011658@svn.freebsd.org> From: Lawrence Stewart Date: Mon, 9 Mar 2009 06:14:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r189556 - in user/lstewart/alq_varlen_8.x: . bin/ps bin/sh contrib/bind9 contrib/cpio contrib/csup contrib/file contrib/gdtoa contrib/gdtoa/test contrib/hostapd contrib/less contrib/ncu... X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Mar 2009 06:14:30 -0000 Author: lstewart Date: Mon Mar 9 06:14:27 2009 New Revision: 189556 URL: http://svn.freebsd.org/changeset/base/189556 Log: Merge r188939:r189554 from head. Added: user/lstewart/alq_varlen_8.x/contrib/wpa/ (props changed) - copied from r189554, head/contrib/wpa/ user/lstewart/alq_varlen_8.x/gnu/usr.bin/gdb/gdbserver/fbsd-ppc-low.c - copied unchanged from r189554, head/gnu/usr.bin/gdb/gdbserver/fbsd-ppc-low.c user/lstewart/alq_varlen_8.x/gnu/usr.bin/gdb/gdbserver/reg-ppc.c - copied unchanged from r189554, head/gnu/usr.bin/gdb/gdbserver/reg-ppc.c user/lstewart/alq_varlen_8.x/lib/libarchive/archive_read_disk.c - copied unchanged from r189554, head/lib/libarchive/archive_read_disk.c user/lstewart/alq_varlen_8.x/lib/libarchive/archive_read_disk_entry_from_file.c - copied unchanged from r189554, head/lib/libarchive/archive_read_disk_entry_from_file.c user/lstewart/alq_varlen_8.x/lib/libarchive/archive_read_disk_private.h - copied unchanged from r189554, head/lib/libarchive/archive_read_disk_private.h user/lstewart/alq_varlen_8.x/lib/libarchive/archive_read_disk_set_standard_lookup.c - copied unchanged from r189554, head/lib/libarchive/archive_read_disk_set_standard_lookup.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_compat_gtar_1.tar.uu - copied unchanged from r189554, head/lib/libarchive/test/test_compat_gtar_1.tar.uu user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_extattr_freebsd.c - copied unchanged from r189554, head/lib/libarchive/test/test_extattr_freebsd.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_pax_filename_encoding.tar.uu - copied unchanged from r189554, head/lib/libarchive/test/test_pax_filename_encoding.tar.uu user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_read_disk.c - copied unchanged from r189554, head/lib/libarchive/test/test_read_disk.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_read_file_nonexistent.c - copied unchanged from r189554, head/lib/libarchive/test/test_read_file_nonexistent.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_read_format_gtar_sparse_1_13.tar.uu - copied unchanged from r189554, head/lib/libarchive/test/test_read_format_gtar_sparse_1_13.tar.uu user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_read_format_gtar_sparse_1_17.tar.uu - copied unchanged from r189554, head/lib/libarchive/test/test_read_format_gtar_sparse_1_17.tar.uu user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tar.uu - copied unchanged from r189554, head/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tar.uu user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tar.uu - copied unchanged from r189554, head/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tar.uu user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tar.uu - copied unchanged from r189554, head/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tar.uu user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_read_format_isojoliet_bz2.c - copied unchanged from r189554, head/lib/libarchive/test/test_read_format_isojoliet_bz2.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_read_format_isojoliet_bz2.iso.bz2.uu - copied unchanged from r189554, head/lib/libarchive/test/test_read_format_isojoliet_bz2.iso.bz2.uu user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_read_format_isojolietrr_bz2.iso.bz2.uu - copied unchanged from r189554, head/lib/libarchive/test/test_read_format_isojolietrr_bz2.iso.bz2.uu user/lstewart/alq_varlen_8.x/lib/libbluetooth/dev.c - copied unchanged from r189554, head/lib/libbluetooth/dev.c user/lstewart/alq_varlen_8.x/lib/libbluetooth/hci.c - copied unchanged from r189554, head/lib/libbluetooth/hci.c user/lstewart/alq_varlen_8.x/lib/libc/stdio/dprintf.c - copied unchanged from r189554, head/lib/libc/stdio/dprintf.c user/lstewart/alq_varlen_8.x/lib/libc/stdio/getdelim.c - copied unchanged from r189554, head/lib/libc/stdio/getdelim.c user/lstewart/alq_varlen_8.x/lib/libc/stdio/getline.3 - copied unchanged from r189554, head/lib/libc/stdio/getline.3 user/lstewart/alq_varlen_8.x/lib/libc/stdio/getline.c - copied unchanged from r189554, head/lib/libc/stdio/getline.c user/lstewart/alq_varlen_8.x/lib/libc/stdio/vdprintf.c - copied unchanged from r189554, head/lib/libc/stdio/vdprintf.c user/lstewart/alq_varlen_8.x/lib/libc/string/stpncpy.c - copied unchanged from r189554, head/lib/libc/string/stpncpy.c user/lstewart/alq_varlen_8.x/lib/libc/string/strnlen.c - copied unchanged from r189554, head/lib/libc/string/strnlen.c user/lstewart/alq_varlen_8.x/lib/libc/string/wcpcpy.c - copied unchanged from r189554, head/lib/libc/string/wcpcpy.c user/lstewart/alq_varlen_8.x/lib/libc/string/wcpncpy.c - copied unchanged from r189554, head/lib/libc/string/wcpncpy.c user/lstewart/alq_varlen_8.x/lib/libc/string/wcscasecmp.c - copied unchanged from r189554, head/lib/libc/string/wcscasecmp.c user/lstewart/alq_varlen_8.x/lib/libc/string/wcsncasecmp.c - copied unchanged from r189554, head/lib/libc/string/wcsncasecmp.c user/lstewart/alq_varlen_8.x/lib/libc/string/wcsnlen.c - copied unchanged from r189554, head/lib/libc/string/wcsnlen.c user/lstewart/alq_varlen_8.x/lib/libmp/Symbol.map - copied unchanged from r189554, head/lib/libmp/Symbol.map user/lstewart/alq_varlen_8.x/sys/dev/drm/i915_reg.h - copied unchanged from r189554, head/sys/dev/drm/i915_reg.h user/lstewart/alq_varlen_8.x/sys/dev/drm/r600_cp.c - copied unchanged from r189554, head/sys/dev/drm/r600_cp.c user/lstewart/alq_varlen_8.x/sys/dev/drm/r600_microcode.h - copied unchanged from r189554, head/sys/dev/drm/r600_microcode.h user/lstewart/alq_varlen_8.x/sys/dev/usb/ - copied from r189554, head/sys/dev/usb/ user/lstewart/alq_varlen_8.x/sys/legacy/dev/ata/ - copied from r189554, head/sys/legacy/dev/ata/ user/lstewart/alq_varlen_8.x/sys/legacy/dev/sound/ - copied from r189554, head/sys/legacy/dev/sound/ user/lstewart/alq_varlen_8.x/sys/libkern/memmove.c - copied unchanged from r189554, head/sys/libkern/memmove.c user/lstewart/alq_varlen_8.x/sys/modules/usb/ - copied from r189554, head/sys/modules/usb/ user/lstewart/alq_varlen_8.x/tools/regression/lib/libc/stdio/test-getdelim.c - copied unchanged from r189554, head/tools/regression/lib/libc/stdio/test-getdelim.c user/lstewart/alq_varlen_8.x/tools/regression/lib/libc/stdio/test-printbasic.c - copied unchanged from r189554, head/tools/regression/lib/libc/stdio/test-printbasic.c user/lstewart/alq_varlen_8.x/tools/regression/lib/libc/string/test-stpncpy.c - copied unchanged from r189554, head/tools/regression/lib/libc/string/test-stpncpy.c user/lstewart/alq_varlen_8.x/tools/regression/lib/libc/string/test-wcscasecmp.c - copied unchanged from r189554, head/tools/regression/lib/libc/string/test-wcscasecmp.c user/lstewart/alq_varlen_8.x/tools/regression/lib/libc/string/test-wcsnlen.c - copied unchanged from r189554, head/tools/regression/lib/libc/string/test-wcsnlen.c user/lstewart/alq_varlen_8.x/tools/tools/nanobsd/gateworks/Files/root/updatep1 - copied unchanged from r189554, head/tools/tools/nanobsd/gateworks/Files/root/updatep1 user/lstewart/alq_varlen_8.x/tools/tools/nanobsd/gateworks/Files/root/updatep2 - copied unchanged from r189554, head/tools/tools/nanobsd/gateworks/Files/root/updatep2 user/lstewart/alq_varlen_8.x/usr.bin/tar/getdate.c - copied unchanged from r189554, head/usr.bin/tar/getdate.c user/lstewart/alq_varlen_8.x/usr.bin/tar/test/test_option_s.c - copied unchanged from r189554, head/usr.bin/tar/test/test_option_s.c user/lstewart/alq_varlen_8.x/usr.bin/tar/test/test_patterns_2.tar.uu - copied unchanged from r189554, head/usr.bin/tar/test/test_patterns_2.tar.uu user/lstewart/alq_varlen_8.x/usr.bin/tar/test/test_patterns_3.tar.uu - copied unchanged from r189554, head/usr.bin/tar/test/test_patterns_3.tar.uu user/lstewart/alq_varlen_8.x/usr.bin/tar/test/test_patterns_4.tar.uu - copied unchanged from r189554, head/usr.bin/tar/test/test_patterns_4.tar.uu user/lstewart/alq_varlen_8.x/usr.sbin/ifmcstat/printb.c - copied unchanged from r189554, head/usr.sbin/ifmcstat/printb.c Replaced: user/lstewart/alq_varlen_8.x/lib/libc/stdio/asprintf.c - copied unchanged from r189554, head/lib/libc/stdio/asprintf.c user/lstewart/alq_varlen_8.x/sys/dev/ata/ata-usb.c - copied unchanged from r189554, head/sys/dev/ata/ata-usb.c user/lstewart/alq_varlen_8.x/sys/dev/sound/usb/uaudio.c - copied unchanged from r189554, head/sys/dev/sound/usb/uaudio.c user/lstewart/alq_varlen_8.x/sys/dev/sound/usb/uaudio.h - copied unchanged from r189554, head/sys/dev/sound/usb/uaudio.h user/lstewart/alq_varlen_8.x/sys/dev/sound/usb/uaudio_pcm.c - copied unchanged from r189554, head/sys/dev/sound/usb/uaudio_pcm.c user/lstewart/alq_varlen_8.x/sys/dev/sound/usb/uaudioreg.h - copied unchanged from r189554, head/sys/dev/sound/usb/uaudioreg.h Deleted: user/lstewart/alq_varlen_8.x/contrib/gdtoa/test/ user/lstewart/alq_varlen_8.x/contrib/gdtoa/xsum0.out user/lstewart/alq_varlen_8.x/contrib/hostapd/ user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/ user/lstewart/alq_varlen_8.x/gnu/games/ user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_compat_gtar_1.tgz.uu user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_pax_filename_encoding.tar.gz.uu user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_read_format_gtar_sparse_1_13.tgz.uu user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_read_format_gtar_sparse_1_17.tgz.uu user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tgz.uu user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tgz.uu user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tgz.uu user/lstewart/alq_varlen_8.x/lib/libthread_db/arch/amd64/libc_r_md.c user/lstewart/alq_varlen_8.x/lib/libthread_db/arch/i386/libc_r_md.c user/lstewart/alq_varlen_8.x/lib/libthread_db/arch/ia64/libc_r_md.c user/lstewart/alq_varlen_8.x/lib/libthread_db/arch/powerpc/libc_r_md.c user/lstewart/alq_varlen_8.x/lib/libthread_db/arch/sparc64/libc_r_md.c user/lstewart/alq_varlen_8.x/lib/libthread_db/libc_r_db.c user/lstewart/alq_varlen_8.x/sys/amd64/conf/USB2 user/lstewart/alq_varlen_8.x/sys/dev/usb2/ user/lstewart/alq_varlen_8.x/sys/i386/conf/USB2 user/lstewart/alq_varlen_8.x/sys/legacy/dev/usb/usbdevs user/lstewart/alq_varlen_8.x/sys/modules/usb2/ user/lstewart/alq_varlen_8.x/usr.bin/tar/getdate.y user/lstewart/alq_varlen_8.x/usr.bin/tar/test/test_patterns_2.tgz.uu user/lstewart/alq_varlen_8.x/usr.bin/tar/test/test_patterns_3.tgz.uu Modified: user/lstewart/alq_varlen_8.x/ (props changed) user/lstewart/alq_varlen_8.x/MAINTAINERS user/lstewart/alq_varlen_8.x/ObsoleteFiles.inc user/lstewart/alq_varlen_8.x/UPDATING user/lstewart/alq_varlen_8.x/bin/ps/extern.h user/lstewart/alq_varlen_8.x/bin/ps/keyword.c user/lstewart/alq_varlen_8.x/bin/ps/print.c user/lstewart/alq_varlen_8.x/bin/sh/miscbltin.c user/lstewart/alq_varlen_8.x/contrib/bind9/ (props changed) user/lstewart/alq_varlen_8.x/contrib/cpio/ (props changed) user/lstewart/alq_varlen_8.x/contrib/csup/ (props changed) user/lstewart/alq_varlen_8.x/contrib/csup/updater.c user/lstewart/alq_varlen_8.x/contrib/file/ (props changed) user/lstewart/alq_varlen_8.x/contrib/gdtoa/ (props changed) user/lstewart/alq_varlen_8.x/contrib/less/line.c user/lstewart/alq_varlen_8.x/contrib/ncurses/ (props changed) user/lstewart/alq_varlen_8.x/contrib/netcat/ (props changed) user/lstewart/alq_varlen_8.x/contrib/ntp/ (props changed) user/lstewart/alq_varlen_8.x/contrib/openbsm/ (props changed) user/lstewart/alq_varlen_8.x/contrib/openbsm/CREDITS user/lstewart/alq_varlen_8.x/contrib/openbsm/NEWS user/lstewart/alq_varlen_8.x/contrib/openbsm/README user/lstewart/alq_varlen_8.x/contrib/openbsm/VERSION user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/audit/audit.8 user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/audit/audit.c user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/auditd/audit_warn.c user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/auditd/auditd.c user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/auditd/auditd.h user/lstewart/alq_varlen_8.x/contrib/openbsm/bsm/auditd_lib.h user/lstewart/alq_varlen_8.x/contrib/openbsm/bsm/libbsm.h user/lstewart/alq_varlen_8.x/contrib/openbsm/config/config.h user/lstewart/alq_varlen_8.x/contrib/openbsm/configure user/lstewart/alq_varlen_8.x/contrib/openbsm/configure.ac user/lstewart/alq_varlen_8.x/contrib/openbsm/etc/audit_control user/lstewart/alq_varlen_8.x/contrib/openbsm/etc/audit_event user/lstewart/alq_varlen_8.x/contrib/openbsm/libauditd/auditd_lib.c user/lstewart/alq_varlen_8.x/contrib/openbsm/libbsm/au_control.3 user/lstewart/alq_varlen_8.x/contrib/openbsm/libbsm/au_domain.3 user/lstewart/alq_varlen_8.x/contrib/openbsm/libbsm/au_errno.3 user/lstewart/alq_varlen_8.x/contrib/openbsm/libbsm/bsm_control.c user/lstewart/alq_varlen_8.x/contrib/openbsm/libbsm/bsm_errno.c user/lstewart/alq_varlen_8.x/contrib/openbsm/libbsm/bsm_io.c user/lstewart/alq_varlen_8.x/contrib/openbsm/libbsm/bsm_token.c user/lstewart/alq_varlen_8.x/contrib/openbsm/man/audit_control.5 user/lstewart/alq_varlen_8.x/contrib/openbsm/man/auditon.2 user/lstewart/alq_varlen_8.x/contrib/openbsm/sys/bsm/audit.h user/lstewart/alq_varlen_8.x/contrib/openbsm/sys/bsm/audit_kevents.h user/lstewart/alq_varlen_8.x/contrib/openbsm/tools/audump.c user/lstewart/alq_varlen_8.x/contrib/openpam/ (props changed) user/lstewart/alq_varlen_8.x/contrib/pf/ (props changed) user/lstewart/alq_varlen_8.x/contrib/sendmail/ (props changed) user/lstewart/alq_varlen_8.x/contrib/telnet/libtelnet/pk.c user/lstewart/alq_varlen_8.x/contrib/top/ (props changed) user/lstewart/alq_varlen_8.x/crypto/openssh/ (props changed) user/lstewart/alq_varlen_8.x/crypto/openssl/ (props changed) user/lstewart/alq_varlen_8.x/etc/mtree/BSD.include.dist user/lstewart/alq_varlen_8.x/games/fortune/datfiles/fortunes user/lstewart/alq_varlen_8.x/gnu/lib/libssp/Makefile user/lstewart/alq_varlen_8.x/gnu/usr.bin/gdb/Makefile user/lstewart/alq_varlen_8.x/gnu/usr.bin/gdb/gdbserver/Makefile user/lstewart/alq_varlen_8.x/gnu/usr.bin/groff/tmac/mdoc.local user/lstewart/alq_varlen_8.x/include/Makefile user/lstewart/alq_varlen_8.x/include/signal.h user/lstewart/alq_varlen_8.x/include/stdio.h user/lstewart/alq_varlen_8.x/include/stdlib.h user/lstewart/alq_varlen_8.x/include/string.h user/lstewart/alq_varlen_8.x/include/strings.h user/lstewart/alq_varlen_8.x/include/unistd.h user/lstewart/alq_varlen_8.x/include/wchar.h user/lstewart/alq_varlen_8.x/lib/libarchive/Makefile user/lstewart/alq_varlen_8.x/lib/libarchive/archive.h user/lstewart/alq_varlen_8.x/lib/libarchive/archive_check_magic.c user/lstewart/alq_varlen_8.x/lib/libarchive/archive_endian.h user/lstewart/alq_varlen_8.x/lib/libarchive/archive_entry.c user/lstewart/alq_varlen_8.x/lib/libarchive/archive_entry_copy_stat.c user/lstewart/alq_varlen_8.x/lib/libarchive/archive_entry_stat.c user/lstewart/alq_varlen_8.x/lib/libarchive/archive_platform.h user/lstewart/alq_varlen_8.x/lib/libarchive/archive_private.h user/lstewart/alq_varlen_8.x/lib/libarchive/archive_read.c user/lstewart/alq_varlen_8.x/lib/libarchive/archive_read_open_filename.c user/lstewart/alq_varlen_8.x/lib/libarchive/archive_read_private.h user/lstewart/alq_varlen_8.x/lib/libarchive/archive_read_support_compression_all.c user/lstewart/alq_varlen_8.x/lib/libarchive/archive_read_support_compression_bzip2.c user/lstewart/alq_varlen_8.x/lib/libarchive/archive_read_support_compression_compress.c user/lstewart/alq_varlen_8.x/lib/libarchive/archive_read_support_compression_gzip.c user/lstewart/alq_varlen_8.x/lib/libarchive/archive_read_support_compression_program.c user/lstewart/alq_varlen_8.x/lib/libarchive/archive_read_support_format_ar.c user/lstewart/alq_varlen_8.x/lib/libarchive/archive_read_support_format_cpio.c user/lstewart/alq_varlen_8.x/lib/libarchive/archive_read_support_format_empty.c user/lstewart/alq_varlen_8.x/lib/libarchive/archive_read_support_format_iso9660.c user/lstewart/alq_varlen_8.x/lib/libarchive/archive_read_support_format_mtree.c user/lstewart/alq_varlen_8.x/lib/libarchive/archive_read_support_format_tar.c user/lstewart/alq_varlen_8.x/lib/libarchive/archive_read_support_format_zip.c user/lstewart/alq_varlen_8.x/lib/libarchive/archive_string.c user/lstewart/alq_varlen_8.x/lib/libarchive/archive_string.h user/lstewart/alq_varlen_8.x/lib/libarchive/archive_string_sprintf.c user/lstewart/alq_varlen_8.x/lib/libarchive/archive_util.c user/lstewart/alq_varlen_8.x/lib/libarchive/archive_virtual.c user/lstewart/alq_varlen_8.x/lib/libarchive/archive_write.c user/lstewart/alq_varlen_8.x/lib/libarchive/archive_write_disk.c user/lstewart/alq_varlen_8.x/lib/libarchive/archive_write_private.h user/lstewart/alq_varlen_8.x/lib/libarchive/archive_write_set_compression_bzip2.c user/lstewart/alq_varlen_8.x/lib/libarchive/archive_write_set_compression_gzip.c user/lstewart/alq_varlen_8.x/lib/libarchive/archive_write_set_compression_program.c user/lstewart/alq_varlen_8.x/lib/libarchive/archive_write_set_format_ar.c user/lstewart/alq_varlen_8.x/lib/libarchive/archive_write_set_format_cpio.c user/lstewart/alq_varlen_8.x/lib/libarchive/archive_write_set_format_cpio_newc.c user/lstewart/alq_varlen_8.x/lib/libarchive/archive_write_set_format_mtree.c user/lstewart/alq_varlen_8.x/lib/libarchive/archive_write_set_format_pax.c user/lstewart/alq_varlen_8.x/lib/libarchive/archive_write_set_format_shar.c user/lstewart/alq_varlen_8.x/lib/libarchive/archive_write_set_format_ustar.c user/lstewart/alq_varlen_8.x/lib/libarchive/config_freebsd.h user/lstewart/alq_varlen_8.x/lib/libarchive/test/ (props changed) user/lstewart/alq_varlen_8.x/lib/libarchive/test/Makefile user/lstewart/alq_varlen_8.x/lib/libarchive/test/main.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/read_open_memory.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test.h user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_acl_freebsd.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_acl_pax.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_compat_bzip2.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_compat_gtar.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_compat_gzip.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_compat_zip.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_empty_write.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_entry.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_fuzz.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_pax_filename_encoding.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_read_compress_program.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_read_extract.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_read_format_cpio_bin_Z.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_read_format_cpio_bin_bz2.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_read_format_cpio_bin_gz.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_read_format_cpio_svr4_gzip.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_read_format_cpio_svr4c_Z.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_read_format_empty.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_read_format_gtar_gz.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_read_format_gtar_sparse.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_read_format_iso_gz.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_read_format_isorr_bz2.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_read_format_pax_bz2.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_read_format_tar.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_read_format_tbz.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_read_format_tgz.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_read_format_tz.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_read_format_zip.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_read_large.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_read_pax_truncated.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_read_position.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_tar_large.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_ustar_filenames.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_write_compress.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_write_compress_program.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_write_disk.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_write_disk_failures.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_write_disk_hardlink.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_write_disk_perms.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_write_disk_secure.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_write_format_ar.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_write_format_cpio_newc.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_write_format_cpio_odc.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_write_format_tar.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_write_format_tar_empty.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_write_format_tar_ustar.c user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_write_open_memory.c user/lstewart/alq_varlen_8.x/lib/libbluetooth/Makefile user/lstewart/alq_varlen_8.x/lib/libbluetooth/bluetooth.3 user/lstewart/alq_varlen_8.x/lib/libbluetooth/bluetooth.c user/lstewart/alq_varlen_8.x/lib/libbluetooth/bluetooth.h user/lstewart/alq_varlen_8.x/lib/libc/ (props changed) user/lstewart/alq_varlen_8.x/lib/libc/db/btree/bt_close.c user/lstewart/alq_varlen_8.x/lib/libc/db/btree/bt_conv.c user/lstewart/alq_varlen_8.x/lib/libc/db/btree/bt_debug.c user/lstewart/alq_varlen_8.x/lib/libc/db/btree/bt_delete.c user/lstewart/alq_varlen_8.x/lib/libc/db/btree/bt_get.c user/lstewart/alq_varlen_8.x/lib/libc/db/btree/bt_open.c user/lstewart/alq_varlen_8.x/lib/libc/db/btree/bt_overflow.c user/lstewart/alq_varlen_8.x/lib/libc/db/btree/bt_page.c user/lstewart/alq_varlen_8.x/lib/libc/db/btree/bt_put.c user/lstewart/alq_varlen_8.x/lib/libc/db/btree/bt_search.c user/lstewart/alq_varlen_8.x/lib/libc/db/btree/bt_seq.c user/lstewart/alq_varlen_8.x/lib/libc/db/btree/bt_split.c user/lstewart/alq_varlen_8.x/lib/libc/db/btree/bt_utils.c user/lstewart/alq_varlen_8.x/lib/libc/db/btree/btree.h user/lstewart/alq_varlen_8.x/lib/libc/db/db/db.c user/lstewart/alq_varlen_8.x/lib/libc/db/hash/hash.c user/lstewart/alq_varlen_8.x/lib/libc/db/hash/hash.h user/lstewart/alq_varlen_8.x/lib/libc/db/hash/hash_bigkey.c user/lstewart/alq_varlen_8.x/lib/libc/db/hash/hash_buf.c user/lstewart/alq_varlen_8.x/lib/libc/db/hash/hash_log2.c user/lstewart/alq_varlen_8.x/lib/libc/db/hash/hash_page.c user/lstewart/alq_varlen_8.x/lib/libc/db/hash/page.h user/lstewart/alq_varlen_8.x/lib/libc/db/mpool/mpool.c user/lstewart/alq_varlen_8.x/lib/libc/db/recno/rec_close.c user/lstewart/alq_varlen_8.x/lib/libc/db/recno/rec_delete.c user/lstewart/alq_varlen_8.x/lib/libc/db/recno/rec_get.c user/lstewart/alq_varlen_8.x/lib/libc/db/recno/rec_open.c user/lstewart/alq_varlen_8.x/lib/libc/db/recno/rec_put.c user/lstewart/alq_varlen_8.x/lib/libc/db/recno/rec_search.c user/lstewart/alq_varlen_8.x/lib/libc/db/recno/rec_seq.c user/lstewart/alq_varlen_8.x/lib/libc/db/recno/rec_utils.c user/lstewart/alq_varlen_8.x/lib/libc/gen/fts.c user/lstewart/alq_varlen_8.x/lib/libc/gen/lockf.3 user/lstewart/alq_varlen_8.x/lib/libc/gen/lockf.c user/lstewart/alq_varlen_8.x/lib/libc/net/rcmd.3 user/lstewart/alq_varlen_8.x/lib/libc/net/sourcefilter.3 user/lstewart/alq_varlen_8.x/lib/libc/net/sourcefilter.c user/lstewart/alq_varlen_8.x/lib/libc/stdio/Makefile.inc user/lstewart/alq_varlen_8.x/lib/libc/stdio/Symbol.map user/lstewart/alq_varlen_8.x/lib/libc/stdio/fgetln.3 user/lstewart/alq_varlen_8.x/lib/libc/stdio/fgets.3 user/lstewart/alq_varlen_8.x/lib/libc/stdio/findfp.c user/lstewart/alq_varlen_8.x/lib/libc/stdio/printf-pos.c user/lstewart/alq_varlen_8.x/lib/libc/stdio/printf.3 user/lstewart/alq_varlen_8.x/lib/libc/stdio/printflocal.h user/lstewart/alq_varlen_8.x/lib/libc/stdio/stdio.3 user/lstewart/alq_varlen_8.x/lib/libc/stdio/vfprintf.c user/lstewart/alq_varlen_8.x/lib/libc/stdio/vfwprintf.c user/lstewart/alq_varlen_8.x/lib/libc/stdlib/atol.3 user/lstewart/alq_varlen_8.x/lib/libc/stdtime/ (props changed) user/lstewart/alq_varlen_8.x/lib/libc/string/Makefile.inc user/lstewart/alq_varlen_8.x/lib/libc/string/Symbol.map user/lstewart/alq_varlen_8.x/lib/libc/string/ffsll.c (props changed) user/lstewart/alq_varlen_8.x/lib/libc/string/flsll.c (props changed) user/lstewart/alq_varlen_8.x/lib/libc/string/stpcpy.c user/lstewart/alq_varlen_8.x/lib/libc/string/strcpy.3 user/lstewart/alq_varlen_8.x/lib/libc/string/strlcat.c user/lstewart/alq_varlen_8.x/lib/libc/string/strlcpy.3 user/lstewart/alq_varlen_8.x/lib/libc/string/strlcpy.c user/lstewart/alq_varlen_8.x/lib/libc/string/strlen.3 user/lstewart/alq_varlen_8.x/lib/libc/string/wmemchr.3 user/lstewart/alq_varlen_8.x/lib/libc/sys/open.2 user/lstewart/alq_varlen_8.x/lib/libc/sys/shmctl.2 user/lstewart/alq_varlen_8.x/lib/libcompat/4.3/rexec.c user/lstewart/alq_varlen_8.x/lib/libmp/Makefile user/lstewart/alq_varlen_8.x/lib/libmp/libmp.3 user/lstewart/alq_varlen_8.x/lib/libmp/mp.h user/lstewart/alq_varlen_8.x/lib/libmp/mpasbn.c user/lstewart/alq_varlen_8.x/lib/librpcsvc/rnusers.c user/lstewart/alq_varlen_8.x/lib/librpcsvc/rstat.c user/lstewart/alq_varlen_8.x/lib/librpcsvc/rwall.c user/lstewart/alq_varlen_8.x/lib/librpcsvc/secretkey.c user/lstewart/alq_varlen_8.x/lib/librpcsvc/xcrypt.c user/lstewart/alq_varlen_8.x/lib/libtelnet/Makefile user/lstewart/alq_varlen_8.x/lib/libthr/Makefile user/lstewart/alq_varlen_8.x/lib/libthr/thread/thr_syscalls.c user/lstewart/alq_varlen_8.x/lib/libusb20/libusb20.3 user/lstewart/alq_varlen_8.x/lib/libusb20/libusb20.c user/lstewart/alq_varlen_8.x/lib/libusb20/libusb20.h user/lstewart/alq_varlen_8.x/lib/libusb20/libusb20_int.h user/lstewart/alq_varlen_8.x/lib/libusb20/libusb20_ugen20.c user/lstewart/alq_varlen_8.x/lib/libusbhid/descr.c user/lstewart/alq_varlen_8.x/lib/libusbhid/descr_compat.c user/lstewart/alq_varlen_8.x/lib/libusbhid/usbvar.h user/lstewart/alq_varlen_8.x/lib/libutil/ (props changed) user/lstewart/alq_varlen_8.x/release/amd64/boot_crunch.conf user/lstewart/alq_varlen_8.x/release/i386/boot_crunch.conf user/lstewart/alq_varlen_8.x/release/ia64/boot_crunch.conf user/lstewart/alq_varlen_8.x/release/picobsd/bridge/PICOBSD user/lstewart/alq_varlen_8.x/release/powerpc/boot_crunch.conf user/lstewart/alq_varlen_8.x/release/sparc64/boot_crunch.conf user/lstewart/alq_varlen_8.x/release/sun4v/boot_crunch.conf user/lstewart/alq_varlen_8.x/sbin/ (props changed) user/lstewart/alq_varlen_8.x/sbin/atacontrol/atacontrol.c user/lstewart/alq_varlen_8.x/sbin/devd/devd.conf.5 user/lstewart/alq_varlen_8.x/sbin/dump/optr.c user/lstewart/alq_varlen_8.x/sbin/ifconfig/ifclone.c user/lstewart/alq_varlen_8.x/sbin/ifconfig/ifconfig.h user/lstewart/alq_varlen_8.x/sbin/ifconfig/ifieee80211.c user/lstewart/alq_varlen_8.x/sbin/ifconfig/ifvlan.c user/lstewart/alq_varlen_8.x/sbin/ipfw/altq.c user/lstewart/alq_varlen_8.x/sbin/ipfw/main.c user/lstewart/alq_varlen_8.x/sbin/ipfw/nat.c user/lstewart/alq_varlen_8.x/sbin/mount/mount.8 user/lstewart/alq_varlen_8.x/sbin/mount/mount.c user/lstewart/alq_varlen_8.x/sbin/newfs_msdos/newfs_msdos.c user/lstewart/alq_varlen_8.x/share/man/man4/crypto.4 user/lstewart/alq_varlen_8.x/share/man/man4/ip.4 user/lstewart/alq_varlen_8.x/share/man/man4/multicast.4 user/lstewart/alq_varlen_8.x/share/man/man4/uplcom.4 user/lstewart/alq_varlen_8.x/share/man/man4/usb2_core.4 user/lstewart/alq_varlen_8.x/share/man/man7/hier.7 user/lstewart/alq_varlen_8.x/share/man/man7/tuning.7 user/lstewart/alq_varlen_8.x/share/man/man9/Makefile user/lstewart/alq_varlen_8.x/share/man/man9/VOP_VPTOCNP.9 user/lstewart/alq_varlen_8.x/share/man/man9/vfs_getopt.9 user/lstewart/alq_varlen_8.x/share/termcap/termcap.src user/lstewart/alq_varlen_8.x/share/zoneinfo/ (props changed) user/lstewart/alq_varlen_8.x/sys/ (props changed) user/lstewart/alq_varlen_8.x/sys/amd64/acpica/madt.c user/lstewart/alq_varlen_8.x/sys/amd64/amd64/fpu.c user/lstewart/alq_varlen_8.x/sys/amd64/amd64/machdep.c user/lstewart/alq_varlen_8.x/sys/amd64/amd64/mp_machdep.c user/lstewart/alq_varlen_8.x/sys/amd64/amd64/pmap.c user/lstewart/alq_varlen_8.x/sys/amd64/amd64/trap.c user/lstewart/alq_varlen_8.x/sys/amd64/amd64/vm_machdep.c user/lstewart/alq_varlen_8.x/sys/amd64/conf/GENERIC user/lstewart/alq_varlen_8.x/sys/amd64/ia32/ia32_signal.c user/lstewart/alq_varlen_8.x/sys/amd64/include/fpu.h user/lstewart/alq_varlen_8.x/sys/amd64/include/pcb.h user/lstewart/alq_varlen_8.x/sys/amd64/linux32/linux.h user/lstewart/alq_varlen_8.x/sys/amd64/linux32/linux32_sysvec.c user/lstewart/alq_varlen_8.x/sys/arm/arm/cpufunc_asm_sheeva.S (props changed) user/lstewart/alq_varlen_8.x/sys/arm/at91/files.at91 user/lstewart/alq_varlen_8.x/sys/arm/conf/AVILA user/lstewart/alq_varlen_8.x/sys/arm/conf/BWCT user/lstewart/alq_varlen_8.x/sys/arm/conf/CAMBRIA user/lstewart/alq_varlen_8.x/sys/arm/conf/HL200 user/lstewart/alq_varlen_8.x/sys/arm/conf/KB920X user/lstewart/alq_varlen_8.x/sys/arm/conf/NSLU user/lstewart/alq_varlen_8.x/sys/arm/mv/files.mv user/lstewart/alq_varlen_8.x/sys/arm/xscale/ixp425/avila_machdep.c user/lstewart/alq_varlen_8.x/sys/arm/xscale/ixp425/files.ixp425 user/lstewart/alq_varlen_8.x/sys/arm/xscale/ixp425/ixp425_pci.c user/lstewart/alq_varlen_8.x/sys/arm/xscale/ixp425/ixp425reg.h user/lstewart/alq_varlen_8.x/sys/boot/i386/boot2/Makefile user/lstewart/alq_varlen_8.x/sys/boot/i386/boot2/boot1.S user/lstewart/alq_varlen_8.x/sys/boot/i386/btx/btx/btx.S user/lstewart/alq_varlen_8.x/sys/bsm/audit.h user/lstewart/alq_varlen_8.x/sys/bsm/audit_kevents.h user/lstewart/alq_varlen_8.x/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c user/lstewart/alq_varlen_8.x/sys/cddl/compat/opensolaris/sys/sysmacros.h user/lstewart/alq_varlen_8.x/sys/compat/freebsd32/freebsd32_misc.c user/lstewart/alq_varlen_8.x/sys/compat/linprocfs/linprocfs.c user/lstewart/alq_varlen_8.x/sys/compat/linux/linux_ioctl.c user/lstewart/alq_varlen_8.x/sys/compat/linux/linux_misc.c user/lstewart/alq_varlen_8.x/sys/compat/linux/linux_misc.h user/lstewart/alq_varlen_8.x/sys/compat/ndis/hal_var.h user/lstewart/alq_varlen_8.x/sys/compat/ndis/kern_ndis.c user/lstewart/alq_varlen_8.x/sys/compat/ndis/kern_windrv.c user/lstewart/alq_varlen_8.x/sys/compat/ndis/ndis_var.h user/lstewart/alq_varlen_8.x/sys/compat/ndis/ntoskrnl_var.h user/lstewart/alq_varlen_8.x/sys/compat/ndis/pe_var.h user/lstewart/alq_varlen_8.x/sys/compat/ndis/resource_var.h user/lstewart/alq_varlen_8.x/sys/compat/ndis/subr_hal.c user/lstewart/alq_varlen_8.x/sys/compat/ndis/subr_ndis.c user/lstewart/alq_varlen_8.x/sys/compat/ndis/subr_ntoskrnl.c user/lstewart/alq_varlen_8.x/sys/compat/ndis/subr_pe.c user/lstewart/alq_varlen_8.x/sys/compat/ndis/subr_usbd.c user/lstewart/alq_varlen_8.x/sys/compat/ndis/usbd_var.h user/lstewart/alq_varlen_8.x/sys/compat/svr4/svr4_sockio.c user/lstewart/alq_varlen_8.x/sys/conf/NOTES user/lstewart/alq_varlen_8.x/sys/conf/files user/lstewart/alq_varlen_8.x/sys/conf/files.amd64 user/lstewart/alq_varlen_8.x/sys/conf/files.i386 user/lstewart/alq_varlen_8.x/sys/conf/files.ia64 user/lstewart/alq_varlen_8.x/sys/conf/files.mips user/lstewart/alq_varlen_8.x/sys/conf/files.pc98 user/lstewart/alq_varlen_8.x/sys/conf/files.powerpc user/lstewart/alq_varlen_8.x/sys/conf/files.sparc64 user/lstewart/alq_varlen_8.x/sys/conf/files.sun4v user/lstewart/alq_varlen_8.x/sys/conf/kern.mk user/lstewart/alq_varlen_8.x/sys/conf/kern.pre.mk user/lstewart/alq_varlen_8.x/sys/conf/kmod.mk user/lstewart/alq_varlen_8.x/sys/contrib/altq/altq/altq_subr.c user/lstewart/alq_varlen_8.x/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c user/lstewart/alq_varlen_8.x/sys/contrib/pf/ (props changed) user/lstewart/alq_varlen_8.x/sys/contrib/pf/net/pf_if.c user/lstewart/alq_varlen_8.x/sys/contrib/pf/net/pf_ioctl.c user/lstewart/alq_varlen_8.x/sys/dev/aac/aac.c user/lstewart/alq_varlen_8.x/sys/dev/ale/if_ale.c user/lstewart/alq_varlen_8.x/sys/dev/ata/ata-all.c user/lstewart/alq_varlen_8.x/sys/dev/ata/chipsets/ata-acerlabs.c user/lstewart/alq_varlen_8.x/sys/dev/ata/chipsets/ata-ahci.c user/lstewart/alq_varlen_8.x/sys/dev/ata/chipsets/ata-intel.c user/lstewart/alq_varlen_8.x/sys/dev/ata/chipsets/ata-jmicron.c user/lstewart/alq_varlen_8.x/sys/dev/ata/chipsets/ata-marvell.c user/lstewart/alq_varlen_8.x/sys/dev/ata/chipsets/ata-nvidia.c user/lstewart/alq_varlen_8.x/sys/dev/ata/chipsets/ata-promise.c user/lstewart/alq_varlen_8.x/sys/dev/ata/chipsets/ata-siliconimage.c user/lstewart/alq_varlen_8.x/sys/dev/ata/chipsets/ata-sis.c user/lstewart/alq_varlen_8.x/sys/dev/ata/chipsets/ata-via.c user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_hal/ah.c user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_hal/ah.h user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_hal/ah_internal.h user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_hal/ar5210/ar5210.h user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_hal/ar5210/ar5210_misc.c user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_hal/ar5211/ar5211.h user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_hal/ar5212/ar2425.c user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_hal/ar5212/ar5212.h user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_hal/ar5212/ar5212_gpio.c user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_hal/ar5212/ar5413.c user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_hal/ar5312/ar5312.h user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_hal/ar5312/ar5312_gpio.c user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_hal/ar5312/ar5315_gpio.c user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_hal/ar5416/ar2133.c user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_hal/ar5416/ar5416.h user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_hal/ar5416/ar5416.ini user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_hal/ar5416/ar5416_gpio.c user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_hal/ar5416/ar5416reg.h user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_hal/ar5416/ar9160.ini user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c user/lstewart/alq_varlen_8.x/sys/dev/ath/if_ath.c user/lstewart/alq_varlen_8.x/sys/dev/ath/if_athvar.h user/lstewart/alq_varlen_8.x/sys/dev/bce/if_bce.c user/lstewart/alq_varlen_8.x/sys/dev/bce/if_bcefw.h user/lstewart/alq_varlen_8.x/sys/dev/bce/if_bcereg.h user/lstewart/alq_varlen_8.x/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c user/lstewart/alq_varlen_8.x/sys/dev/drm/drmP.h user/lstewart/alq_varlen_8.x/sys/dev/drm/drm_bufs.c user/lstewart/alq_varlen_8.x/sys/dev/drm/drm_drv.c user/lstewart/alq_varlen_8.x/sys/dev/drm/drm_irq.c user/lstewart/alq_varlen_8.x/sys/dev/drm/drm_lock.c user/lstewart/alq_varlen_8.x/sys/dev/drm/drm_pciids.h user/lstewart/alq_varlen_8.x/sys/dev/drm/i915_dma.c user/lstewart/alq_varlen_8.x/sys/dev/drm/i915_drv.c user/lstewart/alq_varlen_8.x/sys/dev/drm/i915_drv.h user/lstewart/alq_varlen_8.x/sys/dev/drm/i915_irq.c user/lstewart/alq_varlen_8.x/sys/dev/drm/mach64_drv.c user/lstewart/alq_varlen_8.x/sys/dev/drm/mach64_drv.h user/lstewart/alq_varlen_8.x/sys/dev/drm/mach64_irq.c user/lstewart/alq_varlen_8.x/sys/dev/drm/mga_dma.c user/lstewart/alq_varlen_8.x/sys/dev/drm/mga_irq.c user/lstewart/alq_varlen_8.x/sys/dev/drm/r128_drv.c user/lstewart/alq_varlen_8.x/sys/dev/drm/r128_drv.h user/lstewart/alq_varlen_8.x/sys/dev/drm/r128_irq.c user/lstewart/alq_varlen_8.x/sys/dev/drm/radeon_cp.c user/lstewart/alq_varlen_8.x/sys/dev/drm/radeon_drm.h user/lstewart/alq_varlen_8.x/sys/dev/drm/radeon_drv.h user/lstewart/alq_varlen_8.x/sys/dev/drm/radeon_irq.c user/lstewart/alq_varlen_8.x/sys/dev/drm/radeon_state.c user/lstewart/alq_varlen_8.x/sys/dev/ichwd/ichwd.c user/lstewart/alq_varlen_8.x/sys/dev/if_ndis/if_ndis.c user/lstewart/alq_varlen_8.x/sys/dev/if_ndis/if_ndis_pccard.c user/lstewart/alq_varlen_8.x/sys/dev/if_ndis/if_ndis_pci.c user/lstewart/alq_varlen_8.x/sys/dev/if_ndis/if_ndis_usb.c user/lstewart/alq_varlen_8.x/sys/dev/if_ndis/if_ndisvar.h user/lstewart/alq_varlen_8.x/sys/dev/mca/mca_bus.c user/lstewart/alq_varlen_8.x/sys/dev/nsp/nsp.c user/lstewart/alq_varlen_8.x/sys/dev/ofw/ofw_iicbus.c user/lstewart/alq_varlen_8.x/sys/dev/pccard/pccard.c user/lstewart/alq_varlen_8.x/sys/dev/pccard/pccardvar.h user/lstewart/alq_varlen_8.x/sys/dev/pccard/pccardvarp.h user/lstewart/alq_varlen_8.x/sys/dev/pci/pci.c user/lstewart/alq_varlen_8.x/sys/dev/pci/pci_private.h user/lstewart/alq_varlen_8.x/sys/dev/pci/pcireg.h user/lstewart/alq_varlen_8.x/sys/dev/pci/vga_pci.c user/lstewart/alq_varlen_8.x/sys/dev/puc/pucdata.c user/lstewart/alq_varlen_8.x/sys/dev/sound/pci/hda/hdac.c user/lstewart/alq_varlen_8.x/sys/dev/stg/tmc18c30.c user/lstewart/alq_varlen_8.x/sys/dev/syscons/scterm-teken.c user/lstewart/alq_varlen_8.x/sys/dev/txp/3c990img.h user/lstewart/alq_varlen_8.x/sys/dev/txp/if_txp.c user/lstewart/alq_varlen_8.x/sys/dev/txp/if_txpreg.h user/lstewart/alq_varlen_8.x/sys/dev/uart/uart_bus_pci.c user/lstewart/alq_varlen_8.x/sys/fs/devfs/devfs_vnops.c user/lstewart/alq_varlen_8.x/sys/fs/msdosfs/denode.h user/lstewart/alq_varlen_8.x/sys/fs/msdosfs/msdosfs_denode.c user/lstewart/alq_varlen_8.x/sys/fs/msdosfs/msdosfs_vfsops.c user/lstewart/alq_varlen_8.x/sys/fs/msdosfs/msdosfs_vnops.c user/lstewart/alq_varlen_8.x/sys/fs/msdosfs/msdosfsmount.h user/lstewart/alq_varlen_8.x/sys/fs/procfs/procfs_dbregs.c user/lstewart/alq_varlen_8.x/sys/fs/procfs/procfs_fpregs.c user/lstewart/alq_varlen_8.x/sys/fs/procfs/procfs_regs.c user/lstewart/alq_varlen_8.x/sys/fs/udf/udf.h user/lstewart/alq_varlen_8.x/sys/fs/udf/udf_vfsops.c user/lstewart/alq_varlen_8.x/sys/fs/udf/udf_vnops.c user/lstewart/alq_varlen_8.x/sys/gnu/fs/reiserfs/reiserfs_fs.h user/lstewart/alq_varlen_8.x/sys/gnu/fs/xfs/FreeBSD/xfs_compat.h user/lstewart/alq_varlen_8.x/sys/i386/acpica/madt.c user/lstewart/alq_varlen_8.x/sys/i386/conf/GENERIC user/lstewart/alq_varlen_8.x/sys/i386/conf/XBOX user/lstewart/alq_varlen_8.x/sys/i386/i386/machdep.c user/lstewart/alq_varlen_8.x/sys/i386/i386/mp_machdep.c user/lstewart/alq_varlen_8.x/sys/i386/i386/pmap.c user/lstewart/alq_varlen_8.x/sys/i386/i386/vm86.c user/lstewart/alq_varlen_8.x/sys/i386/include/npx.h user/lstewart/alq_varlen_8.x/sys/i386/include/pcb.h user/lstewart/alq_varlen_8.x/sys/i386/isa/npx.c user/lstewart/alq_varlen_8.x/sys/i386/linux/linux.h user/lstewart/alq_varlen_8.x/sys/i386/linux/linux_sysvec.c user/lstewart/alq_varlen_8.x/sys/i386/xen/mp_machdep.c user/lstewart/alq_varlen_8.x/sys/ia64/conf/GENERIC user/lstewart/alq_varlen_8.x/sys/isa/syscons_isa.c user/lstewart/alq_varlen_8.x/sys/kern/kern_condvar.c user/lstewart/alq_varlen_8.x/sys/kern/kern_conf.c user/lstewart/alq_varlen_8.x/sys/kern/kern_cons.c user/lstewart/alq_varlen_8.x/sys/kern/kern_exec.c user/lstewart/alq_varlen_8.x/sys/kern/kern_exit.c user/lstewart/alq_varlen_8.x/sys/kern/kern_malloc.c user/lstewart/alq_varlen_8.x/sys/kern/kern_poll.c user/lstewart/alq_varlen_8.x/sys/kern/kern_priv.c user/lstewart/alq_varlen_8.x/sys/kern/kern_prot.c user/lstewart/alq_varlen_8.x/sys/kern/kern_rwlock.c user/lstewart/alq_varlen_8.x/sys/kern/kern_sig.c user/lstewart/alq_varlen_8.x/sys/kern/kern_synch.c user/lstewart/alq_varlen_8.x/sys/kern/kern_tc.c user/lstewart/alq_varlen_8.x/sys/kern/kern_thr.c user/lstewart/alq_varlen_8.x/sys/kern/kern_time.c user/lstewart/alq_varlen_8.x/sys/kern/kern_uuid.c user/lstewart/alq_varlen_8.x/sys/kern/subr_prf.c user/lstewart/alq_varlen_8.x/sys/kern/subr_smp.c user/lstewart/alq_varlen_8.x/sys/kern/subr_witness.c user/lstewart/alq_varlen_8.x/sys/kern/sys_generic.c user/lstewart/alq_varlen_8.x/sys/kern/sys_process.c user/lstewart/alq_varlen_8.x/sys/kern/sysv_shm.c user/lstewart/alq_varlen_8.x/sys/kern/tty.c user/lstewart/alq_varlen_8.x/sys/kern/tty_info.c user/lstewart/alq_varlen_8.x/sys/kern/tty_inq.c user/lstewart/alq_varlen_8.x/sys/kern/tty_outq.c user/lstewart/alq_varlen_8.x/sys/kern/tty_pts.c user/lstewart/alq_varlen_8.x/sys/kern/tty_pty.c user/lstewart/alq_varlen_8.x/sys/kern/tty_ttydisc.c user/lstewart/alq_varlen_8.x/sys/kern/uipc_usrreq.c user/lstewart/alq_varlen_8.x/sys/kern/vfs_default.c user/lstewart/alq_varlen_8.x/sys/kern/vfs_extattr.c user/lstewart/alq_varlen_8.x/sys/kern/vfs_mount.c user/lstewart/alq_varlen_8.x/sys/kern/vfs_subr.c user/lstewart/alq_varlen_8.x/sys/legacy/dev/usb/ (props changed) user/lstewart/alq_varlen_8.x/sys/legacy/dev/usb/ehci_ixp4xx.c (props changed) user/lstewart/alq_varlen_8.x/sys/libkern/strtouq.c user/lstewart/alq_varlen_8.x/sys/mips/mips/elf64_machdep.c (props changed) user/lstewart/alq_varlen_8.x/sys/mips/mips/pmap.c user/lstewart/alq_varlen_8.x/sys/modules/Makefile user/lstewart/alq_varlen_8.x/sys/modules/ata/atausb/Makefile user/lstewart/alq_varlen_8.x/sys/modules/drm/radeon/Makefile user/lstewart/alq_varlen_8.x/sys/modules/if_ndis/Makefile user/lstewart/alq_varlen_8.x/sys/modules/ndis/Makefile user/lstewart/alq_varlen_8.x/sys/modules/netgraph/bluetooth/ubt/Makefile user/lstewart/alq_varlen_8.x/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile user/lstewart/alq_varlen_8.x/sys/modules/sound/driver/uaudio/Makefile user/lstewart/alq_varlen_8.x/sys/net/bpf.c user/lstewart/alq_varlen_8.x/sys/net/bpf_zerocopy.c user/lstewart/alq_varlen_8.x/sys/net/bridgestp.c user/lstewart/alq_varlen_8.x/sys/net/if.c user/lstewart/alq_varlen_8.x/sys/net/if_ef.c user/lstewart/alq_varlen_8.x/sys/net/if_ethersubr.c user/lstewart/alq_varlen_8.x/sys/net/if_gif.h user/lstewart/alq_varlen_8.x/sys/net/if_loop.c user/lstewart/alq_varlen_8.x/sys/net/if_mib.c user/lstewart/alq_varlen_8.x/sys/net/if_var.h user/lstewart/alq_varlen_8.x/sys/net/if_vlan.c user/lstewart/alq_varlen_8.x/sys/net/netisr.h user/lstewart/alq_varlen_8.x/sys/net/raw_cb.c user/lstewart/alq_varlen_8.x/sys/net/raw_usrreq.c user/lstewart/alq_varlen_8.x/sys/net/vnet.h user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_ddb.c user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_freebsd.h user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_scan_sta.c user/lstewart/alq_varlen_8.x/sys/netgraph/atm/ng_atm.c user/lstewart/alq_varlen_8.x/sys/netgraph/atm/ng_ccatm.h user/lstewart/alq_varlen_8.x/sys/netgraph/atm/uni/ng_uni_cust.h user/lstewart/alq_varlen_8.x/sys/netgraph/ng_ether.c user/lstewart/alq_varlen_8.x/sys/netgraph/ng_gif.c user/lstewart/alq_varlen_8.x/sys/netgraph/ng_l2tp.c user/lstewart/alq_varlen_8.x/sys/netgraph/ng_pppoe.c user/lstewart/alq_varlen_8.x/sys/netgraph/ng_pppoe.h user/lstewart/alq_varlen_8.x/sys/netinet/if_ether.c user/lstewart/alq_varlen_8.x/sys/netinet/igmp.c user/lstewart/alq_varlen_8.x/sys/netinet/igmp.h user/lstewart/alq_varlen_8.x/sys/netinet/in.h user/lstewart/alq_varlen_8.x/sys/netinet/in_gif.c user/lstewart/alq_varlen_8.x/sys/netinet/in_mcast.c user/lstewart/alq_varlen_8.x/sys/netinet/in_proto.c user/lstewart/alq_varlen_8.x/sys/netinet/in_rmx.c user/lstewart/alq_varlen_8.x/sys/netinet/ip6.h user/lstewart/alq_varlen_8.x/sys/netinet/ip_dummynet.c user/lstewart/alq_varlen_8.x/sys/netinet/ip_fw.h user/lstewart/alq_varlen_8.x/sys/netinet/ip_fw2.c user/lstewart/alq_varlen_8.x/sys/netinet/ip_input.c user/lstewart/alq_varlen_8.x/sys/netinet/ip_options.c user/lstewart/alq_varlen_8.x/sys/netinet/ip_options.h user/lstewart/alq_varlen_8.x/sys/netinet/ip_output.c user/lstewart/alq_varlen_8.x/sys/netinet/raw_ip.c user/lstewart/alq_varlen_8.x/sys/netinet/sctp_constants.h user/lstewart/alq_varlen_8.x/sys/netinet/sctp_crc32.c user/lstewart/alq_varlen_8.x/sys/netinet/sctp_indata.c user/lstewart/alq_varlen_8.x/sys/netinet/sctp_input.c user/lstewart/alq_varlen_8.x/sys/netinet/sctp_os_bsd.h user/lstewart/alq_varlen_8.x/sys/netinet/sctp_output.c user/lstewart/alq_varlen_8.x/sys/netinet/sctp_output.h user/lstewart/alq_varlen_8.x/sys/netinet/sctp_usrreq.c user/lstewart/alq_varlen_8.x/sys/netinet/tcp_timewait.c user/lstewart/alq_varlen_8.x/sys/netinet/tcp_usrreq.c user/lstewart/alq_varlen_8.x/sys/netinet/vinet.h user/lstewart/alq_varlen_8.x/sys/netinet6/icmp6.c user/lstewart/alq_varlen_8.x/sys/netinet6/in6.c user/lstewart/alq_varlen_8.x/sys/netinet6/in6_gif.c user/lstewart/alq_varlen_8.x/sys/netinet6/in6_ifattach.c user/lstewart/alq_varlen_8.x/sys/netinet6/in6_proto.c user/lstewart/alq_varlen_8.x/sys/netinet6/in6_rmx.c user/lstewart/alq_varlen_8.x/sys/netinet6/ip6_input.c user/lstewart/alq_varlen_8.x/sys/netinet6/ip6_mroute.c user/lstewart/alq_varlen_8.x/sys/netinet6/ip6_output.c user/lstewart/alq_varlen_8.x/sys/netinet6/nd6.c user/lstewart/alq_varlen_8.x/sys/netinet6/nd6_rtr.c user/lstewart/alq_varlen_8.x/sys/netinet6/raw_ip6.c user/lstewart/alq_varlen_8.x/sys/netinet6/route6.c user/lstewart/alq_varlen_8.x/sys/netinet6/scope6.c user/lstewart/alq_varlen_8.x/sys/netinet6/vinet6.h user/lstewart/alq_varlen_8.x/sys/netipsec/key.c user/lstewart/alq_varlen_8.x/sys/netipsec/key_debug.c user/lstewart/alq_varlen_8.x/sys/netipsec/keysock.c user/lstewart/alq_varlen_8.x/sys/netipsec/vipsec.h user/lstewart/alq_varlen_8.x/sys/netipsec/xform_ipip.c user/lstewart/alq_varlen_8.x/sys/nfsclient/bootp_subr.c user/lstewart/alq_varlen_8.x/sys/nfsclient/nfs_diskless.c user/lstewart/alq_varlen_8.x/sys/nfsclient/nfs_vnops.c user/lstewart/alq_varlen_8.x/sys/nfsserver/nfs_syscalls.c user/lstewart/alq_varlen_8.x/sys/pc98/cbus/syscons_cbus.c user/lstewart/alq_varlen_8.x/sys/pc98/conf/GENERIC user/lstewart/alq_varlen_8.x/sys/pc98/pc98/machdep.c user/lstewart/alq_varlen_8.x/sys/pci/viapm.c user/lstewart/alq_varlen_8.x/sys/powerpc/aim/trap_subr.S user/lstewart/alq_varlen_8.x/sys/powerpc/booke/machdep.c user/lstewart/alq_varlen_8.x/sys/powerpc/booke/pmap.c user/lstewart/alq_varlen_8.x/sys/powerpc/booke/swtch.S user/lstewart/alq_varlen_8.x/sys/powerpc/booke/trap.c user/lstewart/alq_varlen_8.x/sys/powerpc/booke/trap_subr.S user/lstewart/alq_varlen_8.x/sys/powerpc/conf/GENERIC user/lstewart/alq_varlen_8.x/sys/powerpc/conf/MPC85XX user/lstewart/alq_varlen_8.x/sys/powerpc/include/frame.h user/lstewart/alq_varlen_8.x/sys/powerpc/include/pcb.h user/lstewart/alq_varlen_8.x/sys/powerpc/powerpc/genassym.c user/lstewart/alq_varlen_8.x/sys/security/audit/audit_bsm_errno.c user/lstewart/alq_varlen_8.x/sys/security/audit/audit_bsm_token.c user/lstewart/alq_varlen_8.x/sys/security/audit/audit_syscalls.c user/lstewart/alq_varlen_8.x/sys/security/mac/mac_audit.c user/lstewart/alq_varlen_8.x/sys/security/mac/mac_cred.c user/lstewart/alq_varlen_8.x/sys/security/mac/mac_framework.c user/lstewart/alq_varlen_8.x/sys/security/mac/mac_framework.h user/lstewart/alq_varlen_8.x/sys/security/mac/mac_inet.c user/lstewart/alq_varlen_8.x/sys/security/mac/mac_internal.h user/lstewart/alq_varlen_8.x/sys/security/mac/mac_net.c user/lstewart/alq_varlen_8.x/sys/security/mac/mac_pipe.c user/lstewart/alq_varlen_8.x/sys/security/mac/mac_policy.h user/lstewart/alq_varlen_8.x/sys/security/mac/mac_posix_sem.c user/lstewart/alq_varlen_8.x/sys/security/mac/mac_posix_shm.c user/lstewart/alq_varlen_8.x/sys/security/mac/mac_priv.c user/lstewart/alq_varlen_8.x/sys/security/mac/mac_process.c user/lstewart/alq_varlen_8.x/sys/security/mac/mac_socket.c user/lstewart/alq_varlen_8.x/sys/security/mac/mac_system.c user/lstewart/alq_varlen_8.x/sys/security/mac/mac_sysv_msg.c user/lstewart/alq_varlen_8.x/sys/security/mac/mac_sysv_sem.c user/lstewart/alq_varlen_8.x/sys/security/mac/mac_sysv_shm.c user/lstewart/alq_varlen_8.x/sys/security/mac/mac_vfs.c user/lstewart/alq_varlen_8.x/sys/security/mac_biba/mac_biba.c user/lstewart/alq_varlen_8.x/sys/security/mac_bsdextended/ugidfw_internal.h user/lstewart/alq_varlen_8.x/sys/security/mac_bsdextended/ugidfw_vnode.c user/lstewart/alq_varlen_8.x/sys/security/mac_lomac/mac_lomac.c user/lstewart/alq_varlen_8.x/sys/security/mac_mls/mac_mls.c user/lstewart/alq_varlen_8.x/sys/security/mac_stub/mac_stub.c user/lstewart/alq_varlen_8.x/sys/security/mac_test/mac_test.c user/lstewart/alq_varlen_8.x/sys/sparc64/conf/GENERIC user/lstewart/alq_varlen_8.x/sys/sun4v/conf/GENERIC user/lstewart/alq_varlen_8.x/sys/sys/cdefs.h user/lstewart/alq_varlen_8.x/sys/sys/fcntl.h user/lstewart/alq_varlen_8.x/sys/sys/mbuf.h user/lstewart/alq_varlen_8.x/sys/sys/mount.h user/lstewart/alq_varlen_8.x/sys/sys/param.h user/lstewart/alq_varlen_8.x/sys/sys/priv.h user/lstewart/alq_varlen_8.x/sys/sys/sdt.h user/lstewart/alq_varlen_8.x/sys/sys/shm.h user/lstewart/alq_varlen_8.x/sys/sys/stat.h user/lstewart/alq_varlen_8.x/sys/sys/systm.h user/lstewart/alq_varlen_8.x/sys/sys/tree.h user/lstewart/alq_varlen_8.x/sys/sys/vimage.h user/lstewart/alq_varlen_8.x/sys/sys/vnode.h user/lstewart/alq_varlen_8.x/sys/ufs/ffs/ffs_vfsops.c user/lstewart/alq_varlen_8.x/sys/vm/vm_fault.c user/lstewart/alq_varlen_8.x/sys/vm/vm_kern.c user/lstewart/alq_varlen_8.x/sys/vm/vm_map.c user/lstewart/alq_varlen_8.x/sys/vm/vm_map.h user/lstewart/alq_varlen_8.x/sys/vm/vm_mmap.c user/lstewart/alq_varlen_8.x/sys/vm/vm_pager.c user/lstewart/alq_varlen_8.x/sys/vm/vm_unix.c user/lstewart/alq_varlen_8.x/sys/xdr/xdr_mem.c user/lstewart/alq_varlen_8.x/tools/regression/lib/libc/stdio/Makefile user/lstewart/alq_varlen_8.x/tools/regression/lib/libc/string/Makefile user/lstewart/alq_varlen_8.x/tools/regression/lib/libmp/test-libmp.c user/lstewart/alq_varlen_8.x/tools/regression/lib/msun/test-conj.t (props changed) user/lstewart/alq_varlen_8.x/tools/regression/sockets/unix_gc/unix_gc.c user/lstewart/alq_varlen_8.x/tools/tools/ath/Makefile.inc user/lstewart/alq_varlen_8.x/tools/tools/ath/athregs/dumpregs_5416.c user/lstewart/alq_varlen_8.x/tools/tools/ath/athstats/main.c user/lstewart/alq_varlen_8.x/tools/tools/ifinfo/ifinfo.c user/lstewart/alq_varlen_8.x/tools/tools/nanobsd/gateworks/G2348 user/lstewart/alq_varlen_8.x/tools/tools/nanobsd/gateworks/G2358 user/lstewart/alq_varlen_8.x/tools/tools/nanobsd/gateworks/avila user/lstewart/alq_varlen_8.x/tools/tools/nanobsd/gateworks/cambria user/lstewart/alq_varlen_8.x/usr.bin/chkey/Makefile user/lstewart/alq_varlen_8.x/usr.bin/csup/ (props changed) user/lstewart/alq_varlen_8.x/usr.bin/fstat/msdosfs.c user/lstewart/alq_varlen_8.x/usr.bin/ipcs/ipcs.c user/lstewart/alq_varlen_8.x/usr.bin/kdump/mkioctls user/lstewart/alq_varlen_8.x/usr.bin/newkey/Makefile user/lstewart/alq_varlen_8.x/usr.bin/newkey/generic.c user/lstewart/alq_varlen_8.x/usr.bin/newkey/newkey.c user/lstewart/alq_varlen_8.x/usr.bin/newkey/update.c user/lstewart/alq_varlen_8.x/usr.bin/nl/nl.c user/lstewart/alq_varlen_8.x/usr.bin/procstat/ (props changed) user/lstewart/alq_varlen_8.x/usr.bin/tar/ (props changed) user/lstewart/alq_varlen_8.x/usr.bin/tar/Makefile user/lstewart/alq_varlen_8.x/usr.bin/tar/bsdtar.c user/lstewart/alq_varlen_8.x/usr.bin/tar/bsdtar.h user/lstewart/alq_varlen_8.x/usr.bin/tar/bsdtar_platform.h user/lstewart/alq_varlen_8.x/usr.bin/tar/cmdline.c user/lstewart/alq_varlen_8.x/usr.bin/tar/matching.c user/lstewart/alq_varlen_8.x/usr.bin/tar/read.c user/lstewart/alq_varlen_8.x/usr.bin/tar/siginfo.c user/lstewart/alq_varlen_8.x/usr.bin/tar/test/Makefile user/lstewart/alq_varlen_8.x/usr.bin/tar/test/main.c user/lstewart/alq_varlen_8.x/usr.bin/tar/test/test.h user/lstewart/alq_varlen_8.x/usr.bin/tar/test/test_0.c user/lstewart/alq_varlen_8.x/usr.bin/tar/test/test_basic.c user/lstewart/alq_varlen_8.x/usr.bin/tar/test/test_copy.c user/lstewart/alq_varlen_8.x/usr.bin/tar/test/test_getdate.c user/lstewart/alq_varlen_8.x/usr.bin/tar/test/test_option_T.c user/lstewart/alq_varlen_8.x/usr.bin/tar/test/test_patterns.c user/lstewart/alq_varlen_8.x/usr.bin/tar/test/test_strip_components.c user/lstewart/alq_varlen_8.x/usr.bin/tar/test/test_symlink_dir.c user/lstewart/alq_varlen_8.x/usr.bin/tar/test/test_version.c user/lstewart/alq_varlen_8.x/usr.bin/tar/tree.c user/lstewart/alq_varlen_8.x/usr.bin/tar/util.c user/lstewart/alq_varlen_8.x/usr.bin/tar/write.c user/lstewart/alq_varlen_8.x/usr.bin/usbhidaction/usbhidaction.c user/lstewart/alq_varlen_8.x/usr.bin/usbhidctl/usbhid.c user/lstewart/alq_varlen_8.x/usr.sbin/IPXrouted/tables.c user/lstewart/alq_varlen_8.x/usr.sbin/bluetooth/bcmfw/bcmfw.c user/lstewart/alq_varlen_8.x/usr.sbin/boot0cfg/boot0cfg.c user/lstewart/alq_varlen_8.x/usr.sbin/dumpcis/cardinfo.h (props changed) user/lstewart/alq_varlen_8.x/usr.sbin/dumpcis/cis.h (props changed) user/lstewart/alq_varlen_8.x/usr.sbin/keyserv/Makefile user/lstewart/alq_varlen_8.x/usr.sbin/keyserv/setkey.c user/lstewart/alq_varlen_8.x/usr.sbin/makefs/ffs/ffs_bswap.c (props changed) user/lstewart/alq_varlen_8.x/usr.sbin/makefs/ffs/ffs_subr.c (props changed) user/lstewart/alq_varlen_8.x/usr.sbin/makefs/ffs/ufs_bswap.h (contents, props changed) user/lstewart/alq_varlen_8.x/usr.sbin/makefs/getid.c (props changed) user/lstewart/alq_varlen_8.x/usr.sbin/mtest/mtest.8 user/lstewart/alq_varlen_8.x/usr.sbin/mtest/mtest.c user/lstewart/alq_varlen_8.x/usr.sbin/pppd/cbcp.c user/lstewart/alq_varlen_8.x/usr.sbin/timed/timed/Makefile user/lstewart/alq_varlen_8.x/usr.sbin/timed/timed/networkdelta.c user/lstewart/alq_varlen_8.x/usr.sbin/timed/timedc/Makefile user/lstewart/alq_varlen_8.x/usr.sbin/trpt/trpt.c user/lstewart/alq_varlen_8.x/usr.sbin/usbconfig/dump.c user/lstewart/alq_varlen_8.x/usr.sbin/usbconfig/dump.h user/lstewart/alq_varlen_8.x/usr.sbin/usbconfig/usbconfig.c user/lstewart/alq_varlen_8.x/usr.sbin/wpa/Makefile.inc user/lstewart/alq_varlen_8.x/usr.sbin/wpa/hostapd/Makefile user/lstewart/alq_varlen_8.x/usr.sbin/wpa/hostapd/driver_freebsd.c user/lstewart/alq_varlen_8.x/usr.sbin/wpa/hostapd_cli/Makefile user/lstewart/alq_varlen_8.x/usr.sbin/wpa/wpa_cli/Makefile user/lstewart/alq_varlen_8.x/usr.sbin/wpa/wpa_passphrase/Makefile user/lstewart/alq_varlen_8.x/usr.sbin/wpa/wpa_supplicant/Makefile user/lstewart/alq_varlen_8.x/usr.sbin/wpa/wpa_supplicant/Packet32.c user/lstewart/alq_varlen_8.x/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c user/lstewart/alq_varlen_8.x/usr.sbin/wpa/wpa_supplicant/driver_wired.c user/lstewart/alq_varlen_8.x/usr.sbin/zic/ (props changed) Modified: user/lstewart/alq_varlen_8.x/MAINTAINERS ============================================================================== --- user/lstewart/alq_varlen_8.x/MAINTAINERS Mon Mar 9 06:02:55 2009 (r189555) +++ user/lstewart/alq_varlen_8.x/MAINTAINERS Mon Mar 9 06:14:27 2009 (r189556) @@ -29,7 +29,6 @@ MAC Framework rwatson Pre-commit review MAC Modules rwatson Pre-commit review requested. contrib/openbsm rwatson Pre-commit review requested. sys/security/audit rwatson Pre-commit review requested. -ATA/IDE sos Pre-commit review requested. ahc(4) gibbs Pre-commit review requested. ahd(4) gibbs Pre-commit review requested. NEWCARD imp Pre-commit review requested. Modified: user/lstewart/alq_varlen_8.x/ObsoleteFiles.inc ============================================================================== --- user/lstewart/alq_varlen_8.x/ObsoleteFiles.inc Mon Mar 9 06:02:55 2009 (r189555) +++ user/lstewart/alq_varlen_8.x/ObsoleteFiles.inc Mon Mar 9 06:14:27 2009 (r189556) @@ -14,6 +14,65 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20090226: libmp(3) functions renamed +OLD_LIBS+=usr/lib/libmp.so.6 +# 20090223: changeover of USB stacks +OLD_FILES+=usr/include/dev/usb2/include/ufm2_ioctl.h +OLD_FILES+=usr/include/dev/usb2/include/urio2_ioctl.h +OLD_FILES+=usr/include/dev/usb2/include/usb2_cdc.h +OLD_FILES+=usr/include/dev/usb2/include/usb2_defs.h +OLD_FILES+=usr/include/dev/usb2/include/usb2_devid.h +OLD_FILES+=usr/include/dev/usb2/include/usb2_devtable.h +OLD_FILES+=usr/include/dev/usb2/include/usb2_endian.h +OLD_FILES+=usr/include/dev/usb2/include/usb2_error.h +OLD_FILES+=usr/include/dev/usb2/include/usb2_hid.h +OLD_FILES+=usr/include/dev/usb2/include/usb2_ioctl.h +OLD_FILES+=usr/include/dev/usb2/include/usb2_mfunc.h +OLD_FILES+=usr/include/dev/usb2/include/usb2_revision.h +OLD_FILES+=usr/include/dev/usb2/include/usb2_standard.h +OLD_DIRS+=usr/include/dev/usb2/include +OLD_DIRS+=usr/include/dev/usb2 +OLD_FILES+=usr/include/dev/usb/dsbr100io.h +OLD_FILES+=usr/include/dev/usb/ehcireg.h +OLD_FILES+=usr/include/dev/usb/ehcivar.h +OLD_FILES+=usr/include/dev/usb/hid.h +OLD_FILES+=usr/include/dev/usb/if_auereg.h +OLD_FILES+=usr/include/dev/usb/if_axereg.h +OLD_FILES+=usr/include/dev/usb/if_cdcereg.h +OLD_FILES+=usr/include/dev/usb/if_cuereg.h +OLD_FILES+=usr/include/dev/usb/if_kuereg.h +OLD_FILES+=usr/include/dev/usb/if_ruereg.h +OLD_FILES+=usr/include/dev/usb/if_rumreg.h +OLD_FILES+=usr/include/dev/usb/if_rumvar.h +OLD_FILES+=usr/include/dev/usb/if_udavreg.h +OLD_FILES+=usr/include/dev/usb/if_upgtvar.h +OLD_FILES+=usr/include/dev/usb/if_uralreg.h +OLD_FILES+=usr/include/dev/usb/if_uralvar.h +OLD_FILES+=usr/include/dev/usb/if_zydfw.h +OLD_FILES+=usr/include/dev/usb/if_zydreg.h +OLD_FILES+=usr/include/dev/usb/kue_fw.h +OLD_FILES+=usr/include/dev/usb/ohcireg.h +OLD_FILES+=usr/include/dev/usb/ohcivar.h +OLD_FILES+=usr/include/dev/usb/rio500_usb.h +OLD_FILES+=usr/include/dev/usb/rt2573_ucode.h +OLD_FILES+=usr/include/dev/usb/sl811hsreg.h +OLD_FILES+=usr/include/dev/usb/sl811hsvar.h +OLD_FILES+=usr/include/dev/usb/ubser.h +OLD_FILES+=usr/include/dev/usb/ucomvar.h +OLD_FILES+=usr/include/dev/usb/udbp.h +OLD_FILES+=usr/include/dev/usb/uftdireg.h +OLD_FILES+=usr/include/dev/usb/ugraphire_rdesc.h +OLD_FILES+=usr/include/dev/usb/uhcireg.h +OLD_FILES+=usr/include/dev/usb/uhcivar.h +OLD_FILES+=usr/include/dev/usb/usb_ethersubr.h +OLD_FILES+=usr/include/dev/usb/usb_mem.h +OLD_FILES+=usr/include/dev/usb/usb_port.h +OLD_FILES+=usr/include/dev/usb/usb_quirks.h +OLD_FILES+=usr/include/dev/usb/usbcdc.h +OLD_FILES+=usr/include/dev/usb/usbdi.h +OLD_FILES+=usr/include/dev/usb/usbdi_util.h +OLD_FILES+=usr/include/dev/usb/usbdivar.h +OLD_FILES+=usr/include/dev/usb/uxb360gp_rdesc.h # 20090203: removal of pccard header files OLD_FILES+=usr/include/pccard/cardinfo.h OLD_FILES+=usr/include/pccard/cis.h @@ -1674,7 +1733,7 @@ OLD_FILES+=usr/lib/libpam_ssh.a OLD_FILES+=usr/lib/libpam_ssh_p.a OLD_FILES+=usr/bin/help OLD_FILES+=usr/bin/sccs -.if ${TARGET_ARCH} != "arm" && ${TARGET_ARCH} != "i386" +.if ${TARGET_ARCH} != "arm" && ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "powerpc" OLD_FILES+=usr/bin/gdbserver .endif OLD_FILES+=usr/bin/ssh-keysign Modified: user/lstewart/alq_varlen_8.x/UPDATING ============================================================================== --- user/lstewart/alq_varlen_8.x/UPDATING Mon Mar 9 06:02:55 2009 (r189555) +++ user/lstewart/alq_varlen_8.x/UPDATING Mon Mar 9 06:14:27 2009 (r189556) @@ -22,6 +22,30 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8. to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090302: + A workaround is committed to allow the creation of System V shared + memory segment of size > 2 GB on the 64-bit architectures. + Due to a limitation of the existing ABI, the shm_segsz member + of the struct shmid_ds, returned by shmctl(IPC_STAT) call is + wrong for large segments. Note that limits must be explicitely + raised to allow such segments to be created. + +20090301: + The layout of struct ifnet has changed, requiring a rebuild of all + network device driver modules. + +20090227: + The /dev handling for the new USB stack has changed, a + buildworld/installworld is required for libusb20. + +20090223: + The new USB2 stack has now been permanently moved in and all kernel and + module names reverted to their previous values (eg, usb, ehci, ohci, + ums, ...). The old usb stack can be compiled in by prefixing the name + with the letter 'o', the old usb modules have been removed. + Updating entry 20090216 for xorg and 20090215 for libmap may still + apply. + 20090217: The rc.conf(5) option if_up_delay has been renamed to defaultroute_delay to better reflect its purpose. If you have @@ -44,6 +68,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8. that includes GENERIC then ensure that usb names are also changed over, eg uftdi -> usb2_serial_ftdi. + Older programs linked against the ports libusb 0.1 need to be + redirected to the new stack's libusb20. /etc/libmap.conf can + be used for this: + # Map old usb library to new one for usb2 stack + libusb-0.1.so.8 libusb20.so.1 + 20090203: The ichsmb(4) driver has been changed to require SMBus slave addresses be left-justified (xxxxxxx0b) rather than right-justified. Modified: user/lstewart/alq_varlen_8.x/bin/ps/extern.h ============================================================================== --- user/lstewart/alq_varlen_8.x/bin/ps/extern.h Mon Mar 9 06:02:55 2009 (r189555) +++ user/lstewart/alq_varlen_8.x/bin/ps/extern.h Mon Mar 9 06:14:27 2009 (r189556) @@ -71,6 +71,7 @@ void priorityr(KINFO *, VARENT *); void rgroupname(KINFO *, VARENT *); void runame(KINFO *, VARENT *); void rvar(KINFO *, VARENT *); +int s_comm(KINFO *); int s_label(KINFO *); int s_rgroupname(KINFO *); int s_runame(KINFO *); Modified: user/lstewart/alq_varlen_8.x/bin/ps/keyword.c ============================================================================== --- user/lstewart/alq_varlen_8.x/bin/ps/keyword.c Mon Mar 9 06:02:55 2009 (r189555) +++ user/lstewart/alq_varlen_8.x/bin/ps/keyword.c Mon Mar 9 06:14:27 2009 (r189556) @@ -79,8 +79,8 @@ static VAR var[] = { CHAR, NULL, 0}, {"blocked", "", "sigmask", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, {"caught", "", "sigcatch", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, - {"comm", "COMMAND", NULL, LJUST, ucomm, NULL, MAXCOMLEN, 0, CHAR, - NULL, 0}, + {"comm", "COMMAND", NULL, LJUST|DSIZ, ucomm, s_comm, + COMMLEN + OCOMMLEN + 1, 0, CHAR, NULL, 0}, {"command", "COMMAND", NULL, COMM|LJUST|USER, command, NULL, 16, 0, CHAR, NULL, 0}, {"cpu", "CPU", NULL, 0, kvar, NULL, 3, KOFF(ki_estcpu), UINT, "d", @@ -135,12 +135,13 @@ static VAR var[] = { LONG, "ld", 0}, {"nvcsw", "NVCSW", NULL, USER, rvar, NULL, 5, ROFF(ru_nvcsw), LONG, "ld", 0}, - {"nwchan", "NWCHAN", NULL, LJUST, nwchan, NULL, 8, 0, CHAR, NULL, 0}, + {"nwchan", "NWCHAN", NULL, LJUST, nwchan, NULL, sizeof(void *) * 2, 0, + CHAR, NULL, 0}, {"oublk", "OUBLK", NULL, USER, rvar, NULL, 4, ROFF(ru_oublock), LONG, "ld", 0}, {"oublock", "", "oublk", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, - {"paddr", "PADDR", NULL, 0, kvar, NULL, 8, KOFF(ki_paddr), KPTR, - "lx", 0}, + {"paddr", "PADDR", NULL, 0, kvar, NULL, sizeof(void *) * 2, + KOFF(ki_paddr), KPTR, "lx", 0}, {"pagein", "PAGEIN", NULL, USER, pagein, NULL, 6, 0, CHAR, NULL, 0}, {"pcpu", "", "%cpu", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, {"pending", "", "sig", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, @@ -195,13 +196,13 @@ static VAR var[] = { {"tsiz", "TSIZ", NULL, 0, kvar, NULL, 4, KOFF(ki_tsize), PGTOK, "ld", 0}, {"tt", "TT ", NULL, 0, tname, NULL, 4, 0, CHAR, NULL, 0}, {"tty", "TTY", NULL, LJUST, longtname, NULL, 8, 0, CHAR, NULL, 0}, - {"ucomm", "UCOMM", NULL, LJUST, ucomm, NULL, MAXCOMLEN, 0, CHAR, NULL, - 0}, + {"ucomm", "UCOMM", NULL, LJUST|DSIZ, ucomm, s_comm, + COMMLEN + OCOMMLEN + 1, 0, CHAR, NULL, 0}, {"uid", "UID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_uid), UINT, UIDFMT, 0}, {"upr", "UPR", NULL, 0, upr, NULL, 3, 0, CHAR, NULL, 0}, - {"uprocp", "UPROCP", NULL, 0, kvar, NULL, 8, KOFF(ki_paddr), KPTR, - "lx", 0}, + {"uprocp", "UPROCP", NULL, 0, kvar, NULL, sizeof(void *) * 2, + KOFF(ki_paddr), KPTR, "lx", 0}, {"user", "USER", NULL, LJUST|DSIZ, uname, s_uname, USERLEN, 0, CHAR, NULL, 0}, {"usrpri", "", "upr", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, @@ -325,6 +326,8 @@ findvar(char *p, int user, char **header */ rflen = strlen(v->alias) + strlen(hp) + 2; realfmt = malloc(rflen); + if (realfmt == NULL) + errx(1, "malloc failed"); snprintf(realfmt, rflen, "%s=%s", v->alias, hp); parsefmt(realfmt, user); } Modified: user/lstewart/alq_varlen_8.x/bin/ps/print.c ============================================================================== --- user/lstewart/alq_varlen_8.x/bin/ps/print.c Mon Mar 9 06:02:55 2009 (r189555) +++ user/lstewart/alq_varlen_8.x/bin/ps/print.c Mon Mar 9 06:14:27 2009 (r189556) @@ -177,6 +177,7 @@ command(KINFO *k, VARENT *ve) void ucomm(KINFO *k, VARENT *ve) { + char tmpbuff[COMMLEN + OCOMMLEN + 2]; VAR *v; v = ve->var; @@ -184,8 +185,15 @@ ucomm(KINFO *k, VARENT *ve) (void)printf("%s", k->ki_p->ki_comm); if (showthreads && k->ki_p->ki_numthreads > 1) printf("/%s", k->ki_p->ki_ocomm); - } else - (void)printf("%-*s", v->width, k->ki_p->ki_comm); + } else { + bzero(tmpbuff, sizeof(tmpbuff)); + if (showthreads && k->ki_p->ki_numthreads > 1) + sprintf(tmpbuff, "%s/%s", k->ki_p->ki_comm, + k->ki_p->ki_ocomm); + else + sprintf(tmpbuff, "%s", k->ki_p->ki_comm); + (void)printf("%-*s", v->width, tmpbuff); + } } void @@ -821,6 +829,20 @@ out: } int +s_comm(KINFO *k) +{ + char tmpbuff[COMMLEN + OCOMMLEN + 2]; + + bzero(tmpbuff, sizeof(tmpbuff)); + if (showthreads && k->ki_p->ki_numthreads > 1) + sprintf(tmpbuff, "%s/%s", k->ki_p->ki_comm, + k->ki_p->ki_ocomm); + else + sprintf(tmpbuff, "%s", k->ki_p->ki_comm); + return (strlen(tmpbuff)); +} + +int s_label(KINFO *k) { char *string = NULL; Modified: user/lstewart/alq_varlen_8.x/bin/sh/miscbltin.c ============================================================================== --- user/lstewart/alq_varlen_8.x/bin/sh/miscbltin.c Mon Mar 9 06:02:55 2009 (r189555) +++ user/lstewart/alq_varlen_8.x/bin/sh/miscbltin.c Mon Mar 9 06:14:27 2009 (r189556) @@ -147,6 +147,7 @@ readcmd(int argc __unused, char **argv _ if (tcgetattr(0, &told) == 0) { memcpy(&tnew, &told, sizeof(told)); cfmakeraw(&tnew); + tnew.c_iflag |= told.c_iflag & ICRNL; tcsetattr(0, TCSANOW, &tnew); tsaved = 1; } Modified: user/lstewart/alq_varlen_8.x/contrib/csup/updater.c ============================================================================== --- user/lstewart/alq_varlen_8.x/contrib/csup/updater.c Mon Mar 9 06:02:55 2009 (r189555) +++ user/lstewart/alq_varlen_8.x/contrib/csup/updater.c Mon Mar 9 06:14:27 2009 (r189556) @@ -1682,7 +1682,7 @@ updater_rcsedit(struct updater *up, stru stream_close(dest); rcsfile_free(rf); if (error) - return (UPDATER_ERR_PROTO); + lprintf(-1, "Error writing %s\n", name); finish: sr->sr_clientattr = fattr_frompath(path, FATTR_NOFOLLOW); Modified: user/lstewart/alq_varlen_8.x/contrib/less/line.c ============================================================================== --- user/lstewart/alq_varlen_8.x/contrib/less/line.c Mon Mar 9 06:02:55 2009 (r189555) +++ user/lstewart/alq_varlen_8.x/contrib/less/line.c Mon Mar 9 06:14:27 2009 (r189556) @@ -601,9 +601,11 @@ store_char(ch, a, rep, pos) { if (!is_ansi_end(ch) && !is_ansi_middle(ch)) { /* Remove whole unrecognized sequence. */ - do { + while (curr) { --curr; - } while (!IS_CSI_START(linebuf[curr])); + if (IS_CSI_START(linebuf[curr])) + break; + } return 0; } a = AT_ANSI; /* Will force re-AT_'ing around it. */ Modified: user/lstewart/alq_varlen_8.x/contrib/openbsm/CREDITS ============================================================================== --- user/lstewart/alq_varlen_8.x/contrib/openbsm/CREDITS Mon Mar 9 06:02:55 2009 (r189555) +++ user/lstewart/alq_varlen_8.x/contrib/openbsm/CREDITS Mon Mar 9 06:14:27 2009 (r189556) @@ -27,6 +27,7 @@ the development of OpenBSM: Eric Hall Xin LI Stacey Son + Todd Heberlein In addition, Coverity, Inc.'s Prevent(tm) static analysis tool and Gimpel Software's FlexeLint tool were used to identify a number of bugs in the Modified: user/lstewart/alq_varlen_8.x/contrib/openbsm/NEWS ============================================================================== --- user/lstewart/alq_varlen_8.x/contrib/openbsm/NEWS Mon Mar 9 06:02:55 2009 (r189555) +++ user/lstewart/alq_varlen_8.x/contrib/openbsm/NEWS Mon Mar 9 06:14:27 2009 (r189556) @@ -1,5 +1,24 @@ OpenBSM Version History +OpenBSM 1.1 beta 1 + +- The filesz parameter in audit_control(5) now accepts suffixes: 'B' for + Bytes, 'K' for Kilobytes, 'M' for Megabytes, and 'G' for Gigabytes. + For legacy support no suffix defaults to bytes. +- Audit trail log expiration support added. It is configured in + audit_control(5) with the expire-after parameter. If there is no + expire-after parameter in audit_control(5), the default, then the audit + trail files are not expired and removed. See audit_control(5) for + more information. +- Change defaults in audit_control: warn at 5% rather than 20% free for audit + partitions, rotate automatically at 2mb, and set the default policy to + cnt,argv rather than cnt so that execve(2) arguments are captured if + AUE_EXECVE events are audited. These may provide more usable defaults for + many users. +- Use au_domain_to_bsm(3) and au_socket_type_to_bsm(3) to convert + au_to_socket_ex(3) arguments to BSM format. +- Fix error encoding AUT_IPC_PERM tokens. + OpenBSM 1.1 alpha 5 - Stub libauditd(3) man page added. @@ -412,4 +431,4 @@ OpenBSM 1.0 alpha 1 to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/NEWS#27 $ +$P4: //depot/projects/trustedbsd/openbsm/NEWS#32 $ Modified: user/lstewart/alq_varlen_8.x/contrib/openbsm/README ============================================================================== --- user/lstewart/alq_varlen_8.x/contrib/openbsm/README Mon Mar 9 06:02:55 2009 (r189555) +++ user/lstewart/alq_varlen_8.x/contrib/openbsm/README Mon Mar 9 06:14:27 2009 (r189556) @@ -1,4 +1,4 @@ -OpenBSM 1.1 alpha 4 +OpenBSM 1.1 beta 1 Introduction @@ -56,4 +56,4 @@ Information on TrustedBSD may be found o http://www.TrustedBSD.org/ -$P4: //depot/projects/trustedbsd/openbsm/README#34 $ +$P4: //depot/projects/trustedbsd/openbsm/README#35 $ Modified: user/lstewart/alq_varlen_8.x/contrib/openbsm/VERSION ============================================================================== --- user/lstewart/alq_varlen_8.x/contrib/openbsm/VERSION Mon Mar 9 06:02:55 2009 (r189555) +++ user/lstewart/alq_varlen_8.x/contrib/openbsm/VERSION Mon Mar 9 06:14:27 2009 (r189556) @@ -1 +1 @@ -OPENBSM_1_1_ALPHA_5 +OPENBSM_1_1_BETA_1 Modified: user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/audit/audit.8 ============================================================================== --- user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/audit/audit.8 Mon Mar 9 06:02:55 2009 (r189555) +++ user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/audit/audit.8 Mon Mar 9 06:14:27 2009 (r189556) @@ -1,4 +1,4 @@ -.\" Copyright (c) 2004 Apple Inc. +.\" Copyright (c) 2004-2009 Apple Inc. .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -25,9 +25,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#13 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#15 $ .\" -.Dd December 11, 2008 +.Dd January 29, 2009 .Dt AUDIT 8 .Os .Sh NAME @@ -35,7 +35,7 @@ .Nd audit management utility .Sh SYNOPSIS .Nm -.Fl i | n | s | t +.Fl e | i | n | s | t .Sh DESCRIPTION The .Nm @@ -43,6 +43,10 @@ utility controls the state of the audit One of the following flags is required as an argument to .Nm : .Bl -tag -width indent +.It Fl e +Forces the audit system to immediately remove audit log files that +meet the expiration criteria specified in the audit control file without +doing a log rotation. .It Fl i Initializes and starts auditing. This option is currently for Mac OS X only @@ -53,6 +57,8 @@ to be configured to run under .It Fl n Forces the audit system to close the existing audit log file and rotate to a new log file in a location specified in the audit control file. +Also, audit log files that meet the expiration criteria specified in the +audit control file will be removed. .It Fl s Specifies that the audit system should [re]synchronize its configuration from the audit control file. Modified: user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/audit/audit.c ============================================================================== --- user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/audit/audit.c Mon Mar 9 06:02:55 2009 (r189555) +++ user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/audit/audit.c Mon Mar 9 06:14:27 2009 (r189556) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2005-2008 Apple Inc. + * Copyright (c) 2005-2009 Apple Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#13 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#14 $ */ /* * Program to trigger the audit daemon with a message that is either: @@ -68,12 +68,15 @@ static int send_trigger(unsigned int); #include "auditd_control.h" /* - * XXX the following is temporary until this can be added to the kernel + * XXX The following are temporary until these can be added to the kernel * audit.h header. */ #ifndef AUDIT_TRIGGER_INITIALIZE #define AUDIT_TRIGGER_INITIALIZE 7 #endif +#ifndef AUDIT_TRIGGER_EXPIRE_TRAILS +#define AUDIT_TRIGGER_EXPIRE_TRAILS 8 +#endif static int send_trigger(unsigned int trigger) @@ -125,7 +128,7 @@ static void usage(void) { - (void)fprintf(stderr, "Usage: audit -i | -n | -s | -t \n"); + (void)fprintf(stderr, "Usage: audit -e | -i | -n | -s | -t \n"); exit(-1); } @@ -141,9 +144,13 @@ main(int argc, char **argv) if (argc != 2) usage(); - while ((ch = getopt(argc, argv, "inst")) != -1) { + while ((ch = getopt(argc, argv, "einst")) != -1) { switch(ch) { + case 'e': + trigger = AUDIT_TRIGGER_EXPIRE_TRAILS; + break; + case 'i': trigger = AUDIT_TRIGGER_INITIALIZE; break; Modified: user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/auditd/audit_warn.c ============================================================================== --- user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/auditd/audit_warn.c Mon Mar 9 06:02:55 2009 (r189555) +++ user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/auditd/audit_warn.c Mon Mar 9 06:14:27 2009 (r189556) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2005 Apple Inc. + * Copyright (c) 2005-2009 Apple Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#10 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#11 $ */ #include @@ -236,3 +236,18 @@ audit_warn_tmpfile(void) return (auditwarnlog(args)); } + +/* + * Indicates that this trail file has expired and was removed. + */ +int +audit_warn_expired(char *filename) +{ + char *args[3]; + + args[0] = EXPIRED_WARN; + args[1] = filename; + args[2] = NULL; + + return (auditwarnlog(args)); +} Modified: user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/auditd/auditd.c ============================================================================== --- user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/auditd/auditd.c Mon Mar 9 06:02:55 2009 (r189555) +++ user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/auditd/auditd.c Mon Mar 9 06:14:27 2009 (r189556) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2004-2008 Apple Inc. + * Copyright (c) 2004-2009 Apple Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#41 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#43 $ */ #include @@ -67,12 +67,16 @@ #endif /* - * XXX the following is temporary until this can be added to the kernel + * XXX The following are temporary until these can be added to the kernel * audit.h header. */ #ifndef AUDIT_TRIGGER_INITIALIZE #define AUDIT_TRIGGER_INITIALIZE 7 #endif +#ifndef AUDIT_TRIGGER_EXPIRE_TRAILS +#define AUDIT_TRIGGER_EXPIRE_TRAILS 8 +#endif + /* * LaunchD flag (Mac OS X and, maybe, FreeBSD only.) See launchd(8) and @@ -166,7 +170,7 @@ close_lastfile(char *TS) /* Rename the last file -- append timestamp. */ if ((ptr = strstr(lastfile, NOT_TERMINATED)) != NULL) { - strlcpy(ptr, TS, TIMESTAMP_LEN); + memcpy(ptr, TS, POSTFIX_LEN); if (rename(oldname, lastfile) != 0) auditd_log_err( "Could not rename %s to %s: %m", oldname, @@ -275,6 +279,14 @@ do_trail_file(void) return (-1); } + /* + * Finally, see if there are any trail files to expire. + */ + err = auditd_expire_trails(audit_warn_expired); + if (err) + auditd_log_err("auditd_expire_trails(): %s", + auditd_strerror(err)); + return (0); } @@ -550,6 +562,14 @@ auditd_handle_trigger(int trigger) audit_setup(); break; + case AUDIT_TRIGGER_EXPIRE_TRAILS: + auditd_log_info("Got audit expire trails trigger"); + err = auditd_expire_trails(audit_warn_expired); + if (err) + auditd_log_err("auditd_expire_trails(): %s", + auditd_strerror(err)); + break; + default: auditd_log_err("Got unknown trigger %d", trigger); break; @@ -669,13 +689,18 @@ auditd_config_controls(void) */ err = auditd_set_host(); if (err) { - auditd_log_err("auditd_set_host() %s: %m", - auditd_strerror(err)); - ret = -1; + if (err == ADE_PARSE) { + auditd_log_notice( + "audit_control(5) may be missing 'host:' field"); + } else { + auditd_log_err("auditd_set_host() %s: %m", + auditd_strerror(err)); + ret = -1; + } } else auditd_log_debug( "Set audit host address information in kernel."); - + return (ret); } Modified: user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/auditd/auditd.h ============================================================================== --- user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/auditd/auditd.h Mon Mar 9 06:02:55 2009 (r189555) +++ user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/auditd/auditd.h Mon Mar 9 06:14:27 2009 (r189556) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2005 Apple Inc. + * Copyright (c) 2005-2009 Apple Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.h#12 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.h#13 $ */ #ifndef _AUDITD_H_ @@ -57,6 +57,7 @@ #define POSTSIGTERM_WARN "postsigterm" #define SOFTLIM_WARN "soft" #define TMPFILE_WARN "tmpfile" +#define EXPIRED_WARN "expired" #define AUDITWARN_SCRIPT "/etc/security/audit_warn" #define AUDITD_PIDFILE "/var/run/auditd.pid" @@ -76,6 +77,7 @@ int audit_warn_nostart(void); int audit_warn_postsigterm(void); int audit_warn_soft(char *filename); int audit_warn_tmpfile(void); +int audit_warn_expired(char *filename); void auditd_openlog(int debug, gid_t gid); void auditd_log_err(const char *fmt, ...); Modified: user/lstewart/alq_varlen_8.x/contrib/openbsm/bsm/auditd_lib.h ============================================================================== --- user/lstewart/alq_varlen_8.x/contrib/openbsm/bsm/auditd_lib.h Mon Mar 9 06:02:55 2009 (r189555) +++ user/lstewart/alq_varlen_8.x/contrib/openbsm/bsm/auditd_lib.h Mon Mar 9 06:14:27 2009 (r189556) @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/auditd_lib.h#3 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/auditd_lib.h#4 $ */ #ifndef _BSM_AUDITD_LIB_H_ @@ -81,12 +81,14 @@ #define ADE_INVAL -16 /* Invalid argument. */ #define ADE_GETADDR -17 /* Error resolving address from hostname. */ #define ADE_ADDRFAM -18 /* Address family not supported. */ +#define ADE_EXPIRE -19 /* Error expiring audit trail files. */ /* * auditd_lib functions. */ const char *auditd_strerror(int errcode); int auditd_set_minfree(void); +int auditd_expire_trails(int (*warn_expired)(char *)); int auditd_read_dirs(int (*warn_soft)(char *), int (*warn_hard)(char *)); void auditd_close_dirs(void); int auditd_set_evcmap(void); Modified: user/lstewart/alq_varlen_8.x/contrib/openbsm/bsm/libbsm.h ============================================================================== --- user/lstewart/alq_varlen_8.x/contrib/openbsm/bsm/libbsm.h Mon Mar 9 06:02:55 2009 (r189555) +++ user/lstewart/alq_varlen_8.x/contrib/openbsm/bsm/libbsm.h Mon Mar 9 06:14:27 2009 (r189556) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2004-2008 Apple Inc. + * Copyright (c) 2004-2009 Apple Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#41 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#42 $ */ #ifndef _LIBBSM_H_ @@ -76,13 +76,14 @@ #define AUDIT_CONTROL_FILE "/etc/security/audit_control" #define AUDIT_USER_FILE "/etc/security/audit_user" -#define DIR_CONTROL_ENTRY "dir" -#define MINFREE_CONTROL_ENTRY "minfree" -#define FILESZ_CONTROL_ENTRY "filesz" -#define FLAGS_CONTROL_ENTRY "flags" -#define NA_CONTROL_ENTRY "naflags" -#define POLICY_CONTROL_ENTRY "policy" +#define DIR_CONTROL_ENTRY "dir" +#define MINFREE_CONTROL_ENTRY "minfree" +#define FILESZ_CONTROL_ENTRY "filesz" +#define FLAGS_CONTROL_ENTRY "flags" +#define NA_CONTROL_ENTRY "naflags" +#define POLICY_CONTROL_ENTRY "policy" #define AUDIT_HOST_CONTROL_ENTRY "host" +#define EXPIRE_AFTER_CONTROL_ENTRY "expire-after" #define AU_CLASS_NAME_MAX 8 #define AU_CLASS_DESC_MAX 72 @@ -766,6 +767,7 @@ int getacflg(char *auditstr, int len) int getacna(char *auditstr, int len); int getacpol(char *auditstr, size_t len); int getachost(char *auditstr, size_t len); +int getacexpire(int *andflg, time_t *age, size_t *size); int getauditflagsbin(char *auditstr, au_mask_t *masks); int getauditflagschar(char *auditstr, au_mask_t *masks, int verbose); Modified: user/lstewart/alq_varlen_8.x/contrib/openbsm/config/config.h ============================================================================== --- user/lstewart/alq_varlen_8.x/contrib/openbsm/config/config.h Mon Mar 9 06:02:55 2009 (r189555) +++ user/lstewart/alq_varlen_8.x/contrib/openbsm/config/config.h Mon Mar 9 06:14:27 2009 (r189556) @@ -165,13 +165,13 @@ #define PACKAGE_NAME "OpenBSM" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "OpenBSM 1.1alpha4" +#define PACKAGE_STRING "OpenBSM 1.1beta1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "openbsm" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.1alpha4" +#define PACKAGE_VERSION "1.1beta1" /* Define as the return type of signal handlers (`int' or `void'). */ #define RETSIGTYPE void @@ -192,7 +192,7 @@ #define USE_NATIVE_INCLUDES /* Version number of package */ -#define VERSION "1.1alpha4" +#define VERSION "1.1beta1" /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ Modified: user/lstewart/alq_varlen_8.x/contrib/openbsm/configure ============================================================================== --- user/lstewart/alq_varlen_8.x/contrib/openbsm/configure Mon Mar 9 06:02:55 2009 (r189555) +++ user/lstewart/alq_varlen_8.x/contrib/openbsm/configure Mon Mar 9 06:14:27 2009 (r189556) @@ -1,7 +1,7 @@ #! /bin/sh # From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#49 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for OpenBSM 1.1alpha5. +# Generated by GNU Autoconf 2.61 for OpenBSM 1.1beta1. # # Report bugs to . # @@ -729,8 +729,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='OpenBSM' PACKAGE_TARNAME='openbsm' -PACKAGE_VERSION='1.1alpha5' -PACKAGE_STRING='OpenBSM 1.1alpha5' +PACKAGE_VERSION='1.1beta1' +PACKAGE_STRING='OpenBSM 1.1beta1' PACKAGE_BUGREPORT='trustedbsd-audit@TrustesdBSD.org' ac_unique_file="bin/auditreduce/auditreduce.c" @@ -1404,7 +1404,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OpenBSM 1.1alpha5 to adapt to many kinds of systems. +\`configure' configures OpenBSM 1.1beta1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1474,7 +1474,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenBSM 1.1alpha5:";; + short | recursive ) echo "Configuration of OpenBSM 1.1beta1:";; esac cat <<\_ACEOF @@ -1580,7 +1580,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenBSM configure 1.1alpha5 +OpenBSM configure 1.1beta1 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1594,7 +1594,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OpenBSM $as_me 1.1alpha5, which was +It was created by OpenBSM $as_me 1.1beta1, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -19076,7 +19076,7 @@ fi # Define the identity of the package. PACKAGE=OpenBSM - VERSION=1.1alpha5 + VERSION=1.1beta1 cat >>confdefs.h <<_ACEOF @@ -23584,7 +23584,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by OpenBSM $as_me 1.1alpha5, which was +This file was extended by OpenBSM $as_me 1.1beta1, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23637,7 +23637,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -OpenBSM config.status 1.1alpha5 +OpenBSM config.status 1.1beta1 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" Modified: user/lstewart/alq_varlen_8.x/contrib/openbsm/configure.ac ============================================================================== --- user/lstewart/alq_varlen_8.x/contrib/openbsm/configure.ac Mon Mar 9 06:02:55 2009 (r189555) +++ user/lstewart/alq_varlen_8.x/contrib/openbsm/configure.ac Mon Mar 9 06:14:27 2009 (r189556) @@ -2,8 +2,8 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([OpenBSM], [1.1alpha5], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#49 $]) +AC_INIT([OpenBSM], [1.1beta1], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#50 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) Modified: user/lstewart/alq_varlen_8.x/contrib/openbsm/etc/audit_control ============================================================================== --- user/lstewart/alq_varlen_8.x/contrib/openbsm/etc/audit_control Mon Mar 9 06:02:55 2009 (r189555) +++ user/lstewart/alq_varlen_8.x/contrib/openbsm/etc/audit_control Mon Mar 9 06:14:27 2009 (r189556) @@ -1,10 +1,10 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_control#5 $ +# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_control#6 $ # $FreeBSD$ # dir:/var/audit flags:lo -minfree:20 +minfree:5 naflags:lo -policy:cnt -filesz:0 +policy:cnt,argv +filesz:2097152 Modified: user/lstewart/alq_varlen_8.x/contrib/openbsm/etc/audit_event ============================================================================== --- user/lstewart/alq_varlen_8.x/contrib/openbsm/etc/audit_event Mon Mar 9 06:02:55 2009 (r189555) +++ user/lstewart/alq_varlen_8.x/contrib/openbsm/etc/audit_event Mon Mar 9 06:14:27 2009 (r189556) @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#34 $ +# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#36 $ # $FreeBSD$ # # The mapping between event identifiers and values is also hard-coded in @@ -491,7 +491,7 @@ 43128:AUE_MAC_GET_PID:mac_get_pid(2):pc 43129:AUE_MAC_GET_LINK:mac_get_link(2):fa 43130:AUE_MAC_SET_LINK:mac_set_link(2):fm -43131:AUE_MAC_EXECVE:mac_exeve(2):ex,pc +43131:AUE_MAC_EXECVE:mac_execve(2):ex,pc 43132:AUE_GETPATH_FROMFD:getpath_fromfd(2):fa 43133:AUE_GETPATH_FROMADDR:getpath_fromaddr(2):fa 43134:AUE_MQ_OPEN:mq_open(2):ip @@ -552,6 +552,8 @@ 43189:AUE_CAP_GETMODE:cap_getmode(2):pc 43190:AUE_POSIX_SPAWN:posix_spawn(2):pc 43191:AUE_FSGETPATH:fsgetpath(2):ot +43192:AUE_PREAD:pread(2):no +43193:AUE_PWRITE:pwrite(2):no # # Solaris userspace events. # Modified: user/lstewart/alq_varlen_8.x/contrib/openbsm/libauditd/auditd_lib.c ============================================================================== --- user/lstewart/alq_varlen_8.x/contrib/openbsm/libauditd/auditd_lib.c Mon Mar 9 06:02:55 2009 (r189555) +++ user/lstewart/alq_varlen_8.x/contrib/openbsm/libauditd/auditd_lib.c Mon Mar 9 06:14:27 2009 (r189556) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2008 Apple Inc. + * Copyright (c) 2008-2009 Apple Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#2 $ + * $P4: //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#7 $ */ #include @@ -52,6 +52,7 @@ #include #include +#include #include #include #include @@ -77,6 +78,11 @@ #define AUDIT_HARD_LIMIT_FREE_BLOCKS 4 #endif +/* + * Number of seconds to January 1, 2000 + */ +#define JAN_01_2000 946598400 + struct dir_ent { char *dirname; uint8_t softlim; @@ -85,7 +91,19 @@ struct dir_ent { }; static TAILQ_HEAD(, dir_ent) dir_q; -static int minval = -1; + +struct audit_trail { + time_t at_time; + char *at_path; + off_t at_size; + + TAILQ_ENTRY(audit_trail) at_trls; +}; + +static int auditd_minval = -1; + +static char auditd_host[MAXHOSTNAMELEN]; +static int auditd_hostlen = -1; static char *auditd_errmsg[] = { "no error", /* ADE_NOERR ( 0) */ @@ -107,6 +125,7 @@ static char *auditd_errmsg[] = { "invalid argument", /* ADE_INVAL (16) */ "could not resolve hostname to address", /* ADE_GETADDR (17) */ "address family not supported", /* ADE_ADDRFAM (18) */ + "error expiring audit trail files", /* ADE_EXPIRE (19) */ }; #define MAXERRCODE (sizeof(auditd_errmsg) / sizeof(auditd_errmsg[0])) @@ -165,7 +184,13 @@ affixdir(char *name, struct dir_ent *dir return (NULL); } - asprintf(&fn, "%s/%s", dirent->dirname, name); + /* + * If the host is set then also add the hostname to the filename. + */ + if (auditd_hostlen != -1) + asprintf(&fn, "%s/%s.%s", dirent->dirname, name, auditd_host); + else + asprintf(&fn, "%s/%s", dirent->dirname, name); return (fn); } @@ -204,16 +229,14 @@ insert_orderly(struct dir_ent *denew) int auditd_set_host(void) { - char hoststr[MAXHOSTNAMELEN]; struct sockaddr_in6 *sin6; struct sockaddr_in *sin; struct addrinfo *res; struct auditinfo_addr aia; int error, ret = ADE_NOERR; - if (getachost(hoststr, MAXHOSTNAMELEN) != 0) { - - ret = ADE_PARSE; + if (getachost(auditd_host, sizeof(auditd_host)) != 0) { + ret = ADE_PARSE; /* * To maintain reverse compatability with older audit_control @@ -229,7 +252,8 @@ auditd_set_host(void) ret = ADE_AUDITON; return (ret); } - error = getaddrinfo(hoststr, NULL, NULL, &res); + auditd_hostlen = strlen(auditd_host); + error = getaddrinfo(auditd_host, NULL, NULL, &res); if (error) return (ADE_GETADDR); switch (res->ai_family) { @@ -271,14 +295,14 @@ auditd_set_minfree(void) { au_qctrl_t qctrl; - if (getacmin(&minval) != 0) + if (getacmin(&auditd_minval) != 0) return (ADE_PARSE); if (auditon(A_GETQCTRL, &qctrl, sizeof(qctrl)) != 0) return (ADE_AUDITON); - if (qctrl.aq_minfree != minval) { - qctrl.aq_minfree = minval; + if (qctrl.aq_minfree != auditd_minval) { + qctrl.aq_minfree = auditd_minval; if (auditon(A_SETQCTRL, &qctrl, sizeof(qctrl)) != 0) return (ADE_AUDITON); } @@ -287,9 +311,259 @@ auditd_set_minfree(void) } /* *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@FreeBSD.ORG Tue Mar 10 07:51:00 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2BC31106566B; Tue, 10 Mar 2009 07:51:00 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 18F5F8FC0A; Tue, 10 Mar 2009 07:51:00 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2A7p0XH050727; Tue, 10 Mar 2009 07:51:00 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2A7p02m050724; Tue, 10 Mar 2009 07:51:00 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <200903100751.n2A7p02m050724@svn.freebsd.org> From: Lawrence Stewart Date: Tue, 10 Mar 2009 07:51:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r189612 - in user/lstewart/alq_varlen_8.x: sys/kern tools/test/alq X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Mar 2009 07:51:00 -0000 Author: lstewart Date: Tue Mar 10 07:50:59 2009 New Revision: 189612 URL: http://svn.freebsd.org/changeset/base/189612 Log: More bug and style fixes. Modified: user/lstewart/alq_varlen_8.x/sys/kern/kern_alq.c user/lstewart/alq_varlen_8.x/tools/test/alq/Makefile user/lstewart/alq_varlen_8.x/tools/test/alq/alqtest.c Modified: user/lstewart/alq_varlen_8.x/sys/kern/kern_alq.c ============================================================================== --- user/lstewart/alq_varlen_8.x/sys/kern/kern_alq.c Tue Mar 10 06:21:52 2009 (r189611) +++ user/lstewart/alq_varlen_8.x/sys/kern/kern_alq.c Tue Mar 10 07:50:59 2009 (r189612) @@ -270,6 +270,7 @@ alq_shutdown(struct alq *alq) alq->aq_flags |= AQ_WANTED; msleep_spin(alq, &alq->aq_mtx, "aldclose", 0); } + ALQ_UNLOCK(alq); vn_close(alq->aq_vp, FWRITE, alq->aq_cred, curthread); @@ -290,6 +291,7 @@ alq_doio(struct alq *alq) int totlen; int iov; int vfslocked; + int prev_writehead = alq->aq_writehead; KASSERT((ALQ_HAS_PENDING_DATA(alq)), ("%s: queue emtpy!", __func__) @@ -298,43 +300,46 @@ alq_doio(struct alq *alq) vp = alq->aq_vp; td = curthread; totlen = 0; - iov = 0; + iov = 1; bzero(&aiov, sizeof(aiov)); bzero(&auio, sizeof(auio)); /* Start the write from the location of our buffer tail pointer. */ - aiov[iov].iov_base = alq->aq_entbuf + alq->aq_writetail; + aiov[0].iov_base = alq->aq_entbuf + alq->aq_writetail; if (alq->aq_writetail < alq->aq_writehead) { /* Buffer not wrapped */ - totlen = aiov[iov].iov_len = alq->aq_writehead - - alq->aq_writetail; + totlen = aiov[0].iov_len = alq->aq_writehead - alq->aq_writetail; } else { /* * Buffer wrapped, requires 2 aiov entries: * - first is from writetail to end of buffer * - second is from start of buffer to writehead */ - aiov[iov].iov_len = alq->aq_buflen - alq->aq_writetail; + aiov[0].iov_len = alq->aq_buflen - alq->aq_writetail; iov++; - aiov[iov].iov_base = alq->aq_entbuf; - aiov[iov].iov_len = alq->aq_writehead; + aiov[1].iov_base = alq->aq_entbuf; + aiov[1].iov_len = alq->aq_writehead; totlen = aiov[0].iov_len + aiov[1].iov_len; } alq->aq_flags |= AQ_FLUSHING; + /*printf("pre: alq->aq_writehead=%d,alq->aq_writetail=%d,totlen=%d,iov=%d\n", alq->aq_writehead, alq->aq_writetail, totlen, iov);*/ + if (alq->doio_debugcallback != NULL) alq->doio_debugcallback(); + /*printf("flushing %d bytes\n", totlen);*/ + ALQ_UNLOCK(alq); auio.uio_iov = &aiov[0]; auio.uio_offset = 0; auio.uio_segflg = UIO_SYSSPACE; auio.uio_rw = UIO_WRITE; - auio.uio_iovcnt = iov + 1; + auio.uio_iovcnt = iov; auio.uio_resid = totlen; auio.uio_td = td; @@ -359,8 +364,14 @@ alq_doio(struct alq *alq) ALQ_LOCK(alq); alq->aq_flags &= ~AQ_FLUSHING; + /*printf("finished flushing %d bytes\n", totlen);*/ + /* Adjust writetail as required, taking into account wrapping. */ - alq->aq_writetail += (iov == 2) ? aiov[1].iov_len : totlen; + if (iov == 2) + alq->aq_writetail = prev_writehead; + else + alq->aq_writetail = (alq->aq_writetail + totlen) % alq->aq_buflen; + alq->aq_freebytes += totlen; /* @@ -371,6 +382,12 @@ alq_doio(struct alq *alq) if (!ALQ_HAS_PENDING_DATA(alq)) alq->aq_writehead = alq->aq_writetail = 0; + /*printf("post: alq->aq_writehead=%d,alq->aq_writetail=%d,totlen=%d,iov=%d\n", alq->aq_writehead, alq->aq_writetail, totlen, iov);*/ + + KASSERT((alq->aq_writetail >= 0 && alq->aq_writetail < alq->aq_buflen), + ("%s: aq_writetail < 0 || aq_writetail >= aq_buflen", __func__) + ); + if (alq->doio_debugcallback != NULL) alq->doio_debugcallback(); @@ -480,7 +497,7 @@ alq_writen(struct alq *alq, void *data, int copy = len; KASSERT((len > 0 && len <= alq->aq_buflen), - ("%s: len <= 0 || len > alq->aq_buflen", __func__) + ("%s: len <= 0 || len > aq_buflen", __func__) ); ALQ_LOCK(alq); @@ -516,7 +533,7 @@ alq_writen(struct alq *alq, void *data, /* Bail if we're shutting down. */ if (alq->aq_flags & AQ_SHUTDOWN) { - ALQ_UNLOCK(alq); + ALQ_UNLOCK(alq); return (EWOULDBLOCK); } @@ -540,6 +557,10 @@ alq_writen(struct alq *alq, void *data, alq->aq_writehead = len - copy; } + KASSERT((alq->aq_writehead >= 0 && alq->aq_writehead < alq->aq_buflen), + ("%s: aq_writehead < 0 || aq_writehead >= aq_buflen", __func__) + ); + alq->aq_freebytes -= len; if (((alq->aq_flags & AQ_ACTIVE) == 0) && @@ -657,6 +678,10 @@ alq_getn(struct alq *alq, int len, int f if (alq->aq_writehead == alq->aq_buflen) alq->aq_writehead = 0; + KASSERT((alq->aq_writehead >= 0 && alq->aq_writehead < alq->aq_buflen), + ("%s: aq_writehead < 0 || aq_writehead >= aq_buflen", __func__) + ); + return (ale); } @@ -696,7 +721,11 @@ alq_flush(struct alq *alq) ALD_UNLOCK(); - if (ALQ_HAS_PENDING_DATA(alq)) + /* + * Pull the lever iff there is data to flush and we're + * not already in the middle of a flush operation. + */ + if (ALQ_HAS_PENDING_DATA(alq) && (alq->aq_flags & AQ_FLUSHING) == 0) needwakeup = alq_doio(alq); ALQ_UNLOCK(alq); Modified: user/lstewart/alq_varlen_8.x/tools/test/alq/Makefile ============================================================================== --- user/lstewart/alq_varlen_8.x/tools/test/alq/Makefile Tue Mar 10 06:21:52 2009 (r189611) +++ user/lstewart/alq_varlen_8.x/tools/test/alq/Makefile Tue Mar 10 07:50:59 2009 (r189612) @@ -6,8 +6,6 @@ KMOD=alqtest SRCS=alqtest.c alqtest.h CLEANFILES=alqtest.h -SYSDIR=/devel/freebsd_mirror/user/lstewart/alq_varlen_8.x/sys - alqtest.h: @awk -F "\n" '{ if(index($$0, "struct alq {") > 0) p=1; if(p == 1) { print $$0; if($$0 == "};") exit; } }' ${.CURDIR}/../../../sys/kern/kern_alq.c >> ${.TARGET} Modified: user/lstewart/alq_varlen_8.x/tools/test/alq/alqtest.c ============================================================================== --- user/lstewart/alq_varlen_8.x/tools/test/alq/alqtest.c Tue Mar 10 06:21:52 2009 (r189611) +++ user/lstewart/alq_varlen_8.x/tools/test/alq/alqtest.c Tue Mar 10 07:50:59 2009 (r189612) @@ -71,17 +71,25 @@ typedef const enum { } fgcolor_t; static int -sbuf_printf_color(struct sbuf *s, fgcolor_t c, const char *fmt, ...) +alqtest_printf(struct sbuf *s, fgcolor_t c, const char *fmt, ...) { - va_list ap; int ret; + va_list ap1, ap2; + + va_start(ap1, fmt); + va_copy(ap2, ap1); + + printf("\033[%dm", c); + vprintf(fmt, ap1); + printf("\033[0m"); sbuf_printf(s, "\033[%dm", c); - va_start(ap, fmt); - ret = sbuf_vprintf(s, fmt, ap); - va_end(ap); + ret = sbuf_vprintf(s, fmt, ap2); sbuf_printf(s, "\033[0m"); + va_end(ap2); + va_end(ap1); + return (ret); } @@ -96,21 +104,31 @@ alqtest_randchar(void) return (char)c; } -static void +static uint32_t +alqtest_rand(uint32_t lower, uint32_t upper) +{ + uint32_t n; + + while ( (n = arc4random() % (upper+1)) < lower); + + return n; +} + +/*static void alqtest_doio_callback(void) { printf("doing io baby!\n"); -} +}*/ static int alqtest_writen(struct sbuf *s, struct sbuf *debug) { struct alq *testalq; const int buflen = 100; - int i = 0, ret = 0, errors = 0; + int i = 0, n = 0, ret = 0, errors = 0; char buf[buflen+1]; - sbuf_printf(s, "- variable length message writing\n"); + alqtest_printf(s, 0, "- variable length message writing\n"); /* test variable length message writing */ ret = alq_open( &testalq, @@ -121,31 +139,63 @@ alqtest_writen(struct sbuf *s, struct sb 0 ); - testalq->doio_debugcallback = &alqtest_doio_callback; + /*testalq->doio_debugcallback = &alqtest_doio_callback;*/ for (i = 0; i < sizeof(buf); i++) buf[i] = alqtest_randchar(); - sbuf_printf(s, "-- msglen==1,buflen=%d\n", buflen); + alqtest_printf(s, 0, "-- msglen==1,buflen=%d\n", buflen); alq_writen(testalq, buf, 1, ALQ_WAITOK | ALQ_NOACTIVATE); if ((buflen-1 != testalq->aq_freebytes) && (1 != testalq->aq_writehead) && (0 != testalq->aq_writetail)) { errors++; - sbuf_printf( debug, + alqtest_printf( debug, + 0, "alq->%-15s\texpected=%d\tactual=%d\n", "aq_freebytes", buflen-1, testalq->aq_freebytes ); - sbuf_printf( debug, + alqtest_printf( debug, + 0, "alq->%-15s\texpected=%d\tactual=%d\n", "aq_writehead", 1, testalq->aq_writehead ); - sbuf_printf( debug, + alqtest_printf( debug, + 0, + "alq->%-15s\texpected=%d\tactual=%d\n", + "aq_writetail", + 0, + testalq->aq_writetail + ); + } + + alq_flush(testalq); + + if ((buflen != testalq->aq_freebytes) && + (0 != testalq->aq_writehead) && + (0 != testalq->aq_writetail)) { + errors++; + alqtest_printf( debug, + 0, + "alq->%-15s\texpected=%d\tactual=%d\n", + "aq_freebytes", + buflen, + testalq->aq_freebytes + ); + alqtest_printf( debug, + 0, + "alq->%-15s\texpected=%d\tactual=%d\n", + "aq_writehead", + 0, + testalq->aq_writehead + ); + alqtest_printf( debug, + 0, "alq->%-15s\texpected=%d\tactual=%d\n", "aq_writetail", 0, @@ -153,26 +203,29 @@ alqtest_writen(struct sbuf *s, struct sb ); } - sbuf_printf(s, "-- msglen==%d,buflen=%d\n", buflen, buflen); - alq_writen(testalq, buf, buflen, ALQ_WAITOK); + alqtest_printf(s, 0, "-- msglen==%d,buflen=%d\n", buflen, buflen); + alq_writen(testalq, buf, buflen, ALQ_WAITOK | ALQ_NOACTIVATE); if ((0 != testalq->aq_freebytes) && (0 != testalq->aq_writehead) && (0 != testalq->aq_writetail)) { errors++; - sbuf_printf( debug, + alqtest_printf( debug, + 0, "alq->%-15s\texpected=%d\tactual=%d\n", "aq_freebytes", 0, testalq->aq_freebytes ); - sbuf_printf( debug, + alqtest_printf( debug, + 0, "alq->%-15s\texpected=%d\tactual=%d\n", "aq_writehead", 0, testalq->aq_writehead ); - sbuf_printf( debug, + alqtest_printf( debug, + 0, "alq->%-15s\texpected=%d\tactual=%d\n", "aq_writetail", 0, @@ -180,6 +233,106 @@ alqtest_writen(struct sbuf *s, struct sb ); } + alq_flush(testalq); + + if ((buflen != testalq->aq_freebytes) && + (0 != testalq->aq_writehead) && + (0 != testalq->aq_writetail)) { + errors++; + alqtest_printf( debug, + 0, + "alq->%-15s\texpected=%d\tactual=%d\n", + "aq_freebytes", + buflen, + testalq->aq_freebytes + ); + alqtest_printf( debug, + 0, + "alq->%-15s\texpected=%d\tactual=%d\n", + "aq_writehead", + 0, + testalq->aq_writehead + ); + alqtest_printf( debug, + 0, + "alq->%-15s\texpected=%d\tactual=%d\n", + "aq_writetail", + 0, + testalq->aq_writetail + ); + } + +#define NMSGS 100 + + alqtest_printf( s, + 0, + "-- nmsgs==%d,buflen=%d,msglen==[1,%d],flags==ALQ_WAITOK|ALQ_NOACTIVATE\n", + NMSGS, + buflen, + buflen + ); + + for (i = 0; i < NMSGS; i++) { + n = alqtest_rand(1,buflen); + alqtest_printf( s, + 0, + "--- msg==%d,msglen==%d\n", + i, + n + ); + alq_writen(testalq, buf, n, ALQ_WAITOK|ALQ_NOACTIVATE); + + alq_flush(testalq); + + if ((buflen != testalq->aq_freebytes) && + (0 != testalq->aq_writehead) && + (0 != testalq->aq_writetail)) { + errors++; + alqtest_printf( debug, + 0, + "alq->%-15s\texpected=%d\tactual=%d\n", + "aq_freebytes", + buflen, + testalq->aq_freebytes + ); + alqtest_printf( debug, + 0, + "alq->%-15s\texpected=%d\tactual=%d\n", + "aq_writehead", + 0, + testalq->aq_writehead + ); + alqtest_printf( debug, + 0, + "alq->%-15s\texpected=%d\tactual=%d\n", + "aq_writetail", + 0, + testalq->aq_writetail + ); + } + } + + alqtest_printf( s, + 0, + "-- nmsgs==%d,buflen=%d,msglen==[1,%d],flags==ALQ_WAITOK\n", + NMSGS, + buflen, + buflen + ); + + for (i = 0; i < NMSGS; i++) { + n = alqtest_rand(1,buflen); + alqtest_printf( s, + 0, + "--- msg==%d,msglen==%d\n", + i, + n + ); + alq_writen(testalq, buf, n, ALQ_WAITOK); + } + + alq_flush(testalq); + alq_close(testalq); return errors; @@ -192,7 +345,7 @@ alqtest_open(struct sbuf *s, struct sbuf const int buflen = 100; int ret = 0, errors = 0; - sbuf_printf(s, "- variable length message queue creation\n"); + alqtest_printf(s, 0, "- variable length message queue creation\n"); /* test variable length message queue creation */ ret = alq_open( &testalq, @@ -205,7 +358,8 @@ alqtest_open(struct sbuf *s, struct sbuf if (0 != testalq->aq_entmax) { errors++; - sbuf_printf( debug, + alqtest_printf( debug, + 0, "alq->%-15s\texpected=%d\tactual=%d\n", "aq_entmax", 0, @@ -215,7 +369,8 @@ alqtest_open(struct sbuf *s, struct sbuf if (0 != testalq->aq_entlen) { errors++; - sbuf_printf( debug, + alqtest_printf( debug, + 0, "alq->%-15s\texpected=%d\tactual=%d\n", "aq_entlen", 0, @@ -225,7 +380,8 @@ alqtest_open(struct sbuf *s, struct sbuf if (buflen != testalq->aq_freebytes) { errors++; - sbuf_printf( debug, + alqtest_printf( debug, + 0, "alq->%-15s\texpected=%d\tactual=%d\n", "aq_freebytes", buflen, @@ -235,7 +391,8 @@ alqtest_open(struct sbuf *s, struct sbuf if (buflen != testalq->aq_buflen) { errors++; - sbuf_printf( debug, + alqtest_printf( debug, + 0, "alq->%-15s\texpected=%d\tactual=%d\n", "aq_buflen", buflen, @@ -245,7 +402,8 @@ alqtest_open(struct sbuf *s, struct sbuf if (0 != testalq->aq_writehead) { errors++; - sbuf_printf( debug, + alqtest_printf( debug, + 0, "alq->%-15s\texpected=%d\tactual=%d\n", "aq_writehead", 0, @@ -255,7 +413,8 @@ alqtest_open(struct sbuf *s, struct sbuf if (0 != testalq->aq_writetail) { errors++; - sbuf_printf( debug, + alqtest_printf( debug, + 0, "alq->%-15s\texpected=%d\tactual=%d\n", "aq_writetail", 0, @@ -265,7 +424,8 @@ alqtest_open(struct sbuf *s, struct sbuf if (0 != testalq->aq_flags) { errors++; - sbuf_printf( debug, + alqtest_printf( debug, + 0, "alq->%-15s\texpected=%d\tactual=%d\n", "aq_flags", 0, @@ -284,15 +444,15 @@ run_test(struct sbuf *s, const char *tes struct sbuf *debug = NULL; if ((debug = sbuf_new(NULL, NULL, 1024, SBUF_AUTOEXTEND)) != NULL) { - sbuf_printf(s, "########################################\n"); - sbuf_printf_color(s, GREEN, "%s\n", test_banner); + alqtest_printf(s, 0, "########################################\n"); + alqtest_printf(s, GREEN, "%s\n", test_banner); if (test(s, debug)) { sbuf_finish(debug); - sbuf_printf_color(s, RED, "!!ERROR(S) FOUND!!\n"); - sbuf_printf(s, "%s", sbuf_data(debug)); - sbuf_printf_color(s, RED, "!!ERROR(S) FOUND!!\n"); + alqtest_printf(s, RED, "!!ERROR(S) FOUND!!\n"); + alqtest_printf(s, 0, "%s", sbuf_data(debug)); + alqtest_printf(s, RED, "!!ERROR(S) FOUND!!\n"); } - sbuf_printf(s, "########################################\n\n"); + alqtest_printf(s, 0, "########################################\n\n"); sbuf_delete(debug); } } @@ -306,13 +466,13 @@ alqtest_thread(void *arg) /* loop until thread is signalled to exit */ while (run_test_thread && runs < NUM_TEST_RUNS) { if ((s = sbuf_new(NULL, NULL, 1024, SBUF_AUTOEXTEND)) != NULL) { - sbuf_printf(s, "TEST RUN: %ld\n", ++runs); + alqtest_printf(s, 0, "TEST RUN: %ld\n", ++runs); run_test(s, "alq_open", &alqtest_open); run_test(s, "alq_writen", &alqtest_writen); sbuf_finish(s); - printf("%s", sbuf_data(s)); + /*printf("%s", sbuf_data(s));*/ sbuf_delete(s); } } From owner-svn-src-user@FreeBSD.ORG Tue Mar 10 10:59:31 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7C935106566B; Tue, 10 Mar 2009 10:59:31 +0000 (UTC) (envelope-from dfr@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 674ED8FC12; Tue, 10 Mar 2009 10:59:31 +0000 (UTC) (envelope-from dfr@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2AAxVjr059988; Tue, 10 Mar 2009 10:59:31 GMT (envelope-from dfr@svn.freebsd.org) Received: (from dfr@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2AAxVeo059980; Tue, 10 Mar 2009 10:59:31 GMT (envelope-from dfr@svn.freebsd.org) Message-Id: <200903101059.n2AAxVeo059980@svn.freebsd.org> From: Doug Rabson Date: Tue, 10 Mar 2009 10:59:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r189614 - in user/dfr/xenhvm/7/sys: . amd64/amd64 amd64/include amd64/include/xen conf contrib/pf dev/cxgb dev/xen/balloon dev/xen/netfront dev/xen/xenpci xen X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Mar 2009 10:59:31 -0000 Author: dfr Date: Tue Mar 10 10:59:30 2009 New Revision: 189614 URL: http://svn.freebsd.org/changeset/base/189614 Log: Port Xen HVM support forward from 6.x. Add support for TSO/LRO to netfront. Modified: user/dfr/xenhvm/7/sys/ (props changed) user/dfr/xenhvm/7/sys/amd64/amd64/machdep.c user/dfr/xenhvm/7/sys/amd64/include/pcpu.h user/dfr/xenhvm/7/sys/amd64/include/xen/ (props changed) user/dfr/xenhvm/7/sys/amd64/include/xen/xenvar.h user/dfr/xenhvm/7/sys/conf/files user/dfr/xenhvm/7/sys/conf/options.amd64 user/dfr/xenhvm/7/sys/contrib/pf/ (props changed) user/dfr/xenhvm/7/sys/dev/cxgb/ (props changed) user/dfr/xenhvm/7/sys/dev/xen/balloon/balloon.c user/dfr/xenhvm/7/sys/dev/xen/netfront/ (props changed) user/dfr/xenhvm/7/sys/dev/xen/netfront/netfront.c user/dfr/xenhvm/7/sys/dev/xen/xenpci/ (props changed) user/dfr/xenhvm/7/sys/dev/xen/xenpci/evtchn.c user/dfr/xenhvm/7/sys/xen/evtchn.h (props changed) user/dfr/xenhvm/7/sys/xen/hypervisor.h (props changed) user/dfr/xenhvm/7/sys/xen/xen_intr.h (props changed) Modified: user/dfr/xenhvm/7/sys/amd64/amd64/machdep.c ============================================================================== --- user/dfr/xenhvm/7/sys/amd64/amd64/machdep.c Tue Mar 10 09:33:22 2009 (r189613) +++ user/dfr/xenhvm/7/sys/amd64/amd64/machdep.c Tue Mar 10 10:59:30 2009 (r189614) @@ -1335,6 +1335,14 @@ hammer_time(u_int64_t modulep, u_int64_t if (env != NULL) strlcpy(kernelname, env, sizeof(kernelname)); +#ifdef XENHVM + if (inw(0x10) == 0x49d2) { + if (bootverbose) + printf("Xen detected: disabling emulated block and network devices\n"); + outw(0x10, 3); + } +#endif + /* Location of kernel stack for locore */ return ((u_int64_t)thread0.td_pcb); } Modified: user/dfr/xenhvm/7/sys/amd64/include/pcpu.h ============================================================================== --- user/dfr/xenhvm/7/sys/amd64/include/pcpu.h Tue Mar 10 09:33:22 2009 (r189613) +++ user/dfr/xenhvm/7/sys/amd64/include/pcpu.h Tue Mar 10 10:59:30 2009 (r189614) @@ -33,6 +33,24 @@ #error "sys/cdefs.h is a prerequisite for this file" #endif +#if defined(XEN) || defined(XENHVM) +#ifndef NR_VIRQS +#define NR_VIRQS 24 +#endif +#ifndef NR_IPIS +#define NR_IPIS 2 +#endif +#endif + +#ifdef XENHVM +#define PCPU_XEN_FIELDS \ + ; \ + unsigned int pc_last_processed_l1i; \ + unsigned int pc_last_processed_l2i +#else +#define PCPU_XEN_FIELDS +#endif + /* * The SMP parts are setup in pmap.c and locore.s for the BSP, and * mp_machdep.c sets up the data for the AP's to "see" when they awake. @@ -48,7 +66,8 @@ register_t pc_scratch_rsp; /* User %rsp in syscall */ \ u_int pc_apic_id; \ u_int pc_acpi_id; /* ACPI CPU id */ \ - struct user_segment_descriptor *pc_gs32p + struct user_segment_descriptor *pc_gs32p \ + PCPU_XEN_FIELDS #ifdef _KERNEL Modified: user/dfr/xenhvm/7/sys/amd64/include/xen/xenvar.h ============================================================================== --- user/dfr/xenhvm/7/sys/amd64/include/xen/xenvar.h Tue Mar 10 09:33:22 2009 (r189613) +++ user/dfr/xenhvm/7/sys/amd64/include/xen/xenvar.h Tue Mar 10 10:59:30 2009 (r189614) @@ -68,6 +68,7 @@ machtophys(vm_paddr_t ma) #define vtomach(va) pmap_kextract((vm_offset_t) (va)) #define PFNTOMFN(pa) (pa) +#define MFNTOPFN(ma) (ma) #define set_phys_to_machine(pfn, mfn) ((void)0) #define PT_UPDATES_FLUSH() ((void)0) Modified: user/dfr/xenhvm/7/sys/conf/files ============================================================================== --- user/dfr/xenhvm/7/sys/conf/files Tue Mar 10 09:33:22 2009 (r189613) +++ user/dfr/xenhvm/7/sys/conf/files Tue Mar 10 10:59:30 2009 (r189614) @@ -2205,21 +2205,24 @@ gnu/fs/xfs/xfs_behavior.c optional xfs \ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" -xen/gnttab.c optional xen -xen/features.c optional xen -xen/evtchn/evtchn.c optional xen -xen/evtchn/evtchn_dev.c optional xen -xen/xenbus/xenbus_client.c optional xen -xen/xenbus/xenbus_comms.c optional xen -xen/xenbus/xenbus_dev.c optional xen -xen/xenbus/xenbus_if.m optional xen -xen/xenbus/xenbus_probe.c optional xen -#xen/xenbus/xenbus_probe_backend.c optional xen -xen/xenbus/xenbus_xs.c optional xen -dev/xen/console/console.c optional xen -dev/xen/console/xencons_ring.c optional xen -dev/xen/blkfront/blkfront.c optional xen -dev/xen/netfront/netfront.c optional xen -#dev/xen/xenpci/xenpci.c optional xen -#xen/xenbus/xenbus_newbus.c optional xenhvm +xen/gnttab.c optional xen | xenhvm +xen/features.c optional xen | xenhvm +xen/evtchn/evtchn.c optional xen +xen/evtchn/evtchn_dev.c optional xen | xenhvm +xen/reboot.c optional xen +xen/xenbus/xenbus_client.c optional xen | xenhvm +xen/xenbus/xenbus_comms.c optional xen | xenhvm +xen/xenbus/xenbus_dev.c optional xen | xenhvm +xen/xenbus/xenbus_if.m optional xen | xenhvm +xen/xenbus/xenbus_probe.c optional xen | xenhvm +#xen/xenbus/xenbus_probe_backend.c optional xen +xen/xenbus/xenbus_xs.c optional xen | xenhvm +dev/xen/balloon/balloon.c optional xen | xenhvm +dev/xen/console/console.c optional xen +dev/xen/console/xencons_ring.c optional xen +dev/xen/blkfront/blkfront.c optional xen | xenhvm +dev/xen/netfront/netfront.c optional xen | xenhvm +dev/xen/xenpci/xenpci.c optional xenpci +dev/xen/xenpci/evtchn.c optional xenpci +dev/xen/xenpci/machine_reboot.c optional xenpci Modified: user/dfr/xenhvm/7/sys/conf/options.amd64 ============================================================================== --- user/dfr/xenhvm/7/sys/conf/options.amd64 Tue Mar 10 09:33:22 2009 (r189613) +++ user/dfr/xenhvm/7/sys/conf/options.amd64 Tue Mar 10 10:59:30 2009 (r189614) @@ -68,3 +68,5 @@ KDTRACE_FRAME opt_kdtrace.h # BPF just-in-time compiler BPF_JITTER opt_bpf.h + +XENHVM opt_global.h Modified: user/dfr/xenhvm/7/sys/dev/xen/balloon/balloon.c ============================================================================== --- user/dfr/xenhvm/7/sys/dev/xen/balloon/balloon.c Tue Mar 10 09:33:22 2009 (r189613) +++ user/dfr/xenhvm/7/sys/dev/xen/balloon/balloon.c Tue Mar 10 10:59:30 2009 (r189614) @@ -34,11 +34,24 @@ __FBSDID("$FreeBSD$"); #include #include +#include +#include +#include #include +#include -#include -#include -#include +#include +#include +#include +#include +#include + +#include +#include + +MALLOC_DEFINE(M_BALLOON, "Balloon", "Xen Balloon Driver"); + +struct mtx balloon_mutex; /* * Protects atomic reservation decrease/increase against concurrent increases. @@ -46,23 +59,44 @@ __FBSDID("$FreeBSD$"); * balloon lists. */ struct mtx balloon_lock; -#ifdef notyet - -/* We aim for 'current allocation' == 'target allocation'. */ -static unsigned long current_pages; -static unsigned long target_pages; -/* VM /proc information for memory */ -extern unsigned long totalram_pages; +/* We increase/decrease in batches which fit in a page */ +static unsigned long frame_list[PAGE_SIZE / sizeof(unsigned long)]; +#define ARRAY_SIZE(A) (sizeof(A) / sizeof(A[0])) + +struct balloon_stats { + /* We aim for 'current allocation' == 'target allocation'. */ + unsigned long current_pages; + unsigned long target_pages; + /* We may hit the hard limit in Xen. If we do then we remember it. */ + unsigned long hard_limit; + /* + * Drivers may alter the memory reservation independently, but they + * must inform the balloon driver so we avoid hitting the hard limit. + */ + unsigned long driver_pages; + /* Number of pages in high- and low-memory balloons. */ + unsigned long balloon_low; + unsigned long balloon_high; +}; -/* We may hit the hard limit in Xen. If we do then we remember it. */ -static unsigned long hard_limit; +static struct balloon_stats balloon_stats; +#define bs balloon_stats -/* - * Drivers may alter the memory reservation independently, but they must - * inform the balloon driver so that we can avoid hitting the hard limit. - */ -static unsigned long driver_pages; +SYSCTL_DECL(_dev_xen); +SYSCTL_NODE(_dev_xen, OID_AUTO, balloon, CTLFLAG_RD, NULL, "Balloon"); +SYSCTL_ULONG(_dev_xen_balloon, OID_AUTO, current, CTLFLAG_RD, + &bs.current_pages, 0, "Current allocation"); +SYSCTL_ULONG(_dev_xen_balloon, OID_AUTO, target, CTLFLAG_RD, + &bs.target_pages, 0, "Target allocation"); +SYSCTL_ULONG(_dev_xen_balloon, OID_AUTO, driver_pages, CTLFLAG_RD, + &bs.driver_pages, 0, "Driver pages"); +SYSCTL_ULONG(_dev_xen_balloon, OID_AUTO, hard_limit, CTLFLAG_RD, + &bs.hard_limit, 0, "Xen hard limit"); +SYSCTL_ULONG(_dev_xen_balloon, OID_AUTO, low_mem, CTLFLAG_RD, + &bs.balloon_low, 0, "Low-mem balloon"); +SYSCTL_ULONG(_dev_xen_balloon, OID_AUTO, high_mem, CTLFLAG_RD, + &bs.balloon_high, 0, "High-mem balloon"); struct balloon_entry { vm_page_t page; @@ -72,9 +106,6 @@ struct balloon_entry { /* List of ballooned pages, threaded through the mem_map array. */ static STAILQ_HEAD(,balloon_entry) ballooned_pages; -static unsigned long balloon_low, balloon_high; - - /* Main work function, always executed in process context. */ static void balloon_process(void *unused); @@ -89,10 +120,10 @@ balloon_append(vm_page_t page) { struct balloon_entry *entry; - entry = malloc(sizeof(struct balloon_entry), M_WAITOK); - + entry = malloc(sizeof(struct balloon_entry), M_BALLOON, M_WAITOK); + entry->page = page; STAILQ_INSERT_HEAD(&ballooned_pages, entry, list); - balloon_low++; + bs.balloon_low++; } /* balloon_retrieve: rescue a page from the balloon, if it is not empty. */ @@ -111,13 +142,13 @@ balloon_retrieve(void) page = entry->page; free(entry, M_DEVBUF); - balloon_low--; + bs.balloon_low--; return page; } static void -balloon_alarm(unsigned long unused) +balloon_alarm(void *unused) { wakeup(balloon_process); } @@ -125,17 +156,56 @@ balloon_alarm(unsigned long unused) static unsigned long current_target(void) { - unsigned long target = min(target_pages, hard_limit); - if (target > (current_pages + balloon_low + balloon_high)) - target = current_pages + balloon_low + balloon_high; + unsigned long target = min(bs.target_pages, bs.hard_limit); + if (target > (bs.current_pages + bs.balloon_low + bs.balloon_high)) + target = bs.current_pages + bs.balloon_low + bs.balloon_high; return target; } +static unsigned long +minimum_target(void) +{ +#ifdef XENHVM +#define max_pfn physmem +#endif + unsigned long min_pages, curr_pages = current_target(); + +#define MB2PAGES(mb) ((mb) << (20 - PAGE_SHIFT)) + /* Simple continuous piecewiese linear function: + * max MiB -> min MiB gradient + * 0 0 + * 16 16 + * 32 24 + * 128 72 (1/2) + * 512 168 (1/4) + * 2048 360 (1/8) + * 8192 552 (1/32) + * 32768 1320 + * 131072 4392 + */ + if (max_pfn < MB2PAGES(128)) + min_pages = MB2PAGES(8) + (max_pfn >> 1); + else if (max_pfn < MB2PAGES(512)) + min_pages = MB2PAGES(40) + (max_pfn >> 2); + else if (max_pfn < MB2PAGES(2048)) + min_pages = MB2PAGES(104) + (max_pfn >> 3); + else + min_pages = MB2PAGES(296) + (max_pfn >> 5); +#undef MB2PAGES + + /* Don't enforce growth */ + return min(min_pages, curr_pages); +#ifndef CONFIG_XEN +#undef max_pfn +#endif +} + static int increase_reservation(unsigned long nr_pages) { - unsigned long *mfn_list, pfn, i, flags; - struct page *page; + unsigned long pfn, i; + struct balloon_entry *entry; + vm_page_t page; long rc; struct xen_memory_reservation reservation = { .address_bits = 0, @@ -143,64 +213,81 @@ increase_reservation(unsigned long nr_pa .domid = DOMID_SELF }; - if (nr_pages > (PAGE_SIZE / sizeof(unsigned long))) - nr_pages = PAGE_SIZE / sizeof(unsigned long); + if (nr_pages > ARRAY_SIZE(frame_list)) + nr_pages = ARRAY_SIZE(frame_list); - mfn_list = (unsigned long *)malloc(PAGE_SIZE, M_DEVBUF, M_NOWAIT); - if (mfn_list == NULL) - return ENOMEM; + mtx_lock(&balloon_lock); + for (entry = STAILQ_FIRST(&ballooned_pages), i = 0; + i < nr_pages; i++, entry = STAILQ_NEXT(entry, list)) { + KASSERT(entry, ("ballooned_pages list corrupt")); + page = entry->page; + frame_list[i] = (VM_PAGE_TO_PHYS(page) >> PAGE_SHIFT); + } - reservation.extent_start = mfn_list; + set_xen_guest_handle(reservation.extent_start, frame_list); reservation.nr_extents = nr_pages; rc = HYPERVISOR_memory_op( - XENMEM_increase_reservation, &reservation); + XENMEM_populate_physmap, &reservation); if (rc < nr_pages) { - int ret; - /* We hit the Xen hard limit: reprobe. */ - reservation.extent_start = mfn_list; - reservation.nr_extents = rc; - ret = HYPERVISOR_memory_op(XENMEM_decrease_reservation, - &reservation); - PANIC_IF(ret != rc); - hard_limit = current_pages + rc - driver_pages; + if (rc > 0) { + int ret; + + /* We hit the Xen hard limit: reprobe. */ + reservation.nr_extents = rc; + ret = HYPERVISOR_memory_op(XENMEM_decrease_reservation, + &reservation); + KASSERT(ret == rc, ("HYPERVISOR_memory_op failed")); + } + if (rc >= 0) + bs.hard_limit = (bs.current_pages + rc - + bs.driver_pages); goto out; } for (i = 0; i < nr_pages; i++) { page = balloon_retrieve(); - PANIC_IF(page == NULL); + KASSERT(page, ("balloon_retrieve failed")); pfn = (VM_PAGE_TO_PHYS(page) >> PAGE_SHIFT); - PANIC_IF(phys_to_machine_mapping_valid(pfn)); + KASSERT((xen_feature(XENFEAT_auto_translated_physmap) || + !phys_to_machine_mapping_valid(pfn)), + ("auto translated physmap but mapping is valid")); + + set_phys_to_machine(pfn, frame_list[i]); + +#ifndef XENHVM + /* Link back into the page tables if not highmem. */ + if (pfn < max_low_pfn) { + int ret; + ret = HYPERVISOR_update_va_mapping( + (unsigned long)__va(pfn << PAGE_SHIFT), + pfn_pte_ma(frame_list[i], PAGE_KERNEL), + 0); + PASSING(ret == 0, + ("HYPERVISOR_update_va_mapping failed")); + } +#endif - /* Update P->M and M->P tables. */ - PFNTOMFN(pfn) = mfn_list[i]; - xen_machphys_update(mfn_list[i], pfn); - /* Relinquish the page back to the allocator. */ - ClearPageReserved(page); - set_page_count(page, 1); + vm_page_unwire(page, 0); vm_page_free(page); } - current_pages += nr_pages; - totalram_pages = current_pages; + bs.current_pages += nr_pages; + //totalram_pages = bs.current_pages; out: - balloon_unlock(flags); - - free((mfn_list); + mtx_unlock(&balloon_lock); return 0; } -static int +static int decrease_reservation(unsigned long nr_pages) { - unsigned long *mfn_list, pfn, i, flags; - struct page *page; - void *v; + unsigned long pfn, i; + vm_page_t page; int need_sleep = 0; int ret; struct xen_memory_reservation reservation = { @@ -209,48 +296,68 @@ decrease_reservation(unsigned long nr_pa .domid = DOMID_SELF }; - if (nr_pages > (PAGE_SIZE / sizeof(unsigned long))) - nr_pages = PAGE_SIZE / sizeof(unsigned long); - - mfn_list = (unsigned long *)malloc(PAGE_SIZE, M_DEVBUF, M_NOWAIT); - if (mfn_list == NULL) - return ENOMEM; + if (nr_pages > ARRAY_SIZE(frame_list)) + nr_pages = ARRAY_SIZE(frame_list); for (i = 0; i < nr_pages; i++) { int color = 0; if ((page = vm_page_alloc(NULL, color++, - VM_ALLOC_NORMAL | VM_ALLOC_NOOBJ | - VM_ALLOC_WIRED | VM_ALLOC_ZERO)) == NULL) { + VM_ALLOC_NORMAL | VM_ALLOC_NOOBJ | + VM_ALLOC_WIRED | VM_ALLOC_ZERO)) == NULL) { nr_pages = i; need_sleep = 1; break; } + pfn = (VM_PAGE_TO_PHYS(page) >> PAGE_SHIFT); - mfn_list[i] = PFNTOMFN(pfn); + frame_list[i] = PFNTOMFN(pfn); + +#if 0 + if (!PageHighMem(page)) { + v = phys_to_virt(pfn << PAGE_SHIFT); + scrub_pages(v, 1); +#ifdef CONFIG_XEN + ret = HYPERVISOR_update_va_mapping( + (unsigned long)v, __pte_ma(0), 0); + BUG_ON(ret); +#endif + } +#endif +#ifdef CONFIG_XEN_SCRUB_PAGES + else { + v = kmap(page); + scrub_pages(v, 1); + kunmap(page); + } +#endif } - balloon_lock(flags); +#ifdef CONFIG_XEN + /* Ensure that ballooned highmem pages don't have kmaps. */ + kmap_flush_unused(); + flush_tlb_all(); +#endif + + mtx_lock(&balloon_lock); /* No more mappings: invalidate P2M and add to balloon. */ for (i = 0; i < nr_pages; i++) { - pfn = MFNTOPFN(mfn_list[i]); - PFNTOMFN(pfn) = INVALID_P2M_ENTRY; + pfn = MFNTOPFN(frame_list[i]); + set_phys_to_machine(pfn, INVALID_P2M_ENTRY); balloon_append(PHYS_TO_VM_PAGE(pfn << PAGE_SHIFT)); } - reservation.extent_start = mfn_list; + set_xen_guest_handle(reservation.extent_start, frame_list); reservation.nr_extents = nr_pages; ret = HYPERVISOR_memory_op(XENMEM_decrease_reservation, &reservation); - PANIC_IF(ret != nr_pages); + KASSERT(ret == nr_pages, ("HYPERVISOR_memory_op failed")); - current_pages -= nr_pages; - totalram_pages = current_pages; - - balloon_unlock(flags); + bs.current_pages -= nr_pages; + //totalram_pages = bs.current_pages; - free(mfn_list, M_DEVBUF); + mtx_unlock(&balloon_lock); - return need_sleep; + return (need_sleep); } /* @@ -265,27 +372,24 @@ balloon_process(void *unused) int need_sleep = 0; long credit; + mtx_lock(&balloon_mutex); for (;;) { do { - credit = current_target() - current_pages; + credit = current_target() - bs.current_pages; if (credit > 0) need_sleep = (increase_reservation(credit) != 0); if (credit < 0) need_sleep = (decrease_reservation(-credit) != 0); -#ifndef CONFIG_PREEMPT - if (need_resched()) - schedule(); -#endif } while ((credit != 0) && !need_sleep); /* Schedule more work if there is some still to be done. */ - if (current_target() != current_pages) - timeout(balloon_alarm, NULL, ticks + HZ); + if (current_target() != bs.current_pages) + timeout(balloon_alarm, NULL, ticks + hz); - msleep(balloon_process, balloon_lock, 0, "balloon", -1); + msleep(balloon_process, &balloon_mutex, 0, "balloon", -1); } - + mtx_unlock(&balloon_mutex); } /* Resets the Xen limit, sets new target, and kicks off processing. */ @@ -293,8 +397,8 @@ static void set_new_target(unsigned long target) { /* No need for lock. Not read-modify-write updates. */ - hard_limit = ~0UL; - target_pages = target; + bs.hard_limit = ~0UL; + bs.target_pages = max(target, minimum_target()); wakeup(balloon_process); } @@ -311,8 +415,9 @@ watch_target(struct xenbus_watch *watch, unsigned long long new_target; int err; - err = xenbus_scanf(NULL, "memory", "target", "%llu", &new_target); - if (err != 1) { + err = xenbus_scanf(XBT_NIL, "memory", "target", NULL, + "%llu", &new_target); + if (err) { /* This is ok (for domain0 at least) - so just return */ return; } @@ -325,7 +430,7 @@ watch_target(struct xenbus_watch *watch, } static void -balloon_init_watcher(void *) +balloon_init_watcher(void *arg) { int err; @@ -334,48 +439,60 @@ balloon_init_watcher(void *) printf("Failed to set balloon watcher\n"); } +SYSINIT(balloon_init_watcher, SI_SUB_CONFIGURE, SI_ORDER_ANY, + balloon_init_watcher, NULL); static void -balloon_init(void *) +balloon_init(void *arg) { - unsigned long pfn; - struct page *page; +#ifndef XENHVM + vm_page_t page; +#endif - IPRINTK("Initialising balloon driver.\n"); + if (!is_running_on_xen()) + return; - if (xen_init() < 0) - return -1; - - current_pages = min(xen_start_info->nr_pages, max_pfn); - target_pages = current_pages; - balloon_low = 0; - balloon_high = 0; - driver_pages = 0UL; - hard_limit = ~0UL; - - init_timer(&balloon_timer); - balloon_timer.data = 0; - balloon_timer.function = balloon_alarm; + mtx_init(&balloon_lock, "balloon_lock", NULL, MTX_DEF); + mtx_init(&balloon_mutex, "balloon_mutex", NULL, MTX_DEF); + +#ifndef XENHVM + bs.current_pages = min(xen_start_info->nr_pages, max_pfn); +#else + bs.current_pages = physmem; +#endif + bs.target_pages = bs.current_pages; + bs.balloon_low = 0; + bs.balloon_high = 0; + bs.driver_pages = 0UL; + bs.hard_limit = ~0UL; + + kthread_create(balloon_process, NULL, NULL, 0, 0, "balloon"); +// init_timer(&balloon_timer); +// balloon_timer.data = 0; +// balloon_timer.function = balloon_alarm; +#ifndef XENHVM /* Initialise the balloon with excess memory space. */ for (pfn = xen_start_info->nr_pages; pfn < max_pfn; pfn++) { page = PHYS_TO_VM_PAGE(pfn << PAGE_SHIFT); balloon_append(page); } +#endif target_watch.callback = watch_target; - return 0; + return; } +SYSINIT(balloon_init, SI_SUB_CONFIGURE, SI_ORDER_ANY, balloon_init, NULL); + +void balloon_update_driver_allowance(long delta); void balloon_update_driver_allowance(long delta) { - unsigned long flags; - - balloon_lock(flags); - driver_pages += delta; - balloon_unlock(flags); + mtx_lock(&balloon_lock); + bs.driver_pages += delta; + mtx_unlock(&balloon_lock); } #if 0 @@ -393,17 +510,18 @@ static int dealloc_pte_fn( set_pte_at(&init_mm, addr, pte, __pte_ma(0)); set_phys_to_machine(__pa(addr) >> PAGE_SHIFT, INVALID_P2M_ENTRY); ret = HYPERVISOR_memory_op(XENMEM_decrease_reservation, &reservation); - PANIC_IF(ret != 1); + KASSERT(ret == 1, ("HYPERVISOR_memory_op failed")); return 0; } #endif + +#if 0 vm_page_t balloon_alloc_empty_page_range(unsigned long nr_pages) { - unsigned long flags; vm_page_t pages; - int i; + int i, rc; unsigned long *mfn_list; struct xen_memory_reservation reservation = { .address_bits = 0, @@ -422,7 +540,9 @@ balloon_alloc_empty_page_range(unsigned PFNTOMFN(i) = INVALID_P2M_ENTRY; reservation.extent_start = mfn_list; reservation.nr_extents = nr_pages; - PANIC_IF(HYPERVISOR_memory_op(XENMEM_decrease_reservation, &reservation) != nr_pages); + rc = HYPERVISOR_memory_op(XENMEM_decrease_reservation, + &reservation); + KASSERT(rc == nr_pages, ("HYPERVISOR_memory_op failed")); } current_pages -= nr_pages; @@ -435,12 +555,11 @@ balloon_alloc_empty_page_range(unsigned void balloon_dealloc_empty_page_range(vm_page_t page, unsigned long nr_pages) { - unsigned long i, flags; + unsigned long i; for (i = 0; i < nr_pages; i++) balloon_append(page + i); wakeup(balloon_process); } - #endif Modified: user/dfr/xenhvm/7/sys/dev/xen/netfront/netfront.c ============================================================================== --- user/dfr/xenhvm/7/sys/dev/xen/netfront/netfront.c Tue Mar 10 09:33:22 2009 (r189613) +++ user/dfr/xenhvm/7/sys/dev/xen/netfront/netfront.c Tue Mar 10 10:59:30 2009 (r189614) @@ -88,6 +88,7 @@ __FBSDID("$FreeBSD$"); #define NET_TX_RING_SIZE __RING_SIZE((netif_tx_sring_t *)0, PAGE_SIZE) #define NET_RX_RING_SIZE __RING_SIZE((netif_rx_sring_t *)0, PAGE_SIZE) +#if __FreeBSD_version >= 700000 /* * Should the driver do LRO on the RX end * this can be toggled on the fly, but the @@ -96,6 +97,12 @@ __FBSDID("$FreeBSD$"); */ static int xn_enable_lro = 1; TUNABLE_INT("hw.xn.enable_lro", &xn_enable_lro); +#else + +#define IFCAP_TSO4 0 +#define CSUM_TSO 0 + +#endif #ifdef CONFIG_XEN static int MODPARM_rx_copy = 0; @@ -416,10 +423,12 @@ netfront_attach(device_t dev) return err; } +#if __FreeBSD_version >= 700000 SYSCTL_ADD_INT(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "enable_lro", CTLTYPE_INT|CTLFLAG_RW, &xn_enable_lro, 0, "Large Receive Offload"); +#endif return 0; } Modified: user/dfr/xenhvm/7/sys/dev/xen/xenpci/evtchn.c ============================================================================== --- user/dfr/xenhvm/7/sys/dev/xen/xenpci/evtchn.c Tue Mar 10 09:33:22 2009 (r189613) +++ user/dfr/xenhvm/7/sys/dev/xen/xenpci/evtchn.c Tue Mar 10 10:59:30 2009 (r189614) @@ -387,7 +387,7 @@ irq_resume(void) BUS_SETUP_INTR(device_get_parent(xenpci_device), xenpci_device, scp->res_irq, INTR_TYPE_MISC, - evtchn_interrupt, NULL, &scp->intr_cookie); + NULL, evtchn_interrupt, NULL, &scp->intr_cookie); } int @@ -407,8 +407,8 @@ xenpci_irq_init(device_t device, struct } error = BUS_SETUP_INTR(device_get_parent(device), device, - scp->res_irq, INTR_MPSAFE|INTR_TYPE_MISC, evtchn_interrupt, NULL, - &scp->intr_cookie); + scp->res_irq, INTR_MPSAFE|INTR_TYPE_MISC, NULL, evtchn_interrupt, + NULL, &scp->intr_cookie); if (error) return (error); From owner-svn-src-user@FreeBSD.ORG Tue Mar 10 21:02:15 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 254CC106564A for ; Tue, 10 Mar 2009 21:02:15 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx22.fluidhosting.com [204.14.89.5]) by mx1.freebsd.org (Postfix) with ESMTP id 7092B8FC0C for ; Tue, 10 Mar 2009 21:02:14 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: (qmail 17837 invoked by uid 399); 10 Mar 2009 20:35:33 -0000 Received: from localhost (HELO lap.dougb.net) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 10 Mar 2009 20:35:33 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <49B6CF13.9060501@FreeBSD.org> Date: Tue, 10 Mar 2009 13:35:31 -0700 From: Doug Barton Organization: http://www.FreeBSD.org/ User-Agent: Thunderbird 2.0.0.19 (X11/20090307) MIME-Version: 1.0 To: Lawrence Stewart References: <200903100751.n2A7p02m050724@svn.freebsd.org> In-Reply-To: <200903100751.n2A7p02m050724@svn.freebsd.org> X-Enigmail-Version: 0.95.7 OpenPGP: id=D5B2F0FB Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: Re: svn commit: r189612 - in user/lstewart/alq_varlen_8.x: sys/kern tools/test/alq X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Mar 2009 21:02:15 -0000 Lawrence Stewart wrote: > Author: lstewart > Date: Tue Mar 10 07:50:59 2009 > New Revision: 189612 > URL: http://svn.freebsd.org/changeset/base/189612 > > Log: > More bug and style fixes. Generally it's preferred not to mix these two types of changes. The preferred course of action is to make the style changes, confirm that the binary is unchanged (e.g., with sha256), then do substantive changes. Makes the revision history a little easier to parse down the road. Doug -- This .signature sanitized for your protection From owner-svn-src-user@FreeBSD.ORG Tue Mar 10 21:36:23 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4295F106564A; Tue, 10 Mar 2009 21:36:23 +0000 (UTC) (envelope-from luigi@onelab2.iet.unipi.it) Received: from onelab2.iet.unipi.it (onelab2.iet.unipi.it [131.114.9.129]) by mx1.freebsd.org (Postfix) with ESMTP id 0526F8FC15; Tue, 10 Mar 2009 21:36:22 +0000 (UTC) (envelope-from luigi@onelab2.iet.unipi.it) Received: by onelab2.iet.unipi.it (Postfix, from userid 275) id C66A273098; Tue, 10 Mar 2009 22:25:11 +0100 (CET) Date: Tue, 10 Mar 2009 22:25:11 +0100 From: Luigi Rizzo To: Doug Barton Message-ID: <20090310212511.GA53115@onelab2.iet.unipi.it> References: <200903100751.n2A7p02m050724@svn.freebsd.org> <49B6CF13.9060501@FreeBSD.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <49B6CF13.9060501@FreeBSD.org> User-Agent: Mutt/1.4.2.3i Cc: Lawrence Stewart , src-committers@freebsd.org, svn-src-user@freebsd.org Subject: Re: svn commit: r189612 - in user/lstewart/alq_varlen_8.x: sys/kern tools/test/alq X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Mar 2009 21:36:23 -0000 On Tue, Mar 10, 2009 at 01:35:31PM -0700, Doug Barton wrote: > Lawrence Stewart wrote: > > Author: lstewart > > Date: Tue Mar 10 07:50:59 2009 > > New Revision: 189612 > > URL: http://svn.freebsd.org/changeset/base/189612 > > > > Log: > > More bug and style fixes. > > Generally it's preferred not to mix these two types of changes. The > preferred course of action is to make the style changes, confirm that > the binary is unchanged (e.g., with sha256), then do substantive > changes. Makes the revision history a little easier to parse down the > road. well, this is a private branch after all :) From owner-svn-src-user@FreeBSD.ORG Tue Mar 10 21:43:18 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 038131065677 for ; Tue, 10 Mar 2009 21:43:18 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx22.fluidhosting.com [204.14.89.5]) by mx1.freebsd.org (Postfix) with ESMTP id 85AAD8FC1D for ; Tue, 10 Mar 2009 21:43:17 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: (qmail 30526 invoked by uid 399); 10 Mar 2009 21:43:12 -0000 Received: from localhost (HELO lap.dougb.net) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 10 Mar 2009 21:43:12 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <49B6DEED.4040902@FreeBSD.org> Date: Tue, 10 Mar 2009 14:43:09 -0700 From: Doug Barton Organization: http://www.FreeBSD.org/ User-Agent: Thunderbird 2.0.0.19 (X11/20090307) MIME-Version: 1.0 To: Luigi Rizzo References: <200903100751.n2A7p02m050724@svn.freebsd.org> <49B6CF13.9060501@FreeBSD.org> <20090310212511.GA53115@onelab2.iet.unipi.it> In-Reply-To: <20090310212511.GA53115@onelab2.iet.unipi.it> X-Enigmail-Version: 0.95.7 OpenPGP: id=D5B2F0FB Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Lawrence Stewart , src-committers@freebsd.org, svn-src-user@freebsd.org Subject: Re: svn commit: r189612 - in user/lstewart/alq_varlen_8.x: sys/kern tools/test/alq X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Mar 2009 21:43:18 -0000 Luigi Rizzo wrote: > On Tue, Mar 10, 2009 at 01:35:31PM -0700, Doug Barton wrote: >> Lawrence Stewart wrote: >>> Author: lstewart >>> Date: Tue Mar 10 07:50:59 2009 >>> New Revision: 189612 >>> URL: http://svn.freebsd.org/changeset/base/189612 >>> >>> Log: >>> More bug and style fixes. >> Generally it's preferred not to mix these two types of changes. The >> preferred course of action is to make the style changes, confirm that >> the binary is unchanged (e.g., with sha256), then do substantive >> changes. Makes the revision history a little easier to parse down the >> road. > > well, this is a private branch after all :) 1. Good habits come from good practice, and what better place to practice than in a "private" branch? 2. Given that the stuff is in the FreeBSD repository, the presumption is that it is of some use to the wider FreeBSD community. So IMO community best practices are a reasonable expectation. Otherwise, why not just keep it local? Doug -- This .signature sanitized for your protection From owner-svn-src-user@FreeBSD.ORG Tue Mar 10 22:54:30 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 20AD2106568B; Tue, 10 Mar 2009 22:54:30 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id ECC6E8FC1D; Tue, 10 Mar 2009 22:54:29 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from fledge.watson.org (fledge.watson.org [65.122.17.41]) by cyrus.watson.org (Postfix) with ESMTPS id 8C9E846BA4; Tue, 10 Mar 2009 18:54:29 -0400 (EDT) Date: Tue, 10 Mar 2009 22:54:29 +0000 (GMT) From: Robert Watson X-X-Sender: robert@fledge.watson.org To: Doug Barton In-Reply-To: <49B6DEED.4040902@FreeBSD.org> Message-ID: References: <200903100751.n2A7p02m050724@svn.freebsd.org> <49B6CF13.9060501@FreeBSD.org> <20090310212511.GA53115@onelab2.iet.unipi.it> <49B6DEED.4040902@FreeBSD.org> User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Lawrence Stewart , src-committers@freebsd.org, Luigi Rizzo , svn-src-user@freebsd.org Subject: Re: svn commit: r189612 - in user/lstewart/alq_varlen_8.x: sys/kern tools/test/alq X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Mar 2009 22:54:31 -0000 On Tue, 10 Mar 2009, Doug Barton wrote: >>> Generally it's preferred not to mix these two types of changes. The >>> preferred course of action is to make the style changes, confirm that the >>> binary is unchanged (e.g., with sha256), then do substantive changes. >>> Makes the revision history a little easier to parse down the road. >> >> well, this is a private branch after all :) > > 1. Good habits come from good practice, and what better place to practice > than in a "private" branch? > > 2. Given that the stuff is in the FreeBSD repository, the presumption is > that it is of some use to the wider FreeBSD community. So IMO community best > practices are a reasonable expectation. Otherwise, why not just keep it > local? Also, if the plan is to use svn merge to pull the changes back from a work branch into the main branch, revision history from that branch will be seen by people tracking the recursive history of changes in the main branch. Robert N M Watson Computer Laboratory University of Cambridge From owner-svn-src-user@FreeBSD.ORG Tue Mar 10 22:55:22 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 47C5410656BF; Tue, 10 Mar 2009 22:55:22 +0000 (UTC) (envelope-from lstewart@freebsd.org) Received: from outbound.icp-qv1-irony-out2.iinet.net.au (outbound.icp-qv1-irony-out2.iinet.net.au [203.59.1.107]) by mx1.freebsd.org (Postfix) with ESMTP id 4AE008FC0A; Tue, 10 Mar 2009 22:55:21 +0000 (UTC) (envelope-from lstewart@freebsd.org) X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApoEAF+Ftkl8qF1T/2dsb2JhbADSQoQNBg X-IronPort-AV: E=Sophos;i="4.38,337,1233500400"; d="scan'208";a="448128728" Received: from unknown (HELO lawrence1.loshell.room52.net) ([124.168.93.83]) by outbound.icp-qv1-irony-out2.iinet.net.au with ESMTP; 11 Mar 2009 07:25:42 +0900 Message-ID: <49B6E8E6.6030001@freebsd.org> Date: Wed, 11 Mar 2009 09:25:42 +1100 From: Lawrence Stewart User-Agent: Thunderbird 2.0.0.19 (X11/20090118) MIME-Version: 1.0 To: Doug Barton References: <200903100751.n2A7p02m050724@svn.freebsd.org> <49B6CF13.9060501@FreeBSD.org> <20090310212511.GA53115@onelab2.iet.unipi.it> <49B6DEED.4040902@FreeBSD.org> In-Reply-To: <49B6DEED.4040902@FreeBSD.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: src-committers@FreeBSD.org, Luigi Rizzo , svn-src-user@FreeBSD.org Subject: Re: svn commit: r189612 - in user/lstewart/alq_varlen_8.x: sys/kern tools/test/alq X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Mar 2009 22:55:23 -0000 Doug Barton wrote: > Luigi Rizzo wrote: >> On Tue, Mar 10, 2009 at 01:35:31PM -0700, Doug Barton wrote: >>> Lawrence Stewart wrote: >>>> Author: lstewart >>>> Date: Tue Mar 10 07:50:59 2009 >>>> New Revision: 189612 >>>> URL: http://svn.freebsd.org/changeset/base/189612 >>>> >>>> Log: >>>> More bug and style fixes. >>> Generally it's preferred not to mix these two types of changes. The >>> preferred course of action is to make the style changes, confirm that >>> the binary is unchanged (e.g., with sha256), then do substantive >>> changes. Makes the revision history a little easier to parse down the >>> road. >> well, this is a private branch after all :) > > 1. Good habits come from good practice, and what better place to > practice than in a "private" branch? > > 2. Given that the stuff is in the FreeBSD repository, the presumption > is that it is of some use to the wider FreeBSD community. So IMO > community best practices are a reasonable expectation. Otherwise, why > not just keep it local? Duly noted. Cheers, Lawrence From owner-svn-src-user@FreeBSD.ORG Wed Mar 11 03:00:41 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2A063106564A; Wed, 11 Mar 2009 03:00:41 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1722B8FC13; Wed, 11 Mar 2009 03:00:41 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2B30e26082022; Wed, 11 Mar 2009 03:00:40 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2B30e7k082020; Wed, 11 Mar 2009 03:00:40 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <200903110300.n2B30e7k082020@svn.freebsd.org> From: Lawrence Stewart Date: Wed, 11 Mar 2009 03:00:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r189674 - in user/lstewart/alq_varlen_8.x: sys/kern tools/test/alq X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Mar 2009 03:00:41 -0000 Author: lstewart Date: Wed Mar 11 03:00:40 2009 New Revision: 189674 URL: http://svn.freebsd.org/changeset/base/189674 Log: kern_alq.c: - Remove cruft that's not really needed anymore. - Simplify/improve accounting in alq_doio(). - Fix a bug in alq_writen()'s accounting. alqtest.c: - General improvements to the output. Modified: user/lstewart/alq_varlen_8.x/sys/kern/kern_alq.c user/lstewart/alq_varlen_8.x/tools/test/alq/alqtest.c Modified: user/lstewart/alq_varlen_8.x/sys/kern/kern_alq.c ============================================================================== --- user/lstewart/alq_varlen_8.x/sys/kern/kern_alq.c Wed Mar 11 02:39:02 2009 (r189673) +++ user/lstewart/alq_varlen_8.x/sys/kern/kern_alq.c Wed Mar 11 03:00:40 2009 (r189674) @@ -61,10 +61,6 @@ struct alq { struct mtx aq_mtx; /* Queue lock */ struct vnode *aq_vp; /* Open vnode handle */ struct ucred *aq_cred; /* Credentials of the opening thread */ - //struct ale *aq_first; /* First ent */ - //struct ale *aq_entfree; /* First free ent */ - //struct ale *aq_entvalid; /* First ent valid for writing */ - void (*doio_debugcallback)(void); LIST_ENTRY(alq) aq_act; /* List of active queues */ LIST_ENTRY(alq) aq_link; /* List of all queues */ }; @@ -291,7 +287,6 @@ alq_doio(struct alq *alq) int totlen; int iov; int vfslocked; - int prev_writehead = alq->aq_writehead; KASSERT((ALQ_HAS_PENDING_DATA(alq)), ("%s: queue emtpy!", __func__) @@ -311,6 +306,9 @@ alq_doio(struct alq *alq) if (alq->aq_writetail < alq->aq_writehead) { /* Buffer not wrapped */ totlen = aiov[0].iov_len = alq->aq_writehead - alq->aq_writetail; + } else if (alq->aq_writehead == 0) { + /* Buffer not wrapped (special case to avoid an empty iov) */ + totlen = aiov[0].iov_len = alq->aq_buflen - alq->aq_writetail;; } else { /* * Buffer wrapped, requires 2 aiov entries: @@ -325,14 +323,6 @@ alq_doio(struct alq *alq) } alq->aq_flags |= AQ_FLUSHING; - - /*printf("pre: alq->aq_writehead=%d,alq->aq_writetail=%d,totlen=%d,iov=%d\n", alq->aq_writehead, alq->aq_writetail, totlen, iov);*/ - - if (alq->doio_debugcallback != NULL) - alq->doio_debugcallback(); - - /*printf("flushing %d bytes\n", totlen);*/ - ALQ_UNLOCK(alq); auio.uio_iov = &aiov[0]; @@ -364,14 +354,8 @@ alq_doio(struct alq *alq) ALQ_LOCK(alq); alq->aq_flags &= ~AQ_FLUSHING; - /*printf("finished flushing %d bytes\n", totlen);*/ - /* Adjust writetail as required, taking into account wrapping. */ - if (iov == 2) - alq->aq_writetail = prev_writehead; - else - alq->aq_writetail = (alq->aq_writetail + totlen) % alq->aq_buflen; - + alq->aq_writetail = (alq->aq_writetail + totlen) % alq->aq_buflen; alq->aq_freebytes += totlen; /* @@ -382,15 +366,10 @@ alq_doio(struct alq *alq) if (!ALQ_HAS_PENDING_DATA(alq)) alq->aq_writehead = alq->aq_writetail = 0; - /*printf("post: alq->aq_writehead=%d,alq->aq_writetail=%d,totlen=%d,iov=%d\n", alq->aq_writehead, alq->aq_writetail, totlen, iov);*/ - KASSERT((alq->aq_writetail >= 0 && alq->aq_writetail < alq->aq_buflen), ("%s: aq_writetail < 0 || aq_writetail >= aq_buflen", __func__) ); - if (alq->doio_debugcallback != NULL) - alq->doio_debugcallback(); - if (alq->aq_flags & AQ_WANTED) { alq->aq_flags &= ~AQ_WANTED; return (1); @@ -467,8 +446,6 @@ alq_open(struct alq **alqp, const char * alq->aq_writehead = alq->aq_writetail = 0; - alq->doio_debugcallback = NULL; - if ((error = ald_add(alq)) != 0) return (error); *alqp = alq; @@ -544,10 +521,13 @@ alq_writen(struct alq *alq, void *data, if ((alq->aq_buflen - alq->aq_writehead) < len) copy = alq->aq_buflen - alq->aq_writehead; - /* Copy (part of) message to the buffer. */ + /* Copy message (or part thereof if wrap required) to the buffer. */ bcopy(data, alq->aq_entbuf + alq->aq_writehead, copy); alq->aq_writehead += copy; + if (alq->aq_writehead == alq->aq_buflen) + alq->aq_writehead = 0; + if (copy != len) { /* * Wrap the buffer by copying the remainder of our message Modified: user/lstewart/alq_varlen_8.x/tools/test/alq/alqtest.c ============================================================================== --- user/lstewart/alq_varlen_8.x/tools/test/alq/alqtest.c Wed Mar 11 02:39:02 2009 (r189673) +++ user/lstewart/alq_varlen_8.x/tools/test/alq/alqtest.c Wed Mar 11 03:00:40 2009 (r189674) @@ -144,29 +144,26 @@ alqtest_writen(struct sbuf *s, struct sb for (i = 0; i < sizeof(buf); i++) buf[i] = alqtest_randchar(); - alqtest_printf(s, 0, "-- msglen==1,buflen=%d\n", buflen); - alq_writen(testalq, buf, 1, ALQ_WAITOK | ALQ_NOACTIVATE); + alqtest_printf(s, 0, "-- nmsgs==1,msglen==1,buflen=%d,flags==ALQ_WAITOK|ALQ_NOACTIVATE\n", buflen); + alq_writen(testalq, buf, 1, ALQ_WAITOK|ALQ_NOACTIVATE); if ((buflen-1 != testalq->aq_freebytes) && (1 != testalq->aq_writehead) && (0 != testalq->aq_writetail)) { errors++; - alqtest_printf( debug, - 0, + sbuf_printf( debug, "alq->%-15s\texpected=%d\tactual=%d\n", "aq_freebytes", buflen-1, testalq->aq_freebytes ); - alqtest_printf( debug, - 0, + sbuf_printf( debug, "alq->%-15s\texpected=%d\tactual=%d\n", "aq_writehead", 1, testalq->aq_writehead ); - alqtest_printf( debug, - 0, + sbuf_printf( debug, "alq->%-15s\texpected=%d\tactual=%d\n", "aq_writetail", 0, @@ -180,22 +177,19 @@ alqtest_writen(struct sbuf *s, struct sb (0 != testalq->aq_writehead) && (0 != testalq->aq_writetail)) { errors++; - alqtest_printf( debug, - 0, + sbuf_printf( debug, "alq->%-15s\texpected=%d\tactual=%d\n", "aq_freebytes", buflen, testalq->aq_freebytes ); - alqtest_printf( debug, - 0, + sbuf_printf( debug, "alq->%-15s\texpected=%d\tactual=%d\n", "aq_writehead", 0, testalq->aq_writehead ); - alqtest_printf( debug, - 0, + sbuf_printf( debug, "alq->%-15s\texpected=%d\tactual=%d\n", "aq_writetail", 0, @@ -203,29 +197,26 @@ alqtest_writen(struct sbuf *s, struct sb ); } - alqtest_printf(s, 0, "-- msglen==%d,buflen=%d\n", buflen, buflen); + alqtest_printf(s, 0, "-- nmsgs==1,msglen==%d,buflen=%d,flags==ALQ_WAITOK|ALQ_NOACTIVATE\n", buflen, buflen); alq_writen(testalq, buf, buflen, ALQ_WAITOK | ALQ_NOACTIVATE); if ((0 != testalq->aq_freebytes) && (0 != testalq->aq_writehead) && (0 != testalq->aq_writetail)) { errors++; - alqtest_printf( debug, - 0, + sbuf_printf( debug, "alq->%-15s\texpected=%d\tactual=%d\n", "aq_freebytes", 0, testalq->aq_freebytes ); - alqtest_printf( debug, - 0, + sbuf_printf( debug, "alq->%-15s\texpected=%d\tactual=%d\n", "aq_writehead", 0, testalq->aq_writehead ); - alqtest_printf( debug, - 0, + sbuf_printf( debug, "alq->%-15s\texpected=%d\tactual=%d\n", "aq_writetail", 0, @@ -239,22 +230,19 @@ alqtest_writen(struct sbuf *s, struct sb (0 != testalq->aq_writehead) && (0 != testalq->aq_writetail)) { errors++; - alqtest_printf( debug, - 0, + sbuf_printf( debug, "alq->%-15s\texpected=%d\tactual=%d\n", "aq_freebytes", buflen, testalq->aq_freebytes ); - alqtest_printf( debug, - 0, + sbuf_printf( debug, "alq->%-15s\texpected=%d\tactual=%d\n", "aq_writehead", 0, testalq->aq_writehead ); - alqtest_printf( debug, - 0, + sbuf_printf( debug, "alq->%-15s\texpected=%d\tactual=%d\n", "aq_writetail", 0, @@ -274,8 +262,7 @@ alqtest_writen(struct sbuf *s, struct sb for (i = 0; i < NMSGS; i++) { n = alqtest_rand(1,buflen); - alqtest_printf( s, - 0, + sbuf_printf( debug, "--- msg==%d,msglen==%d\n", i, n @@ -283,27 +270,24 @@ alqtest_writen(struct sbuf *s, struct sb alq_writen(testalq, buf, n, ALQ_WAITOK|ALQ_NOACTIVATE); alq_flush(testalq); - + if ((buflen != testalq->aq_freebytes) && (0 != testalq->aq_writehead) && (0 != testalq->aq_writetail)) { errors++; - alqtest_printf( debug, - 0, + sbuf_printf( debug, "alq->%-15s\texpected=%d\tactual=%d\n", "aq_freebytes", buflen, testalq->aq_freebytes ); - alqtest_printf( debug, - 0, + sbuf_printf( debug, "alq->%-15s\texpected=%d\tactual=%d\n", "aq_writehead", 0, testalq->aq_writehead ); - alqtest_printf( debug, - 0, + sbuf_printf( debug, "alq->%-15s\texpected=%d\tactual=%d\n", "aq_writetail", 0, @@ -322,8 +306,7 @@ alqtest_writen(struct sbuf *s, struct sb for (i = 0; i < NMSGS; i++) { n = alqtest_rand(1,buflen); - alqtest_printf( s, - 0, + sbuf_printf( s, "--- msg==%d,msglen==%d\n", i, n @@ -358,8 +341,7 @@ alqtest_open(struct sbuf *s, struct sbuf if (0 != testalq->aq_entmax) { errors++; - alqtest_printf( debug, - 0, + sbuf_printf( debug, "alq->%-15s\texpected=%d\tactual=%d\n", "aq_entmax", 0, @@ -369,8 +351,7 @@ alqtest_open(struct sbuf *s, struct sbuf if (0 != testalq->aq_entlen) { errors++; - alqtest_printf( debug, - 0, + sbuf_printf( debug, "alq->%-15s\texpected=%d\tactual=%d\n", "aq_entlen", 0, @@ -380,8 +361,7 @@ alqtest_open(struct sbuf *s, struct sbuf if (buflen != testalq->aq_freebytes) { errors++; - alqtest_printf( debug, - 0, + sbuf_printf( debug, "alq->%-15s\texpected=%d\tactual=%d\n", "aq_freebytes", buflen, @@ -391,8 +371,7 @@ alqtest_open(struct sbuf *s, struct sbuf if (buflen != testalq->aq_buflen) { errors++; - alqtest_printf( debug, - 0, + sbuf_printf( debug, "alq->%-15s\texpected=%d\tactual=%d\n", "aq_buflen", buflen, @@ -402,8 +381,7 @@ alqtest_open(struct sbuf *s, struct sbuf if (0 != testalq->aq_writehead) { errors++; - alqtest_printf( debug, - 0, + sbuf_printf( debug, "alq->%-15s\texpected=%d\tactual=%d\n", "aq_writehead", 0, @@ -413,8 +391,7 @@ alqtest_open(struct sbuf *s, struct sbuf if (0 != testalq->aq_writetail) { errors++; - alqtest_printf( debug, - 0, + sbuf_printf( debug, "alq->%-15s\texpected=%d\tactual=%d\n", "aq_writetail", 0, @@ -424,8 +401,7 @@ alqtest_open(struct sbuf *s, struct sbuf if (0 != testalq->aq_flags) { errors++; - alqtest_printf( debug, - 0, + sbuf_printf( debug, "alq->%-15s\texpected=%d\tactual=%d\n", "aq_flags", 0, From owner-svn-src-user@FreeBSD.ORG Thu Mar 12 06:24:01 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 79AD11065678; Thu, 12 Mar 2009 06:24:01 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 654DF8FC24; Thu, 12 Mar 2009 06:24:01 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2C6O1XB019098; Thu, 12 Mar 2009 06:24:01 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2C6O06D019084; Thu, 12 Mar 2009 06:24:00 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200903120624.n2C6O06D019084@svn.freebsd.org> From: Kip Macy Date: Thu, 12 Mar 2009 06:24:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r189722 - in user/kmacy/releng_7_net_backport/sys: amd64/amd64 amd64/conf conf dev/e1000 dev/firewire dev/mxge kern net netinet netinet6 nfs4client nfsclient nfsserver sys X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Mar 2009 06:24:01 -0000 Author: kmacy Date: Thu Mar 12 06:24:00 2009 New Revision: 189722 URL: http://svn.freebsd.org/changeset/base/189722 Log: fix build issues Added: user/kmacy/releng_7_net_backport/sys/kern/kern_vimage.c (contents, props changed) Modified: user/kmacy/releng_7_net_backport/sys/amd64/amd64/genassym.c user/kmacy/releng_7_net_backport/sys/amd64/conf/GENERIC user/kmacy/releng_7_net_backport/sys/conf/files user/kmacy/releng_7_net_backport/sys/dev/e1000/e1000_80003es2lan.h user/kmacy/releng_7_net_backport/sys/dev/e1000/e1000_phy.h user/kmacy/releng_7_net_backport/sys/dev/e1000/if_em.c user/kmacy/releng_7_net_backport/sys/dev/e1000/if_em.h user/kmacy/releng_7_net_backport/sys/dev/e1000/if_igb.c user/kmacy/releng_7_net_backport/sys/dev/e1000/if_igb.h user/kmacy/releng_7_net_backport/sys/dev/firewire/firewirereg.h user/kmacy/releng_7_net_backport/sys/dev/mxge/eth_z8e.h user/kmacy/releng_7_net_backport/sys/dev/mxge/ethp_z8e.h user/kmacy/releng_7_net_backport/sys/dev/mxge/if_mxge.c user/kmacy/releng_7_net_backport/sys/dev/mxge/if_mxge_var.h user/kmacy/releng_7_net_backport/sys/dev/mxge/mxge_lro.c user/kmacy/releng_7_net_backport/sys/dev/mxge/mxge_mcp.h user/kmacy/releng_7_net_backport/sys/dev/mxge/rss_eth_z8e.h user/kmacy/releng_7_net_backport/sys/dev/mxge/rss_ethp_z8e.h user/kmacy/releng_7_net_backport/sys/kern/sys_socket.c user/kmacy/releng_7_net_backport/sys/net/bpf.c user/kmacy/releng_7_net_backport/sys/net/if.h user/kmacy/releng_7_net_backport/sys/net/if_clone.c user/kmacy/releng_7_net_backport/sys/net/if_faith.c user/kmacy/releng_7_net_backport/sys/net/if_gif.c user/kmacy/releng_7_net_backport/sys/net/if_loop.c user/kmacy/releng_7_net_backport/sys/netinet/in.c user/kmacy/releng_7_net_backport/sys/netinet/in_gif.c user/kmacy/releng_7_net_backport/sys/netinet/in_pcb.c user/kmacy/releng_7_net_backport/sys/netinet/in_proto.c user/kmacy/releng_7_net_backport/sys/netinet/ip_icmp.c user/kmacy/releng_7_net_backport/sys/netinet/tcp_hostcache.c user/kmacy/releng_7_net_backport/sys/netinet/tcp_input.c user/kmacy/releng_7_net_backport/sys/netinet/tcp_lro.c user/kmacy/releng_7_net_backport/sys/netinet/tcp_output.c user/kmacy/releng_7_net_backport/sys/netinet/tcp_reass.c user/kmacy/releng_7_net_backport/sys/netinet/tcp_sack.c user/kmacy/releng_7_net_backport/sys/netinet/tcp_subr.c user/kmacy/releng_7_net_backport/sys/netinet/tcp_syncache.c user/kmacy/releng_7_net_backport/sys/netinet/tcp_timer.c user/kmacy/releng_7_net_backport/sys/netinet/tcp_timewait.c user/kmacy/releng_7_net_backport/sys/netinet/tcp_usrreq.c user/kmacy/releng_7_net_backport/sys/netinet/udp_usrreq.c user/kmacy/releng_7_net_backport/sys/netinet6/dest6.c user/kmacy/releng_7_net_backport/sys/netinet6/frag6.c user/kmacy/releng_7_net_backport/sys/netinet6/in6_gif.c user/kmacy/releng_7_net_backport/sys/netinet6/in6_pcb.c user/kmacy/releng_7_net_backport/sys/netinet6/in6_proto.c user/kmacy/releng_7_net_backport/sys/netinet6/in6_src.c user/kmacy/releng_7_net_backport/sys/netinet6/ip6_forward.c user/kmacy/releng_7_net_backport/sys/netinet6/mld6.c user/kmacy/releng_7_net_backport/sys/netinet6/nd6.c user/kmacy/releng_7_net_backport/sys/netinet6/route6.c user/kmacy/releng_7_net_backport/sys/netinet6/udp6_usrreq.c user/kmacy/releng_7_net_backport/sys/nfs4client/nfs4_vfsops.c user/kmacy/releng_7_net_backport/sys/nfs4client/nfs4_vnops.c user/kmacy/releng_7_net_backport/sys/nfsclient/nfs_diskless.c user/kmacy/releng_7_net_backport/sys/nfsclient/nfs_vfsops.c user/kmacy/releng_7_net_backport/sys/nfsclient/nfs_vnops.c user/kmacy/releng_7_net_backport/sys/nfsserver/nfs_syscalls.c user/kmacy/releng_7_net_backport/sys/sys/kernel.h user/kmacy/releng_7_net_backport/sys/sys/mbuf.h Modified: user/kmacy/releng_7_net_backport/sys/amd64/amd64/genassym.c ============================================================================== --- user/kmacy/releng_7_net_backport/sys/amd64/amd64/genassym.c Thu Mar 12 04:44:09 2009 (r189721) +++ user/kmacy/releng_7_net_backport/sys/amd64/amd64/genassym.c Thu Mar 12 06:24:00 2009 (r189722) @@ -47,6 +47,8 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include +#include #include #include #include Modified: user/kmacy/releng_7_net_backport/sys/amd64/conf/GENERIC ============================================================================== --- user/kmacy/releng_7_net_backport/sys/amd64/conf/GENERIC Thu Mar 12 04:44:09 2009 (r189721) +++ user/kmacy/releng_7_net_backport/sys/amd64/conf/GENERIC Thu Mar 12 06:24:00 2009 (r189722) @@ -25,6 +25,7 @@ ident GENERIC #hints "GENERIC.hints" # Default places to look for devices. makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols +makeoptions MODULES_OVERRIDE="mxge zlib geom" options SCHED_ULE # ULE scheduler options PREEMPTION # Enable kernel thread preemption @@ -171,7 +172,6 @@ device uart # Generic UART driver device ppc device ppbus # Parallel port bus (required) device lpt # Printer -device plip # TCP/IP over parallel device ppi # Parallel port interface device #device vpo # Requires scbus and da @@ -181,79 +181,20 @@ device ppi # Parallel port interface d #device puc # PCI Ethernet NICs. -device de # DEC/Intel DC21x4x (``Tulip'') device em # Intel PRO/1000 Gigabit Ethernet Family device igb # Intel PRO/1000 PCIE Server Gigabit Family -device ixgb # Intel PRO/10GbE Ethernet Card -device le # AMD Am7900 LANCE and Am79C9xx PCnet -device txp # 3Com 3cR990 (``Typhoon'') -device vx # 3Com 3c590, 3c595 (``Vortex'') # PCI Ethernet NICs that use the common MII bus controller code. # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs! -device miibus # MII bus support -device age # Attansic/Atheros L1 Gigabit Ethernet -device ale # Atheros AR8121/AR8113/AR8114 Ethernet -device bce # Broadcom BCM5706/BCM5708 Gigabit Ethernet -device bfe # Broadcom BCM440x 10/100 Ethernet -device bge # Broadcom BCM570xx Gigabit Ethernet -device dc # DEC/Intel 21143 and various workalikes -device et # Agere ET1310 10/100/Gigabit Ethernet -device fxp # Intel EtherExpress PRO/100B (82557, 82558) -device jme # JMicron JMC250 Gigabit/JMC260 Fast Ethernet -device lge # Level 1 LXT1001 gigabit Ethernet -device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet -device nfe # nVidia nForce MCP on-board Ethernet -device nge # NatSemi DP83820 gigabit Ethernet -#device nve # nVidia nForce MCP on-board Ethernet Networking -device pcn # AMD Am79C97x PCI 10/100 (precedence over 'le') -device re # RealTek 8139C+/8169/8169S/8110S -device rl # RealTek 8129/8139 -device sf # Adaptec AIC-6915 (``Starfire'') -device sis # Silicon Integrated Systems SiS 900/SiS 7016 -device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet -device ste # Sundance ST201 (D-Link DFE-550TX) -device ti # Alteon Networks Tigon I/II gigabit Ethernet -device tl # Texas Instruments ThunderLAN -device tx # SMC EtherPower II (83c170 ``EPIC'') -device vge # VIA VT612x gigabit Ethernet -device vr # VIA Rhine, Rhine II -device wb # Winbond W89C840F -device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') - -# ISA Ethernet NICs. pccard NICs included. -device cs # Crystal Semiconductor CS89x0 NIC -# 'device ed' requires 'device miibus' -device ed # NE[12]000, SMC Ultra, 3c503, DS8390 cards -device ex # Intel EtherExpress Pro/10 and Pro/10+ -device ep # Etherlink III based cards -device fe # Fujitsu MB8696x based cards -device sn # SMC's 9000 series of Ethernet chips -device xe # Xircom pccard Ethernet - -# Wireless NIC cards -device wlan # 802.11 support -device wlan_wep # 802.11 WEP support -device wlan_ccmp # 802.11 CCMP support -device wlan_tkip # 802.11 TKIP support -device wlan_amrr # AMRR transmit rate control algorithm -device wlan_scan_ap # 802.11 AP mode scanning -device wlan_scan_sta # 802.11 STA mode scanning -device an # Aironet 4500/4800 802.11 wireless NICs. -device ath # Atheros pci/cardbus NIC's -device ath_hal # Atheros HAL (Hardware Access Layer) -device ath_rate_sample # SampleRate tx rate control for ath -device awi # BayStack 660 and others -device ral # Ralink Technology RT2500 wireless NICs. -device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. +#device miibus # MII bus support # Pseudo devices. device loop # Network loopback device random # Entropy device device ether # Ethernet support -device sl # Kernel SLIP -device ppp # Kernel PPP -device tun # Packet tunnel. +#device sl # Kernel SLIP +#device ppp # Kernel PPP +#device tun # Packet tunnel. device pty # Pseudo-ttys (telnet etc) device md # Memory "disks" device gif # IPv6 and IPv4 tunneling @@ -266,46 +207,38 @@ device firmware # firmware assist modul device bpf # Berkeley packet filter # USB support -device uhci # UHCI PCI->USB interface -device ohci # OHCI PCI->USB interface -device ehci # EHCI PCI->USB interface (USB 2.0) -device usb # USB Bus (required) +#device uhci # UHCI PCI->USB interface +#device ohci # OHCI PCI->USB interface +#device ehci # EHCI PCI->USB interface (USB 2.0) +#device usb # USB Bus (required) #device udbp # USB Double Bulk Pipe devices -device ugen # Generic -device uhid # "Human Interface Devices" -device ukbd # Keyboard -device ulpt # Printer -device umass # Disks/Mass storage - Requires scbus and da -device ums # Mouse -device ural # Ralink Technology RT2500USB wireless NICs -device urio # Diamond Rio 500 MP3 player -device uscanner # Scanners +#device ugen # Generic +#device uhid # "Human Interface Devices" +#device ukbd # Keyboard +#device ulpt # Printer +#device umass # Disks/Mass storage - Requires scbus and da +#device ums # Mouse +#device ural # Ralink Technology RT2500USB wireless NICs +#device urio # Diamond Rio 500 MP3 player +#device uscanner # Scanners # USB Serial devices -device ucom # Generic com ttys -device uark # Technologies ARK3116 based serial adapters -device ubsa # Belkin F5U103 and compatible serial adapters -device ubser # BWCT console serial adapters -device uftdi # For FTDI usb serial adapters -device uipaq # Some WinCE based devices -device uplcom # Prolific PL-2303 serial adapters -device uslcom # SI Labs CP2101/CP2102 serial adapters -device uvisor # Visor and Palm devices -device uvscom # USB serial support for DDI pocket's PHS -# USB Ethernet, requires miibus -device aue # ADMtek USB Ethernet -device axe # ASIX Electronics USB Ethernet -device cdce # Generic USB over Ethernet -device cue # CATC USB Ethernet -device kue # Kawasaki LSI USB Ethernet -device rue # RealTek RTL8150 USB Ethernet +#device ucom # Generic com ttys +#device uark # Technologies ARK3116 based serial adapters +#device ubsa # Belkin F5U103 and compatible serial adapters +#device ubser # BWCT console serial adapters +#device uftdi # For FTDI usb serial adapters +#device uipaq # Some WinCE based devices +#device uplcom # Prolific PL-2303 serial adapters +#device uslcom # SI Labs CP2101/CP2102 serial adapters +#device uvisor # Visor and Palm devices +#device uvscom # USB serial support for DDI pocket's PHS -# FireWire support -device firewire # FireWire bus code -device sbp # SCSI over FireWire (Requires scbus and da) -device fwe # Ethernet over FireWire (non-standard!) -device fwip # IP over FireWire (RFC 2734,3146) -device dcons # Dumb console driver -device dcons_crom # Configuration ROM for dcons -options VIMAGE_GLOBALS +# FireWire support +#device firewire # FireWire bus code +#device sbp # SCSI over FireWire (Requires scbus and da) +#device fwe # Ethernet over FireWire (non-standard!) +#device fwip # IP over FireWire (RFC 2734,3146) +#device dcons # Dumb console driver +#device dcons_crom # Configuration ROM for dcons Modified: user/kmacy/releng_7_net_backport/sys/conf/files ============================================================================== --- user/kmacy/releng_7_net_backport/sys/conf/files Thu Mar 12 04:44:09 2009 (r189721) +++ user/kmacy/releng_7_net_backport/sys/conf/files Thu Mar 12 06:24:00 2009 (r189722) @@ -1475,6 +1475,7 @@ kern/kern_time.c standard kern/kern_timeout.c standard kern/kern_umtx.c standard kern/kern_uuid.c standard +kern/kern_vimage.c standard kern/kern_xxx.c standard kern/link_elf.c standard kern/linker_if.m standard Modified: user/kmacy/releng_7_net_backport/sys/dev/e1000/e1000_80003es2lan.h ============================================================================== --- user/kmacy/releng_7_net_backport/sys/dev/e1000/e1000_80003es2lan.h Thu Mar 12 04:44:09 2009 (r189721) +++ user/kmacy/releng_7_net_backport/sys/dev/e1000/e1000_80003es2lan.h Thu Mar 12 06:24:00 2009 (r189722) @@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE. *******************************************************************************/ -/*$FreeBSD$*/ +/* $FreeBSD$ */ #ifndef _E1000_80003ES2LAN_H_ Modified: user/kmacy/releng_7_net_backport/sys/dev/e1000/e1000_phy.h ============================================================================== --- user/kmacy/releng_7_net_backport/sys/dev/e1000/e1000_phy.h Thu Mar 12 04:44:09 2009 (r189721) +++ user/kmacy/releng_7_net_backport/sys/dev/e1000/e1000_phy.h Thu Mar 12 06:24:00 2009 (r189722) @@ -1,4 +1,4 @@ -/****************************************************************************** +/***************************************************************************** Copyright (c) 2001-2008, Intel Corporation All rights reserved. Modified: user/kmacy/releng_7_net_backport/sys/dev/e1000/if_em.c ============================================================================== --- user/kmacy/releng_7_net_backport/sys/dev/e1000/if_em.c Thu Mar 12 04:44:09 2009 (r189721) +++ user/kmacy/releng_7_net_backport/sys/dev/e1000/if_em.c Thu Mar 12 06:24:00 2009 (r189722) @@ -34,10 +34,12 @@ #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" +#include "opt_inet.h" #endif #include #include +#include #include #include #include @@ -61,6 +63,7 @@ #include #include #include +#include #include #include #include @@ -278,10 +281,8 @@ static void em_print_hw_stats(struct ada static void em_update_link_status(struct adapter *); static int em_get_buf(struct adapter *, int); -#ifdef EM_HW_VLAN_SUPPORT static void em_register_vlan(void *, struct ifnet *, u16); static void em_unregister_vlan(void *, struct ifnet *, u16); -#endif static int em_xmit(struct adapter *, struct mbuf **); static void em_smartspeed(struct adapter *); @@ -789,13 +790,11 @@ em_attach(device_t dev) else adapter->pcix_82544 = FALSE; -#ifdef EM_HW_VLAN_SUPPORT /* Register for VLAN events */ adapter->vlan_attach = EVENTHANDLER_REGISTER(vlan_config, em_register_vlan, 0, EVENTHANDLER_PRI_FIRST); adapter->vlan_detach = EVENTHANDLER_REGISTER(vlan_unconfig, em_unregister_vlan, 0, EVENTHANDLER_PRI_FIRST); -#endif /* Tell the stack that the interface is not active */ adapter->ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); @@ -879,13 +878,11 @@ em_detach(device_t dev) EM_TX_UNLOCK(adapter); EM_CORE_UNLOCK(adapter); -#ifdef EM_HW_VLAN_SUPPORT /* Unregister VLAN events */ if (adapter->vlan_attach != NULL) EVENTHANDLER_DEREGISTER(vlan_config, adapter->vlan_attach); if (adapter->vlan_detach != NULL) EVENTHANDLER_DEREGISTER(vlan_unconfig, adapter->vlan_detach); -#endif ether_ifdetach(adapter->ifp); callout_drain(&adapter->timer); @@ -894,6 +891,7 @@ em_detach(device_t dev) em_free_pci_resources(adapter); bus_generic_detach(dev); if_free(ifp); + drbr_free(adapter->br, M_DEVBUF); em_free_transmit_structures(adapter); em_free_receive_structures(adapter); @@ -989,6 +987,81 @@ em_resume(device_t dev) * the packet is requeued. **********************************************************************/ +#ifdef IFNET_MULTIQUEUE +static int +em_transmit_locked(struct ifnet *ifp, struct mbuf *m) +{ + struct adapter *adapter = ifp->if_softc; + int error; + + EM_TX_LOCK_ASSERT(adapter); + if (((ifp->if_drv_flags & (IFF_DRV_RUNNING|IFF_DRV_OACTIVE)) != + IFF_DRV_RUNNING) + || (!adapter->link_active)) { + error = drbr_enqueue(ifp, adapter->br, m); + return (error); + } + + if (buf_ring_empty(adapter->br) && + (adapter->num_tx_desc_avail > EM_TX_OP_THRESHOLD)) { + if (em_xmit(adapter, &m)) { + if (m && (error = drbr_enqueue(ifp, adapter->br, m)) != 0) { + return (error); + } + } else{ + /* Send a copy of the frame to the BPF listener */ + ETHER_BPF_MTAP(ifp, m); + } + } else if ((error = drbr_enqueue(ifp, adapter->br, m)) != 0) + return (error); + + if (!buf_ring_empty(adapter->br)) + em_start_locked(ifp); + + return (0); +} + +static void +em_start_locked(struct ifnet *ifp) +{ + struct adapter *adapter = ifp->if_softc; + struct mbuf *m_head; + + EM_TX_LOCK_ASSERT(adapter); + + if ((ifp->if_drv_flags & (IFF_DRV_RUNNING|IFF_DRV_OACTIVE)) != + IFF_DRV_RUNNING) + return; + if (!adapter->link_active) + return; + + while ((adapter->num_tx_desc_avail > EM_TX_OP_THRESHOLD) + && (!buf_ring_empty(adapter->br))) { + + m_head = buf_ring_dequeue_sc(adapter->br); + if (m_head == NULL) + break; + /* + * Encapsulation can modify our pointer, and or make it + * NULL on failure. In that event, we can't requeue. + */ + if (em_xmit(adapter, &m_head)) { + if (m_head == NULL) + break; + break; + } + + /* Send a copy of the frame to the BPF listener */ + ETHER_BPF_MTAP(ifp, m_head); + + /* Set timeout in case hardware has problems transmitting. */ + adapter->watchdog_timer = EM_TX_TIMEOUT; + } + if ((adapter->num_tx_desc_avail <= EM_TX_OP_THRESHOLD)) + ifp->if_drv_flags |= IFF_DRV_OACTIVE; + +} +#else static void em_start_locked(struct ifnet *ifp) { @@ -1027,6 +1100,7 @@ em_start_locked(struct ifnet *ifp) adapter->watchdog_timer = EM_TX_TIMEOUT; } } +#endif static void em_start(struct ifnet *ifp) @@ -1039,6 +1113,23 @@ em_start(struct ifnet *ifp) EM_TX_UNLOCK(adapter); } +static int +em_transmit(struct ifnet *ifp, struct mbuf *m) +{ + + struct adapter *adapter = ifp->if_softc; + int error = 0; + + if(EM_TX_TRYLOCK(adapter)) { + if (ifp->if_drv_flags & IFF_DRV_RUNNING) + error = em_transmit_locked(ifp, m); + EM_TX_UNLOCK(adapter); + } else + error = drbr_enqueue(ifp, adapter->br, m); + + return (error); +} + /********************************************************************* * Ioctl entry point * @@ -1053,7 +1144,9 @@ em_ioctl(struct ifnet *ifp, u_long comma { struct adapter *adapter = ifp->if_softc; struct ifreq *ifr = (struct ifreq *)data; +#ifdef INET struct ifaddr *ifa = (struct ifaddr *)data; +#endif int error = 0; if (adapter->in_detach) @@ -1061,6 +1154,7 @@ em_ioctl(struct ifnet *ifp, u_long comma switch (command) { case SIOCSIFADDR: +#ifdef INET if (ifa->ifa_addr->sa_family == AF_INET) { /* * XXX @@ -1077,6 +1171,7 @@ em_ioctl(struct ifnet *ifp, u_long comma } arp_ifinit(ifp, ifa); } else +#endif error = ether_ioctl(ifp, command, data); break; case SIOCSIFMTU: @@ -1464,14 +1559,16 @@ em_init_locked(struct adapter *adapter) /* Setup VLAN support, basic and offload if available */ E1000_WRITE_REG(&adapter->hw, E1000_VET, ETHERTYPE_VLAN); -#ifndef EM_HW_VLAN_SUPPORT - if (ifp->if_capenable & IFCAP_VLAN_HWTAGGING) { + /* New register interface replaces this but + waiting on kernel support to be added */ + if ((ifp->if_capenable & IFCAP_VLAN_HWTAGGING) && + ((ifp->if_capenable & IFCAP_VLAN_HWFILTER) == 0)) { u32 ctrl; ctrl = E1000_READ_REG(&adapter->hw, E1000_CTRL); ctrl |= E1000_CTRL_VME; E1000_WRITE_REG(&adapter->hw, E1000_CTRL, ctrl); } -#endif + /* Set hardware offload abilities */ ifp->if_hwassist = 0; if (adapter->hw.mac.type >= e1000_82543) { @@ -1596,7 +1693,11 @@ em_poll(struct ifnet *ifp, enum poll_cmd EM_TX_LOCK(adapter); em_txeof(adapter); +#ifdef IFNET_MULTIQUEUE + if (!buf_ring_empty(adapter->br)) +#else if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) +#endif em_start_locked(ifp); EM_TX_UNLOCK(adapter); } @@ -1664,8 +1765,15 @@ em_intr(void *arg) } EM_CORE_UNLOCK(adapter); + if (ifp->if_drv_flags & IFF_DRV_RUNNING && - !IFQ_DRV_IS_EMPTY(&ifp->if_snd)) +#ifdef IFNET_MULTIQUEUE + !buf_ring_empty(adapter->br) +#else + !IFQ_DRV_IS_EMPTY(&ifp->if_snd) +#endif + ) + em_start(ifp); } @@ -1704,7 +1812,11 @@ em_handle_rxtx(void *context, int pendin EM_TX_LOCK(adapter); em_txeof(adapter); +#ifdef IFNET_MULTIQUEUE + if (!buf_ring_empty(adapter->br)) +#else if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) +#endif em_start_locked(ifp); EM_TX_UNLOCK(adapter); } @@ -1731,9 +1843,19 @@ em_handle_tx(void *context, int pending) struct ifnet *ifp = adapter->ifp; if (ifp->if_drv_flags & IFF_DRV_RUNNING) { +#ifdef IFNET_MULTIQUEUE + if (!EM_TX_TRYLOCK(adapter)) + return; +#else EM_TX_LOCK(adapter); +#endif + em_txeof(adapter); +#ifdef IFNET_MULTIQUEUE + if (!buf_ring_empty(adapter->br)) +#else if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) +#endif em_start_locked(ifp); EM_TX_UNLOCK(adapter); } @@ -2082,22 +2204,14 @@ em_xmit(struct adapter *adapter, struct error = bus_dmamap_load_mbuf_sg(adapter->txtag, map, *m_headp, segs, &nsegs, BUS_DMA_NOWAIT); - if (error == ENOMEM) { - adapter->no_tx_dma_setup++; - return (error); - } else if (error != 0) { + if (error) { adapter->no_tx_dma_setup++; m_freem(*m_headp); *m_headp = NULL; return (error); } - } else if (error == ENOMEM) { - adapter->no_tx_dma_setup++; - return (error); } else if (error != 0) { adapter->no_tx_dma_setup++; - m_freem(*m_headp); - *m_headp = NULL; return (error); } @@ -2530,7 +2644,8 @@ em_local_timer(void *arg) struct ifnet *ifp = adapter->ifp; EM_CORE_LOCK_ASSERT(adapter); - + taskqueue_enqueue(adapter->tq, + &adapter->rxtx_task); em_update_link_status(adapter); em_update_stats_counters(adapter); @@ -3124,7 +3239,11 @@ em_setup_interface(device_t dev, struct ether_ifattach(ifp, adapter->hw.mac.addr); ifp->if_capabilities = ifp->if_capenable = 0; - +#ifdef IFNET_MULTIQUEUE + ifp->if_transmit = em_transmit; + adapter->br = buf_ring_alloc(2048, M_DEVBUF, M_WAITOK, &adapter->tx_mtx); +#endif + if (adapter->hw.mac.type >= e1000_82543) { int version_cap; #if __FreeBSD_version < 700000 @@ -4644,8 +4763,6 @@ em_receive_checksum(struct adapter *adap } } - -#ifdef EM_HW_VLAN_SUPPORT /* * This routine is run via an vlan * config EVENT @@ -4706,7 +4823,6 @@ em_unregister_vlan(void *unused, struct adapter->max_frame_size); } } -#endif /* EM_HW_VLAN_SUPPORT */ static void em_enable_intr(struct adapter *adapter) Modified: user/kmacy/releng_7_net_backport/sys/dev/e1000/if_em.h ============================================================================== --- user/kmacy/releng_7_net_backport/sys/dev/e1000/if_em.h Thu Mar 12 04:44:09 2009 (r189721) +++ user/kmacy/releng_7_net_backport/sys/dev/e1000/if_em.h Thu Mar 12 06:24:00 2009 (r189722) @@ -36,6 +36,7 @@ #ifndef _EM_H_DEFINED_ #define _EM_H_DEFINED_ +#define IFNET_MULTIQUEUE /* Tunables */ /* @@ -142,7 +143,7 @@ * This parameter controls when the driver calls the routine to reclaim * transmit descriptors. */ -#define EM_TX_CLEANUP_THRESHOLD (adapter->num_tx_desc / 8) +#define EM_TX_CLEANUP_THRESHOLD (adapter->num_tx_desc / 4) #define EM_TX_OP_THRESHOLD (adapter->num_tx_desc / 32) /* @@ -301,6 +302,9 @@ struct em_dma_alloc { /* Our adapter structure */ struct adapter { struct ifnet *ifp; +#ifdef IFNET_MULTIQUEUE + struct buf_ring *br; +#endif struct e1000_hw hw; /* FreeBSD operating-system-specific structures. */ @@ -339,10 +343,8 @@ struct adapter { struct task tx_task; struct taskqueue *tq; /* private task queue */ -#ifdef EM_HW_VLAN_SUPPORT eventhandler_tag vlan_attach; eventhandler_tag vlan_detach; -#endif /* Management and WOL features */ int wol; @@ -484,6 +486,7 @@ typedef struct _DESCRIPTOR_PAIR #define EM_RX_LOCK_DESTROY(_sc) mtx_destroy(&(_sc)->rx_mtx) #define EM_CORE_LOCK(_sc) mtx_lock(&(_sc)->core_mtx) #define EM_TX_LOCK(_sc) mtx_lock(&(_sc)->tx_mtx) +#define EM_TX_TRYLOCK(_sc) mtx_trylock(&(_sc)->tx_mtx) #define EM_RX_LOCK(_sc) mtx_lock(&(_sc)->rx_mtx) #define EM_CORE_UNLOCK(_sc) mtx_unlock(&(_sc)->core_mtx) #define EM_TX_UNLOCK(_sc) mtx_unlock(&(_sc)->tx_mtx) Modified: user/kmacy/releng_7_net_backport/sys/dev/e1000/if_igb.c ============================================================================== --- user/kmacy/releng_7_net_backport/sys/dev/e1000/if_igb.c Thu Mar 12 04:44:09 2009 (r189721) +++ user/kmacy/releng_7_net_backport/sys/dev/e1000/if_igb.c Thu Mar 12 06:24:00 2009 (r189722) @@ -63,6 +63,7 @@ #include #include #include +#include #include #include #include @@ -192,10 +193,8 @@ static void igb_print_hw_stats(struct ad static void igb_update_link_status(struct adapter *); static int igb_get_buf(struct rx_ring *, int); -#ifdef IGB_HW_VLAN_SUPPORT static void igb_register_vlan(void *, struct ifnet *, u16); static void igb_unregister_vlan(void *, struct ifnet *, u16); -#endif static int igb_xmit(struct tx_ring *, struct mbuf **); static int igb_dma_malloc(struct adapter *, bus_size_t, @@ -281,7 +280,7 @@ TUNABLE_INT("hw.igb.enable_aim", &igb_en static int igb_low_latency = IGB_LOW_LATENCY; TUNABLE_INT("hw.igb.low_latency", &igb_low_latency); static int igb_ave_latency = IGB_AVE_LATENCY; -TUNABLE_INT("hw.igb.ave_latency", &igb_ave_latency); +TUNABLE_INT("hw.igb.ave_latency", &igb_low_latency); static int igb_bulk_latency = IGB_BULK_LATENCY; TUNABLE_INT("hw.igb.bulk_latency", &igb_bulk_latency); @@ -572,13 +571,11 @@ igb_attach(device_t dev) if (eeprom_data) adapter->wol = E1000_WUFC_MAG; -#ifdef IGB_HW_VLAN_SUPPORT /* Register for VLAN events */ adapter->vlan_attach = EVENTHANDLER_REGISTER(vlan_config, igb_register_vlan, 0, EVENTHANDLER_PRI_FIRST); adapter->vlan_detach = EVENTHANDLER_REGISTER(vlan_unconfig, igb_unregister_vlan, 0, EVENTHANDLER_PRI_FIRST); -#endif /* Tell the stack that the interface is not active */ adapter->ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); @@ -639,13 +636,11 @@ igb_detach(device_t dev) igb_enable_wakeup(dev); } -#ifdef IGB_HW_VLAN_SUPPORT /* Unregister VLAN events */ if (adapter->vlan_attach != NULL) EVENTHANDLER_DEREGISTER(vlan_config, adapter->vlan_attach); if (adapter->vlan_detach != NULL) EVENTHANDLER_DEREGISTER(vlan_unconfig, adapter->vlan_detach); -#endif ether_ifdetach(adapter->ifp); @@ -809,7 +804,9 @@ igb_ioctl(struct ifnet *ifp, u_long comm { struct adapter *adapter = ifp->if_softc; struct ifreq *ifr = (struct ifreq *)data; +#ifdef INET struct ifaddr *ifa = (struct ifaddr *)data; +#endif int error = 0; if (adapter->in_detach) @@ -817,6 +814,7 @@ igb_ioctl(struct ifnet *ifp, u_long comm switch (command) { case SIOCSIFADDR: +#ifdef INET if (ifa->ifa_addr->sa_family == AF_INET) { /* * XXX @@ -833,6 +831,7 @@ igb_ioctl(struct ifnet *ifp, u_long comm } arp_ifinit(ifp, ifa); } else +#endif error = ether_ioctl(ifp, command, data); break; case SIOCSIFMTU: @@ -921,12 +920,10 @@ igb_ioctl(struct ifnet *ifp, u_long comm ifp->if_capenable ^= IFCAP_VLAN_HWTAGGING; reinit = 1; } -#ifdef IGB_HW_VLAN_SUPPORT if (mask & IFCAP_VLAN_HWFILTER) { ifp->if_capenable ^= IFCAP_VLAN_HWFILTER; reinit = 1; } -#endif if (reinit && (ifp->if_drv_flags & IFF_DRV_RUNNING)) igb_init(adapter); VLAN_CAPABILITIES(ifp); @@ -1128,15 +1125,14 @@ igb_init_locked(struct adapter *adapter) E1000_WRITE_REG(&adapter->hw, E1000_VET, ETHERTYPE_VLAN); -#ifndef IGB_HW_VLAN_SUPPORT /* Vlan's enabled but HW Filtering off */ - if (ifp->if_capenable & IFCAP_VLAN_HWTAGGING) { + if ((ifp->if_capenable & IFCAP_VLAN_HWTAGGING) && + ((ifp->if_capenable & IFCAP_VLAN_HWFILTER) == 0)) { u32 ctrl; ctrl = E1000_READ_REG(&adapter->hw, E1000_CTRL); ctrl |= E1000_CTRL_VME; E1000_WRITE_REG(&adapter->hw, E1000_CTRL, ctrl); } -#endif /* Set hardware offload abilities */ ifp->if_hwassist = 0; @@ -2499,16 +2495,11 @@ igb_setup_interface(device_t dev, struct * Tell the upper layer(s) what we support. */ ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header); - ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING; + ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING | IFCAP_VLAN_HWFILTER; ifp->if_capabilities |= IFCAP_VLAN_MTU; - ifp->if_capenable |= IFCAP_VLAN_HWTAGGING; + ifp->if_capenable |= IFCAP_VLAN_HWTAGGING | IFCAP_VLAN_HWFILTER; ifp->if_capenable |= IFCAP_VLAN_MTU; -#ifdef IGB_HW_VLAN_SUPPORT - ifp->if_capabilities |= IFCAP_VLAN_HWFILTER; - ifp->if_capenable |= IFCAP_VLAN_HWFILTER; -#endif - /* * Specify the media types supported by this adapter and register * callbacks to update media and link information @@ -4071,7 +4062,6 @@ igb_rx_checksum(u32 staterr, struct mbuf return; } -#ifdef IGB_HW_VLAN_SUPPORT /* * This routine is run via an vlan * config EVENT @@ -4140,7 +4130,6 @@ igb_unregister_vlan(void *unused, struct adapter->max_frame_size); } } -#endif /* IGB_HW_VLAN_SUPPORT */ static void igb_enable_intr(struct adapter *adapter) Modified: user/kmacy/releng_7_net_backport/sys/dev/e1000/if_igb.h ============================================================================== --- user/kmacy/releng_7_net_backport/sys/dev/e1000/if_igb.h Thu Mar 12 04:44:09 2009 (r189721) +++ user/kmacy/releng_7_net_backport/sys/dev/e1000/if_igb.h Thu Mar 12 06:24:00 2009 (r189722) @@ -378,12 +378,8 @@ struct adapter { struct task link_task; struct task rxtx_task; struct taskqueue *tq; /* private task queue */ - -#ifdef IGB_HW_VLAN_SUPPORT eventhandler_tag vlan_attach; eventhandler_tag vlan_detach; -#endif - /* Management and WOL features */ int wol; int has_manage; Modified: user/kmacy/releng_7_net_backport/sys/dev/firewire/firewirereg.h ============================================================================== --- user/kmacy/releng_7_net_backport/sys/dev/firewire/firewirereg.h Thu Mar 12 04:44:09 2009 (r189721) +++ user/kmacy/releng_7_net_backport/sys/dev/firewire/firewirereg.h Thu Mar 12 06:24:00 2009 (r189722) @@ -47,6 +47,7 @@ typedef struct proc fw_proc; #endif #include +#include #include #include Modified: user/kmacy/releng_7_net_backport/sys/dev/mxge/eth_z8e.h ============================================================================== --- user/kmacy/releng_7_net_backport/sys/dev/mxge/eth_z8e.h Thu Mar 12 04:44:09 2009 (r189721) +++ user/kmacy/releng_7_net_backport/sys/dev/mxge/eth_z8e.h Thu Mar 12 06:24:00 2009 (r189722) @@ -1,6 +1,6 @@ /******************************************************************************* -Copyright (c) 2006-2009, Myricom Inc. +Copyright (c) 2006-2008, Myricom Inc. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -28,6951 +28,7074 @@ POSSIBILITY OF SUCH DAMAGE. $FreeBSD$ ***************************************************************************/ -static unsigned int eth_z8e_uncompressed_length = 357812 ; -static unsigned int eth_z8e_length = 111096 ; -static unsigned char eth_z8e[111096 + 1] = - "\x78\x9c\xec\xbd\x7f\x78\x54\xd5\xb5\x37\xbe\x72\x32\xc0\x24\x0d" - "\xcc\x88\x29\x1d\x11\x75\x50\xb4\xd1\xf2\x23\x2a\xb6\x68\x41\xa3" - "\x80\xc5\x5e\x7e\xa4\x8a\x6d\xaa\x68\x82\x26\x34\x68\x84\x08\x11" - "\x07\x08\x99\x61\xc0\x36\x41\x20\x51\x02\x44\x08\x49\x6c\x43\x8b" - "\x14\x24\x56\xda\xd2\xb7\x56\xa7\x25\xbe\x0f\xbd\x0d\x19\x6e\xbf" - "\xd0\x37\x57\xf1\x76\xe4\x46\x9a\x72\x13\x18\xc9\x40\xc6\x64\x66" - "\xf6\xfb\x59\x7b\x9f\x93\xcc\x0c\x13\x94\xdb\xfb\x7c\xdf\x7f\x9a" - "\xe7\x99\x9c\x73\xf6\x8f\xb5\xd7\x5e\x7b\xed\xb5\xd7\xda\x3f\xd6" - "\x26\xfa\x07\xfe\xb4\xbd\xbe\x7f\x24\xfb\x3f\xff\xfe\xf9\xf7\xcf" - "\xbf\x7f\xfe\xfd\xf3\xef\x9f\x7f\xff\xfc\xfb\x7f\xf3\x77\x5e\x33" - "\xd1\x1f\xaa\x88\x7a\xdc\x66\x9b\x8f\xba\xde\xd9\xbe\x45\x84\x10" - "\x9c\xe4\x23\xb3\x8d\x9f\xfa\x8f\x5e\x45\xb8\x56\x45\xe6\x1b\xad" - "\x94\x36\x7d\x17\x51\xf5\x28\xd1\xb9\x65\x9b\xf0\xaf\xdb\x26\x3a" - "\x67\xec\x26\x6a\x1e\x47\xb4\x65\x94\x08\x00\xce\x02\x1f\x7d\x7f" - "\x1c\xc3\x59\x87\x6f\x8e\x5f\x3f\x4a\xf8\x11\x5e\x82\xf0\x5a\x0e" - "\x5f\x3b\x0a\xb0\xd2\x89\xdc\xdb\x44\x30\x0a\xae\x99\xf3\x33\xcc" - "\x19\x63\x25\x3e\x8d\x71\x70\x18\xc6\x21\x1f\x3d\x96\x7e\x19\x18" - "\x69\x06\x5e\x01\x8d\x92\x18\x5e\xb7\x9b\x6c\x01\xb7\xe7\xcb\xc8" - "\x1b\x40\x9d\x32\x38\x6f\x25\xd2\x08\x37\x25\x37\x3b\x42\x64\xbf" - "\x91\x92\x4e\x53\xca\xdf\xf1\xd4\xf0\xfc\x88\xeb\xbb\x4e\xe5\x1b" - "\xc7\x30\x90\x37\xa9\xc7\x9d\x92\xd9\x9f\x17\xb0\xed\x65\x64\x42" - "\xda\xb7\x02\x9a\x47\x53\x69\xad\x29\x7a\x5a\x0d\x69\x17\x18\x69" - "\x55\x9c\xf6\x90\x1e\xf7\x25\xc4\x39\x62\xe3\x4c\xaf\xea\x71\x69" - "\x88\xab\x8e\xc3\xcf\xe4\xed\x0d\x11\xca\x61\x5c\xec\x3e\x3c\x0f" - "\xa3\x65\x74\xdc\x18\xa7\x66\xa4\x77\x71\xfa\x19\x76\x11\x9a\x6f" - "\x27\x89\x0b\xd3\x0e\x69\x67\x1d\x6e\x50\x69\xf1\x3e\x86\xf3\xeb" - "\xef\x76\xbc\xcb\x70\xbd\xdc\xab\x7a\xdc\xa9\x69\xb1\x38\x11\xe9" - "\x71\x23\x11\x97\x11\x1b\xf7\x6e\xa6\x1e\xf7\x15\xc4\xcd\x88\x8d" - "\x4b\x32\xf2\xd9\x10\x97\x67\xc4\x45\xb7\x93\xe2\x38\x13\x7e\x43" - "\xcc\x44\x43\xf1\x1b\x66\x36\xda\x6e\xb9\x4d\x44\x9c\xd7\x90\x49" - "\x6c\xd8\xd2\x11\x71\x0b\xf2\x3a\x82\x64\x1f\x4d\xce\x53\x94\x7a" - "\x0c\x70\x69\xf3\x2a\x32\x3b\x8b\x45\xd0\xeb\xe8\xa4\x56\x7f\x27" - "\x39\xfd\xa2\xc3\x1b\xba\x40\x65\x17\xc8\xec\x0d\x75\x51\xd9\xf3" - "\x64\x6b\x2e\xfd\x84\x12\xf1\x45\x44\x13\xe4\x1c\xc3\x79\xdb\xa9" - "\xb5\xb6\x9d\x9c\xb5\xb1\x79\x9d\xd7\x91\xed\x28\xbe\x41\x73\x0b" - "\xe3\xd1\x6c\x0f\x51\x28\x75\x4b\x47\xe9\x6b\x64\x72\x8e\x25\xed" - "\x68\xbe\x47\xc7\xe5\x4b\x35\x8c\xcb\xfa\x33\x64\xfe\xc9\x22\xb4" - "\xfd\x19\xc6\x77\x67\xc7\x81\x55\x41\xed\xb0\x6d\x36\x1d\xb6\x9d" - "\xa4\x66\xdb\x34\x6a\x76\xcc\xa0\xcd\x67\x28\xed\x70\x70\x2a\x35" - "\x9b\x1e\x44\xdf\x98\x41\xde\x4e\xbc\xdb\xc3\x48\x13\x20\xfb\x0a" - "\x42\xbb\x7e\xa9\xbc\xfa\x19\x32\xfb\x14\x4c\xb4\xe7\x97\xaa\x7f" - "\x5f\x42\xc4\x34\xe3\xef\x44\xf5\x58\x7e\x0d\xd9\x80\x5f\x07\x70" - "\xb9\x1b\xb8\x1c\x1d\x67\xa3\x4c\xe0\x3c\xcc\x5b\x13\x22\x53\x29" - "\xa5\x0c\xd2\x27\xd2\x23\x6e\xd9\x37\x3b\xeb\xb6\x89\x0e\xe6\xad" - "\xee\xd5\x39\xe8\x5f\x69\x26\x94\xdd\xc8\xe5\x6d\x46\x1f\x75\xbe" - "\x4e\xa6\xee\x17\x73\x92\xea\xb7\x89\x76\xc4\xd9\x8d\x38\xf0\x7b" - "\x3b\xe2\x3b\x26\xa5\x93\xd5\x1b\xca\xa2\xf7\x7a\x3b\x4c\x0c\x63" - "\x44\x80\x92\x18\x9e\xc5\x41\xc9\xa8\xcf\x10\xe0\xf3\x69\x3d\xc2" - "\x6f\x42\x3a\xe4\x47\xfb\x57\x04\x38\xbf\xf8\xca\xe3\x9f\x46\xbe" - "\xf2\xb8\x3f\xb2\xfd\xf1\xf3\x62\xfb\xe3\xdd\xe1\xed\x8f\x07\x9c" - "\x2b\xc9\x1c\xfe\xca\xe3\x17\x5a\x8b\x65\x1b\x58\x5b\x8b\xd1\x06" - "\x61\x32\xaf\xe9\x22\xeb\x93\xcf\xa3\xed\x43\x1f\xd1\x9a\xc5\x64" - "\x8b\xa4\xec\x68\xf0\x86\x4e\xd0\x93\xa5\x24\xf0\xde\x94\xa8\x7e" - "\xdd\xa9\xb5\x19\x8a\x67\xcd\x5c\xa7\x36\x9f\xf6\xaa\x8f\xcb\xf5" - "\xa7\x34\x66\xe0\x37\x1e\xbf\x4c\xfc\x26\x8b\xd4\xda\xc9\xa0\x95" - "\x73\xc4\xda\x24\xaa\xeb\x25\x9a\x14\xa1\x24\x34\x51\x00\xf8\x5b" - "\x07\xa1\xdb\x98\xc8\x86\x37\x9b\xbe\xea\xa2\xb2\x9e\x9e\x42\x62" - "\x99\xc2\xf2\x84\xe5\x4b\x8f\x7b\x78\x96\x4f\xdb\x62\x97\xbc\xbf" - "\x4d\x04\x44\xea\x9b\x4d\x08\xef\x08\xac\x2e\x4c\xf2\xaf\x2e\xd4" - "\xba\x53\xdf\x7c\x1b\x69\xf2\x91\x26\x47\xa7\x61\x07\xc3\x42\x3f" - "\xf1\x0f\x0f\x51\x32\x60\x16\xff\xfa\x62\x9b\x69\xd7\x36\x71\x12" - "\xe9\x36\xf6\xc3\x02\x6c\xc0\x01\xfd\x87\x37\x18\x61\xa0\x75\xfb" - "\x26\xa4\xe3\xfc\xde\x60\x16\xcb\x5d\x9f\xb7\xa8\x83\x2c\x21\x4a" - "\x15\x7d\xaa\x3c\xa4\xe9\x60\xf9\x38\x3c\x48\x43\x7b\xdc\x94\xcd" - "\xb0\x39\x9f\xb7\xb3\x83\x90\xef\x6d\xe1\x2c\x84\x5c\xa2\xb9\x3d" - "\xa2\x30\x09\xb2\xb8\xfd\x30\xf2\xab\xb2\x47\x98\x0d\x1c\xb9\x0c" - "\x6e\x6b\x89\x27\xf8\xe1\x70\x51\x90\x86\xd7\x50\x32\xf2\x3d\xc2" - "\xf0\x18\x16\xf8\xc0\x87\xba\xbe\x7d\xb8\xc8\x4f\x11\x11\x03\xd3" - "\xa7\xc3\xcb\x89\x81\x87\x70\x01\x78\xcc\x7f\xcd\xc8\x33\xbc\x41" - "\xc2\x7b\xf8\xd7\x11\x86\x17\x24\x93\x5d\xe2\xfb\x5d\x86\xd1\xc3" - "\x32\x0d\x30\x3d\x2b\x1e\xa0\x4e\x1a\xe1\xf1\x3b\x0b\x93\x5b\x4b" - "\x89\x38\xff\x81\xb2\x8e\x21\xa2\x3b\x27\x99\x79\x8e\xe3\xbd\xa1" - "\xf3\x9c\xe6\x75\xd1\x5d\x98\x3c\xbc\x93\x4c\x8c\x33\xf2\x3b\x18" - "\xcf\xe8\xb6\x7c\x78\xe6\x77\xa7\xd1\x9c\xfb\xa7\x4f\xa3\xec\xef" - "\x3d\x8c\x7f\x73\xa7\xd1\x23\xf8\x65\xde\x3d\x21\xf3\xce\x6f\x4c" - "\xb9\x93\x72\x1e\x7c\x08\xa1\xd3\xa7\xdd\x9e\xf9\xad\x09\xd9\xd3" - "\x1f\x9a\x49\xdf\x99\x7f\x47\xe6\x1d\x77\xd0\xfd\x33\x67\xdf\x9e" - "\x99\xa9\x3f\x6f\xcf\xe4\x24\x8f\x4d\x99\xf9\xc8\x84\xec\x65\x4b" - "\x4b\x96\x4e\x98\xfb\xd0\xf4\xd8\xf1\xd0\x16\x59\x11\xa1\x3a\xf0" - "\x86\xe8\x9e\x45\x02\xf2\x01\xfd\xc0\xcf\x7d\xc1\x53\x76\x1e\xfd" - "\xdc\x7a\x73\x3d\xb7\x8f\x94\x91\x23\x4e\xa2\x6f\x9b\x7a\xdc\x16" - "\x17\xe8\x54\xc3\x74\xc2\xb8\x83\x34\xe9\xaf\x21\xee\x63\x5d\x2e" - "\x73\x7c\x43\x5c\xfc\x1a\xc4\x9f\x8e\x8a\xf7\xc4\xc5\x2f\x44\xfc" - "\x7f\xe9\xf1\xa0\xb1\xc5\x17\x1b\x7f\x15\xe4\xfe\x88\x73\x9b\x11" - "\x3f\xa2\x98\x92\x81\xab\x7f\x9d\x1c\xab\xad\xe6\x7e\x3e\x03\x1f" - "\x37\x97\x66\x91\xf8\xc9\xac\x24\xb4\x4b\x12\xc6\x38\xe4\xb3\x14" - "\x82\xdf\x02\x91\xd4\xc6\x29\xa0\x3f\xa9\x30\xeb\x7c\xc1\xdf\x1b" - "\x1a\xef\x16\x4e\x84\xad\x92\x61\x8f\x72\x18\xda\x20\xb9\xa7\xbb" - "\x90\xc4\x6a\x19\x9e\x8c\xf0\x3f\xd6\x33\x0f\x70\xfa\x3e\x99\x7f" - "\x18\xc2\xde\xc0\xf7\xdd\x80\x79\x8f\x0e\x13\xe3\x6e\xfa\x21\xc0" - "\xfb\x66\x44\xe4\x90\x30\x9f\x6b\xc3\xfb\x54\xcf\xaa\x4e\x3a\x5d" - "\x4c\x9a\x0f\x71\x11\x27\x60\xf6\xf5\x97\xef\xe0\xbc\x28\xcb\xd4" - "\xd3\x57\x88\xb1\xce\x5a\xca\x63\x36\xc2\xee\x8e\xc2\xb1\x90\xcb" - "\xe4\xfe\x86\x7a\x77\x83\x26\x29\xa8\x6b\x20\x8e\x26\x56\xce\x53" - "\x29\x79\xba\xf1\x6e\xc0\xc9\x47\x7f\x82\x0c\x21\x8d\xeb\xe0\x1b" - "\x80\xa1\xd3\xf4\xaa\xc9\x71\xf9\xb3\x01\x9b\xfb\x27\xcb\x90\x64" - "\x1f\x59\x82\x46\x3b\xab\x36\xba\x2a\x3f\x36\xfd\xc8\xf1\xdd\x6e" - "\x4b\x12\xd3\x19\xcf\xe1\x48\x33\x0c\x7d\xd8\xc4\xf2\xf6\x70\x29" - "\xeb\x3b\x57\x55\xc7\xc1\x3f\x88\x74\xe9\x8c\xe3\x00\x4e\x96\xa0" - "\xae\x9f\xb4\x23\xbf\x19\x79\x8e\xc4\xe5\xe9\x40\x9e\x31\x42\xe5" - "\x49\x56\xf4\xb9\x24\x4f\x28\x0e\xaf\x31\x92\x76\x1b\x64\x1e\x13" - "\xfa\x60\x7f\x1e\xd9\x27\x63\xcb\xe5\xba\x41\x8f\x19\x99\x15\xc7" - "\x7f\xd0\x31\x2c\xe3\x98\x16\xa2\x6f\xd6\x97\xd0\x06\x77\x20\x6c" - "\x38\xf0\x98\xc6\xed\xc6\x7c\xe7\xf5\x07\x21\x33\x66\xa5\xa9\xb1" - "\x6f\xe4\xeb\x96\x52\xe2\xf7\x09\xfc\xce\xb0\x45\xdf\x6c\x9d\xe7" - "\x46\xbe\x8e\x27\x87\x97\x73\x38\x68\x8b\xb8\x7f\x89\x28\x98\x23" - "\xdf\x87\x2c\xd1\xf0\x1d\xd6\xcb\x18\x82\xef\x24\xe0\x7e\x0f\xe4" - "\x11\x78\x64\x16\xb7\xff\xe4\xd3\x74\xb5\x1e\x7f\xf5\x05\x4e\x8f" - "\xf7\xdb\xf5\xf7\xa4\x58\xbe\xbb\xba\x4b\x96\x2d\x79\x4f\xe5\x8f" - "\x28\x3e\x9b\x8e\xb8\x7f\xc7\xf3\x21\x3c\xdf\xc7\xf3\x3b\x78\xbe" - "\xee\xbc\x40\x36\x67\x18\xe3\xaf\xfa\xde\x84\xe7\xc3\x78\xae\xc4" - "\xf3\x11\x3c\x0b\x98\x5f\x20\x8f\x89\xdb\x18\x6d\xab\x78\x02\xb2" - "\x34\xa2\xfa\xc6\x30\x45\xcb\xab\xe7\xeb\x65\xaa\xfe\x22\xa2\xc2" - "\x54\x3a\x4d\xb5\x9b\x1e\xd6\x37\x8b\xe9\x92\x0d\xf8\x99\x5c\xbe" - "\x0e\x6b\x48\x02\x58\xa6\x04\xb0\x92\xa2\x61\xe1\x69\x2a\x0b\x08" - "\xe1\xa3\x91\x7e\xa6\x2b\xbe\x03\xa0\x09\xf4\x80\x91\xcd\x4c\xa7" - "\x81\xf4\x23\xf3\xa2\xda\x1b\x7a\x60\x7a\x66\x6c\x7b\x5b\x82\x4c" - "\xb3\x4a\x5d\x36\x30\xff\x4b\xbc\x85\xec\x3f\x43\x0d\x9e\x61\x19" - "\xc8\xb4\x48\x2e\xe5\xfe\x90\x0e\xfd\xff\x27\x7e\x86\xc1\x71\x81" - "\x94\x03\x99\x9c\x3f\xd9\x21\xe3\xaa\xa0\x6f\xb4\x19\x71\x5c\x76" - "\x54\xbe\x7d\x46\xbe\x48\x6a\xb5\x55\xe6\x5d\x5e\x98\xcc\x63\x25" - "\x8f\x79\x18\x7b\x3a\x90\xe6\x98\x8f\x86\x5b\x07\xb3\x0b\xfa\xb4" - "\xf4\xdf\x43\xaf\x3c\xdf\xe7\xcc\x20\x51\x5e\x4d\x13\x88\xb4\xf1" - "\x2e\x4a\xf1\x86\x8e\xd3\xbc\x90\x08\xe3\xd7\x97\xe1\xa2\xab\xbc" - "\xa1\x16\xfa\x2a\xd1\x58\x6f\x68\x23\xc6\x98\x12\x8e\x7b\xef\x26" - "\x4a\x4a\xc2\xd3\x79\x1b\x69\x49\xde\xd0\x64\x84\x37\xd2\x4d\x2e" - "\x53\xd2\x83\x2f\x89\x1e\x6f\x68\x2a\xbe\x8b\x68\xc6\x4b\xe2\xaf" - "\xb9\x61\xb2\xce\x1e\x22\x9c\xde\xd0\x6c\x7a\x70\x48\x44\x78\x43" - "\xcd\x88\xcb\xa7\x79\xe1\xcf\xc4\xbc\x70\x8f\x10\xe6\x6a\xeb\xbc" - "\xf0\x39\xbc\xff\x55\x80\xd6\x78\xbe\x27\x58\x97\x9d\x17\x76\x0a" - "\x51\x51\x4d\xb9\x2b\x35\xea\xc3\x38\x29\x52\xaa\xad\x62\x43\xb5" - "\xbd\x4f\x14\x26\x8b\xd4\xea\x1b\xfa\xfa\xf0\xdc\x50\x7d\xbd\xfc" - "\x2e\xaf\xce\x04\x1c\xfb\x04\x17\x74\x3e\xe0\x1e\x81\x9c\xf1\x86" - "\x4e\xa2\x9c\x4f\x68\xde\x4a\xbf\x60\xfc\x47\xac\x15\x78\x7f\x4f" - "\x60\xac\xb4\xcc\x5b\xe9\x14\xb9\x21\x32\x03\xa6\xdd\x1b\xea\x24" - "\x94\x93\x09\x98\x13\x24\xcc\xf2\xea\x6c\xa4\xf5\x73\x3a\x86\x65" - "\xc0\x61\x18\x9c\x76\x5e\x98\x2c\x48\x9f\xdd\x57\x51\x9d\x85\x5f" - "\x1e\x7e\x55\xc8\xfb\xe3\xbe\xd5\x92\x86\x4d\x78\xf7\x7c\x06\x7e" - "\x91\x34\x0c\xd3\x30\xa4\xe5\x31\x78\x46\x8f\xc2\xd7\x27\xf1\xdd" - "\x50\xfd\xd7\xcf\x54\x3d\xfe\x43\xaf\xc7\x47\x1c\x0e\x9e\x1a\x22" - "\x36\x6c\xa5\x80\x53\xc6\x09\xe4\x9b\x2f\xf3\x95\x6f\x85\xfc\xdf" - "\x6a\x05\x7d\x92\xe7\x85\x85\x8b\x69\x08\xba\xba\x98\x8e\x4c\x2b" - "\x51\x81\xf8\x94\xad\xa0\xcf\xd6\x3b\xfa\x2a\xb6\x82\x46\xc0\x25" - "\x75\x6b\xd6\x67\x12\xf6\xd6\xfb\x00\x67\x41\x0f\x97\x67\xde\x9a" - "\x05\x58\xd9\x9f\x69\x76\xd0\x42\x04\xe7\x85\xd6\x86\x72\x57\x52" - "\x72\x06\xb9\x80\xef\x56\xc0\x2a\x42\x1d\xd7\xe3\x39\x1b\xf1\x74" - "\x35\xca\x7a\x0f\x70\xb3\xb8\x3c\x94\x91\x0d\x98\x73\x00\x2b\x9f" - "\x71\xea\x75\x93\x15\xdf\x79\xbd\x0a\x3f\x57\xa4\x7c\x6b\x43\xc4" - "\xbc\xb5\x2a\x9a\x77\x14\xcd\x98\x67\xf6\x73\x98\xd5\xe0\x93\x70" - "\xf9\xd6\xe2\xaf\x11\x59\xe7\x06\x44\x88\x79\x65\x12\x15\x27\xb5" - "\x06\x5a\x28\x37\x64\xa6\xd6\xe2\x83\x74\x1b\xb1\xfd\x11\xa0\xd6" - "\xc0\x46\x7c\xef\xc2\xb3\x84\x8e\x76\x36\x12\xe3\x38\xb7\x38\xb0" - "\x36\x6c\xde\xea\x3f\xda\x39\x93\x90\xff\x3d\xe0\x18\x79\xb2\xd8" - "\xe4\x6a\x2d\x0e\xf0\xb7\xf3\x68\x27\xf8\x33\x2c\xc2\xa1\xf2\xad" - "\x79\x21\xf3\x36\x9a\x7b\x41\xf8\xe7\x74\xba\x86\x20\xac\xcf\x92" - "\x24\x42\x16\x87\x53\x1c\xed\x5c\x4f\x4f\x5e\xa0\xa4\xa3\x85\x07" - "\x25\x9f\x3e\x59\x5c\x4c\x32\xff\x85\x90\xe5\x89\x4e\x17\x3d\x51" - "\x48\x23\x90\xfe\x1c\xf3\xac\x18\xe1\xa2\x96\xf6\x7c\x9a\xd3\x15" - "\x4a\x9e\x7b\xa1\x4f\xb4\xe4\x6d\xa4\xa3\x85\x1b\x99\x1e\x2e\xd6" - "\xd3\xe7\x74\x75\x8b\xb9\x17\x7a\xc4\xd1\xc2\xfd\xd4\x92\x77\x90" - "\x66\x7f\xe2\xb1\x84\x2b\xb6\x16\x47\x52\xb6\x56\x45\x2a\xb6\x36" - "\x84\x2a\xb6\xe6\x85\x53\xb6\xfa\x43\x29\xdb\xa0\xb3\x6d\x2b\x06" - "\xfd\x52\x64\x5b\xa4\x6e\x5b\x82\x77\xbb\x6c\x5f\xf3\x36\x17\x74" - "\x70\xc9\xff\x5e\xd8\xde\xa2\x7c\x5b\x83\x48\xd9\xe6\xea\xab\xd8" - "\x56\xa5\xf8\x13\xdf\xa9\xdb\x1a\x14\xaf\x6c\x6b\x52\x7d\x60\xdb" - "\x01\x6e\x5f\xa4\xf1\xe0\x77\x0c\x3f\xe8\x94\xdb\x33\x01\xf3\x2a" - "\x86\x1f\x31\x6f\xcf\x8c\x94\x6f\xcf\x12\xe6\xed\xd9\x80\xad\xcd" - "\x7d\x3e\x08\x3a\x82\x86\x0e\xd0\x9f\x6d\x23\x47\x18\xdf\x61\x7a" - "\xf2\x79\x72\x7a\x1d\x27\xf1\x7e\x92\xc4\xbb\x55\x34\xf7\x79\xee" - "\x7f\x61\x3c\x9d\x02\x34\xb2\x44\x52\x00\xa7\x02\x70\x52\x00\x67" - "\xc3\xf6\x62\x5d\x36\x03\x8f\xed\x4b\x15\x1e\xdb\x8b\xfb\xfa\x32" - "\x58\xbf\x33\x21\x8d\x0b\xe1\xe7\xe5\x78\xc2\x3c\x58\xbe\xdd\x3f" - "\xe7\x25\xe1\x17\xe6\x9a\xec\xc8\x50\x92\x7d\x29\xf2\xae\x10\xaa" - "\x3f\x75\x82\x87\x47\xbb\x72\x1d\xd4\x20\x2a\xb6\xfb\x45\x4a\x0d" - "\xe0\xef\x78\x15\x70\x92\x85\x94\x47\x3b\xaa\xfa\x2a\x76\x34\xe1" - "\xd7\x30\xd0\x07\x99\x16\x3b\xaa\x62\x6d\xe7\xc4\x76\x73\x8f\xfb" - "\x9a\x16\x1f\xed\x3f\xc6\xb2\x0f\xef\x6d\x3e\x7a\xb3\x51\x7f\x6f" - "\xf7\x51\xb5\xb4\xc1\x59\xe6\x15\x97\xd1\x97\xcf\xd0\xe8\x1a\xd0" - "\x84\xdf\xd3\xf0\x5e\x3b\xef\xd6\xf7\x44\xa4\xfc\x43\x33\x78\xa0" - "\x87\x65\x90\x70\x4f\x66\xf9\x9d\x05\x7b\xc7\x2c\x7a\x32\xd2\x30" - "\x86\x6c\x16\x7d\x36\xb6\xcd\x2c\xf8\x1e\x01\xfa\x8e\xc3\x73\xe4" - "\xae\x8b\x94\x8e\x9f\x6d\x97\x3b\xe2\x62\x59\x8d\xf7\x4c\xf1\xa2" - "\x2d\x75\xf3\x0a\x1a\x6f\x09\x90\xb9\xde\x1d\xc9\xb1\xac\xb5\xb2" - "\x8d\x92\xce\xef\xc2\x5d\x33\xbb\xfe\x22\x99\x78\xcc\x89\xa4\xa0" - "\x3c\x87\x45\x88\xe5\x19\x54\xbf\x0c\xb2\xc9\x4d\xb6\x7a\xb7\x68" - "\x0a\xf7\x64\x68\x8c\xa7\x81\x0b\xe3\x06\x3c\xaf\x03\x9e\xfb\x1e" *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@FreeBSD.ORG Thu Mar 12 08:27:56 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9CE5B1065676; Thu, 12 Mar 2009 08:27:56 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 867298FC1B; Thu, 12 Mar 2009 08:27:56 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2C8RutT023403; Thu, 12 Mar 2009 08:27:56 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2C8RtBv023371; Thu, 12 Mar 2009 08:27:55 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <200903120827.n2C8RtBv023371@svn.freebsd.org> From: Lawrence Stewart Date: Thu, 12 Mar 2009 08:27:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r189730 - in user/lstewart/alq_varlen_8.x: . contrib/bind9 contrib/cpio contrib/csup contrib/file contrib/gdtoa contrib/ncurses contrib/netcat contrib/ntp contrib/openbsm contrib/openpa... X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Mar 2009 08:27:57 -0000 Author: lstewart Date: Thu Mar 12 08:27:54 2009 New Revision: 189730 URL: http://svn.freebsd.org/changeset/base/189730 Log: Merge r189554:189729 from head. Added: user/lstewart/alq_varlen_8.x/contrib/top/install-sh - copied unchanged from r189729, head/contrib/top/install-sh user/lstewart/alq_varlen_8.x/lib/libusb/ (props changed) - copied from r189729, head/lib/libusb/ user/lstewart/alq_varlen_8.x/share/man/man4/igmp.4 - copied unchanged from r189729, head/share/man/man4/igmp.4 user/lstewart/alq_varlen_8.x/sys/amd64/conf/XENHVM - copied unchanged from r189729, head/sys/amd64/conf/XENHVM user/lstewart/alq_varlen_8.x/sys/amd64/include/xen/ (props changed) - copied from r189729, head/sys/amd64/include/xen/ user/lstewart/alq_varlen_8.x/sys/dev/cfi/cfi_disk.c - copied unchanged from r189729, head/sys/dev/cfi/cfi_disk.c user/lstewart/alq_varlen_8.x/sys/dev/cxgb/t3c_protocol_sram.h - copied unchanged from r189729, head/sys/dev/cxgb/t3c_protocol_sram.h user/lstewart/alq_varlen_8.x/sys/dev/cxgb/t3c_tp_eeprom.h - copied unchanged from r189729, head/sys/dev/cxgb/t3c_tp_eeprom.h user/lstewart/alq_varlen_8.x/sys/dev/xen/xenpci/ (props changed) - copied from r189729, head/sys/dev/xen/xenpci/ user/lstewart/alq_varlen_8.x/sys/geom/geom_redboot.c - copied unchanged from r189729, head/sys/geom/geom_redboot.c user/lstewart/alq_varlen_8.x/sys/xen/features.h - copied unchanged from r189729, head/sys/xen/features.h user/lstewart/alq_varlen_8.x/sys/xen/reboot.c - copied unchanged from r189729, head/sys/xen/reboot.c user/lstewart/alq_varlen_8.x/tools/regression/usr.bin/pkill/pgrep-_g.t - copied unchanged from r189729, head/tools/regression/usr.bin/pkill/pgrep-_g.t user/lstewart/alq_varlen_8.x/tools/regression/usr.bin/pkill/pgrep-_s.t - copied unchanged from r189729, head/tools/regression/usr.bin/pkill/pgrep-_s.t user/lstewart/alq_varlen_8.x/tools/regression/usr.bin/pkill/pkill-_g.t - copied unchanged from r189729, head/tools/regression/usr.bin/pkill/pkill-_g.t user/lstewart/alq_varlen_8.x/tools/tools/ath/athdecode/ - copied from r189729, head/tools/tools/ath/athdecode/ user/lstewart/alq_varlen_8.x/tools/tools/ath/athpoke/ - copied from r189729, head/tools/tools/ath/athpoke/ user/lstewart/alq_varlen_8.x/tools/tools/ath/common/dumpregs.h - copied unchanged from r189729, head/tools/tools/ath/common/dumpregs.h user/lstewart/alq_varlen_8.x/tools/tools/ath/common/dumpregs_5210.c - copied unchanged from r189729, head/tools/tools/ath/common/dumpregs_5210.c user/lstewart/alq_varlen_8.x/tools/tools/ath/common/dumpregs_5211.c - copied unchanged from r189729, head/tools/tools/ath/common/dumpregs_5211.c user/lstewart/alq_varlen_8.x/tools/tools/ath/common/dumpregs_5212.c - copied unchanged from r189729, head/tools/tools/ath/common/dumpregs_5212.c user/lstewart/alq_varlen_8.x/tools/tools/ath/common/dumpregs_5416.c - copied unchanged from r189729, head/tools/tools/ath/common/dumpregs_5416.c user/lstewart/alq_varlen_8.x/tools/tools/netrate/tcpp/ - copied from r189729, head/tools/tools/netrate/tcpp/ Deleted: user/lstewart/alq_varlen_8.x/contrib/top/install user/lstewart/alq_varlen_8.x/lib/libusb20/ user/lstewart/alq_varlen_8.x/share/man/man4/usb2_bluetooth.4 user/lstewart/alq_varlen_8.x/share/man/man4/usb2_controller.4 user/lstewart/alq_varlen_8.x/share/man/man4/usb2_ethernet.4 user/lstewart/alq_varlen_8.x/share/man/man4/usb2_image.4 user/lstewart/alq_varlen_8.x/share/man/man4/usb2_input.4 user/lstewart/alq_varlen_8.x/share/man/man4/usb2_misc.4 user/lstewart/alq_varlen_8.x/share/man/man4/usb2_ndis.4 user/lstewart/alq_varlen_8.x/share/man/man4/usb2_quirk.4 user/lstewart/alq_varlen_8.x/share/man/man4/usb2_serial.4 user/lstewart/alq_varlen_8.x/share/man/man4/usb2_sound.4 user/lstewart/alq_varlen_8.x/share/man/man4/usb2_storage.4 user/lstewart/alq_varlen_8.x/share/man/man4/usb2_wlan.4 user/lstewart/alq_varlen_8.x/tools/regression/usr.bin/pkill/pgrep-G.t user/lstewart/alq_varlen_8.x/tools/regression/usr.bin/pkill/pgrep-S.t user/lstewart/alq_varlen_8.x/tools/regression/usr.bin/pkill/pkill-G.t user/lstewart/alq_varlen_8.x/tools/tools/ath/athregs/dumpregs.h user/lstewart/alq_varlen_8.x/tools/tools/ath/athregs/dumpregs_5210.c user/lstewart/alq_varlen_8.x/tools/tools/ath/athregs/dumpregs_5211.c user/lstewart/alq_varlen_8.x/tools/tools/ath/athregs/dumpregs_5212.c user/lstewart/alq_varlen_8.x/tools/tools/ath/athregs/dumpregs_5416.c Modified: user/lstewart/alq_varlen_8.x/ (props changed) user/lstewart/alq_varlen_8.x/ObsoleteFiles.inc user/lstewart/alq_varlen_8.x/UPDATING user/lstewart/alq_varlen_8.x/contrib/bind9/ (props changed) user/lstewart/alq_varlen_8.x/contrib/cpio/ (props changed) user/lstewart/alq_varlen_8.x/contrib/csup/ (props changed) user/lstewart/alq_varlen_8.x/contrib/file/ (props changed) user/lstewart/alq_varlen_8.x/contrib/gdtoa/ (props changed) user/lstewart/alq_varlen_8.x/contrib/ncurses/ (props changed) user/lstewart/alq_varlen_8.x/contrib/netcat/ (props changed) user/lstewart/alq_varlen_8.x/contrib/ntp/ (props changed) user/lstewart/alq_varlen_8.x/contrib/openbsm/ (props changed) user/lstewart/alq_varlen_8.x/contrib/openpam/ (props changed) user/lstewart/alq_varlen_8.x/contrib/pf/ (props changed) user/lstewart/alq_varlen_8.x/contrib/sendmail/ (props changed) user/lstewart/alq_varlen_8.x/contrib/top/ (props changed) user/lstewart/alq_varlen_8.x/contrib/wpa/ (props changed) user/lstewart/alq_varlen_8.x/crypto/openssh/ (props changed) user/lstewart/alq_varlen_8.x/crypto/openssl/ (props changed) user/lstewart/alq_varlen_8.x/lib/Makefile user/lstewart/alq_varlen_8.x/lib/libarchive/config_freebsd.h user/lstewart/alq_varlen_8.x/lib/libc/ (props changed) user/lstewart/alq_varlen_8.x/lib/libc/softfloat/fpgetmask.c user/lstewart/alq_varlen_8.x/lib/libc/softfloat/fpgetround.c user/lstewart/alq_varlen_8.x/lib/libc/softfloat/fpgetsticky.c user/lstewart/alq_varlen_8.x/lib/libc/softfloat/fpsetmask.c user/lstewart/alq_varlen_8.x/lib/libc/softfloat/fpsetround.c user/lstewart/alq_varlen_8.x/lib/libc/softfloat/fpsetsticky.c user/lstewart/alq_varlen_8.x/lib/libc/stdio/asprintf.c (props changed) user/lstewart/alq_varlen_8.x/lib/libc/stdtime/ (props changed) user/lstewart/alq_varlen_8.x/lib/libc/string/ffsll.c (props changed) user/lstewart/alq_varlen_8.x/lib/libc/string/flsll.c (props changed) user/lstewart/alq_varlen_8.x/lib/libc/string/wcpcpy.c (props changed) user/lstewart/alq_varlen_8.x/lib/libc/string/wcpncpy.c (props changed) user/lstewart/alq_varlen_8.x/lib/libelf/Makefile user/lstewart/alq_varlen_8.x/lib/libutil/ (props changed) user/lstewart/alq_varlen_8.x/release/amd64/boot_crunch.conf user/lstewart/alq_varlen_8.x/release/i386/boot_crunch.conf user/lstewart/alq_varlen_8.x/release/ia64/boot_crunch.conf user/lstewart/alq_varlen_8.x/release/powerpc/boot_crunch.conf user/lstewart/alq_varlen_8.x/release/sparc64/boot_crunch.conf user/lstewart/alq_varlen_8.x/release/sun4v/boot_crunch.conf user/lstewart/alq_varlen_8.x/sbin/ (props changed) user/lstewart/alq_varlen_8.x/sbin/recoverdisk/recoverdisk.1 user/lstewart/alq_varlen_8.x/sbin/recoverdisk/recoverdisk.c user/lstewart/alq_varlen_8.x/share/man/man4/Makefile user/lstewart/alq_varlen_8.x/share/man/man4/altq.4 user/lstewart/alq_varlen_8.x/share/man/man4/ip.4 user/lstewart/alq_varlen_8.x/share/man/man4/multicast.4 user/lstewart/alq_varlen_8.x/share/man/man4/txp.4 user/lstewart/alq_varlen_8.x/share/zoneinfo/ (props changed) user/lstewart/alq_varlen_8.x/sys/ (props changed) user/lstewart/alq_varlen_8.x/sys/amd64/amd64/machdep.c user/lstewart/alq_varlen_8.x/sys/amd64/amd64/pmap.c user/lstewart/alq_varlen_8.x/sys/amd64/amd64/trap.c user/lstewart/alq_varlen_8.x/sys/amd64/include/pcpu.h user/lstewart/alq_varlen_8.x/sys/arm/arm/cpufunc_asm_sheeva.S (props changed) user/lstewart/alq_varlen_8.x/sys/arm/conf/AVILA user/lstewart/alq_varlen_8.x/sys/arm/conf/CAMBRIA user/lstewart/alq_varlen_8.x/sys/arm/conf/CAMBRIA.hints user/lstewart/alq_varlen_8.x/sys/arm/xscale/ixp425/avila_machdep.c user/lstewart/alq_varlen_8.x/sys/arm/xscale/ixp425/if_npe.c user/lstewart/alq_varlen_8.x/sys/arm/xscale/ixp425/ixp425.c user/lstewart/alq_varlen_8.x/sys/arm/xscale/ixp425/ixp425_pci.c user/lstewart/alq_varlen_8.x/sys/arm/xscale/ixp425/ixp425reg.h user/lstewart/alq_varlen_8.x/sys/boot/i386/libi386/Makefile user/lstewart/alq_varlen_8.x/sys/boot/i386/libi386/biosdisk.c user/lstewart/alq_varlen_8.x/sys/boot/i386/libi386/devicename.c user/lstewart/alq_varlen_8.x/sys/boot/i386/loader/Makefile user/lstewart/alq_varlen_8.x/sys/boot/i386/loader/main.c user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c user/lstewart/alq_varlen_8.x/sys/compat/ndis/hal_var.h user/lstewart/alq_varlen_8.x/sys/compat/ndis/subr_hal.c user/lstewart/alq_varlen_8.x/sys/compat/ndis/subr_usbd.c user/lstewart/alq_varlen_8.x/sys/conf/files user/lstewart/alq_varlen_8.x/sys/conf/options.amd64 user/lstewart/alq_varlen_8.x/sys/conf/options.arm user/lstewart/alq_varlen_8.x/sys/contrib/pf/ (props changed) user/lstewart/alq_varlen_8.x/sys/ddb/db_expr.c user/lstewart/alq_varlen_8.x/sys/dev/agp/agp.c user/lstewart/alq_varlen_8.x/sys/dev/agp/agp_amd64.c user/lstewart/alq_varlen_8.x/sys/dev/agp/agp_i810.c user/lstewart/alq_varlen_8.x/sys/dev/agp/agp_intel.c user/lstewart/alq_varlen_8.x/sys/dev/agp/agp_via.c user/lstewart/alq_varlen_8.x/sys/dev/agp/agppriv.h user/lstewart/alq_varlen_8.x/sys/dev/aic7xxx/ahc_pci.c user/lstewart/alq_varlen_8.x/sys/dev/aic7xxx/ahd_pci.c user/lstewart/alq_varlen_8.x/sys/dev/ata/ata-card.c user/lstewart/alq_varlen_8.x/sys/dev/ata/ata-cbus.c user/lstewart/alq_varlen_8.x/sys/dev/ata/ata-isa.c user/lstewart/alq_varlen_8.x/sys/dev/ata/ata-pci.c user/lstewart/alq_varlen_8.x/sys/dev/ata/ata-usb.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_hal/ah.c user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c user/lstewart/alq_varlen_8.x/sys/dev/ath/if_ath.c user/lstewart/alq_varlen_8.x/sys/dev/ath/if_ath_pci.c user/lstewart/alq_varlen_8.x/sys/dev/ath/if_athvar.h user/lstewart/alq_varlen_8.x/sys/dev/cardbus/cardbus.c user/lstewart/alq_varlen_8.x/sys/dev/cfi/cfi_core.c user/lstewart/alq_varlen_8.x/sys/dev/cfi/cfi_dev.c user/lstewart/alq_varlen_8.x/sys/dev/cfi/cfi_var.h user/lstewart/alq_varlen_8.x/sys/dev/cxgb/bin2h.pl user/lstewart/alq_varlen_8.x/sys/dev/cxgb/common/cxgb_ael1002.c user/lstewart/alq_varlen_8.x/sys/dev/cxgb/common/cxgb_common.h user/lstewart/alq_varlen_8.x/sys/dev/cxgb/common/cxgb_t3_cpl.h user/lstewart/alq_varlen_8.x/sys/dev/cxgb/common/cxgb_t3_hw.c user/lstewart/alq_varlen_8.x/sys/dev/cxgb/common/cxgb_xgmac.c user/lstewart/alq_varlen_8.x/sys/dev/cxgb/cxgb_adapter.h user/lstewart/alq_varlen_8.x/sys/dev/cxgb/cxgb_ioctl.h user/lstewart/alq_varlen_8.x/sys/dev/cxgb/cxgb_main.c user/lstewart/alq_varlen_8.x/sys/dev/cxgb/cxgb_multiq.c user/lstewart/alq_varlen_8.x/sys/dev/cxgb/cxgb_sge.c user/lstewart/alq_varlen_8.x/sys/dev/cxgb/cxgb_t3fw.c user/lstewart/alq_varlen_8.x/sys/dev/cxgb/cxgb_t3fw.h user/lstewart/alq_varlen_8.x/sys/dev/dc/if_dc.c user/lstewart/alq_varlen_8.x/sys/dev/drm/drmP.h user/lstewart/alq_varlen_8.x/sys/dev/drm/drm_bufs.c user/lstewart/alq_varlen_8.x/sys/dev/drm/drm_drv.c user/lstewart/alq_varlen_8.x/sys/dev/drm/drm_pci.c user/lstewart/alq_varlen_8.x/sys/dev/drm/drm_scatter.c user/lstewart/alq_varlen_8.x/sys/dev/drm/drm_sysctl.c user/lstewart/alq_varlen_8.x/sys/dev/drm/i915_drv.c user/lstewart/alq_varlen_8.x/sys/dev/drm/mach64_drv.c user/lstewart/alq_varlen_8.x/sys/dev/drm/mga_drv.c user/lstewart/alq_varlen_8.x/sys/dev/drm/r128_drv.c user/lstewart/alq_varlen_8.x/sys/dev/drm/r600_cp.c user/lstewart/alq_varlen_8.x/sys/dev/drm/radeon_cp.c user/lstewart/alq_varlen_8.x/sys/dev/drm/radeon_drv.c user/lstewart/alq_varlen_8.x/sys/dev/drm/savage_drv.c user/lstewart/alq_varlen_8.x/sys/dev/drm/sis_drv.c user/lstewart/alq_varlen_8.x/sys/dev/drm/tdfx_drv.c user/lstewart/alq_varlen_8.x/sys/dev/ed/if_ed_pccard.c user/lstewart/alq_varlen_8.x/sys/dev/exca/exca.c user/lstewart/alq_varlen_8.x/sys/dev/fe/if_fe_pccard.c user/lstewart/alq_varlen_8.x/sys/dev/firewire/fwohci_pci.c user/lstewart/alq_varlen_8.x/sys/dev/fxp/if_fxp.c user/lstewart/alq_varlen_8.x/sys/dev/if_ndis/if_ndis.c user/lstewart/alq_varlen_8.x/sys/dev/if_ndis/if_ndis_pci.c user/lstewart/alq_varlen_8.x/sys/dev/if_ndis/if_ndis_usb.c user/lstewart/alq_varlen_8.x/sys/dev/if_ndis/if_ndisvar.h user/lstewart/alq_varlen_8.x/sys/dev/ipw/if_ipw.c user/lstewart/alq_varlen_8.x/sys/dev/malo/if_malo_pci.c user/lstewart/alq_varlen_8.x/sys/dev/md/md.c user/lstewart/alq_varlen_8.x/sys/dev/mii/ip1000phy.c user/lstewart/alq_varlen_8.x/sys/dev/mii/ip1000phyreg.h user/lstewart/alq_varlen_8.x/sys/dev/mmc/mmc.c user/lstewart/alq_varlen_8.x/sys/dev/pccard/card_if.m user/lstewart/alq_varlen_8.x/sys/dev/pccard/pccard_cis.c user/lstewart/alq_varlen_8.x/sys/dev/pccard/pccarddevs user/lstewart/alq_varlen_8.x/sys/dev/pccbb/pccbb.c user/lstewart/alq_varlen_8.x/sys/dev/pci/pci.c user/lstewart/alq_varlen_8.x/sys/dev/ppbus/lpbb.c user/lstewart/alq_varlen_8.x/sys/dev/puc/puc_pci.c user/lstewart/alq_varlen_8.x/sys/dev/ral/if_ral_pci.c user/lstewart/alq_varlen_8.x/sys/dev/re/if_re.c user/lstewart/alq_varlen_8.x/sys/dev/sio/sio_pci.c user/lstewart/alq_varlen_8.x/sys/dev/smbus/smbus.c user/lstewart/alq_varlen_8.x/sys/dev/smbus/smbus.h user/lstewart/alq_varlen_8.x/sys/dev/sound/pci/emu10k1.c user/lstewart/alq_varlen_8.x/sys/dev/sound/pci/emu10kx.c user/lstewart/alq_varlen_8.x/sys/dev/sound/usb/uaudio.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/sound/usb/uaudio.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/sound/usb/uaudio_pcm.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/sound/usb/uaudioreg.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/syscons/scterm-teken.c user/lstewart/alq_varlen_8.x/sys/dev/syscons/syscons.c user/lstewart/alq_varlen_8.x/sys/dev/syscons/syscons.h user/lstewart/alq_varlen_8.x/sys/dev/syscons/teken/teken.c user/lstewart/alq_varlen_8.x/sys/dev/syscons/teken/teken.h user/lstewart/alq_varlen_8.x/sys/dev/txp/if_txp.c user/lstewart/alq_varlen_8.x/sys/dev/txp/if_txpreg.h user/lstewart/alq_varlen_8.x/sys/dev/uart/uart_bus_pci.c user/lstewart/alq_varlen_8.x/sys/dev/usb/README.TXT (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/bluetooth/TODO.TXT (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/bluetooth/ng_ubt.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/bluetooth/ng_ubt_var.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/bluetooth/ubtbcmfw.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/controller/at91dci.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/controller/at91dci.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/controller/at91dci_atmelarm.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/controller/atmegadci.c (contents, props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/controller/atmegadci.h (contents, props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/controller/atmegadci_atmelarm.c (contents, props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/controller/ehci.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/controller/ehci.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/controller/ehci_ixp4xx.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/controller/ehci_mbus.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/controller/ehci_pci.c (contents, props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/controller/musb_otg.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/controller/musb_otg.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/controller/musb_otg_atmelarm.c (contents, props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/controller/ohci.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/controller/ohci.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/controller/ohci_atmelarm.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/controller/ohci_pci.c (contents, props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/controller/uhci.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/controller/uhci.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/controller/uhci_pci.c (contents, props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/controller/usb_controller.c (contents, props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/controller/uss820dci.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/controller/uss820dci.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/controller/uss820dci_atmelarm.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/image/uscanner.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/input/uhid.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/input/ukbd.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/input/ums.c (contents, props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/input/usb_rdesc.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/misc/udbp.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/misc/udbp.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/misc/ufm.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/net/if_aue.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/net/if_auereg.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/net/if_axe.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/net/if_axereg.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/net/if_cdce.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/net/if_cdcereg.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/net/if_cue.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/net/if_cuereg.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/net/if_kue.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/net/if_kuefw.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/net/if_kuereg.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/net/if_rue.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/net/if_ruereg.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/net/if_udav.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/net/if_udavreg.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/net/usb_ethernet.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/net/usb_ethernet.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/quirk/usb_quirk.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/quirk/usb_quirk.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/serial/u3g.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/serial/uark.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/serial/ubsa.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/serial/ubser.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/serial/uchcom.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/serial/ucycom.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/serial/ufoma.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/serial/uftdi.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/serial/uftdi_reg.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/serial/ugensa.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/serial/uipaq.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/serial/ulpt.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/serial/umct.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/serial/umodem.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/serial/umoscom.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/serial/uplcom.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/serial/usb_serial.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/serial/usb_serial.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/serial/uslcom.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/serial/uvisor.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/serial/uvscom.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/storage/rio500_usb.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/storage/umass.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/storage/urio.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/storage/ustorage_fs.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/template/usb_template.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/template/usb_template.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/template/usb_template_cdce.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/template/usb_template_msc.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/template/usb_template_mtp.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/ufm_ioctl.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_bus.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_busdma.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_busdma.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_cdc.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_compat_linux.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_compat_linux.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_controller.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_core.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_core.h (contents, props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_debug.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_debug.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_defs.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_dev.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_dev.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_device.c (contents, props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_device.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_dynamic.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_dynamic.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_endian.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_error.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_error.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_generic.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_generic.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_handle_request.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_handle_request.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_hid.c (contents, props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_hid.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_hub.c (contents, props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_hub.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_if.m (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_ioctl.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_lookup.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_lookup.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_mbuf.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_mbuf.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_mfunc.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_msctest.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_msctest.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_parse.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_parse.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_pci.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_process.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_process.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_request.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_request.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_revision.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_sw_transfer.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_sw_transfer.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_transfer.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_transfer.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_util.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_util.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usbdevs (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/usbhid.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/wlan/if_rum.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/wlan/if_rumfw.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/wlan/if_rumreg.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/wlan/if_rumvar.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/wlan/if_ural.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/wlan/if_uralreg.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/wlan/if_uralvar.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/wlan/if_zyd.c (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/wlan/if_zydfw.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/wlan/if_zydreg.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/usb/wlan/usb_wlan.h (props changed) user/lstewart/alq_varlen_8.x/sys/dev/vge/if_vge.c user/lstewart/alq_varlen_8.x/sys/dev/xen/balloon/balloon.c user/lstewart/alq_varlen_8.x/sys/dev/xen/blkfront/blkfront.c user/lstewart/alq_varlen_8.x/sys/dev/xen/console/console.c user/lstewart/alq_varlen_8.x/sys/dev/xen/console/xencons_ring.c user/lstewart/alq_varlen_8.x/sys/dev/xen/netfront/ (props changed) user/lstewart/alq_varlen_8.x/sys/dev/xen/netfront/netfront.c user/lstewart/alq_varlen_8.x/sys/dev/xl/if_xl.c user/lstewart/alq_varlen_8.x/sys/fs/cd9660/cd9660_vfsops.c user/lstewart/alq_varlen_8.x/sys/fs/devfs/devfs_vnops.c user/lstewart/alq_varlen_8.x/sys/fs/nullfs/null_vnops.c user/lstewart/alq_varlen_8.x/sys/fs/udf/udf_vfsops.c user/lstewart/alq_varlen_8.x/sys/geom/eli/g_eli.c user/lstewart/alq_varlen_8.x/sys/geom/part/g_part_pc98.c user/lstewart/alq_varlen_8.x/sys/i386/i386/in_cksum.c user/lstewart/alq_varlen_8.x/sys/i386/i386/trap.c user/lstewart/alq_varlen_8.x/sys/i386/include/xen/xenpmap.h user/lstewart/alq_varlen_8.x/sys/kern/kern_ktrace.c user/lstewart/alq_varlen_8.x/sys/kern/kern_sysctl.c user/lstewart/alq_varlen_8.x/sys/kern/subr_bus.c user/lstewart/alq_varlen_8.x/sys/kern/subr_param.c user/lstewart/alq_varlen_8.x/sys/kern/sys_generic.c user/lstewart/alq_varlen_8.x/sys/kern/sys_pipe.c user/lstewart/alq_varlen_8.x/sys/kern/vfs_bio.c user/lstewart/alq_varlen_8.x/sys/kern/vfs_cache.c user/lstewart/alq_varlen_8.x/sys/kern/vfs_lookup.c user/lstewart/alq_varlen_8.x/sys/kern/vfs_vnops.c user/lstewart/alq_varlen_8.x/sys/kern/vnode_if.src user/lstewart/alq_varlen_8.x/sys/legacy/dev/ata/ata-usb.c (props changed) user/lstewart/alq_varlen_8.x/sys/legacy/dev/sound/usb/uaudio.c (props changed) user/lstewart/alq_varlen_8.x/sys/legacy/dev/sound/usb/uaudio.h (props changed) user/lstewart/alq_varlen_8.x/sys/legacy/dev/sound/usb/uaudio_pcm.c (props changed) user/lstewart/alq_varlen_8.x/sys/legacy/dev/sound/usb/uaudioreg.h (props changed) user/lstewart/alq_varlen_8.x/sys/legacy/dev/usb/ (props changed) user/lstewart/alq_varlen_8.x/sys/legacy/dev/usb/ehci_ixp4xx.c (props changed) user/lstewart/alq_varlen_8.x/sys/legacy/dev/usb/ehci_pci.c user/lstewart/alq_varlen_8.x/sys/legacy/dev/usb/ohci_pci.c user/lstewart/alq_varlen_8.x/sys/legacy/dev/usb/uhci_pci.c user/lstewart/alq_varlen_8.x/sys/mips/mips/elf64_machdep.c (props changed) user/lstewart/alq_varlen_8.x/sys/net/bpf.c user/lstewart/alq_varlen_8.x/sys/netinet/if_ether.c user/lstewart/alq_varlen_8.x/sys/netinet/igmp.c user/lstewart/alq_varlen_8.x/sys/netinet/igmp_var.h user/lstewart/alq_varlen_8.x/sys/netinet/in.c user/lstewart/alq_varlen_8.x/sys/netinet/in.h user/lstewart/alq_varlen_8.x/sys/netinet/in_mcast.c user/lstewart/alq_varlen_8.x/sys/netinet/in_pcb.c user/lstewart/alq_varlen_8.x/sys/netinet/in_pcb.h user/lstewart/alq_varlen_8.x/sys/netinet/in_proto.c user/lstewart/alq_varlen_8.x/sys/netinet/in_var.h user/lstewart/alq_varlen_8.x/sys/netinet/ip_input.c user/lstewart/alq_varlen_8.x/sys/netinet/ip_var.h user/lstewart/alq_varlen_8.x/sys/netinet/raw_ip.c user/lstewart/alq_varlen_8.x/sys/netinet/udp_usrreq.c user/lstewart/alq_varlen_8.x/sys/netinet/vinet.h user/lstewart/alq_varlen_8.x/sys/nfsclient/nfs_vnops.c user/lstewart/alq_varlen_8.x/sys/pc98/cbus/scterm-sck.c user/lstewart/alq_varlen_8.x/sys/powerpc/aim/mmu_oea.c user/lstewart/alq_varlen_8.x/sys/security/audit/audit.c user/lstewart/alq_varlen_8.x/sys/security/audit/audit.h user/lstewart/alq_varlen_8.x/sys/security/audit/audit_syscalls.c user/lstewart/alq_varlen_8.x/sys/security/mac_bsdextended/mac_bsdextended.c user/lstewart/alq_varlen_8.x/sys/sparc64/conf/GENERIC user/lstewart/alq_varlen_8.x/sys/sys/buf.h user/lstewart/alq_varlen_8.x/sys/sys/diskpc98.h user/lstewart/alq_varlen_8.x/sys/sys/ktrace.h user/lstewart/alq_varlen_8.x/sys/sys/mount.h user/lstewart/alq_varlen_8.x/sys/sys/param.h user/lstewart/alq_varlen_8.x/sys/sys/pipe.h user/lstewart/alq_varlen_8.x/sys/sys/proc.h user/lstewart/alq_varlen_8.x/sys/sys/sysctl.h user/lstewart/alq_varlen_8.x/sys/sys/vimage.h user/lstewart/alq_varlen_8.x/sys/ufs/ffs/ffs_snapshot.c user/lstewart/alq_varlen_8.x/sys/ufs/ffs/ffs_vfsops.c user/lstewart/alq_varlen_8.x/sys/vm/vm_init.c user/lstewart/alq_varlen_8.x/sys/vm/vnode_pager.c user/lstewart/alq_varlen_8.x/sys/xen/evtchn/evtchn.c user/lstewart/alq_varlen_8.x/sys/xen/evtchn/evtchn_dev.c user/lstewart/alq_varlen_8.x/sys/xen/features.c user/lstewart/alq_varlen_8.x/sys/xen/gnttab.c user/lstewart/alq_varlen_8.x/sys/xen/gnttab.h user/lstewart/alq_varlen_8.x/sys/xen/hypervisor.h user/lstewart/alq_varlen_8.x/sys/xen/interface/arch-x86/xen.h user/lstewart/alq_varlen_8.x/sys/xen/interface/hvm/params.h user/lstewart/alq_varlen_8.x/sys/xen/xen_intr.h user/lstewart/alq_varlen_8.x/sys/xen/xenbus/xenbus_probe.c user/lstewart/alq_varlen_8.x/sys/xen/xenbus/xenbus_xs.c user/lstewart/alq_varlen_8.x/tools/regression/lib/msun/test-conj.t (props changed) user/lstewart/alq_varlen_8.x/tools/tools/ath/Makefile user/lstewart/alq_varlen_8.x/tools/tools/ath/athregs/Makefile user/lstewart/alq_varlen_8.x/usr.bin/csup/ (props changed) user/lstewart/alq_varlen_8.x/usr.bin/kdump/kdump.1 user/lstewart/alq_varlen_8.x/usr.bin/kdump/kdump.c user/lstewart/alq_varlen_8.x/usr.bin/ktrace/ktrace.1 user/lstewart/alq_varlen_8.x/usr.bin/ktrace/ktrace.h user/lstewart/alq_varlen_8.x/usr.bin/ktrace/subr.c user/lstewart/alq_varlen_8.x/usr.bin/netstat/inet.c user/lstewart/alq_varlen_8.x/usr.bin/procstat/ (props changed) user/lstewart/alq_varlen_8.x/usr.bin/sockstat/sockstat.c user/lstewart/alq_varlen_8.x/usr.bin/systat/vmstat.c user/lstewart/alq_varlen_8.x/usr.bin/top/machine.c user/lstewart/alq_varlen_8.x/usr.sbin/cxgbtool/cxgbtool.c user/lstewart/alq_varlen_8.x/usr.sbin/cxgbtool/version.h user/lstewart/alq_varlen_8.x/usr.sbin/dumpcis/cardinfo.h (props changed) user/lstewart/alq_varlen_8.x/usr.sbin/dumpcis/cis.h (props changed) user/lstewart/alq_varlen_8.x/usr.sbin/ifmcstat/Makefile user/lstewart/alq_varlen_8.x/usr.sbin/ifmcstat/ifmcstat.8 user/lstewart/alq_varlen_8.x/usr.sbin/ifmcstat/ifmcstat.c user/lstewart/alq_varlen_8.x/usr.sbin/makefs/ffs/ffs_bswap.c (props changed) user/lstewart/alq_varlen_8.x/usr.sbin/makefs/ffs/ffs_subr.c (props changed) user/lstewart/alq_varlen_8.x/usr.sbin/makefs/ffs/ufs_bswap.h (props changed) user/lstewart/alq_varlen_8.x/usr.sbin/makefs/getid.c (props changed) user/lstewart/alq_varlen_8.x/usr.sbin/usbconfig/Makefile user/lstewart/alq_varlen_8.x/usr.sbin/zic/ (props changed) Modified: user/lstewart/alq_varlen_8.x/ObsoleteFiles.inc ============================================================================== --- user/lstewart/alq_varlen_8.x/ObsoleteFiles.inc Thu Mar 12 07:56:19 2009 (r189729) +++ user/lstewart/alq_varlen_8.x/ObsoleteFiles.inc Thu Mar 12 08:27:54 2009 (r189730) @@ -14,6 +14,12 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20090308: libusb.so.1 renamed +OLD_LIBS+=usr/lib/libusb20.so.1 +OLD_FILES+=usr/lib/libusb20.a +OLD_FILES+=usr/lib/libusb20.so +OLD_FILES+=usr/lib/libusb20_p.a +OLD_FILES+=usr/include/libusb20_compat01.h # 20090226: libmp(3) functions renamed OLD_LIBS+=usr/lib/libmp.so.6 # 20090223: changeover of USB stacks @@ -1766,9 +1772,6 @@ OLD_FILES+=usr/lib/libss.a OLD_FILES+=usr/lib/libss_p.a OLD_FILES+=usr/lib/libtelnet.a OLD_FILES+=usr/lib/libtelnet_p.a -OLD_FILES+=usr/lib/libusb.a -OLD_FILES+=usr/lib/libusb.so -OLD_FILES+=usr/lib/libusb_p.a OLD_FILES+=usr/sbin/diskpart # 200202XX OLD_FILES+=usr/bin/gprof4 Modified: user/lstewart/alq_varlen_8.x/UPDATING ============================================================================== --- user/lstewart/alq_varlen_8.x/UPDATING Thu Mar 12 07:56:19 2009 (r189729) +++ user/lstewart/alq_varlen_8.x/UPDATING Thu Mar 12 08:27:54 2009 (r189730) @@ -22,6 +22,53 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8. to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090309: + IGMPv3 and Source-Specific Multicast (SSM) have been merged + to the IPv4 stack. VIMAGE hooks are in but not yet used. + + For kernel developers, the most important changes are that the + ip_output() and ip_input() paths no longer take the IN_MULTI_LOCK(), + and this lock has been downgraded to a non-recursive mutex. + + Transport protocols (UDP, Raw IP) are now responsible for filtering + inbound multicast traffic according to group membership and source + filters. The imo_multicast_filter() KPI exists for this purpose. + Transports which do not use multicast (SCTP, TCP) already reject + multicast by default. Forwarding and receive performance may improve + as a mutex acquisition is no longer needed in the ip_input() + low-level input path. in_addmulti() and in_delmulti() are shimmed + to new KPIs which exist to support SSM in-kernel. + + For application developers, it is recommended that loopback of + multicast datagrams be disabled for best performance, as this + will still cause the lock to be taken for each looped-back + datagram transmission. The net.inet.ip.mcast.loop sysctl may + be tuned to 0 to disable loopback by default; it defaults to 1 + to preserve the existing behaviour. + + For systems administrators, to obtain best performance with + multicast reception and multiple groups, it is always recommended + that a card with a suitably precise hash filter is used. Hash + collisions will still result in the lock being taken within the + transport protocol input path to check group membership. + + If deploying FreeBSD in an environment with IGMP snooping switches, + it is recommended that the net.inet.igmp.sendlocal sysctl remain + enabled; this forces 224.0.0.0/24 group membership to be announced + via IGMP. + + The size of 'struct igmpstat' has changed; netstat needs to be + recompiled to reflect this. + Bump __FreeBSD_version to 800070. + +20090309: + libusb20.so.1 is now installed as libusb.so.1 and the ports system + updated to use it. This requires a buildworld/installworld in order to + update the library and dependencies (usbconfig, etc). Its advisable to + rebuild all ports which uses libusb. More specific directions are given + in the ports collection UPDATING file. Any /etc/libmap.conf entries for + libusb are no longer required and can be removed. + 20090302: A workaround is committed to allow the creation of System V shared memory segment of size > 2 GB on the 64-bit architectures. Copied: user/lstewart/alq_varlen_8.x/contrib/top/install-sh (from r189729, head/contrib/top/install-sh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/lstewart/alq_varlen_8.x/contrib/top/install-sh Thu Mar 12 08:27:54 2009 (r189730, copy of r189729, head/contrib/top/install-sh) @@ -0,0 +1,69 @@ +#!/bin/sh +# +# this shell script is amazingly similar to the old and lamented +# BSD "install" command. It recognized the following options: +# +# -o target file owner +# -m target file mode +# -g target file group owner +# +# +# scan the options +# +while [ $# -gt 0 ]; do + case $1 in + -o) + owner=$2 + shift ; shift + ;; + + -m) + mode=$2 + shift; shift + ;; + + -g) + group=$2 + shift ; shift + ;; + + -*) + echo "install: unknown option $1" + exit + ;; + + *) + break + ;; + esac +done +# +# we need two more: filename and destination +# +if [ $# -ne 2 ]; then + echo "Usage: install [ -o owner ] [ -m mode ] [ -g group ] file destination" + exit +fi +# +# first, copy +# +cp $1 $2 +# +# normalize the name +# +dest=$2 +if [ -d $2 ]; then + dest=$2/`basename $1` +fi +# +# do optional things +# +if [ "$owner" ]; then + chown $owner $dest +fi +if [ "$group" ]; then + chgrp $group $dest +fi +if [ "$mode" ]; then + chmod $mode $dest +fi Modified: user/lstewart/alq_varlen_8.x/lib/Makefile ============================================================================== --- user/lstewart/alq_varlen_8.x/lib/Makefile Thu Mar 12 07:56:19 2009 (r189729) +++ user/lstewart/alq_varlen_8.x/lib/Makefile Thu Mar 12 08:27:54 2009 (r189730) @@ -40,7 +40,7 @@ SUBDIR= ${_csu} libc libbsm libauditd li ${_libpmc} libproc librt ${_libsdp} ${_libsm} ${_libsmb} \ ${_libsmdb} \ ${_libsmutil} libstand ${_libtelnet} ${_libthr} libthread_db libufs \ - libugidfw ${_libusbhid} ${_libusb20} ${_libvgl} libwrap liby libz \ + libugidfw ${_libusbhid} ${_libusb} ${_libvgl} libwrap liby libz \ ${_bind} .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf) @@ -139,7 +139,7 @@ _libtelnet= libtelnet .if ${MK_USB} != "no" _libusbhid= libusbhid -_libusb20= libusb20 +_libusb= libusb .endif .include Modified: user/lstewart/alq_varlen_8.x/lib/libarchive/config_freebsd.h ============================================================================== --- user/lstewart/alq_varlen_8.x/lib/libarchive/config_freebsd.h Thu Mar 12 07:56:19 2009 (r189729) +++ user/lstewart/alq_varlen_8.x/lib/libarchive/config_freebsd.h Thu Mar 12 08:27:54 2009 (r189730) @@ -34,8 +34,12 @@ #define HAVE_ACL_SET_FD_NP 1 #define HAVE_ACL_SET_FILE 1 #define HAVE_ACL_USER 1 +#if 0 +/* XXX Temporarily disable support for reading extended attributes from + * disk, as it seems to be badly broken on ZFS. XXX */ #define HAVE_EXTATTR_GET_FILE 1 #define HAVE_EXTATTR_LIST_FILE 1 +#endif #define HAVE_EXTATTR_SET_FD 1 #define HAVE_EXTATTR_SET_FILE 1 #define HAVE_SYS_ACL_H 1 Modified: user/lstewart/alq_varlen_8.x/lib/libc/softfloat/fpgetmask.c ============================================================================== --- user/lstewart/alq_varlen_8.x/lib/libc/softfloat/fpgetmask.c Thu Mar 12 07:56:19 2009 (r189729) +++ user/lstewart/alq_varlen_8.x/lib/libc/softfloat/fpgetmask.c Thu Mar 12 08:27:54 2009 (r189730) @@ -1,4 +1,4 @@ -/* $NetBSD: fpgetmask.c,v 1.3 2002/05/12 13:12:45 bjh21 Exp $ */ +/* $NetBSD: fpgetmask.c,v 1.4 2008/04/28 20:23:00 martin Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -15,13 +15,6 @@ * 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 NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: user/lstewart/alq_varlen_8.x/lib/libc/softfloat/fpgetround.c ============================================================================== --- user/lstewart/alq_varlen_8.x/lib/libc/softfloat/fpgetround.c Thu Mar 12 07:56:19 2009 (r189729) +++ user/lstewart/alq_varlen_8.x/lib/libc/softfloat/fpgetround.c Thu Mar 12 08:27:54 2009 (r189730) @@ -1,4 +1,4 @@ -/* $NetBSD: fpgetround.c,v 1.2 2002/01/13 21:45:53 thorpej Exp $ */ +/* $NetBSD: fpgetround.c,v 1.3 2008/04/28 20:23:00 martin Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -15,13 +15,6 @@ * 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 NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: user/lstewart/alq_varlen_8.x/lib/libc/softfloat/fpgetsticky.c ============================================================================== --- user/lstewart/alq_varlen_8.x/lib/libc/softfloat/fpgetsticky.c Thu Mar 12 07:56:19 2009 (r189729) +++ user/lstewart/alq_varlen_8.x/lib/libc/softfloat/fpgetsticky.c Thu Mar 12 08:27:54 2009 (r189730) @@ -1,4 +1,4 @@ -/* $NetBSD: fpgetsticky.c,v 1.2 2002/01/13 21:45:53 thorpej Exp $ */ +/* $NetBSD: fpgetsticky.c,v 1.3 2008/04/28 20:23:00 martin Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -15,13 +15,6 @@ * 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 NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: user/lstewart/alq_varlen_8.x/lib/libc/softfloat/fpsetmask.c ============================================================================== --- user/lstewart/alq_varlen_8.x/lib/libc/softfloat/fpsetmask.c Thu Mar 12 07:56:19 2009 (r189729) +++ user/lstewart/alq_varlen_8.x/lib/libc/softfloat/fpsetmask.c Thu Mar 12 08:27:54 2009 (r189730) @@ -1,4 +1,4 @@ -/* $NetBSD: fpsetmask.c,v 1.3 2002/05/12 13:12:45 bjh21 Exp $ */ +/* $NetBSD: fpsetmask.c,v 1.4 2008/04/28 20:23:00 martin Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -15,13 +15,6 @@ * 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 NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: user/lstewart/alq_varlen_8.x/lib/libc/softfloat/fpsetround.c ============================================================================== --- user/lstewart/alq_varlen_8.x/lib/libc/softfloat/fpsetround.c Thu Mar 12 07:56:19 2009 (r189729) +++ user/lstewart/alq_varlen_8.x/lib/libc/softfloat/fpsetround.c Thu Mar 12 08:27:54 2009 (r189730) @@ -1,4 +1,4 @@ -/* $NetBSD: fpsetround.c,v 1.2 2002/01/13 21:45:53 thorpej Exp $ */ +/* $NetBSD: fpsetround.c,v 1.3 2008/04/28 20:23:00 martin Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -15,13 +15,6 @@ * 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 NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: user/lstewart/alq_varlen_8.x/lib/libc/softfloat/fpsetsticky.c ============================================================================== --- user/lstewart/alq_varlen_8.x/lib/libc/softfloat/fpsetsticky.c Thu Mar 12 07:56:19 2009 (r189729) +++ user/lstewart/alq_varlen_8.x/lib/libc/softfloat/fpsetsticky.c Thu Mar 12 08:27:54 2009 (r189730) @@ -1,4 +1,4 @@ -/* $NetBSD: fpsetsticky.c,v 1.2 2002/01/13 21:45:54 thorpej Exp $ */ +/* $NetBSD: fpsetsticky.c,v 1.3 2008/04/28 20:23:00 martin Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -15,13 +15,6 @@ * 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 NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED Modified: user/lstewart/alq_varlen_8.x/lib/libelf/Makefile ============================================================================== --- user/lstewart/alq_varlen_8.x/lib/libelf/Makefile Thu Mar 12 07:56:19 2009 (r189729) +++ user/lstewart/alq_varlen_8.x/lib/libelf/Makefile Thu Mar 12 08:27:54 2009 (r189730) @@ -148,7 +148,7 @@ VERSION_MAP= ${.CURDIR}/Version.map LIBELF_TEST_HOOKS?= 1 .if defined(LIBELF_TEST_HOOKS) && (${LIBELF_TEST_HOOKS} > 0) -CFLAGS+= -DLIBELF_TEST_HOOKS=1 +CFLAGS+= -DLIBELF_TEST_HOOKS .endif libelf_convert.c: elf_types.m4 libelf_convert.m4 Modified: user/lstewart/alq_varlen_8.x/release/amd64/boot_crunch.conf ============================================================================== --- user/lstewart/alq_varlen_8.x/release/amd64/boot_crunch.conf Thu Mar 12 07:56:19 2009 (r189729) +++ user/lstewart/alq_varlen_8.x/release/amd64/boot_crunch.conf Thu Mar 12 08:27:54 2009 (r189730) @@ -42,4 +42,4 @@ progs usbconfig libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -ldevinfo -libs -lbsdxml -larchive -lbz2 -lusb20 +libs -lbsdxml -larchive -lbz2 -lusb Modified: user/lstewart/alq_varlen_8.x/release/i386/boot_crunch.conf ============================================================================== --- user/lstewart/alq_varlen_8.x/release/i386/boot_crunch.conf Thu Mar 12 07:56:19 2009 (r189729) +++ user/lstewart/alq_varlen_8.x/release/i386/boot_crunch.conf Thu Mar 12 08:27:54 2009 (r189730) @@ -42,4 +42,4 @@ progs usbconfig libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -ldevinfo -libs -lbsdxml -larchive -lbz2 -lusb20 +libs -lbsdxml -larchive -lbz2 -lusb Modified: user/lstewart/alq_varlen_8.x/release/ia64/boot_crunch.conf ============================================================================== --- user/lstewart/alq_varlen_8.x/release/ia64/boot_crunch.conf Thu Mar 12 07:56:19 2009 (r189729) +++ user/lstewart/alq_varlen_8.x/release/ia64/boot_crunch.conf Thu Mar 12 08:27:54 2009 (r189730) @@ -46,4 +46,4 @@ progs usbconfig libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph libs -ldialog -lncurses -ldisk -lcam -lkiconv -lsbuf -lufs -ldevinfo -libs -lgeom -lbsdxml -larchive -lbz2 -lusb20 +libs -lgeom -lbsdxml -larchive -lbz2 -lusb Modified: user/lstewart/alq_varlen_8.x/release/powerpc/boot_crunch.conf ============================================================================== --- user/lstewart/alq_varlen_8.x/release/powerpc/boot_crunch.conf Thu Mar 12 07:56:19 2009 (r189729) +++ user/lstewart/alq_varlen_8.x/release/powerpc/boot_crunch.conf Thu Mar 12 08:27:54 2009 (r189730) @@ -44,4 +44,4 @@ progs usbconfig libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph libs -ldialog -lncurses -ldisk -lcam -lkiconv -lsbuf -lufs -libs -lbsdxml -larchive -lbz2 -lusb20 +libs -lbsdxml -larchive -lbz2 -lusb Modified: user/lstewart/alq_varlen_8.x/release/sparc64/boot_crunch.conf ============================================================================== --- user/lstewart/alq_varlen_8.x/release/sparc64/boot_crunch.conf Thu Mar 12 07:56:19 2009 (r189729) +++ user/lstewart/alq_varlen_8.x/release/sparc64/boot_crunch.conf Thu Mar 12 08:27:54 2009 (r189730) @@ -42,4 +42,4 @@ progs usbconfig libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -lbsdxml -libs -larchive -lbz2 -lusb20 +libs -larchive -lbz2 -lusb Modified: user/lstewart/alq_varlen_8.x/release/sun4v/boot_crunch.conf ============================================================================== --- user/lstewart/alq_varlen_8.x/release/sun4v/boot_crunch.conf Thu Mar 12 07:56:19 2009 (r189729) +++ user/lstewart/alq_varlen_8.x/release/sun4v/boot_crunch.conf Thu Mar 12 08:27:54 2009 (r189730) @@ -42,4 +42,4 @@ progs usbconfig libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -lbsdxml -libs -larchive -lbz2 -lusb20 +libs -larchive -lbz2 -lusb Modified: user/lstewart/alq_varlen_8.x/sbin/recoverdisk/recoverdisk.1 ============================================================================== --- user/lstewart/alq_varlen_8.x/sbin/recoverdisk/recoverdisk.1 Thu Mar 12 07:56:19 2009 (r189729) +++ user/lstewart/alq_varlen_8.x/sbin/recoverdisk/recoverdisk.1 Thu Mar 12 08:27:54 2009 (r189730) @@ -32,7 +32,9 @@ .Nd recover data from hard disk or optical media .Sh SYNOPSIS .Nm +.Op Fl b Ar bigsize .Op Fl r Ar rlist +.Op Fl s Ar snapshot .Op Fl w Ar wlist .Ar special .Op Ar file @@ -46,15 +48,23 @@ It starts reading in multiples of the se Whenever a block fails, it is put to the end of the working queue and will be read again, possibly with a smaller read size. .Pp -It uses block sizes of roughly 1 MB, 64kB, and the native sector size (usually -512 bytes). +By default it uses block sizes of roughly 1 MB, 32kB, and the native +sector size (usually 512 bytes). These figures are adjusted slightly, for devices whose sectorsize is not a power of 2, e.g., audio CDs with a sector size of 2352 bytes. .Pp The options are as follows: .Bl -tag -width indent +.It Fl b Ar bigsize +The size of reads attempted first. +The middle pass is roughly the logarithmic average of the bigsize and +the sectorsize. .It Fl r Ar rlist Read the list of blocks and block sizes to read from the specified file. +.It Fl s Ar snapshot +How often we should update the worklist file while things go OK. +The default is 60 and the units is "progress messages" so if things +go well, this is the same as once per minute. .It Fl w Ar wlist Write the list of remaining blocks to read to the specified file if .Nm @@ -106,6 +116,10 @@ recoverdisk -r worklist -w worklist /dev # recover a single file from the unreadable media touch file.avi; recoverdisk /cdrom/file.avi file.avi + +# If the disk hangs the system on read-errors try: +recoverdisk -b 0 /dev/ad3 /somewhere + .Ed .Sh SEE ALSO .Xr dd 1 Modified: user/lstewart/alq_varlen_8.x/sbin/recoverdisk/recoverdisk.c ============================================================================== --- user/lstewart/alq_varlen_8.x/sbin/recoverdisk/recoverdisk.c Thu Mar 12 07:56:19 2009 (r189729) +++ user/lstewart/alq_varlen_8.x/sbin/recoverdisk/recoverdisk.c Thu Mar 12 08:27:54 2009 (r189730) @@ -26,7 +26,7 @@ volatile sig_atomic_t aborting = 0; static size_t bigsize = 1024 * 1024; -static size_t medsize = 64 * 1024; +static size_t medsize; static size_t minsize = 512; struct lump { @@ -76,6 +76,7 @@ static void save_worklist(void) { FILE *file; + struct lump *llp; if (wworklist != NULL) { (void)fprintf(stderr, "\nSaving worklist ..."); @@ -85,14 +86,11 @@ save_worklist(void) if (file == NULL) err(1, "Error opening file %s", wworklist); - for (;;) { - lp = TAILQ_FIRST(&lumps); - if (lp == NULL) - break; + TAILQ_FOREACH(llp, &lumps, list) fprintf(file, "%jd %jd %d\n", - (intmax_t)lp->start, (intmax_t)lp->len, lp->state); - TAILQ_REMOVE(&lumps, lp, list); - } + (intmax_t)llp->start, (intmax_t)llp->len, + llp->state); + fclose(file); (void)fprintf(stderr, " done.\n"); } } @@ -160,14 +158,21 @@ main(int argc, char * const argv[]) u_int sectorsize; time_t t1, t2; struct stat sb; + u_int n, snapshot = 60; - while ((ch = getopt(argc, argv, "r:w:")) != -1) { + while ((ch = getopt(argc, argv, "b:r:w:s:")) != -1) { switch (ch) { + case 'b': + bigsize = strtoul(optarg, NULL, 0); + break; case 'r': rworklist = strdup(optarg); if (rworklist == NULL) err(1, "Cannot allocate enough memory"); break; + case 's': + snapshot = strtoul(optarg, NULL, 0); + break; case 'w': wworklist = strdup(optarg); if (wworklist == NULL) @@ -197,15 +202,8 @@ main(int argc, char * const argv[]) if (error < 0) err(1, "DIOCGSECTORSIZE failed"); - /* - * Make medsize roughly 64kB, depending on native sector - * size. bigsize has to be a multiple of medsize. - * For media with 2352 sectors, this will - * result in 2352, 63504, and 1016064 bytes. - */ minsize = sectorsize; - medsize = (medsize / sectorsize) * sectorsize; - bigsize = medsize * 16; + bigsize = (bigsize / sectorsize) * sectorsize; error = ioctl(fdr, DIOCGMEDIASIZE, &t); if (error < 0) @@ -215,9 +213,20 @@ main(int argc, char * const argv[]) flags |= O_CREAT | O_TRUNC; } + if (bigsize < minsize) + bigsize = minsize; + + for (ch = 0; (bigsize >> ch) > minsize; ch++) + continue; + medsize = bigsize >> (ch / 2); + medsize = (medsize / minsize) * minsize; + + fprintf(stderr, "Bigsize = %zu, medsize = %zu, minsize = %zu\n", + bigsize, medsize, minsize); + buf = malloc(bigsize); if (buf == NULL) - err(1, "Cannot allocate %jd bytes buffer", (intmax_t)bigsize); + err(1, "Cannot allocate %zu bytes buffer", bigsize); if (argc > 1) { fdw = open(argv[1], flags, DEFFILEMODE); @@ -238,6 +247,7 @@ main(int argc, char * const argv[]) t1 = 0; start = len = i = state = 0; PRINT_HEADER; + n = 0; for (;;) { lp = TAILQ_FIRST(&lumps); if (lp == NULL) @@ -257,6 +267,10 @@ main(int argc, char * const argv[]) if (t1 != t2 || lp->len < (off_t)bigsize) { PRINT_STATUS(start, i, len, state, d, t); t1 = t2; + if (++n == snapshot) { + save_worklist(); + n = 0; + } } if (i == 0) { errx(1, "BOGUS i %10jd", (intmax_t)i); Modified: user/lstewart/alq_varlen_8.x/share/man/man4/Makefile ============================================================================== --- user/lstewart/alq_varlen_8.x/share/man/man4/Makefile Thu Mar 12 07:56:19 2009 (r189729) +++ user/lstewart/alq_varlen_8.x/share/man/man4/Makefile Thu Mar 12 08:27:54 2009 (r189730) @@ -128,6 +128,7 @@ MAN= aac.4 \ if_bridge.4 \ ifmib.4 \ igb.4 \ + igmp.4 \ iic.4 \ iicbb.4 \ iicbus.4 \ Modified: user/lstewart/alq_varlen_8.x/share/man/man4/altq.4 ============================================================================== --- user/lstewart/alq_varlen_8.x/share/man/man4/altq.4 Thu Mar 12 07:56:19 2009 (r189729) +++ user/lstewart/alq_varlen_8.x/share/man/man4/altq.4 Thu Mar 12 08:27:54 2009 (r189730) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 12, 2008 +.Dd March 12, 2009 .Dt ALTQ 4 .Os .Sh NAME @@ -151,6 +151,7 @@ They have been applied to the following .Xr sk 4 , .Xr ste 4 , .Xr stge 4 , +.Xr txp 4 , .Xr udav 4 , .Xr ural 4 , .Xr vge 4 , Copied: user/lstewart/alq_varlen_8.x/share/man/man4/igmp.4 (from r189729, head/share/man/man4/igmp.4) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/lstewart/alq_varlen_8.x/share/man/man4/igmp.4 Thu Mar 12 08:27:54 2009 (r189730, copy of r189729, head/share/man/man4/igmp.4) @@ -0,0 +1,139 @@ +.\" +.\" Copyright (c) 2009 Bruce Simpson. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" 3. Neither the name of the project nor the names of its contributors +.\" may be used to endorse or promote products derived from this software +.\" without specific prior written permission. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd March 9, 2009 +.Dt IGMP 4 +.Os +.Sh NAME +.Nm igmp +.Nd Internet Group Management Protocol +.Sh SYNOPSIS +.In sys/types.h +.In sys/socket.h +.In netinet/in.h +.In netinet/in_systm.h +.In netinet/ip.h +.In netinet/igmp.h +.Ft int +.Fn socket AF_INET SOCK_RAW IPPROTO_IGMP +.Sh DESCRIPTION +.Tn IGMP +is a control plane protocol used by IPv4 hosts and routers to +propagate multicast group membership information. +Normally this protocol is not used directly, except by the kernel +itself, in response to multicast membership requests by user +applications. +Routing protocols may open a raw socket to directly interact with +.Nm . +.Pp +As of +.Fx 8.0 , +IGMP version 3 is implemented. +This adds support for Source-Specific Multicast (SSM), whereby +applications may communicate to upstream multicast routers that +they are only interested in receiving multicast streams from +particular sources. +.\" +.Sh SYSCTL VARIABLES +.Pp +.Bl -tag -width indent +.\" +.It net.inet.igmp.stats +This opaque read-only variable exposes the stack-wide IGMPv3 +protocol statistics to +.Xr netstat 1 . +.\" +.It net.inet.igmp.ifinfo +This opaque read-only variable exposes the per-link IGMPv3 status to +.Xr ifmcstat 8 . +.\" +.It net.inet.igmp.gsrdelay +This variable specifies the time threshold, in seconds, for processing +Group-and-Source Specific Queries (GSR). +As GSR query processing requires maintaining state on the host, +it may cause memory to be allocated, and is therefore a potential +attack point for Denial-of-Service (DoS). +If more than one GSR query is received within this threshold, +it will be dropped, to mitigate the potential for DoS. +.\" +.It net.inet.igmp.default_version +This variable controls the default version of IGMP to be used on all links. +This sysctl is normally set to 3 by default. +.\" +.It net.inet.igmp.legacysupp +If this variable is non-zero, then IGMP v1 and v2 membership reports +received on a link will be allowed to suppress the IGMP v3 state-change +reports which would otherwise be issued by this host. +This sysctl is normally enabled by default. +.\" +.It net.inet.igmp.v2enable +If this variable is non-zero, then IGMP v2 membership queries will be +processed by this host, and backwards compatibility will be enabled +until the v2 'Old Querier Present' timer expires. +This sysctl is normally enabled by default. +.\" +.It net.inet.igmp.v1enable +If this variable is non-zero, then IGMP v1 membership queries will be +processed by this host, and backwards compatibility will be enabled +until the v1 'Old Querier Present' timer expires. +This sysctl is normally enabled by default. +.\" +.It net.inet.igmp.sendlocal +If this variable is non-zero, then IGMP state-changes for groups in +the 224.0.0.0/24 link-scope prefix will be issued. +This behaviour is recommended if deploying +.Fx +in a network environment with layer 2 devices which snoop IGMP traffic +to mitigate multicast propagation throughout the network. +This sysctl is normally enabled by default. +.\" +.It net.inet.igmp.sendra +If this variable is non-zero, then IGMP v2 and v3 reports will contain +the IP Router Alert option. +This sysctl is normally enabled by default. +.\" +.It net.inet.igmp.recvifkludge +If this variable is non-zero, then received IGMP reports which contain +0.0.0.0 as their source will be rewritten to contain the subnet address. +This is useful when there are hosts on-link which have not yet been +configured with a primary IPv4 address. +This sysctl is normally enabled by default. +.\" +.El +.Sh SEE ALSO +.Xr ifmcstat 8 , +.Xr inet 4 , +.Xr multicast 4 , +.Xr netstat 1 , +.Xr sourcefilter 3 +.Sh HISTORY +The +.Nm +manual page re-appeared in +.Fx 8.0 . Modified: user/lstewart/alq_varlen_8.x/share/man/man4/ip.4 ============================================================================== --- user/lstewart/alq_varlen_8.x/share/man/man4/ip.4 Thu Mar 12 07:56:19 2009 (r189729) +++ user/lstewart/alq_varlen_8.x/share/man/man4/ip.4 Thu Mar 12 08:27:54 2009 (r189730) @@ -32,7 +32,7 @@ .\" @(#)ip.4 8.2 (Berkeley) 11/30/93 .\" $FreeBSD$ .\" -.Dd February 13, 2009 +.Dd March 9, 2009 .Dt IP 4 .Os .Sh NAME @@ -466,13 +466,19 @@ setsockopt(s, IPPROTO_IP, IP_MULTICAST_L .Pp This option improves performance for applications that may have no more than one -instance on a single host (such as a router daemon), by eliminating +instance on a single host (such as a routing daemon), by eliminating the overhead of receiving their own transmissions. It should generally not be used by applications for which there may be more than one instance on a single host (such as a conferencing program) or for which the sender does not belong to the destination group (such as a time querying program). .Pp +The sysctl setting +.Va net.inet.ip.mcast.loop +controls the default setting of the +.Dv IP_MULTICAST_LOOP +socket option for new sockets. +.Pp A multicast datagram sent with an initial TTL greater than 1 may be delivered to the sending host on a different interface from that on which it was sent, if the host belongs to the destination group on that other interface. @@ -650,6 +656,13 @@ documented in RFC 3678. For management of source filter lists using this API, please refer to .Xr sourcefilter 3 . +.Pp +The sysctl settings +.Va net.inet.ip.mcast.maxsocksrc +and +.Va net.inet.ip.mcast.maxgrpsrc +are used to specify an upper limit on the number of per-socket and per-group +source filter entries which the kernel may allocate. .\"----------------------- .Ss "Raw IP Sockets" .Pp @@ -795,6 +808,7 @@ field was not equal to the length of the .Xr send 2 , .Xr byteorder 3 , .Xr icmp 4 , +.Xr igmp 4 , .Xr inet 4 , .Xr intro 4 , .Xr multicast 4 , Modified: user/lstewart/alq_varlen_8.x/share/man/man4/multicast.4 ============================================================================== --- user/lstewart/alq_varlen_8.x/share/man/man4/multicast.4 Thu Mar 12 07:56:19 2009 (r189729) +++ user/lstewart/alq_varlen_8.x/share/man/man4/multicast.4 Thu Mar 12 08:27:54 2009 (r189730) @@ -956,6 +956,7 @@ after the previous upcall. .Xr socket 2 , .Xr sourcefilter 3 , .Xr icmp6 4 , +.Xr igmp 4 , .Xr inet 4 , .Xr inet6 4 , .Xr intro 4 , Modified: user/lstewart/alq_varlen_8.x/share/man/man4/txp.4 ============================================================================== --- user/lstewart/alq_varlen_8.x/share/man/man4/txp.4 Thu Mar 12 07:56:19 2009 (r189729) +++ user/lstewart/alq_varlen_8.x/share/man/man4/txp.4 Thu Mar 12 08:27:54 2009 (r189730) @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 16, 2005 +.Dd March 12, 2009 .Dt TXP 4 .Os .Sh NAME @@ -134,6 +134,7 @@ driver supports the following cards: 3Com 3cR990B-SRV .El .Sh SEE ALSO +.Xr altq 4 , .Xr arp 4 , .Xr inet 4 , .Xr intro 4 , Modified: user/lstewart/alq_varlen_8.x/sys/amd64/amd64/machdep.c ============================================================================== --- user/lstewart/alq_varlen_8.x/sys/amd64/amd64/machdep.c Thu Mar 12 07:56:19 2009 (r189729) +++ user/lstewart/alq_varlen_8.x/sys/amd64/amd64/machdep.c Thu Mar 12 08:27:54 2009 (r189730) @@ -1494,6 +1494,14 @@ hammer_time(u_int64_t modulep, u_int64_t if (env != NULL) strlcpy(kernelname, env, sizeof(kernelname)); +#ifdef XENHVM + if (inw(0x10) == 0x49d2) { + if (bootverbose) + printf("Xen detected: disabling emulated block and network devices\n"); + outw(0x10, 3); + } +#endif + /* Location of kernel stack for locore */ return ((u_int64_t)thread0.td_pcb); } Modified: user/lstewart/alq_varlen_8.x/sys/amd64/amd64/pmap.c ============================================================================== --- user/lstewart/alq_varlen_8.x/sys/amd64/amd64/pmap.c Thu Mar 12 07:56:19 2009 (r189729) +++ user/lstewart/alq_varlen_8.x/sys/amd64/amd64/pmap.c Thu Mar 12 08:27:54 2009 (r189730) @@ -1278,7 +1278,6 @@ static int _pmap_unwire_pte_hold(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t *free) { - vm_offset_t pteva; /* * unmap the page table page @@ -1287,19 +1286,16 @@ _pmap_unwire_pte_hold(pmap_t pmap, vm_of /* PDP page */ pml4_entry_t *pml4; pml4 = pmap_pml4e(pmap, va); - pteva = (vm_offset_t) PDPmap + amd64_ptob(m->pindex - (NUPDE + NUPDPE)); *pml4 = 0; } else if (m->pindex >= NUPDE) { /* PD page */ pdp_entry_t *pdp; pdp = pmap_pdpe(pmap, va); - pteva = (vm_offset_t) PDmap + amd64_ptob(m->pindex - NUPDE); *pdp = 0; } else { /* PTE page */ pd_entry_t *pd; pd = pmap_pde(pmap, va); - pteva = (vm_offset_t) PTmap + amd64_ptob(m->pindex); *pd = 0; } --pmap->pm_stats.resident_count; @@ -1325,12 +1321,6 @@ _pmap_unwire_pte_hold(pmap_t pmap, vm_of */ atomic_subtract_rel_int(&cnt.v_wire_count, 1); - /* - * Do an invltlb to make the invalidated mapping - * take effect immediately. - */ - pmap_invalidate_page(pmap, pteva); - /* * Put page on a list so that it is released after * *ALL* TLB shootdown is done @@ -2277,9 +2267,10 @@ pmap_demote_pde(pmap_t pmap, pd_entry_t pde_store(pde, newpde); /* - * Invalidate a stale mapping of the page table page. + * Invalidate a stale recursive mapping of the page table page. */ - pmap_invalidate_page(pmap, (vm_offset_t)vtopte(va)); + if (va >= VM_MAXUSER_ADDRESS) + pmap_invalidate_page(pmap, (vm_offset_t)vtopte(va)); /* * Demote the pv entry. This depends on the earlier demotion @@ -3547,6 +3538,7 @@ pmap_copy(pmap_t dst_pmap, pmap_t src_pm src_pte = (pt_entry_t *)PHYS_TO_DMAP(srcptepaddr); src_pte = &src_pte[pmap_pte_index(addr)]; + dstmpte = NULL; while (addr < va_next) { pt_entry_t ptetemp; ptetemp = *src_pte; @@ -3554,9 +3546,11 @@ pmap_copy(pmap_t dst_pmap, pmap_t src_pm * we only virtual copy managed pages */ if ((ptetemp & PG_MANAGED) != 0) { - dstmpte = pmap_allocpte(dst_pmap, addr, - M_NOWAIT); - if (dstmpte == NULL) + if (dstmpte != NULL && + dstmpte->pindex == pmap_pde_pindex(addr)) + dstmpte->wire_count++; + else if ((dstmpte = pmap_allocpte(dst_pmap, + addr, M_NOWAIT)) == NULL) break; dst_pte = (pt_entry_t *) PHYS_TO_DMAP(VM_PAGE_TO_PHYS(dstmpte)); @@ -3762,7 +3756,7 @@ pmap_page_is_mapped(vm_page_t m) void pmap_remove_pages(pmap_t pmap) { - pd_entry_t *pde; + pd_entry_t ptepde; pt_entry_t *pte, tpte; vm_page_t free = NULL; vm_page_t m, mpte, mt; @@ -3791,23 +3785,19 @@ pmap_remove_pages(pmap_t pmap) pv = &pc->pc_pventry[idx]; inuse &= ~bitmask; - pde = vtopde(pv->pv_va); - tpte = *pde; - if ((tpte & PG_PS) != 0) - pte = pde; - else { + pte = pmap_pdpe(pmap, pv->pv_va); + ptepde = *pte; + pte = pmap_pdpe_to_pde(pte, pv->pv_va); + tpte = *pte; + if ((tpte & (PG_PS | PG_V)) == PG_V) { + ptepde = tpte; pte = (pt_entry_t *)PHYS_TO_DMAP(tpte & PG_FRAME); pte = &pte[pmap_pte_index(pv->pv_va)]; tpte = *pte & ~PG_PTE_PAT; } - - if (tpte == 0) { - printf( - "TPTE at %p IS ZERO @ VA %08lx\n", - pte, pv->pv_va); + if ((tpte & PG_V) == 0) panic("bad pte"); - } /* * We cannot remove wired pages from a process' mapping at this time @@ -3863,8 +3853,6 @@ pmap_remove_pages(pmap_t pmap) pmap_add_delayed_free_list(mpte, &free, FALSE); atomic_subtract_int(&cnt.v_wire_count, 1); } - pmap_unuse_pt(pmap, pv->pv_va, - *pmap_pdpe(pmap, pv->pv_va), &free); } else { pmap->pm_stats.resident_count--; TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); @@ -3873,8 +3861,8 @@ pmap_remove_pages(pmap_t pmap) if (TAILQ_EMPTY(&pvh->pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); } - pmap_unuse_pt(pmap, pv->pv_va, *pde, &free); } + pmap_unuse_pt(pmap, pv->pv_va, ptepde, &free); } } if (allfree) { Modified: user/lstewart/alq_varlen_8.x/sys/amd64/amd64/trap.c ============================================================================== --- user/lstewart/alq_varlen_8.x/sys/amd64/amd64/trap.c Thu Mar 12 07:56:19 2009 (r189729) +++ user/lstewart/alq_varlen_8.x/sys/amd64/amd64/trap.c Thu Mar 12 08:27:54 2009 (r189730) @@ -386,7 +386,6 @@ trap(struct trapframe *frame) #ifdef DEV_ISA case T_NMI: /* machine/parity/power fail/"kitchen sink" faults */ - /* XXX Giant */ if (isa_nmi(code) == 0) { #ifdef KDB /* @@ -530,7 +529,6 @@ trap(struct trapframe *frame) #ifdef DEV_ISA case T_NMI: - /* XXX Giant */ /* machine/parity/power fail/"kitchen sink" faults */ if (isa_nmi(code) == 0) { #ifdef KDB @@ -820,9 +818,6 @@ syscall(struct trapframe *frame) orig_tf_rflags = frame->tf_rflags; if (p->p_sysent->sv_prepsyscall) { - /* - * The prep code is MP aware. - */ (*p->p_sysent->sv_prepsyscall)(frame, (int *)args, &code, ¶ms); } else { if (code == SYS_syscall || code == SYS___syscall) { @@ -841,10 +836,6 @@ syscall(struct trapframe *frame) callp = &p->p_sysent->sv_table[code]; narg = callp->sy_narg; - - /* - * copyin and the ktrsyscall()/ktrsysret() code is MP-aware - */ KASSERT(narg <= sizeof(args) / sizeof(args[0]), ("Too many syscall arguments!")); error = 0; Copied: user/lstewart/alq_varlen_8.x/sys/amd64/conf/XENHVM (from r189729, head/sys/amd64/conf/XENHVM) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/lstewart/alq_varlen_8.x/sys/amd64/conf/XENHVM Thu Mar 12 08:27:54 2009 (r189730, copy of r189729, head/sys/amd64/conf/XENHVM) @@ -0,0 +1,160 @@ +# +# XENHVM -- Xen HVM kernel configuration file for FreeBSD/amd64 *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@FreeBSD.ORG Sat Mar 14 00:31:55 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DC509106566C; Sat, 14 Mar 2009 00:31:55 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B19CB8FC16; Sat, 14 Mar 2009 00:31:55 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2E0VtHl077149; Sat, 14 Mar 2009 00:31:55 GMT (envelope-from thompsa@svn.freebsd.org) Received: (from thompsa@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2E0Vt59077148; Sat, 14 Mar 2009 00:31:55 GMT (envelope-from thompsa@svn.freebsd.org) Message-Id: <200903140031.n2E0Vt59077148@svn.freebsd.org> From: Andrew Thompson Date: Sat, 14 Mar 2009 00:31:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r189779 - user/thompsa/usb X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Mar 2009 00:31:56 -0000 Author: thompsa Date: Sat Mar 14 00:31:55 2009 New Revision: 189779 URL: http://svn.freebsd.org/changeset/base/189779 Log: Remove branch, will recreate rather than track all the recent usb changes. Deleted: user/thompsa/usb/ From owner-svn-src-user@FreeBSD.ORG Sat Mar 14 00:33:08 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E3F7C1065670; Sat, 14 Mar 2009 00:33:08 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B91E88FC15; Sat, 14 Mar 2009 00:33:08 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2E0X8aR077220; Sat, 14 Mar 2009 00:33:08 GMT (envelope-from thompsa@svn.freebsd.org) Received: (from thompsa@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2E0X84q077219; Sat, 14 Mar 2009 00:33:08 GMT (envelope-from thompsa@svn.freebsd.org) Message-Id: <200903140033.n2E0X84q077219@svn.freebsd.org> From: Andrew Thompson Date: Sat, 14 Mar 2009 00:33:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r189780 - user/thompsa/usb X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Mar 2009 00:33:09 -0000 Author: thompsa Date: Sat Mar 14 00:33:08 2009 New Revision: 189780 URL: http://svn.freebsd.org/changeset/base/189780 Log: Branch USB playground. Added: user/thompsa/usb/ (props changed) - copied from r189779, head/ From owner-svn-src-user@FreeBSD.ORG Sat Mar 14 06:48:50 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D51EB1065670; Sat, 14 Mar 2009 06:48:50 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B8E2B8FC12; Sat, 14 Mar 2009 06:48:50 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2E6moqm084434; Sat, 14 Mar 2009 06:48:50 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2E6moZn084431; Sat, 14 Mar 2009 06:48:50 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200903140648.n2E6moZn084431@svn.freebsd.org> From: Kip Macy Date: Sat, 14 Mar 2009 06:48:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r189784 - in user/kmacy/releng_7_net_backport/sys: kern sys vm X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Mar 2009 06:48:51 -0000 Author: kmacy Date: Sat Mar 14 06:48:50 2009 New Revision: 189784 URL: http://svn.freebsd.org/changeset/base/189784 Log: - fix protosw size mismatch - disable superpage assert Modified: user/kmacy/releng_7_net_backport/sys/kern/uipc_domain.c user/kmacy/releng_7_net_backport/sys/sys/protosw.h user/kmacy/releng_7_net_backport/sys/vm/vm_page.c Modified: user/kmacy/releng_7_net_backport/sys/kern/uipc_domain.c ============================================================================== --- user/kmacy/releng_7_net_backport/sys/kern/uipc_domain.c Sat Mar 14 05:33:09 2009 (r189783) +++ user/kmacy/releng_7_net_backport/sys/kern/uipc_domain.c Sat Mar 14 06:48:50 2009 (r189784) @@ -145,7 +145,8 @@ net_init_domain(struct domain *dp) if (dp->dom_init) (*dp->dom_init)(); for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++) - protosw_init(pr); + protosw_init(pr); + /* * update global information about maximums */ @@ -404,7 +405,6 @@ found: dpr->pr_output = NULL; dpr->pr_ctlinput = NULL; dpr->pr_ctloutput = NULL; - dpr->pr_ousrreq = NULL; dpr->pr_init = NULL; dpr->pr_fasttimo = NULL; dpr->pr_slowtimo = NULL; Modified: user/kmacy/releng_7_net_backport/sys/sys/protosw.h ============================================================================== --- user/kmacy/releng_7_net_backport/sys/sys/protosw.h Sat Mar 14 05:33:09 2009 (r189783) +++ user/kmacy/releng_7_net_backport/sys/sys/protosw.h Sat Mar 14 06:48:50 2009 (r189784) @@ -89,15 +89,14 @@ struct protosw { pr_output_t *pr_output; /* output to protocol (from above) */ pr_ctlinput_t *pr_ctlinput; /* control input (from below) */ pr_ctloutput_t *pr_ctloutput; /* control output (from above) */ -/* user-protocol hook */ - pr_usrreq_t *pr_ousrreq; /* utility hooks */ pr_init_t *pr_init; pr_fasttimo_t *pr_fasttimo; /* fast timeout (200ms) */ pr_slowtimo_t *pr_slowtimo; /* slow timeout (500ms) */ pr_drain_t *pr_drain; /* flush any excess space possible */ - struct pr_usrreqs *pr_usrreqs; /* supersedes pr_usrreq() */ + struct pr_usrreqs *pr_usrreqs; /* user-protocol hook */ + }; /*#endif*/ @@ -201,7 +200,6 @@ struct uio; * See uipc_domain.c:net_init_domain() */ struct pr_usrreqs { - double __Break_the_struct_layout_for_now; void (*pru_abort)(struct socket *so); int (*pru_accept)(struct socket *so, struct sockaddr **nam); int (*pru_attach)(struct socket *so, int proto, struct thread *td); Modified: user/kmacy/releng_7_net_backport/sys/vm/vm_page.c ============================================================================== --- user/kmacy/releng_7_net_backport/sys/vm/vm_page.c Sat Mar 14 05:33:09 2009 (r189783) +++ user/kmacy/releng_7_net_backport/sys/vm/vm_page.c Sat Mar 14 06:48:50 2009 (r189784) @@ -370,9 +370,10 @@ vm_page_startup(vm_offset_t vaddr) page_range = 0; for (i = 0; phys_avail[i + 1] != 0; i += 2) page_range += atop(phys_avail[i + 1] - phys_avail[i]); +#if 0 KASSERT(page_range == npages, ("vm_page_startup: inconsistent page counts")); - +#endif /* * Initialize the physical memory allocator. */ From owner-svn-src-user@FreeBSD.ORG Sat Mar 14 15:25:06 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1F4BA106566B; Sat, 14 Mar 2009 15:25:06 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E82688FC12; Sat, 14 Mar 2009 15:25:05 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2EFP5Vm096734; Sat, 14 Mar 2009 15:25:05 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2EFP5cs096733; Sat, 14 Mar 2009 15:25:05 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <200903141525.n2EFP5cs096733@svn.freebsd.org> From: Alexander Motin Date: Sat, 14 Mar 2009 15:25:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r189793 - in user/mav: . ata ata/sys X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Mar 2009 15:25:06 -0000 Author: mav Date: Sat Mar 14 15:25:05 2009 New Revision: 189793 URL: http://svn.freebsd.org/changeset/base/189793 Log: Create sandbox for safe play with ATA driver. Nearest plans: improve port multipliers support, error recovery and hotplug. Further plans: command queueing support. Added: user/mav/ user/mav/ata/ user/mav/ata/sys/ - copied from r189792, head/sys/ From owner-svn-src-user@FreeBSD.ORG Sat Mar 14 15:32:05 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 89D41106566C; Sat, 14 Mar 2009 15:32:05 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 771198FC1C; Sat, 14 Mar 2009 15:32:05 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2EFW54k096899; Sat, 14 Mar 2009 15:32:05 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2EFW49v096889; Sat, 14 Mar 2009 15:32:04 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <200903141532.n2EFW49v096889@svn.freebsd.org> From: Alexander Motin Date: Sat, 14 Mar 2009 15:32:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r189794 - in user/mav/ata/sys/dev/ata: . chipsets X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Mar 2009 15:32:05 -0000 Author: mav Date: Sat Mar 14 15:32:04 2009 New Revision: 189794 URL: http://svn.freebsd.org/changeset/base/189794 Log: Unify ata_sata_phy_reset() function to allow it be used for port multiplier ports. Make it's legacy behaviour of not resetting connected ports controllable. Modified: user/mav/ata/sys/dev/ata/ata-pci.h user/mav/ata/sys/dev/ata/ata-sata.c user/mav/ata/sys/dev/ata/chipsets/ata-ahci.c user/mav/ata/sys/dev/ata/chipsets/ata-intel.c user/mav/ata/sys/dev/ata/chipsets/ata-marvell.c user/mav/ata/sys/dev/ata/chipsets/ata-nvidia.c user/mav/ata/sys/dev/ata/chipsets/ata-promise.c user/mav/ata/sys/dev/ata/chipsets/ata-siliconimage.c user/mav/ata/sys/dev/ata/chipsets/ata-sis.c user/mav/ata/sys/dev/ata/chipsets/ata-via.c Modified: user/mav/ata/sys/dev/ata/ata-pci.h ============================================================================== --- user/mav/ata/sys/dev/ata/ata-pci.h Sat Mar 14 15:25:05 2009 (r189793) +++ user/mav/ata/sys/dev/ata/ata-pci.h Sat Mar 14 15:32:04 2009 (r189794) @@ -443,7 +443,9 @@ int ata_mode2idx(int mode); /* global prototypes ata-sata.c */ void ata_sata_phy_check_events(device_t dev); -int ata_sata_phy_reset(device_t dev); +int ata_sata_scr_read(struct ata_channel *ch, int port, int reg, uint32_t *val); +int ata_sata_scr_write(struct ata_channel *ch, int port, int reg, uint32_t val); +int ata_sata_phy_reset(device_t dev, int port, int quick); void ata_sata_setmode(device_t dev, int mode); int ata_request2fis_h2d(struct ata_request *request, u_int8_t *fis); void ata_pm_identify(device_t dev); Modified: user/mav/ata/sys/dev/ata/ata-sata.c ============================================================================== --- user/mav/ata/sys/dev/ata/ata-sata.c Sat Mar 14 15:25:05 2009 (r189793) +++ user/mav/ata/sys/dev/ata/ata-sata.c Sat Mar 14 15:32:04 2009 (r189794) @@ -73,59 +73,128 @@ ata_sata_phy_check_events(device_t dev) } } +int +ata_sata_scr_read(struct ata_channel *ch, int port, int reg, uint32_t *val) +{ + int r; + + if (port < 0) { + *val = ATA_IDX_INL(ch, reg); + return (0); + } else { + switch (reg) { + case ATA_SSTATUS: + r = 0; + break; + case ATA_SERROR: + r = 1; + break; + case ATA_SCONTROL: + r = 2; + break; + default: + return (EINVAL); + } + return (ch->hw.pm_read(ch->dev, port, r, val)); + } +} + +int +ata_sata_scr_write(struct ata_channel *ch, int port, int reg, uint32_t val) +{ + int r; + + if (port < 0) { + ATA_IDX_OUTL(ch, reg, val); + return (0); + } else { + switch (reg) { + case ATA_SERROR: + r = 1; + break; + case ATA_SCONTROL: + r = 2; + break; + default: + return (EINVAL); + } + return (ch->hw.pm_write(ch->dev, port, r, val)); + } +} + static int -ata_sata_connect(struct ata_channel *ch) +ata_sata_connect(struct ata_channel *ch, int port) { u_int32_t status; int timeout; /* wait up to 1 second for "connect well" */ for (timeout = 0; timeout < 100 ; timeout++) { - status = ATA_IDX_INL(ch, ATA_SSTATUS); + ata_sata_scr_read(ch, port, ATA_SSTATUS, &status); if ((status & ATA_SS_CONWELL_MASK) == ATA_SS_CONWELL_GEN1 || (status & ATA_SS_CONWELL_MASK) == ATA_SS_CONWELL_GEN2) break; ata_udelay(10000); } if (timeout >= 100) { - if (bootverbose) - device_printf(ch->dev, "SATA connect status=%08x\n", status); + if (bootverbose) { + if (port < 0) { + device_printf(ch->dev, "SATA connect timeout status=%08x\n", + status); + } else { + device_printf(ch->dev, "p%d: SATA connect timeout status=%08x\n", + port, status); + } + } return 0; } - if (bootverbose) - device_printf(ch->dev, "SATA connect time=%dms\n", timeout * 10); + if (bootverbose) { + if (port < 0) { + device_printf(ch->dev, "SATA connect time=%dms status=%08x\n", + timeout * 10, status); + } else { + device_printf(ch->dev, "p%d: SATA connect time=%dms status=%08x\n", + port, timeout * 10, status); + } + } /* clear SATA error register */ - ATA_IDX_OUTL(ch, ATA_SERROR, ATA_IDX_INL(ch, ATA_SERROR)); + ata_sata_scr_write(ch, port, ATA_SERROR, 0xffffffff); return 1; } int -ata_sata_phy_reset(device_t dev) +ata_sata_phy_reset(device_t dev, int port, int quick) { struct ata_channel *ch = device_get_softc(dev); int loop, retry; + uint32_t val; - if ((ATA_IDX_INL(ch, ATA_SCONTROL) & ATA_SC_DET_MASK) == ATA_SC_DET_IDLE) - return ata_sata_connect(ch); + if (quick) { + ata_sata_scr_read(ch, port, ATA_SCONTROL, &val); + if ((val & ATA_SC_DET_MASK) == ATA_SC_DET_IDLE) + return ata_sata_connect(ch, port); + } for (retry = 0; retry < 10; retry++) { for (loop = 0; loop < 10; loop++) { - ATA_IDX_OUTL(ch, ATA_SCONTROL, ATA_SC_DET_RESET); + ata_sata_scr_write(ch, port, ATA_SCONTROL, ATA_SC_DET_RESET); ata_udelay(100); - if ((ATA_IDX_INL(ch, ATA_SCONTROL) & ATA_SC_DET_MASK) == - ATA_SC_DET_RESET) + ata_sata_scr_read(ch, port, ATA_SCONTROL, &val); + if ((val & ATA_SC_DET_MASK) == ATA_SC_DET_RESET) break; } ata_udelay(5000); for (loop = 0; loop < 10; loop++) { - ATA_IDX_OUTL(ch, ATA_SCONTROL, ATA_SC_DET_IDLE | - ATA_SC_IPM_DIS_PARTIAL | - ATA_SC_IPM_DIS_SLUMBER); + ata_sata_scr_write(ch, port, ATA_SCONTROL, + ATA_SC_DET_IDLE | + ATA_SC_IPM_DIS_PARTIAL | + ATA_SC_IPM_DIS_SLUMBER); ata_udelay(100); - if ((ATA_IDX_INL(ch, ATA_SCONTROL) & ATA_SC_DET_MASK) == 0) - return ata_sata_connect(ch); + ata_sata_scr_read(ch, port, ATA_SCONTROL, &val); + if ((val & ATA_SC_DET_MASK) == 0) + return ata_sata_connect(ch, port); } } return 0; @@ -253,41 +322,10 @@ ata_pm_identify(device_t dev) /* reset all ports and register if anything connected */ for (port=0; port < pm_ports; port++) { - u_int32_t signature, status; - int timeout; - - if (ch->hw.pm_write(dev, port, 2, ATA_SC_DET_RESET)) { - device_printf(dev, "p%d: writing ATA_SC_DET_RESET failed\n", port); - continue; - } - - ata_udelay(5000); + u_int32_t signature; - if (ch->hw.pm_write(dev, port, 2, ATA_SC_DET_IDLE)) { - device_printf(dev, "p%d: writing ATA_SC_DET_idle failed\n", port); + if (!ata_sata_phy_reset(dev, port, 1)) continue; - } - - ata_udelay(5000); - - /* wait up to 1 second for "connect well" */ - for (timeout = 0; timeout < 100 ; timeout++) { - ch->hw.pm_read(dev, port, 0, &status); - if ((status & ATA_SS_CONWELL_MASK) == ATA_SS_CONWELL_GEN1 || - (status & ATA_SS_CONWELL_MASK) == ATA_SS_CONWELL_GEN2) - break; - ata_udelay(10000); - } - if (timeout >= 100) { - if (bootverbose) - device_printf(dev, "p%d: connect status=%08x\n", port, status); - continue; - } - if (bootverbose) - device_printf(dev, "p%d: connect time %dms\n", port, timeout * 10); - - /* clear SERROR register */ - ch->hw.pm_write(dev, port, 1, 0xffffffff); signature = ch->hw.softreset(dev, port); Modified: user/mav/ata/sys/dev/ata/chipsets/ata-ahci.c ============================================================================== --- user/mav/ata/sys/dev/ata/chipsets/ata-ahci.c Sat Mar 14 15:25:05 2009 (r189793) +++ user/mav/ata/sys/dev/ata/chipsets/ata-ahci.c Sat Mar 14 15:32:04 2009 (r189794) @@ -722,7 +722,7 @@ ata_ahci_reset(device_t dev) /* enable FIS based switching */ //ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_FBS + offset, 0x00000003); - if (!ata_sata_phy_reset(dev)) { + if (!ata_sata_phy_reset(dev, -1, 0)) { if (bootverbose) device_printf(dev, "AHCI reset done: phy reset found no device\n"); ch->devices = 0; Modified: user/mav/ata/sys/dev/ata/chipsets/ata-intel.c ============================================================================== --- user/mav/ata/sys/dev/ata/chipsets/ata-intel.c Sat Mar 14 15:25:05 2009 (r189793) +++ user/mav/ata/sys/dev/ata/chipsets/ata-intel.c Sat Mar 14 15:32:04 2009 (r189794) @@ -517,7 +517,7 @@ ata_intel_31244_tf_write(struct ata_requ static void ata_intel_31244_reset(device_t dev) { - if (ata_sata_phy_reset(dev)) + if (ata_sata_phy_reset(dev, -1, 1)) ata_generic_reset(dev); } Modified: user/mav/ata/sys/dev/ata/chipsets/ata-marvell.c ============================================================================== --- user/mav/ata/sys/dev/ata/chipsets/ata-marvell.c Sat Mar 14 15:25:05 2009 (r189793) +++ user/mav/ata/sys/dev/ata/chipsets/ata-marvell.c Sat Mar 14 15:32:04 2009 (r189794) @@ -503,7 +503,7 @@ ata_marvell_edma_reset(device_t dev) ATA_OUTL(ctlr->r_res1, 0x0200c + ATA_MV_EDMA_BASE(ch), ~0x0); /* enable channel and test for devices */ - if (ata_sata_phy_reset(dev)) + if (ata_sata_phy_reset(dev, -1, 1)) ata_generic_reset(dev); /* enable EDMA machinery */ Modified: user/mav/ata/sys/dev/ata/chipsets/ata-nvidia.c ============================================================================== --- user/mav/ata/sys/dev/ata/chipsets/ata-nvidia.c Sat Mar 14 15:25:05 2009 (r189793) +++ user/mav/ata/sys/dev/ata/chipsets/ata-nvidia.c Sat Mar 14 15:32:04 2009 (r189794) @@ -249,7 +249,7 @@ ata_nvidia_status(device_t dev) static void ata_nvidia_reset(device_t dev) { - if (ata_sata_phy_reset(dev)) + if (ata_sata_phy_reset(dev, -1, 1)) ata_generic_reset(dev); } Modified: user/mav/ata/sys/dev/ata/chipsets/ata-promise.c ============================================================================== --- user/mav/ata/sys/dev/ata/chipsets/ata-promise.c Sat Mar 14 15:25:05 2009 (r189793) +++ user/mav/ata/sys/dev/ata/chipsets/ata-promise.c Sat Mar 14 15:32:04 2009 (r189794) @@ -769,7 +769,7 @@ ata_promise_mio_reset(device_t dev) if ((ctlr->chip->cfg2 == PR_SATA) || ((ctlr->chip->cfg2 == PR_CMBO) && (ch->unit < 2))) { - if (ata_sata_phy_reset(dev)) + if (ata_sata_phy_reset(dev, -1, 1)) ata_generic_reset(dev); /* reset and enable plug/unplug intr */ @@ -805,7 +805,7 @@ ata_promise_mio_reset(device_t dev) (ATA_INL(ctlr->r_res2, 0x414 + (ch->unit << 8)) & ~0x00000003) | 0x00000001); - if (ata_sata_phy_reset(dev)) { + if (ata_sata_phy_reset(dev, -1, 1)) { u_int32_t signature = ch->hw.softreset(dev, ATA_PM); if (1 | bootverbose) Modified: user/mav/ata/sys/dev/ata/chipsets/ata-siliconimage.c ============================================================================== --- user/mav/ata/sys/dev/ata/chipsets/ata-siliconimage.c Sat Mar 14 15:25:05 2009 (r189793) +++ user/mav/ata/sys/dev/ata/chipsets/ata-siliconimage.c Sat Mar 14 15:32:04 2009 (r189794) @@ -380,7 +380,7 @@ ata_sii_status(device_t dev) static void ata_sii_reset(device_t dev) { - if (ata_sata_phy_reset(dev)) + if (ata_sata_phy_reset(dev, -1, 1)) ata_generic_reset(dev); } @@ -832,7 +832,7 @@ ata_siiprb_reset(device_t dev) } /* reset phy */ - if (!ata_sata_phy_reset(dev)) { + if (!ata_sata_phy_reset(dev, -1, 1)) { if (bootverbose) device_printf(dev, "phy reset found no device\n"); ch->devices = 0; Modified: user/mav/ata/sys/dev/ata/chipsets/ata-sis.c ============================================================================== --- user/mav/ata/sys/dev/ata/chipsets/ata-sis.c Sat Mar 14 15:25:05 2009 (r189793) +++ user/mav/ata/sys/dev/ata/chipsets/ata-sis.c Sat Mar 14 15:32:04 2009 (r189794) @@ -226,7 +226,7 @@ ata_sis_ch_attach(device_t dev) static void ata_sis_reset(device_t dev) { - if (ata_sata_phy_reset(dev)) + if (ata_sata_phy_reset(dev, -1, 1)) ata_generic_reset(dev); } Modified: user/mav/ata/sys/dev/ata/chipsets/ata-via.c ============================================================================== --- user/mav/ata/sys/dev/ata/chipsets/ata-via.c Sat Mar 14 15:25:05 2009 (r189793) +++ user/mav/ata/sys/dev/ata/chipsets/ata-via.c Sat Mar 14 15:32:04 2009 (r189794) @@ -269,7 +269,7 @@ ata_via_reset(device_t dev) if ((ctlr->chip->cfg2 & VIABAR) && (ch->unit > 1)) ata_generic_reset(dev); else - if (ata_sata_phy_reset(dev)) + if (ata_sata_phy_reset(dev, -1, 1)) ata_generic_reset(dev); } From owner-svn-src-user@FreeBSD.ORG Sat Mar 14 15:53:06 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D81D8106564A; Sat, 14 Mar 2009 15:53:06 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C6E898FC18; Sat, 14 Mar 2009 15:53:06 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2EFr6YX097391; Sat, 14 Mar 2009 15:53:06 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2EFr6F1097390; Sat, 14 Mar 2009 15:53:06 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <200903141553.n2EFr6F1097390@svn.freebsd.org> From: Alexander Motin Date: Sat, 14 Mar 2009 15:53:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r189796 - user/mav/ata/sys/dev/ata X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Mar 2009 15:53:07 -0000 Author: mav Date: Sat Mar 14 15:53:06 2009 New Revision: 189796 URL: http://svn.freebsd.org/changeset/base/189796 Log: Add SiI 4726 Port Multiplier quirk. Modified: user/mav/ata/sys/dev/ata/ata-sata.c Modified: user/mav/ata/sys/dev/ata/ata-sata.c ============================================================================== --- user/mav/ata/sys/dev/ata/ata-sata.c Sat Mar 14 15:37:19 2009 (r189795) +++ user/mav/ata/sys/dev/ata/ata-sata.c Sat Mar 14 15:53:06 2009 (r189796) @@ -307,13 +307,24 @@ ata_pm_identify(device_t dev) switch (pm_chipid) { case 0x37261095: /* Some of these bogusly reports 6 ports */ + device_printf(dev, "SiI 3726 (rev=%x) Port Multiplier with %d (5) ports\n", + pm_revision, pm_ports); pm_ports = 5; - device_printf(dev, "SiI 3726 r%x Portmultiplier with %d ports\n", + break; + + case 0x47261095: + /* This PM declares 7 ports, while only 5 of them are real. + * Port 5 is some fake "Config Disk" with 640 sectors size, + * port 6 is enclosure management bridge port. + * Both fake ports has implementation problems, causing + * probe faults. Hide them for now. */ + device_printf(dev, "SiI 4726 (rev=%x) Port Multiplier with %d (5) ports\n", pm_revision, pm_ports); + pm_ports = 5; break; default: - device_printf(dev, "Portmultiplier (id=%08x rev=%x) with %d ports\n", + device_printf(dev, "Port Multiplier (id=%08x rev=%x) with %d ports\n", pm_chipid, pm_revision, pm_ports); } From owner-svn-src-user@FreeBSD.ORG Sat Mar 14 23:12:20 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A65DA1065672; Sat, 14 Mar 2009 23:12:20 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 964238FC15; Sat, 14 Mar 2009 23:12:20 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2ENCKIL010670; Sat, 14 Mar 2009 23:12:20 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2ENCK8n010669; Sat, 14 Mar 2009 23:12:20 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200903142312.n2ENCK8n010669@svn.freebsd.org> From: Kip Macy Date: Sat, 14 Mar 2009 23:12:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r189835 - user/kmacy/releng_7_net_backport/sys/kern X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Mar 2009 23:12:20 -0000 Author: kmacy Date: Sat Mar 14 23:12:20 2009 New Revision: 189835 URL: http://svn.freebsd.org/changeset/base/189835 Log: remove reference to ousrreq in ddb Modified: user/kmacy/releng_7_net_backport/sys/kern/uipc_debug.c Modified: user/kmacy/releng_7_net_backport/sys/kern/uipc_debug.c ============================================================================== --- user/kmacy/releng_7_net_backport/sys/kern/uipc_debug.c Sat Mar 14 22:50:03 2009 (r189834) +++ user/kmacy/releng_7_net_backport/sys/kern/uipc_debug.c Sat Mar 14 23:12:20 2009 (r189835) @@ -322,7 +322,6 @@ db_print_protosw(struct protosw *pr, con db_print_indent(indent); db_printf("pr_ctloutput: %p ", pr->pr_ctloutput); - db_printf("pr_ousrreq: %p ", pr->pr_ousrreq); db_printf("pr_init: %p\n", pr->pr_init); db_print_indent(indent); From owner-svn-src-user@FreeBSD.ORG Sat Mar 14 23:16:57 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3DF96106564A; Sat, 14 Mar 2009 23:16:57 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2E0F18FC0A; Sat, 14 Mar 2009 23:16:57 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2ENGvlV010848; Sat, 14 Mar 2009 23:16:57 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2ENGvQC010847; Sat, 14 Mar 2009 23:16:57 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200903142316.n2ENGvQC010847@svn.freebsd.org> From: Kip Macy Date: Sat, 14 Mar 2009 23:16:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r189837 - user/kmacy/releng_7_net_backport/sys/kern X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Mar 2009 23:16:57 -0000 Author: kmacy Date: Sat Mar 14 23:16:56 2009 New Revision: 189837 URL: http://svn.freebsd.org/changeset/base/189837 Log: remove second reference to ousrreq Modified: user/kmacy/releng_7_net_backport/sys/kern/uipc_debug.c Modified: user/kmacy/releng_7_net_backport/sys/kern/uipc_debug.c ============================================================================== --- user/kmacy/releng_7_net_backport/sys/kern/uipc_debug.c Sat Mar 14 23:13:16 2009 (r189836) +++ user/kmacy/releng_7_net_backport/sys/kern/uipc_debug.c Sat Mar 14 23:16:56 2009 (r189837) @@ -330,7 +330,6 @@ db_print_protosw(struct protosw *pr, con db_printf("pr_drain: %p\n", pr->pr_drain); db_print_indent(indent); - db_printf("pr_ousrreq: %p\n", pr->pr_ousrreq); } static void From owner-svn-src-user@FreeBSD.ORG Sat Mar 14 23:39:54 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 920D21065675; Sat, 14 Mar 2009 23:39:54 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 821728FC1F; Sat, 14 Mar 2009 23:39:54 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2ENdseO011290; Sat, 14 Mar 2009 23:39:54 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2ENdsqS011289; Sat, 14 Mar 2009 23:39:54 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200903142339.n2ENdsqS011289@svn.freebsd.org> From: Kip Macy Date: Sat, 14 Mar 2009 23:39:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r189838 - user/kmacy/releng_7_net_backport/sys/kern X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Mar 2009 23:39:54 -0000 Author: kmacy Date: Sat Mar 14 23:39:54 2009 New Revision: 189838 URL: http://svn.freebsd.org/changeset/base/189838 Log: register rmlocks Modified: user/kmacy/releng_7_net_backport/sys/kern/subr_lock.c Modified: user/kmacy/releng_7_net_backport/sys/kern/subr_lock.c ============================================================================== --- user/kmacy/releng_7_net_backport/sys/kern/subr_lock.c Sat Mar 14 23:16:56 2009 (r189837) +++ user/kmacy/releng_7_net_backport/sys/kern/subr_lock.c Sat Mar 14 23:39:54 2009 (r189838) @@ -57,6 +57,7 @@ struct lock_class *lock_classes[LOCK_CLA &lock_class_mtx_spin, &lock_class_mtx_sleep, &lock_class_sx, + &lock_class_rm, &lock_class_rw, &lock_class_lockmgr, }; From owner-svn-src-user@FreeBSD.ORG Sat Mar 14 23:48:04 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 23D391065673; Sat, 14 Mar 2009 23:48:04 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 13DEA8FC0A; Sat, 14 Mar 2009 23:48:04 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2ENm33u011472; Sat, 14 Mar 2009 23:48:03 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2ENm3gL011471; Sat, 14 Mar 2009 23:48:03 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200903142348.n2ENm3gL011471@svn.freebsd.org> From: Kip Macy Date: Sat, 14 Mar 2009 23:48:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r189839 - user/kmacy/releng_7_net_backport/sys/sys X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Mar 2009 23:48:04 -0000 Author: kmacy Date: Sat Mar 14 23:48:03 2009 New Revision: 189839 URL: http://svn.freebsd.org/changeset/base/189839 Log: declare rm lock class Modified: user/kmacy/releng_7_net_backport/sys/sys/lock.h Modified: user/kmacy/releng_7_net_backport/sys/sys/lock.h ============================================================================== --- user/kmacy/releng_7_net_backport/sys/sys/lock.h Sat Mar 14 23:39:54 2009 (r189838) +++ user/kmacy/releng_7_net_backport/sys/sys/lock.h Sat Mar 14 23:48:03 2009 (r189839) @@ -220,8 +220,9 @@ struct lock_list_entry { extern struct lock_class lock_class_mtx_sleep; extern struct lock_class lock_class_mtx_spin; -extern struct lock_class lock_class_sx; +extern struct lock_class lock_class_rm; extern struct lock_class lock_class_rw; +extern struct lock_class lock_class_sx; extern struct lock_class lock_class_lockmgr; extern struct lock_class *lock_classes[]; From owner-svn-src-user@FreeBSD.ORG Sat Mar 14 23:59:54 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 495C3106566C; Sat, 14 Mar 2009 23:59:54 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 393298FC17; Sat, 14 Mar 2009 23:59:54 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2ENxs6R011707; Sat, 14 Mar 2009 23:59:54 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2ENxs2S011706; Sat, 14 Mar 2009 23:59:54 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200903142359.n2ENxs2S011706@svn.freebsd.org> From: Kip Macy Date: Sat, 14 Mar 2009 23:59:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r189840 - user/kmacy/releng_7_net_backport/sys/kern X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Mar 2009 23:59:54 -0000 Author: kmacy Date: Sat Mar 14 23:59:53 2009 New Revision: 189840 URL: http://svn.freebsd.org/changeset/base/189840 Log: update lock types Modified: user/kmacy/releng_7_net_backport/sys/kern/subr_witness.c Modified: user/kmacy/releng_7_net_backport/sys/kern/subr_witness.c ============================================================================== --- user/kmacy/releng_7_net_backport/sys/kern/subr_witness.c Sat Mar 14 23:48:03 2009 (r189839) +++ user/kmacy/releng_7_net_backport/sys/kern/subr_witness.c Sat Mar 14 23:59:53 2009 (r189840) @@ -306,7 +306,7 @@ static struct witness_order_list_entry o * Routing */ { "so_rcv", &lock_class_mtx_sleep }, - { "radix node head", &lock_class_mtx_sleep }, + { "radix node head", &lock_class_rw }, { "rtentry", &lock_class_mtx_sleep }, { "ifaddr", &lock_class_mtx_sleep }, { NULL, NULL }, @@ -321,6 +321,8 @@ static struct witness_order_list_entry o /* * UNIX Domain Sockets */ + { "unp_global_rwlock", &lock_class_rw }, + { "unp_list_lock", &lock_class_mtx_sleep }, { "unp", &lock_class_mtx_sleep }, { "so_snd", &lock_class_mtx_sleep }, { NULL, NULL }, @@ -422,6 +424,7 @@ static struct witness_order_list_entry o { "process slock", &lock_class_mtx_spin }, { "sleepq chain", &lock_class_mtx_spin }, { "umtx lock", &lock_class_mtx_spin }, + { "rm_spinlock", &lock_class_mtx_spin }, { "turnstile chain", &lock_class_mtx_spin }, { "turnstile lock", &lock_class_mtx_spin }, { "sched lock", &lock_class_mtx_spin }, @@ -436,6 +439,7 @@ static struct witness_order_list_entry o /* * leaf locks */ + { "intrcnt", &lock_class_mtx_spin }, { "icu", &lock_class_mtx_spin }, #if defined(SMP) && defined(__sparc64__) { "ipi", &lock_class_mtx_spin },