From owner-p4-projects@FreeBSD.ORG Sun Oct 25 10:53:10 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 32AA01065670; Sun, 25 Oct 2009 10:53: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 D3030106566B for ; Sun, 25 Oct 2009 10:53:09 +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 BFD658FC0A for ; Sun, 25 Oct 2009 10:53:09 +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 n9PAr9LZ092732 for ; Sun, 25 Oct 2009 10:53:09 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9PAr9aA092730 for perforce@freebsd.org; Sun, 25 Oct 2009 10:53:09 GMT (envelope-from mav@freebsd.org) Date: Sun, 25 Oct 2009 10:53:09 GMT Message-Id: <200910251053.n9PAr9aA092730@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 169786 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, 25 Oct 2009 10:53:10 -0000 http://p4web.freebsd.org/chv.cgi?CH=169786 Change 169786 by mav@mav_mavtest on 2009/10/25 10:53:01 If after device reset we got connect status, but not ready, try to do full port reset. On full port reset keep PMP presence information. It could be not needed if XPT do full bus reinitialization, but now it doesn't. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#11 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#11 (text+ko) ==== @@ -511,7 +511,10 @@ /* Get port out of reset state. */ ATA_OUTL(ch->r_mem, SIIS_P_CTLCLR, SIIS_P_CTL_PORT_RESET); ATA_OUTL(ch->r_mem, SIIS_P_CTLCLR, SIIS_P_CTL_32BIT); - ATA_OUTL(ch->r_mem, SIIS_P_CTLCLR, SIIS_P_CTL_PME); + if (ch->pm_present) + ATA_OUTL(ch->r_mem, SIIS_P_CTLSET, SIIS_P_CTL_PME); + else + ATA_OUTL(ch->r_mem, SIIS_P_CTLCLR, SIIS_P_CTL_PME); /* Enable port interrupts */ ATA_OUTL(ch->r_mem, SIIS_P_IESET, SIIS_P_IX_ENABLED); return (0); @@ -1296,7 +1299,7 @@ siis_reset(device_t dev) { struct siis_channel *ch = device_get_softc(dev); - int i; + int i, retry = 0; uint32_t val; if (bootverbose) @@ -1336,6 +1339,7 @@ ATA_OUTL(ch->r_mem, SIIS_P_SCTL, ATA_SC_DET_IDLE | val | ((ch->pm_level > 0) ? 0 : (ATA_SC_IPM_DIS_PARTIAL | ATA_SC_IPM_DIS_SLUMBER))); +retry: siis_devreset(dev); /* Reset and reconnect PHY, */ if (!siis_sata_connect(ch)) { @@ -1350,8 +1354,25 @@ return; } /* Wait for clearing busy status. */ - if (siis_wait_ready(dev, 10000)) + if (siis_wait_ready(dev, 10000)) { device_printf(dev, "device ready timeout\n"); + if (!retry) { + device_printf(dev, "trying full port reset ...\n"); + /* Get port to the reset state. */ + ATA_OUTL(ch->r_mem, SIIS_P_CTLSET, SIIS_P_CTL_PORT_RESET); + DELAY(10000); + /* Get port out of reset state. */ + ATA_OUTL(ch->r_mem, SIIS_P_CTLCLR, SIIS_P_CTL_PORT_RESET); + ATA_OUTL(ch->r_mem, SIIS_P_CTLCLR, SIIS_P_CTL_32BIT); + if (ch->pm_present) + ATA_OUTL(ch->r_mem, SIIS_P_CTLSET, SIIS_P_CTL_PME); + else + ATA_OUTL(ch->r_mem, SIIS_P_CTLCLR, SIIS_P_CTL_PME); + siis_wait_ready(dev, 5000); + retry = 1; + goto retry; + } + } ch->devices = 1; /* Enable port interrupts */ ATA_OUTL(ch->r_mem, SIIS_P_IS, 0xFFFFFFFF); @@ -1487,7 +1508,8 @@ struct ccb_trans_settings *cts = &ccb->cts; if (cts->xport_specific.sata.valid & CTS_SATA_VALID_PM) { - if (cts->xport_specific.sata.pm_present) + ch->pm_present = cts->xport_specific.sata.pm_present; + if (ch->pm_present) ATA_OUTL(ch->r_mem, SIIS_P_CTLSET, SIIS_P_CTL_PME); else ATA_OUTL(ch->r_mem, SIIS_P_CTLCLR, SIIS_P_CTL_PME); @@ -1522,9 +1544,7 @@ cts->xport_specific.sata.bitrate = 150000; cts->xport_specific.sata.valid |= CTS_SATA_VALID_SPEED; } - cts->xport_specific.sata.pm_present = - (ATA_INL(ch->r_mem, SIIS_P_STS) & SIIS_P_CTL_PME) ? - 1 : 0; + cts->xport_specific.sata.pm_present = ch->pm_present; cts->xport_specific.sata.valid |= CTS_SATA_VALID_PM; ccb->ccb_h.status = CAM_REQ_CMP; xpt_done(ccb); From owner-p4-projects@FreeBSD.ORG Sun Oct 25 11:06:25 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 781361065670; Sun, 25 Oct 2009 11:06:25 +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 3B26E106566B for ; Sun, 25 Oct 2009 11:06:25 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E5C2B8FC08 for ; Sun, 25 Oct 2009 11:06:24 +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 n9PB6OHE094669 for ; Sun, 25 Oct 2009 11:06:24 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9PB6MlB094665 for perforce@freebsd.org; Sun, 25 Oct 2009 11:06:22 GMT (envelope-from bz@freebsd.org) Date: Sun, 25 Oct 2009 11:06:22 GMT Message-Id: <200910251106.n9PB6MlB094665@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 169787 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, 25 Oct 2009 11:06:25 -0000 http://p4web.freebsd.org/chv.cgi?CH=169787 Change 169787 by bz@bz_dumpster on 2009/10/25 11:05:33 IFC @169783 Affected files ... .. //depot/projects/s390/Makefile.inc1#31 integrate .. //depot/projects/s390/ObsoleteFiles.inc#11 integrate .. //depot/projects/s390/bin/cat/Makefile#3 integrate .. //depot/projects/s390/bin/csh/iconv_stub.c#2 integrate .. //depot/projects/s390/bin/ls/ls.c#11 integrate .. //depot/projects/s390/bin/sh/eval.c#12 integrate .. //depot/projects/s390/bin/sh/exec.c#11 integrate .. //depot/projects/s390/bin/sh/expand.c#12 integrate .. //depot/projects/s390/bin/sh/parser.c#9 integrate .. //depot/projects/s390/bin/sh/sh.1#14 integrate .. //depot/projects/s390/bin/uuidgen/Makefile#2 integrate .. //depot/projects/s390/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#3 integrate .. //depot/projects/s390/contrib/gcc/config/i386/i386.c#9 integrate .. //depot/projects/s390/contrib/openpam/doc/man/pam.conf.5#3 integrate .. //depot/projects/s390/contrib/tcpdump/print-tcp.c#6 integrate .. //depot/projects/s390/contrib/tcpdump/tcp.h#5 integrate .. //depot/projects/s390/contrib/tcsh/sh.c#7 integrate .. //depot/projects/s390/crypto/openssh/ssh_namespace.h#5 integrate .. //depot/projects/s390/crypto/openssh/sshd_config#12 integrate .. //depot/projects/s390/etc/defaults/rc.conf#22 integrate .. //depot/projects/s390/etc/gettytab#6 integrate .. //depot/projects/s390/etc/pam.d/ftpd#7 integrate .. //depot/projects/s390/etc/pam.d/kde#6 integrate .. //depot/projects/s390/etc/pam.d/other#7 integrate .. //depot/projects/s390/etc/pam.d/sshd#9 integrate .. //depot/projects/s390/etc/pam.d/system#2 integrate .. //depot/projects/s390/etc/pam.d/telnetd#7 integrate .. //depot/projects/s390/etc/pam.d/xdm#8 integrate .. //depot/projects/s390/etc/rc.d/bgfsck#7 integrate .. //depot/projects/s390/etc/rc.d/cleartmp#7 integrate .. //depot/projects/s390/etc/rc.d/faith#2 integrate .. //depot/projects/s390/etc/rc.d/fsck#7 integrate .. //depot/projects/s390/etc/rc.d/hostid#3 integrate .. //depot/projects/s390/etc/rc.d/hostname#5 integrate .. //depot/projects/s390/etc/rc.d/ldconfig#8 integrate .. //depot/projects/s390/etc/rc.d/motd#7 integrate .. //depot/projects/s390/etc/rc.d/mountcritlocal#6 integrate .. //depot/projects/s390/etc/rc.d/moused#7 integrate .. //depot/projects/s390/etc/rc.d/netif#10 integrate .. //depot/projects/s390/etc/rc.d/netoptions#5 integrate .. //depot/projects/s390/etc/rc.d/newsyslog#5 integrate .. //depot/projects/s390/etc/rc.d/nfsclient#6 integrate .. //depot/projects/s390/etc/rc.d/pf#5 integrate .. //depot/projects/s390/etc/rc.d/savecore#5 integrate .. //depot/projects/s390/etc/rc.d/stf#2 integrate .. //depot/projects/s390/etc/rc.subr#14 integrate .. //depot/projects/s390/etc/services#10 integrate .. //depot/projects/s390/games/fortune/datfiles/fortunes#18 integrate .. //depot/projects/s390/games/fortune/datfiles/fortunes.sp.ok#4 integrate .. //depot/projects/s390/games/number/Makefile#2 integrate .. //depot/projects/s390/games/number/number.c#3 integrate .. //depot/projects/s390/include/langinfo.h#3 integrate .. //depot/projects/s390/include/libgen.h#2 integrate .. //depot/projects/s390/kerberos5/lib/libgssapi_krb5/Makefile#2 integrate .. //depot/projects/s390/kerberos5/lib/libgssapi_spnego/Makefile#2 integrate .. //depot/projects/s390/lib/libc/gen/Makefile.inc#16 integrate .. //depot/projects/s390/lib/libc/gen/Symbol.map#7 integrate .. //depot/projects/s390/lib/libc/gen/basename.3#5 integrate .. //depot/projects/s390/lib/libc/gen/basename.c#4 integrate .. //depot/projects/s390/lib/libc/gen/errlst.c#5 integrate .. //depot/projects/s390/lib/libc/gen/fts.3#9 integrate .. //depot/projects/s390/lib/libc/gen/fts.c#7 integrate .. //depot/projects/s390/lib/libc/gen/getcwd.c#7 integrate .. //depot/projects/s390/lib/libc/gen/wordexp.c#3 integrate .. //depot/projects/s390/lib/libc/include/namespace.h#10 integrate .. //depot/projects/s390/lib/libc/include/un-namespace.h#10 integrate .. //depot/projects/s390/lib/libc/locale/nl_langinfo.c#3 integrate .. //depot/projects/s390/lib/libc/nls/C.msg#2 integrate .. //depot/projects/s390/lib/libc/stdio/getdelim.c#2 integrate .. //depot/projects/s390/lib/libc/sys/Symbol.map#6 integrate .. //depot/projects/s390/lib/libc/sys/intro.2#11 integrate .. //depot/projects/s390/lib/libc/sys/nanosleep.2#5 integrate .. //depot/projects/s390/lib/libfetch/common.c#9 integrate .. //depot/projects/s390/lib/libpam/modules/pam_ssh/Makefile#7 integrate .. //depot/projects/s390/lib/libpmc/Makefile#3 integrate .. //depot/projects/s390/lib/libpmc/libpmc.c#7 integrate .. //depot/projects/s390/lib/libthr/arch/ia64/Makefile.inc#4 integrate .. //depot/projects/s390/lib/libthr/arch/ia64/ia64/_umtx_op_err.S#1 branch .. //depot/projects/s390/lib/libthr/arch/ia64/include/pthread_md.h#3 integrate .. //depot/projects/s390/lib/libthr/pthread.map#5 integrate .. //depot/projects/s390/lib/libthr/thread/thr_private.h#9 integrate .. //depot/projects/s390/lib/libthr/thread/thr_syscalls.c#8 integrate .. //depot/projects/s390/lib/libusb/libusb20_ugen20.c#3 integrate .. //depot/projects/s390/libexec/rtld-elf/map_object.c#12 integrate .. //depot/projects/s390/libexec/rtld-elf/rtld.c#17 integrate .. //depot/projects/s390/release/doc/README#3 integrate .. //depot/projects/s390/release/doc/en_US.ISO8859-1/errata/article.sgml#13 integrate .. //depot/projects/s390/release/doc/share/misc/man2hwnotes.pl#3 integrate .. //depot/projects/s390/release/doc/share/mk/doc.relnotes.mk#4 integrate .. //depot/projects/s390/release/doc/share/sgml/release.dsl#6 integrate .. //depot/projects/s390/release/doc/share/sgml/release.ent#10 integrate .. //depot/projects/s390/release/scripts/package-split.py#7 integrate .. //depot/projects/s390/sbin/Makefile.inc#5 integrate .. //depot/projects/s390/sbin/adjkerntz/Makefile#2 integrate .. //depot/projects/s390/sbin/atacontrol/Makefile#4 integrate .. //depot/projects/s390/sbin/atm/atmconfig/Makefile#3 integrate .. //depot/projects/s390/sbin/badsect/Makefile#4 integrate .. //depot/projects/s390/sbin/bsdlabel/Makefile#5 integrate .. //depot/projects/s390/sbin/camcontrol/Makefile#7 integrate .. //depot/projects/s390/sbin/ccdconfig/Makefile#4 integrate .. //depot/projects/s390/sbin/clri/Makefile#2 integrate .. //depot/projects/s390/sbin/comcontrol/Makefile#4 integrate .. //depot/projects/s390/sbin/conscontrol/Makefile#2 integrate .. //depot/projects/s390/sbin/dhclient/Makefile#5 integrate .. //depot/projects/s390/sbin/dhclient/bpf.c#3 integrate .. //depot/projects/s390/sbin/dhclient/dhcpd.h#2 integrate .. //depot/projects/s390/sbin/dhclient/packet.c#2 integrate .. //depot/projects/s390/sbin/dmesg/Makefile#4 integrate .. //depot/projects/s390/sbin/dump/Makefile#6 integrate .. //depot/projects/s390/sbin/dumpfs/Makefile#5 integrate .. //depot/projects/s390/sbin/dumpfs/dumpfs.c#10 integrate .. //depot/projects/s390/sbin/dumpon/Makefile#3 integrate .. //depot/projects/s390/sbin/geom/Makefile#3 integrate .. //depot/projects/s390/sbin/geom/Makefile.inc#2 integrate .. //depot/projects/s390/sbin/geom/class/part/gpart.8#3 integrate .. //depot/projects/s390/sbin/ggate/Makefile.inc#2 integrate .. //depot/projects/s390/sbin/growfs/Makefile#4 integrate .. //depot/projects/s390/sbin/growfs/growfs.c#8 integrate .. //depot/projects/s390/sbin/gvinum/Makefile#3 integrate .. //depot/projects/s390/sbin/ifconfig/af_nd6.c#2 integrate .. //depot/projects/s390/sbin/ifconfig/ifieee80211.c#13 integrate .. //depot/projects/s390/sbin/init/Makefile#5 integrate .. //depot/projects/s390/sbin/ipf/Makefile.inc#2 integrate .. //depot/projects/s390/sbin/iscontrol/Makefile#2 integrate .. //depot/projects/s390/sbin/kldunload/Makefile#4 integrate .. //depot/projects/s390/sbin/ldconfig/Makefile#4 integrate .. //depot/projects/s390/sbin/md5/Makefile#3 integrate .. //depot/projects/s390/sbin/mdconfig/Makefile#4 integrate .. //depot/projects/s390/sbin/mdmfs/Makefile#4 integrate .. //depot/projects/s390/sbin/mksnap_ffs/Makefile#3 integrate .. //depot/projects/s390/sbin/mount/Makefile#5 integrate .. //depot/projects/s390/sbin/mount_autofs/Makefile#2 integrate .. //depot/projects/s390/sbin/mount_cd9660/Makefile#4 integrate .. //depot/projects/s390/sbin/mount_ext2fs/Makefile#3 integrate .. //depot/projects/s390/sbin/mount_msdosfs/Makefile#5 integrate .. //depot/projects/s390/sbin/mount_nullfs/Makefile#4 integrate .. //depot/projects/s390/sbin/mount_reiserfs/Makefile#3 integrate .. //depot/projects/s390/sbin/mount_unionfs/Makefile#4 integrate .. //depot/projects/s390/sbin/newfs_msdos/Makefile#4 integrate .. //depot/projects/s390/sbin/nfsiod/Makefile#3 integrate .. //depot/projects/s390/sbin/pfctl/Makefile#4 integrate .. //depot/projects/s390/sbin/rcorder/Makefile#4 integrate .. //depot/projects/s390/sbin/reboot/Makefile#5 integrate .. //depot/projects/s390/sbin/recoverdisk/Makefile#2 integrate .. //depot/projects/s390/sbin/routed/Makefile#4 integrate .. //depot/projects/s390/sbin/savecore/Makefile#3 integrate .. //depot/projects/s390/sbin/sconfig/Makefile#2 integrate .. //depot/projects/s390/sbin/shutdown/Makefile#3 integrate .. //depot/projects/s390/sbin/spppcontrol/Makefile#2 integrate .. //depot/projects/s390/sbin/swapon/Makefile#5 integrate .. //depot/projects/s390/sbin/sysctl/sysctl.c#12 integrate .. //depot/projects/s390/sbin/tunefs/Makefile#3 integrate .. //depot/projects/s390/sbin/tunefs/tunefs.8#10 integrate .. //depot/projects/s390/share/man/man4/Makefile#25 integrate .. //depot/projects/s390/share/man/man4/acpi_hp.4#2 integrate .. //depot/projects/s390/share/man/man4/acpi_wmi.4#2 integrate .. //depot/projects/s390/share/man/man4/atapicam.4#5 integrate .. //depot/projects/s390/share/man/man4/bce.4#6 integrate .. //depot/projects/s390/share/man/man4/bge.4#14 integrate .. //depot/projects/s390/share/man/man4/de.4#5 integrate .. //depot/projects/s390/share/man/man4/hifn.4#6 integrate .. //depot/projects/s390/share/man/man4/ichwd.4#2 integrate .. //depot/projects/s390/share/man/man4/lindev.4#2 integrate .. //depot/projects/s390/share/man/man4/mac_mls.4#11 integrate .. //depot/projects/s390/share/man/man4/malo.4#3 integrate .. //depot/projects/s390/share/man/man4/sbp_targ.4#2 integrate .. //depot/projects/s390/share/man/man4/targ.4#7 integrate .. //depot/projects/s390/share/man/man4/umass.4#13 integrate .. //depot/projects/s390/share/man/man4/unix.4#6 integrate .. //depot/projects/s390/share/man/man4/urtw.4#4 integrate .. //depot/projects/s390/share/man/man9/BUS_BIND_INTR.9#1 branch .. //depot/projects/s390/share/man/man9/BUS_DESCRIBE_INTR.9#1 branch .. //depot/projects/s390/share/man/man9/Makefile#18 integrate .. //depot/projects/s390/share/man/man9/fetch.9#2 integrate .. //depot/projects/s390/share/man/man9/store.9#2 integrate .. //depot/projects/s390/share/misc/bsd-family-tree#19 integrate .. //depot/projects/s390/share/misc/committers-src.dot#6 integrate .. //depot/projects/s390/share/mk/bsd.sys.mk#9 integrate .. //depot/projects/s390/share/zoneinfo/Makefile#7 integrate .. //depot/projects/s390/share/zoneinfo/asia#13 integrate .. //depot/projects/s390/share/zoneinfo/australasia#10 integrate .. //depot/projects/s390/sys/amd64/acpica/acpi_machdep.c#9 integrate .. //depot/projects/s390/sys/amd64/acpica/acpi_wakecode.S#2 integrate .. //depot/projects/s390/sys/amd64/acpica/acpi_wakeup.c#6 integrate .. //depot/projects/s390/sys/amd64/amd64/elf_machdep.c#9 integrate .. //depot/projects/s390/sys/amd64/amd64/intr_machdep.c#7 integrate .. //depot/projects/s390/sys/amd64/amd64/nexus.c#7 integrate .. //depot/projects/s390/sys/amd64/amd64/pmap.c#13 integrate .. //depot/projects/s390/sys/amd64/conf/GENERIC#15 integrate .. //depot/projects/s390/sys/amd64/include/atomic.h#6 integrate .. //depot/projects/s390/sys/amd64/include/elf.h#6 integrate .. //depot/projects/s390/sys/amd64/include/intr_machdep.h#7 integrate .. //depot/projects/s390/sys/arm/arm/cpufunc.c#9 integrate .. //depot/projects/s390/sys/arm/arm/elf_machdep.c#8 integrate .. //depot/projects/s390/sys/arm/arm/pmap.c#9 integrate .. //depot/projects/s390/sys/arm/conf/HL200#7 integrate .. //depot/projects/s390/sys/arm/conf/KB920X#7 integrate .. //depot/projects/s390/sys/arm/include/elf.h#7 integrate .. //depot/projects/s390/sys/arm/mv/mv_machdep.c#7 integrate .. //depot/projects/s390/sys/arm/xscale/i80321/i80321_timer.c#5 integrate .. //depot/projects/s390/sys/boot/i386/zfsboot/zfsboot.c#3 integrate .. //depot/projects/s390/sys/boot/zfs/zfs.c#2 integrate .. //depot/projects/s390/sys/boot/zfs/zfsimpl.c#3 integrate .. //depot/projects/s390/sys/cam/ata/ata_da.c#3 integrate .. //depot/projects/s390/sys/cam/ata/ata_pmp.c#1 branch .. //depot/projects/s390/sys/cam/ata/ata_xpt.c#3 integrate .. //depot/projects/s390/sys/cam/cam.h#5 integrate .. //depot/projects/s390/sys/cam/cam_periph.c#19 integrate .. //depot/projects/s390/sys/cam/cam_queue.c#5 integrate .. //depot/projects/s390/sys/cam/cam_queue.h#3 integrate .. //depot/projects/s390/sys/cam/cam_xpt.c#16 integrate .. //depot/projects/s390/sys/cam/cam_xpt_internal.h#3 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_all.c#11 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_cd.c#22 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_ch.c#11 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_da.c#27 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_low.c#11 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_pt.c#10 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_sa.c#19 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_targ_bh.c#8 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_target.c#16 integrate .. //depot/projects/s390/sys/cam/scsi/scsi_xpt.c#2 integrate .. //depot/projects/s390/sys/cddl/boot/zfs/zfsimpl.h#3 integrate .. //depot/projects/s390/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#5 integrate .. //depot/projects/s390/sys/cddl/compat/opensolaris/sys/policy.h#4 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#5 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#4 integrate .. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#7 integrate .. //depot/projects/s390/sys/compat/ia32/ia32_sysvec.c#8 integrate .. //depot/projects/s390/sys/compat/linux/linux_socket.c#15 integrate .. //depot/projects/s390/sys/compat/x86bios/x86bios.c#2 integrate .. //depot/projects/s390/sys/compat/x86bios/x86bios.h#2 integrate .. //depot/projects/s390/sys/compat/x86bios/x86bios_alloc.c#2 delete .. //depot/projects/s390/sys/conf/NOTES#29 integrate .. //depot/projects/s390/sys/conf/files#31 integrate .. //depot/projects/s390/sys/conf/files.amd64#14 integrate .. //depot/projects/s390/sys/conf/files.i386#20 integrate .. //depot/projects/s390/sys/conf/options#26 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/changes.txt#3 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/common/adfile.c#3 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/common/adisasm.c#6 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/common/adwalk.c#3 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/common/dmextern.c#1 branch .. //depot/projects/s390/sys/contrib/dev/acpica/common/dmtable.c#4 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/common/getopt.c#6 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/compiler/aslload.c#7 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/debugger/dbcmds.c#3 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/debugger/dbinput.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/disassembler/dmutils.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/disassembler/dmwalk.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/dispatcher/dswload.c#3 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/events/evregion.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/include/acapps.h#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/include/acdebug.h#3 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/include/acdisasm.h#3 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/include/acglobal.h#3 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/include/aclocal.h#3 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/include/acpixf.h#3 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/namespace/nsrepair.c#2 integrate .. //depot/projects/s390/sys/contrib/dev/acpica/utilities/utglobal.c#3 integrate .. //depot/projects/s390/sys/contrib/dev/iwn/LICENSE#2 integrate .. //depot/projects/s390/sys/contrib/dev/iwn/iwlwifi-4965-228.57.2.23.fw.uu#1 branch .. //depot/projects/s390/sys/contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu#2 delete .. //depot/projects/s390/sys/contrib/dev/iwn/iwlwifi-5000-5.4.A.11.fw.uu#1 branch .. //depot/projects/s390/sys/contrib/dev/iwn/iwlwifi-5150-8.24.2.2.fw.uu#1 branch .. //depot/projects/s390/sys/contrib/x86emu/x86emu_util.c#2 delete .. //depot/projects/s390/sys/dev/agp/agp_i810.c#5 integrate .. //depot/projects/s390/sys/dev/ahci/ahci.c#3 integrate .. //depot/projects/s390/sys/dev/ahci/ahci.h#3 integrate .. //depot/projects/s390/sys/dev/aic7xxx/aicasm/aicasm.c#5 integrate .. //depot/projects/s390/sys/dev/ata/ata-queue.c#13 integrate .. //depot/projects/s390/sys/dev/ata/atapi-cd.c#19 integrate .. //depot/projects/s390/sys/dev/ata/atapi-fd.c#16 integrate .. //depot/projects/s390/sys/dev/ata/atapi-tape.c#15 integrate .. //depot/projects/s390/sys/dev/ata/chipsets/ata-ati.c#3 integrate .. //depot/projects/s390/sys/dev/ath/ath_hal/ah_eeprom_v4k.c#1 branch .. //depot/projects/s390/sys/dev/ath/ath_hal/ah_eeprom_v4k.h#1 branch .. //depot/projects/s390/sys/dev/atkbdc/atkbd.c#6 integrate .. //depot/projects/s390/sys/dev/bce/if_bce.c#8 integrate .. //depot/projects/s390/sys/dev/bce/if_bcereg.h#6 integrate .. //depot/projects/s390/sys/dev/bge/if_bge.c#23 integrate .. //depot/projects/s390/sys/dev/bge/if_bgereg.h#15 integrate .. //depot/projects/s390/sys/dev/cxgb/common/cxgb_ael1002.c#5 integrate .. //depot/projects/s390/sys/dev/cxgb/common/cxgb_aq100x.c#1 branch .. //depot/projects/s390/sys/dev/cxgb/common/cxgb_common.h#5 integrate .. //depot/projects/s390/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#2 integrate .. //depot/projects/s390/sys/dev/cxgb/common/cxgb_regs.h#2 integrate .. //depot/projects/s390/sys/dev/cxgb/common/cxgb_t3_hw.c#5 integrate .. //depot/projects/s390/sys/dev/cxgb/common/cxgb_tn1010.c#2 integrate .. //depot/projects/s390/sys/dev/cxgb/common/cxgb_vsc8211.c#2 integrate .. //depot/projects/s390/sys/dev/cxgb/common/cxgb_xgmac.c#4 integrate .. //depot/projects/s390/sys/dev/cxgb/cxgb_adapter.h#5 integrate .. //depot/projects/s390/sys/dev/cxgb/cxgb_main.c#7 integrate .. //depot/projects/s390/sys/dev/cxgb/cxgb_osdep.h#5 integrate .. //depot/projects/s390/sys/dev/cxgb/cxgb_t3fw.h#3 integrate .. //depot/projects/s390/sys/dev/dpms/dpms.c#2 integrate .. //depot/projects/s390/sys/dev/drm/drm_pciids.h#9 integrate .. //depot/projects/s390/sys/dev/drm/i915_drv.h#7 integrate .. //depot/projects/s390/sys/dev/drm/mach64_state.c#4 integrate .. //depot/projects/s390/sys/dev/fb/vesa.c#2 integrate .. //depot/projects/s390/sys/dev/fb/vesa.h#2 integrate .. //depot/projects/s390/sys/dev/fdc/fdc.c#7 integrate .. //depot/projects/s390/sys/dev/gem/if_gem_pci.c#9 integrate .. //depot/projects/s390/sys/dev/hwpmc/hwpmc_core.c#5 integrate .. //depot/projects/s390/sys/dev/hwpmc/hwpmc_mod.c#10 integrate .. //depot/projects/s390/sys/dev/ips/ips_disk.c#6 integrate .. //depot/projects/s390/sys/dev/iwn/if_iwn.c#6 integrate .. //depot/projects/s390/sys/dev/iwn/if_iwnreg.h#2 integrate .. //depot/projects/s390/sys/dev/iwn/if_iwnvar.h#3 integrate .. //depot/projects/s390/sys/dev/mpt/mpt.c#8 integrate .. //depot/projects/s390/sys/dev/mpt/mpt.h#9 integrate .. //depot/projects/s390/sys/dev/mpt/mpt_cam.c#7 integrate .. //depot/projects/s390/sys/dev/mpt/mpt_raid.c#8 integrate .. //depot/projects/s390/sys/dev/mwl/if_mwl_pci.c#2 integrate .. //depot/projects/s390/sys/dev/mxge/if_mxge.c#6 integrate .. //depot/projects/s390/sys/dev/mxge/if_mxge_var.h#6 integrate .. //depot/projects/s390/sys/dev/pci/pci.c#22 integrate .. //depot/projects/s390/sys/dev/pci/vga_pci.c#5 integrate .. //depot/projects/s390/sys/dev/ppbus/lpt.c#15 integrate .. //depot/projects/s390/sys/dev/ppbus/pcfclock.c#11 integrate .. //depot/projects/s390/sys/dev/siis/siis.c#3 integrate .. //depot/projects/s390/sys/dev/syscons/syscons.c#21 integrate .. //depot/projects/s390/sys/dev/usb/controller/ehci.c#4 integrate .. //depot/projects/s390/sys/dev/usb/controller/ehci.h#3 integrate .. //depot/projects/s390/sys/dev/usb/controller/ehci_ixp4xx.c#3 integrate .. //depot/projects/s390/sys/dev/usb/controller/ehci_mbus.c#3 integrate .. //depot/projects/s390/sys/dev/usb/controller/ehci_pci.c#4 integrate .. //depot/projects/s390/sys/dev/usb/controller/ehcireg.h#1 branch .. //depot/projects/s390/sys/dev/usb/controller/ohci.c#3 integrate .. //depot/projects/s390/sys/dev/usb/controller/ohci.h#3 integrate .. //depot/projects/s390/sys/dev/usb/controller/ohci_atmelarm.c#3 integrate .. //depot/projects/s390/sys/dev/usb/controller/ohci_pci.c#3 integrate .. //depot/projects/s390/sys/dev/usb/controller/ohcireg.h#1 branch .. //depot/projects/s390/sys/dev/usb/controller/uhci.c#3 integrate .. //depot/projects/s390/sys/dev/usb/controller/uhci.h#3 integrate .. //depot/projects/s390/sys/dev/usb/controller/uhci_pci.c#3 integrate .. //depot/projects/s390/sys/dev/usb/controller/uhcireg.h#1 branch .. //depot/projects/s390/sys/dev/usb/input/ukbd.c#4 integrate .. //depot/projects/s390/sys/dev/usb/input/ums.c#3 integrate .. //depot/projects/s390/sys/dev/usb/net/if_cdce.c#4 integrate .. //depot/projects/s390/sys/dev/usb/serial/uch341.c#2 delete .. //depot/projects/s390/sys/dev/usb/serial/uchcom.c#4 integrate .. //depot/projects/s390/sys/dev/usb/storage/umass.c#4 integrate .. //depot/projects/s390/sys/dev/usb/usbdevs#24 integrate .. //depot/projects/s390/sys/dev/usb/wlan/if_rum.c#4 integrate .. //depot/projects/s390/sys/dev/usb/wlan/if_uath.c#3 integrate .. //depot/projects/s390/sys/dev/usb/wlan/if_upgt.c#3 integrate .. //depot/projects/s390/sys/dev/usb/wlan/if_ural.c#3 integrate .. //depot/projects/s390/sys/dev/usb/wlan/if_urtw.c#3 integrate .. //depot/projects/s390/sys/dev/usb/wlan/if_urtwreg.h#2 integrate .. //depot/projects/s390/sys/dev/usb/wlan/if_urtwvar.h#2 integrate .. //depot/projects/s390/sys/dev/usb/wlan/if_zyd.c#4 integrate .. //depot/projects/s390/sys/fs/nfsclient/nfs_clport.c#3 integrate .. //depot/projects/s390/sys/fs/nfsclient/nfs_clstate.c#2 integrate .. //depot/projects/s390/sys/fs/nfsclient/nfs_clsubs.c#2 integrate .. //depot/projects/s390/sys/fs/smbfs/smbfs_vfsops.c#14 integrate .. //depot/projects/s390/sys/fs/tmpfs/tmpfs.h#4 integrate .. //depot/projects/s390/sys/fs/tmpfs/tmpfs_subr.c#5 integrate .. //depot/projects/s390/sys/fs/tmpfs/tmpfs_vnops.c#5 integrate .. //depot/projects/s390/sys/geom/concat/g_concat.c#6 integrate .. //depot/projects/s390/sys/geom/label/g_label.c#6 integrate .. //depot/projects/s390/sys/geom/part/g_part.c#7 integrate .. //depot/projects/s390/sys/geom/part/g_part_gpt.c#6 integrate .. //depot/projects/s390/sys/geom/shsec/g_shsec.c#5 integrate .. //depot/projects/s390/sys/geom/stripe/g_stripe.c#6 integrate .. //depot/projects/s390/sys/geom/uzip/g_uzip.c#5 integrate .. //depot/projects/s390/sys/geom/vinum/geom_vinum_create.c#3 integrate .. //depot/projects/s390/sys/geom/vinum/geom_vinum_events.c#3 integrate .. //depot/projects/s390/sys/geom/vinum/geom_vinum_init.c#5 integrate .. //depot/projects/s390/sys/geom/vinum/geom_vinum_move.c#5 integrate .. //depot/projects/s390/sys/geom/vinum/geom_vinum_rm.c#9 integrate .. //depot/projects/s390/sys/geom/vinum/geom_vinum_subr.c#8 integrate .. //depot/projects/s390/sys/i386/conf/GENERIC#25 integrate .. //depot/projects/s390/sys/i386/conf/NOTES#23 integrate .. //depot/projects/s390/sys/i386/i386/elf_machdep.c#13 integrate .. //depot/projects/s390/sys/i386/i386/intr_machdep.c#7 integrate .. //depot/projects/s390/sys/i386/i386/nexus.c#7 integrate .. //depot/projects/s390/sys/i386/i386/pmap.c#24 integrate .. //depot/projects/s390/sys/i386/include/atomic.h#9 integrate .. //depot/projects/s390/sys/i386/include/elf.h#7 integrate .. //depot/projects/s390/sys/i386/include/intr_machdep.h#7 integrate .. //depot/projects/s390/sys/i386/xen/pmap.c#6 integrate .. //depot/projects/s390/sys/ia64/conf/GENERIC#20 integrate .. //depot/projects/s390/sys/ia64/ia64/elf_machdep.c#15 integrate .. //depot/projects/s390/sys/ia64/ia64/pmap.c#22 integrate .. //depot/projects/s390/sys/ia64/include/asm.h#5 integrate .. //depot/projects/s390/sys/ia64/include/elf.h#9 integrate .. //depot/projects/s390/sys/ia64/include/param.h#13 integrate .. //depot/projects/s390/sys/kern/bus_if.m#9 integrate .. //depot/projects/s390/sys/kern/imgact_elf.c#18 integrate .. //depot/projects/s390/sys/kern/init_main.c#20 integrate .. //depot/projects/s390/sys/kern/kern_event.c#17 integrate .. //depot/projects/s390/sys/kern/kern_exec.c#23 integrate .. //depot/projects/s390/sys/kern/kern_exit.c#26 integrate .. //depot/projects/s390/sys/kern/kern_intr.c#17 integrate .. //depot/projects/s390/sys/kern/kern_ktrace.c#16 integrate .. //depot/projects/s390/sys/kern/kern_lock.c#17 integrate .. //depot/projects/s390/sys/kern/kern_shutdown.c#16 integrate .. //depot/projects/s390/sys/kern/kern_sig.c#23 integrate .. //depot/projects/s390/sys/kern/kern_thr.c#14 integrate .. //depot/projects/s390/sys/kern/kern_thread.c#23 integrate .. //depot/projects/s390/sys/kern/sched_ule.c#20 integrate .. //depot/projects/s390/sys/kern/stack_protector.c#2 integrate .. //depot/projects/s390/sys/kern/subr_bus.c#23 integrate .. //depot/projects/s390/sys/kern/subr_taskqueue.c#14 integrate .. //depot/projects/s390/sys/kern/subr_trap.c#21 integrate .. //depot/projects/s390/sys/kern/sys_process.c#15 integrate .. //depot/projects/s390/sys/kern/sysv_shm.c#15 integrate .. //depot/projects/s390/sys/kern/tty.c#22 integrate .. //depot/projects/s390/sys/kern/tty_ttydisc.c#6 integrate .. //depot/projects/s390/sys/kern/uipc_usrreq.c#21 integrate .. //depot/projects/s390/sys/kern/vfs_acl.c#4 integrate .. //depot/projects/s390/sys/mips/include/elf.h#4 integrate .. //depot/projects/s390/sys/mips/mips/elf64_machdep.c#3 integrate .. //depot/projects/s390/sys/mips/mips/elf_machdep.c#5 integrate .. //depot/projects/s390/sys/mips/mips/pmap.c#6 integrate .. //depot/projects/s390/sys/modules/Makefile#28 integrate .. //depot/projects/s390/sys/modules/cam/Makefile#9 integrate .. //depot/projects/s390/sys/modules/cxgb/cxgb/Makefile#4 integrate .. //depot/projects/s390/sys/modules/dpms/Makefile#3 integrate .. //depot/projects/s390/sys/modules/iwnfw/Makefile#3 integrate .. //depot/projects/s390/sys/modules/iwnfw/Makefile.inc#1 branch .. //depot/projects/s390/sys/modules/iwnfw/iwn4965/Makefile#1 branch .. //depot/projects/s390/sys/modules/iwnfw/iwn5000/Makefile#1 branch .. //depot/projects/s390/sys/modules/iwnfw/iwn5150/Makefile#1 branch .. //depot/projects/s390/sys/modules/nfsclient/Makefile#10 integrate .. //depot/projects/s390/sys/modules/nfslockd/Makefile#3 integrate .. //depot/projects/s390/sys/modules/pf/Makefile#7 integrate .. //depot/projects/s390/sys/modules/ubser/Makefile#2 integrate .. //depot/projects/s390/sys/modules/usb/Makefile#9 integrate .. //depot/projects/s390/sys/modules/usb/uch341/Makefile#2 delete .. //depot/projects/s390/sys/modules/usb/ucom/Makefile#2 integrate .. //depot/projects/s390/sys/modules/vesa/Makefile#3 integrate .. //depot/projects/s390/sys/modules/x86bios/Makefile#2 integrate .. //depot/projects/s390/sys/net/bpf.c#20 integrate .. //depot/projects/s390/sys/net/flowtable.c#4 integrate .. //depot/projects/s390/sys/net/if_bridge.c#10 integrate .. //depot/projects/s390/sys/net/if_enc.c#4 integrate .. //depot/projects/s390/sys/net/if_ethersubr.c#22 integrate .. //depot/projects/s390/sys/net/if_gif.c#16 integrate .. //depot/projects/s390/sys/net/pfil.c#8 integrate .. //depot/projects/s390/sys/net/pfil.h#7 integrate .. //depot/projects/s390/sys/net/route.c#18 integrate .. //depot/projects/s390/sys/net80211/ieee80211_hwmp.c#3 integrate .. //depot/projects/s390/sys/net80211/ieee80211_mesh.c#3 integrate .. //depot/projects/s390/sys/net80211/ieee80211_mesh.h#3 integrate .. //depot/projects/s390/sys/net80211/ieee80211_output.c#12 integrate .. //depot/projects/s390/sys/net80211/ieee80211_proto.h#10 integrate .. //depot/projects/s390/sys/netgraph/NOTES#2 integrate .. //depot/projects/s390/sys/netgraph/ng_bridge.c#12 integrate .. //depot/projects/s390/sys/netinet/if_ether.c#19 integrate .. //depot/projects/s390/sys/netinet/in.c#16 integrate .. //depot/projects/s390/sys/netinet/ip_fastfwd.c#10 integrate .. //depot/projects/s390/sys/netinet/ip_icmp.c#19 integrate .. //depot/projects/s390/sys/netinet/ip_input.c#22 integrate .. //depot/projects/s390/sys/netinet/ip_output.c#21 integrate .. //depot/projects/s390/sys/netinet/ip_var.h#15 integrate .. //depot/projects/s390/sys/netinet/ipfw/ip_fw2.c#3 integrate .. //depot/projects/s390/sys/netinet/ipfw/ip_fw_pfil.c#3 integrate .. //depot/projects/s390/sys/netinet/raw_ip.c#20 integrate .. //depot/projects/s390/sys/netinet/sctp_bsd_addr.c#4 integrate .. //depot/projects/s390/sys/netinet/sctp_os_bsd.h#9 integrate .. //depot/projects/s390/sys/netinet/sctp_output.c#9 integrate .. //depot/projects/s390/sys/netinet/sctp_pcb.c#7 integrate .. //depot/projects/s390/sys/netinet/tcp_input.c#27 integrate .. //depot/projects/s390/sys/netinet6/icmp6.c#16 integrate .. //depot/projects/s390/sys/netinet6/in6.c#16 integrate .. //depot/projects/s390/sys/netinet6/in6_ifattach.c#15 integrate .. //depot/projects/s390/sys/netinet6/ip6_forward.c#10 integrate .. //depot/projects/s390/sys/netinet6/ip6_input.c#18 integrate .. //depot/projects/s390/sys/netinet6/ip6_output.c#18 integrate .. //depot/projects/s390/sys/netinet6/ip6_var.h#13 integrate .. //depot/projects/s390/sys/nfsclient/nfs_kdtrace.c#3 integrate .. //depot/projects/s390/sys/nfsclient/nfs_vnops.c#25 integrate .. //depot/projects/s390/sys/nlm/nlm.h#4 integrate .. //depot/projects/s390/sys/nlm/nlm_prot_impl.c#4 integrate .. //depot/projects/s390/sys/nlm/nlm_prot_server.c#2 integrate .. //depot/projects/s390/sys/pc98/conf/GENERIC#22 integrate .. //depot/projects/s390/sys/powerpc/aim/clock.c#3 integrate .. //depot/projects/s390/sys/powerpc/aim/machdep.c#5 integrate .. //depot/projects/s390/sys/powerpc/aim/mmu_oea.c#4 integrate .. //depot/projects/s390/sys/powerpc/aim/mmu_oea64.c#3 integrate .. //depot/projects/s390/sys/powerpc/aim/mp_cpudep.c#4 integrate .. //depot/projects/s390/sys/powerpc/aim/platform_chrp.c#2 integrate .. //depot/projects/s390/sys/powerpc/aim/swtch.S#3 integrate .. //depot/projects/s390/sys/powerpc/aim/trap_subr.S#3 integrate .. //depot/projects/s390/sys/powerpc/booke/mp_cpudep.c#2 integrate .. //depot/projects/s390/sys/powerpc/booke/pmap.c#6 integrate .. //depot/projects/s390/sys/powerpc/include/elf.h#6 integrate .. //depot/projects/s390/sys/powerpc/include/hid.h#5 integrate .. //depot/projects/s390/sys/powerpc/include/pcpu.h#7 integrate .. //depot/projects/s390/sys/powerpc/include/pmap.h#10 integrate .. //depot/projects/s390/sys/powerpc/include/smp.h#4 integrate .. //depot/projects/s390/sys/powerpc/include/spr.h#8 integrate .. //depot/projects/s390/sys/powerpc/powermac/hrowpic.c#6 integrate .. //depot/projects/s390/sys/powerpc/powerpc/cpu.c#6 integrate .. //depot/projects/s390/sys/powerpc/powerpc/elf_machdep.c#12 integrate .. //depot/projects/s390/sys/powerpc/powerpc/mmu_if.m#5 integrate .. //depot/projects/s390/sys/powerpc/powerpc/mp_machdep.c#7 integrate .. //depot/projects/s390/sys/powerpc/powerpc/pmap_dispatch.c#7 integrate .. //depot/projects/s390/sys/powerpc/powerpc/uio_machdep.c#4 integrate .. //depot/projects/s390/sys/sparc64/conf/GENERIC#23 integrate .. //depot/projects/s390/sys/sparc64/include/elf.h#9 integrate .. //depot/projects/s390/sys/sparc64/sparc64/elf_machdep.c#12 integrate .. //depot/projects/s390/sys/sparc64/sparc64/pmap.c#18 integrate .. //depot/projects/s390/sys/sun4v/include/elf.h#4 integrate .. //depot/projects/s390/sys/sun4v/sun4v/pmap.c#3 integrate .. //depot/projects/s390/sys/sys/bus.h#13 integrate .. //depot/projects/s390/sys/sys/errno.h#4 integrate .. //depot/projects/s390/sys/sys/interrupt.h#8 integrate .. //depot/projects/s390/sys/sys/kernel.h#12 integrate .. //depot/projects/s390/sys/sys/ktrace.h#8 integrate .. //depot/projects/s390/sys/sys/signalvar.h#11 integrate .. //depot/projects/s390/sys/sys/ttyqueue.h#3 integrate .. //depot/projects/s390/sys/teken/sequences#2 integrate .. //depot/projects/s390/sys/teken/teken.c#2 integrate .. //depot/projects/s390/sys/teken/teken_subr.h#2 integrate .. //depot/projects/s390/sys/tools/fw_stub.awk#4 integrate .. //depot/projects/s390/sys/tools/makeobjops.awk#4 integrate .. //depot/projects/s390/sys/vm/pmap.h#15 integrate .. //depot/projects/s390/sys/vm/swap_pager.c#18 integrate .. //depot/projects/s390/sys/vm/vm_extern.h#12 integrate .. //depot/projects/s390/sys/vm/vm_glue.c#16 integrate .. //depot/projects/s390/sys/vm/vm_page.c#20 integrate .. //depot/projects/s390/sys/vm/vm_page.h#14 integrate .. //depot/projects/s390/tools/regression/bin/sh/execution/unknown1.0#1 branch .. //depot/projects/s390/tools/regression/bin/sh/expansion/question1.0#1 branch .. //depot/projects/s390/tools/regression/bin/sh/expansion/set-u1.0#1 branch .. //depot/projects/s390/tools/regression/bin/sh/expansion/set-u2.0#1 branch .. //depot/projects/s390/tools/regression/fstest/tests/rename/21.t#2 integrate .. //depot/projects/s390/tools/regression/lib/libc/gen/test-wordexp.c#3 integrate .. //depot/projects/s390/tools/regression/lib/libc/stdio/test-getdelim.c#2 integrate .. //depot/projects/s390/tools/regression/lib/libutil/test-flopen.c#4 integrate .. //depot/projects/s390/tools/regression/sigqueue/sigqtest1/sigqtest1.c#2 integrate .. //depot/projects/s390/tools/regression/sigqueue/sigqtest2/sigqtest2.c#2 integrate .. //depot/projects/s390/tools/regression/sockets/unix_seqpacket/Makefile#1 branch .. //depot/projects/s390/tools/regression/sockets/unix_seqpacket/unix_seqpacket.c#1 branch .. //depot/projects/s390/tools/regression/sockets/unix_seqpacket_exercise/Makefile#1 branch .. //depot/projects/s390/tools/regression/sockets/unix_seqpacket_exercise/unix_seqpacket_exercise.c#1 branch .. //depot/projects/s390/tools/regression/tmpfs/h_tools.c#2 integrate .. //depot/projects/s390/tools/tools/netrate/netsend/netsend.c#3 integrate .. //depot/projects/s390/usr.bin/calendar/calendars/calendar.freebsd#20 integrate .. //depot/projects/s390/usr.bin/locale/locale.1#4 integrate .. //depot/projects/s390/usr.bin/locale/locale.c#4 integrate .. //depot/projects/s390/usr.bin/make/job.c#10 integrate .. //depot/projects/s390/usr.bin/make/main.c#13 integrate .. //depot/projects/s390/usr.bin/netstat/main.c#14 integrate .. //depot/projects/s390/usr.bin/netstat/netstat.h#11 integrate .. //depot/projects/s390/usr.bin/netstat/route.c#9 integrate .. //depot/projects/s390/usr.bin/netstat/unix.c#6 integrate .. //depot/projects/s390/usr.bin/systat/keyboard.c#3 integrate .. //depot/projects/s390/usr.bin/systat/main.c#5 integrate .. //depot/projects/s390/usr.bin/touch/touch.c#5 integrate .. //depot/projects/s390/usr.sbin/acpi/iasl/Makefile#6 integrate .. //depot/projects/s390/usr.sbin/cdcontrol/cdcontrol.c#10 integrate .. //depot/projects/s390/usr.sbin/jail/jail.8#14 integrate .. //depot/projects/s390/usr.sbin/ntp/doc/ntpd.8#6 integrate .. //depot/projects/s390/usr.sbin/sysinstall/tcpip.c#11 integrate .. //depot/projects/s390/usr.sbin/tzsetup/tzsetup.8#5 integrate .. //depot/projects/s390/usr.sbin/tzsetup/tzsetup.c#5 integrate Differences ... ==== //depot/projects/s390/Makefile.inc1#31 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.629 2009/09/10 07:37:36 des Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.631 2009/10/21 19:39:34 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -929,6 +929,10 @@ _mklocale= usr.bin/mklocale .endif +.if ${BOOTSTRAPPING} < 900002 +_sed= usr.bin/sed +.endif + .if ${BOOTSTRAPPING} < 700018 _gensnmptree= usr.sbin/bsnmpd/gensnmptree .endif @@ -954,6 +958,7 @@ usr.bin/makewhatis \ ${_mklocale} \ usr.bin/rpcgen \ + ${_sed} \ usr.bin/xinstall \ ${_gensnmptree} \ usr.sbin/config \ @@ -1038,7 +1043,6 @@ .for _tool in \ gnu/usr.bin/binutils \ gnu/usr.bin/cc \ - usr.bin/sed \ usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \ ${_btxld} \ ${_crunchide} \ @@ -1127,7 +1131,7 @@ _secure_lib_libssh= secure/lib/libssh secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L .if ${MK_KERBEROS} != "no" -kerberos5/lib/libgssapi_krb5__L: kerberos5/lib/libkrb5__L \ +kerberos5/lib/libgssapi_krb5__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \ kerberos5/lib/libhx509__L kerberos5/lib/libasn1__L lib/libcom_err__L \ lib/libmd__L kerberos5/lib/libroken__L secure/lib/libcrypto__L \ lib/libcrypt__L ==== //depot/projects/s390/ObsoleteFiles.inc#11 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.209 2009/09/10 21:42:00 delphij Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.211 2009/10/24 12:59:29 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,9 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20091005: fusword.9 and susword.9 removed +OLD_FILES+=usr/share/man/man9/fusword.9.gz +OLD_FILES+=usr/share/man/man9/susword.9.gz # 20090909: vesa and dpms promoted to be i386/amd64 common OLD_FILES+=usr/include/machine/pc/vesa.h OLD_FILES+=usr/share/man/man4/i386/dpms.4.gz @@ -26,6 +29,49 @@ OLD_FILES+=etc/mtree/BSD.local.dist OLD_FILES+=etc/mtree/BSD.x11.dist OLD_FILES+=etc/mtree/BSD.x11-4.dist +# 20090812: net80211 documentation overhaul +OLD_FILES+=usr/share/man/man9/ieee80211_add_rates.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_add_xrates.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_alloc_node.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_attach.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_begin_scan.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_cfgget.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_cfgset.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_chan2ieee.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_chan2mode.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_create_ibss.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_crypto_attach.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_crypto_detach.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_decap.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_dump_pkt.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_dup_bss.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_encap.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_end_scan.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_find_node.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_fix_rate.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_free_allnodes.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_ieee2mhz.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_ioctl.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_lookup_node.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_media2rate.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_media_change.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_media_init.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_media_status.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_mhz2ieee.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_next_scan.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_node_attach.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_node_detach.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_node_lateattach.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_print_essid.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_proto_attach.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_proto_detach.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_rate2media.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_recv_mgmt.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_send_mgmt.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_setmode.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_timeout_nodes.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_watchdog.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_wep_crypt.9.gz # 20090801: vimage.h removed in favour of vnet.h OLD_FILES+=usr/include/sys/vimage.h # 20090719: library version bump for 8.0 @@ -503,6 +549,8 @@ OLD_FILES+=usr/include/dev/usb/usbcdc.h OLD_FILES+=usr/include/dev/usb/usbdivar.h OLD_FILES+=usr/include/dev/usb/uxb360gp_rdesc.h +OLD_FILES+=usr/sbin/usbdevs +OLD_FILES+=usr/share/man/man8/usbdevs.8.gz # 20090203: removal of pccard header files OLD_FILES+=usr/include/pccard/cardinfo.h OLD_FILES+=usr/include/pccard/cis.h ==== //depot/projects/s390/bin/cat/Makefile#3 (text+ko) ==== @@ -1,7 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/cat/Makefile,v 1.8 2009/03/16 12:16:17 des Exp $ +# $FreeBSD: src/bin/cat/Makefile,v 1.9 2009/10/15 18:17:29 ru Exp $ PROG= cat -WARNS?= 6 .include ==== //depot/projects/s390/bin/csh/iconv_stub.c#2 (text) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/bin/csh/iconv_stub.c,v 1.1 2006/02/19 06:40:29 ume Exp $ + * $FreeBSD: src/bin/csh/iconv_stub.c,v 1.2 2009/10/17 15:53:15 ume Exp $ */ #include @@ -61,9 +61,20 @@ if (iconvlib == NULL) return (iconv_t)-1; iconv_open = (iconv_open_t *)dlfunc(iconvlib, ICONV_OPEN); + if (iconv_open == NULL) + goto dlfunc_err; dl_iconv = (dl_iconv_t *)dlfunc(iconvlib, ICONV_ENGINE); + if (dl_iconv == NULL) + goto dlfunc_err; dl_iconv_close = (dl_iconv_close_t *)dlfunc(iconvlib, ICONV_CLOSE); + if (dl_iconv_close == NULL) + goto dlfunc_err; } return iconv_open(tocode, fromcode); + +dlfunc_err: + dlclose(iconvlib); + iconvlib = NULL; + return (iconv_t)-1; } ==== //depot/projects/s390/bin/ls/ls.c#11 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.86 2008/04/04 03:57:46 grog Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.87 2009/10/13 21:51:50 jilles Exp $"); #include #include @@ -399,7 +399,7 @@ * If not -F, -d or -l options, follow any symbolic links listed on * the command line. */ - if (!f_longform && !f_listdir && !f_type) + if (!f_longform && !f_listdir && (!f_type || f_slash)) fts_options |= FTS_COMFOLLOW; /* ==== //depot/projects/s390/bin/sh/eval.c#12 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.66 2009/08/28 22:41:25 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.67 2009/10/06 22:00:14 jilles Exp $"); #include #include @@ -713,12 +713,7 @@ do_clearcmdentry = 1; } - find_command(argv[0], &cmdentry, 1, path); - if (cmdentry.cmdtype == CMDUNKNOWN) { /* command not found */ - exitstatus = 127; - flushout(&errout); - return; - } + find_command(argv[0], &cmdentry, 0, path); /* implement the bltin builtin here */ if (cmdentry.cmdtype == CMDBUILTIN && cmdentry.u.index == BLTINCMD) { for (;;) { @@ -740,7 +735,7 @@ /* Fork off a child process if necessary. */ if (cmd->ncmd.backgnd - || (cmdentry.cmdtype == CMDNORMAL + || ((cmdentry.cmdtype == CMDNORMAL || cmdentry.cmdtype == CMDUNKNOWN) && ((flags & EV_EXIT) == 0 || have_traps())) || ((flags & EV_BACKCMD) != 0 && (cmdentry.cmdtype != CMDBUILTIN ==== //depot/projects/s390/bin/sh/exec.c#11 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.36 2009/08/28 22:41:25 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.37 2009/10/06 22:00:14 jilles Exp $"); #include #include @@ -429,6 +429,7 @@ outfmt(out2, "%s: %s\n", name, strerror(e)); } entry->cmdtype = CMDUNKNOWN; + entry->u.index = 0; return; success: ==== //depot/projects/s390/bin/sh/expand.c#12 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.55 2009/06/25 17:14:06 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.56 2009/10/24 21:20:04 jilles Exp $"); #include #include @@ -657,7 +657,7 @@ } varlen = 0; startloc = expdest - stackblock(); - if (!set && uflag) { + if (!set && uflag && *var != '@' && *var != '*') { switch (subtype) { case VSNORMAL: case VSTRIMLEFT: ==== //depot/projects/s390/bin/sh/parser.c#9 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.64 2009/10/01 21:40:08 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.65 2009/10/16 16:17:57 jilles Exp $"); #include #include @@ -1308,11 +1308,16 @@ struct jmploc *const savehandler = handler; int savelen; int saveprompt; + const int bq_startlinno = plinno; if (setjmp(jmploc.loc)) { if (str) ckfree(str); handler = savehandler; + if (exception == EXERROR) { + startlinno = bq_startlinno; + synerror("Error in command substitution"); + } longjmp(handler->loc, 1); } INTOFF; ==== //depot/projects/s390/bin/sh/sh.1#14 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.131 2009/09/20 21:42:38 jilles Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.133 2009/10/24 21:20:04 jilles Exp $ .\" -.Dd May 31, 2009 +.Dd October 24, 2009 .Dt SH 1 .Os .Sh NAME @@ -296,7 +296,10 @@ .Ed .It Fl u Li nounset Write a message to standard error when attempting -to expand a variable that is not set, and if the +to expand a variable, a positional parameter or +the special parameter +.Va \&! +that is not set, and if the shell is not interactive, exit immediately. .It Fl V Li vi Enable the built-in @@ -1227,6 +1230,9 @@ final value of .Ar parameter is substituted. +Quoting inside +.Ar word +does not prevent field splitting or pathname expansion. Only variables, not positional parameters or special parameters, can be assigned in this way. ==== //depot/projects/s390/bin/uuidgen/Makefile#2 (text+ko) ==== @@ -1,6 +1,5 @@ -# $FreeBSD: src/bin/uuidgen/Makefile,v 1.4 2008/03/13 17:38:06 obrien Exp $ +# $FreeBSD: src/bin/uuidgen/Makefile,v 1.5 2009/10/15 18:17:29 ru Exp $ PROG= uuidgen -WARNS?= 6 .include ==== //depot/projects/s390/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#3 (text+ko) ==== @@ -1790,11 +1790,14 @@ /* We don't support those properties on FreeBSD. */ switch (prop) { + case ZFS_PROP_DEVICES: + case ZFS_PROP_ZONED: case ZFS_PROP_SHAREISCSI: - case ZFS_PROP_DEVICES: - case ZFS_PROP_ACLMODE: - case ZFS_PROP_ACLINHERIT: case ZFS_PROP_ISCSIOPTIONS: + case ZFS_PROP_XATTR: + case ZFS_PROP_VSCAN: + case ZFS_PROP_NBMAND: + case ZFS_PROP_SHARESMB: (void) snprintf(errbuf, sizeof (errbuf), "property '%s' not supported on FreeBSD", propname); ret = zfs_error(hdl, EZFS_PERM, errbuf); ==== //depot/projects/s390/contrib/gcc/config/i386/i386.c#9 (text+ko) ==== @@ -19,7 +19,7 @@ the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* $FreeBSD: src/contrib/gcc/config/i386/i386.c,v 1.25 2007/08/14 03:04:42 kan Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/i386/i386.c,v 1.26 2009/10/21 19:26:12 jhb Exp $ */ #include "config.h" #include "system.h" @@ -1614,7 +1614,7 @@ "-mtune=generic instead as appropriate."); if (!ix86_arch_string) - ix86_arch_string = TARGET_64BIT ? "x86-64" : "i386"; + ix86_arch_string = TARGET_64BIT ? "x86-64" : "i486"; if (!strcmp (ix86_arch_string, "generic")) error ("generic CPU can be used only for -mtune= switch"); if (!strncmp (ix86_arch_string, "generic", 7)) ==== //depot/projects/s390/contrib/openpam/doc/man/pam.conf.5#3 (text) ==== @@ -109,7 +109,7 @@ .It Cm requisite If this module succeeds, the result of the chain will be success unless a later module fails. -If it module fails, the chain is broken and the result is failure. +If the module fails, the chain is broken and the result is failure. .It Cm sufficient If this module succeeds, the chain is broken and the result is success. ==== //depot/projects/s390/contrib/tcpdump/print-tcp.c#6 (text+ko) ==== @@ -124,6 +124,7 @@ { TCPOPT_CCECHO, "" }, { TCPOPT_SIGNATURE, "md5" }, { TCPOPT_AUTH, "enhanced auth" }, + { TCPOPT_UTO, "uto" }, { 0, NULL } }; @@ -613,6 +614,17 @@ */ break; + case TCPOPT_UTO: + datalen = 2; + LENCHECK(datalen); + uint utoval = EXTRACT_16BITS(cp); + if (utoval & 0x0001) + utoval = (utoval >> 1) * 60; + else + utoval >>= 1; + (void)printf(" %u", utoval); + break; + default: datalen = len - 2; for (i = 0; i < datalen; ++i) { ==== //depot/projects/s390/contrib/tcpdump/tcp.h#5 (text+ko) ==== @@ -83,6 +83,8 @@ #define TCPOLEN_SIGNATURE 18 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Oct 25 11:16:36 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D4123106568D; Sun, 25 Oct 2009 11:16: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 98B701065676 for ; Sun, 25 Oct 2009 11:16:35 +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 6C67A8FC1A for ; Sun, 25 Oct 2009 11:16: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 n9PBGZeg095373 for ; Sun, 25 Oct 2009 11:16:35 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9PBGZpb095371 for perforce@freebsd.org; Sun, 25 Oct 2009 11:16:35 GMT (envelope-from mav@freebsd.org) Date: Sun, 25 Oct 2009 11:16:35 GMT Message-Id: <200910251116.n9PBGZpb095371@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 169788 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, 25 Oct 2009 11:16:36 -0000 http://p4web.freebsd.org/chv.cgi?CH=169788 Change 169788 by mav@mav_mavtest on 2009/10/25 11:15:37 Restart initialization if bus reset hapens while working. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#13 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#13 (text+ko) ==== @@ -94,6 +94,7 @@ int pm_try; int found; int frozen; + int restart; union ccb saved_ccb; struct task sysctl_task; struct sysctl_ctx_list sysctl_ctx; @@ -292,14 +293,21 @@ case AC_BUS_RESET: softc = (struct pmp_softc *)periph->softc; cam_periph_async(periph, code, path, arg); - if (softc->state != PMP_STATE_NORMAL) + if (code == AC_SCSI_AEN && softc->state != PMP_STATE_NORMAL && + softc->state != PMP_STATE_SCAN) break; - pmpfreeze(periph, softc->found); + if (softc->state != PMP_STATE_SCAN) + pmpfreeze(periph, softc->found); + else + pmpfreeze(periph, softc->found & ~(1 << softc->pm_step)); if (code == AC_SENT_BDR || code == AC_BUS_RESET) softc->found = 0; /* We have to reset everything. */ - softc->state = PMP_STATE_PORTS; - cam_periph_acquire(periph); - xpt_schedule(periph, CAM_PRIORITY_BUS); + if (softc->state == PMP_STATE_NORMAL) { + softc->state = PMP_STATE_PORTS; + cam_periph_acquire(periph); + xpt_schedule(periph, CAM_PRIORITY_BUS); + } else + softc->restart = 1; break; default: cam_periph_async(periph, code, path, arg); @@ -408,6 +416,11 @@ softc = (struct pmp_softc *)periph->softc; ataio = &start_ccb->ataio; + + if (softc->restart) { + softc->restart = 0; + softc->state = PMP_STATE_PORTS; + } switch (softc->state) { case PMP_STATE_PORTS: @@ -516,6 +529,22 @@ goto done; } + if (softc->restart) { + softc->restart = 0; + if (softc->state == PMP_STATE_SCAN) { + pmpfreeze(periph, 1 << softc->pm_step); + work_ccb = done_ccb; + done_ccb = (union ccb*)work_ccb->ccb_h.ppriv_ptr0; + /* Free the current request path- we're done with it. */ + xpt_free_path(work_ccb->ccb_h.path); + xpt_free_ccb(work_ccb); + } + xpt_release_ccb(done_ccb); + softc->state = PMP_STATE_PORTS; + xpt_schedule(periph, priority); + return; + } + switch (softc->state) { case PMP_STATE_PORTS: softc->pm_ports = (done_ccb->ataio.res.lba_high << 24) + From owner-p4-projects@FreeBSD.ORG Sun Oct 25 11:45:05 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC5D21065679; Sun, 25 Oct 2009 11:45:04 +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 A10A81065670 for ; Sun, 25 Oct 2009 11:45:04 +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 8E7AC8FC20 for ; Sun, 25 Oct 2009 11:45:04 +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 n9PBj4u6097470 for ; Sun, 25 Oct 2009 11:45:04 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9PBj44O097468 for perforce@freebsd.org; Sun, 25 Oct 2009 11:45:04 GMT (envelope-from mav@freebsd.org) Date: Sun, 25 Oct 2009 11:45:04 GMT Message-Id: <200910251145.n9PBj44O097468@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 169793 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, 25 Oct 2009 11:45:05 -0000 http://p4web.freebsd.org/chv.cgi?CH=169793 Change 169793 by mav@mav_mavtest on 2009/10/25 11:44:40 Replace DELAY() with device freezing to not spent 1s in a loop. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#14 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#14 (text+ko) ==== @@ -578,7 +578,12 @@ softc->pm_step++; if (softc->pm_step >= softc->pm_ports) { softc->pm_step = 0; - DELAY(5000); + cam_freeze_devq(periph->path); + cam_release_devq(periph->path, + RELSIM_RELEASE_AFTER_TIMEOUT, + /*reduction*/0, + /*timeout*/5, + /*getcount_only*/0); printf("PM reset done\n"); softc->state = PMP_STATE_CONNECT; } @@ -607,7 +612,12 @@ softc->pm_step++; } else { if (softc->pm_try < 100) { - DELAY(10000); + cam_freeze_devq(periph->path); + cam_release_devq(periph->path, + RELSIM_RELEASE_AFTER_TIMEOUT, + /*reduction*/0, + /*timeout*/10, + /*getcount_only*/0); softc->pm_try++; } else { printf("PM status: %d - %08x\n", softc->pm_step, res); @@ -621,18 +631,13 @@ softc->pm_step++; } } - if (softc->pm_step < softc->pm_ports) { - xpt_release_ccb(done_ccb); - xpt_schedule(periph, priority); - return; - } else { + if (softc->pm_step >= softc->pm_ports) { + softc->state = PMP_STATE_CLEAR; softc->pm_step = 0; - softc->state = PMP_STATE_CLEAR; - xpt_release_ccb(done_ccb); - xpt_schedule(periph, priority); - return; } - break; + xpt_release_ccb(done_ccb); + xpt_schedule(periph, priority); + return; case PMP_STATE_CLEAR: softc->pm_step++; if (softc->pm_step < softc->pm_ports) { From owner-p4-projects@FreeBSD.ORG Sun Oct 25 12:45:05 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E1E8010656A5; Sun, 25 Oct 2009 12:45:04 +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 A66171065693 for ; Sun, 25 Oct 2009 12:45:04 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 93EC48FC17 for ; Sun, 25 Oct 2009 12:45:04 +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 n9PCj4rp002778 for ; Sun, 25 Oct 2009 12:45:04 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9PCj4sf002776 for perforce@freebsd.org; Sun, 25 Oct 2009 12:45:04 GMT (envelope-from bz@freebsd.org) Date: Sun, 25 Oct 2009 12:45:04 GMT Message-Id: <200910251245.n9PCj4sf002776@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 169794 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, 25 Oct 2009 12:45:05 -0000 http://p4web.freebsd.org/chv.cgi?CH=169794 Change 169794 by bz@bz_dumpster on 2009/10/25 12:44:30 Make world (WITHOUT_SSP) compile again. Affected files ... .. //depot/projects/s390/sys/s390/include/_align.h#1 add .. //depot/projects/s390/sys/s390/include/param.h#4 edit Differences ... ==== //depot/projects/s390/sys/s390/include/param.h#4 (text+ko) ==== @@ -92,6 +92,8 @@ #define PAGE_SIZE (1 << PAGE_SHIFT) #define PAGE_MASK (PAGE_SIZE-1) +#define MAXPAGESIZES 1 /* maximum number of supported page sizes */ + #define KSTACK_PAGES 2 /* includes pcb! */ #define KSTACK_BYTES (KSTACK_PAGES * PAGE_SIZE) #define KSTACK_GUARD_PAGES 1 From owner-p4-projects@FreeBSD.ORG Sun Oct 25 13:20:40 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 641A41065676; Sun, 25 Oct 2009 13:20: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 284F6106566B for ; Sun, 25 Oct 2009 13:20:40 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F0A8B8FC22 for ; Sun, 25 Oct 2009 13:20: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 n9PDKdWI016531 for ; Sun, 25 Oct 2009 13:20:39 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9PDKdad016529 for perforce@freebsd.org; Sun, 25 Oct 2009 13:20:39 GMT (envelope-from bz@freebsd.org) Date: Sun, 25 Oct 2009 13:20:39 GMT Message-Id: <200910251320.n9PDKdad016529@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 169796 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, 25 Oct 2009 13:20:40 -0000 http://p4web.freebsd.org/chv.cgi?CH=169796 Change 169796 by bz@bz_dumpster on 2009/10/25 13:20:34 sys/net/if.c now depends on loop(4). Affected files ... .. //depot/projects/s390/sys/s390/conf/GENERIC#14 edit Differences ... ==== //depot/projects/s390/sys/s390/conf/GENERIC#14 (text+ko) ==== @@ -65,6 +65,8 @@ #device hhc # Debug feature device hmcsc # HMC system console +# Pseudo devices. +device loop # Network loopback device random # Entropy device device pty # Pseudo-ttys (telnet etc) device md # Memory "disks" From owner-p4-projects@FreeBSD.ORG Sun Oct 25 13:21:41 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 705CB1065695; Sun, 25 Oct 2009 13:21:41 +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 34DCC106568F for ; Sun, 25 Oct 2009 13:21:41 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 22B9B8FC27 for ; Sun, 25 Oct 2009 13:21:41 +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 n9PDLfnk016618 for ; Sun, 25 Oct 2009 13:21:41 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9PDLfDv016615 for perforce@freebsd.org; Sun, 25 Oct 2009 13:21:41 GMT (envelope-from bz@freebsd.org) Date: Sun, 25 Oct 2009 13:21:41 GMT Message-Id: <200910251321.n9PDLfDv016615@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 169797 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, 25 Oct 2009 13:21:41 -0000 http://p4web.freebsd.org/chv.cgi?CH=169797 Change 169797 by bz@bz_dumpster on 2009/10/25 13:21:12 Add a dummy for the lately introduced but undocumented pmap_sync_icache(). Affected files ... .. //depot/projects/s390/sys/s390/s390/pmap_bz.c#3 edit Differences ... ==== //depot/projects/s390/sys/s390/s390/pmap_bz.c#3 (text+ko) ==== @@ -443,6 +443,15 @@ { } +/* + * Make the I-cache coherent with the memory or D-cache, depending on the + * semantics of the platform. + * XXX no man page. + */ +void +pmap_sync_icache(pmap_t pm, vm_offset_t va, vm_size_t sz) +{ +} /* ----------------------------------------------------------------------------- * arch specifics. From owner-p4-projects@FreeBSD.ORG Sun Oct 25 13:23:44 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EDB1B1065692; Sun, 25 Oct 2009 13:23:43 +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 B25AA1065679 for ; Sun, 25 Oct 2009 13:23:43 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 86BFC8FC12 for ; Sun, 25 Oct 2009 13:23:43 +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 n9PDNh3C016796 for ; Sun, 25 Oct 2009 13:23:43 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9PDNhve016794 for perforce@freebsd.org; Sun, 25 Oct 2009 13:23:43 GMT (envelope-from bz@freebsd.org) Date: Sun, 25 Oct 2009 13:23:43 GMT Message-Id: <200910251323.n9PDNhve016794@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 169798 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, 25 Oct 2009 13:23:44 -0000 http://p4web.freebsd.org/chv.cgi?CH=169798 Change 169798 by bz@bz_dumpster on 2009/10/25 13:22:49 Add ET_DYN_LOAD_ADDR introduced with the PIE support lately. For now it's like for most archs, TEXT_START_ADDR + 0x1000 (sizeof 1 page). Affected files ... .. //depot/projects/s390/sys/s390/include/elf.h#4 edit Differences ... ==== //depot/projects/s390/sys/s390/include/elf.h#4 (text+ko) ==== @@ -181,4 +181,7 @@ #endif #endif /* _RTLD_COMMON_RELOC */ + +#define ET_DYN_LOAD_ADDR 0x00401000 + #endif /* !_MACHINE_ELF_H_ */ From owner-p4-projects@FreeBSD.ORG Sun Oct 25 13:29:50 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1659D106568D; Sun, 25 Oct 2009 13:29:50 +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 CE9A01065670 for ; Sun, 25 Oct 2009 13:29:49 +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 BC5008FC31 for ; Sun, 25 Oct 2009 13:29:49 +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 n9PDTntD017445 for ; Sun, 25 Oct 2009 13:29:49 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9PDTnKx017443 for perforce@freebsd.org; Sun, 25 Oct 2009 13:29:49 GMT (envelope-from mav@freebsd.org) Date: Sun, 25 Oct 2009 13:29:49 GMT Message-Id: <200910251329.n9PDTnKx017443@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 169799 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, 25 Oct 2009 13:29:50 -0000 http://p4web.freebsd.org/chv.cgi?CH=169799 Change 169799 by mav@mav_mavtest on 2009/10/25 13:29:07 Do not schedule commands while probe in progress. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#32 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#32 (text+ko) ==== @@ -343,7 +343,8 @@ /* * Schedule ourselves for performing the work. */ - xpt_schedule(periph, CAM_PRIORITY_NORMAL); + if (softc->state == ADA_STATE_NORMAL) + xpt_schedule(periph, CAM_PRIORITY_NORMAL); cam_periph_unlock(periph); return; From owner-p4-projects@FreeBSD.ORG Sun Oct 25 13:49:11 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 53BBE1065694; Sun, 25 Oct 2009 13:49:11 +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 168C7106568D for ; Sun, 25 Oct 2009 13:49:11 +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 D38FD8FC18 for ; Sun, 25 Oct 2009 13:49:10 +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 n9PDnADL019022 for ; Sun, 25 Oct 2009 13:49:10 GMT (envelope-from yohanes@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9PDn8XC019016 for perforce@freebsd.org; Sun, 25 Oct 2009 13:49:08 GMT (envelope-from yohanes@FreeBSD.org) Date: Sun, 25 Oct 2009 13:49:08 GMT Message-Id: <200910251349.n9PDn8XC019016@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 169800 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, 25 Oct 2009 13:49:11 -0000 http://p4web.freebsd.org/chv.cgi?CH=169800 Change 169800 by yohanes@econa on 2009/10/25 13:48:30 code cleanup Affected files ... .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/bsdl-gpl/article.sgml#2 integrate .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/contributing/article.sgml#2 integrate .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/linux-users/article.sgml#2 integrate .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/nanobsd/article.sgml#2 integrate .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/new-users/article.sgml#2 integrate .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.sgml#3 integrate .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/mirrors/chapter.sgml#2 integrate .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/multimedia/chapter.sgml#4 integrate .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/printing/chapter.sgml#2 integrate .. //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/x11/chapter.sgml#4 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#4 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#7 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#2 integrate .. //depot/projects/str91xx/doc/hu_HU.ISO8859-2/books/faq/book.sgml#3 integrate .. //depot/projects/str91xx/doc/mn_MN.UTF-8/books/handbook/printing/chapter.sgml#2 integrate .. //depot/projects/str91xx/doc/nl_NL.ISO8859-1/books/handbook/printing/chapter.sgml#2 integrate .. //depot/projects/str91xx/doc/ru_RU.KOI8-R/articles/Makefile#2 integrate .. //depot/projects/str91xx/doc/ru_RU.KOI8-R/articles/geom-class/Makefile#1 branch .. //depot/projects/str91xx/doc/ru_RU.KOI8-R/articles/geom-class/article.sgml#1 branch .. //depot/projects/str91xx/doc/ru_RU.KOI8-R/books/handbook/x11/chapter.sgml#2 integrate .. //depot/projects/str91xx/doc/share/pgpkeys/philip.key#2 integrate .. //depot/projects/str91xx/ports/LEGAL#4 integrate .. //depot/projects/str91xx/ports/MOVED#10 integrate .. //depot/projects/str91xx/ports/Makefile#3 integrate .. //depot/projects/str91xx/ports/Mk/bsd.gcc.mk#6 integrate .. //depot/projects/str91xx/ports/Mk/bsd.ruby.mk#3 integrate .. //depot/projects/str91xx/ports/UPDATING#8 integrate .. //depot/projects/str91xx/src/Makefile.inc1#4 integrate .. //depot/projects/str91xx/src/ObsoleteFiles.inc#6 integrate .. //depot/projects/str91xx/src/bin/cat/Makefile#2 integrate .. //depot/projects/str91xx/src/bin/csh/iconv_stub.c#2 integrate .. //depot/projects/str91xx/src/bin/ls/ls.c#2 integrate .. //depot/projects/str91xx/src/bin/sh/parser.c#4 integrate .. //depot/projects/str91xx/src/bin/sh/sh.1#5 integrate .. //depot/projects/str91xx/src/bin/uuidgen/Makefile#2 integrate .. //depot/projects/str91xx/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 integrate .. //depot/projects/str91xx/src/contrib/gcc/config/i386/i386.c#2 integrate .. //depot/projects/str91xx/src/contrib/openpam/doc/man/pam.conf.5#2 integrate .. //depot/projects/str91xx/src/crypto/openssh/sshd_config#3 integrate .. //depot/projects/str91xx/src/etc/defaults/rc.conf#7 integrate .. //depot/projects/str91xx/src/etc/gettytab#2 integrate .. //depot/projects/str91xx/src/etc/rc.d/bgfsck#2 integrate .. //depot/projects/str91xx/src/etc/rc.d/cleartmp#2 integrate .. //depot/projects/str91xx/src/etc/rc.d/faith#3 integrate .. //depot/projects/str91xx/src/etc/rc.d/fsck#3 integrate .. //depot/projects/str91xx/src/etc/rc.d/hostid#3 integrate .. //depot/projects/str91xx/src/etc/rc.d/hostname#2 integrate .. //depot/projects/str91xx/src/etc/rc.d/ldconfig#2 integrate .. //depot/projects/str91xx/src/etc/rc.d/motd#2 integrate .. //depot/projects/str91xx/src/etc/rc.d/mountcritlocal#2 integrate .. //depot/projects/str91xx/src/etc/rc.d/moused#3 integrate .. //depot/projects/str91xx/src/etc/rc.d/netif#5 integrate .. //depot/projects/str91xx/src/etc/rc.d/netoptions#4 integrate .. //depot/projects/str91xx/src/etc/rc.d/newsyslog#2 integrate .. //depot/projects/str91xx/src/etc/rc.d/nfsclient#2 integrate .. //depot/projects/str91xx/src/etc/rc.d/pf#3 integrate .. //depot/projects/str91xx/src/etc/rc.d/savecore#2 integrate .. //depot/projects/str91xx/src/etc/rc.d/stf#3 integrate .. //depot/projects/str91xx/src/etc/rc.subr#6 integrate .. //depot/projects/str91xx/src/games/number/Makefile#2 integrate .. //depot/projects/str91xx/src/games/number/number.c#2 integrate .. //depot/projects/str91xx/src/kerberos5/lib/libgssapi_krb5/Makefile#2 integrate .. //depot/projects/str91xx/src/kerberos5/lib/libgssapi_spnego/Makefile#2 integrate .. //depot/projects/str91xx/src/lib/libc/gen/errlst.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/gen/getcwd.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/gen/wordexp.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/include/namespace.h#2 integrate .. //depot/projects/str91xx/src/lib/libc/include/un-namespace.h#2 integrate .. //depot/projects/str91xx/src/lib/libc/nls/C.msg#2 integrate .. //depot/projects/str91xx/src/lib/libc/sys/Symbol.map#3 integrate .. //depot/projects/str91xx/src/lib/libc/sys/intro.2#3 integrate .. //depot/projects/str91xx/src/lib/libc/sys/nanosleep.2#2 integrate .. //depot/projects/str91xx/src/lib/libfetch/common.c#2 integrate .. //depot/projects/str91xx/src/lib/libthr/pthread.map#2 integrate .. //depot/projects/str91xx/src/lib/libthr/thread/thr_private.h#2 integrate .. //depot/projects/str91xx/src/lib/libthr/thread/thr_syscalls.c#2 integrate .. //depot/projects/str91xx/src/lib/libusb/libusb20_ugen20.c#4 integrate .. //depot/projects/str91xx/src/libexec/rtld-elf/rtld.c#3 integrate .. //depot/projects/str91xx/src/release/doc/README#2 integrate .. //depot/projects/str91xx/src/release/doc/en_US.ISO8859-1/errata/article.sgml#2 integrate .. //depot/projects/str91xx/src/release/doc/share/mk/doc.relnotes.mk#2 integrate .. //depot/projects/str91xx/src/release/doc/share/sgml/release.dsl#2 integrate .. //depot/projects/str91xx/src/release/doc/share/sgml/release.ent#2 integrate .. //depot/projects/str91xx/src/release/scripts/package-split.py#4 integrate .. //depot/projects/str91xx/src/sbin/Makefile.inc#2 integrate .. //depot/projects/str91xx/src/sbin/adjkerntz/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/atacontrol/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/atm/atmconfig/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/badsect/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/bsdlabel/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/camcontrol/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/ccdconfig/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/clri/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/comcontrol/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/conscontrol/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/dhclient/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/dhclient/bpf.c#2 integrate .. //depot/projects/str91xx/src/sbin/dhclient/dhcpd.h#2 integrate .. //depot/projects/str91xx/src/sbin/dhclient/packet.c#2 integrate .. //depot/projects/str91xx/src/sbin/dmesg/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/dump/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/dumpfs/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/dumpfs/dumpfs.c#2 integrate .. //depot/projects/str91xx/src/sbin/dumpon/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/geom/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/geom/Makefile.inc#2 integrate .. //depot/projects/str91xx/src/sbin/geom/class/part/gpart.8#2 integrate .. //depot/projects/str91xx/src/sbin/ggate/Makefile.inc#2 integrate .. //depot/projects/str91xx/src/sbin/growfs/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/gvinum/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/ifconfig/af_nd6.c#2 integrate .. //depot/projects/str91xx/src/sbin/ifconfig/ifieee80211.c#3 integrate .. //depot/projects/str91xx/src/sbin/init/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/ipf/Makefile.inc#2 integrate .. //depot/projects/str91xx/src/sbin/iscontrol/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/kldunload/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/ldconfig/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/md5/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/mdconfig/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/mdmfs/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/mksnap_ffs/Makefile#3 integrate .. //depot/projects/str91xx/src/sbin/mount/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/mount_autofs/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/mount_cd9660/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/mount_ext2fs/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/mount_msdosfs/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/mount_nullfs/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/mount_reiserfs/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/mount_unionfs/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/newfs_msdos/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/nfsiod/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/pfctl/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/rcorder/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/reboot/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/recoverdisk/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/routed/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/savecore/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/sconfig/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/shutdown/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/spppcontrol/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/swapon/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/sysctl/sysctl.c#3 integrate .. //depot/projects/str91xx/src/sbin/tunefs/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/tunefs/tunefs.8#2 integrate .. //depot/projects/str91xx/src/share/man/man4/Makefile#6 integrate .. //depot/projects/str91xx/src/share/man/man4/atapicam.4#2 integrate .. //depot/projects/str91xx/src/share/man/man4/bce.4#2 integrate .. //depot/projects/str91xx/src/share/man/man4/bge.4#2 integrate .. //depot/projects/str91xx/src/share/man/man4/hifn.4#2 integrate .. //depot/projects/str91xx/src/share/man/man4/ichwd.4#2 integrate .. //depot/projects/str91xx/src/share/man/man4/lindev.4#2 integrate .. //depot/projects/str91xx/src/share/man/man4/mac_mls.4#2 integrate .. //depot/projects/str91xx/src/share/man/man4/malo.4#2 integrate .. //depot/projects/str91xx/src/share/man/man4/sbp_targ.4#2 integrate .. //depot/projects/str91xx/src/share/man/man4/targ.4#2 integrate .. //depot/projects/str91xx/src/share/man/man4/umass.4#2 integrate .. //depot/projects/str91xx/src/share/man/man4/urtw.4#4 integrate .. //depot/projects/str91xx/src/share/man/man9/BUS_BIND_INTR.9#1 branch .. //depot/projects/str91xx/src/share/man/man9/BUS_DESCRIBE_INTR.9#1 branch .. //depot/projects/str91xx/src/share/man/man9/Makefile#7 integrate .. //depot/projects/str91xx/src/share/misc/bsd-family-tree#4 integrate .. //depot/projects/str91xx/src/share/misc/committers-src.dot#4 integrate .. //depot/projects/str91xx/src/share/mk/bsd.sys.mk#2 integrate .. //depot/projects/str91xx/src/share/zoneinfo/Makefile#2 integrate .. //depot/projects/str91xx/src/share/zoneinfo/asia#6 integrate .. //depot/projects/str91xx/src/share/zoneinfo/australasia#4 integrate .. //depot/projects/str91xx/src/sys/amd64/acpica/acpi_machdep.c#5 integrate .. //depot/projects/str91xx/src/sys/amd64/acpica/acpi_wakecode.S#2 integrate .. //depot/projects/str91xx/src/sys/amd64/acpica/acpi_wakeup.c#3 integrate .. //depot/projects/str91xx/src/sys/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/str91xx/src/sys/amd64/amd64/nexus.c#2 integrate .. //depot/projects/str91xx/src/sys/amd64/amd64/pmap.c#7 integrate .. //depot/projects/str91xx/src/sys/amd64/conf/GENERIC#5 integrate .. //depot/projects/str91xx/src/sys/amd64/include/atomic.h#3 integrate .. //depot/projects/str91xx/src/sys/amd64/include/elf.h#2 integrate .. //depot/projects/str91xx/src/sys/amd64/include/intr_machdep.h#3 integrate .. //depot/projects/str91xx/src/sys/arm/arm/pmap.c#6 integrate .. //depot/projects/str91xx/src/sys/arm/conf/HL200#2 integrate .. //depot/projects/str91xx/src/sys/arm/conf/KB920X#2 integrate .. //depot/projects/str91xx/src/sys/arm/econa/econa.c#3 edit .. //depot/projects/str91xx/src/sys/arm/econa/econa_machdep.c#5 edit .. //depot/projects/str91xx/src/sys/arm/econa/econa_reg.h#2 edit .. //depot/projects/str91xx/src/sys/arm/econa/econa_var.h#2 edit .. //depot/projects/str91xx/src/sys/arm/econa/if_ece.c#8 edit .. //depot/projects/str91xx/src/sys/arm/econa/if_ece.h#3 edit .. //depot/projects/str91xx/src/sys/arm/econa/if_ecereg.h#1 add .. //depot/projects/str91xx/src/sys/arm/econa/if_ecevar.h#1 add .. //depot/projects/str91xx/src/sys/arm/econa/timer.c#5 edit .. //depot/projects/str91xx/src/sys/arm/include/elf.h#2 integrate .. //depot/projects/str91xx/src/sys/arm/mv/mv_machdep.c#4 integrate .. //depot/projects/str91xx/src/sys/boot/i386/zfsboot/zfsboot.c#2 integrate .. //depot/projects/str91xx/src/sys/boot/zfs/zfs.c#2 integrate .. //depot/projects/str91xx/src/sys/boot/zfs/zfsimpl.c#2 integrate .. //depot/projects/str91xx/src/sys/cam/ata/ata_da.c#3 integrate .. //depot/projects/str91xx/src/sys/cam/ata/ata_pmp.c#1 branch .. //depot/projects/str91xx/src/sys/cam/ata/ata_xpt.c#4 integrate .. //depot/projects/str91xx/src/sys/cam/cam.h#3 integrate .. //depot/projects/str91xx/src/sys/cam/cam_periph.c#4 integrate .. //depot/projects/str91xx/src/sys/cam/cam_queue.c#2 integrate .. //depot/projects/str91xx/src/sys/cam/cam_queue.h#2 integrate .. //depot/projects/str91xx/src/sys/cam/cam_xpt.c#5 integrate .. //depot/projects/str91xx/src/sys/cam/cam_xpt_internal.h#3 integrate .. //depot/projects/str91xx/src/sys/cam/scsi/scsi_all.c#3 integrate .. //depot/projects/str91xx/src/sys/cam/scsi/scsi_cd.c#4 integrate .. //depot/projects/str91xx/src/sys/cam/scsi/scsi_ch.c#3 integrate .. //depot/projects/str91xx/src/sys/cam/scsi/scsi_da.c#5 integrate .. //depot/projects/str91xx/src/sys/cam/scsi/scsi_low.c#2 integrate .. //depot/projects/str91xx/src/sys/cam/scsi/scsi_pt.c#3 integrate .. //depot/projects/str91xx/src/sys/cam/scsi/scsi_sa.c#3 integrate .. //depot/projects/str91xx/src/sys/cam/scsi/scsi_targ_bh.c#2 integrate .. //depot/projects/str91xx/src/sys/cam/scsi/scsi_target.c#5 integrate .. //depot/projects/str91xx/src/sys/cam/scsi/scsi_xpt.c#2 integrate .. //depot/projects/str91xx/src/sys/cddl/boot/zfs/zfsimpl.h#2 integrate .. //depot/projects/str91xx/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#2 integrate .. //depot/projects/str91xx/src/sys/cddl/compat/opensolaris/sys/policy.h#2 integrate .. //depot/projects/str91xx/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate .. //depot/projects/str91xx/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#7 integrate .. //depot/projects/str91xx/src/sys/compat/x86bios/x86bios.c#3 integrate .. //depot/projects/str91xx/src/sys/compat/x86bios/x86bios.h#3 integrate .. //depot/projects/str91xx/src/sys/compat/x86bios/x86bios_alloc.c#3 delete .. //depot/projects/str91xx/src/sys/conf/NOTES#6 integrate .. //depot/projects/str91xx/src/sys/conf/files#9 integrate .. //depot/projects/str91xx/src/sys/conf/files.amd64#6 integrate .. //depot/projects/str91xx/src/sys/conf/files.i386#7 integrate .. //depot/projects/str91xx/src/sys/conf/options#7 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/changes.txt#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/common/adfile.c#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/common/adisasm.c#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/common/adwalk.c#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/common/dmextern.c#1 branch .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/common/dmtable.c#4 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/common/getopt.c#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/compiler/aslload.c#4 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/debugger/dbcmds.c#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/debugger/dbinput.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/disassembler/dmutils.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/disassembler/dmwalk.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/dispatcher/dswload.c#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/events/evregion.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/include/acapps.h#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/include/acdebug.h#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/include/acdisasm.h#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/include/acglobal.h#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/include/aclocal.h#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/include/acpixf.h#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/namespace/nsrepair.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/acpica/utilities/utglobal.c#3 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/iwn/LICENSE#2 integrate .. //depot/projects/str91xx/src/sys/contrib/dev/iwn/iwlwifi-4965-228.57.2.23.fw.uu#1 branch .. //depot/projects/str91xx/src/sys/contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu#2 delete .. //depot/projects/str91xx/src/sys/contrib/dev/iwn/iwlwifi-5000-5.4.A.11.fw.uu#1 branch .. //depot/projects/str91xx/src/sys/contrib/dev/iwn/iwlwifi-5150-8.24.2.2.fw.uu#1 branch .. //depot/projects/str91xx/src/sys/contrib/x86emu/x86emu_util.c#3 delete .. //depot/projects/str91xx/src/sys/dev/agp/agp_i810.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ahci/ahci.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ahci/ahci.h#3 integrate .. //depot/projects/str91xx/src/sys/dev/aic7xxx/aicasm/aicasm.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/ata/atapi-cd.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ata/atapi-fd.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/ata/atapi-tape.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/ath/ath_hal/ah_eeprom_v4k.c#1 branch .. //depot/projects/str91xx/src/sys/dev/ath/ath_hal/ah_eeprom_v4k.h#1 branch .. //depot/projects/str91xx/src/sys/dev/atkbdc/atkbd.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/bce/if_bce.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/bce/if_bcereg.h#3 integrate .. //depot/projects/str91xx/src/sys/dev/bge/if_bge.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/dpms/dpms.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/drm/drm_pciids.h#5 integrate .. //depot/projects/str91xx/src/sys/dev/drm/i915_drv.h#3 integrate .. //depot/projects/str91xx/src/sys/dev/drm/mach64_state.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/fb/vesa.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/fb/vesa.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/fdc/fdc.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/gem/if_gem_pci.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/hwpmc/hwpmc_core.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/hwpmc/hwpmc_mod.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ips/ips_disk.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/iwn/if_iwn.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/iwn/if_iwnreg.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/iwn/if_iwnvar.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/mpt/mpt.h#3 integrate .. //depot/projects/str91xx/src/sys/dev/mpt/mpt_cam.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/mpt/mpt_raid.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/mwl/if_mwl_pci.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/mxge/if_mxge.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/mxge/if_mxge_var.h#5 integrate .. //depot/projects/str91xx/src/sys/dev/pci/pci.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/pci/vga_pci.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/ppbus/lpt.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/ppbus/pcfclock.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/siis/siis.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/syscons/syscons.c#6 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/ehci.c#6 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/ehci.h#3 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/ehci_ixp4xx.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/ehci_mbus.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/ehci_pci.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/ehcireg.h#1 branch .. //depot/projects/str91xx/src/sys/dev/usb/controller/ohci.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/ohci.h#3 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/ohci_atmelarm.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/ohci_pci.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/ohcireg.h#1 branch .. //depot/projects/str91xx/src/sys/dev/usb/controller/uhci.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/uhci.h#3 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/uhci_pci.c#3 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/uhcireg.h#1 branch .. //depot/projects/str91xx/src/sys/dev/usb/input/ukbd.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/usb/input/ums.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/net/if_cdce.c#6 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/uch341.c#2 delete .. //depot/projects/str91xx/src/sys/dev/usb/serial/uchcom.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/usb/storage/umass.c#7 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usbdevs#7 integrate .. //depot/projects/str91xx/src/sys/dev/usb/wlan/if_rum.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/usb/wlan/if_uath.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/wlan/if_upgt.c#5 integrate .. //depot/projects/str91xx/src/sys/dev/usb/wlan/if_ural.c#4 integrate .. //depot/projects/str91xx/src/sys/dev/usb/wlan/if_urtw.c#6 integrate .. //depot/projects/str91xx/src/sys/dev/usb/wlan/if_urtwreg.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/wlan/if_urtwvar.h#3 integrate .. //depot/projects/str91xx/src/sys/dev/usb/wlan/if_zyd.c#5 integrate .. //depot/projects/str91xx/src/sys/fs/nfsclient/nfs_clport.c#4 integrate .. //depot/projects/str91xx/src/sys/fs/nfsclient/nfs_clstate.c#4 integrate .. //depot/projects/str91xx/src/sys/fs/nfsclient/nfs_clsubs.c#3 integrate .. //depot/projects/str91xx/src/sys/fs/tmpfs/tmpfs.h#2 integrate .. //depot/projects/str91xx/src/sys/fs/tmpfs/tmpfs_subr.c#3 integrate .. //depot/projects/str91xx/src/sys/fs/tmpfs/tmpfs_vnops.c#5 integrate .. //depot/projects/str91xx/src/sys/geom/concat/g_concat.c#2 integrate .. //depot/projects/str91xx/src/sys/geom/label/g_label.c#4 integrate .. //depot/projects/str91xx/src/sys/geom/part/g_part.c#4 integrate .. //depot/projects/str91xx/src/sys/geom/part/g_part_gpt.c#3 integrate .. //depot/projects/str91xx/src/sys/geom/shsec/g_shsec.c#2 integrate .. //depot/projects/str91xx/src/sys/geom/stripe/g_stripe.c#3 integrate .. //depot/projects/str91xx/src/sys/geom/uzip/g_uzip.c#2 integrate .. //depot/projects/str91xx/src/sys/i386/conf/GENERIC#5 integrate .. //depot/projects/str91xx/src/sys/i386/conf/NOTES#7 integrate .. //depot/projects/str91xx/src/sys/i386/i386/intr_machdep.c#3 integrate .. //depot/projects/str91xx/src/sys/i386/i386/nexus.c#2 integrate .. //depot/projects/str91xx/src/sys/i386/i386/pmap.c#5 integrate .. //depot/projects/str91xx/src/sys/i386/include/atomic.h#3 integrate .. //depot/projects/str91xx/src/sys/i386/include/elf.h#2 integrate .. //depot/projects/str91xx/src/sys/i386/include/intr_machdep.h#3 integrate .. //depot/projects/str91xx/src/sys/i386/xen/pmap.c#4 integrate .. //depot/projects/str91xx/src/sys/ia64/ia64/pmap.c#3 integrate .. //depot/projects/str91xx/src/sys/ia64/include/asm.h#2 integrate .. //depot/projects/str91xx/src/sys/ia64/include/elf.h#2 integrate .. //depot/projects/str91xx/src/sys/kern/bus_if.m#3 integrate .. //depot/projects/str91xx/src/sys/kern/imgact_elf.c#5 integrate .. //depot/projects/str91xx/src/sys/kern/init_main.c#5 integrate .. //depot/projects/str91xx/src/sys/kern/kern_event.c#6 integrate .. //depot/projects/str91xx/src/sys/kern/kern_exec.c#5 integrate .. //depot/projects/str91xx/src/sys/kern/kern_exit.c#5 integrate .. //depot/projects/str91xx/src/sys/kern/kern_intr.c#3 integrate .. //depot/projects/str91xx/src/sys/kern/kern_ktrace.c#3 integrate .. //depot/projects/str91xx/src/sys/kern/kern_shutdown.c#6 integrate .. //depot/projects/str91xx/src/sys/kern/kern_sig.c#5 integrate .. //depot/projects/str91xx/src/sys/kern/kern_thr.c#4 integrate .. //depot/projects/str91xx/src/sys/kern/sched_ule.c#4 integrate .. //depot/projects/str91xx/src/sys/kern/stack_protector.c#2 integrate .. //depot/projects/str91xx/src/sys/kern/subr_bus.c#6 integrate .. //depot/projects/str91xx/src/sys/kern/subr_taskqueue.c#3 integrate .. //depot/projects/str91xx/src/sys/kern/subr_trap.c#3 integrate .. //depot/projects/str91xx/src/sys/kern/sys_process.c#3 integrate .. //depot/projects/str91xx/src/sys/kern/tty.c#5 integrate .. //depot/projects/str91xx/src/sys/kern/tty_ttydisc.c#4 integrate .. //depot/projects/str91xx/src/sys/mips/include/elf.h#2 integrate .. //depot/projects/str91xx/src/sys/mips/mips/pmap.c#3 integrate .. //depot/projects/str91xx/src/sys/modules/Makefile#8 integrate .. //depot/projects/str91xx/src/sys/modules/cam/Makefile#3 integrate .. //depot/projects/str91xx/src/sys/modules/dpms/Makefile#3 integrate .. //depot/projects/str91xx/src/sys/modules/iwnfw/Makefile#2 integrate .. //depot/projects/str91xx/src/sys/modules/nfsclient/Makefile#3 integrate .. //depot/projects/str91xx/src/sys/modules/pf/Makefile#3 integrate .. //depot/projects/str91xx/src/sys/modules/ubser/Makefile#2 integrate .. //depot/projects/str91xx/src/sys/modules/usb/Makefile#5 integrate .. //depot/projects/str91xx/src/sys/modules/usb/uch341/Makefile#2 delete .. //depot/projects/str91xx/src/sys/modules/usb/ucom/Makefile#2 integrate .. //depot/projects/str91xx/src/sys/modules/vesa/Makefile#3 integrate .. //depot/projects/str91xx/src/sys/modules/x86bios/Makefile#2 integrate .. //depot/projects/str91xx/src/sys/net/bpf.c#5 integrate .. //depot/projects/str91xx/src/sys/net/flowtable.c#5 integrate .. //depot/projects/str91xx/src/sys/net/if_bridge.c#4 integrate .. //depot/projects/str91xx/src/sys/net/if_enc.c#3 integrate .. //depot/projects/str91xx/src/sys/net/if_ethersubr.c#3 integrate .. //depot/projects/str91xx/src/sys/net/if_gif.c#3 integrate .. //depot/projects/str91xx/src/sys/net/pfil.c#2 integrate .. //depot/projects/str91xx/src/sys/net/pfil.h#3 integrate .. //depot/projects/str91xx/src/sys/net80211/ieee80211_hwmp.c#3 integrate .. //depot/projects/str91xx/src/sys/net80211/ieee80211_mesh.c#3 integrate .. //depot/projects/str91xx/src/sys/net80211/ieee80211_mesh.h#3 integrate .. //depot/projects/str91xx/src/sys/net80211/ieee80211_output.c#3 integrate .. //depot/projects/str91xx/src/sys/net80211/ieee80211_proto.h#4 integrate .. //depot/projects/str91xx/src/sys/netgraph/ng_bridge.c#3 integrate .. //depot/projects/str91xx/src/sys/netinet/if_ether.c#5 integrate .. //depot/projects/str91xx/src/sys/netinet/in.c#7 integrate .. //depot/projects/str91xx/src/sys/netinet/ip_fastfwd.c#4 integrate .. //depot/projects/str91xx/src/sys/netinet/ip_icmp.c#3 integrate .. //depot/projects/str91xx/src/sys/netinet/ip_input.c#3 integrate .. //depot/projects/str91xx/src/sys/netinet/ip_output.c#4 integrate .. //depot/projects/str91xx/src/sys/netinet/ip_var.h#3 integrate .. //depot/projects/str91xx/src/sys/netinet/ipfw/ip_fw2.c#3 integrate .. //depot/projects/str91xx/src/sys/netinet/ipfw/ip_fw_pfil.c#3 integrate .. //depot/projects/str91xx/src/sys/netinet/raw_ip.c#4 integrate .. //depot/projects/str91xx/src/sys/netinet/sctp_bsd_addr.c#4 integrate .. //depot/projects/str91xx/src/sys/netinet/sctp_os_bsd.h#5 integrate .. //depot/projects/str91xx/src/sys/netinet/sctp_output.c#5 integrate .. //depot/projects/str91xx/src/sys/netinet/sctp_pcb.c#6 integrate .. //depot/projects/str91xx/src/sys/netinet6/icmp6.c#6 integrate .. //depot/projects/str91xx/src/sys/netinet6/in6.c#7 integrate .. //depot/projects/str91xx/src/sys/netinet6/in6_ifattach.c#7 integrate .. //depot/projects/str91xx/src/sys/netinet6/ip6_forward.c#3 integrate .. //depot/projects/str91xx/src/sys/netinet6/ip6_input.c#6 integrate .. //depot/projects/str91xx/src/sys/netinet6/ip6_output.c#4 integrate .. //depot/projects/str91xx/src/sys/netinet6/ip6_var.h#3 integrate .. //depot/projects/str91xx/src/sys/nfsclient/nfs_kdtrace.c#2 integrate .. //depot/projects/str91xx/src/sys/nfsclient/nfs_vnops.c#4 integrate .. //depot/projects/str91xx/src/sys/nlm/nlm.h#2 integrate .. //depot/projects/str91xx/src/sys/nlm/nlm_prot_impl.c#4 integrate .. //depot/projects/str91xx/src/sys/nlm/nlm_prot_server.c#2 integrate .. //depot/projects/str91xx/src/sys/pc98/conf/GENERIC#4 integrate .. //depot/projects/str91xx/src/sys/powerpc/aim/clock.c#2 integrate .. //depot/projects/str91xx/src/sys/powerpc/aim/machdep.c#4 integrate .. //depot/projects/str91xx/src/sys/powerpc/aim/mmu_oea.c#3 integrate .. //depot/projects/str91xx/src/sys/powerpc/aim/mmu_oea64.c#3 integrate .. //depot/projects/str91xx/src/sys/powerpc/aim/mp_cpudep.c#2 integrate .. //depot/projects/str91xx/src/sys/powerpc/aim/platform_chrp.c#3 integrate .. //depot/projects/str91xx/src/sys/powerpc/aim/swtch.S#2 integrate .. //depot/projects/str91xx/src/sys/powerpc/aim/trap_subr.S#2 integrate .. //depot/projects/str91xx/src/sys/powerpc/booke/mp_cpudep.c#2 integrate .. //depot/projects/str91xx/src/sys/powerpc/booke/pmap.c#3 integrate .. //depot/projects/str91xx/src/sys/powerpc/include/elf.h#2 integrate .. //depot/projects/str91xx/src/sys/powerpc/include/pcpu.h#2 integrate .. //depot/projects/str91xx/src/sys/powerpc/include/pmap.h#3 integrate .. //depot/projects/str91xx/src/sys/powerpc/include/smp.h#3 integrate .. //depot/projects/str91xx/src/sys/powerpc/include/spr.h#3 integrate .. //depot/projects/str91xx/src/sys/powerpc/powerpc/cpu.c#4 integrate .. //depot/projects/str91xx/src/sys/powerpc/powerpc/mmu_if.m#2 integrate .. //depot/projects/str91xx/src/sys/powerpc/powerpc/mp_machdep.c#4 integrate .. //depot/projects/str91xx/src/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate .. //depot/projects/str91xx/src/sys/powerpc/powerpc/uio_machdep.c#2 integrate .. //depot/projects/str91xx/src/sys/sparc64/conf/GENERIC#4 integrate .. //depot/projects/str91xx/src/sys/sparc64/include/elf.h#2 integrate .. //depot/projects/str91xx/src/sys/sparc64/sparc64/pmap.c#3 integrate .. //depot/projects/str91xx/src/sys/sun4v/include/elf.h#2 integrate .. //depot/projects/str91xx/src/sys/sun4v/sun4v/pmap.c#3 integrate .. //depot/projects/str91xx/src/sys/sys/bus.h#6 integrate .. //depot/projects/str91xx/src/sys/sys/errno.h#2 integrate .. //depot/projects/str91xx/src/sys/sys/interrupt.h#2 integrate .. //depot/projects/str91xx/src/sys/sys/kernel.h#4 integrate .. //depot/projects/str91xx/src/sys/sys/ktrace.h#2 integrate .. //depot/projects/str91xx/src/sys/sys/signalvar.h#3 integrate .. //depot/projects/str91xx/src/sys/sys/ttyqueue.h#2 integrate .. //depot/projects/str91xx/src/sys/teken/sequences#3 integrate .. //depot/projects/str91xx/src/sys/teken/teken.c#3 integrate .. //depot/projects/str91xx/src/sys/teken/teken_subr.h#3 integrate .. //depot/projects/str91xx/src/sys/tools/fw_stub.awk#2 integrate .. //depot/projects/str91xx/src/sys/tools/makeobjops.awk#2 integrate .. //depot/projects/str91xx/src/sys/vm/pmap.h#3 integrate .. //depot/projects/str91xx/src/sys/vm/swap_pager.c#3 integrate .. //depot/projects/str91xx/src/sys/vm/vm_extern.h#4 integrate .. //depot/projects/str91xx/src/sys/vm/vm_glue.c#4 integrate .. //depot/projects/str91xx/src/tools/regression/fstest/tests/rename/21.t#2 integrate .. //depot/projects/str91xx/src/tools/regression/lib/libc/gen/test-wordexp.c#2 integrate .. //depot/projects/str91xx/src/tools/regression/lib/libutil/test-flopen.c#3 integrate .. //depot/projects/str91xx/src/tools/regression/sigqueue/sigqtest1/sigqtest1.c#2 integrate .. //depot/projects/str91xx/src/tools/regression/sigqueue/sigqtest2/sigqtest2.c#2 integrate .. //depot/projects/str91xx/src/tools/regression/tmpfs/h_tools.c#2 integrate .. //depot/projects/str91xx/src/tools/tools/netrate/netsend/netsend.c#2 integrate .. //depot/projects/str91xx/src/usr.bin/locale/locale.c#3 integrate .. //depot/projects/str91xx/src/usr.bin/make/job.c#3 integrate .. //depot/projects/str91xx/src/usr.bin/make/main.c#2 integrate .. //depot/projects/str91xx/src/usr.bin/netstat/route.c#3 integrate .. //depot/projects/str91xx/src/usr.bin/systat/keyboard.c#2 integrate .. //depot/projects/str91xx/src/usr.bin/systat/main.c#2 integrate .. //depot/projects/str91xx/src/usr.bin/touch/touch.c#2 integrate .. //depot/projects/str91xx/src/usr.sbin/acpi/iasl/Makefile#3 integrate .. //depot/projects/str91xx/src/usr.sbin/cdcontrol/cdcontrol.c#2 integrate .. //depot/projects/str91xx/src/usr.sbin/jail/jail.8#4 integrate .. //depot/projects/str91xx/src/usr.sbin/ntp/doc/ntpd.8#2 integrate .. //depot/projects/str91xx/src/usr.sbin/sysinstall/tcpip.c#2 integrate .. //depot/projects/str91xx/src/usr.sbin/tzsetup/tzsetup.8#3 integrate .. //depot/projects/str91xx/src/usr.sbin/tzsetup/tzsetup.c#3 integrate .. //depot/projects/str91xx/www/de/administration.sgml#3 integrate .. //depot/projects/str91xx/www/de/developers.sgml#4 integrate .. //depot/projects/str91xx/www/de/share/sgml/news.xml#7 integrate .. //depot/projects/str91xx/www/en/administration.sgml#4 integrate .. //depot/projects/str91xx/www/en/internal/Makefile#2 integrate .. //depot/projects/str91xx/www/en/internal/i18n.sgml#1 branch .. //depot/projects/str91xx/www/en/internal/policies.sgml#2 integrate .. //depot/projects/str91xx/www/en/news/status/Makefile#3 integrate .. //depot/projects/str91xx/www/en/news/status/report-2009-04-2009-09.xml#2 integrate .. //depot/projects/str91xx/www/en/news/status/status.sgml#2 integrate .. //depot/projects/str91xx/www/en/platforms/ppc.sgml#2 integrate .. //depot/projects/str91xx/www/hu/administration.sgml#3 integrate .. //depot/projects/str91xx/www/hu/platforms/ppc.sgml#2 integrate .. //depot/projects/str91xx/www/hu/share/sgml/events.xml#4 integrate .. //depot/projects/str91xx/www/hu/share/sgml/news.xml#8 integrate .. //depot/projects/str91xx/www/nl/administration.sgml#2 integrate .. //depot/projects/str91xx/www/share/sgml/events.xml#4 integrate .. //depot/projects/str91xx/www/share/sgml/news.xml#8 integrate Differences ... ==== //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/bsdl-gpl/article.sgml#2 (text+ko) ==== @@ -36,7 +36,7 @@ - $FreeBSD: doc/el_GR.ISO8859-7/articles/bsdl-gpl/article.sgml,v 1.3 2008/11/13 08:46:29 keramida Exp $ + $FreeBSD: doc/el_GR.ISO8859-7/articles/bsdl-gpl/article.sgml,v 1.6 2009/10/23 23:38:32 keramida Exp $ &tm-attrib.freebsd; @@ -305,7 +305,7 @@ ðñüãñáììá ðïõ óõíäÝåôáé óôáôéêÜ (static linking) ìå Ýíá ðñüãñáììá ðïõ Ý÷åé Þäç Üäåéá GPL. Ï ðçãáßïò êþäéêáò ãéá êÜèå ðñüãñáììá ìå Üäåéá GPL ðñÝðåé íá åßíáé äéáèÝóéìïò óå êÜèå ÷ñÞóôç ôïõ ðñïãñÜììáôïò. Áíôßèåôá, ç - äõíáìéêÞ óýíäåóç ìå êþäéêá ðïõ äåí Ý÷åé Üäåéá GPL äå èåùñåßôáé ðáñáâßáóç + äõíáìéêÞ óýíäåóç ìå êþäéêá ðïõ Ý÷åé Üäåéá GPL äå èåùñåßôáé ðáñáâßáóç ôçò GPL. Ç ðßåóç íá äéáíÝìïíôáé áêüìá êáé åìðïñéêÜ ðñïãñÜììáôá ìå Üäåéá GPL Üñ÷éóå íá áõîÜíåôáé· åéäéêÜ ãéá ðñïãñÜììáôá ðïõ Ýðñåðå íá óõíäÝïíôáé ìå âéâëéïèÞêåò ôïõ óõóôÞìáôïò. Áõôü ïäÞãçóå óôç äçìéïõñãßá ìéáò @@ -336,7 +336,7 @@ óõóôÞìáôá êáé åôáéñåßåò ãéá ëüãïõò ðÝñá áðü ôïí Ýëåã÷ü ôïõò. Äåêáåôßåò åìðåéñßáò Ý÷ïõí äåßîåé üôé ôï ðñïóùñéíü ìÝãåèïò Þ ç åðéôõ÷ßá ìéáò åôáéñåßáò äåí ðáñÝ÷ïõí êáìßá åããýçóç ó÷åôéêÜ ìå ôç äéáèåóéìüôçôá ôïõ - ëïãéìéêïý ôçò åôáéñåßáò. Êáèþò áëëÜæïõí ïé óõíèÞêåò ôçò áãïñÜò Þ ïé + ëïãéóìéêïý ôçò åôáéñåßáò. Êáèþò áëëÜæïõí ïé óõíèÞêåò ôçò áãïñÜò Þ ïé óôñáôçãéêÝò ôùí åôáéñåéþí — ðïëëÝò öïñÝò ìå ðïëý ãñÞãïñï ñõèìü — ôá ðñïãñÜììáôá ìðïñåß íá ðÜøïõí íá åßíáé äéáèÝóéìá ãéá ïðïéïäÞðïôå ëüãï. @@ -437,11 +437,11 @@ óýíäåóç ìå ôïí GPL êþäéêá ôïõ Linux, áëëÜ âáóßæïíôáé óå Ýíá äõíáìéêü API.) - Ç GPL ðáïóðáèåß íá ðåßóåé ôïõò ðñïãñáììáôéóôÝò íá óõíåéóöÝñïõí óå + Ç GPL ðñïóðáèåß íá ðåßóåé ôïõò ðñïãñáììáôéóôÝò íá óõíåéóöÝñïõí óå Ýíá óõíå÷þò åîåëéóóüìåíï óýíïëï ðñïãñáììÜôùí, ìå ðåñéèþñéï óõíáãùíéóìïý óôç äéáíïìÞ êáé ôçí ôå÷íéêÞ õðïóôÞñéîç áõôþí ôùí ðñïãñáììÜôùí. Áõôü äåí åßíáé ñåáëéóôéêü óåíÜñéï üìùò ãéá ðïëëÜ êáßñéá óõóôÞìáôá êáé ðñüôõðá, ôá - ïðïßá ìðïñåß íá åßíáé ÷ñÞóéìá óå ìåãÜëç ðïéêéëßá óõóôçìÜôùí êáé ìðïñåß + ïðïßá ìðïñåß íá åßíáé ÷ñÞóéìá óå ìåãÜëç ðïéêéëßá óõóôçìÜôùí êáé ôáõôü÷ñïíá íá áðáéôïýí åìðïñéêÝò åðåêôÜóåéò Þ ðñïóáñìïãÝò Þ åíóùìÜôùóç óå õðÜñ÷ïíôá ðñïãñÜììáôá ìå legacy ðñüôõðá êáé õðÜñ÷ïõóåò Üäåéåò, áóýìâáôåò ìå ôçí Üäåéá GPL. Ãéá ðáñÜäåéãìá, ôá real-time êáé ôá embedded óõóôÞìáôá @@ -449,7 +449,7 @@ áðïôåëïýí óïâáñü ðñüâëçìá ãéá åôáéñåßåò ïé ïðïßåò äñáóôçñéïðïéïýíôáé óå áõôü ôï ÷þñï. - Ç Üäåéá GPL åßíáé ìéá ðñïóðÜèåéá íá óõêñáôçèåß ç áíÜðôõîç ôïõ + Ç Üäåéá GPL åßíáé ìéá ðñïóðÜèåéá íá óõãêñáôçèåß ç áíÜðôõîç ôïõ ëïãéóìéêïý, áíåîÜñôçôá áðü ôç æÞôçóç ãéá Üëëïõ åßäïõò áðïôåëÝóìáôá, óå Ýíá óôÜäéï Ýñåõíáò êáé áíÜðôõîçò. Áõôü ìåãéóôïðïéåß ôá êÝñäç ãéá ôïõò ìåëåôçôÝò êáé ôïõò ðñïãñáììáôéóôÝò, áëëÜ ìðïñåß íá Ý÷åé Ýíá Üãíùóôïõ @@ -671,7 +671,7 @@ Åðßëïãïò Óå áíôßèåóç ìå ôçí Üäåéá GPL, ç ïðïßá Ý÷åé ó÷åäéáóôåß ãéá íá - åìðïäßóåé ìå êÜèå ôñüðï ôçí åìðïñéêÞ ÷ñÞóç ôïõ ëïãéóìéêïý, ç Üäåéåò + åìðïäßóåé ìå êÜèå ôñüðï ôçí åìðïñéêÞ ÷ñÞóç ôïõ ëïãéóìéêïý, ïé Üäåéåò ôýðïõ BSD Ý÷ïõí ðïëý ëßãåò áðáéôÞóåéò êáé üñïõò ãéá ïðïéáäÞðïôå ìåëëïíôéêÞ ÷ñÞóç ôïõ ëïãéóìéêïý. ¸ôóé ôï ëïãéóìéêü ìå Üäåéá BSD ìðïñåß íá ðáñáìåßíåé Open Source Þ íá åíóùìáôùèåß óå åìðïñéêÝò ëýóåéò, ==== //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/contributing/article.sgml#2 (text+ko) ==== @@ -5,7 +5,7 @@ The FreeBSD Greek Documentation Project %SOURCE% en_US.ISO8859-1/articles/contributing/article.sgml - %SRCID% 1.510 + %SRCID% 1.511 --> @@ -19,7 +19,7 @@ ÓõíåéóöÝñïíôáò óôï &os; - $FreeBSD: doc/el_GR.ISO8859-7/articles/contributing/article.sgml,v 1.2 2009/05/05 18:26:12 keramida Exp $ + $FreeBSD: doc/el_GR.ISO8859-7/articles/contributing/article.sgml,v 1.3 2009/10/08 21:01:16 keramida Exp $ Áõôü ôï Üñèñï ðåñéãñÜöåé äéÜöïñïõò ôñüðïõò ìå ôïõò ïðïßïõò ìðïñåß ==== //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/linux-users/article.sgml#2 (text+ko) ==== @@ -5,7 +5,7 @@ The FreeBSD Greek Documentation Project %SOURCE% en_US.ISO8859-1/articles/linux-users/article.sgml - %SRCID% 1.7 + %SRCID% 1.8 --> @@ -31,7 +31,7 @@ Ç ÏìÜäá Ôåêìçñßùóçò ôïõ &os; - $FreeBSD: doc/el_GR.ISO8859-7/articles/linux-users/article.sgml,v 1.3 2008/12/27 08:18:37 manolis Exp $ + $FreeBSD: doc/el_GR.ISO8859-7/articles/linux-users/article.sgml,v 1.4 2009/10/08 21:01:16 keramida Exp $ &tm-attrib.freebsd; ==== //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/nanobsd/article.sgml#2 (text+ko) ==== @@ -4,7 +4,7 @@ The FreeBSD Greek Documentation Project %SOURCE% en_US.ISO8859-1/articles/nanobsd/article.sgml - %SRCID% 1.4 + %SRCID% 1.5 --> @@ -29,7 +29,7 @@ - $FreeBSD: doc/el_GR.ISO8859-7/articles/nanobsd/article.sgml,v 1.1 2009/02/09 18:08:25 keramida Exp $ + $FreeBSD: doc/el_GR.ISO8859-7/articles/nanobsd/article.sgml,v 1.2 2009/10/08 21:02:56 keramida Exp $ 2006, 2009 @@ -254,8 +254,8 @@ Ïé ñõèìßóåéò ôïõ NanoBSD ìðïñïýí íá ÷ñçóéìïðïéçèïýí ãéá íá ïñéóôïýí ðñïóáñìïóìÝíåò åðéëïãÝò ìåôáãëþôôéóçò êáé åãêáôÜóôáóçò ôïõ &os;. ÁõôÝò ïé åðéëïãÝò - åðçñåÜæïõí ôá óôÜäéá buildworld - êáé installworld + åðçñåÜæïõí ôá óôÜäéá buildworld + êáé installworld ôïõ NanoBSD, êáèþò êáé Üëëåò åðéëïãÝò ôçò äçìéïõñãßáò ôïõ ôåëéêïý åéäþëïõ. Ìå ôéò êáôÜëëçëåò ñõèìßóåéò ôï NanoBSD ìðïñåß íá ìéêñýíåé áñêåôÜ óå @@ -292,21 +292,21 @@ CONF_BUILD — ÅðéëïãÝò ðïõ ðåñíïýí - óôï óôÜäéï buildworld ôçò ìåôáãëþôôéóçò ôïõ + óôï óôÜäéï buildworld ôçò ìåôáãëþôôéóçò ôïõ &os;. CONF_INSTALL — ÅðéëïãÝò ðïõ ðåñíïýí - óôï óôÜäéï installworld ôçò ðñïåôïéìáóßáò ôïõ + óôï óôÜäéï installworld ôçò ðñïåôïéìáóßáò ôïõ åéäþëïõ. CONF_WORLD — ÅðéëïãÝò ðïõ ðåñíïýí êáé óôá äýï óôÜäéá ôçò ðñïåôïéìáóßáò ôïõ åéäþëïõ, êáé - óôï buildworld êáé - óôï installworld. + óôï buildworld êáé + óôï installworld. ==== //depot/projects/str91xx/doc/el_GR.ISO8859-7/articles/new-users/article.sgml#2 (text+ko) ==== @@ -1,13 +1,13 @@ @@ -1098,6 +1098,7 @@ Local Variables: mode: sgml coding: iso-8859-7 + fill-column: 78 sgml-indent-data: t sgml-omittag: nil sgml-always-quote-attributes: t ==== //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.sgml#3 (text+ko) ==== @@ -4,10 +4,10 @@ The FreeBSD Greek Documentation Project - $FreeBSD: doc/el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.sgml,v 1.15 2009/08/13 21:01:22 manolis Exp $ + $FreeBSD: doc/el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.sgml,v 1.16 2009/10/07 19:53:21 manolis Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml - %SRCID% 1.244 + %SRCID% 1.245 --> @@ -737,11 +737,13 @@ Ý÷åé åêôåëåóôåß êáôÜ ôï ðáñåëèüí. Áí áõôÞ Þôáí ç ðñþôç öïñÜ ðïõ åêôåëïýíôáí, èá ãßíïíôáí áðëþò êáôÝâáóìá ôçò óõëëïãÞò. - ¼ôáí ôï &man.portsnap.8; åêôåëÝóåé åðéôõ÷þò ôçò ëåéôïõñãßá + ¼ôáí ôï &man.portsnap.8; åêôåëÝóåé åðéôõ÷þò ôç ëåéôïõñãßá fetch, ç ÓõëëïãÞ ôùí Ports êáé ôá áíôßóôïé÷á patches Ý÷ïõí áðïèçêåõèåß óôï ôïðéêü óýóôçìá êáé Ý÷åé ãßíåé - ç åðáëÞèåõóç ôïõò. Ôá åíçìåñùìÝíá áñ÷åßá ìðïñïýí íá åãêáôáóôáèïýí - ãñÜöïíôáò: + ç åðáëÞèåõóç ôïõò. Ôçí ðñþôç öïñÜ ðïõ èá åêôåëÝóåôå ôï + portsnap, ÷ñçóéìïðïéÞóôå ôï + extract ãéá íá åãêáôáóôÞóåôå ôá åíçìåñùìÝíá + áñ÷åßá: &prompt.root; portsnap extract /usr/ports/.cvsignore @@ -757,12 +759,19 @@ /usr/ports/Mk/bsd.cmake.mk ... + Óå êÜèå åêôÝëåóç ìåôÜ ôçí ðñþôç öïñÜ, ÷ñçóéìïðïéÞóôå ôï + update ìåôÜ ôçí åêôÝëåóç ôçò + portsnap fetch: + + &prompt.root; portsnap update + Ç äéáäéêáóßá Ý÷åé ðëÝïí ïëïêëçñùèåß, êáé ìðïñåßôå íá åãêáôáóôÞóåôå Þ íá áíáâáèìßóåôå åöáñìïãÝò ÷ñçóéìïðïéþíôáò ôçí åíçìåñùìÝíç ÓõëëïãÞ ôùí Ports. - Ãéá íá åêôåëÝóåôå êáé ôéò äýï äéáäéêáóßåò äéáäï÷éêÜ, äþóôå ôçí - ðáñáêÜôù åíôïëÞ: + Ìðïñåßôå íá åêôåëÝóåôå ôéò äéáäéêáóßåò fetch êáé + extract Þ update äéáäï÷éêÜ, üðùò + öáßíåôáé óôï ðáñáêÜôù ðáñÜäåéãìá: &prompt.root; portsnap fetch update ==== //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/mirrors/chapter.sgml#2 (text+ko) ==== @@ -4,10 +4,10 @@ The FreeBSD Greek Documentation Project - $FreeBSD: doc/el_GR.ISO8859-7/books/handbook/mirrors/chapter.sgml,v 1.15 2009/05/24 16:04:33 manolis Exp $ + $FreeBSD: doc/el_GR.ISO8859-7/books/handbook/mirrors/chapter.sgml,v 1.16 2009/10/19 20:18:04 manolis Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml - %SRCID% 1.464 + %SRCID% 1.467 --> @@ -2500,6 +2500,15 @@ + RELENG_8 + + + Ç ãñáììÞ áíÜðôõîçò ãéá ôï &os;-8.X, ãíùóôÞ åðßóçò êáé ùò + &os; 8-STABLE + + + + RELENG_7 ==== //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/multimedia/chapter.sgml#4 (text+ko) ==== @@ -4,10 +4,10 @@ The FreeBSD Greek Documentation Project - $FreeBSD: doc/el_GR.ISO8859-7/books/handbook/multimedia/chapter.sgml,v 1.8 2009/08/16 12:32:10 manolis Exp $ + $FreeBSD: doc/el_GR.ISO8859-7/books/handbook/multimedia/chapter.sgml,v 1.9 2009/10/07 19:53:22 manolis Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml - %SRCID% 1.134 + %SRCID% 1.135 --> @@ -1631,7 +1631,7 @@ óõóêåõÞ /dev/ugen0.2 Þ ôçí óõóêåõÞ /dev/uscanner0 áíÜëïãá ìå ôçí Ýêäïóç ôïõ &os; ðïõ ÷ñçóéìïðïéåßôáé. Óôï ðáñÜäåéãìá ìáò, ÷ñçóéìïðïéÞóáìå Ýíá - óáñùôÞ &epson.perfection; 1650 USB. + óáñùôÞ &epson.perfection; 1650 USB. @@ -1740,7 +1740,7 @@ device 'epson2:libusb:/dev/usb:/dev/ugen0.2' is a Epson GT-8200 flatbed scanner Ç ðáñáðÜíù Ýîïäïò ðñïÝñ÷åôáé áðü Ýíá óýóôçìá &os; 8.X êáé - ç ãñáììÞ `epson2:libusb:/dev/usb:/dev/ugen0.2' + ç ãñáììÞ 'epson2:libusb:/dev/usb:/dev/ugen0.2' ìáò ðëçñïöïñåß ãéá ôï üíïìá ôïõ backend (epson2) êáé ôï üíïìá ôçò óõóêåõÞò (/dev/ugen0.2) ðïõ ÷ñçóéìïðïéåß ï óáñùôÞò ìáò. @@ -1776,9 +1776,9 @@ Áöïý ï óáñùôÞò äåí áíáãíùñßóôçêå, èá ÷ñåéáóôåß íá åðåîåñãáóôïýìå ôï áñ÷åßï - /usr/local/etc/sane.d/epson2.conf. - Ôï ìïíôÝëï óáñùôÞ ðïõ ÷ñçóéìïðïéÞèçêå Þôáí ôï &epson.perfection; - 1650, Ýôóé îÝñïõìå üôé ï óáñùôÞò èá ÷ñçóéìïðïéåß ôï backend + /usr/local/etc/sane.d/epson2.conf. Ôï ìïíôÝëï + óáñùôÞ ðïõ ÷ñçóéìïðïéÞèçêå Þôáí ôï &epson.perfection; 1650, + Ýôóé îÝñïõìå üôé ï óáñùôÞò èá ÷ñçóéìïðïéåß ôï backend epson2. Âåâáéùèåßôå üôé äéáâÜóáôå ôá âïçèçôéêÜ ó÷üëéá óôá áñ÷åßá ñõèìßóåùí ôïõ backend. Åßíáé áñêåôÜ áðëü íá áëëÜîåôå ãñáììÝò: ÌåôáôñÝøôå óå ó÷üëéá üóåò ãñáììÝò äåß÷íïõí ëÜèïò @@ -1873,7 +1873,7 @@ add path ugen0.2 mode 660 group usb add path usb/0.2.0 mode 0660 group usb - Ãéá ôïõò ÷ñÞóôåò ôïõ &os; 7.X ÷ñåéÜæïíôáé ïé ðáñáêÜôù + Ïé ÷ñÞóôåò ôïõ &os; 7.X èá ÷ñåéáóôïýí ôéò ðáñáêÜôù ãñáììÝò, ìå ôï óùóôü áñ÷åßï óõóêåõÞò (ôéò ðåñéóóüôåñåò öïñÝò èá åßíáé ôï /dev/uscanner0): ==== //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/printing/chapter.sgml#2 (text+ko) ==== @@ -4,10 +4,10 @@ The FreeBSD Greek Documentation Project - $FreeBSD: doc/el_GR.ISO8859-7/books/handbook/printing/chapter.sgml,v 1.5 2008/12/08 03:10:53 keramida Exp $ + $FreeBSD: doc/el_GR.ISO8859-7/books/handbook/printing/chapter.sgml,v 1.6 2009/10/21 12:33:24 manolis Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/printing/chapter.sgml - %SRCID% 1.120 + %SRCID% 1.121 --> @@ -4908,6 +4908,24 @@ . + + + HPLIP + + HPLIP + + Ôï HPLIP, Þ Óýóôçìá Áðåéêüíéóçò + êáé Åêôýðùóçò ôçò HP ãéá &linux;, åßíáé ìéá óïõßôá åöáñìïãþí + ãéá óõóêåõÝò ôçò HP, ðïõ õðïóôçñßæåé ëåéôïõñãßåò üðùò ç åêôýðùóç, + ç óÜñùóç êáé ç áðïóôïëÞ / ëÞøç öáî. Ç óïõßôá áõôÞ ÷ñçóéìïðïéåß + ôï CUPS ùò backend ãéá êÜðïéåò áðü ôéò + ëåéôïõñãßåò åêôýðùóçò ðïõ ðáñÝ÷åé. + + Ç êýñéá äéêôõáêÞ ôïðïèåóßá ôçò åöáñìïãÞò + HPLIP åßíáé . + + ==== //depot/projects/str91xx/doc/el_GR.ISO8859-7/books/handbook/x11/chapter.sgml#4 (text+ko) ==== @@ -4,10 +4,10 @@ The FreeBSD Greek Documentation Project - $FreeBSD: doc/el_GR.ISO8859-7/books/handbook/x11/chapter.sgml,v 1.13 2009/08/28 18:53:28 manolis Exp $ + $FreeBSD: doc/el_GR.ISO8859-7/books/handbook/x11/chapter.sgml,v 1.14 2009/10/07 19:53:22 manolis Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/x11/chapter.sgml - %SRCID% 1.194 + %SRCID% 1.195 --> @@ -1219,8 +1219,12 @@ ×ñÞóç ôïõ XDM - Ôï ðñüãñáììá XDM âñßóêåôáé óôï - /usr/local/bin/xdm. Áõôü ôï ðñüãñáììá + Ãéá íá îåêéíÞóåôå íá ÷ñçóéìïðïéåßôå ôï + XDM, åãêáôáóôÞóôå ôï port x11/xdm (äåí åãêáèßóôáôáé áðü ðñïåðéëïãÞ + óôéò ðñüóöáôåò åêäüóåéò ôïõ &xorg;). + Ìðïñåßôå Ýðåéôá íá âñåßôå ôïí äáßìïíá XDM + óôï /usr/local/bin/xdm. Áõôü ôï ðñüãñáììá ìðïñåß íá åêôåëåóôåß ïðïéáäÞðïôå óôéãìÞ ùò root êáé èá îåêéíÞóåé íá äéá÷åéñßæåôáé ôçí ïèüíç ôïõ X óôï ôïðéêü ìç÷Üíçìá. Áí ï XDM ðñÝðåé íá åêôåëåßôáé ==== //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#4 (text+ko) ==== @@ -9,7 +9,7 @@ The &os; Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.286 2009/08/13 15:51:59 rwatson Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.287 2009/10/15 05:41:12 ale Exp $ 1999 @@ -127,7 +127,7 @@ RELENG_6 (6.X-STABLE), RELENG_7 (7.X-STABLE), - RELENG_8 (7.X-STABLE), + RELENG_8 (8.X-STABLE), HEAD (-CURRENT) ==== //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#7 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -4555,6 +4555,23 @@ url="http://www.cups.org/">. + + + HPLIP + + HPLIP + + HPLIP, the HP &linux; Imaging and + Printing system, is an HP-developed suite of programs that + supports printing, scanning and fax facilities for HP appliances. + This suite of programs utilizes + the CUPS printing system as a backend + for some of its printing features. + + The main site for HPLIP >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Oct 25 16:02:24 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9699210656D8; Sun, 25 Oct 2009 16:02:24 +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 583AC1065670 for ; Sun, 25 Oct 2009 16:02:24 +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 21B618FC28 for ; Sun, 25 Oct 2009 16:02:24 +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 n9PG2O6x031467 for ; Sun, 25 Oct 2009 16:02:24 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9PG2O2s031465 for perforce@freebsd.org; Sun, 25 Oct 2009 16:02:24 GMT (envelope-from mav@freebsd.org) Date: Sun, 25 Oct 2009 16:02:24 GMT Message-Id: <200910251602.n9PG2O2s031465@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 169802 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, 25 Oct 2009 16:02:24 -0000 http://p4web.freebsd.org/chv.cgi?CH=169802 Change 169802 by mav@mav_mavtest on 2009/10/25 16:01:26 Do not forget to release device after ATA_SET_MULTI error. Use only lower byte of identify word 47 for max sec/int. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#33 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#33 (text+ko) ==== @@ -645,7 +645,7 @@ if (cgd->ident_data.satacapabilities & ATA_SUPPORT_NCQ && cgd->ident_data.queue >= 31) softc->flags |= ADA_FLAG_CAN_NCQ; - softc->secsperint = max(1, min(cgd->ident_data.sectors_intr, 16)); + softc->secsperint = max(1, min(cgd->ident_data.sectors_intr & 0xff, 16)); softc->state = ADA_STATE_SET_MULTI; periph->softc = softc; @@ -1015,6 +1015,12 @@ /* A retry was scheduled, so just return. */ return; } + if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) + cam_release_devq(done_ccb->ccb_h.path, + /*relsim_flags*/0, + /*reduction*/0, + /*timeout*/0, + /*getcount_only*/0); } softc->state = ADA_STATE_NORMAL; /* From owner-p4-projects@FreeBSD.ORG Sun Oct 25 18:04:26 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D7A8106568B; Sun, 25 Oct 2009 18:04:26 +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 62026106566B for ; Sun, 25 Oct 2009 18:04:26 +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 502938FC12 for ; Sun, 25 Oct 2009 18:04:26 +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 n9PI4QRE053359 for ; Sun, 25 Oct 2009 18:04:26 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9PI4QlC053357 for perforce@freebsd.org; Sun, 25 Oct 2009 18:04:26 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 25 Oct 2009 18:04:26 GMT Message-Id: <200910251804.n9PI4QlC053357@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 169805 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, 25 Oct 2009 18:04:26 -0000 http://p4web.freebsd.org/chv.cgi?CH=169805 Change 169805 by pgj@beehive on 2009/10/25 18:03:32 IFC Affected files ... .. //depot/projects/docproj_hu/www/hu/share/sgml/events.xml#20 integrate Differences ... ==== //depot/projects/docproj_hu/www/hu/share/sgml/events.xml#20 (text+ko) ==== @@ -17,7 +17,7 @@ - $FreeBSD: www/hu/share/sgml/events.xml,v 1.8 2009/10/21 13:33:32 pgj Exp $ + $FreeBSD: www/hu/share/sgml/events.xml,v 1.9 2009/10/22 23:02:11 pgj Exp $ From owner-p4-projects@FreeBSD.ORG Sun Oct 25 18:20:43 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0AF36106568B; Sun, 25 Oct 2009 18:20:43 +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 C55BA106566B for ; Sun, 25 Oct 2009 18:20:42 +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 B352A8FC1A for ; Sun, 25 Oct 2009 18:20:42 +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 n9PIKgwm054679 for ; Sun, 25 Oct 2009 18:20:42 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9PIKgC3054677 for perforce@freebsd.org; Sun, 25 Oct 2009 18:20:42 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 25 Oct 2009 18:20:42 GMT Message-Id: <200910251820.n9PIKgC3054677@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 169806 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, 25 Oct 2009 18:20:43 -0000 http://p4web.freebsd.org/chv.cgi?CH=169806 Change 169806 by pgj@beehive on 2009/10/25 18:20:17 MFen (doc): 1.120 -> 1.121 hu_HU.ISO8859-2/books/handbook/printing/chapter.sgml Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/printing/chapter.sgml#10 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/printing/chapter.sgml#10 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -6515,6 +6515,28 @@ + + + HPLIP + + HPLIP + + + A HPLIP, + másnéven HP &linux; Imaging and Printing, egy HP + által kidolgozott programcsalád, amely + támogatja a HP eszközök nyomtatási, + lapolvasási és faxolási + lehetõségeit. A benne található + programok bizonyos nyomtatási feladatokhoz + backendként a CUPS + nyomtatási rendszert használják. + + A HPLIP honlapja a + címen érhetõ el. + + From owner-p4-projects@FreeBSD.ORG Sun Oct 25 22:58:21 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0DDCA106568D; Sun, 25 Oct 2009 22:58: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 ADC051065676 for ; Sun, 25 Oct 2009 22:58:20 +0000 (UTC) (envelope-from gk@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 99CA18FC12 for ; Sun, 25 Oct 2009 22:58: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 n9PMwKsR088553 for ; Sun, 25 Oct 2009 22:58:20 GMT (envelope-from gk@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9PMwKJp088551 for perforce@freebsd.org; Sun, 25 Oct 2009 22:58:20 GMT (envelope-from gk@FreeBSD.org) Date: Sun, 25 Oct 2009 22:58:20 GMT Message-Id: <200910252258.n9PMwKJp088551@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gk@FreeBSD.org using -f From: Gleb Kurtsou To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 169812 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, 25 Oct 2009 22:58:21 -0000 http://p4web.freebsd.org/chv.cgi?CH=169812 Change 169812 by gk@gk_h1 on 2009/10/25 22:57:25 enable dircache only for supported filesystems grab vnode interlock inside pefs_node_buf_free do not abuse pkcs5, use hkdf where appropriate style Affected files ... .. //depot/projects/soc2009/gk_pefs/sbin/pefs/Makefile#7 edit .. //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_ctl.c#12 edit .. //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_ctl.h#10 edit .. //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_key.c#11 edit .. //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_keychain.c#7 edit .. //depot/projects/soc2009/gk_pefs/sys/crypto/hmac/hmac_sha512.c#2 edit .. //depot/projects/soc2009/gk_pefs/sys/crypto/hmac/hmac_sha512.h#2 edit .. //depot/projects/soc2009/gk_pefs/sys/crypto/salsa20/salsa20.c#5 edit .. //depot/projects/soc2009/gk_pefs/sys/crypto/salsa20/salsa20.h#4 edit .. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs.h#16 edit .. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_subr.c#18 edit .. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_vfsops.c#15 edit .. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_vnops.c#26 edit Differences ... ==== //depot/projects/soc2009/gk_pefs/sbin/pefs/Makefile#7 (text+ko) ==== @@ -1,19 +1,16 @@ # $FreeBSD$ -MOUNT= ${.CURDIR}/../mount SYS= ${.CURDIR}/../../sys -.PATH: ${MOUNT} ${SYS}/geom/eli ${SYS}/crypto/hmac ${SYS}/crypto/sha2 +.PATH: ${SYS}/geom/eli ${SYS}/crypto/hmac ${SYS}/crypto/sha2 PROG= pefs -SRCS= pefs_ctl.c pefs_key.c pefs_keychain.c pefs_mount.c -SRCS+= getmntopts.c +SRCS= pefs_ctl.c pefs_key.c pefs_keychain.c SRCS+= hmac_sha512.c sha2.c SRCS+= pkcs5v2.c -LINKS= ${BINDIR}/pefs ${BINDIR}/mount_pefs NO_MAN= -CFLAGS+=-I${MOUNT} -I${SYS} +CFLAGS+=-I${SYS} WARNS?= 6 DEBUG_FLAGS+= -g ==== //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_ctl.c#12 (text+ko) ==== @@ -51,9 +51,11 @@ #include "pefs_ctl.h" #include "pefs_keychain.h" +#define PATH_MOUNT "/sbin/mount" #define PATH_UMOUNT "/sbin/umount" #define PATH_DEVRANDOM "/dev/random" +static int pefs_mount(int argc, char *argv[]); static int pefs_unmount(int argc, char *argv[]); static int pefs_addkey(int argc, char *argv[]); static int pefs_setkey(int argc, char *argv[]); @@ -459,6 +461,43 @@ } static int +pefs_mount(int argc, char *argv[]) +{ + char **nargv; + int nargc, topt, i, shift; + + topt = 0; + opterr = 0; + while ((i = getopt(argc, argv, "t:")) != -1) + switch(i) { + case 't': + if (strcmp(optarg, PEFS_FSTYPE) != 0) + errx(EX_USAGE, "invalid filesystem type: %s", optarg); + topt = 1; + break; + default: + break; + } + + shift = (topt == 0 ? 2 : 0); + nargc = argc + shift + 2; + nargv = malloc(nargc * sizeof(*nargv)); + nargv[0] = __DECONST(char *, "pefs mount"); + if (topt == 0) { + nargv[1] = __DECONST(char *, "-t"); + nargv[2] = __DECONST(char *, PEFS_FSTYPE); + } + for (i = 0; i < argc; i++) + nargv[i + shift + 1] = argv[i]; + nargv[nargc - 1] = NULL; + + if (execv(PATH_MOUNT, nargv) == -1) + errx(EX_OSERR, "exec %s", PATH_MOUNT); + + return (EX_OSERR); +} + +static int pefs_unmount(int argc, char *argv[]) { char **nargv; @@ -483,13 +522,13 @@ nargv = malloc((argc + 2) * sizeof(*nargv)); for (i = 0; i < argc; i++) nargv[i + 1] = argv[i]; - nargv[0] = __DECONST(char *, PATH_UMOUNT); + nargv[0] = __DECONST(char *, "pefs unmount"); nargv[argc + 1] = NULL; if (execv(PATH_UMOUNT, nargv) == -1) errx(EX_OSERR, "exec %s", PATH_UMOUNT); - return (0); + return (EX_OSERR); } static int @@ -839,7 +878,7 @@ pefs_usage(void) { fprintf(stderr, -"usage: pefs mount [-o options] from filesystem\n" +"usage: pefs mount [-o options] [from filesystem]\n" " pefs unmount [-fv] filesystem\n" " pefs addkey [-cCpv] [-a alg] [-i iterations] [-k keyfile] filesystem\n" " pefs setkey [-cCpvx] [-a alg] [-i iterations] [-k keyfile] directory\n" @@ -876,11 +915,6 @@ if (prog == NULL) prog = argv[0]; - if (strstr(prog, "mount_pefs")) { - pefs_kld_load(); - return (pefs_mount_prog(argc, argv)); - } - if (argc <= 1) pefs_usage(); ==== //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_ctl.h#10 (text+ko) ==== @@ -40,10 +40,12 @@ #define PEFS_KEYENC_MAC_SIZE (PEFS_KEY_SIZE / 2) struct pefs_xkeyenc { - struct pefs_xkey chained; - uint32_t alg; - uint32_t keybits; - u_char mac[PEFS_KEYENC_MAC_SIZE]; + struct { + struct pefs_xkey ke_next; + uint32_t ke_alg; + uint32_t ke_keybits; + } a; + u_char ke_mac[PEFS_KEYENC_MAC_SIZE]; }; struct pefs_keyparam { @@ -63,8 +65,6 @@ } void pefs_usage(void); -int pefs_mount(int argc, char *argv[]); -int pefs_mount_prog(int argc, char *argv[]); int pefs_getfsroot(const char *path, char *fsroot, size_t size); int pefs_key_get(struct pefs_xkey *xk, const char *prompt, int verify, struct pefs_keyparam *kp); ==== //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_key.c#11 (text+ko) ==== @@ -1,5 +1,6 @@ /*- * Copyright (c) 2004-2008 Pawel Jakub Dawidek + * Copyright (c) 2009 Gleb Kurtsou * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -50,8 +51,6 @@ #define PEFS_KEY_PROMPT_DEFAULT "passphrase" -#define PEFS_KEYENC_ITERATIONS 1000 - struct algorithm { const char *name; uint32_t id; @@ -76,6 +75,9 @@ { NULL, 0, 0 }, }; +static char magic_keyid_info[] = ""; +static char magic_enckey_info[] = ""; + const char * pefs_alg_name(struct pefs_xkey *xk) { @@ -197,7 +199,7 @@ hmac_sha512_update(&ctx, buf, strlen(buf)); } else { pkcs5v2_genkey(xk->pxk_key, PEFS_KEY_SIZE, buf, 0, buf, - strlen(buf), kp->kp_iterations); + kp->kp_iterations); hmac_sha512_update(&ctx, xk->pxk_key, PEFS_KEY_SIZE); } @@ -206,7 +208,7 @@ hmac_sha512_final(&ctx, xk->pxk_key, PEFS_KEY_SIZE); hmac_sha512_init(&ctx, xk->pxk_key, PEFS_KEY_SIZE); - hmac_sha512_update(&ctx, "", 8); + hmac_sha512_update(&ctx, magic_keyid_info, sizeof(magic_keyid_info)); hmac_sha512_final(&ctx, xk->pxk_keyid, PEFS_KEYID_SIZE); return (0); @@ -217,24 +219,31 @@ const struct pefs_xkey *xk_parent) { const int keysize = 128 / 8; - const int datasize = sizeof(struct pefs_xkeyenc) - PEFS_KEYENC_MAC_SIZE; + const int datasize = sizeof(xe->a); struct hmac_sha512_ctx hmac_ctx; - u_char *data = (u_char *) xe; + u_char *data = (u_char *) &xe->a; EVP_CIPHER_CTX ctx; - u_char key[keysize]; + u_char key[PEFS_KEY_SIZE]; u_char mac[PEFS_KEYENC_MAC_SIZE]; int outsize; + char idx; - pkcs5v2_genkey(key, keysize, xk_parent->pxk_keyid, PEFS_KEYID_SIZE, - xk_parent->pxk_key, PEFS_KEY_SIZE, PEFS_KEYENC_ITERATIONS); + idx = 1; + bzero(key, PEFS_KEY_SIZE); + hmac_sha512_init(&hmac_ctx, xk_parent->pxk_key, PEFS_KEY_SIZE); + hmac_sha512_update(&hmac_ctx, key, PEFS_KEY_SIZE); + hmac_sha512_update(&hmac_ctx, magic_enckey_info, + sizeof(magic_enckey_info)); + hmac_sha512_update(&hmac_ctx, &idx, sizeof(idx)); + hmac_sha512_final(&hmac_ctx, key, PEFS_KEY_SIZE); - hmac_sha512_init(&hmac_ctx, key, keysize); + hmac_sha512_init(&hmac_ctx, key, PEFS_KEY_SIZE); if (!enc) { hmac_sha512_update(&hmac_ctx, data, datasize); hmac_sha512_final(&hmac_ctx, mac, PEFS_KEYENC_MAC_SIZE); bzero(&hmac_ctx, sizeof(hmac_ctx)); - if (memcmp(mac, xe->mac, PEFS_KEYENC_MAC_SIZE) != 0) - return (-1); + if (memcmp(mac, xe->ke_mac, PEFS_KEYENC_MAC_SIZE) != 0) + return (EINVAL); } EVP_CIPHER_CTX_init(&ctx); @@ -260,7 +269,7 @@ if (enc) { hmac_sha512_update(&hmac_ctx, data, datasize); - hmac_sha512_final(&hmac_ctx, xe->mac, + hmac_sha512_final(&hmac_ctx, xe->ke_mac, PEFS_KEYENC_MAC_SIZE); bzero(&hmac_ctx, sizeof(hmac_ctx)); } ==== //depot/projects/soc2009/gk_pefs/sbin/pefs/pefs_keychain.c#7 (text+ko) ==== @@ -121,9 +121,9 @@ error = pefs_key_decrypt(&ke, &kc_parent->kc_key); if (error) break; - kc->kc_key = ke.chained; - kc_parent->kc_key.pxk_alg = le32toh(ke.alg); - kc_parent->kc_key.pxk_keybits = le32toh(ke.keybits); + kc->kc_key = ke.a.ke_next; + kc_parent->kc_key.pxk_alg = le32toh(ke.a.ke_alg); + kc_parent->kc_key.pxk_keybits = le32toh(ke.a.ke_keybits); if (pefs_alg_name(&kc_parent->kc_key) == NULL) errx(EX_DATAERR, "keychain: db damaged"); kc->kc_key.pxk_index = -1; @@ -197,12 +197,12 @@ DB *db; int error; - ke.chained = *xknext; - ke.chained.pxk_index = (uint32_t)random(); - ke.chained.pxk_alg = htole32(ke.chained.pxk_alg); - ke.chained.pxk_keybits = htole32(ke.chained.pxk_keybits); - ke.alg = htole32(xk->pxk_alg); - ke.keybits = htole32(xk->pxk_keybits); + ke.a.ke_next = *xknext; + ke.a.ke_next.pxk_index = (uint32_t)random(); + ke.a.ke_next.pxk_alg = htole32(ke.a.ke_next.pxk_alg); + ke.a.ke_next.pxk_keybits = htole32(ke.a.ke_next.pxk_keybits); + ke.a.ke_alg = htole32(xk->pxk_alg); + ke.a.ke_keybits = htole32(xk->pxk_keybits); if (pefs_key_encrypt(&ke, xk) != 0) return (-1); ==== //depot/projects/soc2009/gk_pefs/sys/crypto/hmac/hmac_sha512.c#2 (text+ko) ==== @@ -107,4 +107,3 @@ hmac_sha512_update(&ctx, data, datasize); hmac_sha512_final(&ctx, md, mdsize); } - ==== //depot/projects/soc2009/gk_pefs/sys/crypto/hmac/hmac_sha512.h#2 (text+ko) ==== @@ -43,4 +43,3 @@ const uint8_t *data, size_t datasize, uint8_t *md, size_t mdsize); #endif /* _SYS_CRYPTO_HMAC_SHA512_H */ - ==== //depot/projects/soc2009/gk_pefs/sys/crypto/salsa20/salsa20.c#5 (text+ko) ==== @@ -251,4 +251,3 @@ } } } - ==== //depot/projects/soc2009/gk_pefs/sys/crypto/salsa20/salsa20.h#4 (text+ko) ==== @@ -22,4 +22,3 @@ void salsa20_crypt(salsa20_ctx *ctx, const uint8_t *plaintext, uint8_t *ciphertext, uint32_t len); #endif - ==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs.h#16 (text+ko) ==== @@ -102,6 +102,7 @@ }; #define PM_ROOT_CANRECURSE 0x01 +#define PM_DIRCACHE 0x02 struct pefs_mount { struct mount *pm_lowervfs; ==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_subr.c#18 (text+ko) ==== @@ -524,16 +524,24 @@ void pefs_node_buf_free(struct pefs_node *pn) { + void *bufs[2] = { NULL, NULL }; + int ind = 0; + + ASSERT_VI_UNLOCKED(pn->pn_vnode, "pefs_node_buf_free"); + VI_LOCK(pn->pn_vnode); if (pn->pn_buf_small != NULL && (pn->pn_flags & PN_LOCKBUF_SMALL) == 0) { - free(pn->pn_buf_small, M_PEFSBUF); - pn->pn_buf_small = 0; + bufs[ind++] = pn->pn_buf_small; + pn->pn_buf_small = NULL; } if (pn->pn_buf_large != NULL && (pn->pn_flags & PN_LOCKBUF_LARGE) == 0) { - free(pn->pn_buf_large, M_PEFSBUF); - pn->pn_buf_large = 0; + bufs[ind++] = pn->pn_buf_large; + pn->pn_buf_large = NULL; } + VI_UNLOCK(pn->pn_vnode); + free(bufs[0], M_PEFSBUF); + free(bufs[1], M_PEFSBUF); } struct pefs_key* ==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_vfsops.c#15 (text+ko) ==== @@ -48,42 +48,97 @@ static MALLOC_DEFINE(M_PEFSMNT, "pefs_mount", "PEFS mount structure"); +static const char *pefs_opts[] = { + "from", "export", "dircache", "nodircache", NULL +}; + +static void +dircache_init(struct mount *mp, int opt, struct pefs_mount *pm) +{ + char *lowerfs; + int supported; + + lowerfs = mp->mnt_vnodecovered->v_mount->mnt_vfc->vfc_name; + supported = (strcmp(lowerfs, "zfs") == 0 || + strcmp(lowerfs, "tmpfs") == 0); + if (opt < 0) + opt = supported; + else if (opt > 0 && supported == 0) { + printf("pefs: dircache is not supported by filesystem: %s\n", + lowerfs); + opt = 0; + } + + if (opt == 0) + pm->pm_flags &= ~PM_DIRCACHE; + else + pm->pm_flags |= PM_DIRCACHE; + PEFSDEBUG("pefs_mount: dircache %s\n", (opt ? "enabled" : "disabed")); +} + +static int +subdir(const char *p, const char *dir) +{ + int l; + + l = strlen(dir); + if (l <= 1) + return (1); + + if ((strncmp(p, dir, l) == 0) && (p[l] == '/' || p[l] == '\0')) + return (1); + + return (0); +} + /* * Mount null layer */ static int pefs_mount(struct mount *mp) { - int error = 0; struct vnode *lowerrootvp, *vp; struct vnode *pm_rootvp; + struct nameidata nd, *ndp = &nd; struct pefs_mount *pm; - char *target; + char *from, *from_free; int isvnunlocked = 0, len; - struct nameidata nd, *ndp = &nd; + int opt_dircache; + int error = 0; PEFSDEBUG("pefs_mount(mp = %p)\n", (void *)mp); if (mp->mnt_flag & MNT_ROOTFS) return (EOPNOTSUPP); - /* - * Update is a no-op - */ + + if (vfs_filteropt(mp->mnt_optnew, pefs_opts)) + return (EINVAL); + + opt_dircache = -1; + if (vfs_flagopt(mp->mnt_optnew, "dircache", NULL, 0)) { + vfs_deleteopt(mp->mnt_optnew, "dircache"); + opt_dircache = 1; + } else if (vfs_flagopt(mp->mnt_optnew, "nodircache", NULL, 0)) { + vfs_deleteopt(mp->mnt_optnew, "nodircache"); + opt_dircache = 0; + } + if (mp->mnt_flag & MNT_UPDATE) { - /* - * Only support update mounts for NFS export. - */ + error = EOPNOTSUPP; if (vfs_flagopt(mp->mnt_optnew, "export", NULL, 0)) - return (0); - else - return (EOPNOTSUPP); + error = 0; + if (opt_dircache >= 0) { + dircache_init(mp, opt_dircache, mp->mnt_data); + error = 0; + } + return (error); } /* * Get argument */ - error = vfs_getopt(mp->mnt_optnew, "target", (void **)&target, &len); - if (error || target[len - 1] != '\0') + error = vfs_getopt(mp->mnt_optnew, "from", (void **)&from, &len); + if (error || from[len - 1] != '\0') return (EINVAL); /* @@ -98,8 +153,20 @@ /* * Find lower node */ - NDINIT(ndp, LOOKUP, FOLLOW|LOCKLEAF, UIO_SYSSPACE, target, curthread); + NDINIT(ndp, LOOKUP, FOLLOW|LOCKLEAF, UIO_SYSSPACE, from, curthread); error = namei(ndp); + + if (error == 0) { + from_free = NULL; + error = vn_fullpath(curthread, ndp->ni_vp, &from, + &from_free); + if (error != 0) + NDFREE(ndp, NDF_ONLY_PNBUF); + else + vfs_mountedfrom(mp, from); + free(from_free, M_TEMP); + + } /* * Re-lock vnode. */ @@ -124,6 +191,18 @@ return (EDEADLK); } + /* + * Check paths are not nested + */ + if ((lowerrootvp != mp->mnt_vnodecovered) && + (subdir(mp->mnt_stat.f_mntfromname, mp->mnt_stat.f_mntonname) || + subdir(mp->mnt_stat.f_mntonname, mp->mnt_stat.f_mntfromname))) { + PEFSDEBUG("pefs_mount: %s and %s are nested paths\n", + mp->mnt_stat.f_mntfromname, mp->mnt_stat.f_mntonname); + vput(lowerrootvp); + return (EDEADLK); + } + pm = (struct pefs_mount *)malloc(sizeof(struct pefs_mount), M_PEFSMNT, M_WAITOK | M_ZERO); @@ -136,6 +215,7 @@ pm->pm_lowervfs = lowerrootvp->v_mount; if (lowerrootvp == mp->mnt_vnodecovered) pm->pm_flags |= PM_ROOT_CANRECURSE; + dircache_init(mp, opt_dircache, pm); /* * Save reference. Each mount also holds @@ -145,7 +225,7 @@ /* * Make sure the node alias worked */ - if (error) { + if (error != 0) { VOP_UNLOCK(vp, 0); vrele(lowerrootvp); free(pm, M_PEFSMNT); @@ -176,8 +256,6 @@ mp->mnt_data = pm; vfs_getnewfsid(mp); - vfs_mountedfrom(mp, target); - PEFSDEBUG("pefs_mount: lower %s, alias at %s\n", mp->mnt_stat.f_mntfromname, mp->mnt_stat.f_mntonname); return (0); ==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_vnops.c#26 (text+ko) ==== @@ -124,6 +124,15 @@ return (r); } +static inline int +pefs_cache_active(struct vnode *vp) +{ + struct pefs_mount *pm = VFS_TO_PEFS(vp->v_mount); + + return (pefs_dircache_enable && + (pm->pm_flags & PM_DIRCACHE) != 0); +} + static struct pefs_dircache_entry * pefs_cache_dirent(struct pefs_dircache *pd, struct dirent *de, struct pefs_ctx *ctx, struct pefs_key *pk) @@ -315,7 +324,7 @@ error = 0; dgen = pefs_getgen(dvp, cnp->cn_cred); pefs_dircache_lock(dpn->pn_dircache); - if (pefs_dircache_enable && + if (pefs_cache_active(dvp) && pefs_dircache_valid(dpn->pn_dircache, dgen)) { cache = pefs_dircache_lookup(dpn->pn_dircache, cnp->cn_nameptr, cnp->cn_namelen); @@ -375,7 +384,7 @@ return (0); } - if (pefs_dircache_enable) { + if (pefs_cache_active(dvp)) { pefs_dircache_lock(dpn->pn_dircache); /* Do not check if cache valid check keys are equal instead */ cache = pefs_dircache_lookup(dpn->pn_dircache, @@ -1172,9 +1181,7 @@ * vnode interlock. * Free remaining buffers in pefs_reclaim. */ - VI_LOCK(vp); pefs_node_buf_free(pn); - VI_UNLOCK(vp); if ((pn->pn_flags & PN_HASKEY) && vp->v_object != NULL) { if (vp->v_object->resident_page_count > 0) @@ -1214,12 +1221,12 @@ * prevent faults in pefs_lock(). */ + pefs_node_buf_free(pn); VI_LOCK(vp); #ifdef INVARIANTS if ((pn->pn_flags & (PN_LOCKBUF_SMALL | PN_LOCKBUF_LARGE)) != 0) printf("pefs_reclaim: node buffer leaked: vp: %p\n", vp); #endif - pefs_node_buf_free(pn); vp->v_data = NULL; vp->v_vnlock = &vp->v_lock; pn->pn_lowervp = NULL; From owner-p4-projects@FreeBSD.ORG Mon Oct 26 11:53:15 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 96F60106576D; Mon, 26 Oct 2009 11:53:15 +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 427FB1065753 for ; Mon, 26 Oct 2009 11:53:15 +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 2EBC28FC1C for ; Mon, 26 Oct 2009 11:53:15 +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 n9QBrFwK088403 for ; Mon, 26 Oct 2009 11:53:15 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9QBrF36088401 for perforce@freebsd.org; Mon, 26 Oct 2009 11:53:15 GMT (envelope-from mav@freebsd.org) Date: Mon, 26 Oct 2009 11:53:15 GMT Message-Id: <200910261153.n9QBrF36088401@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 169823 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, 26 Oct 2009 11:53:15 -0000 http://p4web.freebsd.org/chv.cgi?CH=169823 Change 169823 by mav@mav_mavtest on 2009/10/26 11:52:22 Move setting length of PIO transaction from ada driver to ATA XPT, ada driver is now stateless. Make aprobe driver to always set mode and max sectors on device. It is required after device reset. Make XPT to report length of PIO transaction to SIM. It is required for correct PIO modes operation. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#34 edit .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#44 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#28 edit .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#31 edit .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.h#20 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#34 (text+ko) ==== @@ -63,8 +63,7 @@ #define ATA_MAX_28BIT_LBA 268435455UL typedef enum { - ADA_STATE_NORMAL, - ADA_STATE_SET_MULTI + ADA_STATE_NORMAL } ada_state; typedef enum { @@ -84,7 +83,6 @@ } ada_quirks; typedef enum { - ADA_CCB_SET_MULTI = 0x01, ADA_CCB_BUFFER_IO = 0x03, ADA_CCB_WAITING = 0x04, ADA_CCB_DUMP = 0x05, @@ -112,7 +110,6 @@ ada_quirks quirks; int ordered_tag_count; int outstanding_cmds; - int secsperint; struct disk_params params; struct disk *disk; union ccb saved_ccb; @@ -551,22 +548,6 @@ "due to status 0x%x\n", status); break; } - case AC_SENT_BDR: - case AC_BUS_RESET: - { - struct ada_softc *softc = (struct ada_softc *)periph->softc; - - cam_periph_async(periph, code, path, arg); - if (softc->state != ADA_STATE_NORMAL) - break; - /* - * Restore device configuration. - */ - softc->state = ADA_STATE_SET_MULTI; - cam_periph_acquire(periph); - xpt_schedule(periph, CAM_PRIORITY_DEV); - break; - } default: cam_periph_async(periph, code, path, arg); break; @@ -645,8 +626,7 @@ if (cgd->ident_data.satacapabilities & ATA_SUPPORT_NCQ && cgd->ident_data.queue >= 31) softc->flags |= ADA_FLAG_CAN_NCQ; - softc->secsperint = max(1, min(cgd->ident_data.sectors_intr & 0xff, 16)); - softc->state = ADA_STATE_SET_MULTI; + softc->state = ADA_STATE_NORMAL; periph->softc = softc; @@ -735,18 +715,10 @@ * them and the only alternative would be to * not attach the device on failure. */ - xpt_register_async(AC_SENT_BDR | AC_BUS_RESET | AC_LOST_DEVICE, + xpt_register_async(AC_LOST_DEVICE, adaasync, periph, periph->path); /* - * Take an exclusive refcount on the periph while adastart is called - * to finish the probe. The reference will be dropped in adadone at - * the end of probe. - */ - cam_periph_acquire(periph); - xpt_schedule(periph, CAM_PRIORITY_DEV); - - /* * Schedule a periodic event to occasionally send an * ordered tag to a device. */ @@ -902,21 +874,6 @@ } break; } - case ADA_STATE_SET_MULTI: - { - cam_fill_ataio(ataio, - ada_retry_count, - adadone, - CAM_DIR_NONE, - 0, - NULL, - 0, - ada_default_timeout*1000); - - ata_28bit_cmd(ataio, ATA_SET_MULTI, 0, 0, softc->secsperint); - start_ccb->ccb_h.ccb_state = ADA_CCB_SET_MULTI; - xpt_action(start_ccb); - } } } @@ -1004,41 +961,6 @@ wakeup(&done_ccb->ccb_h.cbfcnp); return; } - case ADA_CCB_SET_MULTI: - { - if ((done_ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_CMP) { - } else { - int error; - - error = adaerror(done_ccb, 0, 0); - if (error == ERESTART) { - /* A retry was scheduled, so just return. */ - return; - } - if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) - cam_release_devq(done_ccb->ccb_h.path, - /*relsim_flags*/0, - /*reduction*/0, - /*timeout*/0, - /*getcount_only*/0); - } - softc->state = ADA_STATE_NORMAL; - /* - * Since our peripheral may be invalidated by an error - * above or an external event, we must release our CCB - * before releasing the probe lock on the peripheral. - * The peripheral will only go away once the last lock - * is removed, and we need it around for the CCB release - * operation. - */ - xpt_release_ccb(done_ccb); - if (bioq_first(&softc->bio_queue) != NULL) { - /* Have more work to do, so ensure we stay scheduled */ - xpt_schedule(periph, CAM_PRIORITY_NORMAL); - } - cam_periph_release_locked(periph); - return; - } case ADA_CCB_DUMP: /* No-op. We're polling */ return; ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#44 (text+ko) ==== @@ -92,6 +92,7 @@ PROBE_RESET, PROBE_IDENTIFY, PROBE_SETMODE, + PROBE_SET_MULTI, PROBE_INQUIRY, PROBE_FULL_INQUIRY, PROBE_PM_PID, @@ -103,6 +104,7 @@ "PROBE_RESET", "PROBE_IDENTIFY", "PROBE_SETMODE", + "PROBE_SET_MULTI", "PROBE_INQUIRY", "PROBE_FULL_INQUIRY", "PROBE_PM_PID", @@ -284,12 +286,16 @@ struct ccb_ataio *ataio; struct ccb_scsiio *csio; probe_softc *softc; + struct cam_path *path; + struct ata_params *ident_buf; CAM_DEBUG(start_ccb->ccb_h.path, CAM_DEBUG_TRACE, ("probestart\n")); softc = (probe_softc *)periph->softc; + path = start_ccb->ccb_h.path; ataio = &start_ccb->ataio; csio = &start_ccb->csio; + ident_buf = &periph->path->device->ident_data; switch (softc->action) { case PROBE_RESET: @@ -304,10 +310,6 @@ ata_reset_cmd(ataio); break; case PROBE_IDENTIFY: - { - struct ata_params *ident_buf = - &periph->path->device->ident_data; - if ((periph->path->device->flags & CAM_DEV_UNCONFIGURED) == 0) { /* Prepare check that it is the same device. */ MD5_CTX context; @@ -337,12 +339,7 @@ else ata_28bit_cmd(ataio, ATA_ATAPI_IDENTIFY, 0, 0, 0); break; - } case PROBE_SETMODE: - { - struct ata_params *ident_buf = - &periph->path->device->ident_data; - cam_fill_ataio(ataio, 1, probedone, @@ -354,6 +351,37 @@ ata_28bit_cmd(ataio, ATA_SETFEATURES, ATA_SF_SETXFER, 0, ata_max_mode(ident_buf, ATA_UDMA6, ATA_UDMA6)); break; + case PROBE_SET_MULTI: + { + struct ccb_trans_settings cts; + u_int sectors; + + sectors = max(1, min(ident_buf->sectors_intr & 0xff, 16)); + + /* Report bytecount to SIM. */ + bzero(&cts, sizeof(cts)); + xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NORMAL); + cts.ccb_h.func_code = XPT_SET_TRAN_SETTINGS; + cts.type = CTS_TYPE_CURRENT_SETTINGS; + if (path->device->transport == XPORT_ATA) { + cts.xport_specific.ata.bytecount = sectors * 512; + cts.xport_specific.ata.valid = CTS_ATA_VALID_BYTECOUNT; + } else { + cts.xport_specific.sata.bytecount = sectors * 512; + cts.xport_specific.sata.valid = CTS_SATA_VALID_BYTECOUNT; + } + xpt_action((union ccb *)&cts); + + cam_fill_ataio(ataio, + 1, + probedone, + CAM_DIR_NONE, + 0, + NULL, + 0, + 30*1000); + ata_28bit_cmd(ataio, ATA_SET_MULTI, 0, 0, sectors); + break; } case PROBE_INQUIRY: case PROBE_FULL_INQUIRY: @@ -408,7 +436,7 @@ ata_pm_read_cmd(ataio, 1, 15); break; case PROBE_INVALID: - CAM_DEBUG(start_ccb->ccb_h.path, CAM_DEBUG_INFO, + CAM_DEBUG(path, CAM_DEBUG_INFO, ("probestart: invalid action state\n")); default: break; @@ -666,29 +694,28 @@ /* Device changed. */ xpt_async(AC_LOST_DEVICE, path, NULL); } - break; - } + } else { + /* Clean up from previous instance of this device */ + if (path->device->serial_num != NULL) { + free(path->device->serial_num, M_CAMXPT); + path->device->serial_num = NULL; + path->device->serial_num_len = 0; + } + path->device->serial_num = + (u_int8_t *)malloc((sizeof(ident_buf->serial) + 1), + M_CAMXPT, M_NOWAIT); + if (path->device->serial_num != NULL) { + bcopy(ident_buf->serial, + path->device->serial_num, + sizeof(ident_buf->serial)); + path->device->serial_num[sizeof(ident_buf->serial)] + = '\0'; + path->device->serial_num_len = + strlen(path->device->serial_num); + } - /* Clean up from previous instance of this device */ - if (path->device->serial_num != NULL) { - free(path->device->serial_num, M_CAMXPT); - path->device->serial_num = NULL; - path->device->serial_num_len = 0; - } - path->device->serial_num = - (u_int8_t *)malloc((sizeof(ident_buf->serial) + 1), - M_CAMXPT, M_NOWAIT); - if (path->device->serial_num != NULL) { - bcopy(ident_buf->serial, - path->device->serial_num, - sizeof(ident_buf->serial)); - path->device->serial_num[sizeof(ident_buf->serial)] - = '\0'; - path->device->serial_num_len = - strlen(path->device->serial_num); + path->device->flags |= CAM_DEV_IDENTIFY_DATA_VALID; } - - path->device->flags |= CAM_DEV_IDENTIFY_DATA_VALID; ata_device_transport(path); PROBE_SET_ACTION(softc, PROBE_SETMODE); xpt_release_ccb(done_ccb); @@ -696,21 +723,23 @@ return; } case PROBE_SETMODE: - { if (path->device->protocol == PROTO_ATA) { + PROBE_SET_ACTION(softc, PROBE_SET_MULTI); + } else { + PROBE_SET_ACTION(softc, PROBE_INQUIRY); + } + xpt_release_ccb(done_ccb); + xpt_schedule(periph, priority); + return; + case PROBE_SET_MULTI: + if (periph->path->device->flags & CAM_DEV_UNCONFIGURED) { path->device->flags &= ~CAM_DEV_UNCONFIGURED; done_ccb->ccb_h.func_code = XPT_GDEV_TYPE; xpt_action(done_ccb); xpt_async(AC_FOUND_DEVICE, done_ccb->ccb_h.path, done_ccb); - } else { - PROBE_SET_ACTION(softc, PROBE_INQUIRY); - xpt_release_ccb(done_ccb); - xpt_schedule(periph, priority); - return; } break; - } case PROBE_INQUIRY: case PROBE_FULL_INQUIRY: { @@ -747,10 +776,12 @@ scsi_find_quirk(path->device); ata_device_transport(path); - path->device->flags &= ~CAM_DEV_UNCONFIGURED; - done_ccb->ccb_h.func_code = XPT_GDEV_TYPE; - xpt_action(done_ccb); - xpt_async(AC_FOUND_DEVICE, done_ccb->ccb_h.path, done_ccb); + if (periph->path->device->flags & CAM_DEV_UNCONFIGURED) { + path->device->flags &= ~CAM_DEV_UNCONFIGURED; + done_ccb->ccb_h.func_code = XPT_GDEV_TYPE; + xpt_action(done_ccb); + xpt_async(AC_FOUND_DEVICE, done_ccb->ccb_h.path, done_ccb); + } break; } case PROBE_PM_PID: ==== //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#28 (text+ko) ==== @@ -816,12 +816,22 @@ u_int32_t bitrate; /* Mbps */ }; +struct ccb_trans_settings_ata { + u_int valid; /* Which fields to honor */ +#define CTS_ATA_VALID_MODE 0x01 +#define CTS_ATA_VALID_BYTECOUNT 0x04 + u_int32_t mode; + u_int bytecount; /* Length of PIO transaction */ +}; + struct ccb_trans_settings_sata { u_int valid; /* Which fields to honor */ #define CTS_SATA_VALID_SPEED 0x01 #define CTS_SATA_VALID_PM 0x02 +#define CTS_SATA_VALID_BYTECOUNT 0x04 u_int32_t bitrate; /* Mbps */ u_int pm_present; /* PM is present (XPT->SIM) */ + u_int bytecount; /* Length of PIO transaction */ }; /* Get/Set transfer rate/width/disconnection/tag queueing settings */ @@ -841,6 +851,7 @@ struct ccb_trans_settings_spi spi; struct ccb_trans_settings_fc fc; struct ccb_trans_settings_sas sas; + struct ccb_trans_settings_ata ata; struct ccb_trans_settings_sata sata; } xport_specific; }; ==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#31 (text+ko) ==== @@ -149,6 +149,10 @@ mtx_init(&ch->queue_mtx, "ATA queue lock", NULL, MTX_DEF); TAILQ_INIT(&ch->ata_queue); TASK_INIT(&ch->conntask, 0, ata_conn_event, dev); +#ifdef ATA_CAM + ch->bytecount[0] = 16 * 512; + ch->bytecount[1] = 16 * 512; +#endif /* reset the controller HW, the channel and device(s) */ while (ATA_LOCKING(dev, ATA_LF_LOCK) != ch->unit) @@ -1275,7 +1279,8 @@ if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_OUT) request->flags |= ATA_R_WRITE; } - request->transfersize = min(request->bytecount, 16*512); + request->transfersize = min(request->bytecount, + ch->bytecount[ccb->ccb_h.target_id]); // request->callback = ad_done; request->retries = 0; request->timeout = (ccb->ccb_h.timeout + 999) / 1000; @@ -1394,12 +1399,18 @@ break; case XPT_SET_TRAN_SETTINGS: { + struct ccb_trans_settings *cts = &ccb->cts; + + if (ccb->ccb_h.target_id >= 0 && ccb->ccb_h.target_id <= 1 && + (cts->xport_specific.ata.valid & CTS_ATA_VALID_BYTECOUNT)) { + ch->bytecount[ccb->ccb_h.target_id] = + cts->xport_specific.ata.bytecount; + } ccb->ccb_h.status = CAM_REQ_CMP; xpt_done(ccb); break; } case XPT_GET_TRAN_SETTINGS: - /* Get default/user set transfer settings for the target */ { struct ccb_trans_settings *cts = &ccb->cts; @@ -1407,8 +1418,11 @@ cts->protocol_version = PROTO_VERSION_UNSPECIFIED; cts->transport = XPORT_ATA; cts->transport_version = XPORT_VERSION_UNSPECIFIED; - cts->proto_specific.valid = 0; - cts->xport_specific.sata.valid = 0; + if (ccb->ccb_h.target_id >= 0 && ccb->ccb_h.target_id <= 1) { + cts->proto_specific.valid = CTS_ATA_VALID_BYTECOUNT; + cts->xport_specific.ata.bytecount = + ch->bytecount[ccb->ccb_h.target_id]; + } ccb->ccb_h.status = CAM_REQ_CMP; xpt_done(ccb); break; ==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.h#20 (text+ko) ==== @@ -560,6 +560,7 @@ #ifdef ATA_CAM struct cam_sim *sim; struct cam_path *path; + u_int bytecount[2]; /* Length of PIO transaction */ #endif }; From owner-p4-projects@FreeBSD.ORG Mon Oct 26 11:57:20 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2BBAB1065693; Mon, 26 Oct 2009 11:57:20 +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 CB1B1106568F for ; Mon, 26 Oct 2009 11:57:19 +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 B6C688FC0C for ; Mon, 26 Oct 2009 11:57:19 +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 n9QBvJpo088695 for ; Mon, 26 Oct 2009 11:57:19 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9QBvJ5v088693 for perforce@freebsd.org; Mon, 26 Oct 2009 11:57:19 GMT (envelope-from mav@freebsd.org) Date: Mon, 26 Oct 2009 11:57:19 GMT Message-Id: <200910261157.n9QBvJ5v088693@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 169824 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, 26 Oct 2009 11:57:20 -0000 http://p4web.freebsd.org/chv.cgi?CH=169824 Change 169824 by mav@mav_mavtest on 2009/10/26 11:57:06 IFC Affected files ... .. //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#17 integrate .. //depot/projects/scottl-camlock/src/UPDATING#19 integrate .. //depot/projects/scottl-camlock/src/bin/sh/expand.c#4 integrate .. //depot/projects/scottl-camlock/src/bin/sh/sh.1#7 integrate .. //depot/projects/scottl-camlock/src/gnu/lib/libgcov/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/lib/libthr/arch/ia64/Makefile.inc#3 integrate .. //depot/projects/scottl-camlock/src/lib/libthr/arch/ia64/ia64/_umtx_op_err.S#1 branch .. //depot/projects/scottl-camlock/src/lib/libthr/arch/ia64/include/pthread_md.h#2 integrate .. //depot/projects/scottl-camlock/src/sbin/geom/class/part/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/geom/class/part/geom_part.c#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/acpi_hp.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/acpi_wmi.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/bge.4#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/iwn.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/iwnfw.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/msk.4#5 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_socket.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/conf/NOTES#38 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files#51 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-disk.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.h#19 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-queue.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-raid.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cam.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cd.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-nvidia.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-via.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iwn/if_iwn.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/msk/if_msk.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/msk/if_mskreg.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/fs/smbfs/smbfs_vfsops.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/conf/GENERIC#18 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/param.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_thread.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sys_process.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sysv_shm.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/modules/iwnfw/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/modules/iwnfw/Makefile.inc#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/iwnfw/iwn4965/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/iwnfw/iwn5000/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/iwnfw/iwn5150/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/netgraph/NOTES#2 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_input.c#27 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/hid.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/hrowpic.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/cpu.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/tools/fw_stub.awk#5 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_fault.c#23 integrate .. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/expansion/question1.0#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/expansion/set-u1.0#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/expansion/set-u2.0#1 branch .. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/cdrom.c#3 integrate Differences ... ==== //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#17 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.210 2009/10/12 21:10:28 markm Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.211 2009/10/24 12:59:29 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,9 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20091005: fusword.9 and susword.9 removed +OLD_FILES+=usr/share/man/man9/fusword.9.gz +OLD_FILES+=usr/share/man/man9/susword.9.gz # 20090909: vesa and dpms promoted to be i386/amd64 common OLD_FILES+=usr/include/machine/pc/vesa.h OLD_FILES+=usr/share/man/man4/i386/dpms.4.gz @@ -26,6 +29,49 @@ OLD_FILES+=etc/mtree/BSD.local.dist OLD_FILES+=etc/mtree/BSD.x11.dist OLD_FILES+=etc/mtree/BSD.x11-4.dist +# 20090812: net80211 documentation overhaul +OLD_FILES+=usr/share/man/man9/ieee80211_add_rates.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_add_xrates.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_alloc_node.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_attach.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_begin_scan.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_cfgget.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_cfgset.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_chan2ieee.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_chan2mode.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_create_ibss.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_crypto_attach.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_crypto_detach.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_decap.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_dump_pkt.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_dup_bss.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_encap.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_end_scan.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_find_node.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_fix_rate.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_free_allnodes.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_ieee2mhz.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_ioctl.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_lookup_node.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_media2rate.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_media_change.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_media_init.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_media_status.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_mhz2ieee.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_next_scan.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_node_attach.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_node_detach.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_node_lateattach.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_print_essid.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_proto_attach.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_proto_detach.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_rate2media.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_recv_mgmt.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_send_mgmt.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_setmode.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_timeout_nodes.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_watchdog.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_wep_crypt.9.gz # 20090801: vimage.h removed in favour of vnet.h OLD_FILES+=usr/include/sys/vimage.h # 20090719: library version bump for 8.0 ==== //depot/projects/scottl-camlock/src/UPDATING#19 (text+ko) ==== @@ -22,6 +22,14 @@ machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20091025: + The iwn(4) driver has been updated to support the 5000 and 5150 series. + There's one kernel module for each firmware. Adding "device iwnfw" + to the kernel configuration file means including all three firmware + images inside the kernel. If you want to include just the one for + your wireless card, use the the devices iwn4965fw, iwn5000fw or + iwn5150fw. + 20090926: The rc.d/network_ipv6, IPv6 configuration script has been integrated into rc.d/netif. The changes are the following: @@ -624,6 +632,15 @@ userland (libpmc(3)) and the kernel module (hwpmc(4)) in sync. +20081009: + atapci kernel module now includes only generic PCI ATA + driver. AHCI driver moved to ataahci kernel module. + All vendor-specific code moved into separate kernel modules: + ataacard, ataacerlabs, ataadaptec, ataamd, ataati, atacenatek, + atacypress, atacyrix, atahighpoint, ataintel, ataite, atajmicron, + atamarvell, atamicron, atanational, atanetcell, atanvidia, + atapromise, ataserverworks, atasiliconimage, atasis, atavia + 20080820: The TTY subsystem of the kernel has been replaced by a new implementation, which provides better scalability and an @@ -1030,4 +1047,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.641 2009/09/26 18:59:00 hrs Exp $ +$FreeBSD: src/UPDATING,v 1.643 2009/10/26 09:16:08 mav Exp $ ==== //depot/projects/scottl-camlock/src/bin/sh/expand.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.55 2009/06/25 17:14:06 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.56 2009/10/24 21:20:04 jilles Exp $"); #include #include @@ -657,7 +657,7 @@ } varlen = 0; startloc = expdest - stackblock(); - if (!set && uflag) { + if (!set && uflag && *var != '@' && *var != '*') { switch (subtype) { case VSNORMAL: case VSTRIMLEFT: ==== //depot/projects/scottl-camlock/src/bin/sh/sh.1#7 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.132 2009/10/07 22:21:53 jilles Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.133 2009/10/24 21:20:04 jilles Exp $ .\" -.Dd May 31, 2009 +.Dd October 24, 2009 .Dt SH 1 .Os .Sh NAME @@ -296,7 +296,10 @@ .Ed .It Fl u Li nounset Write a message to standard error when attempting -to expand a variable that is not set, and if the +to expand a variable, a positional parameter or +the special parameter +.Va \&! +that is not set, and if the shell is not interactive, exit immediately. .It Fl V Li vi Enable the built-in ==== //depot/projects/scottl-camlock/src/gnu/lib/libgcov/Makefile#4 (text+ko) ==== @@ -1,7 +1,8 @@ -# $FreeBSD: src/gnu/lib/libgcov/Makefile,v 1.6 2009/06/21 01:54:47 kan Exp $ +# $FreeBSD: src/gnu/lib/libgcov/Makefile,v 1.7 2009/10/25 15:52:31 kan Exp $ NO_PROFILE= .include +MK_SSP= no .include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt" GCCDIR= ${.CURDIR}/../../../contrib/gcc ==== //depot/projects/scottl-camlock/src/lib/libthr/arch/ia64/Makefile.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ -# $FreeBSD: src/lib/libthr/arch/ia64/Makefile.inc,v 1.3 2008/02/13 05:25:43 obrien Exp $ +# $FreeBSD: src/lib/libthr/arch/ia64/Makefile.inc,v 1.4 2009/10/24 20:07:17 marcel Exp $ .PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} -SRCS+= pthread_md.c +SRCS+= _umtx_op_err.S pthread_md.c ==== //depot/projects/scottl-camlock/src/lib/libthr/arch/ia64/include/pthread_md.h#2 (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/lib/libthr/arch/ia64/include/pthread_md.h,v 1.4 2006/12/15 11:52:00 davidxu Exp $ + * $FreeBSD: src/lib/libthr/arch/ia64/include/pthread_md.h,v 1.5 2009/10/24 20:07:17 marcel Exp $ */ #ifndef _PTHREAD_MD_H_ @@ -33,6 +33,8 @@ #define CPU_SPINWAIT +#define HAS__UMTX_OP_ERR 1 + #define DTV_OFFSET offsetof(struct tcb, tcb_dtv) /* ==== //depot/projects/scottl-camlock/src/sbin/geom/class/part/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sbin/geom/class/part/Makefile,v 1.2 2008/11/18 04:04:01 marcel Exp $ +# $FreeBSD: src/sbin/geom/class/part/Makefile,v 1.3 2009/10/26 07:43:41 lulf Exp $ .PATH: ${.CURDIR}/../../misc @@ -6,6 +6,4 @@ LDADD= -lutil -WARNS?= 4 - .include ==== //depot/projects/scottl-camlock/src/sbin/geom/class/part/geom_part.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/geom/class/part/geom_part.c,v 1.21 2009/08/16 21:27:35 marcel Exp $"); +__FBSDID("$FreeBSD: src/sbin/geom/class/part/geom_part.c,v 1.22 2009/10/26 07:43:41 lulf Exp $"); #include @@ -192,6 +192,7 @@ unsigned long long sector, bestsector; bestpp = NULL; + bestsector = 0; LIST_FOREACH(pp, &gp->lg_provider, lg_provider) { s = find_provcfg(pp, "start"); if (s == NULL) { ==== //depot/projects/scottl-camlock/src/share/man/man4/acpi_hp.4#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/acpi_hp.4,v 1.4 2009/07/03 21:12:37 rpaulo Exp $ +.\" $FreeBSD: src/share/man/man4/acpi_hp.4,v 1.5 2009/10/24 11:32:02 rpaulo Exp $ .\" .Dd June 30, 2009 .Dt ACPI_HP 4 i386 @@ -256,7 +256,7 @@ The .Nm device driver first appeared in -.Fx CURRENT . +.Fx 8.0 . .Sh AUTHORS .An -nosplit The @@ -279,7 +279,7 @@ This manual page was written by .An Michael Gmelin Aq freebsd@grem.de .Sh BUGS -This driver is experimental and has only been tested on CURRENT i386 on an +This driver is experimental and has only been tested on i386 on an HP Compaq 8510p which featured all supported wireless devices (WWAN/BT/WLAN). Expect undefined results when operating on different hardware. .Pp ==== //depot/projects/scottl-camlock/src/share/man/man4/acpi_wmi.4#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/acpi_wmi.4,v 1.3 2009/07/03 21:12:37 rpaulo Exp $ +.\" $FreeBSD: src/share/man/man4/acpi_wmi.4,v 1.4 2009/10/24 11:32:02 rpaulo Exp $ .\" .Dd June 30, 2009 .Dt ACPI_WMI 4 i386 @@ -79,7 +79,7 @@ The .Nm device driver first appeared in -.Fx CURRENT . +.Fx 8.0 . .Sh AUTHORS .An -nosplit The ==== //depot/projects/scottl-camlock/src/share/man/man4/bge.4#4 (text+ko) ==== @@ -29,9 +29,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/bge.4,v 1.36 2009/10/07 13:25:24 stas Exp $ +.\" $FreeBSD: src/share/man/man4/bge.4,v 1.37 2009/10/25 17:47:52 brueffer Exp $ .\" -.Dd Oct 7, 2009 +.Dd October 7, 2009 .Dt BGE 4 .Os .Sh NAME ==== //depot/projects/scottl-camlock/src/share/man/man4/iwn.4#3 (text+ko) ==== @@ -23,38 +23,54 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/iwn.4,v 1.5 2009/06/10 03:28:34 sam Exp $ +.\" $FreeBSD: src/share/man/man4/iwn.4,v 1.6 2009/10/25 11:01:53 rpaulo Exp $ .\" -.Dd April 13, 2008 +.Dd October 25, 2009 .Os .Dt IWN 4 .Sh NAME .Nm iwn -.Nd "Intel Wireless WiFi Link 4965AGN IEEE 802.11n driver" +.Nd "Intel Wireless WiFi Link 4965/5000 IEEE 802.11n driver" .Sh SYNOPSIS To compile this driver into the kernel, include the following lines in your kernel configuration file: .Bd -ragged -offset indent .Cd "device iwn" -.Cd "device iwnfw" .Cd "device pci" .Cd "device wlan" .Cd "device firmware" .Ed .Pp +You also need to select a firmware for your device. Chose one from: +.Bd -ragged -offset indent +.Cd "device iwn4965fw" +.Cd "device iwn5000fw" +.Cd "device iwn5100fw" +.Ed +.Pp +Or you can use +.Bd -ragged -offset indent +.Cd "device iwnfw" +.Ed +.Pp +to include them all. +.Pp Alternatively, to load the driver as a module at boot time, place the following line in .Xr loader.conf 5 : .Bd -literal -offset indent if_iwn_load="YES" +iwn4965fw_load="YES" +iwn5000fw_load="YES" +iwn5100fw_load="YES" .Ed .Sh DESCRIPTION The .Nm driver provides support for .Tn Intel -Wireless WiFi Link 4965AGN PCI-Express network adapters. +Wireless WiFi Link 4965 and 5000 series of PCI-Express network adapters. .Nm supports .Cm station , ==== //depot/projects/scottl-camlock/src/share/man/man4/iwnfw.4#2 (text+ko) ==== @@ -20,9 +20,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/iwnfw.4,v 1.1 2009/05/09 19:19:19 sam Exp $ +.\" $FreeBSD: src/share/man/man4/iwnfw.4,v 1.2 2009/10/25 11:01:53 rpaulo Exp $ .\" -.Dd May 9, 2009 +.Dd October 25, 2009 .Dt IWNFW 4 .Os .Sh NAME @@ -36,15 +36,26 @@ .Cd "device iwnfw" .Ed .Pp +This will include three firmware images inside the kernel. +If you want to pick only the firmware image for your network adapter choose one +of the following: +.Bd -ragged -offset indent +.Cd "device iwn4965fw" +.Cd "device iwn5000fw" +.Cd "device iwn5100fw" +.Ed +.Pp Alternatively, to load the driver as a module at boot time, place the following line in .Xr loader.conf 5 : .Bd -literal -offset indent -iwnfw_load="YES" +iwn4965fw_load="YES" +iwn5000fw_load="YES" +iwn5100fw_load="YES" .Ed .Sh DESCRIPTION This module provides access to firmware sets for the -Intel Wireless WiFi Link 4965AGN IEEE 802.11n adapters. +Intel Wireless WiFi Link 4965 and 5000 series of IEEE 802.11n adapters. It may be statically linked into the kernel, or loaded as a module. .Sh SEE ALSO ==== //depot/projects/scottl-camlock/src/share/man/man4/msk.4#5 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/msk.4,v 1.10 2009/09/28 21:15:57 yongari Exp $ +.\" $FreeBSD: src/share/man/man4/msk.4,v 1.11 2009/10/25 21:46:38 lulf Exp $ .\" .Dd September 28, 2009 .Dt MSK 4 @@ -190,6 +190,8 @@ .It Marvell Yukon 88E8040T Fast Ethernet .It +Marvell Yukon 88E8042 Fast Ethernet +.It Marvell Yukon 88E8048 Fast Ethernet .It Marvell Yukon 88E8050 Gigabit Ethernet ==== //depot/projects/scottl-camlock/src/sys/compat/linux/linux_socket.c#20 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.101 2009/08/01 19:26:27 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.102 2009/10/25 09:58:56 bz Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" @@ -639,19 +639,12 @@ } #ifdef INET6 /* - * Linux AF_INET6 socket has IPV6_V6ONLY setsockopt set to 0 by - * default and some apps depend on this. So, set V6ONLY to 0 - * for Linux apps if the sysctl value is set to 1. + * Linux AF_INET6 socket has IPV6_V6ONLY setsockopt set to 0 by default + * and some apps depend on this. So, set V6ONLY to 0 for Linux apps. + * For simplicity we do this unconditionally of the net.inet6.ip6.v6only + * sysctl value. */ - if (bsd_args.domain == PF_INET6 -#ifndef KLD_MODULE - /* - * XXX: Avoid undefined symbol error with an IPv4 only - * kernel. - */ - && V_ip6_v6only -#endif - ) { + if (bsd_args.domain == PF_INET6) { int v6only; v6only = 0; ==== //depot/projects/scottl-camlock/src/sys/conf/NOTES#38 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1558 2009/10/21 12:47:09 stas Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1559 2009/10/26 10:35:16 mav Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1657,6 +1657,10 @@ # The 'ATA' driver supports all ATA and ATAPI devices, including PC Card # devices. You only need one "device ata" for it to find all # PCI and PC Card ATA/ATAPI devices on modern machines. +# Alternatively, individual bus and chipset drivers may be chosen by using +# the 'atacore' driver then selecting the drivers on a per vendor basis. +# For example to build a system which only supports a VIA chipset, +# omit 'ata' and include the 'atacore', 'atapci' and 'atavia' drivers. device ata device atadisk # ATA disk drives device ataraid # ATA RAID drives @@ -1665,6 +1669,39 @@ device atapist # ATAPI tape drives device atapicam # emulate ATAPI devices as SCSI ditto via CAM # needs CAM to be present (scbus & pass) + +# Modular ATA +#device atacore # Core ATA functionality +#device atacard # CARDBUS support +#device atabus # PC98 cbus support +#device ataisa # ISA bus support +#device atapci # PCI bus support; only generic chipset support + +# PCI ATA chipsets +#device ataahci # AHCI SATA +#device ataacard # ACARD +#device ataacerlabs # Acer Labs Inc. (ALI) +#device ataadaptec # Adaptec +#device ataamd # American Micro Devices (AMD) +#device ataati # ATI +#device atacenatek # Cenatek +#device atacypress # Cypress +#device atacyrix # Cyrix +#device atahighpoint # HighPoint +#device ataintel # Intel +#device ataite # Integrated Technology Inc. (ITE) +#device atajmicron # JMicron +#device atamarvell # Marvell +#device atamicron # Micron +#device atanational # National +#device atanetcell # NetCell +#device atanvidia # nVidia +#device atapromise # Promise +#device ataserverworks # ServerWorks +#device atasiliconimage # Silicon Image Inc. (SiI) (formerly CMD) +#device atasis # Silicon Integrated Systems Corp.(SiS) +#device atavia # VIA Technologies Inc. + # # For older non-PCI, non-PnPBIOS systems, these are the hints lines to add: hint.ata.0.at="isa" ==== //depot/projects/scottl-camlock/src/sys/conf/files#51 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1478 2009/10/23 12:36:42 mav Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1479 2009/10/25 10:23:11 rpaulo Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1082,20 +1082,48 @@ no-obj no-implicit-rule \ clean "iwi_monitor.fw" dev/iwn/if_iwn.c optional iwn -iwnfw.c optional iwnfw \ - compile-with "${AWK} -f $S/tools/fw_stub.awk iwn.fw:iwnfw:44417 -lintel_iwn -miwn -c${.TARGET}" \ +iwn4965fw.c optional iwn4965fw | iwnfw \ + compile-with "${AWK} -f $S/tools/fw_stub.awk iwn4965.fw:iwn4965fw -miwn4965fw -c${.TARGET}" \ + no-implicit-rule before-depend local \ + clean "iwn4965fw.c" +iwn4965fw.fwo optional iwn4965fw | iwnfw \ + dependency "iwn4965.fw" \ + compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwn4965.fw" \ + no-implicit-rule \ + clean "iwn4965fw.fwo" +iwn4965.fw optional iwn4965fw | iwnfw \ + dependency ".PHONY" \ + compile-with "uudecode -o ${.TARGET} $S/contrib/dev/iwn/iwlwifi-4965-228.57.2.23.fw.uu" \ + no-obj no-implicit-rule \ + clean "iwn4965.fw" +iwn5000fw.c optional iwn5000fw | iwnfw \ + compile-with "${AWK} -f $S/tools/fw_stub.awk iwn5000.fw:iwn5000fw -miwn5000fw -c${.TARGET}" \ + no-implicit-rule before-depend local \ + clean "iwn5000fw.c" +iwn5000fw.fwo optional iwn5000fw | iwnfw \ + dependency "iwn5000.fw" \ + compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwn5000.fw" \ + no-implicit-rule \ + clean "iwn5000fw.fwo" +iwn5000.fw optional iwn5000fw | iwnfw \ + dependency ".PHONY" \ + compile-with "uudecode -o ${.TARGET} $S/contrib/dev/iwn/iwlwifi-5000-5.4.A.11.fw.uu" \ + no-obj no-implicit-rule \ + clean "iwn5000.fw" +iwn5150fw.c optional iwn5150fw | iwnfw \ + compile-with "${AWK} -f $S/tools/fw_stub.awk iwn5150.fw:iwn5150fw -miwn5150fw -c${.TARGET}" \ no-implicit-rule before-depend local \ - clean "iwnfw.c" -iwnfw.fwo optional iwnfw \ - dependency "iwn.fw" \ - compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwn.fw" \ + clean "iwn5150fw.c" +iwn5150fw.fwo optional iwn5150fw | iwnfw \ + dependency "iwn5150.fw" \ + compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwn5150.fw" \ no-implicit-rule \ - clean "iwnfw.fwo" -iwn.fw optional iwnfw \ + clean "iwn5150fw.fwo" +iwn5150.fw optional iwn5150fw | iwnfw \ dependency ".PHONY" \ - compile-with "uudecode -o ${.TARGET} $S/contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu" \ + compile-with "uudecode -o ${.TARGET} $S/contrib/dev/iwn/iwlwifi-5150-8.24.2.2.fw.uu" \ no-obj no-implicit-rule \ - clean "iwn.fw" + clean "iwn5150.fw" dev/ixgb/if_ixgb.c optional ixgb dev/ixgb/ixgb_ee.c optional ixgb dev/ixgb/ixgb_hw.c optional ixgb ==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-disk.c#18 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.217 2009/09/04 09:33:50 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.218 2009/10/26 11:20:14 mav Exp $"); #include "opt_ata.h" #include @@ -230,7 +230,7 @@ } request->dev = dev; request->flags = ATA_R_CONTROL; - request->timeout = 5; + request->timeout = 10; request->retries = 1; request->callback = ad_power_callback; request->u.ata.command = ATA_STANDBY_IMMEDIATE; @@ -265,7 +265,7 @@ request->timeout = 31; } else { - request->timeout = 5; + request->timeout = 10; } request->retries = 2; request->data = bp->bio_data; @@ -468,7 +468,7 @@ request->u.ata.count = 0; request->u.ata.feature = 0; request->flags = ATA_R_CONTROL | ATA_R_QUIET; - request->timeout = 5; + request->timeout = 10; request->retries = 0; ata_queue_request(request); if (request->status & ATA_S_ERROR) @@ -487,7 +487,7 @@ request->u.ata.count = 1; request->u.ata.feature = 0; request->flags = ATA_R_CONTROL; - request->timeout = 5; + request->timeout = 10; request->retries = 0; ata_queue_request(request); if (request->status & ATA_S_ERROR) ==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.h#19 (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.109 2009/06/24 15:38:17 raj Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.110 2009/10/26 10:00:59 mav Exp $ */ /* structure holding chipset config info */ @@ -415,6 +415,8 @@ #define ATA_VIA8237 0x32271106 #define ATA_VIA8237A 0x05911106 #define ATA_VIA8237S 0x53371106 +#define ATA_VIA8237_5372 0x53721106 +#define ATA_VIA8237_7372 0x73721106 #define ATA_VIA8251 0x33491106 #define ATA_VIA8361 0x31121106 #define ATA_VIA8363 0x03051106 ==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-queue.c#22 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.86 2009/10/23 14:56:29 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.87 2009/10/26 11:20:14 mav Exp $"); #include "opt_ata.h" #include @@ -143,7 +143,7 @@ atadev->spindown_state = 0; request->timeout = 31; } else { - request->timeout = 5; + request->timeout = 10; } request->retries = 0; ata_queue_request(request); @@ -397,7 +397,7 @@ request->bytecount = sizeof(struct atapi_sense); request->donecount = 0; request->transfersize = sizeof(struct atapi_sense); - request->timeout = 5; + request->timeout = 10; request->flags &= (ATA_R_ATAPI | ATA_R_QUIET | ATA_R_DEBUG); request->flags |= (ATA_R_READ | ATA_R_AT_HEAD | ATA_R_REQUEUE); ATA_DEBUG_RQ(request, "autoissue request sense"); ==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-raid.c#14 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.135 2009/09/08 13:19:05 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.136 2009/10/26 11:20:14 mav Exp $"); #include "opt_ata.h" #include @@ -273,7 +273,7 @@ request->u.ata.lba = 0; request->u.ata.count = 0; request->u.ata.feature = 0; - request->timeout = 1; + request->timeout = 10; request->retries = 0; request->flags |= ATA_R_ORDERED | ATA_R_DIRECT; ata_queue_request(request); @@ -4371,7 +4371,7 @@ return NULL; } request->dev = dev; - request->timeout = 5; + request->timeout = 10; request->retries = 2; request->callback = ata_raid_done; request->driver = rdp; ==== //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cam.c#19 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cam.c,v 1.63 2009/07/10 08:18:08 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cam.c,v 1.65 2009/10/26 11:26:49 mav Exp $"); #include #include @@ -414,6 +414,12 @@ case ATA_UDMA6: cpi->base_transfer_speed = 133000; break; + case ATA_SA150: + cpi->base_transfer_speed = 150000; + break; + case ATA_SA300: + cpi->base_transfer_speed = 300000; + break; default: break; } @@ -629,7 +635,7 @@ request->data = buf; request->bytecount = len; request->transfersize = min(request->bytecount, 65534); - request->timeout = ccb_h->timeout / 1000; /* XXX lost granularity */ + request->timeout = (ccb_h->timeout + 999) / 1000; request->callback = &atapi_cb; request->flags = request_flags; @@ -732,7 +738,7 @@ request->data = (caddr_t)&csio->sense_data; request->bytecount = sizeof(struct atapi_sense); request->transfersize = min(request->bytecount, 65534); - request->timeout = csio->ccb_h.timeout / 1000; + request->timeout = (csio->ccb_h.timeout + 999) / 1000; request->retries = 2; request->flags = ATA_R_QUIET|ATA_R_ATAPI|ATA_R_IMMEDIATE; hcb->flags |= AUTOSENSE; ==== //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cd.c#15 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.207 2009/10/23 14:56:29 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.208 2009/10/26 11:20:14 mav Exp $"); #include "opt_ata.h" #include @@ -700,7 +700,7 @@ request->dev = dev; bcopy(ccb, request->u.atapi.ccb, 16); request->flags = ATA_R_ATAPI; - request->timeout = 5; + request->timeout = 10; ata_queue_request(request); if (!request->error && (request->u.atapi.sense.key == 2 || ==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-nvidia.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-nvidia.c,v 1.9 2009/07/05 14:50:45 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-nvidia.c,v 1.10 2009/10/26 08:41:10 mav Exp $"); #include "opt_ata.h" #include @@ -165,7 +165,8 @@ /* enable control access */ pci_write_config(dev, 0x50, pci_read_config(dev, 0x50, 1) | 0x04,1); - + /* MCP55 seems to need some time to allow r_res2 read. */ + DELAY(10); if (ctlr->chip->cfg1 & NVQ) { /* clear interrupt status */ ATA_OUTL(ctlr->r_res2, offset, 0x00ff00ff); ==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-via.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-via.c,v 1.6 2009/06/24 19:49:18 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-via.c,v 1.8 2009/10/26 10:07:52 mav Exp $"); #include "opt_ata.h" #include @@ -95,6 +95,8 @@ { ATA_VIA8237, 0x00, VIA133, 0x00, ATA_UDMA6, "8237" }, { ATA_VIA8237A, 0x00, VIA133, 0x00, ATA_UDMA6, "8237A" }, { ATA_VIA8237S, 0x00, VIA133, 0x00, ATA_UDMA6, "8237S" }, + { ATA_VIA8237_5372, 0x00, VIA133, 0x00, ATA_UDMA6, "8237" }, + { ATA_VIA8237_7372, 0x00, VIA133, 0x00, ATA_UDMA6, "8237" }, { ATA_VIA8251, 0x00, VIA133, 0x00, ATA_UDMA6, "8251" }, { 0, 0, 0, 0, 0, 0 }}; static struct ata_chip_id new_ids[] = @@ -103,6 +105,8 @@ { ATA_VIA6421, 0x00, 6, VIABAR, ATA_SA150, "6421" }, { ATA_VIA8237A, 0x00, 7, 0x00, ATA_SA150, "8237A" }, { ATA_VIA8237S, 0x00, 7, 0x00, ATA_SA150, "8237S" }, + { ATA_VIA8237_5372, 0x00, 7, 0x00, ATA_SA300, "8237" }, + { ATA_VIA8237_7372, 0x00, 7, 0x00, ATA_SA300, "8237" }, { ATA_VIA8251, 0x00, 0, VIAAHCI, ATA_SA300, "8251" }, { 0, 0, 0, 0, 0, 0 }}; ==== //depot/projects/scottl-camlock/src/sys/dev/iwn/if_iwn.c#7 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/iwn/if_iwn.c,v 1.19 2009/10/23 22:04:18 rpaulo Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/iwn/if_iwn.c,v 1.20 2009/10/24 09:55:11 rpaulo Exp $"); #include #include @@ -601,7 +601,7 @@ switch (sc->hw_type) { case IWN_HW_REV_TYPE_4965: sc->sc_hal = &iwn4965_hal; - sc->fwname = "iwnfw-4965"; + sc->fwname = "iwn4965fw"; sc->critical_temp = IWN_CTOK(110); sc->txantmsk = IWN_ANT_A | IWN_ANT_B; sc->rxantmsk = IWN_ANT_ABC; @@ -610,7 +610,7 @@ break; case IWN_HW_REV_TYPE_5100: sc->sc_hal = &iwn5000_hal; - sc->fwname = "iwnfw-5000"; + sc->fwname = "iwn5000fw"; sc->critical_temp = 110; sc->txantmsk = IWN_ANT_B; sc->rxantmsk = IWN_ANT_A | IWN_ANT_B; @@ -619,7 +619,7 @@ break; case IWN_HW_REV_TYPE_5150: sc->sc_hal = &iwn5000_hal; - sc->fwname = "iwnfw-5150"; + sc->fwname = "iwn5150fw"; /* NB: critical temperature will be read from EEPROM. */ sc->txantmsk = IWN_ANT_A; sc->rxantmsk = IWN_ANT_A | IWN_ANT_B; @@ -629,14 +629,14 @@ case IWN_HW_REV_TYPE_5300: case IWN_HW_REV_TYPE_5350: sc->sc_hal = &iwn5000_hal; - sc->fwname = "iwnfw-5000"; + sc->fwname = "iwn5000fw"; sc->critical_temp = 110; sc->txantmsk = sc->rxantmsk = IWN_ANT_ABC; sc->ntxchains = sc->nrxchains = 3; break; case IWN_HW_REV_TYPE_1000: sc->sc_hal = &iwn5000_hal; - sc->fwname = "iwnfw-1000"; + sc->fwname = "iwn1000fw"; sc->critical_temp = 110; sc->txantmsk = IWN_ANT_A; sc->rxantmsk = IWN_ANT_A | IWN_ANT_B; @@ -645,7 +645,7 @@ break; case IWN_HW_REV_TYPE_6000: sc->sc_hal = &iwn5000_hal; - sc->fwname = "iwnfw-6000"; + sc->fwname = "iwn6000fw"; sc->critical_temp = 110; sc->txantmsk = IWN_ANT_ABC; sc->rxantmsk = IWN_ANT_ABC; @@ -654,7 +654,7 @@ break; case IWN_HW_REV_TYPE_6050: sc->sc_hal = &iwn5000_hal; - sc->fwname = "iwnfw-6050"; + sc->fwname = "iwn6050fw"; sc->critical_temp = 110; sc->txantmsk = IWN_ANT_ABC; sc->rxantmsk = IWN_ANT_ABC; @@ -1150,7 +1150,6 @@ */ for (i = 0; i < IWN_RX_RING_COUNT; i++) { struct iwn_rx_data *data = &ring->data[i]; - struct mbuf *m; bus_addr_t paddr; error = bus_dmamap_create(ring->desc_dma.tag, 0, &data->map); @@ -1161,8 +1160,8 @@ goto fail; } - m = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR, MJUMPAGESIZE); - if (m == NULL) { + data->m = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR, MJUMPAGESIZE); + if (data->m == NULL) { device_printf(sc->sc_dev, "%s: could not allocate rx mbuf\n", __func__); error = ENOMEM; @@ -1171,21 +1170,17 @@ /* Map page. */ error = bus_dmamap_load(ring->desc_dma.tag, data->map, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Oct 26 15:16:39 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 949C71065676; Mon, 26 Oct 2009 15:16:39 +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 3F02B106566C for ; Mon, 26 Oct 2009 15:16:39 +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 0FB768FC0A for ; Mon, 26 Oct 2009 15:16: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 n9QFGctZ018131 for ; Mon, 26 Oct 2009 15:16:38 GMT (envelope-from yohanes@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9QFGcit018129 for perforce@freebsd.org; Mon, 26 Oct 2009 15:16:38 GMT (envelope-from yohanes@FreeBSD.org) Date: Mon, 26 Oct 2009 15:16:38 GMT Message-Id: <200910261516.n9QFGcit018129@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 169828 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, 26 Oct 2009 15:16:39 -0000 http://p4web.freebsd.org/chv.cgi?CH=169828 Change 169828 by yohanes@econa on 2009/10/26 15:16:38 clean up comments Affected files ... .. //depot/projects/str91xx/src/sys/arm/econa/if_ece.c#9 edit .. //depot/projects/str91xx/src/sys/arm/econa/if_ecevar.h#2 edit Differences ... ==== //depot/projects/str91xx/src/sys/arm/econa/if_ece.c#9 (text+ko) ==== @@ -548,7 +548,7 @@ return (ENXIO); } - /* Allocate a busdma tag for mbufs. */ + /* Allocate a busdma tag for mbufs. Alignment is 2 bytes */ error = bus_dma_tag_create(sc->sc_parent_tag, /* parent */ 16, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ @@ -778,7 +778,9 @@ eth_rx_desc_t *descrx; int i; int error; + + /*create parent tag for tx and rx*/ error = bus_dma_tag_create( bus_get_dma_tag(sc->dev), /* parent */ @@ -832,7 +834,6 @@ ece_activate(device_t dev) { struct ece_softc *sc; - //int rid; int err; uint32_t mac_port_config; uint32_t cpu_port_config; @@ -1412,8 +1413,6 @@ fssd = (fssd_curr - (uint32_t)sc->ring_paddr_rx)>>4; -// printf("fssd = %d\n", fssd); - desc = sc->rx_desc[sc->last_rx].desc; if (fssd > sc->last_rx) { @@ -1433,7 +1432,6 @@ sc->dmamap_ring_rx, BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); - //printf("starting to read\n"); for (i= 0; itx_cons==sc->tx_prod) return; + /*prepare to read the ring (owner bit)*/ bus_dmamap_sync(sc->dmatag_ring_tx, sc->dmamap_ring_tx, BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); - while (sc->tx_cons!=sc->tx_prod) { desc = sc->tx_desc[sc->tx_cons].desc; if (desc->cown != 0) { struct tx_desc_info *td = &(sc->tx_desc[sc->tx_cons]); + /*we are finished with this descriptor*/ + /*sync*/ bus_dmamap_sync(sc->dmatag_data_tx, td->dmamap, BUS_DMASYNC_POSTWRITE); + /*and unload, so we can reuse */ bus_dmamap_unload(sc->dmatag_data_tx, td->dmamap); m_freem(td->buff); td->buff = 0; @@ -1585,7 +1586,6 @@ } - static void ece_intr_qf(void *xsc) { ==== //depot/projects/str91xx/src/sys/arm/econa/if_ecevar.h#2 (text+ko) ==== @@ -113,9 +113,12 @@ bus_dmamap_t dmamap_ring_tx; bus_dmamap_t dmamap_ring_rx; + + /*dma tag for ring*/ bus_dma_tag_t dmatag_ring_tx; bus_dma_tag_t dmatag_ring_rx; + /*dma tag for data*/ bus_dma_tag_t dmatag_data_tx; bus_dma_tag_t dmatag_data_rx; @@ -126,13 +129,16 @@ /*ring physical address*/ bus_addr_t ring_paddr_tx; bus_addr_t ring_paddr_rx; - + + /*index of last received descritor*/ uint32_t last_rx; struct rx_desc_info rx_desc[ECE_MAX_RX_BUFFERS]; - uint32_t tx_prod; + /* tx producer index */ + uint32_t tx_prod; + /* tx consumer index */ uint32_t tx_cons; - /*ring index*/ + /* tx ring index*/ uint32_t desc_curr_tx; struct tx_desc_info tx_desc[ECE_MAX_TX_BUFFERS]; From owner-p4-projects@FreeBSD.ORG Mon Oct 26 21:52:25 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 59594106568F; Mon, 26 Oct 2009 21:52:25 +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 1B757106568B for ; Mon, 26 Oct 2009 21:52:25 +0000 (UTC) (envelope-from peter@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 073768FC13 for ; Mon, 26 Oct 2009 21:52:25 +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 n9QLqOTf077849 for ; Mon, 26 Oct 2009 21:52:24 GMT (envelope-from peter@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9QLqLlc077847 for perforce@freebsd.org; Mon, 26 Oct 2009 21:52:21 GMT (envelope-from peter@wemm.org) Date: Mon, 26 Oct 2009 21:52:21 GMT Message-Id: <200910262152.n9QLqLlc077847@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 169839 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, 26 Oct 2009 21:52:25 -0000 http://p4web.freebsd.org/chv.cgi?CH=169839 Change 169839 by peter@peter_overcee on 2009/10/26 21:51:37 IFC @169837 Affected files ... .. //depot/projects/hammer/Makefile.inc1#148 integrate .. //depot/projects/hammer/ObsoleteFiles.inc#72 integrate .. //depot/projects/hammer/UPDATING#137 integrate .. //depot/projects/hammer/bin/cat/Makefile#3 integrate .. //depot/projects/hammer/bin/csh/iconv_stub.c#2 integrate .. //depot/projects/hammer/bin/ls/ls.c#19 integrate .. //depot/projects/hammer/bin/sh/eval.c#23 integrate .. //depot/projects/hammer/bin/sh/exec.c#15 integrate .. //depot/projects/hammer/bin/sh/expand.c#17 integrate .. //depot/projects/hammer/bin/sh/parser.c#17 integrate .. //depot/projects/hammer/bin/sh/sh.1#33 integrate .. //depot/projects/hammer/bin/uuidgen/Makefile#3 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zfs/zfs.8#3 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#3 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/i386.c#17 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_getch.c#7 integrate .. //depot/projects/hammer/contrib/openpam/doc/man/pam.conf.5#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-tcp.c#9 integrate .. //depot/projects/hammer/contrib/tcpdump/tcp.h#6 integrate .. //depot/projects/hammer/contrib/tcsh/sh.c#8 integrate .. //depot/projects/hammer/crypto/openssh/ChangeLog#14 integrate .. //depot/projects/hammer/crypto/openssh/README#12 integrate .. //depot/projects/hammer/crypto/openssh/README.platform#7 integrate .. //depot/projects/hammer/crypto/openssh/auth-pam.c#15 integrate .. //depot/projects/hammer/crypto/openssh/auth-passwd.c#12 integrate .. //depot/projects/hammer/crypto/openssh/auth-sia.c#9 integrate .. //depot/projects/hammer/crypto/openssh/auth1.c#13 integrate .. //depot/projects/hammer/crypto/openssh/auth2-jpake.c#2 integrate .. //depot/projects/hammer/crypto/openssh/auth2-kbdint.c#7 integrate .. //depot/projects/hammer/crypto/openssh/auth2-none.c#8 integrate .. //depot/projects/hammer/crypto/openssh/auth2-passwd.c#6 integrate .. //depot/projects/hammer/crypto/openssh/auth2-pubkey.c#8 integrate .. //depot/projects/hammer/crypto/openssh/auth2.c#15 integrate .. //depot/projects/hammer/crypto/openssh/canohost.c#15 integrate .. //depot/projects/hammer/crypto/openssh/canohost.h#5 integrate .. //depot/projects/hammer/crypto/openssh/channels.c#15 integrate .. //depot/projects/hammer/crypto/openssh/clientloop.c#13 integrate .. //depot/projects/hammer/crypto/openssh/config.h#17 integrate .. //depot/projects/hammer/crypto/openssh/config.h.in#3 integrate .. //depot/projects/hammer/crypto/openssh/defines.h#14 integrate .. //depot/projects/hammer/crypto/openssh/gss-genr.c#7 integrate .. //depot/projects/hammer/crypto/openssh/includes.h#12 integrate .. //depot/projects/hammer/crypto/openssh/jpake.c#2 integrate .. //depot/projects/hammer/crypto/openssh/jpake.h#2 integrate .. //depot/projects/hammer/crypto/openssh/kex.c#10 integrate .. //depot/projects/hammer/crypto/openssh/kex.h#9 integrate .. //depot/projects/hammer/crypto/openssh/kexdhs.c#5 integrate .. //depot/projects/hammer/crypto/openssh/kexgexs.c#5 integrate .. //depot/projects/hammer/crypto/openssh/monitor.c#16 integrate .. //depot/projects/hammer/crypto/openssh/monitor_mm.c#7 integrate .. //depot/projects/hammer/crypto/openssh/monitor_wrap.c#14 integrate .. //depot/projects/hammer/crypto/openssh/monitor_wrap.h#12 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#9 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-cygwin_util.h#4 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/daemon.c#6 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/getrrsetbyname.c#9 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/openssl-compat.c#4 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/openssl-compat.h#5 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/port-aix.c#10 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/port-aix.h#11 integrate .. //depot/projects/hammer/crypto/openssh/packet.c#14 integrate .. //depot/projects/hammer/crypto/openssh/packet.h#8 integrate .. //depot/projects/hammer/crypto/openssh/readconf.c#15 integrate .. //depot/projects/hammer/crypto/openssh/readconf.h#13 integrate .. //depot/projects/hammer/crypto/openssh/roaming.h#1 branch .. //depot/projects/hammer/crypto/openssh/roaming_common.c#1 branch .. //depot/projects/hammer/crypto/openssh/roaming_dummy.c#1 branch .. //depot/projects/hammer/crypto/openssh/schnorr.c#2 integrate .. //depot/projects/hammer/crypto/openssh/schnorr.h#1 branch .. //depot/projects/hammer/crypto/openssh/servconf.c#14 integrate .. //depot/projects/hammer/crypto/openssh/serverloop.c#13 integrate .. //depot/projects/hammer/crypto/openssh/session.c#17 integrate .. //depot/projects/hammer/crypto/openssh/sftp-client.c#13 integrate .. //depot/projects/hammer/crypto/openssh/sftp-server.8#7 integrate .. //depot/projects/hammer/crypto/openssh/sftp-server.c#11 integrate .. //depot/projects/hammer/crypto/openssh/ssh-agent.1#10 integrate .. //depot/projects/hammer/crypto/openssh/ssh-agent.c#15 integrate .. //depot/projects/hammer/crypto/openssh/ssh-keygen.c#13 integrate .. //depot/projects/hammer/crypto/openssh/ssh.1#15 integrate .. //depot/projects/hammer/crypto/openssh/ssh.c#14 integrate .. //depot/projects/hammer/crypto/openssh/ssh_config#16 integrate .. //depot/projects/hammer/crypto/openssh/ssh_config.5#18 integrate .. //depot/projects/hammer/crypto/openssh/ssh_namespace.h#6 integrate .. //depot/projects/hammer/crypto/openssh/sshconnect.c#14 integrate .. //depot/projects/hammer/crypto/openssh/sshconnect.h#5 integrate .. //depot/projects/hammer/crypto/openssh/sshconnect2.c#15 integrate .. //depot/projects/hammer/crypto/openssh/sshd.8#15 integrate .. //depot/projects/hammer/crypto/openssh/sshd.c#18 integrate .. //depot/projects/hammer/crypto/openssh/sshd_config#17 integrate .. //depot/projects/hammer/crypto/openssh/sshd_config.5#20 integrate .. //depot/projects/hammer/crypto/openssh/sshlogin.c#10 integrate .. //depot/projects/hammer/crypto/openssh/uuencode.c#5 integrate .. //depot/projects/hammer/crypto/openssh/version.h#17 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#99 integrate .. //depot/projects/hammer/etc/gettytab#6 integrate .. //depot/projects/hammer/etc/mtree/BSD.usr.dist#46 integrate .. //depot/projects/hammer/etc/network.subr#32 integrate .. //depot/projects/hammer/etc/pam.d/ftpd#5 integrate .. //depot/projects/hammer/etc/pam.d/kde#5 integrate .. //depot/projects/hammer/etc/pam.d/other#5 integrate .. //depot/projects/hammer/etc/pam.d/sshd#5 integrate .. //depot/projects/hammer/etc/pam.d/system#2 integrate .. //depot/projects/hammer/etc/pam.d/telnetd#5 integrate .. //depot/projects/hammer/etc/pam.d/xdm#7 integrate .. //depot/projects/hammer/etc/periodic/daily/400.status-disks#2 integrate .. //depot/projects/hammer/etc/periodic/security/200.chkmounts#5 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#69 integrate .. //depot/projects/hammer/etc/rc.d/NETWORKING#17 integrate .. //depot/projects/hammer/etc/rc.d/addswap#7 integrate .. //depot/projects/hammer/etc/rc.d/auto_linklocal#3 delete .. //depot/projects/hammer/etc/rc.d/bgfsck#9 integrate .. //depot/projects/hammer/etc/rc.d/cleartmp#15 integrate .. //depot/projects/hammer/etc/rc.d/defaultroute#4 integrate .. //depot/projects/hammer/etc/rc.d/devd#9 integrate .. //depot/projects/hammer/etc/rc.d/faith#1 branch .. //depot/projects/hammer/etc/rc.d/fsck#11 integrate .. //depot/projects/hammer/etc/rc.d/hostid#8 integrate .. //depot/projects/hammer/etc/rc.d/hostname#11 integrate .. //depot/projects/hammer/etc/rc.d/ip6addrctl#6 integrate .. //depot/projects/hammer/etc/rc.d/ldconfig#18 integrate .. //depot/projects/hammer/etc/rc.d/motd#10 integrate .. //depot/projects/hammer/etc/rc.d/mountcritlocal#15 integrate .. //depot/projects/hammer/etc/rc.d/moused#15 integrate .. //depot/projects/hammer/etc/rc.d/mroute6d#5 integrate .. //depot/projects/hammer/etc/rc.d/netif#28 integrate .. //depot/projects/hammer/etc/rc.d/netoptions#9 integrate .. //depot/projects/hammer/etc/rc.d/network_ipv6#9 delete .. //depot/projects/hammer/etc/rc.d/newsyslog#7 integrate .. //depot/projects/hammer/etc/rc.d/nfsclient#8 integrate .. //depot/projects/hammer/etc/rc.d/pf#18 integrate .. //depot/projects/hammer/etc/rc.d/ppp#12 integrate .. //depot/projects/hammer/etc/rc.d/route6d#8 integrate .. //depot/projects/hammer/etc/rc.d/routed#12 integrate .. //depot/projects/hammer/etc/rc.d/routing#11 integrate .. //depot/projects/hammer/etc/rc.d/rtadvd#10 integrate .. //depot/projects/hammer/etc/rc.d/savecore#13 integrate .. //depot/projects/hammer/etc/rc.d/static_arp#2 integrate .. //depot/projects/hammer/etc/rc.d/stf#1 branch .. //depot/projects/hammer/etc/rc.d/sysctl#11 integrate .. //depot/projects/hammer/etc/rc.subr#47 integrate .. //depot/projects/hammer/etc/services#17 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#89 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes.sp.ok#7 integrate .. //depot/projects/hammer/games/number/Makefile#2 integrate .. //depot/projects/hammer/games/number/number.c#4 integrate .. //depot/projects/hammer/gnu/lib/libgcov/Makefile#7 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/tmac/mdoc.local#36 integrate .. //depot/projects/hammer/gnu/usr.bin/patch/common.h#4 integrate .. //depot/projects/hammer/gnu/usr.bin/patch/pch.c#4 integrate .. //depot/projects/hammer/include/langinfo.h#3 integrate .. //depot/projects/hammer/include/libgen.h#2 integrate .. //depot/projects/hammer/kerberos5/lib/libgssapi_krb5/Makefile#3 integrate .. //depot/projects/hammer/kerberos5/lib/libgssapi_spnego/Makefile#2 integrate .. //depot/projects/hammer/lib/libbluetooth/bluetooth.3#10 integrate .. //depot/projects/hammer/lib/libbluetooth/bluetooth.h#6 integrate .. //depot/projects/hammer/lib/libc/Versions.def#5 integrate .. //depot/projects/hammer/lib/libc/gen/Makefile.inc#42 integrate .. //depot/projects/hammer/lib/libc/gen/Symbol.map#16 integrate .. //depot/projects/hammer/lib/libc/gen/_pthread_stubs.c#8 integrate .. //depot/projects/hammer/lib/libc/gen/basename.3#5 integrate .. //depot/projects/hammer/lib/libc/gen/basename.c#3 integrate .. //depot/projects/hammer/lib/libc/gen/errlst.c#6 integrate .. //depot/projects/hammer/lib/libc/gen/fts.3#11 integrate .. //depot/projects/hammer/lib/libc/gen/fts.c#11 integrate .. //depot/projects/hammer/lib/libc/gen/getcwd.c#7 integrate .. //depot/projects/hammer/lib/libc/gen/getpagesizes.3#1 branch .. //depot/projects/hammer/lib/libc/gen/getpagesizes.c#1 branch .. //depot/projects/hammer/lib/libc/gen/wordexp.c#4 integrate .. //depot/projects/hammer/lib/libc/include/namespace.h#15 integrate .. //depot/projects/hammer/lib/libc/include/un-namespace.h#14 integrate .. //depot/projects/hammer/lib/libc/locale/nl_langinfo.c#4 integrate .. //depot/projects/hammer/lib/libc/nls/C.msg#2 integrate .. //depot/projects/hammer/lib/libc/nls/Makefile.inc#9 integrate .. //depot/projects/hammer/lib/libc/nls/gl_ES.ISO8859-1.msg#1 branch .. //depot/projects/hammer/lib/libc/regex/engine.c#10 integrate .. //depot/projects/hammer/lib/libc/regex/grot/tests#3 integrate .. //depot/projects/hammer/lib/libc/stdio/fopen.3#6 integrate .. //depot/projects/hammer/lib/libc/stdio/getdelim.c#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.3#22 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.c#52 integrate .. //depot/projects/hammer/lib/libc/stdtime/localtime.c#13 integrate .. //depot/projects/hammer/lib/libc/sys/Symbol.map#19 integrate .. //depot/projects/hammer/lib/libc/sys/fcntl.2#8 integrate .. //depot/projects/hammer/lib/libc/sys/intro.2#15 integrate .. //depot/projects/hammer/lib/libc/sys/kqueue.2#13 integrate .. //depot/projects/hammer/lib/libc/sys/nanosleep.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/setfib.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/stack_protector.c#4 integrate .. //depot/projects/hammer/lib/libdevinfo/devinfo.h#5 integrate .. //depot/projects/hammer/lib/libdisk/change.c#8 integrate .. //depot/projects/hammer/lib/libfetch/common.c#14 integrate .. //depot/projects/hammer/lib/libjail/jail.3#2 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_ssh/Makefile#9 integrate .. //depot/projects/hammer/lib/libpmc/Makefile#7 integrate .. //depot/projects/hammer/lib/libpmc/libpmc.c#16 integrate .. //depot/projects/hammer/lib/libradius/libradius.3#4 integrate .. //depot/projects/hammer/lib/libradius/radlib.c#5 integrate .. //depot/projects/hammer/lib/libradius/radlib.h#4 integrate .. //depot/projects/hammer/lib/libradius/radlib_private.h#3 integrate .. //depot/projects/hammer/lib/libstand/net.c#4 integrate .. //depot/projects/hammer/lib/libstand/nfs.c#6 integrate .. //depot/projects/hammer/lib/libstand/rpc.c#4 integrate .. //depot/projects/hammer/lib/libthr/arch/ia64/Makefile.inc#4 integrate .. //depot/projects/hammer/lib/libthr/arch/ia64/ia64/_umtx_op_err.S#1 branch .. //depot/projects/hammer/lib/libthr/arch/ia64/include/pthread_md.h#3 integrate .. //depot/projects/hammer/lib/libthr/pthread.map#21 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_private.h#44 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_spec.c#7 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_syscalls.c#17 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_umtx.h#9 integrate .. //depot/projects/hammer/lib/libusb/libusb20_ugen20.c#4 integrate .. //depot/projects/hammer/libexec/rpc.rquotad/rquotad.c#5 integrate .. //depot/projects/hammer/libexec/rtld-elf/map_object.c#15 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.c#49 integrate .. //depot/projects/hammer/release/Makefile#109 integrate .. //depot/projects/hammer/release/doc/README#3 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/errata/article.sgml#22 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/article.sgml#19 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/article.sgml#42 integrate .. //depot/projects/hammer/release/doc/share/misc/man2hwnotes.pl#11 integrate .. //depot/projects/hammer/release/doc/share/mk/doc.relnotes.mk#4 integrate .. //depot/projects/hammer/release/doc/share/sgml/release.dsl#8 integrate .. //depot/projects/hammer/release/doc/share/sgml/release.ent#26 integrate .. //depot/projects/hammer/release/picobsd/bridge/crunch.conf#13 integrate .. //depot/projects/hammer/release/scripts/package-split.py#12 integrate .. //depot/projects/hammer/sbin/Makefile.inc#9 integrate .. //depot/projects/hammer/sbin/adjkerntz/Makefile#2 integrate .. //depot/projects/hammer/sbin/atacontrol/Makefile#4 integrate .. //depot/projects/hammer/sbin/atm/atmconfig/Makefile#8 integrate .. //depot/projects/hammer/sbin/badsect/Makefile#3 integrate .. //depot/projects/hammer/sbin/bsdlabel/Makefile#12 integrate .. //depot/projects/hammer/sbin/camcontrol/Makefile#8 integrate .. //depot/projects/hammer/sbin/camcontrol/camcontrol.c#14 integrate .. //depot/projects/hammer/sbin/ccdconfig/Makefile#5 integrate .. //depot/projects/hammer/sbin/clri/Makefile#2 integrate .. //depot/projects/hammer/sbin/comcontrol/Makefile#4 integrate .. //depot/projects/hammer/sbin/conscontrol/Makefile#2 integrate .. //depot/projects/hammer/sbin/dhclient/Makefile#6 integrate .. //depot/projects/hammer/sbin/dhclient/bpf.c#7 integrate .. //depot/projects/hammer/sbin/dhclient/dhcpd.h#2 integrate .. //depot/projects/hammer/sbin/dhclient/packet.c#3 integrate .. //depot/projects/hammer/sbin/dmesg/Makefile#4 integrate .. //depot/projects/hammer/sbin/dump/Makefile#6 integrate .. //depot/projects/hammer/sbin/dumpfs/Makefile#4 integrate .. //depot/projects/hammer/sbin/dumpfs/dumpfs.c#15 integrate .. //depot/projects/hammer/sbin/dumpon/Makefile#4 integrate .. //depot/projects/hammer/sbin/geom/Makefile#6 integrate .. //depot/projects/hammer/sbin/geom/Makefile.inc#3 integrate .. //depot/projects/hammer/sbin/geom/class/nop/gnop.8#14 integrate .. //depot/projects/hammer/sbin/geom/class/part/Makefile#3 integrate .. //depot/projects/hammer/sbin/geom/class/part/geom_part.c#12 integrate .. //depot/projects/hammer/sbin/geom/class/part/gpart.8#6 integrate .. //depot/projects/hammer/sbin/ggate/Makefile.inc#2 integrate .. //depot/projects/hammer/sbin/growfs/Makefile#8 integrate .. //depot/projects/hammer/sbin/growfs/growfs.c#15 integrate .. //depot/projects/hammer/sbin/gvinum/Makefile#5 integrate .. //depot/projects/hammer/sbin/ifconfig/Makefile#15 integrate .. //depot/projects/hammer/sbin/ifconfig/af_inet6.c#8 integrate .. //depot/projects/hammer/sbin/ifconfig/af_nd6.c#1 branch .. //depot/projects/hammer/sbin/ifconfig/ifconfig.8#58 integrate .. //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#43 integrate .. //depot/projects/hammer/sbin/init/Makefile#9 integrate .. //depot/projects/hammer/sbin/ipf/Makefile.inc#3 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#74 integrate .. //depot/projects/hammer/sbin/iscontrol/Makefile#2 integrate .. //depot/projects/hammer/sbin/kldunload/Makefile#4 integrate .. //depot/projects/hammer/sbin/ldconfig/Makefile#4 integrate .. //depot/projects/hammer/sbin/md5/Makefile#5 integrate .. //depot/projects/hammer/sbin/mdconfig/Makefile#4 integrate .. //depot/projects/hammer/sbin/mdmfs/Makefile#4 integrate .. //depot/projects/hammer/sbin/mksnap_ffs/Makefile#3 integrate .. //depot/projects/hammer/sbin/mksnap_ffs/mksnap_ffs.8#6 integrate .. //depot/projects/hammer/sbin/mount/Makefile#9 integrate .. //depot/projects/hammer/sbin/mount/mount.8#29 integrate .. //depot/projects/hammer/sbin/mount/mount.c#36 integrate .. //depot/projects/hammer/sbin/mount_autofs/Makefile#3 integrate .. //depot/projects/hammer/sbin/mount_cd9660/Makefile#6 integrate .. //depot/projects/hammer/sbin/mount_ext2fs/Makefile#3 integrate .. //depot/projects/hammer/sbin/mount_msdosfs/Makefile#6 integrate .. //depot/projects/hammer/sbin/mount_nfs/mount_nfs.c#23 integrate .. //depot/projects/hammer/sbin/mount_nullfs/Makefile#4 integrate .. //depot/projects/hammer/sbin/mount_reiserfs/Makefile#3 integrate .. //depot/projects/hammer/sbin/mount_unionfs/Makefile#5 integrate .. //depot/projects/hammer/sbin/newfs_msdos/Makefile#6 integrate .. //depot/projects/hammer/sbin/nfsiod/Makefile#3 integrate .. //depot/projects/hammer/sbin/pfctl/Makefile#8 integrate .. //depot/projects/hammer/sbin/rcorder/Makefile#4 integrate .. //depot/projects/hammer/sbin/reboot/Makefile#6 integrate .. //depot/projects/hammer/sbin/recoverdisk/Makefile#2 integrate .. //depot/projects/hammer/sbin/routed/Makefile#6 integrate .. //depot/projects/hammer/sbin/savecore/Makefile#4 integrate .. //depot/projects/hammer/sbin/savecore/savecore.8#12 integrate .. //depot/projects/hammer/sbin/sconfig/Makefile#4 integrate .. //depot/projects/hammer/sbin/shutdown/Makefile#3 integrate .. //depot/projects/hammer/sbin/shutdown/shutdown.c#6 integrate .. //depot/projects/hammer/sbin/spppcontrol/Makefile#2 integrate .. //depot/projects/hammer/sbin/swapon/Makefile#4 integrate .. //depot/projects/hammer/sbin/sysctl/sysctl.c#26 integrate .. //depot/projects/hammer/sbin/tunefs/Makefile#3 integrate .. //depot/projects/hammer/sbin/tunefs/tunefs.8#13 integrate .. //depot/projects/hammer/secure/libexec/sftp-server/Makefile#9 integrate .. //depot/projects/hammer/secure/libexec/ssh-keysign/Makefile#6 integrate .. //depot/projects/hammer/secure/usr.bin/scp/Makefile#6 integrate .. //depot/projects/hammer/secure/usr.bin/sftp/Makefile#8 integrate .. //depot/projects/hammer/secure/usr.bin/ssh-add/Makefile#6 integrate .. //depot/projects/hammer/secure/usr.bin/ssh-agent/Makefile#6 integrate .. //depot/projects/hammer/secure/usr.bin/ssh-keygen/Makefile#6 integrate .. //depot/projects/hammer/secure/usr.bin/ssh-keyscan/Makefile#5 integrate .. //depot/projects/hammer/secure/usr.bin/ssh/Makefile#15 integrate .. //depot/projects/hammer/secure/usr.sbin/sshd/Makefile#22 integrate .. //depot/projects/hammer/share/examples/scsi_target/scsi_target.c#8 integrate .. //depot/projects/hammer/share/man/man4/Makefile#123 integrate .. //depot/projects/hammer/share/man/man4/acpi_hp.4#2 integrate .. //depot/projects/hammer/share/man/man4/acpi_panasonic.4#2 integrate .. //depot/projects/hammer/share/man/man4/acpi_wmi.4#2 integrate .. //depot/projects/hammer/share/man/man4/atapicam.4#6 integrate .. //depot/projects/hammer/share/man/man4/bce.4#9 integrate .. //depot/projects/hammer/share/man/man4/bge.4#28 integrate .. //depot/projects/hammer/share/man/man4/de.4#13 integrate .. //depot/projects/hammer/share/man/man4/ed.4#19 integrate .. //depot/projects/hammer/share/man/man4/hifn.4#9 integrate .. //depot/projects/hammer/share/man/man4/ichwd.4#3 integrate .. //depot/projects/hammer/share/man/man4/inet6.4#5 integrate .. //depot/projects/hammer/share/man/man4/iwn.4#5 integrate .. //depot/projects/hammer/share/man/man4/iwnfw.4#2 integrate .. //depot/projects/hammer/share/man/man4/lindev.4#1 branch .. //depot/projects/hammer/share/man/man4/mac_mls.4#9 integrate .. //depot/projects/hammer/share/man/man4/malo.4#6 integrate .. //depot/projects/hammer/share/man/man4/msk.4#7 integrate .. //depot/projects/hammer/share/man/man4/sbp_targ.4#5 integrate .. //depot/projects/hammer/share/man/man4/syscons.4#12 integrate .. //depot/projects/hammer/share/man/man4/targ.4#4 integrate .. //depot/projects/hammer/share/man/man4/textdump.4#7 integrate .. //depot/projects/hammer/share/man/man4/umass.4#21 integrate .. //depot/projects/hammer/share/man/man4/unix.4#7 integrate .. //depot/projects/hammer/share/man/man4/urtw.4#4 integrate .. //depot/projects/hammer/share/man/man4/zyd.4#5 integrate .. //depot/projects/hammer/share/man/man5/device.hints.5#6 integrate .. //depot/projects/hammer/share/man/man5/procfs.5#10 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#99 integrate .. //depot/projects/hammer/share/man/man7/tuning.7#21 integrate .. //depot/projects/hammer/share/man/man9/BUS_BIND_INTR.9#1 branch .. //depot/projects/hammer/share/man/man9/BUS_DESCRIBE_INTR.9#1 branch .. //depot/projects/hammer/share/man/man9/Makefile#97 integrate .. //depot/projects/hammer/share/man/man9/VOP_ACCESS.9#10 integrate .. //depot/projects/hammer/share/man/man9/acl.9#8 integrate .. //depot/projects/hammer/share/man/man9/fail.9#2 integrate .. //depot/projects/hammer/share/man/man9/fetch.9#2 integrate .. //depot/projects/hammer/share/man/man9/ieee80211.9#6 integrate .. //depot/projects/hammer/share/man/man9/ieee80211_amrr.9#2 integrate .. //depot/projects/hammer/share/man/man9/ieee80211_beacon.9#2 integrate .. //depot/projects/hammer/share/man/man9/ieee80211_bmiss.9#2 integrate .. //depot/projects/hammer/share/man/man9/ieee80211_crypto.9#5 integrate .. //depot/projects/hammer/share/man/man9/ieee80211_ddb.9#2 integrate .. //depot/projects/hammer/share/man/man9/ieee80211_input.9#5 integrate .. //depot/projects/hammer/share/man/man9/ieee80211_node.9#6 integrate .. //depot/projects/hammer/share/man/man9/ieee80211_output.9#5 integrate .. //depot/projects/hammer/share/man/man9/ieee80211_proto.9#5 integrate .. //depot/projects/hammer/share/man/man9/ieee80211_radiotap.9#6 integrate .. //depot/projects/hammer/share/man/man9/ieee80211_regdomain.9#2 integrate .. //depot/projects/hammer/share/man/man9/ieee80211_scan.9#2 integrate .. //depot/projects/hammer/share/man/man9/ieee80211_vap.9#2 integrate .. //depot/projects/hammer/share/man/man9/store.9#2 integrate .. //depot/projects/hammer/share/man/man9/vaccess.9#5 integrate .. //depot/projects/hammer/share/man/man9/vaccess_acl_nfs4.9#1 branch .. //depot/projects/hammer/share/misc/bsd-family-tree#51 integrate .. //depot/projects/hammer/share/misc/committers-src.dot#23 integrate .. //depot/projects/hammer/share/misc/iso3166#12 integrate .. //depot/projects/hammer/share/mk/bsd.sys.mk#20 integrate .. //depot/projects/hammer/share/monetdef/zh_CN.GB18030.src#2 integrate .. //depot/projects/hammer/share/monetdef/zh_CN.GB2312.src#2 integrate .. //depot/projects/hammer/share/timedef/hi_IN.ISCII-DEV.src#3 integrate .. //depot/projects/hammer/share/zoneinfo/Makefile#7 integrate .. //depot/projects/hammer/share/zoneinfo/asia#24 integrate .. //depot/projects/hammer/share/zoneinfo/australasia#15 integrate .. //depot/projects/hammer/share/zoneinfo/southamerica#23 integrate .. //depot/projects/hammer/sys/amd64/acpica/acpi_machdep.c#28 integrate .. //depot/projects/hammer/sys/amd64/acpica/acpi_wakecode.S#3 integrate .. //depot/projects/hammer/sys/amd64/acpica/acpi_wakeup.c#20 integrate .. //depot/projects/hammer/sys/amd64/acpica/madt.c#54 integrate .. //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#43 integrate .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#70 integrate .. //depot/projects/hammer/sys/amd64/amd64/initcpu.c#22 integrate .. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#56 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#179 integrate .. //depot/projects/hammer/sys/amd64/amd64/msi.c#10 integrate .. //depot/projects/hammer/sys/amd64/amd64/nexus.c#46 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#193 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#112 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#125 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#123 integrate .. //depot/projects/hammer/sys/amd64/include/acpica_machdep.h#15 integrate .. //depot/projects/hammer/sys/amd64/include/apm_bios.h#1 branch .. //depot/projects/hammer/sys/amd64/include/atomic.h#28 integrate .. //depot/projects/hammer/sys/amd64/include/cpufunc.h#42 integrate .. //depot/projects/hammer/sys/amd64/include/elf.h#16 integrate .. //depot/projects/hammer/sys/amd64/include/intr_machdep.h#31 integrate .. //depot/projects/hammer/sys/amd64/include/param.h#41 integrate .. //depot/projects/hammer/sys/amd64/include/specialreg.h#37 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_proto.h#19 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#32 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc.c#23 integrate .. //depot/projects/hammer/sys/arm/arm/elf_machdep.c#14 integrate .. //depot/projects/hammer/sys/arm/arm/identcpu.c#14 integrate .. //depot/projects/hammer/sys/arm/arm/pmap.c#59 integrate .. //depot/projects/hammer/sys/arm/conf/HL200#11 integrate .. //depot/projects/hammer/sys/arm/conf/KB920X#16 integrate .. //depot/projects/hammer/sys/arm/include/elf.h#8 integrate .. //depot/projects/hammer/sys/arm/include/md_var.h#6 integrate .. //depot/projects/hammer/sys/arm/include/param.h#13 integrate .. //depot/projects/hammer/sys/arm/mv/mv_machdep.c#7 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/i80321_timer.c#13 integrate .. //depot/projects/hammer/sys/arm/xscale/xscalereg.h#3 delete .. //depot/projects/hammer/sys/arm/xscale/xscalevar.h#3 delete .. //depot/projects/hammer/sys/boot/forth/loader.conf#50 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/pxe.c#7 integrate .. //depot/projects/hammer/sys/boot/i386/zfsboot/zfsboot.c#3 integrate .. //depot/projects/hammer/sys/boot/pc98/Makefile.inc#6 integrate .. //depot/projects/hammer/sys/boot/zfs/zfs.c#3 integrate .. //depot/projects/hammer/sys/boot/zfs/zfsimpl.c#5 integrate .. //depot/projects/hammer/sys/bsm/audit_kevents.h#17 integrate .. //depot/projects/hammer/sys/cam/ata/ata_all.c#3 integrate .. //depot/projects/hammer/sys/cam/ata/ata_da.c#3 integrate .. //depot/projects/hammer/sys/cam/ata/ata_pmp.c#1 branch .. //depot/projects/hammer/sys/cam/ata/ata_xpt.c#3 integrate .. //depot/projects/hammer/sys/cam/cam.h#5 integrate .. //depot/projects/hammer/sys/cam/cam_periph.c#30 integrate .. //depot/projects/hammer/sys/cam/cam_queue.c#6 integrate .. //depot/projects/hammer/sys/cam/cam_queue.h#3 integrate .. //depot/projects/hammer/sys/cam/cam_xpt.c#46 integrate .. //depot/projects/hammer/sys/cam/cam_xpt_internal.h#3 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_all.c#19 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_cd.c#31 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_ch.c#16 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_da.c#54 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_low.c#13 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_pt.c#15 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_sa.c#26 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_targ_bh.c#13 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_target.c#24 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_xpt.c#2 integrate .. //depot/projects/hammer/sys/cddl/boot/zfs/zfsimpl.h#3 integrate .. //depot/projects/hammer/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#5 integrate .. //depot/projects/hammer/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#8 integrate .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/policy.h#4 integrate .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/vfs.h#3 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#5 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#7 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#5 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#3 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#4 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#3 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#6 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#9 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#9 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#8 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#13 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#9 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#69 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#66 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#63 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#63 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#64 integrate .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#68 integrate .. //depot/projects/hammer/sys/compat/ia32/ia32_sysvec.c#28 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ioctl.c#44 integrate .. //depot/projects/hammer/sys/compat/linux/linux_misc.c#62 integrate .. //depot/projects/hammer/sys/compat/linux/linux_socket.c#39 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_proto.h#10 integrate .. //depot/projects/hammer/sys/compat/x86bios/x86bios.c#1 branch .. //depot/projects/hammer/sys/compat/x86bios/x86bios.h#1 branch .. //depot/projects/hammer/sys/conf/NOTES#165 integrate .. //depot/projects/hammer/sys/conf/files#203 integrate .. //depot/projects/hammer/sys/conf/files.amd64#116 integrate .. //depot/projects/hammer/sys/conf/files.i386#108 integrate .. //depot/projects/hammer/sys/conf/files.pc98#78 integrate .. //depot/projects/hammer/sys/conf/newvers.sh#28 integrate .. //depot/projects/hammer/sys/conf/options#147 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acpica_prep.sh#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/changes.txt#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/common/adfile.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/common/adisasm.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/common/adwalk.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/common/dmextern.c#1 branch .. //depot/projects/hammer/sys/contrib/dev/acpica/common/dmrestag.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/common/dmtable.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/common/dmtbdump.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/common/dmtbinfo.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/common/getopt.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslcompiler.h#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslcompiler.l#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslcompiler.y#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/asldefine.h#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslfiles.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslglobal.h#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslload.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/asllookup.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslmain.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslmap.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslstubs.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/asltypes.h#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/debugger/dbcmds.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/debugger/dbdisply.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/debugger/dbexec.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/debugger/dbinput.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/disassembler/dmutils.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/disassembler/dmwalk.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dispatcher/dsfield.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dispatcher/dsmethod.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dispatcher/dsobject.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dispatcher/dswload.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/events/evgpe.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/events/evgpeblk.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/events/evregion.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/events/evrgnini.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exconfig.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exfield.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exfldio.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exstorob.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exutils.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hardware/hwgpe.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hardware/hwregs.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hardware/hwsleep.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hardware/hwtimer.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hardware/hwxface.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acapps.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acconfig.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acdebug.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acdisasm.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acglobal.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/achware.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acinterp.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/aclocal.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acmacros.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acnamesp.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acobject.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acparser.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acpixf.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acpredef.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/actbl.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/actbl1.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/actbl2.h#1 branch .. //depot/projects/hammer/sys/contrib/dev/acpica/include/actypes.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acutils.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/amlcode.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nsalloc.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nseval.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nsinit.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nsload.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nspredef.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nsrepair.c#1 branch .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nsxfeval.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nsxfname.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/parser/psloop.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/parser/psxface.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tables/tbutils.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utilities/uteval.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utilities/utglobal.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utilities/utids.c#1 branch .. //depot/projects/hammer/sys/contrib/dev/acpica/utilities/utinit.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utilities/utmisc.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utilities/utxface.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/iwn/LICENSE#2 integrate .. //depot/projects/hammer/sys/contrib/dev/iwn/iwlwifi-4965-228.57.2.23.fw.uu#1 branch .. //depot/projects/hammer/sys/contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu#2 delete .. //depot/projects/hammer/sys/contrib/dev/iwn/iwlwifi-5000-5.4.A.11.fw.uu#1 branch .. //depot/projects/hammer/sys/contrib/dev/iwn/iwlwifi-5150-8.24.2.2.fw.uu#1 branch .. //depot/projects/hammer/sys/contrib/x86emu/x86emu.c#2 integrate .. //depot/projects/hammer/sys/contrib/x86emu/x86emu_util.c#2 delete .. //depot/projects/hammer/sys/ddb/db_ps.c#24 integrate .. //depot/projects/hammer/sys/dev/acpi_support/acpi_aiboost.c#3 integrate .. //depot/projects/hammer/sys/dev/acpi_support/acpi_ibm.c#17 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#93 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_acad.c#23 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#48 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pcib_acpi.c#28 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_video.c#14 integrate .. //depot/projects/hammer/sys/dev/acpica/acpivar.h#59 integrate .. //depot/projects/hammer/sys/dev/ae/if_ae.c#6 integrate .. //depot/projects/hammer/sys/dev/age/if_age.c#9 integrate .. //depot/projects/hammer/sys/dev/agp/agp_i810.c#10 integrate .. //depot/projects/hammer/sys/dev/ahci/ahci.c#4 integrate .. //depot/projects/hammer/sys/dev/ahci/ahci.h#3 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aicasm/aicasm.c#7 integrate .. //depot/projects/hammer/sys/dev/alc/if_alc.c#4 integrate .. //depot/projects/hammer/sys/dev/ale/if_ale.c#5 integrate .. //depot/projects/hammer/sys/dev/amdtemp/amdtemp.c#4 integrate .. //depot/projects/hammer/sys/dev/asmc/asmc.c#8 integrate .. //depot/projects/hammer/sys/dev/asmc/asmcvar.h#5 integrate .. //depot/projects/hammer/sys/dev/ata/ata-disk.c#53 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.h#64 integrate .. //depot/projects/hammer/sys/dev/ata/ata-queue.c#44 integrate .. //depot/projects/hammer/sys/dev/ata/ata-raid.c#45 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-cam.c#33 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-cd.c#44 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-fd.c#26 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-tape.c#28 integrate .. //depot/projects/hammer/sys/dev/ata/chipsets/ata-ati.c#4 integrate .. //depot/projects/hammer/sys/dev/ata/chipsets/ata-marvell.c#8 integrate .. //depot/projects/hammer/sys/dev/ata/chipsets/ata-nvidia.c#5 integrate .. //depot/projects/hammer/sys/dev/ata/chipsets/ata-via.c#5 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ah_eeprom_v4k.c#1 branch .. //depot/projects/hammer/sys/dev/ath/ath_hal/ah_eeprom_v4k.h#1 branch .. //depot/projects/hammer/sys/dev/atkbdc/atkbd.c#7 integrate .. //depot/projects/hammer/sys/dev/bce/if_bce.c#23 integrate .. //depot/projects/hammer/sys/dev/bce/if_bcereg.h#17 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#92 integrate .. //depot/projects/hammer/sys/dev/bge/if_bgereg.h#47 integrate .. //depot/projects/hammer/sys/dev/ciss/ciss.c#56 integrate .. //depot/projects/hammer/sys/dev/ciss/cissreg.h#15 integrate .. //depot/projects/hammer/sys/dev/ciss/cissvar.h#11 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_ael1002.c#14 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_aq100x.c#1 branch .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_common.h#14 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#6 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_regs.h#4 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_t3_hw.c#16 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_tn1010.c#3 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_vsc8211.c#7 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_xgmac.c#12 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_adapter.h#26 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_main.c#37 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_osdep.h#17 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_t3fw.h#3 integrate .. //depot/projects/hammer/sys/dev/de/if_de.c#9 integrate .. //depot/projects/hammer/sys/dev/de/if_devar.h#4 integrate .. //depot/projects/hammer/sys/dev/dpms/dpms.c#2 integrate .. //depot/projects/hammer/sys/dev/drm/drm_pciids.h#14 integrate .. //depot/projects/hammer/sys/dev/drm/i915_drv.h#10 integrate .. //depot/projects/hammer/sys/dev/drm/mach64_state.c#4 integrate .. //depot/projects/hammer/sys/dev/drm/r600_blit.c#2 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_cs.c#2 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_drv.h#20 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_irq.c#13 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_state.c#18 integrate .. //depot/projects/hammer/sys/dev/e1000/if_em.c#10 integrate .. //depot/projects/hammer/sys/dev/e1000/if_igb.c#9 integrate .. //depot/projects/hammer/sys/dev/fb/s3_pci.c#10 integrate .. //depot/projects/hammer/sys/dev/fb/vesa.c#2 integrate .. //depot/projects/hammer/sys/dev/fb/vesa.h#2 integrate .. //depot/projects/hammer/sys/dev/fb/vga.c#26 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc.c#36 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#76 integrate .. //depot/projects/hammer/sys/dev/gem/if_gem_pci.c#20 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_core.c#6 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_mod.c#30 integrate .. //depot/projects/hammer/sys/dev/hwpmc/pmc_events.h#8 integrate .. //depot/projects/hammer/sys/dev/ichwd/ichwd.c#17 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#75 integrate .. //depot/projects/hammer/sys/dev/ips/ips_disk.c#10 integrate .. //depot/projects/hammer/sys/dev/isp/isp.c#30 integrate .. //depot/projects/hammer/sys/dev/isp/isp_freebsd.c#36 integrate .. //depot/projects/hammer/sys/dev/isp/isp_stds.h#4 integrate .. //depot/projects/hammer/sys/dev/isp/isp_tpublic.h#13 delete .. //depot/projects/hammer/sys/dev/isp/ispmbox.h#15 integrate .. //depot/projects/hammer/sys/dev/iwn/if_iwn.c#9 integrate .. //depot/projects/hammer/sys/dev/iwn/if_iwnreg.h#2 integrate .. //depot/projects/hammer/sys/dev/iwn/if_iwnvar.h#3 integrate .. //depot/projects/hammer/sys/dev/ixgbe/ixgbe.c#11 integrate .. //depot/projects/hammer/sys/dev/jme/if_jme.c#8 integrate .. //depot/projects/hammer/sys/dev/kbd/kbd.c#18 integrate .. //depot/projects/hammer/sys/dev/lindev/full.c#1 branch .. //depot/projects/hammer/sys/dev/lindev/lindev.c#1 branch .. //depot/projects/hammer/sys/dev/lindev/lindev.h#1 branch .. //depot/projects/hammer/sys/dev/mii/e1000phy.c#18 integrate .. //depot/projects/hammer/sys/dev/mii/e1000phyreg.h#7 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt.c#25 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt.h#22 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_cam.c#23 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_raid.c#16 integrate .. //depot/projects/hammer/sys/dev/msk/if_msk.c#20 integrate .. //depot/projects/hammer/sys/dev/msk/if_mskreg.h#10 integrate .. //depot/projects/hammer/sys/dev/mwl/if_mwl.c#5 integrate .. //depot/projects/hammer/sys/dev/mwl/if_mwl_pci.c#2 integrate .. //depot/projects/hammer/sys/dev/mxge/if_mxge.c#23 integrate .. //depot/projects/hammer/sys/dev/mxge/if_mxge_var.h#16 integrate .. //depot/projects/hammer/sys/dev/pci/pci.c#76 integrate .. //depot/projects/hammer/sys/dev/pci/pci_user.c#18 integrate .. //depot/projects/hammer/sys/dev/pci/pcireg.h#25 integrate .. //depot/projects/hammer/sys/dev/pci/pcivar.h#21 integrate .. //depot/projects/hammer/sys/dev/pci/vga_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/ppbus/lpt.c#20 integrate .. //depot/projects/hammer/sys/dev/ppbus/pcfclock.c#15 integrate .. //depot/projects/hammer/sys/dev/ppbus/vpo.c#15 integrate .. //depot/projects/hammer/sys/dev/siis/siis.c#3 integrate .. //depot/projects/hammer/sys/dev/sound/pci/es137x.c#25 integrate .. //depot/projects/hammer/sys/dev/sound/pci/es137x.h#4 integrate .. //depot/projects/hammer/sys/dev/sound/pci/hda/hda_reg.h#3 integrate .. //depot/projects/hammer/sys/dev/sound/pci/hda/hdac.c#35 integrate .. //depot/projects/hammer/sys/dev/sound/pci/t4dwave.c#19 integrate .. //depot/projects/hammer/sys/dev/syscons/daemon/daemon_saver.c#9 integrate .. //depot/projects/hammer/sys/dev/syscons/scmouse.c#14 integrate .. //depot/projects/hammer/sys/dev/syscons/scterm-teken.c#7 integrate .. //depot/projects/hammer/sys/dev/syscons/syscons.c#54 integrate .. //depot/projects/hammer/sys/dev/syscons/syscons.h#19 integrate .. //depot/projects/hammer/sys/dev/twa/tw_cl_io.c#5 integrate .. //depot/projects/hammer/sys/dev/twa/tw_cl_share.h#5 integrate .. //depot/projects/hammer/sys/dev/twe/twe.c#16 integrate .. //depot/projects/hammer/sys/dev/twe/twevar.h#8 integrate .. //depot/projects/hammer/sys/dev/uart/uart_bus.h#13 integrate .. //depot/projects/hammer/sys/dev/uart/uart_core.c#21 integrate .. //depot/projects/hammer/sys/dev/uart/uart_tty.c#27 integrate .. //depot/projects/hammer/sys/dev/usb/controller/atmegadci.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/controller/ehci.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/controller/ehci.h#5 integrate .. //depot/projects/hammer/sys/dev/usb/controller/ehci_ixp4xx.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/controller/ehci_mbus.c#4 integrate .. //depot/projects/hammer/sys/dev/usb/controller/ehci_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/usb/controller/ehcireg.h#1 branch .. //depot/projects/hammer/sys/dev/usb/controller/ohci.c#6 integrate .. //depot/projects/hammer/sys/dev/usb/controller/ohci.h#4 integrate .. //depot/projects/hammer/sys/dev/usb/controller/ohci_atmelarm.c#4 integrate .. //depot/projects/hammer/sys/dev/usb/controller/ohci_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/usb/controller/ohcireg.h#1 branch .. //depot/projects/hammer/sys/dev/usb/controller/uhci.c#6 integrate .. //depot/projects/hammer/sys/dev/usb/controller/uhci.h#4 integrate .. //depot/projects/hammer/sys/dev/usb/controller/uhci_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/usb/controller/uhcireg.h#1 branch .. //depot/projects/hammer/sys/dev/usb/controller/usb_controller.c#8 integrate .. //depot/projects/hammer/sys/dev/usb/input/ukbd.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/input/ums.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/net/if_axe.c#6 integrate .. //depot/projects/hammer/sys/dev/usb/net/if_cdce.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/net/if_cdcereg.h#4 integrate .. //depot/projects/hammer/sys/dev/usb/quirk/usb_quirk.c#4 integrate .. //depot/projects/hammer/sys/dev/usb/serial/u3g.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/serial/uark.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/serial/ubsa.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/serial/ubser.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/serial/uchcom.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/serial/ucycom.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/serial/ufoma.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/serial/uftdi.c#6 integrate .. //depot/projects/hammer/sys/dev/usb/serial/ugensa.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/serial/uipaq.c#6 integrate .. //depot/projects/hammer/sys/dev/usb/serial/umct.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/serial/umodem.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/serial/umoscom.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/serial/uplcom.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/serial/usb_serial.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/serial/usb_serial.h#5 integrate .. //depot/projects/hammer/sys/dev/usb/serial/uslcom.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/serial/uvscom.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/storage/umass.c#8 integrate .. //depot/projects/hammer/sys/dev/usb/usb.h#17 integrate .. //depot/projects/hammer/sys/dev/usb/usb_bus.h#5 integrate .. //depot/projects/hammer/sys/dev/usb/usb_cdc.h#3 integrate .. //depot/projects/hammer/sys/dev/usb/usb_device.c#8 integrate .. //depot/projects/hammer/sys/dev/usb/usb_device.h#7 integrate .. //depot/projects/hammer/sys/dev/usb/usb_hub.c#8 integrate .. //depot/projects/hammer/sys/dev/usb/usb_transfer.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#123 integrate .. //depot/projects/hammer/sys/dev/usb/wlan/if_rum.c#6 integrate .. //depot/projects/hammer/sys/dev/usb/wlan/if_uath.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/wlan/if_upgt.c#6 integrate .. //depot/projects/hammer/sys/dev/usb/wlan/if_ural.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/wlan/if_urtw.c#4 integrate .. //depot/projects/hammer/sys/dev/usb/wlan/if_urtwreg.h#2 integrate .. //depot/projects/hammer/sys/dev/usb/wlan/if_urtwvar.h#2 integrate .. //depot/projects/hammer/sys/dev/usb/wlan/if_zyd.c#7 integrate .. //depot/projects/hammer/sys/fs/fifofs/fifo_vnops.c#51 integrate .. //depot/projects/hammer/sys/fs/nfs/nfs_commonacl.c#4 integrate .. //depot/projects/hammer/sys/fs/nfsclient/nfs_clnode.c#3 integrate .. //depot/projects/hammer/sys/fs/nfsclient/nfs_clport.c#4 integrate .. //depot/projects/hammer/sys/fs/nfsclient/nfs_clstate.c#5 integrate .. //depot/projects/hammer/sys/fs/nfsclient/nfs_clsubs.c#3 integrate .. //depot/projects/hammer/sys/fs/procfs/procfs.c#14 integrate .. //depot/projects/hammer/sys/fs/procfs/procfs.h#5 integrate .. //depot/projects/hammer/sys/fs/procfs/procfs_osrel.c#1 branch .. //depot/projects/hammer/sys/fs/smbfs/smbfs_vfsops.c#31 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs.h#12 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_subr.c#16 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vnops.c#20 integrate .. //depot/projects/hammer/sys/geom/concat/g_concat.c#21 integrate .. //depot/projects/hammer/sys/geom/label/g_label.c#17 integrate .. //depot/projects/hammer/sys/geom/part/g_part.c#23 integrate .. //depot/projects/hammer/sys/geom/part/g_part_ebr.c#4 integrate .. //depot/projects/hammer/sys/geom/part/g_part_gpt.c#16 integrate .. //depot/projects/hammer/sys/geom/shsec/g_shsec.c#7 integrate .. //depot/projects/hammer/sys/geom/stripe/g_stripe.c#20 integrate .. //depot/projects/hammer/sys/geom/uzip/g_uzip.c#12 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_create.c#3 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_events.c#2 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_init.c#14 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_move.c#5 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_rm.c#15 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_subr.c#18 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_machdep.c#37 integrate .. //depot/projects/hammer/sys/i386/acpica/madt.c#27 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#84 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#116 integrate .. //depot/projects/hammer/sys/i386/cpufreq/hwpstate.c#3 integrate .. //depot/projects/hammer/sys/i386/i386/elf_machdep.c#23 integrate .. //depot/projects/hammer/sys/i386/i386/identcpu.c#52 integrate .. //depot/projects/hammer/sys/i386/i386/initcpu.c#24 integrate .. //depot/projects/hammer/sys/i386/i386/intr_machdep.c#31 integrate .. //depot/projects/hammer/sys/i386/i386/machdep.c#97 integrate .. //depot/projects/hammer/sys/i386/i386/msi.c#10 integrate .. //depot/projects/hammer/sys/i386/i386/nexus.c#26 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#124 integrate .. //depot/projects/hammer/sys/i386/i386/trap.c#68 integrate .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#69 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_proto.h#11 integrate .. //depot/projects/hammer/sys/i386/include/acpica_machdep.h#8 integrate .. //depot/projects/hammer/sys/i386/include/apm_bios.h#4 integrate .. //depot/projects/hammer/sys/i386/include/atomic.h#17 integrate .. //depot/projects/hammer/sys/i386/include/cpufunc.h#21 integrate .. //depot/projects/hammer/sys/i386/include/elf.h#10 integrate .. //depot/projects/hammer/sys/i386/include/intr_machdep.h#17 integrate .. //depot/projects/hammer/sys/i386/include/param.h#20 integrate .. //depot/projects/hammer/sys/i386/include/specialreg.h#25 integrate .. //depot/projects/hammer/sys/i386/include/xen/xen-os.h#4 integrate .. //depot/projects/hammer/sys/i386/linux/linux_proto.h#29 integrate .. //depot/projects/hammer/sys/i386/pci/pci_cfgreg.c#33 integrate .. //depot/projects/hammer/sys/i386/xen/locore.s#4 integrate .. //depot/projects/hammer/sys/i386/xen/pmap.c#10 integrate .. //depot/projects/hammer/sys/i386/xen/xen_machdep.c#10 integrate .. //depot/projects/hammer/sys/ia64/conf/GENERIC#42 integrate .. //depot/projects/hammer/sys/ia64/ia64/elf_machdep.c#28 integrate .. //depot/projects/hammer/sys/ia64/ia64/pmap.c#72 integrate .. //depot/projects/hammer/sys/ia64/include/asm.h#7 integrate .. //depot/projects/hammer/sys/ia64/include/elf.h#9 integrate .. //depot/projects/hammer/sys/ia64/include/param.h#18 integrate .. //depot/projects/hammer/sys/kern/bus_if.m#14 integrate .. //depot/projects/hammer/sys/kern/imgact_elf.c#56 integrate .. //depot/projects/hammer/sys/kern/init_main.c#62 integrate .. //depot/projects/hammer/sys/kern/init_sysent.c#77 integrate .. //depot/projects/hammer/sys/kern/kern_cpuset.c#13 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#93 integrate .. //depot/projects/hammer/sys/kern/kern_event.c#56 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#92 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#84 integrate .. //depot/projects/hammer/sys/kern/kern_intr.c#57 integrate .. //depot/projects/hammer/sys/kern/kern_ktrace.c#42 integrate .. //depot/projects/hammer/sys/kern/kern_lock.c#51 integrate .. //depot/projects/hammer/sys/kern/kern_mib.c#28 integrate .. //depot/projects/hammer/sys/kern/kern_proc.c#88 integrate .. //depot/projects/hammer/sys/kern/kern_rwlock.c#25 integrate .. //depot/projects/hammer/sys/kern/kern_shutdown.c#62 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#99 integrate .. //depot/projects/hammer/sys/kern/kern_sx.c#29 integrate .. //depot/projects/hammer/sys/kern/kern_thr.c#50 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#117 integrate .. //depot/projects/hammer/sys/kern/kern_timeout.c#34 integrate .. //depot/projects/hammer/sys/kern/kern_umtx.c#36 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#106 integrate .. //depot/projects/hammer/sys/kern/stack_protector.c#2 integrate .. //depot/projects/hammer/sys/kern/subr_acl_nfs4.c#2 integrate .. //depot/projects/hammer/sys/kern/subr_acl_posix1e.c#6 integrate .. //depot/projects/hammer/sys/kern/subr_bus.c#72 integrate .. //depot/projects/hammer/sys/kern/subr_devstat.c#14 integrate .. //depot/projects/hammer/sys/kern/subr_smp.c#43 integrate .. //depot/projects/hammer/sys/kern/subr_taskqueue.c#28 integrate .. //depot/projects/hammer/sys/kern/subr_trap.c#49 integrate .. //depot/projects/hammer/sys/kern/sys_generic.c#46 integrate .. //depot/projects/hammer/sys/kern/sys_pipe.c#45 integrate .. //depot/projects/hammer/sys/kern/sys_process.c#49 integrate .. //depot/projects/hammer/sys/kern/syscalls.c#74 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#76 integrate .. //depot/projects/hammer/sys/kern/sysv_shm.c#33 integrate .. //depot/projects/hammer/sys/kern/tty.c#73 integrate .. //depot/projects/hammer/sys/kern/tty_pts.c#22 integrate .. //depot/projects/hammer/sys/kern/tty_ttydisc.c#9 integrate .. //depot/projects/hammer/sys/kern/uipc_mqueue.c#23 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#97 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#79 integrate .. //depot/projects/hammer/sys/kern/uipc_usrreq.c#66 integrate .. //depot/projects/hammer/sys/kern/vfs_acl.c#10 integrate .. //depot/projects/hammer/sys/kern/vfs_aio.c#61 integrate .. //depot/projects/hammer/sys/kern/vfs_default.c#62 integrate .. //depot/projects/hammer/sys/kern/vfs_export.c#27 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#145 integrate .. //depot/projects/hammer/sys/kern/vfs_vnops.c#69 integrate .. //depot/projects/hammer/sys/mips/include/elf.h#5 integrate .. //depot/projects/hammer/sys/mips/include/param.h#6 integrate .. //depot/projects/hammer/sys/mips/mips/elf64_machdep.c#4 integrate .. //depot/projects/hammer/sys/mips/mips/elf_machdep.c#8 integrate .. //depot/projects/hammer/sys/mips/mips/pmap.c#12 integrate .. //depot/projects/hammer/sys/modules/Makefile#146 integrate .. //depot/projects/hammer/sys/modules/acpi/acpi/Makefile#18 integrate .. //depot/projects/hammer/sys/modules/cam/Makefile#13 integrate .. //depot/projects/hammer/sys/modules/cxgb/cxgb/Makefile#12 integrate .. //depot/projects/hammer/sys/modules/dpms/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/dtrace/lockstat/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/iwnfw/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/iwnfw/Makefile.inc#1 branch .. //depot/projects/hammer/sys/modules/iwnfw/iwn4965/Makefile#1 branch .. //depot/projects/hammer/sys/modules/iwnfw/iwn5000/Makefile#1 branch .. //depot/projects/hammer/sys/modules/iwnfw/iwn5150/Makefile#1 branch .. //depot/projects/hammer/sys/modules/lindev/Makefile#1 branch .. //depot/projects/hammer/sys/modules/nfsclient/Makefile#13 integrate .. //depot/projects/hammer/sys/modules/nfslockd/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/pf/Makefile#17 integrate .. //depot/projects/hammer/sys/modules/procfs/Makefile#6 integrate .. //depot/projects/hammer/sys/modules/ubser/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/usb/Makefile#14 integrate .. //depot/projects/hammer/sys/modules/usb/ucom/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/vesa/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/x86bios/Makefile#1 branch .. //depot/projects/hammer/sys/modules/x86emu/Makefile#2 delete .. //depot/projects/hammer/sys/net/bpf.c#73 integrate .. //depot/projects/hammer/sys/net/flowtable.c#6 integrate .. //depot/projects/hammer/sys/net/flowtable.h#4 integrate .. //depot/projects/hammer/sys/net/if.c#93 integrate .. //depot/projects/hammer/sys/net/if_bridge.c#52 integrate .. //depot/projects/hammer/sys/net/if_enc.c#10 integrate .. //depot/projects/hammer/sys/net/if_ethersubr.c#83 integrate .. //depot/projects/hammer/sys/net/if_gif.c#39 integrate .. //depot/projects/hammer/sys/net/if_llatbl.c#7 integrate .. //depot/projects/hammer/sys/net/if_var.h#61 integrate .. //depot/projects/hammer/sys/net/pfil.c#12 integrate .. //depot/projects/hammer/sys/net/pfil.h#11 integrate .. //depot/projects/hammer/sys/net/route.c#47 integrate .. //depot/projects/hammer/sys/net80211/ieee80211.h#27 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_hwmp.c#2 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_mesh.c#2 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_mesh.h#2 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_output.c#48 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.h#30 integrate .. //depot/projects/hammer/sys/netgraph/NOTES#2 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#7 integrate .. //depot/projects/hammer/sys/netgraph/ng_bridge.c#20 integrate .. //depot/projects/hammer/sys/netinet/if_ether.c#61 integrate .. //depot/projects/hammer/sys/netinet/in.c#45 integrate .. //depot/projects/hammer/sys/netinet/in_mcast.c#16 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.c#73 integrate .. //depot/projects/hammer/sys/netinet/in_proto.c#32 integrate .. //depot/projects/hammer/sys/netinet/ip_fastfwd.c#41 integrate .. //depot/projects/hammer/sys/netinet/ip_icmp.c#49 integrate .. //depot/projects/hammer/sys/netinet/ip_input.c#85 integrate .. //depot/projects/hammer/sys/netinet/ip_mroute.c#50 integrate .. //depot/projects/hammer/sys/netinet/ip_output.c#82 integrate .. //depot/projects/hammer/sys/netinet/ip_var.h#38 integrate .. //depot/projects/hammer/sys/netinet/ipfw/ip_fw2.c#4 integrate .. //depot/projects/hammer/sys/netinet/ipfw/ip_fw_pfil.c#4 integrate .. //depot/projects/hammer/sys/netinet/raw_ip.c#67 integrate .. //depot/projects/hammer/sys/netinet/sctp_asconf.c#21 integrate .. //depot/projects/hammer/sys/netinet/sctp_bsd_addr.c#17 integrate .. //depot/projects/hammer/sys/netinet/sctp_input.c#28 integrate .. //depot/projects/hammer/sys/netinet/sctp_os_bsd.h#25 integrate .. //depot/projects/hammer/sys/netinet/sctp_output.c#34 integrate .. //depot/projects/hammer/sys/netinet/sctp_pcb.c#32 integrate .. //depot/projects/hammer/sys/netinet/sctp_pcb.h#21 integrate .. //depot/projects/hammer/sys/netinet/sctp_structs.h#20 integrate .. //depot/projects/hammer/sys/netinet/sctp_sysctl.c#19 integrate .. //depot/projects/hammer/sys/netinet/sctp_timer.c#24 integrate .. //depot/projects/hammer/sys/netinet/sctp_usrreq.c#30 integrate .. //depot/projects/hammer/sys/netinet/sctputil.c#38 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#100 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#97 integrate .. //depot/projects/hammer/sys/netinet/tcp_timer.c#42 integrate .. //depot/projects/hammer/sys/netinet/tcp_timer.h#16 integrate .. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#69 integrate .. //depot/projects/hammer/sys/netinet/tcp_var.h#63 integrate .. //depot/projects/hammer/sys/netinet6/icmp6.c#49 integrate .. //depot/projects/hammer/sys/netinet6/in6.c#46 integrate .. //depot/projects/hammer/sys/netinet6/in6_ifattach.c#36 integrate .. //depot/projects/hammer/sys/netinet6/in6_proto.c#31 integrate .. //depot/projects/hammer/sys/netinet6/ip6_forward.c#28 integrate .. //depot/projects/hammer/sys/netinet6/ip6_input.c#48 integrate .. //depot/projects/hammer/sys/netinet6/ip6_output.c#62 integrate .. //depot/projects/hammer/sys/netinet6/ip6_var.h#31 integrate .. //depot/projects/hammer/sys/netinet6/nd6.c#48 integrate .. //depot/projects/hammer/sys/netinet6/nd6.h#17 integrate .. //depot/projects/hammer/sys/netinet6/nd6_nbr.c#36 integrate .. //depot/projects/hammer/sys/netinet6/nd6_rtr.c#31 integrate .. //depot/projects/hammer/sys/netinet6/sctp6_usrreq.c#22 integrate .. //depot/projects/hammer/sys/netipsec/key.c#34 integrate .. //depot/projects/hammer/sys/netipsec/xform_esp.c#21 integrate .. //depot/projects/hammer/sys/netsmb/smb_dev.c#19 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_kdtrace.c#2 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_node.c#31 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#69 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#75 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_serv.c#52 integrate .. //depot/projects/hammer/sys/nlm/nlm.h#5 integrate .. //depot/projects/hammer/sys/nlm/nlm_prot_impl.c#12 integrate .. //depot/projects/hammer/sys/nlm/nlm_prot_server.c#5 integrate .. //depot/projects/hammer/sys/pc98/conf/GENERIC#66 integrate .. //depot/projects/hammer/sys/pc98/conf/NOTES#74 integrate .. //depot/projects/hammer/sys/pci/intpm.c#17 integrate .. //depot/projects/hammer/sys/pci/intpmreg.h#4 integrate .. //depot/projects/hammer/sys/powerpc/aim/clock.c#7 integrate .. //depot/projects/hammer/sys/powerpc/aim/machdep.c#16 integrate .. //depot/projects/hammer/sys/powerpc/aim/mmu_oea.c#11 integrate .. //depot/projects/hammer/sys/powerpc/aim/mmu_oea64.c#4 integrate .. //depot/projects/hammer/sys/powerpc/aim/mp_cpudep.c#5 integrate .. //depot/projects/hammer/sys/powerpc/aim/platform_chrp.c#3 integrate .. //depot/projects/hammer/sys/powerpc/aim/swtch.S#7 integrate .. //depot/projects/hammer/sys/powerpc/aim/trap_subr.S#7 integrate .. //depot/projects/hammer/sys/powerpc/booke/mp_cpudep.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Oct 27 14:33:06 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1FA421065694; Tue, 27 Oct 2009 14:33:06 +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 CB0161065692 for ; Tue, 27 Oct 2009 14:33:05 +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 B88218FC2D for ; Tue, 27 Oct 2009 14:33:05 +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 n9REX5qA008344 for ; Tue, 27 Oct 2009 14:33:05 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9REX5kN008342 for perforce@freebsd.org; Tue, 27 Oct 2009 14:33:05 GMT (envelope-from mav@freebsd.org) Date: Tue, 27 Oct 2009 14:33:05 GMT Message-Id: <200910271433.n9REX5kN008342@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 169855 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, 27 Oct 2009 14:33:06 -0000 http://p4web.freebsd.org/chv.cgi?CH=169855 Change 169855 by mav@mav_mavtest on 2009/10/27 14:32:41 Tune PMP reset/rescan timings. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#15 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#15 (text+ko) ==== @@ -93,6 +93,7 @@ int pm_step; int pm_try; int found; + int reset; int frozen; int restart; union ccb saved_ccb; @@ -482,6 +483,7 @@ ata_pm_read_cmd(ataio, 0, softc->pm_step); break; case PMP_STATE_CLEAR: + softc->reset = 0; cam_fill_ataio(ataio, pmp_retry_count, pmpdone, @@ -571,6 +573,7 @@ case PMP_STATE_CONFIG: softc->pm_step = 0; softc->state = PMP_STATE_RESET; + softc->reset |= ~softc->found; xpt_release_ccb(done_ccb); xpt_schedule(periph, priority); return; @@ -595,6 +598,12 @@ if (softc->pm_step >= softc->pm_ports) { softc->pm_step = 0; softc->pm_try = 0; + cam_freeze_devq(periph->path); + cam_release_devq(periph->path, + RELSIM_RELEASE_AFTER_TIMEOUT, + /*reduction*/0, + /*timeout*/10, + /*getcount_only*/0); printf("PM connect done\n"); softc->state = PMP_STATE_CHECK; } @@ -611,7 +620,7 @@ softc->found |= (1 << softc->pm_step); softc->pm_step++; } else { - if (softc->pm_try < 100) { + if (softc->pm_try < 10) { cam_freeze_devq(periph->path); cam_release_devq(periph->path, RELSIM_RELEASE_AFTER_TIMEOUT, @@ -632,6 +641,14 @@ } } if (softc->pm_step >= softc->pm_ports) { + if (softc->reset & softc->found) { + cam_freeze_devq(periph->path); + cam_release_devq(periph->path, + RELSIM_RELEASE_AFTER_TIMEOUT, + /*reduction*/0, + /*timeout*/1000, + /*getcount_only*/0); + } softc->state = PMP_STATE_CLEAR; softc->pm_step = 0; } From owner-p4-projects@FreeBSD.ORG Wed Oct 28 12:10:44 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D23C1065695; Wed, 28 Oct 2009 12:10: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 11888106568D for ; Wed, 28 Oct 2009 12:10:44 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F2D5F8FC08 for ; Wed, 28 Oct 2009 12:10:43 +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 n9SCAhCv075095 for ; Wed, 28 Oct 2009 12:10:43 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9SCAh8I075093 for perforce@freebsd.org; Wed, 28 Oct 2009 12:10:43 GMT (envelope-from bz@freebsd.org) Date: Wed, 28 Oct 2009 12:10:43 GMT Message-Id: <200910281210.n9SCAh8I075093@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 169879 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, 28 Oct 2009 12:10:44 -0000 http://p4web.freebsd.org/chv.cgi?CH=169879 Change 169879 by bz@bz_dumpster on 2009/10/28 12:10:41 Add new files of unknown state that were forgotten a while back. Noticed by: jan Affected files ... .. //depot/projects/s390/contrib/bind9/lib/isc/s390/include/isc/atomic.h#1 add .. //depot/projects/s390/contrib/gcc/config/s390/freebsd-unwind.h#1 add .. //depot/projects/s390/lib/libthr/arch/s390x/Makefile.inc#1 add .. //depot/projects/s390/lib/libthr/arch/s390x/include/pthread_md.h#1 add .. //depot/projects/s390/lib/libthr/arch/s390x/s390x/pthread_md.c#1 add .. //depot/projects/s390/lib/msun/s390/Symbol.map#1 add .. //depot/projects/s390/lib/msun/s390x/Makefile.inc#1 add .. //depot/projects/s390/lib/msun/s390x/Symbol.map#1 add .. //depot/projects/s390/sys/cddl/contrib/opensolaris/common/atomic/s390/atomic.S#1 add .. //depot/projects/s390/sys/s390/include/sf_buf.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Oct 28 12:19:54 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D5EFD1065679; Wed, 28 Oct 2009 12:19:53 +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 82149106566C for ; Wed, 28 Oct 2009 12:19:53 +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 6E3228FC0C for ; Wed, 28 Oct 2009 12:19:53 +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 n9SCJrSr075692 for ; Wed, 28 Oct 2009 12:19:53 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9SCJrJm075690 for perforce@freebsd.org; Wed, 28 Oct 2009 12:19:53 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 28 Oct 2009 12:19:53 GMT Message-Id: <200910281219.n9SCJrJm075690@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 169881 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, 28 Oct 2009 12:19:54 -0000 http://p4web.freebsd.org/chv.cgi?CH=169881 Change 169881 by rene@rene_self on 2009/10/28 12:19:11 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#35 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/config/chapter.sgml#9 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/printing/chapter.sgml#6 integrate .. //depot/projects/docproj_nl/www/share/sgml/events.xml#21 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#35 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -2733,7 +2733,7 @@ src/sys/contrib/dev/acpica. The glue code that allows ACPI-CA to work on &os; is in - src/sys/dev/acpica/Osd. Finally, drivers + src/sys/dev/acpica/Osd. Finally, drivers that implement various ACPI devices are found in src/sys/dev/acpica. ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/printing/chapter.sgml#6 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -2900,7 +2900,7 @@ ACPI-CA-broncode staat in src/sys/contrib/dev/acpica. De lijmcode die ACPI-CA laat werken met &os; - staat in src/sys/dev/acpica/Osd. + staat in src/sys/dev/acpica/Osd. Stuurprogramma's die verscheidene ACPI-apparaten implementeren staan in src/sys/dev/acpica. From owner-p4-projects@FreeBSD.ORG Wed Oct 28 12:59:33 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D4FC01065697; Wed, 28 Oct 2009 12:59: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 990B11065694 for ; Wed, 28 Oct 2009 12:59:33 +0000 (UTC) (envelope-from remko@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 84B258FC16 for ; Wed, 28 Oct 2009 12:59:33 +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 n9SCxXhH088738 for ; Wed, 28 Oct 2009 12:59:33 GMT (envelope-from remko@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9SCxXft088736 for perforce@freebsd.org; Wed, 28 Oct 2009 12:59:33 GMT (envelope-from remko@freebsd.org) Date: Wed, 28 Oct 2009 12:59:33 GMT Message-Id: <200910281259.n9SCxXft088736@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to remko@freebsd.org using -f From: Remko Lodder To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 169883 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, 28 Oct 2009 12:59:34 -0000 http://p4web.freebsd.org/chv.cgi?CH=169883 Change 169883 by remko@remko_guardian on 2009/10/28 12:59:14 New WIP. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/faq/book.sgml#19 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/faq/book.sgml#19 (text+ko) ==== @@ -2051,50 +2051,52 @@ - What are the limits for memory? + Wat zijn de limitaties voor wat betreft het geheugen? - Memory limits depend on the platform used. On a - standard &i386; install, the limit is 4 GB but more - memory can be supported through &man.pae.4;. See instructions for using 4 GB or more memory on &i386;. + Geheugen limieten zijn afhankelijk van het gebruikte + platform. Op een standaard &i386; installatie is deze + limitatie 4 GB, maar de &man.pae.4; optie kan meer + geheugen ondersteunen. Zie de instructies voor het gebruik van 4 GB of meer geheugen op &i386; - &os;/pc98 has a limit of 4 GB memory, and PAE can - not be used with it. Other architectures supported by &os; - have much higher theoretical limits on maximum memory (many - terabytes). + &os;/pc98 heeft een limiet van 4  geheugen en PAE + kan hier niet mee gebruikt worden. Andere architecturen + ondersteund door &os; hebben veel hogere theoretische + limitaties voor het maximale geheugen (vele terabytes). - What are the limits for FFS file systems? + Wat zijn de limitaties voor FFS bestandssystemen? - For FFS file systems, the maximum theoretical limit is - 8 TB (2 G blocks), or 16 TB for the default - block size of 8 KB. In practice, there is a soft limit - of 1 TB, but with modifications file systems with - 4 TB are possible (and exist). + Voor FFS bestandssystemen is de maximale theoretische + limitatie 8 TB (2 GB blokken), of 16 TB voor + de standaard block grootte van 8 KB. In de praktijk + is er echter een zachte limitatie van 1 TB, maar met + enkele wijzigingen is het mogelijk om 4 TB te halen + (welke ook bestaan). - The maximum size of a single FFS file is approximately - 1 G blocks, or 4 TB with a block size of + De maximale grootte van een enkel FFS bestand is ongeveer + 1 G blok, of 4 TB met een blok grootte van 4 KB. - Maximum file sizes + Maximale bestand groottes - FS Block Size + FS blok grootte - Works + Werkt - Should Work + Zou moeten werken @@ -2142,63 +2144,68 @@
- When the FS block size is 4 KB, triple indirect - blocks work and everything should be limited by the maximum FS - block number that can be represented using triple indirect - blocks (approx. + Wanneer de FS blok grootte 4 KB is, kunnen + indirecte blokken werken, en moet alles gelimiteerd worden + door het maximale FS blok nummer, dat kan worden + gepresenteerd door het verdrievoudigen van indirecte blokken + (ongeveer 10243 + 10242 + 1024), - but everything is limited by a (wrong) limit of - 1 G - 1 on FS block numbers. The limit on FS - block numbers should be 2 G - 1. There are - some bugs for FS block numbers near 2 G - 1, - but such block numbers are unreachable when the FS block - size is 4 KB. + maar alles wordt gelimiteerd door een (verkeerde) limitatie + van 1 G - 1 op FS blok nummers. Het limiet + op FS blok nummers zou moeten zijn 2 G - 1. + Er zijn enkele bugs voor FS blok nummers nabij de + 2 G - 1, maar zulke blokken zijn onbereikbaar + wanneer de FS blok grootte 4 KB is. - For block sizes of 8 KB and larger, everything - should be limited by the 2 G - 1 limit on FS - block numbers, but is actually limited by the - 1 G - 1 limit on FS block numbers. Using the - correct limit of 2 G - 1 blocks does cause - problems. + Voor blok grootte's van 8 KB en groter moet alles + gelimiteerd worden door de 2 G - 1; limitatie + op FS blok nummers, maar wordt in werkelijkheid gelimiteerd + door de 1 G - 1 limitatie op FS blok nummers. + Het gebruik van de correcte limitatie van 2 G - 1 + blokken levert problemen op. - Why do I get an error message, - archsw.readin.failed after compiling - and booting a new kernel? + Waarom krijg ik de fout melding + archsw.readin.failed na het compileren + en opstarten van een nieuwe kernel? - Because your world and kernel are out of sync. This is - not supported. Be sure you use make buildworld - and make buildkernel - to update your kernel. + Dit komt omdat je wereld, en de kernel niet + gesynchroniseerd zijn aan elkaar. Dit wordt niet ondersteund. + Zorg ervoor dat je gebruik maakt van + make buildworld en + make buildkernel + om de kernel te updaten. - You can boot by specifying the kernel directly at the - second stage, pressing any key when the | - shows up before loader is started. + Je kunt opstarten door de kernel direct te specificeren + in de tweede opstartfase, door het indrukken van een + willekeurige knop, wanneer de | + getoond wordt, voordat de loader wordt gestart. - Installation crashes while booting, what can I do? + De installatie crashed terwijl ik opstart, wat kan ik + hiertegen doen? - Try disabling ACPI support. When the bootloader loads, - press the Space key. The system will display - the following: + Probeer ACPI ondersteuning uit te schakelen. Wanneer de + bootloader start, druk op de Spatie knop. + Het systeem toont dan het volgende: OK - Type: + Typ: unset acpi_load - And then type: + En typ daarna: boot @@ -2207,89 +2214,96 @@ - Hardware compatibility + Hardware compatibiliteit - General + Algemeen - I want to get a piece of hardware for my &os; system. - Which model/brand/type is best? + Ik wil een stuk hardware kopen voor mijn &os; systeem. + Welk model of type is het beste - This is discussed continually on the &os; mailing - lists. Since hardware changes so quickly, however, we - expect this. We still strongly - recommend that you read through the Hardware Notes - for &os; &rel.current; or + Dit wordt continue bediscussieerd op de &os; mailing + lijst. Omdat hardware zo snel veranderd verwachten we + dit ook. We raden nog steeds + aan dat je de Hardware Notes leest voor &os; &rel.current; of &rel2.current; and - search the mailing list archives - before asking about the latest and greatest hardware. - Chances are a discussion about the type of hardware you - are looking for took place just last week. + url="&rel2.current.hardware;">&rel2.current; en + de mailing lijsten archieven + doorzoekt, voordat er gevraagd wordt over de laatste en + mooiste hardware. Grote kans dat er vorige week een + discussie is geweest over het type hardware waar jij naar + kijkt. - If you are looking for a laptop, check the &a.mobile; - archives. Otherwise, you probably want the archives for - the &a.questions;, or possibly a specific mailing list for - a particular hardware type. + Als je op zoek bent naar een laptop, bekijk dan de + &a.mobile; archieven. In het andere geval wil je + waarschijnlijk de archieven van de &a.questions; doorzoeken + of wellicht een meer specifieke mailing lijst voor + specifieke hardware types. - Memory + Geheugen - Does &os; support more than 4 GB of memory (RAM)? - More than 16 GB? More than 48 GB? + Ondersteund &os; meer dan 4 GB geheugen (RAM)? + Meer dan 16 GB? Meer dan 48 GB? - Yes. &os; as an operating system generally supports - as much physical memory (RAM) as the platform it is running - on does. Keep in mind that different platforms have - different limits for memory; for example &i386; without - PAE supports at most 4 GB of - memory (and usually less than that because of PCI address - space) and &i386; with PAE supports at most 64 GB - memory. AMD64 platforms currently deployed support up to - 1 TB of physical memory. + Ja. &os; is een besturingssysteem dat over het + algemeen zoveel fysiek geheugen (RAM) ondersteund als + het platform waar het op draait ondersteund. Houd er + rekening mee dat verschillende platformen, verschillende + limitaties hebben voor het geheugen; Bijvoorbeeld &i386; + zonder PAE ondersteund maximaal + 4 GB geheugen (meestal minder dan dat vanwege de + PCI addresserings ruimte), en &i386; met PAE ondersteund + maximaal 64 GB geheugen. AMD64 platformen welke + op dit moment geleverd worden, ondersteunen maximaal + 1 TB fysiek geheugen. - Why does &os; report less than 4 GB memory when - installed on an &i386; machine? + Waarom rapporteert &os; minder dan 4 GB geheugen + wanneer er geinstalleerd is op een &i386; machine? - The total address space on &i386; machines is 32-bit, - meaning that at most 4 GB of memory is addressable (can - be accessed). Furthermore, some addresses in this range - are reserved by hardware for different purposes, for - example for using and controlling PCI devices, for - accessing video memory, and so on. Therefore, the total - amount of memory usable by the operating system for its - kernel and applications is limited to significantly less - than 4 GB. Usually, 3.2 GB to 3.7 GB is - the maximum usable physical memory in this - configuration. + De totale adres ruimte op &i386; machines is 32-bit, + wat betekend dat er maximaal 4 GB geheugen + adresseerbaar (bereikt) kan worden. Daarnaast worden + sommige adressen in deze reeks gereserveerd voor hardware + met diverse doelstellingen, bijvoorbeeld voor het + gebruiken en controleren van PCI apparatuur, voor + toegang tot het video geheugen etc. Daardoor is het totaal + van bruikbaar geheugen door het besturingssysteem voor + de kernel en applicaties, significant minder dan 4 GB. + Over het algemeen is 3.2 GB tot 3.7 GB het + maximaal bruikbare fysieke geheugen in deze + configuratie. - To access more than 3.2 GB to 3.7 GB of - installed memory (meaning up to 4 GB but also more than - 4 GB), a special tweak called PAE - must be used. PAE stands for Physical Address Extension - and is a way for 32-bit x86 CPUs to address more than + Om meer dan 3.2 GB tot 3.7 GB aan + geheugen te kunnen gebruiken (tot 4 GB en meer), + is er een speciale aanpassing genaamd + PAE welke gebruikt kan worden. PAE + staat voor Physical Address Extension en is een manier + voor 32-bit x86 CPU's om meer dan 4 GB aan geheugen + te kunnen addresseren. Het geheugen wordt opnieuw + toegewezen waar het normaal ges 4 GB of memory. It remaps the memory that would otherwise be overlayed by address reservations for hardware devices above the 4 GB range and uses it as @@ -2299,120 +2313,126 @@ modules (see &man.kld.4;) are not supported. This means all drivers must be compiled into the kernel. - The most common way to enable PAE is to build a new - kernel with the special ready-provided kernel configuration - file called PAE, which is already - configured to build a safe kernel. Note that some entries - in this kernel configuration file are too conservative and - some drivers marked as unready to be used with PAE are - actually usable. A rule of thumb is that if the driver is - usable on 64-bit architectures (like AMD64), it is also - usable with PAE. If you wish to create your own kernel - configuration file, you can enable PAE by adding the - following line to your configuration: + De meest gekozen manier om PAE in te schakelen is door + een nieuwe kernel te maken, met het speciaal voorbereide + kernel configuratie bestand PAE, welke + reeds voorbereid is om een veilige kernel te maken. Let + op dat sommige regels in dit kernel configuratie bestand erg + conservatief zijn, en dat sommige drivers beschreven zijn + als niet bruikbaar, terwijl deze wel bruikbaar zijn. Een + vaste regel is dat als de driver bruikbaar is op 64-bit + architecturen (zoals AMD64), deze ook bruikbaar zijn met + PAE. Als je je eigen kernel configuratie bestand wilt + creeëren, kan PAE ingeschakeld worden door het + toevoegen van de volgende regel in de configuratie: options PAE - PAE is not much used nowadays because most new x86 - hardware also supports running in 64-bit mode, known as - AMD64 or &intel; 64. It has a much larger address - space and does not need such tweaks. &os; supports AMD64 - and it is recommended that this version of &os; be used - instead of the &i386; version if 4 GB or more memory - is required. + PAE wordt echter niet veel meer gebruikt, omdat de + meeste nieuwe x86 systemen, ook ondersteuning bieden voor + 64-bit mode, ook wel bekend als AMD64 of &intel; 64. + Deze heeft een veel grotere adres ruimte en heeft daardoor + geen extra aanpassingen nodig. &os; ondersteund AMD64 en + verdiend de aanbeveling boven de &i386; versie als er + 4 GB of meer geheugen benodigd is. - Architectures and processors + Architecturen en processoren - Does &os; support architectures other than the + Ondersteund &os; architecturen anders dan de x86? - Yes. &os; currently runs on the Intel x86 and the - AMD64 architectures. The Intel EM64T, IA-64, &arm;, - &powerpc;, sun4v and &sparc64; architectures are also - supported. Upcoming platforms are &mips; and &s390;, join - the &a.mips; for more information about ongoing work on - the &mips; platform. For general discussion on new - architectures, join the &a.platforms;. + Ja. &os; wekrt momenteel op de Intel x86 en de + AMD64 architecturen. De Intel EM64T, IA-64, &arm;, + &powerpc;, sun4v en &sparc64; architecturen worden + ook ondersteund. Aankomende platformen zijn &mips; + en &s390;, schrijf je in op de &a.mips; voor meer + informatie over doorgaand werk op het &mips; platform. + Voor algemene discussies over nieuwe architecturen, + is er de &a.platforms;. - If your machine has a different architecture and you - need something right now, we suggest you look at NetBSD or Als je machine een andere architectuur heeft, en je + hebt dringend iets nodig wat meteen werkt, stellen we + voor dat je eens kijkt naar NetBSD of OpenBSD. - Does &os; support Symmetric Multiprocessing + Ondersteund &os; Symmetrische Multiprocessing (SMP)? - Symmetric multi-processor (SMP) systems are generally - supported by &os;, although in some cases, BIOS or - motherboard bugs may generate some problems. Perusing the - &a.smp; may yield some clues. + Symmetrische multi-processor (SMP) systemen worden + over het algemeen ondersteund op &os;, echter in sommige + gevallen gooien BIOS of moederbord bugs roet in het + eten. Het nazoeken in de &a.smp; kan een aantal + indrukken geven. - &os; will take advantage of HyperThreading (HTT) - support on Intel CPUs that support this feature. A kernel - with the options SMP feature enabled - will automatically detect the additional logical - processors. The default &os; scheduler treats the logical - processors the same as additional physical processors; in - other words, no attempt is made to optimize scheduling - decisions given the shared resources between logical - processors within the same CPU. Because this naive - scheduling can result in suboptimal performance, under - certain circumstances it may be useful to disable the - logical processors with the + &os; maakt gebruikt van HyperThreading (HTT) + ondersteuning op Intel CPU's, mits deze dat ondersteunen. + Een kernel met de options SMP optie + ingeschakeld, zal automatisch de extra logische processoren + detecteren. De standaard &os; scheduler behandeld deze + logische processoren hetzelfde als extra fysieke + processoren, met andere woorden, er wordt geen poging + gedaan om schedule optimalisatie beslissingen te nemen + vanwege de gedeelde bronnen tussen logische processoren + die zich op dezelfde CPU bevinden. Vanwege deze naieve + scheduling kan dit resulteren in suboptimale performance + waar het onder bepaalde voorwaarden nuttiger kan zijn om + de logische processor uit te schakelen met de machdep.hlt_logical_cpus sysctl - variable. It is also possible to halt any CPU in the idle - loop with the machdep.hlt_cpus sysctl - variable. The &man.smp.4; manual page has more - details. + variabele. Het is daarnaast ook mogelijk om elke CPU + te stoppen die zich in de idle-loop bevind, met de + machdep.hlt_cpus sysctl variable. De + &man.smp.4; handleiding heeft hierover meer details. - Hard drives, tape drives, and CD and DVD drives + Harde schijven, tape drives en CD,DVD drives - What kind of hard drives does &os; support? + Welke soort harde schijven ondersteund &os;? - &os; supports EIDE, SATA, SCSI, and SAS drives (with a - compatible controller; see the next section), and all - drives using the original Western Digital - interface (MFM, RLL, ESDI, and of course IDE). A few ESDI - controllers that use proprietary interfaces may not work: - stick to WD1002/3/6/7 interfaces and clones. + &os; ondersteund EIDE, SATA, SCSI en SAS schijven (met + een compatibel controller, zie de volgende sectie), en alle + schijven die de originele Western Digital + interface (MFM, RLL, ESDI en natuurlijk IDE) ondersteunen. + Een aantal ESDI controllers welke proprietary interfaces + gebruiken werken mogelijk niet, blijf bij de + WD1002/3/6/7 interfaces en daarop gebaseerde clonen. - Which SCSI or SAS controllers are supported? + Welke SCSI of SAS controllers worden ondersteund? - See the complete list in the Hardware Notes for &os; + Zie de complete lijst in de Hardware Notes voor &os; &rel.current; - or &rel2.current;. @@ -2420,22 +2440,23 @@ - What types of tape drives are supported? + Welke type tape drives worden ondersteund? - &os; supports SCSI and QIC-36 (with a QIC-02 - interface). This includes 8-mm (aka Exabyte) and DAT - drives. + &os; ondersteund SCSI en QIC-36 (met een QIC-02 + interface). Hieronder vallen 8-mm (aka Exabyte) en + DAT drivers. - Some of the early 8-mm drives are not quite compatible - with SCSI-2, and may not work well with &os;. + Een aantal van de vroege 8-mm drives zijn niet helemaal + compatibel met SCSI-2, en werken daardoor mogelijk niet + helemaal goed met &os;. - Does &os; support tape changers? + Ondersteund &os; tape wisselaars From owner-p4-projects@FreeBSD.ORG Wed Oct 28 13:19:00 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C7F0106568B; Wed, 28 Oct 2009 13:19:00 +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 20B8E106566C for ; Wed, 28 Oct 2009 13:19:00 +0000 (UTC) (envelope-from remko@elvandar.org) Received: from mailgate.jr-hosting.nl (mailgate.jr-hosting.nl [78.46.126.30]) by mx1.freebsd.org (Postfix) with ESMTP id C0A438FC14 for ; Wed, 28 Oct 2009 13:18:59 +0000 (UTC) Received: from websrv01.jr-hosting.nl (websrv01 [78.47.69.233]) by mailgate.jr-hosting.nl (Postfix) with ESMTP id 059681CD2C; Wed, 28 Oct 2009 14:00:49 +0100 (CET) Received: from milamber.elvandar.org ([78.47.44.222] helo=[10.0.3.2]) by websrv01.jr-hosting.nl with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69 (FreeBSD)) (envelope-from ) id 1N388u-000Odx-Vh; Wed, 28 Oct 2009 14:00:49 +0100 Mime-Version: 1.0 (Apple Message framework v1076) Content-Type: text/plain; charset=us-ascii; format=flowed From: Remko Lodder In-Reply-To: <200910281259.n9SCxXft088736@repoman.freebsd.org> Date: Wed, 28 Oct 2009 14:00:48 +0100 Content-Transfer-Encoding: 7bit Message-Id: <581E9E8D-4F32-4714-BE88-ECF0B21FD42A@elvandar.org> References: <200910281259.n9SCxXft088736@repoman.freebsd.org> To: Remko Lodder X-Mailer: Apple Mail (2.1076) Cc: Perforce Change Reviews Subject: Re: PERFORCE change 169883 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, 28 Oct 2009 13:19:00 -0000 On Oct 28, 2009, at 1:59 PM, Remko Lodder wrote: > http://p4web.freebsd.org/chv.cgi?CH=169883 > > Change 169883 by remko@remko_guardian on 2009/10/28 12:59:14 > > New WIP. > > Affected files ... Ofcourse this was Facilitated by my employer: Snow B.V. -- /"\ Best regards, | remko@FreeBSD.org \ / Remko Lodder | remko@EFnet X http://www.evilcoder.org/ | / \ ASCII Ribbon Campaign | Against HTML Mail and News From owner-p4-projects@FreeBSD.ORG Wed Oct 28 16:21:57 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 21F5A1065697; Wed, 28 Oct 2009 16:21: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 C262E1065695 for ; Wed, 28 Oct 2009 16:21:56 +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 B010E8FC14 for ; Wed, 28 Oct 2009 16:21:56 +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 n9SGLu5G008056 for ; Wed, 28 Oct 2009 16:21:56 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9SGLuuC008054 for perforce@freebsd.org; Wed, 28 Oct 2009 16:21:56 GMT (envelope-from mav@freebsd.org) Date: Wed, 28 Oct 2009 16:21:56 GMT Message-Id: <200910281621.n9SGLuuC008054@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 169892 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, 28 Oct 2009 16:21:57 -0000 http://p4web.freebsd.org/chv.cgi?CH=169892 Change 169892 by mav@mav_mavtest on 2009/10/28 16:20:57 Introduce early-attaching type of periph drivers. Initialize them before main scan during boot, not after. Use if for probe, aprobe, xpt and pmp drivers. It is mostly required for pmp driver, to give it ability finish devices probe before FS mounting. The rest of drivers left as-is now, because late attach is required for proper device numbering, when bus scanned in parallel. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#16 edit .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#45 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.h#18 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#109 edit .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.c#19 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#16 (text+ko) ==== @@ -136,7 +136,8 @@ static struct periph_driver pmpdriver = { pmpinit, "pmp", - TAILQ_HEAD_INITIALIZER(pmpdriver.units), /* generation */ 0 + TAILQ_HEAD_INITIALIZER(pmpdriver.units), /* generation */ 0, + CAM_PERIPH_DRV_EARLY }; PERIPHDRIVER_DECLARE(pmp, pmpdriver); ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#45 (text+ko) ==== @@ -83,7 +83,8 @@ static struct periph_driver probe_driver = { probe_periph_init, "aprobe", - TAILQ_HEAD_INITIALIZER(probe_driver.units) + TAILQ_HEAD_INITIALIZER(probe_driver.units), /* generation */ 0, + CAM_PERIPH_DRV_EARLY }; PERIPHDRIVER_DECLARE(aprobe, probe_driver); ==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.h#18 (text+ko) ==== @@ -79,6 +79,8 @@ char *driver_name; TAILQ_HEAD(,cam_periph) units; u_int generation; + u_int flags; +#define CAM_PERIPH_DRV_EARLY 0x01 }; typedef enum { ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#109 (text+ko) ==== @@ -161,7 +161,8 @@ static struct periph_driver xpt_driver = { xpt_periph_init, "xpt", - TAILQ_HEAD_INITIALIZER(xpt_driver.units) + TAILQ_HEAD_INITIALIZER(xpt_driver.units), /* generation */ 0, + CAM_PERIPH_DRV_EARLY }; PERIPHDRIVER_DECLARE(xpt, xpt_driver); @@ -4657,6 +4658,9 @@ static void xpt_config(void *arg) { + struct periph_driver **p_drv; + int i; + /* * Now that interrupts are enabled, go find our devices */ @@ -4690,6 +4694,13 @@ #endif /* CAM_DEBUG_BUS */ #endif /* CAMDEBUG */ + /* Register early peripheral drivers */ + /* XXX This will have to change when we have loadable modules */ + p_drv = periph_drivers; + for (i = 0; p_drv[i] != NULL; i++) { + if ((p_drv[i]->flags & CAM_PERIPH_DRV_EARLY) != 0) + (*p_drv[i]->init)(); + } /* * Scan all installed busses. */ @@ -4740,7 +4751,8 @@ /* XXX This will have to change when we have loadable modules */ p_drv = periph_drivers; for (i = 0; p_drv[i] != NULL; i++) { - (*p_drv[i]->init)(); + if ((p_drv[i]->flags & CAM_PERIPH_DRV_EARLY) == 0) + (*p_drv[i]->init)(); } /* ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.c#19 (text+ko) ==== @@ -110,7 +110,8 @@ static struct periph_driver probe_driver = { probe_periph_init, "probe", - TAILQ_HEAD_INITIALIZER(probe_driver.units) + TAILQ_HEAD_INITIALIZER(probe_driver.units), /* generation */ 0, + CAM_PERIPH_DRV_EARLY }; PERIPHDRIVER_DECLARE(probe, probe_driver); From owner-p4-projects@FreeBSD.ORG Wed Oct 28 18:34:10 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 297FC106568D; Wed, 28 Oct 2009 18:34: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 C9C8B106566B for ; Wed, 28 Oct 2009 18:34:09 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B6CD68FC14 for ; Wed, 28 Oct 2009 18:34:09 +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 n9SIY9s8029706 for ; Wed, 28 Oct 2009 18:34:09 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9SIY9Wl029702 for perforce@freebsd.org; Wed, 28 Oct 2009 18:34:09 GMT (envelope-from trasz@freebsd.org) Date: Wed, 28 Oct 2009 18:34:09 GMT Message-Id: <200910281834.n9SIY9Wl029702@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 169898 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, 28 Oct 2009 18:34:10 -0000 http://p4web.freebsd.org/chv.cgi?CH=169898 Change 169898 by trasz@trasz_victim on 2009/10/28 18:33:48 Move code specific to UFS from the syscall layer (sys/kern/vfs_acl.c) to UFS itself. Not very pretty, as it makes it neccessary for the code in ufs_vnops.c to use private UFS functions instead of calling VOP_SETACL() and VOP_GETACL(), but correct. XXX: Note that there is still one bug here - if we deny ACL_READ_ACL, retrieving the ACL is denied as it should be, but stat(2) is not. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_acl.c#22 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/acl.h#4 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_acl.c#22 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_acl.c#22 (text+ko) ==== @@ -215,18 +215,6 @@ error = acl_copyin(aclp, inkernelacl, type); if (error != 0) goto out; - - /* - * With NFSv4 ACLs, chmod(2) may need to add additional entries. - * Make sure it has enough room for that - splitting every entry - * into two and appending "canonical six" entries at the end. - */ - if (type == ACL_TYPE_NFS4 && - inkernelacl->acl_cnt > (ACL_MAX_ENTRIES - 6) / 2) { - error = ENOSPC; - goto out; - } - error = vn_start_write(vp, &mp, V_WAIT | PCATCH); if (error != 0) goto out; @@ -265,14 +253,12 @@ if (error != 0) goto out; #endif - error = VOP_ACCESSX(vp, VREAD_ACL, td->td_ucred, td); - if (error != 0) - goto out; - error = VOP_GETACL(vp, acl_type_unold(type), inkernelacl, td->td_ucred, td); +#ifdef MAC out: +#endif VOP_UNLOCK(vp, 0); if (error == 0) error = acl_copyout(inkernelacl, aclp, type); @@ -321,18 +307,6 @@ error = acl_copyin(aclp, inkernelacl, type); if (error != 0) goto out; - - /* - * With NFSv4 ACLs, chmod(2) may need to add additional entries. - * Make sure it has enough room for that - splitting every entry - * into two and appending "canonical six" entries at the end. - */ - if (type == ACL_TYPE_NFS4 && - inkernelacl->acl_cnt > (ACL_MAX_ENTRIES - 6) / 2) { - error = ENOSPC; - goto out; - } - error = VOP_ACLCHECK(vp, acl_type_unold(type), inkernelacl, td->td_ucred, td); out: ==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/acl.h#4 (text+ko) ==== @@ -37,6 +37,8 @@ #ifdef _KERNEL +int ufs_getacl_nfs4_internal(struct vnode *vp, struct acl *aclp, struct thread *td); +int ufs_setacl_nfs4_internal(struct vnode *vp, struct acl *aclp, struct thread *td); void ufs_sync_acl_from_inode(struct inode *ip, struct acl *acl); void ufs_sync_inode_from_acl(struct acl *acl, struct inode *ip); ==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_acl.c#22 (text+ko) ==== @@ -140,29 +140,31 @@ DIP_SET(ip, i_mode, ip->i_mode); } -static int -ufs_getacl_nfs4(struct vop_getacl_args *ap) +/* + * Retrieve NFSv4 ACL, skipping access checks. Must be used in UFS code + * instead of VOP_GETACL() when we don't want to be restricted by the user + * not having ACL_READ_ACL permission, e.g. when calculating inherited ACL + * or in ufs_vnops.c:ufs_accessx(). + */ +int +ufs_getacl_nfs4_internal(struct vnode *vp, struct acl *aclp, struct thread *td) { int error, len; - struct inode *ip = VTOI(ap->a_vp); + struct inode *ip = VTOI(vp); - if ((ap->a_vp->v_mount->mnt_flag & MNT_NFS4ACLS) == 0) - return (EINVAL); + len = sizeof(*aclp); + bzero(aclp, len); - len = sizeof(*ap->a_aclp); - bzero(ap->a_aclp, len); - - error = vn_extattr_get(ap->a_vp, IO_NODELOCKED, - NFS4_ACL_EXTATTR_NAMESPACE, - NFS4_ACL_EXTATTR_NAME, &len, (char *) ap->a_aclp, - ap->a_td); - ap->a_aclp->acl_maxcnt = ACL_MAX_ENTRIES; + error = vn_extattr_get(vp, IO_NODELOCKED, + NFS4_ACL_EXTATTR_NAMESPACE, NFS4_ACL_EXTATTR_NAME, + &len, (char *) aclp, td); + aclp->acl_maxcnt = ACL_MAX_ENTRIES; if (error == ENOATTR) { /* * Legitimately no ACL set on object, purely * emulate it through the inode. */ - acl_nfs4_sync_acl_from_mode(ap->a_aclp, ip->i_mode, ip->i_uid); + acl_nfs4_sync_acl_from_mode(aclp, ip->i_mode, ip->i_uid); return (0); } @@ -170,7 +172,7 @@ if (error) return (error); - if (len != sizeof(*ap->a_aclp)) { + if (len != sizeof(*aclp)) { /* * A short (or long) read, meaning that for * some reason the ACL is corrupted. Return @@ -184,7 +186,7 @@ return (EPERM); } - error = acl_nfs4_check(ap->a_aclp, ap->a_vp->v_type == VDIR); + error = acl_nfs4_check(aclp, vp->v_type == VDIR); if (error) { printf("ufs_getacl_nfs4(): Loaded invalid ACL " "(failed acl_nfs4_check), inumber %d on %s\n", @@ -196,6 +198,23 @@ return (0); } +static int +ufs_getacl_nfs4(struct vop_getacl_args *ap) +{ + int error; + + if ((ap->a_vp->v_mount->mnt_flag & MNT_NFS4ACLS) == 0) + return (EINVAL); + + error = VOP_ACCESSX(ap->a_vp, VREAD_ACL, ap->a_td->td_ucred, ap->a_td); + if (error) + return (error); + + error = ufs_getacl_nfs4_internal(ap->a_vp, ap->a_aclp, ap->a_td); + + return (error); +} + /* * Read POSIX.1e ACL from an EA. Return error if its not found * or if any other error has occured. @@ -347,11 +366,67 @@ return (ufs_getacl_posix1e(ap)); } +/* + * Set NFSv4 ACL without doing any access checking. This is required + * e.g. by the UFS code that implements ACL inheritance, or from + * ufs_vnops.c:ufs_chmod(), as some of the checks have to be skipped + * in that case, and others are redundant. + */ +int +ufs_setacl_nfs4_internal(struct vnode *vp, struct acl *aclp, struct thread *td) +{ + int error; + mode_t mode; + struct inode *ip = VTOI(vp); + + KASSERT(acl_nfs4_check(aclp, vp->v_type == VDIR) == 0, + ("invalid ACL passed to ufs_setacl_nfs4_internal")); + + if (acl_nfs4_is_trivial(aclp, ip->i_uid)) { + error = vn_extattr_rm(vp, IO_NODELOCKED, + NFS4_ACL_EXTATTR_NAMESPACE, NFS4_ACL_EXTATTR_NAME, td); + + /* + * An attempt to remove ACL from a file that didn't have + * any extended entries is not an error. + */ + if (error == ENOATTR) + error = 0; + + } else { + error = vn_extattr_set(vp, IO_NODELOCKED, + NFS4_ACL_EXTATTR_NAMESPACE, NFS4_ACL_EXTATTR_NAME, + sizeof(*aclp), (char *) aclp, td); + } + + /* + * Map lack of attribute definition in UFS_EXTATTR into lack of + * support for ACLs on the filesystem. + */ + if (error == ENOATTR) + return (EOPNOTSUPP); + + if (error) + return (error); + + mode = ip->i_mode; + + acl_nfs4_sync_mode_from_acl(&mode, aclp); + + ip->i_mode &= ACL_PRESERVE_MASK; + ip->i_mode |= mode; + DIP_SET(ip, i_mode, ip->i_mode); + ip->i_flag |= IN_CHANGE; + + VN_KNOTE_UNLOCKED(vp, NOTE_ATTRIB); + + return (0); +} + static int ufs_setacl_nfs4(struct vop_setacl_args *ap) { int error; - mode_t mode; struct inode *ip = VTOI(ap->a_vp); if ((ap->a_vp->v_mount->mnt_flag & MNT_NFS4ACLS) == 0) @@ -380,47 +455,16 @@ if ((error = VOP_ACCESSX(ap->a_vp, VWRITE_ACL, ap->a_cred, ap->a_td))) return (error); - if (acl_nfs4_is_trivial(ap->a_aclp, ip->i_uid)) { - error = vn_extattr_rm(ap->a_vp, IO_NODELOCKED, - NFS4_ACL_EXTATTR_NAMESPACE, - NFS4_ACL_EXTATTR_NAME, ap->a_td); - - /* - * An attempt to remove ACL from a file that didn't have - * any extended entries is not an error. - */ - if (error == ENOATTR) - error = 0; - - } else { - error = vn_extattr_set(ap->a_vp, IO_NODELOCKED, - NFS4_ACL_EXTATTR_NAMESPACE, - NFS4_ACL_EXTATTR_NAME, - sizeof(*ap->a_aclp), - (char *) ap->a_aclp, ap->a_td); - } - /* - * Map lack of attribute definition in UFS_EXTATTR into lack of - * support for ACLs on the filesystem. + * With NFSv4 ACLs, chmod(2) may need to add additional entries. + * Make sure it has enough room for that - splitting every entry + * into two and appending "canonical six" entries at the end. */ - if (error == ENOATTR) - return (EOPNOTSUPP); + if (ap->a_aclp->acl_cnt > (ACL_MAX_ENTRIES - 6) / 2) + return (ENOSPC); - if (error) - return (error); - - mode = ip->i_mode; - - acl_nfs4_sync_mode_from_acl(&mode, ap->a_aclp); - - ip->i_mode &= ACL_PRESERVE_MASK; - ip->i_mode |= mode; - DIP_SET(ip, i_mode, ip->i_mode); - ip->i_flag |= IN_CHANGE; + error = ufs_setacl_nfs4_internal(ap->a_vp, ap->a_aclp, ap->a_td); - VN_KNOTE_UNLOCKED(ap->a_vp, NOTE_ATTRIB); - return (0); } @@ -578,6 +622,14 @@ if ((ap->a_vp->v_mount->mnt_flag & MNT_NFS4ACLS) == 0) return (EINVAL); + /* + * With NFSv4 ACLs, chmod(2) may need to add additional entries. + * Make sure it has enough room for that - splitting every entry + * into two and appending "canonical six" entries at the end. + */ + if (ap->a_aclp->acl_cnt > (ACL_MAX_ENTRIES - 6) / 2) + return (ENOSPC); + if (ap->a_vp->v_type == VDIR) is_directory = 1; From owner-p4-projects@FreeBSD.ORG Wed Oct 28 20:40:16 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AFF851065692; Wed, 28 Oct 2009 20:40:16 +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 223C11065679 for ; Wed, 28 Oct 2009 20:40:16 +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 0E8CD8FC13 for ; Wed, 28 Oct 2009 20:40:16 +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 n9SKeFIp040620 for ; Wed, 28 Oct 2009 20:40:15 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9SKeFT3040618 for perforce@freebsd.org; Wed, 28 Oct 2009 20:40:15 GMT (envelope-from mav@freebsd.org) Date: Wed, 28 Oct 2009 20:40:15 GMT Message-Id: <200910282040.n9SKeFT3040618@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 169901 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, 28 Oct 2009 20:40:17 -0000 http://p4web.freebsd.org/chv.cgi?CH=169901 Change 169901 by mav@mav_mavbook on 2009/10/28 20:39:49 IFC Affected files ... .. //depot/projects/scottl-camlock/src/Makefile.inc1#9 integrate .. //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#18 integrate .. //depot/projects/scottl-camlock/src/contrib/ncurses/ncurses/base/lib_getch.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libbluetooth/bluetooth.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libbluetooth/bluetooth.h#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/Makefile.inc#6 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/Symbol.map#8 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/pselect.3#2 delete .. //depot/projects/scottl-camlock/src/lib/libc/gen/pselect.c#2 delete .. //depot/projects/scottl-camlock/src/lib/libc/sys/Makefile.inc#7 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/Symbol.map#10 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/pselect.2#1 branch .. //depot/projects/scottl-camlock/src/lib/libstand/open.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libthr/thread/thr_syscalls.c#4 integrate .. //depot/projects/scottl-camlock/src/sbin/mount_nfs/mount_nfs.c#6 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/iwn.4#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man5/regdomain.5#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/Makefile#12 integrate .. //depot/projects/scottl-camlock/src/share/zoneinfo/southamerica#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#31 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/ia32/ia32_signal.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_machdep.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_sysvec.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/machdep.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/boot/common/commands.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_misc.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_proto.h#25 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_syscall.h#24 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_syscalls.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_sysent.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/syscalls.master#26 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aac.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aac_cam.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/amr/amr.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cd.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fdc/fdc.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci_pci.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ohci.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/uhci_pci.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/fs/tmpfs/tmpfs_subr.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/machdep.c#30 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_machdep.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_sysvec.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/machdep.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/kern/init_sysent.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_context.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_cpuset.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_sig.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_trap.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sys_generic.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/kern/syscalls.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/kern/syscalls.master#22 integrate .. //depot/projects/scottl-camlock/src/sys/kern/systrace_args.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/pm_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/libalias/alias.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_cc_functions.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_output.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/pc98/machdep.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/machdep.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/booke/machdep.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/in_cksum.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/machdep.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/machdep.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/sys/signalvar.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/sys/syscall.h#21 integrate .. //depot/projects/scottl-camlock/src/sys/sys/syscall.mk#21 integrate .. //depot/projects/scottl-camlock/src/sys/sys/syscallsubr.h#18 integrate .. //depot/projects/scottl-camlock/src/sys/sys/sysproto.h#22 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_fault.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_map.c#24 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/cdrom.c#4 integrate Differences ... ==== //depot/projects/scottl-camlock/src/Makefile.inc1#9 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.631 2009/10/21 19:39:34 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.632 2009/10/28 07:05:32 edwin Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -599,11 +599,14 @@ .if ${MK_INFO} != "no" _install-info= install-info .endif +.if ${MK_ZONEINFO} != "no" +_zoneinfo= zic tzsetup +.endif ITOOLS= [ awk cap_mkdb cat chflags chmod chown \ date echo egrep find grep ${_install-info} \ ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ - test true uname wc zic + test true uname wc ${_zoneinfo} # # distributeworld ==== //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#18 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.211 2009/10/24 12:59:29 antoine Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.212 2009/10/28 11:14:32 kib Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20091027: pselect.3 implemented as syscall +OLD_FILES+=usr/share/man/man3/pselect.3.gz # 20091005: fusword.9 and susword.9 removed OLD_FILES+=usr/share/man/man9/fusword.9.gz OLD_FILES+=usr/share/man/man9/susword.9.gz ==== //depot/projects/scottl-camlock/src/contrib/ncurses/ncurses/base/lib_getch.c#3 (text+ko) ==== @@ -476,6 +476,12 @@ /* resizeterm can push KEY_RESIZE */ if (cooked_key_in_fifo()) { *result = fifo_pull(sp); + /* + * Get the ERR from queue -- it is from WINCH, + * so we should take it out, the "error" is handled. + */ + if (fifo_peek(sp) == -1) + fifo_pull(sp); returnCode(*result >= KEY_MIN ? KEY_CODE_YES : OK); } } ==== //depot/projects/scottl-camlock/src/lib/libbluetooth/bluetooth.3#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .\" $Id: bluetooth.3,v 1.5 2003/05/20 23:04:30 max Exp $ -.\" $FreeBSD: src/lib/libbluetooth/bluetooth.3,v 1.10 2009/04/22 15:50:03 emax Exp $ +.\" $FreeBSD: src/lib/libbluetooth/bluetooth.3,v 1.11 2009/10/26 17:27:30 emax Exp $ .\" .Dd April 9, 2009 .Dt BLUETOOTH 3 @@ -272,7 +272,7 @@ .Pp The .Fn bt_devinfo -function populates prodivded +function populates provided .Vt bt_devinfo structure with the information about given Bluetooth device. The caller is expected to pass Bluetooth device name in the ==== //depot/projects/scottl-camlock/src/lib/libbluetooth/bluetooth.h#3 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $Id: bluetooth.h,v 1.5 2003/09/14 23:28:42 max Exp $ - * $FreeBSD: src/lib/libbluetooth/bluetooth.h,v 1.5 2009/04/22 15:50:03 emax Exp $ + * $FreeBSD: src/lib/libbluetooth/bluetooth.h,v 1.6 2009/10/26 17:27:30 emax Exp $ */ #ifndef _BLUETOOTH_H_ @@ -163,8 +163,8 @@ int bt_devsend (int s, uint16_t opcode, void *param, size_t plen); ssize_t bt_devrecv (int s, void *buf, size_t size, time_t to); int bt_devreq (int s, struct bt_devreq *r, time_t to); -int bt_devfilter(int s, struct bt_devfilter const *new, - struct bt_devfilter *old); +int bt_devfilter(int s, struct bt_devfilter const *newp, + struct bt_devfilter *oldp); void bt_devfilter_pkt_set(struct bt_devfilter *filter, uint8_t type); void bt_devfilter_pkt_clr(struct bt_devfilter *filter, uint8_t type); int bt_devfilter_pkt_tst(struct bt_devfilter const *filter, uint8_t type); ==== //depot/projects/scottl-camlock/src/lib/libc/gen/Makefile.inc#6 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.6 (Berkeley) 5/4/95 -# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.146 2009/10/06 14:05:57 rwatson Exp $ +# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.148 2009/10/28 11:14:32 kib Exp $ # machine-independent gen sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen @@ -21,7 +21,7 @@ initgroups.c isatty.c isinf.c isnan.c jrand48.c lcong48.c \ lockf.c lrand48.c mrand48.c nftw.c nice.c \ nlist.c nrand48.c opendir.c \ - pause.c pmadvise.c popen.c posix_spawn.c pselect.c \ + pause.c pmadvise.c popen.c posix_spawn.c \ psignal.c pw_scan.c pwcache.c \ raise.c readdir.c readpassphrase.c rewinddir.c \ scandir.c seed48.c seekdir.c sem.c semctl.c \ @@ -62,7 +62,7 @@ posix_spawnattr_getpgroup.3 posix_spawnattr_getschedparam.3 \ posix_spawnattr_getschedpolicy.3 posix_spawnattr_init.3 \ posix_spawnattr_getsigdefault.3 posix_spawnattr_getsigmask.3 \ - pselect.3 psignal.3 pwcache.3 \ + psignal.3 pwcache.3 \ raise.3 rand48.3 readpassphrase.3 rfork_thread.3 \ scandir.3 sem_destroy.3 sem_getvalue.3 sem_init.3 \ sem_open.3 sem_post.3 sem_timedwait.3 sem_wait.3 \ ==== //depot/projects/scottl-camlock/src/lib/libc/gen/Symbol.map#8 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/gen/Symbol.map,v 1.23 2009/10/06 14:05:57 rwatson Exp $ + * $FreeBSD: src/lib/libc/gen/Symbol.map,v 1.24 2009/10/27 10:57:53 kib Exp $ */ FBSD_1.0 { @@ -223,7 +223,6 @@ posix_madvise; popen; pclose; - pselect; psignal; raise; readdir; @@ -454,7 +453,6 @@ __opendir2; __pause; _pause; - __pselect; __pw_scan; /* Used by (at least) libutil */ __raise; _raise; ==== //depot/projects/scottl-camlock/src/lib/libc/sys/Makefile.inc#7 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.3 (Berkeley) 10/24/94 -# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.142 2009/07/13 12:53:43 trasz Exp $ +# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.143 2009/10/28 11:14:32 kib Exp $ # sys sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/sys ${.CURDIR}/sys @@ -83,7 +83,8 @@ mq_setattr.2 \ msgctl.2 msgget.2 msgrcv.2 msgsnd.2 \ msync.2 munmap.2 nanosleep.2 nfssvc.2 ntp_adjtime.2 open.2 \ - pathconf.2 pipe.2 poll.2 posix_openpt.2 profil.2 ptrace.2 quotactl.2 \ + pathconf.2 pipe.2 poll.2 posix_openpt.2 profil.2 \ + pselect.2 ptrace.2 quotactl.2 \ read.2 readlink.2 reboot.2 recv.2 rename.2 revoke.2 rfork.2 rmdir.2 \ rtprio.2 .if !defined(NO_P1003_1B) ==== //depot/projects/scottl-camlock/src/lib/libc/sys/Symbol.map#10 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/sys/Symbol.map,v 1.29 2009/10/11 20:19:45 jilles Exp $ + * $FreeBSD: src/lib/libc/sys/Symbol.map,v 1.30 2009/10/27 10:55:34 kib Exp $ */ /* @@ -211,6 +211,7 @@ posix_openpt; preadv; profil; + pselect; ptrace; pwritev; quotactl; @@ -781,6 +782,8 @@ __sys_preadv; _profil; __sys_profil; + _pselect; + __sys_pselect; _ptrace; __sys_ptrace; _pwritev; ==== //depot/projects/scottl-camlock/src/lib/libstand/open.c#2 (text+ko) ==== @@ -61,7 +61,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libstand/open.c,v 1.7 2007/01/09 01:02:04 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libstand/open.c,v 1.8 2009/10/28 14:13:45 brueffer Exp $"); #include "stand.h" @@ -113,6 +113,7 @@ /* see if we opened a raw device; otherwise, 'file' is the file name. */ if (file == (char *)0 || *file == '\0') { f->f_flags |= F_RAW; + f->f_rabuf = NULL; return (fd); } ==== //depot/projects/scottl-camlock/src/lib/libthr/thread/thr_syscalls.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ * 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/libthr/thread/thr_syscalls.c,v 1.21 2009/10/11 20:19:45 jilles Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_syscalls.c,v 1.22 2009/10/27 10:55:34 kib Exp $ */ /* @@ -104,6 +104,8 @@ extern int __sys_connect(int, const struct sockaddr *, socklen_t); extern int __sys_fsync(int); extern int __sys_msync(void *, size_t, int); +extern int __sys_pselect(int, fd_set *, fd_set *, fd_set *, + const struct timespec *, const sigset_t *); extern int __sys_poll(struct pollfd *, unsigned, int); extern ssize_t __sys_recv(int, void *, size_t, int); extern ssize_t __sys_recvfrom(int, void *, size_t, int, struct sockaddr *, socklen_t *); @@ -394,7 +396,7 @@ int ret; _thr_cancel_enter(curthread); - ret = __pselect(count, rfds, wfds, efds, timo, mask); + ret = __sys_pselect(count, rfds, wfds, efds, timo, mask); _thr_cancel_leave(curthread); return (ret); ==== //depot/projects/scottl-camlock/src/sbin/mount_nfs/mount_nfs.c#6 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/mount_nfs/mount_nfs.c,v 1.89 2009/09/17 19:08:15 rmacklem Exp $"); +__FBSDID("$FreeBSD: src/sbin/mount_nfs/mount_nfs.c,v 1.90 2009/10/26 14:57:33 jh Exp $"); #include #include @@ -232,16 +232,16 @@ char *pnextopt = NULL; char *val = ""; pass_flag_to_nmount = 1; + pnextopt = strchr(opt, ','); + if (pnextopt != NULL) { + *pnextopt = '\0'; + pnextopt++; + } pval = strchr(opt, '='); - pnextopt = strchr(opt, ','); if (pval != NULL) { *pval = '\0'; val = pval + 1; } - if (pnextopt) { - *pnextopt = '\0'; - pnextopt++; - } if (strcmp(opt, "bg") == 0) { opflags |= BGRND; pass_flag_to_nmount=0; ==== //depot/projects/scottl-camlock/src/share/man/man4/iwn.4#4 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/iwn.4,v 1.6 2009/10/25 11:01:53 rpaulo Exp $ +.\" $FreeBSD: src/share/man/man4/iwn.4,v 1.7 2009/10/27 17:22:03 brueffer Exp $ .\" .Dd October 25, 2009 .Os @@ -42,7 +42,8 @@ .Cd "device firmware" .Ed .Pp -You also need to select a firmware for your device. Chose one from: +You also need to select a firmware for your device. +Choose one from: .Bd -ragged -offset indent .Cd "device iwn4965fw" .Cd "device iwn5000fw" @@ -57,7 +58,7 @@ to include them all. .Pp Alternatively, to load the driver as a -module at boot time, place the following line in +module at boot time, place the following lines in .Xr loader.conf 5 : .Bd -literal -offset indent if_iwn_load="YES" ==== //depot/projects/scottl-camlock/src/share/man/man5/regdomain.5#2 (text+ko) ==== @@ -22,8 +22,8 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/regdomain.5,v 1.1 2008/04/20 20:35:46 sam Exp $ -.Dd Apri 13, 2008 +.\" $FreeBSD: src/share/man/man5/regdomain.5,v 1.2 2009/10/28 14:39:27 brueffer Exp $ +.Dd April 13, 2008 .Dt REGDOMAIN 5 .Os .Sh NAME @@ -44,5 +44,5 @@ XML database of 802.11 regulatory constraints .El .Sh SEE ALSO -.Xr wlan 4 -.Xr ifconfig 8 , +.Xr wlan 4 , +.Xr ifconfig 8 ==== //depot/projects/scottl-camlock/src/share/man/man9/Makefile#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.363 2009/10/15 14:54:35 jhb Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.364 2009/10/27 14:37:25 emaste Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -1222,6 +1222,7 @@ timeout.9 callout_init_rw.9 \ timeout.9 callout_pending.9 \ timeout.9 callout_reset.9 \ + timeout.9 callout_schedule.9 \ timeout.9 callout_stop.9 \ timeout.9 untimeout.9 MLINKS+=ucred.9 crcopy.9 \ ==== //depot/projects/scottl-camlock/src/share/zoneinfo/southamerica#5 (text+ko) ==== @@ -1,5 +1,5 @@ # 
-# @(#)southamerica	8.37
+# @(#)southamerica	8.40
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -215,9 +215,23 @@
 # http://www.jujuy.gov.ar/index2/partes_prensa/18_10_08/235-181008.doc
 # 
 
+# From fullinet (2009-10-18):
+# As announced in
+# 
+# http://www.argentina.gob.ar/argentina/portal/paginas.dhtml?pagina=356
+# 
+# (an official .gob.ar) under title: "Sin Cambio de Hora" (english: "No hour change")
+#
+# "Por el momento, el Gobierno Nacional resolvio no modificar la hora
+# oficial, decision que estaba en estudio para su implementacion el
+# domingo 18 de octubre. Desde el Ministerio de Planificacion se anuncio
+# que la Argentina hoy, en estas condiciones meteorologicas, no necesita
+# la modificacion del huso horario, ya que 2009 nos encuentra con
+# crecimiento en la produccion y distribucion energetica."
+
 Rule	Arg	2007	only	-	Dec	30	0:00	1:00	S
-Rule	Arg	2008	max	-	Mar	Sun>=15	0:00	0	-
-Rule	Arg	2008	max	-	Oct	Sun>=15	0:00	1:00	S
+Rule	Arg	2008	2009	-	Mar	Sun>=15	0:00	0	-
+Rule	Arg	2008	only	-	Oct	Sun>=15	0:00	1:00	S
  
 # From Mariano Absatz (2004-05-21):
 # Today it was officially published that the Province of Mendoza is changing
@@ -389,44 +403,39 @@
 # during 2009, this timezone change will run from 00:00 the third Sunday
 # in March until 24:00 of the second Saturday in October.
 
-# From Arthur David Olson (2009-03-16):
-# The unofficial claim at
-# 
-# http://www.timeanddate.com/news/time/san-luis-new-time-zone.html
+# From Mariano Absatz (2009-10-16):
+# ...the Province of San Luis is a case in itself.
+#
+# The Law at
+# 
-# is that "The province will most likely follow the next daylight saving schedule,
-# which is planned for the second Sunday in October."
-
-# From Alexander Krivenyshev (2009-09-19):
-# Some  Argentinian Provinces (Buenos Aires, Entre Ríos) are opposing to the
-# Daylight Saving Time for the 2009-2010 season.
+# is ambiguous because establishes a calendar from the 2nd Sunday in
+# October at 0:00 thru the 2nd Saturday in March at 24:00 and the
+# complement of that starting on the 2nd Sunday of March at 0:00 and
+# ending on the 2nd Saturday of March at 24:00.
+#
+# This clearly breaks every time the 1st of March or October is a Sunday.
+#
+# IMHO, the "spirit of the Law" is to make the changes at 0:00 on the 2nd
+# Sunday of October and March.
+#
+# The problem is that the changes in the rest of the Provinces that did
+# change in 2007/2008, were made according to the Federal Law and Decrees
+# that did so on the 3rd Sunday of October and March.
 #
-# (Spanish)
-# "El cambio de huso horario en Entre Ríos deberá ser aprobado por la
-# Legislatura":
-# 
-# http://www.analisisdigital.com.ar/noticias.php?ed=1&di=0&no=110168
-# 
-# English translation - "The time zone change in Entre Rios must be approved by
-# the Legislature."
+# In fact, San Luis actually switched from UTC-4 to UTC-3 last Sunday
+# (October 11th) at 0:00.
 #
-# (Spanish)
-# "Mar del Plata no quiere cambiar la hora."
-# 
-# http://www.mensajeroweb.com.ar/index.php?x=nota/33861/1/mar-del-plata-no-quiere-cambiar-la-hora
-# 
-# English translation - "Mar del Plata is not to change the time"
+# So I guess a new set of rules, besides "Arg", must be made and the last
+# America/Argentina/San_Luis entries should change to use these...
 #
-# or
-# (some English translation)
-# 
-# http://www.worldtimezone.com/dst_news/dst_news_argentina07.html
-# 
-
-# From Arthur David Olson (2009-09-22):
-# "Mar del Plata no quiere cambiar la hora" translates to
-# "Mar del Plata doesn't want to change the time"
-# (less definitive than "is not to").
+# I'm enclosing a patch that does what I say... regretfully, the San Luis
+# timezone must be called "WART/WARST" even when most of the time (like,
+# right now) WARST == ART... that is, since last Sunday, all the country
+# is using UTC-3, but in my patch, San Luis calls it "WARST" and the rest
+# of the country calls it "ART".
+# ...
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 #
@@ -560,6 +569,10 @@
 			-3:00	-	ART
 #
 # San Luis (SL)
+
+Rule	SanLuis	2008	max	-	Mar	Sun>=8	0:00	0	-
+Rule	SanLuis	2007	max	-	Oct	Sun>=8	0:00	1:00	S
+
 Zone America/Argentina/San_Luis -4:25:24 - LMT	1894 Oct 31
 			-4:16:48 -	CMT	1920 May
 			-4:00	-	ART	1930 Dec
@@ -574,8 +587,7 @@
 			-3:00	-	ART	2004 May 31
 			-4:00	-	WART	2004 Jul 25
 			-3:00	Arg	AR%sT	2008 Jan 21
-			-3:00	-	ART	2009 Mar 15
-			-4:00	Arg	WAR%sT
+			-4:00	SanLuis	WAR%sT
 #
 # Santa Cruz (SC)
 Zone America/Argentina/Rio_Gallegos -4:36:52 - LMT 1894 Oct 31

==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#31 (text+ko) ====

@@ -39,7 +39,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.710 2009/09/22 16:51:00 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.711 2009/10/27 10:47:58 kib Exp $");
 
 #include "opt_atalk.h"
 #include "opt_atpic.h"
@@ -415,7 +415,7 @@
 	ucontext_t uc;
 	struct proc *p = td->td_proc;
 	struct trapframe *regs;
-	const ucontext_t *ucp;
+	ucontext_t *ucp;
 	long rflags;
 	int cs, error, ret;
 	ksiginfo_t ksi;
@@ -478,7 +478,6 @@
 	td->td_pcb->pcb_fsbase = ucp->uc_mcontext.mc_fsbase;
 	td->td_pcb->pcb_gsbase = ucp->uc_mcontext.mc_gsbase;
 
-	PROC_LOCK(p);
 #if defined(COMPAT_43)
 	if (ucp->uc_mcontext.mc_onstack & 1)
 		td->td_sigstk.ss_flags |= SS_ONSTACK;
@@ -486,10 +485,7 @@
 		td->td_sigstk.ss_flags &= ~SS_ONSTACK;
 #endif
 
-	td->td_sigmask = ucp->uc_sigmask;
-	SIG_CANTMASK(td->td_sigmask);
-	signotify(td);
-	PROC_UNLOCK(p);
+	kern_sigprocmask(td, SIG_SETMASK, &ucp->uc_sigmask, NULL, 0);
 	td->td_pcb->pcb_flags |= PCB_FULLCTX;
 	td->td_pcb->pcb_full_iret = 1;
 	return (EJUSTRETURN);

==== //depot/projects/scottl-camlock/src/sys/amd64/ia32/ia32_signal.c#9 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.23 2009/07/09 09:34:11 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.24 2009/10/27 10:47:58 kib Exp $");
 
 #include "opt_compat.h"
 
@@ -244,10 +244,8 @@
 		if (ret == 0) {
 			ret = ia32_set_mcontext(td, &uc.uc_mcontext);
 			if (ret == 0) {
-				SIG_CANTMASK(uc.uc_sigmask);
-				PROC_LOCK(td->td_proc);
-				td->td_sigmask = uc.uc_sigmask;
-				PROC_UNLOCK(td->td_proc);
+				kern_sigprocmask(td, SIG_SETMASK,
+				    &uc.uc_sigmask, NULL, 0);
 			}
 		}
 	}
@@ -273,10 +271,8 @@
 			if (ret == 0) {
 				ret = ia32_set_mcontext(td, &uc.uc_mcontext);
 				if (ret == 0) {
-					SIG_CANTMASK(uc.uc_sigmask);
-					PROC_LOCK(td->td_proc);
-					td->td_sigmask = uc.uc_sigmask;
-					PROC_UNLOCK(td->td_proc);
+					kern_sigprocmask(td, SIG_SETMASK,
+					    &uc.uc_sigmask, NULL, 0);
 				}
 			}
 		}
@@ -544,9 +540,8 @@
 	} */ *uap;
 {
 	struct ia32_ucontext4 uc;
-	struct proc *p = td->td_proc;
 	struct trapframe *regs;
-	const struct ia32_ucontext4 *ucp;
+	struct ia32_ucontext4 *ucp;
 	int cs, eflags, error;
 	ksiginfo_t ksi;
 
@@ -610,11 +605,7 @@
 	regs->tf_fs = ucp->uc_mcontext.mc_fs;
 	regs->tf_gs = ucp->uc_mcontext.mc_gs;
 
-	PROC_LOCK(p);
-	td->td_sigmask = ucp->uc_sigmask;
-	SIG_CANTMASK(td->td_sigmask);
-	signotify(td);
-	PROC_UNLOCK(p);
+	kern_sigprocmask(td, SIG_SETMASK, &ucp->uc_sigmask, NULL, 0);
 	td->td_pcb->pcb_full_iret = 1;
 	return (EJUSTRETURN);
 }
@@ -631,9 +622,8 @@
 	} */ *uap;
 {
 	struct ia32_ucontext uc;
-	struct proc *p = td->td_proc;
 	struct trapframe *regs;
-	const struct ia32_ucontext *ucp;
+	struct ia32_ucontext *ucp;
 	int cs, eflags, error, ret;
 	ksiginfo_t ksi;
 
@@ -702,11 +692,7 @@
 	regs->tf_gs = ucp->uc_mcontext.mc_gs;
 	regs->tf_flags = TF_HASSEGS;
 
-	PROC_LOCK(p);
-	td->td_sigmask = ucp->uc_sigmask;
-	SIG_CANTMASK(td->td_sigmask);
-	signotify(td);
-	PROC_UNLOCK(p);
+	kern_sigprocmask(td, SIG_SETMASK, &ucp->uc_sigmask, NULL, 0);
 	td->td_pcb->pcb_full_iret = 1;
 	return (EJUSTRETURN);
 }

==== //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_machdep.c#16 (text+ko) ====

@@ -29,7 +29,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.53 2009/04/01 13:09:26 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.54 2009/10/28 20:17:54 jhb Exp $");
 
 #include 
 #include 
@@ -91,6 +91,10 @@
 	return (bsa);
 }
 
+static int	linux_mmap_common(struct thread *td, l_uintptr_t addr,
+		    l_size_t len, l_int prot, l_int flags, l_int fd,
+		    l_loff_t pos);
+
 int
 bsd_to_linux_sigaltstack(int bsa)
 {
@@ -759,12 +763,9 @@
 #define STACK_SIZE  (2 * 1024 * 1024)
 #define GUARD_SIZE  (4 * PAGE_SIZE)
 
-static int linux_mmap_common(struct thread *, struct l_mmap_argv *);
-
 int
 linux_mmap2(struct thread *td, struct linux_mmap2_args *args)
 {
-	struct l_mmap_argv linux_args;
 
 #ifdef DEBUG
 	if (ldebug(mmap2))
@@ -773,14 +774,9 @@
 		    args->flags, args->fd, args->pgoff);
 #endif
 
-	linux_args.addr = PTROUT(args->addr);
-	linux_args.len = args->len;
-	linux_args.prot = args->prot;
-	linux_args.flags = args->flags;
-	linux_args.fd = args->fd;
-	linux_args.pgoff = args->pgoff;
-
-	return (linux_mmap_common(td, &linux_args));
+	return (linux_mmap_common(td, PTROUT(args->addr), args->len, args->prot,
+		args->flags, args->fd, (uint64_t)(uint32_t)args->pgoff *
+		PAGE_SIZE));
 }
 
 int
@@ -799,15 +795,15 @@
 		    linux_args.addr, linux_args.len, linux_args.prot,
 		    linux_args.flags, linux_args.fd, linux_args.pgoff);
 #endif
-	if ((linux_args.pgoff % PAGE_SIZE) != 0)
-		return (EINVAL);
-	linux_args.pgoff /= PAGE_SIZE;
 
-	return (linux_mmap_common(td, &linux_args));
+	return (linux_mmap_common(td, linux_args.addr, linux_args.len,
+	    linux_args.prot, linux_args.flags, linux_args.fd,
+	    (uint32_t)linux_args.pgoff));
 }
 
 static int
-linux_mmap_common(struct thread *td, struct l_mmap_argv *linux_args)
+linux_mmap_common(struct thread *td, l_uintptr_t addr, l_size_t len, l_int prot,
+    l_int flags, l_int fd, l_loff_t pos)
 {
 	struct proc *p = td->td_proc;
 	struct mmap_args /* {
@@ -830,21 +826,20 @@
 	 * Linux mmap(2):
 	 * You must specify exactly one of MAP_SHARED and MAP_PRIVATE
 	 */
-	if (! ((linux_args->flags & LINUX_MAP_SHARED) ^
-	    (linux_args->flags & LINUX_MAP_PRIVATE)))
+	if (!((flags & LINUX_MAP_SHARED) ^ (flags & LINUX_MAP_PRIVATE)))
 		return (EINVAL);
 
-	if (linux_args->flags & LINUX_MAP_SHARED)
+	if (flags & LINUX_MAP_SHARED)
 		bsd_args.flags |= MAP_SHARED;
-	if (linux_args->flags & LINUX_MAP_PRIVATE)
+	if (flags & LINUX_MAP_PRIVATE)
 		bsd_args.flags |= MAP_PRIVATE;
-	if (linux_args->flags & LINUX_MAP_FIXED)
+	if (flags & LINUX_MAP_FIXED)
 		bsd_args.flags |= MAP_FIXED;
-	if (linux_args->flags & LINUX_MAP_ANON)
+	if (flags & LINUX_MAP_ANON)
 		bsd_args.flags |= MAP_ANON;
 	else
 		bsd_args.flags |= MAP_NOSYNC;
-	if (linux_args->flags & LINUX_MAP_GROWSDOWN)
+	if (flags & LINUX_MAP_GROWSDOWN)
 		bsd_args.flags |= MAP_STACK;
 
 	/*
@@ -852,12 +847,12 @@
 	 * on Linux/i386. We do this to ensure maximum compatibility.
 	 * Linux/ia64 does the same in i386 emulation mode.
 	 */
-	bsd_args.prot = linux_args->prot;
+	bsd_args.prot = prot;
 	if (bsd_args.prot & (PROT_READ | PROT_WRITE | PROT_EXEC))
 		bsd_args.prot |= PROT_READ | PROT_EXEC;
 
 	/* Linux does not check file descriptor when MAP_ANONYMOUS is set. */
-	bsd_args.fd = (bsd_args.flags & MAP_ANON) ? -1 : linux_args->fd;
+	bsd_args.fd = (bsd_args.flags & MAP_ANON) ? -1 : fd;
 	if (bsd_args.fd != -1) {
 		/*
 		 * Linux follows Solaris mmap(2) description:
@@ -882,7 +877,7 @@
 		fdrop(fp, td);
 	}
 
-	if (linux_args->flags & LINUX_MAP_GROWSDOWN) {
+	if (flags & LINUX_MAP_GROWSDOWN) {
 		/*
 		 * The Linux MAP_GROWSDOWN option does not limit auto
 		 * growth of the region.  Linux mmap with this option
@@ -905,8 +900,7 @@
 		 * fixed size of (STACK_SIZE - GUARD_SIZE).
 		 */
 
-		if ((caddr_t)PTRIN(linux_args->addr) + linux_args->len >
-		    p->p_vmspace->vm_maxsaddr) {
+		if ((caddr_t)PTRIN(addr) + len > p->p_vmspace->vm_maxsaddr) {
 			/*
 			 * Some Linux apps will attempt to mmap
 			 * thread stacks near the top of their
@@ -937,19 +931,19 @@
 		 * we map the full stack, since we don't have a way
 		 * to autogrow it.
 		 */
-		if (linux_args->len > STACK_SIZE - GUARD_SIZE) {
-			bsd_args.addr = (caddr_t)PTRIN(linux_args->addr);
-			bsd_args.len = linux_args->len;
+		if (len > STACK_SIZE - GUARD_SIZE) {
+			bsd_args.addr = (caddr_t)PTRIN(addr);
+			bsd_args.len = len;
 		} else {
-			bsd_args.addr = (caddr_t)PTRIN(linux_args->addr) -
-			    (STACK_SIZE - GUARD_SIZE - linux_args->len);
+			bsd_args.addr = (caddr_t)PTRIN(addr) -
+			    (STACK_SIZE - GUARD_SIZE - len);
 			bsd_args.len = STACK_SIZE - GUARD_SIZE;
 		}
 	} else {
-		bsd_args.addr = (caddr_t)PTRIN(linux_args->addr);
-		bsd_args.len  = linux_args->len;
+		bsd_args.addr = (caddr_t)PTRIN(addr);
+		bsd_args.len  = len;
 	}
-	bsd_args.pos = (off_t)linux_args->pgoff * PAGE_SIZE;
+	bsd_args.pos = pos;
 
 #ifdef DEBUG
 	if (ldebug(mmap))

==== //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_sysvec.c#18 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.53 2009/08/24 16:19:47 bz Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.54 2009/10/27 10:47:58 kib Exp $");
 #include "opt_compat.h"
 
 #ifndef COMPAT_IA32
@@ -565,9 +565,9 @@
 int
 linux_sigreturn(struct thread *td, struct linux_sigreturn_args *args)
 {
-	struct proc *p = td->td_proc;
 	struct l_sigframe frame;
 	struct trapframe *regs;
+	sigset_t bmask;
 	l_sigset_t lmask;
 	int eflags, i;
 	ksiginfo_t ksi;
@@ -623,11 +623,8 @@
 	lmask.__bits[0] = frame.sf_sc.sc_mask;
 	for (i = 0; i < (LINUX_NSIG_WORDS-1); i++)
 		lmask.__bits[i+1] = frame.sf_extramask[i];
-	PROC_LOCK(p);
-	linux_to_bsd_sigset(&lmask, &td->td_sigmask);
-	SIG_CANTMASK(td->td_sigmask);
-	signotify(td);
-	PROC_UNLOCK(p);
+	linux_to_bsd_sigset(&lmask, &bmask);
+	kern_sigprocmask(td, SIG_SETMASK, &bmask, NULL, 0);
 
 	/*
 	 * Restore signal context.
@@ -666,9 +663,9 @@
 int
 linux_rt_sigreturn(struct thread *td, struct linux_rt_sigreturn_args *args)
 {
-	struct proc *p = td->td_proc;
 	struct l_ucontext uc;
 	struct l_sigcontext *context;
+	sigset_t bmask;
 	l_stack_t *lss;
 	stack_t ss;
 	struct trapframe *regs;
@@ -725,11 +722,8 @@
 		return(EINVAL);
 	}
 
-	PROC_LOCK(p);
-	linux_to_bsd_sigset(&uc.uc_sigmask, &td->td_sigmask);
-	SIG_CANTMASK(td->td_sigmask);
-	signotify(td);
-	PROC_UNLOCK(p);
+	linux_to_bsd_sigset(&uc.uc_sigmask, &bmask);
+	kern_sigprocmask(td, SIG_SETMASK, &bmask, NULL, 0);
 
 	/*
 	 * Restore signal context

==== //depot/projects/scottl-camlock/src/sys/arm/arm/machdep.c#13 (text+ko) ====

@@ -46,7 +46,7 @@
 #include "opt_ddb.h"
 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.33 2009/05/18 18:37:18 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.34 2009/10/27 10:47:58 kib Exp $");
 
 #include 
 #include 
@@ -605,7 +605,6 @@
 		const struct __ucontext *sigcntxp;
 	} */ *uap;
 {
-	struct proc *p = td->td_proc;
 	struct sigframe sf;
 	struct trapframe *tf;
 	int spsr;
@@ -627,11 +626,7 @@
 	set_mcontext(td, &sf.sf_uc.uc_mcontext);
 
 	/* Restore signal mask. */
-	PROC_LOCK(p);
-	td->td_sigmask = sf.sf_uc.uc_sigmask;
-	SIG_CANTMASK(td->td_sigmask);
-	signotify(td);
-	PROC_UNLOCK(p);
+	kern_sigprocmask(td, SIG_SETMASK, &sf.sf_uc.uc_sigmask, NULL, 0);
 
 	return (EJUSTRETURN);
 }

==== //depot/projects/scottl-camlock/src/sys/boot/common/commands.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/boot/common/commands.c,v 1.22 2004/11/13 17:04:55 ru Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/common/commands.c,v 1.23 2009/10/28 10:06:27 brueffer Exp $");
 
 #include 
 #include 
@@ -150,6 +150,7 @@
 	break;
     default:
 	command_errmsg = "usage is 'help  []";
+	close(hfd);
 	return(CMD_ERROR);
     }
 

==== //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_misc.c#22 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.94 2009/09/09 20:59:01 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.97 2009/10/27 10:55:34 kib Exp $");
 
 #include "opt_compat.h"
 #include "opt_inet.h"
@@ -593,6 +593,41 @@
 	    sizeof(int32_t) * 8));
 }
 
+int
+freebsd32_pselect(struct thread *td, struct freebsd32_pselect_args *uap)
+{
+	struct timespec32 ts32;
+	struct timespec ts;
+	struct timeval tv, *tvp;
+	sigset_t set, *uset;

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Thu Oct 29 12:43:29 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7AFE01065679; Thu, 29 Oct 2009 12:43:29 +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 3D9491065670
	for ; Thu, 29 Oct 2009 12:43:29 +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 28DC28FC17
	for ; Thu, 29 Oct 2009 12:43:29 +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 n9TChSSO069044
	for ; Thu, 29 Oct 2009 12:43:28 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9TChIji069034
	for perforce@freebsd.org; Thu, 29 Oct 2009 12:43:18 GMT
	(envelope-from jhb@freebsd.org)
Date: Thu, 29 Oct 2009 12:43:18 GMT
Message-Id: <200910291243.n9TChIji069034@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 169915 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, 29 Oct 2009 12:43:29 -0000

http://p4web.freebsd.org/chv.cgi?CH=169915

Change 169915 by jhb@jhb_jhbbsd on 2009/10/29 12:42:35

	IFC @169914

Affected files ...

.. //depot/projects/multipass/share/man/man9/BUS_BIND_INTR.9#1 branch
.. //depot/projects/multipass/share/man/man9/BUS_DESCRIBE_INTR.9#1 branch
.. //depot/projects/multipass/share/man/man9/Makefile#2 integrate
.. //depot/projects/multipass/share/man/man9/fetch.9#2 integrate
.. //depot/projects/multipass/share/man/man9/get_cyclecount.9#2 integrate
.. //depot/projects/multipass/share/man/man9/store.9#2 integrate
.. //depot/projects/multipass/sys/amd64/acpica/acpi_machdep.c#5 integrate
.. //depot/projects/multipass/sys/amd64/acpica/acpi_wakecode.S#2 integrate
.. //depot/projects/multipass/sys/amd64/acpica/acpi_wakeup.c#4 integrate
.. //depot/projects/multipass/sys/amd64/acpica/madt.c#4 integrate
.. //depot/projects/multipass/sys/amd64/amd64/elf_machdep.c#3 integrate
.. //depot/projects/multipass/sys/amd64/amd64/identcpu.c#5 integrate
.. //depot/projects/multipass/sys/amd64/amd64/initcpu.c#4 integrate
.. //depot/projects/multipass/sys/amd64/amd64/intr_machdep.c#4 integrate
.. //depot/projects/multipass/sys/amd64/amd64/local_apic.c#6 integrate
.. //depot/projects/multipass/sys/amd64/amd64/machdep.c#8 integrate
.. //depot/projects/multipass/sys/amd64/amd64/mp_machdep.c#5 integrate
.. //depot/projects/multipass/sys/amd64/amd64/msi.c#5 integrate
.. //depot/projects/multipass/sys/amd64/amd64/nexus.c#3 integrate
.. //depot/projects/multipass/sys/amd64/amd64/pmap.c#9 integrate
.. //depot/projects/multipass/sys/amd64/amd64/trap.c#4 integrate
.. //depot/projects/multipass/sys/amd64/conf/GENERIC#8 integrate
.. //depot/projects/multipass/sys/amd64/conf/NOTES#5 integrate
.. //depot/projects/multipass/sys/amd64/conf/XENHVM#3 integrate
.. //depot/projects/multipass/sys/amd64/ia32/ia32_signal.c#4 integrate
.. //depot/projects/multipass/sys/amd64/include/_align.h#1 branch
.. //depot/projects/multipass/sys/amd64/include/acpica_machdep.h#2 integrate
.. //depot/projects/multipass/sys/amd64/include/apicvar.h#4 integrate
.. //depot/projects/multipass/sys/amd64/include/apm_bios.h#1 branch
.. //depot/projects/multipass/sys/amd64/include/atomic.h#3 integrate
.. //depot/projects/multipass/sys/amd64/include/cpufunc.h#4 integrate
.. //depot/projects/multipass/sys/amd64/include/elf.h#3 integrate
.. //depot/projects/multipass/sys/amd64/include/intr_machdep.h#4 integrate
.. //depot/projects/multipass/sys/amd64/include/param.h#5 integrate
.. //depot/projects/multipass/sys/amd64/include/pmc_mdep.h#3 integrate
.. //depot/projects/multipass/sys/amd64/include/smp.h#4 integrate
.. //depot/projects/multipass/sys/amd64/include/specialreg.h#4 integrate
.. //depot/projects/multipass/sys/amd64/linux32/linux32_machdep.c#3 integrate
.. //depot/projects/multipass/sys/amd64/linux32/linux32_proto.h#3 integrate
.. //depot/projects/multipass/sys/amd64/linux32/linux32_sysvec.c#5 integrate
.. //depot/projects/multipass/sys/amd64/pci/pci_cfgreg.c#4 integrate
.. //depot/projects/multipass/sys/arm/arm/cpufunc.c#5 integrate
.. //depot/projects/multipass/sys/arm/arm/elf_machdep.c#4 integrate
.. //depot/projects/multipass/sys/arm/arm/identcpu.c#3 integrate
.. //depot/projects/multipass/sys/arm/arm/machdep.c#4 integrate
.. //depot/projects/multipass/sys/arm/arm/minidump_machdep.c#2 integrate
.. //depot/projects/multipass/sys/arm/arm/pmap.c#8 integrate
.. //depot/projects/multipass/sys/arm/arm/undefined.c#2 integrate
.. //depot/projects/multipass/sys/arm/arm/vm_machdep.c#5 integrate
.. //depot/projects/multipass/sys/arm/at91/uart_dev_at91usart.c#3 integrate
.. //depot/projects/multipass/sys/arm/conf/CAMBRIA#4 integrate
.. //depot/projects/multipass/sys/arm/conf/HL200#4 integrate
.. //depot/projects/multipass/sys/arm/conf/KB920X#4 integrate
.. //depot/projects/multipass/sys/arm/conf/SHEEVAPLUG#1 branch
.. //depot/projects/multipass/sys/arm/include/_align.h#1 branch
.. //depot/projects/multipass/sys/arm/include/elf.h#3 integrate
.. //depot/projects/multipass/sys/arm/include/md_var.h#2 integrate
.. //depot/projects/multipass/sys/arm/include/param.h#4 integrate
.. //depot/projects/multipass/sys/arm/mv/common.c#5 integrate
.. //depot/projects/multipass/sys/arm/mv/discovery/db78xxx.c#4 integrate
.. //depot/projects/multipass/sys/arm/mv/kirkwood/db88f6xxx.c#4 integrate
.. //depot/projects/multipass/sys/arm/mv/kirkwood/files.db88f6xxx#2 integrate
.. //depot/projects/multipass/sys/arm/mv/kirkwood/files.kirkwood#1 branch
.. //depot/projects/multipass/sys/arm/mv/kirkwood/files.sheevaplug#1 branch
.. //depot/projects/multipass/sys/arm/mv/kirkwood/sheevaplug.c#1 branch
.. //depot/projects/multipass/sys/arm/mv/kirkwood/std.db88f6xxx#2 integrate
.. //depot/projects/multipass/sys/arm/mv/kirkwood/std.kirkwood#1 branch
.. //depot/projects/multipass/sys/arm/mv/kirkwood/std.sheevaplug#1 branch
.. //depot/projects/multipass/sys/arm/mv/mv_machdep.c#5 integrate
.. //depot/projects/multipass/sys/arm/mv/mvreg.h#5 integrate
.. //depot/projects/multipass/sys/arm/mv/mvvar.h#3 integrate
.. //depot/projects/multipass/sys/arm/mv/orion/db88f5xxx.c#4 integrate
.. //depot/projects/multipass/sys/arm/xscale/i80321/i80321_timer.c#2 integrate
.. //depot/projects/multipass/sys/arm/xscale/ixp425/ixdp425_pci.c#2 integrate
.. //depot/projects/multipass/sys/arm/xscale/xscalereg.h#2 delete
.. //depot/projects/multipass/sys/arm/xscale/xscalevar.h#2 delete
.. //depot/projects/multipass/sys/boot/common/commands.c#2 integrate
.. //depot/projects/multipass/sys/boot/forth/loader.conf#7 integrate
.. //depot/projects/multipass/sys/boot/i386/gptboot/gptboot.c#2 integrate
.. //depot/projects/multipass/sys/boot/i386/libi386/pxe.c#2 integrate
.. //depot/projects/multipass/sys/boot/i386/zfsboot/zfsboot.c#4 integrate
.. //depot/projects/multipass/sys/boot/pc98/Makefile.inc#2 integrate
.. //depot/projects/multipass/sys/boot/zfs/zfs.c#3 integrate
.. //depot/projects/multipass/sys/boot/zfs/zfsimpl.c#4 integrate
.. //depot/projects/multipass/sys/bsm/audit_kevents.h#6 integrate
.. //depot/projects/multipass/sys/cam/ata/ata_all.c#2 integrate
.. //depot/projects/multipass/sys/cam/ata/ata_all.h#2 integrate
.. //depot/projects/multipass/sys/cam/ata/ata_da.c#3 integrate
.. //depot/projects/multipass/sys/cam/ata/ata_pmp.c#1 branch
.. //depot/projects/multipass/sys/cam/ata/ata_xpt.c#3 integrate
.. //depot/projects/multipass/sys/cam/cam.h#3 integrate
.. //depot/projects/multipass/sys/cam/cam_ccb.h#3 integrate
.. //depot/projects/multipass/sys/cam/cam_periph.c#6 integrate
.. //depot/projects/multipass/sys/cam/cam_queue.c#2 integrate
.. //depot/projects/multipass/sys/cam/cam_queue.h#2 integrate
.. //depot/projects/multipass/sys/cam/cam_xpt.c#4 integrate
.. //depot/projects/multipass/sys/cam/cam_xpt_internal.h#2 integrate
.. //depot/projects/multipass/sys/cam/scsi/scsi_all.c#4 integrate
.. //depot/projects/multipass/sys/cam/scsi/scsi_cd.c#4 integrate
.. //depot/projects/multipass/sys/cam/scsi/scsi_ch.c#4 integrate
.. //depot/projects/multipass/sys/cam/scsi/scsi_da.c#4 integrate
.. //depot/projects/multipass/sys/cam/scsi/scsi_low.c#3 integrate
.. //depot/projects/multipass/sys/cam/scsi/scsi_pt.c#4 integrate
.. //depot/projects/multipass/sys/cam/scsi/scsi_sa.c#5 integrate
.. //depot/projects/multipass/sys/cam/scsi/scsi_targ_bh.c#2 integrate
.. //depot/projects/multipass/sys/cam/scsi/scsi_target.c#4 integrate
.. //depot/projects/multipass/sys/cam/scsi/scsi_xpt.c#3 integrate
.. //depot/projects/multipass/sys/cddl/boot/zfs/zfsimpl.h#4 integrate
.. //depot/projects/multipass/sys/cddl/compat/opensolaris/kern/opensolaris.c#5 integrate
.. //depot/projects/multipass/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#4 integrate
.. //depot/projects/multipass/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#4 integrate
.. //depot/projects/multipass/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c#1 branch
.. //depot/projects/multipass/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#4 integrate
.. //depot/projects/multipass/sys/cddl/compat/opensolaris/rpc/xdr.h#2 integrate
.. //depot/projects/multipass/sys/cddl/compat/opensolaris/sys/mutex.h#4 integrate
.. //depot/projects/multipass/sys/cddl/compat/opensolaris/sys/policy.h#2 integrate
.. //depot/projects/multipass/sys/cddl/compat/opensolaris/sys/proc.h#2 integrate
.. //depot/projects/multipass/sys/cddl/compat/opensolaris/sys/taskq.h#2 delete
.. //depot/projects/multipass/sys/cddl/compat/opensolaris/sys/taskq_impl.h#2 delete
.. //depot/projects/multipass/sys/cddl/compat/opensolaris/sys/vfs.h#2 integrate
.. //depot/projects/multipass/sys/cddl/compat/opensolaris/sys/vnode.h#5 integrate
.. //depot/projects/multipass/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#3 integrate
.. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#3 integrate
.. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c#3 integrate
.. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#5 integrate
.. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#4 integrate
.. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#2 integrate
.. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 integrate
.. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#2 integrate
.. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 integrate
.. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#2 integrate
.. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#2 integrate
.. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#2 integrate
.. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#2 integrate
.. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 integrate
.. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#3 integrate
.. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 integrate
.. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate
.. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 integrate
.. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#4 integrate
.. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 integrate
.. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#4 integrate
.. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#4 integrate
.. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#7 integrate
.. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 integrate
.. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 integrate
.. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c#2 delete
.. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr.c#2 delete
.. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_array.c#2 delete
.. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_mem.c#2 delete
.. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#3 delete
.. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#2 integrate
.. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/sys/taskq.h#1 branch
.. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#3 integrate
.. //depot/projects/multipass/sys/compat/freebsd32/freebsd32_misc.c#7 integrate
.. //depot/projects/multipass/sys/compat/freebsd32/freebsd32_proto.h#7 integrate
.. //depot/projects/multipass/sys/compat/freebsd32/freebsd32_syscall.h#7 integrate
.. //depot/projects/multipass/sys/compat/freebsd32/freebsd32_syscalls.c#7 integrate
.. //depot/projects/multipass/sys/compat/freebsd32/freebsd32_sysent.c#8 integrate
.. //depot/projects/multipass/sys/compat/freebsd32/syscalls.master#7 integrate
.. //depot/projects/multipass/sys/compat/ia32/ia32_sysvec.c#3 integrate
.. //depot/projects/multipass/sys/compat/linprocfs/linprocfs.c#6 integrate
.. //depot/projects/multipass/sys/compat/linux/linux_ioctl.c#8 integrate
.. //depot/projects/multipass/sys/compat/linux/linux_misc.c#6 integrate
.. //depot/projects/multipass/sys/compat/linux/linux_socket.c#6 integrate
.. //depot/projects/multipass/sys/compat/svr4/svr4_proto.h#3 integrate
.. //depot/projects/multipass/sys/compat/svr4/svr4_sockio.c#6 integrate
.. //depot/projects/multipass/sys/compat/x86bios/x86bios.c#1 branch
.. //depot/projects/multipass/sys/compat/x86bios/x86bios.h#1 branch
.. //depot/projects/multipass/sys/conf/NOTES#9 integrate
.. //depot/projects/multipass/sys/conf/files#9 integrate
.. //depot/projects/multipass/sys/conf/files.amd64#5 integrate
.. //depot/projects/multipass/sys/conf/files.i386#6 integrate
.. //depot/projects/multipass/sys/conf/files.ia64#3 integrate
.. //depot/projects/multipass/sys/conf/files.pc98#4 integrate
.. //depot/projects/multipass/sys/conf/files.powerpc#6 integrate
.. //depot/projects/multipass/sys/conf/files.sparc64#3 integrate
.. //depot/projects/multipass/sys/conf/newvers.sh#5 integrate
.. //depot/projects/multipass/sys/conf/options#9 integrate
.. //depot/projects/multipass/sys/conf/options.amd64#3 integrate
.. //depot/projects/multipass/sys/conf/options.arm#3 integrate
.. //depot/projects/multipass/sys/conf/options.i386#3 integrate
.. //depot/projects/multipass/sys/conf/options.pc98#3 integrate
.. //depot/projects/multipass/sys/contrib/altq/altq/altq_subr.c#7 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/acpica_prep.sh#3 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/changes.txt#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/common/adfile.c#3 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/common/adisasm.c#3 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/common/adwalk.c#3 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/common/dmextern.c#1 branch
.. //depot/projects/multipass/sys/contrib/dev/acpica/common/dmrestag.c#3 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/common/dmtable.c#3 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/common/dmtbdump.c#3 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/common/dmtbinfo.c#3 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/common/getopt.c#3 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/compiler/aslcompiler.h#3 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/compiler/aslcompiler.l#3 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/compiler/aslcompiler.y#3 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/compiler/asldefine.h#3 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/compiler/aslfiles.c#3 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/compiler/aslglobal.h#3 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/compiler/aslload.c#3 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/compiler/asllookup.c#3 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/compiler/aslmain.c#3 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/compiler/aslmap.c#3 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/compiler/aslstubs.c#3 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/compiler/asltypes.h#3 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/debugger/dbcmds.c#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/debugger/dbdisply.c#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/debugger/dbexec.c#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/debugger/dbinput.c#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/disassembler/dmutils.c#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/disassembler/dmwalk.c#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/dispatcher/dsfield.c#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/dispatcher/dsmethod.c#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/dispatcher/dsobject.c#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/dispatcher/dswload.c#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/events/evgpe.c#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/events/evgpeblk.c#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/events/evregion.c#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/events/evrgnini.c#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/executer/exconfig.c#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/executer/exfield.c#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/executer/exfldio.c#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/executer/exstorob.c#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/executer/exutils.c#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/hardware/hwgpe.c#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/hardware/hwregs.c#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/hardware/hwsleep.c#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/hardware/hwtimer.c#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/hardware/hwxface.c#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/include/acapps.h#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/include/acconfig.h#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/include/acdebug.h#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/include/acdisasm.h#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/include/acglobal.h#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/include/achware.h#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/include/acinterp.h#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/include/aclocal.h#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/include/acmacros.h#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/include/acnamesp.h#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/include/acobject.h#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/include/acparser.h#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/include/acpixf.h#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/include/acpredef.h#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/include/actbl.h#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/include/actbl1.h#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/include/actbl2.h#1 branch
.. //depot/projects/multipass/sys/contrib/dev/acpica/include/actypes.h#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/include/acutils.h#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/include/amlcode.h#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/namespace/nsalloc.c#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/namespace/nseval.c#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/namespace/nsinit.c#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/namespace/nsload.c#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/namespace/nspredef.c#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/namespace/nsrepair.c#1 branch
.. //depot/projects/multipass/sys/contrib/dev/acpica/namespace/nsxfeval.c#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/namespace/nsxfname.c#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/parser/psloop.c#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/parser/psxface.c#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/tables/tbutils.c#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/utilities/uteval.c#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/utilities/utglobal.c#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/utilities/utids.c#1 branch
.. //depot/projects/multipass/sys/contrib/dev/acpica/utilities/utinit.c#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/utilities/utmisc.c#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/acpica/utilities/utxface.c#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/iwn/LICENSE#2 integrate
.. //depot/projects/multipass/sys/contrib/dev/iwn/iwlwifi-4965-228.57.2.23.fw.uu#1 branch
.. //depot/projects/multipass/sys/contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu#2 delete
.. //depot/projects/multipass/sys/contrib/dev/iwn/iwlwifi-5000-5.4.A.11.fw.uu#1 branch
.. //depot/projects/multipass/sys/contrib/dev/iwn/iwlwifi-5150-8.24.2.2.fw.uu#1 branch
.. //depot/projects/multipass/sys/contrib/ipfilter/netinet/fil.c#2 integrate
.. //depot/projects/multipass/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#6 integrate
.. //depot/projects/multipass/sys/contrib/pf/net/pf.c#6 integrate
.. //depot/projects/multipass/sys/contrib/pf/net/pf_if.c#6 integrate
.. //depot/projects/multipass/sys/contrib/pf/net/pf_ioctl.c#7 integrate
.. //depot/projects/multipass/sys/contrib/pf/net/pf_subr.c#4 integrate
.. //depot/projects/multipass/sys/contrib/pf/net/pfvar.h#3 integrate
.. //depot/projects/multipass/sys/contrib/rdma/rdma_cma.c#5 integrate
.. //depot/projects/multipass/sys/contrib/x86emu/x86emu.c#1 branch
.. //depot/projects/multipass/sys/contrib/x86emu/x86emu.h#1 branch
.. //depot/projects/multipass/sys/contrib/x86emu/x86emu_regs.h#1 branch
.. //depot/projects/multipass/sys/ddb/db_ps.c#2 integrate
.. //depot/projects/multipass/sys/ddb/db_sym.c#3 integrate
.. //depot/projects/multipass/sys/dev/aac/aac.c#4 integrate
.. //depot/projects/multipass/sys/dev/aac/aac_cam.c#2 integrate
.. //depot/projects/multipass/sys/dev/aac/aacvar.h#3 integrate
.. //depot/projects/multipass/sys/dev/acpi_support/acpi_aiboost.c#3 integrate
.. //depot/projects/multipass/sys/dev/acpi_support/acpi_ibm.c#4 integrate
.. //depot/projects/multipass/sys/dev/acpica/acpi.c#7 integrate
.. //depot/projects/multipass/sys/dev/acpica/acpi_acad.c#3 integrate
.. //depot/projects/multipass/sys/dev/acpica/acpi_battery.c#4 integrate
.. //depot/projects/multipass/sys/dev/acpica/acpi_cpu.c#6 integrate
.. //depot/projects/multipass/sys/dev/acpica/acpi_dock.c#3 integrate
.. //depot/projects/multipass/sys/dev/acpica/acpi_pcib_acpi.c#7 integrate
.. //depot/projects/multipass/sys/dev/acpica/acpi_thermal.c#3 integrate
.. //depot/projects/multipass/sys/dev/acpica/acpi_video.c#3 integrate
.. //depot/projects/multipass/sys/dev/acpica/acpivar.h#4 integrate
.. //depot/projects/multipass/sys/dev/adb/adb_bus.c#3 integrate
.. //depot/projects/multipass/sys/dev/ae/if_ae.c#4 integrate
.. //depot/projects/multipass/sys/dev/age/if_age.c#5 integrate
.. //depot/projects/multipass/sys/dev/agp/agp_i810.c#3 integrate
.. //depot/projects/multipass/sys/dev/ahci/ahci.c#2 integrate
.. //depot/projects/multipass/sys/dev/ahci/ahci.h#2 integrate
.. //depot/projects/multipass/sys/dev/aic7xxx/aicasm/aicasm.c#3 integrate
.. //depot/projects/multipass/sys/dev/alc/if_alc.c#3 integrate
.. //depot/projects/multipass/sys/dev/ale/if_ale.c#4 integrate
.. //depot/projects/multipass/sys/dev/amdtemp/amdtemp.c#2 integrate
.. //depot/projects/multipass/sys/dev/amr/amr.c#3 integrate
.. //depot/projects/multipass/sys/dev/asmc/asmc.c#5 integrate
.. //depot/projects/multipass/sys/dev/asmc/asmcvar.h#3 integrate
.. //depot/projects/multipass/sys/dev/ata/ata-all.c#5 integrate
.. //depot/projects/multipass/sys/dev/ata/ata-disk.c#4 integrate
.. //depot/projects/multipass/sys/dev/ata/ata-dma.c#4 integrate
.. //depot/projects/multipass/sys/dev/ata/ata-pci.h#6 integrate
.. //depot/projects/multipass/sys/dev/ata/ata-queue.c#4 integrate
.. //depot/projects/multipass/sys/dev/ata/ata-raid.c#3 integrate
.. //depot/projects/multipass/sys/dev/ata/atapi-cam.c#5 integrate
.. //depot/projects/multipass/sys/dev/ata/atapi-cd.c#4 integrate
.. //depot/projects/multipass/sys/dev/ata/atapi-fd.c#3 integrate
.. //depot/projects/multipass/sys/dev/ata/atapi-tape.c#4 integrate
.. //depot/projects/multipass/sys/dev/ata/chipsets/ata-acerlabs.c#5 integrate
.. //depot/projects/multipass/sys/dev/ata/chipsets/ata-ati.c#4 integrate
.. //depot/projects/multipass/sys/dev/ata/chipsets/ata-marvell.c#5 integrate
.. //depot/projects/multipass/sys/dev/ata/chipsets/ata-nvidia.c#5 integrate
.. //depot/projects/multipass/sys/dev/ata/chipsets/ata-via.c#4 integrate
.. //depot/projects/multipass/sys/dev/ath/ah_osdep.c#5 integrate
.. //depot/projects/multipass/sys/dev/ath/ath_hal/ah.c#4 integrate
.. //depot/projects/multipass/sys/dev/ath/ath_hal/ah_eeprom_v3.c#2 integrate
.. //depot/projects/multipass/sys/dev/ath/ath_hal/ah_eeprom_v4k.c#1 branch
.. //depot/projects/multipass/sys/dev/ath/ath_hal/ah_eeprom_v4k.h#1 branch
.. //depot/projects/multipass/sys/dev/ath/ath_hal/ah_regdomain.c#2 integrate
.. //depot/projects/multipass/sys/dev/ath/if_ath.c#8 integrate
.. //depot/projects/multipass/sys/dev/atkbdc/atkbd.c#3 integrate
.. //depot/projects/multipass/sys/dev/atkbdc/psm.c#3 integrate
.. //depot/projects/multipass/sys/dev/bce/if_bce.c#6 integrate
.. //depot/projects/multipass/sys/dev/bce/if_bcereg.h#5 integrate
.. //depot/projects/multipass/sys/dev/bge/if_bge.c#6 integrate
.. //depot/projects/multipass/sys/dev/bge/if_bgereg.h#3 integrate
.. //depot/projects/multipass/sys/dev/bktr/bktr_os.c#3 integrate
.. //depot/projects/multipass/sys/dev/ciss/ciss.c#7 integrate
.. //depot/projects/multipass/sys/dev/ciss/cissreg.h#2 integrate
.. //depot/projects/multipass/sys/dev/ciss/cissvar.h#4 integrate
.. //depot/projects/multipass/sys/dev/coretemp/coretemp.c#3 integrate
.. //depot/projects/multipass/sys/dev/cxgb/common/cxgb_ael1002.c#4 integrate
.. //depot/projects/multipass/sys/dev/cxgb/common/cxgb_aq100x.c#1 branch
.. //depot/projects/multipass/sys/dev/cxgb/common/cxgb_common.h#4 integrate
.. //depot/projects/multipass/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#2 integrate
.. //depot/projects/multipass/sys/dev/cxgb/common/cxgb_regs.h#2 integrate
.. //depot/projects/multipass/sys/dev/cxgb/common/cxgb_t3_hw.c#4 integrate
.. //depot/projects/multipass/sys/dev/cxgb/common/cxgb_tn1010.c#2 integrate
.. //depot/projects/multipass/sys/dev/cxgb/common/cxgb_vsc8211.c#2 integrate
.. //depot/projects/multipass/sys/dev/cxgb/common/cxgb_xgmac.c#3 integrate
.. //depot/projects/multipass/sys/dev/cxgb/cxgb_adapter.h#6 integrate
.. //depot/projects/multipass/sys/dev/cxgb/cxgb_main.c#6 integrate
.. //depot/projects/multipass/sys/dev/cxgb/cxgb_osdep.h#4 integrate
.. //depot/projects/multipass/sys/dev/cxgb/cxgb_sge.c#7 integrate
.. //depot/projects/multipass/sys/dev/cxgb/cxgb_t3fw.h#3 integrate
.. //depot/projects/multipass/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#6 integrate
.. //depot/projects/multipass/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#7 integrate
.. //depot/projects/multipass/sys/dev/de/if_de.c#4 integrate
.. //depot/projects/multipass/sys/dev/de/if_devar.h#2 integrate
.. //depot/projects/multipass/sys/dev/dpms/dpms.c#1 branch
.. //depot/projects/multipass/sys/dev/drm/drmP.h#4 integrate
.. //depot/projects/multipass/sys/dev/drm/drm_bufs.c#4 integrate
.. //depot/projects/multipass/sys/dev/drm/drm_drv.c#5 integrate
.. //depot/projects/multipass/sys/dev/drm/drm_fops.c#2 integrate
.. //depot/projects/multipass/sys/dev/drm/drm_pciids.h#4 integrate
.. //depot/projects/multipass/sys/dev/drm/drm_sysctl.c#4 integrate
.. //depot/projects/multipass/sys/dev/drm/i915_drv.h#5 integrate
.. //depot/projects/multipass/sys/dev/drm/mach64_state.c#2 integrate
.. //depot/projects/multipass/sys/dev/drm/r600_blit.c#1 branch
.. //depot/projects/multipass/sys/dev/drm/r600_cp.c#3 integrate
.. //depot/projects/multipass/sys/dev/drm/radeon_cp.c#4 integrate
.. //depot/projects/multipass/sys/dev/drm/radeon_cs.c#1 branch
.. //depot/projects/multipass/sys/dev/drm/radeon_drm.h#3 integrate
.. //depot/projects/multipass/sys/dev/drm/radeon_drv.h#4 integrate
.. //depot/projects/multipass/sys/dev/drm/radeon_irq.c#4 integrate
.. //depot/projects/multipass/sys/dev/drm/radeon_state.c#3 integrate
.. //depot/projects/multipass/sys/dev/e1000/if_em.c#7 integrate
.. //depot/projects/multipass/sys/dev/e1000/if_igb.c#7 integrate
.. //depot/projects/multipass/sys/dev/ep/if_ep.c#4 integrate
.. //depot/projects/multipass/sys/dev/ep/if_epreg.h#3 integrate
.. //depot/projects/multipass/sys/dev/fb/s3_pci.c#3 integrate
.. //depot/projects/multipass/sys/dev/fb/vesa.c#1 branch
.. //depot/projects/multipass/sys/dev/fb/vesa.h#1 branch
.. //depot/projects/multipass/sys/dev/fb/vga.c#2 integrate
.. //depot/projects/multipass/sys/dev/fdc/fdc.c#3 integrate
.. //depot/projects/multipass/sys/dev/firewire/fwcrom.c#2 integrate
.. //depot/projects/multipass/sys/dev/firewire/fwdev.c#3 integrate
.. //depot/projects/multipass/sys/dev/fxp/if_fxp.c#7 integrate
.. //depot/projects/multipass/sys/dev/gem/if_gem_pci.c#3 integrate
.. //depot/projects/multipass/sys/dev/hptiop/hptiop.c#2 integrate
.. //depot/projects/multipass/sys/dev/hptrr/hptrr_osm_bsd.c#2 integrate
.. //depot/projects/multipass/sys/dev/hwpmc/hwpmc_core.c#2 integrate
.. //depot/projects/multipass/sys/dev/hwpmc/hwpmc_mod.c#4 integrate
.. //depot/projects/multipass/sys/dev/hwpmc/hwpmc_piv.c#3 integrate
.. //depot/projects/multipass/sys/dev/hwpmc/hwpmc_ppro.c#3 integrate
.. //depot/projects/multipass/sys/dev/hwpmc/hwpmc_x86.c#3 integrate
.. //depot/projects/multipass/sys/dev/hwpmc/pmc_events.h#3 integrate
.. //depot/projects/multipass/sys/dev/ichwd/ichwd.c#3 integrate
.. //depot/projects/multipass/sys/dev/if_ndis/if_ndis.c#8 integrate
.. //depot/projects/multipass/sys/dev/iir/iir.c#3 integrate
.. //depot/projects/multipass/sys/dev/ips/ips_disk.c#2 integrate
.. //depot/projects/multipass/sys/dev/ips/ips_pci.c#2 integrate
.. //depot/projects/multipass/sys/dev/iscsi/initiator/isc_cam.c#3 integrate
.. //depot/projects/multipass/sys/dev/isp/isp.c#3 integrate
.. //depot/projects/multipass/sys/dev/isp/isp_freebsd.c#3 integrate
.. //depot/projects/multipass/sys/dev/isp/isp_freebsd.h#3 integrate
.. //depot/projects/multipass/sys/dev/isp/isp_ioctl.h#2 integrate
.. //depot/projects/multipass/sys/dev/isp/isp_library.c#2 integrate
.. //depot/projects/multipass/sys/dev/isp/isp_library.h#2 integrate
.. //depot/projects/multipass/sys/dev/isp/isp_pci.c#2 integrate
.. //depot/projects/multipass/sys/dev/isp/isp_sbus.c#2 integrate
.. //depot/projects/multipass/sys/dev/isp/isp_stds.h#2 integrate
.. //depot/projects/multipass/sys/dev/isp/isp_target.c#2 integrate
.. //depot/projects/multipass/sys/dev/isp/isp_target.h#2 integrate
.. //depot/projects/multipass/sys/dev/isp/isp_tpublic.h#2 delete
.. //depot/projects/multipass/sys/dev/isp/ispmbox.h#2 integrate
.. //depot/projects/multipass/sys/dev/isp/ispreg.h#2 integrate
.. //depot/projects/multipass/sys/dev/isp/ispvar.h#2 integrate
.. //depot/projects/multipass/sys/dev/ispfw/asm_2300.h#2 integrate
.. //depot/projects/multipass/sys/dev/ispfw/asm_2400.h#2 integrate
.. //depot/projects/multipass/sys/dev/ispfw/asm_2500.h#1 branch
.. //depot/projects/multipass/sys/dev/ispfw/ispfw.c#2 integrate
.. //depot/projects/multipass/sys/dev/iwn/if_iwn.c#6 integrate
.. //depot/projects/multipass/sys/dev/iwn/if_iwnreg.h#2 integrate
.. //depot/projects/multipass/sys/dev/iwn/if_iwnvar.h#4 integrate
.. //depot/projects/multipass/sys/dev/ixgbe/ixgbe.c#5 integrate
.. //depot/projects/multipass/sys/dev/jme/if_jme.c#4 integrate
.. //depot/projects/multipass/sys/dev/kbd/kbd.c#3 integrate
.. //depot/projects/multipass/sys/dev/lindev/full.c#1 branch
.. //depot/projects/multipass/sys/dev/lindev/lindev.c#1 branch
.. //depot/projects/multipass/sys/dev/lindev/lindev.h#1 branch
.. //depot/projects/multipass/sys/dev/mfi/mfi.c#6 integrate
.. //depot/projects/multipass/sys/dev/mfi/mfi_ioctl.h#2 integrate
.. //depot/projects/multipass/sys/dev/mfi/mfireg.h#2 integrate
.. //depot/projects/multipass/sys/dev/mge/if_mge.c#7 integrate
.. //depot/projects/multipass/sys/dev/mii/e1000phy.c#3 integrate
.. //depot/projects/multipass/sys/dev/mii/e1000phyreg.h#3 integrate
.. //depot/projects/multipass/sys/dev/mlx/mlx.c#4 integrate
.. //depot/projects/multipass/sys/dev/mmc/mmc.c#3 integrate
.. //depot/projects/multipass/sys/dev/mpt/mpt.c#3 integrate
.. //depot/projects/multipass/sys/dev/mpt/mpt.h#4 integrate
.. //depot/projects/multipass/sys/dev/mpt/mpt_cam.c#4 integrate
.. //depot/projects/multipass/sys/dev/mpt/mpt_raid.c#4 integrate
.. //depot/projects/multipass/sys/dev/msk/if_msk.c#5 integrate
.. //depot/projects/multipass/sys/dev/msk/if_mskreg.h#4 integrate
.. //depot/projects/multipass/sys/dev/mwl/if_mwl.c#3 integrate
.. //depot/projects/multipass/sys/dev/mwl/if_mwl_pci.c#2 integrate
.. //depot/projects/multipass/sys/dev/mxge/if_mxge.c#8 integrate
.. //depot/projects/multipass/sys/dev/mxge/if_mxge_var.h#7 integrate
.. //depot/projects/multipass/sys/dev/null/null.c#2 integrate
.. //depot/projects/multipass/sys/dev/pccbb/pccbb.c#3 integrate
.. //depot/projects/multipass/sys/dev/pci/pci.c#9 integrate
.. //depot/projects/multipass/sys/dev/pci/pci_user.c#3 integrate
.. //depot/projects/multipass/sys/dev/pci/pcireg.h#4 integrate
.. //depot/projects/multipass/sys/dev/pci/pcivar.h#3 integrate
.. //depot/projects/multipass/sys/dev/pci/vga_pci.c#4 integrate
.. //depot/projects/multipass/sys/dev/ppbus/lpt.c#3 integrate
.. //depot/projects/multipass/sys/dev/ppbus/pcfclock.c#3 integrate
.. //depot/projects/multipass/sys/dev/ppbus/vpo.c#3 integrate
.. //depot/projects/multipass/sys/dev/pst/pst-iop.c#2 integrate
.. //depot/projects/multipass/sys/dev/pty/pty.c#1 branch
.. //depot/projects/multipass/sys/dev/re/if_re.c#7 integrate
.. //depot/projects/multipass/sys/dev/rp/rp.c#4 integrate
.. //depot/projects/multipass/sys/dev/rp/rp_pci.c#3 integrate
.. //depot/projects/multipass/sys/dev/siis/siis.c#2 integrate
.. //depot/projects/multipass/sys/dev/snp/snp.c#4 integrate
.. //depot/projects/multipass/sys/dev/sound/pci/es137x.c#3 integrate
.. //depot/projects/multipass/sys/dev/sound/pci/es137x.h#2 integrate
.. //depot/projects/multipass/sys/dev/sound/pci/hda/hda_reg.h#2 integrate
.. //depot/projects/multipass/sys/dev/sound/pci/hda/hdac.c#6 integrate
.. //depot/projects/multipass/sys/dev/sound/pci/hda/hdac_private.h#3 integrate
.. //depot/projects/multipass/sys/dev/sound/pci/hda/hdac_reg.h#2 integrate
.. //depot/projects/multipass/sys/dev/sound/pci/t4dwave.c#3 integrate
.. //depot/projects/multipass/sys/dev/sound/usb/uaudio.c#7 integrate
.. //depot/projects/multipass/sys/dev/syscons/daemon/daemon_saver.c#4 integrate
.. //depot/projects/multipass/sys/dev/syscons/scmouse.c#2 integrate
.. //depot/projects/multipass/sys/dev/syscons/scterm-teken.c#4 integrate
.. //depot/projects/multipass/sys/dev/syscons/scvesactl.c#2 integrate
.. //depot/projects/multipass/sys/dev/syscons/scvgarndr.c#2 integrate
.. //depot/projects/multipass/sys/dev/syscons/scvidctl.c#2 integrate
.. //depot/projects/multipass/sys/dev/syscons/syscons.c#5 integrate
.. //depot/projects/multipass/sys/dev/syscons/syscons.h#3 integrate
.. //depot/projects/multipass/sys/dev/syscons/teken/Makefile#2 delete
.. //depot/projects/multipass/sys/dev/syscons/teken/gensequences#2 delete
.. //depot/projects/multipass/sys/dev/syscons/teken/sequences#3 delete
.. //depot/projects/multipass/sys/dev/syscons/teken/teken.c#4 delete
.. //depot/projects/multipass/sys/dev/syscons/teken/teken.h#3 delete
.. //depot/projects/multipass/sys/dev/syscons/teken/teken_demo.c#3 delete
.. //depot/projects/multipass/sys/dev/syscons/teken/teken_scs.h#2 delete
.. //depot/projects/multipass/sys/dev/syscons/teken/teken_stress.c#3 delete
.. //depot/projects/multipass/sys/dev/syscons/teken/teken_subr.h#2 delete
.. //depot/projects/multipass/sys/dev/syscons/teken/teken_subr_compat.h#3 delete
.. //depot/projects/multipass/sys/dev/syscons/teken/teken_wcwidth.h#2 delete
.. //depot/projects/multipass/sys/dev/twa/tw_cl_io.c#2 integrate
.. //depot/projects/multipass/sys/dev/twa/tw_cl_share.h#2 integrate
.. //depot/projects/multipass/sys/dev/twe/twe.c#2 integrate
.. //depot/projects/multipass/sys/dev/twe/twevar.h#2 integrate
.. //depot/projects/multipass/sys/dev/txp/if_txp.c#4 integrate
.. //depot/projects/multipass/sys/dev/uart/uart_bus.h#2 integrate
.. //depot/projects/multipass/sys/dev/uart/uart_core.c#2 integrate
.. //depot/projects/multipass/sys/dev/uart/uart_tty.c#4 integrate
.. //depot/projects/multipass/sys/dev/usb/controller/atmegadci.c#7 integrate
.. //depot/projects/multipass/sys/dev/usb/controller/ehci.c#6 integrate
.. //depot/projects/multipass/sys/dev/usb/controller/ehci.h#4 integrate
.. //depot/projects/multipass/sys/dev/usb/controller/ehci_ixp4xx.c#3 integrate
.. //depot/projects/multipass/sys/dev/usb/controller/ehci_mbus.c#3 integrate
.. //depot/projects/multipass/sys/dev/usb/controller/ehci_pci.c#4 integrate
.. //depot/projects/multipass/sys/dev/usb/controller/ehcireg.h#1 branch
.. //depot/projects/multipass/sys/dev/usb/controller/ohci.c#6 integrate
.. //depot/projects/multipass/sys/dev/usb/controller/ohci.h#4 integrate
.. //depot/projects/multipass/sys/dev/usb/controller/ohci_atmelarm.c#3 integrate
.. //depot/projects/multipass/sys/dev/usb/controller/ohci_pci.c#4 integrate
.. //depot/projects/multipass/sys/dev/usb/controller/ohcireg.h#1 branch
.. //depot/projects/multipass/sys/dev/usb/controller/uhci.c#6 integrate
.. //depot/projects/multipass/sys/dev/usb/controller/uhci.h#4 integrate
.. //depot/projects/multipass/sys/dev/usb/controller/uhci_pci.c#4 integrate
.. //depot/projects/multipass/sys/dev/usb/controller/uhcireg.h#1 branch
.. //depot/projects/multipass/sys/dev/usb/controller/usb_controller.c#6 integrate
.. //depot/projects/multipass/sys/dev/usb/input/ukbd.c#5 integrate
.. //depot/projects/multipass/sys/dev/usb/input/ums.c#5 integrate
.. //depot/projects/multipass/sys/dev/usb/misc/ufm.c#4 integrate
.. //depot/projects/multipass/sys/dev/usb/net/if_aue.c#6 integrate
.. //depot/projects/multipass/sys/dev/usb/net/if_axe.c#6 integrate
.. //depot/projects/multipass/sys/dev/usb/net/if_cdce.c#6 integrate
.. //depot/projects/multipass/sys/dev/usb/net/if_cdcereg.h#3 integrate
.. //depot/projects/multipass/sys/dev/usb/net/usb_ethernet.c#5 integrate
.. //depot/projects/multipass/sys/dev/usb/quirk/usb_quirk.c#4 integrate
.. //depot/projects/multipass/sys/dev/usb/serial/u3g.c#6 integrate
.. //depot/projects/multipass/sys/dev/usb/serial/uark.c#4 integrate
.. //depot/projects/multipass/sys/dev/usb/serial/ubsa.c#4 integrate
.. //depot/projects/multipass/sys/dev/usb/serial/ubser.c#4 integrate
.. //depot/projects/multipass/sys/dev/usb/serial/uchcom.c#4 integrate
.. //depot/projects/multipass/sys/dev/usb/serial/ucycom.c#4 integrate
.. //depot/projects/multipass/sys/dev/usb/serial/ufoma.c#4 integrate
.. //depot/projects/multipass/sys/dev/usb/serial/uftdi.c#5 integrate
.. //depot/projects/multipass/sys/dev/usb/serial/ugensa.c#4 integrate
.. //depot/projects/multipass/sys/dev/usb/serial/uipaq.c#4 integrate
.. //depot/projects/multipass/sys/dev/usb/serial/umct.c#4 integrate
.. //depot/projects/multipass/sys/dev/usb/serial/umodem.c#4 integrate
.. //depot/projects/multipass/sys/dev/usb/serial/umoscom.c#4 integrate
.. //depot/projects/multipass/sys/dev/usb/serial/uplcom.c#4 integrate
.. //depot/projects/multipass/sys/dev/usb/serial/usb_serial.c#5 integrate
.. //depot/projects/multipass/sys/dev/usb/serial/usb_serial.h#4 integrate
.. //depot/projects/multipass/sys/dev/usb/serial/uslcom.c#4 integrate
.. //depot/projects/multipass/sys/dev/usb/serial/uvisor.c#4 integrate
.. //depot/projects/multipass/sys/dev/usb/serial/uvscom.c#4 integrate
.. //depot/projects/multipass/sys/dev/usb/storage/umass.c#6 integrate
.. //depot/projects/multipass/sys/dev/usb/storage/urio.c#4 integrate
.. //depot/projects/multipass/sys/dev/usb/usb.h#5 integrate
.. //depot/projects/multipass/sys/dev/usb/usb_bus.h#5 integrate
.. //depot/projects/multipass/sys/dev/usb/usb_busdma.c#5 integrate
.. //depot/projects/multipass/sys/dev/usb/usb_cdc.h#3 integrate
.. //depot/projects/multipass/sys/dev/usb/usb_compat_linux.c#6 integrate
.. //depot/projects/multipass/sys/dev/usb/usb_dev.c#6 integrate
.. //depot/projects/multipass/sys/dev/usb/usb_device.c#7 integrate
.. //depot/projects/multipass/sys/dev/usb/usb_device.h#5 integrate
.. //depot/projects/multipass/sys/dev/usb/usb_handle_request.c#7 integrate
.. //depot/projects/multipass/sys/dev/usb/usb_hub.c#6 integrate
.. //depot/projects/multipass/sys/dev/usb/usb_process.c#4 integrate
.. //depot/projects/multipass/sys/dev/usb/usb_process.h#4 integrate
.. //depot/projects/multipass/sys/dev/usb/usb_transfer.c#7 integrate
.. //depot/projects/multipass/sys/dev/usb/usbdevs#7 integrate
.. //depot/projects/multipass/sys/dev/usb/wlan/if_rum.c#5 integrate
.. //depot/projects/multipass/sys/dev/usb/wlan/if_rumreg.h#2 integrate
.. //depot/projects/multipass/sys/dev/usb/wlan/if_uath.c#6 integrate
.. //depot/projects/multipass/sys/dev/usb/wlan/if_upgt.c#5 integrate
.. //depot/projects/multipass/sys/dev/usb/wlan/if_ural.c#5 integrate
.. //depot/projects/multipass/sys/dev/usb/wlan/if_urtw.c#4 integrate
.. //depot/projects/multipass/sys/dev/usb/wlan/if_urtwreg.h#2 integrate
.. //depot/projects/multipass/sys/dev/usb/wlan/if_urtwvar.h#2 integrate
.. //depot/projects/multipass/sys/dev/usb/wlan/if_zyd.c#7 integrate
.. //depot/projects/multipass/sys/dev/wi/if_wi.c#7 integrate
.. //depot/projects/multipass/sys/dev/xen/blkback/blkback.c#3 integrate
.. //depot/projects/multipass/sys/dev/xen/blkfront/blkfront.c#4 integrate
.. //depot/projects/multipass/sys/dev/xen/console/console.c#5 integrate
.. //depot/projects/multipass/sys/dev/xen/netback/netback.c#3 integrate
.. //depot/projects/multipass/sys/fs/fifofs/fifo_vnops.c#5 integrate
.. //depot/projects/multipass/sys/fs/msdosfs/msdosfs_conv.c#3 integrate
.. //depot/projects/multipass/sys/fs/nfs/nfs_commonacl.c#3 integrate
.. //depot/projects/multipass/sys/fs/nfs/nfsport.h#5 integrate
.. //depot/projects/multipass/sys/fs/nfsclient/nfs_clnode.c#3 integrate
.. //depot/projects/multipass/sys/fs/nfsclient/nfs_clport.c#4 integrate
.. //depot/projects/multipass/sys/fs/nfsclient/nfs_clstate.c#7 integrate
.. //depot/projects/multipass/sys/fs/nfsclient/nfs_clsubs.c#2 integrate
.. //depot/projects/multipass/sys/fs/nfsclient/nfs_clvnops.c#7 integrate
.. //depot/projects/multipass/sys/fs/procfs/procfs.c#3 integrate
.. //depot/projects/multipass/sys/fs/procfs/procfs.h#2 integrate
.. //depot/projects/multipass/sys/fs/procfs/procfs_osrel.c#1 branch
.. //depot/projects/multipass/sys/fs/pseudofs/pseudofs_vncache.c#4 integrate
.. //depot/projects/multipass/sys/fs/pseudofs/pseudofs_vnops.c#6 integrate
.. //depot/projects/multipass/sys/fs/smbfs/smbfs_vfsops.c#3 integrate
.. //depot/projects/multipass/sys/fs/tmpfs/tmpfs.h#4 integrate
.. //depot/projects/multipass/sys/fs/tmpfs/tmpfs_subr.c#5 integrate
.. //depot/projects/multipass/sys/fs/tmpfs/tmpfs_vnops.c#6 integrate
.. //depot/projects/multipass/sys/fs/unionfs/union_subr.c#4 integrate
.. //depot/projects/multipass/sys/geom/concat/g_concat.c#3 integrate
.. //depot/projects/multipass/sys/geom/geom_dev.c#4 integrate
.. //depot/projects/multipass/sys/geom/geom_disk.c#3 integrate
.. //depot/projects/multipass/sys/geom/geom_io.c#4 integrate
.. //depot/projects/multipass/sys/geom/geom_vfs.c#4 integrate
.. //depot/projects/multipass/sys/geom/label/g_label.c#5 integrate
.. //depot/projects/multipass/sys/geom/mirror/g_mirror_ctl.c#2 integrate
.. //depot/projects/multipass/sys/geom/multipath/g_multipath.c#2 integrate
.. //depot/projects/multipass/sys/geom/part/g_part.c#5 integrate
.. //depot/projects/multipass/sys/geom/part/g_part_ebr.c#3 integrate
.. //depot/projects/multipass/sys/geom/part/g_part_gpt.c#3 integrate
.. //depot/projects/multipass/sys/geom/shsec/g_shsec.c#2 integrate
.. //depot/projects/multipass/sys/geom/stripe/g_stripe.c#2 integrate
.. //depot/projects/multipass/sys/geom/uzip/g_uzip.c#2 integrate
.. //depot/projects/multipass/sys/geom/vinum/geom_vinum_create.c#3 integrate
.. //depot/projects/multipass/sys/geom/vinum/geom_vinum_events.c#3 integrate
.. //depot/projects/multipass/sys/geom/vinum/geom_vinum_init.c#3 integrate
.. //depot/projects/multipass/sys/geom/vinum/geom_vinum_move.c#3 integrate
.. //depot/projects/multipass/sys/geom/vinum/geom_vinum_rm.c#4 integrate
.. //depot/projects/multipass/sys/geom/vinum/geom_vinum_subr.c#4 integrate
.. //depot/projects/multipass/sys/i386/acpica/acpi_machdep.c#5 integrate
.. //depot/projects/multipass/sys/i386/acpica/madt.c#4 integrate
.. //depot/projects/multipass/sys/i386/bios/smapi.c#4 integrate
.. //depot/projects/multipass/sys/i386/bios/smbios.c#3 integrate
.. //depot/projects/multipass/sys/i386/bios/vpd.c#3 integrate
.. //depot/projects/multipass/sys/i386/conf/GENERIC#8 integrate
.. //depot/projects/multipass/sys/i386/conf/NOTES#6 integrate
.. //depot/projects/multipass/sys/i386/cpufreq/hwpstate.c#4 integrate
.. //depot/projects/multipass/sys/i386/i386/elf_machdep.c#4 integrate
.. //depot/projects/multipass/sys/i386/i386/identcpu.c#4 integrate
.. //depot/projects/multipass/sys/i386/i386/initcpu.c#4 integrate
.. //depot/projects/multipass/sys/i386/i386/intr_machdep.c#4 integrate
.. //depot/projects/multipass/sys/i386/i386/local_apic.c#6 integrate
.. //depot/projects/multipass/sys/i386/i386/machdep.c#7 integrate
.. //depot/projects/multipass/sys/i386/i386/mp_machdep.c#5 integrate
.. //depot/projects/multipass/sys/i386/i386/msi.c#5 integrate
.. //depot/projects/multipass/sys/i386/i386/nexus.c#3 integrate
.. //depot/projects/multipass/sys/i386/i386/pmap.c#9 integrate
.. //depot/projects/multipass/sys/i386/i386/trap.c#4 integrate
.. //depot/projects/multipass/sys/i386/i386/vm_machdep.c#4 integrate
.. //depot/projects/multipass/sys/i386/ibcs2/ibcs2_proto.h#3 integrate
.. //depot/projects/multipass/sys/i386/include/_align.h#1 branch
.. //depot/projects/multipass/sys/i386/include/acpica_machdep.h#2 integrate
.. //depot/projects/multipass/sys/i386/include/apicvar.h#5 integrate
.. //depot/projects/multipass/sys/i386/include/apm_bios.h#2 integrate
.. //depot/projects/multipass/sys/i386/include/atomic.h#3 integrate
.. //depot/projects/multipass/sys/i386/include/cpufunc.h#5 integrate
.. //depot/projects/multipass/sys/i386/include/elf.h#3 integrate
.. //depot/projects/multipass/sys/i386/include/intr_machdep.h#4 integrate
.. //depot/projects/multipass/sys/i386/include/param.h#4 integrate
.. //depot/projects/multipass/sys/i386/include/pc/vesa.h#2 delete
.. //depot/projects/multipass/sys/i386/include/pcpu.h#2 integrate
.. //depot/projects/multipass/sys/i386/include/pmap.h#6 integrate
.. //depot/projects/multipass/sys/i386/include/pmc_mdep.h#3 integrate
.. //depot/projects/multipass/sys/i386/include/smp.h#3 integrate
.. //depot/projects/multipass/sys/i386/include/specialreg.h#5 integrate
.. //depot/projects/multipass/sys/i386/include/xen/xen-os.h#3 integrate
.. //depot/projects/multipass/sys/i386/isa/dpms.c#2 delete
.. //depot/projects/multipass/sys/i386/isa/vesa.c#3 delete
.. //depot/projects/multipass/sys/i386/linux/linux_machdep.c#4 integrate
.. //depot/projects/multipass/sys/i386/linux/linux_proto.h#2 integrate
.. //depot/projects/multipass/sys/i386/linux/linux_sysvec.c#4 integrate
.. //depot/projects/multipass/sys/i386/pci/pci_cfgreg.c#4 integrate
.. //depot/projects/multipass/sys/i386/xen/locore.s#2 integrate
.. //depot/projects/multipass/sys/i386/xen/mp_machdep.c#6 integrate
.. //depot/projects/multipass/sys/i386/xen/pmap.c#7 integrate
.. //depot/projects/multipass/sys/i386/xen/xen_machdep.c#3 integrate
.. //depot/projects/multipass/sys/ia64/conf/GENERIC#5 integrate
.. //depot/projects/multipass/sys/ia64/ia64/elf_machdep.c#5 integrate
.. //depot/projects/multipass/sys/ia64/ia64/genassym.c#2 integrate
.. //depot/projects/multipass/sys/ia64/ia64/interrupt.c#2 integrate
.. //depot/projects/multipass/sys/ia64/ia64/machdep.c#4 integrate
.. //depot/projects/multipass/sys/ia64/ia64/mp_machdep.c#5 integrate
.. //depot/projects/multipass/sys/ia64/ia64/pmap.c#6 integrate
.. //depot/projects/multipass/sys/ia64/include/_align.h#1 branch
.. //depot/projects/multipass/sys/ia64/include/asm.h#2 integrate
.. //depot/projects/multipass/sys/ia64/include/elf.h#3 integrate
.. //depot/projects/multipass/sys/ia64/include/param.h#4 integrate
.. //depot/projects/multipass/sys/ia64/include/smp.h#2 integrate
.. //depot/projects/multipass/sys/isa/isahint.c#2 integrate
.. //depot/projects/multipass/sys/kern/bus_if.m#4 integrate
.. //depot/projects/multipass/sys/kern/imgact_elf.c#3 integrate
.. //depot/projects/multipass/sys/kern/init_main.c#6 integrate
.. //depot/projects/multipass/sys/kern/init_sysent.c#6 integrate
.. //depot/projects/multipass/sys/kern/kern_conf.c#5 integrate
.. //depot/projects/multipass/sys/kern/kern_cons.c#3 integrate
.. //depot/projects/multipass/sys/kern/kern_context.c#2 integrate
.. //depot/projects/multipass/sys/kern/kern_cpuset.c#6 integrate
.. //depot/projects/multipass/sys/kern/kern_descrip.c#7 integrate
.. //depot/projects/multipass/sys/kern/kern_event.c#4 integrate
.. //depot/projects/multipass/sys/kern/kern_exec.c#7 integrate
.. //depot/projects/multipass/sys/kern/kern_exit.c#8 integrate
.. //depot/projects/multipass/sys/kern/kern_fork.c#8 integrate
.. //depot/projects/multipass/sys/kern/kern_intr.c#4 integrate
.. //depot/projects/multipass/sys/kern/kern_jail.c#9 integrate
.. //depot/projects/multipass/sys/kern/kern_kthread.c#2 integrate
.. //depot/projects/multipass/sys/kern/kern_ktrace.c#4 integrate
.. //depot/projects/multipass/sys/kern/kern_linker.c#7 integrate
.. //depot/projects/multipass/sys/kern/kern_lock.c#6 integrate
.. //depot/projects/multipass/sys/kern/kern_mib.c#6 integrate
.. //depot/projects/multipass/sys/kern/kern_mutex.c#4 integrate
.. //depot/projects/multipass/sys/kern/kern_poll.c#7 integrate
.. //depot/projects/multipass/sys/kern/kern_proc.c#6 integrate
.. //depot/projects/multipass/sys/kern/kern_rwlock.c#4 integrate
.. //depot/projects/multipass/sys/kern/kern_shutdown.c#5 integrate
.. //depot/projects/multipass/sys/kern/kern_sig.c#6 integrate
.. //depot/projects/multipass/sys/kern/kern_subr.c#2 integrate
.. //depot/projects/multipass/sys/kern/kern_sx.c#4 integrate
.. //depot/projects/multipass/sys/kern/kern_sysctl.c#7 integrate
.. //depot/projects/multipass/sys/kern/kern_thr.c#4 integrate
.. //depot/projects/multipass/sys/kern/kern_thread.c#4 integrate
.. //depot/projects/multipass/sys/kern/kern_timeout.c#3 integrate
.. //depot/projects/multipass/sys/kern/kern_umtx.c#3 integrate
.. //depot/projects/multipass/sys/kern/kern_uuid.c#7 integrate
.. //depot/projects/multipass/sys/kern/kern_vimage.c#6 delete
.. //depot/projects/multipass/sys/kern/sched_ule.c#5 integrate
.. //depot/projects/multipass/sys/kern/stack_protector.c#2 integrate
.. //depot/projects/multipass/sys/kern/subr_acl_nfs4.c#2 integrate
.. //depot/projects/multipass/sys/kern/subr_acl_posix1e.c#3 integrate
.. //depot/projects/multipass/sys/kern/subr_bus.c#10 integrate
.. //depot/projects/multipass/sys/kern/subr_devstat.c#3 integrate
.. //depot/projects/multipass/sys/kern/subr_kdb.c#3 integrate
.. //depot/projects/multipass/sys/kern/subr_pcpu.c#6 integrate
.. //depot/projects/multipass/sys/kern/subr_sglist.c#2 integrate
.. //depot/projects/multipass/sys/kern/subr_smp.c#4 integrate
.. //depot/projects/multipass/sys/kern/subr_taskqueue.c#3 integrate
.. //depot/projects/multipass/sys/kern/subr_trap.c#5 integrate
.. //depot/projects/multipass/sys/kern/subr_witness.c#5 integrate
.. //depot/projects/multipass/sys/kern/sys_generic.c#5 integrate
.. //depot/projects/multipass/sys/kern/sys_pipe.c#7 integrate
.. //depot/projects/multipass/sys/kern/sys_process.c#5 integrate
.. //depot/projects/multipass/sys/kern/sys_socket.c#5 integrate
.. //depot/projects/multipass/sys/kern/syscalls.c#5 integrate
.. //depot/projects/multipass/sys/kern/syscalls.master#5 integrate
.. //depot/projects/multipass/sys/kern/systrace_args.c#5 integrate
.. //depot/projects/multipass/sys/kern/sysv_shm.c#7 integrate
.. //depot/projects/multipass/sys/kern/tty.c#7 integrate
.. //depot/projects/multipass/sys/kern/tty_pts.c#7 integrate
.. //depot/projects/multipass/sys/kern/tty_pty.c#3 delete
.. //depot/projects/multipass/sys/kern/tty_ttydisc.c#4 integrate
.. //depot/projects/multipass/sys/kern/uipc_domain.c#5 integrate
.. //depot/projects/multipass/sys/kern/uipc_mqueue.c#6 integrate
.. //depot/projects/multipass/sys/kern/uipc_socket.c#8 integrate
.. //depot/projects/multipass/sys/kern/uipc_syscalls.c#7 integrate
.. //depot/projects/multipass/sys/kern/uipc_usrreq.c#6 integrate
.. //depot/projects/multipass/sys/kern/vfs_acl.c#5 integrate
.. //depot/projects/multipass/sys/kern/vfs_aio.c#5 integrate
.. //depot/projects/multipass/sys/kern/vfs_cache.c#6 integrate
.. //depot/projects/multipass/sys/kern/vfs_default.c#6 integrate
.. //depot/projects/multipass/sys/kern/vfs_export.c#6 integrate
.. //depot/projects/multipass/sys/kern/vfs_mount.c#7 integrate
.. //depot/projects/multipass/sys/kern/vfs_subr.c#7 integrate
.. //depot/projects/multipass/sys/kern/vfs_syscalls.c#9 integrate
.. //depot/projects/multipass/sys/kern/vfs_vnops.c#8 integrate
.. //depot/projects/multipass/sys/mips/include/_align.h#1 branch
.. //depot/projects/multipass/sys/mips/include/elf.h#3 integrate
.. //depot/projects/multipass/sys/mips/include/param.h#4 integrate
.. //depot/projects/multipass/sys/mips/include/smp.h#2 integrate
.. //depot/projects/multipass/sys/mips/mips/elf64_machdep.c#2 integrate
.. //depot/projects/multipass/sys/mips/mips/elf_machdep.c#4 integrate
.. //depot/projects/multipass/sys/mips/mips/mp_machdep.c#3 integrate
.. //depot/projects/multipass/sys/mips/mips/pm_machdep.c#3 integrate
.. //depot/projects/multipass/sys/mips/mips/pmap.c#7 integrate
.. //depot/projects/multipass/sys/modules/Makefile#9 integrate
.. //depot/projects/multipass/sys/modules/acpi/acpi/Makefile#5 integrate
.. //depot/projects/multipass/sys/modules/cam/Makefile#3 integrate
.. //depot/projects/multipass/sys/modules/cxgb/cxgb/Makefile#3 integrate
.. //depot/projects/multipass/sys/modules/dpms/Makefile#2 integrate
.. //depot/projects/multipass/sys/modules/drm/radeon/Makefile#3 integrate
.. //depot/projects/multipass/sys/modules/dtrace/lockstat/Makefile#2 integrate
.. //depot/projects/multipass/sys/modules/ispfw/Makefile#2 integrate
.. //depot/projects/multipass/sys/modules/ispfw/isp_2400_multi/Makefile#1 branch
.. //depot/projects/multipass/sys/modules/ispfw/isp_2500/Makefile#1 branch
.. //depot/projects/multipass/sys/modules/ispfw/isp_2500_multi/Makefile#1 branch
.. //depot/projects/multipass/sys/modules/iwnfw/Makefile#3 integrate
.. //depot/projects/multipass/sys/modules/iwnfw/Makefile.inc#1 branch
.. //depot/projects/multipass/sys/modules/iwnfw/iwn4965/Makefile#1 branch
.. //depot/projects/multipass/sys/modules/iwnfw/iwn5000/Makefile#1 branch
.. //depot/projects/multipass/sys/modules/iwnfw/iwn5150/Makefile#1 branch
.. //depot/projects/multipass/sys/modules/lindev/Makefile#1 branch
.. //depot/projects/multipass/sys/modules/nfsclient/Makefile#6 integrate
.. //depot/projects/multipass/sys/modules/nfslockd/Makefile#2 integrate
.. //depot/projects/multipass/sys/modules/pf/Makefile#5 integrate
.. //depot/projects/multipass/sys/modules/procfs/Makefile#2 integrate
.. //depot/projects/multipass/sys/modules/pty/Makefile#1 branch
.. //depot/projects/multipass/sys/modules/ubser/Makefile#2 integrate
.. //depot/projects/multipass/sys/modules/usb/Makefile#4 integrate
.. //depot/projects/multipass/sys/modules/usb/ucom/Makefile#2 integrate
.. //depot/projects/multipass/sys/modules/vesa/Makefile#2 integrate
.. //depot/projects/multipass/sys/modules/x86bios/Makefile#1 branch
.. //depot/projects/multipass/sys/modules/zfs/Makefile#4 integrate
.. //depot/projects/multipass/sys/net/bpf.c#6 integrate
.. //depot/projects/multipass/sys/net/bpf_buffer.c#2 integrate
.. //depot/projects/multipass/sys/net/bpf_zerocopy.c#3 integrate
.. //depot/projects/multipass/sys/net/bpfdesc.h#2 integrate
.. //depot/projects/multipass/sys/net/bridgestp.c#7 integrate
.. //depot/projects/multipass/sys/net/flowtable.c#5 integrate
.. //depot/projects/multipass/sys/net/flowtable.h#5 integrate
.. //depot/projects/multipass/sys/net/if.c#9 integrate
.. //depot/projects/multipass/sys/net/if_arp.h#2 integrate
.. //depot/projects/multipass/sys/net/if_bridge.c#8 integrate
.. //depot/projects/multipass/sys/net/if_clone.c#5 integrate
.. //depot/projects/multipass/sys/net/if_ef.c#7 integrate
.. //depot/projects/multipass/sys/net/if_enc.c#5 integrate
.. //depot/projects/multipass/sys/net/if_epair.c#3 integrate
.. //depot/projects/multipass/sys/net/if_ethersubr.c#8 integrate
.. //depot/projects/multipass/sys/net/if_faith.c#5 integrate
.. //depot/projects/multipass/sys/net/if_gif.c#7 integrate
.. //depot/projects/multipass/sys/net/if_gre.c#6 integrate
.. //depot/projects/multipass/sys/net/if_llatbl.c#4 integrate
.. //depot/projects/multipass/sys/net/if_llatbl.h#4 integrate
.. //depot/projects/multipass/sys/net/if_loop.c#7 integrate
.. //depot/projects/multipass/sys/net/if_mib.c#7 integrate
.. //depot/projects/multipass/sys/net/if_spppsubr.c#7 integrate
.. //depot/projects/multipass/sys/net/if_stf.c#8 integrate
.. //depot/projects/multipass/sys/net/if_tun.c#7 integrate
.. //depot/projects/multipass/sys/net/if_var.h#9 integrate
.. //depot/projects/multipass/sys/net/if_vlan.c#7 integrate
.. //depot/projects/multipass/sys/net/netisr.c#6 integrate
.. //depot/projects/multipass/sys/net/pfil.c#3 integrate
.. //depot/projects/multipass/sys/net/pfil.h#4 integrate
.. //depot/projects/multipass/sys/net/raw_cb.c#6 integrate
.. //depot/projects/multipass/sys/net/raw_usrreq.c#6 integrate
.. //depot/projects/multipass/sys/net/route.c#8 integrate
.. //depot/projects/multipass/sys/net/route.h#6 integrate
.. //depot/projects/multipass/sys/net/rtsock.c#8 integrate
.. //depot/projects/multipass/sys/net/vnet.c#2 integrate
.. //depot/projects/multipass/sys/net/vnet.h#8 integrate
.. //depot/projects/multipass/sys/net80211/ieee80211.c#9 integrate
.. //depot/projects/multipass/sys/net80211/ieee80211.h#7 integrate
.. //depot/projects/multipass/sys/net80211/ieee80211_action.c#2 integrate
.. //depot/projects/multipass/sys/net80211/ieee80211_ddb.c#9 integrate
.. //depot/projects/multipass/sys/net80211/ieee80211_dfs.c#4 integrate
.. //depot/projects/multipass/sys/net80211/ieee80211_freebsd.c#6 integrate
.. //depot/projects/multipass/sys/net80211/ieee80211_hwmp.c#3 integrate
.. //depot/projects/multipass/sys/net80211/ieee80211_input.c#6 integrate
.. //depot/projects/multipass/sys/net80211/ieee80211_mesh.c#3 integrate
.. //depot/projects/multipass/sys/net80211/ieee80211_mesh.h#3 integrate
.. //depot/projects/multipass/sys/net80211/ieee80211_output.c#7 integrate
.. //depot/projects/multipass/sys/net80211/ieee80211_proto.h#7 integrate
.. //depot/projects/multipass/sys/net80211/ieee80211_scan_sta.c#6 integrate
.. //depot/projects/multipass/sys/net80211/ieee80211_sta.c#7 integrate
.. //depot/projects/multipass/sys/netatalk/at_control.c#5 integrate
.. //depot/projects/multipass/sys/netgraph/NOTES#2 integrate
.. //depot/projects/multipass/sys/netgraph/atm/ng_atm.c#6 integrate
.. //depot/projects/multipass/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#2 integrate
.. //depot/projects/multipass/sys/netgraph/ng_base.c#7 integrate
.. //depot/projects/multipass/sys/netgraph/ng_bridge.c#3 integrate
.. //depot/projects/multipass/sys/netgraph/ng_eiface.c#7 integrate
.. //depot/projects/multipass/sys/netgraph/ng_ether.c#8 integrate
.. //depot/projects/multipass/sys/netgraph/ng_gif.c#5 integrate
.. //depot/projects/multipass/sys/netgraph/ng_iface.c#7 integrate
.. //depot/projects/multipass/sys/netgraph/ng_pipe.c#2 integrate
.. //depot/projects/multipass/sys/netgraph/ng_source.c#2 integrate
.. //depot/projects/multipass/sys/netinet/icmp6.h#5 integrate
.. //depot/projects/multipass/sys/netinet/icmp_var.h#4 integrate
.. //depot/projects/multipass/sys/netinet/if_ether.c#9 integrate
.. //depot/projects/multipass/sys/netinet/if_ether.h#3 integrate
.. //depot/projects/multipass/sys/netinet/igmp.c#8 integrate
.. //depot/projects/multipass/sys/netinet/in.c#9 integrate
.. //depot/projects/multipass/sys/netinet/in.h#4 integrate
.. //depot/projects/multipass/sys/netinet/in_gif.c#6 integrate
.. //depot/projects/multipass/sys/netinet/in_mcast.c#8 integrate
.. //depot/projects/multipass/sys/netinet/in_pcb.c#8 integrate
.. //depot/projects/multipass/sys/netinet/in_pcb.h#7 integrate
.. //depot/projects/multipass/sys/netinet/in_proto.c#7 integrate
.. //depot/projects/multipass/sys/netinet/in_rmx.c#8 integrate
.. //depot/projects/multipass/sys/netinet/ip_carp.c#7 integrate
.. //depot/projects/multipass/sys/netinet/ip_divert.c#8 integrate
.. //depot/projects/multipass/sys/netinet/ip_divert.h#2 integrate
.. //depot/projects/multipass/sys/netinet/ip_fastfwd.c#5 integrate
.. //depot/projects/multipass/sys/netinet/ip_fw.h#7 integrate
.. //depot/projects/multipass/sys/netinet/ip_icmp.c#8 integrate
.. //depot/projects/multipass/sys/netinet/ip_input.c#8 integrate
.. //depot/projects/multipass/sys/netinet/ip_ipsec.c#6 integrate
.. //depot/projects/multipass/sys/netinet/ip_mroute.c#7 integrate
.. //depot/projects/multipass/sys/netinet/ip_options.c#6 integrate
.. //depot/projects/multipass/sys/netinet/ip_output.c#7 integrate
.. //depot/projects/multipass/sys/netinet/ip_var.h#6 integrate
.. //depot/projects/multipass/sys/netinet/ipfw/ip_fw2.c#6 integrate
.. //depot/projects/multipass/sys/netinet/ipfw/ip_fw_nat.c#4 integrate
.. //depot/projects/multipass/sys/netinet/ipfw/ip_fw_pfil.c#4 integrate
.. //depot/projects/multipass/sys/netinet/libalias/alias.c#3 integrate
.. //depot/projects/multipass/sys/netinet/raw_ip.c#9 integrate
.. //depot/projects/multipass/sys/netinet/sctp_asconf.c#3 integrate
.. //depot/projects/multipass/sys/netinet/sctp_bsd_addr.c#3 integrate
.. //depot/projects/multipass/sys/netinet/sctp_cc_functions.c#2 integrate
.. //depot/projects/multipass/sys/netinet/sctp_indata.c#5 integrate
.. //depot/projects/multipass/sys/netinet/sctp_input.c#4 integrate
.. //depot/projects/multipass/sys/netinet/sctp_os_bsd.h#6 integrate
.. //depot/projects/multipass/sys/netinet/sctp_output.c#4 integrate
.. //depot/projects/multipass/sys/netinet/sctp_pcb.c#4 integrate
.. //depot/projects/multipass/sys/netinet/sctp_pcb.h#3 integrate
.. //depot/projects/multipass/sys/netinet/sctp_structs.h#4 integrate
.. //depot/projects/multipass/sys/netinet/sctp_sysctl.c#5 integrate
.. //depot/projects/multipass/sys/netinet/sctp_timer.c#3 integrate
.. //depot/projects/multipass/sys/netinet/sctp_usrreq.c#3 integrate
.. //depot/projects/multipass/sys/netinet/sctputil.c#5 integrate
.. //depot/projects/multipass/sys/netinet/sctputil.h#4 integrate
.. //depot/projects/multipass/sys/netinet/tcp_hostcache.c#7 integrate
.. //depot/projects/multipass/sys/netinet/tcp_input.c#6 integrate
.. //depot/projects/multipass/sys/netinet/tcp_offload.c#5 integrate
.. //depot/projects/multipass/sys/netinet/tcp_output.c#6 integrate
.. //depot/projects/multipass/sys/netinet/tcp_reass.c#5 integrate
.. //depot/projects/multipass/sys/netinet/tcp_sack.c#5 integrate
.. //depot/projects/multipass/sys/netinet/tcp_subr.c#7 integrate
.. //depot/projects/multipass/sys/netinet/tcp_syncache.c#7 integrate
.. //depot/projects/multipass/sys/netinet/tcp_timer.c#5 integrate
.. //depot/projects/multipass/sys/netinet/tcp_timer.h#2 integrate
.. //depot/projects/multipass/sys/netinet/tcp_timewait.c#6 integrate
.. //depot/projects/multipass/sys/netinet/tcp_usrreq.c#5 integrate
.. //depot/projects/multipass/sys/netinet/tcp_var.h#8 integrate
.. //depot/projects/multipass/sys/netinet/udp_usrreq.c#7 integrate
.. //depot/projects/multipass/sys/netinet/udp_var.h#6 integrate
.. //depot/projects/multipass/sys/netinet6/dest6.c#4 integrate
.. //depot/projects/multipass/sys/netinet6/frag6.c#6 integrate
.. //depot/projects/multipass/sys/netinet6/icmp6.c#8 integrate
.. //depot/projects/multipass/sys/netinet6/in6.c#9 integrate
.. //depot/projects/multipass/sys/netinet6/in6_gif.c#5 integrate
.. //depot/projects/multipass/sys/netinet6/in6_ifattach.c#9 integrate
.. //depot/projects/multipass/sys/netinet6/in6_mcast.c#5 integrate
.. //depot/projects/multipass/sys/netinet6/in6_pcb.c#8 integrate
.. //depot/projects/multipass/sys/netinet6/in6_proto.c#8 integrate
.. //depot/projects/multipass/sys/netinet6/in6_rmx.c#8 integrate
.. //depot/projects/multipass/sys/netinet6/in6_src.c#6 integrate
.. //depot/projects/multipass/sys/netinet6/ip6_forward.c#4 integrate
.. //depot/projects/multipass/sys/netinet6/ip6_input.c#9 integrate
.. //depot/projects/multipass/sys/netinet6/ip6_ipsec.c#5 integrate
.. //depot/projects/multipass/sys/netinet6/ip6_mroute.c#7 integrate
.. //depot/projects/multipass/sys/netinet6/ip6_output.c#8 integrate
.. //depot/projects/multipass/sys/netinet6/ip6_var.h#7 integrate
.. //depot/projects/multipass/sys/netinet6/mld6.c#7 integrate
.. //depot/projects/multipass/sys/netinet6/nd6.c#9 integrate
.. //depot/projects/multipass/sys/netinet6/nd6.h#6 integrate
.. //depot/projects/multipass/sys/netinet6/nd6_nbr.c#6 integrate
.. //depot/projects/multipass/sys/netinet6/nd6_rtr.c#9 integrate
.. //depot/projects/multipass/sys/netinet6/raw_ip6.c#7 integrate
.. //depot/projects/multipass/sys/netinet6/route6.c#5 integrate
.. //depot/projects/multipass/sys/netinet6/scope6.c#6 integrate
.. //depot/projects/multipass/sys/netinet6/sctp6_usrreq.c#3 integrate
.. //depot/projects/multipass/sys/netinet6/udp6_usrreq.c#7 integrate
.. //depot/projects/multipass/sys/netipsec/ipsec.c#7 integrate
.. //depot/projects/multipass/sys/netipsec/ipsec.h#5 integrate
.. //depot/projects/multipass/sys/netipsec/ipsec_input.c#6 integrate
.. //depot/projects/multipass/sys/netipsec/ipsec_mbuf.c#4 integrate
.. //depot/projects/multipass/sys/netipsec/ipsec_output.c#5 integrate
.. //depot/projects/multipass/sys/netipsec/key.c#8 integrate
.. //depot/projects/multipass/sys/netipsec/keysock.c#6 integrate
.. //depot/projects/multipass/sys/netipsec/xform_ah.c#4 integrate
.. //depot/projects/multipass/sys/netipsec/xform_esp.c#4 integrate
.. //depot/projects/multipass/sys/netipsec/xform_ipcomp.c#4 integrate
.. //depot/projects/multipass/sys/netipsec/xform_ipip.c#6 integrate
.. //depot/projects/multipass/sys/netipsec/xform_tcp.c#5 integrate
.. //depot/projects/multipass/sys/netsmb/smb_dev.c#2 integrate
.. //depot/projects/multipass/sys/nfsclient/bootp_subr.c#8 integrate
.. //depot/projects/multipass/sys/nfsclient/nfs_diskless.c#8 integrate
.. //depot/projects/multipass/sys/nfsclient/nfs_kdtrace.c#3 integrate
.. //depot/projects/multipass/sys/nfsclient/nfs_node.c#4 integrate
.. //depot/projects/multipass/sys/nfsclient/nfs_subs.c#5 integrate
.. //depot/projects/multipass/sys/nfsclient/nfs_vfsops.c#7 integrate
.. //depot/projects/multipass/sys/nfsclient/nfs_vnops.c#8 integrate
.. //depot/projects/multipass/sys/nfsserver/nfs_serv.c#5 integrate
.. //depot/projects/multipass/sys/nlm/nlm.h#3 integrate
.. //depot/projects/multipass/sys/nlm/nlm_prot_impl.c#5 integrate
.. //depot/projects/multipass/sys/nlm/nlm_prot_server.c#2 integrate
.. //depot/projects/multipass/sys/opencrypto/cryptodev.c#3 integrate
.. //depot/projects/multipass/sys/pc98/cbus/fdc.c#2 integrate
.. //depot/projects/multipass/sys/pc98/conf/GENERIC#6 integrate
.. //depot/projects/multipass/sys/pc98/conf/NOTES#4 integrate
.. //depot/projects/multipass/sys/pc98/include/_align.h#1 branch
.. //depot/projects/multipass/sys/pc98/include/pc/vesa.h#2 delete
.. //depot/projects/multipass/sys/pc98/pc98/machdep.c#5 integrate
.. //depot/projects/multipass/sys/pci/if_rlreg.h#5 integrate
.. //depot/projects/multipass/sys/pci/intpm.c#3 integrate
.. //depot/projects/multipass/sys/pci/intpmreg.h#2 integrate
.. //depot/projects/multipass/sys/powerpc/aim/clock.c#3 integrate
.. //depot/projects/multipass/sys/powerpc/aim/machdep.c#6 integrate
.. //depot/projects/multipass/sys/powerpc/aim/mmu_oea.c#5 integrate
.. //depot/projects/multipass/sys/powerpc/aim/mmu_oea64.c#5 integrate
.. //depot/projects/multipass/sys/powerpc/aim/mp_cpudep.c#4 integrate
.. //depot/projects/multipass/sys/powerpc/aim/platform_chrp.c#3 integrate
.. //depot/projects/multipass/sys/powerpc/aim/swtch.S#3 integrate
.. //depot/projects/multipass/sys/powerpc/aim/trap_subr.S#3 integrate
.. //depot/projects/multipass/sys/powerpc/booke/machdep.c#5 integrate
.. //depot/projects/multipass/sys/powerpc/booke/mp_cpudep.c#2 integrate
.. //depot/projects/multipass/sys/powerpc/booke/pmap.c#7 integrate
.. //depot/projects/multipass/sys/powerpc/conf/GENERIC#7 integrate
.. //depot/projects/multipass/sys/powerpc/include/_align.h#1 branch
.. //depot/projects/multipass/sys/powerpc/include/elf.h#3 integrate
.. //depot/projects/multipass/sys/powerpc/include/hid.h#4 integrate
.. //depot/projects/multipass/sys/powerpc/include/param.h#5 integrate
.. //depot/projects/multipass/sys/powerpc/include/pcpu.h#4 integrate

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Thu Oct 29 15:09:39 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 30DCA1065670; Thu, 29 Oct 2009 15:09:39 +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 C8C7E106566B
	for ; Thu, 29 Oct 2009 15:09:38 +0000 (UTC)
	(envelope-from raj@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B446D8FC15
	for ; Thu, 29 Oct 2009 15:09:38 +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 n9TF9c3X093368
	for ; Thu, 29 Oct 2009 15:09:38 GMT
	(envelope-from raj@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9TF9b6X093366
	for perforce@freebsd.org; Thu, 29 Oct 2009 15:09:37 GMT
	(envelope-from raj@freebsd.org)
Date: Thu, 29 Oct 2009 15:09:37 GMT
Message-Id: <200910291509.n9TF9b6X093366@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	raj@freebsd.org using -f
From: Rafal Jaworowski 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 169923 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, 29 Oct 2009 15:09:39 -0000

http://p4web.freebsd.org/chv.cgi?CH=169923

Change 169923 by raj@raj_fdt on 2009/10/29 15:09:35

	HEAD baseline import.

Affected files ...

.. //depot/projects/fdt/COPYRIGHT#1 branch
.. //depot/projects/fdt/LOCKS#1 branch
.. //depot/projects/fdt/MAINTAINERS#1 branch
.. //depot/projects/fdt/Makefile#1 branch
.. //depot/projects/fdt/Makefile.inc1#1 branch
.. //depot/projects/fdt/ObsoleteFiles.inc#1 branch
.. //depot/projects/fdt/README#1 branch
.. //depot/projects/fdt/UPDATING#1 branch
.. //depot/projects/fdt/bin/Makefile#1 branch
.. //depot/projects/fdt/bin/Makefile.inc#1 branch
.. //depot/projects/fdt/bin/cat/Makefile#1 branch
.. //depot/projects/fdt/bin/cat/cat.1#1 branch
.. //depot/projects/fdt/bin/cat/cat.c#1 branch
.. //depot/projects/fdt/bin/chflags/Makefile#1 branch
.. //depot/projects/fdt/bin/chflags/chflags.1#1 branch
.. //depot/projects/fdt/bin/chflags/chflags.c#1 branch
.. //depot/projects/fdt/bin/chio/Makefile#1 branch
.. //depot/projects/fdt/bin/chio/chio.1#1 branch
.. //depot/projects/fdt/bin/chio/chio.c#1 branch
.. //depot/projects/fdt/bin/chio/defs.h#1 branch
.. //depot/projects/fdt/bin/chio/pathnames.h#1 branch
.. //depot/projects/fdt/bin/chmod/Makefile#1 branch
.. //depot/projects/fdt/bin/chmod/chmod.1#1 branch
.. //depot/projects/fdt/bin/chmod/chmod.c#1 branch
.. //depot/projects/fdt/bin/cp/Makefile#1 branch
.. //depot/projects/fdt/bin/cp/cp.1#1 branch
.. //depot/projects/fdt/bin/cp/cp.c#1 branch
.. //depot/projects/fdt/bin/cp/extern.h#1 branch
.. //depot/projects/fdt/bin/cp/utils.c#1 branch
.. //depot/projects/fdt/bin/csh/Makefile#1 branch
.. //depot/projects/fdt/bin/csh/USD.doc/csh.1#1 branch
.. //depot/projects/fdt/bin/csh/USD.doc/csh.2#1 branch
.. //depot/projects/fdt/bin/csh/USD.doc/csh.3#1 branch
.. //depot/projects/fdt/bin/csh/USD.doc/csh.4#1 branch
.. //depot/projects/fdt/bin/csh/USD.doc/csh.a#1 branch
.. //depot/projects/fdt/bin/csh/USD.doc/csh.g#1 branch
.. //depot/projects/fdt/bin/csh/USD.doc/tabs#1 branch
.. //depot/projects/fdt/bin/csh/config.h#1 branch
.. //depot/projects/fdt/bin/csh/config_p.h#1 branch
.. //depot/projects/fdt/bin/csh/host.defs#1 branch
.. //depot/projects/fdt/bin/csh/iconv.h#1 branch
.. //depot/projects/fdt/bin/csh/iconv_stub.c#1 branch
.. //depot/projects/fdt/bin/date/Makefile#1 branch
.. //depot/projects/fdt/bin/date/date.1#1 branch
.. //depot/projects/fdt/bin/date/date.c#1 branch
.. //depot/projects/fdt/bin/date/extern.h#1 branch
.. //depot/projects/fdt/bin/date/netdate.c#1 branch
.. //depot/projects/fdt/bin/date/vary.c#1 branch
.. //depot/projects/fdt/bin/date/vary.h#1 branch
.. //depot/projects/fdt/bin/dd/Makefile#1 branch
.. //depot/projects/fdt/bin/dd/args.c#1 branch
.. //depot/projects/fdt/bin/dd/conv.c#1 branch
.. //depot/projects/fdt/bin/dd/conv_tab.c#1 branch
.. //depot/projects/fdt/bin/dd/dd.1#1 branch
.. //depot/projects/fdt/bin/dd/dd.c#1 branch
.. //depot/projects/fdt/bin/dd/dd.h#1 branch
.. //depot/projects/fdt/bin/dd/extern.h#1 branch
.. //depot/projects/fdt/bin/dd/gen.c#1 branch
.. //depot/projects/fdt/bin/dd/misc.c#1 branch
.. //depot/projects/fdt/bin/dd/position.c#1 branch
.. //depot/projects/fdt/bin/dd/ref.ascii#1 branch
.. //depot/projects/fdt/bin/dd/ref.ebcdic#1 branch
.. //depot/projects/fdt/bin/dd/ref.ibm#1 branch
.. //depot/projects/fdt/bin/dd/ref.lcase#1 branch
.. //depot/projects/fdt/bin/dd/ref.oldascii#1 branch
.. //depot/projects/fdt/bin/dd/ref.oldebcdic#1 branch
.. //depot/projects/fdt/bin/dd/ref.oldibm#1 branch
.. //depot/projects/fdt/bin/dd/ref.pareven#1 branch
.. //depot/projects/fdt/bin/dd/ref.parnone#1 branch
.. //depot/projects/fdt/bin/dd/ref.parodd#1 branch
.. //depot/projects/fdt/bin/dd/ref.parset#1 branch
.. //depot/projects/fdt/bin/dd/ref.swab#1 branch
.. //depot/projects/fdt/bin/dd/ref.ucase#1 branch
.. //depot/projects/fdt/bin/df/Makefile#1 branch
.. //depot/projects/fdt/bin/df/df.1#1 branch
.. //depot/projects/fdt/bin/df/df.c#1 branch
.. //depot/projects/fdt/bin/domainname/Makefile#1 branch
.. //depot/projects/fdt/bin/domainname/domainname.1#1 branch
.. //depot/projects/fdt/bin/domainname/domainname.c#1 branch
.. //depot/projects/fdt/bin/echo/Makefile#1 branch
.. //depot/projects/fdt/bin/echo/echo.1#1 branch
.. //depot/projects/fdt/bin/echo/echo.c#1 branch
.. //depot/projects/fdt/bin/ed/Makefile#1 branch
.. //depot/projects/fdt/bin/ed/POSIX#1 branch
.. //depot/projects/fdt/bin/ed/README#1 branch
.. //depot/projects/fdt/bin/ed/buf.c#1 branch
.. //depot/projects/fdt/bin/ed/cbc.c#1 branch
.. //depot/projects/fdt/bin/ed/ed.1#1 branch
.. //depot/projects/fdt/bin/ed/ed.h#1 branch
.. //depot/projects/fdt/bin/ed/glbl.c#1 branch
.. //depot/projects/fdt/bin/ed/io.c#1 branch
.. //depot/projects/fdt/bin/ed/main.c#1 branch
.. //depot/projects/fdt/bin/ed/re.c#1 branch
.. //depot/projects/fdt/bin/ed/sub.c#1 branch
.. //depot/projects/fdt/bin/ed/test/=.err#1 branch
.. //depot/projects/fdt/bin/ed/test/Makefile#1 branch
.. //depot/projects/fdt/bin/ed/test/README#1 branch
.. //depot/projects/fdt/bin/ed/test/TODO#1 branch
.. //depot/projects/fdt/bin/ed/test/a.d#1 branch
.. //depot/projects/fdt/bin/ed/test/a.r#1 branch
.. //depot/projects/fdt/bin/ed/test/a.t#1 branch
.. //depot/projects/fdt/bin/ed/test/a1.err#1 branch
.. //depot/projects/fdt/bin/ed/test/a2.err#1 branch
.. //depot/projects/fdt/bin/ed/test/addr.d#1 branch
.. //depot/projects/fdt/bin/ed/test/addr.r#1 branch
.. //depot/projects/fdt/bin/ed/test/addr.t#1 branch
.. //depot/projects/fdt/bin/ed/test/addr1.err#1 branch
.. //depot/projects/fdt/bin/ed/test/addr2.err#1 branch
.. //depot/projects/fdt/bin/ed/test/ascii.d.uu#1 branch
.. //depot/projects/fdt/bin/ed/test/ascii.r.uu#1 branch
.. //depot/projects/fdt/bin/ed/test/ascii.t#1 branch
.. //depot/projects/fdt/bin/ed/test/bang1.d#1 branch
.. //depot/projects/fdt/bin/ed/test/bang1.err#1 branch
.. //depot/projects/fdt/bin/ed/test/bang1.r#1 branch
.. //depot/projects/fdt/bin/ed/test/bang1.t#1 branch
.. //depot/projects/fdt/bin/ed/test/bang2.err#1 branch
.. //depot/projects/fdt/bin/ed/test/c.d#1 branch
.. //depot/projects/fdt/bin/ed/test/c.r#1 branch
.. //depot/projects/fdt/bin/ed/test/c.t#1 branch
.. //depot/projects/fdt/bin/ed/test/c1.err#1 branch
.. //depot/projects/fdt/bin/ed/test/c2.err#1 branch
.. //depot/projects/fdt/bin/ed/test/ckscripts.sh#1 branch
.. //depot/projects/fdt/bin/ed/test/d.d#1 branch
.. //depot/projects/fdt/bin/ed/test/d.err#1 branch
.. //depot/projects/fdt/bin/ed/test/d.r#1 branch
.. //depot/projects/fdt/bin/ed/test/d.t#1 branch
.. //depot/projects/fdt/bin/ed/test/e1.d#1 branch
.. //depot/projects/fdt/bin/ed/test/e1.err#1 branch
.. //depot/projects/fdt/bin/ed/test/e1.r#1 branch
.. //depot/projects/fdt/bin/ed/test/e1.t#1 branch
.. //depot/projects/fdt/bin/ed/test/e2.d#1 branch
.. //depot/projects/fdt/bin/ed/test/e2.err#1 branch
.. //depot/projects/fdt/bin/ed/test/e2.r#1 branch
.. //depot/projects/fdt/bin/ed/test/e2.t#1 branch
.. //depot/projects/fdt/bin/ed/test/e3.d#1 branch
.. //depot/projects/fdt/bin/ed/test/e3.err#1 branch
.. //depot/projects/fdt/bin/ed/test/e3.r#1 branch
.. //depot/projects/fdt/bin/ed/test/e3.t#1 branch
.. //depot/projects/fdt/bin/ed/test/e4.d#1 branch
.. //depot/projects/fdt/bin/ed/test/e4.r#1 branch
.. //depot/projects/fdt/bin/ed/test/e4.t#1 branch
.. //depot/projects/fdt/bin/ed/test/f1.err#1 branch
.. //depot/projects/fdt/bin/ed/test/f2.err#1 branch
.. //depot/projects/fdt/bin/ed/test/g1.d#1 branch
.. //depot/projects/fdt/bin/ed/test/g1.err#1 branch
.. //depot/projects/fdt/bin/ed/test/g1.r#1 branch
.. //depot/projects/fdt/bin/ed/test/g1.t#1 branch
.. //depot/projects/fdt/bin/ed/test/g2.d#1 branch
.. //depot/projects/fdt/bin/ed/test/g2.err#1 branch
.. //depot/projects/fdt/bin/ed/test/g2.r#1 branch
.. //depot/projects/fdt/bin/ed/test/g2.t#1 branch
.. //depot/projects/fdt/bin/ed/test/g3.d#1 branch
.. //depot/projects/fdt/bin/ed/test/g3.err#1 branch
.. //depot/projects/fdt/bin/ed/test/g3.r#1 branch
.. //depot/projects/fdt/bin/ed/test/g3.t#1 branch
.. //depot/projects/fdt/bin/ed/test/g4.d#1 branch
.. //depot/projects/fdt/bin/ed/test/g4.r#1 branch
.. //depot/projects/fdt/bin/ed/test/g4.t#1 branch
.. //depot/projects/fdt/bin/ed/test/g5.d#1 branch
.. //depot/projects/fdt/bin/ed/test/g5.r#1 branch
.. //depot/projects/fdt/bin/ed/test/g5.t#1 branch
.. //depot/projects/fdt/bin/ed/test/h.err#1 branch
.. //depot/projects/fdt/bin/ed/test/i.d#1 branch
.. //depot/projects/fdt/bin/ed/test/i.r#1 branch
.. //depot/projects/fdt/bin/ed/test/i.t#1 branch
.. //depot/projects/fdt/bin/ed/test/i1.err#1 branch
.. //depot/projects/fdt/bin/ed/test/i2.err#1 branch
.. //depot/projects/fdt/bin/ed/test/i3.err#1 branch
.. //depot/projects/fdt/bin/ed/test/j.d#1 branch
.. //depot/projects/fdt/bin/ed/test/j.r#1 branch
.. //depot/projects/fdt/bin/ed/test/j.t#1 branch
.. //depot/projects/fdt/bin/ed/test/k.d#1 branch
.. //depot/projects/fdt/bin/ed/test/k.r#1 branch
.. //depot/projects/fdt/bin/ed/test/k.t#1 branch
.. //depot/projects/fdt/bin/ed/test/k1.err#1 branch
.. //depot/projects/fdt/bin/ed/test/k2.err#1 branch
.. //depot/projects/fdt/bin/ed/test/k3.err#1 branch
.. //depot/projects/fdt/bin/ed/test/k4.err#1 branch
.. //depot/projects/fdt/bin/ed/test/l.d#1 branch
.. //depot/projects/fdt/bin/ed/test/l.r#1 branch
.. //depot/projects/fdt/bin/ed/test/l.t#1 branch
.. //depot/projects/fdt/bin/ed/test/m.d#1 branch
.. //depot/projects/fdt/bin/ed/test/m.err#1 branch
.. //depot/projects/fdt/bin/ed/test/m.r#1 branch
.. //depot/projects/fdt/bin/ed/test/m.t#1 branch
.. //depot/projects/fdt/bin/ed/test/mkscripts.sh#1 branch
.. //depot/projects/fdt/bin/ed/test/n.d#1 branch
.. //depot/projects/fdt/bin/ed/test/n.r#1 branch
.. //depot/projects/fdt/bin/ed/test/n.t#1 branch
.. //depot/projects/fdt/bin/ed/test/nl.err#1 branch
.. //depot/projects/fdt/bin/ed/test/nl1.d#1 branch
.. //depot/projects/fdt/bin/ed/test/nl1.r#1 branch
.. //depot/projects/fdt/bin/ed/test/nl1.t#1 branch
.. //depot/projects/fdt/bin/ed/test/nl2.d#1 branch
.. //depot/projects/fdt/bin/ed/test/nl2.r#1 branch
.. //depot/projects/fdt/bin/ed/test/nl2.t#1 branch
.. //depot/projects/fdt/bin/ed/test/p.d#1 branch
.. //depot/projects/fdt/bin/ed/test/p.r#1 branch
.. //depot/projects/fdt/bin/ed/test/p.t#1 branch
.. //depot/projects/fdt/bin/ed/test/q.d#1 branch
.. //depot/projects/fdt/bin/ed/test/q.r#1 branch
.. //depot/projects/fdt/bin/ed/test/q.t#1 branch
.. //depot/projects/fdt/bin/ed/test/q1.err#1 branch
.. //depot/projects/fdt/bin/ed/test/r1.d#1 branch
.. //depot/projects/fdt/bin/ed/test/r1.err#1 branch
.. //depot/projects/fdt/bin/ed/test/r1.r#1 branch
.. //depot/projects/fdt/bin/ed/test/r1.t#1 branch
.. //depot/projects/fdt/bin/ed/test/r2.d#1 branch
.. //depot/projects/fdt/bin/ed/test/r2.err#1 branch
.. //depot/projects/fdt/bin/ed/test/r2.r#1 branch
.. //depot/projects/fdt/bin/ed/test/r2.t#1 branch
.. //depot/projects/fdt/bin/ed/test/r3.d#1 branch
.. //depot/projects/fdt/bin/ed/test/r3.r#1 branch
.. //depot/projects/fdt/bin/ed/test/r3.t#1 branch
.. //depot/projects/fdt/bin/ed/test/s1.d#1 branch
.. //depot/projects/fdt/bin/ed/test/s1.err#1 branch
.. //depot/projects/fdt/bin/ed/test/s1.r#1 branch
.. //depot/projects/fdt/bin/ed/test/s1.t#1 branch
.. //depot/projects/fdt/bin/ed/test/s10.err#1 branch
.. //depot/projects/fdt/bin/ed/test/s2.d#1 branch
.. //depot/projects/fdt/bin/ed/test/s2.err#1 branch
.. //depot/projects/fdt/bin/ed/test/s2.r#1 branch
.. //depot/projects/fdt/bin/ed/test/s2.t#1 branch
.. //depot/projects/fdt/bin/ed/test/s3.d#1 branch
.. //depot/projects/fdt/bin/ed/test/s3.err#1 branch
.. //depot/projects/fdt/bin/ed/test/s3.r#1 branch
.. //depot/projects/fdt/bin/ed/test/s3.t#1 branch
.. //depot/projects/fdt/bin/ed/test/s4.err#1 branch
.. //depot/projects/fdt/bin/ed/test/s5.err#1 branch
.. //depot/projects/fdt/bin/ed/test/s6.err#1 branch
.. //depot/projects/fdt/bin/ed/test/s7.err#1 branch
.. //depot/projects/fdt/bin/ed/test/s8.err#1 branch
.. //depot/projects/fdt/bin/ed/test/s9.err#1 branch
.. //depot/projects/fdt/bin/ed/test/t.d#1 branch
.. //depot/projects/fdt/bin/ed/test/t.r#1 branch
.. //depot/projects/fdt/bin/ed/test/t1.d#1 branch
.. //depot/projects/fdt/bin/ed/test/t1.err#1 branch
.. //depot/projects/fdt/bin/ed/test/t1.r#1 branch
.. //depot/projects/fdt/bin/ed/test/t1.t#1 branch
.. //depot/projects/fdt/bin/ed/test/t2.d#1 branch
.. //depot/projects/fdt/bin/ed/test/t2.err#1 branch
.. //depot/projects/fdt/bin/ed/test/t2.r#1 branch
.. //depot/projects/fdt/bin/ed/test/t2.t#1 branch
.. //depot/projects/fdt/bin/ed/test/u.d#1 branch
.. //depot/projects/fdt/bin/ed/test/u.err#1 branch
.. //depot/projects/fdt/bin/ed/test/u.r#1 branch
.. //depot/projects/fdt/bin/ed/test/u.t#1 branch
.. //depot/projects/fdt/bin/ed/test/v.d#1 branch
.. //depot/projects/fdt/bin/ed/test/v.r#1 branch
.. //depot/projects/fdt/bin/ed/test/v.t#1 branch
.. //depot/projects/fdt/bin/ed/test/w.d#1 branch
.. //depot/projects/fdt/bin/ed/test/w.r#1 branch
.. //depot/projects/fdt/bin/ed/test/w.t#1 branch
.. //depot/projects/fdt/bin/ed/test/w1.err#1 branch
.. //depot/projects/fdt/bin/ed/test/w2.err#1 branch
.. //depot/projects/fdt/bin/ed/test/w3.err#1 branch
.. //depot/projects/fdt/bin/ed/test/x.err#1 branch
.. //depot/projects/fdt/bin/ed/test/z.err#1 branch
.. //depot/projects/fdt/bin/ed/undo.c#1 branch
.. //depot/projects/fdt/bin/expr/Makefile#1 branch
.. //depot/projects/fdt/bin/expr/expr.1#1 branch
.. //depot/projects/fdt/bin/expr/expr.y#1 branch
.. //depot/projects/fdt/bin/getfacl/Makefile#1 branch
.. //depot/projects/fdt/bin/getfacl/getfacl.1#1 branch
.. //depot/projects/fdt/bin/getfacl/getfacl.c#1 branch
.. //depot/projects/fdt/bin/hostname/Makefile#1 branch
.. //depot/projects/fdt/bin/hostname/hostname.1#1 branch
.. //depot/projects/fdt/bin/hostname/hostname.c#1 branch
.. //depot/projects/fdt/bin/kenv/Makefile#1 branch
.. //depot/projects/fdt/bin/kenv/kenv.1#1 branch
.. //depot/projects/fdt/bin/kenv/kenv.c#1 branch
.. //depot/projects/fdt/bin/kill/Makefile#1 branch
.. //depot/projects/fdt/bin/kill/kill.1#1 branch
.. //depot/projects/fdt/bin/kill/kill.c#1 branch
.. //depot/projects/fdt/bin/ln/Makefile#1 branch
.. //depot/projects/fdt/bin/ln/ln.1#1 branch
.. //depot/projects/fdt/bin/ln/ln.c#1 branch
.. //depot/projects/fdt/bin/ln/symlink.7#1 branch
.. //depot/projects/fdt/bin/ls/Makefile#1 branch
.. //depot/projects/fdt/bin/ls/cmp.c#1 branch
.. //depot/projects/fdt/bin/ls/extern.h#1 branch
.. //depot/projects/fdt/bin/ls/ls.1#1 branch
.. //depot/projects/fdt/bin/ls/ls.c#1 branch
.. //depot/projects/fdt/bin/ls/ls.h#1 branch
.. //depot/projects/fdt/bin/ls/print.c#1 branch
.. //depot/projects/fdt/bin/ls/util.c#1 branch
.. //depot/projects/fdt/bin/mkdir/Makefile#1 branch
.. //depot/projects/fdt/bin/mkdir/mkdir.1#1 branch
.. //depot/projects/fdt/bin/mkdir/mkdir.c#1 branch
.. //depot/projects/fdt/bin/mv/Makefile#1 branch
.. //depot/projects/fdt/bin/mv/mv.1#1 branch
.. //depot/projects/fdt/bin/mv/mv.c#1 branch
.. //depot/projects/fdt/bin/pax/Makefile#1 branch
.. //depot/projects/fdt/bin/pax/ar_io.c#1 branch
.. //depot/projects/fdt/bin/pax/ar_subs.c#1 branch
.. //depot/projects/fdt/bin/pax/buf_subs.c#1 branch
.. //depot/projects/fdt/bin/pax/cache.c#1 branch
.. //depot/projects/fdt/bin/pax/cache.h#1 branch
.. //depot/projects/fdt/bin/pax/cpio.1#1 branch
.. //depot/projects/fdt/bin/pax/cpio.c#1 branch
.. //depot/projects/fdt/bin/pax/cpio.h#1 branch
.. //depot/projects/fdt/bin/pax/extern.h#1 branch
.. //depot/projects/fdt/bin/pax/file_subs.c#1 branch
.. //depot/projects/fdt/bin/pax/ftree.c#1 branch
.. //depot/projects/fdt/bin/pax/ftree.h#1 branch
.. //depot/projects/fdt/bin/pax/gen_subs.c#1 branch
.. //depot/projects/fdt/bin/pax/getoldopt.c#1 branch
.. //depot/projects/fdt/bin/pax/options.c#1 branch
.. //depot/projects/fdt/bin/pax/options.h#1 branch
.. //depot/projects/fdt/bin/pax/pat_rep.c#1 branch
.. //depot/projects/fdt/bin/pax/pat_rep.h#1 branch
.. //depot/projects/fdt/bin/pax/pax.1#1 branch
.. //depot/projects/fdt/bin/pax/pax.c#1 branch
.. //depot/projects/fdt/bin/pax/pax.h#1 branch
.. //depot/projects/fdt/bin/pax/sel_subs.c#1 branch
.. //depot/projects/fdt/bin/pax/sel_subs.h#1 branch
.. //depot/projects/fdt/bin/pax/tables.c#1 branch
.. //depot/projects/fdt/bin/pax/tables.h#1 branch
.. //depot/projects/fdt/bin/pax/tar.1#1 branch
.. //depot/projects/fdt/bin/pax/tar.c#1 branch
.. //depot/projects/fdt/bin/pax/tar.h#1 branch
.. //depot/projects/fdt/bin/pax/tty_subs.c#1 branch
.. //depot/projects/fdt/bin/pkill/Makefile#1 branch
.. //depot/projects/fdt/bin/pkill/pkill.1#1 branch
.. //depot/projects/fdt/bin/pkill/pkill.c#1 branch
.. //depot/projects/fdt/bin/ps/Makefile#1 branch
.. //depot/projects/fdt/bin/ps/extern.h#1 branch
.. //depot/projects/fdt/bin/ps/fmt.c#1 branch
.. //depot/projects/fdt/bin/ps/keyword.c#1 branch
.. //depot/projects/fdt/bin/ps/nlist.c#1 branch
.. //depot/projects/fdt/bin/ps/print.c#1 branch
.. //depot/projects/fdt/bin/ps/ps.1#1 branch
.. //depot/projects/fdt/bin/ps/ps.c#1 branch
.. //depot/projects/fdt/bin/ps/ps.h#1 branch
.. //depot/projects/fdt/bin/pwd/Makefile#1 branch
.. //depot/projects/fdt/bin/pwd/pwd.1#1 branch
.. //depot/projects/fdt/bin/pwd/pwd.c#1 branch
.. //depot/projects/fdt/bin/rcp/Makefile#1 branch
.. //depot/projects/fdt/bin/rcp/extern.h#1 branch
.. //depot/projects/fdt/bin/rcp/rcp.1#1 branch
.. //depot/projects/fdt/bin/rcp/rcp.c#1 branch
.. //depot/projects/fdt/bin/rcp/util.c#1 branch
.. //depot/projects/fdt/bin/realpath/Makefile#1 branch
.. //depot/projects/fdt/bin/realpath/realpath.1#1 branch
.. //depot/projects/fdt/bin/realpath/realpath.c#1 branch
.. //depot/projects/fdt/bin/rm/Makefile#1 branch
.. //depot/projects/fdt/bin/rm/rm.1#1 branch
.. //depot/projects/fdt/bin/rm/rm.c#1 branch
.. //depot/projects/fdt/bin/rmail/Makefile#1 branch
.. //depot/projects/fdt/bin/rmdir/Makefile#1 branch
.. //depot/projects/fdt/bin/rmdir/rmdir.1#1 branch
.. //depot/projects/fdt/bin/rmdir/rmdir.c#1 branch
.. //depot/projects/fdt/bin/setfacl/Makefile#1 branch
.. //depot/projects/fdt/bin/setfacl/file.c#1 branch
.. //depot/projects/fdt/bin/setfacl/mask.c#1 branch
.. //depot/projects/fdt/bin/setfacl/merge.c#1 branch
.. //depot/projects/fdt/bin/setfacl/remove.c#1 branch
.. //depot/projects/fdt/bin/setfacl/setfacl.1#1 branch
.. //depot/projects/fdt/bin/setfacl/setfacl.c#1 branch
.. //depot/projects/fdt/bin/setfacl/setfacl.h#1 branch
.. //depot/projects/fdt/bin/setfacl/util.c#1 branch
.. //depot/projects/fdt/bin/sh/Makefile#1 branch
.. //depot/projects/fdt/bin/sh/TOUR#1 branch
.. //depot/projects/fdt/bin/sh/alias.c#1 branch
.. //depot/projects/fdt/bin/sh/alias.h#1 branch
.. //depot/projects/fdt/bin/sh/arith.h#1 branch
.. //depot/projects/fdt/bin/sh/arith.y#1 branch
.. //depot/projects/fdt/bin/sh/arith_lex.l#1 branch
.. //depot/projects/fdt/bin/sh/bltin/bltin.h#1 branch
.. //depot/projects/fdt/bin/sh/bltin/echo.1#1 branch
.. //depot/projects/fdt/bin/sh/bltin/echo.c#1 branch
.. //depot/projects/fdt/bin/sh/builtins.def#1 branch
.. //depot/projects/fdt/bin/sh/cd.c#1 branch
.. //depot/projects/fdt/bin/sh/cd.h#1 branch
.. //depot/projects/fdt/bin/sh/error.c#1 branch
.. //depot/projects/fdt/bin/sh/error.h#1 branch
.. //depot/projects/fdt/bin/sh/eval.c#1 branch
.. //depot/projects/fdt/bin/sh/eval.h#1 branch
.. //depot/projects/fdt/bin/sh/exec.c#1 branch
.. //depot/projects/fdt/bin/sh/exec.h#1 branch
.. //depot/projects/fdt/bin/sh/expand.c#1 branch
.. //depot/projects/fdt/bin/sh/expand.h#1 branch
.. //depot/projects/fdt/bin/sh/funcs/cmv#1 branch
.. //depot/projects/fdt/bin/sh/funcs/dirs#1 branch
.. //depot/projects/fdt/bin/sh/funcs/kill#1 branch
.. //depot/projects/fdt/bin/sh/funcs/login#1 branch
.. //depot/projects/fdt/bin/sh/funcs/newgrp#1 branch
.. //depot/projects/fdt/bin/sh/funcs/popd#1 branch
.. //depot/projects/fdt/bin/sh/funcs/pushd#1 branch
.. //depot/projects/fdt/bin/sh/funcs/suspend#1 branch
.. //depot/projects/fdt/bin/sh/histedit.c#1 branch
.. //depot/projects/fdt/bin/sh/init.h#1 branch
.. //depot/projects/fdt/bin/sh/input.c#1 branch
.. //depot/projects/fdt/bin/sh/input.h#1 branch
.. //depot/projects/fdt/bin/sh/jobs.c#1 branch
.. //depot/projects/fdt/bin/sh/jobs.h#1 branch
.. //depot/projects/fdt/bin/sh/mail.c#1 branch
.. //depot/projects/fdt/bin/sh/mail.h#1 branch
.. //depot/projects/fdt/bin/sh/main.c#1 branch
.. //depot/projects/fdt/bin/sh/main.h#1 branch
.. //depot/projects/fdt/bin/sh/memalloc.c#1 branch
.. //depot/projects/fdt/bin/sh/memalloc.h#1 branch
.. //depot/projects/fdt/bin/sh/miscbltin.c#1 branch
.. //depot/projects/fdt/bin/sh/mkbuiltins#1 branch
.. //depot/projects/fdt/bin/sh/mkinit.c#1 branch
.. //depot/projects/fdt/bin/sh/mknodes.c#1 branch
.. //depot/projects/fdt/bin/sh/mksyntax.c#1 branch
.. //depot/projects/fdt/bin/sh/mktokens#1 branch
.. //depot/projects/fdt/bin/sh/myhistedit.h#1 branch
.. //depot/projects/fdt/bin/sh/mystring.c#1 branch
.. //depot/projects/fdt/bin/sh/mystring.h#1 branch
.. //depot/projects/fdt/bin/sh/nodes.c.pat#1 branch
.. //depot/projects/fdt/bin/sh/nodetypes#1 branch
.. //depot/projects/fdt/bin/sh/options.c#1 branch
.. //depot/projects/fdt/bin/sh/options.h#1 branch
.. //depot/projects/fdt/bin/sh/output.c#1 branch
.. //depot/projects/fdt/bin/sh/output.h#1 branch
.. //depot/projects/fdt/bin/sh/parser.c#1 branch
.. //depot/projects/fdt/bin/sh/parser.h#1 branch
.. //depot/projects/fdt/bin/sh/redir.c#1 branch
.. //depot/projects/fdt/bin/sh/redir.h#1 branch
.. //depot/projects/fdt/bin/sh/sh.1#1 branch
.. //depot/projects/fdt/bin/sh/shell.h#1 branch
.. //depot/projects/fdt/bin/sh/show.c#1 branch
.. //depot/projects/fdt/bin/sh/show.h#1 branch
.. //depot/projects/fdt/bin/sh/trap.c#1 branch
.. //depot/projects/fdt/bin/sh/trap.h#1 branch
.. //depot/projects/fdt/bin/sh/var.c#1 branch
.. //depot/projects/fdt/bin/sh/var.h#1 branch
.. //depot/projects/fdt/bin/sleep/Makefile#1 branch
.. //depot/projects/fdt/bin/sleep/sleep.1#1 branch
.. //depot/projects/fdt/bin/sleep/sleep.c#1 branch
.. //depot/projects/fdt/bin/stty/Makefile#1 branch
.. //depot/projects/fdt/bin/stty/cchar.c#1 branch
.. //depot/projects/fdt/bin/stty/extern.h#1 branch
.. //depot/projects/fdt/bin/stty/gfmt.c#1 branch
.. //depot/projects/fdt/bin/stty/key.c#1 branch
.. //depot/projects/fdt/bin/stty/modes.c#1 branch
.. //depot/projects/fdt/bin/stty/print.c#1 branch
.. //depot/projects/fdt/bin/stty/stty.1#1 branch
.. //depot/projects/fdt/bin/stty/stty.c#1 branch
.. //depot/projects/fdt/bin/stty/stty.h#1 branch
.. //depot/projects/fdt/bin/stty/util.c#1 branch
.. //depot/projects/fdt/bin/sync/Makefile#1 branch
.. //depot/projects/fdt/bin/sync/sync.8#1 branch
.. //depot/projects/fdt/bin/sync/sync.c#1 branch
.. //depot/projects/fdt/bin/test/Makefile#1 branch
.. //depot/projects/fdt/bin/test/TEST.README#1 branch
.. //depot/projects/fdt/bin/test/TEST.csh#1 branch
.. //depot/projects/fdt/bin/test/TEST.sh#1 branch
.. //depot/projects/fdt/bin/test/test.1#1 branch
.. //depot/projects/fdt/bin/test/test.c#1 branch
.. //depot/projects/fdt/bin/uuidgen/Makefile#1 branch
.. //depot/projects/fdt/bin/uuidgen/uuidgen.1#1 branch
.. //depot/projects/fdt/bin/uuidgen/uuidgen.c#1 branch
.. //depot/projects/fdt/cddl/Makefile#1 branch
.. //depot/projects/fdt/cddl/Makefile.inc#1 branch
.. //depot/projects/fdt/cddl/compat/opensolaris/include/alloca.h#1 branch
.. //depot/projects/fdt/cddl/compat/opensolaris/include/assert.h#1 branch
.. //depot/projects/fdt/cddl/compat/opensolaris/include/devid.h#1 branch
.. //depot/projects/fdt/cddl/compat/opensolaris/include/dtrace.h#1 branch
.. //depot/projects/fdt/cddl/compat/opensolaris/include/fcntl.h#1 branch
.. //depot/projects/fdt/cddl/compat/opensolaris/include/fsshare.h#1 branch
.. //depot/projects/fdt/cddl/compat/opensolaris/include/libintl.h#1 branch
.. //depot/projects/fdt/cddl/compat/opensolaris/include/libproc.h#1 branch
.. //depot/projects/fdt/cddl/compat/opensolaris/include/libshare.h#1 branch
.. //depot/projects/fdt/cddl/compat/opensolaris/include/mnttab.h#1 branch
.. //depot/projects/fdt/cddl/compat/opensolaris/include/priv.h#1 branch
.. //depot/projects/fdt/cddl/compat/opensolaris/include/solaris.h#1 branch
.. //depot/projects/fdt/cddl/compat/opensolaris/include/stdio.h#1 branch
.. //depot/projects/fdt/cddl/compat/opensolaris/include/stdlib.h#1 branch
.. //depot/projects/fdt/cddl/compat/opensolaris/include/strings.h#1 branch
.. //depot/projects/fdt/cddl/compat/opensolaris/include/unistd.h#1 branch
.. //depot/projects/fdt/cddl/compat/opensolaris/include/zone.h#1 branch
.. //depot/projects/fdt/cddl/compat/opensolaris/lib/libumem/umem.c#1 branch
.. //depot/projects/fdt/cddl/compat/opensolaris/lib/libumem/umem.h#1 branch
.. //depot/projects/fdt/cddl/compat/opensolaris/misc/deviceid.c#1 branch
.. //depot/projects/fdt/cddl/compat/opensolaris/misc/fsshare.c#1 branch
.. //depot/projects/fdt/cddl/compat/opensolaris/misc/mkdirp.c#1 branch
.. //depot/projects/fdt/cddl/compat/opensolaris/misc/mnttab.c#1 branch
.. //depot/projects/fdt/cddl/compat/opensolaris/misc/zmount.c#1 branch
.. //depot/projects/fdt/cddl/compat/opensolaris/misc/zone.c#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/README#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/baddof.c#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/badioctl.c#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/chkargs.c#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Getopt.java#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/JDTrace.java#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/jdtrace.c#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/manifest/jdtrace.jar-manifest#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_FUNC.bad.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_MDIM.bad.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_NULL.bad.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_REDEF.redef.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.avgtoofew.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.maxnoarg.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.mintoofew.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.quantizetoofew.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.sumtoofew.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_AGGARG.bad.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_PROTO.bad.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_IDENT.bad.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_UNDEF.badaggfunc.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badexpr.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badkey3.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.noeffect.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey1.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey2.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey4.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqbad1.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqshort.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASEVAL.bad.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMTYPE.lqbad1.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMVAL.bad.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.order.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.order.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHSTEP.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MISMATCH.lqbadarg.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPLARGE.lqtoofew.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPSMALL.bad.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPTYPE.lqbadinc.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPVAL.bad.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_AGGARG.bad.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_PROTO.bad.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_SCALAR.bad.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_ARG.lquantizetoofew.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgnoarg.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgtoomany.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.counttoomany.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizenoarg.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizetoomany.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxnoarg.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxtoomany.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.minnoarg.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.mintoomany.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizenoarg.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizetoomany.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumnoarg.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumtoomany.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_AGGARG.bad.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badmany.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badnone.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_SCALAR.bad.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg_neg.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg_neg.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count3.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.goodkey.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max_neg.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max_neg.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min_neg.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min_neg.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs1.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signature.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_1.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_2.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.modby0.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.addmin.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.divmin.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muladd.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muldiv.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.basics.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_ARR_BADREF.bad.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRBIG.toobig.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRNULL.bad.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRSUB.bad.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_PROTO_TYPE.badtuple.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_IDENT_UNDEF.badureg.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic1.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic2.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic3.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic4.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic5.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic6.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.uregsarray.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.this.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_ARG.badsig.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toofew.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toomany.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_SYNTAX.errassign.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.tupoflow.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.cpyarray.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.diffprofile.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.initialize.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.invalidref.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.misc.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.orthogonality.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.this.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.valassign.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.begin.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.tick.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_ADDROF_BITFIELD.BitfieldAddress.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.NegBitField.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.ZeroBitField.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.ExceedBaseType.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.GreaterThan64.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFTYPE.badtype.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_OFFSETOF_BITFIELD.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_SIZEOF_BITFIELD.SizeofBitfield.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.BitFieldPromotion.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.SizeofBitField.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.end.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize1.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize2.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize3.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.zerobuf.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.alignring.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.cputime.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.dynvarsize.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize1.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize2.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize3.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring1.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.smallring.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.cpuusage.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.nice.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.priority.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.prsize.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.rssize.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0clause.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8clause.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller1.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid1.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno1.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.execname.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.hpriority.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id1.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl1.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo1.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid1.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo1.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid1.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.timestamp.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.vtimestamp.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggfun.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggtup.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.arrtup.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.body.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.both.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.pred.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.nopred.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.pred.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predfirst.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predlast.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LOCASSC.NonLocalAssoc.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LONGINT.LongStruct.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PARMCLASS.BadStorageClass.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_NAME.VoidName.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_TYPE.Dyn.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VARARGS.VarLenArgs.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VOID.NonSoleVoid.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_SIGNINT.UnsignedStruct.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_VOIDATTR.ShortVoidDecl.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.arrays.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.basics.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.funcs.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.pointers.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.varargsfuncs.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/badptr.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/countdown.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/counter.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/errorpath.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/hello.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/kstat.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/ksyms.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/renormalize.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rtime.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rw.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwinfo.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwtime.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/specopen.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/truss.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/trussrw.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/userfunc.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_AGGREGATION.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DBLERROR.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DYNAMIC.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.end.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPEC.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPECUNAVAIL.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_STKSTROVERFLOW.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/err.D_PDESC_ZERO.InvalidDescription1.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.APIVersion.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.AddSearchPath.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.CoalesceTrace.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ELFGeneration.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.IncludedFilePath.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithFunctions#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithIDs#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithModules#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithNames#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithProviders#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ShowCompilerCode.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceFunctions#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceIDs#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceModule#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceNames#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceProvider#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.VerboseStabilityReport.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.AddSearchPath.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeGiga.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeKilo.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeMega.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeTera.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel32.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel64.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithoutW.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationOut.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationWithO.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus1.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus2.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExtraneousProbeIds.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName1.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName2.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId1.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId2.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId3.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule1.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule2.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule3.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule4.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProbeIdentifier.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider1.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider2.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider3.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider4.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc1.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc2.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc3.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc4.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc5.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc6.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc7.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc8.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc9.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID1.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID2.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID3.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID4.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID5.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID6.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID7.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule1.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule2.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule3.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule4.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule5.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule6.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule7.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule8.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName1.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName2.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName3.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName4.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName5.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName6.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName7.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName8.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName9.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider1.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider2.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider3.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider4.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider5.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.MultipleInvalidProbeId.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.PreprocessorStatement.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.UnDefineNameWithCPP.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbeIdentfier.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbesWithoutZ.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/err.D_IDENT_UNDEF.timespent.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.end.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.endwithoutbegin.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multibeginend.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multiend.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_DECL_IDRED.EnumSameName.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_UNKNOWN.RepeatIdentifiers.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumEquality.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumSameValue.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumValAssign.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_BADADDR.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_DIVZERO.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_UNKNOWN.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.error.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.errorend.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.D_PROTO_LEN.noarg.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.exitarg1.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/tst.basic1.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/err.D_PDESC_ZERO.notreturn.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.basic.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionentry.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionreturnvalue.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.ioctlargs.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offset.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offsetzero.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return0.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.tailcall.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_FUNC_UNDEF.progenyofbad1.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_OP_VFPTR.badop.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.chillbadarg.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.copyoutbadarg.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.mobadarg.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.raisebadarg.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.allocanoarg.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.badbreakpoint.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoofew.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoomany.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrbadarg.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrtoofew.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoofew.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoomany.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoofew.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoomany.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtabadarg.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.panicbadarg.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.progenyofbad2.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.stopbadarg.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_STRINGOF_TYPE.badstringof.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_VAR_UNDEF.badvar.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca2.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy1.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy2.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy3.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy4.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy5.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy6.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badchill.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.chillbadarg.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyout.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutbadaddr.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutstrbadaddr.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoa6badaddr.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoabadaddr.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadaddr.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadarg.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.badfreopen.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d.out#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.bcopy.d#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.chill.ksh#1 branch
.. //depot/projects/fdt/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d#1 branch

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Thu Oct 29 15:40:09 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A7BD61065694; Thu, 29 Oct 2009 15:40: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 6689B106568B
	for ; Thu, 29 Oct 2009 15:40:09 +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 54C238FC13
	for ; Thu, 29 Oct 2009 15:40:09 +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 n9TFe9Cf096049
	for ; Thu, 29 Oct 2009 15:40:09 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9TFe9IC096045
	for perforce@freebsd.org; Thu, 29 Oct 2009 15:40:09 GMT
	(envelope-from mav@freebsd.org)
Date: Thu, 29 Oct 2009 15:40:09 GMT
Message-Id: <200910291540.n9TFe9IC096045@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 169926 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, 29 Oct 2009 15:40:10 -0000

http://p4web.freebsd.org/chv.cgi?CH=169926

Change 169926 by mav@mav_mavtest on 2009/10/29 15:39:15

	Fix typo.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#32 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#32 (text+ko) ====

@@ -1419,7 +1419,7 @@
 		cts->transport = XPORT_ATA;
 		cts->transport_version = XPORT_VERSION_UNSPECIFIED;
 		if (ccb->ccb_h.target_id >= 0 && ccb->ccb_h.target_id <= 1) {
-			cts->proto_specific.valid = CTS_ATA_VALID_BYTECOUNT;
+			cts->xport_specific.valid = CTS_ATA_VALID_BYTECOUNT;
 			cts->xport_specific.ata.bytecount = 
 			    ch->bytecount[ccb->ccb_h.target_id];
 		}
@@ -1480,7 +1480,7 @@
 		cpi->max_lun = 0;
 		cpi->initiator_id = 0;
 		cpi->bus_id = cam_sim_bus(sim);
-		cpi->base_transfer_speed = 150000;
+		cpi->base_transfer_speed = 3300;
 		strncpy(cpi->sim_vid, "FreeBSD", SIM_IDLEN);
 		strncpy(cpi->hba_vid, "ATA", HBA_IDLEN);
 		strncpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN);

From owner-p4-projects@FreeBSD.ORG  Thu Oct 29 15:46:16 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DDD571065676; Thu, 29 Oct 2009 15:46:15 +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 A254A1065697
	for ; Thu, 29 Oct 2009 15:46:15 +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 900498FC1B
	for ; Thu, 29 Oct 2009 15:46:15 +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 n9TFkFcD096501
	for ; Thu, 29 Oct 2009 15:46:15 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9TFkFI1096499
	for perforce@freebsd.org; Thu, 29 Oct 2009 15:46:15 GMT
	(envelope-from mav@freebsd.org)
Date: Thu, 29 Oct 2009 15:46:15 GMT
Message-Id: <200910291546.n9TFkFI1096499@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 169927 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, 29 Oct 2009 15:46:16 -0000

http://p4web.freebsd.org/chv.cgi?CH=169927

Change 169927 by mav@mav_mavtest on 2009/10/29 15:46:09

	Update speed reporting.
	Report speed in identify command, same as in inquiry.

Affected files ...

.. //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#25 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#25 (text+ko) ====

@@ -186,7 +186,7 @@
 			 char *combinedopt, int retry_count, int timeout);
 static int scsiinquiry(struct cam_device *device, int retry_count, int timeout);
 static int scsiserial(struct cam_device *device, int retry_count, int timeout);
-static int scsixferrate(struct cam_device *device);
+static int camxferrate(struct cam_device *device);
 #endif /* MINIMALISTIC */
 static int parse_btl(char *tstr, int *bus, int *target, int *lun,
 		     cam_argmask *arglst);
@@ -663,7 +663,7 @@
 		return(error);
 
 	if (arglist & CAM_ARG_GET_XFERRATE)
-		error = scsixferrate(device);
+		error = camxferrate(device);
 
 	return(error);
 }
@@ -873,14 +873,18 @@
 }
 
 static int
-scsixferrate(struct cam_device *device)
+camxferrate(struct cam_device *device)
 {
+	struct ccb_pathinq cpi;
 	u_int32_t freq = 0;
 	u_int32_t speed = 0;
 	union ccb *ccb;
 	u_int mb;
 	int retval = 0;
 
+	if ((retval = get_cpi(device, &cpi)) != 0)
+		return (1);
+
 	ccb = cam_getccb(device);
 
 	if (ccb == NULL) {
@@ -913,6 +917,8 @@
 
 	}
 
+	speed = cpi.base_transfer_speed;
+	freq = 0;
 	if (ccb->cts.transport == XPORT_SPI) {
 		struct ccb_trans_settings_spi *spi =
 		    &ccb->cts.xport_specific.spi;
@@ -920,31 +926,44 @@
 		if ((spi->valid & CTS_SPI_VALID_SYNC_RATE) != 0) {
 			freq = scsi_calc_syncsrate(spi->sync_period);
 			speed = freq;
-		} else {
-			struct ccb_pathinq cpi;
-
-			retval = get_cpi(device, &cpi);
-			if (retval == 0) {
-				speed = cpi.base_transfer_speed;
-				freq = 0;
-			}
 		}
-
-		fprintf(stdout, "%s%d: ", device->device_name,
-			device->dev_unit_num);
-
 		if ((spi->valid & CTS_SPI_VALID_BUS_WIDTH) != 0) {
 			speed *= (0x01 << spi->bus_width);
 		}
+	} else if (ccb->cts.transport == XPORT_FC) {
+		struct ccb_trans_settings_fc *fc =
+		    &ccb->cts.xport_specific.fc;
+
+		if (fc->valid & CTS_FC_VALID_SPEED)
+			speed = fc->bitrate;
+	} else if (ccb->cts.transport == XPORT_SAS) {
+		struct ccb_trans_settings_sas *sas =
+		    &ccb->cts.xport_specific.sas;
+
+		if (sas->valid & CTS_SAS_VALID_SPEED)
+			speed = sas->bitrate;
+	} else if (ccb->cts.transport == XPORT_SATA) {
+		struct ccb_trans_settings_sata *sata =
+		    &ccb->cts.xport_specific.sata;
+
+		if (sata->valid & CTS_SATA_VALID_SPEED)
+			speed = sata->bitrate;
+	}
 
-		mb = speed / 1000;
+	mb = speed / 1000;
+	if (mb > 0) {
+		fprintf(stdout, "%s%d: %d.%03dMB/s transfers ",
+			device->device_name, device->dev_unit_num,
+			mb, speed % 1000);
+	} else {
+		fprintf(stdout, "%s%d: %dKB/s transfers ",
+			device->device_name, device->dev_unit_num,
+			speed);
+	}
 
-		if (mb > 0) 
-			fprintf(stdout, "%d.%03dMB/s transfers ",
-				mb, speed % 1000);
-		else
-			fprintf(stdout, "%dKB/s transfers ",
-				speed);
+	if (ccb->cts.transport == XPORT_SPI) {
+		struct ccb_trans_settings_spi *spi =
+		    &ccb->cts.xport_specific.spi;
 
 		if (((spi->valid & CTS_SPI_VALID_SYNC_OFFSET) != 0)
 		 && (spi->sync_offset != 0))
@@ -964,25 +983,22 @@
 		 && (spi->sync_offset != 0)) {
 			fprintf(stdout, ")");
 		}
-	} else {
-		struct ccb_pathinq cpi;
+	} else if (ccb->cts.transport == XPORT_ATA) {
+		struct ccb_trans_settings_ata *ata =
+		    &ccb->cts.xport_specific.ata;
 
-		retval = get_cpi(device, &cpi);
+		if (ata->valid & CTS_ATA_VALID_BYTECOUNT) {
+			fprintf(stdout, "(PIO size %dbytes)",
+			    ata->bytecount);
+		}
+	} else if (ccb->cts.transport == XPORT_SATA) {
+		struct ccb_trans_settings_sata *sata =
+		    &ccb->cts.xport_specific.sata;
 
-		if (retval != 0)
-			goto xferrate_bailout;
-
-		speed = cpi.base_transfer_speed;
-		freq = 0;
-
-		mb = speed / 1000;
-
-		if (mb > 0) 
-			fprintf(stdout, "%d.%03dMB/s transfers ",
-				mb, speed % 1000);
-		else
-			fprintf(stdout, "%dKB/s transfers ",
-				speed);
+		if (sata->valid & CTS_SATA_VALID_BYTECOUNT) {
+			fprintf(stdout, "(PIO size %dbytes)",
+			    sata->bytecount);
+		}
 	}
 
 	if (ccb->cts.protocol == PROTO_SCSI) {
@@ -1305,6 +1321,7 @@
 	fprintf(stdout, "%s%d: ", device->device_name,
 		device->dev_unit_num);
 	ata_print_ident(ident_buf);
+	camxferrate(device);
 	atacapprint(ident_buf);
 
 	free(ident_buf);

From owner-p4-projects@FreeBSD.ORG  Thu Oct 29 16:17:47 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B7FFB1065697; Thu, 29 Oct 2009 16:17: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 7C4801065696
	for ; Thu, 29 Oct 2009 16:17: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 512F58FC22
	for ; Thu, 29 Oct 2009 16:17: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 n9TGHlvX099826
	for ; Thu, 29 Oct 2009 16:17:47 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9TGHlDq099824
	for perforce@freebsd.org; Thu, 29 Oct 2009 16:17:47 GMT
	(envelope-from mav@freebsd.org)
Date: Thu, 29 Oct 2009 16:17:47 GMT
Message-Id: <200910291617.n9TGHlDq099824@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 169929 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, 29 Oct 2009 16:17:47 -0000

http://p4web.freebsd.org/chv.cgi?CH=169929

Change 169929 by mav@mav_mavtest on 2009/10/29 16:17:35

	Report PIO size during boot.
	Tune style.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#110 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#110 (text+ko) ====

@@ -1076,30 +1076,35 @@
 	speed = cpi.base_transfer_speed;
 	freq = 0;
 	if (cts.ccb_h.status == CAM_REQ_CMP && cts.transport == XPORT_SPI) {
-		struct	ccb_trans_settings_spi *spi;
+		struct	ccb_trans_settings_spi *spi =
+		    &cts.xport_specific.spi;
 
-		spi = &cts.xport_specific.spi;
 		if ((spi->valid & CTS_SPI_VALID_SYNC_OFFSET) != 0
 		  && spi->sync_offset != 0) {
 			freq = scsi_calc_syncsrate(spi->sync_period);
 			speed = freq;
 		}
-
 		if ((spi->valid & CTS_SPI_VALID_BUS_WIDTH) != 0)
 			speed *= (0x01 << spi->bus_width);
 	}
 	if (cts.ccb_h.status == CAM_REQ_CMP && cts.transport == XPORT_FC) {
-		struct	ccb_trans_settings_fc *fc = &cts.xport_specific.fc;
+		struct	ccb_trans_settings_fc *fc =
+		    &cts.xport_specific.fc;
+
 		if (fc->valid & CTS_FC_VALID_SPEED)
 			speed = fc->bitrate;
 	}
 	if (cts.ccb_h.status == CAM_REQ_CMP && cts.transport == XPORT_SAS) {
-		struct	ccb_trans_settings_sas *sas = &cts.xport_specific.sas;
+		struct	ccb_trans_settings_sas *sas =
+		    &cts.xport_specific.sas;
+
 		if (sas->valid & CTS_SAS_VALID_SPEED)
 			speed = sas->bitrate;
 	}
 	if (cts.ccb_h.status == CAM_REQ_CMP && cts.transport == XPORT_SATA) {
-		struct	ccb_trans_settings_sata *sata = &cts.xport_specific.sata;
+		struct	ccb_trans_settings_sata *sata =
+		    &cts.xport_specific.sata;
+
 		if (sata->valid & CTS_SATA_VALID_SPEED)
 			speed = sata->bitrate;
 	}
@@ -1147,7 +1152,20 @@
 		if (fc->valid & CTS_FC_VALID_PORT)
 			printf(" PortID 0x%x", fc->port);
 	}
+	if (cts.ccb_h.status == CAM_REQ_CMP && cts.transport == XPORT_ATA) {
+		struct ccb_trans_settings_ata *ata =
+		    &cts.xport_specific.ata;
 
+		if (ata->valid & CTS_ATA_VALID_BYTECOUNT)
+			printf(" (PIO size %dbytes)", ata->bytecount);
+	}
+	if (cts.ccb_h.status == CAM_REQ_CMP && cts.transport == XPORT_SATA) {
+		struct ccb_trans_settings_sata *sata =
+		    &cts.xport_specific.sata;
+
+		if (sata->valid & CTS_SATA_VALID_BYTECOUNT)
+			printf(" (PIO size %dbytes)", sata->bytecount);
+	}
 	if (path->device->inq_flags & SID_CmdQue
 	 || path->device->flags & CAM_DEV_TAG_AFTER_COUNT) {
 		printf("\n%s%d: Command Queueing enabled",

From owner-p4-projects@FreeBSD.ORG  Thu Oct 29 16:23:53 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CA4D81065695; Thu, 29 Oct 2009 16:23:53 +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 8E15A1065693
	for ; Thu, 29 Oct 2009 16:23:53 +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 7AF0A8FC15
	for ; Thu, 29 Oct 2009 16:23:53 +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 n9TGNreV000431
	for ; Thu, 29 Oct 2009 16:23:53 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9TGNrHI000429
	for perforce@freebsd.org; Thu, 29 Oct 2009 16:23:53 GMT
	(envelope-from mav@freebsd.org)
Date: Thu, 29 Oct 2009 16:23:53 GMT
Message-Id: <200910291623.n9TGNrHI000429@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 169930 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, 29 Oct 2009 16:23:54 -0000

http://p4web.freebsd.org/chv.cgi?CH=169930

Change 169930 by mav@mav_mavtest on 2009/10/29 16:23:12

	IFC

Affected files ...

.. //depot/projects/scottl-camlock/src/sbin/ddb/ddb_capture.c#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/get_cyclecount.9#2 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/NOTES#39 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aac/aac.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aac/aacvar.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.h#21 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-serverworks.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_sig.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/uipc_syscalls.c#31 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_hwmp.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/aim/machdep.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/ata.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/time.h#10 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/crashinfo/crashinfo.sh#2 integrate

Differences ...

==== //depot/projects/scottl-camlock/src/sbin/ddb/ddb_capture.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sbin/ddb/ddb_capture.c,v 1.1 2008/04/25 17:34:09 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sbin/ddb/ddb_capture.c,v 1.2 2009/10/29 13:44:58 jhb Exp $");
 
 #include 
 #include 
@@ -95,24 +95,24 @@
 static void
 ddb_capture_print_kvm(kvm_t *kvm)
 {
-	u_int db_capture_bufsize;
+	u_int db_capture_bufoff;
 	char *buffer, *db_capture_buf;
 
 	if (kread_symbol(kvm, X_DB_CAPTURE_BUF, &db_capture_buf,
 	    sizeof(db_capture_buf), 0) < 0)
 		errx(-1, "kvm: unable to read db_capture_buf");
 
-	if (kread_symbol(kvm, X_DB_CAPTURE_BUFSIZE, &db_capture_bufsize,
-	    sizeof(db_capture_bufsize), 0) < 0)
-		errx(-1, "kvm: unable to read db_capture_bufsize");
+	if (kread_symbol(kvm, X_DB_CAPTURE_BUFOFF, &db_capture_bufoff,
+	    sizeof(db_capture_bufoff), 0) < 0)
+		errx(-1, "kvm: unable to read db_capture_bufoff");
 
-	buffer = malloc(db_capture_bufsize + 1);
+	buffer = malloc(db_capture_bufoff + 1);
 	if (buffer == NULL)
-		err(-1, "malloc: db_capture_bufsize (%u)",
-		    db_capture_bufsize);
-	bzero(buffer, db_capture_bufsize + 1);
+		err(-1, "malloc: db_capture_bufoff (%u)",
+		    db_capture_bufoff);
+	bzero(buffer, db_capture_bufoff + 1);
 
-	if (kread(kvm, db_capture_buf, buffer, db_capture_bufsize, 0) < 0)
+	if (kread(kvm, db_capture_buf, buffer, db_capture_bufoff, 0) < 0)
 		errx(-1, "kvm: unable to read buffer");
 
 	printf("%s\n", buffer);
@@ -161,7 +161,7 @@
 		errx(-1, "kvm: unable to read db_capture_bufsize");
 	if (kread_symbol(kvm, X_DB_CAPTURE_INPROGRESS,
 	    &db_capture_inprogress, sizeof(db_capture_inprogress), 0) < 0)
-		err(-1, "kvm: unable to read db_capture_inpgoress");
+		err(-1, "kvm: unable to read db_capture_inprogress");
 	printf("%u/%u bytes used\n", db_capture_bufoff, db_capture_bufsize);
 	if (db_capture_inprogress)
 		printf("capture is on\n");

==== //depot/projects/scottl-camlock/src/share/man/man9/get_cyclecount.9#2 (text+ko) ====

@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man9/get_cyclecount.9,v 1.10 2004/11/16 21:22:09 jhb Exp $
+.\" $FreeBSD: src/share/man/man9/get_cyclecount.9,v 1.11 2009/10/29 09:45:05 ru Exp $
 .\"
-.Dd November 20, 2000
+.Dd October 24, 2009
 .Dt GET_CYCLECOUNT 9
 .Os
 .Sh NAME
@@ -65,10 +65,10 @@
 so
 .Fn get_cyclecount
 on these platforms
-returns the number of nanoseconds
+returns a (non-monotonic) combination of numbers
 represented by the
 structure returned by
-.Xr nanotime 9 .
+.Xr binuptime 9 .
 .Pp
 The
 .Tn Pentium
@@ -77,18 +77,12 @@
 register.
 .Pp
 The
-.Tn Alpha
-processors use the
-.Li PCC
-register.
-.Pp
-The
 .Tn IA64
 processors use the
 .Li AR.ITC
 register.
 .Sh SEE ALSO
-.Xr nanotime 9
+.Xr binuptime 9
 .Sh HISTORY
 The
 .Fn get_cyclecount

==== //depot/projects/scottl-camlock/src/sys/conf/NOTES#39 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1559 2009/10/26 10:35:16 mav Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1560 2009/10/29 09:51:13 ru Exp $
 #
 # NOTES -- Lines that can be cut/pasted into kernel and hints configs.
 #
@@ -402,8 +402,7 @@
 options 	KTRACE_REQUEST_POOL=101
 
 #
-# KTR is a kernel tracing mechanism imported from BSD/OS.  Currently
-# it has no userland interface aside from a few sysctl's.  It is
+# KTR is a kernel tracing facility imported from BSD/OS.  It is
 # enabled with the KTR option.  KTR_ENTRIES defines the number of
 # entries in the circular trace buffer; it must be a power of two.
 # KTR_COMPILE defines the mask of events to compile into the kernel as
@@ -413,7 +412,7 @@
 # events, with bit X corresponding to CPU X.  KTR_VERBOSE enables
 # dumping of KTR events to the console by default.  This functionality
 # can be toggled via the debug.ktr_verbose sysctl and defaults to off
-# if KTR_VERBOSE is not defined.
+# if KTR_VERBOSE is not defined.  See ktr(4) and ktrdump(8) for details.
 #
 options 	KTR
 options 	KTR_ENTRIES=1024
@@ -424,7 +423,7 @@
 
 #
 # ALQ(9) is a facility for the asynchronous queuing of records from the kernel
-# to a vnode, and is employed by services such as KTR(4) to produce trace
+# to a vnode, and is employed by services such as ktr(4) to produce trace
 # files based on a kernel event stream.  Records are written asynchronously
 # in a worker thread.
 #
@@ -618,9 +617,9 @@
 # I have not yet commited the tools to get and print
 # the logs, I will do that eventually .. before then
 # if you want them send me an email rrs@freebsd.org
-# You basically must have KTR enabled for these
+# You basically must have ktr(4) enabled for these
 # and you then set the sysctl to turn on/off various
-# logging bits. Use ktrdump to pull the log and run
+# logging bits. Use ktrdump(8) to pull the log and run
 # it through a dispaly program.. and graphs and other
 # things too.
 #

==== //depot/projects/scottl-camlock/src/sys/dev/aac/aac.c#15 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.149 2009/10/28 13:50:28 emaste Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.150 2009/10/29 14:53:45 emaste Exp $");
 
 /*
  * Driver for the Adaptec 'FSA' family of PCI/SCSI RAID adapters.
@@ -909,8 +909,11 @@
 	mtx_unlock(&sc->aac_io_lock);
 }
 
+/*
+ * Interrupt filter for !NEW_COMM interface.
+ */
 int
-aac_fast_intr(void *arg)
+aac_filter(void *arg)
 {
 	struct aac_softc *sc;
 	u_int16_t reason;
@@ -2032,18 +2035,11 @@
 		}
 	} else {
 		if (bus_setup_intr(sc->aac_dev, sc->aac_irq,
-				   INTR_TYPE_BIO, aac_fast_intr, NULL,
+				   INTR_TYPE_BIO, aac_filter, NULL,
 				   sc, &sc->aac_intr)) {
 			device_printf(sc->aac_dev,
-				      "can't set up FAST interrupt\n");
-			if (bus_setup_intr(sc->aac_dev, sc->aac_irq,
-					   INTR_MPSAFE|INTR_TYPE_BIO,
-					   NULL, (driver_intr_t *)aac_fast_intr,
-					   sc, &sc->aac_intr)) {
-				device_printf(sc->aac_dev,
-					     "can't set up MPSAFE interrupt\n");
-				return (EINVAL);
-			}
+				      "can't set up interrupt filter\n");
+			return (EINVAL);
 		}
 	}
 	return (0);

==== //depot/projects/scottl-camlock/src/sys/dev/aac/aacvar.h#9 (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.53 2009/09/09 03:41:40 emaste Exp $
+ *	$FreeBSD: src/sys/dev/aac/aacvar.h,v 1.54 2009/10/29 14:53:45 emaste Exp $
  */
 
 #include 
@@ -448,7 +448,7 @@
 extern int		aac_suspend(device_t dev); 
 extern int		aac_resume(device_t dev);
 extern void		aac_new_intr(void *arg);
-extern int		aac_fast_intr(void *arg);
+extern int		aac_filter(void *arg);
 extern void		aac_submit_bio(struct bio *bp);
 extern void		aac_biodone(struct bio *bp);
 extern void		aac_startio(struct aac_softc *sc);

==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.h#21 (text+ko) ====

@@ -23,9 +23,14 @@
  * (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.146 2009/06/24 15:38:17 raj Exp $
+ * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.147 2009/10/29 13:27:14 nwhitehorn Exp $
  */
 
+#if 0
+#define	ATA_LEGACY_SUPPORT		/* Enable obsolete features that break
+					 * some modern devices */
+#endif
+
 /* ATA register defines */
 #define ATA_DATA                        0       /* (RW) data */
 
@@ -81,7 +86,11 @@
 #define ATA_PC98_CTLOFFSET              0x10c   /* do for PC98 devices */
 #define         ATA_A_IDS               0x02    /* disable interrupts */
 #define         ATA_A_RESET             0x04    /* RESET controller */
-#define         ATA_A_4BIT              0x08    /* 4 head bits */
+#ifdef	ATA_LEGACY_SUPPORT			
+#define         ATA_A_4BIT              0x08    /* 4 head bits: obsolete 1996 */
+#else
+#define         ATA_A_4BIT              0x00 
+#endif
 #define         ATA_A_HOB               0x80    /* High Order Byte enable */
 
 /* SATA register defines */

==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-serverworks.c#7 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-serverworks.c,v 1.6 2009/06/24 19:49:18 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-serverworks.c,v 1.7 2009/10/29 13:28:37 nwhitehorn Exp $");
 
 #include "opt_ata.h"
 #include 
@@ -41,6 +41,9 @@
 #include 
 #include 
 #include 
+#ifdef __powerpc__
+#include 
+#endif
 #include 
 #include 
 #include 
@@ -106,8 +109,15 @@
 ata_serverworks_status(device_t dev)
 {
     struct ata_channel *ch = device_get_softc(dev);
+    struct ata_pci_controller *ctlr = device_get_softc(device_get_parent(dev));
 
     /*
+     * Check if this interrupt belongs to our channel.
+     */
+    if (!(ATA_INL(ctlr->r_res2, 0x1f80) & (1 << ch->unit)))
+	return (0);
+
+    /*
      * We need to do a 4-byte read on the status reg before the values
      * will report correctly
      */
@@ -208,8 +218,29 @@
     ch->hw.tf_write = ata_serverworks_tf_write;
 #ifdef __powerpc__
     ch->hw.status = ata_serverworks_status;
+
+    /* Make sure that our interrupt is edge triggered */
+    powerpc_config_intr(bus_get_resource_start(device_get_parent(dev),
+	SYS_RES_IRQ, 0), INTR_TRIGGER_EDGE, INTR_POLARITY_HIGH);
 #endif
 
+    if (ctlr->chip->chipid == ATA_K2) {
+	/*
+	 * The revision 1 K2 SATA controller has interesting bugs. Patch them.
+	 * These magic numbers regulate interrupt delivery in the first few
+	 * cases and are pure magic in the last case.
+	 *
+	 * Values obtained from the Darwin driver.
+	 */
+
+	ATA_IDX_OUTB(ch, ATA_BMSTAT_PORT, 0x04);
+	ATA_IDX_OUTL(ch, ATA_SERROR, 0xffffffff);
+	ATA_IDX_OUTL(ch, ATA_SCONTROL, 0x00000300);
+	ATA_OUTL(ctlr->r_res2, ch_offset + 0x88, 0);
+	ATA_OUTL(ctlr->r_res2, ch_offset + 0x80,
+	    ATA_INL(ctlr->r_res2, ch_offset + 0x80) & ~0x00040000);
+    }
+
     /* chip does not reliably do 64K DMA transfers */
     ch->dma.max_iosize = 64 * DEV_BSIZE;
 

==== //depot/projects/scottl-camlock/src/sys/kern/kern_sig.c#25 (text+ko) ====

@@ -35,7 +35,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.379 2009/10/27 10:47:58 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.380 2009/10/29 14:34:24 kib Exp $");
 
 #include "opt_compat.h"
 #include "opt_kdtrace.h"
@@ -1863,7 +1863,8 @@
 		if (!SIGISMEMBER(ps->ps_signodefer, sig)) {
 			SIGEMPTYSET(mask);
 			SIGADDSET(mask, sig);
-			kern_sigprocmask(td, SIG_BLOCK, &mask, NULL, 0);
+			kern_sigprocmask(td, SIG_BLOCK, &mask, NULL,
+			    SIGPROCMASK_PROC_LOCKED);
 		}
 		if (SIGISMEMBER(ps->ps_sigreset, sig)) {
 			/*

==== //depot/projects/scottl-camlock/src/sys/kern/uipc_syscalls.c#31 (text+ko) ====

@@ -33,7 +33,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.286 2009/10/01 12:50:26 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.287 2009/10/29 10:03:08 kib Exp $");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
@@ -2016,7 +2016,7 @@
 		 * Loop and construct maximum sized mbuf chain to be bulk
 		 * dumped into socket buffer.
 		 */
-		while(space > loopbytes) {
+		while (space > loopbytes) {
 			vm_pindex_t pindex;
 			vm_offset_t pgoff;
 			struct mbuf *m0;

==== //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_hwmp.c#7 (text+ko) ====

@@ -28,7 +28,7 @@
  */ 
 #include 
 #ifdef __FreeBSD__
-__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_hwmp.c,v 1.9 2009/10/22 17:30:22 rpaulo Exp $");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_hwmp.c,v 1.10 2009/10/29 12:19:10 rpaulo Exp $");
 #endif
 
 /*
@@ -1239,15 +1239,18 @@
 		return;
 	}
 	hr = IEEE80211_MESH_ROUTE_PRIV(rt, struct ieee80211_hwmp_route);
-	if (HWMP_SEQ_GT(rann->rann_seq, hr->hr_seq) && rann->rann_ttl > 1 &&
-	    rann->rann_hopcount < hs->hs_maxhops &&
-	    (ms->ms_flags & IEEE80211_MESHFLAGS_FWD)) {
-		memcpy(&prann, rann, sizeof(prann));
-		prann.rann_hopcount += 1;
-		prann.rann_ttl -= 1;
-		prann.rann_metric += ms->ms_pmetric->mpm_metric(ni);
-		hwmp_send_rann(vap->iv_bss, vap->iv_myaddr, broadcastaddr,
-		    &prann);
+	if (HWMP_SEQ_GT(rann->rann_seq, hr->hr_seq)) {
+		hr->hr_seq = rann->rann_seq;
+		if (rann->rann_ttl > 1 &&
+		    rann->rann_hopcount < hs->hs_maxhops &&
+		    (ms->ms_flags & IEEE80211_MESHFLAGS_FWD)) {
+			memcpy(&prann, rann, sizeof(prann));
+			prann.rann_hopcount += 1;
+			prann.rann_ttl -= 1;
+			prann.rann_metric += ms->ms_pmetric->mpm_metric(ni);
+			hwmp_send_rann(vap->iv_bss, vap->iv_myaddr,
+			    broadcastaddr, &prann);
+		}
 	}
 }
 

==== //depot/projects/scottl-camlock/src/sys/powerpc/aim/machdep.c#8 (text+ko) ====

@@ -55,7 +55,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/powerpc/aim/machdep.c,v 1.130 2009/10/27 10:47:58 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/powerpc/aim/machdep.c,v 1.131 2009/10/29 14:22:09 nwhitehorn Exp $");
 
 #include "opt_compat.h"
 #include "opt_ddb.h"
@@ -897,8 +897,10 @@
 cpu_idle(int busy)
 {
 	uint32_t msr;
+	uint16_t vers;
 
 	msr = mfmsr();
+	vers = mfpvr() >> 16;
 
 #ifdef INVARIANTS
 	if ((msr & PSL_EE) != PSL_EE) {
@@ -908,9 +910,25 @@
 	}
 #endif
 	if (powerpc_pow_enabled) {
-		powerpc_sync();
-		mtmsr(msr | PSL_POW);
-		isync();
+		switch (vers) {
+		case IBM970:
+		case IBM970FX:
+		case IBM970MP:
+		case MPC7447A:
+		case MPC7448:
+		case MPC7450:
+		case MPC7455:
+		case MPC7457:
+			__asm __volatile("\
+			    dssall; sync; mtmsr %0; isync"
+			    :: "r"(msr | PSL_POW));
+			break;
+		default:
+			powerpc_sync();
+			mtmsr(msr | PSL_POW);
+			isync();
+			break;
+		}
 	}
 }
 

==== //depot/projects/scottl-camlock/src/sys/sys/ata.h#13 (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/sys/ata.h,v 1.42 2009/09/27 20:48:10 mav Exp $
+ * $FreeBSD: src/sys/sys/ata.h,v 1.43 2009/10/29 13:52:34 mav Exp $
  */
 
 #ifndef _SYS_ATA_H_
@@ -226,7 +226,11 @@
 /*128*/ u_int16_t       security_status;
 	u_int16_t       reserved129[31];
 /*160*/ u_int16_t       cfa_powermode1;
-	u_int16_t       reserved161[15];
+	u_int16_t       reserved161;
+/*162*/ u_int16_t       cfa_kms_support;
+/*163*/ u_int16_t       cfa_trueide_modes;
+/*164*/ u_int16_t       cfa_memory_modes;
+	u_int16_t       reserved165[11];
 /*176*/ u_int8_t        media_serial[60];
 /*206*/ u_int16_t       sct;
 	u_int16_t       reserved206[2];

==== //depot/projects/scottl-camlock/src/sys/sys/time.h#10 (text+ko) ====

@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)time.h	8.5 (Berkeley) 5/4/95
- * $FreeBSD: src/sys/sys/time.h,v 1.79 2009/03/14 19:15:13 das Exp $
+ * $FreeBSD: src/sys/sys/time.h,v 1.80 2009/10/29 09:27:09 ru Exp $
  */
 
 #ifndef _SYS_TIME_H_
@@ -283,7 +283,7 @@
  *
  * Functions with the "get" prefix returns a less precise result
  * much faster than the functions without "get" prefix and should
- * be used where a precision of 10 msec is acceptable or where
+ * be used where a precision of 1/hz seconds is acceptable or where
  * performance is priority. (NB: "precision", _not_ "resolution" !) 
  * 
  */

==== //depot/projects/scottl-camlock/src/usr.sbin/crashinfo/crashinfo.sh#2 (text+ko) ====

@@ -27,7 +27,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/usr.sbin/crashinfo/crashinfo.sh,v 1.1 2008/08/05 20:41:46 jhb Exp $
+# $FreeBSD: src/usr.sbin/crashinfo/crashinfo.sh,v 1.2 2009/10/29 13:45:33 jhb Exp $
 
 usage()
 {
@@ -304,3 +304,10 @@
 echo "kernel config"
 echo
 config -x $KERNEL
+
+echo
+echo "------------------------------------------------------------------------"
+echo "ddb capture buffer"
+echo
+
+ddb capture -M $VMCORE -N $KERNEL print

From owner-p4-projects@FreeBSD.ORG  Fri Oct 30 06:48:19 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 99D421065676; Fri, 30 Oct 2009 06:48: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 53C21106566C
	for ; Fri, 30 Oct 2009 06:48:19 +0000 (UTC)
	(envelope-from remko@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 2824B8FC0C
	for ; Fri, 30 Oct 2009 06:48:19 +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 n9U6mJwD022137
	for ; Fri, 30 Oct 2009 06:48:19 GMT
	(envelope-from remko@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9U6mJer022135
	for perforce@freebsd.org; Fri, 30 Oct 2009 06:48:19 GMT
	(envelope-from remko@freebsd.org)
Date: Fri, 30 Oct 2009 06:48:19 GMT
Message-Id: <200910300648.n9U6mJer022135@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	remko@freebsd.org using -f
From: Remko Lodder 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 169949 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, 30 Oct 2009 06:48:19 -0000

http://p4web.freebsd.org/chv.cgi?CH=169949

Change 169949 by remko@remko_guardian on 2009/10/30 06:47:52

	Translated a bit further.
	Resolved build problem [1]
	
	Facilitated by:		Snow B.V.
	Prodded by:		rene [1]

Affected files ...

.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/faq/book.sgml#20 edit

Differences ...

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/faq/book.sgml#20 (text+ko) ====

@@ -2158,7 +2158,7 @@
 	    wanneer de FS blok grootte 4 KB is.
 
 	  Voor blok grootte's van 8 KB en groter moet alles
-	    gelimiteerd worden door de 2 G - 1; limitatie
+	    gelimiteerd worden door de 2 G - 1 limitatie
 	    op FS blok nummers, maar wordt in werkelijkheid gelimiteerd
 	    door de 1 G - 1 limitatie op FS blok nummers.
 	    Het gebruik van de correcte limitatie van 2 G - 1
@@ -2460,17 +2460,18 @@
 	  
 
 	  
-	    &os; supports SCSI changers using the &man.ch.4; device
-	      and the &man.chio.1; command.  The details of how you
-	      actually control the changer can be found in the
-	      &man.chio.1; manual page.
+	    &os; ondersteund SCSI wisselaars door middel van het
+	      &man.ch.4; apparaat en de &man.chio.1; commando.  De
+	      details over hoe de wisselaar bediend kan worden kan
+	      gevonden worden in de &man.chio.1; handleiding.
 
-	    If you are not using AMANDA
-	      or some other product that already understands changers,
-	      remember that they only know how to move a tape from one
-	      point to another, so you need to keep track of which slot a
-	      tape is in, and which slot the tape currently in the drive
-	      needs to go back to.
+	    Als je geen gebruik maakt van
+	      AMANDA of een ander product wat
+	      wisselaars al begrijpt, deze alleen weten hoe een tape van
+	      één plek naar de andere verplaatst kan worden,
+	      dus dat je zelf in de gaten moet houden welke tape in welk
+	      slot zit, en naar welk slot de tape moet die momenteel in
+	      gebruik is.
 	  
 	
 

From owner-p4-projects@FreeBSD.ORG  Fri Oct 30 11:56:56 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A9BFC106568F; Fri, 30 Oct 2009 11:56:56 +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 6E26B106566B
	for ; Fri, 30 Oct 2009 11:56:56 +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 40F328FC14
	for ; Fri, 30 Oct 2009 11:56:56 +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 n9UBuutn059541
	for ; Fri, 30 Oct 2009 11:56:56 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9UBuuCr059539
	for perforce@freebsd.org; Fri, 30 Oct 2009 11:56:56 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Fri, 30 Oct 2009 11:56:56 GMT
Message-Id: <200910301156.n9UBuuCr059539@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 169952 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, 30 Oct 2009 11:56:56 -0000

http://p4web.freebsd.org/chv.cgi?CH=169952

Change 169952 by hselasky@hselasky_laptop001 on 2009/10/30 11:56:44

	
	USB CORE:
	 - add more functions to Linux compat layer.
	 - patch from: Leunam Elebek

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#49 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.h#23 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#49 (text+ko) ====

@@ -1663,3 +1663,58 @@
 		goto tr_setup;
 	}
 }
+
+/*------------------------------------------------------------------------*
+ *	usb_fill_bulk_urb
+ *------------------------------------------------------------------------*/
+void
+usb_fill_bulk_urb(struct urb *urb, struct usb_device *udev,
+    struct usb_host_endpoint *uhe, void *buf,
+    int length, usb_complete_t callback, void *arg)
+{
+	urb->dev = udev;
+	urb->endpoint = uhe;
+	urb->transfer_buffer = buf;
+	urb->transfer_buffer_length = length;
+	urb->complete = callback;
+	urb->context = arg;
+}
+
+/*------------------------------------------------------------------------*
+ *	usb_bulk_msg
+ *
+ * NOTE: This function can also be used for interrupt endpoints!
+ *
+ * Return values:
+ *    0: Success
+ * Else: Failure
+ *------------------------------------------------------------------------*/
+int
+usb_bulk_msg(struct usb_device *udev, struct usb_host_endpoint *uhe,
+    void *data, int len, uint16_t *pactlen, usb_timeout_t timeout)
+{
+	struct urb *urb;
+	int err;
+
+	if (uhe == NULL)
+		return (-EINVAL);
+	if (len < 0)
+		return (-EINVAL);
+
+	err = usb_setup_endpoint(udev, uhe, 4096 /* bytes */);
+	if (err)
+		return (err);
+
+	urb = usb_alloc_urb(0, 0);
+	if (urb == NULL)
+		return (-ENOMEM);
+
+        usb_fill_bulk_urb(urb, udev, uhe, data, len,
+	    usb_linux_wait_complete, NULL);
+
+	err = usb_start_wait_urb(urb, timeout, pactlen);
+
+	usb_free_urb(urb);
+
+	return (err);
+}

==== //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.h#23 (text+ko) ====

@@ -299,6 +299,11 @@
 void	usb_linux_register(void *arg);
 void	usb_linux_deregister(void *arg);
 
+void	usb_fill_bulk_urb(struct urb *, struct usb_device *,
+	    struct usb_host_endpoint *, void *, int, usb_complete_t, void *);
+int	usb_bulk_msg(struct usb_device *, struct usb_host_endpoint *,
+	    void *, int, uint16_t *, usb_timeout_t);
+
 #define	interface_to_usbdev(intf) (intf)->linux_udev
 #define	interface_to_bsddev(intf) (intf)->linux_udev
 

From owner-p4-projects@FreeBSD.ORG  Fri Oct 30 18:40:42 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 43CC71065670; Fri, 30 Oct 2009 18:40:42 +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 07EC9106566B
	for ; Fri, 30 Oct 2009 18:40:42 +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 E89D78FC17
	for ; Fri, 30 Oct 2009 18:40:41 +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 n9UIefbS017347
	for ; Fri, 30 Oct 2009 18:40:41 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9UIefqC017345
	for perforce@freebsd.org; Fri, 30 Oct 2009 18:40:41 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Fri, 30 Oct 2009 18:40:41 GMT
Message-Id: <200910301840.n9UIefqC017345@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 169969 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, 30 Oct 2009 18:40:42 -0000

http://p4web.freebsd.org/chv.cgi?CH=169969

Change 169969 by pgj@beehive on 2009/10/30 18:40:00

	IFC

Affected files ...

.. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#39 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/printing/chapter.sgml#11 integrate
.. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#34 integrate
.. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#32 integrate
.. //depot/projects/docproj_hu/doc/share/pgpkeys/sylvio.key#1 branch
.. //depot/projects/docproj_hu/www/en/developers.sgml#33 integrate
.. //depot/projects/docproj_hu/www/en/platforms/Makefile#2 integrate
.. //depot/projects/docproj_hu/www/en/platforms/amd64.sgml#4 integrate
.. //depot/projects/docproj_hu/www/en/platforms/amd64/Makefile#2 delete
.. //depot/projects/docproj_hu/www/en/platforms/amd64/motherboards.sgml#7 delete
.. //depot/projects/docproj_hu/www/share/sgml/news.xml#72 integrate
.. //depot/projects/docproj_hu/www/share/sgml/release.ent#17 integrate

Differences ...

==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#39 (text+ko) ====

@@ -13,7 +13,7 @@
                  builds for the other languages, and we will poke fun of you
                  in public.
 
-     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.490 2009/10/04 14:47:10 jh Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.491 2009/10/29 23:37:50 sylvio Exp $
 -->
 
 aaron@FreeBSD.org">
@@ -1054,6 +1054,8 @@
 
 swallace@FreeBSD.org">
 
+sylvio@FreeBSD.org">
+
 syrinx@FreeBSD.org">
 
 tabthorpe@FreeBSD.org">

==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/printing/chapter.sgml#11 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
 
     
@@ -1186,6 +1186,11 @@
       &pgpkey.nork;
     
 
+    
+      &a.sylvio;
+      &pgpkey.sylvio;
+    
+
     
       &a.syrinx;
       &pgpkey.syrinx;

==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#32 (text+ko) ====

@@ -1,5 +1,5 @@
 
-
+
 
 
 
@@ -283,6 +283,7 @@
 
 
 
+
 
 
 

==== //depot/projects/docproj_hu/www/en/developers.sgml#33 (text+ko) ====

@@ -6,7 +6,7 @@
 us to update author names, or the representation of those names (such
 as adding email addresses), by just editing a single file.
 
-$FreeBSD: www/en/developers.sgml,v 1.231 2009/10/04 15:00:07 jh Exp $
+$FreeBSD: www/en/developers.sgml,v 1.232 2009/10/29 23:45:07 sylvio Exp $
 
 -->
 
@@ -524,6 +524,7 @@
 
 
 
+
 
 
 

==== //depot/projects/docproj_hu/www/en/platforms/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/platforms/Makefile,v 1.12 2006/11/09 06:29:55 jb Exp $
+# $FreeBSD: www/en/platforms/Makefile,v 1.13 2009/10/30 17:43:24 brueffer Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -21,7 +21,6 @@
 DOCS+=	x86-64.sgml
 DOCS+=	xbox.sgml
 
-SUBDIR=	amd64
-SUBDIR+=ia64
+SUBDIR=	ia64
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"

==== //depot/projects/docproj_hu/www/en/platforms/amd64.sgml#4 (text+ko) ====

@@ -1,6 +1,6 @@
 
-
+
 
 
 
@@ -41,7 +41,6 @@
 
   
FreeBSD/amd64 Specific Resources

   
 

==== //depot/projects/docproj_hu/www/share/sgml/news.xml#72 (text+ko) ====

@@ -25,7 +25,7 @@
 
   
     
-      $FreeBSD: www/share/sgml/news.xml,v 1.273 2009/10/11 17:49:27 danger Exp $
+      $FreeBSD: www/share/sgml/news.xml,v 1.275 2009/10/30 00:00:33 sylvio Exp $
     
   
 
@@ -36,6 +36,31 @@
       10
 
       
+	29
+	
+	  
New committer: Sylvio
+	    Cesar Teixeira (ports)

+	
+      
+
+      
+	28
+
+	
+	  &os; 8.0-RC2 Available
+
+	  
The second of the Release Candidates for the &os;-8.0
+	    release cycle is now available.  ISO images for Tier-1
+	    architectures and a memory stick image for
+	    amd64/i386 are now available
+	    on most of the &os;
+	    mirror sites.

+	
+      
+
+      
 	11
 
 	

==== //depot/projects/docproj_hu/www/share/sgml/release.ent#17 (text+ko) ====

@@ -1,4 +1,4 @@
-
+
 
 
 
 
 
@@ -22,6 +22,34 @@
       10
 
       
+	29
+
+	
+	  
Új tag: Sylvio
+	    Cesar Teixeira (ports)

+	
+      
+
+      
+	28
+
+	
+	  Megjelent a &os; 8.0-RC2! 
+
+	  
Mostantól érhetõ el a &os; 8.0
+	    megjelenési ciklusának második
+	    kiadásra jelölt változata.  A &os; tükrözések
+	    többségén már megtalálhatjuk
+	    az ISO lemezképeket az összes Tier 1,
+	    valamint a pendrive formátumú
+	    telepítõkészleteket az amd64 és
+	    i386 architektúrákra.

+	
+      
+
+      
 	11
 
 	

From owner-p4-projects@FreeBSD.ORG  Fri Oct 30 21:50:52 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 998F01065670; Fri, 30 Oct 2009 21:50: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 5E284106568D
	for ; Fri, 30 Oct 2009 21:50:52 +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 4BF9B8FC1A
	for ; Fri, 30 Oct 2009 21:50:52 +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 n9ULoqZ7044223
	for ; Fri, 30 Oct 2009 21:50:52 GMT
	(envelope-from truncs@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9ULoqGo044221
	for perforce@freebsd.org; Fri, 30 Oct 2009 21:50:52 GMT
	(envelope-from truncs@FreeBSD.org)
Date: Fri, 30 Oct 2009 21:50:52 GMT
Message-Id: <200910302150.n9ULoqGo044221@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 169976 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, 30 Oct 2009 21:50:52 -0000

http://p4web.freebsd.org/chv.cgi?CH=169976

Change 169976 by truncs@aditya on 2009/10/30 21:50:45

	It actually uses ext2_bmaparray and not ufs_bmaparray.

Affected files ...

.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_bmap.c#4 edit

Differences ...

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_bmap.c#4 (text+ko) ====

@@ -92,7 +92,7 @@
  * which they point.  Triple indirect blocks are addressed by one less than
  * the address of the first double indirect block to which they point.
  *
- * ufs_bmaparray does the bmap conversion, and if requested returns the
+ * ext2_bmaparray does the bmap conversion, and if requested returns the
  * array of logical blocks which must be traversed to get to a block.
  * Each entry contains the offset into that block that gets you to the
  * next block and the disk address of the block (if it is assigned).

From owner-p4-projects@FreeBSD.ORG  Sat Oct 31 08:47:49 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id ECA0E106568B; Sat, 31 Oct 2009 08:47:48 +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 B10E61065676
	for ; Sat, 31 Oct 2009 08:47:48 +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 9EBD18FC08
	for ; Sat, 31 Oct 2009 08:47:48 +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 n9V8lmmq033949
	for ; Sat, 31 Oct 2009 08:47:48 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9V8lm6l033947
	for perforce@freebsd.org; Sat, 31 Oct 2009 08:47:48 GMT
	(envelope-from mav@freebsd.org)
Date: Sat, 31 Oct 2009 08:47:48 GMT
Message-Id: <200910310847.n9V8lm6l033947@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 169980 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: Sat, 31 Oct 2009 08:47:49 -0000

http://p4web.freebsd.org/chv.cgi?CH=169980

Change 169980 by mav@mav_mavtest on 2009/10/31 08:47:33

	Ensure target/lun passed from user-level supported on this bus.
	Scanning unsupported IDs causes different issues from duplicate
	devices to system crash.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#111 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#111 (text+ko) ====

@@ -453,7 +453,34 @@
 			ccb = xpt_alloc_ccb();
 
 			CAM_SIM_LOCK(bus->sim);
-
+			/* Ensure passed in target/lun supported on this bus. */
+			if ((inccb->ccb_h.target_id != CAM_TARGET_WILDCARD) ||
+			    (inccb->ccb_h.target_lun != CAM_LUN_WILDCARD)) {
+				if (xpt_create_path(&ccb->ccb_h.path,
+					    xpt_periph,
+					    inccb->ccb_h.path_id,
+					    CAM_TARGET_WILDCARD,
+					    CAM_LUN_WILDCARD) != CAM_REQ_CMP) {
+					error = EINVAL;
+					CAM_SIM_UNLOCK(bus->sim);
+					xpt_free_ccb(ccb);
+					break;
+				}
+				xpt_setup_ccb(&ccb->ccb_h, ccb->ccb_h.path,
+				    inccb->ccb_h.pinfo.priority);
+				ccb->ccb_h.func_code = XPT_PATH_INQ;
+				xpt_action(ccb);
+				xpt_free_path(ccb->ccb_h.path);
+				if ((inccb->ccb_h.target_id != CAM_TARGET_WILDCARD &&
+				    inccb->ccb_h.target_id > ccb->cpi.max_target) ||
+				    (inccb->ccb_h.target_lun != CAM_LUN_WILDCARD &&
+				    inccb->ccb_h.target_lun > ccb->cpi.max_lun)) {
+					error = EINVAL;
+					CAM_SIM_UNLOCK(bus->sim);
+					xpt_free_ccb(ccb);
+					break;
+				}
+			}
 			/*
 			 * Create a path using the bus, target, and lun the
 			 * user passed in.

From owner-p4-projects@FreeBSD.ORG  Sat Oct 31 09:07:08 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8043C1065670; Sat, 31 Oct 2009 09:07: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 44E40106566B
	for ; Sat, 31 Oct 2009 09:07:08 +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 32D778FC0A
	for ; Sat, 31 Oct 2009 09:07: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 n9V978Ui036442
	for ; Sat, 31 Oct 2009 09:07:08 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9V978SP036440
	for perforce@freebsd.org; Sat, 31 Oct 2009 09:07:08 GMT
	(envelope-from mav@freebsd.org)
Date: Sat, 31 Oct 2009 09:07:08 GMT
Message-Id: <200910310907.n9V978SP036440@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 169982 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: Sat, 31 Oct 2009 09:07:08 -0000

http://p4web.freebsd.org/chv.cgi?CH=169982

Change 169982 by mav@mav_mavbook on 2009/10/31 09:06:56

	Remove some obsoleted code.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#35 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#35 (text+ko) ====

@@ -340,8 +340,7 @@
 	/*
 	 * Schedule ourselves for performing the work.
 	 */
-	if (softc->state == ADA_STATE_NORMAL)
-		xpt_schedule(periph, CAM_PRIORITY_NORMAL);
+	xpt_schedule(periph, CAM_PRIORITY_NORMAL);
 	cam_periph_unlock(periph);
 
 	return;

From owner-p4-projects@FreeBSD.ORG  Sat Oct 31 09:16:18 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 04E921065679; Sat, 31 Oct 2009 09:16:18 +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 BCB871065670
	for ; Sat, 31 Oct 2009 09:16:17 +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 A906A8FC19
	for ; Sat, 31 Oct 2009 09:16:17 +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 n9V9GHta037096
	for ; Sat, 31 Oct 2009 09:16:17 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9V9GHDu037094
	for perforce@freebsd.org; Sat, 31 Oct 2009 09:16:17 GMT
	(envelope-from mav@freebsd.org)
Date: Sat, 31 Oct 2009 09:16:17 GMT
Message-Id: <200910310916.n9V9GHDu037094@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 169983 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: Sat, 31 Oct 2009 09:16:18 -0000

http://p4web.freebsd.org/chv.cgi?CH=169983

Change 169983 by mav@mav_mavbook on 2009/10/31 09:15:42

	IFC

Affected files ...

.. //depot/projects/scottl-camlock/src/share/man/man4/atapicam.4#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/umass.4#4 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#112 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/vnode.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files#52 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aac/aac_cam.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aac/aacreg.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_aiboost.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_pci.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.h#20 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-adaptec.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-marvell.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/drmP.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_scatter.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/r600_blit.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/drm/radeon_cp.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_sig.c#26 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_output.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/stack_machdep.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/aac_ioctl.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/signalvar.h#12 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/bsdiff/bsdiff/bsdiff.1#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/bsdiff/bspatch/bspatch.1#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/logger/logger.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/vmstat/vmstat.c#3 integrate

Differences ...

==== //depot/projects/scottl-camlock/src/share/man/man4/atapicam.4#4 (text+ko) ====

@@ -25,7 +25,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/atapicam.4,v 1.7 2009/10/22 11:35:12 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/atapicam.4,v 1.8 2009/10/29 15:59:27 brueffer Exp $
 .\"
 .Dd October 22, 2009
 .Dt ATAPICAM 4
@@ -39,7 +39,6 @@
 kernel configuration file:
 .Bd -ragged -offset indent
 .Cd "device scbus"
-.Cd "device cam"
 .Cd "device ata"
 .Cd "device atapicam"
 .Ed

==== //depot/projects/scottl-camlock/src/share/man/man4/umass.4#4 (text+ko) ====

@@ -25,7 +25,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/umass.4,v 1.46 2009/10/22 11:35:12 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/umass.4,v 1.47 2009/10/29 15:59:27 brueffer Exp $
 .\"
 .Dd October 22, 2009
 .Dt UMASS 4
@@ -39,7 +39,6 @@
 kernel configuration file:
 .Bd -ragged -offset indent
 .Cd "device scbus"
-.Cd "device cam"
 .Cd "device usb"
 .Cd "device umass"
 .Ed

==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#112 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.228 2009/10/23 11:26:58 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.229 2009/10/31 09:03:48 mav Exp $");
 
 #include 
 #include 

==== //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/vnode.h#7 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/vnode.h,v 1.13 2009/08/17 09:48:34 pjd Exp $
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/vnode.h,v 1.14 2009/10/30 23:33:06 pjd Exp $
  */
 
 #ifndef _OPENSOLARIS_SYS_VNODE_H_
@@ -57,6 +57,8 @@
 
 #define	v_count	v_usecount
 
+#define	V_APPEND	VAPPEND
+
 static __inline int
 vn_is_readonly(vnode_t *vp)
 {

==== //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#14 (text+ko) ====

@@ -3989,21 +3989,33 @@
 		struct thread *a_td;
 	} */ *ap;
 {
+	accmode_t accmode;
+	int error = 0;
 
 	/*
-	 * ZFS itself only knowns about VREAD, VWRITE and VEXEC, the rest
-	 * we have to handle by calling vaccess().
+	 * ZFS itself only knowns about VREAD, VWRITE, VEXEC and VAPPEND,
+	 */
+	accmode = ap->a_accmode & (VREAD|VWRITE|VEXEC|VAPPEND);
+	if (accmode != 0)
+		error = zfs_access(ap->a_vp, accmode, 0, ap->a_cred, NULL);
+
+	/*
+	 * VADMIN has to be handled by vaccess().
 	 */
-	if ((ap->a_accmode & ~(VREAD|VWRITE|VEXEC)) != 0) {
-		vnode_t *vp = ap->a_vp;
-		znode_t *zp = VTOZ(vp);
-		znode_phys_t *zphys = zp->z_phys;
+	if (error == 0) {
+		accmode = ap->a_accmode & ~(VREAD|VWRITE|VEXEC|VAPPEND);
+		if (accmode != 0) {
+			vnode_t *vp = ap->a_vp;
+			znode_t *zp = VTOZ(vp);
+			znode_phys_t *zphys = zp->z_phys;
 
-		return (vaccess(vp->v_type, zphys->zp_mode, zphys->zp_uid,
-		    zphys->zp_gid, ap->a_accmode, ap->a_cred, NULL));
+			error = vaccess(vp->v_type, zphys->zp_mode,
+			    zphys->zp_uid, zphys->zp_gid, accmode, ap->a_cred,
+			    NULL);
+		}
 	}
 
-	return (zfs_access(ap->a_vp, ap->a_accmode, 0, ap->a_cred, NULL));
+	return (error);
 }
 
 static int

==== //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#4 (text+ko) ====

@@ -304,7 +304,6 @@
  * VOP_ACCESS flags
  */
 #define	V_ACE_MASK	0x1	/* mask represents  NFSv4 ACE permissions */
-#define	V_APPEND	0x2	/* want to do append only check */
 
 /*
  * Flags for vnode operations.

==== //depot/projects/scottl-camlock/src/sys/conf/files#52 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1479 2009/10/25 10:23:11 rpaulo Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1480 2009/10/29 20:53:26 mav Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -520,14 +520,14 @@
 dev/ata/chipsets/ata-intel.c	optional ata pci | ataintel
 dev/ata/chipsets/ata-ite.c	optional ata pci | ataite
 dev/ata/chipsets/ata-jmicron.c	optional ata pci | atajmicron
-dev/ata/chipsets/ata-marvell.c	optional ata pci | atamarvell
+dev/ata/chipsets/ata-marvell.c	optional ata pci | atamarvell | ataadaptec
 dev/ata/chipsets/ata-micron.c	optional ata pci | atamicron
 dev/ata/chipsets/ata-national.c	optional ata pci | atanational
 dev/ata/chipsets/ata-netcell.c	optional ata pci | atanetcell
 dev/ata/chipsets/ata-nvidia.c	optional ata pci | atanvidia
 dev/ata/chipsets/ata-promise.c	optional ata pci | atapromise
 dev/ata/chipsets/ata-serverworks.c	optional ata pci | ataserverworks
-dev/ata/chipsets/ata-siliconimage.c	optional ata pci | atasiliconimage
+dev/ata/chipsets/ata-siliconimage.c	optional ata pci | atasiliconimage | ataati
 dev/ata/chipsets/ata-sis.c	optional ata pci | atasis
 dev/ata/chipsets/ata-via.c	optional ata pci | atavia
 dev/ata/ata-disk.c		optional atadisk

==== //depot/projects/scottl-camlock/src/sys/dev/aac/aac_cam.c#14 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/aac/aac_cam.c,v 1.32 2009/10/27 19:37:37 emaste Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/aac/aac_cam.c,v 1.33 2009/10/29 17:14:18 emaste Exp $");
 
 /*
  * CAM front-end for communicating with non-DASD devices
@@ -211,7 +211,7 @@
 {
 	struct	aac_cam *camsc;
 	struct	aac_softc *sc;
-	struct	aac_srb32 *srb;
+	struct	aac_srb *srb;
 	struct	aac_fib *fib;
 	struct	aac_command *cm;
 
@@ -351,7 +351,7 @@
 	}
 
 	fib = cm->cm_fib;
-	srb = (struct aac_srb32 *)&fib->data[0];
+	srb = (struct aac_srb *)&fib->data[0];
 	cm->cm_datalen = 0;
 
 	switch (ccb->ccb_h.flags & CAM_DIR_MASK) {
@@ -459,7 +459,7 @@
 	    AAC_FIBSTATE_REXPECTED	|
 	    AAC_FIBSTATE_NORM;
 	fib->Header.Size = sizeof(struct aac_fib_header) +
-	    sizeof(struct aac_srb32);
+	    sizeof(struct aac_srb);
 
 	aac_enqueue_ready(cm);
 	aac_startio(cm->cm_sc);

==== //depot/projects/scottl-camlock/src/sys/dev/aac/aacreg.h#7 (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/aacreg.h,v 1.27 2009/02/21 15:40:03 attilio Exp $
+ *	$FreeBSD: src/sys/dev/aac/aacreg.h,v 1.28 2009/10/29 17:14:18 emaste Exp $
  */
 
 /*
@@ -1363,7 +1363,7 @@
 /*
  * SCSI Passthrough structures
  */
-struct aac_srb32 {
+struct aac_srb {
 	u_int32_t		function;
 	u_int32_t		bus;
 	u_int32_t		target;

==== //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_aiboost.c#4 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_aiboost.c,v 1.5 2009/09/22 18:34:23 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_aiboost.c,v 1.6 2009/10/29 18:03:16 jhb Exp $");
 
 #include "opt_acpi.h"
 #include 
@@ -41,23 +41,25 @@
 #include 
 #include 
 
-#define _COMPONENT	ACPI_OEM
+#define	_COMPONENT	ACPI_OEM
 ACPI_MODULE_NAME("AIBOOST")
 
-#define DESCSTRLEN 32
-struct acpi_aiboost_element{
+#define	DESCSTRLEN	32
+
+struct acpi_aiboost_element {
 	uint32_t id;
-	char desc[DESCSTRLEN];
+	char	desc[DESCSTRLEN];
 };
+
 ACPI_SERIAL_DECL(aiboost, "ACPI AIBOOST");
-/**/
-struct acpi_aiboost_component{
-	unsigned int num;
-	struct acpi_aiboost_element elem[1];
+
+struct acpi_aiboost_component {
+	u_int	num;
+	struct acpi_aiboost_element elem[0];
 };
 
 struct acpi_aiboost_softc {
-	int pid;
+	int	pid;
 	struct acpi_aiboost_component *temp;
 	struct acpi_aiboost_component *volt;
 	struct acpi_aiboost_component *fan;
@@ -65,7 +67,7 @@
 
 static int	acpi_aiboost_probe(device_t dev);
 static int	acpi_aiboost_attach(device_t dev);
-static int 	acpi_aiboost_detach(device_t dev);
+static int	acpi_aiboost_detach(device_t dev);
 
 static device_method_t acpi_aiboost_methods[] = {
 	/* Device interface */
@@ -85,46 +87,56 @@
 static devclass_t acpi_aiboost_devclass;
 
 DRIVER_MODULE(acpi_aiboost, acpi, acpi_aiboost_driver, acpi_aiboost_devclass,
-	      0, 0);
+    0, 0);
 MODULE_DEPEND(acpi_aiboost, acpi, 1, 1, 1);
+
 static char    *abs_id[] = {"ATK0110", NULL};
 
-/*VSIF, RVLT, SVLT,  TSIF, RTMP, STMP FSIF, RFAN, SFAN */
+/* VSIF, RVLT, SVLT, TSIF, RTMP, STMP, FSIF, RFAN, SFAN */
 
-static ACPI_STATUS acpi_aiboost_getcomponent(device_t dev, char *name, struct  acpi_aiboost_component **comp)
+static ACPI_STATUS
+acpi_aiboost_getcomponent(device_t dev, char *name,
+    struct acpi_aiboost_component **comp)
 {
-	ACPI_BUFFER		buf, buf2;
-	ACPI_OBJECT            *o,*elem,*subobj;
+	ACPI_BUFFER buf, buf2;
+	ACPI_OBJECT *elem, *o, *subobj;
 	ACPI_STATUS status;
-	struct acpi_aiboost_component *c = NULL;
-
+	struct acpi_aiboost_component *c;
 	int i;
 
+	c = NULL;
 	buf.Pointer = NULL;
 	buf.Length = ACPI_ALLOCATE_BUFFER;
 	buf2.Pointer = NULL;
+	status = AcpiEvaluateObject(acpi_get_handle(dev), name, NULL, &buf);
 
-	status = AcpiEvaluateObject(acpi_get_handle(dev), name, NULL, &buf);
-	
-	if(ACPI_FAILURE(status))
-		return status;
-	
+	if (ACPI_FAILURE(status))
+		return (status);
+
 	o = buf.Pointer;
-	if(o->Type != ACPI_TYPE_PACKAGE)
+	if (o->Type != ACPI_TYPE_PACKAGE) {
+		device_printf(dev, "%s is not a package\n", name);
 		goto error;
-	
+	}
+
 	elem = o->Package.Elements;
-	if(elem->Type != ACPI_TYPE_INTEGER)
+	if (elem->Type != ACPI_TYPE_INTEGER) {
+		device_printf(dev, "First item in %s is not a count\n", name);
+		goto error;
+	}
+
+	if (elem->Integer.Value != o->Package.Count - 1) {
+		device_printf(dev, "Device count mismatch in %s\n", name);
 		goto error;
+	}
 
-	c = malloc(sizeof(struct acpi_aiboost_component)
-		   + sizeof(struct acpi_aiboost_element)
-		   * (elem->Integer.Value -1),
-		   M_DEVBUF, M_ZERO|M_WAITOK);
+	c = malloc(sizeof(struct acpi_aiboost_component) +
+	    sizeof(struct acpi_aiboost_element) * elem->Integer.Value, M_DEVBUF,
+	    M_WAITOK | M_ZERO);
 	*comp = c;
 	c->num = elem->Integer.Value;
-	
-	for(i = 1 ; i < o->Package.Count; i++){
+
+	for (i = 1; i < o->Package.Count; i++) {
 		elem = &o->Package.Elements[i];
 		if (elem->Type == ACPI_TYPE_ANY) {
 			buf2.Pointer = NULL;
@@ -132,196 +144,195 @@
 
 			status = AcpiEvaluateObject(elem->Reference.Handle,
 			    NULL, NULL, &buf2);
-			if (ACPI_FAILURE(status)){
-				printf("FETCH OBJECT\n");
+			if (ACPI_FAILURE(status)) {
+				device_printf(dev,
+				    "Failed to fetch object for %s\n", name);
 				goto error;
 			}
 			subobj = buf2.Pointer;
 		} else if (elem->Type == ACPI_TYPE_PACKAGE)
 			subobj = elem;
 		else {
-			printf("NO PACKAGE\n");
+			device_printf(dev,
+			    "Subitem %d was not a package for %s\n", i, name);
 			goto error;
 		}
-		if(ACPI_FAILURE(acpi_PkgInt32(subobj,0, &c->elem[i -1].id))){
-			printf("ID FAILED\n");
+		status = acpi_PkgInt32(subobj, 0, &c->elem[i - 1].id);
+		if (ACPI_FAILURE(status)) {
+			device_printf(dev,
+			    "Failed to fetch ID for subobject %d in %s\n", i,
+			    name);
 			goto error;
 		}
-		status = acpi_PkgStr(subobj, 1, c->elem[i - 1].desc, 
-				     sizeof(c->elem[i - 1].desc));
-		if(ACPI_FAILURE(status)){
-			if(status == E2BIG){
+		status = acpi_PkgStr(subobj, 1, c->elem[i - 1].desc,
+		    sizeof(c->elem[i - 1].desc));
+		if (ACPI_FAILURE(status)){
+			if (status == E2BIG) {
 				c->elem[i - 1].desc[DESCSTRLEN-1] = 0;
-			}else{
-				printf("DESC FAILED %d\n", i-1);
+			} else {
+				device_printf(dev,
+		    "Failed to fetch description for subobject %d in %s\n",
+				    i, name);
 				goto error;
 			}
 		}
-		
+
 		if (buf2.Pointer) {
 			AcpiOsFree(buf2.Pointer);
 			buf2.Pointer = NULL;
 		}
 	}
 
-	if(buf.Pointer)
+	if (buf.Pointer)
 		AcpiOsFree(buf.Pointer);
 
-	return 0;
+	return (0);
 
- error:
-	printf("BAD DATA\n");
-	if(buf.Pointer)
+error:
+	if (buf.Pointer)
 		AcpiOsFree(buf.Pointer);
-	if(buf2.Pointer)
+	if (buf2.Pointer)
 		AcpiOsFree(buf2.Pointer);
-	if(c)
+	if (c)
 		free(c, M_DEVBUF);
-	return AE_BAD_DATA;
+	return (AE_BAD_DATA);
 }
 
-static int 
+static int
 acpi_aiboost_get_value(ACPI_HANDLE handle, char *path, UINT32 number)
 {
 	ACPI_OBJECT arg1, *ret;
 	ACPI_OBJECT_LIST args;
 	ACPI_BUFFER buf;
-	buf.Length = ACPI_ALLOCATE_BUFFER;
-	buf.Pointer = 0;
 	int val;
 
 	arg1.Type = ACPI_TYPE_INTEGER;
 	arg1.Integer.Value = number;
 	args.Count = 1;
 	args.Pointer = &arg1;
-
-	if(ACPI_FAILURE(AcpiEvaluateObject(handle, path, &args, &buf))){
-		return -1;
-	}
+	buf.Length = ACPI_ALLOCATE_BUFFER;
+	buf.Pointer = NULL;
+	if (ACPI_FAILURE(AcpiEvaluateObject(handle, path, &args, &buf)))
+		return (-1);
 
 	ret = buf.Pointer;
-	val = (ret->Type == ACPI_TYPE_INTEGER)? ret->Integer.Value : -1;
+	if (ret->Type == ACPI_TYPE_INTEGER)
+		val = ret->Integer.Value;
+	else
+		val = -1;
 
 	AcpiOsFree(buf.Pointer);
-	return val;
+	return (val);
 }
 
 
-static int acpi_aiboost_temp_sysctl(SYSCTL_HANDLER_ARGS)
+static int
+acpi_aiboost_temp_sysctl(SYSCTL_HANDLER_ARGS)
 {
-	device_t dev = arg1;
-	int function = oidp->oid_arg2;
-	int error = 0, val;
+	device_t dev;
+	int error, val;
+
+	dev = arg1;
 	ACPI_SERIAL_BEGIN(aiboost);
-	val = acpi_aiboost_get_value(acpi_get_handle(dev), "RTMP",function );
-	error = sysctl_handle_int(oidp, &val, 0 , req);
+	val = acpi_aiboost_get_value(acpi_get_handle(dev), "RTMP", arg2);
+	error = sysctl_handle_int(oidp, &val, 0, req);
 	ACPI_SERIAL_END(aiboost);
-	
-	return 0;
+	return (error);
 }
 
-static int acpi_aiboost_volt_sysctl(SYSCTL_HANDLER_ARGS)
+static int
+acpi_aiboost_volt_sysctl(SYSCTL_HANDLER_ARGS)
 {
-	device_t dev = arg1;
-	int function = oidp->oid_arg2;
-	int error = 0, val;
+	device_t dev;
+	int error, val;
+
+	dev = arg1;
 	ACPI_SERIAL_BEGIN(aiboost);
-	val = acpi_aiboost_get_value(acpi_get_handle(dev), "RVLT", function);
-	error = sysctl_handle_int(oidp, &val, 0 , req);
+	val = acpi_aiboost_get_value(acpi_get_handle(dev), "RVLT", arg2);
+	error = sysctl_handle_int(oidp, &val, 0, req);
 	ACPI_SERIAL_END(aiboost);
-	
-	return 0;
+	return (error);
 }
 
-static int acpi_aiboost_fan_sysctl(SYSCTL_HANDLER_ARGS)
+static int
+acpi_aiboost_fan_sysctl(SYSCTL_HANDLER_ARGS)
 {
-	device_t dev = arg1;
-	int function = oidp->oid_arg2;
-	int error = 0, val;
+	device_t dev;
+	int error, val;
+
+	dev = arg1;
 	ACPI_SERIAL_BEGIN(aiboost);
-	val = acpi_aiboost_get_value(acpi_get_handle(dev), "RFAN", function);
-	error = sysctl_handle_int(oidp, &val, 0 , req);
+	val = acpi_aiboost_get_value(acpi_get_handle(dev), "RFAN", arg2);
+	error = sysctl_handle_int(oidp, &val, 0, req);
 	ACPI_SERIAL_END(aiboost);
-	
-	return 0;
+	return (error);
 }
 
 static int
 acpi_aiboost_probe(device_t dev)
 {
-	int		ret = ENXIO;
+
+	if (ACPI_ID_PROBE(device_get_parent(dev), dev, abs_id) == NULL)
+		return (ENXIO);
 
-	if (ACPI_ID_PROBE(device_get_parent(dev), dev, abs_id)) {
-		device_set_desc(dev, "ASUStek AIBOOSTER");
-		ret = 0;
-	}
-	return (ret);
+	device_set_desc(dev, "ASUStek AIBOOSTER");
+	return (0);
 }
 
 static int
 acpi_aiboost_attach(device_t dev)
 {
 	struct acpi_aiboost_softc *sc;
-	char nambuf[]="tempXXX";
+	char nambuf[16];
 	int i;
 
 	sc = device_get_softc(dev);
-	if(ACPI_FAILURE(acpi_aiboost_getcomponent(dev, "TSIF", &sc->temp)))
+	if (ACPI_FAILURE(acpi_aiboost_getcomponent(dev, "TSIF", &sc->temp)))
 		goto error;
-	for(i= 0; i < sc->temp->num; i++){
-		sprintf(nambuf,"temp%d", i);
+	for (i = 0; i < sc->temp->num; i++) {
+		snprintf(nambuf, sizeof(nambuf), "temp%d", i);
 		SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev),
-				SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
-				OID_AUTO, nambuf,
-				CTLTYPE_INT|CTLFLAG_RD, dev, 
-				sc->temp->elem[i].id,
-				acpi_aiboost_temp_sysctl,
-				"I", sc->temp->elem[i].desc);
+		    SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO,
+		    nambuf, CTLTYPE_INT | CTLFLAG_RD, dev, sc->temp->elem[i].id,
+		    acpi_aiboost_temp_sysctl, "I", sc->temp->elem[i].desc);
 	}
-	if(ACPI_FAILURE(acpi_aiboost_getcomponent(dev, "VSIF", &sc->volt)))
+
+	if (ACPI_FAILURE(acpi_aiboost_getcomponent(dev, "VSIF", &sc->volt)))
 		goto error;
-
-	for(i= 0; i < sc->volt->num; i++){
-		sprintf(nambuf,"volt%d", i);
+	for (i = 0; i < sc->volt->num; i++) {
+		snprintf(nambuf, sizeof(nambuf), "volt%d", i);
 		SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev),
-				SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
-				OID_AUTO, nambuf,
-				CTLTYPE_INT|CTLFLAG_RD, dev, 
-				sc->volt->elem[i].id,
-				acpi_aiboost_volt_sysctl,
-				"I", sc->volt->elem[i].desc);
+		    SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO,
+		    nambuf, CTLTYPE_INT | CTLFLAG_RD, dev, sc->volt->elem[i].id,
+		    acpi_aiboost_volt_sysctl, "I", sc->volt->elem[i].desc);
 	}
 
-	if(ACPI_FAILURE(acpi_aiboost_getcomponent(dev, "FSIF", &sc->fan)))
+	if (ACPI_FAILURE(acpi_aiboost_getcomponent(dev, "FSIF", &sc->fan)))
 		goto error;
-
-	for(i= 0; i < sc->fan->num; i++){
-		sprintf(nambuf,"fan%d", i);
+	for (i = 0; i < sc->fan->num; i++) {
+		snprintf(nambuf, sizeof(nambuf), "fan%d", i);
 		SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev),
-				SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
-				OID_AUTO, nambuf,
-				CTLTYPE_INT|CTLFLAG_RD, dev, 
-				sc->fan->elem[i].id,
-				acpi_aiboost_fan_sysctl,
-				"I", sc->fan->elem[i].desc);
+		    SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO,
+		    nambuf, CTLTYPE_INT | CTLFLAG_RD, dev, sc->fan->elem[i].id,
+		    acpi_aiboost_fan_sysctl, "I", sc->fan->elem[i].desc);
 	}
 
-	
 	return (0);
  error:
-	return EINVAL;
+	return (EINVAL);
 }
 
-static int 
+static int
 acpi_aiboost_detach(device_t dev)
 {
-	struct acpi_aiboost_softc *sc = device_get_softc(dev);
+	struct acpi_aiboost_softc *sc;
 
-	if(sc->temp)
+	sc = device_get_softc(dev);
+	if (sc->temp)
 		free(sc->temp, M_DEVBUF);
-	if(sc->volt)
+	if (sc->volt)
 		free(sc->volt, M_DEVBUF);
-	if(sc->fan)
+	if (sc->fan)
 		free(sc->fan, M_DEVBUF);
 	return (0);
 }

==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_pci.c#9 (text+ko) ====

@@ -46,7 +46,7 @@
 #include "aic79xx_inline.h"
 #else
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic79xx_pci.c,v 1.26 2007/04/17 06:26:24 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic79xx_pci.c,v 1.27 2009/10/30 16:23:56 brueffer Exp $");
 #include 
 #include 
 #endif
@@ -89,6 +89,7 @@
 #define ID_AHA_39320D_B			0x801C900500419005ull
 #define ID_AHA_39320D_HP		0x8011900500AC0E11ull
 #define ID_AHA_39320D_B_HP		0x801C900500AC0E11ull
+#define ID_AHA_39320LPE 		0x8017900500459005ull
 #define ID_AIC7902_PCI_REV_A4		0x3
 #define ID_AIC7902_PCI_REV_B0		0x10
 #define SUBID_HP			0x0E11
@@ -204,6 +205,12 @@
 		"Adaptec (HP OEM) 39320D Ultra320 SCSI adapter",
 		ahd_aic7902_setup
 	},
+	{
+		ID_AHA_39320LPE,
+		ID_ALL_MASK,
+		"Adaptec 39320LPE Ultra320 SCSI adapter",
+		ahd_aic7902_setup
+	},
 	/* Generic chip probes for devices we don't know 'exactly' */
 	{
 		ID_AIC7901 & ID_9005_GENERIC_MASK,

==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.h#20 (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.110 2009/10/26 10:00:59 mav Exp $
+ * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.111 2009/10/30 20:28:49 mav Exp $
  */
 
 /* structure holding chipset config info */
@@ -97,6 +97,7 @@
 
 #define ATA_ADAPTEC_ID          0x9005
 #define ATA_ADAPTEC_1420        0x02419005
+#define ATA_ADAPTEC_1430        0x02439005
 
 #define ATA_ATI_ID              0x1002
 #define ATA_ATI_IXP200          0x43491002
@@ -216,7 +217,9 @@
 #define ATA_M88SX5080           0x508011ab
 #define ATA_M88SX5081           0x508111ab
 #define ATA_M88SX6041           0x604111ab
+#define ATA_M88SX6042           0x604211ab
 #define ATA_M88SX6081           0x608111ab
+#define ATA_M88SX7042           0x704211ab
 #define ATA_M88SX6101           0x610111ab
 #define ATA_M88SX6121           0x612111ab
 #define ATA_M88SX6145           0x614511ab

==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-adaptec.c#4 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-adaptec.c,v 1.2 2009/06/24 19:49:18 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-adaptec.c,v 1.3 2009/10/30 20:28:49 mav Exp $");
 
 #include "opt_ata.h"
 #include 
@@ -53,6 +53,7 @@
 
 /* misc defines */
 #define MV_60XX		60		//must match ata_marvell.c's definition
+#define MV_7042		72		//must match ata_marvell.c's definition
 
 
 /*
@@ -64,6 +65,7 @@
     struct ata_pci_controller *ctlr = device_get_softc(dev);
     static struct ata_chip_id ids[] =
     {{ ATA_ADAPTEC_1420, 0, 4, MV_60XX, ATA_SA300, "1420SA" },
+     { ATA_ADAPTEC_1430, 0, 4, MV_7042, ATA_SA300, "1430SA" },
      { 0, 0, 0, 0, 0, 0}};
 
     if (pci_get_vendor(dev) != ATA_ADAPTEC_ID)

==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-marvell.c#11 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-marvell.c,v 1.12 2009/09/22 11:47:21 marius Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-marvell.c,v 1.13 2009/10/30 20:28:49 mav Exp $");
 
 #include "opt_ata.h"
 #include 
@@ -67,6 +67,8 @@
 /* misc defines */
 #define MV_50XX		50
 #define MV_60XX		60
+#define MV_6042		62
+#define MV_7042		72
 #define MV_61XX		61
 
 
@@ -102,7 +104,9 @@
      { ATA_M88SX5080, 0, 8, MV_50XX, ATA_SA150, "88SX5080" },
      { ATA_M88SX5081, 0, 8, MV_50XX, ATA_SA150, "88SX5081" },
      { ATA_M88SX6041, 0, 4, MV_60XX, ATA_SA300, "88SX6041" },
+     { ATA_M88SX6042, 0, 4, MV_6042, ATA_SA300, "88SX6042" },
      { ATA_M88SX6081, 0, 8, MV_60XX, ATA_SA300, "88SX6081" },
+     { ATA_M88SX7042, 0, 4, MV_7042, ATA_SA300, "88SX7042" },
      { ATA_M88SX6101, 0, 1, MV_61XX, ATA_UDMA6, "88SX6101" },
      { ATA_M88SX6121, 0, 1, MV_61XX, ATA_UDMA6, "88SX6121" },
      { ATA_M88SX6145, 0, 2, MV_61XX, ATA_UDMA6, "88SX6145" },
@@ -119,6 +123,8 @@
     switch (ctlr->chip->cfg2) {
     case MV_50XX:
     case MV_60XX:
+    case MV_6042:
+    case MV_7042:
 	ctlr->chipinit = ata_marvell_edma_chipinit;
 	break;
     case MV_61XX:
@@ -251,6 +257,8 @@
 	ch->r_io[ATA_SCONTROL].offset = 0x00108 + ATA_MV_HOST_BASE(ch);
 	break;
     case MV_60XX:
+    case MV_6042:
+    case MV_7042:
 	ch->r_io[ATA_SSTATUS].res = ctlr->r_res1;
 	ch->r_io[ATA_SSTATUS].offset =  0x02300 + ATA_MV_EDMA_BASE(ch);
 	ch->r_io[ATA_SERROR].res = ctlr->r_res1;
@@ -383,35 +391,61 @@
 	request->dma->sg_bus & 0xffffffff);
     le32enc(bytep + 1 * sizeof(u_int32_t),
 	(u_int64_t)request->dma->sg_bus >> 32);
-    le16enc(bytep + 4 * sizeof(u_int16_t),
-	(request->flags & ATA_R_READ ? 0x01 : 0x00) | (request->tag << 1));
+    if (ctlr->chip->cfg2 != MV_6042 && ctlr->chip->cfg2 != MV_7042) {
+	    le16enc(bytep + 4 * sizeof(u_int16_t),
+		(request->flags & ATA_R_READ ? 0x01 : 0x00) | (request->tag << 1));
+
+	    i = 10;
+	    bytep[i++] = (request->u.ata.count >> 8) & 0xff;
+	    bytep[i++] = 0x10 | ATA_COUNT;
+	    bytep[i++] = request->u.ata.count & 0xff;
+	    bytep[i++] = 0x10 | ATA_COUNT;
+
+	    bytep[i++] = (request->u.ata.lba >> 24) & 0xff;
+	    bytep[i++] = 0x10 | ATA_SECTOR;
+	    bytep[i++] = request->u.ata.lba & 0xff;
+	    bytep[i++] = 0x10 | ATA_SECTOR;
+
+	    bytep[i++] = (request->u.ata.lba >> 32) & 0xff;
+	    bytep[i++] = 0x10 | ATA_CYL_LSB;
+	    bytep[i++] = (request->u.ata.lba >> 8) & 0xff;
+	    bytep[i++] = 0x10 | ATA_CYL_LSB;
+
+	    bytep[i++] = (request->u.ata.lba >> 40) & 0xff;
+	    bytep[i++] = 0x10 | ATA_CYL_MSB;
+	    bytep[i++] = (request->u.ata.lba >> 16) & 0xff;
+	    bytep[i++] = 0x10 | ATA_CYL_MSB;
 
-    i = 10;
-    bytep[i++] = (request->u.ata.count >> 8) & 0xff;
-    bytep[i++] = 0x10 | ATA_COUNT;
-    bytep[i++] = request->u.ata.count & 0xff;
-    bytep[i++] = 0x10 | ATA_COUNT;
+	    bytep[i++] = ATA_D_LBA | ATA_D_IBM | ((request->u.ata.lba >> 24) & 0xf);
+	    bytep[i++] = 0x10 | ATA_DRIVE;
 
-    bytep[i++] = (request->u.ata.lba >> 24) & 0xff;
-    bytep[i++] = 0x10 | ATA_SECTOR;
-    bytep[i++] = request->u.ata.lba & 0xff;
-    bytep[i++] = 0x10 | ATA_SECTOR;
+	    bytep[i++] = request->u.ata.command;
+	    bytep[i++] = 0x90 | ATA_COMMAND;
+    } else {
+	    le32enc(bytep + 2 * sizeof(u_int32_t),
+		(request->flags & ATA_R_READ ? 0x01 : 0x00) | (request->tag << 1));
 
-    bytep[i++] = (request->u.ata.lba >> 32) & 0xff;
-    bytep[i++] = 0x10 | ATA_CYL_LSB;
-    bytep[i++] = (request->u.ata.lba >> 8) & 0xff;
-    bytep[i++] = 0x10 | ATA_CYL_LSB;
+	    i = 16;
+	    bytep[i++] = 0;
+	    bytep[i++] = 0;
+	    bytep[i++] = request->u.ata.command;
+	    bytep[i++] = request->u.ata.feature & 0xff;
 
-    bytep[i++] = (request->u.ata.lba >> 40) & 0xff;
-    bytep[i++] = 0x10 | ATA_CYL_MSB;
-    bytep[i++] = (request->u.ata.lba >> 16) & 0xff;
-    bytep[i++] = 0x10 | ATA_CYL_MSB;
+	    bytep[i++] = request->u.ata.lba & 0xff;
+	    bytep[i++] = (request->u.ata.lba >> 8) & 0xff;
+	    bytep[i++] = (request->u.ata.lba >> 16) & 0xff;
+	    bytep[i++] = ATA_D_LBA | ATA_D_IBM | ((request->u.ata.lba >> 24) & 0x0f);
 
-    bytep[i++] = ATA_D_LBA | ATA_D_IBM | ((request->u.ata.lba >> 24) & 0xf);
-    bytep[i++] = 0x10 | ATA_DRIVE;
+	    bytep[i++] = (request->u.ata.lba >> 24) & 0xff;
+	    bytep[i++] = (request->u.ata.lba >> 32) & 0xff;
+	    bytep[i++] = (request->u.ata.lba >> 40) & 0xff;
+	    bytep[i++] = (request->u.ata.feature >> 8) & 0xff;
 
-    bytep[i++] = request->u.ata.command;
-    bytep[i++] = 0x90 | ATA_COMMAND;
+	    bytep[i++] = request->u.ata.count & 0xff;
+	    bytep[i++] = (request->u.ata.count >> 8) & 0xff;
+	    bytep[i++] = 0;
+	    bytep[i++] = 0;
+    }
 
     bus_dmamap_sync(ch->dma.work_tag, ch->dma.work_map,
 	BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
@@ -556,7 +590,8 @@
 	ch->dma.max_address = BUS_SPACE_MAXADDR;
 
     /* chip does not reliably do 64K DMA transfers */
-    ch->dma.max_iosize = 64 * DEV_BSIZE; 
+    if (ctlr->chip->cfg2 == MV_50XX || ctlr->chip->cfg2 == MV_60XX)
+	ch->dma.max_iosize = 64 * DEV_BSIZE; 
 }
 
 ATA_DECLARE_DRIVER(ata_marvell);

==== //depot/projects/scottl-camlock/src/sys/dev/drm/drmP.h#13 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/drm/drmP.h,v 1.39 2009/08/23 14:33:12 rnoland Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/drm/drmP.h,v 1.40 2009/10/30 16:59:58 rnoland Exp $");
 
 #ifndef _DRM_P_H_
 #define _DRM_P_H_
@@ -223,23 +223,9 @@
  * DRM_WRITEMEMORYBARRIER() prevents reordering of writes.
  * DRM_MEMORYBARRIER() prevents reordering of reads and writes.
  */
-#if defined(__i386__)
-#define DRM_READMEMORYBARRIER()		__asm __volatile( \
-					"lock; addl $0,0(%%esp)" : : : "memory");
-#define DRM_WRITEMEMORYBARRIER()	__asm __volatile("" : : : "memory");
-#define DRM_MEMORYBARRIER()		__asm __volatile( \
-					"lock; addl $0,0(%%esp)" : : : "memory");
-#elif defined(__alpha__)
-#define DRM_READMEMORYBARRIER()		alpha_mb();
-#define DRM_WRITEMEMORYBARRIER()	alpha_wmb();
-#define DRM_MEMORYBARRIER()		alpha_mb();
-#elif defined(__amd64__)
-#define DRM_READMEMORYBARRIER()		__asm __volatile( \
-					"lock; addl $0,0(%%rsp)" : : : "memory");
-#define DRM_WRITEMEMORYBARRIER()	__asm __volatile("" : : : "memory");
-#define DRM_MEMORYBARRIER()		__asm __volatile( \
-					"lock; addl $0,0(%%rsp)" : : : "memory");
-#endif
+#define DRM_READMEMORYBARRIER()		rmb()
+#define DRM_WRITEMEMORYBARRIER()	wmb()
+#define DRM_MEMORYBARRIER()		mb()
 
 #define DRM_READ8(map, offset)						\
 	*(volatile u_int8_t *)(((vm_offset_t)(map)->handle) +		\

==== //depot/projects/scottl-camlock/src/sys/dev/drm/drm_scatter.c#5 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/drm/drm_scatter.c,v 1.10 2009/03/25 01:41:56 rnoland Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/drm/drm_scatter.c,v 1.12 2009/10/30 18:30:13 rnoland Exp $");
 
 /** @file drm_scatter.c
  * Allocation of memory for scatter-gather mappings by the graphics chip.
@@ -47,79 +47,50 @@
 {
 	struct drm_sg_mem *entry;
 	struct drm_dma_handle *dmah;
-	unsigned long pages;
 	int ret;
 
 	if (dev->sg)
 		return EINVAL;
 
 	entry = malloc(sizeof(*entry), DRM_MEM_SGLISTS, M_WAITOK | M_ZERO);
-	if (!entry)
-		return ENOMEM;
+	entry->pages = round_page(request->size) / PAGE_SIZE;
+	DRM_DEBUG("sg size=%ld pages=%d\n", request->size, entry->pages);
 
-	pages = round_page(request->size) / PAGE_SIZE;
-	DRM_DEBUG("sg size=%ld pages=%ld\n", request->size, pages);
-
-	entry->pages = pages;
-
-	entry->busaddr = malloc(pages * sizeof(*entry->busaddr), DRM_MEM_PAGES,
+	entry->busaddr = malloc(entry->pages * sizeof(*entry->busaddr),
+	    DRM_MEM_PAGES, M_WAITOK | M_ZERO);
+	dmah = malloc(sizeof(struct drm_dma_handle), DRM_MEM_DMA,
 	    M_WAITOK | M_ZERO);
-	if (!entry->busaddr) {
-		free(entry, DRM_MEM_SGLISTS);
-		return ENOMEM;
-	}
-
-	dmah = malloc(sizeof(struct drm_dma_handle), DRM_MEM_DMA,
-	    M_ZERO | M_NOWAIT);
-	if (dmah == NULL) {
-		free(entry->busaddr, DRM_MEM_PAGES);
-		free(entry, DRM_MEM_SGLISTS);
-		return ENOMEM;

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Sat Oct 31 11:16:18 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 06F1D1065676; Sat, 31 Oct 2009 11:16:18 +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 A7007106566B
	for ; Sat, 31 Oct 2009 11:16:17 +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 9450F8FC08
	for ; Sat, 31 Oct 2009 11:16:17 +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 n9VBGHbT047743
	for ; Sat, 31 Oct 2009 11:16:17 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9VBGHvp047741
	for perforce@freebsd.org; Sat, 31 Oct 2009 11:16:17 GMT
	(envelope-from mav@freebsd.org)
Date: Sat, 31 Oct 2009 11:16:17 GMT
Message-Id: <200910311116.n9VBGHvp047741@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 169986 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: Sat, 31 Oct 2009 11:16:18 -0000

http://p4web.freebsd.org/chv.cgi?CH=169986

Change 169986 by mav@mav_mavbook on 2009/10/31 11:15:16

	IFC

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#36 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#46 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#29 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.h#19 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#113 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#49 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sg.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/bios/apm.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/conf.h#16 integrate

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#36 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/cam/ata/ata_da.c,v 1.7 2009/10/23 08:27:55 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/ata/ata_da.c,v 1.8 2009/10/31 10:43:38 mav Exp $");
 
 #include 
 

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#17 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/cam/ata/ata_da.c,v 1.1 2009/07/10 08:18:08 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/ata/ata_pmp.c,v 1.2 2009/10/31 10:43:38 mav Exp $");
 
 #include 
 

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#46 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.9 2009/10/23 12:36:42 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.10 2009/10/31 10:43:38 mav Exp $");
 
 #include 
 #include 

==== //depot/projects/scottl-camlock/src/sys/cam/cam.h#9 (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.h,v 1.14 2009/10/23 08:27:55 mav Exp $
+ * $FreeBSD: src/sys/cam/cam.h,v 1.15 2009/10/31 10:43:38 mav Exp $
  */
 
 #ifndef _CAM_CAM_H

==== //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#29 (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_ccb.h,v 1.38 2009/08/18 08:46:54 mav Exp $
+ * $FreeBSD: src/sys/cam/cam_ccb.h,v 1.39 2009/10/31 10:43:38 mav Exp $
  */
 
 #ifndef _CAM_CAM_CCB_H

==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.h#19 (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.20 2009/06/22 14:43:48 scottl Exp $
+ * $FreeBSD: src/sys/cam/cam_periph.h,v 1.21 2009/10/31 10:43:38 mav Exp $
  */
 
 #ifndef _CAM_CAM_PERIPH_H

==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#113 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.229 2009/10/31 09:03:48 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.230 2009/10/31 10:43:38 mav Exp $");
 
 #include 
 #include 

==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#49 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.240 2009/10/23 08:27:55 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.241 2009/10/31 10:43:38 mav Exp $");
 
 #include 
 

==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_sg.c#16 (text+ko) ====

@@ -30,7 +30,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sg.c,v 1.15 2009/07/10 08:18:08 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sg.c,v 1.16 2009/10/31 10:43:38 mav Exp $");
 
 #include 
 #include 

==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.c#20 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_xpt.c,v 1.4 2009/10/23 08:27:55 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_xpt.c,v 1.5 2009/10/31 10:43:38 mav Exp $");
 
 #include 
 #include 

==== //depot/projects/scottl-camlock/src/sys/i386/bios/apm.c#10 (text+ko) ====

@@ -17,7 +17,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/i386/bios/apm.c,v 1.155 2009/05/04 08:41:54 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/bios/apm.c,v 1.156 2009/10/31 10:38:30 ed Exp $");
 
 #include 
 #include 
@@ -79,9 +79,8 @@
 #define	SCFLAG_OCTL	0x0000002
 #define	SCFLAG_OPEN	(SCFLAG_ONORMAL|SCFLAG_OCTL)
 
-#define APMDEV(dev)	(dev2unit(dev)&0x0f)
 #define APMDEV_NORMAL	0
-#define APMDEV_CTL	8
+#define APMDEV_CTL	1
 
 #ifdef PC98
 extern int bios32_apm98(struct bios_regs *, u_int, u_short);
@@ -1249,8 +1248,10 @@
 	sc->suspending = 0;
 	sc->running = 0;
 
-	make_dev(&apm_cdevsw, 0, 0, 5, 0664, "apm");
-	make_dev(&apm_cdevsw, 8, 0, 5, 0660, "apmctl");
+	make_dev(&apm_cdevsw, APMDEV_NORMAL,
+	    UID_ROOT, GID_OPERATOR, 0664, "apm");
+	make_dev(&apm_cdevsw, APMDEV_CTL,
+	    UID_ROOT, GID_OPERATOR, 0660, "apmctl");
 	return 0;
 }
 
@@ -1258,12 +1259,11 @@
 apmopen(struct cdev *dev, int flag, int fmt, struct thread *td)
 {
 	struct apm_softc *sc = &apm_softc;
-	int ctl = APMDEV(dev);
 
 	if (sc == NULL || sc->initialized == 0)
 		return (ENXIO);
 
-	switch (ctl) {
+	switch (dev2unit(dev)) {
 	case APMDEV_CTL:
 		if (!(flag & FWRITE))
 			return EINVAL;
@@ -1275,9 +1275,6 @@
 	case APMDEV_NORMAL:
 		sc->sc_flags |= SCFLAG_ONORMAL;
 		break;
-	default:
-		return ENXIO;
-		break;
 	}
 	return 0;
 }
@@ -1286,9 +1283,8 @@
 apmclose(struct cdev *dev, int flag, int fmt, struct thread *td)
 {
 	struct apm_softc *sc = &apm_softc;
-	int ctl = APMDEV(dev);
 
-	switch (ctl) {
+	switch (dev2unit(dev)) {
 	case APMDEV_CTL:
 		apm_lastreq_rejected();
 		sc->sc_flags &= ~SCFLAG_OCTL;
@@ -1429,7 +1425,7 @@
 	}
 
 	/* for /dev/apmctl */
-	if (APMDEV(dev) == APMDEV_CTL) {
+	if (dev2unit(dev) == APMDEV_CTL) {
 		struct apm_event_info *evp;
 		int i;
 
@@ -1468,7 +1464,7 @@
 	int error;
 	u_char enabled;
 
-	if (APMDEV(dev) != APMDEV_CTL)
+	if (dev2unit(dev) != APMDEV_CTL)
 		return(ENODEV);
 	if (uio->uio_resid != sizeof(u_int))
 		return(E2BIG);

==== //depot/projects/scottl-camlock/src/sys/sys/conf.h#16 (text+ko) ====

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)conf.h	8.5 (Berkeley) 1/9/95
- * $FreeBSD: src/sys/sys/conf.h,v 1.252 2009/08/28 14:06:55 jhb Exp $
+ * $FreeBSD: src/sys/sys/conf.h,v 1.253 2009/10/31 10:35:41 ed Exp $
  */
 
 #ifndef _SYS_CONF_H_
@@ -210,15 +210,13 @@
 	d_kqfilter_t		*d_kqfilter;
 	d_purge_t		*d_purge;
 	d_mmap_single_t		*d_mmap_single;
-	uid_t			d_uid;
-	gid_t			d_gid;
-	mode_t			d_mode;
-	const char		*d_kind;
+
+	int32_t			d_spare0[3];
+	void			*d_spare1[3];
 
 	/* These fields should not be messed with by drivers */
-	LIST_ENTRY(cdevsw)	d_list;
 	LIST_HEAD(, cdev)	d_devs;
-	int			d_spare3;
+	int			d_spare2;
 	union {
 		struct cdevsw		*gianttrick;
 		SLIST_ENTRY(cdevsw)	postfree_list;

From owner-p4-projects@FreeBSD.ORG  Sat Oct 31 11:49:52 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2F2671065694; Sat, 31 Oct 2009 11:49: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 E72EE106568B
	for ; Sat, 31 Oct 2009 11:49: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 D59058FC19
	for ; Sat, 31 Oct 2009 11:49: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 n9VBnp50050229
	for ; Sat, 31 Oct 2009 11:49:51 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9VBnpDe050227
	for perforce@freebsd.org; Sat, 31 Oct 2009 11:49:51 GMT
	(envelope-from mav@freebsd.org)
Date: Sat, 31 Oct 2009 11:49:51 GMT
Message-Id: <200910311149.n9VBnpDe050227@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 169989 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: Sat, 31 Oct 2009 11:49:52 -0000

http://p4web.freebsd.org/chv.cgi?CH=169989

Change 169989 by mav@mav_mavbook on 2009/10/31 11:48:57

	IFC

Affected files ...

.. //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#26 integrate

Differences ...

==== //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#26 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.65 2009/09/27 22:00:26 mav Exp $");
+__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.66 2009/10/31 10:47:47 mav Exp $");
 
 #include 
 #include 

From owner-p4-projects@FreeBSD.ORG  Sat Oct 31 13:07:09 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 77E831065694; Sat, 31 Oct 2009 13:07: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 3B5651065679
	for ; Sat, 31 Oct 2009 13:07:09 +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 2927D8FC1B
	for ; Sat, 31 Oct 2009 13:07:09 +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 n9VD791t068297
	for ; Sat, 31 Oct 2009 13:07:09 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9VD79ab068295
	for perforce@freebsd.org; Sat, 31 Oct 2009 13:07:09 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sat, 31 Oct 2009 13:07:09 GMT
Message-Id: <200910311307.n9VD79ab068295@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 169992 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: Sat, 31 Oct 2009 13:07:09 -0000

http://p4web.freebsd.org/chv.cgi?CH=169992

Change 169992 by hselasky@hselasky_laptop001 on 2009/10/31 13:06:29

	
	USB CORE:
	 - correct Linux Compatibility error codes for short
	   isochronous IN transfers and make status field signed.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#50 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.h#24 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#50 (text+ko) ====

@@ -1362,8 +1362,17 @@
 
 			for (x = 0; x < urb->number_of_packets; x++) {
 				uipd = urb->iso_frame_desc + x;
+				if (uipd->actual_length > xfer->frlengths[x]) {
+					if (urb->transfer_flags & URB_SHORT_NOT_OK) {
+						/* XXX should be EREMOTEIO */
+						uipd->status = -EPIPE;
+					} else {
+						uipd->status = 0;
+					}
+				} else {
+					uipd->status = 0;
+				}
 				uipd->actual_length = xfer->frlengths[x];
-				uipd->status = 0;
 				if (!xfer->flags.ext_buffer) {
 					usbd_copy_out(xfer->frbuffers, offset,
 					    USB_ADD_BYTES(urb->transfer_buffer,
@@ -1385,8 +1394,8 @@
 		if (xfer->actlen < xfer->sumlen) {
 			/* short transfer */
 			if (urb->transfer_flags & URB_SHORT_NOT_OK) {
-				urb->status = -EPIPE;	/* XXX should be
-							 * EREMOTEIO */
+				/* XXX should be EREMOTEIO */
+				urb->status = -EPIPE;
 			} else {
 				urb->status = 0;
 			}
@@ -1482,6 +1491,7 @@
 		/* Set zero for "actual_length" */
 		for (x = 0; x < urb->number_of_packets; x++) {
 			urb->iso_frame_desc[x].actual_length = 0;
+			urb->iso_frame_desc[x].status = urb->status;
 		}
 
 		/* call callback */

==== //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.h#24 (text+ko) ====

@@ -217,7 +217,7 @@
 					 * packets are usually back to back) */
 	uint16_t length;		/* expected length */
 	uint16_t actual_length;
-	uint16_t status;
+	 int16_t status;		/* transfer status */
 };
 
 /*

From owner-p4-projects@FreeBSD.ORG  Sat Oct 31 13:11:13 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AD187106568D; Sat, 31 Oct 2009 13:11: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 712CB106566C
	for ; Sat, 31 Oct 2009 13:11:13 +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 5F7368FC12
	for ; Sat, 31 Oct 2009 13:11:13 +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 n9VDBDgW068605
	for ; Sat, 31 Oct 2009 13:11:13 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9VDBDKv068603
	for perforce@freebsd.org; Sat, 31 Oct 2009 13:11:13 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sat, 31 Oct 2009 13:11:13 GMT
Message-Id: <200910311311.n9VDBDKv068603@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 169993 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: Sat, 31 Oct 2009 13:11:13 -0000

http://p4web.freebsd.org/chv.cgi?CH=169993

Change 169993 by hselasky@hselasky_laptop001 on 2009/10/31 13:11:03

	
	USB CORE:
		 - fix issue introduced in last patch
		 - use correct length field in Linux Compat code.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#51 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#51 (text+ko) ====

@@ -1362,7 +1362,7 @@
 
 			for (x = 0; x < urb->number_of_packets; x++) {
 				uipd = urb->iso_frame_desc + x;
-				if (uipd->actual_length > xfer->frlengths[x]) {
+				if (uipd->length > xfer->frlengths[x]) {
 					if (urb->transfer_flags & URB_SHORT_NOT_OK) {
 						/* XXX should be EREMOTEIO */
 						uipd->status = -EPIPE;

From owner-p4-projects@FreeBSD.ORG  Sat Oct 31 13:33:37 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D96C21065679; Sat, 31 Oct 2009 13:33: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 9DAD4106566B
	for ; Sat, 31 Oct 2009 13:33:36 +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 8A9338FC16
	for ; Sat, 31 Oct 2009 13:33:36 +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 n9VDXaNq070318
	for ; Sat, 31 Oct 2009 13:33:36 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9VDXakU070316
	for perforce@freebsd.org; Sat, 31 Oct 2009 13:33:36 GMT
	(envelope-from mav@freebsd.org)
Date: Sat, 31 Oct 2009 13:33:36 GMT
Message-Id: <200910311333.n9VDXakU070316@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 169996 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: Sat, 31 Oct 2009 13:33:37 -0000

http://p4web.freebsd.org/chv.cgi?CH=169996

Change 169996 by mav@mav_mavbook on 2009/10/31 13:33:35

	IFC

Affected files ...

.. //depot/projects/scottl-camlock/src/sbin/mknod/mknod.8#2 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/mv/mv_sata.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#33 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.h#22 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-dma.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-lowlevel.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-queue.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-sata.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-ahci.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-intel.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-marvell.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-promise.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-serverworks.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-siliconimage.c#9 integrate

Differences ...

==== //depot/projects/scottl-camlock/src/sbin/mknod/mknod.8#2 (text+ko) ====

@@ -26,9 +26,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mknod.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD: src/sbin/mknod/mknod.8,v 1.31 2005/02/10 09:19:30 ru Exp $
+.\" $FreeBSD: src/sbin/mknod/mknod.8,v 1.32 2009/10/31 12:22:23 brueffer Exp $
 .\"
-.Dd December 15, 2004
+.Dd October 31, 2009
 .Dt MKNOD 8
 .Os
 .Sh NAME
@@ -74,9 +74,7 @@
 .It Ar major
 The major device number is an integer number which tells the kernel
 which device driver entry point to use.
-To learn what
-major device number to use for a particular device, check
-.Pa /usr/src/sys/conf/majors .
+This is a compatibility shim and should be left zero.
 .It Ar minor
 The minor device number tells the kernel which subunit
 the node corresponds to on the device; for example,

==== //depot/projects/scottl-camlock/src/sys/arm/mv/mv_sata.c#2 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/mv/mv_sata.c,v 1.1 2009/06/24 15:41:18 raj Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/mv/mv_sata.c,v 1.2 2009/10/31 13:24:14 mav Exp $");
 
 #include 
 #include 
@@ -548,14 +548,16 @@
 	uint32_t req_in;
 	int error, slot;
 
-	sc = device_get_softc(GRANDPARENT(request->dev));
+	sc = device_get_softc(device_get_parent(request->parent));
 	ch = device_get_softc(request->parent);
 
 	mtx_assert(&ch->state_mtx, MA_OWNED);
 
 	/* Only DMA R/W goes through the EDMA machine. */
 	if (request->u.ata.command != ATA_READ_DMA &&
-	    request->u.ata.command != ATA_WRITE_DMA) {
+	    request->u.ata.command != ATA_WRITE_DMA &&
+	    request->u.ata.command != ATA_READ_DMA48 &&
+	    request->u.ata.command != ATA_WRITE_DMA48) {
 
 		/* Disable EDMA before accessing legacy registers */
 		if (sata_edma_is_running(request->parent)) {
@@ -569,12 +571,9 @@
 		return (ata_begin_transaction(request));
 	}
 
-	/* Check for 48 bit access and convert if needed */
-	ata_modify_if_48bit(request);
-
 	/* Prepare data for DMA */
 	if ((error = ch->dma.load(request, NULL, NULL))) {
-		device_printf(request->dev, "setting up DMA failed!\n");
+		device_printf(request->parent, "setting up DMA failed!\n");
 		request->result = error;
 		return ATA_OP_FINISHED;
 	}
@@ -633,7 +632,7 @@
 	uint32_t res_in, res_out, icr;
 	int slot;
 
-	sc = device_get_softc(GRANDPARENT(request->dev));
+	sc = device_get_softc(device_get_parent(request->parent));
 	ch = device_get_softc(request->parent);
 
 	mtx_assert(&ch->state_mtx, MA_OWNED);

==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#33 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.309 2009/08/20 19:17:53 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.310 2009/10/31 13:24:14 mav Exp $");
 
 #include "opt_ata.h"
 #include 

==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.h#22 (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.147 2009/10/29 13:27:14 nwhitehorn Exp $
+ * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.148 2009/10/31 13:24:14 mav Exp $
  */
 
 #if 0

==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-dma.c#15 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.161 2009/09/06 14:23:26 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.162 2009/10/31 13:24:14 mav Exp $");
 
 #include 
 #include 

==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-lowlevel.c#15 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.84 2008/05/08 17:55:44 grehan Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.85 2009/10/31 13:24:14 mav Exp $");
 
 #include "opt_ata.h"
 #include 

==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.c#14 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.144 2009/04/29 21:17:18 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.145 2009/10/31 13:24:14 mav Exp $");
 
 #include "opt_ata.h"
 #include 

==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-queue.c#23 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.87 2009/10/26 11:20:14 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.88 2009/10/31 13:24:14 mav Exp $");
 
 #include "opt_ata.h"
 #include 

==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-sata.c#8 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-sata.c,v 1.6 2009/06/24 15:38:17 raj Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-sata.c,v 1.7 2009/10/31 13:24:14 mav Exp $");
 
 #include "opt_ata.h"
 #include 

==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-ahci.c#9 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-ahci.c,v 1.26 2009/07/08 06:00:21 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-ahci.c,v 1.27 2009/10/31 13:24:14 mav Exp $");
 
 #include "opt_ata.h"
 #include 

==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-intel.c#9 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-intel.c,v 1.7 2009/06/24 19:49:18 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-intel.c,v 1.8 2009/10/31 13:24:14 mav Exp $");
 
 #include "opt_ata.h"
 #include 

==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-marvell.c#12 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-marvell.c,v 1.13 2009/10/30 20:28:49 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-marvell.c,v 1.14 2009/10/31 13:24:14 mav Exp $");
 
 #include "opt_ata.h"
 #include 

==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-promise.c#7 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-promise.c,v 1.11 2009/06/24 19:49:18 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-promise.c,v 1.12 2009/10/31 13:24:14 mav Exp $");
 
 #include "opt_ata.h"
 #include 

==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-serverworks.c#8 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-serverworks.c,v 1.7 2009/10/29 13:28:37 nwhitehorn Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-serverworks.c,v 1.8 2009/10/31 13:24:14 mav Exp $");
 
 #include "opt_ata.h"
 #include 

==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-siliconimage.c#9 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-siliconimage.c,v 1.8 2009/06/24 19:49:18 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-siliconimage.c,v 1.9 2009/10/31 13:24:14 mav Exp $");
 
 #include "opt_ata.h"
 #include 

From owner-p4-projects@FreeBSD.ORG  Sat Oct 31 14:53:57 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4424F1065676; Sat, 31 Oct 2009 14:53: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 F3F23106566C
	for ; Sat, 31 Oct 2009 14:53:56 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id DFA2F8FC0A
	for ; Sat, 31 Oct 2009 14:53:56 +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 n9VErub6077537
	for ; Sat, 31 Oct 2009 14:53:56 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9VEru0j077535
	for perforce@freebsd.org; Sat, 31 Oct 2009 14:53:56 GMT
	(envelope-from trasz@freebsd.org)
Date: Sat, 31 Oct 2009 14:53:56 GMT
Message-Id: <200910311453.n9VEru0j077535@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 169999 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: Sat, 31 Oct 2009 14:53:57 -0000

http://p4web.freebsd.org/chv.cgi?CH=169999

Change 169999 by trasz@trasz_victim on 2009/10/31 14:53:15

	Move list of limits into the container.  Reason for this is to make
	the code less ugly, and to make my next step (not updating resource
	usage in unused containers) much easier.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#72 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_loginclass.c#16 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_resource.c#27 edit
.. //depot/projects/soc2009/trasz_limits/sys/sys/hrl.h#41 edit
.. //depot/projects/soc2009/trasz_limits/sys/sys/jail.h#11 edit
.. //depot/projects/soc2009/trasz_limits/sys/sys/loginclass.h#6 edit
.. //depot/projects/soc2009/trasz_limits/sys/sys/proc.h#14 edit
.. //depot/projects/soc2009/trasz_limits/sys/sys/resourcevar.h#14 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#72 (text+ko) ====

@@ -59,6 +59,16 @@
 #define	HRL_DEFAULT_BUFSIZE	4096
 #define	HRL_LOG_BUFSIZE		128
 
+/*
+ * 'hrl_limit' connects a rule with every container it's related to.
+ * For example, rule 'user:X:openfiles:deny=N/process' is linked
+ * with uidinfo for user X, and to each process of that user.
+ */
+struct hrl_limit {
+	LIST_ENTRY(hrl_limit)	hl_next;
+	struct hrl_rule		*hl_rule;
+};
+
 struct dict {
 	const char	*d_name;
 	int		d_value;
@@ -290,9 +300,9 @@
 	/*
 	 * XXX: We should sort the rules somewhat, so that 'log' and 'sig'
 	 * 	rules come before before 'deny', to spare iterations over
-	 * 	the p_limits.
+	 * 	the p_container.hc_limits.
 	 */
-	LIST_FOREACH(limit, &p->p_limits, hl_next) {
+	LIST_FOREACH(limit, &p->p_container.hc_limits, hl_next) {
 		rule = limit->hl_rule;
 		if (rule->hr_resource != resource)
 			continue;
@@ -370,7 +380,7 @@
 	for (i = 0; i <= HRL_RESOURCE_MAX; i++)
 		(*availablep)[i] = INT64_MAX;
 
-	LIST_FOREACH(limit, &p->p_limits, hl_next) {
+	LIST_FOREACH(limit, &p->p_container.hc_limits, hl_next) {
 		rule = limit->hl_rule;
 		resource = rule->hr_resource;
 		available = hrl_available_resource(p, rule);
@@ -768,10 +778,10 @@
 }
 
 /*
- * Add a new limit for a rule, increasing refcount for the rule.
+ * Connect the rule to the container, increasing refcount for the rule.
  */
 static void
-hrl_limit_add(struct hrl_limits_head *limits_head, struct hrl_rule *rule)
+hrl_container_add_rule(struct hrl_container *container, struct hrl_rule *rule)
 {
 	struct hrl_limit *limit;
 
@@ -782,12 +792,12 @@
 	limit->hl_rule = rule;
 
 	mtx_lock(&hrl_lock);
-	LIST_INSERT_HEAD(limits_head, limit, hl_next);
+	LIST_INSERT_HEAD(&container->hc_limits, limit, hl_next);
 	mtx_unlock(&hrl_lock);
 }
 
 static int
-hrl_limit_add_locked(struct hrl_limits_head *limits_head, struct hrl_rule *rule)
+hrl_container_add_rule_locked(struct hrl_container *container, struct hrl_rule *rule)
 {
 	struct hrl_limit *limit;
 
@@ -800,7 +810,7 @@
 	hrl_rule_acquire(rule);
 	limit->hl_rule = rule;
 
-	LIST_INSERT_HEAD(limits_head, limit, hl_next);
+	LIST_INSERT_HEAD(&container->hc_limits, limit, hl_next);
 	return (0);
 }
 
@@ -810,14 +820,14 @@
  * the number of limit structures removed.
  */
 static int
-hrl_limit_remove_matching(struct hrl_limits_head *limits_head,
+hrl_container_remove_rules(struct hrl_container *container,
     const struct hrl_rule *filter)
 {
 	int removed = 0;
 	struct hrl_limit *limit, *limittmp;
 
 	mtx_lock(&hrl_lock);
-	LIST_FOREACH_SAFE(limit, limits_head, hl_next, limittmp) {
+	LIST_FOREACH_SAFE(limit, &container->hc_limits, hl_next, limittmp) {
 		if (!hrl_rule_matches(limit->hl_rule, filter))
 			continue;
 
@@ -1156,39 +1166,41 @@
 	case HRL_SUBJECT_TYPE_PROCESS:
 		p = rule->hr_subject.hs_proc;
 		KASSERT(p != NULL, ("hrl_rule_add: NULL proc"));
-		hrl_limit_add(&p->p_limits, rule);
+		hrl_container_add_rule(&p->p_container, rule);
 		/*
 		 * In case of per-process rule, we don't have anything more
-		 * to do.
+		 * to do.  Also, there is no point in increasing reference
+		 * count, as the per-process containers never have
+		 * any subcontainers.
 		 */
 		return (0);
 
 	case HRL_SUBJECT_TYPE_USER:
 		uip = rule->hr_subject.hs_uip;
 		KASSERT(uip != NULL, ("hrl_rule_add: NULL uip"));
-		hrl_limit_add(&uip->ui_limits, rule);
+		hrl_container_add_rule(&uip->ui_container, rule);
 		break;
 
 	case HRL_SUBJECT_TYPE_GROUP:
 		gip = rule->hr_subject.hs_gip;
 		KASSERT(gip != NULL, ("hrl_rule_add: NULL gip"));
-		hrl_limit_add(&gip->gi_limits, rule);
+		hrl_container_add_rule(&gip->gi_container, rule);
 		break;
 
 	case HRL_SUBJECT_TYPE_LOGINCLASS:
 		lc = rule->hr_subject.hs_loginclass;
 		KASSERT(lc != NULL, ("hrl_rule_add: NULL loginclass"));
-		hrl_limit_add(&lc->lc_limits, rule);
+		hrl_container_add_rule(&lc->lc_container, rule);
 		break;
 
 	case HRL_SUBJECT_TYPE_JAIL:
 		pr = rule->hr_subject.hs_prison;
 		KASSERT(pr != NULL, ("hrl_rule_add: NULL pr"));
-		hrl_limit_add(&pr->pr_limits, rule);
+		hrl_container_add_rule(&pr->pr_container, rule);
 		break;
 
 	default:
-		panic("hrl_rule_add_limits: unknown subject type %d",
+		panic("hrl_rule_add: unknown subject type %d",
 		    rule->hr_subject_type);
 	}
 
@@ -1219,22 +1231,22 @@
 					break;
 			continue;
 		default:
-			panic("hrl_rule_add_limits: unknown subject type %d",
+			panic("hrl_rule_add: unknown subject type %d",
 			    rule->hr_subject_type);
 		}
 
-		hrl_limit_add(&p->p_limits, rule);
+		hrl_container_add_rule(&p->p_container, rule);
 	}
 
 	return (0);
 }
 
 static int
-hrl_rule_remove_callback(struct hrl_limits_head *limits, const struct hrl_rule *filter, void *arg3)
+hrl_rule_remove_callback(struct hrl_container *container, const struct hrl_rule *filter, void *arg3)
 {
 	int *found = (int *)arg3;
 
-	*found += hrl_limit_remove_matching(limits, filter);
+	*found += hrl_container_remove_rules(container, filter);
 	return (0);
 }
 
@@ -1250,25 +1262,25 @@
 	if (filter->hr_subject_type == HRL_SUBJECT_TYPE_PROCESS &&
 	    filter->hr_subject.hs_proc != NULL) {
 		p = filter->hr_subject.hs_proc;
-		found = hrl_limit_remove_matching(&p->p_limits, filter);
+		found = hrl_container_remove_rules(&p->p_container, filter);
 		if (found)
 			return (0);
 		return (ESRCH);
 	}
 
-	error = loginclass_limits_foreach(hrl_rule_remove_callback, filter,
+	error = loginclass_container_foreach(hrl_rule_remove_callback, filter,
 	    (void *)&found);
-	KASSERT(error == 0, ("loginclass_limits_foreach failed"));
-	error = ui_limits_foreach(hrl_rule_remove_callback, filter,
+	KASSERT(error == 0, ("loginclass_container_foreach failed"));
+	error = ui_container_foreach(hrl_rule_remove_callback, filter,
 	    (void *)&found);
-	KASSERT(error == 0, ("ui_limits_foreach failed"));
-	error = gi_limits_foreach(hrl_rule_remove_callback, filter,
+	KASSERT(error == 0, ("ui_container_foreach failed"));
+	error = gi_container_foreach(hrl_rule_remove_callback, filter,
 	    (void *)&found);
-	KASSERT(error == 0, ("gi_limits_foreach failed"));
+	KASSERT(error == 0, ("gi_container_foreach failed"));
 
 	sx_assert(&allproc_lock, SA_LOCKED);
 	FOREACH_PROC_IN_SYSTEM(p) {
-		found += hrl_limit_remove_matching(&p->p_limits, filter);
+		found += hrl_container_remove_rules(&p->p_container, filter);
 		if (error == 0)
 			found = 1;
 	}
@@ -1474,7 +1486,7 @@
 }
 
 static int
-hrl_get_rules_callback(struct hrl_limits_head *limits,
+hrl_get_rules_callback(struct hrl_container *container,
     const struct hrl_rule *filter, void *arg3)
 {
 	struct hrl_limit *limit;
@@ -1482,7 +1494,7 @@
 
 	mtx_assert(&hrl_lock, MA_OWNED);
 
-	LIST_FOREACH(limit, limits, hl_next) {
+	LIST_FOREACH(limit, &container->hc_limits, hl_next) {
 		if (!hrl_rule_matches(limit->hl_rule, filter))
 			continue;
 		hrl_rule_to_sbuf(sb, limit->hl_rule);
@@ -1523,7 +1535,7 @@
 	sx_assert(&allproc_lock, SA_LOCKED);
 	FOREACH_PROC_IN_SYSTEM(p) {
 		mtx_lock(&hrl_lock);
-		LIST_FOREACH(limit, &p->p_limits, hl_next) {
+		LIST_FOREACH(limit, &p->p_container.hc_limits, hl_next) {
 			/*
 			 * Non-process rules will be added to the buffer later.
 			 * Adding them here would result in duplicated output.
@@ -1539,9 +1551,9 @@
 	}
 
 	mtx_lock(&hrl_lock);
-	loginclass_limits_foreach(hrl_get_rules_callback, filter, sb);
-	ui_limits_foreach(hrl_get_rules_callback, filter, sb);
-	gi_limits_foreach(hrl_get_rules_callback, filter, sb);
+	loginclass_container_foreach(hrl_get_rules_callback, filter, sb);
+	ui_container_foreach(hrl_get_rules_callback, filter, sb);
+	gi_container_foreach(hrl_get_rules_callback, filter, sb);
 	mtx_unlock(&hrl_lock);
 	if (sbuf_overflowed(sb)) {
 		sbuf_delete(sb);
@@ -1608,7 +1620,7 @@
 	KASSERT(sb != NULL, ("sbuf_new failed"));
 
 	mtx_lock(&hrl_lock);
-	LIST_FOREACH(limit, &filter->hr_subject.hs_proc->p_limits, hl_next) {
+	LIST_FOREACH(limit, &filter->hr_subject.hs_proc->p_container.hc_limits, hl_next) {
 		hrl_rule_to_sbuf(sb, limit->hl_rule);
 		sbuf_printf(sb, ",");
 	}
@@ -1750,7 +1762,7 @@
 	/*
 	 * Remove rules that are no longer applicable with the new ucred.
 	 */
-	LIST_FOREACH(limit, &p->p_limits, hl_next) {
+	LIST_FOREACH(limit, &p->p_container.hc_limits, hl_next) {
 		switch (limit->hl_rule->hr_subject_type) {
 		case HRL_SUBJECT_TYPE_PROCESS:
 			continue;
@@ -1780,8 +1792,8 @@
 	 * Add rules for the new ucred and move between containers where applicable.
 	 */
 	if (newuip != olduip) {
-		LIST_FOREACH(limit, &newuip->ui_limits, hl_next) {
-			error = hrl_limit_add_locked(&p->p_limits, limit->hl_rule);
+		LIST_FOREACH(limit, &newuip->ui_container.hc_limits, hl_next) {
+			error = hrl_container_add_rule_locked(&p->p_container, limit->hl_rule);
 			KASSERT(error == 0, ("XXX: better error handling needed"));
 		}
 
@@ -1789,8 +1801,8 @@
 		hrl_container_join(&p->p_container, &newuip->ui_container);
 	}
 	if (newlc != oldlc) {
-		LIST_FOREACH(limit, &newlc->lc_limits, hl_next) {
-			error = hrl_limit_add_locked(&p->p_limits, limit->hl_rule);
+		LIST_FOREACH(limit, &newlc->lc_container.hc_limits, hl_next) {
+			error = hrl_container_add_rule_locked(&p->p_container, limit->hl_rule);
 			KASSERT(error == 0, ("XXX: better error handling needed"));
 		}
 
@@ -1798,8 +1810,8 @@
 		hrl_container_join(&p->p_container, &newlc->lc_container);
 	}
 	if (newpr != oldpr) {
-		LIST_FOREACH(limit, &newpr->pr_limits, hl_next) {
-			error = hrl_limit_add_locked(&p->p_limits, limit->hl_rule);
+		LIST_FOREACH(limit, &newpr->pr_container.hc_limits, hl_next) {
+			error = hrl_container_add_rule_locked(&p->p_container, limit->hl_rule);
 			KASSERT(error == 0, ("XXX: better error handling needed"));
 		}
 
@@ -1851,18 +1863,18 @@
 	 * Rules with 'process' subject have to be duplicated in order to make their
 	 * hr_subject point to the new process.
 	 */
-	LIST_FOREACH(limit, &parent->p_limits, hl_next) {
+	LIST_FOREACH(limit, &parent->p_container.hc_limits, hl_next) {
 		if (limit->hl_rule->hr_subject_type == HRL_SUBJECT_TYPE_PROCESS) {
 			rule = hrl_rule_duplicate(limit->hl_rule, M_NOWAIT);
 			KASSERT(rule != NULL, ("XXX: better error handling needed"));
 			KASSERT(rule->hr_subject.hs_proc == parent,
 			    ("rule->hr_subject.hs_proc == parent"));
 			rule->hr_subject.hs_proc = child;
-			error = hrl_limit_add_locked(&child->p_limits, rule);
+			error = hrl_container_add_rule_locked(&child->p_container, rule);
 			KASSERT(error == 0, ("XXX: better error handling needed"));
 			hrl_rule_release(rule);
 		} else {
-			error = hrl_limit_add_locked(&child->p_limits, limit->hl_rule);
+			error = hrl_container_add_rule_locked(&child->p_container, limit->hl_rule);
 			KASSERT(error == 0, ("XXX: better error handling needed"));
 		}
 	}
@@ -1896,8 +1908,8 @@
 	struct hrl_limit *limit;
 
 	mtx_lock(&hrl_lock);
-	while (!LIST_EMPTY(&p->p_limits)) {
-		limit = LIST_FIRST(&p->p_limits);
+	while (!LIST_EMPTY(&p->p_container.hc_limits)) {
+		limit = LIST_FIRST(&p->p_container.hc_limits);
 		LIST_REMOVE(limit, hl_next);
 		hrl_rule_release(limit->hl_rule);
 		uma_zfree(hrl_limit_zone, limit);

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_loginclass.c#16 (text+ko) ====

@@ -208,7 +208,7 @@
 }
 
 int
-loginclass_limits_foreach(int (*callback)(struct hrl_limits_head *limits,
+loginclass_container_foreach(int (*callback)(struct hrl_container *container,
     const struct hrl_rule *filter, void *arg3),
     const struct hrl_rule *filter, void *arg3)
 {
@@ -216,7 +216,7 @@
 	struct loginclass *lc, *lctmp;
 
 	LIST_FOREACH_SAFE(lc, &loginclasses, lc_next, lctmp) {
-		error = (callback)(&lc->lc_limits, filter, arg3);
+		error = (callback)(&lc->lc_container, filter, arg3);
 		if (error)
 			return (error);
 	}

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_resource.c#27 (text+ko) ====

@@ -1392,7 +1392,7 @@
 }
 
 int
-ui_limits_foreach(int (*callback)(struct hrl_limits_head *limits,
+ui_container_foreach(int (*callback)(struct hrl_container *container,
     const struct hrl_rule *filter, void *arg3),
     const struct hrl_rule *filter, void *arg3)
 {
@@ -1404,7 +1404,7 @@
 	for (uih = &uihashtbl[uihash]; uih >= uihashtbl; uih--) {
 		for (uip = LIST_FIRST(uih); uip; uip = nextuip) {
 			nextuip = LIST_NEXT(uip, ui_hash);
-			error = (callback)(&uip->ui_limits, filter, arg3);
+			error = (callback)(&uip->ui_container, filter, arg3);
 			if (error) {
 				rw_runlock(&uihashtbl_lock);
 				return (error);
@@ -1479,7 +1479,6 @@
 			refcount_init(&gip->gi_ref, 0);
 			gip->gi_gid = gid;
 			LIST_INSERT_HEAD(GIHASH(gid), gip, gi_hash);
-			hrl_container_create(&gip->gi_container);
 		}
 	}
 	gihold(gip);
@@ -1541,7 +1540,7 @@
 }
 
 int
-gi_limits_foreach(int (*callback)(struct hrl_limits_head *limits,
+gi_container_foreach(int (*callback)(struct hrl_container *container,
     const struct hrl_rule *filter, void *arg3),
     const struct hrl_rule *filter, void *arg3)
 {
@@ -1553,7 +1552,7 @@
 	for (gih = &gihashtbl[gihash]; gih >= gihashtbl; gih--) {
 		for (gip = LIST_FIRST(gih); gip; gip = nextgip) {
 			nextgip = LIST_NEXT(gip, gi_hash);
-			error = (callback)(&gip->gi_limits, filter, arg3);
+			error = (callback)(&gip->gi_container, filter, arg3);
 			if (error) {
 				rw_runlock(&gihashtbl_lock);
 				return (error);

==== //depot/projects/soc2009/trasz_limits/sys/sys/hrl.h#41 (text+ko) ====

@@ -147,24 +147,15 @@
  * it.  For example, uidinfo will have container assigned only if there
  * is a rule this uidinfo is subject to, and 'hr_per' for this rule
  * is HRL_SUBJECT_TYPE_USER.
+ *
+ * This structure must be filled with zeroes initially.
  */
 struct hrl_container {
 	int64_t				hc_resources[HRL_RESOURCE_MAX + 1];
 	struct hrl_container		*hc_parents[HRL_HC_PARENTS_MAX + 1];
+	LIST_HEAD(, hrl_limit)		hc_limits;
 };
 
-/*
- * 'hrl_limit' connects a rule with every subject it's related to.
- * For example, rule 'user:X:openfiles:deny=N/process' is linked
- * with uidinfo for user X, and to each process of that user.
- */
-struct hrl_limit {
-	LIST_ENTRY(hrl_limit)	hl_next;
-	struct hrl_rule		*hl_rule;
-};
-
-LIST_HEAD(hrl_limits_head, hrl_limit);
-
 #ifdef _KERNEL
 
 int	hrl_alloc(struct proc *p, int object, uint64_t amount);

==== //depot/projects/soc2009/trasz_limits/sys/sys/jail.h#11 (text+ko) ====

@@ -182,7 +182,6 @@
 	char		 pr_domainname[MAXHOSTNAMELEN];	/* (p) jail domainname */
 	char		 pr_hostuuid[HOSTUUIDLEN];	/* (p) jail hostuuid */
 	struct hrl_container pr_container;		/* (*) HRL resource accounting */
-	struct hrl_limits_head	pr_limits;		/* (*) HRL rules applicable to the prison */
 };
 #endif /* _KERNEL || _WANT_PRISON */
 

==== //depot/projects/soc2009/trasz_limits/sys/sys/loginclass.h#6 (text+ko) ====

@@ -37,13 +37,12 @@
 	char			lc_name[MAXLOGNAME];
 	u_int			lc_refcount;
 	struct hrl_container	lc_container;
-	struct hrl_limits_head	lc_limits;
 };
 
 void	loginclass_acquire(struct loginclass *lc);
 void	loginclass_release(struct loginclass *lc);
 struct loginclass	*loginclass_find(const char *name);
-int	loginclass_limits_foreach(int (*callback)(struct hrl_limits_head *limits,
+int	loginclass_container_foreach(int (*callback)(struct hrl_container *container,
 	    const struct hrl_rule *filter, void *arg3),
 	    const struct hrl_rule *filter, void *arg3);
 

==== //depot/projects/soc2009/trasz_limits/sys/sys/proc.h#14 (text+ko) ====

@@ -512,7 +512,6 @@
 	int		p_pendingcnt;	/* how many signals are pending */
 	struct itimers	*p_itimers;	/* (c) POSIX interval timers. */
 	struct hrl_container p_container;	/* (*) HRL resource accounting */
-	struct hrl_limits_head p_limits;/* (*) HRL rules applicable to the proccess */
 /* End area that is zeroed on creation. */
 #define	p_endzero	p_magic
 

==== //depot/projects/soc2009/trasz_limits/sys/sys/resourcevar.h#14 (text+ko) ====

@@ -99,7 +99,6 @@
 	uid_t	ui_uid;			/* (a) uid */
 	u_int	ui_ref;			/* (b) reference count */
 	struct hrl_container ui_container;	/* (*) HRL resource accounting */
-	struct hrl_limits_head	ui_limits;/* (*) HRL rules applicable to the uid */
 };
 
 #define	UIDINFO_VMSIZE_LOCK(ui)		mtx_lock(&((ui)->ui_vmsize_mtx))
@@ -118,7 +117,6 @@
 	gid_t	gi_gid;			/* (a) gid */
 	u_int	gi_ref;			/* (b) reference count */
 	struct hrl_container gi_container;	/* (*) HRL resource accounting */
-	struct hrl_limits_head	gi_limits;/* (*) HRL rules applicable to the gid */
 };
 
 struct proc;
@@ -157,7 +155,7 @@
 void	 uifree(struct uidinfo *uip);
 void	 uihashinit(void);
 void	 uihold(struct uidinfo *uip);
-int	 ui_limits_foreach(int (*callback)(struct hrl_limits_head *limits,
+int	 ui_container_foreach(int (*callback)(struct hrl_container *container,
 	    const struct hrl_rule *filter, void *arg3),
 	    const struct hrl_rule *filter, void *arg3);
 struct gidinfo
@@ -165,7 +163,7 @@
 void	 gifree(struct gidinfo *gip);
 void	 gihashinit(void);
 void	 gihold(struct gidinfo *gip);
-int	 gi_limits_foreach(int (*callback)(struct hrl_limits_head *limits,
+int	 gi_container_foreach(int (*callback)(struct hrl_container *container,
 	    const struct hrl_rule *filter, void *arg3),
 	    const struct hrl_rule *filter, void *arg3);
 

From owner-p4-projects@FreeBSD.ORG  Sat Oct 31 15:40:45 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EF752106568D; Sat, 31 Oct 2009 15:40: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 A9D52106568F
	for ; Sat, 31 Oct 2009 15:40:44 +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 7DBB48FC12
	for ; Sat, 31 Oct 2009 15:40: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 n9VFei6x081941
	for ; Sat, 31 Oct 2009 15:40:44 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9VFei6o081939
	for perforce@freebsd.org; Sat, 31 Oct 2009 15:40:44 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sat, 31 Oct 2009 15:40:44 GMT
Message-Id: <200910311540.n9VFei6o081939@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 170001 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: Sat, 31 Oct 2009 15:40:45 -0000

http://p4web.freebsd.org/chv.cgi?CH=170001

Change 170001 by hselasky@hselasky_laptop001 on 2009/10/31 15:39:49

	
	USB CORE:
		- Fix a corner case where usbd_transfer_drain() can return
		too early. This fixes some rare panics at USB device detach.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_core.h#28 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#170 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/usb_core.h#28 (text+ko) ====

@@ -112,6 +112,7 @@
 	uint8_t	curr_dma_set:1;		/* used by USB HC/DC driver */
 	uint8_t	can_cancel_immed:1;	/* set if USB transfer can be
 					 * cancelled immediately */
+	uint8_t	doing_callback:1;	/* set if executing the callback */
 };
 
 /*

==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#170 (text+ko) ====

@@ -1797,8 +1797,18 @@
 
 	usbd_transfer_stop(xfer);
 
-	while (usbd_transfer_pending(xfer)) {
+	while (usbd_transfer_pending(xfer) || 
+	    xfer->flags_int.doing_callback) {
+
+		/* 
+		 * It is allowed that the callback can drop its
+		 * transfer mutex. In that case checking only
+		 * "usbd_transfer_pending()" is not enough to tell if
+		 * the USB transfer is fully drained. We also need to
+		 * check the internal "doing_callback" flag.
+		 */
 		xfer->flags_int.draining = 1;
+
 		/*
 		 * Wait until the current outstanding USB
 		 * transfer is complete !
@@ -2043,6 +2053,9 @@
 	/* get next USB transfer in the queue */
 	info->done_q.curr = NULL;
 
+	/* set flag in case of drain */
+	xfer->flags_int.doing_callback = 1;
+
 	USB_BUS_UNLOCK(info->bus);
 	USB_BUS_LOCK_ASSERT(info->bus, MA_NOTOWNED);
 
@@ -2095,12 +2108,17 @@
 	if ((!xfer->flags_int.open) &&
 	    (xfer->flags_int.started) &&
 	    (xfer->usb_state == USB_ST_ERROR)) {
+		/* clear flag in case of drain */
+		xfer->flags_int.doing_callback = 0;
 		/* try to loop, but not recursivly */
 		usb_command_wrapper(&info->done_q, xfer);
 		return;
 	}
 
 done:
+	/* clear flag in case of drain */
+	xfer->flags_int.doing_callback = 0;
+
 	/*
 	 * Check if we are draining.
 	 */

From owner-p4-projects@FreeBSD.ORG  Sat Oct 31 15:50:56 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2CB5E1065694; Sat, 31 Oct 2009 15:50:56 +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 CC3451065679
	for ; Sat, 31 Oct 2009 15:50:55 +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 B766F8FC14
	for ; Sat, 31 Oct 2009 15:50:55 +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 n9VFotDn082660
	for ; Sat, 31 Oct 2009 15:50:55 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9VFosfa082658
	for perforce@freebsd.org; Sat, 31 Oct 2009 15:50:54 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sat, 31 Oct 2009 15:50:54 GMT
Message-Id: <200910311550.n9VFosfa082658@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 170002 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: Sat, 31 Oct 2009 15:50:56 -0000

http://p4web.freebsd.org/chv.cgi?CH=170002

Change 170002 by hselasky@hselasky_laptop001 on 2009/10/31 15:50:40

	
	IFC @ 169997

Affected files ...

.. //depot/projects/usb/src/lib/libusb/libusb20_ugen20.c#9 integrate
.. //depot/projects/usb/src/sys/amd64/acpica/acpi_wakecode.S#5 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/machdep.c#27 integrate
.. //depot/projects/usb/src/sys/amd64/ia32/ia32_signal.c#10 integrate
.. //depot/projects/usb/src/sys/amd64/linux32/linux32_machdep.c#14 integrate
.. //depot/projects/usb/src/sys/amd64/linux32/linux32_sysvec.c#23 integrate
.. //depot/projects/usb/src/sys/arm/arm/machdep.c#10 integrate
.. //depot/projects/usb/src/sys/arm/mv/mv_sata.c#2 integrate
.. //depot/projects/usb/src/sys/boot/common/commands.c#2 integrate
.. //depot/projects/usb/src/sys/boot/i386/zfsboot/zfsboot.c#5 integrate
.. //depot/projects/usb/src/sys/boot/zfs/zfs.c#4 integrate
.. //depot/projects/usb/src/sys/boot/zfs/zfsimpl.c#5 integrate
.. //depot/projects/usb/src/sys/cam/ata/ata_da.c#6 integrate
.. //depot/projects/usb/src/sys/cam/ata/ata_pmp.c#1 branch
.. //depot/projects/usb/src/sys/cam/ata/ata_xpt.c#5 integrate
.. //depot/projects/usb/src/sys/cam/cam.h#4 integrate
.. //depot/projects/usb/src/sys/cam/cam_ccb.h#8 integrate
.. //depot/projects/usb/src/sys/cam/cam_periph.c#13 integrate
.. //depot/projects/usb/src/sys/cam/cam_periph.h#5 integrate
.. //depot/projects/usb/src/sys/cam/cam_queue.c#2 integrate
.. //depot/projects/usb/src/sys/cam/cam_queue.h#2 integrate
.. //depot/projects/usb/src/sys/cam/cam_xpt.c#24 integrate
.. //depot/projects/usb/src/sys/cam/scsi/scsi_all.c#8 integrate
.. //depot/projects/usb/src/sys/cam/scsi/scsi_cd.c#12 integrate
.. //depot/projects/usb/src/sys/cam/scsi/scsi_ch.c#7 integrate
.. //depot/projects/usb/src/sys/cam/scsi/scsi_da.c#16 integrate
.. //depot/projects/usb/src/sys/cam/scsi/scsi_low.c#6 integrate
.. //depot/projects/usb/src/sys/cam/scsi/scsi_pt.c#7 integrate
.. //depot/projects/usb/src/sys/cam/scsi/scsi_sa.c#10 integrate
.. //depot/projects/usb/src/sys/cam/scsi/scsi_sg.c#9 integrate
.. //depot/projects/usb/src/sys/cam/scsi/scsi_targ_bh.c#5 integrate
.. //depot/projects/usb/src/sys/cam/scsi/scsi_target.c#8 integrate
.. //depot/projects/usb/src/sys/cam/scsi/scsi_xpt.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/boot/zfs/zfsimpl.h#4 integrate
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/vnode.h#8 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#16 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#4 integrate
.. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_misc.c#22 integrate
.. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_proto.h#22 integrate
.. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_syscall.h#21 integrate
.. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_syscalls.c#21 integrate
.. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_sysent.c#22 integrate
.. //depot/projects/usb/src/sys/compat/freebsd32/syscalls.master#21 integrate
.. //depot/projects/usb/src/sys/compat/linux/linux_socket.c#17 integrate
.. //depot/projects/usb/src/sys/conf/NOTES#48 integrate
.. //depot/projects/usb/src/sys/conf/files#84 integrate
.. //depot/projects/usb/src/sys/contrib/dev/iwn/LICENSE#2 integrate
.. //depot/projects/usb/src/sys/contrib/dev/iwn/iwlwifi-4965-228.57.2.23.fw.uu#1 branch
.. //depot/projects/usb/src/sys/contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu#2 delete
.. //depot/projects/usb/src/sys/contrib/dev/iwn/iwlwifi-5000-5.4.A.11.fw.uu#1 branch
.. //depot/projects/usb/src/sys/contrib/dev/iwn/iwlwifi-5150-8.24.2.2.fw.uu#1 branch
.. //depot/projects/usb/src/sys/dev/aac/aac.c#11 integrate
.. //depot/projects/usb/src/sys/dev/aac/aac_cam.c#8 integrate
.. //depot/projects/usb/src/sys/dev/aac/aacreg.h#4 integrate
.. //depot/projects/usb/src/sys/dev/aac/aacvar.h#6 integrate
.. //depot/projects/usb/src/sys/dev/acpi_support/acpi_aiboost.c#4 integrate
.. //depot/projects/usb/src/sys/dev/ahci/ahci.c#5 integrate
.. //depot/projects/usb/src/sys/dev/aic7xxx/aic79xx_pci.c#4 integrate
.. //depot/projects/usb/src/sys/dev/amr/amr.c#12 integrate
.. //depot/projects/usb/src/sys/dev/ata/ata-all.c#20 integrate
.. //depot/projects/usb/src/sys/dev/ata/ata-all.h#15 integrate
.. //depot/projects/usb/src/sys/dev/ata/ata-disk.c#16 integrate
.. //depot/projects/usb/src/sys/dev/ata/ata-dma.c#11 integrate
.. //depot/projects/usb/src/sys/dev/ata/ata-lowlevel.c#6 integrate
.. //depot/projects/usb/src/sys/dev/ata/ata-pci.c#15 integrate
.. //depot/projects/usb/src/sys/dev/ata/ata-pci.h#22 integrate
.. //depot/projects/usb/src/sys/dev/ata/ata-queue.c#15 integrate
.. //depot/projects/usb/src/sys/dev/ata/ata-raid.c#11 integrate
.. //depot/projects/usb/src/sys/dev/ata/ata-sata.c#6 integrate
.. //depot/projects/usb/src/sys/dev/ata/atapi-cam.c#13 integrate
.. //depot/projects/usb/src/sys/dev/ata/atapi-cd.c#12 integrate
.. //depot/projects/usb/src/sys/dev/ata/atapi-fd.c#9 integrate
.. //depot/projects/usb/src/sys/dev/ata/atapi-tape.c#11 integrate
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-adaptec.c#3 integrate
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-ahci.c#10 integrate
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-intel.c#7 integrate
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-marvell.c#9 integrate
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-nvidia.c#8 integrate
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-promise.c#8 integrate
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-serverworks.c#5 integrate
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-siliconimage.c#7 integrate
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-via.c#6 integrate
.. //depot/projects/usb/src/sys/dev/drm/drmP.h#15 integrate
.. //depot/projects/usb/src/sys/dev/drm/drm_scatter.c#7 integrate
.. //depot/projects/usb/src/sys/dev/drm/r600_blit.c#4 integrate
.. //depot/projects/usb/src/sys/dev/drm/radeon_cp.c#12 integrate
.. //depot/projects/usb/src/sys/dev/fb/vesa.c#4 integrate
.. //depot/projects/usb/src/sys/dev/fb/vesa.h#2 integrate
.. //depot/projects/usb/src/sys/dev/fdc/fdc.c#10 integrate
.. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_core.c#5 integrate
.. //depot/projects/usb/src/sys/dev/iwn/if_iwn.c#12 integrate
.. //depot/projects/usb/src/sys/dev/iwn/if_iwnreg.h#2 integrate
.. //depot/projects/usb/src/sys/dev/iwn/if_iwnvar.h#4 integrate
.. //depot/projects/usb/src/sys/dev/msk/if_msk.c#16 integrate
.. //depot/projects/usb/src/sys/dev/msk/if_mskreg.h#11 integrate
.. //depot/projects/usb/src/sys/dev/mwl/if_mwl_pci.c#2 integrate
.. //depot/projects/usb/src/sys/dev/pci/pci.c#29 integrate
.. //depot/projects/usb/src/sys/dev/ppbus/lpt.c#10 integrate
.. //depot/projects/usb/src/sys/dev/ppbus/pcfclock.c#5 integrate
.. //depot/projects/usb/src/sys/dev/siis/siis.c#5 integrate
.. //depot/projects/usb/src/sys/dev/syscons/syscons.c#17 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#16 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#31 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/uhci_pci.c#13 integrate
.. //depot/projects/usb/src/sys/dev/usb/input/ums.c#24 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/usb_serial.c#15 edit
.. //depot/projects/usb/src/sys/fs/smbfs/smbfs_vfsops.c#8 integrate
.. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs_subr.c#12 integrate
.. //depot/projects/usb/src/sys/i386/bios/apm.c#8 integrate
.. //depot/projects/usb/src/sys/i386/i386/machdep.c#24 integrate
.. //depot/projects/usb/src/sys/i386/linux/linux_machdep.c#12 integrate
.. //depot/projects/usb/src/sys/i386/linux/linux_sysvec.c#17 integrate
.. //depot/projects/usb/src/sys/ia64/conf/GENERIC#14 integrate
.. //depot/projects/usb/src/sys/ia64/ia64/machdep.c#13 integrate
.. //depot/projects/usb/src/sys/ia64/include/param.h#6 integrate
.. //depot/projects/usb/src/sys/kern/init_sysent.c#18 integrate
.. //depot/projects/usb/src/sys/kern/kern_context.c#3 integrate
.. //depot/projects/usb/src/sys/kern/kern_cpuset.c#9 integrate
.. //depot/projects/usb/src/sys/kern/kern_exec.c#23 integrate
.. //depot/projects/usb/src/sys/kern/kern_ktrace.c#12 integrate
.. //depot/projects/usb/src/sys/kern/kern_shutdown.c#15 integrate
.. //depot/projects/usb/src/sys/kern/kern_sig.c#19 integrate
.. //depot/projects/usb/src/sys/kern/kern_thread.c#17 integrate
.. //depot/projects/usb/src/sys/kern/subr_bus.c#33 integrate
.. //depot/projects/usb/src/sys/kern/subr_taskqueue.c#10 integrate
.. //depot/projects/usb/src/sys/kern/subr_trap.c#13 integrate
.. //depot/projects/usb/src/sys/kern/sys_generic.c#19 integrate
.. //depot/projects/usb/src/sys/kern/sys_process.c#15 integrate
.. //depot/projects/usb/src/sys/kern/syscalls.c#17 integrate
.. //depot/projects/usb/src/sys/kern/syscalls.master#17 integrate
.. //depot/projects/usb/src/sys/kern/systrace_args.c#14 integrate
.. //depot/projects/usb/src/sys/kern/sysv_shm.c#13 integrate
.. //depot/projects/usb/src/sys/kern/uipc_syscalls.c#21 integrate
.. //depot/projects/usb/src/sys/mips/mips/pm_machdep.c#3 integrate
.. //depot/projects/usb/src/sys/modules/cam/Makefile#4 integrate
.. //depot/projects/usb/src/sys/modules/iwnfw/Makefile#3 integrate
.. //depot/projects/usb/src/sys/modules/iwnfw/Makefile.inc#1 branch
.. //depot/projects/usb/src/sys/modules/iwnfw/iwn4965/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/iwnfw/iwn5000/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/iwnfw/iwn5150/Makefile#1 branch
.. //depot/projects/usb/src/sys/net/bpf.c#25 integrate
.. //depot/projects/usb/src/sys/net/flowtable.c#14 integrate
.. //depot/projects/usb/src/sys/net/if_gif.c#19 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_hwmp.c#6 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_output.c#29 integrate
.. //depot/projects/usb/src/sys/netgraph/NOTES#2 integrate
.. //depot/projects/usb/src/sys/netinet/if_ether.c#32 integrate
.. //depot/projects/usb/src/sys/netinet/in.c#39 integrate
.. //depot/projects/usb/src/sys/netinet/ip_input.c#33 integrate
.. //depot/projects/usb/src/sys/netinet/libalias/alias.c#8 integrate
.. //depot/projects/usb/src/sys/netinet/sctp_cc_functions.c#5 integrate
.. //depot/projects/usb/src/sys/netinet/sctp_output.c#25 integrate
.. //depot/projects/usb/src/sys/netinet6/in6.c#35 integrate
.. //depot/projects/usb/src/sys/pc98/pc98/machdep.c#15 integrate
.. //depot/projects/usb/src/sys/powerpc/aim/clock.c#6 integrate
.. //depot/projects/usb/src/sys/powerpc/aim/machdep.c#13 integrate
.. //depot/projects/usb/src/sys/powerpc/aim/mmu_oea64.c#6 integrate
.. //depot/projects/usb/src/sys/powerpc/aim/mp_cpudep.c#5 integrate
.. //depot/projects/usb/src/sys/powerpc/aim/platform_chrp.c#4 integrate
.. //depot/projects/usb/src/sys/powerpc/aim/trap_subr.S#8 integrate
.. //depot/projects/usb/src/sys/powerpc/booke/machdep.c#13 integrate
.. //depot/projects/usb/src/sys/powerpc/booke/mp_cpudep.c#2 integrate
.. //depot/projects/usb/src/sys/powerpc/include/hid.h#6 integrate
.. //depot/projects/usb/src/sys/powerpc/include/pcpu.h#10 integrate
.. //depot/projects/usb/src/sys/powerpc/include/smp.h#7 integrate
.. //depot/projects/usb/src/sys/powerpc/include/spr.h#13 integrate
.. //depot/projects/usb/src/sys/powerpc/powermac/hrowpic.c#6 integrate
.. //depot/projects/usb/src/sys/powerpc/powerpc/cpu.c#11 integrate
.. //depot/projects/usb/src/sys/powerpc/powerpc/mp_machdep.c#10 integrate
.. //depot/projects/usb/src/sys/powerpc/powerpc/stack_machdep.c#2 integrate
.. //depot/projects/usb/src/sys/sparc64/include/in_cksum.h#4 integrate
.. //depot/projects/usb/src/sys/sparc64/sparc64/machdep.c#17 integrate
.. //depot/projects/usb/src/sys/sun4v/sun4v/machdep.c#10 integrate
.. //depot/projects/usb/src/sys/sys/aac_ioctl.h#3 integrate
.. //depot/projects/usb/src/sys/sys/ata.h#7 integrate
.. //depot/projects/usb/src/sys/sys/conf.h#21 integrate
.. //depot/projects/usb/src/sys/sys/interrupt.h#10 integrate
.. //depot/projects/usb/src/sys/sys/ktrace.h#4 integrate
.. //depot/projects/usb/src/sys/sys/signalvar.h#6 integrate
.. //depot/projects/usb/src/sys/sys/syscall.h#17 integrate
.. //depot/projects/usb/src/sys/sys/syscall.mk#17 integrate
.. //depot/projects/usb/src/sys/sys/syscallsubr.h#14 integrate
.. //depot/projects/usb/src/sys/sys/sysproto.h#18 integrate
.. //depot/projects/usb/src/sys/sys/time.h#8 integrate
.. //depot/projects/usb/src/sys/tools/fw_stub.awk#5 integrate
.. //depot/projects/usb/src/sys/tools/makeobjops.awk#2 integrate
.. //depot/projects/usb/src/sys/vm/vm_fault.c#18 integrate
.. //depot/projects/usb/src/sys/vm/vm_map.c#21 integrate

Differences ...

==== //depot/projects/usb/src/lib/libusb/libusb20_ugen20.c#9 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/libusb/libusb20_ugen20.c,v 1.4 2009/06/23 02:19:59 thompsa Exp $ */
+/* $FreeBSD: src/lib/libusb/libusb20_ugen20.c,v 1.5 2009/10/22 21:01:41 thompsa Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/amd64/acpica/acpi_wakecode.S#5 (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/amd64/acpica/acpi_wakecode.S,v 1.4 2009/10/08 17:41:53 jkim Exp $
+ * $FreeBSD: src/sys/amd64/acpica/acpi_wakecode.S,v 1.5 2009/10/23 18:57:52 jkim Exp $
  */
 
 #define LOCORE
@@ -88,6 +88,11 @@
 	movb	$0, reset_video - wakeup_start
 	lcall	$0xc000, $3
 
+	/* When we reach here, int 0x10 should be ready.  Hide cursor. */
+	movb	$0x01, %ah
+	movb	$0x20, %ch
+	int	$0x10
+
 	/* Re-start in case the previous BIOS call clobbers them. */
 	jmp	wakeup_start
 1:

==== //depot/projects/usb/src/sys/amd64/amd64/machdep.c#27 (text+ko) ====

@@ -39,7 +39,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.710 2009/09/22 16:51:00 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.711 2009/10/27 10:47:58 kib Exp $");
 
 #include "opt_atalk.h"
 #include "opt_atpic.h"
@@ -415,7 +415,7 @@
 	ucontext_t uc;
 	struct proc *p = td->td_proc;
 	struct trapframe *regs;
-	const ucontext_t *ucp;
+	ucontext_t *ucp;
 	long rflags;
 	int cs, error, ret;
 	ksiginfo_t ksi;
@@ -478,7 +478,6 @@
 	td->td_pcb->pcb_fsbase = ucp->uc_mcontext.mc_fsbase;
 	td->td_pcb->pcb_gsbase = ucp->uc_mcontext.mc_gsbase;
 
-	PROC_LOCK(p);
 #if defined(COMPAT_43)
 	if (ucp->uc_mcontext.mc_onstack & 1)
 		td->td_sigstk.ss_flags |= SS_ONSTACK;
@@ -486,10 +485,7 @@
 		td->td_sigstk.ss_flags &= ~SS_ONSTACK;
 #endif
 
-	td->td_sigmask = ucp->uc_sigmask;
-	SIG_CANTMASK(td->td_sigmask);
-	signotify(td);
-	PROC_UNLOCK(p);
+	kern_sigprocmask(td, SIG_SETMASK, &ucp->uc_sigmask, NULL, 0);
 	td->td_pcb->pcb_flags |= PCB_FULLCTX;
 	td->td_pcb->pcb_full_iret = 1;
 	return (EJUSTRETURN);

==== //depot/projects/usb/src/sys/amd64/ia32/ia32_signal.c#10 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.23 2009/07/09 09:34:11 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.24 2009/10/27 10:47:58 kib Exp $");
 
 #include "opt_compat.h"
 
@@ -244,10 +244,8 @@
 		if (ret == 0) {
 			ret = ia32_set_mcontext(td, &uc.uc_mcontext);
 			if (ret == 0) {
-				SIG_CANTMASK(uc.uc_sigmask);
-				PROC_LOCK(td->td_proc);
-				td->td_sigmask = uc.uc_sigmask;
-				PROC_UNLOCK(td->td_proc);
+				kern_sigprocmask(td, SIG_SETMASK,
+				    &uc.uc_sigmask, NULL, 0);
 			}
 		}
 	}
@@ -273,10 +271,8 @@
 			if (ret == 0) {
 				ret = ia32_set_mcontext(td, &uc.uc_mcontext);
 				if (ret == 0) {
-					SIG_CANTMASK(uc.uc_sigmask);
-					PROC_LOCK(td->td_proc);
-					td->td_sigmask = uc.uc_sigmask;
-					PROC_UNLOCK(td->td_proc);
+					kern_sigprocmask(td, SIG_SETMASK,
+					    &uc.uc_sigmask, NULL, 0);
 				}
 			}
 		}
@@ -544,9 +540,8 @@
 	} */ *uap;
 {
 	struct ia32_ucontext4 uc;
-	struct proc *p = td->td_proc;
 	struct trapframe *regs;
-	const struct ia32_ucontext4 *ucp;
+	struct ia32_ucontext4 *ucp;
 	int cs, eflags, error;
 	ksiginfo_t ksi;
 
@@ -610,11 +605,7 @@
 	regs->tf_fs = ucp->uc_mcontext.mc_fs;
 	regs->tf_gs = ucp->uc_mcontext.mc_gs;
 
-	PROC_LOCK(p);
-	td->td_sigmask = ucp->uc_sigmask;
-	SIG_CANTMASK(td->td_sigmask);
-	signotify(td);
-	PROC_UNLOCK(p);
+	kern_sigprocmask(td, SIG_SETMASK, &ucp->uc_sigmask, NULL, 0);
 	td->td_pcb->pcb_full_iret = 1;
 	return (EJUSTRETURN);
 }
@@ -631,9 +622,8 @@
 	} */ *uap;
 {
 	struct ia32_ucontext uc;
-	struct proc *p = td->td_proc;
 	struct trapframe *regs;
-	const struct ia32_ucontext *ucp;
+	struct ia32_ucontext *ucp;
 	int cs, eflags, error, ret;
 	ksiginfo_t ksi;
 
@@ -702,11 +692,7 @@
 	regs->tf_gs = ucp->uc_mcontext.mc_gs;
 	regs->tf_flags = TF_HASSEGS;
 
-	PROC_LOCK(p);
-	td->td_sigmask = ucp->uc_sigmask;
-	SIG_CANTMASK(td->td_sigmask);
-	signotify(td);
-	PROC_UNLOCK(p);
+	kern_sigprocmask(td, SIG_SETMASK, &ucp->uc_sigmask, NULL, 0);
 	td->td_pcb->pcb_full_iret = 1;
 	return (EJUSTRETURN);
 }

==== //depot/projects/usb/src/sys/amd64/linux32/linux32_machdep.c#14 (text+ko) ====

@@ -29,7 +29,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.53 2009/04/01 13:09:26 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.54 2009/10/28 20:17:54 jhb Exp $");
 
 #include 
 #include 
@@ -91,6 +91,10 @@
 	return (bsa);
 }
 
+static int	linux_mmap_common(struct thread *td, l_uintptr_t addr,
+		    l_size_t len, l_int prot, l_int flags, l_int fd,
+		    l_loff_t pos);
+
 int
 bsd_to_linux_sigaltstack(int bsa)
 {
@@ -759,12 +763,9 @@
 #define STACK_SIZE  (2 * 1024 * 1024)
 #define GUARD_SIZE  (4 * PAGE_SIZE)
 
-static int linux_mmap_common(struct thread *, struct l_mmap_argv *);
-
 int
 linux_mmap2(struct thread *td, struct linux_mmap2_args *args)
 {
-	struct l_mmap_argv linux_args;
 
 #ifdef DEBUG
 	if (ldebug(mmap2))
@@ -773,14 +774,9 @@
 		    args->flags, args->fd, args->pgoff);
 #endif
 
-	linux_args.addr = PTROUT(args->addr);
-	linux_args.len = args->len;
-	linux_args.prot = args->prot;
-	linux_args.flags = args->flags;
-	linux_args.fd = args->fd;
-	linux_args.pgoff = args->pgoff;
-
-	return (linux_mmap_common(td, &linux_args));
+	return (linux_mmap_common(td, PTROUT(args->addr), args->len, args->prot,
+		args->flags, args->fd, (uint64_t)(uint32_t)args->pgoff *
+		PAGE_SIZE));
 }
 
 int
@@ -799,15 +795,15 @@
 		    linux_args.addr, linux_args.len, linux_args.prot,
 		    linux_args.flags, linux_args.fd, linux_args.pgoff);
 #endif
-	if ((linux_args.pgoff % PAGE_SIZE) != 0)
-		return (EINVAL);
-	linux_args.pgoff /= PAGE_SIZE;
 
-	return (linux_mmap_common(td, &linux_args));
+	return (linux_mmap_common(td, linux_args.addr, linux_args.len,
+	    linux_args.prot, linux_args.flags, linux_args.fd,
+	    (uint32_t)linux_args.pgoff));
 }
 
 static int
-linux_mmap_common(struct thread *td, struct l_mmap_argv *linux_args)
+linux_mmap_common(struct thread *td, l_uintptr_t addr, l_size_t len, l_int prot,
+    l_int flags, l_int fd, l_loff_t pos)
 {
 	struct proc *p = td->td_proc;
 	struct mmap_args /* {
@@ -830,21 +826,20 @@
 	 * Linux mmap(2):
 	 * You must specify exactly one of MAP_SHARED and MAP_PRIVATE
 	 */
-	if (! ((linux_args->flags & LINUX_MAP_SHARED) ^
-	    (linux_args->flags & LINUX_MAP_PRIVATE)))
+	if (!((flags & LINUX_MAP_SHARED) ^ (flags & LINUX_MAP_PRIVATE)))
 		return (EINVAL);
 
-	if (linux_args->flags & LINUX_MAP_SHARED)
+	if (flags & LINUX_MAP_SHARED)
 		bsd_args.flags |= MAP_SHARED;
-	if (linux_args->flags & LINUX_MAP_PRIVATE)
+	if (flags & LINUX_MAP_PRIVATE)
 		bsd_args.flags |= MAP_PRIVATE;
-	if (linux_args->flags & LINUX_MAP_FIXED)
+	if (flags & LINUX_MAP_FIXED)
 		bsd_args.flags |= MAP_FIXED;
-	if (linux_args->flags & LINUX_MAP_ANON)
+	if (flags & LINUX_MAP_ANON)
 		bsd_args.flags |= MAP_ANON;
 	else
 		bsd_args.flags |= MAP_NOSYNC;
-	if (linux_args->flags & LINUX_MAP_GROWSDOWN)
+	if (flags & LINUX_MAP_GROWSDOWN)
 		bsd_args.flags |= MAP_STACK;
 
 	/*
@@ -852,12 +847,12 @@
 	 * on Linux/i386. We do this to ensure maximum compatibility.
 	 * Linux/ia64 does the same in i386 emulation mode.
 	 */
-	bsd_args.prot = linux_args->prot;
+	bsd_args.prot = prot;
 	if (bsd_args.prot & (PROT_READ | PROT_WRITE | PROT_EXEC))
 		bsd_args.prot |= PROT_READ | PROT_EXEC;
 
 	/* Linux does not check file descriptor when MAP_ANONYMOUS is set. */
-	bsd_args.fd = (bsd_args.flags & MAP_ANON) ? -1 : linux_args->fd;
+	bsd_args.fd = (bsd_args.flags & MAP_ANON) ? -1 : fd;
 	if (bsd_args.fd != -1) {
 		/*
 		 * Linux follows Solaris mmap(2) description:
@@ -882,7 +877,7 @@
 		fdrop(fp, td);
 	}
 
-	if (linux_args->flags & LINUX_MAP_GROWSDOWN) {
+	if (flags & LINUX_MAP_GROWSDOWN) {
 		/*
 		 * The Linux MAP_GROWSDOWN option does not limit auto
 		 * growth of the region.  Linux mmap with this option
@@ -905,8 +900,7 @@
 		 * fixed size of (STACK_SIZE - GUARD_SIZE).
 		 */
 
-		if ((caddr_t)PTRIN(linux_args->addr) + linux_args->len >
-		    p->p_vmspace->vm_maxsaddr) {
+		if ((caddr_t)PTRIN(addr) + len > p->p_vmspace->vm_maxsaddr) {
 			/*
 			 * Some Linux apps will attempt to mmap
 			 * thread stacks near the top of their
@@ -937,19 +931,19 @@
 		 * we map the full stack, since we don't have a way
 		 * to autogrow it.
 		 */
-		if (linux_args->len > STACK_SIZE - GUARD_SIZE) {
-			bsd_args.addr = (caddr_t)PTRIN(linux_args->addr);
-			bsd_args.len = linux_args->len;
+		if (len > STACK_SIZE - GUARD_SIZE) {
+			bsd_args.addr = (caddr_t)PTRIN(addr);
+			bsd_args.len = len;
 		} else {
-			bsd_args.addr = (caddr_t)PTRIN(linux_args->addr) -
-			    (STACK_SIZE - GUARD_SIZE - linux_args->len);
+			bsd_args.addr = (caddr_t)PTRIN(addr) -
+			    (STACK_SIZE - GUARD_SIZE - len);
 			bsd_args.len = STACK_SIZE - GUARD_SIZE;
 		}
 	} else {
-		bsd_args.addr = (caddr_t)PTRIN(linux_args->addr);
-		bsd_args.len  = linux_args->len;
+		bsd_args.addr = (caddr_t)PTRIN(addr);
+		bsd_args.len  = len;
 	}
-	bsd_args.pos = (off_t)linux_args->pgoff * PAGE_SIZE;
+	bsd_args.pos = pos;
 
 #ifdef DEBUG
 	if (ldebug(mmap))

==== //depot/projects/usb/src/sys/amd64/linux32/linux32_sysvec.c#23 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.53 2009/08/24 16:19:47 bz Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.54 2009/10/27 10:47:58 kib Exp $");
 #include "opt_compat.h"
 
 #ifndef COMPAT_IA32
@@ -565,9 +565,9 @@
 int
 linux_sigreturn(struct thread *td, struct linux_sigreturn_args *args)
 {
-	struct proc *p = td->td_proc;
 	struct l_sigframe frame;
 	struct trapframe *regs;
+	sigset_t bmask;
 	l_sigset_t lmask;
 	int eflags, i;
 	ksiginfo_t ksi;
@@ -623,11 +623,8 @@
 	lmask.__bits[0] = frame.sf_sc.sc_mask;
 	for (i = 0; i < (LINUX_NSIG_WORDS-1); i++)
 		lmask.__bits[i+1] = frame.sf_extramask[i];
-	PROC_LOCK(p);
-	linux_to_bsd_sigset(&lmask, &td->td_sigmask);
-	SIG_CANTMASK(td->td_sigmask);
-	signotify(td);
-	PROC_UNLOCK(p);
+	linux_to_bsd_sigset(&lmask, &bmask);
+	kern_sigprocmask(td, SIG_SETMASK, &bmask, NULL, 0);
 
 	/*
 	 * Restore signal context.
@@ -666,9 +663,9 @@
 int
 linux_rt_sigreturn(struct thread *td, struct linux_rt_sigreturn_args *args)
 {
-	struct proc *p = td->td_proc;
 	struct l_ucontext uc;
 	struct l_sigcontext *context;
+	sigset_t bmask;
 	l_stack_t *lss;
 	stack_t ss;
 	struct trapframe *regs;
@@ -725,11 +722,8 @@
 		return(EINVAL);
 	}
 
-	PROC_LOCK(p);
-	linux_to_bsd_sigset(&uc.uc_sigmask, &td->td_sigmask);
-	SIG_CANTMASK(td->td_sigmask);
-	signotify(td);
-	PROC_UNLOCK(p);
+	linux_to_bsd_sigset(&uc.uc_sigmask, &bmask);
+	kern_sigprocmask(td, SIG_SETMASK, &bmask, NULL, 0);
 
 	/*
 	 * Restore signal context

==== //depot/projects/usb/src/sys/arm/arm/machdep.c#10 (text+ko) ====

@@ -46,7 +46,7 @@
 #include "opt_ddb.h"
 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.33 2009/05/18 18:37:18 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.34 2009/10/27 10:47:58 kib Exp $");
 
 #include 
 #include 
@@ -605,7 +605,6 @@
 		const struct __ucontext *sigcntxp;
 	} */ *uap;
 {
-	struct proc *p = td->td_proc;
 	struct sigframe sf;
 	struct trapframe *tf;
 	int spsr;
@@ -627,11 +626,7 @@
 	set_mcontext(td, &sf.sf_uc.uc_mcontext);
 
 	/* Restore signal mask. */
-	PROC_LOCK(p);
-	td->td_sigmask = sf.sf_uc.uc_sigmask;
-	SIG_CANTMASK(td->td_sigmask);
-	signotify(td);
-	PROC_UNLOCK(p);
+	kern_sigprocmask(td, SIG_SETMASK, &sf.sf_uc.uc_sigmask, NULL, 0);
 
 	return (EJUSTRETURN);
 }

==== //depot/projects/usb/src/sys/arm/mv/mv_sata.c#2 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/mv/mv_sata.c,v 1.1 2009/06/24 15:41:18 raj Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/mv/mv_sata.c,v 1.2 2009/10/31 13:24:14 mav Exp $");
 
 #include 
 #include 
@@ -548,14 +548,16 @@
 	uint32_t req_in;
 	int error, slot;
 
-	sc = device_get_softc(GRANDPARENT(request->dev));
+	sc = device_get_softc(device_get_parent(request->parent));
 	ch = device_get_softc(request->parent);
 
 	mtx_assert(&ch->state_mtx, MA_OWNED);
 
 	/* Only DMA R/W goes through the EDMA machine. */
 	if (request->u.ata.command != ATA_READ_DMA &&
-	    request->u.ata.command != ATA_WRITE_DMA) {
+	    request->u.ata.command != ATA_WRITE_DMA &&
+	    request->u.ata.command != ATA_READ_DMA48 &&
+	    request->u.ata.command != ATA_WRITE_DMA48) {
 
 		/* Disable EDMA before accessing legacy registers */
 		if (sata_edma_is_running(request->parent)) {
@@ -569,12 +571,9 @@
 		return (ata_begin_transaction(request));
 	}
 
-	/* Check for 48 bit access and convert if needed */
-	ata_modify_if_48bit(request);
-
 	/* Prepare data for DMA */
 	if ((error = ch->dma.load(request, NULL, NULL))) {
-		device_printf(request->dev, "setting up DMA failed!\n");
+		device_printf(request->parent, "setting up DMA failed!\n");
 		request->result = error;
 		return ATA_OP_FINISHED;
 	}
@@ -633,7 +632,7 @@
 	uint32_t res_in, res_out, icr;
 	int slot;
 
-	sc = device_get_softc(GRANDPARENT(request->dev));
+	sc = device_get_softc(device_get_parent(request->parent));
 	ch = device_get_softc(request->parent);
 
 	mtx_assert(&ch->state_mtx, MA_OWNED);

==== //depot/projects/usb/src/sys/boot/common/commands.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/boot/common/commands.c,v 1.22 2004/11/13 17:04:55 ru Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/common/commands.c,v 1.23 2009/10/28 10:06:27 brueffer Exp $");
 
 #include 
 #include 
@@ -150,6 +150,7 @@
 	break;
     default:
 	command_errmsg = "usage is 'help  []";
+	close(hfd);
 	return(CMD_ERROR);
     }
 

==== //depot/projects/usb/src/sys/boot/i386/zfsboot/zfsboot.c#5 (text+ko) ====

@@ -14,7 +14,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/boot/i386/zfsboot/zfsboot.c,v 1.4 2009/10/14 14:13:42 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/i386/zfsboot/zfsboot.c,v 1.5 2009/10/23 18:44:53 rnoland Exp $");
 
 #include 
 #include 
@@ -474,6 +474,7 @@
     slba = hdr.hdr_lba_table;
     elba = slba + hdr.hdr_entries / entries_per_sec;
     while (slba < elba) {
+	dsk->start = 0;
 	if (drvread(dsk, sec, slba, 1))
 	    return;
 	for (part = 0; part < entries_per_sec; part++) {
@@ -494,7 +495,6 @@
 		     */
 		    dsk = copy_dsk(dsk);
 		}
-		break;
 	    }
 	}
 	slba++;
@@ -857,12 +857,13 @@
 printf(const char *fmt,...)
 {
     va_list ap;
-    char buf[10];
+    char buf[20];
     char *s;
-    unsigned u;
+    unsigned long long u;
     int c;
     int minus;
     int prec;
+    int l;
     int len;
     int pad;
 
@@ -871,6 +872,7 @@
 	if (c == '%') {
 	    minus = 0;
 	    prec = 0;
+	    l = 0;
 	nextfmt:
 	    c = *fmt++;
 	    switch (c) {
@@ -892,6 +894,9 @@
 	    case 'c':
 		putchar(va_arg(ap, int));
 		continue;
+	    case 'l':
+		l++;
+		goto nextfmt;
 	    case 's':
 		s = va_arg(ap, char *);
 		if (prec) {
@@ -914,7 +919,17 @@
 		}
 		continue;
 	    case 'u':
-		u = va_arg(ap, unsigned);
+		switch (l) {
+		case 2:
+		    u = va_arg(ap, unsigned long long);
+		    break;
+		case 1:
+		    u = va_arg(ap, unsigned long);
+		    break;
+		default:
+		    u = va_arg(ap, unsigned);
+		    break;
+		}
 		s = buf;
 		do
 		    *s++ = '0' + u % 10U;

==== //depot/projects/usb/src/sys/boot/zfs/zfs.c#4 (text+ko) ====

@@ -23,11 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD: src/sys/boot/zfs/zfs.c,v 1.4 2008/12/11 16:48:35 ps Exp $
+ *	$FreeBSD: src/sys/boot/zfs/zfs.c,v 1.5 2009/10/23 18:44:53 rnoland Exp $
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/boot/zfs/zfs.c,v 1.4 2008/12/11 16:48:35 ps Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/zfs/zfs.c,v 1.5 2009/10/23 18:44:53 rnoland Exp $");
 
 /*
  *	Stand-alone file reading package.
@@ -100,7 +100,7 @@
 	f->f_fsdata = (void *)fp;
 
 	if (spa->spa_root_objset.os_type != DMU_OST_ZFS) {
-		printf("Unexpected object set type %lld\n",
+		printf("Unexpected object set type %llu\n",
 		    spa->spa_root_objset.os_type);
 		rc = EIO;
 		goto out;
@@ -413,7 +413,7 @@
 		if (vdev_probe(vdev_read, (void*) (uintptr_t) fd, 0))
 			close(fd);
 
-		for (slice = 1; slice <= 4; slice++) {
+		for (slice = 1; slice <= 128; slice++) {
 			sprintf(devname, "disk%dp%d:", unit, slice);
 			fd = open(devname, O_RDONLY);
 			if (fd == -1) {

==== //depot/projects/usb/src/sys/boot/zfs/zfsimpl.c#5 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/boot/zfs/zfsimpl.c,v 1.5 2009/05/16 10:48:20 dfr Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/zfs/zfsimpl.c,v 1.6 2009/10/23 18:44:53 rnoland Exp $");
 
 /*
  *	Stand-alone ZFS file reader.
@@ -53,6 +53,8 @@
 
 #define TEMP_SIZE	(1*SPA_MAXBLOCKSIZE)
 
+static int zio_read(spa_t *spa, const blkptr_t *bp, void *buf);
+
 static void
 zfs_init(void)
 {
@@ -897,6 +899,33 @@
 }
 
 static int
+zio_read_gang(spa_t *spa, const blkptr_t *bp, const dva_t *dva, void *buf)
+{
+	zio_gbh_phys_t zio_gb;
+	vdev_t *vdev;
+	int vdevid;
+	off_t offset;
+	int i;
+
+	vdevid = DVA_GET_VDEV(dva);
+	offset = DVA_GET_OFFSET(dva);
+	STAILQ_FOREACH(vdev, &spa->spa_vdevs, v_childlink)
+		if (vdev->v_id == vdevid)
+			break;
+	if (!vdev || !vdev->v_read)
+		return (EIO);
+	if (vdev->v_read(vdev, bp, &zio_gb, offset, SPA_GANGBLOCKSIZE))
+		return (EIO);
+
+	for (i = 0; i < SPA_GBH_NBLKPTRS; i++) {
+		if (zio_read(spa, &zio_gb.zg_blkptr[i], buf))
+			return (EIO);
+	}
+ 
+	return (0);
+}
+
+static int
 zio_read(spa_t *spa, const blkptr_t *bp, void *buf)
 {
 	int cpfunc = BP_GET_COMPRESS(bp);
@@ -920,20 +949,27 @@
 		if (!dva->dva_word[0] && !dva->dva_word[1])
 			continue;
 
-		vdevid = DVA_GET_VDEV(dva);
-		offset = DVA_GET_OFFSET(dva);
-		STAILQ_FOREACH(vdev, &spa->spa_vdevs, v_childlink)
-			if (vdev->v_id == vdevid)
-				break;
-		if (!vdev || !vdev->v_read)
-			continue;
-		if (vdev->v_read(vdev, bp, pbuf, offset, psize))
-			continue;
+		if (DVA_GET_GANG(dva)) {
+			printf("ZFS: gang block detected!\n");
+			if (zio_read_gang(spa, bp, dva, buf))
+				return (EIO); 
+		} else {
+			vdevid = DVA_GET_VDEV(dva);
+			offset = DVA_GET_OFFSET(dva);
+			STAILQ_FOREACH(vdev, &spa->spa_vdevs, v_childlink)
+				if (vdev->v_id == vdevid)
+					break;
+			if (!vdev || !vdev->v_read) {
+				continue;
+			}
+			if (vdev->v_read(vdev, bp, pbuf, offset, psize))
+				continue;
 
-		if (cpfunc != ZIO_COMPRESS_OFF) {
-			if (zio_decompress_data(cpfunc, pbuf, psize,
-				buf, lsize))
-				return (EIO);
+			if (cpfunc != ZIO_COMPRESS_OFF) {
+				if (zio_decompress_data(cpfunc, pbuf, psize,
+				    buf, lsize))
+					return (EIO);
+			}
 		}
 
 		return (0);
@@ -1331,13 +1367,13 @@
 	dsl_dataset_phys_t *ds;
 
 	if (objset_get_dnode(spa, &spa->spa_mos, objnum, &dataset)) {
-		printf("ZFS: can't find dataset %lld\n", objnum);
+		printf("ZFS: can't find dataset %llu\n", objnum);
 		return (EIO);
 	}
 
 	ds = (dsl_dataset_phys_t *) &dataset.dn_bonus;
 	if (zio_read(spa, &ds->ds_bp, objset)) {
-		printf("ZFS: can't read object set for dataset %lld\n", objnum);
+		printf("ZFS: can't read object set for dataset %llu\n", objnum);
 		return (EIO);
 	}
 
@@ -1367,7 +1403,8 @@
 	 */
 	if (zap_lookup(spa, &dir, DMU_POOL_PROPS, &props) == 0
 	     && objset_get_dnode(spa, &spa->spa_mos, props, &propdir) == 0
-	     && zap_lookup(spa, &propdir, "bootfs", &bootfs) == 0)
+	     && zap_lookup(spa, &propdir, "bootfs", &bootfs) == 0
+	     && bootfs != 0)
 		return zfs_mount_dataset(spa, bootfs, objset);
 
 	/*
@@ -1425,7 +1462,7 @@
 	int symlinks_followed = 0;
 
 	if (spa->spa_root_objset.os_type != DMU_OST_ZFS) {
-		printf("ZFS: unexpected object set type %lld\n",
+		printf("ZFS: unexpected object set type %llu\n",
 		       spa->spa_root_objset.os_type);
 		return (EIO);
 	}

==== //depot/projects/usb/src/sys/cam/ata/ata_da.c#6 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/cam/ata/ata_da.c,v 1.6 2009/10/21 14:20:55 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/ata/ata_da.c,v 1.8 2009/10/31 10:43:38 mav Exp $");
 
 #include 
 
@@ -63,8 +63,7 @@
 #define ATA_MAX_28BIT_LBA               268435455UL
 
 typedef enum {
-	ADA_STATE_NORMAL,
-	ADA_STATE_SET_MULTI
+	ADA_STATE_NORMAL
 } ada_state;
 
 typedef enum {
@@ -84,7 +83,6 @@
 } ada_quirks;
 
 typedef enum {
-	ADA_CCB_SET_MULTI	= 0x01,
 	ADA_CCB_BUFFER_IO	= 0x03,
 	ADA_CCB_WAITING		= 0x04,
 	ADA_CCB_DUMP		= 0x05,
@@ -112,7 +110,6 @@
 	ada_quirks quirks;
 	int	 ordered_tag_count;
 	int	 outstanding_cmds;
-	int	 secsperint;
 	struct	 disk_params params;
 	struct	 disk *disk;
 	union	 ccb saved_ccb;
@@ -270,7 +267,7 @@
 	/* We only sync the cache if the drive is capable of it. */
 	if (softc->flags & ADA_FLAG_CAN_FLUSHCACHE) {
 
-		ccb = cam_periph_getccb(periph, /*priority*/1);
+		ccb = cam_periph_getccb(periph, CAM_PRIORITY_NORMAL);
 		cam_fill_ataio(&ccb->ataio,
 				    1,
 				    adadone,
@@ -343,7 +340,7 @@
 	/*
 	 * Schedule ourselves for performing the work.
 	 */
-	xpt_schedule(periph, /* XXX priority */1);
+	xpt_schedule(periph, CAM_PRIORITY_NORMAL);
 	cam_periph_unlock(periph);
 
 	return;
@@ -377,7 +374,7 @@
 
 	if (length > 0) {
 		periph->flags |= CAM_PERIPH_POLLED;
-		xpt_setup_ccb(&ccb.ccb_h, periph->path, /*priority*/1);
+		xpt_setup_ccb(&ccb.ccb_h, periph->path, CAM_PRIORITY_NORMAL);

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Sat Oct 31 16:01:06 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 567121065676; Sat, 31 Oct 2009 16:01:06 +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 1B156106568D
	for ; Sat, 31 Oct 2009 16:01:06 +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 087258FC18
	for ; Sat, 31 Oct 2009 16:01:06 +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 n9VG15gg083346
	for ; Sat, 31 Oct 2009 16:01:05 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9VG15Gn083344
	for perforce@freebsd.org; Sat, 31 Oct 2009 16:01:05 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sat, 31 Oct 2009 16:01:05 GMT
Message-Id: <200910311601.n9VG15Gn083344@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 170003 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: Sat, 31 Oct 2009 16:01:06 -0000

http://p4web.freebsd.org/chv.cgi?CH=170003

Change 170003 by hselasky@hselasky_laptop001 on 2009/10/31 16:00:17

	
	USB serial:
	 - add missing "cn_name" initialisation.
	 - reported by: Dimitry Andric

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/serial/usb_serial.c#16 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/serial/usb_serial.c#16 (text+ko) ====

@@ -1304,6 +1304,8 @@
 		cp->cn_pri = CN_NORMAL;
 	else
 		cp->cn_pri = CN_DEAD;
+
+	strlcpy(cp->cn_name, "ucom", sizeof(cp->cn_name));
 }
 
 static void

From owner-p4-projects@FreeBSD.ORG  Sat Oct 31 16:06:11 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8F08F106568B; Sat, 31 Oct 2009 16:06:11 +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 536281065670
	for ; Sat, 31 Oct 2009 16:06:11 +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 401A58FC21
	for ; Sat, 31 Oct 2009 16:06:11 +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 n9VG6BRp084705
	for ; Sat, 31 Oct 2009 16:06:11 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9VG6BKv084703
	for perforce@freebsd.org; Sat, 31 Oct 2009 16:06:11 GMT
	(envelope-from mav@freebsd.org)
Date: Sat, 31 Oct 2009 16:06:11 GMT
Message-Id: <200910311606.n9VG6BKv084703@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 170004 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: Sat, 31 Oct 2009 16:06:11 -0000

http://p4web.freebsd.org/chv.cgi?CH=170004

Change 170004 by mav@mav_mavtest on 2009/10/31 16:05:19

	Fix reference counting bug, when device unreferenced before then
	invalidated. To do it, do not handle validity flag as another
	reference, but explicitly modify reference count each time flag is
	modified.
	
	Discovered by:	thompsa

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#47 edit
.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#114 edit
.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_internal.h#10 edit
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.c#21 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#47 (text+ko) ====

@@ -735,6 +735,7 @@
 	case PROBE_SET_MULTI:
 		if (periph->path->device->flags & CAM_DEV_UNCONFIGURED) {
 			path->device->flags &= ~CAM_DEV_UNCONFIGURED;
+			xpt_acquire_device(path->device);
 			done_ccb->ccb_h.func_code = XPT_GDEV_TYPE;
 			xpt_action(done_ccb);
 			xpt_async(AC_FOUND_DEVICE, done_ccb->ccb_h.path,
@@ -779,6 +780,7 @@
 		ata_device_transport(path);
 		if (periph->path->device->flags & CAM_DEV_UNCONFIGURED) {
 			path->device->flags &= ~CAM_DEV_UNCONFIGURED;
+			xpt_acquire_device(path->device);
 			done_ccb->ccb_h.func_code = XPT_GDEV_TYPE;
 			xpt_action(done_ccb);
 			xpt_async(AC_FOUND_DEVICE, done_ccb->ccb_h.path, done_ccb);
@@ -812,6 +814,7 @@
 		path->device->flags |= CAM_DEV_IDENTIFY_DATA_VALID;
 		if (periph->path->device->flags & CAM_DEV_UNCONFIGURED) {
 			path->device->flags &= ~CAM_DEV_UNCONFIGURED;
+			xpt_acquire_device(path->device);
 			done_ccb->ccb_h.func_code = XPT_GDEV_TYPE;
 			xpt_action(done_ccb);
 			xpt_async(AC_FOUND_DEVICE, done_ccb->ccb_h.path,
@@ -1517,8 +1520,10 @@
 				     CAM_EXPECT_INQ_CHANGE, NULL);
 		}
 		xpt_release_path(&newpath);
-	} else if (async_code == AC_LOST_DEVICE) {
+	} else if (async_code == AC_LOST_DEVICE &&
+	    (device->flags & CAM_DEV_UNCONFIGURED) == 0) {
 		device->flags |= CAM_DEV_UNCONFIGURED;
+		xpt_release_device(device);
 	} else if (async_code == AC_TRANSFER_NEG) {
 		struct ccb_trans_settings *settings;
 

==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#114 (text+ko) ====

@@ -217,9 +217,7 @@
 					 int run_queue);
 static struct cam_et*
 		 xpt_alloc_target(struct cam_eb *bus, target_id_t target_id);
-static void	 xpt_release_target(struct cam_eb *bus, struct cam_et *target);
-static void	 xpt_release_device(struct cam_eb *bus, struct cam_et *target,
-				    struct cam_ed *device);
+static void	 xpt_release_target(struct cam_et *target);
 static struct cam_eb*
 		 xpt_find_bus(path_id_t path_id);
 static struct cam_et*
@@ -3528,9 +3526,9 @@
 		CAM_DEBUG(new_path, CAM_DEBUG_TRACE, ("xpt_compile_path\n"));
 	} else {
 		if (device != NULL)
-			xpt_release_device(bus, target, device);
+			xpt_release_device(device);
 		if (target != NULL)
-			xpt_release_target(bus, target);
+			xpt_release_target(target);
 		if (bus != NULL)
 			xpt_release_bus(bus);
 	}
@@ -3542,11 +3540,11 @@
 {
 	CAM_DEBUG(path, CAM_DEBUG_TRACE, ("xpt_release_path\n"));
 	if (path->device != NULL) {
-		xpt_release_device(path->bus, path->target, path->device);
+		xpt_release_device(path->device);
 		path->device = NULL;
 	}
 	if (path->target != NULL) {
-		xpt_release_target(path->bus, path->target);
+		xpt_release_target(path->target);
 		path->target = NULL;
 	}
 	if (path->bus != NULL) {
@@ -4383,15 +4381,15 @@
 }
 
 static void
-xpt_release_target(struct cam_eb *bus, struct cam_et *target)
+xpt_release_target(struct cam_et *target)
 {
 
 	if ((--target->refcount == 0)
 	 && (TAILQ_FIRST(&target->ed_entries) == NULL)) {
-		TAILQ_REMOVE(&bus->et_entries, target, links);
-		bus->generation++;
+		TAILQ_REMOVE(&target->bus->et_entries, target, links);
+		target->bus->generation++;
+		xpt_release_bus(target->bus);
 		free(target, M_CAMXPT);
-		xpt_release_bus(bus);
 	}
 }
 
@@ -4478,13 +4476,18 @@
 	return (device);
 }
 
-static void
-xpt_release_device(struct cam_eb *bus, struct cam_et *target,
-		   struct cam_ed *device)
+void
+xpt_acquire_device(struct cam_ed *device)
+{
+
+	device->refcount++;
+}
+
+void
+xpt_release_device(struct cam_ed *device)
 {
 
-	if ((--device->refcount == 0)
-	 && ((device->flags & CAM_DEV_UNCONFIGURED) != 0)) {
+	if (--device->refcount == 0) {
 		struct cam_devq *devq;
 
 		if (device->alloc_ccb_entry.pinfo.index != CAM_UNQUEUED_INDEX
@@ -4494,16 +4497,16 @@
 		if ((device->flags & CAM_DEV_REL_TIMEOUT_PENDING) != 0)
 				callout_stop(&device->callout);
 
-		TAILQ_REMOVE(&target->ed_entries, device,links);
-		target->generation++;
-		bus->sim->max_ccbs -= device->ccbq.devq_openings;
+		TAILQ_REMOVE(&device->target->ed_entries, device,links);
+		device->target->generation++;
+		device->target->bus->sim->max_ccbs -= device->ccbq.devq_openings;
 		/* Release our slot in the devq */
-		devq = bus->sim->devq;
+		devq = device->target->bus->sim->devq;
 		cam_devq_resize(devq, devq->alloc_queue.array_size - 1);
 		camq_fini(&device->drvq);
 		cam_ccbq_fini(&device->ccbq);
+		xpt_release_target(device->target);
 		free(device, M_CAMXPT);
-		xpt_release_target(bus, target);
 	}
 }
 

==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_internal.h#10 (text+ko) ====

@@ -37,9 +37,7 @@
 typedef struct cam_ed * (*xpt_alloc_device_func)(struct cam_eb *bus,
 					         struct cam_et *target,
 					         lun_id_t lun_id);
-typedef void (*xpt_release_device_func)(struct cam_eb *bus,
-				        struct cam_et *target,
-				        struct cam_ed *device);
+typedef void (*xpt_release_device_func)(struct cam_ed *device);
 typedef void (*xpt_action_func)(union ccb *start_ccb);
 typedef void (*xpt_done_func)(union ccb *done_ccb);
 typedef void (*xpt_dev_async_func)(u_int32_t async_code,
@@ -174,6 +172,8 @@
 struct cam_ed *		xpt_alloc_device(struct cam_eb *bus,
 					 struct cam_et *target,
 					 lun_id_t lun_id);
+void			xpt_acquire_device(struct cam_ed *device);
+void			xpt_release_device(struct cam_ed *device);
 void			xpt_run_dev_sendq(struct cam_eb *bus);
 int			xpt_schedule_dev(struct camq *queue, cam_pinfo *dev_pinfo,
 					 u_int32_t new_priority);

==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.c#21 (text+ko) ====

@@ -1077,8 +1077,10 @@
 				else
 					PROBE_SET_ACTION(softc, PROBE_SERIAL_NUM_0);
 
-				path->device->flags &= ~CAM_DEV_UNCONFIGURED;
-
+				if (path->device->flags & CAM_DEV_UNCONFIGURED) {
+					path->device->flags &= ~CAM_DEV_UNCONFIGURED;
+					xpt_acquire_device(path->device);
+				}
 				xpt_release_ccb(done_ccb);
 				xpt_schedule(periph, priority);
 				return;
@@ -1337,8 +1339,12 @@
 			CAM_DEBUG(periph->path, CAM_DEBUG_INFO,
 			    ("Leave Domain Validation\n"));
 		}
+		if (path->device->flags & CAM_DEV_UNCONFIGURED) {
+			path->device->flags &= ~CAM_DEV_UNCONFIGURED;
+			xpt_acquire_device(path->device);
+		}
 		path->device->flags &=
-		    ~(CAM_DEV_UNCONFIGURED|CAM_DEV_IN_DV|CAM_DEV_DV_HIT_BOTTOM);
+		    ~(CAM_DEV_IN_DV|CAM_DEV_DV_HIT_BOTTOM);
 		if ((softc->flags & PROBE_NO_ANNOUNCE) == 0) {
 			/* Inform the XPT that a new device has been found */
 			done_ccb->ccb_h.func_code = XPT_GDEV_TYPE;
@@ -1388,8 +1394,12 @@
 			CAM_DEBUG(periph->path, CAM_DEBUG_INFO,
 			    ("Leave Domain Validation Successfully\n"));
 		}
+		if (path->device->flags & CAM_DEV_UNCONFIGURED) {
+			path->device->flags &= ~CAM_DEV_UNCONFIGURED;
+			xpt_acquire_device(path->device);
+		}
 		path->device->flags &=
-		    ~(CAM_DEV_UNCONFIGURED|CAM_DEV_IN_DV|CAM_DEV_DV_HIT_BOTTOM);
+		    ~(CAM_DEV_IN_DV|CAM_DEV_DV_HIT_BOTTOM);
 		if ((softc->flags & PROBE_NO_ANNOUNCE) == 0) {
 			/* Inform the XPT that a new device has been found */
 			done_ccb->ccb_h.func_code = XPT_GDEV_TYPE;
@@ -2376,8 +2386,10 @@
 				     CAM_EXPECT_INQ_CHANGE, NULL);
 		}
 		xpt_release_path(&newpath);
-	} else if (async_code == AC_LOST_DEVICE) {
+	} else if (async_code == AC_LOST_DEVICE &&
+	    (device->flags & CAM_DEV_UNCONFIGURED) == 0) {
 		device->flags |= CAM_DEV_UNCONFIGURED;
+		xpt_release_device(device);
 	} else if (async_code == AC_TRANSFER_NEG) {
 		struct ccb_trans_settings *settings;
 

From owner-p4-projects@FreeBSD.ORG  Sat Oct 31 16:48:54 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4F220106568D; Sat, 31 Oct 2009 16:48:54 +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 1392D1065694
	for ; Sat, 31 Oct 2009 16:48:54 +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 00DA08FC0A
	for ; Sat, 31 Oct 2009 16:48:54 +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 n9VGmrrY097934
	for ; Sat, 31 Oct 2009 16:48:53 GMT
	(envelope-from truncs@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9VGmrME097932
	for perforce@freebsd.org; Sat, 31 Oct 2009 16:48:53 GMT
	(envelope-from truncs@FreeBSD.org)
Date: Sat, 31 Oct 2009 16:48:53 GMT
Message-Id: <200910311648.n9VGmrME097932@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 170005 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: Sat, 31 Oct 2009 16:48:54 -0000

http://p4web.freebsd.org/chv.cgi?CH=170005

Change 170005 by truncs@aditya on 2009/10/31 16:47:58

	- Sync changes from ffs.
	- Intoduce Buffer Object and it's locks.

Affected files ...

.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_inode.c#8 edit

Differences ...

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_inode.c#8 (text+ko) ====

@@ -75,14 +75,15 @@
 	struct inode *ip;
 	int error;
 
+	ASSERT_VOP_ELOCKED(vp, "ext2_update");
 	ext2_itimes(vp);
 	ip = VTOI(vp);
-	if ((ip->i_flag & IN_MODIFIED) == 0)
+	if ((ip->i_flag & IN_MODIFIED) == 0 && waitfor == 0)
 		return (0);
-	ip->i_flag &= ~(IN_LAZYMOD | IN_MODIFIED);
-	if (vp->v_mount->mnt_flag & MNT_RDONLY)
+	ip->i_flag &= ~(IN_LAZYACCESS | IN_LAZYMOD | IN_MODIFIED);
+	fs = ip->i_e2fs;
+	if(fs->e2fs_ronly)
 		return (0);
-	fs = ip->i_e2fs;
 	if ((error = bread(ip->i_devvp,
 	    fsbtodb(fs, ino_to_fsba(fs, ip->i_number)),
 		(int)fs->e2fs_bsize, NOCRED, &bp)) != 0) {
@@ -119,6 +120,7 @@
 	struct inode *oip;
 	int32_t bn, lbn, lastiblock[NIADDR], indir_lbn[NIADDR];
 	int32_t oldblks[NDADDR + NIADDR], newblks[NDADDR + NIADDR];
+	struct bufobj *bo;
 	struct m_ext2fs *fs;
 	struct buf *bp;
 	int offset, size, level;
@@ -127,6 +129,10 @@
 	off_t osize;
 
 	oip = VTOI(ovp);
+	bo = &ovp->v_bufobj;
+
+	ASSERT_VOP_LOCKED(vp, "ext2_truncate");	
+
 	if (length < 0)
 	    return (EINVAL);
 
@@ -329,11 +335,11 @@
 	for (i = 0; i < NDADDR; i++)
 		if (newblks[i] != oip->i_db[i])
 			panic("itrunc2");
-	VI_LOCK(ovp);
-	if (length == 0 && (ovp->v_bufobj.bo_dirty.bv_cnt != 0 ||
-	    ovp->v_bufobj.bo_clean.bv_cnt != 0))
+	BO_LOCK(bo);
+	if (length == 0 && (bo->bo_dirty.bv_cnt != 0 ||
+	    bo->bo_clean.bv_cnt != 0))
 		panic("itrunc3");
-	VI_UNLOCK(ovp);
+	BO_UNLOCK(ovp);
 #endif /* DIAGNOSTIC */
 	/*
 	 * Put back the real size.

From owner-p4-projects@FreeBSD.ORG  Sat Oct 31 19:55:01 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C64521065670; Sat, 31 Oct 2009 19:55: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 8AC261065679
	for ; Sat, 31 Oct 2009 19:55:01 +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 7753F8FC0A
	for ; Sat, 31 Oct 2009 19:55:01 +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 n9VJt1qf014746
	for ; Sat, 31 Oct 2009 19:55:01 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9VJt1O9014736
	for perforce@freebsd.org; Sat, 31 Oct 2009 19:55:01 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Sat, 31 Oct 2009 19:55:01 GMT
Message-Id: <200910311955.n9VJt1O9014736@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 170016 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: Sat, 31 Oct 2009 19:55:02 -0000

http://p4web.freebsd.org/chv.cgi?CH=170016

Change 170016 by pgj@beehive on 2009/10/31 19:54:57

	IFC

Affected files ...

.. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#59 integrate

Differences ...

==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#59 (text+ko) ====

@@ -11,7 +11,7 @@
 
   
     
-      $FreeBSD: www/hu/share/sgml/news.xml,v 1.24 2009/10/12 08:41:39 pgj Exp $
+      $FreeBSD: www/hu/share/sgml/news.xml,v 1.25 2009/10/30 20:54:26 pgj Exp $
     
   
 

From owner-p4-projects@FreeBSD.ORG  Sat Oct 31 20:04:11 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 158531065743; Sat, 31 Oct 2009 20:04:11 +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 CB1B5106573E
	for ; Sat, 31 Oct 2009 20:04:10 +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 B90A48FC18
	for ; Sat, 31 Oct 2009 20:04:10 +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 n9VK4AKI016378
	for ; Sat, 31 Oct 2009 20:04:10 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9VK4AYU016376
	for perforce@freebsd.org; Sat, 31 Oct 2009 20:04:10 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Sat, 31 Oct 2009 20:04:10 GMT
Message-Id: <200910312004.n9VK4AYU016376@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 170017 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: Sat, 31 Oct 2009 20:04:11 -0000

http://p4web.freebsd.org/chv.cgi?CH=170017

Change 170017 by pgj@beehive on 2009/10/31 20:04:10

	MFen (www):
		1.23       -> 1.24       hu/platforms/amd64.sgml

Affected files ...

.. //depot/projects/docproj_hu/www/hu/platforms/amd64.sgml#11 edit

Differences ...

==== //depot/projects/docproj_hu/www/hu/platforms/amd64.sgml#11 (text+ko) ====

@@ -10,9 +10,9 @@
 
- 
+
 
   &header;
 
@@ -56,8 +56,6 @@
 
   
 

From owner-p4-projects@FreeBSD.ORG  Sat Oct 31 21:48:56 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 272571065679; Sat, 31 Oct 2009 21:48:56 +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 DF5F7106566C
	for ; Sat, 31 Oct 2009 21:48:55 +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 CE09C8FC08
	for ; Sat, 31 Oct 2009 21:48:55 +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 n9VLmt6E035255
	for ; Sat, 31 Oct 2009 21:48:55 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9VLmtRO035253
	for perforce@freebsd.org; Sat, 31 Oct 2009 21:48:55 GMT
	(envelope-from rene@FreeBSD.org)
Date: Sat, 31 Oct 2009 21:48:55 GMT
Message-Id: <200910312148.n9VLmtRO035253@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 170021 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: Sat, 31 Oct 2009 21:48:56 -0000

http://p4web.freebsd.org/chv.cgi?CH=170021

Change 170021 by rene@rene_self on 2009/10/31 21:48:47

	[porters handbook]
	* update version numbers of gcc and java
	* remove some pre-java 1.3 notes

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#47 edit

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#47 (text+ko) ====

@@ -3378,9 +3378,9 @@
 	  It is always incorrect to set
 	    any USE_*
 	    in /etc/make.conf.  For instance,
-	    setting USE_GCC=3.2
-	    would adds a dependency on gcc32 for every port,
-	    including gcc32 itself!
+	    setting USE_GCC=3.4
+	    would adds a dependency on gcc34 for every port,
+	    including gcc34 itself!
 	
 
 	
@@ -3433,9 +3433,9 @@
 
 		The port requires a specific version of
 		  gcc to build.  The exact version can be
-		  specified with value such as 3.2.
+		  specified with value such as 3.4.
 		  The minimal required version can be specified as
-		  3.2+.  The gcc from
+		  3.4+.  The gcc from
 		  the base system is used when it satisfies the requested
 		  version, otherwise an appropriate gcc is
 		  compiled from ports and the CC and
@@ -3701,11 +3701,11 @@
 	a different location.  However, this is not recommended.  These entries
 	contain just the path relative to
 	PREFIX/INFO_PATH.
-	For example, lang/gcc33 installs
+	For example, lang/gcc34 installs
 	info files to
-	PREFIX/INFO_PATH/gcc33,
+	PREFIX/INFO_PATH/gcc34,
 	and INFO will be something like this:
-	INFO= gcc33/cpp gcc33/cppinternals gcc33/g77 ...
+	INFO= gcc34/cpp gcc34/cppinternals gcc34/g77 ...
 
 	Appropriate installation/de-installation code will be automatically
 	added to the temporary pkg-plist before package
@@ -5935,7 +5935,7 @@
       There are several JDKs in the ports collection, from various
 	vendors, and in several versions.  If your port must use one of
 	these versions, you can define which one.  The most current
-	version is java/jdk15.
+	version is java/jdk16.
 
       
Variables that may be set by ports that use Java
@@ -6074,21 +6074,21 @@
 	    
 	      JAVAC
 	      Path to the Java compiler to use (e.g.
-		'/usr/local/jdk1.1.8/bin/javac' or
+		'/usr/local/jdk1.3.1/bin/javac' or
 		'/usr/local/bin/jikes').
 	    
 	      JAR
 	      Path to the jar tool to use (e.g.
-		'/usr/local/jdk1.2.2/bin/jar' or
+		'/usr/local/jdk1.3.1/bin/jar' or
 		'/usr/local/bin/fastjar').
 	    
 	      APPLETVIEWER
 	      Path to the appletviewer utility (e.g.
-		'/usr/local/linux-jdk1.2.2/bin/appletviewer').
+		'/usr/local/linux-jdk1.3.1/bin/appletviewer').
 	    
@@ -6116,9 +6116,7 @@
 
 	    
 	      JAVA_KEYTOOL
-	      Path to the keytool utility program.
-		This variable is available only if the JDK is Java 1.2 or
-		higher.
+	      Path to the keytool utility program.
 	    
 
 	    
@@ -6128,9 +6126,7 @@
 
 	    
 	      JAVA_POLICYTOOL
-	      Path to the policytool program.
-		This variable is available only if the JDK is Java 1.2 or
-		higher.
+	      Path to the policytool program.
 	    
 
 	    
@@ -6153,18 +6149,13 @@
 
 	    
 	      RMID
-	      Path to the RMI daemon program rmid.
-		This variable is only available if the JDK is Java 1.2
-		or higher.
+	      Path to the RMI daemon program rmid.
 	    
 
 	    
 	      JAVA_CLASSES
 	      Path to the archive that contains the JDK class
-		files. On JDK 1.2 or later, this is
-		${JAVA_HOME}/jre/lib/rt.jar.  Earlier
-		JDKs used
-		${JAVA_HOME}/lib/classes.zip.
+		files, ${JAVA_HOME}/jre/lib/rt.jar.
 	    
 
 	    

From owner-p4-projects@FreeBSD.ORG  Sat Oct 31 22:19:27 2009
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DB44C1065679; Sat, 31 Oct 2009 22:19:26 +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 A00A51065670
	for ; Sat, 31 Oct 2009 22:19:26 +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 8FA378FC1C
	for ; Sat, 31 Oct 2009 22:19:26 +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 n9VMJQ8r038319
	for ; Sat, 31 Oct 2009 22:19:26 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9VMJQSh038317
	for perforce@freebsd.org; Sat, 31 Oct 2009 22:19:26 GMT
	(envelope-from rene@FreeBSD.org)
Date: Sat, 31 Oct 2009 22:19:26 GMT
Message-Id: <200910312219.n9VMJQSh038317@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 170022 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: Sat, 31 Oct 2009 22:19:27 -0000

http://p4web.freebsd.org/chv.cgi?CH=170022

Change 170022 by rene@rene_self on 2009/10/31 22:18:49

	[porters handbook]
	* fix some language nits	
	Reviewed by:	keramida

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#48 edit

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#48 (text+ko) ====

@@ -3379,7 +3379,7 @@
 	    any USE_*
 	    in /etc/make.conf.  For instance,
 	    setting USE_GCC=3.4
-	    would adds a dependency on gcc34 for every port,
+	    would add a dependency on gcc34 for every port,
 	    including gcc34 itself!
 	
 
@@ -9105,9 +9105,9 @@
 	<makevar>PREFIX</makevar> and <makevar>DESTDIR</makevar>
 
 	PREFIX determines the location where
-	  the port will install.  It is usually /usr/local,
-	  or /opt.  User can set PREFIX
-	  to anything he wants.  Your port must respect this variable.
+	  the port will install.  It is usually /usr/local
+	  or /opt,  but can be set
+	  to a custom path.  Your port must respect this variable.
 
 	DESTDIR, if set by user, determines the
 	  complete alternative environment, usually a jail, or an installed