From owner-p4-projects@FreeBSD.ORG Sun Dec 6 11:25:48 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D53271065679; Sun, 6 Dec 2009 11:25:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 993B4106566C for ; Sun, 6 Dec 2009 11:25:47 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 848C28FC1A for ; Sun, 6 Dec 2009 11:25:47 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nB6BPlTB096863 for ; Sun, 6 Dec 2009 11:25:47 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB6BPlGD096861 for perforce@freebsd.org; Sun, 6 Dec 2009 11:25:47 GMT (envelope-from mav@freebsd.org) Date: Sun, 6 Dec 2009 11:25:47 GMT Message-Id: <200912061125.nB6BPlGD096861@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171446 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Dec 2009 11:25:48 -0000 http://p4web.freebsd.org/chv.cgi?CH=171446 Change 171446 by mav@mav_mavbook on 2009/12/06 11:25:36 IFC Affected files ... .. //depot/projects/scottl-camlock/src/rescue/rescue/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sbin/atacontrol/atacontrol.c#6 integrate .. //depot/projects/scottl-camlock/src/share/mk/bsd.subdir.mk#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/mv/mv_sata.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#64 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#33 integrate .. //depot/projects/scottl-camlock/src/sys/conf/NOTES#44 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options#38 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#43 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.h#27 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-disk.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-dma.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-lowlevel.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.h#27 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-queue.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-sata.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata_if.m#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cd.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-fd.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-tape.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-acard.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-acerlabs.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-ahci.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-amd.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-ati.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-cenatek.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-cypress.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-cyrix.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-highpoint.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-intel.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-ite.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-jmicron.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-marvell.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-micron.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-national.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-netcell.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-nvidia.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-promise.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-serverworks.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-siliconimage.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-sis.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-via.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_dummynet.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/ata_dbdma.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/ata_kauai.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/ata_macio.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/psim/ata_iobus.c#7 integrate .. //depot/projects/scottl-camlock/src/usr.bin/w/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/w/w.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pw/pw_user.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/repquota/repquota.c#3 integrate Differences ... ==== //depot/projects/scottl-camlock/src/rescue/rescue/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -#$FreeBSD: src/rescue/rescue/Makefile,v 1.71 2009/06/24 18:21:37 jamie Exp $ +#$FreeBSD: src/rescue/rescue/Makefile,v 1.72 2009/12/05 23:23:46 ed Exp $ # @(#)Makefile 8.1 (Berkeley) 6/2/93 NO_MAN= @@ -72,7 +72,7 @@ CRUNCH_PROGS_bin= cat chflags chio chmod cp date dd df echo \ ed expr getfacl hostname kenv kill ln ls mkdir mv \ pkill ps pwd realpath rm rmdir setfacl sh stty sync test -CRUNCH_LIBS+= -lcrypt -ledit -lkvm -ll -ltermcap -lutil +CRUNCH_LIBS+= -lcrypt -ledit -lkvm -ll -ltermcap -lulog -lutil # Additional options for specific programs CRUNCH_ALIAS_test= [ ==== //depot/projects/scottl-camlock/src/sbin/atacontrol/atacontrol.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sbin/atacontrol/atacontrol.c,v 1.54 2009/11/26 12:41:43 mav Exp $ + * $FreeBSD: src/sbin/atacontrol/atacontrol.c,v 1.55 2009/12/06 00:10:13 mav Exp $ */ #include ==== //depot/projects/scottl-camlock/src/share/mk/bsd.subdir.mk#3 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91 -# $FreeBSD: src/share/mk/bsd.subdir.mk,v 1.51 2007/12/07 15:02:06 ru Exp $ +# $FreeBSD: src/share/mk/bsd.subdir.mk,v 1.52 2009/12/06 08:59:19 ed Exp $ # # The include file contains the default targets # for building subdirectories. @@ -24,9 +24,9 @@ # This is a variant of install, which will # put the stuff into the right "distribution". # -# afterinstall, all, all-man, beforeinstall, checkdpadd, -# clean, cleandepend, cleandir, depend, install, lint, maninstall, -# manlint, obj, objlink, realinstall, regress, tags +# afterinstall, all, all-man, beforeinstall, checkdpadd, clean, +# cleandepend, cleandir, cleanilinks depend, install, lint, +# maninstall, manlint, obj, objlink, realinstall, regress, tags # .include @@ -66,9 +66,8 @@ ${MAKE} all .for __target in all all-man checkdpadd clean cleandepend cleandir \ - depend distribute lint maninstall manlint \ - obj objlink realinstall regress tags \ - ${SUBDIR_TARGETS} + cleanilinks depend distribute lint maninstall manlint obj objlink \ + realinstall regress tags ${SUBDIR_TARGETS} ${__target}: _SUBDIR .endfor ==== //depot/projects/scottl-camlock/src/sys/arm/mv/mv_sata.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/mv/mv_sata.c,v 1.2 2009/10/31 13:24:14 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/mv/mv_sata.c,v 1.3 2009/12/06 00:10:13 mav Exp $"); #include #include ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#64 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.16 2009/11/25 14:24:14 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.17 2009/12/06 00:10:13 mav Exp $"); #include #include ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#33 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.113 2009/12/02 16:08:33 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.114 2009/12/06 00:10:13 mav Exp $"); #include "opt_cd.h" ==== //depot/projects/scottl-camlock/src/sys/conf/NOTES#44 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1565 2009/11/13 11:28:54 ed Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1566 2009/12/06 00:10:13 mav Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1718,9 +1718,15 @@ # else the device numbers are dynamically allocated. # ATA_REQUEST_TIMEOUT: the number of seconds to wait for an ATA request # before timing out. +# ATA_CAM: Turn ata(4) subsystem controller drivers into cam(4) +# interface modules. This deprecates all ata(4) +# peripheral device drivers (atadisk, ataraid, atapicd, +# atapifd. atapist, atapicam) and all user-level APIs. +# cam(4) drivers and APIs will be connected instead. options ATA_STATIC_ID #options ATA_REQUEST_TIMEOUT=10 +#options ATA_CAM # # Standard floppy disk controllers and floppy tapes, supports ==== //depot/projects/scottl-camlock/src/sys/conf/options#38 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.697 2009/11/13 11:28:54 ed Exp $ +# $FreeBSD: src/sys/conf/options,v 1.698 2009/12/06 00:10:13 mav Exp $ # # On the handling of kernel options # ==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#43 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.311 2009/11/26 12:41:43 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.312 2009/12/06 00:10:13 mav Exp $"); #include "opt_ata.h" #include ==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.h#27 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.149 2009/11/08 14:33:19 mav Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.150 2009/12/06 00:10:13 mav Exp $ */ #if 0 ==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-disk.c#23 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.220 2009/11/24 14:06:15 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.221 2009/12/06 00:10:13 mav Exp $"); #include "opt_ata.h" #include ==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-dma.c#18 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.162 2009/10/31 13:24:14 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.163 2009/12/06 00:10:13 mav Exp $"); #include #include ==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-lowlevel.c#18 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.85 2009/10/31 13:24:14 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.86 2009/12/06 00:10:13 mav Exp $"); #include "opt_ata.h" #include ==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.c#19 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.147 2009/12/05 13:40:51 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.148 2009/12/06 00:10:13 mav Exp $"); #include "opt_ata.h" #include ==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.h#27 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.115 2009/11/16 15:38:27 mav Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.116 2009/12/06 00:10:13 mav Exp $ */ /* structure holding chipset config info */ ==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-queue.c#26 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.89 2009/11/08 14:33:19 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.90 2009/12/06 00:10:13 mav Exp $"); #include "opt_ata.h" #include ==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-sata.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-sata.c,v 1.7 2009/10/31 13:24:14 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-sata.c,v 1.8 2009/12/06 00:10:13 mav Exp $"); #include "opt_ata.h" #include ==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata_if.m#7 (text+ko) ==== @@ -22,7 +22,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $FreeBSD: src/sys/dev/ata/ata_if.m,v 1.8 2008/04/10 13:05:05 sos Exp $ +# $FreeBSD: src/sys/dev/ata/ata_if.m,v 1.9 2009/12/06 00:10:13 mav Exp $ #include #include ==== //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cd.c#20 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.210 2009/11/08 14:33:19 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.211 2009/12/06 00:10:13 mav Exp $"); #include "opt_ata.h" #include ==== //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-fd.c#14 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.120 2009/10/23 14:56:29 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.121 2009/12/06 00:10:13 mav Exp $"); #include #include ==== //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-tape.c#14 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.115 2009/10/23 14:56:29 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.116 2009/12/06 00:10:13 mav Exp $"); #include "opt_ata.h" #include ==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-acard.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-acard.c,v 1.5 2009/06/24 19:49:18 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-acard.c,v 1.6 2009/12/06 00:10:13 mav Exp $"); #include "opt_ata.h" #include ==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-acerlabs.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-acerlabs.c,v 1.8 2009/09/08 13:19:05 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-acerlabs.c,v 1.9 2009/12/06 00:10:13 mav Exp $"); #include "opt_ata.h" #include ==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-ahci.c#15 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-ahci.c,v 1.30 2009/12/05 10:30:54 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-ahci.c,v 1.31 2009/12/06 00:10:13 mav Exp $"); #include "opt_ata.h" #include ==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-amd.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-amd.c,v 1.2 2009/06/24 19:49:18 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-amd.c,v 1.3 2009/12/06 00:10:13 mav Exp $"); #include "opt_ata.h" #include ==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-ati.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-ati.c,v 1.4 2009/10/05 16:26:54 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-ati.c,v 1.5 2009/12/06 00:10:13 mav Exp $"); #include "opt_ata.h" #include ==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-cenatek.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-cenatek.c,v 1.2 2009/06/24 19:49:18 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-cenatek.c,v 1.3 2009/12/06 00:10:13 mav Exp $"); #include "opt_ata.h" #include ==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-cypress.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-cypress.c,v 1.2 2009/06/24 19:49:18 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-cypress.c,v 1.3 2009/12/06 00:10:13 mav Exp $"); #include "opt_ata.h" #include ==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-cyrix.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-cyrix.c,v 1.3 2009/06/24 19:49:18 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-cyrix.c,v 1.4 2009/12/06 00:10:13 mav Exp $"); #include "opt_ata.h" #include ==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-highpoint.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-highpoint.c,v 1.4 2009/06/24 19:49:18 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-highpoint.c,v 1.5 2009/12/06 00:10:13 mav Exp $"); #include "opt_ata.h" #include ==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-intel.c#15 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-intel.c,v 1.9 2009/11/09 09:27:09 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-intel.c,v 1.12 2009/12/06 00:10:13 mav Exp $"); #include "opt_ata.h" #include ==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-ite.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-ite.c,v 1.2 2009/06/24 19:49:18 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-ite.c,v 1.3 2009/12/06 00:10:13 mav Exp $"); #include "opt_ata.h" #include ==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-jmicron.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-jmicron.c,v 1.7 2009/11/16 15:38:27 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-jmicron.c,v 1.8 2009/12/06 00:10:13 mav Exp $"); #include "opt_ata.h" #include ==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-marvell.c#20 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-marvell.c,v 1.17 2009/11/16 15:38:27 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-marvell.c,v 1.18 2009/12/06 00:10:13 mav Exp $"); #include "opt_ata.h" #include ==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-micron.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-micron.c,v 1.2 2009/06/24 19:49:18 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-micron.c,v 1.3 2009/12/06 00:10:13 mav Exp $"); #include "opt_ata.h" #include ==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-national.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-national.c,v 1.3 2009/06/24 19:49:18 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-national.c,v 1.4 2009/12/06 00:10:13 mav Exp $"); #include "opt_ata.h" #include ==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-netcell.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-netcell.c,v 1.4 2009/06/24 19:49:18 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-netcell.c,v 1.5 2009/12/06 00:10:13 mav Exp $"); #include "opt_ata.h" #include ==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-nvidia.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-nvidia.c,v 1.11 2009/11/02 19:02:31 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-nvidia.c,v 1.12 2009/12/06 00:10:13 mav Exp $"); #include "opt_ata.h" #include ==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-promise.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-promise.c,v 1.12 2009/10/31 13:24:14 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-promise.c,v 1.13 2009/12/06 00:10:13 mav Exp $"); #include "opt_ata.h" #include ==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-serverworks.c#12 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-serverworks.c,v 1.8 2009/10/31 13:24:14 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-serverworks.c,v 1.9 2009/12/06 00:10:13 mav Exp $"); #include "opt_ata.h" #include ==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-siliconimage.c#15 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-siliconimage.c,v 1.10 2009/11/01 13:06:15 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-siliconimage.c,v 1.11 2009/12/06 00:10:13 mav Exp $"); #include "opt_ata.h" #include ==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-sis.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-sis.c,v 1.7 2009/06/24 19:49:18 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-sis.c,v 1.8 2009/12/06 00:10:13 mav Exp $"); #include "opt_ata.h" #include ==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-via.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-via.c,v 1.8 2009/10/26 10:07:52 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-via.c,v 1.9 2009/12/06 00:10:13 mav Exp $"); #include "opt_ata.h" #include ==== //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_dummynet.c#7 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/ipfw/ip_dummynet.c,v 1.8 2009/12/02 15:20:31 luigi Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/ipfw/ip_dummynet.c,v 1.9 2009/12/05 23:27:21 oleg Exp $"); #define DUMMYNET_DEBUG @@ -1447,7 +1447,9 @@ q->numbytes += pipe->bandwidth; } } else { /* WF2Q. */ - if (pipe->idle_time < curr_time) { + if (pipe->idle_time < curr_time && + pipe->scheduler_heap.elements == 0 && + pipe->not_eligible_heap.elements == 0) { /* Calculate available burst size. */ pipe->numbytes += (curr_time - pipe->idle_time - 1) * pipe->bandwidth; ==== //depot/projects/scottl-camlock/src/sys/powerpc/powermac/ata_dbdma.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/powerpc/powermac/ata_dbdma.c,v 1.2 2008/10/28 22:09:30 nwhitehorn Exp $ + * $FreeBSD: src/sys/powerpc/powermac/ata_dbdma.c,v 1.3 2009/12/06 00:10:13 mav Exp $ */ /* ==== //depot/projects/scottl-camlock/src/sys/powerpc/powermac/ata_kauai.c#8 (text+ko) ==== @@ -26,7 +26,7 @@ * */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/powermac/ata_kauai.c,v 1.17 2008/10/27 00:09:14 nwhitehorn Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/powermac/ata_kauai.c,v 1.18 2009/12/06 00:10:13 mav Exp $"); /* * Mac 'Kauai' PCI ATA controller ==== //depot/projects/scottl-camlock/src/sys/powerpc/powermac/ata_macio.c#7 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/powerpc/powermac/ata_macio.c,v 1.22 2009/03/25 03:42:49 nwhitehorn Exp $ + * $FreeBSD: src/sys/powerpc/powermac/ata_macio.c,v 1.23 2009/12/06 00:10:13 mav Exp $ */ /* ==== //depot/projects/scottl-camlock/src/sys/powerpc/psim/ata_iobus.c#7 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/powerpc/psim/ata_iobus.c,v 1.15 2009/06/10 17:40:18 imp Exp $ + * $FreeBSD: src/sys/powerpc/psim/ata_iobus.c,v 1.16 2009/12/06 00:10:13 mav Exp $ */ /* ==== //depot/projects/scottl-camlock/src/usr.bin/w/Makefile#2 (text+ko) ==== @@ -1,11 +1,11 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 -# $FreeBSD: src/usr.bin/w/Makefile,v 1.8 2001/07/26 19:20:13 brian Exp $ +# $FreeBSD: src/usr.bin/w/Makefile,v 1.9 2009/12/06 01:10:30 ed Exp $ PROG= w SRCS= fmt.c pr_time.c proc_compare.c w.c MAN= w.1 uptime.1 -DPADD= ${LIBKVM} ${LIBUTIL} -LDADD= -lkvm -lutil +DPADD= ${LIBKVM} ${LIBULOG} ${LIBUTIL} +LDADD= -lkvm -lulog -lutil #BINGRP= kmem #BINMODE=2555 LINKS= ${BINDIR}/w ${BINDIR}/uptime ==== //depot/projects/scottl-camlock/src/usr.bin/w/w.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ #include -__FBSDID("$FreeBSD: src/usr.bin/w/w.c,v 1.62 2009/11/22 16:51:44 ume Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/w/w.c,v 1.63 2009/12/06 01:10:30 ed Exp $"); #ifndef lint static const char copyright[] = @@ -83,14 +83,15 @@ #include #include #include +#define _ULOG_POSIX_NAMES +#include #include -#include #include #include "extern.h" struct timeval boottime; -struct utmp utmp; +struct utmpx *utmp; struct winsize ws; kvm_t *kd; time_t now; /* the current time of day */ @@ -109,7 +110,7 @@ */ struct entry { struct entry *next; - struct utmp utmp; + struct utmpx utmp; dev_t tdev; /* dev_t of terminal */ time_t idle; /* idle time of terminal in seconds */ struct kinfo_proc *kp; /* `most interesting' proc */ @@ -119,11 +120,12 @@ #define debugproc(p) *((struct kinfo_proc **)&(p)->ki_udata) -/* W_DISPHOSTSIZE should not be greater than UT_HOSTSIZE */ -#define W_DISPHOSTSIZE 16 +#define W_DISPUSERSIZE 10 +#define W_DISPLINESIZE 8 +#define W_DISPHOSTSIZE 24 static void pr_header(time_t *, int); -static struct stat *ttystat(char *, int); +static struct stat *ttystat(char *); static void usage(int); static int this_is_uptime(const char *s); @@ -135,7 +137,6 @@ struct kinfo_proc *kp; struct kinfo_proc *dkp; struct stat *stp; - FILE *ut; time_t touched; int ch, i, nentries, nusers, wcmd, longidle, longattime, dropgid; const char *memf, *nlistf, *p; @@ -208,16 +209,15 @@ errx(1, "%s", errbuf); (void)time(&now); - if ((ut = fopen(_PATH_UTMP, "r")) == NULL) - err(1, "%s", _PATH_UTMP); if (*argv) sel_users = argv; - for (nusers = 0; fread(&utmp, sizeof(utmp), 1, ut);) { - if (utmp.ut_name[0] == '\0') + setutxent(); + for (nusers = 0; (utmp = getutxent()) != NULL;) { + if (utmp->ut_type != USER_PROCESS) continue; - if (!(stp = ttystat(utmp.ut_line, UT_LINESIZE))) + if (!(stp = ttystat(utmp->ut_line))) continue; /* corrupted record */ ++nusers; if (wcmd == 0) @@ -228,7 +228,7 @@ usermatch = 0; for (user = sel_users; !usermatch && *user; user++) - if (!strncmp(utmp.ut_name, *user, UT_NAMESIZE)) + if (!strcmp(utmp->ut_user, *user)) usermatch = 1; if (!usermatch) continue; @@ -237,7 +237,7 @@ errx(1, "calloc"); *nextp = ep; nextp = &ep->next; - memmove(&ep->utmp, &utmp, sizeof(struct utmp)); + memmove(&ep->utmp, utmp, sizeof *utmp); ep->tdev = stp->st_rdev; /* * If this is the console device, attempt to ascertain @@ -250,14 +250,14 @@ (void)sysctlbyname("machdep.consdev", &ep->tdev, &size, NULL, 0); } touched = stp->st_atime; - if (touched < ep->utmp.ut_time) { + if (touched < ep->utmp.ut_tv.tv_sec) { /* tty untouched since before login */ - touched = ep->utmp.ut_time; + touched = ep->utmp.ut_tv.tv_sec; } if ((ep->idle = now - touched) < 0) ep->idle = 0; } - (void)fclose(ut); + endutxent(); if (header || wcmd == 0) { pr_header(&now, nusers); @@ -271,11 +271,11 @@ #define HEADER_FROM "FROM" #define HEADER_LOGIN_IDLE "LOGIN@ IDLE " #define HEADER_WHAT "WHAT\n" -#define WUSED (UT_NAMESIZE + UT_LINESIZE + W_DISPHOSTSIZE + \ +#define WUSED (W_DISPUSERSIZE + W_DISPLINESIZE + W_DISPHOSTSIZE + \ sizeof(HEADER_LOGIN_IDLE) + 3) /* header width incl. spaces */ (void)printf("%-*.*s %-*.*s %-*.*s %s", - UT_NAMESIZE, UT_NAMESIZE, HEADER_USER, - UT_LINESIZE, UT_LINESIZE, HEADER_TTY, + W_DISPUSERSIZE, W_DISPUSERSIZE, HEADER_USER, + W_DISPLINESIZE, W_DISPLINESIZE, HEADER_TTY, W_DISPHOSTSIZE, W_DISPHOSTSIZE, HEADER_FROM, HEADER_LOGIN_IDLE HEADER_WHAT); } @@ -347,7 +347,6 @@ } for (ep = ehead; ep != NULL; ep = ep->next) { - char host_buf[UT_HOSTSIZE + 1]; struct addrinfo hints, *res; struct sockaddr_storage ss; struct sockaddr *sa = (struct sockaddr *)&ss; @@ -356,9 +355,7 @@ time_t t; int isaddr; - host_buf[UT_HOSTSIZE] = '\0'; - strncpy(host_buf, ep->utmp.ut_host, UT_HOSTSIZE); - p = *host_buf ? host_buf : "-"; + p = *ep->utmp.ut_host ? ep->utmp.ut_host : "-"; if ((x_suffix = strrchr(p, ':')) != NULL) { if ((dot = strchr(x_suffix, '.')) != NULL && strchr(dot+1, '.') == NULL) @@ -419,13 +416,13 @@ } } (void)printf("%-*.*s %-*.*s %-*.*s ", - UT_NAMESIZE, UT_NAMESIZE, ep->utmp.ut_name, - UT_LINESIZE, UT_LINESIZE, + W_DISPUSERSIZE, W_DISPUSERSIZE, ep->utmp.ut_user, + W_DISPLINESIZE, W_DISPLINESIZE, strncmp(ep->utmp.ut_line, "tty", 3) && strncmp(ep->utmp.ut_line, "cua", 3) ? ep->utmp.ut_line : ep->utmp.ut_line + 3, W_DISPHOSTSIZE, W_DISPHOSTSIZE, *p ? p : "-"); - t = _time_to_time32(ep->utmp.ut_time); + t = ep->utmp.ut_tv.tv_sec; longattime = pr_attime(&t, &now); longidle = pr_idle(ep->idle); (void)printf("%.*s\n", argwidth - longidle - longattime, @@ -496,12 +493,12 @@ } static struct stat * -ttystat(char *line, int sz) +ttystat(char *line) { static struct stat sb; char ttybuf[MAXPATHLEN]; - (void)snprintf(ttybuf, sizeof(ttybuf), "%s%.*s", _PATH_DEV, sz, line); + (void)snprintf(ttybuf, sizeof(ttybuf), "%s%s", _PATH_DEV, line); if (stat(ttybuf, &sb) == 0) { return (&sb); } else ==== //depot/projects/scottl-camlock/src/usr.sbin/pw/pw_user.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/usr.sbin/pw/pw_user.c,v 1.63 2008/08/16 15:41:03 ache Exp $"; + "$FreeBSD: src/usr.sbin/pw/pw_user.c,v 1.64 2009/12/06 01:27:28 ed Exp $"; #endif /* not lint */ #include @@ -41,16 +41,11 @@ #include #include #include -#include #include #include "pw.h" #include "bitmap.h" -#if (MAXLOGNAME-1) > UT_NAMESIZE -#define LOGNAMESIZE UT_NAMESIZE -#else #define LOGNAMESIZE (MAXLOGNAME-1) -#endif static char locked_str[] = "*LOCKED*"; ==== //depot/projects/scottl-camlock/src/usr.sbin/repquota/repquota.c#3 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/usr.sbin/repquota/repquota.c,v 1.22 2008/07/02 15:51:59 des Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/repquota/repquota.c,v 1.23 2009/12/06 01:29:49 ed Exp $"); /* * Quota report @@ -60,7 +60,6 @@ #include #include #include -#include /* Let's be paranoid about block size */ #if 10 > DEV_BSHIFT @@ -227,9 +226,9 @@ } fclose(qf); printf("%*s Block limits File limits\n", - max(UT_NAMESIZE,10), " "); + max(MAXLOGNAME-1,10), " "); printf("%s%*s used soft hard grace used soft hard grace\n", - type == USRQUOTA ? "User " : "Group", max(UT_NAMESIZE,10), " "); + type == USRQUOTA ? "User " : "Group", max(MAXLOGNAME-1,10), " "); for (id = 0; id <= highid[type]; id++) { fup = lookup(id, type); if (fup == 0) @@ -237,7 +236,7 @@ if (fup->fu_dqblk.dqb_curinodes == 0 && fup->fu_dqblk.dqb_curblocks == 0) continue; - printf("%-*s ", max(UT_NAMESIZE,10), fup->fu_name); + printf("%-*s ", max(MAXLOGNAME-1,10), fup->fu_name); printf("%c%c %8lu %8lu %8lu %6s", fup->fu_dqblk.dqb_bsoftlimit && fup->fu_dqblk.dqb_curblocks >= From owner-p4-projects@FreeBSD.ORG Sun Dec 6 11:41:03 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 354D01065672; Sun, 6 Dec 2009 11:41:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EE0551065670 for ; Sun, 6 Dec 2009 11:41:02 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DB86F8FC18 for ; Sun, 6 Dec 2009 11:41:02 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nB6Bf2tu098000 for ; Sun, 6 Dec 2009 11:41:02 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB6Bf2wu097998 for perforce@freebsd.org; Sun, 6 Dec 2009 11:41:02 GMT (envelope-from mav@freebsd.org) Date: Sun, 6 Dec 2009 11:41:02 GMT Message-Id: <200912061141.nB6Bf2wu097998@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171447 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Dec 2009 11:41:03 -0000 http://p4web.freebsd.org/chv.cgi?CH=171447 Change 171447 by mav@mav_mavbook on 2009/12/06 11:40:06 Reduce diff to HEAD. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.h#22 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.h#22 (text+ko) ==== @@ -178,9 +178,23 @@ int cam_periph_error(union ccb *ccb, cam_flags camflags, u_int32_t sense_flags, union ccb *save_ccb); -#define cam_periph_lock(periph) mtx_lock((periph)->sim->mtx) -#define cam_periph_unlock(periph) mtx_unlock((periph)->sim->mtx) -#define cam_periph_owned(periph) mtx_owned((periph)->sim->mtx) +static __inline void +cam_periph_lock(struct cam_periph *periph) +{ + mtx_lock(periph->sim->mtx); +} + +static __inline void +cam_periph_unlock(struct cam_periph *periph) +{ + mtx_unlock(periph->sim->mtx); +} + +static __inline int +cam_periph_owned(struct cam_periph *periph) +{ + return (mtx_owned(periph->sim->mtx)); +} #endif /* _KERNEL */ #endif /* _CAM_CAM_PERIPH_H */ From owner-p4-projects@FreeBSD.ORG Sun Dec 6 19:13:36 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E117106568F; Sun, 6 Dec 2009 19:13:36 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 08F3A106568D for ; Sun, 6 Dec 2009 19:13:36 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E99E18FC13 for ; Sun, 6 Dec 2009 19:13:35 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nB6JDZAY060015 for ; Sun, 6 Dec 2009 19:13:35 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB6JDZF4060013 for perforce@freebsd.org; Sun, 6 Dec 2009 19:13:35 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 6 Dec 2009 19:13:35 GMT Message-Id: <200912061913.nB6JDZF4060013@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171457 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Dec 2009 19:13:36 -0000 http://p4web.freebsd.org/chv.cgi?CH=171457 Change 171457 by pgj@beehive on 2009/12/06 19:12:39 IFC Affected files ... .. //depot/projects/docproj_hu/www/hu/administration.sgml#28 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/navibar.l10n.ent#29 integrate .. //depot/projects/docproj_hu/www/share/sgml/advisories.xml#15 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#77 integrate Differences ... ==== //depot/projects/docproj_hu/www/hu/administration.sgml#28 (text+ko) ==== @@ -1,5 +1,5 @@ + ==== //depot/projects/docproj_hu/www/hu/share/sgml/navibar.l10n.ent#29 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -19,6 +19,42 @@ 2009 + 12 + + + 3 + + + Az NVIDIA kártyák most már az + &arch.amd64; architektúrán is hivatalosan + támogatottak + +

Az NVIDIA Corporation bétateszt + céljából kiadta az NVIDIA 195.22 + verziójú grafikus meghajtójának + &os; változatát &arch.i386; és + &arch.amd64; architektúrákra egyaránt. + A meghajtó a &os; operációs rendszer + legújabb (7.2-STABLE és 8.0-RELEASE) + változatait támogatja, és számos + újítást vonultat fel, mint + például az SLI támogatása, jobb + kompatibilitás és teljesítmény, + különösen 4 GB fizikai + memóriánál többel rendelkezõ + rendszerek esetén. Ez a meghajtó elsõ + olyan kiadása, amely támogatja az &arch.amd64; + architektúrát, mivel korábban + kizárólag csak &arch.i386; rendszerekre volt + elérhetõ. A további + részletekrõl az eredeti bejelentésben + olvashatunk.

+ + + + + 11 From owner-p4-projects@FreeBSD.ORG Sun Dec 6 20:23:46 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B89471065692; Sun, 6 Dec 2009 20:23:46 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7C8261065672 for ; Sun, 6 Dec 2009 20:23:46 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6773A8FC12 for ; Sun, 6 Dec 2009 20:23:46 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nB6KNkwn066412 for ; Sun, 6 Dec 2009 20:23:46 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB6KNkD4066410 for perforce@freebsd.org; Sun, 6 Dec 2009 20:23:46 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 6 Dec 2009 20:23:46 GMT Message-Id: <200912062023.nB6KNkD4066410@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171460 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Dec 2009 20:23:46 -0000 http://p4web.freebsd.org/chv.cgi?CH=171460 Change 171460 by pgj@beehive on 2009/12/06 20:23:02 MFen (doc): 1.136 -> 1.137 hu_HU.ISO8859-2/books/handbook/introduction/chapter.sgml 1.471 -> 1.473 hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/introduction/chapter.sgml#26 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#40 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/introduction/chapter.sgml#26 (text+ko) ==== @@ -7,7 +7,7 @@ The FreeBSD Hungarian Documentation Project Translated by: PALI, Gabor %SOURCE% en_US.ISO8859-1/books/handbook/introduction/chapter.sgml - %SRCID% 1.136 + %SRCID% 1.137 --> @@ -653,6 +653,11 @@ TELEHOUSE America + + + Experts + Exchange + és még sokan mások. ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#40 (text+ko) ==== @@ -7,7 +7,7 @@ The FreeBSD Hungarian Documentation Project Translated by: PALI, Gabor %SOURCE% en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml - %SRCID% 1.471 + %SRCID% 1.473 --> @@ -1021,7 +1021,7 @@ CTM tükrözések - A CTM/FreeBSD anonim FTP-n + A CTM/&os; anonim FTP-n keresztül elérhetõ az alábbi tüköroldalak valamelyikérõl. Amennyiben ezen a módon kívánjuk letölteni a @@ -1361,7 +1361,7 @@ hozzáadásával. Mindezek tudatában most már megkezdhetjük - a FreeBSD-CURRENT ág + a &os;-CURRENT ág tartalmának letöltésére és frissen tartására alkalmas supfile állomány @@ -3073,8 +3073,8 @@ RELENG_8 - A FreeBSD-8.X fejlesztési ága, más - néven a FreeBSD 8-STABLE + A &os;-8.X fejlesztési ága, más + néven a &os; 8-STABLE @@ -3082,9 +3082,9 @@ RELENG_8_0 - A FreeBSD-8.0 kiadás ága, ahová - csak a biztonsági frissítések és - a kritikus hibajavítások kerülnek. + A &os;-8.0 kiadás ága, ahová csak a + biztonsági frissítések és a + kritikus hibajavítások kerülnek. @@ -3092,8 +3092,8 @@ RELENG_7 - A FreeBSD-7.X fejlesztési ága, más - néven a FreeBSD 7-STABLE + A &os;-7.X fejlesztési ága, más + néven a &os; 7-STABLE @@ -3101,8 +3101,8 @@ RELENG_7_2 - A FreeBSD-7.2 kiadás ága, ahová - csak a biztonsági frissítések és a + A &os;-7.2 kiadás ága, ahová csak a + biztonsági frissítések és a kritikus hibajavítások kerülnek. @@ -3111,8 +3111,8 @@ RELENG_7_1 - A FreeBSD-7.1 kiadás ága, ahová - csak a biztonsági frissítések és a + A &os;-7.1 kiadás ága, ahová csak a + biztonsági frissítések és a kritikus hibajavítások kerülnek. @@ -3121,9 +3121,9 @@ RELENG_7_0 - A FreeBSD-7.0 kiadás ága, ahová - csak a biztonsági frissítések és - a kritikus hibajavítások kerülnek. + A &os;-7.0 kiadás ága, ahová csak a + biztonsági frissítések és a + kritikus hibajavítások kerülnek. @@ -3131,8 +3131,8 @@ RELENG_6 - A FreeBSD-6.X fejlesztési ága, más - néven a FreeBSD 6-STABLE + A &os;-6.X fejlesztési ága, más + néven a &os; 6-STABLE @@ -3140,8 +3140,8 @@ RELENG_6_4 - A FreeBSD-6.4 kiadás ága, ahová - csak biztonsági frissítések és a + A &os;-6.4 kiadás ága, ahová csak + biztonsági frissítések és a kritikus hibajavítások kerülnek. @@ -3150,8 +3150,8 @@ RELENG_6_3 - A FreeBSD-6.3 kiadás ága, ahová - csak biztonsági frissítések és a + A &os;-6.3 kiadás ága, ahová csak + biztonsági frissítések és a kritikus hibajavítások kerülnek. @@ -3160,8 +3160,8 @@ RELENG_6_2 - A FreeBSD-6.2 kiadás ága, ahová - csak biztonsági frissítések és a + A &os;-6.2 kiadás ága, ahová csak + biztonsági frissítések és a kritikus hibajavítások kerülnek. @@ -3170,8 +3170,8 @@ RELENG_6_1 - A FreeBSD-6.1 kiadás ága, ahová - csak biztonsági frissítések és a + A &os;-6.1 kiadás ága, ahová csak + biztonsági frissítések és a kritikus hibajavítások kerülnek. @@ -3180,8 +3180,8 @@ RELENG_6_0 - A FreeBSD-6.0 kiadás ága, ahová - csak biztonsági frissítések és a + A &os;-6.0 kiadás ága, ahová csak + biztonsági frissítések és a kritikus hibajavítások kerülnek. @@ -3190,8 +3190,8 @@ RELENG_5 - A FreeBSD-5.X fejlesztési ág, más - néven a FreeBSD 5-STABLE. + A &os;-5.X fejlesztési ág, más + néven a &os; 5-STABLE. @@ -3199,8 +3199,8 @@ RELENG_5_5 - A FreeBSD-5.5 kiadás ága, ahová - csak biztonsági frissítések és a + A &os;-5.5 kiadás ága, ahová csak + biztonsági frissítések és a kritikus hibajavítások kerülnek. @@ -3209,8 +3209,8 @@ RELENG_5_4 - A FreeBSD-5.4 kiadás ága, ahová - csak biztonsági frissítések és a + A &os;-5.4 kiadás ága, ahová csak + biztonsági frissítések és a kritikus hibajavítások kerülnek. @@ -3219,8 +3219,8 @@ RELENG_5_3 - A FreeBSD-5.3 kiadás ága, ahová - csak biztonsági frissítések és a + A &os;-5.3 kiadás ága, ahová csak + biztonsági frissítések és a kritikus hibajavítások kerülnek. @@ -3229,7 +3229,7 @@ RELENG_5_2 - A FreeBSD-5.2 és FreeBSD-5.2.1 kiadások + A &os;-5.2 és &os;-5.2.1 kiadások ága, ahová csak biztonsági frissítések és a kritikus hibajavítások kerülnek. @@ -3240,8 +3240,8 @@ RELENG_5_1 - A FreeBSD-5.1 kiadás ága, ahová - csak biztonsági frissítések és a + A &os;-5.1 kiadás ága, ahová csak + biztonsági frissítések és a kritikus hibajavítások kerülnek. @@ -3250,8 +3250,8 @@ RELENG_5_0 - A FreeBSD-5.0 kiadás ága, ahová - csak biztonsági frissítések és a + A &os;-5.0 kiadás ága, ahová csak + biztonsági frissítések és a kritikus hibajavítások kerülnek. @@ -3260,8 +3260,8 @@ RELENG_4 - A FreeBSD-4.X fejlesztési ága, más - néven a FreeBSD 4-STABLE. + A &os;-4.X fejlesztési ága, más + néven a &os; 4-STABLE. @@ -3269,8 +3269,8 @@ RELENG_4_11 - A FreeBSD-4.11 kiadás ága, ahová - csak biztonsági frissítések és a + A &os;-4.11 kiadás ága, ahová csak + biztonsági frissítések és a kritikus hibajavítások kerülnek. @@ -3279,8 +3279,8 @@ RELENG_4_10 - A FreeBSD-4.10 kiadás ága, ahová - csak biztonsági frissítések és a + A &os;-4.10 kiadás ága, ahová csak + biztonsági frissítések és a kritikus hibajavítások kerülnek. @@ -3289,8 +3289,8 @@ RELENG_4_9 - A FreeBSD-4.9 kiadás ága, ahová - csak biztonsági frissítések és a + A &os;-4.9 kiadás ága, ahová csak + biztonsági frissítések és a kritikus hibajavítások kerülnek. @@ -3299,8 +3299,8 @@ RELENG_4_8 - A FreeBSD-4.8 kiadás ága, ahová - csak biztonsági frissítések és a + A &os;-4.8 kiadás ága, ahová csak + biztonsági frissítések és a kritikus hibajavítások kerülnek. @@ -3309,8 +3309,8 @@ RELENG_4_7 - A FreeBSD-4.7 kiadás ága, ahová - csak biztonsági frissítések és a + A &os;-4.7 kiadás ága, ahová csak + biztonsági frissítések és a kritikus hibajavítások kerülnek. @@ -3319,7 +3319,7 @@ RELENG_4_6 - A FreeBSD-4.6 és FreeBSD-4.6.2 kiadások + A &os;-4.6 és &os;-4.6.2 kiadások ága, ahová csak biztonsági frissítések és a kritikus hibajavítások kerülnek. @@ -3330,8 +3330,8 @@ RELENG_4_5 - A FreeBSD-4.5 kiadás ága, ahová - csak biztonsági frissítések és a + A &os;-4.5 kiadás ága, ahová csak + biztonsági frissítések és a kritikus hibajavítások kerülnek. @@ -3340,8 +3340,8 @@ RELENG_4_4 - A FreeBSD-4.4 kiadás ága, ahová - csak biztonsági frissítések és a + A &os;-4.4 kiadás ága, ahová csak + biztonsági frissítések és a kritikus hibajavítások kerülnek. @@ -3350,8 +3350,8 @@ RELENG_4_3 - A FreeBSD-4.3 kiadás ága, ahová - csak biztonsági frissítések és a + A &os;-4.3 kiadás ága, ahová csak + biztonsági frissítések és a kritikus hibajavítások kerülnek. @@ -3360,7 +3360,7 @@ RELENG_3 - A FreeBSD-3.X fejlesztési ága, más + A &os;-3.X fejlesztési ága, más néven a 3.X-STABLE. @@ -3369,9 +3369,9 @@ RELENG_2_2 - A FreeBSD-2.2.X fejlesztési ága, - más néven a 2.2-STABLE. Ez az ág - manapság már elavult. + A &os;-2.2.X fejlesztési ága, más + néven a 2.2-STABLE. Ez az ág manapság + már elavult. @@ -3408,7 +3408,7 @@ RELENG_7_2_0_RELEASE - FreeBSD 7.2 + &os; 7.2 @@ -3416,7 +3416,7 @@ RELENG_7_1_0_RELEASE - FreeBSD 7.1 + &os; 7.1 @@ -3424,7 +3424,7 @@ RELENG_7_0_0_RELEASE - FreeBSD 7.0 + &os; 7.0 @@ -3432,7 +3432,7 @@ RELENG_6_4_0_RELEASE - FreeBSD 6.4 + &os; 6.4 @@ -3440,7 +3440,7 @@ RELENG_6_3_0_RELEASE - FreeBSD 6.3 + &os; 6.3 @@ -3448,7 +3448,7 @@ RELENG_6_2_0_RELEASE - FreeBSD 6.2 + &os; 6.2 @@ -3456,7 +3456,7 @@ RELENG_6_1_0_RELEASE - FreeBSD 6.1 + &os; 6.1 @@ -3464,7 +3464,7 @@ RELENG_6_0_0_RELEASE - FreeBSD 6.0 + &os; 6.0 @@ -3472,7 +3472,7 @@ RELENG_5_5_0_RELEASE - FreeBSD 5.5 + &os; 5.5 @@ -3480,7 +3480,7 @@ RELENG_5_4_0_RELEASE - FreeBSD 5.4 + &os; 5.4 @@ -3488,7 +3488,7 @@ RELENG_4_11_0_RELEASE - FreeBSD 4.11 + &os; 4.11 @@ -3496,7 +3496,7 @@ RELENG_5_3_0_RELEASE - FreeBSD 5.3 + &os; 5.3 @@ -3504,7 +3504,7 @@ RELENG_4_10_0_RELEASE - FreeBSD 4.10 + &os; 4.10 @@ -3512,7 +3512,7 @@ RELENG_5_2_1_RELEASE - FreeBSD 5.2.1 + &os; 5.2.1 @@ -3520,7 +3520,7 @@ RELENG_5_2_0_RELEASE - FreeBSD 5.2 + &os; 5.2 @@ -3528,7 +3528,7 @@ RELENG_4_9_0_RELEASE - FreeBSD 4.9 + &os; 4.9 @@ -3536,7 +3536,7 @@ RELENG_5_1_0_RELEASE - FreeBSD 5.1 + &os; 5.1 @@ -3544,7 +3544,7 @@ RELENG_4_8_0_RELEASE - FreeBSD 4.8 + &os; 4.8 @@ -3552,7 +3552,7 @@ RELENG_5_0_0_RELEASE - FreeBSD 5.0 + &os; 5.0 @@ -3560,7 +3560,7 @@ RELENG_4_7_0_RELEASE - FreeBSD 4.7 + &os; 4.7 @@ -3568,7 +3568,7 @@ RELENG_4_6_2_RELEASE - FreeBSD 4.6.2 + &os; 4.6.2 @@ -3576,7 +3576,7 @@ RELENG_4_6_1_RELEASE - FreeBSD 4.6.1 + &os; 4.6.1 @@ -3584,7 +3584,7 @@ RELENG_4_6_0_RELEASE - FreeBSD 4.6 + &os; 4.6 @@ -3592,7 +3592,7 @@ RELENG_4_5_0_RELEASE - FreeBSD 4.5 + &os; 4.5 @@ -3600,7 +3600,7 @@ RELENG_4_4_0_RELEASE - FreeBSD 4.4 + &os; 4.4 @@ -3608,7 +3608,7 @@ RELENG_4_3_0_RELEASE - FreeBSD 4.3 + &os; 4.3 @@ -3616,7 +3616,7 @@ RELENG_4_2_0_RELEASE - FreeBSD 4.2 + &os; 4.2 @@ -3624,7 +3624,7 @@ RELENG_4_1_1_RELEASE - FreeBSD 4.1.1 + &os; 4.1.1 @@ -3632,7 +3632,7 @@ RELENG_4_1_0_RELEASE - FreeBSD 4.1 + &os; 4.1 @@ -3640,7 +3640,7 @@ RELENG_4_0_0_RELEASE - FreeBSD 4.0 + &os; 4.0 @@ -3648,7 +3648,7 @@ RELENG_3_5_0_RELEASE - FreeBSD-3.5 + &os; 3.5 @@ -3656,7 +3656,7 @@ RELENG_3_4_0_RELEASE - FreeBSD-3.4 + &os; 3.4 @@ -3664,7 +3664,7 @@ RELENG_3_3_0_RELEASE - FreeBSD-3.3 + &os; 3.3 @@ -3672,7 +3672,7 @@ RELENG_3_2_0_RELEASE - FreeBSD-3.2 + &os; 3.2 @@ -3680,7 +3680,7 @@ RELENG_3_1_0_RELEASE - FreeBSD-3.1 + &os; 3.1 @@ -3688,7 +3688,7 @@ RELENG_3_0_0_RELEASE - FreeBSD-3.0 + &os; 3.0 @@ -3696,7 +3696,7 @@ RELENG_2_2_8_RELEASE - FreeBSD-2.2.8 + &os; 2.2.8 @@ -3704,7 +3704,7 @@ RELENG_2_2_7_RELEASE - FreeBSD-2.2.7 + &os; 2.2.7 @@ -3712,7 +3712,7 @@ RELENG_2_2_6_RELEASE - FreeBSD-2.2.6 + &os; 2.2.6 @@ -3720,7 +3720,7 @@ RELENG_2_2_5_RELEASE - FreeBSD-2.2.5 + &os; 2.2.5 @@ -3728,7 +3728,7 @@ RELENG_2_2_2_RELEASE - FreeBSD-2.2.2 + &os; 2.2.2 @@ -3736,7 +3736,7 @@ RELENG_2_2_1_RELEASE - FreeBSD-2.2.1 + &os; 2.2.1 @@ -3744,7 +3744,7 @@ RELENG_2_2_0_RELEASE - FreeBSD-2.2.0 + &os; 2.2.0 @@ -3816,7 +3816,7 @@ tükrözése. - FreeBSD: a &os; FTP szerverének teljes + &os;: a &os; FTP szerverének teljes tükrözése. @@ -3833,7 +3833,7 @@ - FreeBSD: a &os; FTP szerverének teljes + &os;: a &os; FTP szerverének teljes tükrözése. @@ -3849,14 +3849,21 @@ Elérhetõ gyûjtemények: - FreeBSD: A &os; FTP szerver teljes - tartalma. - FreeBSD-gnats: A GNATS - hibanyilvántartó - adatbázis. - FreeBSD-Archive: A &os; archívumait - tároló FTP szerver - tükrözése. + + &os;: A &os; FTP szerver teljes + tartalma. + + + + &os;-gnats: A GNATS hibanyilvántartó + adatbázis. + + + + &os;-Archive: A &os; archívumait + tároló FTP szerver + tükrözése. + @@ -3872,7 +3879,7 @@ Elérhetõ gyûjtemények: - FreeBSD: a &os; FTP szerverének teljes + &os;: a &os; FTP szerverének teljes tükrözése. @@ -3910,9 +3917,10 @@ - FreeBSD: a &os; FTP szerverének központi + &os;: a &os; FTP szerverének központi archívuma. + acl: a &os; központi ACL listája. @@ -3924,7 +3932,7 @@ - FreeBSD: a &os; FTP szerver teljes + &os;: a &os; FTP szerver teljes tükrözése. From owner-p4-projects@FreeBSD.ORG Sun Dec 6 21:09:33 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 20D8F10656A6; Sun, 6 Dec 2009 21:09:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D96DE106568B for ; Sun, 6 Dec 2009 21:09:32 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C64E68FC23 for ; Sun, 6 Dec 2009 21:09:32 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nB6L9WRd081911 for ; Sun, 6 Dec 2009 21:09:32 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB6L9WmV081909 for perforce@freebsd.org; Sun, 6 Dec 2009 21:09:32 GMT (envelope-from mav@freebsd.org) Date: Sun, 6 Dec 2009 21:09:32 GMT Message-Id: <200912062109.nB6L9WmV081909@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171465 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Dec 2009 21:09:33 -0000 http://p4web.freebsd.org/chv.cgi?CH=171465 Change 171465 by mav@mav_mavtest on 2009/12/06 21:09:28 Add Asynchronous Notification support for controllers without SNTF capability by snooping SDB FIS receive area. It should be even faster then regular way, but less reliable. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#89 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#89 (text+ko) ==== @@ -1129,7 +1129,8 @@ struct cam_path *dpath; int i; - ATA_OUTL(ch->r_mem, AHCI_P_SNTF, status); + if (ch->caps & AHCI_CAP_SSNTF) + ATA_OUTL(ch->r_mem, AHCI_P_SNTF, status); if (bootverbose) device_printf(dev, "SNTF 0x%04x\n", status); for (i = 0; i < 16; i++) { @@ -1188,8 +1189,16 @@ /* Read command statuses. */ sstatus = ATA_INL(ch->r_mem, AHCI_P_SACT); cstatus = ATA_INL(ch->r_mem, AHCI_P_CI); - if ((istatus & AHCI_P_IX_SDB) && (ch->caps & AHCI_CAP_SSNTF)) - sntf = ATA_INL(ch->r_mem, AHCI_P_SNTF); + if (istatus & AHCI_P_IX_SDB) { + if (ch->caps & AHCI_CAP_SSNTF) + sntf = ATA_INL(ch->r_mem, AHCI_P_SNTF); + else { + u_int8_t *fis = ch->dma.rfis + 0x58; + + if (fis[1] & 0x80) + sntf = (1 << (fis[1] & 0x0f)); + } + } /* Process PHY events */ if (istatus & (AHCI_P_IX_PC | AHCI_P_IX_PRC | AHCI_P_IX_OF | AHCI_P_IX_IF | AHCI_P_IX_HBD | AHCI_P_IX_HBF | AHCI_P_IX_TFE)) { From owner-p4-projects@FreeBSD.ORG Sun Dec 6 22:43:07 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D9681065676; Sun, 6 Dec 2009 22:43:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 423C2106566C for ; Sun, 6 Dec 2009 22:43:07 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2F77E8FC08 for ; Sun, 6 Dec 2009 22:43:07 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nB6Mh7Kw089920 for ; Sun, 6 Dec 2009 22:43:07 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB6Mh70F089918 for perforce@freebsd.org; Sun, 6 Dec 2009 22:43:07 GMT (envelope-from mav@freebsd.org) Date: Sun, 6 Dec 2009 22:43:07 GMT Message-Id: <200912062243.nB6Mh70F089918@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171473 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Dec 2009 22:43:07 -0000 http://p4web.freebsd.org/chv.cgi?CH=171473 Change 171473 by mav@mav_mavtest on 2009/12/06 22:42:24 Increase device reference count while we hold freeze on it. Elseway if device disappears, we will unfreeze something unexpected. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#22 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#22 (text+ko) ==== @@ -54,6 +54,7 @@ #include #include #include +#include #include #include @@ -178,6 +179,7 @@ i, 0) == CAM_REQ_CMP) { printf("PMP freeze: %d\n", i); softc->frozen |= (1 << i); + xpt_acquire_device(dpath->device); cam_freeze_devq(dpath); xpt_free_path(dpath); } @@ -201,6 +203,7 @@ printf("PMP release: %d\n", i); softc->frozen &= ~(1 << i); cam_release_devq(dpath, 0, 0, 0, FALSE); + xpt_release_device(dpath->device); xpt_free_path(dpath); } } @@ -228,6 +231,7 @@ xpt_free_path(dpath); } } + pmprelease(periph, -1); xpt_print(periph->path, "lost device\n"); } From owner-p4-projects@FreeBSD.ORG Sun Dec 6 23:26:51 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4347F1065670; Sun, 6 Dec 2009 23:26:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 07F6F106566B for ; Sun, 6 Dec 2009 23:26:51 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E9CBD8FC0C for ; Sun, 6 Dec 2009 23:26:50 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nB6NQoji094289 for ; Sun, 6 Dec 2009 23:26:50 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB6NQoVv094287 for perforce@freebsd.org; Sun, 6 Dec 2009 23:26:50 GMT (envelope-from mav@freebsd.org) Date: Sun, 6 Dec 2009 23:26:50 GMT Message-Id: <200912062326.nB6NQoVv094287@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171474 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Dec 2009 23:26:51 -0000 http://p4web.freebsd.org/chv.cgi?CH=171474 Change 171474 by mav@mav_mavtest on 2009/12/06 23:25:51 Be more polite to freeze underruns in production. It is bad, but not fatal. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#133 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#133 (text+ko) ==== @@ -4152,7 +4152,10 @@ KASSERT(count <= dev->ccbq.queue.qfrozen_cnt, ("xpt_release_devq: requested %u > present %u\n", count, dev->ccbq.queue.qfrozen_cnt)); - dev->ccbq.queue.qfrozen_cnt -= count; + if (count <= dev->ccbq.queue.qfrozen_cnt) + dev->ccbq.queue.qfrozen_cnt -= count; + else + dev->ccbq.queue.qfrozen_cnt = 0; if (dev->ccbq.queue.qfrozen_cnt == 0) { /* * No longer need to wait for a successful @@ -4190,7 +4193,8 @@ KASSERT(sendq->qfrozen_cnt > 0, ("xpt_release_simq: requested 1 > present %u\n", sendq->qfrozen_cnt)); - sendq->qfrozen_cnt--; + if (sendq->qfrozen_cnt > 0) + sendq->qfrozen_cnt--; if (sendq->qfrozen_cnt == 0) { /* * If there is a timeout scheduled to release this From owner-p4-projects@FreeBSD.ORG Mon Dec 7 12:10:35 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F8AA10656A9; Mon, 7 Dec 2009 12:10:35 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 13E411065692 for ; Mon, 7 Dec 2009 12:10:35 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 004698FC24 for ; Mon, 7 Dec 2009 12:10:35 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nB7CAYrI095927 for ; Mon, 7 Dec 2009 12:10:34 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB7CAYJT095925 for perforce@freebsd.org; Mon, 7 Dec 2009 12:10:34 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 7 Dec 2009 12:10:34 GMT Message-Id: <200912071210.nB7CAYJT095925@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171486 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Dec 2009 12:10:35 -0000 http://p4web.freebsd.org/chv.cgi?CH=171486 Change 171486 by rene@rene_self on 2009/12/07 12:10:15 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#39 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/portbuild/article.sgml#18 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#58 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml#24 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#39 integrate .. //depot/projects/docproj_nl/www/nl/administration.sgml#16 edit .. //depot/projects/docproj_nl/www/nl/share/sgml/navibar.l10n.ent#12 edit Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#39 (text+ko) ==== @@ -1,4 +1,4 @@ - + sigpause(3) and PIE support in csu. + + 900004 + December 6, 2009 + 9.0-CURRENT after addition of libulog and its + libutempter compatibility interface. + ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml#24 (text+ko) ==== @@ -1,7 +1,7 @@ &header; @@ -154,7 +154,6 @@
  • &a.kib; <kib@FreeBSD.org>
  • &a.blackend; <blackend@FreeBSD.org>
  • &a.mux; <mux@FreeBSD.org>
    • -
  • &a.bmah; <bmah@FreeBSD.org>
  • &a.gnn; <gnn@FreeBSD.org>
  • &a.hrs; <hrs@FreeBSD.org>
  • &a.kensmith; <kensmith@FreeBSD.org> ==== //depot/projects/docproj_nl/www/nl/share/sgml/navibar.l10n.ent#12 (text+ko) ==== @@ -1,6 +1,6 @@ - @@ -122,7 +122,7 @@
  • &os;/GNOME '> From owner-p4-projects@FreeBSD.ORG Mon Dec 7 12:32:57 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C25AB1065670; Mon, 7 Dec 2009 12:32:57 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 86EC4106566B for ; Mon, 7 Dec 2009 12:32:57 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 755DD8FC1F for ; Mon, 7 Dec 2009 12:32:57 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nB7CWvGl097573 for ; Mon, 7 Dec 2009 12:32:57 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB7CWvFr097571 for perforce@freebsd.org; Mon, 7 Dec 2009 12:32:57 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 7 Dec 2009 12:32:57 GMT Message-Id: <200912071232.nB7CWvFr097571@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171487 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Dec 2009 12:32:58 -0000 http://p4web.freebsd.org/chv.cgi?CH=171487 Change 171487 by rene@rene_self on 2009/12/07 12:32:03 Add some links to the current set of Clang port patches to the Clang section of the Porters Handbook. Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#59 edit Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#59 (text+ko) ==== @@ -13711,6 +13711,14 @@ -Werror. + + The current patch set can be downloaded from a server of rene@. + A customizable + script to automatically update your Tinderbox Ports Tree + and apply the patches to it is also available. You might also want + to fetch the + list of files to remove from there. From owner-p4-projects@FreeBSD.ORG Mon Dec 7 12:43:08 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 187431065670; Mon, 7 Dec 2009 12:43:08 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D1511106566B for ; Mon, 7 Dec 2009 12:43:07 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BFF238FC17 for ; Mon, 7 Dec 2009 12:43:07 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nB7Ch7u4098347 for ; Mon, 7 Dec 2009 12:43:07 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB7Ch7BO098345 for perforce@freebsd.org; Mon, 7 Dec 2009 12:43:07 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 7 Dec 2009 12:43:07 GMT Message-Id: <200912071243.nB7Ch7BO098345@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171488 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Dec 2009 12:43:08 -0000 http://p4web.freebsd.org/chv.cgi?CH=171488 Change 171488 by rene@rene_self on 2009/12/07 12:43:05 [porters-handbook] Add a requirement for the list of files to remove when using the patch-tree script. Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#60 edit Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#60 (text+ko) ==== @@ -13718,7 +13718,8 @@ script to automatically update your Tinderbox Ports Tree and apply the patches to it is also available. You might also want to fetch the - list of files to remove from there. + list of files to remove from there. This list is relative + to the Tinderbox Ports Tree. From owner-p4-projects@FreeBSD.ORG Mon Dec 7 13:26:52 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C3001065708; Mon, 7 Dec 2009 13:26:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CC4081065706 for ; Mon, 7 Dec 2009 13:26:51 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B236D8FC18 for ; Mon, 7 Dec 2009 13:26:51 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nB7DQpiR013038 for ; Mon, 7 Dec 2009 13:26:51 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB7DQpTj013036 for perforce@freebsd.org; Mon, 7 Dec 2009 13:26:51 GMT (envelope-from mav@freebsd.org) Date: Mon, 7 Dec 2009 13:26:51 GMT Message-Id: <200912071326.nB7DQpTj013036@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171490 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Dec 2009 13:26:52 -0000 http://p4web.freebsd.org/chv.cgi?CH=171490 Change 171490 by mav@mav_mavtest on 2009/12/07 13:25:55 SiI3124 has no SNotification register. Handle Asynchronous Notifications there as good as possible without it. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#27 edit .. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.h#11 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#27 (text+ko) ==== @@ -93,15 +93,17 @@ uint32_t id; const char *name; int ports; + int quirks; +#define SIIS_Q_SNTF 1 } siis_ids[] = { - {0x31241095, "SiI3124", 4}, - {0x31248086, "SiI3124", 4}, - {0x31321095, "SiI3132", 2}, - {0x02421095, "SiI3132", 2}, - {0x02441095, "SiI3132", 2}, - {0x31311095, "SiI3131", 1}, - {0x35311095, "SiI3531", 1}, - {0, NULL, 0} + {0x31241095, "SiI3124", 4, 0}, + {0x31248086, "SiI3124", 4, 0}, + {0x31321095, "SiI3132", 2, SIIS_Q_SNTF}, + {0x02421095, "SiI3132", 2, SIIS_Q_SNTF}, + {0x02441095, "SiI3132", 2, SIIS_Q_SNTF}, + {0x31311095, "SiI3131", 1, SIIS_Q_SNTF}, + {0x35311095, "SiI3531", 1, SIIS_Q_SNTF}, + {0, NULL, 0, 0} }; static int @@ -113,7 +115,7 @@ for (i = 0; siis_ids[i].id != 0; i++) { if (siis_ids[i].id == devid) { - snprintf(buf, sizeof(buf), "%s SATA2 controller", + snprintf(buf, sizeof(buf), "%s SATA controller", siis_ids[i].name); device_set_desc_copy(dev, buf); return (BUS_PROBE_VENDOR); @@ -130,11 +132,12 @@ device_t child; int error, i, unit; + ctlr->dev = dev; for (i = 0; siis_ids[i].id != 0; i++) { if (siis_ids[i].id == devid) break; } - ctlr->dev = dev; + ctlr->quirks = siis_ids[i].quirks; /* Global memory */ ctlr->r_grid = PCIR_BAR(0); if (!(ctlr->r_gmem = bus_alloc_resource_any(dev, SYS_RES_MEMORY, @@ -413,12 +416,14 @@ static int siis_ch_attach(device_t dev) { + struct siis_controller *ctlr = device_get_softc(device_get_parent(dev)); struct siis_channel *ch = device_get_softc(dev); struct cam_devq *devq; int rid, error, i, sata_rev = 0; ch->dev = dev; ch->unit = (intptr_t)device_get_ivars(dev); + ch->quirks = ctlr->quirks; resource_int_value(device_get_name(dev), device_get_unit(dev), "pm_level", &ch->pm_level); resource_int_value(device_get_name(dev), @@ -680,8 +685,16 @@ u_int32_t status; int i; - status = ATA_INL(ch->r_mem, SIIS_P_SNTF); - ATA_OUTL(ch->r_mem, SIIS_P_SNTF, status); + if (ch->quirks & SIIS_Q_SNTF) { + status = ATA_INL(ch->r_mem, SIIS_P_SNTF); + ATA_OUTL(ch->r_mem, SIIS_P_SNTF, status); + } else { + /* + * Without SNTF we have no idea which device sent notification. + * If PMP is connected, assume it, else - device. + */ + status = (ch->pm_present) ? 0x8000 : 0x0001; + } if (bootverbose) device_printf(dev, "SNTF 0x%04x\n", status); for (i = 0; i < 16; i++) { ==== //depot/projects/scottl-camlock/src/sys/dev/siis/siis.h#11 (text+ko) ==== @@ -363,6 +363,7 @@ struct ata_dma dma; /* DMA data */ struct cam_sim *sim; struct cam_path *path; + int quirks; int pm_level; /* power management level */ struct siis_slot slot[SIIS_MAX_SLOTS]; @@ -400,6 +401,7 @@ void *handle; int r_irq_rid; } irq; + int quirks; int channels; struct { void (*function)(void *); From owner-p4-projects@FreeBSD.ORG Mon Dec 7 15:33:59 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB1DB106568F; Mon, 7 Dec 2009 15:33:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 776781065672 for ; Mon, 7 Dec 2009 15:33:59 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6596E8FC19 for ; Mon, 7 Dec 2009 15:33:59 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nB7FXxeS024602 for ; Mon, 7 Dec 2009 15:33:59 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB7FXxlE024600 for perforce@freebsd.org; Mon, 7 Dec 2009 15:33:59 GMT (envelope-from mav@freebsd.org) Date: Mon, 7 Dec 2009 15:33:59 GMT Message-Id: <200912071533.nB7FXxlE024600@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171495 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Dec 2009 15:34:00 -0000 http://p4web.freebsd.org/chv.cgi?CH=171495 Change 171495 by mav@mav_mavtest on 2009/12/07 15:33:52 Clean kernel messages. Mostly PMP. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#23 edit .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#65 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#23 (text+ko) ==== @@ -177,7 +177,6 @@ if (xpt_create_path(&dpath, periph, xpt_path_path_id(periph->path), i, 0) == CAM_REQ_CMP) { -printf("PMP freeze: %d\n", i); softc->frozen |= (1 << i); xpt_acquire_device(dpath->device); cam_freeze_devq(dpath); @@ -200,7 +199,6 @@ if (xpt_create_path(&dpath, periph, xpt_path_path_id(periph->path), i, 0) == CAM_REQ_CMP) { -printf("PMP release: %d\n", i); softc->frozen &= ~(1 << i); cam_release_devq(dpath, 0, 0, 0, FALSE); xpt_release_device(dpath->device); @@ -463,8 +461,6 @@ pmp_default_timeout * 1000); ata_pm_write_cmd(ataio, 2, softc->pm_step, (softc->found & (1 << softc->pm_step)) ? 0 : 1); -printf("PM RESET %d%s\n", softc->pm_step, - (softc->found & (1 << softc->pm_step)) ? " skipping" : ""); break; case PMP_STATE_CONNECT: cam_fill_ataio(ataio, @@ -588,7 +584,9 @@ if (softc->pm_pid == 0x57231095 || softc->pm_pid == 0x57331095 || softc->pm_pid == 0x57341095 || softc->pm_pid == 0x57441095) softc->pm_ports--; - printf("PM ports: %d\n", softc->pm_ports); + printf("%s%d: %d fan-out ports\n", + periph->periph_name, periph->unit_number, + softc->pm_ports); softc->state = PMP_STATE_PRECONFIG; xpt_release_ccb(done_ccb); xpt_schedule(periph, priority); @@ -610,7 +608,6 @@ /*reduction*/0, /*timeout*/5, /*getcount_only*/0); - printf("PM reset done\n"); softc->state = PMP_STATE_CONNECT; } xpt_release_ccb(done_ccb); @@ -627,7 +624,6 @@ /*reduction*/0, /*timeout*/10, /*getcount_only*/0); - printf("PM connect done\n"); softc->state = PMP_STATE_CHECK; } xpt_release_ccb(done_ccb); @@ -639,7 +635,11 @@ (done_ccb->ataio.res.lba_low << 8) + done_ccb->ataio.res.sector_count; if ((res & 0xf0f) == 0x103 && (res & 0x0f0) != 0) { - printf("PM status: %d - %08x\n", softc->pm_step, res); + if (bootverbose) { + printf("%s%d: port %d status: %08x\n", + periph->periph_name, periph->unit_number, + softc->pm_step, res); + } /* Report device speed. */ if (xpt_create_path(&dpath, periph, xpt_path_path_id(periph->path), @@ -665,7 +665,11 @@ /*getcount_only*/0); softc->pm_try++; } else { - printf("PM status: %d - %08x\n", softc->pm_step, res); + if (bootverbose) { + printf("%s%d: port %d status: %08x\n", + periph->periph_name, periph->unit_number, + softc->pm_step, res); + } softc->found &= ~(1 << softc->pm_step); if (xpt_create_path(&dpath, periph, done_ccb->ccb_h.path_id, ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#65 (text+ko) ==== @@ -729,7 +729,8 @@ { int sign = (done_ccb->ataio.res.lba_high << 8) + done_ccb->ataio.res.lba_mid; - xpt_print(path, "SIGNATURE: %04x\n", sign); + if (bootverbose) + xpt_print(path, "SIGNATURE: %04x\n", sign); if (sign == 0x0000 && done_ccb->ccb_h.target_id != 15) { path->device->protocol = PROTO_ATA; @@ -921,7 +922,6 @@ (done_ccb->ataio.res.lba_low << 8) + done_ccb->ataio.res.sector_count; ((uint32_t *)ident_buf)[0] = softc->pm_pid; - printf("PM Product ID: %08x\n", softc->pm_pid); snprintf(ident_buf->model, sizeof(ident_buf->model), "Port Multiplier %08x", softc->pm_pid); PROBE_SET_ACTION(softc, PROBE_PM_PRV); @@ -934,7 +934,6 @@ (done_ccb->ataio.res.lba_low << 8) + done_ccb->ataio.res.sector_count; ((uint32_t *)ident_buf)[1] = softc->pm_prv; - printf("PM Revision: %08x\n", softc->pm_prv); snprintf(ident_buf->revision, sizeof(ident_buf->revision), "%04x", softc->pm_prv); path->device->flags |= CAM_DEV_IDENTIFY_DATA_VALID; From owner-p4-projects@FreeBSD.ORG Mon Dec 7 15:47:13 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F1901065670; Mon, 7 Dec 2009 15:47:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D7DA0106568D for ; Mon, 7 Dec 2009 15:47:12 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C68E78FC0C for ; Mon, 7 Dec 2009 15:47:12 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nB7FlCcd025591 for ; Mon, 7 Dec 2009 15:47:12 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB7FlCQG025589 for perforce@freebsd.org; Mon, 7 Dec 2009 15:47:12 GMT (envelope-from mav@freebsd.org) Date: Mon, 7 Dec 2009 15:47:12 GMT Message-Id: <200912071547.nB7FlCQG025589@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171496 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Dec 2009 15:47:13 -0000 http://p4web.freebsd.org/chv.cgi?CH=171496 Change 171496 by mav@mav_mavtest on 2009/12/07 15:46:59 Report whether device implements ATA or ATAPI. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#32 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#32 (text+ko) ==== @@ -256,8 +256,10 @@ sizeof(product)); cam_strvis(revision, ident_data->revision, sizeof(ident_data->revision), sizeof(revision)); - printf("<%s %s> ATA/ATAPI-%d", - product, revision, ata_version(ident_data->version_major)); + printf("<%s %s> %s-%d", + product, revision, + (ident_data->config & ATA_PROTO_ATAPI) ? "ATAPI" : "ATA", + ata_version(ident_data->version_major)); if (ident_data->satacapabilities && ident_data->satacapabilities != 0xffff) { if (ident_data->satacapabilities & ATA_SATA_GEN3) printf(" SATA 3.x"); From owner-p4-projects@FreeBSD.ORG Mon Dec 7 18:19:47 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 14D38106568F; Mon, 7 Dec 2009 18:19:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CD6791065693 for ; Mon, 7 Dec 2009 18:19:46 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A0B988FC14 for ; Mon, 7 Dec 2009 18:19:46 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nB7IJkwv050215 for ; Mon, 7 Dec 2009 18:19:46 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB7IJkZI050213 for perforce@freebsd.org; Mon, 7 Dec 2009 18:19:46 GMT (envelope-from mav@freebsd.org) Date: Mon, 7 Dec 2009 18:19:46 GMT Message-Id: <200912071819.nB7IJkZI050213@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171505 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Dec 2009 18:19:47 -0000 http://p4web.freebsd.org/chv.cgi?CH=171505 Change 171505 by mav@mav_mavtest on 2009/12/07 18:19:13 Explicitly acknowledge MSI completion, as required by SiI3124. It makes MSI working there. Later (and cheaper) chips (3132/3531) still crashing system in few seconds under high interrupt rate. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#28 edit .. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.h#12 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#28 (text+ko) ==== @@ -143,6 +143,7 @@ if (!(ctlr->r_gmem = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &ctlr->r_grid, RF_ACTIVE))) return (ENXIO); + ctlr->gctl = ATA_INL(ctlr->r_gmem, SIIS_GCTL); /* Channels memory */ ctlr->r_rid = PCIR_BAR(2); if (!(ctlr->r_mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY, @@ -221,7 +222,8 @@ bus_generic_suspend(dev); /* Put controller into reset state. */ - ATA_OUTL(ctlr->r_gmem, SIIS_GCTL, SIIS_GCTL_GRESET); + ctlr->gctl |= SIIS_GCTL_GRESET; + ATA_OUTL(ctlr->r_gmem, SIIS_GCTL, ctlr->gctl); return 0; } @@ -231,10 +233,13 @@ struct siis_controller *ctlr = device_get_softc(dev); /* Put controller into reset state. */ - ATA_OUTL(ctlr->r_gmem, SIIS_GCTL, SIIS_GCTL_GRESET); + ctlr->gctl |= SIIS_GCTL_GRESET; + ATA_OUTL(ctlr->r_gmem, SIIS_GCTL, ctlr->gctl); DELAY(10000); /* Get controller out of reset state and enable port interrupts. */ - ATA_OUTL(ctlr->r_gmem, SIIS_GCTL, 0x0000000f); + ctlr->gctl &= ~(SIIS_GCTL_GRESET | SIIS_GCTL_I2C_IE); + ctlr->gctl |= 0x0000000f; + ATA_OUTL(ctlr->r_gmem, SIIS_GCTL, ctlr->gctl); return (bus_generic_resume(dev)); } @@ -288,6 +293,11 @@ ctlr->interrupt[unit].function(arg); } } + /* Acknowledge interrupt, if MSI enabled. */ + if (ctlr->irq.r_irq_rid) { + ATA_OUTL(ctlr->r_gmem, SIIS_GCTL, + ctlr->gctl | SIIS_GCTL_MSIACK); + } } static struct resource * ==== //depot/projects/scottl-camlock/src/sys/dev/siis/siis.h#12 (text+ko) ==== @@ -403,6 +403,7 @@ } irq; int quirks; int channels; + uint32_t gctl; struct { void (*function)(void *); void *argument; From owner-p4-projects@FreeBSD.ORG Tue Dec 8 11:27:58 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE8421065670; Tue, 8 Dec 2009 11:27:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 92436106566B for ; Tue, 8 Dec 2009 11:27:57 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7DA338FC14 for ; Tue, 8 Dec 2009 11:27:57 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nB8BRvgQ087020 for ; Tue, 8 Dec 2009 11:27:57 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB8BRvov087018 for perforce@freebsd.org; Tue, 8 Dec 2009 11:27:57 GMT (envelope-from mav@freebsd.org) Date: Tue, 8 Dec 2009 11:27:57 GMT Message-Id: <200912081127.nB8BRvov087018@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171529 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Dec 2009 11:27:58 -0000 http://p4web.freebsd.org/chv.cgi?CH=171529 Change 171529 by mav@mav_mavbook on 2009/12/08 11:27:30 IFC Affected files ... .. //depot/projects/scottl-camlock/src/MAINTAINERS#6 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/lib/isc/ia64/include/isc/atomic.h#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdlib/getenv.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdlib/getenv.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libulog/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/lib/libulog/Symbol.map#2 integrate .. //depot/projects/scottl-camlock/src/lib/libulog/utempter.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libulog/utempter.h#1 branch .. //depot/projects/scottl-camlock/src/lib/libulog/utempter_add_record.3#1 branch .. //depot/projects/scottl-camlock/src/release/i386/fixit_crunch.conf#3 integrate .. //depot/projects/scottl-camlock/src/release/pc98/fixit-small_crunch.conf#3 integrate .. //depot/projects/scottl-camlock/src/release/pc98/fixit_crunch.conf#3 integrate .. //depot/projects/scottl-camlock/src/sbin/ipfw/ipfw2.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/biosmem.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/libi386.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/loader/main.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#33 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#44 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#66 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.h#23 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aac.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aac_cam.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aacvar.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#90 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bge.c#31 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/LICENSE#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_80003es2lan.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_80003es2lan.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_82541.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_82571.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_82575.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_82575.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_api.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_defines.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_hw.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_ich8lan.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_ich8lan.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_mac.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_manage.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_osdep.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_phy.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_phy.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_regs.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_em.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_em.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_igb.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_igb.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_82598.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_82599.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_api.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_api.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_common.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_common.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_osdep.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_phy.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_phy.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe_type.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mfi/mfi.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/dev/puc/pucdata.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#29 integrate .. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_bus_pci.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/input/atp.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/fs/ntfs/ntfs.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/fs/ntfs/ntfs_subr.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/fs/ntfs/ntfs_vfsops.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/clock.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/exception.S#7 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/genassym.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/interrupt.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/machdep.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/mp_machdep.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/pmap.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/kdb.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/param.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/pcpu.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/pmap.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_hostap.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/psim/ata_iobus.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/trap.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/sys/param.h#36 integrate .. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/parser/for1.0#2 integrate Differences ... ==== //depot/projects/scottl-camlock/src/MAINTAINERS#6 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.154 2009/07/06 11:46:18 flz Exp $ +$FreeBSD: src/MAINTAINERS,v 1.155 2009/12/06 23:48:38 cperciva Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -124,6 +124,8 @@ usr.sbin/bluetooth emax Pre-commit review preferred. gnu/usr.bin/send-pr bugmaster Pre-commit review requested. ncurses rafan Heads-up appreciated, try not to break it. +*env(3) secteam Due to the problematic security history of this + code, please have patches reviewed by secteam. Following are the entries from the Makefiles, and a few other sources. Please remove stale entries from both their origin, and this file. ==== //depot/projects/scottl-camlock/src/contrib/bind9/lib/isc/ia64/include/isc/atomic.h#4 (text+ko) ==== @@ -41,7 +41,7 @@ for (prev = *(volatile isc_int32_t *)p; ; prev = swapped) { swapped = prev + val; __asm__ volatile( - "mov ar.ccv=%2;" + "mov ar.ccv=%2;;" "cmpxchg4.acq %0=%4,%3,ar.ccv" : "=r" (swapped), "=m" (*p) : "r" (prev), "r" (swapped), "m" (*p) @@ -84,7 +84,7 @@ isc_int32_t ret; __asm__ volatile( - "mov ar.ccv=%2;" + "mov ar.ccv=%2;;" "cmpxchg4.acq %0=%4,%3,ar.ccv" : "=r" (ret), "=m" (*p) : "r" (cmpval), "r" (val), "m" (*p) ==== //depot/projects/scottl-camlock/src/lib/libc/stdlib/getenv.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)getenv.3 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/lib/libc/stdlib/getenv.3,v 1.27 2007/07/04 00:00:39 scf Exp $ +.\" $FreeBSD: src/lib/libc/stdlib/getenv.3,v 1.28 2009/12/06 23:51:27 scf Exp $ .\" .Dd June 20, 2007 .Dt GETENV 3 @@ -107,6 +107,15 @@ deletes all instances of the variable name pointed to by .Fa name from the list. +.Pp +If corruption (e.g., a name without a value) is detected while making a copy of +environ for internal usage, then +.Fn setenv , +.Fn unsetenv +and +.Fn putenv +will output a warning to stderr about the issue, drop the corrupt entry and +complete the task without error. .Sh RETURN VALUES The .Fn getenv @@ -159,15 +168,6 @@ or .Fn putenv failed because they were unable to allocate memory for the environment. -.It Bq Er EFAULT -The functions -.Fn setenv , -.Fn unsetenv -or -.Fn putenv -failed to make a valid copy of the environment due to the environment being -corrupt (i.e., a name without a value). A warning will be output to stderr with -information about the issue. .El .Sh SEE ALSO .Xr csh 1 , ==== //depot/projects/scottl-camlock/src/lib/libc/stdlib/getenv.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2007-2008 Sean C. Farley + * Copyright (c) 2007-2009 Sean C. Farley * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/getenv.c,v 1.17 2009/12/01 06:42:47 green Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/getenv.c,v 1.20 2009/12/07 00:22:10 scf Exp $"); #include "namespace.h" @@ -160,7 +160,7 @@ /* * Find environment variable from end of array (more likely to be - * active). A variable created by putenv is always active or it is not + * active). A variable created by putenv is always active, or it is not * tracked in the array. */ for (ndx = *envNdx; ndx >= 0; ndx--) @@ -426,13 +426,14 @@ } /* - * An empty environment (environ or its first value) regardless if - * environ has been copied before will return a NULL. + * Variable search order: + * 1. Check for an empty environ. This allows an application to clear + * the environment. + * 2. Search the external environ array. + * 3. Search the internal environment. * - * If the environment is not empty, find an environment variable via - * environ if environ has not been copied via an *env() call or been - * replaced by a running program, otherwise, use the rebuilt - * environment. + * Since malloc() depends upon getenv(), getenv() must never cause the + * internal environment storage to be generated. */ if (environ == NULL || environ[0] == NULL) return (NULL); ==== //depot/projects/scottl-camlock/src/lib/libulog/Makefile#2 (text+ko) ==== @@ -1,12 +1,17 @@ -# $FreeBSD: src/lib/libulog/Makefile,v 1.2 2009/12/05 19:53:29 ed Exp $ +# $FreeBSD: src/lib/libulog/Makefile,v 1.4 2009/12/07 05:57:28 ed Exp $ + +SHLIBDIR?=/lib + +.include LIB= ulog SHLIB_MAJOR= 0 -INCS= ulog.h +INCS= ulog.h utempter.h SRCS= ulog.h ulog_getutxent.c ulog_internal.h ulog_login.c \ - ulog_login_pseudo.c ulog_pututxline.c ulog_util.c + ulog_login_pseudo.c ulog_pututxline.c ulog_util.c utempter.c -MAN= ulog_getutxent.3 ulog_login.3 ulog_setutxfile.3 +MAN= ulog_getutxent.3 ulog_login.3 ulog_setutxfile.3 \ + utempter_add_record.3 MLINKS+=ulog_getutxent.3 ulog_endutxent.3 \ ulog_getutxent.3 ulog_getutxline.3 \ ulog_getutxent.3 ulog_pututxline.3 \ @@ -14,7 +19,12 @@ ulog_login.3 ulog_login_pseudo.3 \ ulog_login.3 ulog_logout.3 \ ulog_login.3 ulog_logout_pseudo.3 \ - ulog_setutxfile.3 ulog_getutxuser.3 + ulog_setutxfile.3 ulog_getutxuser.3 \ + utempter_add_record.3 utempter_remove_added_record.3 \ + utempter_add_record.3 utempter_remove_record.3 \ + utempter_add_record.3 addToUtmp.3 \ + utempter_remove_added_record.3 removeFromUtmp.3 \ + utempter_remove_record.3 removeLineFromUtmp.3 # Add links to -style functions. MLINKS+=ulog_endutxent.3 endutxent.3 \ @@ -28,4 +38,14 @@ VERSION_DEF= ${.CURDIR}/../libc/Versions.def SYMBOL_MAPS= ${.CURDIR}/Symbol.map +.if ${MK_INSTALLLIB} != "no" +SYMLINKS+=libulog.a ${LIBDIR}/libutempter.a +.endif +.if !defined(NO_PIC) +SYMLINKS+=libulog.so ${LIBDIR}/libutempter.so +.endif +.if ${MK_PROFILE} != "no" +SYMLINKS+=libulog_p.a ${LIBDIR}/libutempter_p.a +.endif + .include ==== //depot/projects/scottl-camlock/src/lib/libulog/Symbol.map#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libulog/Symbol.map,v 1.2 2009/12/05 19:53:29 ed Exp $ + * $FreeBSD: src/lib/libulog/Symbol.map,v 1.3 2009/12/06 20:30:21 ed Exp $ */ FBSD_1.2 { @@ -14,4 +14,11 @@ ulog_pututxline; ulog_setutxent; ulog_setutxfile; + + addToUtmp; + removeFromUtmp; + removeLineFromUtmp; + utempter_add_record; + utempter_remove_added_record; + utempter_remove_record; }; ==== //depot/projects/scottl-camlock/src/release/i386/fixit_crunch.conf#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/i386/fixit_crunch.conf,v 1.17 2008/09/25 12:25:54 nyan Exp $ +# $FreeBSD: src/release/i386/fixit_crunch.conf,v 1.18 2009/12/06 14:22:14 ed Exp $ buildopts -DRELEASE_CRUNCH @@ -46,4 +46,4 @@ progs chroot ln chown chgrp -libs -ledit -lgeom -lbsdxml -lsbuf -lkiconv -lkvm -lncurses -lutil +libs -ledit -lgeom -lbsdxml -lsbuf -lkiconv -lkvm -lncurses -lulog -lutil ==== //depot/projects/scottl-camlock/src/release/pc98/fixit-small_crunch.conf#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/pc98/fixit-small_crunch.conf,v 1.11 2008/09/25 12:25:54 nyan Exp $ +# $FreeBSD: src/release/pc98/fixit-small_crunch.conf,v 1.12 2009/12/06 14:22:14 ed Exp $ buildopts -DRELEASE_CRUNCH @@ -40,4 +40,4 @@ progs chown ln chown chgrp -libs -lgeom -lbsdxml -lsbuf -lkiconv -lkvm -lncurses -lutil +libs -lgeom -lbsdxml -lsbuf -lkiconv -lkvm -lncurses -lulog -lutil ==== //depot/projects/scottl-camlock/src/release/pc98/fixit_crunch.conf#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/pc98/fixit_crunch.conf,v 1.17 2008/09/25 12:25:54 nyan Exp $ +# $FreeBSD: src/release/pc98/fixit_crunch.conf,v 1.18 2009/12/06 14:22:14 ed Exp $ buildopts -DRELEASE_CRUNCH @@ -44,4 +44,4 @@ progs chown ln chown chgrp -libs -ledit -lgeom -lbsdxml -lsbuf -lkiconv -lkvm -lncurses -lutil +libs -ledit -lgeom -lbsdxml -lsbuf -lkiconv -lkvm -lncurses -lulog -lutil ==== //depot/projects/scottl-camlock/src/sbin/ipfw/ipfw2.c#4 (text+ko) ==== @@ -17,7 +17,7 @@ * * NEW command line interface for IP firewall facility * - * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.149 2009/06/08 10:53:18 luigi Exp $ + * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.150 2009/12/06 18:04:26 luigi Exp $ */ #include @@ -2740,9 +2740,11 @@ /* * In the kernel we assume AF_INET and use only - * sin_port and sin_addr. + * sin_port and sin_addr. Remember to set sin_len as + * the routing code seems to use it too. */ p->sa.sin_family = AF_INET; + p->sa.sin_len = sizeof(struct sockaddr_in); p->sa.sin_port = 0; /* * locate the address-port separator (':' or ',') ==== //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/biosmem.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosmem.c,v 1.9 2007/10/28 21:23:49 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosmem.c,v 1.11 2009/12/07 16:29:43 jhb Exp $"); /* * Obtain memory configuration information from the BIOS @@ -35,14 +35,20 @@ #include "libi386.h" #include "btxv86.h" -vm_offset_t memtop, memtop_copyin; -u_int32_t bios_basemem, bios_extmem; +vm_offset_t memtop, memtop_copyin, high_heap_base; +uint32_t bios_basemem, bios_extmem, high_heap_size; static struct bios_smap smap; +/* + * The minimum amount of memory to reserve in bios_extmem for the heap. + */ +#define HEAP_MIN (3 * 1024 * 1024) + void bios_getmem(void) { + uint64_t size; /* Parse system memory map */ v86.ebx = 0; @@ -65,6 +71,26 @@ if ((smap.type == SMAP_TYPE_MEMORY) && (smap.base == 0x100000)) { bios_extmem = smap.length; } + + /* + * Look for the largest segment in 'extended' memory beyond + * 1MB but below 4GB. + */ + if ((smap.type == SMAP_TYPE_MEMORY) && (smap.base > 0x100000) && + (smap.base < 0x100000000ull)) { + size = smap.length; + + /* + * If this segment crosses the 4GB boundary, truncate it. + */ + if (smap.base + size > 0x100000000ull) + size = 0x100000000ull - smap.base; + + if (size > high_heap_size) { + high_heap_size = size; + high_heap_base = smap.base; + } + } } while (v86.ebx != 0); /* Fall back to the old compatibility function for base memory */ @@ -97,5 +123,13 @@ /* Set memtop to actual top of memory */ memtop = memtop_copyin = 0x100000 + bios_extmem; + /* + * If we have extended memory and did not find a suitable heap + * region in the SMAP, use the last 3MB of 'extended' memory as a + * high heap candidate. + */ + if (bios_extmem >= HEAP_MIN && high_heap_size < HEAP_MIN) { + high_heap_size = HEAP_MIN; + high_heap_base = memtop - HEAP_MIN; + } } - ==== //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/libi386.h#10 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/i386/libi386/libi386.h,v 1.28 2009/03/12 20:41:52 jhb Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/libi386.h,v 1.30 2009/12/07 16:29:43 jhb Exp $ */ @@ -78,9 +78,9 @@ int bc_getdev(struct i386_devdesc *dev); /* return dev_t for (dev) */ int bc_bios2unit(int biosdev); /* xlate BIOS device -> bioscd unit */ int bc_unit2bios(int unit); /* xlate bioscd unit -> BIOS device */ -u_int32_t bd_getbigeom(int bunit); /* return geometry in bootinfo format */ -int bd_bios2unit(int biosdev); /* xlate BIOS device -> biosdisk unit */ -int bd_unit2bios(int unit); /* xlate biosdisk unit -> BIOS device */ +uint32_t bd_getbigeom(int bunit); /* return geometry in bootinfo format */ +int bd_bios2unit(int biosdev); /* xlate BIOS device -> biosdisk unit */ +int bd_unit2bios(int unit); /* xlate biosdisk unit -> BIOS device */ int bd_getdev(struct i386_devdesc *dev); /* return dev_t for (dev) */ ssize_t i386_copyin(const void *src, vm_offset_t dest, const size_t len); @@ -92,12 +92,15 @@ void bios_getsmap(void); void bios_getmem(void); -extern u_int32_t bios_basemem; /* base memory in bytes */ -extern u_int32_t bios_extmem; /* extended memory in bytes */ +extern uint32_t bios_basemem; /* base memory in bytes */ +extern uint32_t bios_extmem; /* extended memory in bytes */ extern vm_offset_t memtop; /* last address of physical memory + 1 */ extern vm_offset_t memtop_copyin; /* memtop less heap size for the cases */ - /* when heap is at the top of extended memory */ - /* for other cases - just the same as memtop */ + /* when heap is at the top of */ + /* extended memory; for other cases */ + /* just the same as memtop */ +extern uint32_t high_heap_size; /* extended memory region available */ +extern vm_offset_t high_heap_base; /* for use as the heap */ int biospci_find_devclass(uint32_t class, int index, uint32_t *locator); int biospci_write_config(uint32_t locator, int offset, int width, uint32_t val); ==== //depot/projects/scottl-camlock/src/sys/boot/i386/loader/main.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/loader/main.c,v 1.44 2009/03/09 17:16:29 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/loader/main.c,v 1.46 2009/12/07 16:29:43 jhb Exp $"); /* * MD bootstrap main() and assorted miscellaneous @@ -102,14 +102,19 @@ */ bios_getmem(); -#if defined(LOADER_BZIP2_SUPPORT) || defined(LOADER_FIREWIRE_SUPPORT) || defined(LOADER_GPT_SUPPORT) || defined(LOADER_ZFS_SUPPORT) - heap_top = PTOV(memtop_copyin); - memtop_copyin -= 0x300000; - heap_bottom = PTOV(memtop_copyin); -#else - heap_top = (void *)bios_basemem; - heap_bottom = (void *)end; +#if defined(LOADER_BZIP2_SUPPORT) || defined(LOADER_FIREWIRE_SUPPORT) || \ + defined(LOADER_GPT_SUPPORT) || defined(LOADER_ZFS_SUPPORT) + if (high_heap_size > 0) { + heap_top = PTOV(high_heap_base + high_heap_size); + heap_bottom = PTOV(high_heap_base); + if (high_heap_base < memtop_copyin) + memtop_copyin = high_heap_base; + } else #endif + { + heap_top = (void *)PTOV(bios_basemem); + heap_bottom = (void *)end; + } setheap(heap_bottom, heap_top); /* ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#33 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/ata/ata_all.c,v 1.10 2009/12/01 23:01:29 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/ata/ata_all.c,v 1.11 2009/12/07 16:23:25 mav Exp $"); #include ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#44 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/ata/ata_da.c,v 1.11 2009/11/11 11:10:36 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/ata/ata_da.c,v 1.12 2009/12/06 11:48:53 mav Exp $"); #include ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#24 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/ata/ata_pmp.c,v 1.4 2009/11/24 12:47:58 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/ata/ata_pmp.c,v 1.5 2009/12/07 16:23:25 mav Exp $"); #include ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#66 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.17 2009/12/06 00:10:13 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.18 2009/12/07 16:23:25 mav Exp $"); #include #include ==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.h#23 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_periph.h,v 1.22 2009/11/04 15:40:19 mav Exp $ + * $FreeBSD: src/sys/cam/cam_periph.h,v 1.23 2009/12/06 11:48:53 mav Exp $ */ #ifndef _CAM_CAM_PERIPH_H ==== //depot/projects/scottl-camlock/src/sys/dev/aac/aac.c#16 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.150 2009/10/29 14:53:45 emaste Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.151 2009/12/08 05:35:51 jkim Exp $"); /* * Driver for the Adaptec 'FSA' family of PCI/SCSI RAID adapters. @@ -604,7 +604,7 @@ TAILQ_INIT(&sc->aac_fibmap_tqh); sc->aac_commands = malloc(sc->aac_max_fibs * sizeof(struct aac_command), M_AACBUF, M_WAITOK|M_ZERO); - while (sc->total_fibs < AAC_PREALLOCATE_FIBS) { + while (sc->total_fibs < sc->aac_max_fibs) { if (aac_alloc_commands(sc) != 0) break; } ==== //depot/projects/scottl-camlock/src/sys/dev/aac/aac_cam.c#15 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac_cam.c,v 1.33 2009/10/29 17:14:18 emaste Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac_cam.c,v 1.34 2009/12/08 05:35:51 jkim Exp $"); /* * CAM front-end for communicating with non-DASD devices @@ -260,8 +260,11 @@ cpi->hba_inquiry = PI_WIDE_16; cpi->target_sprt = 0; - /* Resetting via the passthrough causes problems. */ - cpi->hba_misc = PIM_NOBUSRESET; + /* + * Resetting via the passthrough or parallel bus scan + * causes problems. + */ + cpi->hba_misc = PIM_NOBUSRESET | PIM_SEQSCAN; cpi->hba_eng_cnt = 0; cpi->max_target = camsc->inf->TargetsPerBus; cpi->max_lun = 8; /* Per the controller spec */ ==== //depot/projects/scottl-camlock/src/sys/dev/aac/aacvar.h#10 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/aac/aacvar.h,v 1.54 2009/10/29 14:53:45 emaste Exp $ + * $FreeBSD: src/sys/dev/aac/aacvar.h,v 1.55 2009/12/08 05:35:51 jkim Exp $ */ #include @@ -57,13 +57,6 @@ #define AAC_ADAPTER_FIBS 8 /* - * FIBs are allocated in page-size chunks and can grow up to the 512 - * limit imposed by the hardware. - */ -#define AAC_PREALLOCATE_FIBS 128 -#define AAC_NUM_MGT_FIB 8 - -/* * The controller reports status events in AIFs. We hang on to a number of * these in order to pass them out to user-space management tools. */ ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#90 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ahci/ahci.c,v 1.18 2009/11/26 08:49:46 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ahci/ahci.c,v 1.19 2009/12/06 23:56:54 mav Exp $"); #include #include ==== //depot/projects/scottl-camlock/src/sys/dev/bge/if_bge.c#31 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.262 2009/12/03 23:57:06 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.265 2009/12/08 03:24:29 yongari Exp $"); /* * Broadcom BCM570x family gigabit ethernet driver for FreeBSD. @@ -1642,7 +1642,9 @@ else val = BGE_STD_RX_RING_CNT / 8; CSR_WRITE_4(sc, BGE_RBDI_STD_REPL_THRESH, val); - CSR_WRITE_4(sc, BGE_RBDI_JUMBO_REPL_THRESH, BGE_JUMBO_RX_RING_CNT/8); + if (BGE_IS_JUMBO_CAPABLE(sc)) + CSR_WRITE_4(sc, BGE_RBDI_JUMBO_REPL_THRESH, + BGE_JUMBO_RX_RING_CNT/8); /* * Disable all unused send rings by setting the 'ring disabled' @@ -1684,8 +1686,10 @@ /* Initialize RX ring indexes */ bge_writembx(sc, BGE_MBX_RX_STD_PROD_LO, 0); - bge_writembx(sc, BGE_MBX_RX_JUMBO_PROD_LO, 0); - bge_writembx(sc, BGE_MBX_RX_MINI_PROD_LO, 0); + if (BGE_IS_JUMBO_CAPABLE(sc)) + bge_writembx(sc, BGE_MBX_RX_JUMBO_PROD_LO, 0); + if (sc->bge_asicrev == BGE_ASICREV_BCM5700) + bge_writembx(sc, BGE_MBX_RX_MINI_PROD_LO, 0); /* * Set up RX return ring 0 @@ -4588,17 +4592,11 @@ bge_stop(struct bge_softc *sc) { struct ifnet *ifp; - struct ifmedia_entry *ifm; - struct mii_data *mii = NULL; - int mtmp, itmp; BGE_LOCK_ASSERT(sc); ifp = sc->bge_ifp; - if ((sc->bge_flags & BGE_FLAG_TBI) == 0) - mii = device_get_softc(sc->bge_miibus); - callout_stop(&sc->bge_stat_ch); /* Disable host interrupts. */ @@ -4672,27 +4670,6 @@ /* Free TX buffers. */ bge_free_tx_ring(sc); - /* - * Isolate/power down the PHY, but leave the media selection - * unchanged so that things will be put back to normal when - * we bring the interface back up. - */ - if ((sc->bge_flags & BGE_FLAG_TBI) == 0) { - itmp = ifp->if_flags; - ifp->if_flags |= IFF_UP; - /* - * If we are called from bge_detach(), mii is already NULL. - */ - if (mii != NULL) { - ifm = mii->mii_media.ifm_cur; - mtmp = ifm->ifm_media; - ifm->ifm_media = IFM_ETHER | IFM_NONE; - mii_mediachg(mii); - ifm->ifm_media = mtmp; - } - ifp->if_flags = itmp; - } - sc->bge_tx_saved_considx = BGE_TXCONS_UNSET; /* Clear MAC's link state (PHY may still have link UP). */ ==== //depot/projects/scottl-camlock/src/sys/dev/e1000/LICENSE#2 (text+ko) ==== @@ -1,6 +1,6 @@ -$FreeBSD: src/sys/dev/e1000/LICENSE,v 1.1 2008/07/30 21:56:53 jfv Exp $ +$FreeBSD: src/sys/dev/e1000/LICENSE,v 1.2 2009/12/08 01:07:44 jfv Exp $ - Copyright (c) 2001-2008, Intel Corporation + Copyright (c) 2001-2009, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without ==== //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_80003es2lan.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE. ******************************************************************************/ -/*$FreeBSD: src/sys/dev/e1000/e1000_80003es2lan.c,v 1.3 2009/04/10 00:05:46 jfv Exp $*/ +/*$FreeBSD: src/sys/dev/e1000/e1000_80003es2lan.c,v 1.4 2009/12/08 01:07:44 jfv Exp $*/ /* * 80003ES2LAN Gigabit Ethernet Controller (Copper) @@ -171,7 +171,7 @@ break; } - nvm->type = e1000_nvm_eeprom_spi; + nvm->type = e1000_nvm_eeprom_spi; size = (u16)((eecd & E1000_EECD_SIZE_EX_MASK) >> E1000_EECD_SIZE_EX_SHIFT); @@ -206,17 +206,22 @@ static s32 e1000_init_mac_params_80003es2lan(struct e1000_hw *hw) { struct e1000_mac_info *mac = &hw->mac; - s32 ret_val = E1000_SUCCESS; DEBUGFUNC("e1000_init_mac_params_80003es2lan"); - /* Set media type */ + /* Set media type and media-dependent function pointers */ switch (hw->device_id) { case E1000_DEV_ID_80003ES2LAN_SERDES_DPT: hw->phy.media_type = e1000_media_type_internal_serdes; + mac->ops.check_for_link = e1000_check_for_serdes_link_generic; + mac->ops.setup_physical_interface = + e1000_setup_fiber_serdes_link_generic; break; default: hw->phy.media_type = e1000_media_type_copper; + mac->ops.check_for_link = e1000_check_for_copper_link_generic; + mac->ops.setup_physical_interface = + e1000_setup_copper_link_80003es2lan; break; } @@ -230,6 +235,8 @@ mac->arc_subsystem_valid = (E1000_READ_REG(hw, E1000_FWSM) & E1000_FWSM_MODE_MASK) ? TRUE : FALSE; + /* Adaptive IFS not supported */ + mac->adaptive_ifs = FALSE; /* Function pointers */ @@ -241,27 +248,6 @@ mac->ops.init_hw = e1000_init_hw_80003es2lan; /* link setup */ mac->ops.setup_link = e1000_setup_link_generic; - /* physical interface link setup */ - mac->ops.setup_physical_interface = - (hw->phy.media_type == e1000_media_type_copper) - ? e1000_setup_copper_link_80003es2lan - : e1000_setup_fiber_serdes_link_generic; - /* check for link */ - switch (hw->phy.media_type) { - case e1000_media_type_copper: - mac->ops.check_for_link = e1000_check_for_copper_link_generic; - break; - case e1000_media_type_fiber: - mac->ops.check_for_link = e1000_check_for_fiber_link_generic; - break; - case e1000_media_type_internal_serdes: - mac->ops.check_for_link = e1000_check_for_serdes_link_generic; - break; - default: - ret_val = -E1000_ERR_CONFIG; - goto out; - break; - } /* check management mode */ mac->ops.check_mng_mode = e1000_check_mng_mode_generic; /* multicast address update */ @@ -290,8 +276,10 @@ /* link info */ mac->ops.get_link_up_info = e1000_get_link_up_info_80003es2lan; -out: - return ret_val; + /* set lan id for port to determine which phy lock to use */ + hw->mac.ops.set_lan_id(hw); + + return E1000_SUCCESS; } /** @@ -307,7 +295,6 @@ hw->mac.ops.init_params = e1000_init_mac_params_80003es2lan; hw->nvm.ops.init_params = e1000_init_nvm_params_80003es2lan; hw->phy.ops.init_params = e1000_init_phy_params_80003es2lan; - e1000_get_bus_info_pcie_generic(hw); } /** @@ -342,7 +329,6 @@ e1000_release_swfw_sync_80003es2lan(hw, mask); } - /** * e1000_acquire_mac_csr_80003es2lan - Acquire rights to access Kumeran register * @hw: pointer to the HW structure @@ -532,28 +518,36 @@ goto out; } - /* - * The "ready" bit in the MDIC register may be incorrectly set - * before the device has completed the "Page Select" MDI - * transaction. So we wait 200us after each MDI command... - */ - usec_delay(200); + if (hw->dev_spec._80003es2lan.mdic_wa_enable == TRUE) { + /* + * The "ready" bit in the MDIC register may be incorrectly set + * before the device has completed the "Page Select" MDI + * transaction. So we wait 200us after each MDI command... + */ + usec_delay(200); + + /* ...and verify the command was successful. */ + ret_val = e1000_read_phy_reg_mdic(hw, page_select, &temp); - /* ...and verify the command was successful. */ - ret_val = e1000_read_phy_reg_mdic(hw, page_select, &temp); + if (((u16)offset >> GG82563_PAGE_SHIFT) != temp) { + ret_val = -E1000_ERR_PHY; + e1000_release_phy_80003es2lan(hw); + goto out; + } - if (((u16)offset >> GG82563_PAGE_SHIFT) != temp) { - ret_val = -E1000_ERR_PHY; - e1000_release_phy_80003es2lan(hw); - goto out; - } + usec_delay(200); - usec_delay(200); + ret_val = e1000_read_phy_reg_mdic(hw, + MAX_PHY_REG_ADDRESS & offset, + data); - ret_val = e1000_read_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset, - data); + usec_delay(200); + } else { + ret_val = e1000_read_phy_reg_mdic(hw, + MAX_PHY_REG_ADDRESS & offset, + data); + } - usec_delay(200); e1000_release_phy_80003es2lan(hw); out: @@ -599,29 +593,36 @@ goto out; } + if (hw->dev_spec._80003es2lan.mdic_wa_enable == TRUE) { + /* + * The "ready" bit in the MDIC register may be incorrectly set + * before the device has completed the "Page Select" MDI + * transaction. So we wait 200us after each MDI command... + */ + usec_delay(200); - /* - * The "ready" bit in the MDIC register may be incorrectly set - * before the device has completed the "Page Select" MDI - * transaction. So we wait 200us after each MDI command... - */ - usec_delay(200); + /* ...and verify the command was successful. */ + ret_val = e1000_read_phy_reg_mdic(hw, page_select, &temp); - /* ...and verify the command was successful. */ - ret_val = e1000_read_phy_reg_mdic(hw, page_select, &temp); + if (((u16)offset >> GG82563_PAGE_SHIFT) != temp) { + ret_val = -E1000_ERR_PHY; + e1000_release_phy_80003es2lan(hw); + goto out; + } - if (((u16)offset >> GG82563_PAGE_SHIFT) != temp) { - ret_val = -E1000_ERR_PHY; - e1000_release_phy_80003es2lan(hw); - goto out; - } + usec_delay(200); - usec_delay(200); + ret_val = e1000_write_phy_reg_mdic(hw, + MAX_PHY_REG_ADDRESS & offset, + data); - ret_val = e1000_write_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset, - data); + usec_delay(200); + } else { + ret_val = e1000_write_phy_reg_mdic(hw, + MAX_PHY_REG_ADDRESS & offset, + data); + } - usec_delay(200); e1000_release_phy_80003es2lan(hw); out: @@ -802,13 +803,13 @@ index = phy_data & GG82563_DSPD_CABLE_LENGTH; - if (index >= GG82563_CABLE_LENGTH_TABLE_SIZE + 5) { - ret_val = E1000_ERR_PHY; + if (index >= GG82563_CABLE_LENGTH_TABLE_SIZE - 5) { + ret_val = -E1000_ERR_PHY; goto out; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Dec 8 15:55:30 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C24291065693; Tue, 8 Dec 2009 15:55:30 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 862B1106568F for ; Tue, 8 Dec 2009 15:55:30 +0000 (UTC) (envelope-from yohanes@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 71C718FC17 for ; Tue, 8 Dec 2009 15:55:30 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nB8FtUTJ023070 for ; Tue, 8 Dec 2009 15:55:30 GMT (envelope-from yohanes@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB8FtPto023064 for perforce@freebsd.org; Tue, 8 Dec 2009 15:55:25 GMT (envelope-from yohanes@FreeBSD.org) Date: Tue, 8 Dec 2009 15:55:25 GMT Message-Id: <200912081555.nB8FtPto023064@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to yohanes@FreeBSD.org using -f From: Yohanes Nugroho To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171536 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Dec 2009 15:55:31 -0000 http://p4web.freebsd.org/chv.cgi?CH=171536 Change 171536 by yohanes@econa on 2009/12/08 15:54:57 revise network driver based on suggestions of Pyun YongHyeon Affected files ... .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/articles/contributing-ports/article.sgml#2 integrate .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/developers-handbook/tools/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/bibliography/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/filesystems/chapter.sgml#5 integrate .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/introduction/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/jails/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/printing/chapter.sgml#2 integrate .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/txtfiles.ent#2 integrate .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/handbook/virtualization/chapter.sgml#4 integrate .. //depot/projects/str91xx/doc/de_DE.ISO8859-1/books/porters-handbook/book.sgml#3 integrate .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/Makefile#2 integrate .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/mailing-list-faq/Makefile#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/mailing-list-faq/article.sgml#1 branch .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/bibliography/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/book.sgml#2 integrate .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/chapters.ent#2 integrate .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/filesystems/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/firewalls/chapter.sgml#4 integrate .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/introduction/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/jails/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/mirrors/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/virtualization/chapter.sgml#5 integrate .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/x11/chapter.sgml#5 integrate .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/share/sgml/freebsd.ent#2 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/contributing-ports/article.sgml#2 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#8 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#7 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#2 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/mailing-list-faq/article.sgml#2 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/portbuild/article.sgml#4 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/releng/Makefile#2 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/releng/article.sgml#3 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/arch-handbook/boot/chapter.sgml#2 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/design-44bsd/book.sgml#2 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml#2 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/jails/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml#4 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#4 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#8 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/share/sgml/authors.ent#7 integrate .. //depot/projects/str91xx/doc/hu_HU.ISO8859-2/books/handbook/bibliography/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/hu_HU.ISO8859-2/books/handbook/config/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/hu_HU.ISO8859-2/books/handbook/filesystems/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/hu_HU.ISO8859-2/books/handbook/introduction/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/hu_HU.ISO8859-2/books/handbook/jails/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#4 integrate .. //depot/projects/str91xx/doc/hu_HU.ISO8859-2/books/handbook/printing/chapter.sgml#2 integrate .. //depot/projects/str91xx/doc/hu_HU.ISO8859-2/books/handbook/virtualization/chapter.sgml#4 integrate .. //depot/projects/str91xx/doc/hu_HU.ISO8859-2/books/handbook/x11/chapter.sgml#5 integrate .. //depot/projects/str91xx/doc/hu_HU.ISO8859-2/share/sgml/freebsd.ent#3 integrate .. //depot/projects/str91xx/doc/ja_JP.eucJP/books/handbook/desktop/chapter.sgml#4 integrate .. //depot/projects/str91xx/doc/ja_JP.eucJP/books/handbook/x11/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/mn_MN.UTF-8/books/handbook/bibliography/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/mn_MN.UTF-8/books/handbook/config/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/mn_MN.UTF-8/books/handbook/filesystems/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/mn_MN.UTF-8/books/handbook/firewalls/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/mn_MN.UTF-8/books/handbook/introduction/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/mn_MN.UTF-8/books/handbook/jails/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/mn_MN.UTF-8/books/handbook/mirrors/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/mn_MN.UTF-8/books/handbook/virtualization/chapter.sgml#4 integrate .. //depot/projects/str91xx/doc/mn_MN.UTF-8/books/handbook/x11/chapter.sgml#4 integrate .. //depot/projects/str91xx/doc/nl_NL.ISO8859-1/articles/contributing-ports/article.sgml#2 integrate .. //depot/projects/str91xx/doc/nl_NL.ISO8859-1/books/handbook/bibliography/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/nl_NL.ISO8859-1/books/handbook/jails/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.sgml#4 integrate .. //depot/projects/str91xx/doc/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#4 integrate .. //depot/projects/str91xx/doc/ru_RU.KOI8-R/articles/Makefile#3 integrate .. //depot/projects/str91xx/doc/ru_RU.KOI8-R/articles/custom-gcc/Makefile#1 branch .. //depot/projects/str91xx/doc/ru_RU.KOI8-R/articles/custom-gcc/article.sgml#1 branch .. //depot/projects/str91xx/doc/ru_RU.KOI8-R/articles/gjournal-desktop/Makefile#1 branch .. //depot/projects/str91xx/doc/ru_RU.KOI8-R/articles/gjournal-desktop/article.sgml#1 branch .. //depot/projects/str91xx/doc/ru_RU.KOI8-R/books/handbook/x11/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/share/images/articles/checkpoint/networks.pic#2 integrate .. //depot/projects/str91xx/doc/share/images/articles/releng/branches-releng8.pic#1 branch .. //depot/projects/str91xx/doc/share/pgpkeys/mandree.key#1 branch .. //depot/projects/str91xx/doc/share/pgpkeys/pgpkeys-developers.sgml#6 integrate .. //depot/projects/str91xx/doc/share/pgpkeys/pgpkeys.ent#6 integrate .. //depot/projects/str91xx/doc/share/pgpkeys/roam.key#2 integrate .. //depot/projects/str91xx/doc/share/pgpkeys/stas.key#2 integrate .. //depot/projects/str91xx/doc/share/pgpkeys/sylvio.key#1 branch .. //depot/projects/str91xx/doc/share/sgml/freebsd.ent#3 integrate .. //depot/projects/str91xx/doc/share/sgml/man-refs.ent#4 integrate .. //depot/projects/str91xx/doc/share/sgml/mirrors.xml#3 integrate .. //depot/projects/str91xx/ports/GIDs#6 integrate .. //depot/projects/str91xx/ports/LEGAL#5 integrate .. //depot/projects/str91xx/ports/MOVED#11 integrate .. //depot/projects/str91xx/ports/Mk/bsd.database.mk#4 integrate .. //depot/projects/str91xx/ports/Mk/bsd.gecko.mk#3 integrate .. //depot/projects/str91xx/ports/Mk/bsd.gnome.mk#4 integrate .. //depot/projects/str91xx/ports/Mk/bsd.gnustep.mk#2 integrate .. //depot/projects/str91xx/ports/Mk/bsd.kde4.mk#5 integrate .. //depot/projects/str91xx/ports/Mk/bsd.octave.mk#3 integrate .. //depot/projects/str91xx/ports/Mk/bsd.port.mk#6 integrate .. //depot/projects/str91xx/ports/Mk/bsd.python.mk#4 integrate .. //depot/projects/str91xx/ports/Mk/bsd.qt.mk#4 integrate .. //depot/projects/str91xx/ports/Mk/bsd.ruby.mk#4 integrate .. //depot/projects/str91xx/ports/Tools/portbuild/scripts/build#3 integrate .. //depot/projects/str91xx/ports/Tools/portbuild/scripts/buildenv#3 integrate .. //depot/projects/str91xx/ports/Tools/portbuild/scripts/clean-chroot#2 integrate .. //depot/projects/str91xx/ports/Tools/portbuild/scripts/cleanup-chroots#2 integrate .. //depot/projects/str91xx/ports/Tools/portbuild/scripts/dopackages#3 integrate .. //depot/projects/str91xx/ports/Tools/portbuild/scripts/dopackagestats#4 integrate .. //depot/projects/str91xx/ports/Tools/portbuild/scripts/makerestr#2 integrate .. //depot/projects/str91xx/ports/Tools/portbuild/scripts/makeworld#3 integrate .. //depot/projects/str91xx/ports/Tools/portbuild/scripts/mkbindist#2 integrate .. //depot/projects/str91xx/ports/Tools/portbuild/scripts/updatesnap#3 integrate .. //depot/projects/str91xx/ports/Tools/portbuild/scripts/updatesnap.ports#2 integrate .. //depot/projects/str91xx/ports/Tools/portbuild/scripts/zbackup#2 integrate .. //depot/projects/str91xx/ports/Tools/portbuild/scripts/zexpire#3 integrate .. //depot/projects/str91xx/ports/Tools/scripts/patchtool.py#2 integrate .. //depot/projects/str91xx/ports/UIDs#6 integrate .. //depot/projects/str91xx/ports/UPDATING#9 integrate .. //depot/projects/str91xx/src/MAINTAINERS#3 integrate .. //depot/projects/str91xx/src/Makefile.inc1#5 integrate .. //depot/projects/str91xx/src/ObsoleteFiles.inc#7 integrate .. //depot/projects/str91xx/src/UPDATING#8 integrate .. //depot/projects/str91xx/src/bin/Makefile#2 integrate .. //depot/projects/str91xx/src/bin/date/Makefile#2 integrate .. //depot/projects/str91xx/src/bin/date/date.c#2 integrate .. //depot/projects/str91xx/src/bin/getfacl/getfacl.1#3 integrate .. //depot/projects/str91xx/src/bin/ps/keyword.c#2 integrate .. //depot/projects/str91xx/src/bin/pwait/Makefile#1 branch .. //depot/projects/str91xx/src/bin/pwait/pwait.1#1 branch .. //depot/projects/str91xx/src/bin/pwait/pwait.c#1 branch .. //depot/projects/str91xx/src/bin/sh/arith_lex.l#2 integrate .. //depot/projects/str91xx/src/bin/sh/cd.c#2 integrate .. //depot/projects/str91xx/src/bin/sh/error.c#2 integrate .. //depot/projects/str91xx/src/bin/sh/error.h#2 integrate .. //depot/projects/str91xx/src/bin/sh/eval.c#7 integrate .. //depot/projects/str91xx/src/bin/sh/expand.c#3 integrate .. //depot/projects/str91xx/src/bin/sh/histedit.c#4 integrate .. //depot/projects/str91xx/src/bin/sh/input.c#3 integrate .. //depot/projects/str91xx/src/bin/sh/input.h#3 integrate .. //depot/projects/str91xx/src/bin/sh/jobs.c#2 integrate .. //depot/projects/str91xx/src/bin/sh/main.c#4 integrate .. //depot/projects/str91xx/src/bin/sh/output.c#3 integrate .. //depot/projects/str91xx/src/bin/sh/output.h#2 integrate .. //depot/projects/str91xx/src/bin/sh/parser.c#5 integrate .. //depot/projects/str91xx/src/bin/sh/redir.c#3 integrate .. //depot/projects/str91xx/src/bin/sh/sh.1#6 integrate .. //depot/projects/str91xx/src/bin/sh/trap.c#4 integrate .. //depot/projects/str91xx/src/bin/sh/var.c#3 integrate .. //depot/projects/str91xx/src/contrib/bind9/CHANGES#4 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/dig/dighost.c#3 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/query.c#3 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/api#4 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/types.h#3 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/masterdump.c#3 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rbtdb.c#3 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/resolver.c#4 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/validator.c#3 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/ia64/include/isc/atomic.h#4 integrate .. //depot/projects/str91xx/src/contrib/bind9/version#4 integrate .. //depot/projects/str91xx/src/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt#2 integrate .. //depot/projects/str91xx/src/contrib/bsnmp/snmp_mibII/mibII.c#2 integrate .. //depot/projects/str91xx/src/contrib/bsnmp/snmp_mibII/mibII.h#2 integrate .. //depot/projects/str91xx/src/contrib/bsnmp/snmp_mibII/mibII_begemot.c#2 integrate .. //depot/projects/str91xx/src/contrib/bsnmp/snmp_mibII/mibII_tree.def#2 integrate .. //depot/projects/str91xx/src/contrib/ee/ee.c#4 integrate .. //depot/projects/str91xx/src/contrib/gcc/config/freebsd-spec.h#3 integrate .. //depot/projects/str91xx/src/contrib/groff/tmac/doc-syms#2 integrate .. //depot/projects/str91xx/src/contrib/ipfilter/man/ipf.8#2 integrate .. //depot/projects/str91xx/src/contrib/libpcap/inet.c#2 integrate .. //depot/projects/str91xx/src/contrib/ncurses/ncurses/base/lib_getch.c#2 integrate .. //depot/projects/str91xx/src/contrib/ntp/ntpd/ntp_io.c#2 integrate .. //depot/projects/str91xx/src/contrib/telnet/telnet/externs.h#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/ssh_namespace.h#4 integrate .. //depot/projects/str91xx/src/crypto/openssh/sshd.c#3 integrate .. //depot/projects/str91xx/src/crypto/openssl/ssl/s3_lib.c#3 integrate .. //depot/projects/str91xx/src/crypto/openssl/ssl/s3_pkt.c#3 integrate .. //depot/projects/str91xx/src/crypto/openssl/ssl/s3_srvr.c#3 integrate .. //depot/projects/str91xx/src/etc/Makefile#4 integrate .. //depot/projects/str91xx/src/etc/defaults/rc.conf#8 integrate .. //depot/projects/str91xx/src/etc/etc.amd64/ttys#3 integrate .. //depot/projects/str91xx/src/etc/etc.arm/ttys#3 integrate .. //depot/projects/str91xx/src/etc/etc.i386/ttys#3 integrate .. //depot/projects/str91xx/src/etc/etc.ia64/ttys#3 integrate .. //depot/projects/str91xx/src/etc/etc.mips/ttys#3 integrate .. //depot/projects/str91xx/src/etc/etc.pc98/ttys#1 branch .. //depot/projects/str91xx/src/etc/etc.powerpc/ttys#3 integrate .. //depot/projects/str91xx/src/etc/etc.sparc64/ttys#3 integrate .. //depot/projects/str91xx/src/etc/mtree/BSD.var.dist#2 integrate .. //depot/projects/str91xx/src/etc/rc.d/Makefile#6 integrate .. //depot/projects/str91xx/src/etc/rc.d/ip6fw#3 delete .. //depot/projects/str91xx/src/etc/rc.d/ipfw#3 integrate .. //depot/projects/str91xx/src/etc/rc.d/jail#3 integrate .. //depot/projects/str91xx/src/etc/rc.firewall#2 integrate .. //depot/projects/str91xx/src/etc/rc.firewall6#2 delete .. //depot/projects/str91xx/src/etc/root/dot.profile#2 integrate .. //depot/projects/str91xx/src/games/factor/factor.c#2 integrate .. //depot/projects/str91xx/src/games/fortune/datfiles/fortunes#4 integrate .. //depot/projects/str91xx/src/games/fortune/datfiles/fortunes-o.real#3 integrate .. //depot/projects/str91xx/src/gnu/lib/libgcov/Makefile#3 integrate .. //depot/projects/str91xx/src/include/Makefile#5 integrate .. //depot/projects/str91xx/src/include/signal.h#2 integrate .. //depot/projects/str91xx/src/include/termios.h#1 branch .. //depot/projects/str91xx/src/lib/Makefile#4 integrate .. //depot/projects/str91xx/src/lib/bind/config.h#3 integrate .. //depot/projects/str91xx/src/lib/csu/amd64/Makefile#2 integrate .. //depot/projects/str91xx/src/lib/csu/arm/Makefile#2 integrate .. //depot/projects/str91xx/src/lib/csu/i386-elf/Makefile#2 integrate .. //depot/projects/str91xx/src/lib/csu/i386-elf/crt1.c#2 delete .. //depot/projects/str91xx/src/lib/csu/i386-elf/crt1_c.c#1 branch .. //depot/projects/str91xx/src/lib/csu/i386-elf/crt1_s.S#1 branch .. //depot/projects/str91xx/src/lib/csu/ia64/Makefile#2 integrate .. //depot/projects/str91xx/src/lib/csu/mips/Makefile#2 integrate .. //depot/projects/str91xx/src/lib/csu/powerpc/Makefile#2 integrate .. //depot/projects/str91xx/src/lib/csu/sparc64/Makefile#2 integrate .. //depot/projects/str91xx/src/lib/libbluetooth/bluetooth.3#2 integrate .. //depot/projects/str91xx/src/lib/libbluetooth/bluetooth.h#2 integrate .. //depot/projects/str91xx/src/lib/libc/compat-43/Makefile.inc#2 integrate .. //depot/projects/str91xx/src/lib/libc/compat-43/Symbol.map#2 integrate .. //depot/projects/str91xx/src/lib/libc/compat-43/sigcompat.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/compat-43/sigpause.2#2 integrate .. //depot/projects/str91xx/src/lib/libc/gen/Makefile.inc#5 integrate .. //depot/projects/str91xx/src/lib/libc/gen/Symbol.map#5 integrate .. //depot/projects/str91xx/src/lib/libc/gen/_once_stub.c#1 branch .. //depot/projects/str91xx/src/lib/libc/gen/_pthread_stubs.c#3 integrate .. //depot/projects/str91xx/src/lib/libc/gen/exec.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/gen/fdevname.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/gen/fmtmsg.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/gen/fts.3#3 integrate .. //depot/projects/str91xx/src/lib/libc/gen/fts.c#3 integrate .. //depot/projects/str91xx/src/lib/libc/gen/getcap.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/gen/getlogin.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/gen/getttyent.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/gen/getusershell.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/gen/nlist.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/gen/pause.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/gen/posix_spawn.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/gen/posix_spawn_file_actions_addopen.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/gen/posix_spawn_file_actions_init.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/gen/posix_spawnattr_getflags.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/gen/posix_spawnattr_getpgroup.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/gen/posix_spawnattr_getschedparam.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/gen/posix_spawnattr_getschedpolicy.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/gen/posix_spawnattr_getsigdefault.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/gen/posix_spawnattr_getsigmask.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/gen/posix_spawnattr_init.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/gen/pselect.3#2 delete .. //depot/projects/str91xx/src/lib/libc/gen/pselect.c#2 delete .. //depot/projects/str91xx/src/lib/libc/gen/pwcache.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/gen/raise.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/gen/sleep.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/gen/termios.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/gen/timezone.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/gen/tzset.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/gen/usleep.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/gen/wordexp.c#3 integrate .. //depot/projects/str91xx/src/lib/libc/gmon/gmon.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/include/libc_private.h#2 integrate .. //depot/projects/str91xx/src/lib/libc/locale/isblank.3#3 integrate .. //depot/projects/str91xx/src/lib/libc/locale/isgraph.3#3 integrate .. //depot/projects/str91xx/src/lib/libc/locale/isprint.3#3 integrate .. //depot/projects/str91xx/src/lib/libc/locale/nl_langinfo.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/net/gai_strerror.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/net/getnameinfo.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/net/ip6opt.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/net/sctp_send.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/net/sctp_sendmsg.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/nls/C.msg#3 integrate .. //depot/projects/str91xx/src/lib/libc/nls/Makefile.inc#3 integrate .. //depot/projects/str91xx/src/lib/libc/nls/es_ES.ISO8859-1.msg#2 integrate .. //depot/projects/str91xx/src/lib/libc/nls/hu_HU.ISO8859-2.msg#2 integrate .. //depot/projects/str91xx/src/lib/libc/nls/ja_JP.UTF-8.msg#1 branch .. //depot/projects/str91xx/src/lib/libc/nls/ja_JP.eucJP.msg#1 branch .. //depot/projects/str91xx/src/lib/libc/nls/ko_KR.UTF-8.msg#2 integrate .. //depot/projects/str91xx/src/lib/libc/nls/ko_KR.eucKR.msg#2 integrate .. //depot/projects/str91xx/src/lib/libc/nls/nl_NL.ISO8859-1.msg#2 integrate .. //depot/projects/str91xx/src/lib/libc/nls/uk_UA.UTF-8.msg#2 integrate .. //depot/projects/str91xx/src/lib/libc/posix1e/acl_from_text.c#3 integrate .. //depot/projects/str91xx/src/lib/libc/posix1e/acl_to_text.c#4 integrate .. //depot/projects/str91xx/src/lib/libc/rpc/clnt_raw.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/rpc/getnetconfig.c#3 integrate .. //depot/projects/str91xx/src/lib/libc/rpc/getrpcent.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/rpc/key_call.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/rpc/svc.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/rpc/svc_raw.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/stdio/fgetws.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/stdio/findfp.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/stdio/funopen.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/stdio/fvwrite.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/stdio/printf.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/stdio/vfwprintf.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/stdio/xprintf_time.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/stdlib/getenv.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/stdlib/getenv.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/stdlib/malloc.c#4 integrate .. //depot/projects/str91xx/src/lib/libc/stdlib/system.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/stdtime/localtime.c#4 integrate .. //depot/projects/str91xx/src/lib/libc/string/strcat.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/string/strcmp.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/sys/Makefile.inc#3 integrate .. //depot/projects/str91xx/src/lib/libc/sys/Symbol.map#4 integrate .. //depot/projects/str91xx/src/lib/libc/sys/__error.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/sys/accept.2#2 integrate .. //depot/projects/str91xx/src/lib/libc/sys/mmap.2#3 integrate .. //depot/projects/str91xx/src/lib/libc/sys/pselect.2#1 branch .. //depot/projects/str91xx/src/lib/libc/sys/setpgid.2#2 integrate .. //depot/projects/str91xx/src/lib/libc/sys/vfork.2#2 integrate .. //depot/projects/str91xx/src/lib/libc/yp/yplib.c#2 integrate .. //depot/projects/str91xx/src/lib/libdevinfo/devinfo.h#3 integrate .. //depot/projects/str91xx/src/lib/libfetch/ftp.c#2 integrate .. //depot/projects/str91xx/src/lib/libkvm/kvm_i386.c#3 integrate .. //depot/projects/str91xx/src/lib/libpam/modules/pam_unix/pam_unix.8#3 integrate .. //depot/projects/str91xx/src/lib/libpmc/libpmc.c#3 integrate .. //depot/projects/str91xx/src/lib/libpmc/pmc_attach.3#2 integrate .. //depot/projects/str91xx/src/lib/librt/Makefile#2 integrate .. //depot/projects/str91xx/src/lib/librt/mq.c#2 integrate .. //depot/projects/str91xx/src/lib/librt/sigev_thread.c#2 integrate .. //depot/projects/str91xx/src/lib/libstand/open.c#2 integrate .. //depot/projects/str91xx/src/lib/libstand/udp.c#2 integrate .. //depot/projects/str91xx/src/lib/libtacplus/taclib.c#2 integrate .. //depot/projects/str91xx/src/lib/libthr/Makefile#2 integrate .. //depot/projects/str91xx/src/lib/libthr/arch/ia64/Makefile.inc#2 integrate .. //depot/projects/str91xx/src/lib/libthr/arch/ia64/ia64/_umtx_op_err.S#1 branch .. //depot/projects/str91xx/src/lib/libthr/arch/ia64/include/pthread_md.h#2 integrate .. //depot/projects/str91xx/src/lib/libthr/thread/thr_syscalls.c#3 integrate .. //depot/projects/str91xx/src/lib/libulog/Makefile#1 branch .. //depot/projects/str91xx/src/lib/libulog/Symbol.map#1 branch .. //depot/projects/str91xx/src/lib/libulog/ulog.h#1 branch .. //depot/projects/str91xx/src/lib/libulog/ulog_getutxent.3#1 branch .. //depot/projects/str91xx/src/lib/libulog/ulog_getutxent.c#1 branch .. //depot/projects/str91xx/src/lib/libulog/ulog_internal.h#1 branch .. //depot/projects/str91xx/src/lib/libulog/ulog_login.3#1 branch .. //depot/projects/str91xx/src/lib/libulog/ulog_login.c#1 branch .. //depot/projects/str91xx/src/lib/libulog/ulog_login_pseudo.c#1 branch .. //depot/projects/str91xx/src/lib/libulog/ulog_pututxline.c#1 branch .. //depot/projects/str91xx/src/lib/libulog/ulog_setutxfile.3#1 branch .. //depot/projects/str91xx/src/lib/libulog/ulog_util.c#1 branch .. //depot/projects/str91xx/src/lib/libulog/utempter.c#1 branch .. //depot/projects/str91xx/src/lib/libulog/utempter.h#1 branch .. //depot/projects/str91xx/src/lib/libulog/utempter_add_record.3#1 branch .. //depot/projects/str91xx/src/lib/libusb/libusb.h#2 integrate .. //depot/projects/str91xx/src/lib/libusb/libusb10.c#2 integrate .. //depot/projects/str91xx/src/lib/libusb/libusb10.h#2 integrate .. //depot/projects/str91xx/src/lib/libusb/libusb10_desc.c#2 integrate .. //depot/projects/str91xx/src/lib/libusb/libusb10_io.c#2 integrate .. //depot/projects/str91xx/src/lib/libusb/libusb20.3#2 integrate .. //depot/projects/str91xx/src/lib/libusb/libusb20.c#4 integrate .. //depot/projects/str91xx/src/lib/libusb/libusb20.h#4 integrate .. //depot/projects/str91xx/src/lib/libusb/libusb20_desc.c#2 integrate .. //depot/projects/str91xx/src/lib/libusb/libusb20_ugen20.c#5 integrate .. //depot/projects/str91xx/src/lib/libutil/libutil.h#2 integrate .. //depot/projects/str91xx/src/lib/libutil/pw_util.c#2 integrate .. //depot/projects/str91xx/src/libexec/Makefile#3 integrate .. //depot/projects/str91xx/src/libexec/rtld-elf/rtld.c#4 integrate .. //depot/projects/str91xx/src/libexec/rtld-elf/rtld.h#4 integrate .. //depot/projects/str91xx/src/libexec/ulog-helper/Makefile#1 branch .. //depot/projects/str91xx/src/libexec/ulog-helper/ulog-helper.c#1 branch .. //depot/projects/str91xx/src/release/i386/fixit_crunch.conf#2 integrate .. //depot/projects/str91xx/src/release/pc98/fixit-small_crunch.conf#2 integrate .. //depot/projects/str91xx/src/release/pc98/fixit_crunch.conf#2 integrate .. //depot/projects/str91xx/src/release/picobsd/bridge/PICOBSD#2 integrate .. //depot/projects/str91xx/src/release/picobsd/floppy.tree/etc/ttys#2 integrate .. //depot/projects/str91xx/src/release/picobsd/tinyware/oinit/oinit.c#2 integrate .. //depot/projects/str91xx/src/rescue/rescue/Makefile#3 integrate .. //depot/projects/str91xx/src/sbin/atacontrol/atacontrol.c#2 integrate .. //depot/projects/str91xx/src/sbin/camcontrol/camcontrol.8#4 integrate .. //depot/projects/str91xx/src/sbin/camcontrol/camcontrol.c#6 integrate .. //depot/projects/str91xx/src/sbin/ddb/ddb_capture.c#2 integrate .. //depot/projects/str91xx/src/sbin/fsck/fsck.c#2 integrate .. //depot/projects/str91xx/src/sbin/geom/class/part/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/geom/class/part/geom_part.c#4 integrate .. //depot/projects/str91xx/src/sbin/ifconfig/ifconfig.8#5 integrate .. //depot/projects/str91xx/src/sbin/ifconfig/ifconfig.c#3 integrate .. //depot/projects/str91xx/src/sbin/init/Makefile#3 integrate .. //depot/projects/str91xx/src/sbin/init/init.c#3 integrate .. //depot/projects/str91xx/src/sbin/ipfw/dummynet.c#3 integrate .. //depot/projects/str91xx/src/sbin/ipfw/ipfw2.c#3 integrate .. //depot/projects/str91xx/src/sbin/mknod/mknod.8#2 integrate .. //depot/projects/str91xx/src/sbin/mount/mount.8#3 integrate .. //depot/projects/str91xx/src/sbin/mount_cd9660/mount_cd9660.c#2 integrate .. //depot/projects/str91xx/src/sbin/mount_nfs/mount_nfs.c#5 integrate .. //depot/projects/str91xx/src/sbin/reboot/Makefile#3 integrate .. //depot/projects/str91xx/src/sbin/reboot/reboot.c#2 integrate .. //depot/projects/str91xx/src/sbin/sysctl/sysctl.c#4 integrate .. //depot/projects/str91xx/src/secure/lib/libssh/Makefile#3 integrate .. //depot/projects/str91xx/src/secure/usr.bin/bdes/bdes.c#2 integrate .. //depot/projects/str91xx/src/share/examples/ses/srcs/chpmon.c#2 integrate .. //depot/projects/str91xx/src/share/examples/ses/srcs/eltsub.c#2 integrate .. //depot/projects/str91xx/src/share/examples/ses/srcs/eltsub.h#1 branch .. //depot/projects/str91xx/src/share/examples/ses/srcs/getencstat.c#2 integrate .. //depot/projects/str91xx/src/share/examples/ses/srcs/getnobj.c#2 integrate .. //depot/projects/str91xx/src/share/examples/ses/srcs/getobjmap.c#2 integrate .. //depot/projects/str91xx/src/share/examples/ses/srcs/getobjstat.c#2 integrate .. //depot/projects/str91xx/src/share/examples/ses/srcs/inienc.c#2 integrate .. //depot/projects/str91xx/src/share/examples/ses/srcs/sesd.c#2 integrate .. //depot/projects/str91xx/src/share/examples/ses/srcs/setencstat.c#2 integrate .. //depot/projects/str91xx/src/share/examples/ses/srcs/setobjstat.c#2 integrate .. //depot/projects/str91xx/src/share/man/man3/queue.3#3 integrate .. //depot/projects/str91xx/src/share/man/man3/tree.3#2 integrate .. //depot/projects/str91xx/src/share/man/man4/Makefile#7 integrate .. //depot/projects/str91xx/src/share/man/man4/acpi_hp.4#2 integrate .. //depot/projects/str91xx/src/share/man/man4/acpi_wmi.4#2 integrate .. //depot/projects/str91xx/src/share/man/man4/ada.4#1 branch .. //depot/projects/str91xx/src/share/man/man4/amdsbwd.4#1 branch .. //depot/projects/str91xx/src/share/man/man4/ata.4#3 integrate .. //depot/projects/str91xx/src/share/man/man4/atapicam.4#3 integrate .. //depot/projects/str91xx/src/share/man/man4/atp.4#1 branch .. //depot/projects/str91xx/src/share/man/man4/bge.4#3 integrate .. //depot/projects/str91xx/src/share/man/man4/hptrr.4#2 integrate .. //depot/projects/str91xx/src/share/man/man4/ipsec.4#2 integrate .. //depot/projects/str91xx/src/share/man/man4/iwn.4#3 integrate .. //depot/projects/str91xx/src/share/man/man4/iwnfw.4#2 integrate .. //depot/projects/str91xx/src/share/man/man4/man4.powerpc/Makefile#2 integrate .. //depot/projects/str91xx/src/share/man/man4/man4.powerpc/adb.4#1 branch .. //depot/projects/str91xx/src/share/man/man4/man4.powerpc/akbd.4#1 branch .. //depot/projects/str91xx/src/share/man/man4/man4.powerpc/ams.4#1 branch .. //depot/projects/str91xx/src/share/man/man4/man4.powerpc/cuda.4#1 branch .. //depot/projects/str91xx/src/share/man/man4/man4.powerpc/pmu.4#2 integrate .. //depot/projects/str91xx/src/share/man/man4/mfi.4#4 integrate .. //depot/projects/str91xx/src/share/man/man4/msk.4#4 integrate .. //depot/projects/str91xx/src/share/man/man4/netintro.4#2 integrate .. //depot/projects/str91xx/src/share/man/man4/sctp.4#2 integrate .. //depot/projects/str91xx/src/share/man/man4/snd_hda.4#2 integrate .. //depot/projects/str91xx/src/share/man/man4/tty.4#2 integrate .. //depot/projects/str91xx/src/share/man/man4/umass.4#3 integrate .. //depot/projects/str91xx/src/share/man/man4/wi.4#2 integrate .. //depot/projects/str91xx/src/share/man/man5/ar.5#2 integrate .. //depot/projects/str91xx/src/share/man/man5/make.conf.5#3 integrate .. //depot/projects/str91xx/src/share/man/man5/msdosfs.5#2 integrate .. //depot/projects/str91xx/src/share/man/man5/rc.conf.5#6 integrate .. //depot/projects/str91xx/src/share/man/man5/regdomain.5#2 integrate .. //depot/projects/str91xx/src/share/man/man7/adding_user.7#2 integrate .. //depot/projects/str91xx/src/share/man/man8/Makefile#2 integrate .. //depot/projects/str91xx/src/share/man/man8/rc.8#2 integrate .. //depot/projects/str91xx/src/share/man/man9/Makefile#8 integrate .. //depot/projects/str91xx/src/share/man/man9/VOP_OPENCLOSE.9#2 integrate .. //depot/projects/str91xx/src/share/man/man9/get_cyclecount.9#2 integrate .. //depot/projects/str91xx/src/share/man/man9/ifnet.9#2 integrate .. //depot/projects/str91xx/src/share/misc/bsd-family-tree#5 integrate .. //depot/projects/str91xx/src/share/misc/committers-ports.dot#4 integrate .. //depot/projects/str91xx/src/share/misc/iso3166#3 integrate .. //depot/projects/str91xx/src/share/misc/organization.dot#2 integrate .. //depot/projects/str91xx/src/share/mk/bsd.libnames.mk#3 integrate .. //depot/projects/str91xx/src/share/mk/bsd.subdir.mk#2 integrate .. //depot/projects/str91xx/src/share/skel/dot.profile#2 integrate .. //depot/projects/str91xx/src/share/timedef/ja_JP.SJIS.src#3 integrate .. //depot/projects/str91xx/src/share/timedef/ja_JP.UTF-8.src#3 integrate .. //depot/projects/str91xx/src/share/timedef/ja_JP.eucJP.src#3 integrate .. //depot/projects/str91xx/src/share/zoneinfo/antarctica#2 integrate .. //depot/projects/str91xx/src/share/zoneinfo/asia#7 integrate .. //depot/projects/str91xx/src/share/zoneinfo/australasia#5 integrate .. //depot/projects/str91xx/src/share/zoneinfo/etcetera#2 integrate .. //depot/projects/str91xx/src/share/zoneinfo/europe#3 integrate .. //depot/projects/str91xx/src/share/zoneinfo/southamerica#3 integrate .. //depot/projects/str91xx/src/share/zoneinfo/zone.tab#2 integrate .. //depot/projects/str91xx/src/sys/amd64/acpica/acpi_wakeup.c#4 integrate .. //depot/projects/str91xx/src/sys/amd64/amd64/bpf_jit_machdep.c#2 integrate .. //depot/projects/str91xx/src/sys/amd64/amd64/bpf_jit_machdep.h#2 integrate .. //depot/projects/str91xx/src/sys/amd64/amd64/identcpu.c#4 integrate .. //depot/projects/str91xx/src/sys/amd64/amd64/initcpu.c#5 integrate .. //depot/projects/str91xx/src/sys/amd64/amd64/machdep.c#5 integrate .. //depot/projects/str91xx/src/sys/amd64/amd64/mca.c#2 integrate .. //depot/projects/str91xx/src/sys/amd64/amd64/mp_machdep.c#4 integrate .. //depot/projects/str91xx/src/sys/amd64/amd64/pmap.c#8 integrate .. //depot/projects/str91xx/src/sys/amd64/amd64/trap.c#5 integrate .. //depot/projects/str91xx/src/sys/amd64/amd64/vm_machdep.c#3 integrate .. //depot/projects/str91xx/src/sys/amd64/conf/NOTES#7 integrate .. //depot/projects/str91xx/src/sys/amd64/ia32/ia32_signal.c#3 integrate .. //depot/projects/str91xx/src/sys/amd64/include/mca.h#2 integrate .. //depot/projects/str91xx/src/sys/amd64/include/md_var.h#3 integrate .. //depot/projects/str91xx/src/sys/amd64/include/param.h#5 integrate .. //depot/projects/str91xx/src/sys/amd64/include/specialreg.h#3 integrate .. //depot/projects/str91xx/src/sys/amd64/isa/isa_dma.c#2 integrate .. //depot/projects/str91xx/src/sys/amd64/linux32/linux32_machdep.c#2 integrate .. //depot/projects/str91xx/src/sys/amd64/linux32/linux32_sysvec.c#4 integrate .. //depot/projects/str91xx/src/sys/arm/arm/db_trace.c#2 integrate .. //depot/projects/str91xx/src/sys/arm/arm/gdb_machdep.c#2 integrate .. //depot/projects/str91xx/src/sys/arm/arm/machdep.c#2 integrate .. //depot/projects/str91xx/src/sys/arm/arm/trap.c#2 integrate .. //depot/projects/str91xx/src/sys/arm/arm/vm_machdep.c#5 integrate .. //depot/projects/str91xx/src/sys/arm/at91/at91_machdep.c#3 integrate .. //depot/projects/str91xx/src/sys/arm/at91/if_ate.c#3 integrate .. //depot/projects/str91xx/src/sys/arm/conf/AVILA#4 integrate .. //depot/projects/str91xx/src/sys/arm/conf/CAMBRIA#4 integrate .. //depot/projects/str91xx/src/sys/arm/econa/if_ece.c#10 edit .. //depot/projects/str91xx/src/sys/arm/econa/if_ecereg.h#2 edit .. //depot/projects/str91xx/src/sys/arm/econa/if_ecevar.h#3 edit .. //depot/projects/str91xx/src/sys/arm/mv/mv_machdep.c#5 integrate .. //depot/projects/str91xx/src/sys/arm/mv/mv_sata.c#2 integrate .. //depot/projects/str91xx/src/sys/arm/sa11x0/assabet_machdep.c#3 integrate .. //depot/projects/str91xx/src/sys/boot/Makefile#2 integrate .. //depot/projects/str91xx/src/sys/boot/common/Makefile.inc#2 integrate .. //depot/projects/str91xx/src/sys/boot/common/boot.c#3 integrate .. //depot/projects/str91xx/src/sys/boot/common/commands.c#2 integrate .. //depot/projects/str91xx/src/sys/boot/forth/loader.conf.5#2 integrate .. //depot/projects/str91xx/src/sys/boot/i386/Makefile#2 integrate .. //depot/projects/str91xx/src/sys/boot/i386/libi386/Makefile#3 integrate .. //depot/projects/str91xx/src/sys/boot/i386/libi386/biosmem.c#2 integrate .. //depot/projects/str91xx/src/sys/boot/i386/libi386/elf32_freebsd.c#2 integrate .. //depot/projects/str91xx/src/sys/boot/i386/libi386/elf64_freebsd.c#2 integrate .. //depot/projects/str91xx/src/sys/boot/i386/libi386/libi386.h#2 integrate .. //depot/projects/str91xx/src/sys/boot/i386/libi386/spinconsole.c#1 branch .. //depot/projects/str91xx/src/sys/boot/i386/libi386/vidconsole.c#2 integrate .. //depot/projects/str91xx/src/sys/boot/i386/loader/Makefile#2 integrate .. //depot/projects/str91xx/src/sys/boot/i386/loader/conf.c#2 integrate .. //depot/projects/str91xx/src/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/str91xx/src/sys/boot/i386/zfsboot/zfsboot.c#3 integrate .. //depot/projects/str91xx/src/sys/boot/i386/zfsboot/zfsldr.S#2 integrate .. //depot/projects/str91xx/src/sys/boot/i386/zfsloader/Makefile#1 branch .. //depot/projects/str91xx/src/sys/boot/pc98/btx/btx/btx.S#2 integrate .. //depot/projects/str91xx/src/sys/boot/pc98/libpc98/biosmem.c#2 integrate .. //depot/projects/str91xx/src/sys/boot/pc98/loader/conf.c#2 integrate .. //depot/projects/str91xx/src/sys/boot/pc98/loader/main.c#2 integrate .. //depot/projects/str91xx/src/sys/boot/uboot/common/metadata.c#2 integrate .. //depot/projects/str91xx/src/sys/boot/uboot/lib/glue.c#2 integrate .. //depot/projects/str91xx/src/sys/cam/ata/ata_all.c#4 integrate .. //depot/projects/str91xx/src/sys/cam/ata/ata_all.h#3 integrate .. //depot/projects/str91xx/src/sys/cam/ata/ata_da.c#4 integrate .. //depot/projects/str91xx/src/sys/cam/ata/ata_pmp.c#2 integrate .. //depot/projects/str91xx/src/sys/cam/ata/ata_xpt.c#5 integrate .. //depot/projects/str91xx/src/sys/cam/cam.c#3 integrate .. //depot/projects/str91xx/src/sys/cam/cam.h#4 integrate .. //depot/projects/str91xx/src/sys/cam/cam_ccb.h#4 integrate .. //depot/projects/str91xx/src/sys/cam/cam_periph.c#5 integrate .. //depot/projects/str91xx/src/sys/cam/cam_periph.h#3 integrate .. //depot/projects/str91xx/src/sys/cam/cam_queue.c#3 integrate .. //depot/projects/str91xx/src/sys/cam/cam_queue.h#3 integrate .. //depot/projects/str91xx/src/sys/cam/cam_xpt.c#6 integrate .. //depot/projects/str91xx/src/sys/cam/cam_xpt_internal.h#4 integrate .. //depot/projects/str91xx/src/sys/cam/scsi/scsi_cd.c#5 integrate .. //depot/projects/str91xx/src/sys/cam/scsi/scsi_ch.c#4 integrate .. //depot/projects/str91xx/src/sys/cam/scsi/scsi_da.c#6 integrate .. //depot/projects/str91xx/src/sys/cam/scsi/scsi_sg.c#3 integrate .. //depot/projects/str91xx/src/sys/cam/scsi/scsi_xpt.c#3 integrate .. //depot/projects/str91xx/src/sys/cddl/boot/zfs/zfssubr.c#2 integrate .. //depot/projects/str91xx/src/sys/cddl/compat/opensolaris/rpc/xdr.h#2 integrate .. //depot/projects/str91xx/src/sys/cddl/compat/opensolaris/sys/vnode.h#4 integrate .. //depot/projects/str91xx/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#4 integrate .. //depot/projects/str91xx/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate .. //depot/projects/str91xx/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#8 integrate .. //depot/projects/str91xx/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#4 integrate .. //depot/projects/str91xx/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#4 integrate .. //depot/projects/str91xx/src/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#3 integrate .. //depot/projects/str91xx/src/sys/compat/freebsd32/freebsd32_misc.c#5 integrate .. //depot/projects/str91xx/src/sys/compat/freebsd32/freebsd32_proto.h#5 integrate .. //depot/projects/str91xx/src/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate .. //depot/projects/str91xx/src/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate .. //depot/projects/str91xx/src/sys/compat/freebsd32/freebsd32_sysent.c#4 integrate .. //depot/projects/str91xx/src/sys/compat/freebsd32/syscalls.master#4 integrate .. //depot/projects/str91xx/src/sys/compat/linux/linux_ioctl.c#6 integrate .. //depot/projects/str91xx/src/sys/compat/linux/linux_ioctl.h#2 integrate .. //depot/projects/str91xx/src/sys/compat/linux/linux_ipc.c#3 integrate .. //depot/projects/str91xx/src/sys/compat/linux/linux_socket.c#4 integrate .. //depot/projects/str91xx/src/sys/compat/linux/linux_videodev.h#1 branch .. //depot/projects/str91xx/src/sys/compat/linux/linux_videodev_compat.h#1 branch .. //depot/projects/str91xx/src/sys/compat/ndis/kern_ndis.c#3 integrate .. //depot/projects/str91xx/src/sys/compat/ndis/kern_windrv.c#2 integrate .. //depot/projects/str91xx/src/sys/compat/ndis/subr_hal.c#2 integrate .. //depot/projects/str91xx/src/sys/compat/ndis/subr_ndis.c#3 integrate .. //depot/projects/str91xx/src/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/str91xx/src/sys/compat/ndis/subr_pe.c#2 integrate .. //depot/projects/str91xx/src/sys/compat/ndis/subr_usbd.c#4 integrate .. //depot/projects/str91xx/src/sys/compat/svr4/svr4_termios.c#2 integrate .. //depot/projects/str91xx/src/sys/conf/NOTES#7 integrate .. //depot/projects/str91xx/src/sys/conf/files#10 integrate .. //depot/projects/str91xx/src/sys/conf/files.amd64#7 integrate .. //depot/projects/str91xx/src/sys/conf/files.i386#8 integrate .. //depot/projects/str91xx/src/sys/conf/files.ia64#3 integrate .. //depot/projects/str91xx/src/sys/conf/options#8 integrate .. //depot/projects/str91xx/src/sys/contrib/altq/altq/altq_hfsc.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/changes.txt#4 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/compiler/aslcompile.c#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/compiler/aslerror.c#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/compiler/asllookup.c#4 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/compiler/asloperands.c#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/compiler/asltransform.c#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/compiler/asltypes.h#4 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/debugger/dbcmds.c#4 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/debugger/dbexec.c#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/debugger/dbstats.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/dispatcher/dsinit.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/dispatcher/dsobject.c#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/events/evgpeblk.c#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/events/evregion.c#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/executer/exconfig.c#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/executer/exconvrt.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/executer/exfield.c#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/executer/exoparg1.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/executer/exoparg6.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/executer/exregion.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/include/acconfig.h#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/include/acmacros.h#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/include/acnamesp.h#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/include/acpixf.h#4 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/include/acutils.h#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/namespace/nsdump.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/namespace/nsdumpdv.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/namespace/nseval.c#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/namespace/nsinit.c#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/namespace/nspredef.c#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/namespace/nsrepair.c#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/namespace/nsrepair2.c#1 branch .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/namespace/nswalk.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/namespace/nsxfeval.c#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/parser/psloop.c#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/parser/psparse.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/parser/psxface.c#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/utilities/utmisc.c#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/utilities/utobject.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/rdma/krping/krping.c#2 integrate .. //depot/projects/str91xx/src/sys/ddb/db_command.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/aac/aac.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/aac/aac_cam.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/aac/aacreg.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/aac/aacvar.h#3 integrate .. //depot/projects/str91xx/src/sys/dev/acpi_support/acpi_aiboost.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/acpica/acpi.c#7 integrate .. //depot/projects/str91xx/src/sys/dev/acpica/acpi_cpu.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/acpica/acpi_dock.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/acpica/acpi_ec.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/acpica/acpi_hpet.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/acpica/acpi_pci.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/acpica/acpi_video.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/acpica/acpivar.h#5 integrate .. //depot/projects/str91xx/src/sys/dev/adb/adb.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/adb/adb_bus.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/adb/adb_mouse.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/ahci/ahci.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/ahci/ahci.h#4 integrate .. //depot/projects/str91xx/src/sys/dev/aic7xxx/ahd_pci.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/aic7xxx/aic79xx.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/aic7xxx/aic79xx.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/aic7xxx/aic79xx_osm.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/aic7xxx/aic79xx_osm.h#3 integrate .. //depot/projects/str91xx/src/sys/dev/aic7xxx/aic79xx_pci.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/amdsbwd/amdsbwd.c#1 branch .. //depot/projects/str91xx/src/sys/dev/amr/amr.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/an/if_an.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/an/if_an_isa.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/an/if_an_pccard.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/an/if_an_pci.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/an/if_anreg.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/arcmsr/arcmsr.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/arcmsr/arcmsr.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/ata/ata-all.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/ata/ata-all.h#3 integrate .. //depot/projects/str91xx/src/sys/dev/ata/ata-disk.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ata/ata-dma.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/ata/ata-lowlevel.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/str91xx/src/sys/dev/ata/ata-queue.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ata/ata-raid.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ata/ata-sata.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ata/ata-usb.c#4 delete .. //depot/projects/str91xx/src/sys/dev/ata/ata_if.m#2 integrate .. //depot/projects/str91xx/src/sys/dev/ata/atapi-cam.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ata/atapi-cd.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/ata/atapi-fd.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ata/atapi-tape.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ata/chipsets/ata-acard.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ata/chipsets/ata-acerlabs.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/ata/chipsets/ata-adaptec.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ata/chipsets/ata-ahci.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ata/chipsets/ata-amd.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ata/chipsets/ata-ati.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/ata/chipsets/ata-cenatek.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ata/chipsets/ata-cypress.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ata/chipsets/ata-cyrix.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ata/chipsets/ata-highpoint.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ata/chipsets/ata-intel.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ata/chipsets/ata-ite.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ata/chipsets/ata-jmicron.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ata/chipsets/ata-marvell.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/ata/chipsets/ata-micron.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ata/chipsets/ata-national.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ata/chipsets/ata-netcell.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ata/chipsets/ata-nvidia.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ata/chipsets/ata-promise.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ata/chipsets/ata-serverworks.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ata/chipsets/ata-siliconimage.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ata/chipsets/ata-sis.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ata/chipsets/ata-via.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ath/ath_hal/ah_regdomain.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ath/if_ath.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/bge/if_bge.c#6 integrate .. //depot/projects/str91xx/src/sys/dev/bge/if_bgereg.h#3 integrate .. //depot/projects/str91xx/src/sys/dev/bwi/if_bwi.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/bwi/if_bwivar.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/ce/if_ce.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/cm/smc90cx6.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/cm/smc90cx6var.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/cp/if_cp.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ctau/if_ct.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/cx/if_cx.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/cxgb/common/cxgb_ael1002.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/cxgb/common/cxgb_aq100x.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/cxgb/common/cxgb_common.h#3 integrate .. //depot/projects/str91xx/src/sys/dev/cxgb/common/cxgb_xgmac.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/cxgb/cxgb_main.c#6 integrate .. //depot/projects/str91xx/src/sys/dev/cxgb/cxgb_t3fw.h#3 integrate .. //depot/projects/str91xx/src/sys/dev/cxgb/ulp/tom/cxgb_vm.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/de/if_de.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/de/if_devar.h#3 integrate .. //depot/projects/str91xx/src/sys/dev/dpms/dpms.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/drm/drmP.h#4 integrate .. //depot/projects/str91xx/src/sys/dev/drm/drm_scatter.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/drm/r600_blit.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/drm/radeon_cp.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/e1000/LICENSE#2 integrate .. //depot/projects/str91xx/src/sys/dev/e1000/e1000_80003es2lan.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/e1000/e1000_80003es2lan.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/e1000/e1000_82541.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/e1000/e1000_82571.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/e1000/e1000_82575.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/e1000/e1000_82575.h#3 integrate .. //depot/projects/str91xx/src/sys/dev/e1000/e1000_api.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/e1000/e1000_defines.h#3 integrate .. //depot/projects/str91xx/src/sys/dev/e1000/e1000_hw.h#3 integrate .. //depot/projects/str91xx/src/sys/dev/e1000/e1000_ich8lan.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/e1000/e1000_ich8lan.h#3 integrate .. //depot/projects/str91xx/src/sys/dev/e1000/e1000_mac.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/e1000/e1000_manage.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/e1000/e1000_osdep.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/e1000/e1000_phy.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/e1000/e1000_phy.h#3 integrate .. //depot/projects/str91xx/src/sys/dev/e1000/e1000_regs.h#3 integrate .. //depot/projects/str91xx/src/sys/dev/e1000/if_em.c#6 integrate .. //depot/projects/str91xx/src/sys/dev/e1000/if_em.h#3 integrate .. //depot/projects/str91xx/src/sys/dev/e1000/if_igb.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/e1000/if_igb.h#3 integrate .. //depot/projects/str91xx/src/sys/dev/ed/if_ed.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ed/if_ed_pccard.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/ed/if_edvar.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/ep/if_ep.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ep/if_epvar.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/et/if_et.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/et/if_etreg.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/et/if_etvar.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/fatm/if_fatm.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/fatm/if_fatmvar.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/fb/vesa.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/fb/vgareg.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/fdc/fdc.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/fe/if_fe_pccard.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/hatm/if_hatm.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/hptrr/hptrr_osm_bsd.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/hwpmc/hwpmc_logging.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/hwpmc/hwpmc_mod.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/hwpmc/hwpmc_x86.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ichsmb/ichsmb_pci.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/ichwd/ichwd.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ieee488/ibfoo.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/if_ndis/if_ndis.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/if_ndis/if_ndis_usb.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/iir/iir_ctrl.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/isp/isp_freebsd.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/isp/isp_freebsd.h#3 integrate .. //depot/projects/str91xx/src/sys/dev/isp/isp_sbus.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/iwn/if_iwn.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/ixgb/if_ixgb.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/ixgb/if_ixgb.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/ixgbe/ixgbe.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/ixgbe/ixgbe.h#3 integrate .. //depot/projects/str91xx/src/sys/dev/ixgbe/ixgbe_82598.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ixgbe/ixgbe_82599.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ixgbe/ixgbe_api.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ixgbe/ixgbe_api.h#3 integrate .. //depot/projects/str91xx/src/sys/dev/ixgbe/ixgbe_common.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ixgbe/ixgbe_common.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/ixgbe/ixgbe_osdep.h#3 integrate .. //depot/projects/str91xx/src/sys/dev/ixgbe/ixgbe_phy.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ixgbe/ixgbe_phy.h#3 integrate .. //depot/projects/str91xx/src/sys/dev/ixgbe/ixgbe_type.h#3 integrate .. //depot/projects/str91xx/src/sys/dev/lge/if_lge.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/lge/if_lgereg.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/lmc/if_lmc.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/lmc/if_lmc.h#3 integrate .. //depot/projects/str91xx/src/sys/dev/malo/if_malo.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/malo/if_malo.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/mfi/mfi.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/mii/brgphy.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/mii/miidevs#3 integrate .. //depot/projects/str91xx/src/sys/dev/msk/if_msk.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/msk/if_mskreg.h#4 integrate .. //depot/projects/str91xx/src/sys/dev/mwl/if_mwl.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/mwl/if_mwlvar.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/my/if_my.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/my/if_myreg.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/nfe/if_nfe.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/nve/if_nve.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/nve/if_nvereg.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/nxge/if_nxge.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/patm/if_patm_attach.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/pci/pci.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/pci/vga_pci.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/pcn/if_pcn.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/pcn/if_pcnreg.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/pdq/if_fea.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/pdq/if_fpa.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/pdq/pdq_freebsd.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/pdq/pdq_ifsubr.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/puc/pucdata.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/re/if_re.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/siis/siis.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/siis/siis.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/sk/if_sk.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/sn/if_sn.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/sn/if_sn_pccard.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/sn/if_snvar.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/sound/pci/hda/hdac.c#7 integrate .. //depot/projects/str91xx/src/sys/dev/sound/usb/uaudio.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/ste/if_ste.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/ste/if_stereg.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/stge/if_stge.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/sym/sym_hipd.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/syscons/scterm-teken.c#6 integrate .. //depot/projects/str91xx/src/sys/dev/syscons/scvidctl.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/syscons/syscons.c#7 integrate .. //depot/projects/str91xx/src/sys/dev/syscons/syscons.h#4 integrate .. //depot/projects/str91xx/src/sys/dev/syscons/sysmouse.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ti/if_ti.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ti/if_tireg.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/tl/if_tl.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/tl/if_tlreg.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/tsec/if_tsec.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/uart/uart_bus_pci.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/uart/uart_core.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/uart/uart_tty.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/at91dci.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/atmegadci.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/avr32dci.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/ehci.c#7 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/ehci.h#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/ehci_ebus.c#4 edit .. //depot/projects/str91xx/src/sys/dev/usb/controller/ehci_ixp4xx.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/ehci_mbus.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/ehci_pci.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/musb_otg.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/musb_otg.h#3 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/ohci.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/ohci_ec.c#3 edit .. //depot/projects/str91xx/src/sys/dev/usb/controller/uhci.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/uhci_pci.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/uhcireg.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/usb_controller.c#6 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/uss820dci.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/input/atp.c#1 branch .. //depot/projects/str91xx/src/sys/dev/usb/input/uhid.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/input/ukbd.c#6 integrate .. //depot/projects/str91xx/src/sys/dev/usb/input/ums.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/usb/net/if_aue.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/usb/net/if_axe.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/usb/net/if_cdce.c#7 integrate .. //depot/projects/str91xx/src/sys/dev/usb/net/if_cue.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/net/if_kue.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/net/if_rue.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/net/if_udav.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/u3g.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/uark.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/ubser.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/ucycom.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/ufoma.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/uftdi.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/ugensa.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/umct.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/umodem.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/uplcom.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/usb_serial.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/usb_serial.h#5 integrate .. //depot/projects/str91xx/src/sys/dev/usb/storage/umass.c#8 integrate .. //depot/projects/str91xx/src/sys/dev/usb/template/usb_template.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_busdma.c#6 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_compat_linux.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_compat_linux.h#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_core.h#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_debug.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_debug.h#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_dev.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_device.c#6 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_generic.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_hid.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_hub.c#6 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_hub.h#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_msctest.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_process.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_request.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_transfer.c#6 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usbdevs#8 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usbdi.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/wlan/if_upgt.c#6 integrate .. //depot/projects/str91xx/src/sys/dev/usb/wlan/if_urtw.c#7 integrate .. //depot/projects/str91xx/src/sys/dev/vge/if_vge.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/vge/if_vgevar.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/vx/if_vx.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/vx/if_vxvar.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/wb/if_wb.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/wb/if_wbreg.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/wl/if_wl.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/wpi/if_wpi.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/xen/blkfront/blkfront.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/xen/blkfront/block.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/xen/console/console.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/xen/netfront/netfront.c#4 integrate .. //depot/projects/str91xx/src/sys/fs/fifofs/fifo_vnops.c#6 integrate .. //depot/projects/str91xx/src/sys/fs/nfs/nfs_commonacl.c#4 integrate .. //depot/projects/str91xx/src/sys/fs/nfs/nfs_commonport.c#4 integrate .. //depot/projects/str91xx/src/sys/fs/nfs/nfs_commonsubs.c#2 integrate .. //depot/projects/str91xx/src/sys/fs/nfs/nfs_var.h#3 integrate .. //depot/projects/str91xx/src/sys/fs/nfs/nfsport.h#4 integrate .. //depot/projects/str91xx/src/sys/fs/nfsclient/nfs_clrpcops.c#3 integrate .. //depot/projects/str91xx/src/sys/fs/nfsclient/nfs_clvnops.c#5 integrate .. //depot/projects/str91xx/src/sys/fs/nfsserver/nfs_nfsdport.c#4 integrate .. //depot/projects/str91xx/src/sys/fs/nfsserver/nfs_nfsdserv.c#2 integrate .. //depot/projects/str91xx/src/sys/fs/ntfs/ntfs.h#3 integrate .. //depot/projects/str91xx/src/sys/fs/ntfs/ntfs_subr.c#2 integrate .. //depot/projects/str91xx/src/sys/fs/ntfs/ntfs_vfsops.c#2 integrate .. //depot/projects/str91xx/src/sys/fs/portalfs/portal_vnops.c#3 integrate .. //depot/projects/str91xx/src/sys/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/str91xx/src/sys/fs/tmpfs/tmpfs_subr.c#4 integrate .. //depot/projects/str91xx/src/sys/geom/label/g_label.c#5 integrate .. //depot/projects/str91xx/src/sys/geom/label/g_label.h#3 integrate .. //depot/projects/str91xx/src/sys/geom/label/g_label_ext2fs.c#2 integrate .. //depot/projects/str91xx/src/sys/geom/label/g_label_gpt.c#2 integrate .. //depot/projects/str91xx/src/sys/geom/label/g_label_iso9660.c#2 integrate .. //depot/projects/str91xx/src/sys/geom/label/g_label_msdosfs.c#2 integrate .. //depot/projects/str91xx/src/sys/geom/label/g_label_ntfs.c#2 integrate .. //depot/projects/str91xx/src/sys/geom/label/g_label_reiserfs.c#2 integrate .. //depot/projects/str91xx/src/sys/geom/label/g_label_ufs.c#2 integrate .. //depot/projects/str91xx/src/sys/geom/mirror/g_mirror.c#2 integrate .. //depot/projects/str91xx/src/sys/geom/mirror/g_mirror.h#2 integrate .. //depot/projects/str91xx/src/sys/geom/part/g_part_gpt.c#4 integrate .. //depot/projects/str91xx/src/sys/gnu/fs/ext2fs/ext2_inode_cnv.c#2 integrate .. //depot/projects/str91xx/src/sys/gnu/fs/ext2fs/ext2_vnops.c#3 integrate .. //depot/projects/str91xx/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#2 integrate .. //depot/projects/str91xx/src/sys/i386/bios/apm.c#2 integrate .. //depot/projects/str91xx/src/sys/i386/conf/NOTES#8 integrate .. //depot/projects/str91xx/src/sys/i386/cpufreq/est.c#3 integrate .. //depot/projects/str91xx/src/sys/i386/i386/bpf_jit_machdep.c#2 integrate .. //depot/projects/str91xx/src/sys/i386/i386/bpf_jit_machdep.h#2 integrate .. //depot/projects/str91xx/src/sys/i386/i386/identcpu.c#3 integrate .. //depot/projects/str91xx/src/sys/i386/i386/initcpu.c#4 integrate .. //depot/projects/str91xx/src/sys/i386/i386/machdep.c#6 integrate .. //depot/projects/str91xx/src/sys/i386/i386/mca.c#2 integrate .. //depot/projects/str91xx/src/sys/i386/i386/pmap.c#6 integrate .. //depot/projects/str91xx/src/sys/i386/i386/trap.c#4 integrate .. //depot/projects/str91xx/src/sys/i386/i386/vm_machdep.c#4 integrate .. //depot/projects/str91xx/src/sys/i386/include/mca.h#2 integrate .. //depot/projects/str91xx/src/sys/i386/include/specialreg.h#4 integrate .. //depot/projects/str91xx/src/sys/i386/isa/isa_dma.c#2 integrate .. //depot/projects/str91xx/src/sys/i386/linux/linux_machdep.c#3 integrate .. //depot/projects/str91xx/src/sys/i386/linux/linux_sysvec.c#3 integrate .. //depot/projects/str91xx/src/sys/i386/xen/exception.s#2 integrate .. //depot/projects/str91xx/src/sys/i386/xen/pmap.c#5 integrate .. //depot/projects/str91xx/src/sys/ia64/conf/GENERIC#3 integrate .. //depot/projects/str91xx/src/sys/ia64/ia64/clock.c#2 integrate .. //depot/projects/str91xx/src/sys/ia64/ia64/db_machdep.c#2 integrate .. //depot/projects/str91xx/src/sys/ia64/ia64/exception.S#2 integrate .. //depot/projects/str91xx/src/sys/ia64/ia64/genassym.c#3 integrate .. //depot/projects/str91xx/src/sys/ia64/ia64/highfp.c#1 branch .. //depot/projects/str91xx/src/sys/ia64/ia64/interrupt.c#3 integrate .. //depot/projects/str91xx/src/sys/ia64/ia64/machdep.c#4 integrate .. //depot/projects/str91xx/src/sys/ia64/ia64/mp_machdep.c#5 integrate .. //depot/projects/str91xx/src/sys/ia64/ia64/pmap.c#4 integrate .. //depot/projects/str91xx/src/sys/ia64/ia64/trap.c#2 integrate .. //depot/projects/str91xx/src/sys/ia64/ia64/vm_machdep.c#3 integrate .. //depot/projects/str91xx/src/sys/ia64/include/bus.h#2 integrate .. //depot/projects/str91xx/src/sys/ia64/include/cpufunc.h#2 integrate .. //depot/projects/str91xx/src/sys/ia64/include/ia64_cpu.h#2 integrate .. //depot/projects/str91xx/src/sys/ia64/include/kdb.h#2 integrate .. //depot/projects/str91xx/src/sys/ia64/include/md_var.h#2 integrate .. //depot/projects/str91xx/src/sys/ia64/include/param.h#5 integrate .. //depot/projects/str91xx/src/sys/ia64/include/pcpu.h#2 integrate .. //depot/projects/str91xx/src/sys/ia64/include/pmap.h#3 integrate .. //depot/projects/str91xx/src/sys/ia64/include/proc.h#2 integrate .. //depot/projects/str91xx/src/sys/isa/vga_isa.c#2 integrate .. //depot/projects/str91xx/src/sys/kern/init_sysent.c#4 integrate .. //depot/projects/str91xx/src/sys/kern/kern_context.c#2 integrate .. //depot/projects/str91xx/src/sys/kern/kern_cpuset.c#4 integrate .. //depot/projects/str91xx/src/sys/kern/kern_descrip.c#5 integrate .. //depot/projects/str91xx/src/sys/kern/kern_idle.c#2 integrate .. //depot/projects/str91xx/src/sys/kern/kern_intr.c#4 integrate .. //depot/projects/str91xx/src/sys/kern/kern_jail.c#6 integrate .. //depot/projects/str91xx/src/sys/kern/kern_linker.c#5 integrate .. //depot/projects/str91xx/src/sys/kern/kern_lock.c#6 integrate .. //depot/projects/str91xx/src/sys/kern/kern_sig.c#6 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Dec 8 22:21:58 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 92BB71065679; Tue, 8 Dec 2009 22:21:58 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 579551065672 for ; Tue, 8 Dec 2009 22:21:58 +0000 (UTC) (envelope-from truncs@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 44CFB8FC0C for ; Tue, 8 Dec 2009 22:21:58 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nB8MLwO2080172 for ; Tue, 8 Dec 2009 22:21:58 GMT (envelope-from truncs@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB8MLwtT080170 for perforce@freebsd.org; Tue, 8 Dec 2009 22:21:58 GMT (envelope-from truncs@FreeBSD.org) Date: Tue, 8 Dec 2009 22:21:58 GMT Message-Id: <200912082221.nB8MLwtT080170@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to truncs@FreeBSD.org using -f From: Aditya Sarawgi To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171550 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Dec 2009 22:21:58 -0000 http://p4web.freebsd.org/chv.cgi?CH=171550 Change 171550 by truncs@aditya on 2009/12/08 22:21:32 Remove debugging aid. Affected files ... .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_vfsops.c#12 edit Differences ... ==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_vfsops.c#12 (text+ko) ==== @@ -388,7 +388,6 @@ fs->e2fs_total_dir += fs->e2fs_gd[i].ext2bgd_ndirs; fs->e2fs_contigdirs[i] = 0; } - uprintf("Total dirs %d", fs->e2fs_total_dir); if (es->e2fs_rev == E2FS_REV0 || (es->e2fs_features_rocompat & EXT2F_ROCOMPAT_LARGEFILE) == 0) fs->e2fs_maxfilesize = 0x7fffffff; From owner-p4-projects@FreeBSD.ORG Tue Dec 8 22:31:08 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 03885106568F; Tue, 8 Dec 2009 22:31:08 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BBECA1065679 for ; Tue, 8 Dec 2009 22:31:07 +0000 (UTC) (envelope-from truncs@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8FFD08FC0A for ; Tue, 8 Dec 2009 22:31:07 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nB8MV7N8080870 for ; Tue, 8 Dec 2009 22:31:07 GMT (envelope-from truncs@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB8MV7ar080868 for perforce@freebsd.org; Tue, 8 Dec 2009 22:31:07 GMT (envelope-from truncs@FreeBSD.org) Date: Tue, 8 Dec 2009 22:31:07 GMT Message-Id: <200912082231.nB8MV7ar080868@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to truncs@FreeBSD.org using -f From: Aditya Sarawgi To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171551 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Dec 2009 22:31:08 -0000 http://p4web.freebsd.org/chv.cgi?CH=171551 Change 171551 by truncs@aditya on 2009/12/08 22:30:39 Update Makefile. Affected files ... .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/ext2fs/Makefile#3 edit Differences ... ==== //depot/projects/soc2009/soc_ext2fs/src/sys/modules/ext2fs/Makefile#3 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Wed Dec 9 11:21:01 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 41A201065695; Wed, 9 Dec 2009 11:21:01 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 063911065693 for ; Wed, 9 Dec 2009 11:21:01 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E848A8FC0A for ; Wed, 9 Dec 2009 11:21:00 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nB9BL0Ht082786 for ; Wed, 9 Dec 2009 11:21:00 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB9BL0Rn082784 for perforce@freebsd.org; Wed, 9 Dec 2009 11:21:00 GMT (envelope-from mav@freebsd.org) Date: Wed, 9 Dec 2009 11:21:00 GMT Message-Id: <200912091121.nB9BL0Rn082784@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171561 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Dec 2009 11:21:01 -0000 http://p4web.freebsd.org/chv.cgi?CH=171561 Change 171561 by mav@mav_mavtest on 2009/12/09 11:20:05 Increase Max Read Request Size for PCIe chips to 1024 bytes. It gives those slow beasts additional 10% of write bandwidth. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#30 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#30 (text+ko) ==== @@ -231,7 +231,20 @@ siis_resume(device_t dev) { struct siis_controller *ctlr = device_get_softc(dev); + int cap; + uint16_t val; + /* Set PCIe max read request size to at least 1024 bytes */ + if (pci_find_extcap(dev, PCIY_EXPRESS, &cap) == 0) { + val = pci_read_config(dev, + cap + PCIR_EXPRESS_DEVICE_CTL, 2); + if ((val & PCIM_EXP_CTL_MAX_READ_REQUEST) < 0x3000) { + val &= ~PCIM_EXP_CTL_MAX_READ_REQUEST; + val |= 0x3000; + pci_write_config(dev, + cap + PCIR_EXPRESS_DEVICE_CTL, val, 2); + } + } /* Put controller into reset state. */ ctlr->gctl |= SIIS_GCTL_GRESET; ATA_OUTL(ctlr->r_gmem, SIIS_GCTL, ctlr->gctl); From owner-p4-projects@FreeBSD.ORG Wed Dec 9 13:51:32 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 338771065679; Wed, 9 Dec 2009 13:51:32 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EC579106566B for ; Wed, 9 Dec 2009 13:51:31 +0000 (UTC) (envelope-from truncs@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8BCB48FC12 for ; Wed, 9 Dec 2009 13:51:31 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nB9DpVC6006370 for ; Wed, 9 Dec 2009 13:51:31 GMT (envelope-from truncs@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB9DpVOu006368 for perforce@freebsd.org; Wed, 9 Dec 2009 13:51:31 GMT (envelope-from truncs@FreeBSD.org) Date: Wed, 9 Dec 2009 13:51:31 GMT Message-Id: <200912091351.nB9DpVOu006368@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to truncs@FreeBSD.org using -f From: Aditya Sarawgi To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171564 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Dec 2009 13:51:32 -0000 http://p4web.freebsd.org/chv.cgi?CH=171564 Change 171564 by truncs@aditya on 2009/12/09 13:50:38 Remove unwanted assert. Affected files ... .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_alloc.c#19 edit Differences ... ==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_alloc.c#19 (text+ko) ==== @@ -642,7 +642,6 @@ int error, bno, start, end, loc; char *bbp; /* XXX ondisk32 */ - mtx_assert(EXT2_MTX(ip->i_ump), MA_OWNED); fs = ip->i_e2fs; ump = ip->i_ump; if (fs->e2fs_gd[cg].ext2bgd_nbfree == 0) From owner-p4-projects@FreeBSD.ORG Wed Dec 9 15:19:11 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE27110656AA; Wed, 9 Dec 2009 15:19:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 81A7C10656A7; Wed, 9 Dec 2009 15:19:10 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id 53FDF8FC30; Wed, 9 Dec 2009 15:19:10 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id 03CDD46B8B; Wed, 9 Dec 2009 10:19:10 -0500 (EST) Received: from jhbbsd.localnet (unknown [209.249.190.9]) by bigwig.baldwin.cx (Postfix) with ESMTPA id 51E718A021; Wed, 9 Dec 2009 10:19:09 -0500 (EST) From: John Baldwin To: Alexander Motin Date: Wed, 9 Dec 2009 10:16:26 -0500 User-Agent: KMail/1.12.1 (FreeBSD/7.2-CBSD-20091103; KDE/4.3.1; amd64; ; ) References: <200912091121.nB9BL0Rn082784@repoman.freebsd.org> In-Reply-To: <200912091121.nB9BL0Rn082784@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Message-Id: <200912091016.26737.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.0.1 (bigwig.baldwin.cx); Wed, 09 Dec 2009 10:19:09 -0500 (EST) X-Virus-Scanned: clamav-milter 0.95.1 at bigwig.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-2.5 required=4.2 tests=AWL,BAYES_00,RDNS_NONE autolearn=no version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bigwig.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 171561 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Dec 2009 15:19:11 -0000 On Wednesday 09 December 2009 6:21:00 am Alexander Motin wrote: > http://p4web.freebsd.org/chv.cgi?CH=171561 > > Change 171561 by mav@mav_mavtest on 2009/12/09 11:20:05 > > Increase Max Read Request Size for PCIe chips to 1024 bytes. > It gives those slow beasts additional 10% of write bandwidth. We should probably add a method in pci.c to do this ala pci_enable_busmaster(). Several drivers have cut and pasted similar versions of this code that I think it warrants having a common function now. > Affected files ... > > .. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#30 edit > > Differences ... > > ==== //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#30 (text+ko) ==== > > @@ -231,7 +231,20 @@ > siis_resume(device_t dev) > { > struct siis_controller *ctlr = device_get_softc(dev); > + int cap; > + uint16_t val; > > + /* Set PCIe max read request size to at least 1024 bytes */ > + if (pci_find_extcap(dev, PCIY_EXPRESS, &cap) == 0) { > + val = pci_read_config(dev, > + cap + PCIR_EXPRESS_DEVICE_CTL, 2); > + if ((val & PCIM_EXP_CTL_MAX_READ_REQUEST) < 0x3000) { > + val &= ~PCIM_EXP_CTL_MAX_READ_REQUEST; > + val |= 0x3000; > + pci_write_config(dev, > + cap + PCIR_EXPRESS_DEVICE_CTL, val, 2); > + } > + } > /* Put controller into reset state. */ > ctlr->gctl |= SIIS_GCTL_GRESET; > ATA_OUTL(ctlr->r_gmem, SIIS_GCTL, ctlr->gctl); > -- John Baldwin From owner-p4-projects@FreeBSD.ORG Wed Dec 9 17:28:09 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7E6E0106568D; Wed, 9 Dec 2009 17:28:09 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DBBEA106566C for ; Wed, 9 Dec 2009 17:28:08 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AFB618FC14 for ; Wed, 9 Dec 2009 17:28:08 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nB9HS8rM036440 for ; Wed, 9 Dec 2009 17:28:08 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB9HS8jb036438 for perforce@freebsd.org; Wed, 9 Dec 2009 17:28:08 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 9 Dec 2009 17:28:08 GMT Message-Id: <200912091728.nB9HS8jb036438@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171571 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Dec 2009 17:28:09 -0000 http://p4web.freebsd.org/chv.cgi?CH=171571 Change 171571 by hselasky@hselasky_laptop001 on 2009/12/09 17:27:17 USB network: - compliance fixes for NCM. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/net/if_cdce.c#25 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/net/if_cdce.c#25 (text+ko) ==== @@ -1098,7 +1098,7 @@ sc->sc_ncm.dpt.dwSignature[0] = 'N'; sc->sc_ncm.dpt.dwSignature[1] = 'C'; sc->sc_ncm.dpt.dwSignature[2] = 'M'; - sc->sc_ncm.dpt.dwSignature[3] = 'x'; + sc->sc_ncm.dpt.dwSignature[3] = '0'; USETW(sc->sc_ncm.dpt.wNextNdpIndex, 0); /* reserved */ usbd_copy_in(pc, 0, &(sc->sc_ncm.hdr), sizeof(sc->sc_ncm.hdr)); @@ -1182,7 +1182,7 @@ if (actlen < (sizeof(sc->sc_ncm.hdr) + sizeof(sc->sc_ncm.dpt))) { DPRINTFN(1, "frame too short\n"); - goto tr_stall; + goto tr_setup; } usbd_copy_out(pc, 0, &(sc->sc_ncm.hdr), sizeof(sc->sc_ncm.hdr)); @@ -1191,7 +1191,12 @@ (sc->sc_ncm.hdr.dwSignature[1] != 'C') || (sc->sc_ncm.hdr.dwSignature[2] != 'M') || (sc->sc_ncm.hdr.dwSignature[3] != 'H')) { - DPRINTFN(1, "invalid HDR signature\n"); + DPRINTFN(1, "invalid HDR signature: " + "0x%02x:0x%02x:0x%02x:0x%02x\n", + sc->sc_ncm.hdr.dwSignature[0], + sc->sc_ncm.hdr.dwSignature[1], + sc->sc_ncm.hdr.dwSignature[2], + sc->sc_ncm.hdr.dwSignature[3]); goto tr_stall; } temp = UGETW(sc->sc_ncm.hdr.wBlockLength); @@ -1202,7 +1207,7 @@ } temp = UGETW(sc->sc_ncm.hdr.wDptIndex); if ((temp + sizeof(sc->sc_ncm.dpt)) > actlen) { - DPRINTFN(1, "invalid DPT index\n"); + DPRINTFN(1, "invalid DPT index: 0x%04x\n", temp); goto tr_stall; } usbd_copy_out(pc, temp, &(sc->sc_ncm.dpt), @@ -1211,8 +1216,13 @@ if ((sc->sc_ncm.dpt.dwSignature[0] != 'N') || (sc->sc_ncm.dpt.dwSignature[1] != 'C') || (sc->sc_ncm.dpt.dwSignature[2] != 'M') || - (sc->sc_ncm.dpt.dwSignature[3] != 'x')) { - DPRINTFN(1, "invalid DPT signature\n"); + (sc->sc_ncm.dpt.dwSignature[3] != '0')) { + DPRINTFN(1, "invalid DPT signature" + "0x%02x:0x%02x:0x%02x:0x%02x\n", + sc->sc_ncm.dpt.dwSignature[0], + sc->sc_ncm.dpt.dwSignature[1], + sc->sc_ncm.dpt.dwSignature[2], + sc->sc_ncm.dpt.dwSignature[3]); goto tr_stall; } nframes = UGETW(sc->sc_ncm.dpt.wLength) / 4; @@ -1284,6 +1294,7 @@ DPRINTFN(1, "Efficiency: %u/%u bytes\n", sumdata, actlen); case USB_ST_SETUP: +tr_setup: usbd_xfer_set_frame_len(xfer, 0, sc->sc_ncm.rx_max); usbd_xfer_set_frames(xfer, 1); usbd_transfer_submit(xfer); From owner-p4-projects@FreeBSD.ORG Wed Dec 9 20:39:22 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF8541065692; Wed, 9 Dec 2009 20:39:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B41A8106568D for ; Wed, 9 Dec 2009 20:39:21 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A181B8FC24 for ; Wed, 9 Dec 2009 20:39:21 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nB9KdLHE053606 for ; Wed, 9 Dec 2009 20:39:21 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB9KdLc9053604 for perforce@freebsd.org; Wed, 9 Dec 2009 20:39:21 GMT (envelope-from jhb@freebsd.org) Date: Wed, 9 Dec 2009 20:39:21 GMT Message-Id: <200912092039.nB9KdLc9053604@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171579 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Dec 2009 20:39:22 -0000 http://p4web.freebsd.org/chv.cgi?CH=171579 Change 171579 by jhb@jhb_jhbbsd on 2009/12/09 20:39:14 Oops, need to call bus_activate_resource() when allocating a reserved resource if RF_ACTIVE is set. Missed porting this over from the PCI bus driver. Affected files ... .. //depot/projects/multipass/sys/kern/subr_bus.c#11 edit Differences ... ==== //depot/projects/multipass/sys/kern/subr_bus.c#11 (text+ko) ==== @@ -2991,6 +2991,9 @@ if (passthrough) panic( "resource_list_reserve() should only be called for direct children"); + if (flags & RF_ACTIVE) + panic( + "resource_list_reserve() should only reserve inactive resources"); r = resource_list_alloc(rl, bus, child, type, rid, start, end, count, flags); @@ -3056,6 +3059,10 @@ if (rle->flags & RLE_RESERVED) { if (rle->flags & RLE_ALLOCATED) return (NULL); + else if ((flags & RF_ACTIVE) && + bus_activate_resource(child, type, *rid, + rle->res) != 0) + return (NULL); else return (rle->res); } From owner-p4-projects@FreeBSD.ORG Thu Dec 10 22:34:19 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C3541065679; Thu, 10 Dec 2009 22:34:19 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 086DF1065672 for ; Thu, 10 Dec 2009 22:34:19 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E9E918FC16 for ; Thu, 10 Dec 2009 22:34:18 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nBAMYIOF070046 for ; Thu, 10 Dec 2009 22:34:18 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBAMYIDQ070044 for perforce@freebsd.org; Thu, 10 Dec 2009 22:34:18 GMT (envelope-from pgj@FreeBSD.org) Date: Thu, 10 Dec 2009 22:34:18 GMT Message-Id: <200912102234.nBAMYIDQ070044@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171616 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Dec 2009 22:34:19 -0000 http://p4web.freebsd.org/chv.cgi?CH=171616 Change 171616 by pgj@beehive on 2009/12/10 22:33:51 IFC Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/introduction/chapter.sgml#27 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#41 integrate .. //depot/projects/docproj_hu/www/en/developers.sgml#36 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#69 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#78 integrate Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/introduction/chapter.sgml#27 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -185,6 +185,7 @@ + @@ -600,7 +601,6 @@ - ==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#69 (text+ko) ==== @@ -11,7 +11,7 @@ - $FreeBSD: www/hu/share/sgml/news.xml,v 1.29 2009/11/29 02:42:48 pgj Exp $ + $FreeBSD: www/hu/share/sgml/news.xml,v 1.30 2009/12/06 21:21:08 pgj Exp $ ==== //depot/projects/docproj_hu/www/share/sgml/news.xml#78 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.281 2009/12/03 18:25:12 danger Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.282 2009/12/09 21:15:22 gavin Exp $ @@ -36,6 +36,15 @@ 12 + 7 + + +

    New committer: Gavin + Atkinson (src)

    +     +     + + 3 From owner-p4-projects@FreeBSD.ORG Thu Dec 10 22:59:45 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E28F11065693; Thu, 10 Dec 2009 22:59:44 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A6C961065676 for ; Thu, 10 Dec 2009 22:59:44 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 949AD8FC15 for ; Thu, 10 Dec 2009 22:59:44 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nBAMxihq071817 for ; Thu, 10 Dec 2009 22:59:44 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBAMxife071815 for perforce@freebsd.org; Thu, 10 Dec 2009 22:59:44 GMT (envelope-from pgj@FreeBSD.org) Date: Thu, 10 Dec 2009 22:59:44 GMT Message-Id: <200912102259.nBAMxife071815@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171618 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Dec 2009 22:59:45 -0000 http://p4web.freebsd.org/chv.cgi?CH=171618 Change 171618 by pgj@beehive on 2009/12/10 22:58:46 MFen (www): 1.281 -> 1.282 hu/share/sgml/news.xml Affected files ... .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#70 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#70 (text+ko) ==== @@ -5,7 +5,7 @@ @@ -22,6 +22,15 @@ 12 + 7 + + +

    Új tag: Gavin Atkinson + (src)

    +     +     + + 3 From owner-p4-projects@FreeBSD.ORG Fri Dec 11 02:59:46 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7AECF1065676; Fri, 11 Dec 2009 02:59:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3EC5D1065670 for ; Fri, 11 Dec 2009 02:59:46 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2A79D8FC12 for ; Fri, 11 Dec 2009 02:59:46 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nBB2xkw5004774 for ; Fri, 11 Dec 2009 02:59:46 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBB2xjDb004772 for perforce@freebsd.org; Fri, 11 Dec 2009 02:59:45 GMT (envelope-from mav@freebsd.org) Date: Fri, 11 Dec 2009 02:59:45 GMT Message-Id: <200912110259.nBB2xjDb004772@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171632 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Dec 2009 02:59:46 -0000 http://p4web.freebsd.org/chv.cgi?CH=171632 Change 171632 by mav@mav_mavbook on 2009/12/11 02:59:31 IFC Affected files ... .. //depot/projects/scottl-camlock/src/contrib/expat/lib/xmlparse.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/expat/lib/xmltok_impl.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/netcat/FREEBSD-vendor#3 integrate .. //depot/projects/scottl-camlock/src/etc/namedb/named.root#3 integrate .. //depot/projects/scottl-camlock/src/etc/termcap.small#3 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_format_cpio.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/sem_init.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdlib/malloc.c#7 integrate .. //depot/projects/scottl-camlock/src/lib/libkvm/kvm_proc.c#6 integrate .. //depot/projects/scottl-camlock/src/release/picobsd/bridge/PICOBSD#4 integrate .. //depot/projects/scottl-camlock/src/release/picobsd/bridge/crunch.conf#4 integrate .. //depot/projects/scottl-camlock/src/release/picobsd/build/picobsd#4 integrate .. //depot/projects/scottl-camlock/src/sbin/geom/class/mirror/geom_mirror.c#4 integrate .. //depot/projects/scottl-camlock/src/sbin/geom/class/mirror/gmirror.8#4 integrate .. //depot/projects/scottl-camlock/src/share/misc/committers-src.dot#8 integrate .. //depot/projects/scottl-camlock/src/share/termcap/termcap.src#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/acpica/acpi_switch.S#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/mv/mv_sata.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/gptboot/gptboot.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/biosacpi.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/zfsboot/zfsboot.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/btx/btx/btx.S#7 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/libpc98/biosmem.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/loader/main.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/boot/zfs/zfsimpl.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#34 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#44 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-disk.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bge.c#32 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bgereg.h#21 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_igb.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pci.c#29 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pci_pci.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#31 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/hda/hdac.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_bus_pci.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci_pci.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/uhci_pci.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/input/uhid.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_axe.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_cdce.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/quirk/usb_quirk.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/quirk/usb_quirk.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/u3g.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uftdi.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/umodem.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#33 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfsserver/nfs_nfsdcache.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/dump_machdep.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/machdep.c#31 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/minidump_machdep.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/xen/pmap.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_bus.c#38 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_syscalls.c#30 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_vnops.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/net/radix.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_dummynet.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/stack_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/stack_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/sys/bus.h#19 integrate .. //depot/projects/scottl-camlock/src/usr.bin/calendar/calendars/calendar.freebsd#7 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/lastlogin/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/lastlogin/lastlogin.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/user.c#4 integrate Differences ... ==== //depot/projects/scottl-camlock/src/contrib/expat/lib/xmlparse.c#3 (text+ko) ==== @@ -3725,7 +3725,6 @@ return XML_ERROR_NO_ELEMENTS; default: tok = -tok; - next = end; break; } } ==== //depot/projects/scottl-camlock/src/contrib/expat/lib/xmltok_impl.c#3 (text+ko) ==== @@ -1744,7 +1744,7 @@ const char *end, POSITION *pos) { - while (ptr != end) { + while (ptr < end) { switch (BYTE_TYPE(enc, ptr)) { #define LEAD_CASE(n) \ case BT_LEAD ## n: \ ==== //depot/projects/scottl-camlock/src/contrib/netcat/FREEBSD-vendor#3 (text+ko) ==== @@ -1,5 +1,5 @@ -# $FreeBSD: src/contrib/netcat/FREEBSD-vendor,v 1.3 2009/08/13 06:07:38 des Exp $ +# $FreeBSD: src/contrib/netcat/FREEBSD-vendor,v 1.4 2009/12/08 19:12:38 delphij Exp $ Project: netcat (aka src/usr.bin/nc in OpenBSD) ProjectURL: http://www.openbsd.org/ -Version: 4.4 +Version: 4.5 License: BSD ==== //depot/projects/scottl-camlock/src/etc/namedb/named.root#3 (text+ko) ==== @@ -1,5 +1,5 @@ ; -; $FreeBSD: src/etc/namedb/named.root,v 1.14 2008/02/07 06:28:02 dougb Exp $ +; $FreeBSD: src/etc/namedb/named.root,v 1.15 2009/12/11 01:06:04 dougb Exp $ ; ; This file holds the information on root name servers needed to @@ -13,8 +13,8 @@ ; on server FTP.INTERNIC.NET ; -OR- RS.INTERNIC.NET ; -; last update: Feb 04, 2008 -; related version of root zone: 2008020400 +; last update: Dec 12, 2008 +; related version of root zone: 2008121200 ; ; formerly NS.INTERNIC.NET ; @@ -22,68 +22,69 @@ A.ROOT-SERVERS.NET. 3600000 A 198.41.0.4 A.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:BA3E::2:30 ; -; formerly NS1.ISI.EDU +; FORMERLY NS1.ISI.EDU ; . 3600000 NS B.ROOT-SERVERS.NET. B.ROOT-SERVERS.NET. 3600000 A 192.228.79.201 ; -; formerly C.PSI.NET +; FORMERLY C.PSI.NET ; . 3600000 NS C.ROOT-SERVERS.NET. C.ROOT-SERVERS.NET. 3600000 A 192.33.4.12 ; -; formerly TERP.UMD.EDU +; FORMERLY TERP.UMD.EDU ; . 3600000 NS D.ROOT-SERVERS.NET. D.ROOT-SERVERS.NET. 3600000 A 128.8.10.90 ; -; formerly NS.NASA.GOV +; FORMERLY NS.NASA.GOV ; . 3600000 NS E.ROOT-SERVERS.NET. E.ROOT-SERVERS.NET. 3600000 A 192.203.230.10 ; -; formerly NS.ISC.ORG +; FORMERLY NS.ISC.ORG ; . 3600000 NS F.ROOT-SERVERS.NET. F.ROOT-SERVERS.NET. 3600000 A 192.5.5.241 -F.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2f::f +F.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2F::F ; -; formerly NS.NIC.DDN.MIL +; FORMERLY NS.NIC.DDN.MIL ; . 3600000 NS G.ROOT-SERVERS.NET. G.ROOT-SERVERS.NET. 3600000 A 192.112.36.4 ; -; formerly AOS.ARL.ARMY.MIL +; FORMERLY AOS.ARL.ARMY.MIL ; . 3600000 NS H.ROOT-SERVERS.NET. H.ROOT-SERVERS.NET. 3600000 A 128.63.2.53 -H.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:1::803f:235 +H.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:1::803F:235 ; -; formerly NIC.NORDU.NET +; FORMERLY NIC.NORDU.NET ; . 3600000 NS I.ROOT-SERVERS.NET. I.ROOT-SERVERS.NET. 3600000 A 192.36.148.17 ; -; operated by VeriSign, Inc. +; OPERATED BY VERISIGN, INC. ; . 3600000 NS J.ROOT-SERVERS.NET. J.ROOT-SERVERS.NET. 3600000 A 192.58.128.30 J.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:C27::2:30 ; -; operated by RIPE NCC +; OPERATED BY RIPE NCC ; . 3600000 NS K.ROOT-SERVERS.NET. K.ROOT-SERVERS.NET. 3600000 A 193.0.14.129 -K.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fd::1 +K.ROOT-SERVERS.NET. 3600000 AAAA 2001:7FD::1 ; -; operated by ICANN +; OPERATED BY ICANN ; . 3600000 NS L.ROOT-SERVERS.NET. L.ROOT-SERVERS.NET. 3600000 A 199.7.83.42 +L.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:3::42 ; -; operated by WIDE +; OPERATED BY WIDE ; . 3600000 NS M.ROOT-SERVERS.NET. M.ROOT-SERVERS.NET. 3600000 A 202.12.27.33 -M.ROOT-SERVERS.NET. 3600000 AAAA 2001:dc3::35 +M.ROOT-SERVERS.NET. 3600000 AAAA 2001:DC3::35 ; End of File ==== //depot/projects/scottl-camlock/src/etc/termcap.small#3 (text+ko) ==== @@ -30,7 +30,7 @@ # SUCH DAMAGE. # # @(#)termcap.src 5.88 (Berkeley) 4/30/91 -# $FreeBSD: src/etc/termcap.small,v 1.30 2009/06/13 13:35:18 edwin Exp $ +# $FreeBSD: src/etc/termcap.small,v 1.31 2009/12/10 22:25:53 ed Exp $ # # for syscons # common entry without semigraphics @@ -291,32 +291,32 @@ :up=\E[A:\ :ut: -# $XFree86: xc/programs/xterm/termcap,v 3.28 2001/01/17 23:46:39 dawes Exp $ +# $XTermId: termcap,v 1.78 2009/11/09 00:24:26 tom Exp $ # -xterm-xfree86|XFree86 xterm:\ - :k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:\ - :k5=\E[15~:k6=\E[17~:k7=\E[18~:k8=\E[19~:\ - :k9=\E[20~:k;=\E[21~:F1=\E[23~:F2=\E[24~:\ - :@7=\EOF:@8=\EOM:kI=\E[2~:\ - :kh=\EOH:kP=\E[5~:kN=\E[6~:\ - :ku=\EOA:kd=\EOB:kr=\EOC:kl=\EOD:Km=\E[M:tc=xterm-basic: +xterm-new|modern xterm:\ + :*6=\EOF:@7=\EOF:F1=\E[23~:F2=\E[24~:K2=\EOE:Km=\E[M:\ + :k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\E[15~:k6=\E[17~:\ + :k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:kH=\EOF:kI=\E[2~:\ + :kN=\E[6~:kP=\E[5~:kd=\EOB:kh=\EOH:kl=\EOD:kr=\EOC:ku=\EOA:\ + :tc=xterm-basic: # # This chunk is used for building the VT220/Sun/PC keyboard variants. -xterm-basic|xterm common (XFree86):\ - :li#24:co#80:am:kn#12:km:mi:ms:xn:AX:bl=^G:\ - :is=\E[!p\E[?3;4l\E[4l\E>:rs=\E[!p\E[?3;4l\E[4l\E>:le=^H:\ - :AL=\E[%dL:DL=\E[%dM:DC=\E[%dP:al=\E[L:dc=\E[P:dl=\E[M:\ - :UP=\E[%dA:DO=\E[%dB:LE=\E[%dD:RI=\E[%dC:\ - :ho=\E[H:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cs=\E[%i%d;%dr:\ - :im=\E[4h:ei=\E[4l:ks=\E[?1h\E=:ke=\E[?1l\E>:kD=\E[3~:kb=^H:\ - :sf=\n:sr=\EM:st=\EH:ct=\E[3g:sc=\E7:rc=\E8:\ - :eA=\E(B\E)0:as=\E(0:ae=\E(B:ml=\El:mu=\Em:up=\E[A:nd=\E[C:\ - :md=\E[1m:me=\E[m:mr=\E[7m:so=\E[7m:se=\E[27m:us=\E[4m:ue=\E[24m:\ - :ti=\E[?1049h:te=\E[?1049l:vi=\E[?25l:ve=\E[?25h:\ - :ut:Co#8:pa#64:op=\E[39;49m:AB=\E[4%dm:AF=\E[3%dm:\ +xterm-basic|modern xterm common:\ + :am:bs:km:mi:ms:ut:xn:AX:\ + :Co#8:co#80:kn#12:li#24:pa#64:\ + :AB=\E[4%dm:AF=\E[3%dm:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:\ + :DO=\E[%dB:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:ae=\E(B:al=\E[L:\ + :as=\E(0:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:\ + :cm=\E[%i%d;%dH:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:\ + :ei=\E[4l:ho=\E[H:im=\E[4h:is=\E[!p\E[?3;4l\E[4l\E>:\ + :kD=\E[3~:kb=^H:ke=\E[?1l\E>:ks=\E[?1h\E=:le=^H:md=\E[1m:\ + :me=\E[m:ml=\El:mr=\E[7m:mu=\Em:nd=\E[C:op=\E[39;49m:\ + :rc=\E8:rs=\E[!p\E[?3;4l\E[4l\E>:sc=\E7:se=\E[27m:sf=^J:\ + :so=\E[7m:sr=\EM:st=\EH:te=\E[?1049l:ti=\E[?1049h:\ + :ue=\E[24m:up=\E[A:us=\E[4m:ve=\E[?12l\E[?25h:vi=\E[?25l:vs=\E[?12;25h: # # This is the only entry which you should have to customize, since "xterm" # is widely used for a variety of incompatible terminal emulations including # color_xterm and rxvt. -xterm|xterm-color|X11 terminal emulator:\ - :ti@:te@:tc=xterm-xfree86: +xterm|X11 terminal emulator:\ + :tc=xterm-new: ==== //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_format_cpio.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_cpio.c,v 1.30 2009/04/27 19:30:09 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_cpio.c,v 1.31 2009/12/10 06:42:28 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -356,7 +356,7 @@ * Scan ahead until we find something that looks * like an odc header. */ - while (p + sizeof(struct cpio_newc_header) < q) { + while (p + sizeof(struct cpio_newc_header) <= q) { switch (p[5]) { case '1': case '2': @@ -490,7 +490,7 @@ * Scan ahead until we find something that looks * like an odc header. */ - while (p + sizeof(struct cpio_odc_header) < q) { + while (p + sizeof(struct cpio_odc_header) <= q) { switch (p[5]) { case '7': if (memcmp("070707", p, 6) == 0 @@ -731,6 +731,9 @@ dev_t dev; ino_t ino; + if (archive_entry_nlink(entry) <= 1) + return; + dev = archive_entry_dev(entry); ino = archive_entry_ino(entry); ==== //depot/projects/scottl-camlock/src/lib/libc/gen/sem_init.3#2 (text+ko) ==== @@ -25,9 +25,9 @@ .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/sem_init.3,v 1.18 2005/07/13 13:15:21 rwatson Exp $ +.\" $FreeBSD: src/lib/libc/gen/sem_init.3,v 1.19 2009/12/08 20:48:06 jilles Exp $ .\" -.Dd February 15, 2000 +.Dd December 8, 2009 .Dt SEM_INIT 3 .Os .Sh NAME @@ -48,8 +48,7 @@ .Fa value . A non-zero value for .Fa pshared -specifies a shared semaphore that can be used by multiple processes, which this -implementation is not capable of. +specifies a shared semaphore that can be used by multiple processes. .Pp Following a successful call to .Fn sem_init , @@ -78,8 +77,6 @@ .Dv SEM_VALUE_MAX . .It Bq Er ENOSPC Memory allocation error. -.It Bq Er EPERM -Unable to initialize a shared semaphore. .El .Sh SEE ALSO .Xr sem_destroy 3 , @@ -93,16 +90,10 @@ .Fn sem_init function conforms to .St -p1003.1-96 . -.Pp -This implementation does not support shared semaphores, and reports this fact -by setting -.Va errno -to -.Er EPERM . -This is perhaps a stretch of the intention of -.Tn POSIX , -but is -compliant, with the caveat that -.Fn sem_init -always reports a permissions error when an attempt to create a shared semaphore -is made. +.Sh BUGS +A sem_t is a pointer to a separately allocated structure, +therefore process shared semaphores only work between related processes +and do not perform very well +(each operation is a system call, +while single-process semaphores only do a system call +if they need to block or wake up a thread). ==== //depot/projects/scottl-camlock/src/lib/libc/stdlib/malloc.c#7 (text+ko) ==== @@ -156,7 +156,7 @@ #define MALLOC_DSS #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.186 2009/11/14 09:31:47 cperciva Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.188 2009/12/10 02:51:40 jasone Exp $"); #include "libc_private.h" #ifdef MALLOC_DEBUG @@ -2419,7 +2419,7 @@ static inline void arena_run_reg_dalloc(arena_run_t *run, arena_bin_t *bin, void *ptr, size_t size) { - unsigned diff, regind, elm, bit; + unsigned shift, diff, regind, elm, bit; assert(run->magic == ARENA_RUN_MAGIC); @@ -2428,31 +2428,16 @@ * actual division here can reduce allocator throughput by over 20%! */ diff = (unsigned)((uintptr_t)ptr - (uintptr_t)run - bin->reg0_offset); - if ((size & (size - 1)) == 0) { - /* - * log2_table allows fast division of a power of two in the - * [1..128] range. - * - * (x / divisor) becomes (x >> log2_table[divisor - 1]). - */ - static const unsigned char log2_table[] = { - 0, 1, 0, 2, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 4, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7 - }; + + /* Rescale (factor powers of 2 out of the numerator and denominator). */ + shift = ffs(size) - 1; + diff >>= shift; + size >>= shift; - if (size <= 128) - regind = (diff >> log2_table[size - 1]); - else if (size <= 32768) - regind = diff >> (8 + log2_table[(size >> 8) - 1]); - else - regind = diff / size; - } else if (size < qspace_max) { + if (size == 1) { + /* The divisor was a power of 2. */ + regind = diff; + } else { /* * To divide by a number D that is not a power of two we * multiply by (2^21 / D) and then right shift by 21 positions. @@ -2461,78 +2446,32 @@ * * becomes * - * (X * qsize_invs[(D >> QUANTUM_2POW) - 3]) - * >> SIZE_INV_SHIFT + * (X * size_invs[D - 3]) >> SIZE_INV_SHIFT * * We can omit the first three elements, because we never - * divide by 0, and QUANTUM and 2*QUANTUM are both powers of - * two, which are handled above. + * divide by 0, and 1 and 2 are both powers of two, which are + * handled above. */ #define SIZE_INV_SHIFT 21 -#define QSIZE_INV(s) (((1U << SIZE_INV_SHIFT) / (s << QUANTUM_2POW)) + 1) - static const unsigned qsize_invs[] = { - QSIZE_INV(3), - QSIZE_INV(4), QSIZE_INV(5), QSIZE_INV(6), QSIZE_INV(7) -#if (QUANTUM_2POW < 4) - , - QSIZE_INV(8), QSIZE_INV(9), QSIZE_INV(10), QSIZE_INV(11), - QSIZE_INV(12),QSIZE_INV(13), QSIZE_INV(14), QSIZE_INV(15) -#endif +#define SIZE_INV(s) (((1U << SIZE_INV_SHIFT) / (s)) + 1) + static const unsigned size_invs[] = { + SIZE_INV(3), + SIZE_INV(4), SIZE_INV(5), SIZE_INV(6), SIZE_INV(7), + SIZE_INV(8), SIZE_INV(9), SIZE_INV(10), SIZE_INV(11), + SIZE_INV(12), SIZE_INV(13), SIZE_INV(14), SIZE_INV(15), + SIZE_INV(16), SIZE_INV(17), SIZE_INV(18), SIZE_INV(19), + SIZE_INV(20), SIZE_INV(21), SIZE_INV(22), SIZE_INV(23), + SIZE_INV(24), SIZE_INV(25), SIZE_INV(26), SIZE_INV(27), + SIZE_INV(28), SIZE_INV(29), SIZE_INV(30), SIZE_INV(31) }; - assert(QUANTUM * (((sizeof(qsize_invs)) / sizeof(unsigned)) + 3) - >= (1U << QSPACE_MAX_2POW_DEFAULT)); - if (size <= (((sizeof(qsize_invs) / sizeof(unsigned)) + 2) << - QUANTUM_2POW)) { - regind = qsize_invs[(size >> QUANTUM_2POW) - 3] * diff; - regind >>= SIZE_INV_SHIFT; - } else + if (size <= ((sizeof(size_invs) / sizeof(unsigned)) + 2)) + regind = (diff * size_invs[size - 3]) >> SIZE_INV_SHIFT; + else regind = diff / size; -#undef QSIZE_INV - } else if (size < cspace_max) { -#define CSIZE_INV(s) (((1U << SIZE_INV_SHIFT) / (s << CACHELINE_2POW)) + 1) - static const unsigned csize_invs[] = { - CSIZE_INV(3), - CSIZE_INV(4), CSIZE_INV(5), CSIZE_INV(6), CSIZE_INV(7) - }; - assert(CACHELINE * (((sizeof(csize_invs)) / sizeof(unsigned)) + - 3) >= (1U << CSPACE_MAX_2POW_DEFAULT)); - - if (size <= (((sizeof(csize_invs) / sizeof(unsigned)) + 2) << - CACHELINE_2POW)) { - regind = csize_invs[(size >> CACHELINE_2POW) - 3] * - diff; - regind >>= SIZE_INV_SHIFT; - } else - regind = diff / size; -#undef CSIZE_INV - } else { -#define SSIZE_INV(s) (((1U << SIZE_INV_SHIFT) / (s << SUBPAGE_2POW)) + 1) - static const unsigned ssize_invs[] = { - SSIZE_INV(3), - SSIZE_INV(4), SSIZE_INV(5), SSIZE_INV(6), SSIZE_INV(7), - SSIZE_INV(8), SSIZE_INV(9), SSIZE_INV(10), SSIZE_INV(11), - SSIZE_INV(12), SSIZE_INV(13), SSIZE_INV(14), SSIZE_INV(15) -#if (PAGE_SHIFT == 13) - , - SSIZE_INV(16), SSIZE_INV(17), SSIZE_INV(18), SSIZE_INV(19), - SSIZE_INV(20), SSIZE_INV(21), SSIZE_INV(22), SSIZE_INV(23), - SSIZE_INV(24), SSIZE_INV(25), SSIZE_INV(26), SSIZE_INV(27), - SSIZE_INV(28), SSIZE_INV(29), SSIZE_INV(29), SSIZE_INV(30) -#endif - }; - assert(SUBPAGE * (((sizeof(ssize_invs)) / sizeof(unsigned)) + 3) - >= PAGE_SIZE); - - if (size < (((sizeof(ssize_invs) / sizeof(unsigned)) + 2) << - SUBPAGE_2POW)) { - regind = ssize_invs[(size >> SUBPAGE_2POW) - 3] * diff; - regind >>= SIZE_INV_SHIFT; - } else - regind = diff / size; -#undef SSIZE_INV +#undef SIZE_INV +#undef SIZE_INV_SHIFT } -#undef SIZE_INV_SHIFT assert(diff == regind * size); assert(regind < bin->nregs); @@ -5340,6 +5279,7 @@ size = 1; else { result = NULL; + *memptr = NULL; ret = 0; goto RETURN; } ==== //depot/projects/scottl-camlock/src/lib/libkvm/kvm_proc.c#6 (text+ko) ==== @@ -38,7 +38,7 @@ #endif #include -__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.101 2009/09/08 19:37:59 brooks Exp $"); +__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.102 2009/12/10 21:16:16 brooks Exp $"); /* * Proc traversal interface for kvm. ps and w are (probably) the exclusive @@ -149,7 +149,7 @@ if (ucred.cr_ngroups > KI_NGROUPS) { kp->ki_ngroups = KI_NGROUPS; kp->ki_cr_flags |= KI_CRF_GRP_OVERFLOW; - } + } else kp->ki_ngroups = ucred.cr_ngroups; kvm_read(kd, (u_long)ucred.cr_groups, kp->ki_groups, kp->ki_ngroups * sizeof(gid_t)); ==== //depot/projects/scottl-camlock/src/release/picobsd/bridge/PICOBSD#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/release/picobsd/bridge/PICOBSD,v 1.25 2009/11/08 08:59:40 luigi Exp $ +# $FreeBSD: src/release/picobsd/bridge/PICOBSD,v 1.26 2009/12/09 17:42:14 luigi Exp $ # # Line starting with #PicoBSD contains PicoBSD build parameters #marker def_sz init MFS_inodes floppy_inodes @@ -46,7 +46,7 @@ # Support for bridging and bandwidth limiting options DUMMYNET device if_bridge -options HZ=1000 +#options HZ=1000 device random # used by ssh device pci ==== //depot/projects/scottl-camlock/src/release/picobsd/bridge/crunch.conf#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/release/picobsd/bridge/crunch.conf,v 1.27 2009/09/12 15:50:08 luigi Exp $ +# $FreeBSD: src/release/picobsd/bridge/crunch.conf,v 1.28 2009/12/09 17:41:47 luigi Exp $ # # Configuration file for "bridge" images.. # @@ -98,13 +98,15 @@ progs test ln test [ +progs less +ln less more progs mount progs minigzip ln minigzip gzip progs kill progs df progs ps -progs ns # this is the +progs ns # this is the picobsd version ln ns netstat progs vm progs hostname @@ -179,3 +181,4 @@ libs_so -lbsdxml libs_so -lsbuf libs_so -ljail # used by ifconfig +libs_so -lulog # used by ifconfig ==== //depot/projects/scottl-camlock/src/release/picobsd/build/picobsd#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh - # -# $FreeBSD: src/release/picobsd/build/picobsd,v 1.50 2009/06/22 16:06:38 luigi Exp $ +# $FreeBSD: src/release/picobsd/build/picobsd,v 1.51 2009/12/09 17:48:05 luigi Exp $ # This file requires sysutils/makefs to run # # The PicoBSD build script. Invoked as @@ -167,7 +167,7 @@ local no log "create_includes_and_libraries2() for ${SRC}" if [ ${OSVERSION} -ge 600000 ] ; then - no="-DNO_CLEAN -DNO_PROFILE -DNO_GAMES -DNO_LIBC_R" + no="-DNO_CLEAN -DNO_PROFILE -DNO_GAMES -DNO_LIBC_R" # WITOUT_CDDL=1" else no="-DNOCLEAN -DNOPROFILE -DNOGAMES -DNOLIBC_R" fi @@ -587,8 +587,9 @@ local i u_progs="`find_progs_helper $*`" local o=${o_objdir:-${_SHLIBDIRPREFIX}} + log "looking for libs for $u_progs in $_SHLIBDIRPREFIX" [ -z "${u_progs}" ] && return 1 # not found, error - i="`ldd ${u_progs} | grep -v '^/' | awk '{print $1}' | sort | uniq`" + i="`LD_LIBRARY_PATH=$o/lib ldd ${u_progs} | grep -v '^/' | awk '{print $1}' | sort | uniq`" u_libs="`find_progs_helper $i`" return 0 } @@ -719,8 +720,7 @@ (cd ${dst}; chown -R root . ) fi - # If we are building a shared 'crunch', take the libraries - # and the dynamic loader as well + log "for a shared 'crunch' take libraries and dynamic loader as well" find_progs ${dst}/stand/crunch if [ -n "${u_libs}" ] ; then mkdir -p ${dst}/lib && cp -p ${u_libs} ${dst}/lib ==== //depot/projects/scottl-camlock/src/sbin/geom/class/mirror/geom_mirror.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/geom/class/mirror/geom_mirror.c,v 1.18 2009/09/06 06:52:06 pjd Exp $"); +__FBSDID("$FreeBSD: src/sbin/geom/class/mirror/geom_mirror.c,v 1.19 2009/12/08 22:43:29 mav Exp $"); #include #include @@ -44,7 +44,7 @@ uint32_t lib_version = G_LIB_VERSION; uint32_t version = G_MIRROR_VERSION; -static char label_balance[] = "split", configure_balance[] = "none"; +static char label_balance[] = "load", configure_balance[] = "none"; static intmax_t label_slice = 4096, configure_slice = -1; static intmax_t insert_priority = 0, configure_priority = -1; ==== //depot/projects/scottl-camlock/src/sbin/geom/class/mirror/gmirror.8#4 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/geom/class/mirror/gmirror.8,v 1.25 2009/09/09 19:06:01 pjd Exp $ +.\" $FreeBSD: src/sbin/geom/class/mirror/gmirror.8,v 1.26 2009/12/09 11:00:00 ru Exp $ .\" -.Dd August 1, 2009 +.Dd December 8, 2009 .Dt GMIRROR 8 .Os .Sh NAME @@ -135,6 +135,7 @@ .Bl -tag -width ".Cm round-robin" .It Cm load Read from the component with the lowest load. +This is the default balance algorithm. .It Cm prefer Read from the component with the biggest priority. .It Cm round-robin @@ -142,7 +143,6 @@ .It Cm split Split read requests, which are bigger than or equal to slice size on N pieces, where N is the number of active components. -This is the default balance algorithm. .El .It Fl F Do not synchronize after a power failure or system crash. ==== //depot/projects/scottl-camlock/src/share/misc/committers-src.dot#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/misc/committers-src.dot,v 1.100 2009/10/17 00:33:55 neel Exp $ +# $FreeBSD: src/share/misc/committers-src.dot,v 1.103 2009/12/10 14:41:47 kib Exp $ # This file is meant to list all FreeBSD src committers and describe the # mentor-mentee relationships between them. @@ -94,6 +94,7 @@ flz [label="Florent Thoumie\nflz@FreeBSD.org\n2006/03/30"] gad [label="Garance A. Drosehn\ngad@FreeBSD.org\n2000/10/27"] gallatin [label="Andrew Gallatin\ngallatin@FreeBSD.org\n????/??/??"] +gavin [label="Gavin Atkinson\ngavin@FreeBSD.org\n2009/12/07"] gibbs [label="Justin T. Gibbs\ngibbs@FreeBSD.org\n????/??/??"] glebius [label="Gleb Smirnoff\nglebius@FreeBSD.org\n2004/07/14"] gnn [label="George V. Neville-Neil\ngnn@FreeBSD.org\n2004/10/11"] @@ -122,6 +123,7 @@ kaiw [label="Kai Wang\nkaiw@FreeBSD.org\n2007/09/26"] kensmith [label="Ken Smith\nkensmith@FreeBSD.org\n2004/01/23"] kevlo [label="Kevin Lo\nkevlo@FreeBSD.org\n2006/07/23"] +kib [label="Konstantin Belousov\nkib@FreeBSD.org\n2006/06/03"] kmacy [label="Kip Macy\nkmacy@FreeBSD.org\n2005/06/01"] le [label="Lukas Ertl\nle@FreeBSD.org\n2004/02/02"] linimon [label="Mark Linimon\nlinimon@FreeBSD.org\n2006/09/30"] @@ -254,7 +256,9 @@ dwmalone -> peadar dwmalone -> snb +ed -> gavin ed -> jilles +ed -> rdivacky eivind -> des eivind -> rwatson @@ -345,7 +349,14 @@ julian -> adrian julian -> zec +kan -> kib + +kib -> dchagin kib -> lulf +kib -> pho +kib -> rdivacky +kib -> rmacklem +kib -> stas kmacy -> lstewart @@ -384,9 +395,11 @@ peter -> jayanth peter -> ps +philip -> ed philip -> jls philip -> matteo +pjd -> kib pjd -> lulf rgrimes -> markm @@ -413,6 +426,7 @@ rwatson -> kensmith rwatson -> kmacy rwatson -> linimon +rwatson -> rmacklem rwatson -> shafeeq rwatson -> tmm rwatson -> trasz ==== //depot/projects/scottl-camlock/src/share/termcap/termcap.src#4 (text+ko) ==== @@ -30,7 +30,7 @@ # SUCH DAMAGE. # # @(#)termcap.src 8.2 (Berkeley) 11/17/93 -# $FreeBSD: src/share/termcap/termcap.src,v 1.156 2009/06/14 07:02:50 edwin Exp $ +# $FreeBSD: src/share/termcap/termcap.src,v 1.157 2009/12/10 22:25:53 ed Exp $ # Termcap source file # John Kunze, Berkeley @@ -2784,48 +2784,46 @@ :ts=\E_:fs=\E\\:ds=\E_\E\\:tc=screen: SW|screen-w|VT 100/ANSI X3.64 virtual terminal with 132 cols:\ :co#132:tc=screen: -# $Xorg: termcap,v 1.3 2000/08/17 19:55:10 cpqbld Exp $ +# $XTermId: termcap,v 1.78 2009/11/09 00:24:26 tom Exp $ # # Note: # termcap format is limited to 1023 characters. This set of descriptions # is a subset of the terminfo, since not all features can be fit into # that limit. The 'xterm' description supports color. The monochrome -# 'xtermm' drops color in favor of additional function keys. If you need -# both, use terminfo. +# 'xterm-mono' drops color in favor of additional function keys. If you +# need both, use terminfo. # # The 1023-character limit applies to each entry after resolving the # "tc=" strings. Some implementations may discount all or part of the # formatting characters in the entry (i.e., the backslash newline tab # colon). GNU termcap does not have this limit. # -# I checked the limits using ncurses "captoinfo -CrTv", which prints +# I checked the limits using ncurses "captoinfo -CrTUvx", which prints # the resolved length of each entry in a comment at the end - T.Dickey # -# $XFree86: xc/programs/xterm/termcap,v 3.28 2001/01/17 23:46:39 dawes Exp $ -# -xterm-xfree86|XFree86 xterm:\ - :k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:\ - :k5=\E[15~:k6=\E[17~:k7=\E[18~:k8=\E[19~:\ - :k9=\E[20~:k;=\E[21~:F1=\E[23~:F2=\E[24~:\ - :@7=\EOF:@8=\EOM:kI=\E[2~:\ - :kh=\EOH:kP=\E[5~:kN=\E[6~:\ - :ku=\EOA:kd=\EOB:kr=\EOC:kl=\EOD:Km=\E[M:tc=xterm-basic: +xterm-new|modern xterm:\ + :*6=\EOF:@7=\EOF:F1=\E[23~:F2=\E[24~:K2=\EOE:Km=\E[M:\ + :k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\E[15~:k6=\E[17~:\ + :k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:kH=\EOF:kI=\E[2~:\ + :kN=\E[6~:kP=\E[5~:kd=\EOB:kh=\EOH:kl=\EOD:kr=\EOC:ku=\EOA:\ + :tc=xterm-basic: # # This chunk is used for building the VT220/Sun/PC keyboard variants. -xterm-basic|xterm common (XFree86):\ - :li#24:co#80:am:kn#12:km:mi:ms:xn:AX:bl=^G:\ - :is=\E[!p\E[?3;4l\E[4l\E>:rs=\E[!p\E[?3;4l\E[4l\E>:le=^H:\ - :AL=\E[%dL:DL=\E[%dM:DC=\E[%dP:al=\E[L:dc=\E[P:dl=\E[M:\ - :UP=\E[%dA:DO=\E[%dB:LE=\E[%dD:RI=\E[%dC:\ - :ho=\E[H:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cs=\E[%i%d;%dr:\ - :im=\E[4h:ei=\E[4l:ks=\E[?1h\E=:ke=\E[?1l\E>:kD=\E[3~:kb=^H:\ - :sf=\n:sr=\EM:st=\EH:ct=\E[3g:sc=\E7:rc=\E8:\ - :eA=\E(B\E)0:as=\E(0:ae=\E(B:ml=\El:mu=\Em:up=\E[A:nd=\E[C:\ - :md=\E[1m:me=\E[m:mr=\E[7m:so=\E[7m:se=\E[27m:us=\E[4m:ue=\E[24m:\ - :ti=\E[?1049h:te=\E[?1049l:vi=\E[?25l:ve=\E[?25h:\ - :ut:Co#8:pa#64:op=\E[39;49m:AB=\E[4%dm:AF=\E[3%dm: +xterm-basic|modern xterm common:\ + :am:bs:km:mi:ms:ut:xn:AX:\ + :Co#8:co#80:kn#12:li#24:pa#64:\ + :AB=\E[4%dm:AF=\E[3%dm:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:\ + :DO=\E[%dB:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:ae=\E(B:al=\E[L:\ + :as=\E(0:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:\ + :cm=\E[%i%d;%dH:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:\ + :ei=\E[4l:ho=\E[H:im=\E[4h:is=\E[!p\E[?3;4l\E[4l\E>:\ + :kD=\E[3~:kb=^H:ke=\E[?1l\E>:ks=\E[?1h\E=:le=^H:md=\E[1m:\ + :me=\E[m:ml=\El:mr=\E[7m:mu=\Em:nd=\E[C:op=\E[39;49m:\ + :rc=\E8:rs=\E[!p\E[?3;4l\E[4l\E>:sc=\E7:se=\E[27m:sf=^J:\ + :so=\E[7m:sr=\EM:st=\EH:te=\E[?1049l:ti=\E[?1049h:\ + :ue=\E[24m:up=\E[A:us=\E[4m:ve=\E[?12l\E[?25h:vi=\E[?25l:vs=\E[?12;25h: -# The xterm-xfree86 description has all of the features, but is not completely +# The xterm-new description has all of the features, but is not completely # compatible with vt220. If you are using a Sun or PC keyboard, set the # sunKeyboard resource to true: # + maps the editing keypad @@ -2835,68 +2833,91 @@ # + uses DEC-style control sequences for the application keypad. # xterm-vt220|xterm emulating vt220:\ - :kH=\E[4~::@7=\E[4~:*6=\E[4~:kh=\E[1~:Km=\E[M:tc=xterm-basic: + :*6=\E[4~:@7=\E[4~:K2=\EOu:Km=\E[M:kH=\E[4~:kh=\E[1~:\ + :tc=xterm-basic: xterm-24|xterms|vs100|24x80 xterm:\ - :li#24:\ - :tc=xterm: + :li#24:tc=xterm-old: xterm-65|65x80 xterm:\ - :li#65:tc=xterm: + :li#65:tc=xterm-old: xterm-bold|xterm with bold for underline:\ - :so=\E[7m:us=\E[1m:tc=xterm: + :so=\E[7m:us=\E[1m:tc=xterm-old: xterm-boldso|xterm with bold for standout:\ - :se=\E[m:so=\E[1m:tc=xterm: + :se=\E[m:so=\E[1m:tc=xterm-old: xterm-mono|monochrome xterm:\ - :kn#20:\ - :st@:ut@:Co@:NC@:op@:AB@:AF@:pa@:Sf@:Sb@:tc=xterm: + :ut@:\ + :Co@:NC@:kn#20:pa@:\ + :AB@:AF@:Sb@:Sf@:op@:st@:tc=xterm-old: # # Alternate terminal description that "works" for interactive shells such as # tcsh and bash. xterm-noapp|xterm with cursor keys in normal mode:\ - :kl=\E[D:kd=\E[B:kr=\E[C:ku=\E[A:ks=\E=:ke=\E>:ti@:te@:tc=xterm: + :kd=\E[B:ke=\E>:kl=\E[D:kr=\E[C:ks=\E=:ku=\E[A:te@:ti@:\ + :tc=xterm: +# +# This should work for the commonly used "color xterm" variations (XFree86 +# xterm, color_xterm, nxterm, rxvt). Note that it does not set 'bce', so for +# XFree86 and rxvt, some applications that use colors will be less efficient, +# and in a few special cases (with "smart" optimization) the wrong color will +# be painted in spots. +xterm-color|generic "ANSI" color xterm:\ + :Co#8:NC@:pa#64:\ + :AB=\E[4%dm:AF=\E[3%dm:ac=:op=\E[m:tc=xterm-r6: # # These aliases are for compatibility with the terminfo; termcap cannot provide -# the extra features, but termcap applications still want the names. -xterm-16color|xterm alias 1:tc=xterm-xfree86: -xterm-88color|xterm alias 2:tc=xterm-256color: -xterm-256color|xterm alias 3:tc=xterm-xfree86: -xterm-nrc|xterm alias 4:tc=xterm: -xterm-rep|xterm alias 5:tc=xterm: -xterm-xmc|xterm alias 6:sg#1:tc=xterm: +# the extra features such as color initialization, but termcap applications +# still want the names. +xterm-16color|xterm alias 1:\ + :tc=xterm-new: + +xterm-88color|xterm alias 2:\ + :Co#88:pa#7744:tc=xterm-256color: + +xterm-256color|xterm alias 3:\ + :Co#256:pa#32767:\ + :AB=\E[48;5;%dm:AF=\E[38;5;%dm:tc=xterm-new: + +xterm-nrc|xterm alias 4:\ + :tc=xterm: +xterm-rep|xterm alias 5:\ + :tc=xterm: +xterm-xmc|xterm alias 6:\ + :sg#1:tc=xterm: # # An 8-bit description is doable with termcap, but there are probably no # termcap (or BSD curses) applications that are able to use it. xterm-8bit|xterm terminal emulator 8-bit controls (X Window System):\ - :co#80:li#24:\ - :it#8:am:km:mi:ms:xn:\ - :AL=\233%dL:DC=\233%dP:DL=\233%dM:DO=\233%dB:IC=\233%d@:LE=\233%dD:\ - :RI=\233%dC:UP=\233%dA:ae=^O:al=\233L:as=^N:bl=^G:bt=\233Z:\ - :cd=\233J:ce=\233K:cl=\233H\2332J:cm=\233%i%d;%dH:cr=^M:\ - :cs=\233%i%d;%dr:ct=\2333g:dc=\233P:dl=\233M:do=^J:up=\233A:nd=\233C:\ - :ei=\2334l:ho=\233H:im=\2334h:\ + :am:km:mi:ms:xn:\ + :co#80:it#8:li#24:\ + :AL=\233%dL:DC=\233%dP:DL=\233%dM:DO=\233%dB:IC=\233%d@:\ + :K2=\217y:Km=\233M:LE=\233%dD:RI=\233%dC:UP=\233%dA:\ + :ae=\E(B:al=\233L:as=\E(0:bl=^G:bt=\233Z:cd=\233J:ce=\233K:\ + :cl=\233H\2332J:cm=\233%i%d;%dH:cr=^M:cs=\233%i%d;%dr:\ + :ct=\2333g:dc=\233P:dl=\233M:do=^J:ei=\2334l:ho=\233H:\ + :im=\2334h:\ :is=\E[62"p\E G\233m\233?7h\E>\E7\233?1;3;4;6l\2334l\233r\E8:\ :k1=\23311~:k2=\23312~:k3=\23313~:k4=\23314~:k5=\23315~:\ :k6=\23317~:k7=\23318~:k8=\23319~:k9=\23320~:kD=\2333~:\ :kI=\2332~:kN=\2336~:kP=\2335~:kb=^H:kd=\217B:\ :ke=\233?1l\E>:kh=\2331~:kl=\217D:kr=\217C:ks=\233?1h\E=:\ - :ku=\217A:le=^H:mb=\2335m:md=\2331m:me=\233m^O:mr=\2337m:\ - :rc=\E8:sc=\E7:se=\23327m:sf=^J:so=\2337m:sr=\215:\ - :st=\210:ta=^I:te=\233?1049l:ti=\233?1049h:ue=\23324m:us=\2334m:\ - :vb=\233?5h\233?5l:ve=\233?25h:vi=\233?25l:Km=\233M: + :ku=\217A:le=^H:mb=\2335m:md=\2331m:me=\233m:mr=\2337m:\ + :nd=\233C:rc=\E8:sc=\E7:se=\23327m:sf=^J:so=\2337m:sr=\215:\ + :st=\210:ta=^I:te=\233?1049l:ti=\233?1049h:ue=\23324m:\ + :up=\233A:us=\2334m:vb=\233?5h\233?5l:ve=\233?25l\233?25h:\ + :vs=\233?12;25h:vi=\233?25l: # -xterm-hp|XFree86 xterm with hpterm function keys:\ - :k1=\Ep:k2=\Eq:k3=\Er:k4=\Es:k5=\Et:k6=\Eu:k7=\Ev:k8=\Ew:\ - :kC=\EJ:kD=\EP:@7=\EF:kI=\EQ:kN=\ES:kP=\ET:kh=\Eh:\ - :kd=\EB:kl=\ED:kr=\EC:ku=\EA:tc=xterm-basic: +xterm-hp|xterm with hpterm function keys:\ + :@7=\EF:k1=\Ep:k2=\Eq:k3=\Er:k4=\Es:k5=\Et:k6=\Eu:k7=\Ev:\ + :k8=\Ew:kC=\EJ:kD=\EP:kI=\EQ:kN=\ES:kP=\ET:kd=\EB:kh=\Eh:\ + :kl=\ED:kr=\EC:ku=\EA:tc=xterm-basic: # -xterm-sco|XFree86 xterm with SCO function keys:\ - :kl=\E[D:kd=\E[B:kr=\E[C:ku=\E[A:@7=\E[F:\ - :k1=\E[M:k2=\E[N:k3=\E[O:k4=\E[P:k5=\E[Q:\ - :k6=\E[R:k7=\E[S:k8=\E[T:k9=\E[U:k;=\E[V:\ - :F1=\E[W:F2=\E[X:F3=\E[Y:F5=\E[a:F6=\E[b:\ - :F7=\E[c:F8=\E[d:F9=\E[e:FA=\E[f:FB=\E[g:\ - :FC=\E[h:FD=\E[i:FE=\E[j:FF=\E[k:\ - :kh=\E[H:kI=\E[L:kN=\E[G:kP=\E[I:ac@:tc=xterm-basic: +xterm-sco|xterm with SCO function keys:\ + :@7=\E[F:F1=\E[W:F2=\E[X:F3=\E[Y:F5=\E[a:F6=\E[b:F7=\E[c:\ + :F8=\E[d:F9=\E[e:FA=\E[f:FB=\E[g:FC=\E[h:FD=\E[i:FE=\E[j:\ + :FF=\E[k:ac=:k1=\E[M:k2=\E[N:k3=\E[O:k4=\E[P:k5=\E[Q:\ + :k6=\E[R:k7=\E[S:k8=\E[T:k9=\E[U:k;=\E[V:kD=\177:kI=\E[L:\ + :kN=\E[G:kP=\E[I:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:\ + :tc=xterm-basic: # xterm-vt52|xterm emulating vt52:\ :bs:\ @@ -2906,63 +2927,65 @@ :le=\ED:nd=\EC:nw=^M^J:sf=^J:sr=\EI:ta=^I:up=\EA: # xterm-sun|xterm with Sun functionkeys:\ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Dec 11 03:52:40 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 68E091065676; Fri, 11 Dec 2009 03:52:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 22E43106566B for ; Fri, 11 Dec 2009 03:52:40 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EB6188FC08 for ; Fri, 11 Dec 2009 03:52:39 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nBB3qdFX009885 for ; Fri, 11 Dec 2009 03:52:39 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBB3qdKC009883 for perforce@freebsd.org; Fri, 11 Dec 2009 03:52:39 GMT (envelope-from mav@freebsd.org) Date: Fri, 11 Dec 2009 03:52:39 GMT Message-Id: <200912110352.nBB3qdKC009883@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171636 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Dec 2009 03:52:40 -0000 http://p4web.freebsd.org/chv.cgi?CH=171636 Change 171636 by mav@mav_mavtest on 2009/12/11 03:52:21 Make PMP driber honot user-configured SATA revision. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#25 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#25 (text+ko) ==== @@ -416,8 +416,11 @@ static void pmpstart(struct cam_periph *periph, union ccb *start_ccb) { + struct ccb_trans_settings cts; struct ccb_ataio *ataio; struct pmp_softc *softc; + struct cam_path *dpath; + int revision = 0; softc = (struct pmp_softc *)periph->softc; ataio = &start_ccb->ataio; @@ -426,7 +429,22 @@ softc->restart = 0; softc->state = PMP_STATE_PORTS; } - + /* Fetch user wanted device speed. */ + if (softc->state == PMP_STATE_RESET || + softc->state == PMP_STATE_CONNECT) { + if (xpt_create_path(&dpath, periph, + xpt_path_path_id(periph->path), + softc->pm_step, 0) == CAM_REQ_CMP) { + bzero(&cts, sizeof(cts)); + xpt_setup_ccb(&cts.ccb_h, dpath, CAM_PRIORITY_NORMAL); + cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS; + cts.type = CTS_TYPE_USER_SETTINGS; + xpt_action((union ccb *)&cts); + if (cts.xport_specific.sata.valid & CTS_SATA_VALID_REVISION) + revision = cts.xport_specific.sata.revision; + xpt_free_path(dpath); + } + } switch (softc->state) { case PMP_STATE_PORTS: cam_fill_ataio(ataio, @@ -460,7 +478,8 @@ /*dxfer_len*/0, pmp_default_timeout * 1000); ata_pm_write_cmd(ataio, 2, softc->pm_step, - (softc->found & (1 << softc->pm_step)) ? 0 : 1); + (revision << 4) | + ((softc->found & (1 << softc->pm_step)) ? 0 : 1)); break; case PMP_STATE_CONNECT: cam_fill_ataio(ataio, @@ -471,7 +490,8 @@ /*data_ptr*/NULL, /*dxfer_len*/0, pmp_default_timeout * 1000); - ata_pm_write_cmd(ataio, 2, softc->pm_step, 0); + ata_pm_write_cmd(ataio, 2, softc->pm_step, + (revision << 4)); break; case PMP_STATE_CHECK: cam_fill_ataio(ataio, From owner-p4-projects@FreeBSD.ORG Fri Dec 11 05:33:21 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E87E1065676; Fri, 11 Dec 2009 05:33:21 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EE097106566B for ; Fri, 11 Dec 2009 05:33:20 +0000 (UTC) (envelope-from yohanes@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D97768FC08 for ; Fri, 11 Dec 2009 05:33:20 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nBB5XKQL033532 for ; Fri, 11 Dec 2009 05:33:20 GMT (envelope-from yohanes@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBB5XKuF033530 for perforce@freebsd.org; Fri, 11 Dec 2009 05:33:20 GMT (envelope-from yohanes@FreeBSD.org) Date: Fri, 11 Dec 2009 05:33:20 GMT Message-Id: <200912110533.nBB5XKuF033530@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to yohanes@FreeBSD.org using -f From: Yohanes Nugroho To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171637 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Dec 2009 05:33:21 -0000 http://p4web.freebsd.org/chv.cgi?CH=171637 Change 171637 by yohanes@econa on 2009/12/11 05:32:32 - network code cleanup - autodetect memory size - add CFI support Affected files ... .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#9 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#8 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/audit/chapter.sgml#2 integrate .. //depot/projects/str91xx/doc/mn_MN.UTF-8/books/handbook/audit/chapter.sgml#2 integrate .. //depot/projects/str91xx/ports/MOVED#12 integrate .. //depot/projects/str91xx/ports/Mk/bsd.ruby.mk#5 integrate .. //depot/projects/str91xx/src/contrib/expat/lib/xmlparse.c#2 integrate .. //depot/projects/str91xx/src/contrib/expat/lib/xmltok_impl.c#2 integrate .. //depot/projects/str91xx/src/contrib/netcat/FREEBSD-vendor#3 integrate .. //depot/projects/str91xx/src/etc/namedb/named.root#2 integrate .. //depot/projects/str91xx/src/etc/termcap.small#3 integrate .. //depot/projects/str91xx/src/lib/libarchive/archive_read_support_format_cpio.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/gen/sem_init.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/stdlib/malloc.c#5 integrate .. //depot/projects/str91xx/src/lib/libkvm/kvm_proc.c#4 integrate .. //depot/projects/str91xx/src/release/picobsd/bridge/PICOBSD#3 integrate .. //depot/projects/str91xx/src/release/picobsd/bridge/crunch.conf#3 integrate .. //depot/projects/str91xx/src/release/picobsd/build/picobsd#3 integrate .. //depot/projects/str91xx/src/sbin/geom/class/mirror/geom_mirror.c#3 integrate .. //depot/projects/str91xx/src/sbin/geom/class/mirror/gmirror.8#3 integrate .. //depot/projects/str91xx/src/share/misc/committers-src.dot#5 integrate .. //depot/projects/str91xx/src/share/termcap/termcap.src#3 integrate .. //depot/projects/str91xx/src/sys/amd64/acpica/acpi_switch.S#2 integrate .. //depot/projects/str91xx/src/sys/arm/conf/CNS11XXNAS#6 edit .. //depot/projects/str91xx/src/sys/arm/econa/cfi_bus_econa.c#1 add .. //depot/projects/str91xx/src/sys/arm/econa/econa.c#4 edit .. //depot/projects/str91xx/src/sys/arm/econa/econa_machdep.c#6 edit .. //depot/projects/str91xx/src/sys/arm/econa/econa_reg.h#3 edit .. //depot/projects/str91xx/src/sys/arm/econa/ehci_ebus.c#1 branch .. //depot/projects/str91xx/src/sys/arm/econa/files.econa#2 edit .. //depot/projects/str91xx/src/sys/arm/econa/if_ece.c#11 edit .. //depot/projects/str91xx/src/sys/arm/econa/if_ecereg.h#3 edit .. //depot/projects/str91xx/src/sys/arm/econa/if_ecevar.h#4 edit .. //depot/projects/str91xx/src/sys/arm/econa/ohci_ec.c#1 branch .. //depot/projects/str91xx/src/sys/arm/econa/uart_bus_ec.c#1 branch .. //depot/projects/str91xx/src/sys/arm/econa/uart_cpu_ec.c#1 branch .. //depot/projects/str91xx/src/sys/arm/mv/mv_sata.c#3 integrate .. //depot/projects/str91xx/src/sys/boot/i386/gptboot/gptboot.c#3 integrate .. //depot/projects/str91xx/src/sys/boot/i386/libi386/biosacpi.c#3 integrate .. //depot/projects/str91xx/src/sys/boot/i386/zfsboot/zfsboot.c#4 integrate .. //depot/projects/str91xx/src/sys/boot/zfs/zfsimpl.c#3 integrate .. //depot/projects/str91xx/src/sys/cam/scsi/scsi_cd.c#6 integrate .. //depot/projects/str91xx/src/sys/dev/ata/ata-all.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/ata/ata-disk.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/bge/if_bge.c#7 integrate .. //depot/projects/str91xx/src/sys/dev/bge/if_bgereg.h#4 integrate .. //depot/projects/str91xx/src/sys/dev/e1000/if_igb.c#6 integrate .. //depot/projects/str91xx/src/sys/dev/pci/pci.c#6 integrate .. //depot/projects/str91xx/src/sys/dev/pci/pci_pci.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/puc/puc.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/siis/siis.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/sound/pci/hda/hdac.c#8 integrate .. //depot/projects/str91xx/src/sys/dev/uart/uart_bus_ec.c#2 delete .. //depot/projects/str91xx/src/sys/dev/uart/uart_cpu_ec.c#2 delete .. //depot/projects/str91xx/src/sys/dev/usb/controller/ehci_ebus.c#5 delete .. //depot/projects/str91xx/src/sys/dev/usb/controller/ehci_pci.c#6 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/ohci_ec.c#4 delete .. //depot/projects/str91xx/src/sys/dev/usb/controller/uhci_pci.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/usb/input/uhid.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/usb/net/if_axe.c#6 integrate .. //depot/projects/str91xx/src/sys/dev/usb/net/if_cdce.c#8 integrate .. //depot/projects/str91xx/src/sys/dev/usb/quirk/usb_quirk.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/usb/quirk/usb_quirk.h#3 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/u3g.c#6 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/uftdi.c#6 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/umodem.c#6 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usbdevs#9 integrate .. //depot/projects/str91xx/src/sys/fs/nfsserver/nfs_nfsdcache.c#2 integrate .. //depot/projects/str91xx/src/sys/i386/i386/dump_machdep.c#3 integrate .. //depot/projects/str91xx/src/sys/i386/i386/machdep.c#7 integrate .. //depot/projects/str91xx/src/sys/i386/i386/minidump_machdep.c#3 integrate .. //depot/projects/str91xx/src/sys/i386/xen/pmap.c#6 integrate .. //depot/projects/str91xx/src/sys/kern/subr_bus.c#8 integrate .. //depot/projects/str91xx/src/sys/kern/vfs_syscalls.c#6 integrate .. //depot/projects/str91xx/src/sys/kern/vfs_vnops.c#6 integrate .. //depot/projects/str91xx/src/sys/net/radix.c#2 integrate .. //depot/projects/str91xx/src/sys/netinet/ipfw/ip_dummynet.c#3 integrate .. //depot/projects/str91xx/src/sys/sparc64/sparc64/stack_machdep.c#2 integrate .. //depot/projects/str91xx/src/sys/sun4v/sun4v/stack_machdep.c#2 integrate .. //depot/projects/str91xx/src/sys/sys/bus.h#7 integrate .. //depot/projects/str91xx/src/usr.bin/calendar/calendars/calendar.freebsd#5 integrate .. //depot/projects/str91xx/src/usr.sbin/lastlogin/Makefile#2 integrate .. //depot/projects/str91xx/src/usr.sbin/lastlogin/lastlogin.c#2 integrate .. //depot/projects/str91xx/src/usr.sbin/sysinstall/user.c#3 integrate .. //depot/projects/str91xx/www/en/developers.sgml#7 integrate .. //depot/projects/str91xx/www/hu/share/sgml/news.xml#10 integrate .. //depot/projects/str91xx/www/ru/index.xsl#3 integrate .. //depot/projects/str91xx/www/ru/share/sgml/header.l10n.ent#2 integrate .. //depot/projects/str91xx/www/share/sgml/news.xml#10 integrate Differences ... ==== //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#9 (text+ko) ==== @@ -1,4 +1,4 @@ - + +