From ed at FreeBSD.org Sat Nov 1 06:10:51 2008 From: ed at FreeBSD.org (Ed Schouten) Date: Sat Nov 1 06:10:59 2008 Subject: PERFORCE change 152311 for review Message-ID: <200811011310.mA1DAdMx063900@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=152311 Change 152311 by ed@ed_dull on 2008/11/01 13:10:17 IFC. Affected files ... .. //depot/projects/mpsafetty/UPDATING#12 integrate .. //depot/projects/mpsafetty/bin/cat/cat.c#2 integrate .. //depot/projects/mpsafetty/bin/chio/chio.c#2 integrate .. //depot/projects/mpsafetty/bin/cp/utils.c#5 integrate .. //depot/projects/mpsafetty/bin/rcp/rcp.c#2 integrate .. //depot/projects/mpsafetty/etc/Makefile#5 integrate .. //depot/projects/mpsafetty/etc/rc.d/netif#2 integrate .. //depot/projects/mpsafetty/lib/libc/gen/err.3#2 integrate .. //depot/projects/mpsafetty/lib/libc/stdtime/strftime.c#2 integrate .. //depot/projects/mpsafetty/lib/libcam/camlib.c#2 integrate .. //depot/projects/mpsafetty/lib/libutil/pty.c#4 integrate .. //depot/projects/mpsafetty/share/man/man4/Makefile#13 integrate .. //depot/projects/mpsafetty/share/man/man4/u3g.4#4 integrate .. //depot/projects/mpsafetty/share/man/man9/VOP_ACCESS.9#2 integrate .. //depot/projects/mpsafetty/share/man/man9/style.9#4 integrate .. //depot/projects/mpsafetty/share/man/man9/vaccess.9#2 integrate .. //depot/projects/mpsafetty/share/man/man9/vaccess_acl_posix1e.9#2 integrate .. //depot/projects/mpsafetty/share/misc/bsd-family-tree#3 integrate .. //depot/projects/mpsafetty/share/zoneinfo/southamerica#6 integrate .. //depot/projects/mpsafetty/share/zoneinfo/zone.tab#4 integrate .. //depot/projects/mpsafetty/sys/amd64/amd64/dump_machdep.c#4 integrate .. //depot/projects/mpsafetty/sys/amd64/amd64/local_apic.c#4 integrate .. //depot/projects/mpsafetty/sys/amd64/amd64/minidump_machdep.c#5 integrate .. //depot/projects/mpsafetty/sys/arm/at91/at91_mci.c#6 integrate .. //depot/projects/mpsafetty/sys/boot/powerpc/boot1.chrp/boot1.c#2 integrate .. //depot/projects/mpsafetty/sys/boot/powerpc/boot1.chrp/bootinfo.txt#2 integrate .. //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/sys/policy.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#5 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#5 integrate .. //depot/projects/mpsafetty/sys/compat/linux/linux_emul.c#2 integrate .. //depot/projects/mpsafetty/sys/compat/linux/linux_getcwd.c#3 integrate .. //depot/projects/mpsafetty/sys/conf/NOTES#15 integrate .. //depot/projects/mpsafetty/sys/conf/files#24 integrate .. //depot/projects/mpsafetty/sys/conf/options#13 integrate .. //depot/projects/mpsafetty/sys/dev/adb/adb_bus.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/adb/adb_mouse.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/adb/adbvar.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/ath/if_ath.c#6 integrate .. //depot/projects/mpsafetty/sys/dev/bge/if_bge.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/drm/i915_dma.c#6 integrate .. //depot/projects/mpsafetty/sys/dev/drm/radeon_cp.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/drm/radeon_drv.h#4 integrate .. //depot/projects/mpsafetty/sys/dev/mmc/mmc.c#6 integrate .. //depot/projects/mpsafetty/sys/dev/mmc/mmcbrvar.h#4 integrate .. //depot/projects/mpsafetty/sys/dev/mmc/mmcsd.c#7 integrate .. //depot/projects/mpsafetty/sys/dev/mmc/mmcvar.h#6 integrate .. //depot/projects/mpsafetty/sys/dev/sdhci/sdhci.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/sound/pci/hda/hdac.c#9 integrate .. //depot/projects/mpsafetty/sys/dev/usb/u3g.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/usb/usbdevs#15 integrate .. //depot/projects/mpsafetty/sys/dev/usb/usbdi.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/cd9660/cd9660_vfsops.c#4 integrate .. //depot/projects/mpsafetty/sys/fs/cd9660/cd9660_vnops.c#4 integrate .. //depot/projects/mpsafetty/sys/fs/coda/coda_vnops.c#3 integrate .. //depot/projects/mpsafetty/sys/fs/devfs/devfs_vnops.c#7 integrate .. //depot/projects/mpsafetty/sys/fs/hpfs/hpfs_vnops.c#5 integrate .. //depot/projects/mpsafetty/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate .. //depot/projects/mpsafetty/sys/fs/msdosfs/msdosfs_vnops.c#5 integrate .. //depot/projects/mpsafetty/sys/fs/ntfs/ntfs_vnops.c#4 integrate .. //depot/projects/mpsafetty/sys/fs/nullfs/null_vnops.c#4 integrate .. //depot/projects/mpsafetty/sys/fs/nwfs/nwfs_vnops.c#3 integrate .. //depot/projects/mpsafetty/sys/fs/pseudofs/pseudofs_vnops.c#4 integrate .. //depot/projects/mpsafetty/sys/fs/smbfs/smbfs_vnops.c#3 integrate .. //depot/projects/mpsafetty/sys/fs/tmpfs/tmpfs_vnops.c#6 integrate .. //depot/projects/mpsafetty/sys/fs/udf/udf_vnops.c#4 integrate .. //depot/projects/mpsafetty/sys/fs/unionfs/union_vnops.c#3 integrate .. //depot/projects/mpsafetty/sys/geom/geom_disk.c#4 integrate .. //depot/projects/mpsafetty/sys/gnu/fs/ext2fs/ext2_vfsops.c#5 integrate .. //depot/projects/mpsafetty/sys/gnu/fs/ext2fs/ext2_vnops.c#3 integrate .. //depot/projects/mpsafetty/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#3 integrate .. //depot/projects/mpsafetty/sys/gnu/fs/reiserfs/reiserfs_vnops.c#2 integrate .. //depot/projects/mpsafetty/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#3 integrate .. //depot/projects/mpsafetty/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#4 integrate .. //depot/projects/mpsafetty/sys/i386/i386/dump_machdep.c#4 integrate .. //depot/projects/mpsafetty/sys/i386/i386/local_apic.c#6 integrate .. //depot/projects/mpsafetty/sys/i386/i386/minidump_machdep.c#4 integrate .. //depot/projects/mpsafetty/sys/i386/isa/pmtimer.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/init_main.c#6 integrate .. //depot/projects/mpsafetty/sys/kern/kern_proc.c#9 integrate .. //depot/projects/mpsafetty/sys/kern/kern_thr.c#4 integrate .. //depot/projects/mpsafetty/sys/kern/kern_timeout.c#4 integrate .. //depot/projects/mpsafetty/sys/kern/sched_ule.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/subr_acl_posix1e.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/subr_stack.c#4 integrate .. //depot/projects/mpsafetty/sys/kern/tty.c#64 integrate .. //depot/projects/mpsafetty/sys/kern/uipc_mqueue.c#6 integrate .. //depot/projects/mpsafetty/sys/kern/uipc_shm.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_subr.c#10 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_syscalls.c#7 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_vnops.c#7 integrate .. //depot/projects/mpsafetty/sys/kern/vnode_if.src#3 integrate .. //depot/projects/mpsafetty/sys/modules/rl/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_adhoc.c#5 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_hostap.c#6 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_sta.c#6 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_wds.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_dummynet.h#2 integrate .. //depot/projects/mpsafetty/sys/nfs4client/nfs4_vnops.c#4 integrate .. //depot/projects/mpsafetty/sys/nfsclient/nfs_vnops.c#8 integrate .. //depot/projects/mpsafetty/sys/nfsserver/nfs_serv.c#7 integrate .. //depot/projects/mpsafetty/sys/nfsserver/nfs_srvsock.c#4 integrate .. //depot/projects/mpsafetty/sys/opencrypto/cryptosoft.c#3 integrate .. //depot/projects/mpsafetty/sys/pci/if_rl.c#3 integrate .. //depot/projects/mpsafetty/sys/pci/if_rlreg.h#5 integrate .. //depot/projects/mpsafetty/sys/powerpc/include/cpufunc.h#4 integrate .. //depot/projects/mpsafetty/sys/powerpc/include/endian.h#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/powermac/ata_dbdma.c#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/powermac/cuda.c#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/powermac/dbdma.c#4 integrate .. //depot/projects/mpsafetty/sys/powerpc/powermac/dbdmavar.h#3 integrate .. //depot/projects/mpsafetty/sys/powerpc/powermac/pmu.c#2 integrate .. //depot/projects/mpsafetty/sys/security/audit/audit_bsm_klib.c#6 integrate .. //depot/projects/mpsafetty/sys/security/audit/audit_pipe.c#4 integrate .. //depot/projects/mpsafetty/sys/security/mac/mac_cred.c#1 branch .. //depot/projects/mpsafetty/sys/security/mac/mac_framework.h#5 integrate .. //depot/projects/mpsafetty/sys/security/mac/mac_policy.h#5 integrate .. //depot/projects/mpsafetty/sys/security/mac/mac_process.c#3 integrate .. //depot/projects/mpsafetty/sys/security/mac/mac_syscalls.c#3 integrate .. //depot/projects/mpsafetty/sys/security/mac/mac_vfs.c#3 integrate .. //depot/projects/mpsafetty/sys/security/mac_biba/mac_biba.c#6 integrate .. //depot/projects/mpsafetty/sys/security/mac_bsdextended/mac_bsdextended.c#9 integrate .. //depot/projects/mpsafetty/sys/security/mac_bsdextended/ugidfw_internal.h#2 integrate .. //depot/projects/mpsafetty/sys/security/mac_bsdextended/ugidfw_vnode.c#3 integrate .. //depot/projects/mpsafetty/sys/security/mac_lomac/mac_lomac.c#8 integrate .. //depot/projects/mpsafetty/sys/security/mac_mls/mac_mls.c#6 integrate .. //depot/projects/mpsafetty/sys/security/mac_partition/mac_partition.c#5 integrate .. //depot/projects/mpsafetty/sys/security/mac_stub/mac_stub.c#5 integrate .. //depot/projects/mpsafetty/sys/security/mac_test/mac_test.c#5 integrate .. //depot/projects/mpsafetty/sys/sparc64/pci/schizo.c#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/db_trace.c#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/stack_machdep.c#3 integrate .. //depot/projects/mpsafetty/sys/sun4v/sun4v/db_trace.c#2 integrate .. //depot/projects/mpsafetty/sys/sun4v/sun4v/stack_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/sys/_types.h#2 integrate .. //depot/projects/mpsafetty/sys/sys/extattr.h#2 integrate .. //depot/projects/mpsafetty/sys/sys/param.h#18 integrate .. //depot/projects/mpsafetty/sys/sys/tty.h#24 integrate .. //depot/projects/mpsafetty/sys/sys/types.h#4 integrate .. //depot/projects/mpsafetty/sys/sys/user.h#4 integrate .. //depot/projects/mpsafetty/sys/sys/vnode.h#7 integrate .. //depot/projects/mpsafetty/sys/ufs/ffs/ffs_vfsops.c#10 integrate .. //depot/projects/mpsafetty/sys/ufs/ufs/ufs_vnops.c#7 integrate .. //depot/projects/mpsafetty/tools/tools/ath/athdebug/athdebug.c#2 integrate .. //depot/projects/mpsafetty/tools/tools/ath/athstats/Makefile#2 integrate .. //depot/projects/mpsafetty/tools/tools/ath/athstats/athstats.c#2 integrate .. //depot/projects/mpsafetty/tools/tools/ath/athstats/main.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/rpc.yppasswdd/yppasswdd_main.c#2 integrate Differences ... ==== //depot/projects/mpsafetty/UPDATING#12 (text+ko) ==== @@ -22,6 +22,9 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20081028: + dummynet(4) ABI has changed. ipfw(8) needs to be recompiled. + 20081009: The uhci, ohci, ehci and slhci USB Host controller drivers have been put into separate modules. If you load the usb module @@ -1146,4 +1149,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.545 2008/10/10 06:37:51 n_hibma Exp $ +$FreeBSD: src/UPDATING,v 1.546 2008/10/28 14:14:57 oleg Exp $ ==== //depot/projects/mpsafetty/bin/cat/cat.c#2 (text+ko) ==== @@ -44,7 +44,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cat/cat.c,v 1.32 2005/01/10 08:39:20 imp Exp $"); +__FBSDID("$FreeBSD: src/bin/cat/cat.c,v 1.33 2008/10/30 14:05:57 ivoras Exp $"); #include #include @@ -77,6 +77,17 @@ static int udom_open(const char *path, int flags); #endif +/* Memory strategy threshold, in pages: if physmem is larger then this, use a + * large buffer */ +#define PHYSPAGES_THRESHOLD (32*1024) + +/* Maximum buffer size in bytes - do not allow it to grow larger than this */ +#define BUFSIZE_MAX (2*1024*1024) + +/* Small (default) buffer size in bytes. It's inefficient for this to be + * smaller than MAXPHYS */ +#define BUFSIZE_SMALL (MAXPHYS) + int main(int argc, char *argv[]) { @@ -247,9 +258,17 @@ if (buf == NULL) { if (fstat(wfd, &sbuf)) err(1, "%s", filename); - bsize = MAX(sbuf.st_blksize, 1024); + if (S_ISREG(sbuf.st_mode)) { + /* If there's plenty of RAM, use a large copy buffer */ + if (sysconf(_SC_PHYS_PAGES) > PHYSPAGES_THRESHOLD) + bsize = MIN(BUFSIZE_MAX, MAXPHYS*8); + else + bsize = BUFSIZE_SMALL; + } else + bsize = MAX(sbuf.st_blksize, + (blksize_t)sysconf(_SC_PAGESIZE)); if ((buf = malloc(bsize)) == NULL) - err(1, "buffer"); + err(1, "malloc() failure of IO buffer"); } while ((nr = read(rfd, buf, bsize)) > 0) for (off = 0; nr; nr -= nw, off += nw) ==== //depot/projects/mpsafetty/bin/chio/chio.c#2 (text+ko) ==== @@ -43,7 +43,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/chio/chio.c,v 1.27 2005/01/10 08:39:20 imp Exp $"); +__FBSDID("$FreeBSD: src/bin/chio/chio.c,v 1.28 2008/10/30 19:51:02 joerg Exp $"); #include #include @@ -69,7 +69,7 @@ static void find_element(char *, uint16_t *, uint16_t *); static struct changer_element_status *get_element_status - (unsigned int, unsigned int); + (unsigned int, unsigned int, int); static int do_move(const char *, int, char **); static int do_exchange(const char *, int, char **); @@ -969,7 +969,8 @@ ++argv; --argc; /* Get the status */ - ces = get_element_status((unsigned int)type, (unsigned int)element); + ces = get_element_status((unsigned int)type, (unsigned int)element, + CHET_VT == type); if (NULL == ces) errx(1, "%s: null element status pointer", cname); @@ -1004,7 +1005,7 @@ * should free() it when done. */ static struct changer_element_status * -get_element_status(unsigned int type, unsigned int element) +get_element_status(unsigned int type, unsigned int element, int use_voltags) { struct changer_element_status_request cesr; struct changer_element_status *ces; @@ -1020,7 +1021,8 @@ cesr.cesr_element_type = (uint16_t)type; cesr.cesr_element_base = (uint16_t)element; cesr.cesr_element_count = 1; /* Only this one element */ - cesr.cesr_flags |= CESR_VOLTAGS; /* Grab voltags as well */ + if (use_voltags) + cesr.cesr_flags |= CESR_VOLTAGS; /* Grab voltags as well */ cesr.cesr_element_status = ces; if (ioctl(changer_fd, CHIOGSTATUS, (char *)&cesr) == -1) { ==== //depot/projects/mpsafetty/bin/cp/utils.c#5 (text+ko) ==== @@ -33,7 +33,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.56 2008/10/27 15:21:15 dds Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.57 2008/10/30 14:05:57 ivoras Exp $"); #include #include @@ -57,10 +57,22 @@ #define cp_pct(x, y) ((y == 0) ? 0 : (int)(100.0 * (x) / (y))) +/* Memory strategy threshold, in pages: if physmem is larger then this, use a + * large buffer */ +#define PHYSPAGES_THRESHOLD (32*1024) + +/* Maximum buffer size in bytes - do not allow it to grow larger than this */ +#define BUFSIZE_MAX (2*1024*1024) + +/* Small (default) buffer size in bytes. It's inefficient for this to be + * smaller than MAXPHYS */ +#define BUFSIZE_SMALL (MAXPHYS) + int copy_file(const FTSENT *entp, int dne) { - static char buf[MAXBSIZE]; + static char *buf = NULL; + static size_t bufsize; struct stat *fs; ssize_t wcount; size_t wresid; @@ -174,8 +186,23 @@ } else #endif { + if (buf == NULL) { + /* + * Note that buf and bufsize are static. If + * malloc() fails, it will fail at the start + * and not copy only some files. + */ + if (sysconf(_SC_PHYS_PAGES) > + PHYSPAGES_THRESHOLD) + bufsize = MIN(BUFSIZE_MAX, MAXPHYS * 8); + else + bufsize = BUFSIZE_SMALL; + buf = malloc(bufsize); + if (buf == NULL) + err(1, "Not enough memory"); + } wtotal = 0; - while ((rcount = read(from_fd, buf, MAXBSIZE)) > 0) { + while ((rcount = read(from_fd, buf, bufsize)) > 0) { for (bufp = buf, wresid = rcount; ; bufp += wcount, wresid -= wcount) { wcount = write(to_fd, bufp, wresid); ==== //depot/projects/mpsafetty/bin/rcp/rcp.c#2 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/rcp/rcp.c,v 1.46 2007/05/22 04:21:00 cperciva Exp $"); +__FBSDID("$FreeBSD: src/bin/rcp/rcp.c,v 1.47 2008/10/28 17:15:46 rdivacky Exp $"); #include #include @@ -789,6 +789,4 @@ vwarnx(fmt, ap); va_end(ap); } - - va_end(ap); } ==== //depot/projects/mpsafetty/etc/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.372 2008/10/27 16:13:28 sam Exp $ +# $FreeBSD: src/etc/Makefile,v 1.373 2008/10/29 18:46:47 mp Exp $ .include @@ -154,7 +154,7 @@ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \ master.passwd nsmb.conf opieaccess ${DESTDIR}/etc; .if ${MK_TCSH} == "no" - sed -i "" -e 's;/bin/csh;;' ${DESTDIR}/etc/master.passwd + sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd .endif pwd_mkdb ${PWD_MKDB_ENDIAN} -i -p -d ${DESTDIR}/etc \ ${DESTDIR}/etc/master.passwd ==== //depot/projects/mpsafetty/etc/rc.d/netif#2 (text+ko) ==== @@ -22,7 +22,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/netif,v 1.29 2008/06/23 20:50:11 mtm Exp $ +# $FreeBSD: src/etc/rc.d/netif,v 1.30 2008/10/30 20:24:25 pjd Exp $ # # PROVIDE: netif @@ -141,7 +141,9 @@ esac echo "${_str} Network:${_ok}." if [ -z "${rc_quiet}" ]; then - /sbin/ifconfig ${_ok} + for ifn in ${_ok}; do + /sbin/ifconfig ${ifn} + done fi fi ==== //depot/projects/mpsafetty/lib/libc/gen/err.3#2 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)err.3 8.1 (Berkeley) 6/9/93 -.\" $FreeBSD: src/lib/libc/gen/err.3,v 1.23 2007/01/09 00:27:53 imp Exp $ +.\" $FreeBSD: src/lib/libc/gen/err.3,v 1.24 2008/10/31 15:14:40 rwatson Exp $ .\" .Dd March 6, 1999 .Dt ERR 3 @@ -178,15 +178,16 @@ Display the current errno information string and exit: .Bd -literal -offset indent if ((p = malloc(size)) == NULL) - err(1, NULL); + err(EX_OSERR, NULL); if ((fd = open(file_name, O_RDONLY, 0)) == -1) - err(1, "%s", file_name); + err(EX_NOINPUT, "%s", file_name); .Ed .Pp Display an error message and exit: .Bd -literal -offset indent if (tm.tm_hour < START_TIME) - errx(1, "too early, wait until %s", start_time_string); + errx(EX_DATAERR, "too early, wait until %s", + start_time_string); .Ed .Pp Warn of an error: @@ -195,7 +196,7 @@ warnx("%s: %s: trying the block device", raw_device, strerror(errno)); if ((fd = open(block_device, O_RDONLY, 0)) == -1) - err(1, "%s", block_device); + err(EX_OSFILE, "%s", block_device); .Ed .Pp Warn of an error without using the global variable ==== //depot/projects/mpsafetty/lib/libc/stdtime/strftime.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ static const char sccsid[] = "@(#)strftime.c 5.4 (Berkeley) 3/14/89"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdtime/strftime.c,v 1.41 2004/11/04 08:34:57 delphij Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdtime/strftime.c,v 1.42 2008/10/30 00:19:19 delphij Exp $"); #include "tzfile.h" #include @@ -177,7 +177,7 @@ { int warn2 = IN_SOME; - pt = _fmt(tptr->c_fmt, t, pt, ptlim, warnp); + pt = _fmt(tptr->c_fmt, t, pt, ptlim, &warn2); if (warn2 == IN_ALL) warn2 = IN_THIS; if (warn2 > *warnp) ==== //depot/projects/mpsafetty/lib/libcam/camlib.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libcam/camlib.c,v 1.16 2006/11/02 00:54:32 mjacob Exp $"); +__FBSDID("$FreeBSD: src/lib/libcam/camlib.c,v 1.17 2008/10/27 21:46:58 marius Exp $"); #include #include @@ -346,6 +346,9 @@ bzero(&ccb, sizeof(union ccb)); ccb.ccb_h.func_code = XPT_DEV_MATCH; + ccb.ccb_h.path_id = CAM_XPT_PATH_ID; + ccb.ccb_h.target_id = CAM_TARGET_WILDCARD; + ccb.ccb_h.target_lun = CAM_LUN_WILDCARD; /* Setup the result buffer */ bufsize = sizeof(struct dev_match_result); ==== //depot/projects/mpsafetty/lib/libutil/pty.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libutil/pty.c,v 1.23 2008/10/03 09:42:50 ed Exp $"); +__FBSDID("$FreeBSD: src/lib/libutil/pty.c,v 1.24 2008/10/28 06:00:13 ed Exp $"); #if defined(LIBC_SCCS) && !defined(lint) #if 0 @@ -47,7 +47,6 @@ #include #include #include -#include int openpty(int *amaster, int *aslave, char *name, struct termios *termp, @@ -70,9 +69,6 @@ if (slavename == NULL) goto bad; - if (revoke(slavename) == -1) - goto bad; - slave = open(slavename, O_RDWR); if (slave == -1) goto bad; ==== //depot/projects/mpsafetty/share/man/man4/Makefile#13 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.434 2008/10/09 21:25:01 n_hibma Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.435 2008/10/29 16:17:34 n_hibma Exp $ MAN= aac.4 \ acpi.4 \ @@ -553,6 +553,7 @@ MLINKS+=tun.4 if_tun.4 MLINKS+=tx.4 if_tx.4 MLINKS+=txp.4 if_txp.4 +MLINKS+=u3g.4 u3gstub.4 MLINKS+=udav.4 if_udav.4 MLINKS+=ural.4 if_ural.4 MLINKS+=vge.4 if_vge.4 ==== //depot/projects/mpsafetty/share/man/man4/u3g.4#4 (text+ko) ==== @@ -2,7 +2,7 @@ .\" Copyright (c) 2008 AnyWi Technologies .\" All rights reserved. .\" -.\" This code is derived from uark.c +.\" This code is derived from uark.c .\" .\" Permission to use, copy, modify, and distribute this software for any .\" purpose with or without fee is hereby granted, provided that the above @@ -16,7 +16,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.\" $FreeBSD: src/share/man/man4/u3g.4,v 1.6 2008/10/19 17:19:42 simon Exp $ +.\" $FreeBSD: src/share/man/man4/u3g.4,v 1.8 2008/10/29 18:49:37 brueffer Exp $ .\" .Dd October 7, 2008 .Dt U3G 4 @@ -43,7 +43,7 @@ The .Nm driver provides support for the multiple USB-to-serial interfaces exposed by -many 3G usb/pccard modems. +many 3G USB/PCCard modems. .Pp The device is accessed through the .Xr ucom 4 @@ -76,18 +76,30 @@ .It Sierra cards .El -(See /sys/dev/u3g.c for the complete list of supported cards for each vendor -mentioned above). +.Pp +See +.Pa /sys/dev/u3g.c +for the complete list of supported cards for each vendor +mentioned above. .Pp The supported 3G cards provide the necessary modem port for ppp, pppd, or mpd connections as well as extra ports (depending on the specific -device) to provide other functions (diagnostic port, SIM toolkit port) +device) to provide other functions (diagnostic port, SIM toolkit port). .Pp -In some of these devices a mass storage device supported by the +In some of these devices a mass storage device supported by the .Xr umass 4 -driver is present which contains Windows and Mac OSX drivers. This device is -hidden, unless the machine was booted in verbose (see -.Xr boot 8 ). +driver is present which contains Windows and Mac OS X drivers. +This device is +hidden, unless the machine was booted in verbose mode (see +.Xr boot 8 ) . +To temporarily unhide the device, set +.Va debug.bootverbose +to 1 using +.Xr sysctl 8 +and replug the device. +The +.Xr u3gstub 4 +device will attach temporarily and detach within seconds. .Sh SEE ALSO .Xr tty 4 , .Xr ucom 4 , @@ -95,10 +107,11 @@ .Sh HISTORY The .Nm -driver -appeared in +driver appeared in .Fx 8.0 , -is based on the uark driver, and written by +is based on the +.Xr uark 4 +driver, and written by .An Andrea Guzzo Aq aguzzo@anywi.com in September 2008. .Sh AUTHORS @@ -108,4 +121,4 @@ .An Andrea Guzzo Aq aguzzo@anywi.com and .An Nick Hibma Aq n_hibma@freebsd.org . -Hardware for testing provided by AnyWi Technologies, Leiden, NL. +Hardware for testing was provided by AnyWi Technologies, Leiden, NL. ==== //depot/projects/mpsafetty/share/man/man9/VOP_ACCESS.9#2 (text+ko) ==== @@ -27,7 +27,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/share/man/man9/VOP_ACCESS.9,v 1.21 2005/06/28 20:15:18 hmp Exp $ +.\" $FreeBSD: src/share/man/man9/VOP_ACCESS.9,v 1.22 2008/10/28 13:44:11 trasz Exp $ .\" .Dd July 24, 1996 .Os @@ -39,16 +39,16 @@ .In sys/param.h .In sys/vnode.h .Ft int -.Fn VOP_ACCESS "struct vnode *vp" "int mode" "struct ucred *cred" "struct thread *td" +.Fn VOP_ACCESS "struct vnode *vp" "accmode_t accmode" "struct ucred *cred" "struct thread *td" .Sh DESCRIPTION This entry point checks the access permissions of the file against the given credentials. .Pp Its arguments are: -.Bl -tag -width mode +.Bl -tag -width accmode .It Fa vp The vnode of the file to check. -.It Fa mode +.It Fa accmode The type of access required. .It Fa cred The user credentials to check. @@ -57,8 +57,8 @@ .El .Pp The -.Fa mode -is a mask which can contain +.Fa accmode +is a mask which can contain flags described in , e.g. .Dv VREAD , .Dv VWRITE or @@ -71,7 +71,7 @@ .Sh PSEUDOCODE .Bd -literal int -vop_access(struct vnode *vp, int mode, struct ucred *cred, struct thread *td) +vop_access(struct vnode *vp, accmode_t accmode, struct ucred *cred, struct thread *td) { int error; @@ -80,7 +80,7 @@ * unless the file is a socket, fifo, or a block or * character device resident on the filesystem. */ - if (mode & VWRITE) { + if (accmode & VWRITE) { switch (vp->v_type) { case VDIR: case VLNK: @@ -93,7 +93,7 @@ } /* If immutable bit set, nobody gets to write it. */ - if ((mode & VWRITE) && vp has immutable bit set) + if ((accmode & VWRITE) && vp has immutable bit set) return EPERM; /* Otherwise, user id 0 always gets access. */ @@ -104,11 +104,11 @@ /* Otherwise, check the owner. */ if (cred->cr_uid == owner of vp) { - if (mode & VEXEC) + if (accmode & VEXEC) mask |= S_IXUSR; - if (mode & VREAD) + if (accmode & VREAD) mask |= S_IRUSR; - if (mode & VWRITE) + if (accmode & VWRITE) mask |= S_IWUSR; return (((mode of vp) & mask) == mask ? 0 : EACCES); } @@ -116,21 +116,21 @@ /* Otherwise, check the groups. */ for (i = 0, gp = cred->cr_groups; i < cred->cr_ngroups; i++, gp++) if (group of vp == *gp) { - if (mode & VEXEC) + if (accmode & VEXEC) mask |= S_IXGRP; - if (mode & VREAD) + if (accmode & VREAD) mask |= S_IRGRP; - if (mode & VWRITE) + if (accmode & VWRITE) mask |= S_IWGRP; return (((mode of vp) & mask) == mask ? 0 : EACCES); } /* Otherwise, check everyone else. */ - if (mode & VEXEC) + if (accmode & VEXEC) mask |= S_IXOTH; - if (mode & VREAD) + if (accmode & VREAD) mask |= S_IROTH; - if (mode & VWRITE) + if (accmode & VWRITE) mask |= S_IWOTH; return (((mode of vp) & mask) == mask ? 0 : EACCES); } ==== //depot/projects/mpsafetty/share/man/man9/style.9#4 (text+ko) ==== @@ -24,7 +24,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)style 1.14 (Berkeley) 4/28/95 -.\" $FreeBSD: src/share/man/man9/style.9,v 1.127 2008/07/10 11:24:41 danger Exp $ +.\" $FreeBSD: src/share/man/man9/style.9,v 1.128 2008/10/31 14:47:15 rwatson Exp $ .\" .Dd February 10, 2005 .Dt STYLE 9 @@ -46,7 +46,7 @@ * Style guide for FreeBSD. Based on the CSRG's KNF (Kernel Normal Form). * * @(#)style 1.14 (Berkeley) 4/28/95 - * $FreeBSD: src/share/man/man9/style.9,v 1.127 2008/07/10 11:24:41 danger Exp $ + * $FreeBSD: src/share/man/man9/style.9,v 1.128 2008/10/31 14:47:15 rwatson Exp $ */ /* @@ -111,7 +111,7 @@ #endif #include -__FBSDID("$FreeBSD: src/share/man/man9/style.9,v 1.127 2008/07/10 11:24:41 danger Exp $"); +__FBSDID("$FreeBSD: src/share/man/man9/style.9,v 1.128 2008/10/31 14:47:15 rwatson Exp $"); .Ed .Pp Leave another blank line before the header files. @@ -716,9 +716,9 @@ do not roll your own. .Bd -literal if ((four = malloc(sizeof(struct foo))) == NULL) - err(1, (char *)NULL); + err(EX_OSERR, NULL); if ((six = (int *)overflow()) == NULL) - errx(1, "number overflowed"); + errx(EX_DATAERR, "number overflowed"); return (eight); } .Ed ==== //depot/projects/mpsafetty/share/man/man9/vaccess.9#2 (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/man9/vaccess.9,v 1.9 2005/06/28 20:15:18 hmp Exp $ +.\" $FreeBSD: src/share/man/man9/vaccess.9,v 1.10 2008/10/28 13:44:11 trasz Exp $ .\" .Dd August 22, 2001 .Os @@ -40,7 +40,7 @@ .Fa "mode_t file_mode" .Fa "uid_t file_uid" .Fa "gid_t file_gid" -.Fa "mode_t acc_mode" +.Fa "accmode_t accmode" .Fa "struct ucred *cred" .Fa "int *privused" .Fc @@ -59,7 +59,7 @@ owning GID .Fa file_gid , desired access mode -.Fa acc_mode , +.Fa accmode , requesting credential .Fa cred , and an optional call-by-reference ==== //depot/projects/mpsafetty/share/man/man9/vaccess_acl_posix1e.9#2 (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/man9/vaccess_acl_posix1e.9,v 1.5 2005/06/28 20:15:18 hmp Exp $ +.\" $FreeBSD: src/share/man/man9/vaccess_acl_posix1e.9,v 1.6 2008/10/28 13:44:11 trasz Exp $ .\" .Dd August 22, 2001 .Os @@ -41,7 +41,7 @@ .Fa "uid_t file_uid" .Fa "gid_t file_gid" .Fa "struct acl *acl" -.Fa "mode_t acc_mode" +.Fa "accmode_t accmode" .Fa "struct ucred *cred" .Fa "int *privused" .Fc @@ -59,7 +59,7 @@ access ACL for the file .Fa acl , desired access mode -.Fa acc_mode , +.Fa accmode , requesting credential .Fa cred , and an optional call-by-reference ==== //depot/projects/mpsafetty/share/misc/bsd-family-tree#3 (text+ko) ==== @@ -222,6 +222,7 @@ | 7.0 | | | | | | | | OpenBSD 4.3 | | V | | | DragonFly 2.0.0 + | | | OpenBSD 4.4 | | | | | | FreeBSD 8 -current | NetBSD -current OpenBSD -current | | | | | | @@ -486,6 +487,7 @@ FreeBSD 7.0 2008-02-27 [FBD] OpenBSD 4.3 2008-05-01 [OBD] DragonFly 2.0.0 2008-07-21 [DFB] +OpenBSD 4.4 2008-11-01 [OBD] Bibliography ------------------------ @@ -546,4 +548,4 @@ Copyright (c) 1997-2007 Wolfram Schneider URL: http://cvsweb.freebsd.org/src/share/misc/bsd-family-tree -$FreeBSD: src/share/misc/bsd-family-tree,v 1.121 2008/07/23 14:25:39 maxim Exp $ +$FreeBSD: src/share/misc/bsd-family-tree,v 1.122 2008/11/01 06:48:28 maxim Exp $ ==== //depot/projects/mpsafetty/share/zoneinfo/southamerica#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# @(#)southamerica 8.30 +# @(#)southamerica 8.33 # 
 
 # This data is by no means authoritative; if you think you know better,
@@ -193,6 +193,26 @@
 # 
 # So there is no summer time in Argentina for now.
 
+# From Mariano Absatz (2008-10-20):
+# Decree 1693/2008 applies Law 26.350 for the summer 2008/2009 establishing DST in Argentina
+# From 2008-10-19 until 2009-03-15
+# 
+# http://www.boletinoficial.gov.ar/Bora.Portal/CustomControls/PdfContent.aspx?fp=16102008&pi=3&pf=4&s=0&sec=01
+# 
+#
+# Decree 1705/2008 excepting 12 Provinces from applying DST in the summer 2008/2009:
+# Catamarca, La Rioja, Mendoza, Salta, San Juan, San Luis, La Pampa, Neuquen, Rio Negro, Chubut, Santa Cruz
+# and Tierra del Fuego
+# 
+# http://www.boletinoficial.gov.ar/Bora.Portal/CustomControls/PdfContent.aspx?fp=17102008&pi=1&pf=1&s=0&sec=01
+# 
+#
+# Press release 235 dated Saturday October 18th, from the Government of the Province of Jujuy saying
+# it will not apply DST either (even when it was not included in Decree 1705/2008)
+# 
+# http://www.jujuy.gov.ar/index2/partes_prensa/18_10_08/235-181008.doc
+# 
+
 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
@@ -343,9 +363,8 @@
 			-4:00	Arg	AR%sT	2000 Mar  3
 			-3:00	Arg	AR%sT
 #
-# Santa Fe (SF), Entre Rios (ER), Corrientes (CN), Misiones (MN), Chaco (CC),
-# Formosa (FM), Salta (SA), Santiago del Estero (SE), Cordoba (CB),
-# La Pampa (LP), Neuquen (NQ), Rio Negro (RN)
+# Cordoba (CB), Santa Fe (SF), Entre Rios (ER), Corrientes (CN), Misiones (MN),
+# Chaco (CC), Formosa (FM), Santiago del Estero (SE)
 #
 # Shanks & Pottenger also make the following claims, which we haven't verified:
 # - Formosa switched to -3:00 on 1991-01-07.
@@ -364,6 +383,18 @@
 			-4:00	Arg	AR%sT	2000 Mar  3
 			-3:00	Arg	AR%sT
 #
+# Salta (SA), La Pampa (LP), Neuquen (NQ), Rio Negro (RN)
+Zone America/Argentina/Salta -4:21:40 - LMT	1894 Oct 31
+			-4:16:48 -	CMT	1920 May
+			-4:00	-	ART	1930 Dec
+			-4:00	Arg	AR%sT	1969 Oct  5
+			-3:00	Arg	AR%sT	1991 Mar  3
+			-4:00	-	WART	1991 Oct 20
+			-3:00	Arg	AR%sT	1999 Oct  3
+			-4:00	Arg	AR%sT	2000 Mar  3
+			-3:00	Arg	AR%sT	2008 Oct 18
+			-3:00	-	ART
+#
 # Tucuman (TM)
 Zone America/Argentina/Tucuman -4:20:52 - LMT	1894 Oct 31
 			-4:16:48 -	CMT	1920 May
@@ -388,7 +419,8 @@
 			-4:00	Arg	AR%sT	2000 Mar  3
 			-3:00	-	ART	2004 Jun  1
 			-4:00	-	WART	2004 Jun 20
-			-3:00	Arg	AR%sT
+			-3:00	Arg	AR%sT	2008 Oct 18
+			-3:00	-	ART
 #
 # San Juan (SJ)
 Zone America/Argentina/San_Juan -4:34:04 - LMT	1894 Oct 31
@@ -401,7 +433,8 @@
 			-4:00	Arg	AR%sT	2000 Mar  3
 			-3:00	-	ART	2004 May 31
 			-4:00	-	WART	2004 Jul 25
-			-3:00	Arg	AR%sT
+			-3:00	Arg	AR%sT	2008 Oct 18
+			-3:00	-	ART
 #
 # Jujuy (JY)
 Zone America/Argentina/Jujuy -4:21:12 -	LMT	1894 Oct 31
@@ -415,7 +448,8 @@
 			-3:00	1:00	ARST	1992
 			-3:00	Arg	AR%sT	1999 Oct  3
 			-4:00	Arg	AR%sT	2000 Mar  3
-			-3:00	Arg	AR%sT
+			-3:00	Arg	AR%sT	2008 Oct 18
+			-3:00	-	ART
 #
 # Catamarca (CT), Chubut (CH)
 Zone America/Argentina/Catamarca -4:23:08 - LMT	1894 Oct 31
@@ -428,7 +462,8 @@
 			-4:00	Arg	AR%sT	2000 Mar  3
 			-3:00	-	ART	2004 Jun  1
 			-4:00	-	WART	2004 Jun 20
-			-3:00	Arg	AR%sT
+			-3:00	Arg	AR%sT	2008 Oct 18
+			-3:00	-	ART
 #
 # Mendoza (MZ)
 Zone America/Argentina/Mendoza -4:35:16 - LMT	1894 Oct 31
@@ -445,7 +480,8 @@
 			-4:00	Arg	AR%sT	2000 Mar  3
 			-3:00	-	ART	2004 May 23
 			-4:00	-	WART	2004 Sep 26
-			-3:00	Arg	AR%sT
+			-3:00	Arg	AR%sT	2008 Oct 18
+			-3:00	-	ART
 #
 # San Luis (SL)
 Zone America/Argentina/San_Luis -4:25:24 - LMT	1894 Oct 31
@@ -473,7 +509,8 @@
 			-4:00	Arg	AR%sT	2000 Mar  3
 			-3:00	-	ART	2004 Jun  1
 			-4:00	-	WART	2004 Jun 20
-			-3:00	Arg	AR%sT
+			-3:00	Arg	AR%sT	2008 Oct 18
+			-3:00	-	ART
 #
 # Tierra del Fuego, Antartida e Islas del Atlantico Sur (TF)
 Zone America/Argentina/Ushuaia -4:33:12 - LMT 1894 Oct 31
@@ -484,7 +521,8 @@
 			-4:00	Arg	AR%sT	2000 Mar  3
 			-3:00	-	ART	2004 May 30
 			-4:00	-	WART	2004 Jun 20
-			-3:00	Arg	AR%sT
+			-3:00	Arg	AR%sT	2008 Oct 18
+			-3:00	-	ART
 
 # Aruba
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]

==== //depot/projects/mpsafetty/share/zoneinfo/zone.tab#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# @(#)zone.tab	8.19

>>> TRUNCATED FOR MAIL (1000 lines) <<<
From ed at FreeBSD.org  Sat Nov  1 06:12:54 2008
From: ed at FreeBSD.org (Ed Schouten)
Date: Sat Nov  1 06:13:00 2008
Subject: PERFORCE change 152312 for review
Message-ID: <200811011312.mA1DCrec064050@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152312

Change 152312 by ed@ed_dull on 2008/11/01 13:11:53

	Reduce diff against HEAD.

Affected files ...

.. //depot/projects/mpsafetty/sys/kern/kern_cons.c#3 integrate

Differences ...

==== //depot/projects/mpsafetty/sys/kern/kern_cons.c#3 (text+ko) ====

@@ -35,7 +35,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/kern/tty_cons.c,v 1.145 2008/08/20 08:31:58 ed Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_cons.c,v 1.1 2008/11/01 08:35:28 ed Exp $");
 
 #include "opt_ddb.h"
 
From peter at FreeBSD.org  Sat Nov  1 11:27:12 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Sat Nov  1 11:27:18 2008
Subject: PERFORCE change 152318 for review
Message-ID: <200811011827.mA1IRBhd005760@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152318

Change 152318 by peter@peter_overcee on 2008/11/01 18:26:45

	Add libc-4x.supp to the build list

Affected files ...

.. //depot/projects/valgrind/Makefile.am#9 edit

Differences ...

==== //depot/projects/valgrind/Makefile.am#9 (text+ko) ====

@@ -27,6 +27,7 @@
 	glibc-2.34567-NPTL-helgrind.supp \
 	glibc-2.2-LinuxThreads-helgrind.supp \
 	glibc-2.X-drd.supp \
+	libc-4x.supp \
 	exp-ptrcheck.supp
 
 dist_val_DATA = $(SUPP_FILES) default.supp
From peter at FreeBSD.org  Sat Nov  1 11:28:13 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Sat Nov  1 11:28:19 2008
Subject: PERFORCE change 152319 for review
Message-ID: <200811011828.mA1ISCgK005824@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152319

Change 152319 by peter@peter_overcee on 2008/11/01 18:27:22

	Note that sigaction.sa_flags is an int on both of our platforms.

Affected files ...

.. //depot/projects/valgrind/include/vki/vki-amd64-freebsd.h#4 edit
.. //depot/projects/valgrind/include/vki/vki-x86-freebsd.h#3 edit

Differences ...

==== //depot/projects/valgrind/include/vki/vki-amd64-freebsd.h#4 (text+ko) ====

@@ -66,7 +66,7 @@
 #define _VKI_NSIG_BPW	32
 #define _VKI_NSIG_WORDS	(_VKI_NSIG / _VKI_NSIG_BPW)
 
-/* Note that this uses 32 bit words, even on amd64 */
+/* 32 bit words, even on amd64 - is not long aligned. */
 typedef struct {
 	vki_uint32_t sig[_VKI_NSIG_WORDS];
 } vki_sigset_t;

==== //depot/projects/valgrind/include/vki/vki-x86-freebsd.h#3 (text+ko) ====

@@ -66,6 +66,7 @@
 #define _VKI_NSIG_BPW	32
 #define _VKI_NSIG_WORDS	(_VKI_NSIG / _VKI_NSIG_BPW)
 
+/* 32 bit words, even on amd64 - is not long aligned. */
 typedef struct {
 	vki_uint32_t sig[_VKI_NSIG_WORDS];
 } vki_sigset_t;
@@ -122,7 +123,7 @@
 
 struct vki_sigaction {
 	__vki_sighandler_t ksa_handler;
-	unsigned long sa_flags;
+	unsigned int sa_flags;
 	vki_sigset_t sa_mask;		/* mask last for extensibility */
 };
 
From gonzo at FreeBSD.org  Sat Nov  1 11:39:25 2008
From: gonzo at FreeBSD.org (Oleksandr Tymoshenko)
Date: Sat Nov  1 11:39:31 2008
Subject: PERFORCE change 152320 for review
Message-ID: <200811011839.mA1IdOPb006667@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152320

Change 152320 by gonzo@gonzo_jeeves on 2008/11/01 18:38:25

	- cfe_tp is unused, remove it

Affected files ...

.. //depot/projects/mips2/src/sys/dev/cfe/cfe_console.c#5 edit

Differences ...

==== //depot/projects/mips2/src/sys/dev/cfe/cfe_console.c#5 (text+ko) ====

@@ -62,7 +62,6 @@
 };
 
 static int			conhandle = -1;
-static struct tty		*cfe_tp = NULL;
 /* XXX does cfe have to poll? */
 static int			polltime;
 static struct callout_handle	cfe_timeouthandle
From peter at FreeBSD.org  Sat Nov  1 11:46:32 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Sat Nov  1 11:46:38 2008
Subject: PERFORCE change 152321 for review
Message-ID: <200811011846.mA1IkV7V007463@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152321

Change 152321 by peter@peter_overcee on 2008/11/01 18:46:02

	attempt a suppression of ttyname_r's ioctl call copyin.

Affected files ...

.. //depot/projects/valgrind/libc-4x.supp#2 edit

Differences ...

==== //depot/projects/valgrind/libc-4x.supp#2 (text+ko) ====

@@ -55,3 +55,10 @@
    fun:realloc
    fun:__submore
 }
+{
+   ttyname_r copyin of alignment padding
+   Memcheck:Param
+   ioctl(generic)
+   fun:__sys_ioctl
+   fun:ttyname_r
+}
From peter at FreeBSD.org  Sat Nov  1 11:47:33 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Sat Nov  1 11:47:39 2008
Subject: PERFORCE change 152322 for review
Message-ID: <200811011847.mA1IlW39007524@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152322

Change 152322 by peter@peter_overcee on 2008/11/01 18:46:43

	Add a redirect entry for strcpy in ld-elf.so.1, but I don't yet know why
	m_redir.c can't do it.

Affected files ...

.. //depot/projects/valgrind/memcheck/mc_replace_strmem.c#5 edit

Differences ...

==== //depot/projects/valgrind/memcheck/mc_replace_strmem.c#5 (text+ko) ====

@@ -112,6 +112,8 @@
 #  error "Unknown platform"
 #endif
 
+#define  m_ld_elf_so_1         ldZhelfZdsoZd1               // ld-elf.so.1
+
 /* --- Sonames for Linux ELF linkers. --- */
 
 #define  m_ld_linux_so_2         ldZhlinuxZdsoZd2           // ld-linux.so.2
@@ -266,6 +268,7 @@
    }
 
 STRCPY(m_libc_soname, strcpy)
+STRCPY(m_ld_elf_so_1, strcpy)
 
 
 #define STRNCPY(soname, fnname) \
From peter at FreeBSD.org  Sat Nov  1 11:48:34 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Sat Nov  1 11:48:40 2008
Subject: PERFORCE change 152323 for review
Message-ID: <200811011848.mA1ImXWl007593@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152323

Change 152323 by peter@peter_overcee on 2008/11/01 18:48:28

	Give in and try an explicitly unaligned bitfield in sigaction.  This
	is to work around other signal mask problems elsewhere because valgrind
	likes to assume that (UWord) == bitfield container (eg: m_libcsignal.c)

Affected files ...

.. //depot/projects/valgrind/include/vki/vki-amd64-freebsd.h#5 edit
.. //depot/projects/valgrind/include/vki/vki-x86-freebsd.h#4 edit

Differences ...

==== //depot/projects/valgrind/include/vki/vki-amd64-freebsd.h#5 (text+ko) ====

@@ -63,12 +63,12 @@
 #define VKI_SIG_IGN	((__vki_sighandler_t)1)	/* ignore signal */
 
 #define _VKI_NSIG	128
-#define _VKI_NSIG_BPW	32
+#define _VKI_NSIG_BPW	64
 #define _VKI_NSIG_WORDS	(_VKI_NSIG / _VKI_NSIG_BPW)
 
-/* 32 bit words, even on amd64 - is not long aligned. */
+/* Beware, not longword aligned in struct sigaction */
 typedef struct {
-	vki_uint32_t sig[_VKI_NSIG_WORDS];
+	vki_uint64_t sig[_VKI_NSIG_WORDS];
 } vki_sigset_t;
 
 #define VKI_SIGHUP		 1
@@ -124,7 +124,8 @@
 struct vki_sigaction {
 	__vki_sighandler_t ksa_handler;
 	unsigned int sa_flags;
-	vki_sigset_t sa_mask;		/* mask last for extensibility */
+	vki_sigset_t sa_mask __attribute__((__packed__));
+	unsigned int __sa_pad;
 };
 
 typedef struct vki_sigaltstack {

==== //depot/projects/valgrind/include/vki/vki-x86-freebsd.h#4 (text+ko) ====

@@ -66,7 +66,6 @@
 #define _VKI_NSIG_BPW	32
 #define _VKI_NSIG_WORDS	(_VKI_NSIG / _VKI_NSIG_BPW)
 
-/* 32 bit words, even on amd64 - is not long aligned. */
 typedef struct {
 	vki_uint32_t sig[_VKI_NSIG_WORDS];
 } vki_sigset_t;
From gabor at FreeBSD.org  Sat Nov  1 13:15:02 2008
From: gabor at FreeBSD.org (Gabor Kovesdan)
Date: Sat Nov  1 13:15:08 2008
Subject: PERFORCE change 152326 for review
Message-ID: <200811012015.mA1KF11N016525@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152326

Change 152326 by gabor@gabor_server on 2008/11/01 20:14:29

	- Add some tags

Affected files ...

.. //depot/projects/docproj_es/www/es/about.sgml#2 edit
.. //depot/projects/docproj_es/www/es/applications.sgml#2 edit
.. //depot/projects/docproj_es/www/es/availability.sgml#2 edit
.. //depot/projects/docproj_es/www/es/community.sgml#2 edit
.. //depot/projects/docproj_es/www/es/docs.sgml#2 edit
.. //depot/projects/docproj_es/www/es/features.sgml#2 edit
.. //depot/projects/docproj_es/www/es/index.xsl#5 edit
.. //depot/projects/docproj_es/www/es/internet.sgml#5 edit
.. //depot/projects/docproj_es/www/es/mailto.sgml#2 edit
.. //depot/projects/docproj_es/www/es/publish.sgml#2 edit
.. //depot/projects/docproj_es/www/es/send-pr.sgml#4 edit
.. //depot/projects/docproj_es/www/es/support.sgml#2 edit
.. //depot/projects/docproj_es/www/es/where.sgml#2 edit
.. //depot/projects/docproj_es/www/es/y2kbug.sgml#2 edit

Differences ...

==== //depot/projects/docproj_es/www/es/about.sgml#2 (text+ko) ====

@@ -5,7 +5,9 @@
 ]>
 
 
+     %SOURCE%	en/about.sgml
+     %SRCID%	1.12
+-->
 
 
 &header;

==== //depot/projects/docproj_es/www/es/applications.sgml#2 (text+ko) ====

@@ -5,7 +5,9 @@
 ]>
 
 
+     %SOURCE%	en/applications.sgml
+     %SRCID%	1.34
+-->
 
 
 &header;

==== //depot/projects/docproj_es/www/es/availability.sgml#2 (text+ko) ====

@@ -5,7 +5,9 @@
 ]>
 
 
+     %SOURCE%	en/availability.sgml
+     %SRCID%	1.35
+-->
 
 
   

==== //depot/projects/docproj_es/www/es/community.sgml#2 (text+ko) ====

@@ -5,7 +5,9 @@
 ]>
 
 
+     %SOURCE%	en/cmmunity.sgml
+     %SRCID%	1.5
+-->
 
 
     &header;

==== //depot/projects/docproj_es/www/es/docs.sgml#2 (text+ko) ====

@@ -5,7 +5,9 @@
 ]>
 
 
+     %SOURCE%	en/docs.sgml
+     %SRCID%	1.195
+-->
 
 
   &header;

==== //depot/projects/docproj_es/www/es/features.sgml#2 (text+ko) ====


==== //depot/projects/docproj_es/www/es/index.xsl#5 (text+ko) ====

@@ -6,7 +6,7 @@
 
 
 
 

==== //depot/projects/docproj_es/www/es/internet.sgml#5 (text+ko) ====

@@ -5,7 +5,9 @@
 ]>
 
 
+     %SOURCE%	en/internet.sgml
+     %SRCID%	1.39
+-->
 
 
     &header;

==== //depot/projects/docproj_es/www/es/mailto.sgml#2 (text+ko) ====

@@ -5,7 +5,9 @@
 ]>
 
 
+     %SOURCE%	en/mailto.sgml
+     %SRCID%	1.32
+-->
 
 
   &header;

==== //depot/projects/docproj_es/www/es/publish.sgml#2 (text+ko) ====


==== //depot/projects/docproj_es/www/es/send-pr.sgml#4 (text+ko) ====

@@ -8,7 +8,9 @@
 ]>
 
 
+     %SOURCE%	en/send-pr.sgml
+     %SRCID%	1.60
+-->
 
 
     &header;

==== //depot/projects/docproj_es/www/es/support.sgml#2 (text+ko) ====

@@ -5,7 +5,9 @@
 ]>
 
 
+     %SOURCE%	en/support.sgml
+     %SRCID%	1.356
+-->
 
 
   &header;

==== //depot/projects/docproj_es/www/es/where.sgml#2 (text+ko) ====


==== //depot/projects/docproj_es/www/es/y2kbug.sgml#2 (text+ko) ====

From peter at FreeBSD.org  Sat Nov  1 14:16:04 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Sat Nov  1 14:16:11 2008
Subject: PERFORCE change 152328 for review
Message-ID: <200811012116.mA1LG3WY032135@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152328

Change 152328 by peter@peter_overcee on 2008/11/01 21:16:03

	Fix warnings on i386.  The UCONTEXT macros return 'long'
	all platforms except i386-freebsd, so that upset some printf
	strings.  Cast them to long (instead of int) for freebsd rather
	than adding ifdefs to ``MI'' code.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_coredump/priv_elf.h#3 edit
.. //depot/projects/valgrind/coregrind/m_signals.c#8 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_coredump/priv_elf.h#3 (text+ko) ====

@@ -37,7 +37,7 @@
 void ML_(fill_elffpregs_from_tst)(vki_elf_fpregset_t* fpu,
                                   const ThreadArchState* arch);
 
-#if defined(VGP_x86_linux)
+#if defined(VGP_x86_linux) || defined(VGP_x86_freebsd)
 void ML_(fill_elffpxregs_from_tst)(vki_elf_fpxregset_t* xfpu,
                                    const ThreadArchState* arch);
 #endif

==== //depot/projects/valgrind/coregrind/m_signals.c#8 (text+ko) ====

@@ -307,10 +307,10 @@
    }
 
 #elif defined(VGP_x86_freebsd)
-#  define VG_UCONTEXT_INSTR_PTR(uc)       ((uc)->uc_mcontext.eip)
-#  define VG_UCONTEXT_STACK_PTR(uc)       ((uc)->uc_mcontext.esp)
-#  define VG_UCONTEXT_FRAME_PTR(uc)       ((uc)->uc_mcontext.ebp)
-#  define VG_UCONTEXT_SYSCALL_NUM(uc)     ((uc)->uc_mcontext.eax)
+#  define VG_UCONTEXT_INSTR_PTR(uc)       ((UWord)(uc)->uc_mcontext.eip)
+#  define VG_UCONTEXT_STACK_PTR(uc)       ((UWord)(uc)->uc_mcontext.esp)
+#  define VG_UCONTEXT_FRAME_PTR(uc)       ((UWord)(uc)->uc_mcontext.ebp)
+#  define VG_UCONTEXT_SYSCALL_NUM(uc)     ((UWord)(uc)->uc_mcontext.eax)
 #  define VG_UCONTEXT_SYSCALL_SYSRES(uc)                        \
       /* Convert the value in uc_mcontext.eax into a SysRes. */ \
       VG_(mk_SysRes_x86_freebsd)( (uc)->uc_mcontext.eax, \
From rene at FreeBSD.org  Sat Nov  1 14:17:05 2008
From: rene at FreeBSD.org (Rene Ladan)
Date: Sat Nov  1 14:17:12 2008
Subject: PERFORCE change 152329 for review
Message-ID: <200811012117.mA1LH4F3032223@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152329

Change 152329 by rene@rene_self on 2008/11/01 21:16:46

	Oops, do two things at once:
	* IFC
	* Translate 'contributing' article up to 13%

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#11 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/config/chapter.sgml#5 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#3 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#10 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing/article.sgml#2 edit
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#8 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#8 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/versus.key#1 branch
.. //depot/projects/docproj_nl/www/en/developers.sgml#8 integrate
.. //depot/projects/docproj_nl/www/en/releases/6.4R/schedule.sgml#7 integrate
.. //depot/projects/docproj_nl/www/en/releng/index.sgml#6 integrate
.. //depot/projects/docproj_nl/www/share/sgml/news.xml#14 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#11 (text+ko) ====

@@ -1,4 +1,4 @@
-
+
 
 
 
@@ -65,8 +65,8 @@
       like that, and our computers require some assistance before they can
       meaningfully process our text.
 
-    More precisely, they need help identifying what is what.  You or I
-      can look at
+    More precisely, they need help identifying what is what.  Let's
+      look at this text:
 
       

 	To remove /tmp/foo use &man.rm.1;.
@@ -74,7 +74,7 @@
 	&prompt.user; rm /tmp/foo
       

 
-      and easily see which parts are filenames, which are commands to be typed
+    It is easy to see which parts are filenames, which are commands to be typed
       in, which parts are references to manual pages, and so on.  But the
       computer processing the document cannot.  For this we need
       markup.
@@ -204,15 +204,15 @@
 
     For an element called element-name the
       start tag will normally look like
-      <element-name>.  The
+      element-name.  The
       corresponding closing tag for this element is
-      </element-name>.
+      /element-name.
 
     
       Using an element (start and end tags)
 
       HTML has an element for indicating that the content enclosed by
-	the element is a paragraph, called p.  This
+	the element is a paragraph, called p.  This
 	element has both start and end tags.
       
       This is a paragraph.  It starts with the start tag for
@@ -231,7 +231,7 @@
       Using an element (start tag only)
 
       HTML has an element for indicating a horizontal rule, called
-	hr.  This element does not wrap content, so only
+	hr.  This element does not wrap content, so only
 	has a start tag.
 
       This is a paragraph.

@@ -266,10 +266,10 @@
 	end.
 
       When this document (or anyone else knowledgeable about SGML) refers
-	to the <p> tag they mean the literal text
+	to the p tag they mean the literal text
 	consisting of the three characters <,
 	p, and >.  But the phrase
-	the <p> element refers to the whole
+	the p element refers to the whole
 	element.
 
       This distinction is very subtle.  But keep it 
@@ -287,7 +287,7 @@
       attribute-name="attribute-value".
 
     In sufficiently recent versions of HTML, the p
-      element has an attribute called align, which suggests
+      element has an attribute called align, which suggests
       an alignment (justification) for the paragraph to the program displaying
       the HTML.
 
@@ -494,7 +494,7 @@
 
 		
 		  6
-		  The text of the error message.
+		  The text of the message.
 		
 	      
 	    
@@ -519,7 +519,7 @@
 	
 
 	
-	  Put the title element back in.
+	  Put the title element back in.
 	
       
     
@@ -781,7 +781,7 @@
   
     Escaping back to SGML
 
-    Earlier in this primer I said that SGML is only used when writing a
+    As mentioned earlier, SGML is only used when writing a
       DTD.  This is not strictly true.  There is certain SGML syntax that you
       will want to be able to use within your documents.  For example,
       comments can be included in your document, and will be ignored by the
@@ -1379,7 +1379,7 @@
 	  characters.
 	
 	RCDATA is for Entity references and
-	  character data If the parser is in this content model then it
+	  character data.  If the parser is in this content model then it
 	  is expecting to see characters and entities.
 	  < loses its special status, but
 	  & will still be treated as
@@ -1392,7 +1392,7 @@
 	  < is converted to a
 	  &lt; and every &
 	  is converted to a &amp;, it can be
-	  easier to mark the section as only containing CDATA.  When the SGML
+	  easier to mark the section as only containing CDATA.  When the SGML
 	  parser encounters this it will ignore the
 	  < and & symbols
 	  embedded in the content.
@@ -1534,7 +1534,7 @@
   <body>	    
     <p>This paragraph <![ CDATA [contains many <
       characters (< < < < <) so it is easier
-      to wrap it in a CDATA marked section ]]></p>
+      to wrap it in a CDATA marked section.]]></p>
 
     <![ IGNORE [
     <p>This paragraph will definitely not be included in the

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/config/chapter.sgml#5 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
@@ -623,7 +623,7 @@
       
     
 
-    This is the basic set up for every
+    This is the basic setup for every
       crontab file, although there is one thing
       different about this one.  Field number six, where we specified
       the username, only exists in the system

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#3 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
@@ -14,20 +14,24 @@
       
       
     
+
     
       
 	Jordan
 	Hubbard
 	Original work by 
       
+
       
 	Poul-Henning
 	Kamp
       
+
       
 	John
 	Polstra
       
+
       
 	Nik
 	Clayton
@@ -52,31 +56,48 @@
     After reading this chapter, you will know:
 
     
-      The difference between the two development
-      branches: &os.stable; and &os.current;.
+      
+	The difference between the two development
+	  branches: &os.stable; and &os.current;.
       
-      How to keep your system up to date with
+
+      
+	How to keep your system up to date with
 	  CVSup,
 	  CVS, or
 	  CTM.
       
-      How to rebuild and reinstall the entire base
-      system with make buildworld (etc).
+
+      
+	How to rebuild and reinstall the entire base
+	  system with make buildworld (etc).
       
-
     
 
     Before reading this chapter, you should:
 
     
-      Properly set up your network connection ().
+      
+	Properly set up your network connection ().
+      
+
+      
+	Know how to install additional third-party
+	  software ().
       
-      Know how to install additional third-party
-        software ().
     
+
+    
+      Throughout this chapter, the cvsup command is
+	used to obtain and update &os; sources.  To use it, you will need to
+	install a port or package like net/cvsup-without-gui.  If you are using
+	&os; 6.2-RELEASE or later, you may wish to substitute this
+	with &man.csup.1;, which is now part of the base system.
+    
   
-  
+
   
     &os.current; vs. &os.stable;
     -CURRENT
@@ -95,7 +116,7 @@
 	&os.current; users are expected to have a high degree of
 	technical skill, and should be capable of solving difficult
 	system problems on their own.  If you are new to &os;, think
-	twice before installing it.  
+	twice before installing it.
 
       
 	What Is &os.current;?
@@ -184,31 +205,33 @@
 
       
 	Using &os.current;
-      
+
 	
 	  -CURRENT
 	  using
 	
 	
 	  
-	    Join the &a.current.name; and the &a.cvsall.name; lists.  This is not
-	      just a good idea, it is essential.  If
-	      you are not on the &a.current.name; list,
-	      you will not see the comments that people are
-	      making about the current state of the system and thus will
-	      probably end up stumbling over a lot of problems that others
-	      have already found and solved.  Even more importantly, you
-	      will miss out on important bulletins which may be critical
-	      to your system's continued health.
+	    Join the &a.current.name; and the &a.svn-src-head.name;
+	      lists.  This is not just a good idea, it is
+	      essential.  If you are not on the
+	      &a.current.name; list, you will not see
+	      the comments that people are making about the current state of
+	      the system and thus will probably end up stumbling over a lot
+	      of problems that others have already found and solved.  Even
+	      more importantly, you will miss out on important bulletins
+	      which may be critical to your system's continued health.
 
-	    The &a.cvsall.name; list will allow you to see the
-	      commit log entry for each change as it is made along with
+	    The &a.svn-src-head.name; list will allow you to see the
+	      commit log entry for each change as it is made, along with
 	      any pertinent information on possible side-effects.
 
 	    To join these lists, or one of the others available
 	      go to &a.mailman.lists.link; and click on the list that
 	      you wish to subscribe to.  Instructions on the rest of
-	      the procedure are available there.
+	      the procedure are available there.  If you are interested
+	      in tracking changes for the whole source tree, we would
+	      recommend subscribing to the &a.svn-src-all.name; list.
 	  
 
 	  
@@ -216,47 +239,66 @@
 	      site.  You can do this in one of two ways:
 
 	    
-              
-                cvsup
-              
-              
-                cron
-              
-              
-	        -CURRENT
+	      
+		cvsup
+	      
+	      
+		cron
+	      
+	      
+		-CURRENT
 		Syncing with CVSup
 	      
 
 	      
 		Use the cvsup program
-                  with the supfile named standard-supfile
-                  available from /usr/share/examples/cvsup.
-		  This is the most recommended
-		  method, since it allows you to grab the entire
-		  collection once and then only what has changed from then
-		  on.  Many people run cvsup from 
-		  cron and keep their
- 		  sources up-to-date automatically.  You have to 
- 		  customize the sample supfile above, and configure 
- 		  cvsup for your environment.
+		  with the supfile named
+		  standard-supfile
+		  available from
+		  /usr/share/examples/cvsup.
+		  This is the most recommended method, since it allows you to
+		  grab the entire collection once and then only what has
+		  changed from then on.  Many people run
+		  cvsup from cron and
+		  keep their sources up-to-date automatically.  You have to
+		  customize the sample supfile above,
+		  and configure cvsup for your environment.
+
+		
+		  The sample standard-supfile is
+		    intended for tracking a specific security branch of
+		    &os;, and not &os.current;.  You will need to edit this
+		    file and replace the following line:
+
+		  *default release=cvs tag=RELENG_X_Y
+
+		  With this one:
+
+		  *default release=cvs tag=.
+
+		  For a detailed explanation of usable tags, please
+		    refer to the Handbook's CVS Tags section.
+		
 	      
 
-              
-	        -CURRENT
+	      
+		-CURRENT
 		Syncing with CTM
 	      
 	      
 		Use the CTM facility.  If you
+		    linkend="ctm">CTM facility.  If you
 		  have very bad connectivity (high price connections or
-		  only email access) CTM is an option.
-		  However, it is a lot of hassle and can give you broken files.
-		  This leads to it being rarely used, which again increases
-		  the chance of it not working for fairly long periods of
-		  time.  We recommend using
+		  only email access) CTM is an
+		  option.  However, it is a lot of hassle and can give you
+		  broken files.  This leads to it being rarely used, which
+		  again increases the chance of it not working for fairly
+		  long periods of time.  We recommend using
 		  CVSup
-		  for anybody with a 9600 bps modem or faster connection.
-		
+		  for anybody with a 9600 bps modem or faster
+		  connection.
 	      
 	    
 	  
@@ -269,20 +311,21 @@
 	      to compile just a subset is almost guaranteed to get you
 	      into trouble.
 
-	  
-	    -CURRENT
-	    compiling
-	  
+	    
+	      -CURRENT
+	      compiling
+	    
 	    Before compiling &os.current;, read the
 	      Makefile in /usr/src
 	      carefully.  You should at least install a new kernel and rebuild the world the first time through
+		linkend="makeworld">install a new kernel and rebuild the
+		world the first time through
 	      as part of the upgrading process.  Reading the &a.current;
-	      and /usr/src/UPDATING will keep you up-to-date on other bootstrapping procedures
-	      that sometimes become necessary as we move toward the next
-	      release.
+	      and /usr/src/UPDATING will keep you
+	      up-to-date on other bootstrapping procedures that sometimes
+	      become necessary as we move toward the next release.
 	  
-	      
+
 	  
 	    Be active! If you are running &os.current;, we want
 	      to know what you have to say about it, especially if you
@@ -293,7 +336,7 @@
 	
       
     
-  
+
     
       Staying Stable with &os;
 
@@ -305,8 +348,8 @@
 	  are made.  Changes go into this branch at a different pace, and
 	  with the general assumption that they have first gone into
 	  &os.current; for testing.  This is still
-	  a development branch, however, and this means that at any given time,
-	  the sources for &os.stable; may or may not be suitable for any
+	  a development branch, however, and this means that at any given
+	  time, the sources for &os.stable; may or may not be suitable for any
 	  particular purpose.  It is simply another engineering development
 	  track, not a resource for end-users.
       
@@ -315,23 +358,23 @@
 	Who Needs &os.stable;?
 
 	If you are interested in tracking or contributing to the
-          FreeBSD development process, especially as it relates to the
+	  FreeBSD development process, especially as it relates to the
 	  next point release of FreeBSD, then you should
 	  consider following &os.stable;.
 
 	While it is true that security fixes also go into the
 	  &os.stable; branch, you do not need to
-	  track &os.stable; to do this. Every security advisory for
+	  track &os.stable; to do this.  Every security advisory for
 	  FreeBSD explains how to fix the problem for the releases it
 	  affects
 	  That is not quite true.  We can not continue to
-  	    support old releases of FreeBSD forever, although we do
-  	    support them for many years.  For a complete description
-  	    of the current security policy for old releases of
-  	    FreeBSD, please see http://www.FreeBSD.org/security/.
-	  
-	  , and tracking an entire development branch just
+	    support old releases of FreeBSD forever, although we do
+	    support them for many years.  For a complete description
+	    of the current security policy for old releases of
+	    FreeBSD, please see http://www.FreeBSD.org/security/.
+	  ,
+	  and tracking an entire development branch just
 	  for security reasons is likely to bring in a lot of unwanted
 	  changes as well.
 
@@ -355,38 +398,42 @@
 
       
 	Using &os.stable;
-      
+
 	
 	  -STABLE
 	  using
 	
 	
 	  
-	    Join the &a.stable.name; list.  This will keep you informed of
-	      build-dependencies that may appear in &os.stable;
-	      or any other issues requiring
-	      special attention.  Developers will also make announcements
-	      in this mailing list when they are contemplating some
-	      controversial fix or update, giving the users a chance to
-	      respond if they have any issues to raise concerning the
-	      proposed change.
+	    Join the &a.stable.name; list.  This will keep you informed
+	      of build-dependencies that may appear in &os.stable;
+	      or any other issues requiring special attention.  Developers
+	      will also make announcements in this mailing list when they are
+	      contemplating some controversial fix or update, giving the
+	      users a chance to respond if they have any issues to raise
+	      concerning the proposed change.
 
-	    The &a.cvsall.name; list will allow you to see the
-	      commit log entry for each change as it is made along with
-	      any pertinent information on possible side-effects.
+	    Join the relevant SVN list for
+	      the branch you are tracking.  For example, if you are tracking
+	      the 7-STABLE branch, join the &a.svn-src-stable-7.name; list.
+	      This will allow you to view the commit log entry for each
+	      change as it is made, along with any pertinent information on
+	      possible side-effects.
 
 	    To join these lists, or one of the others available
 	      go to &a.mailman.lists.link; and click on the list that
 	      you wish to subscribe to.  Instructions on the rest of
-	      the procedure are available there.
+	      the procedure are available there.  If you are interested
+	      in tracking changes for the whole source tree, we would
+	      recommend subscribing to the &a.svn-src-all.name; list.
 	  
 
 	  
 	    If you are going to install a new system and want it
 	      to run monthly snapshot built from &os.stable;, please
-	      check the 
-		Snapshots web page for more information.
-	      Alternatively, it is possible to
+	      check the Snapshots web page for
+	      more information.  Alternatively, it is possible to
 	      install the most recent &os.stable; release from the
 	      mirror sites and follow
 	      the instructions below to upgrade your system to the
@@ -405,39 +452,37 @@
 		cron
 	      
 	      
-	        -STABLE
+		-STABLE
 		syncing with CVSup
 	      
 	      
 		Use the cvsup program
-                  with the supfile named stable-supfile
-                  from the directory
-                  /usr/share/examples/cvsup.
-		  This is the most recommended
-		  method, since it allows you to grab the entire
-		  collection once and then only what has changed from then
-		  on.  Many people run cvsup from 
-		  cron to keep their
-		  sources up-to-date automatically.  You have to
+		  with the supfile named
+		  stable-supfile from the directory
+		  /usr/share/examples/cvsup.
+		  This is the most recommended method, since it allows you to
+		  grab the entire collection once and then only what has
+		  changed from then on.  Many people run
+		  cvsup from cron to
+		  keep their sources up-to-date automatically.  You have to
 		  customize the sample supfile above,
 		  and configure cvsup for your
 		  environment.
 	      
 
 	      
-	        -STABLE
+		-STABLE
 		syncing with CTM
 	      
 	      
 		Use the CTM facility.  If
+		    linkend="ctm">CTM facility.  If
 		  you do not have a fast and inexpensive connection to
 		  the Internet, this is the method you should consider
-		  using.
-		  
+		  using.
 	      
-	   
-	 
+	    
+	  
 
 	  
 	    Essentially, if you need rapid on-demand access to the
@@ -454,11 +499,12 @@
 	    Before compiling &os.stable;, read the
 	    Makefile in /usr/src
 	    carefully.  You should at least install a new kernel and rebuild the world the first time through
-	    as part of the upgrading process.  Reading the &a.stable; and /usr/src/UPDATING will
-	    keep you up-to-date on other bootstrapping procedures that
-	    sometimes become necessary as we move toward the next
-	    release.
+	      linkend="makeworld">install a new kernel and rebuild the
+	      world the first time through
+	    as part of the upgrading process.  Reading the &a.stable; and
+	    /usr/src/UPDATING will keep you up-to-date
+	    on other bootstrapping procedures that sometimes become
+	    necessary as we move toward the next release.
 	  
 	
       
@@ -467,23 +513,23 @@
 
   
     Synchronizing Your Source
-    
+
     There are various ways of using an Internet (or email)
       connection to stay up-to-date with any given area of the &os;
       project sources, or all areas, depending on what interests you.  The
       primary services we offer are Anonymous
       CVS, CVSup, and CTM.
+	linkend="ctm">CTM.
 
     
       While it is possible to update only parts of your source tree,
-        the only supported update procedure is to update the entire tree
-        and recompile both userland (i.e., all the programs that run in
-        user space, such as those in /bin and
-        /sbin) and kernel sources.  Updating only part
-        of your source tree, only the kernel, or only userland will often
-        result in problems.  These problems may range from compile errors
-        to kernel panics or data corruption.
+	the only supported update procedure is to update the entire tree
+	and recompile both userland (i.e., all the programs that run in
+	user space, such as those in /bin and
+	/sbin) and kernel sources.  Updating only part
+	of your source tree, only the kernel, or only userland will often
+	result in problems.  These problems may range from compile errors
+	to kernel panics or data corruption.
     
 
     
@@ -494,7 +540,7 @@
     Anonymous CVS and
       CVSup use the pull
       model of updating sources.  In the case of
-      CVSup the user (or a 
+      CVSup the user (or a
       cron script) invokes
       the cvsup program, and it interacts with a
       cvsupd server somewhere to bring your files
@@ -504,12 +550,11 @@
       of interest to you.  Updates are generated on the fly by the server,
       according to what you have and what you want to have.
       Anonymous CVS is quite a bit more
-      simplistic than CVSup in that it is just an extension to
-      CVS which allows it to pull changes
-      directly from a remote CVS repository.
+      simplistic than CVSup in that it is just an
+      extension to CVS which allows it to pull
+      changes directly from a remote CVS repository.
       CVSup can do this far more efficiently,
-      but Anonymous CVS is easier to
-      use.
+      but Anonymous CVS is easier to use.
 
     
       CTM
@@ -535,8 +580,10 @@
       CTM will not do this, and if you wipe some
       portion of your source tree out (and do not have it backed up) then
       you will have to start from scratch (from the most recent CVS
-      base delta) and rebuild it all with CTM or, with
-      Anonymous CVS, simply delete the bad bits and resync.
+      base delta) and rebuild it all with
+      CTM or, with
+      Anonymous CVS, simply delete the bad bits
+      and resync.
   
 
   
@@ -547,8 +594,7 @@
     
     Once you have synchronized your local source tree against a
       particular version of &os; (&os.stable;, &os.current;, and so on)
-      you can then use the source
-      tree to rebuild the system.
+      you can then use the source tree to rebuild the system.
 
     
       Make a Backup
@@ -561,9 +607,8 @@
 	source tree render your system unbootable.
 
       Make sure you have taken a backup.  And have a fixit floppy or
-	bootable CD at
-	hand.  You will probably never have to use it, but it is better to be
-	safe than sorry!
+	bootable CD at hand.  You will probably never have to use it, but it
+	is better to be safe than sorry!
     
 
     
@@ -581,15 +626,14 @@
 	file systems (or worse).
 
       If problems like these occur, a heads up is
-        posted to the appropriate mailing list, explaining the nature of
+	posted to the appropriate mailing list, explaining the nature of
 	the problem and which systems it affects.  And an all
 	clear announcement is posted when the problem has been
 	solved.
 
       If you try to track &os.stable; or &os.current; and do
-	not read the &a.stable; or the
-	&a.current; respectively, then you are
-	asking for trouble.
+	not read the &a.stable; or the &a.current; respectively, then you
+	are asking for trouble.
     
 
     
@@ -611,10 +655,11 @@
 	necessary for your version of the sources and then use the following
 	procedure:
 
-      &prompt.root; make buildworld
+      &prompt.root; cd /usr/src
+&prompt.root; make buildworld
 &prompt.root; make buildkernel
 &prompt.root; make installkernel
-&prompt.root; reboot
+&prompt.root; shutdown -r now
 
       
 	There are a few rare cases when an extra run of
@@ -630,7 +675,9 @@
 	(i.e. using boot -s from the loader
 	prompt).  Then run:
 
-      &prompt.root; mergemaster -p
+      &prompt.root; mount -a -t ufs
+&prompt.root; mergemaster -p
+&prompt.root; cd /usr/src
 &prompt.root; make installworld
 &prompt.root; mergemaster
 &prompt.root; reboot
@@ -658,8 +705,8 @@
 
       
 	Reading UPDATING is not an acceptable
-	  substitute for subscribing to the correct mailing list, as described 
-	  previously.  The two requirements are complementary, not
+	  substitute for subscribing to the correct mailing list, as
+	  described previously.  The two requirements are complementary, not
 	  exclusive.
       
     
@@ -667,12 +714,11 @@
     
       Check <filename>/etc/make.conf</filename>
       
-        make.conf
+	make.conf
       
 
       Examine the files
-	/usr/share/examples/etc/make.conf
-	and
+	/usr/share/examples/etc/make.conf and
 	/etc/make.conf.  The first contains some
 	default defines – most of which are commented out.  To
 	make use of them when you rebuild your system from source, add
@@ -685,10 +731,9 @@
 	CFLAGS and
 	NO_PROFILE lines found in
 	/usr/share/examples/etc/make.conf
-	to
-	/etc/make.conf and uncomment them.
+	to /etc/make.conf and uncomment them.
 
-      Examine the other definitions (COPTFLAGS, 
+      Examine the other definitions (COPTFLAGS,
 	NOPORTDOCS and so
 	on) and decide if they are relevant to you.
     
@@ -706,15 +751,14 @@
 	/etc/group.
 
       There have been occasions when the installation part of
-        make installworld has expected certain usernames or groups
-	to exist.  When performing an upgrade it is likely that these
-	users or groups did not exist. This caused problems when upgrading.
-	In some cases make buildworld will check to see if
-	these users or groups exist.
+	make installworld has expected certain usernames
+	or groups to exist.  When performing an upgrade it is likely that
+	these users or groups did not exist.  This caused problems when
+	upgrading.  In some cases make buildworld will
+	check to see if these users or groups exist.
 
-      An example of this is when the
-	smmsp user was added.  Users had the
-	installation process fail for them when
+      An example of this is when the smmsp user
+	was added.  Users had the installation process fail for them when
 	&man.mtree.8; was trying to create
 	/var/spool/clientmqueue.
 
@@ -757,9 +801,9 @@
 
       multi-user mode
       Another method is to compile the system in multi-user mode, and
-        then drop into single user mode for the installation.  If you would
-        like to do it this way, simply hold off on the following steps until
-        the build has completed.  You can postpone dropping to single user
+	then drop into single user mode for the installation.  If you would
+	like to do it this way, simply hold off on the following steps until
+	the build has completed.  You can postpone dropping to single user
 	mode until you have to installkernel or
 	installworld.
 
@@ -771,8 +815,8 @@
 	mode.
 
       Alternatively, reboot the system, and at the boot prompt,
-        select the single user option.  The system will then boot
-	single user.  At the shell prompt you should then run:
+	select the single user option.  The system will then
+	boot single user.  At the shell prompt you should then run:
 
       &prompt.root; fsck -p
 &prompt.root; mount -u /
@@ -783,20 +827,18 @@
 	read/write, mounts all the other UFS file systems referenced in
 	/etc/fstab and then turns swapping on.
 
+      
+	If your CMOS clock is set to local time and not to GMT
+	  (this is true if the output of the &man.date.1; command
+	  does not show the correct time and zone),
+	  you may also need to run the following command:
 
-        
-          If your CMOS clock is set to local time and not to GMT
-	    (this is true if the output of the &man.date.1; command
-	    does not show the correct time and zone),
-            you may also need to run the following command:
-&prompt.root; adjkerntz -i
+	&prompt.root; adjkerntz -i
 
-          This will make sure that your local time-zone settings
-            get set up correctly — without this, you may later run into some
-            problems.
-          
-        
-
+	This will make sure that your local time-zone settings
+	  get set up correctly — without this, you may later run
+	  into some problems.
+      
     
 
     
@@ -807,8 +849,8 @@
 	/usr/obj.  The directories shadow those under
 	/usr/src.
 
-      You can speed up the make buildworld process, and
-	possibly save yourself some dependency headaches by removing this
+      You can speed up the make buildworld process,
+	and possibly save yourself some dependency headaches by removing this
 	directory as well.
 
       Some files below /usr/obj may have the
@@ -839,9 +881,9 @@
 	  when the process has finished.
 
 	&prompt.root; script /var/tmp/mw.out
-Script started, output file is /var/tmp/mw.out	 
+Script started, output file is /var/tmp/mw.out
 &prompt.root; make TARGET
-… compile, compile, compile …	  
+… compile, compile, compile …
 &prompt.root; exit
 Script done, …
 
@@ -865,9 +907,9 @@
 	make
 
 	To rebuild the world you use the &man.make.1; command.  This
-          command reads instructions from the Makefile,
-          which describes how the programs that comprise &os; should be
-          rebuilt, the order in which they should be built, and so on.
+	  command reads instructions from the Makefile,
+	  which describes how the programs that comprise &os; should be
+	  rebuilt, the order in which they should be built, and so on.
 
 	The general format of the command line you will type is as
 	  follows:
@@ -891,7 +933,7 @@
 	is another way of specifying that profiled libraries should
 	  not be built, and corresponds with the
 
-	NO_PROFILE=    true 	#    Avoid compiling profiled libraries
+	NO_PROFILE=    true     #    Avoid compiling profiled libraries
 
 	line in /etc/make.conf.
 
@@ -907,8 +949,8 @@
 	  sub-steps.
 
 	Most of the time you will not need to pass any parameters to
-	    &man.make.1;, and so your command like will look like
-	    this:
+	  &man.make.1;, and so your command like will look like
+	  this:
 
 	&prompt.root; make target
 
@@ -918,26 +960,27 @@
 
 	As the names imply, buildworld
 	  builds a complete new tree under /usr/obj,
-	  and installworld, another target, installs this tree on
-	  the current machine.
+	  and installworld, another target,
+	  installs this tree on the current machine.
 
-	Having separate options is very useful for two reasons.  First, it allows you
-	  to do the build safe in the knowledge that no components of
-	  your running system will be affected.  The build is
+	Having separate options is very useful for two reasons.  First,
+	  it allows you to do the build safe in the knowledge that no
+	  components of your running system will be affected.  The build is
 	  self hosted.  Because of this, you can safely
 	  run buildworld on a machine running
 	  in multi-user mode with no fear of ill-effects.  It is still
-	  recommended that you run the
-	  installworld part in single user
-	  mode, though.
+	  recommended that you run the installworld
+	  part in single user mode, though.
 
-	Secondly, it allows you to use NFS mounts to upgrade 
+	Secondly, it allows you to use NFS mounts to upgrade

>>> TRUNCATED FOR MAIL (1000 lines) <<<
From peter at FreeBSD.org  Sat Nov  1 15:58:48 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Sat Nov  1 15:58:55 2008
Subject: PERFORCE change 152332 for review
Message-ID: <200811012258.mA1Mwm4F042984@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152332

Change 152332 by peter@peter_overcee on 2008/11/01 22:58:20

	AARGH!!!!
	Fix the value of SIG_SETMASK in sigprocmask syscall.  (It is 2 on linux,
	3 on FreeBSD.)  This was duplicated rather than using #includes.
	
	This is responsible for the assertion failures on non-trivial code due to
	signals getting unblocked when they should have remained blocked for the
	interpreter-driven periodic polling to find them.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_syswrap/syscall-amd64-freebsd.S#3 edit
.. //depot/projects/valgrind/coregrind/m_syswrap/syscall-x86-freebsd.S#6 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_syswrap/syscall-amd64-freebsd.S#3 (text+ko) ====

@@ -71,7 +71,7 @@
 */
 
 /* from vki_arch.h */	
-#define VKI_SIG_SETMASK	2
+#define VKI_SIG_SETMASK	3
 	
 .globl ML_(do_syscall_for_client_WRK)
 ML_(do_syscall_for_client_WRK):

==== //depot/projects/valgrind/coregrind/m_syswrap/syscall-x86-freebsd.S#6 (text+ko) ====

@@ -84,7 +84,7 @@
 */
 
 /* from vki_arch.h */	
-#define VKI_SIG_SETMASK	2
+#define VKI_SIG_SETMASK	3
 	
 /* QQQ translate syscall abi conventions */
 .globl ML_(do_syscall_for_client_WRK)
From peter at FreeBSD.org  Sat Nov  1 16:14:04 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Sat Nov  1 16:14:16 2008
Subject: PERFORCE change 152334 for review
Message-ID: <200811012314.mA1NE33r045511@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152334

Change 152334 by peter@peter_overcee on 2008/11/01 23:13:17

	Unused

Affected files ...

.. //depot/projects/valgrind/coregrind/m_syswrap/priv_types_n_macros.h#8 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_syswrap/priv_types_n_macros.h#8 (text+ko) ====

@@ -90,7 +90,6 @@
       Int o_arg7;
       Int o_arg8;
 #ifdef VGO_freebsd
-      Int o_onstk;
       Int o_retval2;
 #endif
       Int o_retval;
From peter at FreeBSD.org  Sat Nov  1 16:14:05 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Sat Nov  1 16:14:16 2008
Subject: PERFORCE change 152335 for review
Message-ID: <200811012314.mA1NE37l045516@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152335

Change 152335 by peter@peter_overcee on 2008/11/01 23:13:59

	Take a halfway complete shot at implementing async syscall wrappers for
	amd64.  (And sync/reduce-diffs with linux version)

Affected files ...

.. //depot/projects/valgrind/coregrind/m_syswrap/syscall-amd64-freebsd.S#4 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_syswrap/syscall-amd64-freebsd.S#4 (text+ko) ====

@@ -1,13 +1,13 @@
 
-##--------------------------------------------------------------------##
-##--- Support for doing system calls.        syscall-amd64-linux.S ---##
-##--------------------------------------------------------------------##
+/*--------------------------------------------------------------------*/
+/*--- Support for doing system calls.      syscall-amd64-freebsd.S ---*/
+/*--------------------------------------------------------------------*/
 
 /*
   This file is part of Valgrind, a dynamic binary instrumentation
   framework.
 
-  Copyright (C) 2000-2006 Julian Seward 
+  Copyright (C) 2000-2008 Julian Seward 
      jseward@acm.org
 
   This program is free software; you can redistribute it and/or
@@ -66,8 +66,20 @@
 				  void* guest_state,		// rsi
 				  const vki_sigset_t *sysmask,	// rdx
 				  const vki_sigset_t *postmask,	// rcx
-				  Int nsigwords)		// r8
-				   
+				  Int nsigwords,		// r8
+				  SyscallArgs *args)		// r9
+
+See priv_types_n_macros.h for SyscallArgs layout:
+      UWord sysno;             // 0
+      UWord arg1;              // 8
+      UWord arg2;              // 16
+      UWord arg3;              // 24
+      UWord arg4;              // 32
+      UWord arg5;              // 40
+      UWord arg6;              // 48
+      UWord arg7;              // 56
+      UWord arg8;              // 64
+
 */
 
 /* from vki_arch.h */	
@@ -113,13 +125,11 @@
 	movq	$VKI_SIG_SETMASK, %rdi		// how
 	movq	%rdx, %rsi			// sysmask
 	movq	%rcx, %rdx			// postmask
-	movq	%r8, %r10			// nsigwords
 	syscall
 
 	POP_di_si_dx_cx_8
 	
-	testq	%rax, %rax
-	js	7f	/* sigprocmask failed */
+	jb	7f	/* sigprocmask failed */
 
 	/* OK, that worked.  Now do the syscall proper. */
 	
@@ -144,8 +154,13 @@
 
 	POP_di_si_dx_cx_8
 
+	pushf
+	popq	%r15
 	movq	%rax, OFFSET_amd64_RAX(%rsi)	/* save back to RAX */
+	movq	%rdx, OFFSET_amd64_RDX(%rsi)	/* save back to RDX */
 
+	/* QQQ Race here.  see syscall-x86-freebsd.S comment */
+
 4:	/* Re-block signals.  If eip is in [4,5), then the syscall 
 	   is complete and we needn't worry about it. */
 
@@ -155,15 +170,22 @@
 	movq	$VKI_SIG_SETMASK, %rdi		// how
 	movq	%rcx, %rsi			// postmask
 	xorq	%rdx, %rdx			// NULL
-	movq	%r8, %r10			// nsigwords
 	syscall
 
 	POP_di_si_dx_cx_8
 
-	testq	%rax, %rax
-	js	7f	/* sigprocmask failed */
+	jb	7f	/* sigprocmask failed */
 
 5:	/* now safe from signals */
+
+	PUSH_di_si_dx_cx_8
+	/* Export carry state */
+	movq	%r15,%rdi
+	andq	$1, %rdi
+	/* rsi still --> VexGuestAMD64State * */
+	call	LibVEX_GuestAMD64_put_rflag_c
+	POP_di_si_dx_cx_8
+
 	movq	$0, %rax	/* SUCCESS */
 	popq	%r15
 	popq	%r14
@@ -174,8 +196,6 @@
 	ret
 
 7:	/* failure:	 return 0x8000 | error code */
-	negq	%rax
-	andq	$0x7FFF, %rax
 	orq	$0x8000, %rax
 	popq	%r15
 	popq	%r14
@@ -206,6 +226,6 @@
 /* Let the linker know we don't need an executable stack */
 .section .note.GNU-stack,"",@progbits
 
-##--------------------------------------------------------------------##
-##--- end                                                          ---##
-##--------------------------------------------------------------------##
+/*--------------------------------------------------------------------*/
+/*--- end                                                          ---*/
+/*--------------------------------------------------------------------*/
From peter at FreeBSD.org  Sat Nov  1 18:53:46 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Sat Nov  1 18:53:52 2008
Subject: PERFORCE change 152340 for review
Message-ID: <200811020153.mA21rkeD071582@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152340

Change 152340 by peter@peter_overcee on 2008/11/02 01:53:27

	Grr.  make 'ps -axH' show the kthread names like top(1) does.

Affected files ...

.. //depot/projects/hammer/bin/ps/print.c#18 edit

Differences ...

==== //depot/projects/hammer/bin/ps/print.c#18 (text+ko) ====

@@ -125,8 +125,10 @@
 	VAR *v;
 	int left;
 	char *cp, *vis_env, *vis_args;
+	int flag;
 
 	v = ve->var;
+	flag = k->ki_p->ki_flag;
 	if (cflag) {
 		/* If it is the last field, then don't pad */
 		if (STAILQ_NEXT(ve, next_ve) == NULL) {
@@ -137,6 +139,17 @@
 			(void)printf("%-*s", v->width, k->ki_p->ki_comm);
 		return;
 	}
+	if (showthreads && (k->ki_p->ki_flag & P_SYSTEM) != 0 && k->ki_p->ki_pid != 1) {
+		/* If it is the last field, then don't pad */
+		char *kth;
+		asprintf(&kth, "{%s}", k->ki_p->ki_ocomm);
+		if (STAILQ_NEXT(ve, next_ve) == NULL)
+			(void)printf("%s", kth);
+		else
+			(void)printf("%-*s", v->width, kth);
+		free(kth);
+		return;
+	}
 	if ((vis_args = malloc(strlen(k->ki_args) * 4 + 1)) == NULL)
 		errx(1, "malloc failed");
 	strvis(vis_args, k->ki_args, VIS_TAB | VIS_NL | VIS_NOSLASH);
From peter at FreeBSD.org  Sat Nov  1 18:56:50 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Sat Nov  1 18:56:56 2008
Subject: PERFORCE change 152341 for review
Message-ID: <200811020156.mA21unFf071836@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152341

Change 152341 by peter@peter_overcee on 2008/11/02 01:56:41

	Show non-threaded kprocs the normal way (like top does)

Affected files ...

.. //depot/projects/hammer/bin/ps/print.c#19 edit

Differences ...

==== //depot/projects/hammer/bin/ps/print.c#19 (text+ko) ====

@@ -139,7 +139,8 @@
 			(void)printf("%-*s", v->width, k->ki_p->ki_comm);
 		return;
 	}
-	if (showthreads && (k->ki_p->ki_flag & P_SYSTEM) != 0 && k->ki_p->ki_pid != 1) {
+	if (showthreads && (k->ki_p->ki_flag & P_SYSTEM) != 0 &&
+	    k->ki_p->ki_numthreads > 1) {
 		/* If it is the last field, then don't pad */
 		char *kth;
 		asprintf(&kth, "{%s}", k->ki_p->ki_ocomm);
From peter at FreeBSD.org  Sat Nov  1 19:41:35 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Sat Nov  1 19:41:42 2008
Subject: PERFORCE change 152342 for review
Message-ID: <200811020241.mA22fYYh076391@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152342

Change 152342 by peter@peter_overcee on 2008/11/02 02:41:09

	Oops.  In the error case, return sres.err, not sres.res in %EAX/RAX.
	(Fallout from the AIX port restructuring changes)

Affected files ...

.. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-main.c#11 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-main.c#11 (text+ko) ====

@@ -647,22 +647,24 @@
 #elif defined(VGP_x86_freebsd)
    VexGuestX86State* gst = (VexGuestX86State*)gst_vanilla;
    vg_assert(canonical->what == SsComplete);
-   gst->guest_EAX = canonical->sres.res;
-   gst->guest_EDX = canonical->sres.res2;
    if (canonical->sres.isError) {
+      gst->guest_EAX = canonical->sres.err;
       LibVEX_GuestX86_put_eflag_c( 1, gst );
    } else {
+      gst->guest_EAX = canonical->sres.res;
+      gst->guest_EDX = canonical->sres.res2;
       LibVEX_GuestX86_put_eflag_c( 0, gst );
    }
 
 #elif defined(VGP_amd64_freebsd)
    VexGuestAMD64State* gst = (VexGuestAMD64State*)gst_vanilla;
    vg_assert(canonical->what == SsComplete);
-   gst->guest_RAX = canonical->sres.res;
-   gst->guest_RDX = canonical->sres.res2;
    if (canonical->sres.isError) {
+      gst->guest_RAX = canonical->sres.err;
       LibVEX_GuestAMD64_put_rflag_c( 1, gst );
    } else {
+      gst->guest_RAX = canonical->sres.res;
+      gst->guest_RDX = canonical->sres.res2;
       LibVEX_GuestAMD64_put_rflag_c( 0, gst );
    }
 
From peter at FreeBSD.org  Sat Nov  1 19:56:51 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Sat Nov  1 19:56:56 2008
Subject: PERFORCE change 152343 for review
Message-ID: <200811020256.mA22uo9G077468@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152343

Change 152343 by peter@peter_overcee on 2008/11/02 02:56:32

	Hopefully close the signal reception vs unmasked syscalls race that was
	unique to the FreeBSD async syscall handler.  On the other valgrind platforms
	the results of the async syscall are written directly into the guest state.
	The problem is that the 'carry' return can't be done like that as it isn't
	something we can write to in asm.  Instead export it and track its progress
	through the stack and fix it up when needed.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_syswrap/syscall-amd64-freebsd.S#5 edit
.. //depot/projects/valgrind/coregrind/m_syswrap/syscall-x86-freebsd.S#7 edit
.. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-main.c#12 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_syswrap/syscall-amd64-freebsd.S#5 (text+ko) ====

@@ -159,8 +159,6 @@
 	movq	%rax, OFFSET_amd64_RAX(%rsi)	/* save back to RAX */
 	movq	%rdx, OFFSET_amd64_RDX(%rsi)	/* save back to RDX */
 
-	/* QQQ Race here.  see syscall-x86-freebsd.S comment */
-
 4:	/* Re-block signals.  If eip is in [4,5), then the syscall 
 	   is complete and we needn't worry about it. */
 
@@ -178,15 +176,9 @@
 
 5:	/* now safe from signals */
 
-	PUSH_di_si_dx_cx_8
 	/* Export carry state */
-	movq	%r15,%rdi
-	andq	$1, %rdi
-	/* rsi still --> VexGuestAMD64State * */
-	call	LibVEX_GuestAMD64_put_rflag_c
-	POP_di_si_dx_cx_8
-
-	movq	$0, %rax	/* SUCCESS */
+	movq	%r15,%rax
+	andq	$1, %rax	/* SUCCESS */
 	popq	%r15
 	popq	%r14
 	popq	%r13

==== //depot/projects/valgrind/coregrind/m_syswrap/syscall-x86-freebsd.S#7 (text+ko) ====

@@ -153,6 +153,7 @@
 
 4:	/* Re-block signals.  If eip is in [4,5), then the syscall is complete and 
 	   we needn't worry about it. */
+	/* QQQ: However, on FreeBSD, the trap handler has to export just carry */
 	movl	$__NR_sigprocmask, %eax
 	movl	$VKI_SIG_SETMASK, %ecx
 	movl	%ecx, 4(%esp)
@@ -166,14 +167,8 @@
 5:	/* now safe from signals */
 
 	/* Export carry state */
-	movl	4+FSZ(%esp), %ebx
-	pushl	%ebx	/* guest state * */
-	andl	$1, %edi
-	pushl	%edi	/* carry flag */
-	call	LibVEX_GuestX86_put_eflag_c
-	addl	$8, %esp
-
-	movl	$0, %eax	/* SUCCESS */
+	movl	%edi, %eax
+	andl	$1, %eax	/* SUCCESS */
 	addl	$(9*4), %esp	/* args + fake return address */
 	popl	%ebp
 	popl	%ebx

==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-main.c#12 (text+ko) ====

@@ -264,6 +264,22 @@
 #          endif
            , args
         );
+#if defined(VGP_x86_freebsd)
+   /* On FreeBSD, the success/fail status is returned */
+   if (err == 1) {
+      LibVEX_Guestx86_put_eflag_c(1, &tst->arch.vex);
+      err = 0;
+   } else {
+      LibVEX_Guestx86_put_eflag_c(0, &tst->arch.vex);
+   }
+#elif defined(VGP_amd64_freebsd)
+   if (err == 1) {
+      LibVEX_GuestAMD64_put_rflag_c(1, &tst->arch.vex);
+      err = 0;
+   } else {
+      LibVEX_GuestAMD64_put_rflag_c(0, &tst->arch.vex);
+   }
+#endif
    vg_assert2(
       err == 0,
       "ML_(do_syscall_for_client_WRK): sigprocmask error %d",
@@ -1614,6 +1630,23 @@
       /* Result committed, but the signal mask has not been restored;
          we expect our caller (the signal handler) will have fixed
          this up. */
+#if defined(VGP_x86_freebsd)
+      /* On FreeBSD, the success/fail status is returned to the caller
+	 and still has to be fixed up here. */
+      if (!(sci->flags & SfNoWriteResult)) {
+        if (sres.isError)
+           LibVEX_Guestx86_put_eflag_c(1, &th_regs->vex);
+        else
+           LibVEX_Guestx86_put_eflag_c(0, &th_regs->vex);
+      }
+#elif defined(VGP_amd64_freebsd)
+      if (!(sci->flags & SfNoWriteResult)) {
+        if (sres.isError)
+           LibVEX_GuestAMD64_put_rflag_c(1, &th_regs->vex);
+        else
+           LibVEX_GuestAMD64_put_rflag_c(0, &th_regs->vex);
+      }
+#endif
       if (debug)
          VG_(printf)("  all done\n");
       VG_(post_syscall)(tid);
From pgj at FreeBSD.org  Sun Nov  2 04:37:40 2008
From: pgj at FreeBSD.org (Gabor Pali)
Date: Sun Nov  2 04:37:46 2008
Subject: PERFORCE change 152350 for review
Message-ID: <200811021237.mA2CbdcG052536@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152350

Change 152350 by pgj@kolbasz on 2008/11/02 12:37:09

	IFC

Affected files ...

.. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#16 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/cups/article.sgml#6 integrate
.. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#11 integrate
.. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#11 integrate
.. //depot/projects/docproj_hu/doc/share/pgpkeys/versus.key#1 branch
.. //depot/projects/docproj_hu/www/en/developers.sgml#14 integrate
.. //depot/projects/docproj_hu/www/share/sgml/news.xml#25 integrate

Differences ...

==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#16 (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.463 2008/10/06 08:36:30 lstewart Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.464 2008/11/01 11:08:11 versus Exp $
 -->
 
 aaron@FreeBSD.org">
@@ -1096,6 +1096,8 @@
 
 vd@FreeBSD.org">
 
+versus@FreeBSD.org">
+
 viny@FreeBSD.org">
 
 vkashyap@FreeBSD.org">

==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/cups/article.sgml#6 (text+ko) ====


==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#11 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
     
@@ -479,6 +479,11 @@
       &pgpkey.jkh;
     
 
+    
+	&a.versus;
+	&pgpkey.versus;
+    
+
     
       &a.weongyo;
       &pgpkey.weongyo;

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

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

==== //depot/projects/docproj_hu/www/en/developers.sgml#14 (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.206 2008/10/06 13:59:02 lstewart Exp $
+$FreeBSD: www/en/developers.sgml,v 1.207 2008/11/01 12:55:08 versus Exp $
 
 -->
 
@@ -546,6 +546,7 @@
 
 
 
+
 
 
 

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

@@ -25,7 +25,7 @@
 
   
     
-      $FreeBSD: www/share/sgml/news.xml,v 1.203 2008/10/23 08:48:05 danger Exp $
+      $FreeBSD: www/share/sgml/news.xml,v 1.204 2008/11/01 12:55:08 versus Exp $
     
   
 
@@ -33,6 +33,24 @@
     2008
 
     
+      11
+
+      
+	1
+         
+           New committer: <a href="mailto:versus@FreeBSD.org">
+	     Konrad Jankowski</a> (src) - SoC2008 alumnus.
+
+	   
New committer: Konrad Jankowski (src).
+	     Konrad participated in Summer Of Code 2008.
+	     He will begin his work in the i18n area, specifically in
+	     bringing his SoC code (UTF-8 collation) to the coming releases.

+         
+      
+
+    
+
+    
       10
 
       
From pgj at FreeBSD.org  Sun Nov  2 05:41:46 2008
From: pgj at FreeBSD.org (Gabor Pali)
Date: Sun Nov  2 05:41:53 2008
Subject: PERFORCE change 152352 for review
Message-ID: <200811021341.mA2DfjDT068001@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152352

Change 152352 by pgj@kolbasz on 2008/11/02 13:41:21

	MFen (doc):
	    1.234      -> 1.235      hu_HU.ISO8859-2/books/handbook/config/chapter.sgml
	    1.228      -> 1.230      hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.sgml

Affected files ...

.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/config/chapter.sgml#15 edit
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.sgml#6 edit

Differences ...

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

@@ -7,7 +7,7 @@
 
 
 

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

@@ -7,7 +7,7 @@
 
 
 
@@ -97,6 +97,18 @@
 	    
     
 
+    
+      A fejezetben a &os; forrásainak
+	frissítését a cvsup
+	parancs segítségével fogjuk
+	elvégezni.  Ehhez telepítsük a net/cvsup-without-gui portot vagy
+	csomagot, vagy ha már a &os; 6.2-RELEASE vagy
+	késõbbi változatával
+	rendelkezünk, akkor elegendõ csak az alaprendszer
+	részeként elérhetõ &man.csup.1;
+	programot használnunk.
+    
   
 
   
@@ -271,11 +283,12 @@
 	
 	  
 	    Iratkozzunk fel az &a.current.name; és
-	      &a.cvsall.name; listákra.  Ez nem egyszerûen
-	      hasznos, hanem elengedhetetlen.  Ha
-	      nem vagyunk a &a.current.name;
-	      listán, akkor nem fogjuk látni a rendszer
-	      aktuális állapotára vonatkozó
+	      &a.svn-src-head.name; listákra.  Ez nem
+	      egyszerûen hasznos, hanem
+	      elengedhetetlen.  Ha nem vagyunk a
+	      &a.current.name; listán, akkor
+	      nem fogjuk látni a rendszer aktuális
+	      állapotára vonatkozó
 	      megjegyzéseket, és így esetleg
 	      feleslegesen öljük az idõnket olyan
 	      problémák megoldásába,
@@ -286,8 +299,8 @@
 	      létfontosságú
 	      bejelentéseket.
 
-	    A &a.cvsall.name; listán láthatjuk az a
-	      forráskód egyes
+	    A &a.svn-src-head.name; listán láthatjuk
+	      az a forráskód egyes
 	      változtatásaihoz tartozó
 	      naplóbejegyzéseket, a hozzájuk
 	      tartozó esetleges mellékhatások
@@ -298,7 +311,10 @@
 	      valamelyikére úgy tudunk feliratkozni, ha
 	      rákattintunk a nevére.  A további
 	      lépésekrõl ezt követõen itt
-	      kapunk értesítést.
+	      kapunk értesítést.  Amennyiben a
+	      teljes forrásfa változásai
+	      érdekelnek minket, javasoljuk a
+	      &a.svn-src-all.name; lista olvasását.
 	  
 
 	  
@@ -319,7 +335,7 @@
 
 	      
 		Használjuk a cvsup programot a
+		    linkend="cvsup">cvsup programot a
 		  /usr/share/examples/cvsup
 		  könyvtárban található
 		  standard-supfile
@@ -332,13 +348,42 @@
 		  cron parancson keresztül
 		  adják ki, és ezzel mindig automatikusan
 		  frissítik a forrásaikat.  A cvsup
+		    linkend="cvsup">cvsup
 		  mûködését a fentebb
 		  említett minta supfile
 		  állomány megfelelõ
 		  módosításával tudjuk a
 		  saját környezetünkhöz
 		  igazítani.
+
+		
+		  Az említett
+		    standard-supfile
+		    állomány eredetileg nem a
+		    &os.current;, hanem inkább a &os;
+		    biztonsági problémáit
+		    érintõ javítások
+		    követésére használatos.  A
+		    &os.current; forrásainak
+		    eléréséhez a
+		    következõ sort kell
+		    kicserélnünk ebben az
+		    állományban:
+
+		  *default release=cvs
+tag=RELENG_X_Y
+
+		  Erre:
+
+		  *default release=cvs tag=.
+
+		  A tag
+		    paramétereként megadható
+		    egyéb címkékrõl a
+		    kézikönyv CVS
+		    címkék szakaszában
+		    olvashatunk.
+		
 	      
 
 	      
@@ -348,7 +393,7 @@
 
 	      
 		Használjuk a CTM
+		    linkend="ctm">CTM
 		  alkalmazás nyújtotta
 		  lehetõségeket.  Amennyiben nagyon rossz
 		  netkapcsolattal rendelkezünk (drága vagy
@@ -545,7 +590,12 @@
 	      kapcsolatban bármilyen problémájuk
 	      vagy ötletünk van.
 
-	    A &a.cvsall.name; lista
+	    Iratkozzunk fel a követni kívánt
+	      ághoz tartozó SVN
+	      levelezési listára.  Például
+	      ha a 7-STABLE ág változásait
+	      követjük, akkor az &a.svn-src-stable-7.name;
+	      listára érdemes feliratkoznunk.  Ennek
 	      segítségével elolvashatjuk az egyes
 	      változtatásokhoz tartozó
 	      naplóbejegyzéseket, a rájuk
@@ -911,10 +961,11 @@
 	Ezután adjuk ki az alábbi
 	utasításokat:
 
-      &prompt.root; make buildworld
+      &prompt.root; cd /usr/src
+&prompt.root; make buildworld
 &prompt.root; make buildkernel
 &prompt.root; make installkernel
-&prompt.root; reboot
+&prompt.root; shutdown -r now
 
       
 	Néhány ritka esetben a
@@ -937,7 +988,9 @@
 	parancssorában adjuk ki boot -s
 	parancsot).  Itt futtassuk a következõket:
 
-      &prompt.root; mergemaster -p
+      &prompt.root; mount -a -t ufs
+&prompt.root; mergemaster -p
+&prompt.root; cd /usr/src
 &prompt.root; make installworld
 &prompt.root; mergemaster
 &prompt.root; reboot
From pgj at FreeBSD.org  Sun Nov  2 05:52:57 2008
From: pgj at FreeBSD.org (Gabor Pali)
Date: Sun Nov  2 05:53:08 2008
Subject: PERFORCE change 152353 for review
Message-ID: <200811021352.mA2Dqubk068945@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152353

Change 152353 by pgj@kolbasz on 2008/11/02 13:52:34

	Some minor fixes in the previous merge

Affected files ...

.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.sgml#7 edit

Differences ...

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

@@ -299,8 +299,8 @@
 	      létfontosságú
 	      bejelentéseket.
 
-	    A &a.svn-src-head.name; listán láthatjuk
-	      az a forráskód egyes
+	    Az &a.svn-src-head.name; listán
+	      láthatjuk az a forráskód egyes
 	      változtatásaihoz tartozó
 	      naplóbejegyzéseket, a hozzájuk
 	      tartozó esetleges mellékhatások
@@ -313,7 +313,7 @@
 	      lépésekrõl ezt követõen itt
 	      kapunk értesítést.  Amennyiben a
 	      teljes forrásfa változásai
-	      érdekelnek minket, javasoljuk a
+	      érdekelnek minket, javasoljuk az
 	      &a.svn-src-all.name; lista olvasását.
 	  
 
@@ -370,8 +370,7 @@
 		    kicserélnünk ebben az
 		    állományban:
 
-		  *default release=cvs
-tag=RELENG_X_Y
+		  *default release=cvs tag=RELENG_X_Y
 
 		  Erre:
 
From pgj at FreeBSD.org  Sun Nov  2 06:45:51 2008
From: pgj at FreeBSD.org (Gabor Pali)
Date: Sun Nov  2 06:46:03 2008
Subject: PERFORCE change 152355 for review
Message-ID: <200811021445.mA2Ejo8c074470@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152355

Change 152355 by pgj@kolbasz on 2008/11/02 14:45:45

	MFen (doc):
	    1.230      -> 1.231      hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.sgml

Affected files ...

.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.sgml#8 edit

Differences ...

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

@@ -7,7 +7,7 @@
 
 
 
From pgj at FreeBSD.org  Sun Nov  2 07:08:14 2008
From: pgj at FreeBSD.org (Gabor Pali)
Date: Sun Nov  2 07:08:20 2008
Subject: PERFORCE change 152357 for review
Message-ID: <200811021508.mA2F8DRC077358@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152357

Change 152357 by pgj@kolbasz on 2008/11/02 15:07:18

	MFen:
	    1.47       -> 1.48       hu_HU.ISO8859-2/books/fdp-primer/sgml-primer/chapter.sgml

Affected files ...

.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/sgml-primer/chapter.sgml#3 edit

Differences ...

==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/sgml-primer/chapter.sgml#3 (text+ko) ====

@@ -33,7 +33,7 @@
 
 
 
@@ -106,9 +106,10 @@
       segítségre a szöveges adatok értelmes
       feldolgozásában.
 
-    Pontosabban úgy fogalmazhatnánk, hogy segítenünk kell nekik az
-      egyes elemek beazonosításában.  Nézzük meg például ezt a
-      szöveget:
+    Pontosabban úgy fogalmazhatnánk, hogy
+      segítenünk kell nekik az egyes elemek
+      beazonosításában.  Nézzük meg
+      például ezt a szöveget:
 
       

 	Az &man.rm.1; parancs használatával
@@ -339,15 +340,15 @@
 
     Egy elem elemhez tartozó
       kezdõcímke általános alakja az
-      <elem>.  Az
+      <elem>.  Az
       hozzátartozó zárócímke pedig az
-      </elem>.
+      </elem>.
 
     
       Elem (kezdõ- és
 	zárócímkék) használata
 
-      A HTML-ben a bekezdéseket a p
+      A HTML-ben a bekezdéseket a p
 	(mint paragrafus) elemmel jelölhetjük.  Ehhez az elemhez
 	tartozik kezdõ- és
 	zárócímke.
@@ -372,7 +373,7 @@
       Elem (csak kezdõcímke)
 	használata
 
-      A HTML-ben van egy hr nevû elem,
+      A HTML-ben van egy hr nevû elem,
 	amellyel vízszintes elválasztókat (horizontal
 	rule) jelölhetünk.  Ennek az elemnek nincs tartalma,
 	ezért csak kezdõcímkével
@@ -447,12 +448,12 @@
       alakban.
 
     A HTML újabb változataiban például
-      a p elemnek van egy align
+      a p elemnek van egy align
       tulajdonsága, amely a HTML megjelenítése
       során javasolja, hogy az általa jelölt
       bekezdést merre igazítsuk.
 
-    Ez az align tulajdonság négy
+    Ez az align tulajdonság négy
       elõre meghatározott érték
       valamelyikét kaphatja meg: left (balra
       zárt), center (középre
@@ -754,7 +755,7 @@
 	
 
 	
-	  Tegyük vissza a title
+	  Tegyük vissza a title
 	    elemet.
 	
       
From andenore at FreeBSD.org  Sun Nov  2 08:14:28 2008
From: andenore at FreeBSD.org (Anders Nore)
Date: Sun Nov  2 08:14:36 2008
Subject: PERFORCE change 152360 for review
Message-ID: <200811021614.mA2GESoa083405@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152360

Change 152360 by andenore@andenore_laptop on 2008/11/02 16:13:50

	New method in deps that checks conflicts from packinglist. Improved
	pkg_upgrade a bit so that it upgrades packages that does not depend
	on other packages. But it does not 'upgrade' +REQUIRED_BY files. 

Affected files ...

.. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/deps.c#5 edit
.. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/lib.h#18 edit
.. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/url.c#9 edit
.. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/upgrade/Makefile#2 edit
.. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/upgrade/main.c#2 edit
.. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/upgrade/pkg_upgrade.1#1 add

Differences ...

==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/deps.c#5 (text+ko) ====

@@ -247,7 +247,7 @@
 
 /*
  * Fixes dependencies on the package with name pkgname.
- * It scans the installed packages, searches for @pkgdep in the +CONTENS file
+ * It scans the installed packages, searches for @pkgdep in the +CONTENTS file
  * and see if that matches the given pkgname, if it does then register the
  * installed package in pkgname's +REQUIRED_BY file.
  */
@@ -299,3 +299,41 @@
 	free_plist(&nplist);
     }
 }
+
+/*
+ * Returns the number of conflicts found from packinglist and prints them out.
+ * @param Plist A package-list
+ * @return number of conflicts found
+ */
+int
+checkConflicts(Package Plist)
+{
+    int conflictsfound = 0;
+    char *conflict[2];
+    char **matched;
+    int errcode;
+    PackingList p = NULL;
+
+    for (p = Plist.head; p != NULL; p = p->next) {
+    if (p->type == PLIST_CONFLICTS) {
+	int i;
+	conflict[0] = strdup(p->name);
+	conflict[1] = NULL;
+	matched = matchinstalled(MATCH_GLOB, conflict, &errcode);
+	free(conflict[0]);
+	if (errcode == 0 && matched != NULL) {
+	    for (i = 0; matched[i] != NULL; i++) {
+		if (isinstalledpkg(matched[i]) > 0) {
+		    warnx("package '%s' conflicts with %s", Plist.name,
+			    matched[i]);
+		    conflictsfound = 1;
+		}
+	    }
+	}
+	continue;
+    }
+    }
+
+    return conflictsfound;
+}
+

==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/lib.h#18 (text+ko) ====

@@ -250,6 +250,7 @@
 int		chkifdepends(const char *, const char *);
 int		requiredby(const char *, struct reqr_by_head **, Boolean, Boolean);
 void		fix_dependencies(char *pkgname);
+int		checkConflicts(Package);
 
 /* Version */
 int		verscmp(Package *, int, int);

==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/url.c#9 (text+ko) ====

@@ -40,7 +40,7 @@
 char *
 fileGetURL(const char *base, const char *spec, int keep_package)
 {
-    char *cp, *rp, *tmp, *strippedName;
+    char *rp, *tmp, *strippedName;
     char fname[FILENAME_MAX];
     char pen[FILENAME_MAX];
     char pkg[FILENAME_MAX];
@@ -48,7 +48,6 @@
     FILE *ftp;
     pid_t tpid;
     int pfd[2], pstat, r, w = 0;
-    char *hint;
     int fd, pkgfd = 0;
     struct url_stat ustat;
     Boolean gotStat = FALSE;

==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/upgrade/Makefile#2 (text+ko) ====

@@ -1,9 +1,9 @@
 # $FreeBSD: src/usr.sbin/pkg_install/add/Makefile,v 1.21 2004/08/12 20:06:00 ru Exp $
 
-PROG=	pkg_add
-SRCS=	main.c perform.c futil.c extract.c
+PROG=	pkg_upgrade
+SRCS=	perform.c main.c 
 
-CFLAGS+= -I${.CURDIR}/../lib -g
+CFLAGS+= -I${.CURDIR}/../lib 
 
 WARNS?=	3
 WFORMAT?=	1

==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/upgrade/main.c#2 (text+ko) ====

@@ -1,7 +1,39 @@
+/*
+ * pkg_upgrade, upgrading packages.
+ * @author Anders Nore
+ * @email andenore@FreeBSD.org
+ */
+
 
 #include 
+#include "lib.h"
+#include "upgrade.h"
 
+/* Globals */
+char PkgUpgradeCmd[MAXPATHLEN];
+
+/* Prototypes */
+void usage(char *);
+
 int main(int argc, char *argv[]) 
 {
+    strlcpy(PkgUpgradeCmd, argv[0], sizeof(PkgUpgradeCmd));
+    if (argc < 2) {
+	usage(argv[0]);   
+	exit(1);
+    }
+
+    openDatabase(O_RDWR);
+    atexit(closeDatabase);
+    pkg_do(argv[1]);
+    
+
+    return 0;
 }
 
+
+/* Print usage */
+void usage(char *run) 
+{
+    printf("Usage: %s pkg-name\n", run);
+}
From peter at FreeBSD.org  Sun Nov  2 13:30:51 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Sun Nov  2 13:31:02 2008
Subject: PERFORCE change 152377 for review
Message-ID: <200811022130.mA2LUodW038817@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152377

Change 152377 by peter@peter_overcee on 2008/11/02 21:29:56

	Record spare fields as unsigned to ease casting to 64 bit values.

Affected files ...

.. //depot/projects/valgrind/include/vki/vki-amd64-freebsd.h#6 edit
.. //depot/projects/valgrind/include/vki/vki-x86-freebsd.h#5 edit

Differences ...

==== //depot/projects/valgrind/include/vki/vki-amd64-freebsd.h#6 (text+ko) ====

@@ -280,7 +280,7 @@
 	vki_stack_t		uc_stack;
 	int			uc_flags;
 #define	VKI_UCF_SWAPPED	1
-	int			__spare__[4];
+	unsigned int		__spare__[4];
 };
 
 //----------------------------------------------------------------------

==== //depot/projects/valgrind/include/vki/vki-x86-freebsd.h#5 (text+ko) ====

@@ -361,7 +361,7 @@
 	vki_stack_t		uc_stack;
 	int			uc_flags;
 #define	VKI_UCF_SWAPPED	1
-	int			__spare__[4];
+	unsigned int		__spare__[4];
 };
 
 struct vki_ucontext {
@@ -369,7 +369,7 @@
 	struct vki_mcontext	uc_mcontext;
 	struct vki_ucontext    *uc_link;
 	vki_stack_t		uc_stack;
-	int			__spare__[8];
+	unsigned int		__spare__[8];
 };
 
 #if 0
From peter at FreeBSD.org  Sun Nov  2 13:30:52 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Sun Nov  2 13:31:03 2008
Subject: PERFORCE change 152378 for review
Message-ID: <200811022130.mA2LUouY038822@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152378

Change 152378 by peter@peter_overcee on 2008/11/02 21:30:38

	Pass a ucontext pointer to sigreturn(2).

Affected files ...

.. //depot/projects/valgrind/coregrind/m_trampoline.S#6 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_trampoline.S#6 (text+ko) ====

@@ -777,6 +777,8 @@
         /* This is a very specific sequence which GDB uses to
            recognize signal handler frames. */
         movq    $__NR_sigreturn, %rax
+        movq	%rsp, %rdi
+        addq	$40,%rdi
         syscall
         ud2
 
From peter at FreeBSD.org  Sun Nov  2 13:33:55 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Sun Nov  2 13:34:00 2008
Subject: PERFORCE change 152379 for review
Message-ID: <200811022133.mA2LXsKF039051@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152379

Change 152379 by peter@peter_overcee on 2008/11/02 21:33:04

	Initial pass at getting signals delivered to userland and back again.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_sigframe/sigframe-amd64-freebsd.c#4 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_sigframe/sigframe-amd64-freebsd.c#4 (text+ko) ====

@@ -114,10 +114,10 @@
    /* Sig handler's return address */
    Addr retaddr;
 
-   Int sigNo;
+   Int  sigNo;
    Addr psigInfo;	/* code or pointer to sigContext */
    Addr puContext;	/* points to uContext */
-   Addr addr;		/* secret 4th argument */
+   Addr addr;		/* "secret" 4th argument */
    Addr phandler;	/* "action" or "handler" */
 
    /* pointed to by puContext */
@@ -126,8 +126,6 @@
    /* pointed to by psiginfo */
    vki_siginfo_t sigInfo;
 
-   /* AAA:QQQ: struct _vki_fpstate fpstate; */
-
    struct vg_sigframe vg;
 };
 
@@ -347,33 +345,35 @@
    // FIXME: save_i387(&tst->arch, fpstate);
 
 #  define SC2(reg,REG)  sc->reg = tst->arch.vex.guest_##REG
+   SC2(rdi,RDI);
+   SC2(rsi,RSI);
+   SC2(rdx,RDX);
+   SC2(rcx,RCX);
    SC2(r8,R8);
    SC2(r9,R9);
+   SC2(rax,RAX);
+   SC2(rbx,RBX);
+   SC2(rbp,RBP);
    SC2(r10,R10);
    SC2(r11,R11);
    SC2(r12,R12);
    SC2(r13,R13);
    SC2(r14,R14);
    SC2(r15,R15);
-   SC2(rdi,RDI);
-   SC2(rsi,RSI);
-   SC2(rbp,RBP);
-   SC2(rbx,RBX);
-   SC2(rdx,RDX);
-   SC2(rax,RAX);
-   SC2(rcx,RCX);
-   SC2(rsp,RSP);
-
+   /* XXX trapno */
+   sc->addr = (UWord)si->si_addr;
+   /* XXX flags */
+   /* XXX err */
    SC2(rip,RIP);
+   // FIXME: SC2(cs,CS);
    sc->rflags = LibVEX_GuestAMD64_get_rflags(&tst->arch.vex);
-   // FIXME: SC2(cs,CS);
-   // FIXME: SC2(gs,GS);
-   // FIXME: SC2(fs,FS);
-   /* XXX err */
-   /* XXX trapno */
+   SC2(rsp,RSP);
+   /* XXX ss */
+   sc->len = sizeof(*sc);
+   sc->fpformat = VKI_FPFMT_NODEV;
+   sc->ownedfp = VKI_FPOWNED_NONE;
 #  undef SC2
 
-   /* sc->cr2 = (UWord)si->_sifields._sigfault._addr; */
 }
 
 
@@ -461,9 +461,10 @@
       return rsp_top_of_frame;
 
    /* retaddr, siginfo, uContext fields are to be written */
-   VG_TRACK( pre_mem_write, Vg_CoreSignal, tst->tid, "rt signal handler frame", 
+   VG_TRACK( pre_mem_write, Vg_CoreSignal, tst->tid, "signal handler frame", 
 	     rsp, offsetof(struct sigframe, vg) );
 
+   frame->sigNo = sigNo;
    frame->retaddr = (Addr)&VG_(amd64_freebsd_SUBST_FOR_sigreturn);
    if ((flags & VKI_SA_SIGINFO) == 0)
       frame->psigInfo = (Addr)siginfo->si_code;
@@ -472,13 +473,15 @@
    frame->puContext = (Addr)&frame->uContext;
    VG_(memcpy)(&frame->sigInfo, siginfo, sizeof(vki_siginfo_t));
 
+#if 0 /* QQQ */
    /* SIGILL defines addr to be the faulting address */
    if (sigNo == VKI_SIGILL && siginfo->si_code > 0)
       frame->sigInfo.si_addr = (void*)tst->arch.vex.guest_RIP;
+#endif
 
    synth_ucontext(tst->tid, siginfo, mask, &frame->uContext /*, &frame->fpstate*/);
 
-   frame->uContext.__spare__[0] = ((unsigned long)&frame->vg) >> 32;
+   frame->uContext.__spare__[0] = ((unsigned long)&frame->vg) >> 32ul;
    frame->uContext.__spare__[1] = 0x31415926;
    frame->uContext.__spare__[2] = (unsigned long)&frame->vg;
    frame->uContext.__spare__[3] = 0x53589793;
@@ -611,7 +614,7 @@
       return 0;
    }
 
-   addr = uc->__spare__[2] | (((unsigned long)uc->__spare__[0]) << 32);
+   addr = (unsigned long)uc->__spare__[2] | (((unsigned long)uc->__spare__[0]) << 32ul);
    if (restore_vg_sigframe(tst, (struct vg_sigframe *)addr, sigNo))
       restore_sigcontext(tst, uc /*, &frame->fpstate*/ );
 
@@ -626,8 +629,6 @@
    SizeT	 size;
    Int		 sigNo;
 
-   vg_assert(isRT);
-
    tst = VG_(get_ThreadState)(tid);
 
    /* Correctly reestablish the frame base address. */
From andenore at FreeBSD.org  Sun Nov  2 14:54:16 2008
From: andenore at FreeBSD.org (Anders Nore)
Date: Sun Nov  2 14:54:22 2008
Subject: PERFORCE change 152380 for review
Message-ID: <200811022254.mA2MsFiw046137@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152380

Change 152380 by andenore@andenore_laptop on 2008/11/02 22:53:41

	Adding the perform..

Affected files ...

.. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/upgrade/main.c#3 edit
.. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/upgrade/perform.c#1 add

Differences ...

==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/upgrade/main.c#3 (text+ko) ====

From jb at FreeBSD.org  Sun Nov  2 21:41:31 2008
From: jb at FreeBSD.org (John Birrell)
Date: Sun Nov  2 21:41:38 2008
Subject: PERFORCE change 152395 for review
Message-ID: <200811030541.mA35fDU6008636@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152395

Change 152395 by jb@freebsd3 on 2008/11/03 05:41:08

	IFC

Affected files ...

.. //depot/projects/dtrace/src/Makefile.inc1#52 integrate
.. //depot/projects/dtrace/src/ObsoleteFiles.inc#53 integrate
.. //depot/projects/dtrace/src/UPDATING#40 integrate
.. //depot/projects/dtrace/src/bin/cat/cat.c#4 integrate
.. //depot/projects/dtrace/src/bin/chio/chio.c#4 integrate
.. //depot/projects/dtrace/src/bin/cp/utils.c#10 integrate
.. //depot/projects/dtrace/src/bin/pkill/pkill.1#2 integrate
.. //depot/projects/dtrace/src/bin/pkill/pkill.c#2 integrate
.. //depot/projects/dtrace/src/bin/rcp/rcp.c#5 integrate
.. //depot/projects/dtrace/src/contrib/smbfs/lib/smb/nb_name.c#4 integrate
.. //depot/projects/dtrace/src/contrib/tcsh/sh.c#6 integrate
.. //depot/projects/dtrace/src/contrib/tcsh/tc.const.c#6 integrate
.. //depot/projects/dtrace/src/crypto/openssh/loginrec.c#7 integrate
.. //depot/projects/dtrace/src/crypto/openssh/moduli.5#2 integrate
.. //depot/projects/dtrace/src/crypto/openssh/scp.1#6 integrate
.. //depot/projects/dtrace/src/crypto/openssh/sftp-server.8#6 integrate
.. //depot/projects/dtrace/src/crypto/openssh/sftp.1#5 integrate
.. //depot/projects/dtrace/src/crypto/openssh/ssh-add.1#5 integrate
.. //depot/projects/dtrace/src/crypto/openssh/ssh-agent.1#6 integrate
.. //depot/projects/dtrace/src/crypto/openssh/ssh-keygen.1#5 integrate
.. //depot/projects/dtrace/src/crypto/openssh/ssh-keyscan.1#6 integrate
.. //depot/projects/dtrace/src/crypto/openssh/ssh-keysign.8#6 integrate
.. //depot/projects/dtrace/src/crypto/openssh/ssh.1#7 integrate
.. //depot/projects/dtrace/src/crypto/openssh/ssh_config.5#8 integrate
.. //depot/projects/dtrace/src/crypto/openssh/sshd.8#6 integrate
.. //depot/projects/dtrace/src/crypto/openssh/sshd.c#8 integrate
.. //depot/projects/dtrace/src/crypto/openssh/sshd_config.5#8 integrate
.. //depot/projects/dtrace/src/etc/Makefile#16 integrate
.. //depot/projects/dtrace/src/etc/devd.conf#8 integrate
.. //depot/projects/dtrace/src/etc/etc.mips/ttys#3 integrate
.. //depot/projects/dtrace/src/etc/mtree/BSD.usr.dist#19 integrate
.. //depot/projects/dtrace/src/etc/network.subr#19 integrate
.. //depot/projects/dtrace/src/etc/periodic/security/200.chkmounts#4 integrate
.. //depot/projects/dtrace/src/etc/rc.d/netif#11 integrate
.. //depot/projects/dtrace/src/etc/rc.subr#20 integrate
.. //depot/projects/dtrace/src/etc/remote#5 integrate
.. //depot/projects/dtrace/src/games/fortune/datfiles/fortunes#38 integrate
.. //depot/projects/dtrace/src/gnu/lib/csu/Makefile#9 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/gdb/arch/amd64/Makefile#5 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/gdb/arch/i386/Makefile#5 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/kld.c#6 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/trgt_i386.c#10 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/man/man/man.c#8 integrate
.. //depot/projects/dtrace/src/lib/libarchive/archive_entry.c#12 integrate
.. //depot/projects/dtrace/src/lib/libarchive/archive_entry.h#10 integrate
.. //depot/projects/dtrace/src/lib/libarchive/archive_entry_copy_stat.c#2 integrate
.. //depot/projects/dtrace/src/lib/libarchive/archive_entry_private.h#6 integrate
.. //depot/projects/dtrace/src/lib/libarchive/archive_entry_stat.c#2 integrate
.. //depot/projects/dtrace/src/lib/libarchive/archive_read_support_format_tar.c#18 integrate
.. //depot/projects/dtrace/src/lib/libarchive/archive_read_support_format_zip.c#17 integrate
.. //depot/projects/dtrace/src/lib/libarchive/archive_util.c#10 integrate
.. //depot/projects/dtrace/src/lib/libarchive/archive_write.3#10 integrate
.. //depot/projects/dtrace/src/lib/libarchive/archive_write_disk.c#12 integrate
.. //depot/projects/dtrace/src/lib/libarchive/archive_write_set_format_pax.c#12 integrate
.. //depot/projects/dtrace/src/lib/libarchive/config_freebsd.h#10 integrate
.. //depot/projects/dtrace/src/lib/libarchive/test/Makefile#12 integrate
.. //depot/projects/dtrace/src/lib/libarchive/test/test_acl_basic.c#3 integrate
.. //depot/projects/dtrace/src/lib/libarchive/test/test_acl_freebsd.c#1 branch
.. //depot/projects/dtrace/src/lib/libarchive/test/test_entry.c#5 integrate
.. //depot/projects/dtrace/src/lib/libarchive/test/test_read_format_zip.c#6 integrate
.. //depot/projects/dtrace/src/lib/libarchive/test/test_read_format_zip.zip.uu#2 integrate
.. //depot/projects/dtrace/src/lib/libarchive/test/test_write_disk.c#6 integrate
.. //depot/projects/dtrace/src/lib/libarchive/test/test_write_disk_times.c#1 branch
.. //depot/projects/dtrace/src/lib/libarchive/test/test_write_format_pax.c#1 branch
.. //depot/projects/dtrace/src/lib/libc/amd64/SYS.h#6 integrate
.. //depot/projects/dtrace/src/lib/libc/amd64/gen/_setjmp.S#6 integrate
.. //depot/projects/dtrace/src/lib/libc/amd64/gen/fabs.S#4 integrate
.. //depot/projects/dtrace/src/lib/libc/amd64/gen/modf.S#5 integrate
.. //depot/projects/dtrace/src/lib/libc/amd64/gen/rfork_thread.S#4 integrate
.. //depot/projects/dtrace/src/lib/libc/amd64/gen/setjmp.S#6 integrate
.. //depot/projects/dtrace/src/lib/libc/amd64/gen/sigsetjmp.S#5 integrate
.. //depot/projects/dtrace/src/lib/libc/amd64/stdlib/div.S#2 integrate
.. //depot/projects/dtrace/src/lib/libc/amd64/stdlib/ldiv.S#2 integrate
.. //depot/projects/dtrace/src/lib/libc/amd64/stdlib/lldiv.S#2 integrate
.. //depot/projects/dtrace/src/lib/libc/amd64/string/bcmp.S#4 integrate
.. //depot/projects/dtrace/src/lib/libc/amd64/string/bcopy.S#4 integrate
.. //depot/projects/dtrace/src/lib/libc/amd64/string/bzero.S#4 integrate
.. //depot/projects/dtrace/src/lib/libc/amd64/string/memcmp.S#4 integrate
.. //depot/projects/dtrace/src/lib/libc/amd64/string/memset.S#4 integrate
.. //depot/projects/dtrace/src/lib/libc/amd64/string/strcat.S#4 integrate
.. //depot/projects/dtrace/src/lib/libc/amd64/string/strcmp.S#4 integrate
.. //depot/projects/dtrace/src/lib/libc/amd64/string/strcpy.S#4 integrate
.. //depot/projects/dtrace/src/lib/libc/amd64/sys/brk.S#5 integrate
.. //depot/projects/dtrace/src/lib/libc/amd64/sys/exect.S#5 integrate
.. //depot/projects/dtrace/src/lib/libc/amd64/sys/getcontext.S#4 integrate
.. //depot/projects/dtrace/src/lib/libc/amd64/sys/pipe.S#5 integrate
.. //depot/projects/dtrace/src/lib/libc/amd64/sys/ptrace.S#5 integrate
.. //depot/projects/dtrace/src/lib/libc/amd64/sys/reboot.S#5 integrate
.. //depot/projects/dtrace/src/lib/libc/amd64/sys/sbrk.S#5 integrate
.. //depot/projects/dtrace/src/lib/libc/amd64/sys/setlogin.S#5 integrate
.. //depot/projects/dtrace/src/lib/libc/amd64/sys/vfork.S#5 integrate
.. //depot/projects/dtrace/src/lib/libc/arm/gen/_setjmp.S#4 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/__xuname.c#5 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/err.3#7 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/getosreldate.3#5 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/posix_spawn.c#3 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/SYS.h#6 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/gen/_ctx_start.S#4 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/gen/_setjmp.S#6 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/gen/fabs.S#5 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/gen/modf.S#5 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/gen/rfork_thread.S#4 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/gen/setjmp.S#6 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/gen/sigsetjmp.S#5 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/stdlib/abs.S#5 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/stdlib/div.S#5 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/stdlib/labs.S#5 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/stdlib/ldiv.S#4 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/string/bcmp.S#4 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/string/bcopy.S#5 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/string/bzero.S#4 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/string/ffs.S#4 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/string/index.S#4 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/string/memchr.S#4 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/string/memcmp.S#4 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/string/memset.S#4 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/string/rindex.S#4 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/string/strcat.S#4 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/string/strchr.S#4 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/string/strcmp.S#4 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/string/strcpy.S#4 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/string/strlen.S#4 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/string/strncmp.S#4 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/string/strrchr.S#4 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/string/swab.S#4 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/string/wcschr.S#4 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/string/wcscmp.S#4 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/string/wcslen.S#4 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/string/wmemchr.S#4 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/sys/Ovfork.S#5 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/sys/brk.S#5 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/sys/exect.S#5 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/sys/getcontext.S#4 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/sys/pipe.S#5 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/sys/ptrace.S#5 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/sys/reboot.S#5 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/sys/sbrk.S#5 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/sys/setlogin.S#5 integrate
.. //depot/projects/dtrace/src/lib/libc/i386/sys/syscall.S#5 integrate
.. //depot/projects/dtrace/src/lib/libc/stdlib/Makefile.inc#6 integrate
.. //depot/projects/dtrace/src/lib/libc/stdtime/strftime.c#4 integrate
.. //depot/projects/dtrace/src/lib/libc/string/strlcpy.c#4 integrate
.. //depot/projects/dtrace/src/lib/libc/string/strxfrm.c#4 integrate
.. //depot/projects/dtrace/src/lib/libc/sys/cpuset.2#3 integrate
.. //depot/projects/dtrace/src/lib/libc/sys/cpuset_getaffinity.2#3 integrate
.. //depot/projects/dtrace/src/lib/libc/sys/mmap.2#7 integrate
.. //depot/projects/dtrace/src/lib/libcam/camlib.c#6 integrate
.. //depot/projects/dtrace/src/lib/libfetch/http.c#9 integrate
.. //depot/projects/dtrace/src/lib/libkvm/kvm.c#8 integrate
.. //depot/projects/dtrace/src/lib/libkvm/kvm_minidump_amd64.c#4 integrate
.. //depot/projects/dtrace/src/lib/libkvm/kvm_minidump_i386.c#4 integrate
.. //depot/projects/dtrace/src/lib/libpmc/Makefile#7 integrate
.. //depot/projects/dtrace/src/lib/libpmc/libpmc.c#8 integrate
.. //depot/projects/dtrace/src/lib/libpmc/pmc.3#10 integrate
.. //depot/projects/dtrace/src/lib/libpmc/pmc.atom.3#1 branch
.. //depot/projects/dtrace/src/lib/libpmc/pmc.core.3#1 branch
.. //depot/projects/dtrace/src/lib/libpmc/pmc.core2.3#1 branch
.. //depot/projects/dtrace/src/lib/libpmc/pmc.iaf.3#1 branch
.. //depot/projects/dtrace/src/lib/libpmc/pmc.k7.3#2 integrate
.. //depot/projects/dtrace/src/lib/libpmc/pmc.k8.3#2 integrate
.. //depot/projects/dtrace/src/lib/libpmc/pmc.p4.3#2 integrate
.. //depot/projects/dtrace/src/lib/libpmc/pmc.p5.3#2 integrate
.. //depot/projects/dtrace/src/lib/libpmc/pmc.p6.3#2 integrate
.. //depot/projects/dtrace/src/lib/libpmc/pmc.tsc.3#2 integrate
.. //depot/projects/dtrace/src/lib/libstand/Makefile#10 integrate
.. //depot/projects/dtrace/src/lib/libutil/flopen.3#3 integrate
.. //depot/projects/dtrace/src/lib/libutil/flopen.c#2 integrate
.. //depot/projects/dtrace/src/lib/libutil/login_cap.h#5 integrate
.. //depot/projects/dtrace/src/lib/libutil/login_class.3#5 integrate
.. //depot/projects/dtrace/src/lib/libutil/login_class.c#7 integrate
.. //depot/projects/dtrace/src/lib/libutil/login_times.3#4 integrate
.. //depot/projects/dtrace/src/lib/libutil/login_times.c#4 integrate
.. //depot/projects/dtrace/src/lib/libutil/logwtmp.c#5 integrate
.. //depot/projects/dtrace/src/lib/libutil/pidfile.3#5 integrate
.. //depot/projects/dtrace/src/lib/libutil/pidfile.c#7 integrate
.. //depot/projects/dtrace/src/lib/libutil/pty.c#8 integrate
.. //depot/projects/dtrace/src/lib/libutil/realhostname.c#4 integrate
.. //depot/projects/dtrace/src/libexec/rtld-elf/mips/reloc.c#2 integrate
.. //depot/projects/dtrace/src/libexec/rtld-elf/rtld.c#11 integrate
.. //depot/projects/dtrace/src/release/Makefile#21 integrate
.. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#8 integrate
.. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#28 integrate
.. //depot/projects/dtrace/src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#5 integrate
.. //depot/projects/dtrace/src/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#5 integrate
.. //depot/projects/dtrace/src/release/doc/share/misc/dev.archlist.txt#19 integrate
.. //depot/projects/dtrace/src/release/doc/share/misc/man2hwnotes.pl#6 integrate
.. //depot/projects/dtrace/src/release/scripts/package-trees.sh#4 integrate
.. //depot/projects/dtrace/src/sbin/bsdlabel/bsdlabel.c#8 integrate
.. //depot/projects/dtrace/src/sbin/dhclient/dhclient.c#10 integrate
.. //depot/projects/dtrace/src/sbin/dhclient/dhcp.h#5 integrate
.. //depot/projects/dtrace/src/sbin/dhclient/tables.c#5 integrate
.. //depot/projects/dtrace/src/sbin/fdisk/fdisk.c#7 integrate
.. //depot/projects/dtrace/src/sbin/fsck_ffs/pass5.c#5 integrate
.. //depot/projects/dtrace/src/sbin/geom/class/part/geom_part.c#8 integrate
.. //depot/projects/dtrace/src/sbin/geom/class/part/gpart.8#5 integrate
.. //depot/projects/dtrace/src/sbin/ifconfig/ifconfig.8#23 integrate
.. //depot/projects/dtrace/src/sbin/ifconfig/ifconfig.c#14 integrate
.. //depot/projects/dtrace/src/sbin/ifconfig/ifvlan.c#7 integrate
.. //depot/projects/dtrace/src/sbin/ipfw/ipfw.8#24 integrate
.. //depot/projects/dtrace/src/sbin/ipfw/ipfw2.c#21 integrate
.. //depot/projects/dtrace/src/sbin/setkey/setkey.8#7 integrate
.. //depot/projects/dtrace/src/share/Makefile#7 integrate
.. //depot/projects/dtrace/src/share/examples/FreeBSD_version/FreeBSD_version.c#4 integrate
.. //depot/projects/dtrace/src/share/examples/drivers/make_pseudo_driver.sh#7 integrate
.. //depot/projects/dtrace/src/share/man/man3/Makefile#9 integrate
.. //depot/projects/dtrace/src/share/man/man3/makedev.3#1 branch
.. //depot/projects/dtrace/src/share/man/man4/Makefile#43 integrate
.. //depot/projects/dtrace/src/share/man/man4/ae.4#1 branch
.. //depot/projects/dtrace/src/share/man/man4/ata.4#12 integrate
.. //depot/projects/dtrace/src/share/man/man4/bce.4#7 integrate
.. //depot/projects/dtrace/src/share/man/man4/ddb.4#23 integrate
.. //depot/projects/dtrace/src/share/man/man4/em.4#6 integrate
.. //depot/projects/dtrace/src/share/man/man4/igb.4#1 branch
.. //depot/projects/dtrace/src/share/man/man4/jme.4#2 integrate
.. //depot/projects/dtrace/src/share/man/man4/mmc.4#2 integrate
.. //depot/projects/dtrace/src/share/man/man4/mmcsd.4#2 integrate
.. //depot/projects/dtrace/src/share/man/man4/nfe.4#7 integrate
.. //depot/projects/dtrace/src/share/man/man4/ng_netflow.4#5 integrate
.. //depot/projects/dtrace/src/share/man/man4/ng_tty.4#4 integrate
.. //depot/projects/dtrace/src/share/man/man4/rl.4#6 integrate
.. //depot/projects/dtrace/src/share/man/man4/sdhci.4#1 branch
.. //depot/projects/dtrace/src/share/man/man4/snd_hda.4#10 integrate
.. //depot/projects/dtrace/src/share/man/man4/u3g.4#1 branch
.. //depot/projects/dtrace/src/share/man/man4/ubsa.4#9 integrate
.. //depot/projects/dtrace/src/share/man/man4/umass.4#6 integrate
.. //depot/projects/dtrace/src/share/man/man4/umodem.4#6 integrate
.. //depot/projects/dtrace/src/share/man/man4/vlan.4#11 integrate
.. //depot/projects/dtrace/src/share/man/man4/vr.4#6 integrate
.. //depot/projects/dtrace/src/share/man/man4/wpi.4#5 integrate
.. //depot/projects/dtrace/src/share/man/man4/zyd.4#4 integrate
.. //depot/projects/dtrace/src/share/man/man5/Makefile#10 integrate
.. //depot/projects/dtrace/src/share/man/man5/nullfs.5#1 branch
.. //depot/projects/dtrace/src/share/man/man9/Makefile#34 integrate
.. //depot/projects/dtrace/src/share/man/man9/VOP_ACCESS.9#4 integrate
.. //depot/projects/dtrace/src/share/man/man9/device_ids.9#4 delete
.. //depot/projects/dtrace/src/share/man/man9/make_dev.9#8 integrate
.. //depot/projects/dtrace/src/share/man/man9/malloc.9#5 integrate
.. //depot/projects/dtrace/src/share/man/man9/spl.9#4 integrate
.. //depot/projects/dtrace/src/share/man/man9/style.9#9 integrate
.. //depot/projects/dtrace/src/share/man/man9/vaccess.9#4 integrate
.. //depot/projects/dtrace/src/share/man/man9/vaccess_acl_posix1e.9#4 integrate
.. //depot/projects/dtrace/src/share/man/man9/vfs_busy.9#5 integrate
.. //depot/projects/dtrace/src/share/man/man9/vinvalbuf.9#4 integrate
.. //depot/projects/dtrace/src/share/misc/bsd-family-tree#18 integrate
.. //depot/projects/dtrace/src/share/misc/committers-src.dot#17 integrate
.. //depot/projects/dtrace/src/share/mk/bsd.kmod.mk#4 integrate
.. //depot/projects/dtrace/src/share/syscons/keymaps/INDEX.keymaps#7 integrate
.. //depot/projects/dtrace/src/share/syscons/keymaps/eee_nordic.kbd#1 branch
.. //depot/projects/dtrace/src/share/zoneinfo/Makefile#6 integrate
.. //depot/projects/dtrace/src/share/zoneinfo/africa#10 integrate
.. //depot/projects/dtrace/src/share/zoneinfo/asia#13 integrate
.. //depot/projects/dtrace/src/share/zoneinfo/southamerica#14 integrate
.. //depot/projects/dtrace/src/share/zoneinfo/zone.tab#11 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/dump_machdep.c#8 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/identcpu.c#14 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/initcpu.c#4 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/local_apic.c#17 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/minidump_machdep.c#9 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/mp_machdep.c#15 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/prof_machdep.c#8 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/tsc.c#7 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/vm_machdep.c#11 integrate
.. //depot/projects/dtrace/src/sys/amd64/conf/GENERIC#47 integrate
.. //depot/projects/dtrace/src/sys/amd64/include/clock.h#11 integrate
.. //depot/projects/dtrace/src/sys/amd64/include/md_var.h#7 integrate
.. //depot/projects/dtrace/src/sys/amd64/include/param.h#9 integrate
.. //depot/projects/dtrace/src/sys/amd64/include/smp.h#7 integrate
.. //depot/projects/dtrace/src/sys/amd64/include/specialreg.h#13 integrate
.. //depot/projects/dtrace/src/sys/amd64/linux32/linux.h#11 integrate
.. //depot/projects/dtrace/src/sys/amd64/linux32/linux32_sysvec.c#14 integrate
.. //depot/projects/dtrace/src/sys/arm/arm/busdma_machdep.c#10 integrate
.. //depot/projects/dtrace/src/sys/arm/arm/cpufunc.c#14 integrate
.. //depot/projects/dtrace/src/sys/arm/arm/cpufunc_asm_feroceon.S#1 branch
.. //depot/projects/dtrace/src/sys/arm/arm/dump_machdep.c#6 integrate
.. //depot/projects/dtrace/src/sys/arm/arm/elf_machdep.c#6 integrate
.. //depot/projects/dtrace/src/sys/arm/arm/elf_trampoline.c#14 integrate
.. //depot/projects/dtrace/src/sys/arm/arm/genassym.c#8 integrate
.. //depot/projects/dtrace/src/sys/arm/arm/identcpu.c#10 integrate
.. //depot/projects/dtrace/src/sys/arm/arm/locore.S#8 integrate
.. //depot/projects/dtrace/src/sys/arm/arm/pmap.c#33 integrate
.. //depot/projects/dtrace/src/sys/arm/arm/swtch.S#9 integrate
.. //depot/projects/dtrace/src/sys/arm/arm/undefined.c#7 integrate
.. //depot/projects/dtrace/src/sys/arm/at91/at91.c#15 integrate
.. //depot/projects/dtrace/src/sys/arm/at91/at91_mci.c#5 integrate
.. //depot/projects/dtrace/src/sys/arm/at91/at91_spi.c#8 integrate
.. //depot/projects/dtrace/src/sys/arm/at91/if_ate.c#16 integrate
.. //depot/projects/dtrace/src/sys/arm/at91/uart_dev_at91usart.c#12 integrate
.. //depot/projects/dtrace/src/sys/arm/conf/AVILA#12 integrate
.. //depot/projects/dtrace/src/sys/arm/conf/BWCT#5 integrate
.. //depot/projects/dtrace/src/sys/arm/conf/CRB#5 integrate
.. //depot/projects/dtrace/src/sys/arm/conf/DB-78XXX#1 branch
.. //depot/projects/dtrace/src/sys/arm/conf/DB-88F5XXX#1 branch
.. //depot/projects/dtrace/src/sys/arm/conf/DB-88F6XXX#1 branch
.. //depot/projects/dtrace/src/sys/arm/conf/DEFAULTS#1 branch
.. //depot/projects/dtrace/src/sys/arm/conf/EP80219#8 integrate
.. //depot/projects/dtrace/src/sys/arm/conf/GUMSTIX#2 integrate
.. //depot/projects/dtrace/src/sys/arm/conf/HL200#6 integrate
.. //depot/projects/dtrace/src/sys/arm/conf/IQ31244#10 integrate
.. //depot/projects/dtrace/src/sys/arm/conf/KB920X#15 integrate
.. //depot/projects/dtrace/src/sys/arm/conf/NSLU#3 integrate
.. //depot/projects/dtrace/src/sys/arm/conf/SIMICS#10 integrate
.. //depot/projects/dtrace/src/sys/arm/conf/SKYEYE#10 integrate
.. //depot/projects/dtrace/src/sys/arm/include/armreg.h#8 integrate
.. //depot/projects/dtrace/src/sys/arm/include/bootinfo.h#1 branch
.. //depot/projects/dtrace/src/sys/arm/include/cpufunc.h#8 integrate
.. //depot/projects/dtrace/src/sys/arm/include/intr.h#8 integrate
.. //depot/projects/dtrace/src/sys/arm/include/metadata.h#4 integrate
.. //depot/projects/dtrace/src/sys/arm/include/resource.h#4 integrate
.. //depot/projects/dtrace/src/sys/arm/mv/bus_space.c#1 branch
.. //depot/projects/dtrace/src/sys/arm/mv/common.c#1 branch
.. //depot/projects/dtrace/src/sys/arm/mv/discovery/db78xxx.c#1 branch
.. //depot/projects/dtrace/src/sys/arm/mv/discovery/discovery.c#1 branch
.. //depot/projects/dtrace/src/sys/arm/mv/discovery/files.db78xxx#1 branch
.. //depot/projects/dtrace/src/sys/arm/mv/discovery/std.db78xxx#1 branch
.. //depot/projects/dtrace/src/sys/arm/mv/files.mv#1 branch
.. //depot/projects/dtrace/src/sys/arm/mv/gpio.c#1 branch
.. //depot/projects/dtrace/src/sys/arm/mv/ic.c#1 branch
.. //depot/projects/dtrace/src/sys/arm/mv/kirkwood/db88f6xxx.c#1 branch
.. //depot/projects/dtrace/src/sys/arm/mv/kirkwood/files.db88f6xxx#1 branch
.. //depot/projects/dtrace/src/sys/arm/mv/kirkwood/kirkwood.c#1 branch
.. //depot/projects/dtrace/src/sys/arm/mv/kirkwood/std.db88f6xxx#1 branch
.. //depot/projects/dtrace/src/sys/arm/mv/mv_machdep.c#1 branch
.. //depot/projects/dtrace/src/sys/arm/mv/mvreg.h#1 branch
.. //depot/projects/dtrace/src/sys/arm/mv/mvvar.h#1 branch
.. //depot/projects/dtrace/src/sys/arm/mv/obio.c#1 branch
.. //depot/projects/dtrace/src/sys/arm/mv/orion/db88f5xxx.c#1 branch
.. //depot/projects/dtrace/src/sys/arm/mv/orion/files.db88f5xxx#1 branch
.. //depot/projects/dtrace/src/sys/arm/mv/orion/orion.c#1 branch
.. //depot/projects/dtrace/src/sys/arm/mv/orion/std.db88f5xxx#1 branch
.. //depot/projects/dtrace/src/sys/arm/mv/rtc.c#1 branch
.. //depot/projects/dtrace/src/sys/arm/mv/std.mv#1 branch
.. //depot/projects/dtrace/src/sys/arm/mv/timer.c#1 branch
.. //depot/projects/dtrace/src/sys/arm/mv/twsi.c#1 branch
.. //depot/projects/dtrace/src/sys/arm/xscale/ixp425/avila_machdep.c#8 integrate
.. //depot/projects/dtrace/src/sys/arm/xscale/ixp425/if_npe.c#7 integrate
.. //depot/projects/dtrace/src/sys/boot/Makefile#11 integrate
.. //depot/projects/dtrace/src/sys/boot/arm/Makefile#5 integrate
.. //depot/projects/dtrace/src/sys/boot/arm/at91/boot2/boot2.c#5 integrate
.. //depot/projects/dtrace/src/sys/boot/arm/at91/boot2/centipad_board.c#2 integrate
.. //depot/projects/dtrace/src/sys/boot/arm/at91/boot2/kb920x_board.c#4 integrate
.. //depot/projects/dtrace/src/sys/boot/arm/ixp425/Makefile.inc#1 branch
.. //depot/projects/dtrace/src/sys/boot/arm/ixp425/boot2/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/boot/arm/ixp425/boot2/arm_init.S#1 branch
.. //depot/projects/dtrace/src/sys/boot/arm/ixp425/boot2/boot2.c#1 branch
.. //depot/projects/dtrace/src/sys/boot/arm/ixp425/boot2/cf_ata.h#1 branch
.. //depot/projects/dtrace/src/sys/boot/arm/ixp425/boot2/ixp425_board.c#1 branch
.. //depot/projects/dtrace/src/sys/boot/arm/ixp425/boot2/lib.h#1 branch
.. //depot/projects/dtrace/src/sys/boot/arm/uboot/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/boot/arm/uboot/conf.c#1 branch
.. //depot/projects/dtrace/src/sys/boot/arm/uboot/help.uboot#1 branch
.. //depot/projects/dtrace/src/sys/boot/arm/uboot/ldscript.arm#1 branch
.. //depot/projects/dtrace/src/sys/boot/arm/uboot/start.S#1 branch
.. //depot/projects/dtrace/src/sys/boot/arm/uboot/version#1 branch
.. //depot/projects/dtrace/src/sys/boot/common/Makefile.inc#6 integrate
.. //depot/projects/dtrace/src/sys/boot/common/load_elf.c#8 integrate
.. //depot/projects/dtrace/src/sys/boot/ficl/Makefile#7 integrate
.. //depot/projects/dtrace/src/sys/boot/forth/loader.conf#22 integrate
.. //depot/projects/dtrace/src/sys/boot/i386/libi386/bootinfo64.c#5 integrate
.. //depot/projects/dtrace/src/sys/boot/ofw/libofw/ofw_disk.c#4 integrate
.. //depot/projects/dtrace/src/sys/boot/powerpc/Makefile#6 integrate
.. //depot/projects/dtrace/src/sys/boot/powerpc/boot1.chrp/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/boot/powerpc/boot1.chrp/Makefile.hfs#1 branch
.. //depot/projects/dtrace/src/sys/boot/powerpc/boot1.chrp/boot1.c#1 branch
.. //depot/projects/dtrace/src/sys/boot/powerpc/boot1.chrp/bootinfo.txt#1 branch
.. //depot/projects/dtrace/src/sys/boot/powerpc/boot1.chrp/generate-hfs.sh#1 branch
.. //depot/projects/dtrace/src/sys/boot/powerpc/boot1.chrp/hfs.tmpl.bz2.uu#1 branch
.. //depot/projects/dtrace/src/sys/boot/sparc64/loader/main.c#11 integrate
.. //depot/projects/dtrace/src/sys/boot/uboot/lib/api_public.h#4 integrate
.. //depot/projects/dtrace/src/sys/boot/uboot/lib/glue.c#5 integrate
.. //depot/projects/dtrace/src/sys/boot/uboot/lib/glue.h#4 integrate
.. //depot/projects/dtrace/src/sys/boot/uboot/lib/net.c#4 integrate
.. //depot/projects/dtrace/src/sys/cam/scsi/scsi_target.c#7 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#3 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/policy.h#3 integrate
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#14 integrate
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 integrate
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#7 integrate
.. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_misc.c#17 integrate
.. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_proto.h#28 integrate
.. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_syscall.h#28 integrate
.. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_syscalls.c#28 integrate
.. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_sysent.c#28 integrate
.. //depot/projects/dtrace/src/sys/compat/freebsd32/syscalls.master#28 integrate
.. //depot/projects/dtrace/src/sys/compat/linprocfs/linprocfs.c#20 integrate
.. //depot/projects/dtrace/src/sys/compat/linux/linux_emul.c#10 integrate
.. //depot/projects/dtrace/src/sys/compat/linux/linux_futex.c#9 integrate
.. //depot/projects/dtrace/src/sys/compat/linux/linux_futex.h#6 integrate
.. //depot/projects/dtrace/src/sys/compat/linux/linux_getcwd.c#9 integrate
.. //depot/projects/dtrace/src/sys/compat/linux/linux_ioctl.c#11 integrate
.. //depot/projects/dtrace/src/sys/compat/linux/linux_misc.c#29 integrate
.. //depot/projects/dtrace/src/sys/compat/linux/linux_signal.c#8 integrate
.. //depot/projects/dtrace/src/sys/compat/linux/linux_signal.h#5 integrate
.. //depot/projects/dtrace/src/sys/compat/linux/linux_socket.c#11 integrate
.. //depot/projects/dtrace/src/sys/compat/linux/linux_util.c#10 integrate
.. //depot/projects/dtrace/src/sys/compat/svr4/svr4_sockio.c#7 integrate
.. //depot/projects/dtrace/src/sys/conf/Makefile.arm#11 integrate
.. //depot/projects/dtrace/src/sys/conf/NOTES#68 integrate
.. //depot/projects/dtrace/src/sys/conf/files#107 integrate
.. //depot/projects/dtrace/src/sys/conf/files.arm#11 integrate
.. //depot/projects/dtrace/src/sys/conf/files.mips#3 integrate
.. //depot/projects/dtrace/src/sys/conf/files.powerpc#22 integrate
.. //depot/projects/dtrace/src/sys/conf/files.sparc64#13 integrate
.. //depot/projects/dtrace/src/sys/conf/kmod.mk#13 integrate
.. //depot/projects/dtrace/src/sys/conf/ldscript.mips.cfe#3 integrate
.. //depot/projects/dtrace/src/sys/conf/newvers.sh#7 integrate
.. //depot/projects/dtrace/src/sys/conf/options#60 integrate
.. //depot/projects/dtrace/src/sys/conf/options.arm#14 integrate
.. //depot/projects/dtrace/src/sys/conf/options.sparc64#7 integrate
.. //depot/projects/dtrace/src/sys/contrib/altq/altq/altq_cbq.c#6 integrate
.. //depot/projects/dtrace/src/sys/contrib/altq/altq/altq_cdnr.c#5 integrate
.. //depot/projects/dtrace/src/sys/contrib/altq/altq/altq_hfsc.c#6 integrate
.. //depot/projects/dtrace/src/sys/contrib/altq/altq/altq_priq.c#6 integrate
.. //depot/projects/dtrace/src/sys/contrib/altq/altq/altq_red.c#6 integrate
.. //depot/projects/dtrace/src/sys/contrib/altq/altq/altq_rio.c#5 integrate
.. //depot/projects/dtrace/src/sys/contrib/altq/altq/altq_rmclass.c#4 integrate
.. //depot/projects/dtrace/src/sys/contrib/altq/altq/altq_subr.c#7 integrate
.. //depot/projects/dtrace/src/sys/contrib/ipfilter/netinet/ip_auth.c#9 integrate
.. //depot/projects/dtrace/src/sys/contrib/ipfilter/netinet/ip_compat.h#10 integrate
.. //depot/projects/dtrace/src/sys/contrib/pf/net/pf.c#18 integrate
.. //depot/projects/dtrace/src/sys/contrib/pf/net/pf_if.c#9 integrate
.. //depot/projects/dtrace/src/sys/contrib/pf/net/pf_ioctl.c#17 integrate
.. //depot/projects/dtrace/src/sys/contrib/pf/net/pf_subr.c#6 integrate
.. //depot/projects/dtrace/src/sys/contrib/pf/net/pfvar.h#6 integrate
.. //depot/projects/dtrace/src/sys/contrib/rdma/rdma_cma.c#3 integrate
.. //depot/projects/dtrace/src/sys/ddb/db_textdump.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/acpica/Osd/OsdSchedule.c#7 integrate
.. //depot/projects/dtrace/src/sys/dev/acpica/acpi.c#18 integrate
.. //depot/projects/dtrace/src/sys/dev/adb/adb.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/adb/adb_bus.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/adb/adb_hb_if.m#1 branch
.. //depot/projects/dtrace/src/sys/dev/adb/adb_if.m#1 branch
.. //depot/projects/dtrace/src/sys/dev/adb/adb_kbd.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/adb/adb_mouse.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/adb/adbvar.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/ae/if_ae.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/ae/if_aereg.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/ae/if_aevar.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/age/if_age.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/age/if_agevar.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/agp/agp_i810.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/agp/agpreg.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/aha/aha_isa.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/aha/aha_mca.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/amr/amr.c#13 integrate
.. //depot/projects/dtrace/src/sys/dev/amr/amr_cam.c#10 integrate
.. //depot/projects/dtrace/src/sys/dev/amr/amrvar.h#7 integrate
.. //depot/projects/dtrace/src/sys/dev/ar/if_ar.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/ata/ata-all.c#18 integrate
.. //depot/projects/dtrace/src/sys/dev/ata/ata-all.h#15 integrate
.. //depot/projects/dtrace/src/sys/dev/ata/ata-chipset.c#33 delete
.. //depot/projects/dtrace/src/sys/dev/ata/ata-dma.c#11 integrate
.. //depot/projects/dtrace/src/sys/dev/ata/ata-pci.c#13 integrate
.. //depot/projects/dtrace/src/sys/dev/ata/ata-pci.h#19 integrate
.. //depot/projects/dtrace/src/sys/dev/ata/ata-queue.c#11 integrate
.. //depot/projects/dtrace/src/sys/dev/ata/ata-sata.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/ata/chipsets/ata-acard.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/ata/chipsets/ata-acerlabs.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/ata/chipsets/ata-adaptec.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/ata/chipsets/ata-ahci.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/ata/chipsets/ata-amd.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/ata/chipsets/ata-ati.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/ata/chipsets/ata-cenatek.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/ata/chipsets/ata-cypress.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/ata/chipsets/ata-cyrix.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/ata/chipsets/ata-highpoint.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/ata/chipsets/ata-intel.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/ata/chipsets/ata-ite.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/ata/chipsets/ata-jmicron.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/ata/chipsets/ata-marvell.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/ata/chipsets/ata-micron.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/ata/chipsets/ata-national.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/ata/chipsets/ata-netcell.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/ata/chipsets/ata-nvidia.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/ata/chipsets/ata-promise.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/ata/chipsets/ata-serverworks.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/ata/chipsets/ata-siliconimage.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/ata/chipsets/ata-sis.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/ata/chipsets/ata-via.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/ath/ah_osdep.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/ath/ath_rate/amrr/amrr.c#7 integrate
.. //depot/projects/dtrace/src/sys/dev/ath/ath_rate/onoe/onoe.c#7 integrate
.. //depot/projects/dtrace/src/sys/dev/ath/ath_rate/sample/sample.c#9 integrate
.. //depot/projects/dtrace/src/sys/dev/ath/if_ath.c#26 integrate
.. //depot/projects/dtrace/src/sys/dev/ath/if_athrate.h#7 integrate
.. //depot/projects/dtrace/src/sys/dev/ath/if_athvar.h#16 integrate
.. //depot/projects/dtrace/src/sys/dev/atkbdc/psm.c#13 integrate
.. //depot/projects/dtrace/src/sys/dev/bge/if_bge.c#33 integrate
.. //depot/projects/dtrace/src/sys/dev/bge/if_bgereg.h#21 integrate
.. //depot/projects/dtrace/src/sys/dev/bm/if_bm.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/ce/if_ce.c#9 integrate
.. //depot/projects/dtrace/src/sys/dev/cfe/cfe_console.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/cfi/cfi_bus_lbc.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/cfi/cfi_core.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/cfi/cfi_dev.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/cfi/cfi_reg.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/cfi/cfi_var.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_main.c#15 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_sge.c#15 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#11 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#10 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#7 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_vm.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_vm.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/dc/dcphy.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/dc/pnphy.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/ati_pcigart.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/drm.h#7 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/drmP.h#9 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/drm_agpsupport.c#8 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/drm_atomic.h#4 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/drm_auth.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/drm_bufs.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/drm_context.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/drm_dma.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/drm_drawable.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/drm_drv.c#8 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/drm_fops.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/drm_ioctl.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/drm_irq.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/drm_linux_list.h#4 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/drm_lock.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/drm_memory.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/drm_pci.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/drm_pciids.h#9 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/drm_scatter.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/drm_sysctl.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/drm_vm.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/i915_dma.c#10 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/i915_drm.h#7 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/i915_drv.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/i915_drv.h#7 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/i915_irq.c#7 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/i915_suspend.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/mach64_drv.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/mga_drv.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/r128_drv.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/radeon_cp.c#7 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/radeon_drv.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/radeon_drv.h#7 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/savage_drv.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/sis_drv.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/drm/tdfx_drv.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/fatm/if_fatm.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/firewire/firewire.c#8 integrate
.. //depot/projects/dtrace/src/sys/dev/hptiop/hptiop.h#3 integrate
.. //depot/projects/dtrace/src/sys/dev/hwpmc/hwpmc_amd.c#7 integrate
.. //depot/projects/dtrace/src/sys/dev/hwpmc/hwpmc_logging.c#7 integrate
.. //depot/projects/dtrace/src/sys/dev/hwpmc/hwpmc_mod.c#14 integrate
.. //depot/projects/dtrace/src/sys/dev/hwpmc/hwpmc_piv.c#7 integrate
.. //depot/projects/dtrace/src/sys/dev/hwpmc/hwpmc_ppro.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/hwpmc/hwpmc_x86.c#7 integrate
.. //depot/projects/dtrace/src/sys/dev/hwpmc/pmc_events.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/if_ndis/if_ndis.c#22 integrate
.. //depot/projects/dtrace/src/sys/dev/if_ndis/if_ndisvar.h#11 integrate
.. //depot/projects/dtrace/src/sys/dev/iwn/if_iwn.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/jme/if_jme.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/jme/if_jmereg.h#3 integrate
.. //depot/projects/dtrace/src/sys/dev/lmc/if_lmc.c#10 integrate
.. //depot/projects/dtrace/src/sys/dev/mge/if_mge.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/mge/if_mgevar.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/mii/atphy.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/mii/ciphy.c#9 integrate
.. //depot/projects/dtrace/src/sys/dev/mii/e1000phy.c#9 integrate
.. //depot/projects/dtrace/src/sys/dev/mii/miidevs#22 integrate
.. //depot/projects/dtrace/src/sys/dev/mmc/bridge.h#3 integrate
.. //depot/projects/dtrace/src/sys/dev/mmc/mmc.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/mmc/mmcbrvar.h#3 integrate
.. //depot/projects/dtrace/src/sys/dev/mmc/mmcreg.h#3 integrate
.. //depot/projects/dtrace/src/sys/dev/mmc/mmcsd.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/mmc/mmcvar.h#3 integrate
.. //depot/projects/dtrace/src/sys/dev/mn/if_mn.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/msk/if_msk.c#11 integrate
.. //depot/projects/dtrace/src/sys/dev/mxge/eth_z8e.h#3 integrate
.. //depot/projects/dtrace/src/sys/dev/mxge/ethp_z8e.h#3 integrate
.. //depot/projects/dtrace/src/sys/dev/mxge/mxge_mcp.h#6 integrate
.. //depot/projects/dtrace/src/sys/dev/mxge/rss_eth_z8e.h#3 integrate
.. //depot/projects/dtrace/src/sys/dev/mxge/rss_ethp_z8e.h#3 integrate
.. //depot/projects/dtrace/src/sys/dev/nfe/if_nfe.c#16 integrate
.. //depot/projects/dtrace/src/sys/dev/nfe/if_nfereg.h#10 integrate
.. //depot/projects/dtrace/src/sys/dev/nfe/if_nfevar.h#6 integrate
.. //depot/projects/dtrace/src/sys/dev/ofw/ofw_console.c#12 integrate
.. //depot/projects/dtrace/src/sys/dev/pccbb/pccbb_pci.c#10 integrate
.. //depot/projects/dtrace/src/sys/dev/pci/pci.c#24 integrate
.. //depot/projects/dtrace/src/sys/dev/pci/pcireg.h#10 integrate
.. //depot/projects/dtrace/src/sys/dev/powermac_nvram/powermac_nvram.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/ppbus/if_plip.c#8 integrate
.. //depot/projects/dtrace/src/sys/dev/ppbus/immio.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/ppbus/lpbb.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/ppbus/lpt.c#7 integrate
.. //depot/projects/dtrace/src/sys/dev/ppbus/pcfclock.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/ppbus/ppb_base.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/ppbus/ppb_msq.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/ppbus/ppbconf.c#9 integrate
.. //depot/projects/dtrace/src/sys/dev/ppbus/ppbconf.h#6 integrate
.. //depot/projects/dtrace/src/sys/dev/ppbus/ppi.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/ppbus/pps.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/ppbus/vpo.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/ppbus/vpoio.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/ppbus/vpoio.h#4 integrate
.. //depot/projects/dtrace/src/sys/dev/ppc/ppc.c#9 integrate
.. //depot/projects/dtrace/src/sys/dev/ppc/ppcreg.h#7 integrate
.. //depot/projects/dtrace/src/sys/dev/puc/pucdata.c#11 integrate
.. //depot/projects/dtrace/src/sys/dev/ral/rt2560.c#17 integrate
.. //depot/projects/dtrace/src/sys/dev/ral/rt2661.c#16 integrate
.. //depot/projects/dtrace/src/sys/dev/ray/if_ray.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/ray/if_rayvar.h#4 integrate
.. //depot/projects/dtrace/src/sys/dev/sdhci/sdhci.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/sdhci/sdhci.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/sio/sio.c#13 integrate
.. //depot/projects/dtrace/src/sys/dev/sound/pci/hda/hdac.c#22 integrate
.. //depot/projects/dtrace/src/sys/dev/sr/if_sr.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/sym/sym_hipd.c#10 integrate
.. //depot/projects/dtrace/src/sys/dev/twa/tw_osl_freebsd.c#8 integrate
.. //depot/projects/dtrace/src/sys/dev/uart/uart_bus_mbus.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/uart/uart_cpu_mv.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/uart/uart_tty.c#7 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/ehci.c#18 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/ehci_mbus.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb/ehci_pci.c#13 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/ehcivar.h#8 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/if_zyd.c#15 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/ohci_pci.c#8 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/slhci_pccard.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/u3g.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb/uark.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/ubsa.c#13 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/ucom.c#10 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/udbp.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/ufoma.c#8 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/uhci_pci.c#9 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/ukbd.c#12 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/umass.c#15 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/umct.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/usb_quirks.c#13 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/usbdevs#45 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/usbdi.c#11 integrate
.. //depot/projects/dtrace/src/sys/dev/wpi/if_wpi.c#16 integrate
.. //depot/projects/dtrace/src/sys/dev/xen/console/console.c#5 integrate
.. //depot/projects/dtrace/src/sys/fs/cd9660/cd9660_node.c#2 integrate
.. //depot/projects/dtrace/src/sys/fs/cd9660/cd9660_rrip.c#4 integrate
.. //depot/projects/dtrace/src/sys/fs/cd9660/cd9660_vfsops.c#6 integrate
.. //depot/projects/dtrace/src/sys/fs/cd9660/cd9660_vnops.c#4 integrate
.. //depot/projects/dtrace/src/sys/fs/coda/coda_vnops.c#11 integrate
.. //depot/projects/dtrace/src/sys/fs/devfs/devfs_vnops.c#27 integrate
.. //depot/projects/dtrace/src/sys/fs/fdescfs/fdesc_vfsops.c#9 integrate
.. //depot/projects/dtrace/src/sys/fs/fdescfs/fdesc_vnops.c#11 integrate
.. //depot/projects/dtrace/src/sys/fs/fifofs/fifo_vnops.c#11 integrate
.. //depot/projects/dtrace/src/sys/fs/hpfs/hpfs_subr.c#4 integrate
.. //depot/projects/dtrace/src/sys/fs/hpfs/hpfs_vfsops.c#10 integrate
.. //depot/projects/dtrace/src/sys/fs/hpfs/hpfs_vnops.c#9 integrate
.. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_denode.c#8 integrate
.. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_vfsops.c#22 integrate
.. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_vnops.c#16 integrate
.. //depot/projects/dtrace/src/sys/fs/ntfs/ntfs_subr.c#9 integrate
.. //depot/projects/dtrace/src/sys/fs/ntfs/ntfs_vfsops.c#10 integrate
.. //depot/projects/dtrace/src/sys/fs/ntfs/ntfs_vnops.c#10 integrate
.. //depot/projects/dtrace/src/sys/fs/nullfs/null_subr.c#8 integrate
.. //depot/projects/dtrace/src/sys/fs/nullfs/null_vnops.c#11 integrate
.. //depot/projects/dtrace/src/sys/fs/nwfs/nwfs_io.c#7 integrate
.. //depot/projects/dtrace/src/sys/fs/nwfs/nwfs_node.c#8 integrate
.. //depot/projects/dtrace/src/sys/fs/nwfs/nwfs_vfsops.c#7 integrate
.. //depot/projects/dtrace/src/sys/fs/nwfs/nwfs_vnops.c#7 integrate
.. //depot/projects/dtrace/src/sys/fs/portalfs/portal_vfsops.c#8 integrate
.. //depot/projects/dtrace/src/sys/fs/portalfs/portal_vnops.c#9 integrate
.. //depot/projects/dtrace/src/sys/fs/procfs/procfs_map.c#6 integrate
.. //depot/projects/dtrace/src/sys/fs/pseudofs/pseudofs.c#7 integrate
.. //depot/projects/dtrace/src/sys/fs/pseudofs/pseudofs_vncache.c#9 integrate
.. //depot/projects/dtrace/src/sys/fs/pseudofs/pseudofs_vnops.c#9 integrate
.. //depot/projects/dtrace/src/sys/fs/smbfs/smbfs_io.c#9 integrate
.. //depot/projects/dtrace/src/sys/fs/smbfs/smbfs_node.c#11 integrate
.. //depot/projects/dtrace/src/sys/fs/smbfs/smbfs_vfsops.c#9 integrate
.. //depot/projects/dtrace/src/sys/fs/smbfs/smbfs_vnops.c#12 integrate
.. //depot/projects/dtrace/src/sys/fs/tmpfs/tmpfs_vnops.c#10 integrate
.. //depot/projects/dtrace/src/sys/fs/udf/udf_vfsops.c#15 integrate
.. //depot/projects/dtrace/src/sys/fs/udf/udf_vnops.c#10 integrate
.. //depot/projects/dtrace/src/sys/fs/unionfs/union_subr.c#19 integrate
.. //depot/projects/dtrace/src/sys/fs/unionfs/union_vnops.c#18 integrate
.. //depot/projects/dtrace/src/sys/geom/geom_disk.c#9 integrate
.. //depot/projects/dtrace/src/sys/geom/geom_vfs.c#5 integrate
.. //depot/projects/dtrace/src/sys/geom/geom_vfs.h#4 integrate
.. //depot/projects/dtrace/src/sys/geom/journal/g_journal.c#9 integrate
.. //depot/projects/dtrace/src/sys/geom/part/g_part.c#12 integrate
.. //depot/projects/dtrace/src/sys/geom/part/g_part_apm.c#7 integrate
.. //depot/projects/dtrace/src/sys/geom/part/g_part_bsd.c#7 integrate
.. //depot/projects/dtrace/src/sys/geom/part/g_part_pc98.c#5 integrate
.. //depot/projects/dtrace/src/sys/geom/part/g_part_vtoc8.c#5 integrate
.. //depot/projects/dtrace/src/sys/geom/vinum/geom_vinum.c#4 integrate
.. //depot/projects/dtrace/src/sys/geom/vinum/geom_vinum.h#5 integrate
.. //depot/projects/dtrace/src/sys/geom/vinum/geom_vinum_drive.c#8 integrate
.. //depot/projects/dtrace/src/sys/geom/vinum/geom_vinum_init.c#5 integrate
.. //depot/projects/dtrace/src/sys/geom/vinum/geom_vinum_plex.c#5 integrate
.. //depot/projects/dtrace/src/sys/geom/vinum/geom_vinum_raid5.c#4 integrate
.. //depot/projects/dtrace/src/sys/geom/vinum/geom_vinum_rm.c#5 integrate
.. //depot/projects/dtrace/src/sys/geom/vinum/geom_vinum_state.c#4 integrate
.. //depot/projects/dtrace/src/sys/geom/vinum/geom_vinum_subr.c#6 integrate
.. //depot/projects/dtrace/src/sys/geom/vinum/geom_vinum_var.h#4 integrate
.. //depot/projects/dtrace/src/sys/geom/vinum/geom_vinum_volume.c#5 integrate
.. //depot/projects/dtrace/src/sys/gnu/fs/ext2fs/ext2_inode.c#6 integrate
.. //depot/projects/dtrace/src/sys/gnu/fs/ext2fs/ext2_lookup.c#6 integrate
.. //depot/projects/dtrace/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#15 integrate
.. //depot/projects/dtrace/src/sys/gnu/fs/ext2fs/ext2_vnops.c#10 integrate
.. //depot/projects/dtrace/src/sys/gnu/fs/reiserfs/reiserfs_inode.c#7 integrate
.. //depot/projects/dtrace/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#9 integrate
.. //depot/projects/dtrace/src/sys/gnu/fs/reiserfs/reiserfs_vnops.c#5 integrate
.. //depot/projects/dtrace/src/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#6 integrate
.. //depot/projects/dtrace/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#9 integrate
.. //depot/projects/dtrace/src/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#8 integrate
.. //depot/projects/dtrace/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#9 integrate
.. //depot/projects/dtrace/src/sys/i386/conf/GENERIC#48 integrate
.. //depot/projects/dtrace/src/sys/i386/conf/NOTES#28 integrate
.. //depot/projects/dtrace/src/sys/i386/conf/XEN#4 integrate
.. //depot/projects/dtrace/src/sys/i386/cpufreq/powernow.c#8 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/apic_vector.s#6 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/bios.c#6 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/db_trace.c#10 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/dump_machdep.c#8 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/identcpu.c#15 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/initcpu.c#7 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/local_apic.c#20 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/minidump_machdep.c#8 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/mp_machdep.c#17 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/sys_machdep.c#11 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/trap.c#35 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/tsc.c#13 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/vm_machdep.c#12 integrate
.. //depot/projects/dtrace/src/sys/i386/include/apicvar.h#10 integrate
.. //depot/projects/dtrace/src/sys/i386/include/clock.h#11 integrate
.. //depot/projects/dtrace/src/sys/i386/include/cpufunc.h#9 integrate
.. //depot/projects/dtrace/src/sys/i386/include/md_var.h#6 integrate
.. //depot/projects/dtrace/src/sys/i386/include/param.h#8 integrate
.. //depot/projects/dtrace/src/sys/i386/include/pcpu.h#8 integrate
.. //depot/projects/dtrace/src/sys/i386/include/smp.h#8 integrate
.. //depot/projects/dtrace/src/sys/i386/include/specialreg.h#12 integrate
.. //depot/projects/dtrace/src/sys/i386/include/trap.h#5 integrate
.. //depot/projects/dtrace/src/sys/i386/include/xen/evtchn.h#3 integrate
.. //depot/projects/dtrace/src/sys/i386/include/xen/xen-os.h#3 integrate
.. //depot/projects/dtrace/src/sys/i386/include/xen/xen_intr.h#2 integrate
.. //depot/projects/dtrace/src/sys/i386/include/xen/xenfunc.h#3 integrate
.. //depot/projects/dtrace/src/sys/i386/isa/pmtimer.c#6 integrate
.. //depot/projects/dtrace/src/sys/i386/isa/prof_machdep.c#8 integrate
.. //depot/projects/dtrace/src/sys/i386/linux/linux.h#10 integrate
.. //depot/projects/dtrace/src/sys/i386/linux/linux_sysvec.c#13 integrate
.. //depot/projects/dtrace/src/sys/i386/xen/clock.c#3 integrate
.. //depot/projects/dtrace/src/sys/i386/xen/exception.s#3 integrate
.. //depot/projects/dtrace/src/sys/i386/xen/locore.s#4 integrate
.. //depot/projects/dtrace/src/sys/i386/xen/mp_machdep.c#2 integrate
.. //depot/projects/dtrace/src/sys/i386/xen/xen_machdep.c#5 integrate
.. //depot/projects/dtrace/src/sys/ia64/ia64/dump_machdep.c#6 integrate
.. //depot/projects/dtrace/src/sys/ia64/ia64/interrupt.c#13 integrate
.. //depot/projects/dtrace/src/sys/ia64/ia64/mp_machdep.c#9 integrate
.. //depot/projects/dtrace/src/sys/ia64/ia64/sal.c#5 integrate
.. //depot/projects/dtrace/src/sys/ia64/ia64/sscdisk.c#6 integrate
.. //depot/projects/dtrace/src/sys/ia64/include/smp.h#4 integrate
.. //depot/projects/dtrace/src/sys/isa/isa_common.c#7 integrate
.. //depot/projects/dtrace/src/sys/isa/isa_common.h#6 integrate
.. //depot/projects/dtrace/src/sys/isa/isavar.h#5 integrate
.. //depot/projects/dtrace/src/sys/isa/pnp.c#4 integrate
.. //depot/projects/dtrace/src/sys/kern/imgact_elf.c#15 integrate
.. //depot/projects/dtrace/src/sys/kern/init_main.c#30 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_cons.c#1 branch
.. //depot/projects/dtrace/src/sys/kern/kern_descrip.c#34 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_event.c#16 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_exit.c#26 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_fork.c#34 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_jail.c#18 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_linker.c#37 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_lockf.c#11 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_mib.c#13 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_mtxpool.c#5 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_proc.c#27 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_prot.c#11 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_resource.c#20 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_shutdown.c#17 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_sig.c#29 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_synch.c#24 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_thr.c#25 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_thread.c#27 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_time.c#13 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_timeout.c#14 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_uuid.c#7 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_xxx.c#9 integrate
.. //depot/projects/dtrace/src/sys/kern/sched_ule.c#38 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_acl_posix1e.c#6 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_blist.c#5 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_bus.c#17 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_firmware.c#7 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_param.c#7 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_rman.c#13 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_sleepqueue.c#21 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_stack.c#8 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_trap.c#14 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_witness.c#24 integrate
.. //depot/projects/dtrace/src/sys/kern/sys_process.c#18 integrate
.. //depot/projects/dtrace/src/sys/kern/sys_socket.c#10 integrate
.. //depot/projects/dtrace/src/sys/kern/tty.c#18 integrate
.. //depot/projects/dtrace/src/sys/kern/tty_cons.c#17 delete
.. //depot/projects/dtrace/src/sys/kern/uipc_accf.c#4 integrate
.. //depot/projects/dtrace/src/sys/kern/uipc_mqueue.c#15 integrate
.. //depot/projects/dtrace/src/sys/kern/uipc_shm.c#6 integrate
.. //depot/projects/dtrace/src/sys/kern/uipc_sockbuf.c#12 integrate
.. //depot/projects/dtrace/src/sys/kern/uipc_socket.c#29 integrate
.. //depot/projects/dtrace/src/sys/kern/uipc_syscalls.c#30 integrate
.. //depot/projects/dtrace/src/sys/kern/uipc_usrreq.c#25 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_bio.c#28 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_export.c#10 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_lookup.c#18 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_mount.c#40 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_subr.c#46 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_syscalls.c#28 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_vnops.c#20 integrate
.. //depot/projects/dtrace/src/sys/kern/vnode_if.src#11 integrate
.. //depot/projects/dtrace/src/sys/libkern/qdivrem.c#4 integrate
.. //depot/projects/dtrace/src/sys/mips/adm5120/if_admsw.c#3 integrate
.. //depot/projects/dtrace/src/sys/mips/conf/ADM5120#4 integrate
.. //depot/projects/dtrace/src/sys/mips/conf/DEFAULTS#1 branch
.. //depot/projects/dtrace/src/sys/mips/conf/IDT#5 integrate
.. //depot/projects/dtrace/src/sys/mips/conf/MALTA#4 integrate
.. //depot/projects/dtrace/src/sys/mips/conf/QEMU#3 integrate
.. //depot/projects/dtrace/src/sys/mips/conf/SENTRY5#5 integrate
.. //depot/projects/dtrace/src/sys/mips/idt/if_kr.c#3 integrate
.. //depot/projects/dtrace/src/sys/mips/include/param.h#2 integrate
.. //depot/projects/dtrace/src/sys/mips/include/smp.h#2 integrate
.. //depot/projects/dtrace/src/sys/mips/mips/machdep.c#5 integrate
.. //depot/projects/dtrace/src/sys/mips/mips/mp_machdep.c#3 integrate
.. //depot/projects/dtrace/src/sys/mips/mips/pmap.c#6 integrate
.. //depot/projects/dtrace/src/sys/mips/mips/trap.c#3 integrate
.. //depot/projects/dtrace/src/sys/modules/Makefile#56 integrate
.. //depot/projects/dtrace/src/sys/modules/ae/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/amr/Makefile#5 integrate
.. //depot/projects/dtrace/src/sys/modules/amr/amr_cam/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/ata/Makefile#4 integrate
.. //depot/projects/dtrace/src/sys/modules/ata/ata/Makefile#4 delete
.. //depot/projects/dtrace/src/sys/modules/ata/atacore/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/ata/atadevel/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/ata/atadevel/ata-devel.c#1 branch
.. //depot/projects/dtrace/src/sys/modules/ata/atapci/Makefile#4 integrate
.. //depot/projects/dtrace/src/sys/modules/ata/atapci/Makefile.inc#1 branch
.. //depot/projects/dtrace/src/sys/modules/ata/atapci/chipsets/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/ata/atapci/chipsets/Makefile.inc#1 branch
.. //depot/projects/dtrace/src/sys/modules/ata/atapci/chipsets/ataacard/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/ata/atapci/chipsets/ataadaptec/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/ata/atapci/chipsets/ataahci/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/ata/atapci/chipsets/ataamd/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/ata/atapci/chipsets/ataati/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/ata/atapci/chipsets/atacenatek/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/ata/atapci/chipsets/atacypress/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/ata/atapci/chipsets/atacyrix/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/ata/atapci/chipsets/atahighpoint/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/ata/atapci/chipsets/ataintel/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/ata/atapci/chipsets/ataite/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/ata/atapci/chipsets/atajmicron/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/ata/atapci/chipsets/atamarvell/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/ata/atapci/chipsets/atamicron/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/ata/atapci/chipsets/atanational/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/ata/atapci/chipsets/atanetcell/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/ata/atapci/chipsets/atanvidia/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/ata/atapci/chipsets/atapromise/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/ata/atapci/chipsets/ataserverworks/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/ata/atapci/chipsets/atasis/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/ata/atapci/chipsets/atavia/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/ehci/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/mac_bsdextended/Makefile#4 integrate
.. //depot/projects/dtrace/src/sys/modules/ohci/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/rl/Makefile#4 integrate
.. //depot/projects/dtrace/src/sys/modules/sdhci/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/slhci/Makefile#5 integrate
.. //depot/projects/dtrace/src/sys/modules/u3g/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/uhci/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb/Makefile#5 integrate
.. //depot/projects/dtrace/src/sys/modules/wpifw/Makefile#2 integrate
.. //depot/projects/dtrace/src/sys/net/bpf.c#26 integrate
.. //depot/projects/dtrace/src/sys/net/bridgestp.c#18 integrate
.. //depot/projects/dtrace/src/sys/net/bsd_comp.c#6 integrate
.. //depot/projects/dtrace/src/sys/net/if.c#22 integrate
.. //depot/projects/dtrace/src/sys/net/if_arcsubr.c#5 integrate
.. //depot/projects/dtrace/src/sys/net/if_bridge.c#32 integrate
.. //depot/projects/dtrace/src/sys/net/if_ef.c#6 integrate
.. //depot/projects/dtrace/src/sys/net/if_ethersubr.c#20 integrate
.. //depot/projects/dtrace/src/sys/net/if_faith.c#7 integrate
.. //depot/projects/dtrace/src/sys/net/if_fddisubr.c#7 integrate
.. //depot/projects/dtrace/src/sys/net/if_gif.c#13 integrate
.. //depot/projects/dtrace/src/sys/net/if_gif.h#5 integrate
.. //depot/projects/dtrace/src/sys/net/if_gre.c#17 integrate
.. //depot/projects/dtrace/src/sys/net/if_iso88025subr.c#9 integrate
.. //depot/projects/dtrace/src/sys/net/if_lagg.c#12 integrate
.. //depot/projects/dtrace/src/sys/net/if_loop.c#15 integrate
.. //depot/projects/dtrace/src/sys/net/if_mib.c#6 integrate
.. //depot/projects/dtrace/src/sys/net/if_ppp.c#12 integrate
.. //depot/projects/dtrace/src/sys/net/if_sl.c#6 integrate
.. //depot/projects/dtrace/src/sys/net/if_spppsubr.c#10 integrate
.. //depot/projects/dtrace/src/sys/net/if_stf.c#13 integrate
.. //depot/projects/dtrace/src/sys/net/if_tap.c#14 integrate
.. //depot/projects/dtrace/src/sys/net/if_tun.c#13 integrate
.. //depot/projects/dtrace/src/sys/net/if_var.h#12 integrate
.. //depot/projects/dtrace/src/sys/net/if_vlan.c#18 integrate
.. //depot/projects/dtrace/src/sys/net/ppp_deflate.c#4 integrate
.. //depot/projects/dtrace/src/sys/net/raw_cb.c#7 integrate
.. //depot/projects/dtrace/src/sys/net/raw_usrreq.c#9 integrate
.. //depot/projects/dtrace/src/sys/net/route.c#19 integrate
.. //depot/projects/dtrace/src/sys/net/rtsock.c#15 integrate
.. //depot/projects/dtrace/src/sys/net/vnet.h#1 branch
.. //depot/projects/dtrace/src/sys/net80211/_ieee80211.h#7 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211.c#17 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_acl.c#6 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_adhoc.c#4 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_crypto.c#8 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_crypto_ccmp.c#7 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_crypto_tkip.c#8 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_crypto_wep.c#7 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_ddb.c#6 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_freebsd.c#11 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_freebsd.h#11 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_hostap.c#4 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_ht.c#11 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_ht.h#7 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_input.c#14 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_ioctl.c#16 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_node.c#15 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_node.h#8 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_output.c#17 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_power.c#3 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_power.h#3 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_proto.c#12 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_proto.h#11 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_regdomain.c#3 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_scan.c#5 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_scan_sta.c#8 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_sta.c#3 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_var.h#15 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_wds.c#4 integrate
.. //depot/projects/dtrace/src/sys/netatalk/ddp_pcb.c#7 integrate
.. //depot/projects/dtrace/src/sys/netgraph/atm/ng_atm.c#5 integrate
.. //depot/projects/dtrace/src/sys/netgraph/atm/sscfu/ng_sscfu_cust.h#4 integrate
.. //depot/projects/dtrace/src/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#6 integrate
.. //depot/projects/dtrace/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#8 integrate
.. //depot/projects/dtrace/src/sys/netgraph/bluetooth/hci/ng_hci_main.c#4 integrate
.. //depot/projects/dtrace/src/sys/netgraph/bluetooth/hci/ng_hci_misc.c#4 integrate
.. //depot/projects/dtrace/src/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c#4 integrate
.. //depot/projects/dtrace/src/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#4 integrate
.. //depot/projects/dtrace/src/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h#4 integrate
.. //depot/projects/dtrace/src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#8 integrate
.. //depot/projects/dtrace/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#9 integrate
.. //depot/projects/dtrace/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#7 integrate
.. //depot/projects/dtrace/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#11 integrate
.. //depot/projects/dtrace/src/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c#2 integrate
.. //depot/projects/dtrace/src/sys/netgraph/netflow/netflow.c#10 integrate
.. //depot/projects/dtrace/src/sys/netgraph/netflow/ng_netflow.c#9 integrate
.. //depot/projects/dtrace/src/sys/netgraph/netflow/ng_netflow.h#5 integrate
.. //depot/projects/dtrace/src/sys/netgraph/netgraph.h#13 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_UI.c#4 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_async.c#4 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_atmllc.c#4 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_base.c#27 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_bpf.c#8 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_bridge.c#5 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_cisco.c#5 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_device.c#6 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_eiface.c#7 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_etf.c#4 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_ether.c#8 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_fec.c#7 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_frame_relay.c#4 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_gif.c#5 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_gif_demux.c#4 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_hole.c#4 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_iface.c#7 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_ipfw.c#4 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_ksocket.c#7 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_l2tp.c#10 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_lmi.c#4 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_message.h#5 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_mppc.c#5 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_nat.c#11 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_one2many.c#4 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_parse.c#5 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_pipe.c#2 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_ppp.c#9 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_pptpgre.c#7 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_rfc1490.c#4 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_sample.c#4 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_split.c#4 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_sppp.c#5 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_tag.c#3 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_tcpmss.c#5 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_tee.c#6 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_tty.c#5 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_tty.h#4 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_vjc.c#4 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_vlan.c#6 integrate
.. //depot/projects/dtrace/src/sys/netinet/if_ether.c#20 integrate

>>> TRUNCATED FOR MAIL (1000 lines) <<<
From peter at FreeBSD.org  Mon Nov  3 00:27:24 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Mon Nov  3 00:27:31 2008
Subject: PERFORCE change 152399 for review
Message-ID: <200811030827.mA38RNph024463@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152399

Change 152399 by peter@peter_overcee on 2008/11/03 08:26:46

	add eaccess(2), which just turned up

Affected files ...

.. //depot/projects/valgrind/coregrind/m_syswrap/priv_syswrap-freebsd.h#10 edit
.. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#19 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_syswrap/priv_syswrap-freebsd.h#10 (text+ko) ====

@@ -228,6 +228,7 @@
 DECL_TEMPLATE(freebsd, sys_thr_kill2);
 DECL_TEMPLATE(freebsd, sys_shm_open);
 DECL_TEMPLATE(freebsd, sys_shm_unlink);
+DECL_TEMPLATE(freebsd, sys_eaccess);
 DECL_TEMPLATE(freebsd, sys_cpuset);
 DECL_TEMPLATE(freebsd, sys_cpuset_setid);
 DECL_TEMPLATE(freebsd, sys_cpuset_getid);

==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#19 (text+ko) ====

@@ -2320,6 +2320,14 @@
    ML_(generic_POST_sys_semctl)(tid, RES,ARG1,ARG2,ARG3,ARG4);
 }
 
+PRE(sys_eaccess)
+{
+   PRINT("sys_eaccess ( %#lx(%s), %ld )", ARG1,(char*)ARG1,ARG2);
+   PRE_REG_READ2(long, "eaccess", const char *, pathname, int, mode);
+   PRE_MEM_RASCIIZ( "eaccess(pathname)", ARG1 );
+}
+
+
 /* ---------------------------------------------------------------------
    *at wrappers
    ------------------------------------------------------------------ */
@@ -3122,7 +3130,7 @@
    // __setugid								   374
    // nfsclnt								   375
 
-   // eaccess								   376
+   BSDX_(__NR_eaccess,			sys_eaccess),			// 376
    // afs_syscall							   377
    // nmount								   378
    // kse_exit								   379
From gk at FreeBSD.org  Mon Nov  3 02:57:58 2008
From: gk at FreeBSD.org (Gleb Kurtsou)
Date: Mon Nov  3 02:58:05 2008
Subject: PERFORCE change 152405 for review
Message-ID: <200811031057.mA3Avv6N048342@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152405

Change 152405 by gk@gk_h1 on 2008/11/03 10:57:20

	IFC

Affected files ...

.. //depot/projects/soc2008/gk_l2filter/sbin-ifconfig/ifconfig.8#6 integrate
.. //depot/projects/soc2008/gk_l2filter/sbin-ifconfig/ifconfig.c#5 integrate
.. //depot/projects/soc2008/gk_l2filter/sbin-ifconfig/ifieee80211.c#5 integrate
.. //depot/projects/soc2008/gk_l2filter/sbin-ifconfig/ifvlan.c#3 integrate
.. //depot/projects/soc2008/gk_l2filter/sbin-ifconfig/regdomain.c#3 integrate
.. //depot/projects/soc2008/gk_l2filter/sbin-ipfw/ipfw.8#8 integrate
.. //depot/projects/soc2008/gk_l2filter/sbin-ipfw/ipfw2.c#11 integrate
.. //depot/projects/soc2008/gk_l2filter/share-man4/if_bridge.4#4 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-net/bpf.c#6 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-net/bridgestp.c#3 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-net/bsd_comp.c#2 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-net/if.c#4 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-net/if_arcsubr.c#2 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-net/if_atmsubr.c#2 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-net/if_bridge.c#10 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-net/if_clone.c#2 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-net/if_clone.h#2 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-net/if_ef.c#3 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-net/if_ethersubr.c#5 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-net/if_faith.c#3 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-net/if_fddisubr.c#2 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-net/if_fwsubr.c#2 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-net/if_gif.c#3 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-net/if_gif.h#2 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-net/if_gre.c#4 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-net/if_iso88025subr.c#2 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-net/if_lagg.c#3 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-net/if_loop.c#5 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-net/if_mib.c#3 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-net/if_ppp.c#3 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-net/if_sl.c#2 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-net/if_spppsubr.c#3 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-net/if_stf.c#3 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-net/if_tap.c#3 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-net/if_tap.h#2 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-net/if_tun.c#3 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-net/if_var.h#4 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-net/if_vlan.c#4 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-net/ppp_deflate.c#2 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-net/raw_cb.c#4 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-net/raw_usrreq.c#4 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-net/route.c#4 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-net/route.h#2 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-net/rtsock.c#4 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-net/vnet.h#1 branch
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/if_ether.c#4 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/igmp.c#3 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/in.c#4 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/in.h#2 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/in_gif.c#3 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/in_mcast.c#3 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/in_pcb.c#5 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/in_pcb.h#5 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/in_rmx.c#3 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/in_var.h#3 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/ip.h#2 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/ip6.h#3 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_carp.c#5 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_divert.c#4 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_dummynet.h#2 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_fastfwd.c#3 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_fw.h#12 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_fw2.c#17 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_fw_nat.c#4 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_icmp.c#3 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_input.c#4 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_ipsec.c#3 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_mroute.c#3 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_options.c#3 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/raw_ip.c#6 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp_crc32.c#2 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp_os_bsd.h#5 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp_output.c#6 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp_sysctl.c#3 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp_timer.c#6 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp_timer.h#4 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp_uio.h#4 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/sctp_usrreq.c#5 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/sctputil.c#6 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/tcp_debug.c#2 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/tcp_hostcache.c#3 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/tcp_input.c#4 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/tcp_offload.c#4 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/tcp_output.c#5 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/tcp_reass.c#3 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/tcp_sack.c#3 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/tcp_subr.c#5 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/tcp_syncache.c#6 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/tcp_timer.c#5 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/tcp_timewait.c#3 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/tcp_usrreq.c#4 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/tcp_var.h#3 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/udp_usrreq.c#6 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/vinet.h#1 branch
.. //depot/projects/soc2008/gk_l2filter/sys-pf/net/pf.c#10 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-pf/net/pf_if.c#3 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-pf/net/pf_ioctl.c#6 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-pf/net/pf_subr.c#3 integrate
.. //depot/projects/soc2008/gk_l2filter/sys-pf/net/pfvar.h#9 integrate

Differences ...

==== //depot/projects/soc2008/gk_l2filter/sbin-ifconfig/ifconfig.8#6 (text+ko) ====

@@ -26,9 +26,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)ifconfig.8	8.3 (Berkeley) 1/5/94
-.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.153 2008/08/28 22:13:44 jfv Exp $
+.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.156 2008/10/19 09:45:29 keramida Exp $
 .\"
-.Dd August 27, 2008
+.Dd October 19, 2008
 .Dt IFCONFIG 8
 .Os
 .Sh NAME
@@ -106,7 +106,7 @@
 That is, one can specify an address like
 .Li 192.168.0.1/16 .
 .Pp
-For
+For the
 .Dq inet6
 family, it is also possible to specify the prefix length using the slash
 notation, like
@@ -1263,18 +1263,19 @@
 .Cm HTCAP
 (station supports 802.11n/HT communication),
 .Cm ATH
-(station supoprts Atheros protocol extensions),
+(station supports Atheros protocol extensions),
 .Cm VEN
 (station supports unknown vendor-specific extensions).
 If the
 .Fl v
 flag is used all the information elements and their
 contents will be shown.
-Specifying The
+Specifying the
 .Fl v
 flag also enables display of long SSIDs.
+The
 .Cm list ap
-is another way of requesting this information.
+command is another way of requesting this information.
 .It Cm list sta
 When operating as an access point display the stations that are
 currently associated.
@@ -1323,7 +1324,7 @@
 By default information elements received from associated stations
 are displayed in a short form; the
 .Fl v
-flag causes this information to be displayed symbolicaly.
+flag causes this information to be displayed symbolically.
 .It Cm list wme
 Display the current channel parameters to use when operating in WME mode.
 If the
@@ -1417,6 +1418,13 @@
 .Cm outdoor ,
 and
 .Cm anywhere .
+.It Cm rifs
+Enable use of Reduced InterFrame Spacing (RIFS) when operating in 802.11n
+on an HT channel.
+Note that RIFS must be supported by both the station and access point
+for it to be used.
+To disable RIFS use
+.Fl rifs .
 .It Cm roam:rate Ar rate
 Set the threshold for controlling roaming when operating in a BSS.
 The
@@ -1518,6 +1526,23 @@
 NB: this currently enables Short GI on both HT40 and HT20 channels.
 To disable Short GI use
 .Fl shortgi .
+.It Cm smps
+Enable use of Static Spatial Multiplexing Power Save (SMPS)
+when operating in 802.11n.
+A station operating with Static SMPS maintains only a single
+receive chain active (this can significantly reduce power consumption).
+To disable SMPS use
+.Fl smps .
+.It Cm smpsdyn
+Enable use of Dynamic Spatial Multiplexing Power Save (SMPS)
+when operating in 802.11n.
+A station operating with Dynamic SMPS maintains only a single
+receive chain active but switches to multiple receive chains when it
+receives an RTS frame (this can significantly reduce power consumption).
+Note that stations cannot distinguish between RTS/CTS intended to
+enable multiple receive chains and those used for other purposes.
+To disable SMPS use
+.Fl smps .
 .It Cm ssid Ar ssid
 Set the desired Service Set Identifier (aka network name).
 The SSID is a string up to 32 characters

==== //depot/projects/soc2008/gk_l2filter/sbin-ifconfig/ifconfig.c#5 (text+ko) ====

@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)ifconfig.c	8.2 (Berkeley) 2/16/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.139 2008/08/28 22:13:44 jfv Exp $";
+  "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.140 2008/09/29 16:27:32 sam Exp $";
 #endif /* not lint */
 
 #include 
@@ -392,14 +392,21 @@
 }
 
 static const struct cmd *
-cmd_lookup(const char *name)
+cmd_lookup(const char *name, int iscreate)
 {
 #define	N(a)	(sizeof(a)/sizeof(a[0]))
 	const struct cmd *p;
 
 	for (p = cmds; p != NULL; p = p->c_next)
-		if (strcmp(name, p->c_name) == 0)
-			return p;
+		if (strcmp(name, p->c_name) == 0) {
+			if (iscreate) {
+				if (p->c_iscloneop)
+					return p;
+			} else {
+				if (!p->c_iscloneop)
+					return p;
+			}
+		}
 	return NULL;
 #undef N
 }
@@ -437,6 +444,7 @@
 ifconfig(int argc, char *const *argv, int iscreate, const struct afswtch *afp)
 {
 	const struct afswtch *nafp;
+	const struct cmd *p;
 	struct callback *cb;
 	int s;
 
@@ -452,9 +460,38 @@
 		err(1, "socket(family %u,SOCK_DGRAM", ifr.ifr_addr.sa_family);
 
 	while (argc > 0) {
-		const struct cmd *p;
-
-		p = cmd_lookup(*argv);
+		p = cmd_lookup(*argv, iscreate);
+		if (iscreate && p == NULL) {
+			/*
+			 * Push the clone create callback so the new
+			 * device is created and can be used for any
+			 * remaining arguments.
+			 */
+			cb = callbacks;
+			if (cb == NULL)
+				errx(1, "internal error, no callback");
+			callbacks = cb->cb_next;
+			cb->cb_func(s, cb->cb_arg);
+			iscreate = 0;
+			/*
+			 * Handle any address family spec that
+			 * immediately follows and potentially
+			 * recreate the socket.
+			 */
+			nafp = af_getbyname(*argv);
+			if (nafp != NULL) {
+				argc--, argv++;
+				if (nafp != afp) {
+					close(s);
+					afp = nafp;
+					goto top;
+				}
+			}
+			/*
+			 * Look for a normal parameter.
+			 */
+			continue;
+		}
 		if (p == NULL) {
 			/*
 			 * Not a recognized command, choose between setting
@@ -463,33 +500,6 @@
 			p = (setaddr ? &setifdstaddr_cmd : &setifaddr_cmd);
 		}
 		if (p->c_u.c_func || p->c_u.c_func2) {
-			if (iscreate && !p->c_iscloneop) { 
-				/*
-				 * Push the clone create callback so the new
-				 * device is created and can be used for any
-				 * remaining arguments.
-				 */
-				cb = callbacks;
-				if (cb == NULL)
-					errx(1, "internal error, no callback");
-				callbacks = cb->cb_next;
-				cb->cb_func(s, cb->cb_arg);
-				iscreate = 0;
-				/*
-				 * Handle any address family spec that
-				 * immediately follows and potentially
-				 * recreate the socket.
-				 */
-				nafp = af_getbyname(*argv);
-				if (nafp != NULL) {
-					argc--, argv++;
-					if (nafp != afp) {
-						close(s);
-						afp = nafp;
-						goto top;
-					}
-				}
-			}
 			if (p->c_parameter == NEXTARG) {
 				if (argv[1] == NULL)
 					errx(1, "'%s' requires argument",

==== //depot/projects/soc2008/gk_l2filter/sbin-ifconfig/ifieee80211.c#5 (text+ko) ====

@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.57 2008/08/14 03:49:14 thompsa Exp $
+ * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.59 2008/09/22 00:30:26 sam Exp $
  */
 
 /*-
@@ -112,6 +112,11 @@
 #define	IEEE80211_NODE_HTCOMPAT	0x0080		/* HT setup w/ vendor OUI's */
 #define	IEEE80211_NODE_WPS	0x0100		/* WPS association */
 #define	IEEE80211_NODE_TSN	0x0200		/* TSN association */
+#define	IEEE80211_NODE_AMPDU_RX	0x0400		/* AMPDU rx enabled */
+#define	IEEE80211_NODE_AMPDU_TX	0x0800		/* AMPDU tx enabled */
+#define	IEEE80211_NODE_MIMO_PS	0x1000		/* MIMO power save enabled */
+#define	IEEE80211_NODE_MIMO_RTS	0x2000		/* send RTS in MIMO PS */
+#define	IEEE80211_NODE_RIFS	0x4000		/* RIFS enabled */
 #endif
 
 #define	MAXCOL	78
@@ -1598,7 +1603,7 @@
 {
 	int v;
 
-	if (isanyarg(val))
+	if (isanyarg(val) || strcasecmp(val, "na") == 0)
 		v = IEEE80211_HTCAP_MPDUDENSITY_NA;
 	else switch ((int)(atof(val)*4)) {
 	case 0:
@@ -1695,6 +1700,18 @@
 	set80211(s, IEEE80211_IOC_DOTD, d, 0, NULL);
 }
 
+static void
+set80211smps(const char *val, int d, int s, const struct afswtch *rafp)
+{
+	set80211(s, IEEE80211_IOC_SMPS, d, 0, NULL);
+}
+
+static void
+set80211rifs(const char *val, int d, int s, const struct afswtch *rafp)
+{
+	set80211(s, IEEE80211_IOC_RIFS, d, 0, NULL);
+}
+
 static int
 regdomain_sort(const void *a, const void *b)
 {
@@ -2093,7 +2110,18 @@
 	if (flags & IEEE80211_NODE_WPS)
 		*cp++ = 'W';
 	if (flags & IEEE80211_NODE_TSN)
+		*cp++ = 'N';
+	if (flags & IEEE80211_NODE_AMPDU_TX)
 		*cp++ = 'T';
+	if (flags & IEEE80211_NODE_AMPDU_RX)
+		*cp++ = 'R';
+	if (flags & IEEE80211_NODE_MIMO_PS) {
+		*cp++ = 'M';
+		if (flags & IEEE80211_NODE_MIMO_RTS)
+			*cp++ = '+';
+	}
+	if (flags & IEEE80211_NODE_RIFS)
+		*cp++ = 'I';
 	*cp = '\0';
 	return flagstring;
 }
@@ -4048,7 +4076,7 @@
 			switch (val) {
 			case IEEE80211_HTCAP_MPDUDENSITY_NA:
 				if (verbose)
-					LINE_CHECK("ampdudensity -");
+					LINE_CHECK("ampdudensity NA");
 				break;
 			case IEEE80211_HTCAP_MPDUDENSITY_025:
 				LINE_CHECK("ampdudensity .25");
@@ -4111,6 +4139,20 @@
 			else if (verbose)
 				LINE_CHECK("-puren");
 		}
+		if (get80211val(s, IEEE80211_IOC_SMPS, &val) != -1) {
+			if (val == IEEE80211_HTCAP_SMPS_DYNAMIC)
+				LINE_CHECK("smpsdyn");
+			else if (val == IEEE80211_HTCAP_SMPS_ENA)
+				LINE_CHECK("smps");
+			else if (verbose)
+				LINE_CHECK("-smps");
+		}
+		if (get80211val(s, IEEE80211_IOC_RIFS, &val) != -1) {
+			if (val)
+				LINE_CHECK("rifs");
+			else if (verbose)
+				LINE_CHECK("-rifs");
+		}
 	}
 
 	if (get80211val(s, IEEE80211_IOC_WME, &wme) != -1) {
@@ -4593,6 +4635,11 @@
 	DEF_CMD("-ht40",	0,	set80211htconf),
 	DEF_CMD("ht",		3,	set80211htconf),	/* NB: 20+40 */
 	DEF_CMD("-ht",		0,	set80211htconf),
+	DEF_CMD("rifs",		1,	set80211rifs),
+	DEF_CMD("-rifs",	0,	set80211rifs),
+	DEF_CMD("smps",		IEEE80211_HTCAP_SMPS_ENA,	set80211smps),
+	DEF_CMD("smpsdyn",	IEEE80211_HTCAP_SMPS_DYNAMIC,	set80211smps),
+	DEF_CMD("-smps",	IEEE80211_HTCAP_SMPS_OFF,	set80211smps),
 	/* XXX for testing */
 	DEF_CMD_ARG("chanswitch",	set80211chanswitch),
 

==== //depot/projects/soc2008/gk_l2filter/sbin-ifconfig/ifvlan.c#3 (text+ko) ====

@@ -56,7 +56,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD: src/sbin/ifconfig/ifvlan.c,v 1.14 2008/08/28 22:13:44 jfv Exp $";
+  "$FreeBSD: src/sbin/ifconfig/ifvlan.c,v 1.15 2008/10/02 20:03:41 sam Exp $";
 #endif
 
 #define	NOTAG	((u_short) -1)
@@ -174,6 +174,9 @@
 static struct cmd vlan_cmds[] = {
 	DEF_CLONE_CMD_ARG("vlan",			setvlantag),
 	DEF_CLONE_CMD_ARG("vlandev",			setvlandev),
+	/* NB: non-clone cmds */
+	DEF_CMD_ARG("vlan",				setvlantag),
+	DEF_CMD_ARG("vlandev",				setvlandev),
 	/* XXX For compatibility.  Should become DEF_CMD() some day. */
 	DEF_CMD_OPTARG("-vlandev",			unsetvlandev),
 	DEF_CMD("vlanmtu",	IFCAP_VLAN_MTU,		setifcap),

==== //depot/projects/soc2008/gk_l2filter/sbin-ifconfig/regdomain.c#3 (text+ko) ====

@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef lint
-static const char rcsid[] = "$FreeBSD: src/sbin/ifconfig/regdomain.c,v 1.3 2008/08/09 11:14:05 des Exp $";
+static const char rcsid[] = "$FreeBSD: src/sbin/ifconfig/regdomain.c,v 1.4 2008/09/21 22:16:03 sam Exp $";
 #endif /* not lint */
 
 #include 
@@ -390,7 +390,7 @@
 	struct freqband *fp;
 	struct netband *nb;
 	const void *id;
-	int i;
+	int i, errors;
 
 	memset(rdp, 0, sizeof(struct regdata));
 	mt = calloc(1, sizeof(struct mystate));
@@ -415,6 +415,8 @@
 	if (rdp->ident == NULL)
 		return ENOMEM;
 	free(mt);
+
+	errors = 0;
 	i = 0;
 	LIST_FOREACH(dp, &rdp->domains, next) {
 		rdp->ident[i].id = dp->name;
@@ -440,26 +442,71 @@
 		if (dp->cc != NULL) {
 			id = dp->cc;
 			dp->cc = findid(rdp, id, COUNTRY);
+			if (dp->cc == NULL) {
+				warnx("undefined country \"%s\"",
+				    __DECONST(char *, id));
+				errors++;
+			}
 			free(__DECONST(char *, id));
 		}
-		LIST_FOREACH(nb, &dp->bands_11b, next)
-			nb->band = findid(rdp, nb->band, FREQBAND);
-		LIST_FOREACH(nb, &dp->bands_11g, next)
-			nb->band = findid(rdp, nb->band, FREQBAND);
-		LIST_FOREACH(nb, &dp->bands_11a, next)
-			nb->band = findid(rdp, nb->band, FREQBAND);
-		LIST_FOREACH(nb, &dp->bands_11ng, next)
-			nb->band = findid(rdp, nb->band, FREQBAND);
-		LIST_FOREACH(nb, &dp->bands_11na, next)
-			nb->band = findid(rdp, nb->band, FREQBAND);
+		LIST_FOREACH(nb, &dp->bands_11b, next) {
+			id = findid(rdp, nb->band, FREQBAND);
+			if (id == NULL) {
+				warnx("undefined 11b band \"%s\"",
+				    __DECONST(char *, nb->band));
+				errors++;
+			}
+			nb->band = id;
+		}
+		LIST_FOREACH(nb, &dp->bands_11g, next) {
+			id = findid(rdp, nb->band, FREQBAND);
+			if (id == NULL) {
+				warnx("undefined 11g band \"%s\"",
+				    __DECONST(char *, nb->band));
+				errors++;
+			}
+			nb->band = id;
+		}
+		LIST_FOREACH(nb, &dp->bands_11a, next) {
+			id = findid(rdp, nb->band, FREQBAND);
+			if (id == NULL) {
+				warnx("undefined 11a band \"%s\"",
+				    __DECONST(char *, nb->band));
+				errors++;
+			}
+			nb->band = id;
+		}
+		LIST_FOREACH(nb, &dp->bands_11ng, next) {
+			id = findid(rdp, nb->band, FREQBAND);
+			if (id == NULL) {
+				warnx("undefined 11ng band \"%s\"",
+				    __DECONST(char *, nb->band));
+				errors++;
+			}
+			nb->band = id;
+		}
+		LIST_FOREACH(nb, &dp->bands_11na, next) {
+			id = findid(rdp, nb->band, FREQBAND);
+			if (id == NULL) {
+				warnx("undefined 11na band \"%s\"",
+				    __DECONST(char *, nb->band));
+				errors++;
+			}
+			nb->band = id;
+		}
 	}
 	LIST_FOREACH(cp, &rdp->countries, next) {
 		id = cp->rd;
 		cp->rd = findid(rdp, id, DOMAIN);
+		if (cp->rd == NULL) {
+			warnx("undefined country \"%s\"",
+			    __DECONST(char *, id));
+			errors++;
+		}
 		free(__DECONST(char *, id));
 	}
 
-	return 0;
+	return errors ? EINVAL : 0;
 }
 
 static void

==== //depot/projects/soc2008/gk_l2filter/sbin-ipfw/ipfw.8#8 (text+ko) ====

@@ -1,7 +1,7 @@
 .\"
-.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.216 2008/08/27 15:30:09 ivoras Exp $
+.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.217 2008/09/27 15:09:00 rik Exp $
 .\"
-.Dd November 26, 2007
+.Dd September 27, 2008
 .Dt IPFW 8
 .Os
 .Sh NAME
@@ -49,9 +49,13 @@
 .Nm
 .Cm table Ar number Cm delete Ar addr Ns Op / Ns Ar masklen
 .Nm
-.Cm table Ar number Cm flush
+.Cm table
+.Brq Ar number | all
+.Cm flush
 .Nm
-.Cm table Ar number Cm list
+.Cm table
+.Brq Ar number | all
+.Cm list
 .Pp
 .Nm
 .Brq Cm pipe | queue
@@ -2306,6 +2310,11 @@
 .It Va net.inet.ip.fw.debug : No 1
 Controls debugging messages produced by
 .Nm .
+.It Va net.inet.ip.fw.default_rule : No 65535
+The default rule number (read-only).
+By the design of
+.Nm , the default rule is the last one, so its number
+can also serve as the highest number allowed for a rule.
 .It Va net.inet.ip.fw.dyn_buckets : No 256
 The number of buckets in the hash table for dynamic rules.
 Must be a power of 2, up to 65536.
@@ -2359,6 +2368,8 @@
 node is not passed though the firewall again.
 Otherwise, after an action, the packet is
 reinjected into the firewall at the next rule.
+.It Va net.inet.ip.fw.tables_max : No 128
+Maximum number of tables (read-only).
 .It Va net.inet.ip.fw.verbose : No 1
 Enables verbose messages.
 .It Va net.inet.ip.fw.verbose_limit : No 0

==== //depot/projects/soc2008/gk_l2filter/sbin-ipfw/ipfw2.c#11 (text+ko) ====

@@ -17,7 +17,7 @@
  *
  * NEW command line interface for IP firewall facility
  *
- * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.120 2008/05/10 15:02:56 julian Exp $
+ * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.132 2008/10/14 17:59:39 maxim Exp $
  */
 
 #include 
@@ -2499,7 +2499,7 @@
 		rulenum = atoi(av[0]);
 		new_set = atoi(av[2]);
 		if (!isdigit(*(av[0])) || (cmd == 3 && rulenum > RESVD_SET) ||
-			(cmd == 2 && rulenum == 65535) )
+			(cmd == 2 && rulenum == IPFW_DEFAULT_RULE) )
 			errx(EX_DATAERR, "invalid source number %s\n", av[0]);
 		if (!isdigit(*(av[2])) || new_set > RESVD_SET)
 			errx(EX_DATAERR, "invalid dest. set %s\n", av[1]);
@@ -2623,7 +2623,7 @@
 	 * need to scan the list to count them.
 	 */
 	for (nstat = 1, r = data, lim = (char *)data + nbytes;
-		    r->rulenum < 65535 && (char *)r < lim;
+		    r->rulenum < IPFW_DEFAULT_RULE && (char *)r < lim;
 		    ++nstat, r = NEXT(r) )
 		; /* nothing */
 
@@ -2791,6 +2791,7 @@
 "set [disable N... enable N...] | move [rule] X to Y | swap X Y | show\n"
 "set N {show|list|zero|resetlog|delete} [N{,N}] | flush\n"
 "table N {add ip[/bits] [ether ETHERADDR] [value] | delete ip[/bits] | flush | list}\n"
+"table all {flush | list}\n"
 "\n"
 "RULE-BODY:	check-state [PARAMS] | ACTION [PARAMS] ADDR [OPTION_LIST]\n"
 "ACTION:	check-state | allow | count | deny | unreach{,6} CODE |\n"
@@ -3642,7 +3643,7 @@
 	char **av, *sep; /* Token separator. */
 	/* Temporary buffer used to hold server pool ip's. */
 	char tmp_spool_buf[NAT_BUF_LEN]; 
-	int ac, i, space, lsnat;
+	int ac, space, lsnat;
 	struct cfg_redir *r;	
 	struct cfg_spool *tmp;		
 
@@ -3861,7 +3862,7 @@
 		 int *_ac, char ***_av) 
 {
 	char **av;
-	int ac, i, space;
+	int ac, space;
 	struct protoent *protoent;
 	struct cfg_redir *r;
 	
@@ -4048,7 +4049,6 @@
 config_nat(int ac, char **av)
 {
 	struct cfg_nat *n;              /* Nat instance configuration. */
-	struct in_addr ip;
 	int i, len, off, tok;
 	char *id, buf[NAT_BUF_LEN]; 	/* Buffer for serialized data. */
 	
@@ -5108,7 +5108,8 @@
 			if (have_tag)
 				errx(EX_USAGE, "tag and untag cannot be "
 				    "specified more than once");
-			GET_UINT_ARG(tag, 1, 65534, i, rule_action_params);
+			GET_UINT_ARG(tag, 1, IPFW_DEFAULT_RULE - 1, i,
+			   rule_action_params);
 			have_tag = cmd;
 			fill_cmd(cmd, O_TAG, (i == TOK_TAG) ? 0: F_NOT, tag);
 			ac--; av++;
@@ -5584,8 +5585,8 @@
 			if (c->limit_mask == 0)
 				errx(EX_USAGE, "limit: missing limit mask");
 
-			GET_UINT_ARG(c->conn_limit, 1, 65534, TOK_LIMIT,
-			    rule_options);
+			GET_UINT_ARG(c->conn_limit, 1, IPFW_DEFAULT_RULE - 1,
+			    TOK_LIMIT, rule_options);
 
 			ac--; av++;
 			break;
@@ -5727,8 +5728,8 @@
 			else {
 				uint16_t tag;
 
-				GET_UINT_ARG(tag, 1, 65534, TOK_TAGGED,
-				    rule_options);
+				GET_UINT_ARG(tag, 1, IPFW_DEFAULT_RULE - 1,
+				    TOK_TAGGED, rule_options);
 				fill_cmd(cmd, O_TAGGED, 0, tag);
 			}
 			ac--; av++;
@@ -5965,30 +5966,57 @@
 	free(av);
 }
 
+static void table_list(ipfw_table_entry ent, int need_header);
+
 /*
  * This one handles all table-related commands
  * 	ipfw table N add addr[/masklen] [value]
  * 	ipfw table N delete addr[/masklen]
- * 	ipfw table N flush
- * 	ipfw table N list
+ * 	ipfw table {N | all} flush
+ * 	ipfw table {N | all} list
  */
 static void
 table_handler(int ac, char *av[])
 {
 	ipfw_table_entry ent;
-	ipfw_table *tbl;
 	int do_add;
+	int is_all;
+	size_t len;
 	char *p;
-	socklen_t l;
 	uint32_t a;
+	uint32_t tables_max;
+
+	len = sizeof(tables_max);
+	if (sysctlbyname("net.inet.ip.fw.tables_max", &tables_max, &len,
+		NULL, 0) == -1) {
+#ifdef IPFW_TABLES_MAX
+		warn("Warn: Failed to get the max tables number via sysctl. "
+		     "Using the compiled in defaults. \nThe reason was");
+		tables_max = IPFW_TABLES_MAX;
+#else
+		errx(1, "Failed sysctlbyname(\"net.inet.ip.fw.tables_max\")");
+#endif
+	}
 
 	ac--; av++;
 	if (ac && isdigit(**av)) {
 		ent.tbl = atoi(*av);
+		is_all = 0;
 		ac--; av++;
+	} else if (ac && _substrcmp(*av, "all") == 0) {
+		ent.tbl = 0;
+		is_all = 1;
+		ac--; av++;
 	} else
+		errx(EX_USAGE, "table number or 'all' keyword required");
+	if (ent.tbl >= tables_max)
+		errx(EX_USAGE, "The table number exceeds the maximum allowed "
+			"value (%d)", tables_max - 1);
+	NEED1("table needs command");
+	if (is_all && _substrcmp(*av, "list") != 0
+		   && _substrcmp(*av, "flush") != 0)
 		errx(EX_USAGE, "table number required");
-	NEED1("table needs command");
+
 	if (_substrcmp(*av, "add") == 0 ||
 	    _substrcmp(*av, "delete") == 0) {
 		do_add = **av == 'a';
@@ -6043,66 +6071,95 @@
 			}
 		}
 	} else if (_substrcmp(*av, "flush") == 0) {
-		if (do_cmd(IP_FW_TABLE_FLUSH, &ent.tbl, sizeof(ent.tbl)) < 0)
-			err(EX_OSERR, "setsockopt(IP_FW_TABLE_FLUSH)");
+		a = is_all ? tables_max : (ent.tbl + 1);
+		do {
+			if (do_cmd(IP_FW_TABLE_FLUSH, &ent.tbl,
+			    sizeof(ent.tbl)) < 0)
+				err(EX_OSERR, "setsockopt(IP_FW_TABLE_FLUSH)");
+		} while (++ent.tbl < a);
 	} else if (_substrcmp(*av, "list") == 0) {
-		a = ent.tbl;
-		l = sizeof(a);
-		if (do_cmd(IP_FW_TABLE_GETSIZE, &a, (uintptr_t)&l) < 0)
-			err(EX_OSERR, "getsockopt(IP_FW_TABLE_GETSIZE)");
-		l = sizeof(*tbl) + a * sizeof(ipfw_table_entry);
-		tbl = malloc(l);
-		if (tbl == NULL)
-			err(EX_OSERR, "malloc");
-		tbl->tbl = ent.tbl;
-		if (do_cmd(IP_FW_TABLE_LIST, tbl, (uintptr_t)&l) < 0)
-			err(EX_OSERR, "getsockopt(IP_FW_TABLE_LIST)");
-		for (a = 0; a < tbl->cnt; a++) {
-			unsigned int tval;
-			char tval_buf[128];
-			char tether_buf[128];
-			tval = tbl->ent[a].value;
-			if (do_value_as_ip) {
-			    /* inet_ntoa expects network order */
-			    tval = htonl(tval);
-			    strlcpy(tval_buf, inet_ntoa(*(struct in_addr *)
-				&tval), sizeof(tval_buf));
-			} else {
-			    snprintf(tval_buf, sizeof(tval_buf), "%u", tval);
-			}
-			if (tbl->ent[a].ether_addr.flags & IPFW_EA_CHECK) {
-			    uint8_t *x = (uint8_t *)&tbl->ent[a].ether_addr;
-		            snprintf(tether_buf, sizeof(tether_buf), "ether %02x:%02x:%02x:%02x:%02x:%02x ",
-		                 x[0], x[1], x[2], x[3], x[4], x[5]);
-			} else {
-			    tether_buf[0] = 0;
-			}
+		a = is_all ? tables_max : (ent.tbl + 1);
+		do {
+			table_list(ent, is_all);
+		} while (++ent.tbl < a);
+	} else
+		errx(EX_USAGE, "invalid table command %s", *av);
+}
+
+static void
+table_list(ipfw_table_entry ent, int need_header)
+{
+	ipfw_table *tbl;
+	socklen_t l;
+	uint32_t a;
+
+	a = ent.tbl;
+	l = sizeof(a);
+	if (do_cmd(IP_FW_TABLE_GETSIZE, &a, (uintptr_t)&l) < 0)
+		err(EX_OSERR, "getsockopt(IP_FW_TABLE_GETSIZE)");
+
+	/* If a is zero we have nothing to do, the table is empty. */
+	if (a == 0)
+		return;
 
-			printf("%s/%u %s%s\n",
-			    inet_ntoa(*(struct in_addr *)&tbl->ent[a].addr),
-			    tbl->ent[a].masklen, tether_buf, tval_buf);
+	l = sizeof(*tbl) + a * sizeof(ipfw_table_entry);
+	tbl = malloc(l);
+	if (tbl == NULL)
+		err(EX_OSERR, "malloc");
+	tbl->tbl = ent.tbl;
+	if (do_cmd(IP_FW_TABLE_LIST, tbl, (uintptr_t)&l) < 0)
+		err(EX_OSERR, "getsockopt(IP_FW_TABLE_LIST)");
+	if (tbl->cnt && need_header)
+		printf("---table(%d)---\n", tbl->tbl);
+	for (a = 0; a < tbl->cnt; a++) {
+		unsigned int tval;
+		char tval_buf[128];
+		char tether_buf[128];
+		tval = tbl->ent[a].value;
+		if (do_value_as_ip) {
+		    /* inet_ntoa expects network order */
+		    tval = htonl(tval);
+		    strlcpy(tval_buf, inet_ntoa(*(struct in_addr *)
+			&tval), sizeof(tval_buf));
+		} else {
+		    snprintf(tval_buf, sizeof(tval_buf), "%u", tval);
+		}
+		if (tbl->ent[a].ether_addr.flags & IPFW_EA_CHECK) {
+		    uint8_t *x = (uint8_t *)&tbl->ent[a].ether_addr;
+		    snprintf(tether_buf, sizeof(tether_buf), "ether %02x:%02x:%02x:%02x:%02x:%02x ",
+			 x[0], x[1], x[2], x[3], x[4], x[5]);
+		} else {
+		    tether_buf[0] = 0;
 		}
-	} else
-		errx(EX_USAGE, "invalid table command %s", *av);
+
+		printf("%s/%u %s%s\n",
+		    inet_ntoa(*(struct in_addr *)&tbl->ent[a].addr),
+		    tbl->ent[a].masklen, tether_buf, tval_buf);
+	}
+	free(tbl);
 }
 
 static void
-show_nat(int ac, char **av) {
+show_nat(int ac, char **av)
+{
 	struct cfg_nat *n;
 	struct cfg_redir *e;
 	int cmd, i, nbytes, do_cfg, do_rule, frule, lrule, nalloc, size;
 	int nat_cnt, redir_cnt, r;
 	uint8_t *data, *p;
-	char **lav, *endptr;
+	char *endptr;
 
 	do_rule = 0;
 	nalloc = 1024;
 	size = 0;
 	data = NULL;
 	frule = 0;
-	lrule = 65535; /* max ipfw rule number */
+	lrule = IPFW_DEFAULT_RULE; /* max ipfw rule number */
 	ac--; av++;
 
+	if (test_only)
+		return;
+
 	/* Parse parameters. */
 	for (cmd = IP_FW_NAT_GET_LOG, do_cfg = 0; ac != 0; ac--, av++) {
 		if (!strncmp(av[0], "config", strlen(av[0]))) {

==== //depot/projects/soc2008/gk_l2filter/share-man4/if_bridge.4#4 (text+ko) ====

@@ -33,7 +33,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/if_bridge.4,v 1.31 2008/08/04 23:16:07 thompsa Exp $
+.\" $FreeBSD: src/share/man/man4/if_bridge.4,v 1.32 2008/09/08 03:28:26 thompsa Exp $
 .\"
 .Dd September 17, 2007
 .Dt IF_BRIDGE 4
@@ -92,6 +92,22 @@
 The address can be changed by assigning the desired link address using
 .Xr ifconfig 8 .
 .Pp
+If
+.Xr sysctl 8
+node
+.Va net.link.bridge.inherit_mac
+has non-zero value, newly created bridge will inherit MAC address
+from its first member instead of choosing random link-level address.
+This will provide more predictable bridge MAC without any
+additional configuration, but currently this feature is known
+to break some L2 protocols, for example PPPoE that is provided
+by
+.Xr ng_pppoe 4
+and
+.Xr ppp 8 .
+Now this feature is considered as experimental and is turned off
+by-default.
+.Pp
 A bridge can be used to provide several services, such as a simple
 802.11-to-Ethernet bridge for wireless hosts, and traffic isolation.
 .Pp

==== //depot/projects/soc2008/gk_l2filter/sys-net/bpf.c#6 (text+ko) ====

@@ -35,7 +35,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/net/bpf.c,v 1.201 2008/08/29 20:34:06 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/net/bpf.c,v 1.202 2008/10/23 15:53:51 des Exp $");
 
 #include "opt_bpf.h"
 #include "opt_mac.h"
@@ -619,7 +619,7 @@
 	struct bpf_d *d;
 	int error;
 
-	MALLOC(d, struct bpf_d *, sizeof(*d), M_BPF, M_WAITOK | M_ZERO);
+	d = malloc(sizeof(*d), M_BPF, M_WAITOK | M_ZERO);
 	error = devfs_set_cdevpriv(d, bpf_dtor);
 	if (error != 0) {
 		free(d, M_BPF);

==== //depot/projects/soc2008/gk_l2filter/sys-net/bridgestp.c#3 (text+ko) ====

@@ -35,7 +35,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/net/bridgestp.c,v 1.41 2008/08/17 23:27:27 bz Exp $");
+__FBSDID("$FreeBSD: src/sys/net/bridgestp.c,v 1.42 2008/10/02 15:37:58 zec Exp $");
 
 #include 
 #include 
@@ -2017,6 +2017,7 @@
 void
 bstp_reinit(struct bstp_state *bs)
 {
+	INIT_VNET_NET(curvnet);
 	struct bstp_port *bp;
 	struct ifnet *ifp, *mif;
 	u_char *e_addr;

==== //depot/projects/soc2008/gk_l2filter/sys-net/bsd_comp.c#2 (text+ko) ====

@@ -37,7 +37,7 @@
 /*
  * This version is for use with mbufs on BSD-derived systems.
  *
- * $FreeBSD: src/sys/net/bsd_comp.c,v 1.25 2007/10/24 19:03:57 rwatson Exp $

>>> TRUNCATED FOR MAIL (1000 lines) <<<
From gk at FreeBSD.org  Mon Nov  3 03:19:19 2008
From: gk at FreeBSD.org (Gleb Kurtsou)
Date: Mon Nov  3 03:19:25 2008
Subject: PERFORCE change 152406 for review
Message-ID: <200811031119.mA3BJJPi052244@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152406

Change 152406 by gk@gk_h1 on 2008/11/03 11:18:47

	cleanup

Affected files ...

.. //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_fw2.c#18 edit
.. //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_fw_pfil.c#10 edit
.. //depot/projects/soc2008/gk_l2filter/sys-pf/net/pf.c#11 edit

Differences ...

==== //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_fw2.c#18 (text+ko) ====

@@ -176,8 +176,6 @@
 static __inline int ether_addr_allow_dyn(ipfw_ether_addr *want, ipfw_ether_addr *a)
 {
 	if ((a->flags & IPFW_EA_CHECK) == 0) {
-		if (want->flags & IPFW_EA_CHECK)
-			printf("ipfw: no tag: %6D (want %6D)\n", a->octet, ":", want->octet, ":");
 		return (1);
 	}
 	return (ether_addr_allow(want, a));
@@ -1243,12 +1241,10 @@
 	 * mbuf has mtag_ether_header.
 	 */
 	if (dir == MATCH_NONE ||
-			!ether_addr_allow_dyn(&q->id.src_ether,
-			(dir == MATCH_FORWARD ? &pkt->src_ether : &pkt->dst_ether)) ||
-			!ether_addr_allow_dyn(&q->id.dst_ether,
-			(dir == MATCH_FORWARD ? &pkt->dst_ether : &pkt->src_ether))) {
-		printf("XXX IPFW DYN RULE: dropped by mac: %6D -> %6D\n",
-				&pkt->src_ether.octet, ":", &pkt->dst_ether.octet, ":");
+	    !ether_addr_allow_dyn(&q->id.src_ether,
+	    (dir == MATCH_FORWARD ? &pkt->src_ether : &pkt->dst_ether)) ||
+	    !ether_addr_allow_dyn(&q->id.dst_ether,
+	    (dir == MATCH_FORWARD ? &pkt->dst_ether : &pkt->src_ether))) {
 		q = NULL;
 		dir = MATCH_NONE;
 		goto done;
@@ -3190,11 +3186,6 @@
 
 					match = lookup_table(chain, cmd->arg1, pa, 
 						(ha.flags ? &ha : NULL), &v);
-					printf("ipfw: %s arp: %s: op = %d: %6D(%d) %s\n",
-						(match ? "pass" : "drop"),
-						cmd->opcode == O_ARP_DST_LOOKUP ? "dst" : "src",
-						op, ha.octet, ":", ha.flags, 
-						inet_ntoa(*(struct in_addr *)&pa));
 					if (!match)
 					    break;
 					if (cmdlen == F_INSN_SIZE(ipfw_insn_u32))

==== //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_fw_pfil.c#10 (text+ko) ====

@@ -457,12 +457,6 @@
 	args.inp = inp;
 	error = ip_fw_chk_ptr(&args);
 	*m0 = args.m;
-#ifdef XXXGK
-	printf("IN  %6D -> %6D: %s\n", 
-			args.eh->ether_shost, ":", 
-			args.eh->ether_dhost, ":",
-			(error == IP_FW_PASS ? "passed" : "droped"));
-#endif
 
 	if (error == IP_FW_PASS)
 		return 0;
@@ -505,12 +499,6 @@
 	args.inp = inp;
 	error = ip_fw_chk_ptr(&args);
 	*m0 = args.m;
-#ifdef XXXGK
-	printf("OUT %6D -> %6D: %s\n", 
-			args.eh->ether_shost, ":", 
-			args.eh->ether_dhost, ":",
-			(error == IP_FW_PASS ? "passed" : "droped"));
-#endif
 
 	if (error == IP_FW_PASS)
 		return 0;

==== //depot/projects/soc2008/gk_l2filter/sys-pf/net/pf.c#11 (text+ko) ====

@@ -712,7 +712,6 @@
 	if ((state->local_flags & PFSTATE_ETHER) == 0)
 		return (1);
 #else
-	/* XXX only FreeBSD is supported */
 	if ((state->rule.ptr->rule_flag & PFRULE_ETHERSTATE) == 0)
 		return (1);
 #endif
From gk at FreeBSD.org  Mon Nov  3 03:22:23 2008
From: gk at FreeBSD.org (Gleb Kurtsou)
Date: Mon Nov  3 03:22:29 2008
Subject: PERFORCE change 152407 for review
Message-ID: <200811031122.mA3BMMDB052525@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152407

Change 152407 by gk@gk_h1 on 2008/11/03 11:22:09

	print 'multicast' address in table list

Affected files ...

.. //depot/projects/soc2008/gk_l2filter/sbin-ipfw/ipfw2.c#12 edit

Differences ...

==== //depot/projects/soc2008/gk_l2filter/sbin-ipfw/ipfw2.c#12 (text+ko) ====

@@ -6126,8 +6126,12 @@
 		}
 		if (tbl->ent[a].ether_addr.flags & IPFW_EA_CHECK) {
 		    uint8_t *x = (uint8_t *)&tbl->ent[a].ether_addr;
-		    snprintf(tether_buf, sizeof(tether_buf), "ether %02x:%02x:%02x:%02x:%02x:%02x ",
-			 x[0], x[1], x[2], x[3], x[4], x[5]);
+		    if (tbl->ent[a].ether_addr.flags & IPFW_EA_MULTICAST)
+			strlcpy(tether_buf, "ether multicast ", sizeof(tether_buf));
+		    else
+			snprintf(tether_buf, sizeof(tether_buf), 
+			    "ether %02x:%02x:%02x:%02x:%02x:%02x ",
+			    x[0], x[1], x[2], x[3], x[4], x[5]);
 		} else {
 		    tether_buf[0] = 0;
 		}
From jhb at FreeBSD.org  Mon Nov  3 13:12:49 2008
From: jhb at FreeBSD.org (John Baldwin)
Date: Mon Nov  3 13:12:56 2008
Subject: PERFORCE change 152423 for review
Message-ID: <200811032112.mA3LCeG7054448@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152423

Change 152423 by jhb@jhb_mutex on 2008/11/03 21:11:59

	IFC @152422

Affected files ...

.. //depot/projects/smpng/sys/amd64/amd64/dump_machdep.c#8 integrate
.. //depot/projects/smpng/sys/amd64/amd64/identcpu.c#29 integrate
.. //depot/projects/smpng/sys/amd64/amd64/local_apic.c#35 integrate
.. //depot/projects/smpng/sys/amd64/amd64/minidump_machdep.c#7 integrate
.. //depot/projects/smpng/sys/amd64/include/specialreg.h#17 integrate
.. //depot/projects/smpng/sys/arm/arm/undefined.c#16 integrate
.. //depot/projects/smpng/sys/arm/at91/at91.c#15 integrate
.. //depot/projects/smpng/sys/arm/at91/at91_mci.c#8 integrate
.. //depot/projects/smpng/sys/arm/conf/AVILA#9 integrate
.. //depot/projects/smpng/sys/arm/conf/BWCT#5 integrate
.. //depot/projects/smpng/sys/arm/conf/CRB#4 integrate
.. //depot/projects/smpng/sys/arm/conf/DB-78XXX#2 integrate
.. //depot/projects/smpng/sys/arm/conf/DB-88F5XXX#2 integrate
.. //depot/projects/smpng/sys/arm/conf/DB-88F6XXX#2 integrate
.. //depot/projects/smpng/sys/arm/conf/DEFAULTS#1 branch
.. //depot/projects/smpng/sys/arm/conf/EP80219#8 integrate
.. //depot/projects/smpng/sys/arm/conf/GUMSTIX#2 integrate
.. //depot/projects/smpng/sys/arm/conf/HL200#4 integrate
.. //depot/projects/smpng/sys/arm/conf/IQ31244#17 integrate
.. //depot/projects/smpng/sys/arm/conf/KB920X#12 integrate
.. //depot/projects/smpng/sys/arm/conf/NSLU#3 integrate
.. //depot/projects/smpng/sys/arm/conf/SIMICS#15 integrate
.. //depot/projects/smpng/sys/arm/conf/SKYEYE#8 integrate
.. //depot/projects/smpng/sys/boot/powerpc/boot1.chrp/boot1.c#2 integrate
.. //depot/projects/smpng/sys/boot/powerpc/boot1.chrp/bootinfo.txt#2 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_target.c#26 integrate
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#2 integrate
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/policy.h#2 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#52 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#47 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#47 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#47 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#47 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#51 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_emul.c#12 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_getcwd.c#27 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#53 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_socket.c#43 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_util.c#20 integrate
.. //depot/projects/smpng/sys/conf/NOTES#156 integrate
.. //depot/projects/smpng/sys/conf/files#221 integrate
.. //depot/projects/smpng/sys/conf/files.arm#14 integrate
.. //depot/projects/smpng/sys/conf/files.mips#4 integrate
.. //depot/projects/smpng/sys/conf/files.powerpc#43 integrate
.. //depot/projects/smpng/sys/conf/options#154 integrate
.. //depot/projects/smpng/sys/contrib/altq/altq/altq_cbq.c#5 integrate
.. //depot/projects/smpng/sys/contrib/altq/altq/altq_cdnr.c#3 integrate
.. //depot/projects/smpng/sys/contrib/altq/altq/altq_hfsc.c#4 integrate
.. //depot/projects/smpng/sys/contrib/altq/altq/altq_priq.c#4 integrate
.. //depot/projects/smpng/sys/contrib/altq/altq/altq_red.c#4 integrate
.. //depot/projects/smpng/sys/contrib/altq/altq/altq_rio.c#4 integrate
.. //depot/projects/smpng/sys/contrib/altq/altq/altq_rmclass.c#2 integrate
.. //depot/projects/smpng/sys/contrib/altq/altq/altq_subr.c#8 integrate
.. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_compat.h#18 integrate
.. //depot/projects/smpng/sys/dev/acpica/Osd/OsdSchedule.c#33 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi.c#108 integrate
.. //depot/projects/smpng/sys/dev/adb/adb.h#1 branch
.. //depot/projects/smpng/sys/dev/adb/adb_bus.c#1 branch
.. //depot/projects/smpng/sys/dev/adb/adb_hb_if.m#1 branch
.. //depot/projects/smpng/sys/dev/adb/adb_if.m#1 branch
.. //depot/projects/smpng/sys/dev/adb/adb_kbd.c#1 branch
.. //depot/projects/smpng/sys/dev/adb/adb_mouse.c#1 branch
.. //depot/projects/smpng/sys/dev/adb/adbvar.h#1 branch
.. //depot/projects/smpng/sys/dev/amr/amr.c#48 integrate
.. //depot/projects/smpng/sys/dev/amr/amr_cam.c#21 integrate
.. //depot/projects/smpng/sys/dev/amr/amrvar.h#27 integrate
.. //depot/projects/smpng/sys/dev/ar/if_ar.c#23 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-queue.c#42 integrate
.. //depot/projects/smpng/sys/dev/ath/ah_osdep.c#5 integrate
.. //depot/projects/smpng/sys/dev/ath/ath_rate/amrr/amrr.c#13 integrate
.. //depot/projects/smpng/sys/dev/ath/ath_rate/onoe/onoe.c#13 integrate
.. //depot/projects/smpng/sys/dev/ath/ath_rate/sample/sample.c#12 integrate
.. //depot/projects/smpng/sys/dev/ath/if_ath.c#59 integrate
.. //depot/projects/smpng/sys/dev/ath/if_athrate.h#8 integrate
.. //depot/projects/smpng/sys/dev/ath/if_athvar.h#36 integrate
.. //depot/projects/smpng/sys/dev/bge/if_bge.c#101 integrate
.. //depot/projects/smpng/sys/dev/cardbus/cardbus_cis.c#30 integrate
.. //depot/projects/smpng/sys/dev/cardbus/cardbusreg.h#7 integrate
.. //depot/projects/smpng/sys/dev/ce/if_ce.c#12 integrate
.. //depot/projects/smpng/sys/dev/cfe/cfe_console.c#2 integrate
.. //depot/projects/smpng/sys/dev/cfi/cfi_bus_lbc.c#1 branch
.. //depot/projects/smpng/sys/dev/cfi/cfi_core.c#1 branch
.. //depot/projects/smpng/sys/dev/cfi/cfi_dev.c#1 branch
.. //depot/projects/smpng/sys/dev/cfi/cfi_reg.h#1 branch
.. //depot/projects/smpng/sys/dev/cfi/cfi_var.h#1 branch
.. //depot/projects/smpng/sys/dev/drm/drm_drv.c#10 integrate
.. //depot/projects/smpng/sys/dev/drm/drm_fops.c#6 integrate
.. //depot/projects/smpng/sys/dev/drm/drm_lock.c#6 integrate
.. //depot/projects/smpng/sys/dev/drm/i915_dma.c#10 integrate
.. //depot/projects/smpng/sys/dev/drm/radeon_cp.c#19 integrate
.. //depot/projects/smpng/sys/dev/drm/radeon_drv.h#18 integrate
.. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_amd.c#11 integrate
.. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_logging.c#9 integrate
.. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_mod.c#26 integrate
.. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_piv.c#11 integrate
.. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_ppro.c#8 integrate
.. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_x86.c#8 integrate
.. //depot/projects/smpng/sys/dev/iwn/if_iwn.c#2 integrate
.. //depot/projects/smpng/sys/dev/lmc/if_lmc.c#19 integrate
.. //depot/projects/smpng/sys/dev/mii/atphy.c#3 integrate
.. //depot/projects/smpng/sys/dev/mii/ciphy.c#11 integrate
.. //depot/projects/smpng/sys/dev/mii/miidevs#33 integrate
.. //depot/projects/smpng/sys/dev/mmc/mmc.c#6 integrate
.. //depot/projects/smpng/sys/dev/mmc/mmcbrvar.h#5 integrate
.. //depot/projects/smpng/sys/dev/mmc/mmcsd.c#6 integrate
.. //depot/projects/smpng/sys/dev/mmc/mmcvar.h#6 integrate
.. //depot/projects/smpng/sys/dev/mn/if_mn.c#1 branch
.. //depot/projects/smpng/sys/dev/mxge/eth_z8e.h#4 integrate
.. //depot/projects/smpng/sys/dev/mxge/ethp_z8e.h#4 integrate
.. //depot/projects/smpng/sys/dev/mxge/rss_eth_z8e.h#4 integrate
.. //depot/projects/smpng/sys/dev/mxge/rss_ethp_z8e.h#4 integrate
.. //depot/projects/smpng/sys/dev/ofw/ofw_console.c#30 integrate
.. //depot/projects/smpng/sys/dev/pci/pcireg.h#28 integrate
.. //depot/projects/smpng/sys/dev/ppbus/lpt.c#21 integrate
.. //depot/projects/smpng/sys/dev/ppbus/ppi.c#18 integrate
.. //depot/projects/smpng/sys/dev/ppc/ppc.c#21 integrate
.. //depot/projects/smpng/sys/dev/puc/pucdata.c#44 integrate
.. //depot/projects/smpng/sys/dev/ral/rt2560.c#13 integrate
.. //depot/projects/smpng/sys/dev/ral/rt2661.c#9 integrate
.. //depot/projects/smpng/sys/dev/ray/if_ray.c#28 integrate
.. //depot/projects/smpng/sys/dev/ray/if_rayvar.h#8 integrate
.. //depot/projects/smpng/sys/dev/sdhci/sdhci.c#2 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/hda/hdac.c#19 integrate
.. //depot/projects/smpng/sys/dev/sr/if_sr.c#24 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_tty.c#22 integrate
.. //depot/projects/smpng/sys/dev/usb/if_zyd.c#7 integrate
.. //depot/projects/smpng/sys/dev/usb/u3g.c#2 integrate
.. //depot/projects/smpng/sys/dev/usb/ubsa.c#27 integrate
.. //depot/projects/smpng/sys/dev/usb/ucom.c#33 integrate
.. //depot/projects/smpng/sys/dev/usb/udbp.c#17 integrate
.. //depot/projects/smpng/sys/dev/usb/ufoma.c#7 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs#118 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdi.c#28 integrate
.. //depot/projects/smpng/sys/dev/wpi/if_wpi.c#6 integrate
.. //depot/projects/smpng/sys/dev/xen/console/console.c#3 integrate
.. //depot/projects/smpng/sys/fs/cd9660/cd9660_node.c#3 integrate
.. //depot/projects/smpng/sys/fs/cd9660/cd9660_vfsops.c#7 integrate
.. //depot/projects/smpng/sys/fs/cd9660/cd9660_vnops.c#4 integrate
.. //depot/projects/smpng/sys/fs/coda/cnode.h#4 integrate
.. //depot/projects/smpng/sys/fs/coda/coda_subr.c#3 integrate
.. //depot/projects/smpng/sys/fs/coda/coda_venus.c#4 integrate
.. //depot/projects/smpng/sys/fs/coda/coda_vnops.c#6 integrate
.. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#73 integrate
.. //depot/projects/smpng/sys/fs/fdescfs/fdesc_vfsops.c#26 integrate
.. //depot/projects/smpng/sys/fs/fdescfs/fdesc_vnops.c#34 integrate
.. //depot/projects/smpng/sys/fs/fifofs/fifo_vnops.c#46 integrate
.. //depot/projects/smpng/sys/fs/hpfs/hpfs_subr.c#6 integrate
.. //depot/projects/smpng/sys/fs/hpfs/hpfs_vfsops.c#38 integrate
.. //depot/projects/smpng/sys/fs/hpfs/hpfs_vnops.c#37 integrate
.. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_denode.c#31 integrate
.. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#60 integrate
.. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#46 integrate
.. //depot/projects/smpng/sys/fs/ntfs/ntfs_subr.c#29 integrate
.. //depot/projects/smpng/sys/fs/ntfs/ntfs_vfsops.c#39 integrate
.. //depot/projects/smpng/sys/fs/ntfs/ntfs_vnops.c#31 integrate
.. //depot/projects/smpng/sys/fs/nullfs/null_subr.c#20 integrate
.. //depot/projects/smpng/sys/fs/nullfs/null_vnops.c#36 integrate
.. //depot/projects/smpng/sys/fs/nwfs/nwfs_node.c#23 integrate
.. //depot/projects/smpng/sys/fs/nwfs/nwfs_vfsops.c#27 integrate
.. //depot/projects/smpng/sys/fs/nwfs/nwfs_vnops.c#19 integrate
.. //depot/projects/smpng/sys/fs/portalfs/portal_vfsops.c#24 integrate
.. //depot/projects/smpng/sys/fs/portalfs/portal_vnops.c#32 integrate
.. //depot/projects/smpng/sys/fs/pseudofs/pseudofs.c#27 integrate
.. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vncache.c#29 integrate
.. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#52 integrate
.. //depot/projects/smpng/sys/fs/smbfs/smbfs_node.c#33 integrate
.. //depot/projects/smpng/sys/fs/smbfs/smbfs_vfsops.c#40 integrate
.. //depot/projects/smpng/sys/fs/smbfs/smbfs_vnops.c#41 integrate
.. //depot/projects/smpng/sys/fs/tmpfs/tmpfs_vnops.c#8 integrate
.. //depot/projects/smpng/sys/fs/udf/udf_vfsops.c#40 integrate
.. //depot/projects/smpng/sys/fs/udf/udf_vnops.c#43 integrate
.. //depot/projects/smpng/sys/fs/unionfs/union_subr.c#35 integrate
.. //depot/projects/smpng/sys/fs/unionfs/union_vfsops.c#37 integrate
.. //depot/projects/smpng/sys/fs/unionfs/union_vnops.c#41 integrate
.. //depot/projects/smpng/sys/geom/geom_disk.c#54 integrate
.. //depot/projects/smpng/sys/geom/journal/g_journal.c#9 integrate
.. //depot/projects/smpng/sys/geom/part/g_part_apm.c#6 integrate
.. //depot/projects/smpng/sys/geom/part/g_part_bsd.c#6 integrate
.. //depot/projects/smpng/sys/geom/part/g_part_vtoc8.c#4 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum.c#17 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum.h#13 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_drive.c#23 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_init.c#12 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_plex.c#14 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_raid5.c#8 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_rm.c#13 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_state.c#8 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_subr.c#15 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_volume.c#11 integrate
.. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_inode.c#5 integrate
.. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_lookup.c#5 integrate
.. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_vfsops.c#18 integrate
.. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_vnops.c#12 integrate
.. //depot/projects/smpng/sys/gnu/fs/reiserfs/reiserfs_inode.c#6 integrate
.. //depot/projects/smpng/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#10 integrate
.. //depot/projects/smpng/sys/gnu/fs/reiserfs/reiserfs_vnops.c#3 integrate
.. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#6 integrate
.. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#8 integrate
.. //depot/projects/smpng/sys/i386/conf/NOTES#136 integrate
.. //depot/projects/smpng/sys/i386/conf/XEN#3 integrate
.. //depot/projects/smpng/sys/i386/i386/bios.c#26 integrate
.. //depot/projects/smpng/sys/i386/i386/dump_machdep.c#12 integrate
.. //depot/projects/smpng/sys/i386/i386/identcpu.c#61 integrate
.. //depot/projects/smpng/sys/i386/i386/local_apic.c#57 integrate
.. //depot/projects/smpng/sys/i386/i386/minidump_machdep.c#7 integrate
.. //depot/projects/smpng/sys/i386/i386/sys_machdep.c#54 integrate
.. //depot/projects/smpng/sys/i386/include/apicvar.h#29 integrate
.. //depot/projects/smpng/sys/i386/include/pcpu.h#21 integrate
.. //depot/projects/smpng/sys/i386/include/smp.h#28 integrate
.. //depot/projects/smpng/sys/i386/include/specialreg.h#21 integrate
.. //depot/projects/smpng/sys/i386/include/xen/xen-os.h#3 integrate
.. //depot/projects/smpng/sys/i386/include/xen/xen_intr.h#3 integrate
.. //depot/projects/smpng/sys/i386/isa/pmtimer.c#8 integrate
.. //depot/projects/smpng/sys/i386/xen/clock.c#3 integrate
.. //depot/projects/smpng/sys/i386/xen/exception.s#3 integrate
.. //depot/projects/smpng/sys/i386/xen/mp_machdep.c#5 integrate
.. //depot/projects/smpng/sys/i386/xen/xen_machdep.c#5 integrate
.. //depot/projects/smpng/sys/ia64/ia64/sscdisk.c#21 integrate
.. //depot/projects/smpng/sys/isa/isa_common.c#22 integrate
.. //depot/projects/smpng/sys/isa/isa_common.h#8 integrate
.. //depot/projects/smpng/sys/isa/isavar.h#11 integrate
.. //depot/projects/smpng/sys/isa/pnp.c#11 integrate
.. //depot/projects/smpng/sys/kern/init_main.c#75 integrate
.. //depot/projects/smpng/sys/kern/init_sysent.c#87 integrate
.. //depot/projects/smpng/sys/kern/kern_cons.c#1 branch
.. //depot/projects/smpng/sys/kern/kern_descrip.c#117 integrate
.. //depot/projects/smpng/sys/kern/kern_event.c#57 integrate
.. //depot/projects/smpng/sys/kern/kern_jail.c#57 integrate
.. //depot/projects/smpng/sys/kern/kern_linker.c#94 integrate
.. //depot/projects/smpng/sys/kern/kern_lockf.c#25 integrate
.. //depot/projects/smpng/sys/kern/kern_mtxpool.c#11 integrate
.. //depot/projects/smpng/sys/kern/kern_proc.c#97 integrate
.. //depot/projects/smpng/sys/kern/kern_prot.c#105 integrate
.. //depot/projects/smpng/sys/kern/kern_resource.c#80 integrate
.. //depot/projects/smpng/sys/kern/kern_sig.c#143 integrate
.. //depot/projects/smpng/sys/kern/kern_thr.c#47 integrate
.. //depot/projects/smpng/sys/kern/kern_thread.c#111 integrate
.. //depot/projects/smpng/sys/kern/kern_timeout.c#43 integrate
.. //depot/projects/smpng/sys/kern/sched_ule.c#88 integrate
.. //depot/projects/smpng/sys/kern/subr_acl_posix1e.c#6 integrate
.. //depot/projects/smpng/sys/kern/subr_blist.c#9 integrate
.. //depot/projects/smpng/sys/kern/subr_param.c#24 integrate
.. //depot/projects/smpng/sys/kern/subr_rman.c#38 integrate
.. //depot/projects/smpng/sys/kern/subr_sleepqueue.c#44 integrate
.. //depot/projects/smpng/sys/kern/subr_stack.c#7 integrate
.. //depot/projects/smpng/sys/kern/subr_witness.c#174 integrate
.. //depot/projects/smpng/sys/kern/sys_process.c#62 integrate
.. //depot/projects/smpng/sys/kern/syscalls.c#87 integrate
.. //depot/projects/smpng/sys/kern/syscalls.master#93 integrate
.. //depot/projects/smpng/sys/kern/systrace_args.c#14 integrate
.. //depot/projects/smpng/sys/kern/tty.c#79 integrate
.. //depot/projects/smpng/sys/kern/tty_cons.c#43 delete
.. //depot/projects/smpng/sys/kern/uipc_accf.c#9 integrate
.. //depot/projects/smpng/sys/kern/uipc_mqueue.c#19 integrate
.. //depot/projects/smpng/sys/kern/uipc_shm.c#4 integrate
.. //depot/projects/smpng/sys/kern/uipc_syscalls.c#112 integrate
.. //depot/projects/smpng/sys/kern/uipc_usrreq.c#84 integrate
.. //depot/projects/smpng/sys/kern/vfs_export.c#29 integrate
.. //depot/projects/smpng/sys/kern/vfs_lookup.c#52 integrate
.. //depot/projects/smpng/sys/kern/vfs_mount.c#85 integrate
.. //depot/projects/smpng/sys/kern/vfs_subr.c#156 integrate
.. //depot/projects/smpng/sys/kern/vfs_syscalls.c#136 integrate
.. //depot/projects/smpng/sys/kern/vfs_vnops.c#88 integrate
.. //depot/projects/smpng/sys/kern/vnode_if.src#37 integrate
.. //depot/projects/smpng/sys/kgssapi/gss_accept_sec_context.c#1 branch
.. //depot/projects/smpng/sys/kgssapi/gss_acquire_cred.c#1 branch
.. //depot/projects/smpng/sys/kgssapi/gss_add_oid_set_member.c#1 branch
.. //depot/projects/smpng/sys/kgssapi/gss_canonicalize_name.c#1 branch
.. //depot/projects/smpng/sys/kgssapi/gss_create_empty_oid_set.c#1 branch
.. //depot/projects/smpng/sys/kgssapi/gss_delete_sec_context.c#1 branch
.. //depot/projects/smpng/sys/kgssapi/gss_display_status.c#1 branch
.. //depot/projects/smpng/sys/kgssapi/gss_export_name.c#1 branch
.. //depot/projects/smpng/sys/kgssapi/gss_get_mic.c#1 branch
.. //depot/projects/smpng/sys/kgssapi/gss_impl.c#1 branch
.. //depot/projects/smpng/sys/kgssapi/gss_import_name.c#1 branch
.. //depot/projects/smpng/sys/kgssapi/gss_init_sec_context.c#1 branch
.. //depot/projects/smpng/sys/kgssapi/gss_names.c#1 branch
.. //depot/projects/smpng/sys/kgssapi/gss_pname_to_uid.c#1 branch
.. //depot/projects/smpng/sys/kgssapi/gss_release_buffer.c#1 branch
.. //depot/projects/smpng/sys/kgssapi/gss_release_cred.c#1 branch
.. //depot/projects/smpng/sys/kgssapi/gss_release_name.c#1 branch
.. //depot/projects/smpng/sys/kgssapi/gss_release_oid_set.c#1 branch
.. //depot/projects/smpng/sys/kgssapi/gss_set_cred_option.c#1 branch
.. //depot/projects/smpng/sys/kgssapi/gss_test_oid_set_member.c#1 branch
.. //depot/projects/smpng/sys/kgssapi/gss_unwrap.c#1 branch
.. //depot/projects/smpng/sys/kgssapi/gss_verify_mic.c#1 branch
.. //depot/projects/smpng/sys/kgssapi/gss_wrap.c#1 branch
.. //depot/projects/smpng/sys/kgssapi/gss_wrap_size_limit.c#1 branch
.. //depot/projects/smpng/sys/kgssapi/gssapi.h#1 branch
.. //depot/projects/smpng/sys/kgssapi/gssapi_impl.h#1 branch
.. //depot/projects/smpng/sys/kgssapi/gssd.x#1 branch
.. //depot/projects/smpng/sys/kgssapi/gssd_prot.c#1 branch
.. //depot/projects/smpng/sys/kgssapi/gsstest.c#1 branch
.. //depot/projects/smpng/sys/kgssapi/kgss_if.m#1 branch
.. //depot/projects/smpng/sys/kgssapi/krb5/kcrypto.c#1 branch
.. //depot/projects/smpng/sys/kgssapi/krb5/kcrypto.h#1 branch
.. //depot/projects/smpng/sys/kgssapi/krb5/kcrypto_aes.c#1 branch
.. //depot/projects/smpng/sys/kgssapi/krb5/kcrypto_arcfour.c#1 branch
.. //depot/projects/smpng/sys/kgssapi/krb5/kcrypto_des.c#1 branch
.. //depot/projects/smpng/sys/kgssapi/krb5/kcrypto_des3.c#1 branch
.. //depot/projects/smpng/sys/kgssapi/krb5/krb5_mech.c#1 branch
.. //depot/projects/smpng/sys/mips/conf/ADM5120#3 integrate
.. //depot/projects/smpng/sys/mips/conf/DEFAULTS#1 branch
.. //depot/projects/smpng/sys/mips/conf/IDT#4 integrate
.. //depot/projects/smpng/sys/mips/conf/MALTA#3 integrate
.. //depot/projects/smpng/sys/mips/conf/QEMU#2 integrate
.. //depot/projects/smpng/sys/mips/conf/SENTRY5#4 integrate
.. //depot/projects/smpng/sys/mips/idt/if_kr.c#3 integrate
.. //depot/projects/smpng/sys/modules/amr/Makefile#5 integrate
.. //depot/projects/smpng/sys/modules/amr/amr_cam/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/kgssapi/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/kgssapi_krb5/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/mac_bsdextended/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/nfsclient/Makefile#11 integrate
.. //depot/projects/smpng/sys/modules/nfsserver/Makefile#7 integrate
.. //depot/projects/smpng/sys/modules/rl/Makefile#3 integrate
.. //depot/projects/smpng/sys/modules/u3g/Makefile#2 integrate
.. //depot/projects/smpng/sys/net/bpf.c#80 integrate
.. //depot/projects/smpng/sys/net/bsd_comp.c#13 integrate
.. //depot/projects/smpng/sys/net/if.c#104 integrate
.. //depot/projects/smpng/sys/net/if_arcsubr.c#23 integrate
.. //depot/projects/smpng/sys/net/if_ethersubr.c#91 integrate
.. //depot/projects/smpng/sys/net/if_fddisubr.c#31 integrate
.. //depot/projects/smpng/sys/net/if_iso88025subr.c#30 integrate
.. //depot/projects/smpng/sys/net/if_ppp.c#49 integrate
.. //depot/projects/smpng/sys/net/if_sl.c#34 integrate
.. //depot/projects/smpng/sys/net/if_tap.c#49 integrate
.. //depot/projects/smpng/sys/net/if_tun.c#55 integrate
.. //depot/projects/smpng/sys/net/ppp_deflate.c#9 integrate
.. //depot/projects/smpng/sys/net/rtsock.c#63 integrate
.. //depot/projects/smpng/sys/net80211/_ieee80211.h#11 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211.c#31 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_acl.c#6 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_adhoc.c#3 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_crypto.c#14 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_crypto_ccmp.c#8 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_crypto_tkip.c#9 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_crypto_wep.c#7 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_freebsd.c#16 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_freebsd.h#14 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_hostap.c#5 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_ht.c#7 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_ht.h#6 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_input.c#42 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.c#38 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_node.c#37 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_node.h#23 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_output.c#34 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_power.c#3 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_power.h#3 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_proto.c#27 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_proto.h#18 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_regdomain.c#3 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_scan.c#3 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_scan_sta.c#5 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_sta.c#4 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_var.h#30 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_wds.c#3 integrate
.. //depot/projects/smpng/sys/netatalk/ddp_pcb.c#12 integrate
.. //depot/projects/smpng/sys/netgraph/atm/sscfu/ng_sscfu_cust.h#3 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#14 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_main.c#7 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_misc.c#10 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c#6 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#12 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h#7 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#22 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#22 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#19 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#18 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c#3 integrate
.. //depot/projects/smpng/sys/netgraph/netflow/netflow.c#18 integrate
.. //depot/projects/smpng/sys/netgraph/netflow/ng_netflow.c#14 integrate
.. //depot/projects/smpng/sys/netgraph/netgraph.h#33 integrate
.. //depot/projects/smpng/sys/netgraph/ng_UI.c#7 integrate
.. //depot/projects/smpng/sys/netgraph/ng_async.c#8 integrate
.. //depot/projects/smpng/sys/netgraph/ng_atmllc.c#4 integrate
.. //depot/projects/smpng/sys/netgraph/ng_base.c#60 integrate
.. //depot/projects/smpng/sys/netgraph/ng_bpf.c#10 integrate
.. //depot/projects/smpng/sys/netgraph/ng_bridge.c#20 integrate
.. //depot/projects/smpng/sys/netgraph/ng_cisco.c#15 integrate
.. //depot/projects/smpng/sys/netgraph/ng_device.c#20 integrate
.. //depot/projects/smpng/sys/netgraph/ng_eiface.c#30 integrate
.. //depot/projects/smpng/sys/netgraph/ng_etf.c#10 integrate
.. //depot/projects/smpng/sys/netgraph/ng_ether.c#36 integrate
.. //depot/projects/smpng/sys/netgraph/ng_fec.c#21 integrate
.. //depot/projects/smpng/sys/netgraph/ng_frame_relay.c#8 integrate
.. //depot/projects/smpng/sys/netgraph/ng_gif.c#17 integrate
.. //depot/projects/smpng/sys/netgraph/ng_gif_demux.c#8 integrate
.. //depot/projects/smpng/sys/netgraph/ng_hole.c#5 integrate
.. //depot/projects/smpng/sys/netgraph/ng_iface.c#31 integrate
.. //depot/projects/smpng/sys/netgraph/ng_ipfw.c#5 integrate
.. //depot/projects/smpng/sys/netgraph/ng_ksocket.c#33 integrate
.. //depot/projects/smpng/sys/netgraph/ng_l2tp.c#17 integrate
.. //depot/projects/smpng/sys/netgraph/ng_lmi.c#11 integrate
.. //depot/projects/smpng/sys/netgraph/ng_message.h#15 integrate
.. //depot/projects/smpng/sys/netgraph/ng_mppc.c#16 integrate
.. //depot/projects/smpng/sys/netgraph/ng_nat.c#10 integrate
.. //depot/projects/smpng/sys/netgraph/ng_one2many.c#14 integrate
.. //depot/projects/smpng/sys/netgraph/ng_parse.c#20 integrate
.. //depot/projects/smpng/sys/netgraph/ng_pipe.c#2 integrate
.. //depot/projects/smpng/sys/netgraph/ng_ppp.c#27 integrate
.. //depot/projects/smpng/sys/netgraph/ng_pptpgre.c#20 integrate
.. //depot/projects/smpng/sys/netgraph/ng_rfc1490.c#9 integrate
.. //depot/projects/smpng/sys/netgraph/ng_sample.c#12 integrate
.. //depot/projects/smpng/sys/netgraph/ng_split.c#8 integrate
.. //depot/projects/smpng/sys/netgraph/ng_sppp.c#12 integrate
.. //depot/projects/smpng/sys/netgraph/ng_tag.c#2 integrate
.. //depot/projects/smpng/sys/netgraph/ng_tcpmss.c#4 integrate
.. //depot/projects/smpng/sys/netgraph/ng_tee.c#16 integrate
.. //depot/projects/smpng/sys/netgraph/ng_tty.c#21 integrate
.. //depot/projects/smpng/sys/netgraph/ng_vjc.c#8 integrate
.. //depot/projects/smpng/sys/netgraph/ng_vlan.c#6 integrate
.. //depot/projects/smpng/sys/netinet/igmp.c#23 integrate
.. //depot/projects/smpng/sys/netinet/in.c#44 integrate
.. //depot/projects/smpng/sys/netinet/in_mcast.c#5 integrate
.. //depot/projects/smpng/sys/netinet/in_pcb.c#86 integrate
.. //depot/projects/smpng/sys/netinet/ip_carp.c#28 integrate
.. //depot/projects/smpng/sys/netinet/ip_dummynet.h#23 integrate
.. //depot/projects/smpng/sys/netinet/sctp_os_bsd.h#15 integrate
.. //depot/projects/smpng/sys/netinet/sctp_output.c#22 integrate
.. //depot/projects/smpng/sys/netinet/sctp_timer.c#16 integrate
.. //depot/projects/smpng/sys/netinet/sctp_timer.h#7 integrate
.. //depot/projects/smpng/sys/netinet/tcp_input.c#118 integrate
.. //depot/projects/smpng/sys/netinet/tcp_sack.c#26 integrate
.. //depot/projects/smpng/sys/netinet/tcp_syncache.c#67 integrate
.. //depot/projects/smpng/sys/netinet6/frag6.c#19 integrate
.. //depot/projects/smpng/sys/netinet6/in6.c#46 integrate
.. //depot/projects/smpng/sys/netinet6/in6_pcb.c#55 integrate
.. //depot/projects/smpng/sys/netinet6/in6_src.c#36 integrate
.. //depot/projects/smpng/sys/netinet6/ip6_var.h#24 integrate
.. //depot/projects/smpng/sys/netinet6/raw_ip6.c#53 integrate
.. //depot/projects/smpng/sys/netipsec/keysock.c#19 integrate
.. //depot/projects/smpng/sys/netipsec/xform_ah.c#14 integrate
.. //depot/projects/smpng/sys/netipx/ipx_pcb.c#22 integrate
.. //depot/projects/smpng/sys/netipx/spx_usrreq.c#30 integrate
.. //depot/projects/smpng/sys/netnatm/natm.c#30 integrate
.. //depot/projects/smpng/sys/netnatm/natm_pcb.c#10 integrate
.. //depot/projects/smpng/sys/netncp/ncp_conn.c#19 integrate
.. //depot/projects/smpng/sys/netncp/ncp_rq.c#10 integrate
.. //depot/projects/smpng/sys/netncp/ncp_sock.c#13 integrate
.. //depot/projects/smpng/sys/netncp/ncp_subr.c#8 integrate
.. //depot/projects/smpng/sys/netsmb/smb_conn.c#20 integrate
.. //depot/projects/smpng/sys/netsmb/smb_conn.h#11 integrate
.. //depot/projects/smpng/sys/netsmb/smb_dev.c#26 integrate
.. //depot/projects/smpng/sys/netsmb/smb_rq.c#17 integrate
.. //depot/projects/smpng/sys/netsmb/smb_trantcp.c#23 integrate
.. //depot/projects/smpng/sys/nfs4client/nfs4_dev.c#9 integrate
.. //depot/projects/smpng/sys/nfs4client/nfs4_idmap.c#8 integrate
.. //depot/projects/smpng/sys/nfs4client/nfs4_socket.c#6 integrate
.. //depot/projects/smpng/sys/nfs4client/nfs4_vfsops.c#24 integrate
.. //depot/projects/smpng/sys/nfs4client/nfs4_vn_subs.c#6 integrate
.. //depot/projects/smpng/sys/nfs4client/nfs4_vnops.c#30 integrate
.. //depot/projects/smpng/sys/nfsclient/krpc_subr.c#16 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs.h#32 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_krpc.c#1 branch
.. //depot/projects/smpng/sys/nfsclient/nfs_lock.c#37 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_nfsiod.c#20 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_node.c#31 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_socket.c#57 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_subs.c#36 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#68 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#77 integrate
.. //depot/projects/smpng/sys/nfsclient/nfsmount.h#15 integrate
.. //depot/projects/smpng/sys/nfsserver/nfs.h#23 integrate
.. //depot/projects/smpng/sys/nfsserver/nfs_fha.c#1 branch
.. //depot/projects/smpng/sys/nfsserver/nfs_fha.h#1 branch
.. //depot/projects/smpng/sys/nfsserver/nfs_serv.c#61 integrate
.. //depot/projects/smpng/sys/nfsserver/nfs_srvcache.c#16 integrate
.. //depot/projects/smpng/sys/nfsserver/nfs_srvkrpc.c#1 branch
.. //depot/projects/smpng/sys/nfsserver/nfs_srvsock.c#36 integrate
.. //depot/projects/smpng/sys/nfsserver/nfs_srvsubs.c#44 integrate
.. //depot/projects/smpng/sys/nfsserver/nfs_syscalls.c#39 integrate
.. //depot/projects/smpng/sys/nfsserver/nfsm_subs.h#12 integrate
.. //depot/projects/smpng/sys/nfsserver/nfsrvcache.h#7 integrate
.. //depot/projects/smpng/sys/nlm/nlm.h#3 integrate
.. //depot/projects/smpng/sys/nlm/nlm_advlock.c#2 integrate
.. //depot/projects/smpng/sys/nlm/nlm_prot_impl.c#4 integrate
.. //depot/projects/smpng/sys/nlm/nlm_prot_svc.c#2 integrate
.. //depot/projects/smpng/sys/opencrypto/cryptodev.c#26 integrate
.. //depot/projects/smpng/sys/opencrypto/cryptosoft.c#14 integrate
.. //depot/projects/smpng/sys/opencrypto/deflate.c#5 integrate
.. //depot/projects/smpng/sys/opencrypto/xform.c#8 integrate
.. //depot/projects/smpng/sys/pc98/pc98/pc98_machdep.c#8 integrate
.. //depot/projects/smpng/sys/pc98/pc98/pc98_machdep.h#6 integrate
.. //depot/projects/smpng/sys/pci/if_mn.c#16 delete
.. //depot/projects/smpng/sys/pci/if_rl.c#73 integrate
.. //depot/projects/smpng/sys/pci/if_rlreg.h#44 integrate
.. //depot/projects/smpng/sys/powerpc/aim/locore.S#4 integrate
.. //depot/projects/smpng/sys/powerpc/booke/locore.S#3 integrate
.. //depot/projects/smpng/sys/powerpc/booke/pmap.c#4 integrate
.. //depot/projects/smpng/sys/powerpc/booke/trap.c#2 integrate
.. //depot/projects/smpng/sys/powerpc/conf/GENERIC#51 integrate
.. //depot/projects/smpng/sys/powerpc/conf/MPC85XX#3 integrate
.. //depot/projects/smpng/sys/powerpc/include/cpu.h#21 integrate
.. //depot/projects/smpng/sys/powerpc/include/cpufunc.h#21 integrate
.. //depot/projects/smpng/sys/powerpc/include/endian.h#13 integrate
.. //depot/projects/smpng/sys/powerpc/include/profile.h#7 integrate
.. //depot/projects/smpng/sys/powerpc/mpc85xx/lbc.c#1 branch
.. //depot/projects/smpng/sys/powerpc/mpc85xx/lbc.h#1 branch
.. //depot/projects/smpng/sys/powerpc/mpc85xx/ocpbus.c#3 integrate
.. //depot/projects/smpng/sys/powerpc/powermac/ata_dbdma.c#2 integrate
.. //depot/projects/smpng/sys/powerpc/powermac/ata_kauai.c#13 integrate
.. //depot/projects/smpng/sys/powerpc/powermac/cuda.c#1 branch
.. //depot/projects/smpng/sys/powerpc/powermac/cudavar.h#1 branch
.. //depot/projects/smpng/sys/powerpc/powermac/dbdma.c#4 integrate
.. //depot/projects/smpng/sys/powerpc/powermac/dbdmavar.h#3 integrate
.. //depot/projects/smpng/sys/powerpc/powermac/macgpio.c#1 branch
.. //depot/projects/smpng/sys/powerpc/powermac/macgpiovar.h#1 branch
.. //depot/projects/smpng/sys/powerpc/powermac/macio.c#17 integrate
.. //depot/projects/smpng/sys/powerpc/powermac/pmu.c#1 branch
.. //depot/projects/smpng/sys/powerpc/powermac/pmuvar.h#1 branch
.. //depot/projects/smpng/sys/powerpc/powermac/viareg.h#1 branch
.. //depot/projects/smpng/sys/rpc/auth.h#2 integrate
.. //depot/projects/smpng/sys/rpc/auth_none.c#2 integrate
.. //depot/projects/smpng/sys/rpc/auth_unix.c#3 integrate
.. //depot/projects/smpng/sys/rpc/clnt.h#3 integrate
.. //depot/projects/smpng/sys/rpc/clnt_dg.c#3 integrate
.. //depot/projects/smpng/sys/rpc/clnt_rc.c#4 integrate
.. //depot/projects/smpng/sys/rpc/clnt_vc.c#3 integrate
.. //depot/projects/smpng/sys/rpc/replay.c#1 branch
.. //depot/projects/smpng/sys/rpc/replay.h#1 branch
.. //depot/projects/smpng/sys/rpc/rpc_com.h#2 integrate
.. //depot/projects/smpng/sys/rpc/rpc_generic.c#2 integrate
.. //depot/projects/smpng/sys/rpc/rpc_msg.h#2 integrate
.. //depot/projects/smpng/sys/rpc/rpc_prot.c#2 integrate
.. //depot/projects/smpng/sys/rpc/rpcclnt.c#18 integrate
.. //depot/projects/smpng/sys/rpc/rpcsec_gss.h#1 branch
.. //depot/projects/smpng/sys/rpc/rpcsec_gss/rpcsec_gss.c#1 branch
.. //depot/projects/smpng/sys/rpc/rpcsec_gss/rpcsec_gss_conf.c#1 branch
.. //depot/projects/smpng/sys/rpc/rpcsec_gss/rpcsec_gss_int.h#1 branch
.. //depot/projects/smpng/sys/rpc/rpcsec_gss/rpcsec_gss_misc.c#1 branch
.. //depot/projects/smpng/sys/rpc/rpcsec_gss/rpcsec_gss_prot.c#1 branch
.. //depot/projects/smpng/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c#1 branch
.. //depot/projects/smpng/sys/rpc/svc.c#2 integrate
.. //depot/projects/smpng/sys/rpc/svc.h#2 integrate
.. //depot/projects/smpng/sys/rpc/svc_auth.c#2 integrate
.. //depot/projects/smpng/sys/rpc/svc_auth.h#2 integrate
.. //depot/projects/smpng/sys/rpc/svc_auth_unix.c#2 integrate
.. //depot/projects/smpng/sys/rpc/svc_dg.c#2 integrate
.. //depot/projects/smpng/sys/rpc/svc_generic.c#2 integrate
.. //depot/projects/smpng/sys/rpc/svc_vc.c#3 integrate
.. //depot/projects/smpng/sys/rpc/xdr.h#2 integrate
.. //depot/projects/smpng/sys/security/audit/audit_bsm_klib.c#12 integrate
.. //depot/projects/smpng/sys/security/audit/audit_pipe.c#12 integrate
.. //depot/projects/smpng/sys/security/mac/mac_cred.c#1 branch
.. //depot/projects/smpng/sys/security/mac/mac_framework.h#13 integrate
.. //depot/projects/smpng/sys/security/mac/mac_inet6.c#2 integrate
.. //depot/projects/smpng/sys/security/mac/mac_policy.h#10 integrate
.. //depot/projects/smpng/sys/security/mac/mac_process.c#17 integrate
.. //depot/projects/smpng/sys/security/mac/mac_syscalls.c#7 integrate
.. //depot/projects/smpng/sys/security/mac/mac_vfs.c#21 integrate
.. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#54 integrate
.. //depot/projects/smpng/sys/security/mac_bsdextended/mac_bsdextended.c#30 integrate
.. //depot/projects/smpng/sys/security/mac_bsdextended/ugidfw_internal.h#1 branch
.. //depot/projects/smpng/sys/security/mac_bsdextended/ugidfw_system.c#1 branch
.. //depot/projects/smpng/sys/security/mac_bsdextended/ugidfw_vnode.c#1 branch
.. //depot/projects/smpng/sys/security/mac_lomac/mac_lomac.c#43 integrate
.. //depot/projects/smpng/sys/security/mac_mls/mac_mls.c#48 integrate
.. //depot/projects/smpng/sys/security/mac_partition/mac_partition.c#18 integrate
.. //depot/projects/smpng/sys/security/mac_stub/mac_stub.c#28 integrate
.. //depot/projects/smpng/sys/security/mac_test/mac_test.c#44 integrate
.. //depot/projects/smpng/sys/sparc64/pci/schizo.c#2 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/db_trace.c#29 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/stack_machdep.c#3 integrate
.. //depot/projects/smpng/sys/sun4v/sun4v/db_trace.c#3 integrate
.. //depot/projects/smpng/sys/sun4v/sun4v/stack_machdep.c#2 integrate
.. //depot/projects/smpng/sys/sys/_types.h#16 integrate
.. //depot/projects/smpng/sys/sys/cfictl.h#1 branch
.. //depot/projects/smpng/sys/sys/cons.h#13 integrate
.. //depot/projects/smpng/sys/sys/extattr.h#12 integrate
.. //depot/projects/smpng/sys/sys/malloc.h#27 integrate
.. //depot/projects/smpng/sys/sys/mount.h#67 integrate
.. //depot/projects/smpng/sys/sys/param.h#130 integrate
.. //depot/projects/smpng/sys/sys/proc.h#191 integrate
.. //depot/projects/smpng/sys/sys/syscall.h#86 integrate
.. //depot/projects/smpng/sys/sys/syscall.mk#86 integrate
.. //depot/projects/smpng/sys/sys/syscallsubr.h#56 integrate
.. //depot/projects/smpng/sys/sys/sysproto.h#90 integrate
.. //depot/projects/smpng/sys/sys/tty.h#27 integrate
.. //depot/projects/smpng/sys/sys/types.h#37 integrate
.. //depot/projects/smpng/sys/sys/user.h#33 integrate
.. //depot/projects/smpng/sys/sys/vnode.h#90 integrate
.. //depot/projects/smpng/sys/tools/vnode_if.awk#16 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_inode.c#30 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#70 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#72 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#106 integrate
.. //depot/projects/smpng/sys/ufs/ufs/ufs_dirhash.c#27 integrate
.. //depot/projects/smpng/sys/ufs/ufs/ufs_extattr.c#45 integrate
.. //depot/projects/smpng/sys/ufs/ufs/ufs_vfsops.c#25 integrate
.. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#71 integrate
.. //depot/projects/smpng/sys/vm/uma.h#23 integrate
.. //depot/projects/smpng/sys/vm/vm_mmap.c#71 integrate
.. //depot/projects/smpng/sys/xdr/xdr_mbuf.c#2 integrate
.. //depot/projects/smpng/sys/xen/evtchn/evtchn.c#3 integrate

Differences ...

==== //depot/projects/smpng/sys/amd64/amd64/dump_machdep.c#8 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.16 2008/10/01 22:08:53 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.17 2008/10/31 10:11:35 kib Exp $");
 
 #include 
 #include 
@@ -165,7 +165,7 @@
 	va = 0;
 	pgs = mdp->md_size / PAGE_SIZE;
 	pa = mdp->md_start;
-	maxdumppgs = di->maxiosize / PAGE_SIZE;
+	maxdumppgs = min(di->maxiosize / PAGE_SIZE, MAXDUMPPGS);
 	if (maxdumppgs == 0)	/* seatbelt */
 		maxdumppgs = 1;
 

==== //depot/projects/smpng/sys/amd64/amd64/identcpu.c#29 (text+ko) ====

@@ -39,7 +39,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.162 2008/10/21 00:38:00 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.164 2008/10/22 17:30:37 jkim Exp $");
 
 #include "opt_cpu.h"
 
@@ -347,10 +347,17 @@
 			    "AuthenticAMD") == 0)
 				cpu_feature &= ~CPUID_HTT;
 
+			/*
+			 * If this CPU supports P-state invariant TSC then
+			 * mention the capability.
+			 */
 			if (!tsc_is_invariant &&
-			    (amd_pminfo & AMDPM_TSC_INVARIANT)) {
+			    (strcmp(cpu_vendor, "AuthenticAMD") == 0 &&
+			    ((amd_pminfo & AMDPM_TSC_INVARIANT) != 0 ||
+			    AMD64_CPU_FAMILY(cpu_id) >= 0x10 ||
+			    cpu_id == 0x60fb2))) {
 				tsc_is_invariant = 1;
-				printf("\n  P-state invariant TSC");
+				printf("\n  TSC: P-state invariant");
 			}
 
 			/*

==== //depot/projects/smpng/sys/amd64/amd64/local_apic.c#35 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.46 2008/08/23 12:35:43 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.48 2008/10/27 21:45:18 sobomax Exp $");
 
 #include "opt_hwpmc_hooks.h"
 #include "opt_kdtrace.h"
@@ -401,7 +401,10 @@
 		lapic_timer_hz = hz * 2;
 	else
 		lapic_timer_hz = hz * 4;
-	stathz = lapic_timer_hz / (lapic_timer_hz / 128);
+	if (lapic_timer_hz < 128)
+		stathz = lapic_timer_hz;
+	else
+		stathz = lapic_timer_hz / (lapic_timer_hz / 128);
 	profhz = lapic_timer_hz;
 	lapic_timer_period = value / lapic_timer_hz;
 

==== //depot/projects/smpng/sys/amd64/amd64/minidump_machdep.c#7 (text) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.8 2008/10/01 22:08:53 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.9 2008/10/31 10:11:35 kib Exp $");
 
 #include 
 #include 
@@ -104,7 +104,7 @@
 	int error, i, c;
 	u_int maxdumpsz;
 
-	maxdumpsz = di->maxiosize;
+	maxdumpsz = min(di->maxiosize, MAXDUMPPGS * PAGE_SIZE);
 	if (maxdumpsz == 0)	/* seatbelt */
 		maxdumpsz = PAGE_SIZE;
 	error = 0;

==== //depot/projects/smpng/sys/amd64/include/specialreg.h#17 (text+ko) ====

@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)specialreg.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.47 2008/10/21 00:17:55 jkim Exp $
+ * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.49 2008/10/22 17:36:52 jkim Exp $
  */
 
 #ifndef _MACHINE_SPECIALREG_H_
@@ -153,6 +153,21 @@
 #define	AMDID2_PREFETCH	0x00000100
 
 /*
+ * CPUID instruction 1 eax info
+ */
+#define	CPUID_STEPPING		0x0000000f
+#define	CPUID_MODEL		0x000000f0
+#define	CPUID_FAMILY		0x00000f00
+#define	CPUID_EXT_MODEL		0x000f0000
+#define	CPUID_EXT_FAMILY	0x0ff00000
+#define	AMD64_CPU_MODEL(id) \
+    ((((id) & CPUID_MODEL) >> 4) | \
+    (((id) & CPUID_EXT_MODEL) >> 12))
+#define	AMD64_CPU_FAMILY(id) \
+    ((((id) & CPUID_FAMILY) >> 8) + \
+    (((id) & CPUID_EXT_FAMILY) >> 20))
+
+/*
  * CPUID instruction 1 ebx info
  */
 #define	CPUID_BRAND_INDEX	0x000000ff

==== //depot/projects/smpng/sys/arm/arm/undefined.c#16 (text+ko) ====

@@ -48,7 +48,7 @@
 #include "opt_ddb.h"
 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.15 2007/06/04 21:38:45 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.16 2008/10/23 15:53:51 des Exp $");
 
 #include 
 #include 
@@ -106,7 +106,7 @@
 	KASSERT(handler != NULL, ("handler is NULL")); /* Used to be legal. */
 
 	/* XXX: M_TEMP??? */
-	MALLOC(uh, struct undefined_handler *, sizeof(*uh), M_TEMP, M_WAITOK);
+	uh = malloc(sizeof(*uh), M_TEMP, M_WAITOK);
 	uh->uh_handler = handler;
 	install_coproc_handler_static(coproc, uh);
 	return uh;
@@ -125,7 +125,7 @@
 	struct undefined_handler *uh = cookie;
 
 	LIST_REMOVE(uh, uh_link);
-	FREE(uh, M_TEMP);
+	free(uh, M_TEMP);
 }
 
 

==== //depot/projects/smpng/sys/arm/at91/at91.c#15 (text) ====

@@ -23,7 +23,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.18 2008/09/05 22:27:10 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.20 2008/10/26 22:53:59 stas Exp $");
 
 #include 
 #include 
@@ -168,6 +168,42 @@
 	generic_armv4_bs_c_2,
 	NULL,
 	NULL,
+
+	/* read (single) stream */
+	generic_bs_r_1,
+	generic_armv4_bs_r_2,
+	generic_bs_r_4,
+	NULL,
+
+	/* read multiple stream */
+	generic_bs_rm_1,
+	generic_armv4_bs_rm_2,
+	generic_bs_rm_4,
+	NULL,
+
+	/* read region stream */
+	generic_bs_rr_1,
+	generic_armv4_bs_rr_2,
+	generic_bs_rr_4,
+	NULL,
+
+	/* write (single) stream */
+	generic_bs_w_1,
+	generic_armv4_bs_w_2,
+	generic_bs_w_4,
+	NULL,
+
+	/* write multiple stream */
+	generic_bs_wm_1,
+	generic_armv4_bs_wm_2,
+	generic_bs_wm_4,
+	NULL,
+
+	/* write region stream */
+	NULL,
+	generic_armv4_bs_wr_2,
+	generic_bs_wr_4,
+	NULL,
 };
 
 static int
@@ -534,8 +570,10 @@
 	case SYS_RES_MEMORY:
 		rle->res = rman_reserve_resource(&sc->sc_mem_rman,
 		    start, end, count, flags, child);
-		rman_set_bustag(rle->res, &at91_bs_tag);
-		rman_set_bushandle(rle->res, start);
+		if (rle->res != NULL) {
+			rman_set_bustag(rle->res, &at91_bs_tag);
+			rman_set_bushandle(rle->res, start);
+		}
 		break;
 	}
 	if (rle->res) {

==== //depot/projects/smpng/sys/arm/at91/at91_mci.c#8 (text+ko) ====

@@ -24,7 +24,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.8 2008/10/07 17:23:16 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.9 2008/10/29 20:01:26 mav Exp $");
 
 #include 
 #include 
@@ -642,6 +642,9 @@
 	case MMCBR_IVAR_VDD:
 		*(int *)result = sc->host.ios.vdd;
 		break;
+	case MMCBR_IVAR_MAX_DATA:
+		*(int *)result = 1;
+		break;
 	}
 	return (0);
 }
@@ -682,6 +685,7 @@
 	case MMCBR_IVAR_HOST_OCR:
 	case MMCBR_IVAR_F_MIN:
 	case MMCBR_IVAR_F_MAX:
+	case MMCBR_IVAR_MAX_DATA:
 		return (EINVAL);
 	}
 	return (0);

==== //depot/projects/smpng/sys/arm/conf/AVILA#9 (text+ko) ====

@@ -16,9 +16,8 @@
 # If you are in doubt as to the purpose or necessity of a line, check first 
 # in NOTES.
 #
-# $FreeBSD: src/sys/arm/conf/AVILA,v 1.16 2008/08/02 22:53:43 imp Exp $
+# $FreeBSD: src/sys/arm/conf/AVILA,v 1.17 2008/10/23 01:51:55 marcel Exp $
 
-machine		arm
 ident		AVILA
 
 options 	PHYSADDR=0x10000000
@@ -80,7 +79,6 @@
 #options 	PREEMPTION
 #options 	VERBOSE_SYSINIT
 
-device		mem			# Memory and kernel memory devices
 #device		saarm
 
 device		pci

==== //depot/projects/smpng/sys/arm/conf/BWCT#5 (text+ko) ====

@@ -15,9 +15,8 @@
 # If you are in doubt as to the purpose or necessity of a line, check first 
 # in NOTES.
 #
-# $FreeBSD: src/sys/arm/conf/BWCT,v 1.5 2008/04/21 10:09:54 phk Exp $
+# $FreeBSD: src/sys/arm/conf/BWCT,v 1.6 2008/10/23 01:51:55 marcel Exp $
 
-machine		arm
 ident		BWCT
 
 options	VERBOSE_INIT_ARM
@@ -85,7 +84,6 @@
 #options 	WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed
 #options		DIAGNOSTIC
 
-device		mem			# Memory and kernel memory devices
 device		md
 device		at91_twi		# TWI: Two Wire Interface
 device		at91_spi		# SPI:

==== //depot/projects/smpng/sys/arm/conf/CRB#4 (text+ko) ====

@@ -15,9 +15,8 @@
 # If you are in doubt as to the purpose or necessity of a line, check first 
 # in NOTES.
 #
-# $FreeBSD: src/sys/arm/conf/CRB,v 1.5 2008/04/21 10:09:54 phk Exp $
+# $FreeBSD: src/sys/arm/conf/CRB,v 1.6 2008/10/23 01:51:55 marcel Exp $
 
-machine		arm
 ident		CRB
 
 options 	PHYSADDR=0x00000000
@@ -67,7 +66,6 @@
 #options		PREEMPTION
 device		loop
 device		ether
-device		mem			# Memory and kernel memory devices
 #device		saarm
 device		miibus
 device		rl

==== //depot/projects/smpng/sys/arm/conf/DB-78XXX#2 (text+ko) ====

@@ -1,10 +1,9 @@
 #
 # Custom kernel for Marvell DB-78xx boards.
 #
-# $FreeBSD: src/sys/arm/conf/DB-78XXX,v 1.1 2008/10/14 08:18:27 raj Exp $
+# $FreeBSD: src/sys/arm/conf/DB-78XXX,v 1.2 2008/10/23 01:51:55 marcel Exp $
 #
 
-machine		arm
 ident		DB-88F78XX
 include		"../mv/discovery/std.db78xxx"
 
@@ -49,7 +48,6 @@
 
 # Pseudo devices
 device		loop
-device		mem
 device		md
 device		pty
 device		random

==== //depot/projects/smpng/sys/arm/conf/DB-88F5XXX#2 (text+ko) ====

@@ -1,10 +1,9 @@
 #
 # Custom kernel for Marvell DB-88F5xxx boards.
 #
-# $FreeBSD: src/sys/arm/conf/DB-88F5XXX,v 1.1 2008/10/14 08:18:27 raj Exp $
+# $FreeBSD: src/sys/arm/conf/DB-88F5XXX,v 1.2 2008/10/23 01:51:55 marcel Exp $
 #
 
-machine		arm
 ident		DB-88F5XXX
 include		"../mv/orion/std.db88f5xxx"
 
@@ -48,7 +47,6 @@
 #options		WITNESS_KDB
 
 # Pseudo devices
-device		mem
 device		md
 device		loop
 device		pty

==== //depot/projects/smpng/sys/arm/conf/DB-88F6XXX#2 (text+ko) ====

@@ -1,10 +1,9 @@
 #
 # Custom kernel for Marvell DB-88F6xxx boards.
 #
-# $FreeBSD: src/sys/arm/conf/DB-88F6XXX,v 1.1 2008/10/14 08:18:27 raj Exp $
+# $FreeBSD: src/sys/arm/conf/DB-88F6XXX,v 1.2 2008/10/23 01:51:55 marcel Exp $
 #
 
-machine		arm
 ident		DB-88F6XXX
 include		"../mv/kirkwood/std.db88f6xxx"
 
@@ -49,7 +48,6 @@
 
 # Pseudo devices
 device		loop
-device		mem
 device		md
 device		pty

>>> TRUNCATED FOR MAIL (1000 lines) <<<
From peter at FreeBSD.org  Mon Nov  3 13:53:31 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Mon Nov  3 13:53:37 2008
Subject: PERFORCE change 152429 for review
Message-ID: <200811032153.mA3LrUre057653@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152429

Change 152429 by peter@peter_overcee on 2008/11/03 21:53:10

	something in the toolchain on amd64 seems to generate call frame records
	that point to slightly before where valgrind things the text segment started.
	I assume this is PLT or something else.  Ignore it for now.  I don't think
	it can lead to the overlaps that the invariant checks are worried about.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_debuginfo/debuginfo.c#7 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_debuginfo/debuginfo.c#7 (text+ko) ====

@@ -523,8 +523,11 @@
    di2 = NULL;
    /* invariant (2) */
    if (di->cfsi) {
+//VG_(printf)("cfsi_minavma %#lx cfsi_maxavma %#lx rx_map_avma %#lx rx_map_size %#lx end %#lx\n", di->cfsi_minavma, di->cfsi_maxavma, di->rx_map_avma, di->rx_map_size, di->rx_map_avma + di->rx_map_size);
       vg_assert(di->cfsi_minavma <= di->cfsi_maxavma); /* duh! */
+#if !defined(VGP_amd64_freebsd)	/* gcc does something wierd here */
       vg_assert(di->cfsi_minavma >= di->rx_map_avma);
+#endif
       vg_assert(di->cfsi_maxavma < di->rx_map_avma + di->rx_map_size);
    }
    /* invariants (3) and (4) */
From peter at FreeBSD.org  Mon Nov  3 13:54:32 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Mon Nov  3 13:54:47 2008
Subject: PERFORCE change 152430 for review
Message-ID: <200811032154.mA3LsV23057720@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152430

Change 152430 by peter@peter_overcee on 2008/11/03 21:53:57

	Large apps overflow the buffer.  That pathname[PATH_MAX] in each record adds up.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-freebsd.c#10 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-freebsd.c#10 (text+ko) ====

@@ -2914,7 +2914,7 @@
 #if __FreeBSD__ >= 7
 
 /* Size of a smallish table used to read /proc/self/map entries. */
-#define M_PROCMAP_BUF 100000
+#define M_PROCMAP_BUF 1000000
 
 /* static ... to keep it out of the stack frame. */
 static Char procmap_buf[M_PROCMAP_BUF];
From peter at FreeBSD.org  Mon Nov  3 13:54:33 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Mon Nov  3 13:54:47 2008
Subject: PERFORCE change 152431 for review
Message-ID: <200811032154.mA3LsVbR057725@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152431

Change 152431 by peter@peter_overcee on 2008/11/03 21:54:29

	Have a debug ld-elf for now.

Affected files ...

.. //depot/projects/hammer/libexec/rtld-elf/Makefile#20 edit

Differences ...

==== //depot/projects/hammer/libexec/rtld-elf/Makefile#20 (text+ko) ====

@@ -10,7 +10,7 @@
 		malloc.c xmalloc.c debug.c libmap.c
 MAN=		rtld.1
 CSTD?=		gnu99
-CFLAGS+=	-Wall -DFREEBSD_ELF -DIN_RTLD
+CFLAGS+=	-Wall -DFREEBSD_ELF -DIN_RTLD -g -DDEBUG
 CFLAGS+=	-I${.CURDIR}/${MACHINE_ARCH} -I${.CURDIR}
 LDFLAGS+=	-nostdlib -e .rtld_start
 INSTALLFLAGS=	-C -b
From peter at FreeBSD.org  Mon Nov  3 14:06:45 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Mon Nov  3 14:06:51 2008
Subject: PERFORCE change 152432 for review
Message-ID: <200811032206.mA3M6iH2059801@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152432

Change 152432 by peter@peter_overcee on 2008/11/03 22:06:17

	Add some more umtx placeholders.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_syswrap/priv_syswrap-freebsd.h#11 edit
.. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#20 edit
.. //depot/projects/valgrind/include/vki/vki-freebsd.h#10 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_syswrap/priv_syswrap-freebsd.h#11 (text+ko) ====

@@ -225,6 +225,8 @@
 DECL_TEMPLATE(freebsd, sys_pread7);
 DECL_TEMPLATE(freebsd, sys_pwrite7);
 DECL_TEMPLATE(freebsd, sys__umtx_op);
+DECL_TEMPLATE(freebsd, sys__umtx_lock);
+DECL_TEMPLATE(freebsd, sys__umtx_unlock);
 DECL_TEMPLATE(freebsd, sys_thr_kill2);
 DECL_TEMPLATE(freebsd, sys_shm_open);
 DECL_TEMPLATE(freebsd, sys_shm_unlink);

==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#20 (text+ko) ====

@@ -1814,6 +1814,30 @@
       PRINT( "sys__umtx_op ( %#lx, CV_BROADCAST, %ld, %#lx, %#lx)",
 	 ARG1, ARG3, ARG4, ARG5);
       break;
+   case VKI_UMTX_OP_WAIT_UINT:
+      PRINT( "sys__umtx_op ( %#lx, CV_WAIT_UINT)", ARG1);
+      break;
+   case VKI_UMTX_OP_RW_RDLOCK:
+      PRINT( "sys__umtx_op ( %#lx, CV_RW_RDLOCK)", ARG1);
+      break;
+   case VKI_UMTX_OP_RW_WRLOCK:
+      PRINT( "sys__umtx_op ( %#lx, CV_RW_WRLOCK)", ARG1);
+      break;
+   case VKI_UMTX_OP_RW_UNLOCK:
+      PRINT( "sys__umtx_op ( %#lx, CV_RW_UNLOCK)", ARG1);
+      break;
+   case VKI_UMTX_OP_WAIT_UINT_PRIVATE:
+      PRINT( "sys__umtx_op ( %#lx, CV_WAIT_UINT_PRIVATE)", ARG1);
+      break;
+   case VKI_UMTX_OP_WAKE_PRIVATE:
+      PRINT( "sys__umtx_op ( %#lx, CV_WAKE_PRIVATE)", ARG1);
+      break;
+   case VKI_UMTX_OP_MUTEX_WAIT:
+      PRINT( "sys__umtx_op ( %#lx, CV_MUTEX_WAIT)", ARG1);
+      break;
+   case VKI_UMTX_OP_MUTEX_WAKE:
+      PRINT( "sys__umtx_op ( %#lx, CV_MUTEX_WAKE)", ARG1);
+      break;
    default:
 	/* XXX: PHK ?? */
 	break;
@@ -1824,6 +1848,24 @@
 {
 }
 
+PRE(sys__umtx_lock)
+{
+   PRINT( "sys__umtx_lock ( %#lx )", ARG1);
+}
+
+POST(sys__umtx_lock)
+{
+}
+
+PRE(sys__umtx_unlock)
+{
+   PRINT( "sys__umtx_unlock ( %#lx )", ARG1);
+}
+
+POST(sys__umtx_unlock)
+{
+}
+
 PRE(sys_rtprio_thread)
 {
    PRINT( "sys_rtprio_thread ( %ld, %ld, %#lx )", ARG1, ARG2, ARG3 );
@@ -3202,8 +3244,8 @@
 
    BSDXY(__NR_thr_self, 		sys_thr_self),			// 432
    // thr_kill								   433
-   // _umtx_lock							   434
-   // _umtx_unlock							   435
+   BSDXY(__NR__umtx_lock,		sys__umtx_lock),		// 434
+   BSDXY(__NR__umtx_unlock,		sys__umtx_unlock),		// 435
 
    // jail_attach							   436
    // extattr_list_fd							   437

==== //depot/projects/valgrind/include/vki/vki-freebsd.h#10 (text+ko) ====

@@ -1698,6 +1698,27 @@
 	unsigned long	u_owner;
 };
 
+struct vki_umutex {
+	vki_lwpid_t	m_owner;
+	vki_uint32_t	m_flags;
+	vki_uint32_t	m_ceilings[2];
+	vki_uint32_t	m_spare[4];
+};
+
+struct vki_ucond {
+	vki_uint32_t	c_has_waiters;
+	vki_uint32_t 	c_flags;
+	vki_uint32_t	c_spare[2];
+};
+
+struct vki_urwlock {
+	vki_uint32_t	rw_state;
+	vki_uint32_t	rw_flags;
+	vki_uint32_t	rw_blocked_readers;
+	vki_uint32_t	rw_blocked_writers;
+	vki_uint32_t	rw_spare[4];
+};
+
 #define	VKI_UMTX_OP_LOCK		0
 #define	VKI_UMTX_OP_UNLOCK		1
 #define	VKI_UMTX_OP_WAIT		2
@@ -1709,7 +1730,15 @@
 #define	VKI_UMTX_OP_CV_WAIT		8
 #define	VKI_UMTX_OP_CV_SIGNAL		9
 #define	VKI_UMTX_OP_CV_BROADCAST	10
-#define	VKI_UMTX_OP_MAX			11
+#define	VKI_UMTX_OP_WAIT_UINT		11
+#define	VKI_UMTX_OP_RW_RDLOCK		12
+#define	VKI_UMTX_OP_RW_WRLOCK		13
+#define	VKI_UMTX_OP_RW_UNLOCK		14
+#define	VKI_UMTX_OP_WAIT_UINT_PRIVATE	15
+#define	VKI_UMTX_OP_WAKE_PRIVATE	16
+#define	VKI_UMTX_OP_MUTEX_WAIT		17
+#define	VKI_UMTX_OP_MUTEX_WAKE		18
+#define	VKI_UMTX_OP_MAX			19
 
 
 //----------------------------------------------------------------------
From peter at FreeBSD.org  Mon Nov  3 15:00:38 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Mon Nov  3 15:00:44 2008
Subject: PERFORCE change 152437 for review
Message-ID: <200811032300.mA3N0awO063995@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152437

Change 152437 by peter@peter_overcee on 2008/11/03 23:00:10

	Begin fleshing out umtx op wrappers and side effects

Affected files ...

.. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#21 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#21 (text+ko) ====

@@ -1774,96 +1774,155 @@
 
 PRE(sys__umtx_op)
 {
+   /* 5 args are always passed through.  The last two can vary, but
+      they're always pointers.  They may not be used though. */
    switch(ARG2) {
    case VKI_UMTX_OP_LOCK:
       PRINT( "sys__umtx_op ( %#lx, LOCK, %ld, %#lx, %#lx)", ARG1, ARG3, ARG4, ARG5);
+      PRE_REG_READ5(long, "_umtx_op_lock",
+                    struct umtx *, obj, int, op, unsigned long, id,
+                    void *, zero, struct vki_timespec *, timeout);
+      PRE_MEM_READ( "_umtx_op_lock(mtx)", ARG1, sizeof(struct vki_umtx) );
+      if (ARG5)
+	 PRE_MEM_READ( "_umtx_op_lock(timespec)", ARG5, sizeof(struct vki_timespec) );
+      PRE_MEM_WRITE( "_umtx_op_lock(mtx)", ARG1, sizeof(struct vki_umtx) );
       break;
    case VKI_UMTX_OP_UNLOCK:
-      PRINT( "sys__umtx_op ( %#lx, UNLOCK, %ld, %#lx, %#lx)", ARG1, ARG3, ARG4, ARG5);
+      PRINT( "sys__umtx_op ( %#lx, UNLOCK, %ld)", ARG1, ARG3);
+      PRE_REG_READ3(long, "_umtx_op_unlock",
+                    struct umtx *, obj, int, op, unsigned long, id);
+      PRE_MEM_READ( "_umtx_op_lock(mtx)", ARG1, sizeof(struct vki_umtx) );
+      PRE_MEM_WRITE( "_umtx_op_lock(mtx)", ARG1, sizeof(struct vki_umtx) );
       break;
    case VKI_UMTX_OP_WAIT:
       PRINT( "sys__umtx_op ( %#lx, WAIT, %ld, %#lx, %#lx)", ARG1, ARG3, ARG4, ARG5);
+      PRE_REG_READ5(long, "_umtx_op_wait",
+                    struct umtx *, obj, int, op, unsigned long, id,
+                    void *, zero, struct vki_timespec *, timeout);
+      PRE_MEM_READ( "_umtx_op_wait(mtx)", ARG1, sizeof(struct vki_umtx) );
+      if (ARG5)
+	 PRE_MEM_READ( "_umtx_op_wait(timespec)", ARG5, sizeof(struct vki_timespec) );
       break;
    case VKI_UMTX_OP_WAKE:
-      PRINT( "sys__umtx_op ( %#lx, WAKE, %ld, %#lx, %#lx)", ARG1, ARG3, ARG4, ARG5);
+      PRINT( "sys__umtx_op ( %#lx, WAKE, %ld)", ARG1, ARG3);
+      PRE_REG_READ3(long, "_umtx_op_wake",
+                    struct umtx *, obj, int, op, unsigned long, id);
+      PRE_MEM_READ( "_umtx_op_wake(mtx)", ARG1, sizeof(struct vki_umtx) );
       break;
    case VKI_UMTX_OP_MUTEX_TRYLOCK:
-      PRINT( "sys__umtx_op ( %#lx, MUTEX_TRYLOCK, %ld, %#lx, %#lx)",
-	 ARG1, ARG3, ARG4, ARG5);
+      PRINT( "sys__umtx_op ( %#lx, MUTEX_TRYLOCK, %ld, %#lx, %#lx)", ARG1, ARG3, ARG4, ARG5);
       break;
    case VKI_UMTX_OP_MUTEX_LOCK:
-      PRINT( "sys__umtx_op ( %#lx, MUTEX_LOCK, %ld, %#lx, %#lx)",
-	 ARG1, ARG3, ARG4, ARG5);
+      PRINT( "sys__umtx_op ( %#lx, MUTEX_LOCK, %ld, %#lx, %#lx)", ARG1, ARG3, ARG4, ARG5);
       break;
    case VKI_UMTX_OP_MUTEX_UNLOCK:
-      PRINT( "sys__umtx_op ( %#lx, MUTEX_UNLOCK, %ld, %#lx, %#lx)",
-	 ARG1, ARG3, ARG4, ARG5);
+      PRINT( "sys__umtx_op ( %#lx, MUTEX_UNLOCK, %ld, %#lx, %#lx)", ARG1, ARG3, ARG4, ARG5);
       break;
    case VKI_UMTX_OP_SET_CEILING:
-      PRINT( "sys__umtx_op ( %#lx, SET_CEILING, %ld, %#lx, %#lx)",
-	 ARG1, ARG3, ARG4, ARG5);
+      PRINT( "sys__umtx_op ( %#lx, SET_CEILING, %ld, %#lx, %#lx)", ARG1, ARG3, ARG4, ARG5);
       break;
    case VKI_UMTX_OP_CV_WAIT:
       PRINT( "sys__umtx_op ( %#lx, CV_WAIT, %ld, %#lx, %#lx)", ARG1, ARG3, ARG4, ARG5);
       break;
    case VKI_UMTX_OP_CV_SIGNAL:
-      PRINT( "sys__umtx_op ( %#lx, CV_SIGNAL, %ld, %#lx, %#lx)",
-	 ARG1, ARG3, ARG4, ARG5);
+      PRINT( "sys__umtx_op ( %#lx, CV_SIGNAL, %ld, %#lx, %#lx)", ARG1, ARG3, ARG4, ARG5);
       break;
    case VKI_UMTX_OP_CV_BROADCAST:
-      PRINT( "sys__umtx_op ( %#lx, CV_BROADCAST, %ld, %#lx, %#lx)",
-	 ARG1, ARG3, ARG4, ARG5);
+      PRINT( "sys__umtx_op ( %#lx, CV_BROADCAST, %ld, %#lx, %#lx)", ARG1, ARG3, ARG4, ARG5);
       break;
    case VKI_UMTX_OP_WAIT_UINT:
-      PRINT( "sys__umtx_op ( %#lx, CV_WAIT_UINT)", ARG1);
+      PRINT( "sys__umtx_op ( %#lx, CV_WAIT_UINT, %ld, %#lx, %#lx)", ARG1, ARG3, ARG4, ARG5);
+      PRE_REG_READ5(long, "_umtx_op_wait_uint",
+                    int *, obj, int, op, unsigned long, id,
+                    void *, zero, struct vki_timespec *, timeout);
+      PRE_MEM_READ( "_umtx_op_wait(uint)", ARG1, sizeof(int) );
+      if (ARG5)
+	 PRE_MEM_READ( "_umtx_op_wait(timespec)", ARG5, sizeof(struct vki_timespec) );
       break;
    case VKI_UMTX_OP_RW_RDLOCK:
-      PRINT( "sys__umtx_op ( %#lx, CV_RW_RDLOCK)", ARG1);
+      PRINT( "sys__umtx_op ( %#lx, CV_RW_RDLOCK, %ld, %#lx, %#lx)", ARG1, ARG3, ARG4, ARG5);
       break;
    case VKI_UMTX_OP_RW_WRLOCK:
-      PRINT( "sys__umtx_op ( %#lx, CV_RW_WRLOCK)", ARG1);
+      PRINT( "sys__umtx_op ( %#lx, CV_RW_WRLOCK, %ld, %#lx, %#lx)", ARG1, ARG3, ARG4, ARG5);
       break;
    case VKI_UMTX_OP_RW_UNLOCK:
-      PRINT( "sys__umtx_op ( %#lx, CV_RW_UNLOCK)", ARG1);
+      PRINT( "sys__umtx_op ( %#lx, CV_RW_UNLOCK, %ld, %#lx, %#lx)", ARG1, ARG3, ARG4, ARG5);
       break;
    case VKI_UMTX_OP_WAIT_UINT_PRIVATE:
-      PRINT( "sys__umtx_op ( %#lx, CV_WAIT_UINT_PRIVATE)", ARG1);
+      PRINT( "sys__umtx_op ( %#lx, CV_WAIT_UINT_PRIVATE, %ld, %#lx, %#lx)", ARG1, ARG3, ARG4, ARG5);
+      PRE_REG_READ5(long, "_umtx_op_wait_uint_private",
+                    int *, obj, int, op, unsigned long, id,
+                    void *, zero, struct vki_timespec *, timeout);
+      PRE_MEM_READ( "_umtx_op_wait_private(uint)", ARG1, sizeof(int) );
+      if (ARG5)
+	 PRE_MEM_READ( "_umtx_op_wait_private(timespec)", ARG5, sizeof(struct vki_timespec) );
       break;
    case VKI_UMTX_OP_WAKE_PRIVATE:
-      PRINT( "sys__umtx_op ( %#lx, CV_WAKE_PRIVATE)", ARG1);
+      PRINT( "sys__umtx_op ( %#lx, CV_WAKE_PRIVATE, %ld)", ARG1, ARG3);
+      PRE_REG_READ3(long, "_umtx_op_wake_private",
+                    struct umtx *, obj, int, op, unsigned long, id);
+      PRE_MEM_READ( "_umtx_op_wake_private(mtx)", ARG1, sizeof(struct vki_umtx) );
       break;
    case VKI_UMTX_OP_MUTEX_WAIT:
-      PRINT( "sys__umtx_op ( %#lx, CV_MUTEX_WAIT)", ARG1);
+      PRINT( "sys__umtx_op ( %#lx, CV_MUTEX_WAIT, %ld, %#lx, %#lx)", ARG1, ARG3, ARG4, ARG5);
       break;
    case VKI_UMTX_OP_MUTEX_WAKE:
-      PRINT( "sys__umtx_op ( %#lx, CV_MUTEX_WAKE)", ARG1);
+      PRINT( "sys__umtx_op ( %#lx, CV_MUTEX_WAKE, %ld, %#lx, %#lx)", ARG1, ARG3, ARG4, ARG5);
       break;
    default:
-	/* XXX: PHK ?? */
-	break;
+      PRINT( "sys__umtx_op ( %#lx, %ld(UNKNOWN), %ld, %#lx, %#lx )", ARG1, ARG2, ARG3, ARG4, ARG5);
+      break;
    }
 }
 
 POST(sys__umtx_op)
 {
+   switch(ARG2) {
+   case VKI_UMTX_OP_LOCK:
+      if (SUCCESS)
+         POST_MEM_WRITE( ARG1, sizeof(struct vki_umtx) );
+      break;
+   case VKI_UMTX_OP_UNLOCK:
+      if (SUCCESS)
+         POST_MEM_WRITE( ARG1, sizeof(struct vki_umtx) );
+      break;
+   case VKI_UMTX_OP_WAIT:
+   case VKI_UMTX_OP_WAKE:
+   case VKI_UMTX_OP_WAIT_UINT:
+   case VKI_UMTX_OP_WAIT_UINT_PRIVATE:
+   case VKI_UMTX_OP_WAKE_PRIVATE:
+      break;
+   default:
+      break;
+   }
 }
 
 PRE(sys__umtx_lock)
 {
    PRINT( "sys__umtx_lock ( %#lx )", ARG1);
+   PRE_REG_READ1(long, "_umtx_lock", struct vki_umtx *, umtx);
+   PRE_MEM_READ( "_umtx_lock(mtx)", ARG1, sizeof(struct vki_umtx) );
+   PRE_MEM_WRITE( "_umtx_lock(mtx)", ARG1, sizeof(struct vki_umtx) );
 }
 
 POST(sys__umtx_lock)
 {
+   if (SUCCESS)
+       POST_MEM_WRITE(ARG1, sizeof(struct vki_umtx));
 }
 
 PRE(sys__umtx_unlock)
 {
    PRINT( "sys__umtx_unlock ( %#lx )", ARG1);
+   PRE_REG_READ1(long, "_umtx_unlock", struct vki_umtx *, umtx);
+   PRE_MEM_READ( "_umtx_unlock(mtx)", ARG1, sizeof(struct vki_umtx) );
+   PRE_MEM_WRITE( "_umtx_unlock(mtx)", ARG1, sizeof(struct vki_umtx) );
 }
 
 POST(sys__umtx_unlock)
 {
+   if (SUCCESS)
+      POST_MEM_WRITE(ARG1, sizeof(struct vki_umtx));
 }
 
 PRE(sys_rtprio_thread)
From peter at FreeBSD.org  Mon Nov  3 19:34:16 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Mon Nov  3 19:34:27 2008
Subject: PERFORCE change 152441 for review
Message-ID: <200811040334.mA43YFMu007533@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152441

Change 152441 by peter@peter_overcee on 2008/11/04 03:33:24

	If we're going to pass garbage into the kernel, pass known garbage.
	(Complained about by valgrind)

Affected files ...

.. //depot/projects/hammer/lib/libthr/thread/thr_rtld.c#7 edit

Differences ...

==== //depot/projects/hammer/lib/libthr/thread/thr_rtld.c#7 (text) ====

@@ -180,7 +180,7 @@
 {
 	struct RtldLockInfo	li;
 	struct pthread		*curthread;
-	long dummy;
+	long dummy = -1;
 
 	curthread = _get_curthread();
 
From peter at FreeBSD.org  Mon Nov  3 19:34:17 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Mon Nov  3 19:34:27 2008
Subject: PERFORCE change 152442 for review
Message-ID: <200811040334.mA43YFJU007538@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152442

Change 152442 by peter@peter_overcee on 2008/11/04 03:33:58

	Flesh out more umtx_op()'s

Affected files ...

.. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#22 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#22 (text+ko) ====

@@ -1791,8 +1791,8 @@
       PRINT( "sys__umtx_op ( %#lx, UNLOCK, %ld)", ARG1, ARG3);
       PRE_REG_READ3(long, "_umtx_op_unlock",
                     struct umtx *, obj, int, op, unsigned long, id);
-      PRE_MEM_READ( "_umtx_op_lock(mtx)", ARG1, sizeof(struct vki_umtx) );
-      PRE_MEM_WRITE( "_umtx_op_lock(mtx)", ARG1, sizeof(struct vki_umtx) );
+      PRE_MEM_READ( "_umtx_op_unlock(mtx)", ARG1, sizeof(struct vki_umtx) );
+      PRE_MEM_WRITE( "_umtx_op_unlock(mtx)", ARG1, sizeof(struct vki_umtx) );
       break;
    case VKI_UMTX_OP_WAIT:
       PRINT( "sys__umtx_op ( %#lx, WAIT, %ld, %#lx, %#lx)", ARG1, ARG3, ARG4, ARG5);
@@ -1811,24 +1811,66 @@
       break;
    case VKI_UMTX_OP_MUTEX_TRYLOCK:
       PRINT( "sys__umtx_op ( %#lx, MUTEX_TRYLOCK, %ld, %#lx, %#lx)", ARG1, ARG3, ARG4, ARG5);
+      PRE_REG_READ5(long, "_umtx_op_mutex_trylock",
+                    struct umutex *, obj, int, op, unsigned long, noid,
+                    void *, zero, struct vki_timespec *, timeout);
+      PRE_MEM_READ( "_umtx_op_mutex_trylock(mutex)", ARG1, sizeof(struct vki_umutex) );
+      if (ARG5)
+	 PRE_MEM_READ( "_umtx_op_mutex_trylock(timespec)", ARG5, sizeof(struct vki_timespec) );
+      PRE_MEM_WRITE( "_umtx_op_mutex_trylock(mutex)", ARG1, sizeof(struct vki_umutex) );
       break;
    case VKI_UMTX_OP_MUTEX_LOCK:
       PRINT( "sys__umtx_op ( %#lx, MUTEX_LOCK, %ld, %#lx, %#lx)", ARG1, ARG3, ARG4, ARG5);
+      PRE_REG_READ5(long, "_umtx_op_mutex_lock",
+                    struct umutex *, obj, int, op, unsigned long, noid,
+                    void *, zero, struct vki_timespec *, timeout);
+      PRE_MEM_READ( "_umtx_op_mutex_lock(mutex)", ARG1, sizeof(struct vki_umutex) );
+      if (ARG5)
+	 PRE_MEM_READ( "_umtx_op_mutex_lock(timespec)", ARG5, sizeof(struct vki_timespec) );
+      PRE_MEM_WRITE( "_umtx_op_mutex_lock(mutex)", ARG1, sizeof(struct vki_umutex) );
       break;
    case VKI_UMTX_OP_MUTEX_UNLOCK:
-      PRINT( "sys__umtx_op ( %#lx, MUTEX_UNLOCK, %ld, %#lx, %#lx)", ARG1, ARG3, ARG4, ARG5);
+      PRINT( "sys__umtx_op ( %#lx, MUTEX_UNLOCK)", ARG1);
+      PRE_REG_READ2(long, "_umtx_op_mutex_unlock",
+                    struct umutex *, obj, int, op);
+      PRE_MEM_READ( "_umtx_op_mutex_unlock(mutex)", ARG1, sizeof(struct vki_umutex) );
+      PRE_MEM_WRITE( "_umtx_op_mutex_unlock(mutex)", ARG1, sizeof(struct vki_umutex) );
       break;
    case VKI_UMTX_OP_SET_CEILING:
-      PRINT( "sys__umtx_op ( %#lx, SET_CEILING, %ld, %#lx, %#lx)", ARG1, ARG3, ARG4, ARG5);
+      PRINT( "sys__umtx_op ( %#lx, SET_CEILING, %ld, %#lx)", ARG1, ARG3, ARG4);
+      PRE_REG_READ4(long, "_umtx_op_set_ceiling",
+                    struct umutex *, obj, int, op, unsigned int, ceiling,
+                    unsigned int *, old_ceiling);
+      PRE_MEM_READ( "_umtx_op_set_ceiling(mutex)", ARG1, sizeof(struct vki_umutex) );
+      PRE_MEM_WRITE( "_umtx_op_set_ceiling(mutex)", ARG1, sizeof(struct vki_umutex) );
+      if (ARG4)
+         PRE_MEM_WRITE( "_umtx_op_set_ceiling(old_ceiling)", ARG4, sizeof(vki_uint32_t) );
       break;
    case VKI_UMTX_OP_CV_WAIT:
       PRINT( "sys__umtx_op ( %#lx, CV_WAIT, %ld, %#lx, %#lx)", ARG1, ARG3, ARG4, ARG5);
+      PRE_REG_READ5(long, "_umtx_op_cv_wait",
+                    struct ucond *, obj, int, op, unsigned long, wflags,
+                    struct umutex *, umtx, struct vki_timespec *, timeout);
+      PRE_MEM_READ( "_umtx_op_cv_wait(cond)", ARG1, sizeof(struct vki_ucond) );
+      PRE_MEM_WRITE( "_umtx_op_cv_wait(cond)", ARG1, sizeof(struct vki_ucond) );
+      PRE_MEM_READ( "_umtx_op_cv_wait(mutex)", ARG4, sizeof(struct vki_umutex) );
+      PRE_MEM_WRITE( "_umtx_op_cv_wait(mutex)", ARG4, sizeof(struct vki_umutex) );
+      if (ARG5)
+	 PRE_MEM_READ( "_umtx_op_cv_wait(timespec)", ARG5, sizeof(struct vki_timespec) );
       break;
    case VKI_UMTX_OP_CV_SIGNAL:
-      PRINT( "sys__umtx_op ( %#lx, CV_SIGNAL, %ld, %#lx, %#lx)", ARG1, ARG3, ARG4, ARG5);
+      PRINT( "sys__umtx_op ( %#lx, CV_SIGNAL)", ARG1);
+      PRE_REG_READ2(long, "_umtx_op_cv_signal",
+                    struct ucond *, obj, int, op);
+      PRE_MEM_READ( "_umtx_op_cv_signal(cond)", ARG1, sizeof(struct vki_ucond) );
+      PRE_MEM_WRITE( "_umtx_op_cv_signal(cond)", ARG1, sizeof(struct vki_ucond) );
       break;
    case VKI_UMTX_OP_CV_BROADCAST:
       PRINT( "sys__umtx_op ( %#lx, CV_BROADCAST, %ld, %#lx, %#lx)", ARG1, ARG3, ARG4, ARG5);
+      PRE_REG_READ2(long, "_umtx_op_cv_broadcast",
+                    struct ucond *, obj, int, op);
+      PRE_MEM_READ( "_umtx_op_cv_broadcast(cond)", ARG1, sizeof(struct vki_ucond) );
+      PRE_MEM_WRITE( "_umtx_op_cv_broadcast(cond)", ARG1, sizeof(struct vki_ucond) );
       break;
    case VKI_UMTX_OP_WAIT_UINT:
       PRINT( "sys__umtx_op ( %#lx, CV_WAIT_UINT, %ld, %#lx, %#lx)", ARG1, ARG3, ARG4, ARG5);
@@ -1840,13 +1882,27 @@
 	 PRE_MEM_READ( "_umtx_op_wait(timespec)", ARG5, sizeof(struct vki_timespec) );
       break;
    case VKI_UMTX_OP_RW_RDLOCK:
-      PRINT( "sys__umtx_op ( %#lx, CV_RW_RDLOCK, %ld, %#lx, %#lx)", ARG1, ARG3, ARG4, ARG5);
+      PRINT( "sys__umtx_op ( %#lx, RW_RDLOCK, %ld, %#lx, %#lx)", ARG1, ARG3, ARG4, ARG5);
+      PRE_REG_READ5(long, "_umtx_op_rw_rdlock",
+                    struct urwlock *, obj, int, op, unsigned long, noid,
+                    void *, zero, struct vki_timespec *, timeout);
+      PRE_MEM_READ( "_umtx_op_rw_rdlock(rw)", ARG1, sizeof(struct vki_urwlock) );
+      PRE_MEM_WRITE( "_umtx_op_rw_rdlock(rw)", ARG1, sizeof(struct vki_urwlock) );
       break;
    case VKI_UMTX_OP_RW_WRLOCK:
-      PRINT( "sys__umtx_op ( %#lx, CV_RW_WRLOCK, %ld, %#lx, %#lx)", ARG1, ARG3, ARG4, ARG5);
+      PRINT( "sys__umtx_op ( %#lx, RW_WRLOCK, %ld, %#lx, %#lx)", ARG1, ARG3, ARG4, ARG5);
+      PRE_REG_READ5(long, "_umtx_op_rw_wrlock",
+                    struct urwlock *, obj, int, op, unsigned long, noid,
+                    void *, zero, struct vki_timespec *, timeout);
+      PRE_MEM_READ( "_umtx_op_rw_wrlock(rw)", ARG1, sizeof(struct vki_urwlock) );
+      PRE_MEM_WRITE( "_umtx_op_rw_wrlock(rw)", ARG1, sizeof(struct vki_urwlock) );
       break;
    case VKI_UMTX_OP_RW_UNLOCK:
-      PRINT( "sys__umtx_op ( %#lx, CV_RW_UNLOCK, %ld, %#lx, %#lx)", ARG1, ARG3, ARG4, ARG5);
+      PRINT( "sys__umtx_op ( %#lx, RW_UNLOCK, %ld, %#lx, %#lx)", ARG1, ARG3, ARG4, ARG5);
+      PRE_REG_READ2(long, "_umtx_op_rw_unlock",
+                    struct urwlock *, obj, int, op);
+      PRE_MEM_READ( "_umtx_op_rw_unlock(rw)", ARG1, sizeof(struct vki_urwlock) );
+      PRE_MEM_WRITE( "_umtx_op_rw_unlock(rw)", ARG1, sizeof(struct vki_urwlock) );
       break;
    case VKI_UMTX_OP_WAIT_UINT_PRIVATE:
       PRINT( "sys__umtx_op ( %#lx, CV_WAIT_UINT_PRIVATE, %ld, %#lx, %#lx)", ARG1, ARG3, ARG4, ARG5);
@@ -1864,10 +1920,18 @@
       PRE_MEM_READ( "_umtx_op_wake_private(mtx)", ARG1, sizeof(struct vki_umtx) );
       break;
    case VKI_UMTX_OP_MUTEX_WAIT:
-      PRINT( "sys__umtx_op ( %#lx, CV_MUTEX_WAIT, %ld, %#lx, %#lx)", ARG1, ARG3, ARG4, ARG5);
+      PRINT( "sys__umtx_op ( %#lx, MUTEX_WAIT, %ld, %#lx, %#lx)", ARG1, ARG3, ARG4, ARG5);
+      PRE_REG_READ2(long, "_umtx_op_mutex_wait",
+                    struct umutex *, obj, int, op);
+      PRE_MEM_READ( "_umtx_op_mutex_wait(mutex)", ARG1, sizeof(struct vki_umutex) );
+      PRE_MEM_WRITE( "_umtx_op_mutex_wait(mutex)", ARG1, sizeof(struct vki_umutex) );
       break;
    case VKI_UMTX_OP_MUTEX_WAKE:
-      PRINT( "sys__umtx_op ( %#lx, CV_MUTEX_WAKE, %ld, %#lx, %#lx)", ARG1, ARG3, ARG4, ARG5);
+      PRINT( "sys__umtx_op ( %#lx, MUTEX_WAKE, %ld, %#lx, %#lx)", ARG1, ARG3, ARG4, ARG5);
+      PRE_REG_READ2(long, "_umtx_op_mutex_wake",
+                    struct umutex *, obj, int, op);
+      PRE_MEM_READ( "_umtx_op_mutex_wake(mutex)", ARG1, sizeof(struct vki_umutex) );
+      PRE_MEM_WRITE( "_umtx_op_mutex_wake(mutex)", ARG1, sizeof(struct vki_umutex) );
       break;
    default:
       PRINT( "sys__umtx_op ( %#lx, %ld(UNKNOWN), %ld, %#lx, %#lx )", ARG1, ARG2, ARG3, ARG4, ARG5);
@@ -1892,6 +1956,44 @@
    case VKI_UMTX_OP_WAIT_UINT_PRIVATE:
    case VKI_UMTX_OP_WAKE_PRIVATE:
       break;
+   case VKI_UMTX_OP_MUTEX_TRYLOCK:
+   case VKI_UMTX_OP_MUTEX_LOCK:
+   case VKI_UMTX_OP_MUTEX_UNLOCK:
+   case VKI_UMTX_OP_MUTEX_WAIT:		/* Sets/clears contested bits */
+   case VKI_UMTX_OP_MUTEX_WAKE:		/* Sets/clears contested bits */
+      if (SUCCESS)
+         POST_MEM_WRITE( ARG1, sizeof(struct vki_umutex) );
+      break;
+   case VKI_UMTX_OP_SET_CEILING:
+      if (SUCCESS) {
+         POST_MEM_WRITE( ARG1, sizeof(struct vki_umutex) );
+	 if (ARG4)
+            POST_MEM_WRITE( ARG4, sizeof(vki_uint32_t) );
+      }
+      break;
+   case VKI_UMTX_OP_CV_WAIT:
+      if (SUCCESS) {
+         POST_MEM_WRITE( ARG1, sizeof(struct vki_ucond) );
+         POST_MEM_WRITE( ARG4, sizeof(struct vki_umutex) );
+      }
+      break;
+   case VKI_UMTX_OP_CV_SIGNAL:
+      if (SUCCESS) {
+         POST_MEM_WRITE( ARG1, sizeof(struct vki_ucond) );
+      }
+      break;
+   case VKI_UMTX_OP_CV_BROADCAST:
+      if (SUCCESS) {
+         POST_MEM_WRITE( ARG1, sizeof(struct vki_ucond) );
+      }
+      break;
+   case VKI_UMTX_OP_RW_RDLOCK:
+   case VKI_UMTX_OP_RW_WRLOCK:
+   case VKI_UMTX_OP_RW_UNLOCK:
+      if (SUCCESS) {
+         POST_MEM_WRITE( ARG1, sizeof(struct vki_urwlock) );
+      }
+      break;
    default:
       break;
    }
From peter at FreeBSD.org  Tue Nov  4 00:49:36 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Tue Nov  4 00:49:42 2008
Subject: PERFORCE change 152445 for review
Message-ID: <200811040849.mA48nZ44057129@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152445

Change 152445 by peter@peter_overcee on 2008/11/04 08:48:40

	Add get/set/swap_context().  This doesn't preserve kernel semantics - the kernel
	saves/restores *all* registers bar the return values.  This clobbers everything
	not guaranteed by the C calling convention.  In reality, this doesn't matter
	because this is called from C.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_syswrap/priv_syswrap-freebsd.h#12 edit
.. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#23 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_syswrap/priv_syswrap-freebsd.h#12 (text+ko) ====

@@ -176,6 +176,9 @@
 DECL_TEMPLATE(freebsd, sys_sigreturn);
 DECL_TEMPLATE(freebsd, sys_sigtimedwait);
 DECL_TEMPLATE(freebsd, sys_sigwaitinfo);
+DECL_TEMPLATE(freebsd, sys_getcontext);
+DECL_TEMPLATE(freebsd, sys_setcontext);
+DECL_TEMPLATE(freebsd, sys_swapcontext);
 DECL_TEMPLATE(freebsd, sys___acl_get_file);
 DECL_TEMPLATE(freebsd, sys___acl_set_file);
 DECL_TEMPLATE(freebsd, sys___acl_get_fd);

==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#23 (text+ko) ====

@@ -2859,6 +2859,54 @@
    PRE_MEM_READ( "__acl_aclcheck_link(aclp)", ARG3, sizeof(struct vki_acl) );
 }
 
+/* The *_context() wrappers aren't really safe.  They clobber registers not
+   preserved by the calling convention.  The kernel doesn't do this.  However,
+   in realtity it doesn't matter because we call these from C rather than asm. */
+PRE(sys_getcontext)
+{
+   PRINT("sys_getcontext ( %#lx )", ARG1);
+   PRE_REG_READ1(long, "getcontext",
+                 struct vki_ucontext *, ucp);
+   PRE_MEM_WRITE( "getcontext(ucp)", ARG1, sizeof(struct vki_ucontext) );
+}
+
+POST(sys_getcontext)
+{
+   POST_MEM_WRITE( ARG1, sizeof(struct vki_ucontext) );
+}
+
+PRE(sys_setcontext)
+{
+   PRINT("sys_setcontext ( %#lx )", ARG1);
+   PRE_REG_READ1(long, "setcontext",
+                 struct vki_ucontext *, ucp);
+
+   PRE_MEM_READ( "setcontext(ucp)", ARG1, sizeof(struct vki_ucontext) );
+   PRE_MEM_WRITE( "setcontext(ucp)", ARG1, sizeof(struct vki_ucontext) );
+}
+
+POST(sys_setcontext)
+{
+   /* changes uc_link etc */
+   POST_MEM_WRITE( ARG1, sizeof(struct vki_ucontext) );
+}
+
+PRE(sys_swapcontext)
+{
+   PRINT("sys_swapcontext ( %#lx, %#lx )", ARG1, ARG2);
+   PRE_REG_READ2(long, "swapcontext",
+                 struct vki_ucontext *, oucp, struct vki_ucontext *, ucp);
+
+   PRE_MEM_READ( "swapcontext(ucp)", ARG2, sizeof(struct vki_ucontext) );
+   PRE_MEM_WRITE( "swapcontext(oucp)", ARG1, sizeof(struct vki_ucontext) );
+}
+
+POST(sys_swapcontext)
+{
+   if (SUCCESS)
+      POST_MEM_WRITE( ARG1, sizeof(struct vki_ucontext) );
+}
+
 #undef PRE
 #undef POST
 
@@ -3389,9 +3437,9 @@
    // __xfstat								   419
 
    // __xlstat								   420
-   // getcontext							   421
-   // setcontext							   422
-   // swapcontext							   423
+   BSDXY(__NR_getcontext,		sys_getcontext),		// 421
+   BSDXY(__NR_setcontext,		sys_setcontext),		// 422
+   BSDXY(__NR_swapcontext,		sys_swapcontext),		// 423
 
    // swapoff								   424
    BSDXY(__NR___acl_get_link,		sys___acl_get_link),		// 425
From bz at FreeBSD.org  Tue Nov  4 02:53:33 2008
From: bz at FreeBSD.org (Bjoern A. Zeeb)
Date: Tue Nov  4 02:53:38 2008
Subject: PERFORCE change 152447 for review
Message-ID: <200811041053.mA4ArV7c068835@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152447

Change 152447 by bz@bz_dumpster on 2008/11/04 10:52:51

	Whitespace, admittedly not always better.

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#15 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_icmp.c#12 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#17 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_output.c#17 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#24 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#8 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/in6_rmx.c#14 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#12 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#16 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/vinet6.h#8 edit
.. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#14 edit

Differences ...

==== //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#15 (text+ko) ====

@@ -384,7 +384,7 @@
 
 	V_rtq_reallyold = 60*60; /* one hour is "really old" */
 	V_rtq_minreallyold = 10; /* never automatically crank down to less */
-	V_rtq_toomany = 128;	/* 128 cached routes is "too many" */
+	V_rtq_toomany = 128;	 /* 128 cached routes is "too many" */
 	V_rtq_timeout = RTQ_TIMEOUT;
 
 	rnh = *head;

==== //depot/projects/vimage-commit2/src/sys/netinet/ip_icmp.c#12 (text+ko) ====

@@ -78,12 +78,12 @@
  */
 
 #ifdef VIMAGE_GLOBALS
-struct icmpstat icmpstat;
+struct icmpstat	icmpstat;
 static int	icmpmaskrepl;
 static u_int	icmpmaskfake;
 static int	drop_redirect;
 static int	log_redirect;
-static int      icmplim;
+static int	icmplim;
 static int	icmplim_output;
 static char	reply_src[IFNAMSIZ];
 static int	icmp_rfi;

==== //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#17 (text+ko) ====

@@ -231,12 +231,12 @@
 	V_ipstealth = 0;
 	V_nipq = 0;	/* Total # of reass queues */
 
-	V_ipport_lowfirstauto  = IPPORT_RESERVED - 1;	/* 1023 */
+	V_ipport_lowfirstauto = IPPORT_RESERVED - 1;	/* 1023 */
 	V_ipport_lowlastauto = IPPORT_RESERVEDSTART;	/* 600 */
 	V_ipport_firstauto = IPPORT_EPHEMERALFIRST;	/* 10000 */
-	V_ipport_lastauto  = IPPORT_EPHEMERALLAST;	/* 65535 */
+	V_ipport_lastauto = IPPORT_EPHEMERALLAST;	/* 65535 */
 	V_ipport_hifirstauto = IPPORT_HIFIRSTAUTO;	/* 49152 */
-	V_ipport_hilastauto  = IPPORT_HILASTAUTO;	/* 65535 */
+	V_ipport_hilastauto = IPPORT_HILASTAUTO;	/* 65535 */
 	V_ipport_reservedhigh = IPPORT_RESERVED - 1;	/* 1023 */
 	V_ipport_reservedlow = 0;
 	V_ipport_randomized = 1;	/* user controlled via sysctl */

==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_output.c#17 (text+ko) ====

@@ -91,11 +91,11 @@
 int path_mtu_discovery;
 int ss_fltsz;
 int ss_fltsz_local;
-int     tcp_do_newreno;
-int	tcp_do_tso;
-int	tcp_do_autosndbuf;
-int	tcp_autosndbuf_inc;
-int	tcp_autosndbuf_max;
+int tcp_do_newreno;
+int tcp_do_tso;
+int tcp_do_autosndbuf;
+int tcp_autosndbuf_inc;
+int tcp_autosndbuf_max;
 #endif
 
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, path_mtu_discovery,

==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#24 (text+ko) ====

@@ -102,7 +102,7 @@
 static struct tcp_syncache tcp_syncache;
 static int tcp_syncookies;
 static int tcp_syncookiesonly;
-int	tcp_sc_rst_sock_fail;
+int tcp_sc_rst_sock_fail;
 #endif
 
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, syncookies,

==== //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#8 (text+ko) ====

@@ -326,8 +326,8 @@
 #define	V_tcp_sack_maxholes	VNET_INET(tcp_sack_maxholes)
 #define	V_tcp_sc_rst_sock_fail	VNET_INET(tcp_sc_rst_sock_fail)
 #define	V_tcp_syncache		VNET_INET(tcp_syncache)
-#define V_tcp_syncookies	VNET_INET(tcp_syncookies)
-#define V_tcp_syncookiesonly	VNET_INET(tcp_syncookiesonly)
+#define	V_tcp_syncookies	VNET_INET(tcp_syncookies)
+#define	V_tcp_syncookiesonly	VNET_INET(tcp_syncookiesonly)
 #define	V_tcp_v6mssdflt		VNET_INET(tcp_v6mssdflt)
 #define	V_tcpstat		VNET_INET(tcpstat)
 #define	V_twq_2msl		VNET_INET(twq_2msl)

==== //depot/projects/vimage-commit2/src/sys/netinet6/in6_rmx.c#14 (text+ko) ====

@@ -226,13 +226,13 @@
 #endif
 
 SYSCTL_V_INT(V_NET, vnet_inet6, _net_inet6_ip6, IPV6CTL_RTEXPIRE, rtexpire,
-	CTLFLAG_RW, rtq_reallyold6 , 0, "");
+    CTLFLAG_RW, rtq_reallyold6 , 0, "");
 
 SYSCTL_V_INT(V_NET, vnet_inet6, _net_inet6_ip6, IPV6CTL_RTMINEXPIRE,
-	rtminexpire, CTLFLAG_RW, rtq_minreallyold6 , 0, "");
+    rtminexpire, CTLFLAG_RW, rtq_minreallyold6 , 0, "");
 
 SYSCTL_V_INT(V_NET, vnet_inet6, _net_inet6_ip6, IPV6CTL_RTMAXCACHE, rtmaxcache,
-	CTLFLAG_RW, rtq_toomany6 , 0, "");
+    CTLFLAG_RW, rtq_toomany6 , 0, "");
 
 
 /*

==== //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#12 (text+ko) ====

@@ -167,7 +167,7 @@
 #ifdef IP6_AUTO_LINKLOCAL
 	V_ip6_auto_linklocal = IP6_AUTO_LINKLOCAL;
 #else
-	V_ip6_auto_linklocal = 1;     /* enable by default */
+	V_ip6_auto_linklocal = 1;	/* enable by default */
 #endif
 
 #ifndef IPV6FORWARDING
@@ -186,15 +186,15 @@
 	V_ip6_sendredirects = IPV6_SENDREDIRECTS;
 	V_ip6_defhlim = IPV6_DEFHLIM;
 	V_ip6_defmcasthlim = IPV6_DEFAULT_MULTICAST_HOPS;
-	V_ip6_accept_rtadv = 0;	/* "IPV6FORWARDING ? 0 : 1" is dangerous */
+	V_ip6_accept_rtadv = 0;	 /* "IPV6FORWARDING ? 0 : 1" is dangerous */
 	V_ip6_log_interval = 5;
 	V_ip6_hdrnestlimit = 15; /* How many header options will we process? */
-	V_ip6_dad_count = 1;	/* DupAddrDetectionTransmits */
+	V_ip6_dad_count = 1;	 /* DupAddrDetectionTransmits */
 	V_ip6_auto_flowlabel = 1;
-	V_ip6_use_deprecated = 1; /* allow deprecated addr (RFC2462 5.5.4) */
-	V_ip6_rr_prune = 5;	/* router renumbering prefix
-                                 * walk list every 5 sec. */
-	V_ip6_mcast_pmtu = 0;	/* enable pMTU discovery for multicast? */
+	V_ip6_use_deprecated = 1;/* allow deprecated addr (RFC2462 5.5.4) */
+	V_ip6_rr_prune = 5;	 /* router renumbering prefix
+                                  * walk list every 5 sec. */
+	V_ip6_mcast_pmtu = 0;	 /* enable pMTU discovery for multicast? */
 	V_ip6_v6only = 1;
 	V_ip6_keepfaith = 0;
 	V_ip6_log_time = (time_t)0L;
@@ -208,8 +208,8 @@
 
 	/* raw IP6 parameters */
 	/*
- 	 * Nominal space allocated to a raw ip socket.
- 	 */
+	 * Nominal space allocated to a raw ip socket.
+	 */
 #define RIPV6SNDQ	8192
 #define RIPV6RCVQ	8192
 	V_rip6_sendspace = RIPV6SNDQ;

==== //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#16 (text+ko) ====

@@ -80,12 +80,12 @@
 #define SDL(s) ((struct sockaddr_dl *)s)
 
 #ifdef VIMAGE_GLOBALS
-int	nd6_prune;
-int	nd6_delay;
-int	nd6_umaxtries;
-int	nd6_mmaxtries;
-int	nd6_useloopback;
-int	nd6_gctimer;
+int nd6_prune;
+int nd6_delay;
+int nd6_umaxtries;
+int nd6_mmaxtries;
+int nd6_useloopback;
+int nd6_gctimer;
 
 /* preventing too many loops in ND option parsing */
 int nd6_maxndopt;

==== //depot/projects/vimage-commit2/src/sys/netinet6/vinet6.h#8 (text+ko) ====

@@ -233,7 +233,7 @@
 #define	V_nd6_maxnudhint		VNET_INET6(nd6_maxnudhint)
 #define	V_nd6_maxqueuelen		VNET_INET6(nd6_maxqueuelen)
 #define	V_nd6_mmaxtries			VNET_INET6(nd6_mmaxtries)
-#define V_nd6_onlink_ns_rfc4861		VNET_INET6(nd6_onlink_ns_rfc4861)
+#define	V_nd6_onlink_ns_rfc4861		VNET_INET6(nd6_onlink_ns_rfc4861)
 #define	V_nd6_prune			VNET_INET6(nd6_prune)
 #define	V_nd6_recalc_reachtm_interval	VNET_INET6(nd6_recalc_reachtm_interval)
 #define	V_nd6_slowtimo_ch		VNET_INET6(nd6_slowtimo_ch)

==== //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#14 (text+ko) ====

@@ -262,6 +262,7 @@
 	V_ip4_ah_net_deflev = IPSEC_LEVEL_USE;
 	V_ip4_ipsec_ecn = 0;	/* ECN ignore(-1)/forbidden(0)/allowed(1) */
 	V_ip4_esp_randpad = -1;
+
 	V_crypto_support = CRYPTOCAP_F_HARDWARE | CRYPTOCAP_F_SOFTWARE;
 
 #ifdef REGRESSION
From ed at FreeBSD.org  Tue Nov  4 03:21:03 2008
From: ed at FreeBSD.org (Ed Schouten)
Date: Tue Nov  4 03:21:10 2008
Subject: PERFORCE change 152449 for review
Message-ID: <200811041121.mA4BL1pB072030@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152449

Change 152449 by ed@ed_dull on 2008/11/04 11:20:24

	IFC.

Affected files ...

.. //depot/projects/mpsafetty/contrib/smbfs/lib/smb/nb_name.c#2 integrate
.. //depot/projects/mpsafetty/etc/gss/mech#2 integrate
.. //depot/projects/mpsafetty/etc/rc.d/Makefile#4 integrate
.. //depot/projects/mpsafetty/etc/rc.d/gssd#1 branch
.. //depot/projects/mpsafetty/etc/rc.d/nfsd#3 integrate
.. //depot/projects/mpsafetty/include/rpc/xdr.h#2 integrate
.. //depot/projects/mpsafetty/include/strings.h#2 integrate
.. //depot/projects/mpsafetty/lib/libarchive/archive_write.3#2 integrate
.. //depot/projects/mpsafetty/lib/libc/amd64/SYS.h#2 integrate
.. //depot/projects/mpsafetty/lib/libc/amd64/gen/_setjmp.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/amd64/gen/fabs.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/amd64/gen/modf.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/amd64/gen/rfork_thread.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/amd64/gen/setjmp.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/amd64/gen/sigsetjmp.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/amd64/stdlib/div.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/amd64/stdlib/ldiv.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/amd64/stdlib/lldiv.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/amd64/string/bcmp.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/amd64/string/bcopy.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/amd64/string/bzero.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/amd64/string/memcmp.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/amd64/string/memset.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/amd64/string/strcat.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/amd64/string/strcmp.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/amd64/string/strcpy.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/amd64/sys/brk.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/amd64/sys/exect.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/amd64/sys/getcontext.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/amd64/sys/pipe.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/amd64/sys/ptrace.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/amd64/sys/reboot.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/amd64/sys/sbrk.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/amd64/sys/setlogin.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/amd64/sys/vfork.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/gen/dirname.3#2 integrate
.. //depot/projects/mpsafetty/lib/libc/gen/dirname.c#2 integrate
.. //depot/projects/mpsafetty/lib/libc/i386/SYS.h#2 integrate
.. //depot/projects/mpsafetty/lib/libc/i386/gen/_ctx_start.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/i386/gen/_setjmp.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/i386/gen/fabs.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/i386/gen/modf.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/i386/gen/rfork_thread.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/i386/gen/setjmp.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/i386/gen/sigsetjmp.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/i386/stdlib/abs.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/i386/stdlib/div.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/i386/stdlib/labs.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/i386/stdlib/ldiv.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/i386/string/bcmp.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/i386/string/bcopy.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/i386/string/bzero.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/i386/string/ffs.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/i386/string/index.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/i386/string/memchr.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/i386/string/memcmp.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/i386/string/memset.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/i386/string/rindex.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/i386/string/strcat.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/i386/string/strchr.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/i386/string/strcmp.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/i386/string/strcpy.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/i386/string/strlen.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/i386/string/strncmp.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/i386/string/strrchr.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/i386/string/swab.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/i386/string/wcschr.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/i386/string/wcscmp.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/i386/string/wcslen.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/i386/string/wmemchr.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/i386/sys/Ovfork.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/i386/sys/brk.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/i386/sys/exect.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/i386/sys/getcontext.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/i386/sys/pipe.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/i386/sys/ptrace.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/i386/sys/reboot.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/i386/sys/sbrk.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/i386/sys/setlogin.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/i386/sys/syscall.S#2 integrate
.. //depot/projects/mpsafetty/lib/libc/posix1e/acl_add_perm.3#2 integrate
.. //depot/projects/mpsafetty/lib/libc/posix1e/acl_calc_mask.3#2 integrate
.. //depot/projects/mpsafetty/lib/libc/posix1e/acl_calc_mask.c#2 integrate
.. //depot/projects/mpsafetty/lib/libc/posix1e/acl_clear_perms.3#2 integrate
.. //depot/projects/mpsafetty/lib/libc/posix1e/acl_copy.c#2 integrate
.. //depot/projects/mpsafetty/lib/libc/posix1e/acl_copy_entry.3#2 integrate
.. //depot/projects/mpsafetty/lib/libc/posix1e/acl_create_entry.3#2 integrate
.. //depot/projects/mpsafetty/lib/libc/posix1e/acl_delete_entry.3#2 integrate
.. //depot/projects/mpsafetty/lib/libc/posix1e/acl_delete_perm.3#2 integrate
.. //depot/projects/mpsafetty/lib/libc/posix1e/acl_get_entry.3#2 integrate
.. //depot/projects/mpsafetty/lib/libc/posix1e/acl_get_perm_np.3#2 integrate
.. //depot/projects/mpsafetty/lib/libc/posix1e/acl_get_permset.3#2 integrate
.. //depot/projects/mpsafetty/lib/libc/posix1e/acl_get_qualifier.3#2 integrate
.. //depot/projects/mpsafetty/lib/libc/posix1e/acl_get_tag_type.3#2 integrate
.. //depot/projects/mpsafetty/lib/libc/posix1e/acl_perm.c#2 integrate
.. //depot/projects/mpsafetty/lib/libc/posix1e/acl_set_permset.3#2 integrate
.. //depot/projects/mpsafetty/lib/libc/posix1e/acl_set_qualifier.3#2 integrate
.. //depot/projects/mpsafetty/lib/libc/posix1e/acl_set_tag_type.3#2 integrate
.. //depot/projects/mpsafetty/lib/libc/posix1e/acl_size.c#2 integrate
.. //depot/projects/mpsafetty/lib/libc/stdlib/malloc.3#3 integrate
.. //depot/projects/mpsafetty/lib/libc/stdlib/malloc.c#8 integrate
.. //depot/projects/mpsafetty/lib/libc/string/Makefile.inc#2 integrate
.. //depot/projects/mpsafetty/lib/libc/string/Symbol.map#2 integrate
.. //depot/projects/mpsafetty/lib/libc/string/ffs.3#2 integrate
.. //depot/projects/mpsafetty/lib/libc/string/ffsl.c#2 integrate
.. //depot/projects/mpsafetty/lib/libc/string/ffsll.c#1 branch
.. //depot/projects/mpsafetty/lib/libc/string/flsll.c#1 branch
.. //depot/projects/mpsafetty/lib/libc/sys/Symbol.map#4 integrate
.. //depot/projects/mpsafetty/lib/libc/xdr/Symbol.map#2 integrate
.. //depot/projects/mpsafetty/lib/libc/xdr/xdr.c#2 integrate
.. //depot/projects/mpsafetty/lib/librpcsec_gss/svc_rpcsec_gss.c#3 integrate
.. //depot/projects/mpsafetty/lib/libusb20/Makefile#1 branch
.. //depot/projects/mpsafetty/lib/libusb20/libusb20.3#1 branch
.. //depot/projects/mpsafetty/lib/libusb20/libusb20.c#1 branch
.. //depot/projects/mpsafetty/lib/libusb20/libusb20.h#1 branch
.. //depot/projects/mpsafetty/lib/libusb20/libusb20_compat01.c#1 branch
.. //depot/projects/mpsafetty/lib/libusb20/libusb20_compat01.h#1 branch
.. //depot/projects/mpsafetty/lib/libusb20/libusb20_compat10.c#1 branch
.. //depot/projects/mpsafetty/lib/libusb20/libusb20_compat10.h#1 branch
.. //depot/projects/mpsafetty/lib/libusb20/libusb20_desc.c#1 branch
.. //depot/projects/mpsafetty/lib/libusb20/libusb20_desc.h#1 branch
.. //depot/projects/mpsafetty/lib/libusb20/libusb20_int.h#1 branch
.. //depot/projects/mpsafetty/lib/libusb20/libusb20_ugen20.c#1 branch
.. //depot/projects/mpsafetty/sbin/mount_nfs/mount_nfs.c#5 integrate
.. //depot/projects/mpsafetty/share/man/man4/atapicam.4#2 integrate
.. //depot/projects/mpsafetty/share/man/man4/rl.4#2 integrate
.. //depot/projects/mpsafetty/share/man/man4/usb2_bluetooth.4#1 branch
.. //depot/projects/mpsafetty/share/man/man4/usb2_controller.4#1 branch
.. //depot/projects/mpsafetty/share/man/man4/usb2_core.4#1 branch
.. //depot/projects/mpsafetty/share/man/man4/usb2_ethernet.4#1 branch
.. //depot/projects/mpsafetty/share/man/man4/usb2_image.4#1 branch
.. //depot/projects/mpsafetty/share/man/man4/usb2_input.4#1 branch
.. //depot/projects/mpsafetty/share/man/man4/usb2_misc.4#1 branch
.. //depot/projects/mpsafetty/share/man/man4/usb2_ndis.4#1 branch
.. //depot/projects/mpsafetty/share/man/man4/usb2_quirk.4#1 branch
.. //depot/projects/mpsafetty/share/man/man4/usb2_serial.4#1 branch
.. //depot/projects/mpsafetty/share/man/man4/usb2_sound.4#1 branch
.. //depot/projects/mpsafetty/share/man/man4/usb2_storage.4#1 branch
.. //depot/projects/mpsafetty/share/man/man4/usb2_template.4#1 branch
.. //depot/projects/mpsafetty/share/man/man4/usb2_wlan.4#1 branch
.. //depot/projects/mpsafetty/share/man/man4/zyd.4#3 integrate
.. //depot/projects/mpsafetty/share/man/man9/VOP_ACCESS.9#3 integrate
.. //depot/projects/mpsafetty/share/man/man9/vfs_busy.9#3 integrate
.. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_proto.h#10 integrate
.. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_syscall.h#10 integrate
.. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_syscalls.c#10 integrate
.. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_sysent.c#10 integrate
.. //depot/projects/mpsafetty/sys/compat/freebsd32/syscalls.master#11 integrate
.. //depot/projects/mpsafetty/sys/conf/NOTES#16 integrate
.. //depot/projects/mpsafetty/sys/conf/files#25 integrate
.. //depot/projects/mpsafetty/sys/conf/kmod.mk#3 integrate
.. //depot/projects/mpsafetty/sys/conf/options#14 integrate
.. //depot/projects/mpsafetty/sys/dev/acpica/Osd/OsdSchedule.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/acpica/acpi.c#6 integrate
.. //depot/projects/mpsafetty/sys/dev/adb/adb_mouse.c#3 integrate
.. //depot/projects/mpsafetty/sys/dev/amr/amr.c#4 integrate
.. //depot/projects/mpsafetty/sys/dev/amr/amr_cam.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/amr/amrvar.h#2 integrate
.. //depot/projects/mpsafetty/sys/dev/cardbus/cardbus_cis.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/cardbus/cardbusreg.h#2 integrate
.. //depot/projects/mpsafetty/sys/dev/mn/if_mn.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/pci/pcireg.h#4 integrate
.. //depot/projects/mpsafetty/sys/dev/sound/pcm/channel.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/sound/pcm/channel.h#2 integrate
.. //depot/projects/mpsafetty/sys/dev/sound/pcm/mixer.c#3 integrate
.. //depot/projects/mpsafetty/sys/dev/sound/pcm/mixer.h#2 integrate
.. //depot/projects/mpsafetty/sys/dev/usb/u3g.c#6 integrate
.. //depot/projects/mpsafetty/sys/dev/usb/usb_subr.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/usb/usbdevs#16 integrate
.. //depot/projects/mpsafetty/sys/dev/usb2/bluetooth/TODO.TXT#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/bluetooth/ng_ubt2.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/bluetooth/ng_ubt2_var.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/bluetooth/ubtbcmfw2.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/bluetooth/usb2_bluetooth.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/bluetooth/usb2_bluetooth.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/controller/at91dci.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/controller/at91dci.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/controller/at91dci_atmelarm.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/controller/ehci2.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/controller/ehci2.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/controller/ehci2_pci.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/controller/musb2_otg.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/controller/musb2_otg.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/controller/musb2_otg_atmelarm.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/controller/ohci2.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/controller/ohci2.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/controller/ohci2_atmelarm.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/controller/ohci2_pci.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/controller/uhci2.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/controller/uhci2.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/controller/uhci2_pci.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/controller/usb2_bus.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/controller/usb2_controller.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/controller/usb2_controller.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/controller/usb2_pci.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/controller/uss820dci.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/controller/uss820dci.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/controller/uss820dci_atmelarm.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/controller/uss820dci_pccard.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/README.TXT#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_busdma.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_busdma.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_compat_linux.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_compat_linux.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_config_td.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_config_td.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_core.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_core.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_debug.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_debug.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_dev.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_dev.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_device.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_device.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_dynamic.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_dynamic.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_error.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_generic.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_generic.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_handle_request.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_handle_request.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_hid.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_hid.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_hub.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_hub.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_if.m#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_lookup.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_lookup.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_mbuf.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_mbuf.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_msctest.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_msctest.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_parse.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_parse.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_process.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_process.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_request.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_request.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_sw_transfer.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_sw_transfer.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_transfer.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_transfer.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_util.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_util.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/core/usbdevs#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/ethernet/if_aue2.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/ethernet/if_aue2_reg.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/ethernet/if_axe2.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/ethernet/if_axe2_reg.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/ethernet/if_cdce2.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/ethernet/if_cdce2_reg.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/ethernet/if_cue2.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/ethernet/if_cue2_reg.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/ethernet/if_kue2.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/ethernet/if_kue2_fw.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/ethernet/if_kue2_reg.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/ethernet/if_rue2.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/ethernet/if_rue2_reg.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/ethernet/if_udav2.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/ethernet/if_udav2_reg.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/ethernet/usb2_ethernet.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/ethernet/usb2_ethernet.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/image/usb2_image.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/image/usb2_image.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/image/uscanner2.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/include/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/include/ufm2_ioctl.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/include/urio2_ioctl.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/include/usb2_cdc.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/include/usb2_defs.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/include/usb2_devid.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/include/usb2_devtable.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/include/usb2_endian.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/include/usb2_error.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/include/usb2_hid.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/include/usb2_ioctl.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/include/usb2_mfunc.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/include/usb2_revision.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/include/usb2_standard.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/input/uhid2.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/input/ukbd2.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/input/ums2.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/input/usb2_input.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/input/usb2_input.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/input/usb2_rdesc.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/misc/udbp2.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/misc/udbp2.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/misc/ufm2.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/misc/usb2_misc.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/misc/usb2_misc.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/ndis/if_ndis_usb2.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/ndis/usb2_ndis.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/ndis/usb2_ndis.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/quirk/usb2_quirk.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/quirk/usb2_quirk.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/serial/uark2.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/serial/ubsa2.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/serial/ubser2.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/serial/uchcom2.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/serial/ucycom2.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/serial/ufoma2.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/serial/uftdi2.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/serial/uftdi2_reg.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/serial/ugensa2.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/serial/uipaq2.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/serial/ulpt2.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/serial/umct2.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/serial/umodem2.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/serial/umoscom2.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/serial/uplcom2.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/serial/usb2_serial.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/serial/usb2_serial.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/serial/uvisor2.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/serial/uvscom2.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/sound/uaudio2.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/sound/uaudio2.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/sound/uaudio2_pcm.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/sound/uaudio2_reg.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/sound/usb2_sound.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/sound/usb2_sound.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/storage/ata-usb2.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/storage/umass2.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/storage/urio2.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/storage/usb2_storage.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/storage/usb2_storage.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/storage/ustorage2_fs.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/template/usb2_template.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/template/usb2_template.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/template/usb2_template_cdce.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/template/usb2_template_msc.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/template/usb2_template_mtp.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/wlan/if_rum2.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/wlan/if_rum2_fw.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/wlan/if_rum2_reg.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/wlan/if_rum2_var.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/wlan/if_ural2.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/wlan/if_ural2_reg.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/wlan/if_ural2_var.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/wlan/if_zyd2.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/wlan/if_zyd2_fw.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/wlan/if_zyd2_reg.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/wlan/usb2_wlan.c#1 branch
.. //depot/projects/mpsafetty/sys/dev/usb2/wlan/usb2_wlan.h#1 branch
.. //depot/projects/mpsafetty/sys/fs/coda/cnode.h#2 integrate
.. //depot/projects/mpsafetty/sys/fs/coda/coda_subr.c#2 integrate
.. //depot/projects/mpsafetty/sys/fs/coda/coda_venus.c#3 integrate
.. //depot/projects/mpsafetty/sys/fs/ntfs/ntfs_vnops.c#5 integrate
.. //depot/projects/mpsafetty/sys/fs/smbfs/smbfs_vfsops.c#3 integrate
.. //depot/projects/mpsafetty/sys/fs/unionfs/union_vfsops.c#3 integrate
.. //depot/projects/mpsafetty/sys/geom/journal/g_journal.c#3 integrate
.. //depot/projects/mpsafetty/sys/geom/part/g_part_apm.c#3 integrate
.. //depot/projects/mpsafetty/sys/gnu/fs/ext2fs/ext2_vfsops.c#6 integrate
.. //depot/projects/mpsafetty/sys/i386/conf/XEN#4 integrate
.. //depot/projects/mpsafetty/sys/i386/i386/bios.c#3 integrate
.. //depot/projects/mpsafetty/sys/isa/isa_common.c#3 integrate
.. //depot/projects/mpsafetty/sys/isa/isa_common.h#2 integrate
.. //depot/projects/mpsafetty/sys/isa/isavar.h#3 integrate
.. //depot/projects/mpsafetty/sys/isa/pnp.c#2 integrate
.. //depot/projects/mpsafetty/sys/kern/init_sysent.c#6 integrate
.. //depot/projects/mpsafetty/sys/kern/kern_descrip.c#7 integrate
.. //depot/projects/mpsafetty/sys/kern/sched_ule.c#4 integrate
.. //depot/projects/mpsafetty/sys/kern/subr_smp.c#3 integrate
.. //depot/projects/mpsafetty/sys/kern/syscalls.c#5 integrate
.. //depot/projects/mpsafetty/sys/kern/syscalls.master#7 integrate
.. //depot/projects/mpsafetty/sys/kern/systrace_args.c#4 integrate
.. //depot/projects/mpsafetty/sys/kern/tty.c#65 integrate
.. //depot/projects/mpsafetty/sys/kern/tty_pts.c#24 integrate
.. //depot/projects/mpsafetty/sys/kern/vfs_export.c#3 integrate
.. //depot/projects/mpsafetty/sys/kern/vfs_lookup.c#4 integrate
.. //depot/projects/mpsafetty/sys/kern/vfs_mount.c#11 integrate
.. //depot/projects/mpsafetty/sys/kern/vfs_subr.c#11 integrate
.. //depot/projects/mpsafetty/sys/kern/vfs_syscalls.c#8 integrate
.. //depot/projects/mpsafetty/sys/kern/vfs_vnops.c#8 integrate
.. //depot/projects/mpsafetty/sys/kgssapi/gss_accept_sec_context.c#1 branch
.. //depot/projects/mpsafetty/sys/kgssapi/gss_acquire_cred.c#1 branch
.. //depot/projects/mpsafetty/sys/kgssapi/gss_add_oid_set_member.c#1 branch
.. //depot/projects/mpsafetty/sys/kgssapi/gss_canonicalize_name.c#1 branch
.. //depot/projects/mpsafetty/sys/kgssapi/gss_create_empty_oid_set.c#1 branch
.. //depot/projects/mpsafetty/sys/kgssapi/gss_delete_sec_context.c#1 branch
.. //depot/projects/mpsafetty/sys/kgssapi/gss_display_status.c#1 branch
.. //depot/projects/mpsafetty/sys/kgssapi/gss_export_name.c#1 branch
.. //depot/projects/mpsafetty/sys/kgssapi/gss_get_mic.c#1 branch
.. //depot/projects/mpsafetty/sys/kgssapi/gss_impl.c#1 branch
.. //depot/projects/mpsafetty/sys/kgssapi/gss_import_name.c#1 branch
.. //depot/projects/mpsafetty/sys/kgssapi/gss_init_sec_context.c#1 branch
.. //depot/projects/mpsafetty/sys/kgssapi/gss_names.c#1 branch
.. //depot/projects/mpsafetty/sys/kgssapi/gss_pname_to_uid.c#1 branch
.. //depot/projects/mpsafetty/sys/kgssapi/gss_release_buffer.c#1 branch
.. //depot/projects/mpsafetty/sys/kgssapi/gss_release_cred.c#1 branch
.. //depot/projects/mpsafetty/sys/kgssapi/gss_release_name.c#1 branch
.. //depot/projects/mpsafetty/sys/kgssapi/gss_release_oid_set.c#1 branch
.. //depot/projects/mpsafetty/sys/kgssapi/gss_set_cred_option.c#1 branch
.. //depot/projects/mpsafetty/sys/kgssapi/gss_test_oid_set_member.c#1 branch
.. //depot/projects/mpsafetty/sys/kgssapi/gss_unwrap.c#1 branch
.. //depot/projects/mpsafetty/sys/kgssapi/gss_verify_mic.c#1 branch
.. //depot/projects/mpsafetty/sys/kgssapi/gss_wrap.c#1 branch
.. //depot/projects/mpsafetty/sys/kgssapi/gss_wrap_size_limit.c#1 branch
.. //depot/projects/mpsafetty/sys/kgssapi/gssapi.h#1 branch
.. //depot/projects/mpsafetty/sys/kgssapi/gssapi_impl.h#1 branch
.. //depot/projects/mpsafetty/sys/kgssapi/gssd.x#1 branch
.. //depot/projects/mpsafetty/sys/kgssapi/gssd_prot.c#1 branch
.. //depot/projects/mpsafetty/sys/kgssapi/gsstest.c#1 branch
.. //depot/projects/mpsafetty/sys/kgssapi/kgss_if.m#1 branch
.. //depot/projects/mpsafetty/sys/kgssapi/krb5/kcrypto.c#1 branch
.. //depot/projects/mpsafetty/sys/kgssapi/krb5/kcrypto.h#1 branch
.. //depot/projects/mpsafetty/sys/kgssapi/krb5/kcrypto_aes.c#1 branch
.. //depot/projects/mpsafetty/sys/kgssapi/krb5/kcrypto_arcfour.c#1 branch
.. //depot/projects/mpsafetty/sys/kgssapi/krb5/kcrypto_des.c#1 branch
.. //depot/projects/mpsafetty/sys/kgssapi/krb5/kcrypto_des3.c#1 branch
.. //depot/projects/mpsafetty/sys/kgssapi/krb5/krb5_mech.c#1 branch
.. //depot/projects/mpsafetty/sys/mips/idt/if_kr.c#3 integrate
.. //depot/projects/mpsafetty/sys/modules/Makefile#15 integrate
.. //depot/projects/mpsafetty/sys/modules/amr/Makefile#2 integrate
.. //depot/projects/mpsafetty/sys/modules/amr/amr_cam/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/kgssapi/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/kgssapi_krb5/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/nfsclient/Makefile#2 integrate
.. //depot/projects/mpsafetty/sys/modules/nfsserver/Makefile#2 integrate
.. //depot/projects/mpsafetty/sys/modules/rl/Makefile#3 integrate
.. //depot/projects/mpsafetty/sys/modules/usb2/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/bluetooth/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/bluetooth_fw/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/bluetooth_ng/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/controller/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/controller_at91dci/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/controller_ehci/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/controller_musb/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/controller_ohci/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/controller_uhci/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/controller_uss820dci/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/core/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/ethernet/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/ethernet_aue/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/ethernet_axe/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/ethernet_cdce/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/ethernet_cue/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/ethernet_dav/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/ethernet_kue/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/ethernet_rue/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/image/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/input/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/input_hid/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/input_kbd/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/input_ms/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/misc/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/misc_dbp/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/misc_fm/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/ndis/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/quirk/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/scanner/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/serial/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/serial_ark/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/serial_bsa/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/serial_bser/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/serial_chcom/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/serial_cycom/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/serial_foma/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/serial_ftdi/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/serial_gensa/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/serial_ipaq/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/serial_lpt/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/serial_mct/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/serial_modem/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/serial_moscom/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/serial_plcom/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/serial_visor/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/serial_vscom/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/sound/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/storage/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/storage_ata/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/storage_fs/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/storage_mass/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/storage_rio/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/template/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/wlan/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/wlan_ral/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/wlan_rum/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/modules/usb2/wlan_zyd/Makefile#1 branch
.. //depot/projects/mpsafetty/sys/netsmb/smb_conn.c#2 integrate
.. //depot/projects/mpsafetty/sys/netsmb/smb_conn.h#2 integrate
.. //depot/projects/mpsafetty/sys/netsmb/smb_dev.c#4 integrate
.. //depot/projects/mpsafetty/sys/nfsclient/nfs.h#2 integrate
.. //depot/projects/mpsafetty/sys/nfsclient/nfs_krpc.c#1 branch
.. //depot/projects/mpsafetty/sys/nfsclient/nfs_nfsiod.c#2 integrate
.. //depot/projects/mpsafetty/sys/nfsclient/nfs_socket.c#4 integrate
.. //depot/projects/mpsafetty/sys/nfsclient/nfs_subs.c#3 integrate
.. //depot/projects/mpsafetty/sys/nfsclient/nfs_vfsops.c#10 integrate
.. //depot/projects/mpsafetty/sys/nfsclient/nfsmount.h#2 integrate
.. //depot/projects/mpsafetty/sys/nfsserver/nfs.h#3 integrate
.. //depot/projects/mpsafetty/sys/nfsserver/nfs_fha.c#1 branch
.. //depot/projects/mpsafetty/sys/nfsserver/nfs_fha.h#1 branch
.. //depot/projects/mpsafetty/sys/nfsserver/nfs_serv.c#8 integrate
.. //depot/projects/mpsafetty/sys/nfsserver/nfs_srvcache.c#3 integrate
.. //depot/projects/mpsafetty/sys/nfsserver/nfs_srvkrpc.c#1 branch
.. //depot/projects/mpsafetty/sys/nfsserver/nfs_srvsock.c#5 integrate
.. //depot/projects/mpsafetty/sys/nfsserver/nfs_srvsubs.c#4 integrate
.. //depot/projects/mpsafetty/sys/nfsserver/nfs_syscalls.c#4 integrate
.. //depot/projects/mpsafetty/sys/nfsserver/nfsm_subs.h#2 integrate
.. //depot/projects/mpsafetty/sys/nfsserver/nfsrvcache.h#2 integrate
.. //depot/projects/mpsafetty/sys/nlm/nlm.h#2 integrate
.. //depot/projects/mpsafetty/sys/nlm/nlm_advlock.c#2 integrate
.. //depot/projects/mpsafetty/sys/nlm/nlm_prot_impl.c#4 integrate
.. //depot/projects/mpsafetty/sys/nlm/nlm_prot_svc.c#2 integrate
.. //depot/projects/mpsafetty/sys/pci/if_mn.c#2 delete
.. //depot/projects/mpsafetty/sys/pci/if_rl.c#4 integrate
.. //depot/projects/mpsafetty/sys/pci/if_rlreg.h#6 integrate
.. //depot/projects/mpsafetty/sys/rpc/auth.h#2 integrate
.. //depot/projects/mpsafetty/sys/rpc/auth_none.c#2 integrate
.. //depot/projects/mpsafetty/sys/rpc/auth_unix.c#3 integrate
.. //depot/projects/mpsafetty/sys/rpc/clnt.h#2 integrate
.. //depot/projects/mpsafetty/sys/rpc/clnt_dg.c#2 integrate
.. //depot/projects/mpsafetty/sys/rpc/clnt_rc.c#3 integrate
.. //depot/projects/mpsafetty/sys/rpc/clnt_vc.c#2 integrate
.. //depot/projects/mpsafetty/sys/rpc/replay.c#1 branch
.. //depot/projects/mpsafetty/sys/rpc/replay.h#1 branch
.. //depot/projects/mpsafetty/sys/rpc/rpc_com.h#2 integrate
.. //depot/projects/mpsafetty/sys/rpc/rpc_generic.c#2 integrate
.. //depot/projects/mpsafetty/sys/rpc/rpc_msg.h#2 integrate
.. //depot/projects/mpsafetty/sys/rpc/rpc_prot.c#2 integrate
.. //depot/projects/mpsafetty/sys/rpc/rpcsec_gss.h#1 branch
.. //depot/projects/mpsafetty/sys/rpc/rpcsec_gss/rpcsec_gss.c#1 branch
.. //depot/projects/mpsafetty/sys/rpc/rpcsec_gss/rpcsec_gss_conf.c#1 branch
.. //depot/projects/mpsafetty/sys/rpc/rpcsec_gss/rpcsec_gss_int.h#1 branch
.. //depot/projects/mpsafetty/sys/rpc/rpcsec_gss/rpcsec_gss_misc.c#1 branch
.. //depot/projects/mpsafetty/sys/rpc/rpcsec_gss/rpcsec_gss_prot.c#1 branch
.. //depot/projects/mpsafetty/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c#1 branch
.. //depot/projects/mpsafetty/sys/rpc/svc.c#2 integrate
.. //depot/projects/mpsafetty/sys/rpc/svc.h#2 integrate
.. //depot/projects/mpsafetty/sys/rpc/svc_auth.c#2 integrate
.. //depot/projects/mpsafetty/sys/rpc/svc_auth.h#2 integrate
.. //depot/projects/mpsafetty/sys/rpc/svc_auth_unix.c#2 integrate
.. //depot/projects/mpsafetty/sys/rpc/svc_dg.c#2 integrate
.. //depot/projects/mpsafetty/sys/rpc/svc_generic.c#2 integrate
.. //depot/projects/mpsafetty/sys/rpc/svc_vc.c#2 integrate
.. //depot/projects/mpsafetty/sys/rpc/xdr.h#2 integrate
.. //depot/projects/mpsafetty/sys/security/audit/audit_pipe.c#5 integrate
.. //depot/projects/mpsafetty/sys/sys/mount.h#5 integrate
.. //depot/projects/mpsafetty/sys/sys/param.h#19 integrate
.. //depot/projects/mpsafetty/sys/sys/syscall.h#5 integrate
.. //depot/projects/mpsafetty/sys/sys/syscall.mk#5 integrate
.. //depot/projects/mpsafetty/sys/sys/sysproto.h#5 integrate
.. //depot/projects/mpsafetty/sys/tools/vnode_if.awk#2 integrate
.. //depot/projects/mpsafetty/sys/ufs/ffs/ffs_softdep.c#6 integrate
.. //depot/projects/mpsafetty/sys/ufs/ufs/ufs_vfsops.c#3 integrate
.. //depot/projects/mpsafetty/sys/vm/uma.h#2 integrate
.. //depot/projects/mpsafetty/sys/xdr/xdr_mbuf.c#2 integrate
.. //depot/projects/mpsafetty/tools/regression/kgssapi/Makefile#1 branch
.. //depot/projects/mpsafetty/tools/regression/kgssapi/gsstest.c#1 branch
.. //depot/projects/mpsafetty/tools/regression/rpcsec_gss/Makefile#1 branch
.. //depot/projects/mpsafetty/tools/regression/rpcsec_gss/rpctest.c#1 branch
.. //depot/projects/mpsafetty/usr.sbin/Makefile#12 integrate
.. //depot/projects/mpsafetty/usr.sbin/gssd/Makefile#1 branch
.. //depot/projects/mpsafetty/usr.sbin/gssd/gssd.8#1 branch
.. //depot/projects/mpsafetty/usr.sbin/gssd/gssd.c#1 branch
.. //depot/projects/mpsafetty/usr.sbin/mountd/exports.5#2 integrate
.. //depot/projects/mpsafetty/usr.sbin/mountd/mountd.c#2 integrate
.. //depot/projects/mpsafetty/usr.sbin/nfsd/nfsd.c#2 integrate
.. //depot/projects/mpsafetty/usr.sbin/pstat/pstat.c#9 integrate
.. //depot/projects/mpsafetty/usr.sbin/usbconfig/Makefile#1 branch
.. //depot/projects/mpsafetty/usr.sbin/usbconfig/dump.c#1 branch
.. //depot/projects/mpsafetty/usr.sbin/usbconfig/dump.h#1 branch
.. //depot/projects/mpsafetty/usr.sbin/usbconfig/usbconfig.8#1 branch
.. //depot/projects/mpsafetty/usr.sbin/usbconfig/usbconfig.c#1 branch

Differences ...

==== //depot/projects/mpsafetty/contrib/smbfs/lib/smb/nb_name.c#2 (text+ko) ====

@@ -33,7 +33,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/contrib/smbfs/lib/smb/nb_name.c,v 1.2 2005/09/19 08:07:18 imura Exp $");
+__FBSDID("$FreeBSD: src/contrib/smbfs/lib/smb/nb_name.c,v 1.3 2008/11/02 19:48:15 rwatson Exp $");
 
 #include 
 #include 
@@ -169,7 +169,7 @@
 		memsetw(cp + 2, NB_NAMELEN - 1, NBENCODE(' '));
 		cp += NB_ENCNAMELEN;
 	} else {
-		for (i = 0; *name && i < NB_NAMELEN; i++, cp += 2, name++)
+		for (i = 0; *name && i < NB_NAMELEN - 1; i++, cp += 2, name++)
 			*(u_short*)cp = NBENCODE(toupper(*name));
 		i = NB_NAMELEN - i - 1;
 		if (i > 0) {

==== //depot/projects/mpsafetty/etc/gss/mech#2 (text+ko) ====

@@ -1,6 +1,6 @@
-# $FreeBSD: src/etc/gss/mech,v 1.3 2008/05/07 13:53:02 dfr Exp $
+# $FreeBSD: src/etc/gss/mech,v 1.4 2008/11/03 10:38:00 dfr Exp $
 #
 # Name		OID			Library name			Kernel module
-kerberosv5	1.2.840.113554.1.2.2	/usr/lib/libgssapi_krb5.so.10	-
+kerberosv5	1.2.840.113554.1.2.2	/usr/lib/libgssapi_krb5.so.10	kgssapi_krb5
 spnego		1.3.6.1.5.5.2		/usr/lib/libgssapi_spnego.so.10	-
 #ntlm		1.3.6.1.4.1.311.2.2.10	/usr/lib/libgssapi_ntlm.so.10	-

==== //depot/projects/mpsafetty/etc/rc.d/Makefile#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/rc.d/Makefile,v 1.94 2008/08/25 16:28:54 des Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.95 2008/11/03 10:38:00 dfr Exp $
 
 .include 
 
@@ -11,7 +11,7 @@
 	dmesg dumpon \
 	early.sh encswap \
 	fsck ftp-proxy ftpd \
-	gbde geli geli2 \
+	gbde geli geli2 gssd \
 	hcsecd \
 	hostapd hostid hostname \
 	idmapd inetd initrandom \

==== //depot/projects/mpsafetty/etc/rc.d/nfsd#3 (text+ko) ====

@@ -1,10 +1,10 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/nfsd,v 1.15 2008/07/16 19:50:29 dougb Exp $
+# $FreeBSD: src/etc/rc.d/nfsd,v 1.16 2008/11/03 10:38:00 dfr Exp $
 #
 
 # PROVIDE: nfsd
-# REQUIRE: mountd
+# REQUIRE: mountd hostname gssd
 # KEYWORD: nojail shutdown
 
 . /etc/rc.subr

==== //depot/projects/mpsafetty/include/rpc/xdr.h#2 (text+ko) ====

@@ -30,7 +30,7 @@
  *
  *	from: @(#)xdr.h 1.19 87/04/22 SMI
  *	from: @(#)xdr.h	2.2 88/07/29 4.0 RPCSRC
- * $FreeBSD: src/include/rpc/xdr.h,v 1.23 2003/03/07 13:19:40 nectar Exp $
+ * $FreeBSD: src/include/rpc/xdr.h,v 1.24 2008/11/03 10:38:00 dfr Exp $
  */
 
 /*
@@ -294,10 +294,13 @@
 extern bool_t	xdr_u_short(XDR *, u_short *);
 extern bool_t	xdr_int16_t(XDR *, int16_t *);
 extern bool_t	xdr_u_int16_t(XDR *, u_int16_t *);
+extern bool_t	xdr_uint16_t(XDR *, u_int16_t *);
 extern bool_t	xdr_int32_t(XDR *, int32_t *);
 extern bool_t	xdr_u_int32_t(XDR *, u_int32_t *);
+extern bool_t	xdr_uint32_t(XDR *, u_int32_t *);
 extern bool_t	xdr_int64_t(XDR *, int64_t *);
 extern bool_t	xdr_u_int64_t(XDR *, u_int64_t *);
+extern bool_t	xdr_uint64_t(XDR *, u_int64_t *);
 extern bool_t	xdr_bool(XDR *, bool_t *);
 extern bool_t	xdr_enum(XDR *, enum_t *);
 extern bool_t	xdr_array(XDR *, char **, u_int *, u_int, u_int, xdrproc_t);

==== //depot/projects/mpsafetty/include/strings.h#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/include/strings.h,v 1.6 2004/07/23 07:13:35 tjr Exp $
+ * $FreeBSD: src/include/strings.h,v 1.7 2008/11/03 10:22:19 kib Exp $
  */
 
 #ifndef _STRINGS_H_
@@ -44,8 +44,10 @@
 int	 ffs(int) __pure2;
 #ifdef __BSD_VISIBLE
 int	 ffsl(long) __pure2;
+int	 ffsll(long long) __pure2;
 int	 fls(int) __pure2;
 int	 flsl(long) __pure2;
+int	 flsll(long long) __pure2;
 #endif
 char	*index(const char *, int) __pure;			/* LEGACY */
 char	*rindex(const char *, int) __pure;			/* LEGACY */

==== //depot/projects/mpsafetty/lib/libarchive/archive_write.3#2 (text+ko) ====

@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libarchive/archive_write.3,v 1.24 2008/05/26 17:00:23 kientzle Exp $
+.\" $FreeBSD: src/lib/libarchive/archive_write.3,v 1.25 2008/11/01 19:11:21 kientzle Exp $
 .\"
 .Dd May 11, 2008
 .Dt archive_write 3
@@ -342,7 +342,7 @@
 .Fo archive_write_callback
 .Fa "struct archive *"
 .Fa "void *client_data"
-.Fa "void *buffer"
+.Fa "const void *buffer"
 .Fa "size_t length"
 .Fc
 .El
@@ -410,7 +410,7 @@
 }
 
 ssize_t
-mywrite(struct archive *a, void *client_data, void *buff, size_t n)
+mywrite(struct archive *a, void *client_data, const void *buff, size_t n)
 {
   struct mydata *mydata = client_data;
 

==== //depot/projects/mpsafetty/lib/libc/amd64/SYS.h#2 (text+ko) ====

@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)SYS.h	5.5 (Berkeley) 5/7/91
- * $FreeBSD: src/lib/libc/amd64/SYS.h,v 1.29 2007/07/04 23:18:38 peter Exp $
+ * $FreeBSD: src/lib/libc/amd64/SYS.h,v 1.30 2008/11/02 01:10:54 peter Exp $
  */
 
 #include 
@@ -43,13 +43,15 @@
 			.weak CNAME(__CONCAT(_,x));			\
 			.set CNAME(__CONCAT(_,x)),CNAME(__CONCAT(__sys_,x)); \
 			mov __CONCAT($SYS_,x),%rax; KERNCALL; jb 2f; ret; \
-			2: movq PIC_GOT(HIDENAME(cerror)),%rcx; jmp *%rcx
+			2: movq PIC_GOT(HIDENAME(cerror)),%rcx; jmp *%rcx; \
+			END(__CONCAT(__sys_,x))
 
 #define	PSEUDO(x)	ENTRY(__CONCAT(__sys_,x));			\
 			.weak CNAME(__CONCAT(_,x));			\
 			.set CNAME(__CONCAT(_,x)),CNAME(__CONCAT(__sys_,x)); \
 			mov __CONCAT($SYS_,x),%rax; KERNCALL; jb 2f; ret ; \
-			2: movq PIC_GOT(HIDENAME(cerror)),%rcx; jmp *%rcx
+			2: movq PIC_GOT(HIDENAME(cerror)),%rcx; jmp *%rcx; \
+			END(__CONCAT(__sys_,x))
 #else
 #define	RSYSCALL(x)	ENTRY(__CONCAT(__sys_,x));			\
 			.weak CNAME(x);					\
@@ -57,13 +59,15 @@
 			.weak CNAME(__CONCAT(_,x));			\
 			.set CNAME(__CONCAT(_,x)),CNAME(__CONCAT(__sys_,x)); \
 			mov __CONCAT($SYS_,x),%rax; KERNCALL; jb 2f; ret; \
-			2: jmp HIDENAME(cerror)
+			2: jmp HIDENAME(cerror);			\
+			END(__CONCAT(__sys_,x))
 
 #define	PSEUDO(x)	ENTRY(__CONCAT(__sys_,x));			\
 			.weak CNAME(__CONCAT(_,x));			\
 			.set CNAME(__CONCAT(_,x)),CNAME(__CONCAT(__sys_,x)); \
 			mov __CONCAT($SYS_,x),%rax; KERNCALL; jb 2f; ret; \
-			2: jmp HIDENAME(cerror)
+			2: jmp HIDENAME(cerror);			\
+			END(__CONCAT(__sys_,x))
 #endif
 
 #define KERNCALL	movq %rcx, %r10; syscall

==== //depot/projects/mpsafetty/lib/libc/amd64/gen/_setjmp.S#2 (text+ko) ====

@@ -34,7 +34,7 @@
 	.asciz "@(#)_setjmp.s	5.1 (Berkeley) 4/23/90"
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/_setjmp.S,v 1.20 2008/06/28 17:55:43 das Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/_setjmp.S,v 1.21 2008/11/02 01:10:54 peter Exp $");
 
 /*
  * C library -- _setjmp, _longjmp
@@ -61,6 +61,7 @@
 	stmxcsr	68(%rax)		/*    and mxcsr */
 	xorq	%rax,%rax
 	ret
+END(_setjmp)
 
 	.weak	CNAME(_longjmp)
 	.set	CNAME(_longjmp),CNAME(___longjmp)
@@ -90,3 +91,4 @@
 	incq	%rax
 1:	movq	%rcx,0(%rsp)
 	ret
+END(___longjmp)

==== //depot/projects/mpsafetty/lib/libc/amd64/gen/fabs.S#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/fabs.S,v 1.3 2004/02/08 21:21:45 peter Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/fabs.S,v 1.4 2008/11/02 01:10:54 peter Exp $");
 
 /*
  * Return floating point absolute value of a double.
@@ -37,6 +37,7 @@
 	movsd	signbit(%rip), %xmm0
 	andnpd  %xmm1, %xmm0
 	ret
+END(fabs)
 
 	.data
 signbit:

==== //depot/projects/mpsafetty/lib/libc/amd64/gen/modf.S#2 (text+ko) ====

@@ -36,7 +36,7 @@
 #if defined(LIBC_SCCS)
 	RCSID("$NetBSD: modf.S,v 1.5 1997/07/16 14:37:18 christos Exp $")
 #endif
-__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/modf.S,v 1.3 2007/01/09 00:27:48 imp Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/modf.S,v 1.4 2008/11/02 01:10:54 peter Exp $");
 
 /*
  * modf(value, iptr): return fractional part of value, and stores the
@@ -86,3 +86,4 @@
 	movsd   -8(%rsp),%xmm0
 
 	ret
+END(modf)

==== //depot/projects/mpsafetty/lib/libc/amd64/gen/rfork_thread.S#2 (text+ko) ====

@@ -26,7 +26,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/rfork_thread.S,v 1.1 2003/10/13 20:32:33 alc Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/rfork_thread.S,v 1.2 2008/11/02 01:10:54 peter Exp $");
 
 /*
  * With thanks to John Dyson for the original version of this.
@@ -99,3 +99,4 @@
 #else
 	jmp	HIDENAME(cerror)
 #endif
+END(rfork_thread)

==== //depot/projects/mpsafetty/lib/libc/amd64/gen/setjmp.S#2 (text+ko) ====

@@ -34,7 +34,7 @@
 	.asciz "@(#)setjmp.s	5.1 (Berkeley) 4/23/90"
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/setjmp.S,v 1.28 2008/06/28 17:55:43 das Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/setjmp.S,v 1.29 2008/11/02 01:10:54 peter Exp $");
 
 /*
  * C library -- _setjmp, _longjmp
@@ -70,6 +70,7 @@
 	stmxcsr	68(%rcx)		/*    and mxcsr */
 	xorq	%rax,%rax
 	ret
+END(setjmp)
 
 	.weak CNAME(longjmp)
 	.set CNAME(longjmp),CNAME(__longjmp)
@@ -108,3 +109,4 @@
 	incq	%rax
 1:	movq	%rcx,0(%rsp)
 	ret
+END(__longjmp)

==== //depot/projects/mpsafetty/lib/libc/amd64/gen/sigsetjmp.S#2 (text+ko) ====

@@ -37,7 +37,7 @@
 	.asciz "$Id: sigsetjmp.S,v 1.1 1993/12/05 13:01:05 ats Exp $"
 #endif /* LIBC_SCCS and not lint */
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/sigsetjmp.S,v 1.29 2007/01/09 00:27:48 imp Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/sigsetjmp.S,v 1.30 2008/11/02 01:10:54 peter Exp $");
 
 #include "SYS.h"
 
@@ -77,6 +77,7 @@
 	fnstcw	64(%rcx)		/* 8; fpu cw */
 	xorq	%rax,%rax
 	ret
+END(sigsetjmp)
 
 	.weak CNAME(siglongjmp)
 	.set CNAME(siglongjmp),CNAME(__siglongjmp)
@@ -109,3 +110,4 @@
 	incq	%rax
 1:	movq	%rcx,0(%rsp)
 	ret
+END(__siglongjmp)

==== //depot/projects/mpsafetty/lib/libc/amd64/stdlib/div.S#2 (text+ko) ====

@@ -6,7 +6,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/amd64/stdlib/div.S,v 1.1 2007/04/04 01:19:54 jkim Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/stdlib/div.S,v 1.2 2008/11/02 01:10:54 peter Exp $");
 
 ENTRY(div)
 	movl	%edi,%eax
@@ -15,3 +15,4 @@
 	salq	$32,%rdx
 	orq	%rdx,%rax
 	ret
+END(div)

==== //depot/projects/mpsafetty/lib/libc/amd64/stdlib/ldiv.S#2 (text+ko) ====

@@ -6,10 +6,11 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/amd64/stdlib/ldiv.S,v 1.1 2007/04/04 01:19:54 jkim Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/stdlib/ldiv.S,v 1.2 2008/11/02 01:10:54 peter Exp $");
 
 ENTRY(ldiv)
 	movq	%rdi,%rax
 	cqto
 	idivq	%rsi
 	ret
+END(ldiv)

==== //depot/projects/mpsafetty/lib/libc/amd64/stdlib/lldiv.S#2 (text+ko) ====

@@ -6,10 +6,11 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/amd64/stdlib/lldiv.S,v 1.1 2007/04/04 01:19:54 jkim Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/stdlib/lldiv.S,v 1.2 2008/11/02 01:10:54 peter Exp $");
 
 ENTRY(lldiv)
 	movq	%rdi,%rax
 	cqto
 	idivq	%rsi
 	ret
+END(lldiv)

==== //depot/projects/mpsafetty/lib/libc/amd64/string/bcmp.S#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/amd64/string/bcmp.S,v 1.2 2005/04/10 18:12:06 alc Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/string/bcmp.S,v 1.3 2008/11/02 01:10:54 peter Exp $");
 
 #if 0
 	RCSID("$NetBSD: bcmp.S,v 1.1 2001/06/19 00:25:04 fvdl Exp $")
@@ -22,3 +22,4 @@
 	setne	%al
 	movsbl	%al,%eax
 	ret
+END(bcmp)

==== //depot/projects/mpsafetty/lib/libc/amd64/string/bcopy.S#2 (text+ko) ====

@@ -30,7 +30,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/amd64/string/bcopy.S,v 1.2 2005/04/08 05:10:18 alc Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/string/bcopy.S,v 1.3 2008/11/02 01:10:54 peter Exp $");
 
 #if 0
 	RCSID("$NetBSD: bcopy.S,v 1.2 2003/08/07 16:42:36 agc Exp $")
@@ -86,3 +86,12 @@
 	movsq
 	cld
 	ret
+#ifdef MEMCOPY
+END(memcpy)
+#else
+#ifdef MEMMOVE
+END(memmove)
+#else
+END(bcopy)
+#endif
+#endif

==== //depot/projects/mpsafetty/lib/libc/amd64/string/bzero.S#2 (text+ko) ====

@@ -5,7 +5,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/amd64/string/bzero.S,v 1.2 2005/04/07 05:46:46 alc Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/string/bzero.S,v 1.3 2008/11/02 01:10:54 peter Exp $");
 
 #if 0
 	RCSID("$NetBSD: bzero.S,v 1.2 2003/07/26 19:24:38 salo Exp $")
@@ -41,3 +41,4 @@
 	stosb
 
 	ret
+END(bzero)

>>> TRUNCATED FOR MAIL (1000 lines) <<<
From rene at FreeBSD.org  Tue Nov  4 06:09:55 2008
From: rene at FreeBSD.org (Rene Ladan)
Date: Tue Nov  4 06:10:03 2008
Subject: PERFORCE change 152453 for review
Message-ID: <200811041409.mA4E9si3098061@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152453

Change 152453 by rene@rene_self on 2008/11/04 14:09:43

	The update to rev 1.235 of handbook/config is a no-op for us.
	Take this oppertunity to fix line wrappings (as threatened before) and some language errors.
	At 51%, checked build.

Affected files ...

.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml#6 edit

Differences ...

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml#6 (text+ko) ====

@@ -4,7 +4,7 @@
      $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml,v 1.15 2008/09/14 22:32:27 remko Exp $
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/config/chapter.sgml
-     %SRCID%	1.234
+     %SRCID%	1.235
 -->
 
 
@@ -80,13 +80,13 @@
       
 
       
-	Hoe de instellingenbestanden in
-	  /etc gebruikt worden;
+	Hoe de instellingenbestanden in /etc
+ 	  gebruikt worden;
       
 
       
 	Hoe &os; geoptimaliseerd kan worden met
-	  sysctl variabelen;
+	  sysctl-variabelen;
       
 
       
@@ -99,7 +99,7 @@
 
     
       
-	De &unix; en &os; grondbeginselen (De grondbeginselen van &unix; en &os; () begrijpen;
       
 
@@ -127,40 +127,39 @@
       
 	Basispartities
 
-	Bij het aanmaken van bestandssystemen met
-	  &man.bsdlabel.8; of &man.sysinstall.8; is het van belang
-	  dat op een harde schijf de data-overdracht het snelst is aan
-	  de buitenste sporen en het langzaamst aan de binnenste.
-	  Kleinere en veelgebruikte bestandssystemen kunnen daarom het
-	  beste aan het begin van de schijf geplaatst worden, terwijl
-	  grotere partities als /usr meer naar het
-	  einde van de schijf geplaatst kunnen worden.  Het is een goed
-	  idee om partities aan te maken in deze of gelijksoortige
-	  volgorde: root, swap, /var,
+	Bij het aanmaken van bestandssystemen met &man.bsdlabel.8;
+	  of &man.sysinstall.8; is het van belang dat op een harde
+	  schijf de gegevensoverdracht het snelst is aan de buitenste
+	  sporen en het langzaamst aan de binnenste.  Kleinere en
+	  veelgebruikte bestandssystemen kunnen daarom het beste aan het
+	  begin van de schijf geplaatst worden, terwijl grotere
+	  partities als /usr meer naar het einde
+	  van de schijf geplaatst kunnen worden.  Het is een goed idee
+	  om partities aan te maken in deze of gelijksoortige volgorde:
+	  root, swap, /var,
 	  /usr.
 
-	De grootte van /var
-	  hangt af van de wijze waarop de machine gebruikt gaat worden.
+	De grootte van /var hangt af van de
+	  wijze waarop de machine gebruikt gaat worden.
 	  /var wordt gebruikt voor onder meer
-	  mailboxen, logbestanden en printerdata en -wachtrijen.
+	  mailboxen, logbestanden en printergegevens en -wachtrijen.
 	  Mailboxen en logbestanden kunnen onverwacht groot worden,
 	  afhankelijk van het aantal systeemgebruikers en de bewaarduur
 	  van logbestanden.  Meestal is minder dan een gigabyte
 	  voldoende.  /var/tmp moet wel groot
-	  genoeg moet zijn om packages te kunnen bevatten.
+	  genoeg moet zijn om pakketten te kunnen bevatten.
 
 	De partitie /usr bevat veel van de
-	  benodigde systeembestanden.  Die bevat tevens de
-	  &man.ports.7;collectie (aanbevolen) en de broncode
-	  (optioneel).  Beide zijn optioneel tijdens de installatie.
-	  Voor deze partitie wordt tenminste 2 gigabyte
-	  aanbevolen.
+	  benodigde systeembestanden.  Die bevat tevens de &man.ports.7;
+	  collectie (aanbevolen) en de broncode (optioneel).  Beide zijn
+	  optioneel tijdens de installatie.  Voor deze partitie wordt
+	  tenminste 2 gigabyte aanbevolen.
 
 	Het is verstandig rekening te houden met de vereiste
 	  schijfruimte bij het kiezen van partitiegroottes.  Als in een
-	  partitie onvoldoende vrije schijfruimte is, terwijl een
-	  andere vrijwel niet gebruikt wordt, is dat een vervelend
-	  en niet optimaal oplosbaar probleem.
+	  partitie onvoldoende vrije schijfruimte is, terwijl een andere
+	  vrijwel niet gebruikt wordt, is dat een vervelend en niet
+	  optimaal oplosbaar probleem.
 
 	
 	  &man.sysinstall.8;'s Auto-defaults
@@ -182,33 +181,33 @@
 
 	De vuistregel is dat het wisselbestand ongeveer het
 	  dubbele van de grootte van het systeemgeheugen (RAM) moet
-	  zijn.  Als de machine bijvoorbeeld 128 megabytes
-	  geheugen heeft, kan het beste een wisselbestand van
-	  (tenminste) 256 megabytes gebruikt worden.  Minder
-	  dan 256 megabytes swap is in dit geval af te raden.
-	  Systemen met weinig geheugen kunnen overigens beter
-	  functioneren met meer swap.  Ook is het verstandig rekening
-	  te houden met eventuele geheugenuitbreiding in de toekomst.
-	  Bovendien zijn de VM paging algoritmen van de kernel zo
-	  afgestemd dat ze het beste presteren bij een wisselbestand
-	  van tenminste tweemaal de grootte van het geheugen.  Een te
-	  kleine swap kan dus inefficiënties in de VM code tot
-	  gevolg hebben en mogelijk problemen veroorzaken als het
-	  systeemgeheugen uitgebreid wordt.
+	  zijn.  Als de machine bijvoorbeeld 128 megabytes geheugen
+	  heeft, kan het beste een wisselbestand van (tenminste)
+	  256 megabytes gebruikt worden.  Minder dan
+	  256 megabytes swap is in dit geval af te raden.  Systemen
+	  met weinig geheugen kunnen overigens beter functioneren met
+	  meer swap.  Ook is het verstandig rekening te houden met
+	  eventuele geheugenuitbreiding in de toekomst.  Bovendien zijn
+	  de VM paging-algoritmen van de kernel zo afgestemd dat ze het
+	  beste presteren bij een wisselbestand van tenminste tweemaal
+	  de grootte van het geheugen.  Een te kleine swap kan dus
+	  inefficiënties in de VM-code tot gevolg hebben en
+	  mogelijk problemen veroorzaken als het systeemgeheugen
+	  uitgebreid wordt.
 
-	Op grotere systemen met meerdere SCSI schijven (of
-	  meerdere IDE schijven op verschillende controllers) is het
-	  aan te raden om op elke schijf een wisselpartitie in te
-	  stellen (dit kan tot en met vier schijven), elk met ongeveer
-	  dezelfde grootte.  De kernel kan met arbitraire groottes
-	  werken, maar interne datastructuren schalen tot viermaal de
-	  grootste swappartitie.  De kernel kan de beschikbare ruimte
-	  voor het wisselbestand het meest optimaal indelen als de
-	  partities ongeveer even groot zijn.  Een grote swap is prima,
-	  ook als ze zelden gebruikt wordt.  Zo kan het gemakkelijker
-	  zijn om een (uit de hand gelopen) proces dat het systeem
-	  grotendeels bezet houdt te beëindigen, voordat er
-	  opnieuw opgestart moet worden.
+	Op grotere systemen met meerdere SCSI-schijven (of
+	  meerdere IDE-schijven op verschillende controllers) is het aan
+	  te raden om op elke schijf een wisselpartitie in te stellen
+	  (dit kan tot en met vier schijven), elk met ongeveer dezelfde
+	  grootte.  De kernel kan met arbitraire groottes werken, maar
+	  interne datastructuren schalen tot viermaal de grootste
+	  swappartitie.  De kernel kan de beschikbare ruimte voor het
+	  wisselbestand het meest optimaal indelen als de partities
+	  ongeveer even groot zijn.  Een grote swap is prima, ook als ze
+	  zelden gebruikt wordt.  Zo kan het gemakkelijker zijn om een
+	  (uit de hand gelopen) proces dat het systeem grotendeels bezet
+	  houdt te beëindigen, voordat er opnieuw opgestart moet
+	  worden.
       
 
       
@@ -230,16 +229,16 @@
 	  schrijfactiviteit doorsijpelt naar partities die vooral
 	  lees-intensief zijn.  Door schrijf-intensieve partities aan
 	  het begin van de schijf te plaatsen, zijn de prestaties wat
-	  betreft invoer/uitvoer het beste is daar waar het het
-	  meest nodig is.  Ofschoon er natuurlijk ook de best mogelijke
+	  betreft invoer/uitvoer het beste is daar waar het het meest
+	  nodig is.  Ofschoon er natuurlijk ook de best mogelijke
 	  in/uit prestaties wenselijk zijn in de grotere partities,
-	  weegt het plaatsen van deze bestandssystemen aan het begin
-	  van de schijf niet tegen de voordelen van het plaatsen van
-	  /var aan het begin van de schijf (na
-	  root en swap) voor de totale snelheid van het systeem.
-	  Tenslotte zijn er veiligheidsoverwegingen.  Een compacte en
-	  nette rootpartitie die vrijwel alleen-lezen is, heeft een
-	  betere kans om een nare crash te overleven.
+	  weegt het plaatsen van deze bestandssystemen aan het begin van
+	  de schijf niet tegen de voordelen van het plaatsen van
+	  /var aan het begin van de schijf (na root
+	  en swap) voor de totale snelheid van het systeem.  Tenslotte
+	  zijn er veiligheidsoverwegingen.  Een compacte en nette
+	  rootpartitie die vrijwel alleen-lezen is, heeft een betere
+	  kans om een nare crash te overleven.
       
     
   
@@ -258,16 +257,15 @@
       aan instellingen, die gebruikt wordt om het systeem in te stellen
       bij het opstarten.  De naam impliceert dit al.  Het is informatie
       voor de rc* bestanden (rc staat voor
-      resource configuration of
-      broninstellingen).
+      resource configuration of broninstellingen).
 
     De systeembeheerder wordt geacht regels toe te voegen aan
       rc.conf om de standaardinstellingen uit
       /etc/defaults/rc.conf aan te passen.  Het
-      standaardbestand moet niet letterlijk gekopiëerd worden
-      naar /etc.  Het bevat standaardwaardes en is
-      niet bedoeld als voorbeeld.  Alle wijzigingen die specifiek
-      zijn voor een systeem horen in /etc/rc.conf
+      standaardbestand moet niet letterlijk gekopiëerd worden naar
+      /etc.  Het bevat standaardwaardes en is niet
+      bedoeld als voorbeeld.  Alle wijzigingen die specifiek zijn voor
+      een systeem horen in /etc/rc.conf
       thuis.
 
     In een clusterscenario is het nuttig om systeemspecifieke
@@ -275,7 +273,7 @@
       hele cluster gelden.  Hiervoor kunnen een aantal strategieën
       worden gebruikt.  De aanbevolen benadering is om gedeelde
       instellingen in een ander bestand te plaatsen, zoals
-      /etc/rc.conf.site en dit invoegen in
+      /etc/rc.conf.site en dit in te voegen in
       /etc/rc.conf, wat verder alleen
       systeemspecifieke informatie bevat.
 
@@ -306,8 +304,8 @@
       gelijksoortig programma, terwijl rc.conf
       uniek blijft.
 
-    Het actualiseren van het systeem met &man.sysinstall.8;
-      of make world overschrijft
+    Het actualiseren van het systeem met &man.sysinstall.8; of
+      make world overschrijft
       rc.conf niet, zodat de bestaande
       systeeminstellingen niet verloren gaan.
   
@@ -317,23 +315,23 @@
 
     Geïnstalleerde toepassingen hebben meestal hun eigen
       instellingenbestanden, met hun eigen syntaxis, etc.  Het is van
-      belang deze bestanden apart te houden van het basissysteem,
-      zodat ze makkelijk gelokaliseerd kunnen worden en beheerd kunnen
-      worden met de hulpmiddelen voor pakketbeheer.
+      belang deze bestanden apart te houden van het basissysteem, zodat
+      ze makkelijk gelokaliseerd kunnen worden en beheerd kunnen worden
+      met de hulpmiddelen voor pakketbeheer.
 
     /usr/local/etc
 
     Deze bestanden worden meestal geïnstalleerd in
       /usr/local/etc.  Als een toepassing een
-      uitgebreide set bestanden voor instellingen heeft, wordt er een
-      submap voor aangemaakt.
+      uitgebreide verzameling bestanden voor instellingen heeft, wordt
+      er een submap voor aangemaakt.
 
-    Bij de installatie van een port of package, worden normaliter
+    Bij de installatie van een port of pakket, worden normaliter
       ook voorbeeldbestanden met instellingen geïnstalleerd.  Deze
       zijn doorgaans te herkennen aan een toevoegsel
       .default.  Als er geen bestaande
       instellingenbestanden voor de toepassing zijn, kunnen ze gemaakt
-      worden door de .default bestanden te
+      worden door de .default-bestanden te
       kopiëren.
 
     Een voorbeeld is de map
@@ -351,8 +349,8 @@
 -rw-r--r--  1 root  wheel   7933 May 20  1998 srm.conf.default
 
     Aan de grootte van de bestanden is te zien dat alleen
-      srm.conf gewijzigd is.  Als later de
-      Apache port wordt vernieuwd, wordt dit
+      srm.conf gewijzigd is.  Als later de port
+      Apache wordt vernieuwd, wordt dit
       bestand niet overschreven.
   
 
@@ -374,12 +372,12 @@
       Veel gebruikers kiezen ervoor om software van derden te
 	installeren op &os; vanuit de Portscollectie.  In veel gevallen
 	is het noodzakelijk om de software dusdanig in te stellen dat
-	het opstart tijdens het booten.  Diensten zoals mail/postfix of www/apache13 zijn slechts twee
-	voorbeelden van softwarepakketten die gestart kunnen worden
-	tijdens de systeemstart.  In deze paragraaf wordt toegelicht
-	hoe software van derde partijen kan worden gestart.
+	het opstart tijdens het opstarten van de computer.  Diensten
+	zoals mail/postfix of
+	www/apache13 zijn slechts
+	twee voorbeelden van softwarepakketten die gestart kunnen worden
+	tijdens de systeemstart.  In deze paragraaf wordt toegelicht hoe
+	software van derde partijen kan worden gestart.
 
       In &os; worden de meeste diensten, zoals &man.cron.8;, door
 	de opstartscripts van het systeem gestart.  Deze scripts kunnen
@@ -388,31 +386,32 @@
 	opstartinstellingen verwerkt kunnen worden door simpele
 	opstartscripts.
 
-      Voor de komst van rc.d zetten applicaties simpelweg een
-	opstartscript in de map Voor de komst van rc.d zetten
+	applicaties simpelweg een opstartscript in de map /usr/local/etc/rc.d dat dan
 	uitgelezen werd door de opstartscripts van het systeem.  Deze
-	scripts werden dan uitgevoerd tijdens de laatste stappen van
-	een systeemstart.
+	scripts werden dan uitgevoerd tijdens de laatste stappen van een
+	systeemstart.
 
       Terwijl veel individuen bezig waren om de oude stijl van
 	instellen naar de nieuwe stijl over te zetten, bleef sommige
 	software nog steeds een script nodig hebben in de genoemde map.
 	De subtiele verschillen in de scripts hangen af van het wel of
-	niet gebruiken van rc.d.  Vóór &os; 5.1
-	werden scripts oude stijl gebruikt en in bijna
-	alle gevallen voldoet een script nieuwe
-	  stijl.
+	niet gebruiken van rc.d.
+
+	Vóór &os; 5.1 werden scripts oude
+	  stijl gebruikt en in bijna alle gevallen voldoet een
+	script nieuwe stijl.
 
-      Elk script moet uitvoerbaar zijn door het systeem; dit
-	wordt meestal bereikt door gebruik te maken van het commando
+      Elk script moet uitvoerbaar zijn door het systeem; dit wordt
+	meestal bereikt door gebruik te maken van het commando
 	chmod en het instellen van de unieke
-	permissies 555.  Op zijn minst moeten ook
-	de start en stop opties
-	zijn om de applicatie te starten en te stoppen.
+	permissies 555.  Op zijn minst moeten ook de
+	start en stop opties
+	aanwezig zijn om de applicatie te starten en te stoppen.
 
-      Het simpelste opstartscript ziet er waarschijnlijk als
-	volgt uit:
+      Het simpelste opstartscript ziet er waarschijnlijk als volgt
+	uit:
 
       #!/bin/sh
 echo -n ' utility'
@@ -441,26 +440,26 @@
       &prompt.root; /usr/local/etc/rc.d/utility start
 
       Hoewel niet alle software van derden een regel nodig heeft
-	in /etc/rc.conf, wordt er bijna elke
-	dag een wel een port veranderd om deze instellingen te
-	ondersteunen.  De meldingen tijdens de installatie van de port
-	bevatten vaak meer informatie.  Sommige software
-	van derden levert opstartscripts die de applicatie kunnen laten
-	werken met rc.d.  Dit wordt in de volgende paragraaf
+	in /etc/rc.conf, wordt er bijna elke dag
+	een wel een port veranderd om deze instellingen te ondersteunen.
+	De meldingen tijdens de installatie van de port bevatten vaak
+	meer informatie.  Sommige software van derden levert
+	opstartscripts die de applicatie kunnen laten werken met
+	rc.d.  Dit wordt in de volgende paragraaf
 	behandeld.
 
       
 	Uitgebreide applicatieinstellingen
 
-	Nu &os; rc.d heeft, zijn de instellingen
-	  van applicaties die mee moeten opstarten versimpeld en rijker aan
-	  mogelijkheden.  Door gebruik te maken van de sleutelwoorden die
-	  in de paragraaf rc.d behandeld worden,
-	  kunnen applicaties nu starten na andere diensten.
-	  DNS kan bijvoorbeeld extra opties
-	  meekrijgen van /etc/rc.conf in plaats
-	  van hard ingestelde opties in het opstartscript.  Een
+	Nu &os; rc.d heeft, zijn de
+	  instellingen van applicaties die mee moeten opstarten
+	  versimpeld en rijker aan mogelijkheden.  Door gebruik te maken
+	  van de sleutelwoorden die in de paragraaf rc.d
+	  behandeld worden, kunnen applicaties nu starten na andere
+	  diensten.  DNS kan bijvoorbeeld extra
+	  opties meekrijgen van /etc/rc.conf in
+	  plaats van hard ingestelde opties in het opstartscript.  Een
 	  basisscript ziet er ongeveer als volgt uit:
 
 	#!/bin/sh
@@ -492,39 +491,37 @@
 run_rc_command "$1"
 
 	Dit script zorgt ervoor dat
-	  utility wordt gestart na
-	  de daemon dienst.  Het biedt ook de mogelijkheid
-	  voor het instellingen en volgen van het
-	  PID of het process ID
-	  bestand.
+	  utility wordt gestart na de dienst
+	  daemon.  Het biedt ook de mogelijkheid voor
+	  het instellingen en volgen van het PID of
+	  het proces-ID bestand.
 
 	Voor deze applicatie kan dan de volgende regel in
 	  /etc/rc.conf geplaatst worden:
 
 	utility_enable="YES"
 
-	Deze methode maakt het volgende mogelijk:
-	  makkelijker commandoregelopties manipuleren, importeren van
+	Deze methode maakt het volgende mogelijk: makkelijker
+	  commandoregelopties manipuleren, importeren van
 	  standaardfuncties uit /etc/rc.subr,
-	  compatibiliteit met de &man.rcorder.8; utility en levert
-	  makkelijkere configuratie via het rc.conf
-	  bestand.
+	  compatibiliteit met het gereedschap &man.rcorder.8; en het
+	  levert makkelijkere configuratie via het bestand
+	  rc.conf.
     
 
     
       Diensten met diensten starten
 
-      Andere diensten, zoals POP3 server
+      Andere diensten, zoals POP3-server
 	daemons, IMAP, enzovoort, kunnen gestart
 	worden door gebruik te maken van &man.inetd.8;.  Daaraan is
 	voorafgegaan dat die dienst uit de Portscollectie is
 	geïstalleerd en dat er een regel met instellingen is
 	toegevoegd aan /etc/inetd.conf of
 	één van de bestaande niet actieve regels is
-	geactiveerd.  Werken met inetd
-	en zijn instellingen wordt uitgebreid toegelicht in de
-	paragraaf over inetd.
+	geactiveerd.  Werken met inetd en
+	zijn instellingen wordt uitgebreid toegelicht in de paragraaf
+	over inetd.
 
       In sommige gevallen is het handiger om &man.cron.8; te
 	gebruiken om diensten te starten.  Deze aanpak heeft een aantal
@@ -533,9 +530,9 @@
 	gebruikers in staat om sommige applicaties te starten en te
 	onderhouden.
 
-      cron levert een unieke optie: plaats van
-	een tijdsspecificatie kan @reboot gebruikt
-	worden.  Dit zorgt ervoor dat de taak gestart wordt als
+      cron levert een unieke optie: in plaats
+	van een tijdsspecificatie kan @reboot
+	gebruikt worden.  Dit zorgt ervoor dat de taak gestart wordt als
 	&man.cron.8; gestart wordt, meestal tijdens een
 	systeemstart.
     
@@ -561,7 +558,7 @@
     
 
     Een zeer nuttig hulpprogramma in &os; is &man.cron.8;.  De
-      cron daemon draait op de achtergrond en
+      daemon cron draait op de achtergrond en
       controleert voortdurend /etc/crontab.  Ook
       controleert cron de map
       /var/cron/tabs, op zoek naar nieuwe
@@ -582,15 +579,15 @@
 
     
       Gebruikerscrontabs geven individuele gebruikers de
-	mogelijkheid om bepaalde terugkerende taken automatisch te
-	laten uitvoeren zonder dat root rechten
-	noodig zijn.  Commando's in de crontab van een gebruiker
-	worden uitgevoerd met de rechten van de eigenaar.
+	mogelijkheid om bepaalde terugkerende taken automatisch te laten
+	uitvoeren zonder dat root-rechten noodig
+	zijn.  Commando's in de crontab van een gebruiker worden
+	uitgevoerd met de rechten van de eigenaar.
 
       root kan ook een gebruikerscrontab
 	aanleggen.  Dit is niet dezelfde als
-	/etc/crontab (de systeemcrontab).  Omdat
-	er al een systeemcrontab is, is het doorgaans niet nodig om een
+	/etc/crontab (de systeemcrontab).  Omdat er
+	al een systeemcrontab is, is het doorgaans niet nodig om een
 	gebruikerscrontab voor root te
 	maken.
     
@@ -621,8 +618,7 @@
 	  karakter # vooraf aan commentaar.
 	  Commentaar wordt gebruikt als uitleg en geheugensteun.
 	  Commentaar dient niet vermengd te worden met commando's,
-	  anders wordt het commentaar opgevat als deel van het
-	  commando.  Blanco regels worden genegeerd.
+	  anders wordt het commentaar opgevat als deel van het commando.	  Blanco regels worden genegeerd.
       
 
       
@@ -634,8 +630,8 @@
 	  ontbreekt, gebruikt cron standaard
 	  sh als shell.  Voor de omgevingsvariabele
 	  PATH bestaat geen standaardwaarde.  Als
-	  PATH ontbreekt moeten absolute paden
-	  gebruikt worden.  Als HOME ontbreekt, gebruikt
+	  PATH ontbreekt moeten absolute paden gebruikt
+	  worden.  Als HOME ontbreekt, gebruikt
 	  cron de thuismap van de de gebruiker die
 	  cron aanroept.
       
@@ -646,9 +642,9 @@
 	  uur, mdag,
 	  maand, wdag,
 	  wie en commando.  De
-	  betekenissen liggen voor de hand: minute
+	  betekenissen liggen voor de hand: minuut
 	  is het aantal minuten van het tijdstip waarop het commando
-	  moet worden uitgevoerd; hour geeft het uur
+	  moet worden uitgevoerd; uur geeft het uur
 	  aan; mdag staat voor de dag van de maand;
 	  maand staat voor het maandnummer en
 	  wdag geeft de dag van de week aan.  Het
@@ -656,7 +652,7 @@
 	  /etc/crontab.  Het geeft aan als welke
 	  gebruiker het commando uitgevoerd moet worden.  Een gebruiker
 	  die zijn eigen crontab installeert,
-	  heeft deze optie niet.  Het veld command
+	  heeft deze optie niet.  Het veld commando
 	  bevat het uit te voeren commando.
       
 
@@ -667,16 +663,14 @@
 	  Deze betekenen eerst-laatst en kunnen gezien
 	  worden als telkens.  In deze regel staat
 	  dus dat het commando atrun elke vijf
-	  minuten moet worden uitgevoerd door
-	  root, ongeacht welke dag of maand het
-	  is.  Meer informatie over atrun staat in
-	  &man.atrun.8;.
+	  minuten moet worden uitgevoerd door root,	  ongeacht welke dag of maand het is.  Meer informatie over
+	  atrun staat in &man.atrun.8;.
 
 	Commando's kunnen een willekeurig aantal opties of
 	  argumenten meekrijgen.  Als commando's echter meerdere regels
 	  nodig hebben moeten deze regels afgebroken worden met een
-	  backslash \ karakter, om aan te geven dat ze
-	  op de volgende regel vervolgd worden.
+	  backslash \ karakter, om aan te geven dat ze op
+	  de volgende regel vervolgd worden.
       
     
 
@@ -702,18 +696,18 @@
 
       Om een nieuwe crontab te installeren
 	moet eerst een bestand in het juiste formaat gemaakt worden en
-	daarna moet het geiuml;nstalleerd worden met
-	crontab commando:
+	daarna moet het geiuml;nstalleerd worden met commando
+	crontab:
 
       &prompt.root; crontab crontabbestand
 
       In dit voorbeeld is crontabbestand de
 	naam van een eerder gemaakt
-	crontabbestand.
+	crontab-bestand.
 
       Er bestaat ook een optie om een lijst van
-	geïnstalleerde crontab bestanden op
-	te vragen, namelijk de optie  van
+	geïnstalleerde crontab-bestanden op te
+	vragen, namelijk de optie  van
 	crontab.
 
       Gebruikers die hun eigen crontabbestand willen schrijven
@@ -750,7 +744,7 @@
       in /etc/rc.d zijn scripts voor basisdiensten
       die werken met de opties ,
        en , analoog aan
-      hoe diensten die via een port of package zijn geïnstalleerd
+      hoe diensten die via een port of pakket zijn geïnstalleerd
       gestart worden met de scripts in
       /usr/local/etc/rc.d.  &man.sshd.8; kan
       bijvoorbeeld als volgt herstart worden:
@@ -758,15 +752,16 @@
     &prompt.root; /etc/rc.d/sshd restart
 
     Deze procedure is vrijwel gelijk voor andere diensten.
-      Uiteraard worden diensten meestal automatisch tijdens het booten gestart zoals
-      in &man.rc.conf.5; staat.  Om de Network Address Translation
-      daemon bij het opstarten te laten starten is de volgende regel in
+      Uiteraard worden diensten meestal automatisch tijdens het
+      opstarten van de computer gestart zoals in &man.rc.conf.5; staat.
+      Om de Network Address Translation daemon bij het opstarten te
+      laten starten is de volgende regel in
       /etc/rc.conf bijvoorbeeld voldoende:
 
     natd_enable="YES"
 
-    Als er reeds een natd_enable="NO" regel
-      is, kan NO gewoon in YES
+    Als er reeds een natd_enable="NO" regel is,
+      kan NO gewoon in YES
       veranderd worden.  De rc scripts starten, voor zover nodig,
       automatisch andere afhankelijke diensten.
 
@@ -778,19 +773,19 @@
       /etc/rc.conf zijn ingesteld.  Het commando
       sshd restart alleen dan als
       sshd_enable de waarde YES
-      heeft in /etc/rc.conf.  Als er een service
+      heeft in /etc/rc.conf.  Als er een dienst
       gestart, gestopt of herstart moet worden, ongeacht de definities
       in /etc/rc.conf, moet het commando
       voorafgegaan worden door one.  Dus om
       sshd te herstarten ongeacht
-      /etc/rc.conf setting, voldoet het volgende
-      commando:
+      de instellingen in /etc/rc.conf, voldoet het
+      volgende commando:
 
     &prompt.root; /etc/rc.d/sshd onerestart
 
     Het is eenvoudig te controleren of een dienst is ingeschakeld
       is in /etc/rc.conf door het bijpassende
-      rc.d script uit te voeren met de optie
+      rc.d-script uit te voeren met de optie
       .  Voor sshd:
 
     &prompt.root; /etc/rc.d/sshd rcvar
@@ -799,7 +794,7 @@
 
     De tweede regel (# sshd) is de
 	uitvoer van sshd, geen
-	root console.
+	root-console.
 
     De optie  wordt gebruikt om vast te
       stellen of een dienst gestart is.  Om bijvoorbeeld te controleren
@@ -809,12 +804,12 @@
 sshd is running as pid 433.
 
     In sommige gevallen is het ook mogelijk om een dienst te
-      herstarten met de optie .  Dan wordt er getracht een signaal te
-      sturen aan een individuele dienst, waarbij de dienst de bestanden
-      met instellingen opnieuw in moet lezen.  Meestal komt dit neer
-      op het verzenden van het signaal
-      SIGHUP signaal.  Deze optie wordt niet door
-      alle diensten ondersteund.
+      herstarten met de optie .  Dan wordt er
+      getracht een signaal te sturen aan een individuele dienst, waarbij
+      de dienst de bestanden met instellingen opnieuw in moet lezen.
+      Meestal komt dit neer op het verzenden van het signaal
+      SIGHUP.  Deze optie wordt niet door alle
+      diensten ondersteund.
 
     Het rc.d-systeem wordt niet alleen
       gebruikt voor netwerkdiensten, maar ook voor het merendeel van de
@@ -824,23 +819,23 @@
 
     Starting background file system checks in 60 seconds.
 
-    Dit script wordt dus gebruikt voor bestandssysteemcontrole
-      in de achtergrond, hetgeen alleen tijdens de systeemstart
+    Dit script wordt dus gebruikt voor bestandssysteemcontrole in
+      de achtergrond, hetgeen alleen tijdens de systeemstart
       gebeurt.
 
     Veel systeemdiensten zijn afhankelijk van andere diensten om
       correct te kunnen functioneren.  Zo starten NIS en andere
-      RPC-gebaseerde diensten niet als de rpcbind
-      (portmapper) dienst nog niet draait.  Om dit te stroomlijnen
-      wordt informatie over afhankelijkheden en andere meta-data
-      ingevoegd in het commentaar bovenaan het opstartscript.  Deze
-      commentaarregels worden vervolgens tijdens de systeemstart
-      met &man.rcorder.8; verwerkt om zo vast te stellen in welke
-      volgorde de systeemdiensten gestart moeten worden.
+      RPC-gebaseerde diensten niet als de dienst
+      rpcbind (portmapper) nog niet draait.  Om dit
+      te stroomlijnen wordt informatie over afhankelijkheden en andere
+      metagegevens ingevoegd in het commentaar bovenaan het
+      opstartscript.  Deze commentaarregels worden vervolgens tijdens de
+      systeemstart met &man.rcorder.8; verwerkt om zo vast te stellen in
+      welke volgorde de systeemdiensten gestart moeten worden.
 
-    De volgende woorden moeten in alle opstartscripts staan
-      (ze zijn benodigd door &man.rc.subr.8; om het opstart
-      script te activeren)>:
+    De volgende woorden moeten in alle opstartscripts staan (ze
+      zijn benodigd door &man.rc.subr.8; om het opstartscript te
+      activeren):
 
     
       
@@ -869,11 +864,11 @@
       systemen.
 
     Meer informatie over het rc.d-systeem
-      staat in &man.rc.8; en &man.rc.subr.8;.  Als je geinteresseerd
-      bent in het schrijven van je eigen rc.d
-      script of om de huidige scripts te verbeteren is wellicht
-      dit artikel
-      interessant.
+      staat in &man.rc.8; en &man.rc.subr.8;.  Als u geïnteresseerd
+      bent in het schrijven van uw eigen
+      rc.d-script of om de huidige scripts te
+      verbeteren is wellicht dit
+	artikel interessant.
   
 
   
@@ -896,9 +891,9 @@
     
 
     Het is tegenwoordig nauwelijks voorstelbaar dat een computer
-      geen netwerkverbinding heeft.  Het toevoegen en instellen van
-      een netwerkkaart is een gebruikelijke taak voor een &os;
-      beheerder.
+      geen netwerkverbinding heeft.  Het toevoegen en instellen van een
+      netwerkkaart is een gebruikelijke taak voor een
+      &os;-beheerder.
 
     
       Het juiste stuurprogramma vinden
@@ -910,27 +905,27 @@
       
 
       Voor het zoeken begint, moet duidelijk zijn om welke kaart
-	het gaat, welke chip erop zit en of het een PCI of ISA kaart
+	het gaat, welke chip erop zit en of het een PCI- of ISA-kaart
 	is.  &os; ondersteunt vele kaarten.  Op de Hardware
-	Compatibiliteitslijst voor de betreffende release om staan de
+	Compatibiliteitslijst voor de betreffende uitgave staan de
 	kaarten die ondersteund worden.
 
       Als duidelijk is dat een kaart ondersteund wordt, moet
-	vastgesteld worden wat het geschikte stuurprogramma is.
-	In het bestand /usr/src/sys/conf/NOTES
-	staat een lijst van stuurprogramma's voor
-	netwerkinterfaces met wat informatie over de ondersteunde
-	chipsets of kaarten.  In geval van twijfel biedt de hulppagina
-	voor het stuurprogramma (man) vaak uitkomst.
-	In het algemeen bevat deze meer informatie over de ondersteunde
-	hardware en mogelijke problemen die kunnen optreden.
+	vastgesteld worden wat het geschikte stuurprogramma is.  In het
+	bestand /usr/src/sys/conf/NOTES staat een
+	lijst van stuurprogramma's voor netwerkinterfaces met wat
+	informatie over de ondersteunde chipsets of kaarten.  In geval
+	van twijfel biedt de hulppagina voor het stuurprogramma
+	(man) vaak uitkomst.  In het algemeen bevat
+	deze meer informatie over de ondersteunde hardware en mogelijke
+	problemen die kunnen optreden.
 
       Als een veelgebruikte kaart gebruikt wordt, hoeft meestal
 	niet ver gezocht te worden.  Stuurprogramma's voor
-	veelvoorkomende netwerkinterfaces al aanwezig in de algemene
-	GENERIC kernel.  In dat geval wordt zo'n
-	al gevonden worden bij het opstarten, bijvoorbeeld met het
-	volgende bericht:
+	veelvoorkomende netwerkinterfaces zijn al aanwezig in de
+	algemene kernel GENERIC.  In dat geval
+	wordt zo'n kaart al gevonden bij het opstarten, bijvoorbeeld met
+	het volgende bericht:
 
 dc0: <82c169 PNIC 10/100BaseTX> port 0xa000-0xa0ff mem 0xd3800000-0xd38
 000ff irq 15 at device 11.0 on pci0
@@ -948,8 +943,8 @@
       In dit voorbeeld zitten er twee kaarten in het systeem die
 	het stuurprogramma &man.dc.4; gebruiken.
 
-      Als het stuurprogramma voor een NIC geen onderdeel is van
-	de GENERIC kernel, dan dient het juiste
+      Als het stuurprogramma voor een NIC geen onderdeel is van de
+	kernel GENERIC, dan dient het juiste
 	stuurprogramma voor die NIC geladen te worden.  Dit kan op twee
 	manieren:
 
@@ -958,10 +953,11 @@
 	  De meest eenvoudige manier is het laden van een
 	    kernelmodule voor een netwerkkaart met &man.kldload.8; of
 	    automatisch tijdens het opstarten van het systeem door de
-	    benodigde regel toe te voegen aan /boot/loader.conf.
-	    Niet alle NIC stuurprogramma's zijn als module beschikbaar.
-	    Zo zijn er bijvoorbeeld geen modules beschikbaar voor ISA
-	    kaarten.
+	    benodigde regel toe te voegen aan
+	    /boot/loader.conf.  Niet alle
+	    NIC-stuurprogramma's zijn als module beschikbaar.  Zo zijn
+	    er bijvoorbeeld geen modules beschikbaar voor
+	    ISA-kaarten.
 	
 
 	
@@ -973,68 +969,79 @@
 	    er in het kernelinstellingenbestand moet staan.  In  staat meer informatie over het
 	    compileren van een eigen kernel.  Als een netwerkkaart al
-	    bij het opstarten wordt herkend door de
-	    GENERIC kernel, is er geen reden om
-	    een andere kernel te bouwen.
+	    bij het opstarten wordt herkend door de kernel
+	    GENERIC, is er geen reden om een andere
+	    kernel te bouwen.
 	
       
 
       
-	Gebruik maken van &windows; NDIS drivers
+	Gebruik maken van &windows;
+	  NDIS-stuurpgrogramma's
 
 	NDIS
+
 	NDISulator
+
 	&windows; drivers
+
 	Microsoft Windows
-	Microsoft Windows
-	    device drivers
+
+	
+	  Microsoft Windows
+
+	  device drivers
+
 	KLD (kernel loadable object)
 
-	Helaas zijn er nog steeds veel leveranciers die geen schema's
-	  leveren voor drivers aan de open source gemeenschap, omdat ze
-	  deze informatie beschouwen als handels geheimen.  Als gevolg
-	  daarvan hebben de ontwikkelaars van &os; en andere projecten
-	  twee keuzes: zelf de stuurprogramma's ontwikkelen door een
-	  langdurig en pijnlijk proces door de huidige stuurprogramma's
-	  te ontcijferen, of door gebruik te maken van de huidige binaire
-	  bestanden voor het µsoft.windows; platform.  De meeste
-	  ontwikkelaars, inclusief diegeen die gekoppeld zijn aan &os;,
-	  hebben voor het laatste gekozen.
+	Helaas zijn er nog steeds veel leveranciers die geen
+	  schema's leveren voor stuurprogramma's aan de open-source
+	  gemeenschap, omdat ze deze informatie beschouwen als
+	  handelsgeheimen.  Als gevolg daarvan hebben de ontwikkelaars
+	  van &os; en andere projecten twee keuzes: zelf de
+	  stuurprogramma's ontwikkelen door een langdurig en pijnlijk
+	  proces van de huidige stuurprogramma's te ontcijferen, of door
+	  gebruik te maken van de huidige binaire bestanden voor het
+	  µsoft.windows; platform.  De meeste ontwikkelaars,
+	  inclusief diegeen die gekoppeld zijn aan &os;, hebben voor het
+	  laatste gekozen.
 
 	Dankzij de bijdragen van Bill Paul (wpaul) is er vanaf
 	  &os; 5.3-RELEASE native ondersteuning
 	  voor de Network Driver Interface Specification (NDIS).  De
 	  &os; NDISulator (ook wel bekend als Project Evil) neemt een
-	  &windows; binair stuurprogramma en doet net alsof deze in een
-	  &windows; systeem draait.  Omdat het &man.ndis.4; stuurprogramma
-	  een &windows; binary gebruikt; is het alleen bruikbaar op &i386;
-	  en amd64 systemen.
+	  binair &windows; stuurprogramma en doet net alsof deze in een
+	  &windows; systeem draait.  Omdat het stuurprogramma
+	  &man.ndis.4; een &windows; binary gebruikt; is het alleen
+	  bruikbaar op &i386;- en amd64-systemen.
 
 	
-	  Het &man.ndis.4; stuurprogramma is ontwikkeld om
-	    ondersteuning te geven aan PCI, CardBus en PCMCIA apparaten,
-	    USB apparaten worden nog niet ondersteund.
+	  Het stuurprogramma &man.ndis.4; is ontwikkeld om
+	    ondersteuning te geven aan PCI-, CardBus- en
+	    PCMCIA-apparaten, USB-apparaten worden nog niet
+	    ondersteund.
 	
 
-	Om gebruik te kunnen maken van de NDISulator heb je drie
+	Om gebruik te kunnen maken van de NDISulator heeft u drie
 	  dingen nodig:
 
 	
 	  
-	    De kernel bronbestanden
+	    De bronbestanden van de kernel
 	  
 
 	  
-	    Een &windowsxp; stuurprogramma (met de
-	      .SYS extensie)
+	    Een &windowsxp; stuurprogramma (met de extensie
+	      .SYS)
 
 	  
-	    Een &windowsxp; stuurprogramma configuratie bestand
-	      (met de .INF extensie)
+	    Een instellingenbestand van het &windowsxp;
+	      stuurprogramma (met de extensie
+	      .INF)
 	  
 	
 
-	Lokaliseer de bestanden voor jouw specifieke kaart.  Over
+	Lokaliseer de bestanden voor uw specifieke kaart.  Over
 	  het algemeen kunnen deze gevonden worden op de bijgeleverde
 	  CD's of op de website van de leverancier.  In de volgende
 	  voorbeelden maken we gebruik van
@@ -1042,42 +1049,44 @@
 	  W32DRIVER.INF.
 
 	
-	  Let op, je kunt geen gebruik maken van een &windows;/i386
-	    stuurprogramma op &os;/amd64, hiervoor zul je een &windows;/amd64
-	    stuurprogramma moeten gebruiken om het werkend te
-	    krijgen.
+	  Let op, u kunt geen gebruik maken van een &windows;/i386
+	    stuurprogramma op &os;/amd64, hiervoor zult u een
+	    &windows;/amd64 stuurprogramma moeten gebruiken om het
+	    werkend te krijgen.
 	
 
 	De volgende stap is het compileren van het binaire
-	  stuurprogramma in een laadbare kernel module.  Om dit voor
+	  stuurprogramma in een laadbare kernelmodule.  Om dit voor
 	  elkaar te krijgen moet &man.ndisgen.8; gebruikt worden als
 	  root.
 
-	&prompt.root; ndisgen /path/to/W32DRIVER.INF 
-/path/to/W32DRIVER.SYS
+	&prompt.root; ndisgen /pad/naar/W32DRIVER.INF
+/pad/naar/W32DRIVER.SYS
 
-	De &man.ndisgen.8; utility is interactief en zal vragen om
-	  extra informatie als dat nodig is; het zal een kernel module
-	  produceren in de huidige directory die als volgend gebruikt
-	  kan worden:
+	Het gereedschap &man.ndisgen.8; is interactief en zal
+	  vragen om extra informatie als dat nodig is; het zal een
+	  kernelmodule produceren in de huidige map die als volgt
+	  gebruikt kan worden:
 
 	&prompt.root; kldload ./W32DRIVER.ko
 
-	Naast de gegenereerde kernel module, moeten ook
-	  ndis.ko en de
-	  if_ndis.ko modules geladen worden.  Dit
-	  zou automatisch moeten gebeuren als er een module geladen wordt
-	  dit afhankelijk is van &man.ndis.4;.  Als ze handmatig ingeladen
-	  moeten worden gebruik dan de volgende commando's:
+	Naast de gegenereerde kernelmodule, moeten ook de modules
+	  ndis.ko en
+	  if_ndis.ko geladen worden.  Dit zou
+	  automatisch moeten gebeuren als er een module geladen wordt
+	  dit afhankelijk is van &man.ndis.4;.  Als ze handmatig
+	  ingeladen moeten worden gebruik dan de volgende
+	  commando's:
 
 	&prompt.root; kldload ndis
 &prompt.root; kldload if_ndis
 
-	Het eerste commando laad het NDIS miniport stuurprogramma
-	  wrapper, de tweede laad de daadwerkelijke netwerk interface.
+	Het eerste commando laadt de stuurprogrammawrapper voor de
+	  NDIS miniport, de tweede laadt de daadwerkelijke
+	  netwerkinterface.
 
-	Controleer nu &man.dmesg.8; om te zien of er ergens errors
-	  voorkomen zijn.  Als alles goed gegaan is zie je ongeveer het
+	Controleer nu &man.dmesg.8; om te zien of er ergens fouten
+	  voorkomen.  Als alles goed gegaan is ziet u ongeveer het
 	  volgende:
 
 	ndis0: <Wireless-G PCI Adapter> mem 0xf4100000-0xf4101fff irq 3 at device 8.0 on pci1
@@ -1090,11 +1099,11 @@
 	  net zo gebruikt worden als elke andere netwerkkaart (bv.
 	  dc0).
 
-	Het systeem kan geconfigureerd worden zodat de NDIS modules
-	  automatisch gestart worden tijdens het opstarten van het
-	  systeem, net zoals bij andere modules.  Kopieer eerst de
-	  gegenereerde module W32DRIVER.ko naar de
-	  /boot/modules directory.
+	Het systeem kan geconfigureerd worden zodat de
+	  NDIS-modules automatisch gestart worden tijdens het opstarten
+	  van het systeem, net zoals bij andere modules.  Kopieer eerst
+	  de gegenereerde module W32DRIVER.ko naar
+	  de map /boot/modules.
 	  Voeg daarna de volgende regel toe aan
 	  /boot/loader.conf:
 
@@ -1112,12 +1121,11 @@
       
 
       Nadat een geschikt stuurprogramma geladen is, moet de kaart
-	nog ingestelt worden.  Mogelijk is dit al gebeurd door
+	nog ingesteld worden.  Mogelijk is dit al gebeurd door
 	sysinstall tijdens de
 	installatie.
 
-      Om de instellen van de netwerkkaarten weer te geven
-	zien:
+      Om de instellen van de netwerkkaarten weer te geven:
 
 &prompt.user; ifconfig
 dc0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> mtu 1500

>>> TRUNCATED FOR MAIL (1000 lines) <<<
From peter at FreeBSD.org  Tue Nov  4 07:56:44 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Tue Nov  4 07:56:50 2008
Subject: PERFORCE change 152457 for review
Message-ID: <200811041556.mA4FuhRH010325@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152457

Change 152457 by peter@peter_overcee on 2008/11/04 15:56:27

	Initial shot at what thr_new() should look like.  It creates threads and doesn't
	crash.  Things dont run yet either though.  I'm guessing I've got to revisit the
	tid stuff elsewhere as everything blocks on umtx_op and no progress happens.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_syswrap/priv_syswrap-freebsd.h#13 edit
.. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-amd64-freebsd.c#6 edit
.. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#24 edit
.. //depot/projects/valgrind/include/vki/vki-freebsd.h#11 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_syswrap/priv_syswrap-freebsd.h#13 (text+ko) ====

@@ -256,6 +256,7 @@
 DECL_TEMPLATE(freebsd, sys_unlinkat);
 DECL_TEMPLATE(freebsd, sys_posix_openpt);
 DECL_TEMPLATE(freebsd, sys_uuidgen);
+DECL_TEMPLATE(freebsd, sys_thr_new);
 #endif   // __PRIV_SYSWRAP_FREEBSD_H
 
 /*--------------------------------------------------------------------*/

==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-amd64-freebsd.c#6 (text+ko) ====

@@ -111,10 +111,6 @@
    More thread stuff
    ------------------------------------------------------------------ */
 
-void VG_(cleanup_thread) ( ThreadArchState* arch )
-{
-}  
-
 
 /* ---------------------------------------------------------------------
    PRE/POST wrappers for x86/Linux-specific syscalls
@@ -123,6 +119,124 @@
 #define PRE(name)       DEFN_PRE_TEMPLATE(freebsd, name)
 #define POST(name)      DEFN_POST_TEMPLATE(freebsd, name)
 
+#if 0
+struct thr_param {
+    void        (*start_func)(void *);  /* thread entry function. */
+    void        *arg;                   /* argument for entry function. */
+    char        *stack_base;            /* stack base address. */
+    size_t      stack_size;             /* stack size. */
+    char        *tls_base;              /* tls base address. */
+    size_t      tls_size;               /* tls size. */
+    long        *child_tid;             /* address to store new TID. */
+    long        *parent_tid;            /* parent accesses the new TID here. */
+    int         flags;                  /* thread flags. */
+    struct rtprio       *rtp;           /* Real-time scheduling priority */
+    void        *spare[3];              /* TODO: cpu affinity mask etc. */
+};
+int thr_new(struct thr_param *param, int param_size);
+#endif
+
+PRE(sys_thr_new)
+{
+   static const Bool debug = False;
+
+   ThreadId     ctid = VG_(alloc_ThreadState)();
+   ThreadState* ptst = VG_(get_ThreadState)(tid);
+   ThreadState* ctst = VG_(get_ThreadState)(ctid);
+   SysRes       res;
+   vki_sigset_t blockall, savedmask;
+   struct vki_thr_param tp;
+
+   PRINT("thr_new ( %#lx, %ld )",ARG1,ARG2);
+   PRE_REG_READ2(int, "thr_new",
+                 struct thr_param *, param,
+                 int, param_size);
+   
+   PRE_MEM_READ( "thr_new(param)", ARG1, offsetof(struct vki_thr_param, spare));
+   if (!ML_(safe_to_deref)( (void*)ARG1, offsetof(struct vki_thr_param, spare))) {
+      SET_STATUS_Failure( VKI_EFAULT );
+      return;
+   }
+   VG_(memset)(&tp, 0, sizeof(tp));
+   VG_(memcpy)(&tp, (void *)ARG1, offsetof(struct vki_thr_param, spare));
+   PRE_MEM_WRITE("clone(parent_tidptr)", (Addr)tp.parent_tid, sizeof(long));
+   PRE_MEM_WRITE("clone(child_tidptr)", (Addr)tp.child_tid, sizeof(long));
+
+   VG_(sigfillset)(&blockall);
+
+   vg_assert(VG_(is_running_thread)(tid));
+   vg_assert(VG_(is_valid_tid)(ctid));
+
+   /* Copy register state
+
+      On linux, both parent and child return to the same place, and the code
+      following the clone syscall works out which is which, so we
+      don't need to worry about it.
+      On FreeBSD, thr_new arranges a direct call.  We don't actually need any
+      of this gunk.
+
+      The parent gets the child's new tid returned from clone, but the
+      child gets 0.
+
+      If the clone call specifies a NULL rsp for the new thread, then
+      it actually gets a copy of the parent's rsp.
+   */
+   /* We inherit our parent's guest state. */
+   ctst->arch.vex = ptst->arch.vex;
+   ctst->arch.vex_shadow1 = ptst->arch.vex_shadow1;
+   ctst->arch.vex_shadow2 = ptst->arch.vex_shadow2;
+
+   /* Make sys_clone appear to have returned Success(0) in the
+      child. */
+   ctst->arch.vex.guest_RAX = 0;
+   ctst->arch.vex.guest_RDX = 0;
+   LibVEX_GuestAMD64_put_rflag_c(0, &ctst->arch.vex);
+
+   ctst->os_state.parent = tid;
+
+   /* inherit signal mask */
+   ctst->sig_mask = ptst->sig_mask;
+   ctst->tmp_sig_mask = ptst->sig_mask;
+
+   /* Linux has to guess, we don't */
+   VG_(register_stack)((Addr)tp.stack_base, (Addr)tp.stack_base + tp.stack_size);
+
+   /* Assume the clone will succeed, and tell any tool that wants to
+      know that this thread has come into existence.  If the clone
+      fails, we'll send out a ll_exit notification for it at the out:
+      label below, to clean up. */
+   VG_TRACK ( pre_thread_ll_create, tid, ctid );
+
+   if (debug)
+      VG_(printf)("clone child has SETTLS: tls at %#lx\n", (Addr)tp.tls_base);
+   ctst->arch.vex.guest_FS_ZERO = (UWord)tp.tls_base;
+   tp.tls_base = 0;	/* Don't have the kernel do it too */
+
+   /* start the thread with everything blocked */
+   VG_(sigprocmask)(VKI_SIG_SETMASK, &blockall, &savedmask);
+
+
+   /* Create the new thread */
+   res = VG_(do_syscall2)(__NR_thr_new, ARG1, ARG2);
+
+   VG_(sigprocmask)(VKI_SIG_SETMASK, &savedmask, NULL);
+
+   if (res.isError) {
+      /* clone failed */
+      ctst->status = VgTs_Empty;
+      /* oops.  Better tell the tool the thread exited in a hurry :-) */
+      VG_TRACK( pre_thread_ll_exit, ctid );
+   } else {
+
+      POST_MEM_WRITE((Addr)tp.parent_tid, sizeof(long));
+      POST_MEM_WRITE((Addr)tp.child_tid, sizeof(long));
+
+      /* Thread creation was successful; let the child have the chance
+         to run */
+      /* *flags |= SfYieldAfter; */
+   }
+}
+
 PRE(sys_sigreturn)
 {
    ThreadState* tst;

==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#24 (text+ko) ====

@@ -1774,6 +1774,7 @@
 
 PRE(sys__umtx_op)
 {
+   *flags |= SfMayBlock;
    /* 5 args are always passed through.  The last two can vary, but
       they're always pointers.  They may not be used though. */
    switch(ARG2) {
@@ -3479,7 +3480,7 @@
    // setaudit_addr							   452
    // auditctl								   453
    BSDXY(__NR__umtx_op,			sys__umtx_op),			// 454
-   // thr_new								   455
+   BSDX_(__NR_thr_new,			sys_thr_new),			// 455
 
    // sigqueue								   456
    // kmq_open								   457

==== //depot/projects/valgrind/include/vki/vki-freebsd.h#11 (text+ko) ====

@@ -1818,6 +1818,24 @@
 #define VKI_KERN_PROC        14
 #define VKI_KERN_PROC_VMMAP  13
 
+//----------------------------------------------------------------------
+// From sys/thr.h
+//----------------------------------------------------------------------
+
+struct vki_thr_param {
+	void	(*start_func)(void *);
+	void	*arg;
+	char	*stack_base;
+	vki_size_t	stack_size;
+	char	*tls_base;
+	vki_size_t	tls_size;
+	long	*child_tid;
+	long	*parent_tid;
+	int	flags;
+	struct vki_rtprio *rtp;
+	void	*spare[3];
+};
+
 /*--------------------------------------------------------------------*/
 /*--- end                                                          ---*/
 /*--------------------------------------------------------------------*/
From hselasky at FreeBSD.org  Tue Nov  4 08:26:17 2008
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Tue Nov  4 08:26:23 2008
Subject: PERFORCE change 152460 for review
Message-ID: <200811041626.mA4GQGLm015189@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152460

Change 152460 by hselasky@hselasky_laptop001 on 2008/11/04 16:26:06

	
	Some USB HUBs do not generate an initial port 
	connection change event. Check the initial USB
	port status by default.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#18 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#18 (text+ko) ====

@@ -72,6 +72,7 @@
 	struct usb2_device *sc_udev;	/* USB device */
 	struct usb2_xfer *sc_xfer[2];	/* interrupt xfer */
 	uint8_t	sc_flags;
+#define	UHUB_FLAG_DID_EXPLORE 0x01
 #define	UHUB_FLAG_INTR_STALL 0x02
 	char	sc_name[32];
 };
@@ -511,6 +512,14 @@
 			/* most likely the HUB is gone */
 			break;
 		}
+		if (!(sc->sc_flags & UHUB_FLAG_DID_EXPLORE)) {
+			/*
+			 * Fake a connect status change so that the
+			 * status gets checked initially!
+			 */
+			sc->sc_st.port_change |=
+			    UPS_C_CONNECT_STATUS;
+		}
 		if (sc->sc_st.port_change & UPS_C_PORT_ENABLED) {
 			err = usb2_req_clear_port_feature(
 			    udev, &Giant, portno, UHF_C_PORT_ENABLE);
@@ -533,7 +542,8 @@
 					DPRINTFN(0, "port error, giving up "
 					    "port %d\n", portno);
 				} else {
-					sc->sc_st.port_change |= UPS_C_CONNECT_STATUS;
+					sc->sc_st.port_change |=
+					    UPS_C_CONNECT_STATUS;
 					up->restartcnt++;
 				}
 			}
@@ -560,6 +570,11 @@
 		/* explore succeeded - reset restart counter */
 		up->restartcnt = 0;
 	}
+
+	/* initial status checked */
+	sc->sc_flags |= UHUB_FLAG_DID_EXPLORE;
+
+	/* return success */
 	return (USB_ERR_NORMAL_COMPLETION);
 }
 
From peter at FreeBSD.org  Tue Nov  4 09:05:59 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Tue Nov  4 09:06:05 2008
Subject: PERFORCE change 152469 for review
Message-ID: <200811041705.mA4H5w5a029079@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152469

Change 152469 by peter@peter_overcee on 2008/11/04 17:05:50

	Re-add cleanup_thread().  m_scheduler.c calls it.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-amd64-freebsd.c#7 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-amd64-freebsd.c#7 (text+ko) ====

@@ -111,6 +111,9 @@
    More thread stuff
    ------------------------------------------------------------------ */
 
+void VG_(cleanup_thread) ( ThreadArchState *arch )
+{
+}
 
 /* ---------------------------------------------------------------------
    PRE/POST wrappers for x86/Linux-specific syscalls
@@ -223,6 +226,7 @@
 
    if (res.isError) {
       /* clone failed */
+      VG_(cleanup_thread)(&ctst->arch);
       ctst->status = VgTs_Empty;
       /* oops.  Better tell the tool the thread exited in a hurry :-) */
       VG_TRACK( pre_thread_ll_exit, ctid );
From hselasky at FreeBSD.org  Tue Nov  4 09:28:36 2008
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Tue Nov  4 09:28:45 2008
Subject: PERFORCE change 152472 for review
Message-ID: <200811041728.mA4HSLYp032301@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152472

Change 152472 by hselasky@hselasky_laptop001 on 2008/11/04 17:27:41

	
	IFC @ 152458, first step

Affected files ...

.. //depot/projects/usb/src/sys/amd64/amd64/dump_machdep.c#4 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/identcpu.c#9 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/initcpu.c#3 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/local_apic.c#10 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/mem.c#4 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/minidump_machdep.c#7 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/mp_machdep.c#13 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/prof_machdep.c#6 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/tsc.c#4 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/vm_machdep.c#9 integrate
.. //depot/projects/usb/src/sys/amd64/conf/GENERIC#15 integrate
.. //depot/projects/usb/src/sys/amd64/include/clock.h#6 integrate
.. //depot/projects/usb/src/sys/amd64/include/md_var.h#5 integrate
.. //depot/projects/usb/src/sys/amd64/include/param.h#4 integrate
.. //depot/projects/usb/src/sys/amd64/include/smp.h#6 integrate
.. //depot/projects/usb/src/sys/amd64/include/specialreg.h#9 integrate
.. //depot/projects/usb/src/sys/amd64/linux32/linux.h#7 integrate
.. //depot/projects/usb/src/sys/amd64/linux32/linux32_sysvec.c#10 integrate
.. //depot/projects/usb/src/sys/arm/arm/busdma_machdep.c#9 integrate
.. //depot/projects/usb/src/sys/arm/arm/cpufunc.c#6 integrate
.. //depot/projects/usb/src/sys/arm/arm/cpufunc_asm_feroceon.S#1 branch
.. //depot/projects/usb/src/sys/arm/arm/dump_machdep.c#4 integrate
.. //depot/projects/usb/src/sys/arm/arm/elf_machdep.c#4 integrate
.. //depot/projects/usb/src/sys/arm/arm/elf_trampoline.c#8 integrate
.. //depot/projects/usb/src/sys/arm/arm/genassym.c#6 integrate
.. //depot/projects/usb/src/sys/arm/arm/identcpu.c#6 integrate
.. //depot/projects/usb/src/sys/arm/arm/locore.S#6 integrate
.. //depot/projects/usb/src/sys/arm/arm/mem.c#4 integrate
.. //depot/projects/usb/src/sys/arm/arm/pmap.c#11 integrate
.. //depot/projects/usb/src/sys/arm/arm/swtch.S#5 integrate
.. //depot/projects/usb/src/sys/arm/arm/undefined.c#4 integrate
.. //depot/projects/usb/src/sys/arm/at91/at91.c#11 integrate
.. //depot/projects/usb/src/sys/arm/at91/at91_mci.c#6 integrate
.. //depot/projects/usb/src/sys/arm/at91/at91_spi.c#5 integrate
.. //depot/projects/usb/src/sys/arm/at91/if_ate.c#10 integrate
.. //depot/projects/usb/src/sys/arm/at91/uart_dev_at91usart.c#8 integrate
.. //depot/projects/usb/src/sys/arm/conf/AVILA#8 integrate
.. //depot/projects/usb/src/sys/arm/conf/BWCT#5 integrate
.. //depot/projects/usb/src/sys/arm/conf/CRB#4 integrate
.. //depot/projects/usb/src/sys/arm/conf/DB-78XXX#1 branch
.. //depot/projects/usb/src/sys/arm/conf/DB-88F5XXX#1 branch
.. //depot/projects/usb/src/sys/arm/conf/DB-88F6XXX#1 branch
.. //depot/projects/usb/src/sys/arm/conf/DEFAULTS#1 branch
.. //depot/projects/usb/src/sys/arm/conf/EP80219#7 integrate
.. //depot/projects/usb/src/sys/arm/conf/GUMSTIX#2 integrate
.. //depot/projects/usb/src/sys/arm/conf/HL200#4 integrate
.. //depot/projects/usb/src/sys/arm/conf/IQ31244#8 integrate
.. //depot/projects/usb/src/sys/arm/conf/KB920X#15 integrate
.. //depot/projects/usb/src/sys/arm/conf/NSLU#3 integrate
.. //depot/projects/usb/src/sys/arm/conf/SIMICS#8 integrate
.. //depot/projects/usb/src/sys/arm/conf/SKYEYE#7 integrate
.. //depot/projects/usb/src/sys/arm/include/armreg.h#5 integrate
.. //depot/projects/usb/src/sys/arm/include/bootinfo.h#1 branch
.. //depot/projects/usb/src/sys/arm/include/cpufunc.h#6 integrate
.. //depot/projects/usb/src/sys/arm/include/intr.h#7 integrate
.. //depot/projects/usb/src/sys/arm/include/metadata.h#2 integrate
.. //depot/projects/usb/src/sys/arm/include/resource.h#2 integrate
.. //depot/projects/usb/src/sys/arm/mv/bus_space.c#1 branch
.. //depot/projects/usb/src/sys/arm/mv/common.c#1 branch
.. //depot/projects/usb/src/sys/arm/mv/discovery/db78xxx.c#1 branch
.. //depot/projects/usb/src/sys/arm/mv/discovery/discovery.c#1 branch
.. //depot/projects/usb/src/sys/arm/mv/discovery/files.db78xxx#1 branch
.. //depot/projects/usb/src/sys/arm/mv/discovery/std.db78xxx#1 branch
.. //depot/projects/usb/src/sys/arm/mv/files.mv#1 branch
.. //depot/projects/usb/src/sys/arm/mv/gpio.c#1 branch
.. //depot/projects/usb/src/sys/arm/mv/ic.c#1 branch
.. //depot/projects/usb/src/sys/arm/mv/kirkwood/db88f6xxx.c#1 branch
.. //depot/projects/usb/src/sys/arm/mv/kirkwood/files.db88f6xxx#1 branch
.. //depot/projects/usb/src/sys/arm/mv/kirkwood/kirkwood.c#1 branch
.. //depot/projects/usb/src/sys/arm/mv/kirkwood/std.db88f6xxx#1 branch
.. //depot/projects/usb/src/sys/arm/mv/mv_machdep.c#1 branch
.. //depot/projects/usb/src/sys/arm/mv/mvreg.h#1 branch
.. //depot/projects/usb/src/sys/arm/mv/mvvar.h#1 branch
.. //depot/projects/usb/src/sys/arm/mv/obio.c#1 branch
.. //depot/projects/usb/src/sys/arm/mv/orion/db88f5xxx.c#1 branch
.. //depot/projects/usb/src/sys/arm/mv/orion/files.db88f5xxx#1 branch
.. //depot/projects/usb/src/sys/arm/mv/orion/orion.c#1 branch
.. //depot/projects/usb/src/sys/arm/mv/orion/std.db88f5xxx#1 branch
.. //depot/projects/usb/src/sys/arm/mv/rtc.c#1 branch
.. //depot/projects/usb/src/sys/arm/mv/std.mv#1 branch
.. //depot/projects/usb/src/sys/arm/mv/timer.c#1 branch
.. //depot/projects/usb/src/sys/arm/mv/twsi.c#1 branch
.. //depot/projects/usb/src/sys/arm/xscale/ixp425/avila_machdep.c#8 integrate
.. //depot/projects/usb/src/sys/arm/xscale/ixp425/if_npe.c#6 integrate
.. //depot/projects/usb/src/sys/boot/Makefile#7 integrate
.. //depot/projects/usb/src/sys/boot/arm/Makefile#3 integrate
.. //depot/projects/usb/src/sys/boot/arm/at91/boot2/boot2.c#5 integrate
.. //depot/projects/usb/src/sys/boot/arm/at91/boot2/centipad_board.c#2 integrate
.. //depot/projects/usb/src/sys/boot/arm/at91/boot2/kb920x_board.c#3 integrate
.. //depot/projects/usb/src/sys/boot/arm/ixp425/Makefile.inc#1 branch
.. //depot/projects/usb/src/sys/boot/arm/ixp425/boot2/Makefile#1 branch
.. //depot/projects/usb/src/sys/boot/arm/ixp425/boot2/arm_init.S#1 branch
.. //depot/projects/usb/src/sys/boot/arm/ixp425/boot2/boot2.c#1 branch
.. //depot/projects/usb/src/sys/boot/arm/ixp425/boot2/cf_ata.h#1 branch
.. //depot/projects/usb/src/sys/boot/arm/ixp425/boot2/ixp425_board.c#1 branch
.. //depot/projects/usb/src/sys/boot/arm/ixp425/boot2/lib.h#1 branch
.. //depot/projects/usb/src/sys/boot/arm/uboot/Makefile#1 branch
.. //depot/projects/usb/src/sys/boot/arm/uboot/conf.c#1 branch
.. //depot/projects/usb/src/sys/boot/arm/uboot/help.uboot#1 branch
.. //depot/projects/usb/src/sys/boot/arm/uboot/ldscript.arm#1 branch
.. //depot/projects/usb/src/sys/boot/arm/uboot/start.S#1 branch
.. //depot/projects/usb/src/sys/boot/arm/uboot/version#1 branch
.. //depot/projects/usb/src/sys/boot/common/Makefile.inc#3 integrate
.. //depot/projects/usb/src/sys/boot/common/load_elf.c#4 integrate
.. //depot/projects/usb/src/sys/boot/ficl/Makefile#4 integrate
.. //depot/projects/usb/src/sys/boot/forth/loader.conf#12 integrate
.. //depot/projects/usb/src/sys/boot/i386/libi386/bootinfo64.c#3 integrate
.. //depot/projects/usb/src/sys/boot/ofw/libofw/ofw_disk.c#2 integrate
.. //depot/projects/usb/src/sys/boot/powerpc/Makefile#3 integrate
.. //depot/projects/usb/src/sys/boot/powerpc/boot1.chrp/Makefile#1 branch
.. //depot/projects/usb/src/sys/boot/powerpc/boot1.chrp/Makefile.hfs#1 branch
.. //depot/projects/usb/src/sys/boot/powerpc/boot1.chrp/boot1.c#1 branch
.. //depot/projects/usb/src/sys/boot/powerpc/boot1.chrp/bootinfo.txt#1 branch
.. //depot/projects/usb/src/sys/boot/powerpc/boot1.chrp/generate-hfs.sh#1 branch
.. //depot/projects/usb/src/sys/boot/powerpc/boot1.chrp/hfs.tmpl.bz2.uu#1 branch
.. //depot/projects/usb/src/sys/boot/sparc64/loader/main.c#6 integrate
.. //depot/projects/usb/src/sys/boot/uboot/lib/api_public.h#2 integrate
.. //depot/projects/usb/src/sys/boot/uboot/lib/glue.c#3 integrate
.. //depot/projects/usb/src/sys/boot/uboot/lib/glue.h#3 integrate
.. //depot/projects/usb/src/sys/boot/uboot/lib/net.c#3 integrate
.. //depot/projects/usb/src/sys/cam/scsi/scsi_pass.c#6 integrate
.. //depot/projects/usb/src/sys/cam/scsi/scsi_sa.c#6 integrate
.. //depot/projects/usb/src/sys/cam/scsi/scsi_ses.c#6 integrate
.. //depot/projects/usb/src/sys/cam/scsi/scsi_sg.c#3 integrate
.. //depot/projects/usb/src/sys/cam/scsi/scsi_target.c#4 integrate
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/policy.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#4 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#4 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#4 integrate
.. //depot/projects/usb/src/sys/cddl/dev/dtrace/dtrace_clone.c#2 integrate
.. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_misc.c#10 integrate
.. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_proto.h#10 integrate
.. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_syscall.h#10 integrate
.. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_syscalls.c#10 integrate
.. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_sysent.c#10 integrate
.. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_util.h#2 integrate
.. //depot/projects/usb/src/sys/compat/freebsd32/syscalls.master#10 integrate
.. //depot/projects/usb/src/sys/compat/ia32/ia32_sysvec.c#7 integrate
.. //depot/projects/usb/src/sys/compat/linprocfs/linprocfs.c#10 integrate
.. //depot/projects/usb/src/sys/compat/linux/linux_emul.c#5 integrate
.. //depot/projects/usb/src/sys/compat/linux/linux_futex.c#6 integrate
.. //depot/projects/usb/src/sys/compat/linux/linux_futex.h#5 integrate
.. //depot/projects/usb/src/sys/compat/linux/linux_getcwd.c#6 integrate
.. //depot/projects/usb/src/sys/compat/linux/linux_ioctl.c#7 integrate
.. //depot/projects/usb/src/sys/compat/linux/linux_misc.c#14 integrate
.. //depot/projects/usb/src/sys/compat/linux/linux_signal.c#4 integrate
.. //depot/projects/usb/src/sys/compat/linux/linux_signal.h#3 integrate
.. //depot/projects/usb/src/sys/compat/linux/linux_socket.c#7 integrate
.. //depot/projects/usb/src/sys/compat/linux/linux_util.c#6 integrate
.. //depot/projects/usb/src/sys/compat/svr4/svr4_sockio.c#4 integrate
.. //depot/projects/usb/src/sys/conf/Makefile.arm#7 integrate
.. //depot/projects/usb/src/sys/conf/NOTES#20 integrate
.. //depot/projects/usb/src/sys/conf/files#39 edit
.. //depot/projects/usb/src/sys/conf/files.arm#7 integrate
.. //depot/projects/usb/src/sys/conf/files.mips#4 integrate
.. //depot/projects/usb/src/sys/conf/files.powerpc#11 integrate
.. //depot/projects/usb/src/sys/conf/files.sparc64#9 integrate
.. //depot/projects/usb/src/sys/conf/kmod.mk#10 integrate
.. //depot/projects/usb/src/sys/conf/ldscript.mips.cfe#3 integrate
.. //depot/projects/usb/src/sys/conf/newvers.sh#6 integrate
.. //depot/projects/usb/src/sys/conf/options#12 integrate
.. //depot/projects/usb/src/sys/conf/options.arm#8 integrate
.. //depot/projects/usb/src/sys/conf/options.sparc64#5 integrate
.. //depot/projects/usb/src/sys/contrib/altq/altq/altq_cbq.c#4 integrate
.. //depot/projects/usb/src/sys/contrib/altq/altq/altq_cdnr.c#3 integrate
.. //depot/projects/usb/src/sys/contrib/altq/altq/altq_hfsc.c#4 integrate
.. //depot/projects/usb/src/sys/contrib/altq/altq/altq_priq.c#4 integrate
.. //depot/projects/usb/src/sys/contrib/altq/altq/altq_red.c#4 integrate
.. //depot/projects/usb/src/sys/contrib/altq/altq/altq_rio.c#3 integrate
.. //depot/projects/usb/src/sys/contrib/altq/altq/altq_rmclass.c#2 integrate
.. //depot/projects/usb/src/sys/contrib/altq/altq/altq_subr.c#5 integrate
.. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_auth.c#5 integrate
.. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_compat.h#6 integrate
.. //depot/projects/usb/src/sys/contrib/pf/net/pf.c#9 integrate
.. //depot/projects/usb/src/sys/contrib/pf/net/pf_if.c#6 integrate
.. //depot/projects/usb/src/sys/contrib/pf/net/pf_ioctl.c#10 integrate
.. //depot/projects/usb/src/sys/contrib/pf/net/pf_subr.c#4 integrate
.. //depot/projects/usb/src/sys/contrib/pf/net/pfvar.h#4 integrate
.. //depot/projects/usb/src/sys/contrib/rdma/rdma_cma.c#3 integrate
.. //depot/projects/usb/src/sys/ddb/db_command.c#6 integrate
.. //depot/projects/usb/src/sys/ddb/db_command.h#3 integrate
.. //depot/projects/usb/src/sys/ddb/db_main.c#4 integrate
.. //depot/projects/usb/src/sys/ddb/db_textdump.c#3 integrate
.. //depot/projects/usb/src/sys/dev/acpi_support/acpi_asus.c#9 integrate
.. //depot/projects/usb/src/sys/dev/acpica/Osd/OsdSchedule.c#4 integrate
.. //depot/projects/usb/src/sys/dev/acpica/acpi.c#12 integrate
.. //depot/projects/usb/src/sys/dev/adb/adb.h#1 branch
.. //depot/projects/usb/src/sys/dev/adb/adb_bus.c#1 branch
.. //depot/projects/usb/src/sys/dev/adb/adb_hb_if.m#1 branch
.. //depot/projects/usb/src/sys/dev/adb/adb_if.m#1 branch
.. //depot/projects/usb/src/sys/dev/adb/adb_kbd.c#1 branch
.. //depot/projects/usb/src/sys/dev/adb/adb_mouse.c#1 branch
.. //depot/projects/usb/src/sys/dev/adb/adbvar.h#1 branch
.. //depot/projects/usb/src/sys/dev/ae/if_ae.c#1 branch
.. //depot/projects/usb/src/sys/dev/ae/if_aereg.h#1 branch
.. //depot/projects/usb/src/sys/dev/ae/if_aevar.h#1 branch
.. //depot/projects/usb/src/sys/dev/age/if_age.c#5 integrate
.. //depot/projects/usb/src/sys/dev/age/if_agevar.h#2 integrate
.. //depot/projects/usb/src/sys/dev/agp/agp.c#3 integrate
.. //depot/projects/usb/src/sys/dev/agp/agp_i810.c#5 integrate
.. //depot/projects/usb/src/sys/dev/agp/agpreg.h#2 integrate
.. //depot/projects/usb/src/sys/dev/aha/aha_isa.c#4 integrate
.. //depot/projects/usb/src/sys/dev/aha/aha_mca.c#4 integrate
.. //depot/projects/usb/src/sys/dev/amr/amr.c#7 integrate
.. //depot/projects/usb/src/sys/dev/amr/amr_cam.c#7 integrate
.. //depot/projects/usb/src/sys/dev/amr/amrvar.h#3 integrate
.. //depot/projects/usb/src/sys/dev/ar/if_ar.c#3 integrate
.. //depot/projects/usb/src/sys/dev/arcmsr/arcmsr.c#8 integrate
.. //depot/projects/usb/src/sys/dev/asr/asr.c#5 integrate
.. //depot/projects/usb/src/sys/dev/ata/ata-all.c#11 integrate
.. //depot/projects/usb/src/sys/dev/ata/ata-all.h#8 integrate
.. //depot/projects/usb/src/sys/dev/ata/ata-chipset.c#15 delete
.. //depot/projects/usb/src/sys/dev/ata/ata-dma.c#7 integrate
.. //depot/projects/usb/src/sys/dev/ata/ata-pci.c#9 integrate
.. //depot/projects/usb/src/sys/dev/ata/ata-pci.h#13 integrate
.. //depot/projects/usb/src/sys/dev/ata/ata-queue.c#7 integrate
.. //depot/projects/usb/src/sys/dev/ata/ata-sata.c#1 branch
.. //depot/projects/usb/src/sys/dev/ata/atapi-tape.c#6 integrate
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-acard.c#1 branch
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-acerlabs.c#1 branch
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-adaptec.c#1 branch
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-ahci.c#1 branch
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-amd.c#1 branch
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-ati.c#1 branch
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-cenatek.c#1 branch
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-cypress.c#1 branch
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-cyrix.c#1 branch
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-highpoint.c#1 branch
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-intel.c#1 branch
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-ite.c#1 branch
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-jmicron.c#1 branch
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-marvell.c#1 branch
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-micron.c#1 branch
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-national.c#1 branch
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-netcell.c#1 branch
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-nvidia.c#1 branch
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-promise.c#1 branch
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-serverworks.c#1 branch
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-siliconimage.c#1 branch
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-sis.c#1 branch
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-via.c#1 branch
.. //depot/projects/usb/src/sys/dev/ath/ah_osdep.c#5 integrate
.. //depot/projects/usb/src/sys/dev/ath/ath_rate/amrr/amrr.c#6 integrate
.. //depot/projects/usb/src/sys/dev/ath/ath_rate/onoe/onoe.c#6 integrate
.. //depot/projects/usb/src/sys/dev/ath/ath_rate/sample/sample.c#6 integrate
.. //depot/projects/usb/src/sys/dev/ath/if_ath.c#11 integrate
.. //depot/projects/usb/src/sys/dev/ath/if_athrate.h#5 integrate
.. //depot/projects/usb/src/sys/dev/ath/if_athvar.h#9 integrate
.. //depot/projects/usb/src/sys/dev/atkbdc/psm.c#8 integrate
.. //depot/projects/usb/src/sys/dev/bge/if_bge.c#12 integrate
.. //depot/projects/usb/src/sys/dev/bge/if_bgereg.h#9 integrate
.. //depot/projects/usb/src/sys/dev/bktr/bktr_os.c#3 integrate
.. //depot/projects/usb/src/sys/dev/bm/if_bm.c#5 integrate
.. //depot/projects/usb/src/sys/dev/cardbus/cardbus_cis.c#5 integrate
.. //depot/projects/usb/src/sys/dev/cardbus/cardbusreg.h#2 integrate
.. //depot/projects/usb/src/sys/dev/ce/if_ce.c#6 integrate
.. //depot/projects/usb/src/sys/dev/cfe/cfe_api.c#1 branch
.. //depot/projects/usb/src/sys/dev/cfe/cfe_api.h#1 branch
.. //depot/projects/usb/src/sys/dev/cfe/cfe_api_int.h#1 branch
.. //depot/projects/usb/src/sys/dev/cfe/cfe_console.c#1 branch
.. //depot/projects/usb/src/sys/dev/cfe/cfe_error.h#1 branch
.. //depot/projects/usb/src/sys/dev/cfe/cfe_ioctl.h#1 branch
.. //depot/projects/usb/src/sys/dev/cfe/cfe_resource.c#1 branch
.. //depot/projects/usb/src/sys/dev/cfi/cfi_bus_lbc.c#1 branch
.. //depot/projects/usb/src/sys/dev/cfi/cfi_core.c#1 branch
.. //depot/projects/usb/src/sys/dev/cfi/cfi_dev.c#1 branch
.. //depot/projects/usb/src/sys/dev/cfi/cfi_reg.h#1 branch
.. //depot/projects/usb/src/sys/dev/cfi/cfi_var.h#1 branch
.. //depot/projects/usb/src/sys/dev/cp/if_cp.c#6 integrate
.. //depot/projects/usb/src/sys/dev/cpuctl/cpuctl.c#3 integrate
.. //depot/projects/usb/src/sys/dev/ctau/if_ct.c#6 integrate
.. //depot/projects/usb/src/sys/dev/cxgb/cxgb_main.c#9 integrate
.. //depot/projects/usb/src/sys/dev/cxgb/cxgb_sge.c#8 integrate
.. //depot/projects/usb/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#4 integrate
.. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#6 integrate
.. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#5 integrate
.. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#5 integrate
.. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_vm.c#3 integrate
.. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_vm.h#2 integrate
.. //depot/projects/usb/src/sys/dev/dc/dcphy.c#4 integrate
.. //depot/projects/usb/src/sys/dev/dc/pnphy.c#3 integrate
.. //depot/projects/usb/src/sys/dev/drm/ati_pcigart.c#3 integrate
.. //depot/projects/usb/src/sys/dev/drm/drm.h#3 integrate
.. //depot/projects/usb/src/sys/dev/drm/drmP.h#6 integrate
.. //depot/projects/usb/src/sys/dev/drm/drm_agpsupport.c#5 integrate
.. //depot/projects/usb/src/sys/dev/drm/drm_atomic.h#2 integrate
.. //depot/projects/usb/src/sys/dev/drm/drm_auth.c#3 integrate
.. //depot/projects/usb/src/sys/dev/drm/drm_bufs.c#3 integrate
.. //depot/projects/usb/src/sys/dev/drm/drm_context.c#3 integrate
.. //depot/projects/usb/src/sys/dev/drm/drm_dma.c#3 integrate
.. //depot/projects/usb/src/sys/dev/drm/drm_drawable.c#3 integrate
.. //depot/projects/usb/src/sys/dev/drm/drm_drv.c#5 integrate
.. //depot/projects/usb/src/sys/dev/drm/drm_fops.c#3 integrate
.. //depot/projects/usb/src/sys/dev/drm/drm_ioctl.c#3 integrate
.. //depot/projects/usb/src/sys/dev/drm/drm_irq.c#4 integrate
.. //depot/projects/usb/src/sys/dev/drm/drm_linux_list.h#2 integrate
.. //depot/projects/usb/src/sys/dev/drm/drm_lock.c#3 integrate
.. //depot/projects/usb/src/sys/dev/drm/drm_memory.c#3 integrate
.. //depot/projects/usb/src/sys/dev/drm/drm_pci.c#3 integrate
.. //depot/projects/usb/src/sys/dev/drm/drm_pciids.h#5 integrate
.. //depot/projects/usb/src/sys/dev/drm/drm_scatter.c#3 integrate
.. //depot/projects/usb/src/sys/dev/drm/drm_sysctl.c#3 integrate
.. //depot/projects/usb/src/sys/dev/drm/drm_vm.c#3 integrate
.. //depot/projects/usb/src/sys/dev/drm/i915_dma.c#7 integrate
.. //depot/projects/usb/src/sys/dev/drm/i915_drm.h#4 integrate
.. //depot/projects/usb/src/sys/dev/drm/i915_drv.c#3 integrate
.. //depot/projects/usb/src/sys/dev/drm/i915_drv.h#4 integrate
.. //depot/projects/usb/src/sys/dev/drm/i915_irq.c#4 integrate
.. //depot/projects/usb/src/sys/dev/drm/i915_suspend.c#2 integrate
.. //depot/projects/usb/src/sys/dev/drm/mach64_drv.c#3 integrate
.. //depot/projects/usb/src/sys/dev/drm/mga_drv.c#3 integrate
.. //depot/projects/usb/src/sys/dev/drm/r128_drv.c#3 integrate
.. //depot/projects/usb/src/sys/dev/drm/radeon_cp.c#4 integrate
.. //depot/projects/usb/src/sys/dev/drm/radeon_drv.c#3 integrate
.. //depot/projects/usb/src/sys/dev/drm/radeon_drv.h#4 integrate
.. //depot/projects/usb/src/sys/dev/drm/savage_drv.c#3 integrate
.. //depot/projects/usb/src/sys/dev/drm/sis_drv.c#3 integrate
.. //depot/projects/usb/src/sys/dev/drm/tdfx_drv.c#3 integrate
.. //depot/projects/usb/src/sys/dev/fatm/if_fatm.c#4 integrate
.. //depot/projects/usb/src/sys/dev/fb/fb.c#3 integrate
.. //depot/projects/usb/src/sys/dev/fb/vgareg.h#2 integrate
.. //depot/projects/usb/src/sys/dev/firewire/firewire.c#8 integrate
.. //depot/projects/usb/src/sys/dev/firewire/firewire.h#3 integrate
.. //depot/projects/usb/src/sys/dev/firewire/fwdev.c#6 integrate
.. //depot/projects/usb/src/sys/dev/hptiop/hptiop.c#4 integrate
.. //depot/projects/usb/src/sys/dev/hptiop/hptiop.h#3 integrate
.. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_amd.c#4 integrate
.. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_logging.c#5 integrate
.. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_mod.c#8 integrate
.. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_piv.c#5 integrate
.. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_ppro.c#4 integrate
.. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_x86.c#5 integrate
.. //depot/projects/usb/src/sys/dev/hwpmc/pmc_events.h#3 integrate
.. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis.c#10 integrate
.. //depot/projects/usb/src/sys/dev/if_ndis/if_ndisvar.h#6 integrate
.. //depot/projects/usb/src/sys/dev/iir/iir_ctrl.c#2 integrate
.. //depot/projects/usb/src/sys/dev/iscsi/initiator/isc_cam.c#2 integrate
.. //depot/projects/usb/src/sys/dev/iscsi/initiator/iscsi.c#3 integrate
.. //depot/projects/usb/src/sys/dev/isp/isp_freebsd.c#8 integrate
.. //depot/projects/usb/src/sys/dev/iwn/if_iwn.c#3 integrate
.. //depot/projects/usb/src/sys/dev/jme/if_jme.c#5 integrate
.. //depot/projects/usb/src/sys/dev/jme/if_jmereg.h#4 integrate
.. //depot/projects/usb/src/sys/dev/joy/joy.c#2 integrate
.. //depot/projects/usb/src/sys/dev/kbd/kbd.c#5 integrate
.. //depot/projects/usb/src/sys/dev/led/led.c#5 integrate
.. //depot/projects/usb/src/sys/dev/lmc/if_lmc.c#8 integrate
.. //depot/projects/usb/src/sys/dev/mge/if_mge.c#1 branch
.. //depot/projects/usb/src/sys/dev/mge/if_mgevar.h#1 branch
.. //depot/projects/usb/src/sys/dev/mii/atphy.c#2 integrate
.. //depot/projects/usb/src/sys/dev/mii/ciphy.c#7 integrate
.. //depot/projects/usb/src/sys/dev/mii/e1000phy.c#6 integrate
.. //depot/projects/usb/src/sys/dev/mii/miidevs#11 integrate
.. //depot/projects/usb/src/sys/dev/mlx/mlx.c#4 integrate
.. //depot/projects/usb/src/sys/dev/mly/mly.c#5 integrate
.. //depot/projects/usb/src/sys/dev/mmc/bridge.h#3 integrate
.. //depot/projects/usb/src/sys/dev/mmc/mmc.c#4 integrate
.. //depot/projects/usb/src/sys/dev/mmc/mmcbrvar.h#3 integrate
.. //depot/projects/usb/src/sys/dev/mmc/mmcreg.h#3 integrate
.. //depot/projects/usb/src/sys/dev/mmc/mmcsd.c#5 integrate
.. //depot/projects/usb/src/sys/dev/mmc/mmcvar.h#4 integrate
.. //depot/projects/usb/src/sys/dev/mn/if_mn.c#1 branch
.. //depot/projects/usb/src/sys/dev/mse/mse.c#3 integrate
.. //depot/projects/usb/src/sys/dev/msk/if_msk.c#7 integrate
.. //depot/projects/usb/src/sys/dev/mxge/eth_z8e.h#3 integrate
.. //depot/projects/usb/src/sys/dev/mxge/ethp_z8e.h#3 integrate
.. //depot/projects/usb/src/sys/dev/mxge/mxge_mcp.h#7 integrate
.. //depot/projects/usb/src/sys/dev/mxge/rss_eth_z8e.h#2 integrate
.. //depot/projects/usb/src/sys/dev/mxge/rss_ethp_z8e.h#2 integrate
.. //depot/projects/usb/src/sys/dev/nfe/if_nfe.c#7 integrate
.. //depot/projects/usb/src/sys/dev/nfe/if_nfereg.h#5 integrate
.. //depot/projects/usb/src/sys/dev/nfe/if_nfevar.h#6 integrate
.. //depot/projects/usb/src/sys/dev/ofw/ofw_console.c#7 integrate
.. //depot/projects/usb/src/sys/dev/pbio/pbio.c#2 integrate
.. //depot/projects/usb/src/sys/dev/pccbb/pccbb_pci.c#6 integrate
.. //depot/projects/usb/src/sys/dev/pci/pci.c#11 integrate
.. //depot/projects/usb/src/sys/dev/pci/pcireg.h#8 integrate
.. //depot/projects/usb/src/sys/dev/powermac_nvram/powermac_nvram.c#3 integrate
.. //depot/projects/usb/src/sys/dev/ppbus/if_plip.c#6 integrate
.. //depot/projects/usb/src/sys/dev/ppbus/immio.c#2 integrate
.. //depot/projects/usb/src/sys/dev/ppbus/lpbb.c#3 integrate
.. //depot/projects/usb/src/sys/dev/ppbus/lpt.c#4 integrate
.. //depot/projects/usb/src/sys/dev/ppbus/pcfclock.c#2 integrate
.. //depot/projects/usb/src/sys/dev/ppbus/ppb_base.c#2 integrate
.. //depot/projects/usb/src/sys/dev/ppbus/ppb_msq.c#2 integrate
.. //depot/projects/usb/src/sys/dev/ppbus/ppbconf.c#7 integrate
.. //depot/projects/usb/src/sys/dev/ppbus/ppbconf.h#4 integrate
.. //depot/projects/usb/src/sys/dev/ppbus/ppi.c#4 integrate
.. //depot/projects/usb/src/sys/dev/ppbus/pps.c#4 integrate
.. //depot/projects/usb/src/sys/dev/ppbus/vpo.c#5 integrate
.. //depot/projects/usb/src/sys/dev/ppbus/vpoio.c#2 integrate
.. //depot/projects/usb/src/sys/dev/ppbus/vpoio.h#2 integrate
.. //depot/projects/usb/src/sys/dev/ppc/ppc.c#6 integrate
.. //depot/projects/usb/src/sys/dev/ppc/ppcreg.h#4 integrate
.. //depot/projects/usb/src/sys/dev/puc/pucdata.c#7 integrate
.. //depot/projects/usb/src/sys/dev/ral/rt2560.c#10 integrate
.. //depot/projects/usb/src/sys/dev/ral/rt2661.c#10 integrate
.. //depot/projects/usb/src/sys/dev/ray/if_ray.c#5 integrate
.. //depot/projects/usb/src/sys/dev/ray/if_rayvar.h#2 integrate
.. //depot/projects/usb/src/sys/dev/rp/rpvar.h#3 integrate
.. //depot/projects/usb/src/sys/dev/sdhci/sdhci.c#1 branch
.. //depot/projects/usb/src/sys/dev/sdhci/sdhci.h#1 branch
.. //depot/projects/usb/src/sys/dev/siba/siba.c#1 branch
.. //depot/projects/usb/src/sys/dev/siba/siba_ids.h#1 branch
.. //depot/projects/usb/src/sys/dev/siba/siba_pcib.c#1 branch
.. //depot/projects/usb/src/sys/dev/siba/siba_pcibvar.h#1 branch
.. //depot/projects/usb/src/sys/dev/siba/sibareg.h#1 branch
.. //depot/projects/usb/src/sys/dev/siba/sibavar.h#1 branch
.. //depot/projects/usb/src/sys/dev/sio/sio.c#7 integrate
.. //depot/projects/usb/src/sys/dev/sound/midi/sequencer.c#8 integrate
.. //depot/projects/usb/src/sys/dev/sound/pci/emu10kx.c#8 integrate
.. //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac.c#11 integrate
.. //depot/projects/usb/src/sys/dev/sound/pcm/channel.c#7 integrate
.. //depot/projects/usb/src/sys/dev/sound/pcm/channel.h#5 integrate
.. //depot/projects/usb/src/sys/dev/sound/pcm/dsp.c#7 integrate
.. //depot/projects/usb/src/sys/dev/sound/pcm/mixer.c#12 integrate
.. //depot/projects/usb/src/sys/dev/sound/pcm/mixer.h#10 integrate
.. //depot/projects/usb/src/sys/dev/speaker/spkr.c#5 integrate
.. //depot/projects/usb/src/sys/dev/sr/if_sr.c#3 integrate
.. //depot/projects/usb/src/sys/dev/streams/streams.c#6 integrate
.. //depot/projects/usb/src/sys/dev/sym/sym_hipd.c#8 integrate
.. //depot/projects/usb/src/sys/dev/tdfx/tdfx_pci.c#3 integrate
.. //depot/projects/usb/src/sys/dev/twa/tw_osl_freebsd.c#6 integrate
.. //depot/projects/usb/src/sys/dev/twe/twe_freebsd.c#3 integrate
.. //depot/projects/usb/src/sys/dev/uart/uart_bus_mbus.c#1 branch
.. //depot/projects/usb/src/sys/dev/uart/uart_cpu_mv.c#1 branch
.. //depot/projects/usb/src/sys/dev/uart/uart_tty.c#4 integrate
.. //depot/projects/usb/src/sys/dev/usb/ehci.c#83 integrate
.. //depot/projects/usb/src/sys/dev/usb/ehci_mbus.c#1 branch
.. //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#39 integrate
.. //depot/projects/usb/src/sys/dev/usb/ehcivar.h#5 integrate
.. //depot/projects/usb/src/sys/dev/usb/if_zyd.c#45 integrate
.. //depot/projects/usb/src/sys/dev/usb/ohci_pci.c#33 integrate
.. //depot/projects/usb/src/sys/dev/usb/slhci_pccard.c#8 integrate
.. //depot/projects/usb/src/sys/dev/usb/u3g.c#1 branch
.. //depot/projects/usb/src/sys/dev/usb/uark.c#25 integrate
.. //depot/projects/usb/src/sys/dev/usb/ubsa.c#46 integrate
.. //depot/projects/usb/src/sys/dev/usb/ucom.c#33 integrate
.. //depot/projects/usb/src/sys/dev/usb/ucomvar.h#18 integrate
.. //depot/projects/usb/src/sys/dev/usb/udbp.c#28 integrate
.. //depot/projects/usb/src/sys/dev/usb/ufm.c#21 integrate
.. //depot/projects/usb/src/sys/dev/usb/ufoma.c#44 integrate
.. //depot/projects/usb/src/sys/dev/usb/ugen.c#45 integrate
.. //depot/projects/usb/src/sys/dev/usb/uhci_pci.c#35 integrate
.. //depot/projects/usb/src/sys/dev/usb/uhid.c#35 integrate
.. //depot/projects/usb/src/sys/dev/usb/ukbd.c#45 integrate
.. //depot/projects/usb/src/sys/dev/usb/ulpt.c#46 integrate
.. //depot/projects/usb/src/sys/dev/usb/umass.c#52 integrate
.. //depot/projects/usb/src/sys/dev/usb/umct.c#34 integrate
.. //depot/projects/usb/src/sys/dev/usb/ums.c#47 integrate
.. //depot/projects/usb/src/sys/dev/usb/urio.c#28 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb.c#37 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_quirks.c#21 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#108 integrate
.. //depot/projects/usb/src/sys/dev/usb/usbdevs#24 integrate
.. //depot/projects/usb/src/sys/dev/usb/usbdi.c#4 integrate
.. //depot/projects/usb/src/sys/dev/usb/uscanner.c#31 integrate
.. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.c#16 edit
.. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.h#6 edit
.. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci_pccard.c#9 branch
.. //depot/projects/usb/src/sys/dev/usb2/core/README.TXT#5 branch
.. //depot/projects/usb/src/sys/dev/usb2/core/usbdevs#9 edit
.. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#9 edit
.. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#9 edit
.. //depot/projects/usb/src/sys/dev/usb2/serial/ubsa2.c#11 edit
.. //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#14 edit
.. //depot/projects/usb/src/sys/dev/vkbd/vkbd.c#5 integrate
.. //depot/projects/usb/src/sys/dev/wpi/if_wpi.c#7 integrate
.. //depot/projects/usb/src/sys/dev/xen/blkfront/blkfront.c#2 integrate
.. //depot/projects/usb/src/sys/dev/xen/console/console.c#2 integrate
.. //depot/projects/usb/src/sys/dev/xen/netfront/netfront.c#3 integrate
.. //depot/projects/usb/src/sys/fs/cd9660/cd9660_node.c#2 integrate
.. //depot/projects/usb/src/sys/fs/cd9660/cd9660_rrip.c#4 integrate
.. //depot/projects/usb/src/sys/fs/cd9660/cd9660_vfsops.c#4 integrate
.. //depot/projects/usb/src/sys/fs/cd9660/cd9660_vnops.c#4 integrate
.. //depot/projects/usb/src/sys/fs/coda/cnode.h#3 integrate
.. //depot/projects/usb/src/sys/fs/coda/coda_fbsd.c#3 integrate
.. //depot/projects/usb/src/sys/fs/coda/coda_subr.c#3 integrate
.. //depot/projects/usb/src/sys/fs/coda/coda_venus.c#4 integrate
.. //depot/projects/usb/src/sys/fs/coda/coda_vnops.c#5 integrate
.. //depot/projects/usb/src/sys/fs/devfs/devfs_vnops.c#12 integrate
.. //depot/projects/usb/src/sys/fs/fdescfs/fdesc_vfsops.c#6 integrate
.. //depot/projects/usb/src/sys/fs/fdescfs/fdesc_vnops.c#7 integrate
.. //depot/projects/usb/src/sys/fs/fifofs/fifo_vnops.c#6 integrate
.. //depot/projects/usb/src/sys/fs/hpfs/hpfs_subr.c#2 integrate
.. //depot/projects/usb/src/sys/fs/hpfs/hpfs_vfsops.c#6 integrate
.. //depot/projects/usb/src/sys/fs/hpfs/hpfs_vnops.c#7 integrate
.. //depot/projects/usb/src/sys/fs/msdosfs/msdosfs_denode.c#6 integrate
.. //depot/projects/usb/src/sys/fs/msdosfs/msdosfs_vfsops.c#8 integrate
.. //depot/projects/usb/src/sys/fs/msdosfs/msdosfs_vnops.c#10 integrate
.. //depot/projects/usb/src/sys/fs/ntfs/ntfs_subr.c#5 integrate
.. //depot/projects/usb/src/sys/fs/ntfs/ntfs_vfsops.c#6 integrate
.. //depot/projects/usb/src/sys/fs/ntfs/ntfs_vnops.c#6 integrate
.. //depot/projects/usb/src/sys/fs/nullfs/null_subr.c#5 integrate
.. //depot/projects/usb/src/sys/fs/nullfs/null_vnops.c#9 integrate
.. //depot/projects/usb/src/sys/fs/nwfs/nwfs_io.c#5 integrate
.. //depot/projects/usb/src/sys/fs/nwfs/nwfs_node.c#4 integrate
.. //depot/projects/usb/src/sys/fs/nwfs/nwfs_vfsops.c#5 integrate
.. //depot/projects/usb/src/sys/fs/nwfs/nwfs_vnops.c#4 integrate
.. //depot/projects/usb/src/sys/fs/portalfs/portal_vfsops.c#6 integrate
.. //depot/projects/usb/src/sys/fs/portalfs/portal_vnops.c#7 integrate
.. //depot/projects/usb/src/sys/fs/procfs/procfs_map.c#4 integrate
.. //depot/projects/usb/src/sys/fs/pseudofs/pseudofs.c#4 integrate
.. //depot/projects/usb/src/sys/fs/pseudofs/pseudofs_vncache.c#5 integrate
.. //depot/projects/usb/src/sys/fs/pseudofs/pseudofs_vnops.c#9 integrate
.. //depot/projects/usb/src/sys/fs/smbfs/smbfs_io.c#7 integrate
.. //depot/projects/usb/src/sys/fs/smbfs/smbfs_node.c#9 integrate
.. //depot/projects/usb/src/sys/fs/smbfs/smbfs_vfsops.c#6 integrate
.. //depot/projects/usb/src/sys/fs/smbfs/smbfs_vnops.c#7 integrate
.. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs_vnops.c#6 integrate
.. //depot/projects/usb/src/sys/fs/udf/udf_vfsops.c#7 integrate
.. //depot/projects/usb/src/sys/fs/udf/udf_vnops.c#8 integrate
.. //depot/projects/usb/src/sys/fs/unionfs/union_subr.c#9 integrate
.. //depot/projects/usb/src/sys/fs/unionfs/union_vfsops.c#7 integrate
.. //depot/projects/usb/src/sys/fs/unionfs/union_vnops.c#11 integrate
.. //depot/projects/usb/src/sys/geom/geom_dev.c#8 integrate
.. //depot/projects/usb/src/sys/geom/geom_disk.c#7 integrate
.. //depot/projects/usb/src/sys/geom/geom_vfs.c#3 integrate
.. //depot/projects/usb/src/sys/geom/geom_vfs.h#2 integrate
.. //depot/projects/usb/src/sys/geom/journal/g_journal.c#7 integrate
.. //depot/projects/usb/src/sys/geom/part/g_part.c#10 integrate
.. //depot/projects/usb/src/sys/geom/part/g_part_apm.c#9 integrate
.. //depot/projects/usb/src/sys/geom/part/g_part_bsd.c#4 integrate
.. //depot/projects/usb/src/sys/geom/part/g_part_pc98.c#4 integrate
.. //depot/projects/usb/src/sys/geom/part/g_part_vtoc8.c#4 integrate
.. //depot/projects/usb/src/sys/geom/vinum/geom_vinum.c#2 integrate
.. //depot/projects/usb/src/sys/geom/vinum/geom_vinum.h#3 integrate
.. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_drive.c#6 integrate
.. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_init.c#3 integrate
.. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_plex.c#3 integrate
.. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_raid5.c#2 integrate
.. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_rm.c#3 integrate
.. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_state.c#2 integrate
.. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_subr.c#4 integrate
.. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_var.h#2 integrate
.. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_volume.c#3 integrate
.. //depot/projects/usb/src/sys/gnu/fs/ext2fs/ext2_inode.c#4 integrate
.. //depot/projects/usb/src/sys/gnu/fs/ext2fs/ext2_lookup.c#3 integrate
.. //depot/projects/usb/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#8 integrate
.. //depot/projects/usb/src/sys/gnu/fs/ext2fs/ext2_vnops.c#7 integrate
.. //depot/projects/usb/src/sys/gnu/fs/reiserfs/reiserfs_inode.c#4 integrate
.. //depot/projects/usb/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#7 integrate
.. //depot/projects/usb/src/sys/gnu/fs/reiserfs/reiserfs_vnops.c#3 integrate
.. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#4 integrate
.. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#9 integrate
.. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#5 integrate
.. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#7 integrate
.. //depot/projects/usb/src/sys/i386/acpica/acpi_machdep.c#7 integrate
.. //depot/projects/usb/src/sys/i386/bios/apm.c#6 integrate
.. //depot/projects/usb/src/sys/i386/bios/smapi.c#3 integrate
.. //depot/projects/usb/src/sys/i386/conf/GENERIC#15 integrate
.. //depot/projects/usb/src/sys/i386/conf/NOTES#14 integrate
.. //depot/projects/usb/src/sys/i386/conf/XEN#2 integrate
.. //depot/projects/usb/src/sys/i386/cpufreq/powernow.c#4 integrate
.. //depot/projects/usb/src/sys/i386/i386/apic_vector.s#3 integrate
.. //depot/projects/usb/src/sys/i386/i386/bios.c#4 integrate
.. //depot/projects/usb/src/sys/i386/i386/db_trace.c#6 integrate
.. //depot/projects/usb/src/sys/i386/i386/dump_machdep.c#4 integrate
.. //depot/projects/usb/src/sys/i386/i386/identcpu.c#9 integrate
.. //depot/projects/usb/src/sys/i386/i386/initcpu.c#5 integrate
.. //depot/projects/usb/src/sys/i386/i386/local_apic.c#10 integrate
.. //depot/projects/usb/src/sys/i386/i386/mem.c#2 integrate
.. //depot/projects/usb/src/sys/i386/i386/minidump_machdep.c#6 integrate
.. //depot/projects/usb/src/sys/i386/i386/mp_machdep.c#11 integrate
.. //depot/projects/usb/src/sys/i386/i386/sys_machdep.c#8 integrate
.. //depot/projects/usb/src/sys/i386/i386/trap.c#10 integrate
.. //depot/projects/usb/src/sys/i386/i386/tsc.c#5 integrate
.. //depot/projects/usb/src/sys/i386/i386/vm_machdep.c#9 integrate
.. //depot/projects/usb/src/sys/i386/include/apicvar.h#5 integrate
.. //depot/projects/usb/src/sys/i386/include/clock.h#6 integrate
.. //depot/projects/usb/src/sys/i386/include/cpufunc.h#6 integrate
.. //depot/projects/usb/src/sys/i386/include/md_var.h#3 integrate
.. //depot/projects/usb/src/sys/i386/include/param.h#4 integrate
.. //depot/projects/usb/src/sys/i386/include/pcpu.h#6 integrate
.. //depot/projects/usb/src/sys/i386/include/smp.h#7 integrate
.. //depot/projects/usb/src/sys/i386/include/specialreg.h#10 integrate
.. //depot/projects/usb/src/sys/i386/include/trap.h#3 integrate
.. //depot/projects/usb/src/sys/i386/include/xen/evtchn.h#2 integrate
.. //depot/projects/usb/src/sys/i386/include/xen/xen-os.h#2 integrate
.. //depot/projects/usb/src/sys/i386/include/xen/xen_intr.h#2 integrate
.. //depot/projects/usb/src/sys/i386/include/xen/xenfunc.h#2 integrate
.. //depot/projects/usb/src/sys/i386/isa/pmtimer.c#4 integrate
.. //depot/projects/usb/src/sys/i386/isa/prof_machdep.c#6 integrate
.. //depot/projects/usb/src/sys/i386/linux/linux.h#7 integrate
.. //depot/projects/usb/src/sys/i386/linux/linux_sysvec.c#7 integrate
.. //depot/projects/usb/src/sys/i386/xen/clock.c#2 integrate
.. //depot/projects/usb/src/sys/i386/xen/exception.s#2 integrate
.. //depot/projects/usb/src/sys/i386/xen/locore.s#2 integrate
.. //depot/projects/usb/src/sys/i386/xen/mp_machdep.c#4 integrate
.. //depot/projects/usb/src/sys/i386/xen/xen_machdep.c#4 integrate
.. //depot/projects/usb/src/sys/ia64/ia64/dump_machdep.c#4 integrate
.. //depot/projects/usb/src/sys/ia64/ia64/interrupt.c#8 integrate
.. //depot/projects/usb/src/sys/ia64/ia64/mem.c#2 integrate
.. //depot/projects/usb/src/sys/ia64/ia64/mp_machdep.c#7 integrate
.. //depot/projects/usb/src/sys/ia64/ia64/sal.c#3 integrate
.. //depot/projects/usb/src/sys/ia64/ia64/sscdisk.c#3 integrate
.. //depot/projects/usb/src/sys/ia64/include/smp.h#2 integrate
.. //depot/projects/usb/src/sys/isa/isa_common.c#6 integrate
.. //depot/projects/usb/src/sys/isa/isa_common.h#3 integrate
.. //depot/projects/usb/src/sys/isa/isavar.h#3 integrate
.. //depot/projects/usb/src/sys/isa/pnp.c#2 integrate
.. //depot/projects/usb/src/sys/kern/imgact_elf.c#7 integrate
.. //depot/projects/usb/src/sys/kern/init_main.c#11 integrate
.. //depot/projects/usb/src/sys/kern/init_sysent.c#9 integrate
.. //depot/projects/usb/src/sys/kern/kern_conf.c#11 integrate
.. //depot/projects/usb/src/sys/kern/kern_cons.c#1 branch
.. //depot/projects/usb/src/sys/kern/kern_descrip.c#13 integrate
.. //depot/projects/usb/src/sys/kern/kern_event.c#9 integrate
.. //depot/projects/usb/src/sys/kern/kern_exit.c#11 integrate
.. //depot/projects/usb/src/sys/kern/kern_fork.c#12 integrate
.. //depot/projects/usb/src/sys/kern/kern_jail.c#9 integrate
.. //depot/projects/usb/src/sys/kern/kern_linker.c#10 integrate
.. //depot/projects/usb/src/sys/kern/kern_lockf.c#7 integrate
.. //depot/projects/usb/src/sys/kern/kern_mib.c#9 integrate
.. //depot/projects/usb/src/sys/kern/kern_mtxpool.c#3 integrate
.. //depot/projects/usb/src/sys/kern/kern_proc.c#11 integrate
.. //depot/projects/usb/src/sys/kern/kern_prot.c#7 integrate
.. //depot/projects/usb/src/sys/kern/kern_resource.c#10 integrate
.. //depot/projects/usb/src/sys/kern/kern_shutdown.c#7 integrate
.. //depot/projects/usb/src/sys/kern/kern_sig.c#10 integrate
.. //depot/projects/usb/src/sys/kern/kern_synch.c#14 integrate
.. //depot/projects/usb/src/sys/kern/kern_thr.c#8 integrate
.. //depot/projects/usb/src/sys/kern/kern_thread.c#11 integrate
.. //depot/projects/usb/src/sys/kern/kern_time.c#7 integrate
.. //depot/projects/usb/src/sys/kern/kern_timeout.c#8 integrate
.. //depot/projects/usb/src/sys/kern/kern_uuid.c#5 integrate
.. //depot/projects/usb/src/sys/kern/kern_xxx.c#7 integrate
.. //depot/projects/usb/src/sys/kern/makesyscalls.sh#6 integrate
.. //depot/projects/usb/src/sys/kern/sched_ule.c#10 integrate
.. //depot/projects/usb/src/sys/kern/subr_acl_posix1e.c#4 integrate
.. //depot/projects/usb/src/sys/kern/subr_blist.c#3 integrate
.. //depot/projects/usb/src/sys/kern/subr_bus.c#14 integrate
.. //depot/projects/usb/src/sys/kern/subr_firmware.c#6 integrate
.. //depot/projects/usb/src/sys/kern/subr_param.c#5 integrate
.. //depot/projects/usb/src/sys/kern/subr_rman.c#8 integrate
.. //depot/projects/usb/src/sys/kern/subr_sleepqueue.c#10 integrate
.. //depot/projects/usb/src/sys/kern/subr_smp.c#8 integrate
.. //depot/projects/usb/src/sys/kern/subr_stack.c#6 integrate
.. //depot/projects/usb/src/sys/kern/subr_trap.c#8 integrate
.. //depot/projects/usb/src/sys/kern/subr_witness.c#13 integrate
.. //depot/projects/usb/src/sys/kern/sys_process.c#8 integrate
.. //depot/projects/usb/src/sys/kern/sys_socket.c#8 integrate
.. //depot/projects/usb/src/sys/kern/syscalls.c#9 integrate
.. //depot/projects/usb/src/sys/kern/syscalls.master#9 integrate
.. //depot/projects/usb/src/sys/kern/systrace_args.c#8 integrate
.. //depot/projects/usb/src/sys/kern/tty.c#11 integrate
.. //depot/projects/usb/src/sys/kern/tty_cons.c#7 delete
.. //depot/projects/usb/src/sys/kern/tty_pts.c#8 integrate
.. //depot/projects/usb/src/sys/kern/uipc_accf.c#2 integrate
.. //depot/projects/usb/src/sys/kern/uipc_mqueue.c#8 integrate
.. //depot/projects/usb/src/sys/kern/uipc_shm.c#3 integrate
.. //depot/projects/usb/src/sys/kern/uipc_sockbuf.c#9 integrate
.. //depot/projects/usb/src/sys/kern/uipc_socket.c#13 integrate
.. //depot/projects/usb/src/sys/kern/uipc_syscalls.c#10 integrate
.. //depot/projects/usb/src/sys/kern/uipc_usrreq.c#11 integrate
.. //depot/projects/usb/src/sys/kern/vfs_bio.c#12 integrate
.. //depot/projects/usb/src/sys/kern/vfs_export.c#6 integrate
.. //depot/projects/usb/src/sys/kern/vfs_lookup.c#9 integrate
.. //depot/projects/usb/src/sys/kern/vfs_mount.c#15 integrate
.. //depot/projects/usb/src/sys/kern/vfs_subr.c#12 integrate
.. //depot/projects/usb/src/sys/kern/vfs_syscalls.c#11 integrate
.. //depot/projects/usb/src/sys/kern/vfs_vnops.c#12 integrate
.. //depot/projects/usb/src/sys/kern/vnode_if.src#9 integrate
.. //depot/projects/usb/src/sys/kgssapi/gss_accept_sec_context.c#1 branch
.. //depot/projects/usb/src/sys/kgssapi/gss_acquire_cred.c#1 branch
.. //depot/projects/usb/src/sys/kgssapi/gss_add_oid_set_member.c#1 branch
.. //depot/projects/usb/src/sys/kgssapi/gss_canonicalize_name.c#1 branch
.. //depot/projects/usb/src/sys/kgssapi/gss_create_empty_oid_set.c#1 branch
.. //depot/projects/usb/src/sys/kgssapi/gss_delete_sec_context.c#1 branch
.. //depot/projects/usb/src/sys/kgssapi/gss_display_status.c#1 branch
.. //depot/projects/usb/src/sys/kgssapi/gss_export_name.c#1 branch
.. //depot/projects/usb/src/sys/kgssapi/gss_get_mic.c#1 branch
.. //depot/projects/usb/src/sys/kgssapi/gss_impl.c#1 branch
.. //depot/projects/usb/src/sys/kgssapi/gss_import_name.c#1 branch
.. //depot/projects/usb/src/sys/kgssapi/gss_init_sec_context.c#1 branch
.. //depot/projects/usb/src/sys/kgssapi/gss_names.c#1 branch
.. //depot/projects/usb/src/sys/kgssapi/gss_pname_to_uid.c#1 branch
.. //depot/projects/usb/src/sys/kgssapi/gss_release_buffer.c#1 branch
.. //depot/projects/usb/src/sys/kgssapi/gss_release_cred.c#1 branch
.. //depot/projects/usb/src/sys/kgssapi/gss_release_name.c#1 branch
.. //depot/projects/usb/src/sys/kgssapi/gss_release_oid_set.c#1 branch
.. //depot/projects/usb/src/sys/kgssapi/gss_set_cred_option.c#1 branch
.. //depot/projects/usb/src/sys/kgssapi/gss_test_oid_set_member.c#1 branch
.. //depot/projects/usb/src/sys/kgssapi/gss_unwrap.c#1 branch
.. //depot/projects/usb/src/sys/kgssapi/gss_verify_mic.c#1 branch
.. //depot/projects/usb/src/sys/kgssapi/gss_wrap.c#1 branch
.. //depot/projects/usb/src/sys/kgssapi/gss_wrap_size_limit.c#1 branch
.. //depot/projects/usb/src/sys/kgssapi/gssapi.h#1 branch
.. //depot/projects/usb/src/sys/kgssapi/gssapi_impl.h#1 branch
.. //depot/projects/usb/src/sys/kgssapi/gssd.x#1 branch
.. //depot/projects/usb/src/sys/kgssapi/gssd_prot.c#1 branch
.. //depot/projects/usb/src/sys/kgssapi/gsstest.c#1 branch
.. //depot/projects/usb/src/sys/kgssapi/kgss_if.m#1 branch
.. //depot/projects/usb/src/sys/kgssapi/krb5/kcrypto.c#1 branch
.. //depot/projects/usb/src/sys/kgssapi/krb5/kcrypto.h#1 branch
.. //depot/projects/usb/src/sys/kgssapi/krb5/kcrypto_aes.c#1 branch
.. //depot/projects/usb/src/sys/kgssapi/krb5/kcrypto_arcfour.c#1 branch
.. //depot/projects/usb/src/sys/kgssapi/krb5/kcrypto_des.c#1 branch
.. //depot/projects/usb/src/sys/kgssapi/krb5/kcrypto_des3.c#1 branch
.. //depot/projects/usb/src/sys/kgssapi/krb5/krb5_mech.c#1 branch
.. //depot/projects/usb/src/sys/libkern/qdivrem.c#2 integrate
.. //depot/projects/usb/src/sys/mips/adm5120/if_admsw.c#3 integrate
.. //depot/projects/usb/src/sys/mips/conf/ADM5120#4 integrate
.. //depot/projects/usb/src/sys/mips/conf/DEFAULTS#1 branch
.. //depot/projects/usb/src/sys/mips/conf/IDT#5 integrate
.. //depot/projects/usb/src/sys/mips/conf/MALTA#4 integrate
.. //depot/projects/usb/src/sys/mips/conf/QEMU#3 integrate
.. //depot/projects/usb/src/sys/mips/conf/SENTRY5#4 integrate
.. //depot/projects/usb/src/sys/mips/idt/if_kr.c#3 integrate
.. //depot/projects/usb/src/sys/mips/include/param.h#2 integrate
.. //depot/projects/usb/src/sys/mips/include/smp.h#2 integrate
.. //depot/projects/usb/src/sys/mips/mips/machdep.c#4 integrate
.. //depot/projects/usb/src/sys/mips/mips/mem.c#2 integrate
.. //depot/projects/usb/src/sys/mips/mips/mp_machdep.c#3 integrate
.. //depot/projects/usb/src/sys/mips/mips/pmap.c#4 integrate
.. //depot/projects/usb/src/sys/mips/mips/trap.c#3 integrate
.. //depot/projects/usb/src/sys/mips/sentry5/s5_machdep.c#3 integrate
.. //depot/projects/usb/src/sys/modules/Makefile#21 integrate
.. //depot/projects/usb/src/sys/modules/ae/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/amr/Makefile#3 integrate
.. //depot/projects/usb/src/sys/modules/amr/amr_cam/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/ata/Makefile#2 integrate
.. //depot/projects/usb/src/sys/modules/ata/ata/Makefile#2 delete
.. //depot/projects/usb/src/sys/modules/ata/atacore/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/ata/atadevel/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/ata/atadevel/ata-devel.c#1 branch
.. //depot/projects/usb/src/sys/modules/ata/atapci/Makefile#2 integrate
.. //depot/projects/usb/src/sys/modules/ata/atapci/Makefile.inc#1 branch
.. //depot/projects/usb/src/sys/modules/ata/atapci/chipsets/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/ata/atapci/chipsets/Makefile.inc#1 branch
.. //depot/projects/usb/src/sys/modules/ata/atapci/chipsets/ataacard/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/ata/atapci/chipsets/ataadaptec/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/ata/atapci/chipsets/ataahci/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/ata/atapci/chipsets/ataamd/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/ata/atapci/chipsets/ataati/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/ata/atapci/chipsets/atacenatek/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/ata/atapci/chipsets/atacypress/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/ata/atapci/chipsets/atacyrix/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/ata/atapci/chipsets/atahighpoint/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/ata/atapci/chipsets/ataintel/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/ata/atapci/chipsets/ataite/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/ata/atapci/chipsets/atajmicron/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/ata/atapci/chipsets/atamarvell/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/ata/atapci/chipsets/atamicron/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/ata/atapci/chipsets/atanational/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/ata/atapci/chipsets/atanetcell/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/ata/atapci/chipsets/atanvidia/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/ata/atapci/chipsets/atapromise/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/ata/atapci/chipsets/ataserverworks/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/ata/atapci/chipsets/atasis/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/ata/atapci/chipsets/atavia/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/ehci/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/kgssapi/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/kgssapi_krb5/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/mac_bsdextended/Makefile#2 integrate
.. //depot/projects/usb/src/sys/modules/nfsclient/Makefile#2 integrate
.. //depot/projects/usb/src/sys/modules/nfsserver/Makefile#2 integrate
.. //depot/projects/usb/src/sys/modules/ohci/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/rl/Makefile#2 integrate
.. //depot/projects/usb/src/sys/modules/sdhci/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/slhci/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/u3g/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/uhci/Makefile#1 branch
.. //depot/projects/usb/src/sys/modules/usb/Makefile#12 integrate
.. //depot/projects/usb/src/sys/modules/wpifw/Makefile#2 integrate
.. //depot/projects/usb/src/sys/net/bpf.c#12 integrate
.. //depot/projects/usb/src/sys/net/bridgestp.c#9 integrate
.. //depot/projects/usb/src/sys/net/bsd_comp.c#4 integrate
.. //depot/projects/usb/src/sys/net/if.c#11 integrate
.. //depot/projects/usb/src/sys/net/if_arcsubr.c#2 integrate
.. //depot/projects/usb/src/sys/net/if_bridge.c#10 integrate
.. //depot/projects/usb/src/sys/net/if_ef.c#4 integrate
.. //depot/projects/usb/src/sys/net/if_ethersubr.c#10 integrate
.. //depot/projects/usb/src/sys/net/if_faith.c#4 integrate
.. //depot/projects/usb/src/sys/net/if_fddisubr.c#5 integrate
.. //depot/projects/usb/src/sys/net/if_gif.c#8 integrate
.. //depot/projects/usb/src/sys/net/if_gif.h#3 integrate
.. //depot/projects/usb/src/sys/net/if_gre.c#9 integrate
.. //depot/projects/usb/src/sys/net/if_iso88025subr.c#7 integrate
.. //depot/projects/usb/src/sys/net/if_lagg.c#9 integrate
.. //depot/projects/usb/src/sys/net/if_loop.c#11 integrate
.. //depot/projects/usb/src/sys/net/if_mib.c#3 integrate
.. //depot/projects/usb/src/sys/net/if_ppp.c#8 integrate
.. //depot/projects/usb/src/sys/net/if_sl.c#5 integrate
.. //depot/projects/usb/src/sys/net/if_spppsubr.c#6 integrate
.. //depot/projects/usb/src/sys/net/if_stf.c#8 integrate
.. //depot/projects/usb/src/sys/net/if_tap.c#8 integrate
.. //depot/projects/usb/src/sys/net/if_tun.c#7 integrate
.. //depot/projects/usb/src/sys/net/if_var.h#9 integrate
.. //depot/projects/usb/src/sys/net/if_vlan.c#8 integrate
.. //depot/projects/usb/src/sys/net/ppp_deflate.c#2 integrate
.. //depot/projects/usb/src/sys/net/raw_cb.c#7 integrate
.. //depot/projects/usb/src/sys/net/raw_usrreq.c#7 integrate
.. //depot/projects/usb/src/sys/net/route.c#11 integrate
.. //depot/projects/usb/src/sys/net/rtsock.c#11 integrate
.. //depot/projects/usb/src/sys/net/vnet.h#1 branch
.. //depot/projects/usb/src/sys/net80211/_ieee80211.h#7 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211.c#10 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_acl.c#4 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_adhoc.c#3 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_crypto.c#6 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_crypto_ccmp.c#4 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_crypto_tkip.c#5 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_crypto_wep.c#4 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_ddb.c#5 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_freebsd.c#9 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_freebsd.h#10 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_hostap.c#4 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_ht.c#9 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_ht.h#7 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_input.c#10 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_ioctl.c#11 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_node.c#11 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_node.h#8 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_output.c#11 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_power.c#4 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_power.h#3 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_proto.c#10 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_proto.h#8 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_regdomain.c#4 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_scan.c#4 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_scan_sta.c#5 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_sta.c#4 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_var.h#10 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_wds.c#3 integrate
.. //depot/projects/usb/src/sys/netatalk/ddp_pcb.c#4 integrate
.. //depot/projects/usb/src/sys/netgraph/atm/ng_atm.c#3 integrate
.. //depot/projects/usb/src/sys/netgraph/atm/sscfu/ng_sscfu_cust.h#2 integrate
.. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#5 integrate
.. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#30 integrate
.. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#24 integrate
.. //depot/projects/usb/src/sys/netgraph/bluetooth/hci/ng_hci_main.c#2 integrate
.. //depot/projects/usb/src/sys/netgraph/bluetooth/hci/ng_hci_misc.c#2 integrate
.. //depot/projects/usb/src/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c#2 integrate
.. //depot/projects/usb/src/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#2 integrate
.. //depot/projects/usb/src/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h#2 integrate
.. //depot/projects/usb/src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#5 integrate
.. //depot/projects/usb/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#7 integrate
.. //depot/projects/usb/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#5 integrate
.. //depot/projects/usb/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#6 integrate
.. //depot/projects/usb/src/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c#2 integrate
.. //depot/projects/usb/src/sys/netgraph/netflow/netflow.c#6 integrate
.. //depot/projects/usb/src/sys/netgraph/netflow/ng_netflow.c#5 integrate
.. //depot/projects/usb/src/sys/netgraph/netflow/ng_netflow.h#3 integrate
.. //depot/projects/usb/src/sys/netgraph/netgraph.h#8 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_UI.c#2 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_async.c#2 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_atmllc.c#2 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_base.c#12 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_bpf.c#5 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_bridge.c#3 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_cisco.c#3 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_device.c#3 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_eiface.c#6 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_etf.c#2 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_ether.c#5 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_fec.c#4 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_frame_relay.c#2 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_gif.c#3 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_gif_demux.c#2 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_hole.c#2 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_iface.c#6 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_ipfw.c#2 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_ksocket.c#5 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_l2tp.c#6 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_lmi.c#2 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_message.h#3 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_mppc.c#3 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_nat.c#6 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_one2many.c#2 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_parse.c#3 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_pipe.c#2 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_ppp.c#7 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_pptpgre.c#4 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_rfc1490.c#2 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_sample.c#2 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_split.c#2 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_sppp.c#3 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_tag.c#2 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_tcpmss.c#3 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_tee.c#3 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_tty.c#3 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_tty.h#2 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_vjc.c#2 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_vlan.c#4 integrate
.. //depot/projects/usb/src/sys/netinet/if_ether.c#12 integrate
.. //depot/projects/usb/src/sys/netinet/igmp.c#5 integrate
.. //depot/projects/usb/src/sys/netinet/in.c#10 integrate
.. //depot/projects/usb/src/sys/netinet/in.h#6 integrate
.. //depot/projects/usb/src/sys/netinet/in_gif.c#7 integrate
.. //depot/projects/usb/src/sys/netinet/in_mcast.c#5 integrate
.. //depot/projects/usb/src/sys/netinet/in_pcb.c#13 integrate
.. //depot/projects/usb/src/sys/netinet/in_pcb.h#11 integrate
.. //depot/projects/usb/src/sys/netinet/in_rmx.c#9 integrate
.. //depot/projects/usb/src/sys/netinet/ip.h#5 integrate
.. //depot/projects/usb/src/sys/netinet/ip6.h#3 integrate
.. //depot/projects/usb/src/sys/netinet/ip_carp.c#11 integrate
.. //depot/projects/usb/src/sys/netinet/ip_divert.c#9 integrate
.. //depot/projects/usb/src/sys/netinet/ip_dummynet.h#4 integrate
.. //depot/projects/usb/src/sys/netinet/ip_fastfwd.c#7 integrate
.. //depot/projects/usb/src/sys/netinet/ip_fw.h#9 integrate
.. //depot/projects/usb/src/sys/netinet/ip_fw2.c#13 integrate
.. //depot/projects/usb/src/sys/netinet/ip_fw_nat.c#4 integrate
.. //depot/projects/usb/src/sys/netinet/ip_icmp.c#9 integrate
.. //depot/projects/usb/src/sys/netinet/ip_input.c#13 integrate
.. //depot/projects/usb/src/sys/netinet/ip_ipsec.c#8 integrate
.. //depot/projects/usb/src/sys/netinet/ip_mroute.c#8 integrate
.. //depot/projects/usb/src/sys/netinet/ip_options.c#8 integrate
.. //depot/projects/usb/src/sys/netinet/raw_ip.c#12 integrate
.. //depot/projects/usb/src/sys/netinet/sctp_crc32.c#4 integrate
.. //depot/projects/usb/src/sys/netinet/sctp_os_bsd.h#10 integrate
.. //depot/projects/usb/src/sys/netinet/sctp_output.c#12 integrate
.. //depot/projects/usb/src/sys/netinet/sctp_sysctl.c#8 integrate
.. //depot/projects/usb/src/sys/netinet/sctp_timer.c#11 integrate
.. //depot/projects/usb/src/sys/netinet/sctp_timer.h#7 integrate
.. //depot/projects/usb/src/sys/netinet/sctp_uio.h#9 integrate
.. //depot/projects/usb/src/sys/netinet/sctp_usrreq.c#11 integrate
.. //depot/projects/usb/src/sys/netinet/sctputil.c#12 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_hostcache.c#7 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_input.c#14 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_offload.c#4 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_output.c#13 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_reass.c#5 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_sack.c#6 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_subr.c#12 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_syncache.c#15 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_timer.c#10 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_timewait.c#6 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_usrreq.c#12 integrate
.. //depot/projects/usb/src/sys/netinet/udp_usrreq.c#13 integrate
.. //depot/projects/usb/src/sys/netinet/vinet.h#1 branch
.. //depot/projects/usb/src/sys/netinet6/dest6.c#5 integrate
.. //depot/projects/usb/src/sys/netinet6/frag6.c#8 integrate
.. //depot/projects/usb/src/sys/netinet6/icmp6.c#12 integrate
.. //depot/projects/usb/src/sys/netinet6/in6.c#10 integrate
.. //depot/projects/usb/src/sys/netinet6/in6.h#5 integrate
.. //depot/projects/usb/src/sys/netinet6/in6_gif.c#7 integrate
.. //depot/projects/usb/src/sys/netinet6/in6_ifattach.c#9 integrate
.. //depot/projects/usb/src/sys/netinet6/in6_pcb.c#12 integrate
.. //depot/projects/usb/src/sys/netinet6/in6_proto.c#9 integrate
.. //depot/projects/usb/src/sys/netinet6/in6_rmx.c#8 integrate
.. //depot/projects/usb/src/sys/netinet6/in6_src.c#12 integrate
.. //depot/projects/usb/src/sys/netinet6/ip6_forward.c#8 integrate
.. //depot/projects/usb/src/sys/netinet6/ip6_input.c#12 integrate
.. //depot/projects/usb/src/sys/netinet6/ip6_ipsec.c#6 integrate
.. //depot/projects/usb/src/sys/netinet6/ip6_mroute.c#8 integrate
.. //depot/projects/usb/src/sys/netinet6/ip6_output.c#8 integrate
.. //depot/projects/usb/src/sys/netinet6/ip6_var.h#8 integrate
.. //depot/projects/usb/src/sys/netinet6/mld6.c#8 integrate
.. //depot/projects/usb/src/sys/netinet6/nd6.c#10 integrate
.. //depot/projects/usb/src/sys/netinet6/nd6.h#4 integrate
.. //depot/projects/usb/src/sys/netinet6/nd6_nbr.c#8 integrate
.. //depot/projects/usb/src/sys/netinet6/nd6_rtr.c#8 integrate
.. //depot/projects/usb/src/sys/netinet6/raw_ip6.c#12 integrate
.. //depot/projects/usb/src/sys/netinet6/route6.c#6 integrate
.. //depot/projects/usb/src/sys/netinet6/scope6.c#6 integrate
.. //depot/projects/usb/src/sys/netinet6/udp6_usrreq.c#13 integrate
.. //depot/projects/usb/src/sys/netinet6/vinet6.h#1 branch
.. //depot/projects/usb/src/sys/netipsec/ipsec.c#11 integrate
.. //depot/projects/usb/src/sys/netipsec/ipsec.h#8 integrate
.. //depot/projects/usb/src/sys/netipsec/ipsec_input.c#8 integrate
.. //depot/projects/usb/src/sys/netipsec/ipsec_mbuf.c#4 integrate
.. //depot/projects/usb/src/sys/netipsec/ipsec_output.c#8 integrate
.. //depot/projects/usb/src/sys/netipsec/key.c#7 integrate
.. //depot/projects/usb/src/sys/netipsec/keysock.c#7 integrate
.. //depot/projects/usb/src/sys/netipsec/vipsec.h#1 branch
.. //depot/projects/usb/src/sys/netipsec/xform_ah.c#6 integrate
.. //depot/projects/usb/src/sys/netipsec/xform_esp.c#6 integrate
.. //depot/projects/usb/src/sys/netipsec/xform_ipcomp.c#5 integrate
.. //depot/projects/usb/src/sys/netipsec/xform_ipip.c#7 integrate
.. //depot/projects/usb/src/sys/netipx/ipx_pcb.c#4 integrate
.. //depot/projects/usb/src/sys/netipx/spx_usrreq.c#5 integrate
.. //depot/projects/usb/src/sys/netnatm/natm.c#4 integrate
.. //depot/projects/usb/src/sys/netnatm/natm_pcb.c#3 integrate
.. //depot/projects/usb/src/sys/netncp/ncp_conn.c#5 integrate
.. //depot/projects/usb/src/sys/netncp/ncp_rq.c#3 integrate
.. //depot/projects/usb/src/sys/netncp/ncp_sock.c#6 integrate
.. //depot/projects/usb/src/sys/netncp/ncp_subr.c#2 integrate
.. //depot/projects/usb/src/sys/netsmb/smb_conn.c#5 integrate
.. //depot/projects/usb/src/sys/netsmb/smb_conn.h#3 integrate
.. //depot/projects/usb/src/sys/netsmb/smb_dev.c#4 integrate
.. //depot/projects/usb/src/sys/netsmb/smb_rq.c#4 integrate
.. //depot/projects/usb/src/sys/netsmb/smb_trantcp.c#5 integrate
.. //depot/projects/usb/src/sys/nfs4client/nfs4_dev.c#2 integrate
.. //depot/projects/usb/src/sys/nfs4client/nfs4_idmap.c#3 integrate
.. //depot/projects/usb/src/sys/nfs4client/nfs4_socket.c#3 integrate
.. //depot/projects/usb/src/sys/nfs4client/nfs4_vfsops.c#8 integrate
.. //depot/projects/usb/src/sys/nfs4client/nfs4_vn_subs.c#3 integrate
.. //depot/projects/usb/src/sys/nfs4client/nfs4_vnops.c#8 integrate
.. //depot/projects/usb/src/sys/nfsclient/krpc_subr.c#4 integrate

>>> TRUNCATED FOR MAIL (1000 lines) <<<
From hselasky at FreeBSD.org  Tue Nov  4 10:01:12 2008
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Tue Nov  4 10:01:20 2008
Subject: PERFORCE change 152474 for review
Message-ID: <200811041801.mA4I1BIC035675@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152474

Change 152474 by hselasky@hselasky_laptop001 on 2008/11/04 18:00:15

	
	IFC @ 152458, final step: Update all the RCS ID's.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/bluetooth/TODO.TXT#4 integrate
.. //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2.c#9 integrate
.. //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2_var.h#4 integrate
.. //depot/projects/usb/src/sys/dev/usb2/bluetooth/ubtbcmfw2.c#8 integrate
.. //depot/projects/usb/src/sys/dev/usb2/bluetooth/usb2_bluetooth.c#3 integrate
.. //depot/projects/usb/src/sys/dev/usb2/bluetooth/usb2_bluetooth.h#3 integrate
.. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.c#14 integrate
.. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.h#4 integrate
.. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci_atmelarm.c#10 integrate
.. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.c#17 integrate
.. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.h#7 integrate
.. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_pci.c#13 integrate
.. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#15 integrate
.. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.h#8 integrate
.. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#7 integrate
.. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.c#15 integrate
.. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.h#5 integrate
.. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_atmelarm.c#10 integrate
.. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_pci.c#11 integrate
.. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.c#13 integrate
.. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.h#5 integrate
.. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2_pci.c#12 integrate
.. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_bus.h#4 integrate
.. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.c#14 integrate
.. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.h#5 integrate
.. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_pci.h#3 integrate
.. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.c#12 integrate
.. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.h#4 integrate
.. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci_atmelarm.c#3 integrate
.. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci_pccard.c#10 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/README.TXT#6 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_busdma.c#9 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_busdma.h#4 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_compat_linux.c#11 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_compat_linux.h#7 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_config_td.c#11 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_config_td.h#6 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.c#6 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.h#22 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_debug.c#4 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_debug.h#7 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.c#38 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.h#13 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#28 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.h#9 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dynamic.c#5 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dynamic.h#5 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_error.c#3 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#29 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.h#6 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_handle_request.c#9 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_handle_request.h#3 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hid.c#7 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hid.h#7 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#19 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.h#5 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_if.m#4 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_lookup.c#8 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_lookup.h#9 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_mbuf.c#3 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_mbuf.h#3 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_msctest.c#9 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_msctest.h#5 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_parse.c#4 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_parse.h#4 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_process.c#11 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_process.h#4 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.c#19 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.h#6 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_sw_transfer.c#6 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_sw_transfer.h#3 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#30 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.h#8 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_util.c#6 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_util.h#5 integrate
.. //depot/projects/usb/src/sys/dev/usb2/core/usbdevs#10 integrate
.. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_aue2.c#11 integrate
.. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_aue2_reg.h#5 integrate
.. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axe2.c#11 integrate
.. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axe2_reg.h#5 integrate
.. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdce2.c#11 integrate
.. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdce2_reg.h#5 integrate
.. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cue2.c#11 integrate
.. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cue2_reg.h#5 integrate
.. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2.c#11 integrate
.. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2_fw.h#4 integrate
.. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2_reg.h#5 integrate
.. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_rue2.c#11 integrate
.. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_rue2_reg.h#5 integrate
.. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_udav2.c#11 integrate
.. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_udav2_reg.h#5 integrate
.. //depot/projects/usb/src/sys/dev/usb2/ethernet/usb2_ethernet.c#4 integrate
.. //depot/projects/usb/src/sys/dev/usb2/ethernet/usb2_ethernet.h#4 integrate
.. //depot/projects/usb/src/sys/dev/usb2/image/usb2_image.c#3 integrate
.. //depot/projects/usb/src/sys/dev/usb2/image/usb2_image.h#3 integrate
.. //depot/projects/usb/src/sys/dev/usb2/image/uscanner2.c#9 integrate
.. //depot/projects/usb/src/sys/dev/usb2/include/Makefile#3 integrate
.. //depot/projects/usb/src/sys/dev/usb2/include/ufm2_ioctl.h#4 integrate
.. //depot/projects/usb/src/sys/dev/usb2/include/urio2_ioctl.h#4 integrate
.. //depot/projects/usb/src/sys/dev/usb2/include/usb2_cdc.h#5 integrate
.. //depot/projects/usb/src/sys/dev/usb2/include/usb2_defs.h#5 integrate
.. //depot/projects/usb/src/sys/dev/usb2/include/usb2_endian.h#4 integrate
.. //depot/projects/usb/src/sys/dev/usb2/include/usb2_error.h#3 integrate
.. //depot/projects/usb/src/sys/dev/usb2/include/usb2_hid.h#4 integrate
.. //depot/projects/usb/src/sys/dev/usb2/include/usb2_ioctl.h#22 integrate
.. //depot/projects/usb/src/sys/dev/usb2/include/usb2_mfunc.h#3 integrate
.. //depot/projects/usb/src/sys/dev/usb2/include/usb2_revision.h#5 integrate
.. //depot/projects/usb/src/sys/dev/usb2/include/usb2_standard.h#8 integrate
.. //depot/projects/usb/src/sys/dev/usb2/input/uhid2.c#10 integrate
.. //depot/projects/usb/src/sys/dev/usb2/input/ukbd2.c#10 integrate
.. //depot/projects/usb/src/sys/dev/usb2/input/ums2.c#10 integrate
.. //depot/projects/usb/src/sys/dev/usb2/input/usb2_input.c#4 integrate
.. //depot/projects/usb/src/sys/dev/usb2/input/usb2_input.h#5 integrate
.. //depot/projects/usb/src/sys/dev/usb2/input/usb2_rdesc.h#3 integrate
.. //depot/projects/usb/src/sys/dev/usb2/misc/udbp2.c#9 integrate
.. //depot/projects/usb/src/sys/dev/usb2/misc/udbp2.h#4 integrate
.. //depot/projects/usb/src/sys/dev/usb2/misc/ufm2.c#6 integrate
.. //depot/projects/usb/src/sys/dev/usb2/misc/usb2_misc.c#3 integrate
.. //depot/projects/usb/src/sys/dev/usb2/misc/usb2_misc.h#3 integrate
.. //depot/projects/usb/src/sys/dev/usb2/ndis/if_ndis_usb2.c#6 integrate
.. //depot/projects/usb/src/sys/dev/usb2/ndis/usb2_ndis.c#3 integrate
.. //depot/projects/usb/src/sys/dev/usb2/ndis/usb2_ndis.h#3 integrate
.. //depot/projects/usb/src/sys/dev/usb2/quirk/usb2_quirk.c#8 integrate
.. //depot/projects/usb/src/sys/dev/usb2/quirk/usb2_quirk.h#5 integrate
.. //depot/projects/usb/src/sys/dev/usb2/serial/uark2.c#8 integrate
.. //depot/projects/usb/src/sys/dev/usb2/serial/ubsa2.c#12 integrate
.. //depot/projects/usb/src/sys/dev/usb2/serial/ubser2.c#8 integrate
.. //depot/projects/usb/src/sys/dev/usb2/serial/uchcom2.c#9 integrate
.. //depot/projects/usb/src/sys/dev/usb2/serial/ucycom2.c#9 integrate
.. //depot/projects/usb/src/sys/dev/usb2/serial/ufoma2.c#11 integrate
.. //depot/projects/usb/src/sys/dev/usb2/serial/uftdi2.c#9 integrate
.. //depot/projects/usb/src/sys/dev/usb2/serial/uftdi2_reg.h#3 integrate
.. //depot/projects/usb/src/sys/dev/usb2/serial/ugensa2.c#12 integrate
.. //depot/projects/usb/src/sys/dev/usb2/serial/uipaq2.c#10 integrate
.. //depot/projects/usb/src/sys/dev/usb2/serial/ulpt2.c#9 integrate
.. //depot/projects/usb/src/sys/dev/usb2/serial/umct2.c#8 integrate
.. //depot/projects/usb/src/sys/dev/usb2/serial/umodem2.c#11 integrate
.. //depot/projects/usb/src/sys/dev/usb2/serial/umoscom2.c#9 integrate
.. //depot/projects/usb/src/sys/dev/usb2/serial/uplcom2.c#10 integrate
.. //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.c#15 integrate
.. //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.h#7 integrate
.. //depot/projects/usb/src/sys/dev/usb2/serial/uvisor2.c#9 integrate
.. //depot/projects/usb/src/sys/dev/usb2/serial/uvscom2.c#9 integrate
.. //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.c#15 integrate
.. //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.h#4 integrate
.. //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2_pcm.c#5 integrate
.. //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2_reg.h#4 integrate
.. //depot/projects/usb/src/sys/dev/usb2/sound/usb2_sound.c#3 integrate
.. //depot/projects/usb/src/sys/dev/usb2/sound/usb2_sound.h#3 integrate
.. //depot/projects/usb/src/sys/dev/usb2/storage/ata-usb2.c#9 integrate
.. //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#15 integrate
.. //depot/projects/usb/src/sys/dev/usb2/storage/urio2.c#9 integrate
.. //depot/projects/usb/src/sys/dev/usb2/storage/usb2_storage.c#3 integrate
.. //depot/projects/usb/src/sys/dev/usb2/storage/usb2_storage.h#4 integrate
.. //depot/projects/usb/src/sys/dev/usb2/storage/ustorage2_fs.c#12 integrate
.. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template.c#12 integrate
.. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template.h#6 integrate
.. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template_cdce.c#8 integrate
.. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template_msc.c#7 integrate
.. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template_mtp.c#7 integrate
.. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2.c#18 integrate
.. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2_fw.h#3 integrate
.. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2_reg.h#3 integrate
.. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2_var.h#6 integrate
.. //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2.c#18 integrate
.. //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2_reg.h#4 integrate
.. //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2_var.h#6 integrate
.. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2.c#19 integrate
.. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2_fw.h#4 integrate
.. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2_reg.h#7 integrate
.. //depot/projects/usb/src/sys/dev/usb2/wlan/usb2_wlan.c#4 integrate
.. //depot/projects/usb/src/sys/dev/usb2/wlan/usb2_wlan.h#6 integrate

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/bluetooth/TODO.TXT#4 (text+ko) ====

@@ -1,5 +1,5 @@
 $Id: TODO,v 1.1 2002/11/24 19:46:56 max Exp $
-$FreeBSD$
+$FreeBSD: src/sys/dev/usb2/bluetooth/TODO.TXT,v 1.1 2008/11/04 02:31:03 alfred Exp $
 
 1) SMP/Locking
 

==== //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2.c#9 (text+ko) ====

@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_ubt.c,v 1.16 2003/10/10 19:15:06 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/usb2/bluetooth/ng_ubt2.c,v 1.1 2008/11/04 02:31:03 alfred Exp $
  */
 
 #include 

==== //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2_var.h#4 (text+ko) ====

@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ng_ubt_var.h,v 1.2 2003/03/22 23:44:36 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/usb2/bluetooth/ng_ubt2_var.h,v 1.1 2008/11/04 02:31:03 alfred Exp $
  */
 
 #ifndef _NG_UBT_VAR_H_

==== //depot/projects/usb/src/sys/dev/usb2/bluetooth/ubtbcmfw2.c#8 (text+ko) ====

@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: ubtbcmfw.c,v 1.3 2003/10/10 19:15:08 max Exp $
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/usb2/bluetooth/ubtbcmfw2.c,v 1.1 2008/11/04 02:31:03 alfred Exp $
  */
 
 #include 

==== //depot/projects/usb/src/sys/dev/usb2/bluetooth/usb2_bluetooth.c#3 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/bluetooth/usb2_bluetooth.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/bluetooth/usb2_bluetooth.h#3 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/bluetooth/usb2_bluetooth.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.c#14 (text+ko) ====

@@ -1,5 +1,5 @@
 #include 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/at91dci.c,v 1.1 2008/11/04 02:31:03 alfred Exp $");
 
 /*-
  * Copyright (c) 2007-2008 Hans Petter Selasky. All rights reserved.

==== //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.h#4 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/controller/at91dci.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2006 ATMEL
  * Copyright (c) 2007 Hans Petter Selasky 

==== //depot/projects/usb/src/sys/dev/usb2/controller/at91dci_atmelarm.c#10 (text+ko) ====

@@ -1,5 +1,5 @@
 #include 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/at91dci_atmelarm.c,v 1.1 2008/11/04 02:31:03 alfred Exp $");
 
 /*-
  * Copyright (c) 2007-2008 Hans Petter Selasky. All rights reserved.

==== //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.c#17 (text+ko) ====

@@ -44,7 +44,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/ehci2.c,v 1.1 2008/11/04 02:31:03 alfred Exp $");
 
 #include 
 #include 

==== //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.h#7 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/controller/ehci2.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.

==== //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_pci.c#13 (text+ko) ====

@@ -36,7 +36,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/ehci2_pci.c,v 1.1 2008/11/04 02:31:03 alfred Exp $");
 
 /*
  * USB Enhanced Host Controller Driver, a.k.a. USB 2.0 controller.

==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#15 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/controller/musb2_otg.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.h#8 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/controller/musb2_otg.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#7 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/controller/musb2_otg_atmelarm.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.c#15 (text+ko) ====

@@ -26,7 +26,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/ohci2.c,v 1.1 2008/11/04 02:31:03 alfred Exp $");
 
 /*
  * USB Open Host Controller driver.

==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.h#5 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/controller/ohci2.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.

==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_atmelarm.c#10 (text) ====

@@ -23,7 +23,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/ohci2_atmelarm.c,v 1.1 2008/11/04 02:31:03 alfred Exp $");
 
 #include 
 #include 

==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_pci.c#11 (text+ko) ====

@@ -36,7 +36,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/ohci2_pci.c,v 1.1 2008/11/04 02:31:03 alfred Exp $");
 
 /*
  * USB Open Host Controller driver.

==== //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.c#13 (text+ko) ====

@@ -26,7 +26,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/uhci2.c,v 1.1 2008/11/04 02:31:03 alfred Exp $");
 
 /*
  * USB Universal Host Controller driver.

==== //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.h#5 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/controller/uhci2.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.

==== //depot/projects/usb/src/sys/dev/usb2/controller/uhci2_pci.c#12 (text+ko) ====

@@ -36,7 +36,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/uhci2_pci.c,v 1.1 2008/11/04 02:31:03 alfred Exp $");
 
 /* Universal Host Controller Interface
  *

==== //depot/projects/usb/src/sys/dev/usb2/controller/usb2_bus.h#4 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/controller/usb2_bus.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.c#14 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/controller/usb2_controller.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.h#5 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/controller/usb2_controller.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/controller/usb2_pci.h#3 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/controller/usb2_pci.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.c#12 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/controller/uss820dci.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky 
  * All rights reserved.

==== //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.h#4 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/controller/uss820dci.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2007 Hans Petter Selasky 
  * All rights reserved.

==== //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci_atmelarm.c#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #include 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/uss820dci_atmelarm.c,v 1.1 2008/11/04 02:31:03 alfred Exp $");
 
 /*-
  * Copyright (c) 2008 Hans Petter Selasky 

==== //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci_pccard.c#10 (text+ko) ====


==== //depot/projects/usb/src/sys/dev/usb2/core/README.TXT#6 (text+ko) ====


==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_busdma.c#9 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/core/usb2_busdma.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_busdma.h#4 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/core/usb2_busdma.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_compat_linux.c#11 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/core/usb2_compat_linux.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2007 Luigi Rizzo - Universita` di Pisa. All rights reserved.
  * Copyright (c) 2007 Hans Petter Selasky. All rights reserved.

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_compat_linux.h#7 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/core/usb2_compat_linux.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2007 Luigi Rizzo - Universita` di Pisa. All rights reserved.
  * Copyright (c) 2007 Hans Petter Selasky. All rights reserved.

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_config_td.c#11 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/core/usb2_config_td.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_config_td.h#6 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/core/usb2_config_td.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.c#6 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/core/usb2_core.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.h#22 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/core/usb2_core.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_debug.c#4 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/core/usb2_debug.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_debug.h#7 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/core/usb2_debug.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.c#38 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/core/usb2_dev.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2006-2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.h#13 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/core/usb2_dev.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#28 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/core/usb2_device.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.h#9 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/core/usb2_device.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_dynamic.c#5 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/core/usb2_dynamic.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_dynamic.h#5 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/core/usb2_dynamic.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_error.c#3 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/core/usb2_error.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#29 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/core/usb2_generic.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.h#6 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/core/usb2_generic.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_handle_request.c#9 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/core/usb2_handle_request.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_handle_request.h#3 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/core/usb2_handle_request.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_hid.c#7 (text+ko) ====

@@ -2,7 +2,7 @@
 
 
 #include 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb2/core/usb2_hid.c,v 1.1 2008/11/04 02:31:03 alfred Exp $");
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_hid.h#7 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/core/usb2_hid.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  * Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved.

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#19 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/core/usb2_hub.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved.
  * Copyright (c) 1998 Lennart Augustsson. All rights reserved.

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.h#5 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/core/usb2_hub.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_if.m#4 (text+ko) ====

@@ -24,7 +24,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$
+# $FreeBSD: src/sys/dev/usb2/core/usb2_if.m,v 1.1 2008/11/04 02:31:03 alfred Exp $
 #
 
 # USB interface description

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_lookup.c#8 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/core/usb2_lookup.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_lookup.h#9 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/core/usb2_lookup.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_mbuf.c#3 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/core/usb2_mbuf.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_mbuf.h#3 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/core/usb2_mbuf.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_msctest.c#9 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/core/usb2_msctest.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_msctest.h#5 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/core/usb2_msctest.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_parse.c#4 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/core/usb2_parse.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_parse.h#4 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/core/usb2_parse.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_process.c#11 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/core/usb2_process.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_process.h#4 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/core/usb2_process.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.c#19 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/core/usb2_request.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved.
  * Copyright (c) 1998 Lennart Augustsson. All rights reserved.

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.h#6 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/core/usb2_request.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_sw_transfer.c#6 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/core/usb2_sw_transfer.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_sw_transfer.h#3 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/core/usb2_sw_transfer.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#30 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/core/usb2_transfer.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.h#8 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/core/usb2_transfer.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_util.c#6 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/core/usb2_util.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_util.h#5 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/dev/usb2/core/usb2_util.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/dev/usb2/core/usbdevs#10 (text+ko) ====

@@ -1,4 +1,4 @@
-$FreeBSD: src/sys/dev/usb/usbdevs,v 1.372 2008/09/19 09:04:06 kevlo Exp $
+$FreeBSD: src/sys/dev/usb2/core/usbdevs,v 1.1 2008/11/04 02:31:03 alfred Exp $
 /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */
 
 /*-

==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_aue2.c#11 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb2/ethernet/if_aue2.c,v 1.1 2008/11/04 02:31:03 alfred Exp $");
 
 /*
  * ADMtek AN986 Pegasus and AN8511 Pegasus II USB to ethernet driver.

==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_aue2_reg.h#5 (text+ko) ====

@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/usb2/ethernet/if_aue2_reg.h,v 1.1 2008/11/04 02:31:03 alfred Exp $
  */
 
 /*

==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axe2.c#11 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb2/ethernet/if_axe2.c,v 1.1 2008/11/04 02:31:03 alfred Exp $");
 
 /*
  * ASIX Electronics AX88172/AX88178/AX88778 USB 2.0 ethernet driver. Used in the

==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axe2_reg.h#5 (text+ko) ====

@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/usb2/ethernet/if_axe2_reg.h,v 1.1 2008/11/04 02:31:03 alfred Exp $
  */
 
 /*

==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdce2.c#11 (text+ko) ====

@@ -40,7 +40,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb2/ethernet/if_cdce2.c,v 1.1 2008/11/04 02:31:03 alfred Exp $");
 
 #include 
 #include 

==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdce2_reg.h#5 (text+ko) ====

@@ -29,7 +29,7 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/usb2/ethernet/if_cdce2_reg.h,v 1.1 2008/11/04 02:31:03 alfred Exp $
  */
 
 #ifndef _USB_IF_CDCEREG_H_

==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cue2.c#11 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb2/ethernet/if_cue2.c,v 1.1 2008/11/04 02:31:03 alfred Exp $");
 
 /*
  * CATC USB-EL1210A USB to ethernet driver. Used in the CATC Netmate

==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cue2_reg.h#5 (text+ko) ====

@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/usb2/ethernet/if_cue2_reg.h,v 1.1 2008/11/04 02:31:03 alfred Exp $
  */
 
 /*

==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2.c#11 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/usb2/ethernet/if_kue2.c,v 1.1 2008/11/04 02:31:03 alfred Exp $");
 
 /*

>>> TRUNCATED FOR MAIL (1000 lines) <<<
From hselasky at FreeBSD.org  Tue Nov  4 10:04:15 2008
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Tue Nov  4 10:04:21 2008
Subject: PERFORCE change 152475 for review
Message-ID: <200811041804.mA4I4FNl037014@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152475

Change 152475 by hselasky@hselasky_laptop001 on 2008/11/04 18:03:15

	
	IFC @ 152458 - more RCS ID's.

Affected files ...

.. //depot/projects/usb/src/lib/libusb20/Makefile#3 integrate
.. //depot/projects/usb/src/lib/libusb20/libusb20.3#4 integrate
.. //depot/projects/usb/src/lib/libusb20/libusb20.c#7 integrate
.. //depot/projects/usb/src/lib/libusb20/libusb20.h#7 integrate
.. //depot/projects/usb/src/lib/libusb20/libusb20_compat01.c#4 integrate
.. //depot/projects/usb/src/lib/libusb20/libusb20_compat01.h#2 integrate
.. //depot/projects/usb/src/lib/libusb20/libusb20_compat10.c#2 integrate
.. //depot/projects/usb/src/lib/libusb20/libusb20_compat10.h#2 integrate
.. //depot/projects/usb/src/lib/libusb20/libusb20_desc.c#3 integrate
.. //depot/projects/usb/src/lib/libusb20/libusb20_desc.h#3 integrate
.. //depot/projects/usb/src/lib/libusb20/libusb20_int.h#6 integrate
.. //depot/projects/usb/src/lib/libusb20/libusb20_ugen20.c#7 integrate
.. //depot/projects/usb/src/usr.sbin/usbconfig/Makefile#3 integrate
.. //depot/projects/usb/src/usr.sbin/usbconfig/dump.c#7 integrate
.. //depot/projects/usb/src/usr.sbin/usbconfig/dump.h#4 integrate
.. //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.8#2 integrate
.. //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.c#4 integrate

Differences ...

==== //depot/projects/usb/src/lib/libusb20/Makefile#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/lib/libusb20/Makefile,v 1.1 2008/11/04 02:31:03 alfred Exp $
 #
 # Makefile for the FreeBSD specific LibUSB 2.0
 #

==== //depot/projects/usb/src/lib/libusb20/libusb20.3#4 (text+ko) ====

@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: $
+.\" $FreeBSD: src/lib/libusb20/libusb20.3,v 1.1 2008/11/04 02:31:03 alfred Exp $
 .\"
 .Dd Oct 23, 2008
 .Dt LIBUSB20 3

==== //depot/projects/usb/src/lib/libusb20/libusb20.c#7 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libusb20/libusb20.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/lib/libusb20/libusb20.h#7 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libusb20/libusb20.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  * Copyright (c) 2007-2008 Daniel Drake.  All rights reserved.

==== //depot/projects/usb/src/lib/libusb20/libusb20_compat01.c#4 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libusb20/libusb20_compat01.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/lib/libusb20/libusb20_compat01.h#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libusb20/libusb20_compat01.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/lib/libusb20/libusb20_compat10.c#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libusb20/libusb20_compat10.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/lib/libusb20/libusb20_compat10.h#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libusb20/libusb20_compat10.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/lib/libusb20/libusb20_desc.c#3 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libusb20/libusb20_desc.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/lib/libusb20/libusb20_desc.h#3 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libusb20/libusb20_desc.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  * Copyright (c) 2007-2008 Daniel Drake.  All rights reserved.

==== //depot/projects/usb/src/lib/libusb20/libusb20_int.h#6 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libusb20/libusb20_int.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

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

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/lib/libusb20/libusb20_ugen20.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/usr.sbin/usbconfig/Makefile#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.sbin/usbconfig/Makefile,v 1.1 2008/11/04 02:31:03 alfred Exp $
 #
 PROG=	usbconfig
 MAN=	usbconfig.8

==== //depot/projects/usb/src/usr.sbin/usbconfig/dump.c#7 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/usbconfig/dump.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/usr.sbin/usbconfig/dump.h#4 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/usbconfig/dump.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.8#2 (text+ko) ====

@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.sbin/usbconfig/usbconfig.8,v 1.1 2008/11/04 02:31:03 alfred Exp $
 .\"
 .\" Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
 .\"

==== //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.c#4 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.sbin/usbconfig/usbconfig.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *
From hselasky at FreeBSD.org  Tue Nov  4 10:34:47 2008
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Tue Nov  4 10:34:52 2008
Subject: PERFORCE change 152476 for review
Message-ID: <200811041834.mA4IYkGF039497@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152476

Change 152476 by hselasky@hselasky_laptop001 on 2008/11/04 18:34:37

	
	Some USB drivers do not pass the endpoint direction
	mask correctly to the libusb API functions. Force
	correct endpoint direction.

Affected files ...

.. //depot/projects/usb/src/lib/libusb20/libusb20_compat01.c#5 edit

Differences ...

==== //depot/projects/usb/src/lib/libusb20/libusb20_compat01.c#5 (text+ko) ====

@@ -131,7 +131,7 @@
 	x = (ep_no & LIBUSB20_ENDPOINT_ADDRESS_MASK) * 2;
 
 	if (ep_no & LIBUSB20_ENDPOINT_DIR_MASK) {
-		/* this is a IN endpoint */
+		/* this is an IN endpoint */
 		x |= 1;
 	}
 	speed = libusb20_dev_get_speed(pdev);
@@ -616,28 +616,32 @@
 usb_bulk_write(usb_dev_handle * dev, int ep, char *bytes,
     int size, int timeout)
 {
-	return (usb_std_io(dev, ep, bytes, size, timeout, 0));
+	return (usb_std_io(dev, ep & ~USB_ENDPOINT_DIR_MASK,
+	    bytes, size, timeout, 0));
 }
 
 int
 usb_bulk_read(usb_dev_handle * dev, int ep, char *bytes,
     int size, int timeout)
 {
-	return (usb_std_io(dev, ep, bytes, size, timeout, 0));
+	return (usb_std_io(dev, ep | USB_ENDPOINT_DIR_MASK,
+	    bytes, size, timeout, 0));
 }
 
 int
 usb_interrupt_write(usb_dev_handle * dev, int ep, char *bytes,
     int size, int timeout)
 {
-	return (usb_std_io(dev, ep, bytes, size, timeout, 1));
+	return (usb_std_io(dev, ep & ~USB_ENDPOINT_DIR_MASK,
+	    bytes, size, timeout, 1));
 }
 
 int
 usb_interrupt_read(usb_dev_handle * dev, int ep, char *bytes,
     int size, int timeout)
 {
-	return (usb_std_io(dev, ep, bytes, size, timeout, 1));
+	return (usb_std_io(dev, ep | USB_ENDPOINT_DIR_MASK,
+	    bytes, size, timeout, 1));
 }
 
 int
From hselasky at FreeBSD.org  Tue Nov  4 10:51:03 2008
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Tue Nov  4 10:51:09 2008
Subject: PERFORCE change 152478 for review
Message-ID: <200811041851.mA4Ip2cP040847@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152478

Change 152478 by hselasky@hselasky_laptop001 on 2008/11/04 18:50:56

	
	Patch to support a common "usbdevs" file.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usbdevs#25 edit
.. //depot/projects/usb/src/sys/dev/usb2/core/usbdevs#11 delete
.. //depot/projects/usb/src/sys/dev/usb2/include/Makefile#4 edit
.. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#10 edit
.. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#10 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/usbdevs#25 (text+ko) ====

@@ -795,7 +795,7 @@
 
 /* AIPTEK products */
 product AIPTEK POCKETCAM3M	0x2011	PocketCAM 3Mega
-product AIPTEK2 PENCAM_MEGA_1_3 0x504a	PenCam Mega 1.3
+product SUNPLUS PENCAM_MEGA_1_3 0x504a	PenCam Mega 1.3
 
 /* AirPrime products */
 product AIRPRIME PC5220		0x0112	CDMA Wireless PC Card
@@ -1006,7 +1006,7 @@
 
 /* Chicony products */
 product CHICONY KB8933		0x0001	KB-8933 keyboard
-product CHICONY2 TWINKLECAM	0x600d	TwinkleCam USB camera
+product MICRODIA TWINKLECAM	0x600d	TwinkleCam USB camera
 
 /* CH Products */
 product CHPRODUCTS PROTHROTTLE	0x00f1	Pro Throttle

==== //depot/projects/usb/src/sys/dev/usb2/include/Makefile#4 (text+ko) ====

@@ -6,8 +6,8 @@
 S=${.CURDIR}/../../..
 
 all:
-	awk -f $S/tools/usbdevs2h.awk $S/dev/usb2/core/usbdevs -d ; mv usbdevs_data.h usb2_devtable.h
-	awk -f $S/tools/usbdevs2h.awk $S/dev/usb2/core/usbdevs -h ; mv usbdevs.h usb2_devid.h
+	awk -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs -d ; mv usbdevs_data.h usb2_devtable.h
+	awk -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs -h ; mv usbdevs.h usb2_devid.h
 
 clean:
 	rm -f usb2_devtable.h usb2_devid.h

==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#10 (text+ko) ====

@@ -4,7 +4,7 @@
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.372 2008/09/19 09:04:06 kevlo Exp 
+ *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.381 2008/11/02 03:00:36 imp Exp 
  */
 /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */
 
@@ -951,6 +951,7 @@
 #define	USB_PRODUCT_BELKIN_F5D7050	0x7050		/* F5D7050 Wireless Adapter */
 #define	USB_PRODUCT_BELKIN_F5D7051	0x7051		/* F5D7051 54g USB Network Adapter */
 #define	USB_PRODUCT_BELKIN_F5D7050A	0x705a		/* F5D7050A Wireless Adapter */
+/* Also sold as 'Ativa 802.11g wireless card' */
 #define	USB_PRODUCT_BELKIN_F5D7050_V4000	0x705c		/* F5D7050 v4000 Wireless Adapter */
 #define	USB_PRODUCT_BELKIN_F5D9050V3	0x905b		/* F5D9050 ver 3 Wireless Adapter */
 #define	USB_PRODUCT_BELKIN2_F5U002	0x0002		/* F5U002 Parallel printer */
@@ -1431,6 +1432,7 @@
 #define	USB_PRODUCT_HP_640C	0x2004		/* DeskJet 640c */
 #define	USB_PRODUCT_HP_4670V	0x3005		/* ScanJet 4670v */
 #define	USB_PRODUCT_HP_P1100	0x3102		/* Photosmart P1100 */
+#define	USB_PRODUCT_HP_OJ4215	0x3d11		/* OfficeJet 4215 */
 #define	USB_PRODUCT_HP_HN210E	0x811c		/* Ethernet HN210E */
 #define	USB_PRODUCT_HP2_C500	0x6002		/* PhotoSmart C500 */
 
@@ -1441,7 +1443,7 @@
 
 /* HUAWEI products */
 #define	USB_PRODUCT_HUAWEI_MOBILE	0x1001		/* Huawei Mobile */
-#define	USB_PRODUCT_HUAWEI_E270	0x1003		/* Huawei HSPA modem */
+#define	USB_PRODUCT_HUAWEI_E220	0x1003		/* Huawei HSDPA modem */
 
 /* HUAWEI 3com products */
 #define	USB_PRODUCT_HUAWEI3COM_WUB320G	0x0009		/* Aolynk WUB320g */
@@ -1846,7 +1848,7 @@
 #define	USB_PRODUCT_NOVATEL_ES620	0x2100		/* ES620 CDMA */
 #define	USB_PRODUCT_NOVATEL_U720	0x2110		/* Merlin U720 */
 #define	USB_PRODUCT_NOVATEL_U727	0x4100		/* Merlin U727 CDMA */
-#define	USB_PRODUCT_NOVATEL_U950D	0x4400		/* Novatel MC950D HSUPA */
+#define	USB_PRODUCT_NOVATEL_MC950D	0x4400		/* Novatel MC950D HSUPA */
 #define	USB_PRODUCT_NOVATEL_ZEROCD	0x5010		/* Novatel ZeroCD */
 #define	USB_PRODUCT_NOVATEL2_FLEXPACKGPS	0x0100		/* NovAtel FlexPack GPS receiver */
 
@@ -1879,6 +1881,7 @@
 #define	USB_PRODUCT_OPTION_GT3GQUAD	0x6300		/* GlobeTrotter 3G QUAD datacard */
 #define	USB_PRODUCT_OPTION_GT3GPLUS	0x6600		/* GlobeTrotter 3G+ datacard */
 #define	USB_PRODUCT_OPTION_GTMAX36	0x6701		/* GlobeTrotter Max 3.6 Modem */
+#define	USB_PRODUCT_OPTION_GTMAXHSUPA	0x7001		/* GlobeTrotter HSUPA */
 
 /* OQO */
 #define	USB_PRODUCT_OQO_WIFI01	0x0002		/* model 01 WiFi interface */
@@ -2002,6 +2005,7 @@
 #define	USB_PRODUCT_QUALCOMM2_RWT_FCT	0x3100		/* RWT FCT-CDMA 2000 1xRTT modem */
 #define	USB_PRODUCT_QUALCOMM2_CDMA_MSM	0x3196		/* CDMA Technologies MSM modem */
 #define	USB_PRODUCT_QUALCOMMINC_CDMA_MSM	0x0001		/* CDMA Technologies MSM modem */
+#define	USB_PRODUCT_QUALCOMMINC_ZTE_STOR	0x2000		/* USB ZTE Storage */
 
 /* Qtronix products */
 #define	USB_PRODUCT_QTRONIX_980N	0x2011		/* Scorpion-980N keyboard */
@@ -2238,6 +2242,7 @@
 #define	USB_PRODUCT_SONY_CLIE_NX60	0x00da		/* Sony Clie nx60 */
 #define	USB_PRODUCT_SONY_CLIE_TH55	0x0144		/* Sony Clie th55 */
 #define	USB_PRODUCT_SONY_CLIE_TJ37	0x0169		/* Sony Clie tj37 */
+#define	USB_PRODUCT_SONY_RF_RECEIVER	0x01db		/* Sony RF mouse/kbd Receiver VGP-WRC1 */
 
 /* Sony Ericsson products */
 #define	USB_PRODUCT_SONYERICSSON_DCU10	0x0528		/* USB Cable */

==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#10 (text+ko) ====

@@ -4,7 +4,7 @@
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.372 2008/09/19 09:04:06 kevlo Exp 
+ *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.381 2008/11/02 03:00:36 imp Exp 
  */
 /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */
 
@@ -3101,6 +3101,12 @@
 	    "Photosmart P1100",
 	},
 	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_OJ4215,
+	    0,
+	    "Hewlett Packard",
+	    "OfficeJet 4215",
+	},
+	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_HN210E,
 	    0,
 	    "Hewlett Packard",
@@ -3137,10 +3143,10 @@
 	    "Huawei Mobile",
 	},
 	{
-	    USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E270,
+	    USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E220,
 	    0,
 	    "Huawei Technologies",
-	    "Huawei HSPA modem",
+	    "Huawei HSDPA modem",
 	},
 	{
 	    USB_VENDOR_HUAWEI3COM, USB_PRODUCT_HUAWEI3COM_WUB320G,
@@ -4775,7 +4781,7 @@
 	    "Merlin U727 CDMA",
 	},
 	{
-	    USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U950D,
+	    USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_MC950D,
 	    0,
 	    "Novatel Wireless",
 	    "Novatel MC950D HSUPA",
@@ -4913,6 +4919,12 @@
 	    "GlobeTrotter Max 3.6 Modem",
 	},
 	{
+	    USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GTMAXHSUPA,
+	    0,
+	    "Option N.V:",
+	    "GlobeTrotter HSUPA",
+	},
+	{
 	    USB_VENDOR_OQO, USB_PRODUCT_OQO_WIFI01,
 	    0,
 	    "OQO",
@@ -5435,6 +5447,12 @@
 	    "CDMA Technologies MSM modem",
 	},
 	{
+	    USB_VENDOR_QUALCOMMINC, USB_PRODUCT_QUALCOMMINC_ZTE_STOR,
+	    0,
+	    "Qualcomm, Incorporated",
+	    "USB ZTE Storage",
+	},
+	{
 	    USB_VENDOR_QTRONIX, USB_PRODUCT_QTRONIX_980N,
 	    0,
 	    "Qtronix",
@@ -6395,6 +6413,12 @@
 	    "Sony Clie tj37",
 	},
 	{
+	    USB_VENDOR_SONY, USB_PRODUCT_SONY_RF_RECEIVER,
+	    0,
+	    "Sony",
+	    "Sony RF mouse/kbd Receiver VGP-WRC1",
+	},
+	{
 	    USB_VENDOR_SONYERICSSON, USB_PRODUCT_SONYERICSSON_DCU10,
 	    0,
 	    "Sony Ericsson",
From hselasky at FreeBSD.org  Tue Nov  4 12:07:22 2008
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Tue Nov  4 12:07:28 2008
Subject: PERFORCE change 152486 for review
Message-ID: <200811042007.mA4K7Le7049420@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152486

Change 152486 by hselasky@hselasky_laptop001 on 2008/11/04 20:06:27

	
	Fix a LINT issue.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2.c#20 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2.c#20 (text+ko) ====

@@ -392,10 +392,10 @@
 		usb2_copy_out(xfer->frbuffers, 0,
 		    &sc->sc_intr_ibuf, actlen);
 
-		switch (cmd->code) {
-		case htole16(ZYD_NOTIF_RETRYSTATUS):
+		switch (le16toh(cmd->code)) {
+		case ZYD_NOTIF_RETRYSTATUS:
 			goto handle_notif_retrystatus;
-		case htole16(ZYD_NOTIF_IORD):
+		case ZYD_NOTIF_IORD:
 			goto handle_notif_iord;
 		default:
 			DPRINTFN(2, "unknown indication: 0x%04x\n",
From gonzo at FreeBSD.org  Tue Nov  4 12:10:29 2008
From: gonzo at FreeBSD.org (Oleksandr Tymoshenko)
Date: Tue Nov  4 12:10:37 2008
Subject: PERFORCE change 152487 for review
Message-ID: <200811042010.mA4KAOWq050984@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152487

Change 152487 by gonzo@gonzo_jeeves on 2008/11/04 20:10:08

	- Add some debugging printf's

Affected files ...

.. //depot/projects/mips2/src/sys/mips/mips/pmap.c#36 edit

Differences ...

==== //depot/projects/mips2/src/sys/mips/mips/pmap.c#36 (text+ko) ====

@@ -107,6 +107,8 @@
 #define	PMAP_DIAGNOSTIC
 #endif
 
+#undef PMAP_DEBUG
+
 #ifndef PMAP_SHPGPERPROC
 #define	PMAP_SHPGPERPROC 200
 #endif
@@ -694,6 +696,9 @@
 	register pt_entry_t *pte;
 	pt_entry_t npte, opte;
 
+#ifdef PMAP_DEBUG
+	printf("pmap_kenter:  va: 0x%08x -> pa: 0x%08x\n", va, pa);
+#endif
 	npte = mips_paddr_to_tlbpfn(pa) | PTE_RW | PTE_V | PTE_G | PTE_W;
 
 	if (is_cacheable_mem(pa))
@@ -1801,6 +1806,9 @@
 validate:
 	rw = init_pte_prot(va, m, prot);
 
+#ifdef PMAP_DEBUG
+	printf("pmap_enter:  va: 0x%08x -> pa: 0x%08x\n", va, pa);
+#endif
 	/*
 	 * Now validate mapping with desired protection/wiring.
 	 */
From rene at FreeBSD.org  Tue Nov  4 13:45:05 2008
From: rene at FreeBSD.org (Rene Ladan)
Date: Tue Nov  4 13:45:12 2008
Subject: PERFORCE change 152491 for review
Message-ID: <200811042145.mA4Lj43A071068@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152491

Change 152491 by rene@rene_self on 2008/11/04 21:44:42

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#4 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml#3 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/security/chapter.sgml#9 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#12 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#11 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#9 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#9 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/rene.key#1 branch
.. //depot/projects/docproj_nl/share/sgml/freebsd.ent#4 integrate
.. //depot/projects/docproj_nl/www/en/developers.sgml#9 integrate
.. //depot/projects/docproj_nl/www/en/projects/ideas/ideas.xml#2 integrate
.. //depot/projects/docproj_nl/www/share/sgml/news.xml#15 integrate
.. //depot/projects/docproj_nl/www/share/sgml/release.ent#5 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#4 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
@@ -271,11 +271,11 @@
 		    &os;, and not &os.current;.  You will need to edit this
 		    file and replace the following line:
 
-		  *default release=cvs tag=RELENG_X_Y
+		  *default release=cvs tag=RELENG_X_Y
 
 		  With this one:
 
-		  *default release=cvs tag=.
+		  *default release=cvs tag=.
 
 		  For a detailed explanation of usable tags, please
 		    refer to the Handbook's 
 
 
@@ -532,7 +532,7 @@
 	  also appear to be no noticeable costs having them enabled.
 	  While enabled, it is possible to have ZFS
 	  check data integrity using checksum verification.  This
-	  process is known as scrubing.  To verify the
+	  process is known as scrubbing.  To verify the
 	  data integrity of the storage pool, issue
 	  the following command:
 

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/security/chapter.sgml#9 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
@@ -1311,7 +1311,7 @@
       network environment.  It seems that everyone wants to
       install a firewall to handle network connections.  While a
       firewall has a wide variety of uses, there are some things
-      that a firewall not handle such as sending text back to the
+      that a firewall will not handle, such as sending text back to the
       connection originator.  The TCP Wrappers software
       does this and much more.  In the next few sections many of
       the TCP Wrappers features will be discussed,

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

@@ -1,7 +1,7 @@
 
 
 
 		    800052
 		  
+		  
+		    8.0-CURRENT after the prototype change of
+		      &man.vfs.busy.9; and the introduction of its
+		      MBF_NOWAIT and MBF_MNTLSTLOCK flags.
+		    800053
+	          
 		
 	      
 	    

==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#11 (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.464 2008/11/01 11:08:11 versus Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.465 2008/11/04 20:03:28 rene Exp $
 -->
 
 aaron@FreeBSD.org">
@@ -874,6 +874,8 @@
 
 remko@FreeBSD.org">
 
+rene@FreeBSD.org">
+
 rgrimes@FreeBSD.org">
 
 ricardag@FreeBSD.org">

==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#9 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
     
@@ -714,6 +714,11 @@
       &pgpkey.remko;
     
 
+    
+      &a.rene;
+      &pgpkey.rene;
+    
+
     
       &a.scottl;
       &pgpkey.scottl;

==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#9 (text+ko) ====

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

==== //depot/projects/docproj_nl/share/sgml/freebsd.ent#4 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
@@ -438,6 +438,7 @@
 
 
 
+
 
 
 

==== //depot/projects/docproj_nl/www/en/projects/ideas/ideas.xml#2 (text+ko) ====

@@ -15,7 +15,7 @@
 
   
     
-      $FreeBSD: www/en/projects/ideas/ideas.xml,v 1.89 2008/06/18 06:55:29 ed Exp $
+      $FreeBSD: www/en/projects/ideas/ideas.xml,v 1.90 2008/11/02 22:48:28 versus Exp $
     
   
 
@@ -1801,37 +1801,6 @@
 	
       
 
-      
-	Multibyte collation support
-
-	
-
Technical Contact: Diomidis Spinellis

-
-
Currently FreeBSD supports only single byte collation.  Multibyte
-  collation support would be nice.  This might involve implementing
-  the Unicode Collation Algorithm (see http://unicode.org/reports/tr10/),
-  writing a tool to compile the Default Unicode Collation Element
-  Table (http://www.unicode.org/Public/UCA/latest)
-  into an efficient lookup format, and integrating the corresponding
-  conformance tests (http://www.unicode.org/Public/UCA/latest/CollationTest.html)
-  into the FreeBSD regression testing framework.

-
-
Benefits:

-
    
-  
  • Proper national sorting in UTF-8 and other multibyte locales.
    • 
-

-
Requirements:

-
    
-  
  • Knowledge of C.
    • 
-  
  • Familiarity with locale subsystem and relevant ISO standards.
    • 
-

-	
-      
-
       
 	NDMP data server
 

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

@@ -25,7 +25,7 @@
 
   
     
-      $FreeBSD: www/share/sgml/news.xml,v 1.204 2008/11/01 12:55:08 versus Exp $
+      $FreeBSD: www/share/sgml/news.xml,v 1.205 2008/11/04 20:58:34 danger Exp $
     
   
 
@@ -36,6 +36,24 @@
       11
 
       
+	3
+
+	
+	  &os; 6.4-RC2 Available
+
+	  
The second Release Candidate for &os; 6.4 is now available.
+	    ISO images for Tier-1 architectures are available for
+	    download on most of the &os; mirror sites.
+	    &os; 6.4-RC2 should be the last of the public test builds
+	    for the FreeBSD 6.4 release cycle, therefore we encourage
+	    people to test and report any outstanding bugs as soon as
+	    possible.

+	
+      
+
+      
 	1
          
            New committer: <a href="mailto:versus@FreeBSD.org">

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

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: www/share/sgml/release.ent,v 1.25 2008/10/23 08:17:10 danger Exp $ -->
+<!-- $FreeBSD: www/share/sgml/release.ent,v 1.26 2008/11/04 20:38:09 danger Exp $ -->
 
 <!-- XXX rel.current and u.rel.* should be available in doc/ -->
 <!-- The currently released versions of FreeBSD.  This value is used to
@@ -39,7 +39,7 @@
 <!ENTITY beta2.testing "INCLUDE">
 <!ENTITY % beta2.testing "INCLUDE">
 <!ENTITY betarel2.current '6.4'>
-<!ENTITY betarel2.vers 'RC1'>
+<!ENTITY betarel2.vers 'RC2'>
 <!ENTITY u.betarel2.schedule '&base;/releases/&betarel2.current;R/schedule.html'>
 
 <!ENTITY rel.current.major '7'>
From gonzo at FreeBSD.org  Tue Nov  4 14:15:37 2008
From: gonzo at FreeBSD.org (Oleksandr Tymoshenko)
Date: Tue Nov  4 14:15:43 2008
Subject: PERFORCE change 152493 for review
Message-ID: <200811042215.mA4MFaCn074649@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152493

Change 152493 by gonzo@gonzo_jeeves on 2008/11/04 22:15:30

	o When zeroing memory area use uncached region in KSEG1 and 
	    then invalidate all chache entries for this area.

Affected files ...

.. //depot/projects/mips2/src/sys/mips/mips/pmap.c#37 edit

Differences ...

==== //depot/projects/mips2/src/sys/mips/mips/pmap.c#37 (text+ko) ====

@@ -2178,9 +2178,10 @@
 #endif
 	if (phys < MIPS_KSEG0_LARGEST_PHYS) {
 
-		va = MIPS_PHYS_TO_CACHED(phys);
+		va = MIPS_PHYS_TO_UNCACHED(phys);
 
 		bzero((caddr_t)va, PAGE_SIZE);
+		mips_dcache_wbinv_range(va, PAGE_SIZE);
 	} else {
 		int cpu;
 		struct local_sysmaps *sysm;
@@ -2233,8 +2234,9 @@
 	} else
 #endif
 	if (phys < MIPS_KSEG0_LARGEST_PHYS) {
-		va = MIPS_PHYS_TO_CACHED(phys);
+		va = MIPS_PHYS_TO_UNCACHED(phys);
 		bzero((char *)(caddr_t)va + off, size);
+		mips_dcache_wbinv_range(va + off, size);
 	} else {
 		int cpu;
 		struct local_sysmaps *sysm;
@@ -2271,8 +2273,9 @@
 	} else
 #endif
 	if (phys < MIPS_KSEG0_LARGEST_PHYS) {
-		va = MIPS_PHYS_TO_CACHED(phys);
+		va = MIPS_PHYS_TO_UNCACHED(phys);
 		bzero((caddr_t)va, PAGE_SIZE);
+		mips_dcache_wbinv_range(va, PAGE_SIZE);
 	} else {
 		int cpu;
 		struct local_sysmaps *sysm;
From gonzo at FreeBSD.org  Tue Nov  4 14:18:40 2008
From: gonzo at FreeBSD.org (Oleksandr Tymoshenko)
Date: Tue Nov  4 14:18:46 2008
Subject: PERFORCE change 152494 for review
Message-ID: <200811042218.mA4MIdGi074959@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152494

Change 152494 by gonzo@gonzo_jeeves on 2008/11/04 22:17:43

	Add some verbosity to boot log. Sometimes it's useful to know
	  TLB/cache settings of CPU.

Affected files ...

.. //depot/projects/mips2/src/sys/mips/mips/cpu.c#24 edit

Differences ...

==== //depot/projects/mips2/src/sys/mips/mips/cpu.c#24 (text+ko) ====

@@ -136,6 +136,8 @@
 
 	mips_icache_sync_all();
 	mips_dcache_wbinv_all();
+	/* Print some info about CPU */
+	cpu_identify();
 }
 
 void
From gonzo at FreeBSD.org  Tue Nov  4 14:19:41 2008
From: gonzo at FreeBSD.org (Oleksandr Tymoshenko)
Date: Tue Nov  4 14:19:48 2008
Subject: PERFORCE change 152495 for review
Message-ID: <200811042219.mA4MJert075020@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152495

Change 152495 by gonzo@gonzo_jeeves on 2008/11/04 22:19:13

	- Request all available memory from CFE
	- Make realmem/physmem handling less obscure

Affected files ...

.. //depot/projects/mips2/src/sys/mips/bcm47xx/bcm47xx_machdep.c#3 edit

Differences ...

==== //depot/projects/mips2/src/sys/mips/bcm47xx/bcm47xx_machdep.c#3 (text+ko) ====

@@ -103,7 +103,8 @@
 		int result;
 		uint64_t addr, len, type;
 
-		result = cfe_enummem(i, 0, &addr, &len, &type);
+		result = cfe_enummem(i, CFE_FLG_FULL_ARENA, &addr, &len, 
+		    &type);
 		if (result < 0) {
 			phys_avail[i] = phys_avail[i + 1] = 0;
 			break;
@@ -124,10 +125,10 @@
 		physmem += len;
 	}
 
-	realmem = btoc(physmem);
 #endif
 
-	physmem = realmem;
+	physmem = btoc(physmem);
+	realmem = physmem;
 
 	init_param1();
 	init_param2(physmem);
From hselasky at FreeBSD.org  Wed Nov  5 00:11:43 2008
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Wed Nov  5 00:11:50 2008
Subject: PERFORCE change 152509 for review
Message-ID: <200811050811.mA58BheT050747@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152509

Change 152509 by hselasky@hselasky_laptop001 on 2008/11/05 08:10:53

	
	Correct wrong sysctl name. Reported by Lars Engels.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/image/uscanner2.c#10 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/image/uscanner2.c#10 (text+ko) ====

@@ -67,7 +67,7 @@
 static int uscanner_debug = 0;
 
 SYSCTL_NODE(_hw_usb2, OID_AUTO, uscanner, CTLFLAG_RW, 0, "USB uscanner");
-SYSCTL_INT(_hw_usb2_uscanner, OID_AUTO, uscanner, CTLFLAG_RW, &uscanner_debug,
+SYSCTL_INT(_hw_usb2_uscanner, OID_AUTO, debug, CTLFLAG_RW, &uscanner_debug,
     0, "uscanner debug level");
 #endif
 
From hselasky at FreeBSD.org  Wed Nov  5 00:31:03 2008
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Wed Nov  5 00:31:10 2008
Subject: PERFORCE change 152510 for review
Message-ID: <200811050831.mA58V29r052138@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152510

Change 152510 by hselasky@hselasky_laptop001 on 2008/11/05 08:30:52

	
	Fix some higher level warnings. Rename some shadow variables.

Affected files ...

.. //depot/projects/usb/src/lib/libusb20/libusb20.c#8 edit
.. //depot/projects/usb/src/lib/libusb20/libusb20.h#8 edit
.. //depot/projects/usb/src/lib/libusb20/libusb20_ugen20.c#8 edit
.. //depot/projects/usb/src/usr.sbin/usbconfig/dump.c#8 edit
.. //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.c#5 edit

Differences ...

==== //depot/projects/usb/src/lib/libusb20/libusb20.c#8 (text+ko) ====

@@ -647,7 +647,7 @@
 
 int
 libusb20_dev_req_string_sync(struct libusb20_device *pdev,
-    uint8_t index, uint16_t langid, void *ptr, uint16_t len)
+    uint8_t strIndex, uint16_t langid, void *ptr, uint16_t len)
 {
 	struct LIBUSB20_CONTROL_SETUP_DECODED req;
 	int error;
@@ -667,7 +667,7 @@
 	    LIBUSB20_RECIPIENT_DEVICE |
 	    LIBUSB20_ENDPOINT_IN;
 	req.bRequest = LIBUSB20_REQUEST_GET_DESCRIPTOR;
-	req.wValue = (LIBUSB20_DT_STRING << 8) | index;
+	req.wValue = (LIBUSB20_DT_STRING << 8) | strIndex;
 	req.wIndex = langid;
 	req.wLength = 4;		/* bytes */
 
@@ -695,7 +695,7 @@
 
 int
 libusb20_dev_req_string_simple_sync(struct libusb20_device *pdev,
-    uint8_t index, void *ptr, uint16_t len)
+    uint8_t strIndex, void *ptr, uint16_t len)
 {
 	char *buf;
 	int error;
@@ -725,7 +725,7 @@
 
 	langid = temp[2] | (temp[3] << 8);
 
-	error = libusb20_dev_req_string_sync(pdev, index,
+	error = libusb20_dev_req_string_sync(pdev, strIndex,
 	    langid, temp, sizeof(temp));
 	if (error < 0)
 		return (error);
@@ -836,7 +836,7 @@
 libusb20_dev_get_config_index(struct libusb20_device *pdev)
 {
 	int error;
-	uint8_t index;
+	uint8_t cfg_index;
 	uint8_t do_close;
 
 	if (!pdev->is_opened) {
@@ -850,16 +850,16 @@
 		do_close = 0;
 	}
 
-	error = (pdev->methods->get_config_index) (pdev, &index);
+	error = (pdev->methods->get_config_index) (pdev, &cfg_index);
 	if (error) {
-		index = 0 - 1;		/* current config index */
+		cfg_index = 0 - 1;	/* current config index */
 	}
 	if (do_close) {
 		if (libusb20_dev_close(pdev)) {
 			/* ignore */
 		}
 	}
-	return (index);
+	return (cfg_index);
 }
 
 uint8_t
@@ -1071,16 +1071,16 @@
 
 int
 libusb20_be_get_dev_quirk(struct libusb20_backend *pbe,
-    uint16_t index, struct libusb20_quirk *pq)
+    uint16_t quirk_index, struct libusb20_quirk *pq)
 {
-	return ((pbe->methods->root_get_dev_quirk) (pbe, index, pq));
+	return ((pbe->methods->root_get_dev_quirk) (pbe, quirk_index, pq));
 }
 
 int
 libusb20_be_get_quirk_name(struct libusb20_backend *pbe,
-    uint16_t index, struct libusb20_quirk *pq)
+    uint16_t quirk_index, struct libusb20_quirk *pq)
 {
-	return ((pbe->methods->root_get_quirk_name) (pbe, index, pq));
+	return ((pbe->methods->root_get_quirk_name) (pbe, quirk_index, pq));
 }
 
 int

==== //depot/projects/usb/src/lib/libusb20/libusb20.h#8 (text+ko) ====

@@ -297,6 +297,7 @@
 struct libusb20_backend *libusb20_be_alloc_default(void);
 struct libusb20_backend *libusb20_be_alloc_freebsd(void);
 struct libusb20_backend *libusb20_be_alloc_linux(void);
+struct libusb20_backend *libusb20_be_alloc_ugen20(void);
 struct libusb20_device *libusb20_be_device_foreach(struct libusb20_backend *pbe, struct libusb20_device *pdev);
 void	libusb20_be_dequeue_device(struct libusb20_backend *pbe, struct libusb20_device *pdev);
 void	libusb20_be_enqueue_device(struct libusb20_backend *pbe, struct libusb20_device *pdev);

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

@@ -410,7 +410,7 @@
 
 static int
 ugen20_get_config_desc_full(struct libusb20_device *pdev,
-    uint8_t **ppbuf, uint16_t *plen, uint8_t index)
+    uint8_t **ppbuf, uint16_t *plen, uint8_t cfg_index)
 {
 	struct usb2_gen_descriptor gen_desc = { /* zero */ };
 	struct usb2_config_descriptor cdesc;
@@ -420,7 +420,7 @@
 
 	gen_desc.ugd_data = &cdesc;
 	gen_desc.ugd_maxlen = sizeof(cdesc);
-	gen_desc.ugd_config_index = index;
+	gen_desc.ugd_config_index = cfg_index;
 
 	error = ioctl(pdev->file_ctrl, USB_GET_FULL_DESC, &gen_desc);
 	if (error) {
@@ -466,9 +466,9 @@
 }
 
 static int
-ugen20_set_config_index(struct libusb20_device *pdev, uint8_t index)
+ugen20_set_config_index(struct libusb20_device *pdev, uint8_t cfg_index)
 {
-	int temp = index;
+	int temp = cfg_index;
 
 	if (ioctl(pdev->file_ctrl, USB_SET_CONFIG, &temp)) {
 		return (LIBUSB20_ERROR_OTHER);
@@ -795,21 +795,21 @@
 ugen20_be_ioctl(uint32_t cmd, void *data)
 {
 	int f;
-	int err;
+	int error;
 
 	f = open("/dev/usb", O_RDONLY);
 	if (f < 0)
 		return (LIBUSB20_ERROR_OTHER);
-	err = ioctl(f, cmd, data);
-	if (err == -1) {
+	error = ioctl(f, cmd, data);
+	if (error == -1) {
 		if (errno == EPERM) {
-			err = LIBUSB20_ERROR_ACCESS;
+			error = LIBUSB20_ERROR_ACCESS;
 		} else {
-			err = LIBUSB20_ERROR_OTHER;
+			error = LIBUSB20_ERROR_OTHER;
 		}
 	}
 	close(f);
-	return (err);
+	return (error);
 }
 
 static int
@@ -818,15 +818,15 @@
     gid_t *gid, mode_t *mode)
 {
 	struct usb2_dev_perm perm = { /* zero */ };
-	int err;
+	int error;
 
 	perm.bus_index = bus;
 	perm.dev_index = dev;
 	perm.iface_index = iface;
 
-	err = ugen20_be_ioctl(get_cmd, &perm);
-	if (err)
-		return (err);
+	error = ugen20_be_ioctl(get_cmd, &perm);
+	if (error)
+		return (error);
 
 	if (set_cmd == 0) {
 		if (uid)
@@ -934,18 +934,18 @@
 
 static int
 ugen20_root_get_dev_quirk(struct libusb20_backend *pbe,
-    uint16_t index, struct libusb20_quirk *pq)
+    uint16_t quirk_index, struct libusb20_quirk *pq)
 {
 	struct usb2_gen_quirk q;
-	int err;
+	int error;
 
 	memset(&q, 0, sizeof(q));
 
-	q.index = index;
+	q.index = quirk_index;
 
-	err = ugen20_be_ioctl(USB_DEV_QUIRK_GET, &q);
+	error = ugen20_be_ioctl(USB_DEV_QUIRK_GET, &q);
 
-	if (err) {
+	if (error) {
 		if (errno == EINVAL) {
 			return (LIBUSB20_ERROR_NOT_FOUND);
 		}
@@ -956,30 +956,30 @@
 		pq->bcdDeviceHigh = q.bcdDeviceHigh;
 		strlcpy(pq->quirkname, q.quirkname, sizeof(pq->quirkname));
 	}
-	return (err);
+	return (error);
 }
 
 static int
-ugen20_root_get_quirk_name(struct libusb20_backend *pbe, uint16_t index,
+ugen20_root_get_quirk_name(struct libusb20_backend *pbe, uint16_t quirk_index,
     struct libusb20_quirk *pq)
 {
 	struct usb2_gen_quirk q;
-	int err;
+	int error;
 
 	memset(&q, 0, sizeof(q));
 
-	q.index = index;
+	q.index = quirk_index;
 
-	err = ugen20_be_ioctl(USB_QUIRK_NAME_GET, &q);
+	error = ugen20_be_ioctl(USB_QUIRK_NAME_GET, &q);
 
-	if (err) {
+	if (error) {
 		if (errno == EINVAL) {
 			return (LIBUSB20_ERROR_NOT_FOUND);
 		}
 	} else {
 		strlcpy(pq->quirkname, q.quirkname, sizeof(pq->quirkname));
 	}
-	return (err);
+	return (error);
 }
 
 static int
@@ -987,7 +987,7 @@
     struct libusb20_quirk *pq)
 {
 	struct usb2_gen_quirk q;
-	int err;
+	int error;
 
 	memset(&q, 0, sizeof(q));
 
@@ -997,13 +997,13 @@
 	q.bcdDeviceHigh = pq->bcdDeviceHigh;
 	strlcpy(q.quirkname, pq->quirkname, sizeof(q.quirkname));
 
-	err = ugen20_be_ioctl(USB_DEV_QUIRK_ADD, &q);
-	if (err) {
+	error = ugen20_be_ioctl(USB_DEV_QUIRK_ADD, &q);
+	if (error) {
 		if (errno == ENOMEM) {
 			return (LIBUSB20_ERROR_NO_MEM);
 		}
 	}
-	return (err);
+	return (error);
 }
 
 static int
@@ -1011,7 +1011,7 @@
     struct libusb20_quirk *pq)
 {
 	struct usb2_gen_quirk q;
-	int err;
+	int error;
 
 	memset(&q, 0, sizeof(q));
 
@@ -1021,13 +1021,13 @@
 	q.bcdDeviceHigh = pq->bcdDeviceHigh;
 	strlcpy(q.quirkname, pq->quirkname, sizeof(q.quirkname));
 
-	err = ugen20_be_ioctl(USB_DEV_QUIRK_REMOVE, &q);
-	if (err) {
+	error = ugen20_be_ioctl(USB_DEV_QUIRK_REMOVE, &q);
+	if (error) {
 		if (errno == EINVAL) {
 			return (LIBUSB20_ERROR_NOT_FOUND);
 		}
 	}
-	return (err);
+	return (error);
 }
 
 static int

==== //depot/projects/usb/src/usr.sbin/usbconfig/dump.c#8 (text+ko) ====

@@ -98,7 +98,7 @@
 {
 	struct LIBUSB20_CONTROL_SETUP_DECODED req;
 	uint16_t lang_id;
-	uint8_t index;
+	uint8_t idx;
 	uint8_t temp_string[256];
 
 	printf("%s%s = 0x%04x ", plevel, field, value);
@@ -114,14 +114,14 @@
 	LIBUSB20_INIT(LIBUSB20_CONTROL_SETUP, &req);
 
 	lang_id = 0;
-	index = 0;
+	idx = 0;
 
 	req.bmRequestType =
 	    LIBUSB20_REQUEST_TYPE_STANDARD |
 	    LIBUSB20_RECIPIENT_DEVICE |
 	    LIBUSB20_ENDPOINT_IN;
 	req.bRequest = LIBUSB20_REQUEST_GET_DESCRIPTOR;
-	req.wValue = (256 * LIBUSB20_DT_STRING) | index;
+	req.wValue = (256 * LIBUSB20_DT_STRING) | idx;
 	req.wIndex = lang_id;
 	req.wLength = 4;		/* bytes */
 
@@ -133,9 +133,9 @@
 
 	printf(" LangId:0x%04x <", lang_id);
 
-	index = value;
+	idx = value;
 
-	req.wValue = (256 * LIBUSB20_DT_STRING) | index;
+	req.wValue = (256 * LIBUSB20_DT_STRING) | idx;
 	req.wIndex = lang_id;
 	req.wLength = 4;		/* bytes */
 
@@ -144,7 +144,7 @@
 		printf("ERROR>\n");
 		goto done;
 	}
-	req.wValue = (256 * LIBUSB20_DT_STRING) | index;
+	req.wValue = (256 * LIBUSB20_DT_STRING) | idx;
 	req.wIndex = lang_id;
 	req.wLength = temp_string[0];	/* bytes */
 
@@ -155,11 +155,11 @@
 	}
 	req.wLength /= 2;
 
-	for (index = 1; index != req.wLength; index++) {
-		if (isprint(temp_string[(2 * index) + 0])) {
-			printf("%c", temp_string[(2 * index) + 0]);
-		} else if (isprint(temp_string[(2 * index) + 1])) {
-			printf("%c", temp_string[(2 * index) + 1]);
+	for (idx = 1; idx != req.wLength; idx++) {
+		if (isprint(temp_string[(2 * idx) + 0])) {
+			printf("%c", temp_string[(2 * idx) + 0]);
+		} else if (isprint(temp_string[(2 * idx) + 1])) {
+			printf("%c", temp_string[(2 * idx) + 1]);
 		} else {
 			printf("?");
 		}
@@ -244,7 +244,7 @@
 {
 	struct libusb20_quirk q;
 	uint16_t x;
-	int err;
+	int error;
 
 	memset(&q, 0, sizeof(q));
 
@@ -252,8 +252,8 @@
 
 	for (x = 0; x != 0xFFFF; x++) {
 
-		err = libusb20_be_get_quirk_name(pbe, x, &q);
-		if (err) {
+		error = libusb20_be_get_quirk_name(pbe, x, &q);
+		if (error) {
 			if (x == 0) {
 				printf("No quirk names - maybe the USB quirk "
 				    "module has not been loaded.\n");
@@ -272,7 +272,7 @@
 {
 	struct libusb20_quirk q;
 	uint16_t x;
-	int err;
+	int error;
 
 	memset(&q, 0, sizeof(q));
 
@@ -280,8 +280,8 @@
 
 	for (x = 0; x != 0xFFFF; x++) {
 
-		err = libusb20_be_get_dev_quirk(pbe, x, &q);
-		if (err) {
+		error = libusb20_be_get_dev_quirk(pbe, x, &q);
+		if (error) {
 			if (x == 0) {
 				printf("No device quirks - maybe the USB quirk "
 				    "module has not been loaded.\n");

==== //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.c#5 (text+ko) ====

@@ -144,7 +144,7 @@
     const char *str)
 {
 	struct libusb20_quirk q;
-	int err;
+	int error;
 
 	memset(&q, 0, sizeof(q));
 
@@ -154,8 +154,8 @@
 	q.bcdDeviceHigh = hirev;
 	strlcpy(q.quirkname, str, sizeof(q.quirkname));
 
-	err = libusb20_be_remove_dev_quirk(pbe, &q);
-	if (err) {
+	error = libusb20_be_remove_dev_quirk(pbe, &q);
+	if (error) {
 		printf("Removing quirk '%s' failed, continuing.\n", str);
 	}
 	return;
@@ -167,7 +167,7 @@
     const char *str)
 {
 	struct libusb20_quirk q;
-	int err;
+	int error;
 
 	memset(&q, 0, sizeof(q));
 
@@ -177,8 +177,8 @@
 	q.bcdDeviceHigh = hirev;
 	strlcpy(q.quirkname, str, sizeof(q.quirkname));
 
-	err = libusb20_be_add_dev_quirk(pbe, &q);
-	if (err) {
+	error = libusb20_be_add_dev_quirk(pbe, &q);
+	if (error) {
 		printf("Adding quirk '%s' failed, continuing.\n", str);
 	}
 	return;
From trasz at FreeBSD.org  Wed Nov  5 01:19:53 2008
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Wed Nov  5 01:20:01 2008
Subject: PERFORCE change 152511 for review
Message-ID: <200811050919.mA59JqMZ066236@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152511

Change 152511 by trasz@trasz_victim7 on 2008/11/05 09:18:55

	IFC.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/bin/cat/cat.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/bin/chio/chio.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/bin/cp/utils.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/contrib/smbfs/lib/smb/nb_name.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/Makefile#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/devd.conf#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/gss/mech#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/Makefile#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/gssd#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/netif#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/nfsd#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/include/rpc/xdr.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/include/strings.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write.3#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/amd64/SYS.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/amd64/gen/_setjmp.S#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/amd64/gen/fabs.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/amd64/gen/modf.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/amd64/gen/rfork_thread.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/amd64/gen/setjmp.S#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/amd64/gen/sigsetjmp.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/amd64/stdlib/div.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/amd64/stdlib/ldiv.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/amd64/stdlib/lldiv.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/amd64/string/bcmp.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/amd64/string/bcopy.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/amd64/string/bzero.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/amd64/string/memcmp.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/amd64/string/memset.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/amd64/string/strcat.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/amd64/string/strcmp.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/amd64/string/strcpy.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/amd64/sys/brk.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/amd64/sys/exect.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/amd64/sys/getcontext.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/amd64/sys/pipe.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/amd64/sys/ptrace.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/amd64/sys/reboot.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/amd64/sys/sbrk.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/amd64/sys/setlogin.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/amd64/sys/vfork.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/dirname.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/dirname.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/err.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/SYS.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/gen/_ctx_start.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/gen/_setjmp.S#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/gen/fabs.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/gen/modf.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/gen/rfork_thread.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/gen/setjmp.S#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/gen/sigsetjmp.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/stdlib/abs.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/stdlib/div.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/stdlib/labs.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/stdlib/ldiv.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/string/bcmp.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/string/bcopy.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/string/bzero.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/string/ffs.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/string/index.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/string/memchr.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/string/memcmp.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/string/memset.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/string/rindex.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/string/strcat.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/string/strchr.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/string/strcmp.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/string/strcpy.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/string/strlen.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/string/strncmp.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/string/strrchr.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/string/swab.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/string/wcschr.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/string/wcscmp.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/string/wcslen.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/string/wmemchr.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/sys/Ovfork.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/sys/brk.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/sys/exect.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/sys/getcontext.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/sys/pipe.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/sys/ptrace.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/sys/reboot.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/sys/sbrk.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/sys/setlogin.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/i386/sys/syscall.S#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_add_perm.3#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_calc_mask.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_calc_mask.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_clear_perms.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_copy.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_copy_entry.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_create_entry.3#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_delete_entry.3#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_delete_perm.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get_entry.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get_perm_np.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get_permset.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get_qualifier.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get_tag_type.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_perm.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_set_permset.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_set_qualifier.3#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_set_tag_type.3#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_size.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdlib/malloc.3#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdlib/malloc.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdtime/strftime.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/string/Makefile.inc#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/string/Symbol.map#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/string/ffs.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/string/ffsl.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/string/ffsll.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/string/flsll.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/Symbol.map#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/xdr/Symbol.map#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/xdr/xdr.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/librpcsec_gss/svc_rpcsec_gss.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb20/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb20/libusb20.3#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb20/libusb20.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb20/libusb20.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb20/libusb20_compat01.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb20/libusb20_compat01.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb20/libusb20_compat10.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb20/libusb20_compat10.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb20/libusb20_desc.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb20/libusb20_desc.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb20/libusb20_int.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb20/libusb20_ugen20.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libutil/Makefile#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libutil/login_cap.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libutil/login_class.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libutil/pty.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/libexec/rpc.rquotad/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/libexec/rpc.rquotad/rquotad.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount_nfs/mount_nfs.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/Makefile#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/atapicam.4#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/rl.4#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/u3g.4#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/usb2_bluetooth.4#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/usb2_controller.4#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/usb2_core.4#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/usb2_ethernet.4#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/usb2_image.4#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/usb2_input.4#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/usb2_misc.4#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/usb2_ndis.4#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/usb2_quirk.4#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/usb2_serial.4#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/usb2_sound.4#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/usb2_storage.4#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/usb2_template.4#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/usb2_wlan.4#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/zyd.4#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VOP_ACCESS.9#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/style.9#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/vfs_busy.9#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/misc/bsd-family-tree#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/misc/committers-doc.dot#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/dump_machdep.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/minidump_machdep.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91_mci.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/powerpc/boot1.chrp/boot1.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/powerpc/boot1.chrp/bootinfo.txt#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_proto.h#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_syscall.h#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_syscalls.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_sysent.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/syscalls.master#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linprocfs/linprocfs.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_emul.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/NOTES#17 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#20 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/kmod.mk#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpi_support/acpi_asus.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpica/Osd/OsdSchedule.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpica/acpi.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/adb/adb_bus.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/adb/adb_mouse.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/adb/adbvar.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/amr/amr.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/amr/amr_cam.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/amr/amrvar.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/if_ath.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cardbus/cardbus_cis.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cardbus/cardbusreg.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_mod.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mmc/mmc.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mmc/mmcbrvar.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mmc/mmcsd.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mmc/mmcvar.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mn/if_mn.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pci/pcireg.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sdhci/sdhci.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/hda/hdac.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pcm/channel.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pcm/channel.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pcm/mixer.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pcm/mixer.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/u3g.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_subr.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usbdevs#12 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usbdi.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/bluetooth/TODO.TXT#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/bluetooth/ng_ubt2.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/bluetooth/ng_ubt2_var.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/bluetooth/ubtbcmfw2.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/bluetooth/usb2_bluetooth.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/bluetooth/usb2_bluetooth.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/at91dci.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/at91dci.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/at91dci_atmelarm.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/ehci2.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/ehci2.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/ehci2_pci.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/musb2_otg.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/musb2_otg.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/musb2_otg_atmelarm.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/ohci2.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/ohci2.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/ohci2_atmelarm.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/ohci2_pci.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/uhci2.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/uhci2.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/uhci2_pci.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/usb2_bus.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/usb2_controller.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/usb2_controller.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/usb2_pci.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/uss820dci.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/uss820dci.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/uss820dci_atmelarm.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/uss820dci_pccard.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/README.TXT#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_busdma.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_busdma.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_compat_linux.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_compat_linux.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_config_td.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_config_td.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_core.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_core.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_debug.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_debug.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_dev.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_dev.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_device.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_device.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_dynamic.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_dynamic.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_error.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_generic.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_generic.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_handle_request.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_handle_request.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_hid.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_hid.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_hub.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_hub.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_if.m#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_lookup.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_lookup.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_mbuf.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_mbuf.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_msctest.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_msctest.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_parse.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_parse.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_process.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_process.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_request.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_request.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_sw_transfer.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_sw_transfer.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_transfer.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_transfer.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_util.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_util.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usbdevs#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_aue2.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_aue2_reg.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_axe2.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_axe2_reg.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_cdce2.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_cdce2_reg.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_cue2.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_cue2_reg.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_kue2.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_kue2_fw.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_kue2_reg.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_rue2.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_rue2_reg.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_udav2.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_udav2_reg.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/usb2_ethernet.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/usb2_ethernet.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/image/usb2_image.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/image/usb2_image.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/image/uscanner2.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/ufm2_ioctl.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/urio2_ioctl.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/usb2_cdc.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/usb2_defs.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/usb2_devid.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/usb2_devtable.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/usb2_endian.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/usb2_error.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/usb2_hid.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/usb2_ioctl.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/usb2_mfunc.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/usb2_revision.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/usb2_standard.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/input/uhid2.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/input/ukbd2.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/input/ums2.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/input/usb2_input.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/input/usb2_input.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/input/usb2_rdesc.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/misc/udbp2.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/misc/udbp2.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/misc/ufm2.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/misc/usb2_misc.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/misc/usb2_misc.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ndis/if_ndis_usb2.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ndis/usb2_ndis.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ndis/usb2_ndis.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/quirk/usb2_quirk.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/quirk/usb2_quirk.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/uark2.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/ubsa2.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/ubser2.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/uchcom2.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/ucycom2.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/ufoma2.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/uftdi2.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/uftdi2_reg.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/ugensa2.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/uipaq2.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/ulpt2.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/umct2.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/umodem2.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/umoscom2.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/uplcom2.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/usb2_serial.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/usb2_serial.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/uvisor2.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/uvscom2.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/sound/uaudio2.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/sound/uaudio2.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/sound/uaudio2_pcm.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/sound/uaudio2_reg.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/sound/usb2_sound.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/sound/usb2_sound.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/storage/ata-usb2.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/storage/umass2.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/storage/urio2.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/storage/usb2_storage.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/storage/usb2_storage.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/storage/ustorage2_fs.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/template/usb2_template.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/template/usb2_template.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/template/usb2_template_cdce.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/template/usb2_template_msc.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/template/usb2_template_mtp.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_rum2.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_rum2_fw.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_rum2_reg.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_rum2_var.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_ural2.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_ural2_reg.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_ural2_var.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_zyd2.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_zyd2_fw.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/if_zyd2_reg.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/usb2_wlan.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/wlan/usb2_wlan.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/coda/cnode.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/coda/coda_subr.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/coda/coda_venus.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/ntfs/ntfs_vnops.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/procfs/procfs.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/procfs/procfs_map.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/smbfs/smbfs_vfsops.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/unionfs/union_vfsops.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/geom_disk.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/journal/g_journal.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part_apm.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/gnu/fs/ext2fs/ext2_vfsops.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/conf/XEN#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/bios.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/dump_machdep.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/minidump_machdep.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/isa/isa_common.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/isa/isa_common.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/isa/isavar.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/isa/pnp.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/init_sysent.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_cons.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_descrip.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_proc.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_sig.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_thr.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_thread.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/sched_ule.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_sleepqueue.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_smp.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_stack.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/sys_process.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/syscalls.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/syscalls.master#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/systrace_args.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty_cons.c#4 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty_pts.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_export.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_lookup.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_mount.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#19 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_syscalls.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_vnops.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kgssapi/gss_accept_sec_context.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kgssapi/gss_acquire_cred.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kgssapi/gss_add_oid_set_member.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kgssapi/gss_canonicalize_name.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kgssapi/gss_create_empty_oid_set.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kgssapi/gss_delete_sec_context.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kgssapi/gss_display_status.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kgssapi/gss_export_name.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kgssapi/gss_get_mic.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kgssapi/gss_impl.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kgssapi/gss_import_name.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kgssapi/gss_init_sec_context.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kgssapi/gss_names.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kgssapi/gss_pname_to_uid.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kgssapi/gss_release_buffer.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kgssapi/gss_release_cred.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kgssapi/gss_release_name.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kgssapi/gss_release_oid_set.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kgssapi/gss_set_cred_option.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kgssapi/gss_test_oid_set_member.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kgssapi/gss_unwrap.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kgssapi/gss_verify_mic.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kgssapi/gss_wrap.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kgssapi/gss_wrap_size_limit.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kgssapi/gssapi.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kgssapi/gssapi_impl.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kgssapi/gssd.x#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kgssapi/gssd_prot.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kgssapi/gsstest.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kgssapi/kgss_if.m#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kgssapi/krb5/kcrypto.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kgssapi/krb5/kcrypto.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kgssapi/krb5/kcrypto_aes.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kgssapi/krb5/kcrypto_arcfour.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kgssapi/krb5/kcrypto_des.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kgssapi/krb5/kcrypto_des3.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kgssapi/krb5/krb5_mech.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/idt/if_kr.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/Makefile#13 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/amr/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/amr/amr_cam/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/kgssapi/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/kgssapi_krb5/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/nfsclient/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/nfsserver/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/rl/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/bluetooth/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/bluetooth_fw/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/bluetooth_ng/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/controller/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/controller_at91dci/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/controller_ehci/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/controller_musb/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/controller_ohci/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/controller_uhci/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/controller_uss820dci/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/core/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/ethernet/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/ethernet_aue/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/ethernet_axe/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/ethernet_cdce/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/ethernet_cue/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/ethernet_dav/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/ethernet_kue/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/ethernet_rue/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/image/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/input/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/input_hid/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/input_kbd/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/input_ms/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/misc/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/misc_dbp/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/misc_fm/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/ndis/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/quirk/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/scanner/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/serial/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/serial_ark/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/serial_bsa/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/serial_bser/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/serial_chcom/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/serial_cycom/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/serial_foma/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/serial_ftdi/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/serial_gensa/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/serial_ipaq/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/serial_lpt/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/serial_mct/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/serial_modem/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/serial_moscom/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/serial_plcom/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/serial_visor/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/serial_vscom/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/sound/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/storage/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/storage_ata/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/storage_fs/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/storage_mass/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/storage_rio/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/template/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/wlan/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/wlan_ral/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/wlan_rum/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/wlan_zyd/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_adhoc.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_hostap.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_sta.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_wds.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netsmb/smb_conn.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netsmb/smb_conn.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netsmb/smb_dev.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_krpc.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_nfsiod.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_socket.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_subs.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_vfsops.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfsmount.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs_fha.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs_fha.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs_serv.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs_srvcache.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs_srvkrpc.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs_srvsock.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs_srvsubs.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs_syscalls.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfsm_subs.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfsrvcache.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nlm/nlm.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nlm/nlm_advlock.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nlm/nlm_prot_impl.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nlm/nlm_prot_svc.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/opencrypto/cryptosoft.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/pci/if_mn.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/pci/if_rl.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/pci/if_rlreg.h#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/include/cpufunc.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/include/endian.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/cuda.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/pmu.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/auth.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/auth_none.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/auth_unix.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/clnt.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/clnt_dg.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/clnt_rc.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/clnt_vc.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/replay.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/replay.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/rpc_com.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/rpc_generic.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/rpc_msg.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/rpc_prot.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/rpcsec_gss.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/rpcsec_gss/rpcsec_gss.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/rpcsec_gss/rpcsec_gss_conf.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/rpcsec_gss/rpcsec_gss_int.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/rpcsec_gss/rpcsec_gss_misc.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/rpcsec_gss/rpcsec_gss_prot.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/svc.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/svc.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/svc_auth.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/svc_auth.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/svc_auth_unix.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/svc_dg.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/svc_generic.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/svc_vc.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/rpc/xdr.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_arg.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_bsm_klib.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_pipe.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_bsdextended/mac_bsdextended.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_bsdextended/ugidfw_internal.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_bsdextended/ugidfw_vnode.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/mount.h#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/param.h#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/proc.h#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/syscall.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/syscall.mk#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/sysproto.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/tty.h#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/user.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/tools/vnode_if.awk#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_softdep.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_acl.c#13 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_dirhash.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_vfsops.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/uma.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/xdr/xdr_mbuf.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/kgssapi/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/kgssapi/gsstest.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/rpcsec_gss/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/rpcsec_gss/rpctest.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/ath/athstats/athstats.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/du/du.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/tar/test/main.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/vmstat/vmstat.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/Makefile#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/gssd/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/gssd/gssd.8#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/gssd/gssd.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mountd/exports.5#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mountd/mountd.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nfsd/nfsd.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pstat/pstat.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/rpc.yppasswdd/yppasswdd_main.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/usbconfig/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/usbconfig/dump.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/usbconfig/dump.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/usbconfig/usbconfig.8#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/usbconfig/usbconfig.c#1 branch

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/bin/cat/cat.c#2 (text+ko) ====

@@ -44,7 +44,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/cat/cat.c,v 1.32 2005/01/10 08:39:20 imp Exp $");
+__FBSDID("$FreeBSD: src/bin/cat/cat.c,v 1.33 2008/10/30 14:05:57 ivoras Exp $");
 
 #include <sys/param.h>
 #include <sys/stat.h>
@@ -77,6 +77,17 @@
 static int udom_open(const char *path, int flags);
 #endif
 
+/* Memory strategy threshold, in pages: if physmem is larger then this, use a 
+ * large buffer */
+#define PHYSPAGES_THRESHOLD (32*1024)
+
+/* Maximum buffer size in bytes - do not allow it to grow larger than this */
+#define BUFSIZE_MAX (2*1024*1024)
+
+/* Small (default) buffer size in bytes. It's inefficient for this to be
+ * smaller than MAXPHYS */
+#define BUFSIZE_SMALL (MAXPHYS)
+
 int
 main(int argc, char *argv[])
 {
@@ -247,9 +258,17 @@
 	if (buf == NULL) {
 		if (fstat(wfd, &sbuf))
 			err(1, "%s", filename);
-		bsize = MAX(sbuf.st_blksize, 1024);
+		if (S_ISREG(sbuf.st_mode)) {
+			/* If there's plenty of RAM, use a large copy buffer */
+			if (sysconf(_SC_PHYS_PAGES) > PHYSPAGES_THRESHOLD)
+				bsize = MIN(BUFSIZE_MAX, MAXPHYS*8);
+			else
+				bsize = BUFSIZE_SMALL;
+		} else
+			bsize = MAX(sbuf.st_blksize, 
+					(blksize_t)sysconf(_SC_PAGESIZE));
 		if ((buf = malloc(bsize)) == NULL)
-			err(1, "buffer");
+			err(1, "malloc() failure of IO buffer");
 	}
 	while ((nr = read(rfd, buf, bsize)) > 0)
 		for (off = 0; nr; nr -= nw, off += nw)

==== //depot/projects/soc2008/trasz_nfs4acl/bin/chio/chio.c#2 (text+ko) ====

@@ -43,7 +43,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/chio/chio.c,v 1.27 2005/01/10 08:39:20 imp Exp $");
+__FBSDID("$FreeBSD: src/bin/chio/chio.c,v 1.28 2008/10/30 19:51:02 joerg Exp $");
 
 #include <sys/param.h>
 #include <sys/chio.h> 
@@ -69,7 +69,7 @@
 
 static	void find_element(char *, uint16_t *, uint16_t *);
 static	struct changer_element_status *get_element_status
-	   (unsigned int, unsigned int);
+	   (unsigned int, unsigned int, int);
 
 static	int do_move(const char *, int, char **);
 static	int do_exchange(const char *, int, char **);
@@ -969,7 +969,8 @@
 	++argv; --argc;
 
 	/* Get the status */
-	ces = get_element_status((unsigned int)type, (unsigned int)element);
+	ces = get_element_status((unsigned int)type, (unsigned int)element,
+	    CHET_VT == type);
 
 	if (NULL == ces)
 		errx(1, "%s: null element status pointer", cname);
@@ -1004,7 +1005,7 @@
  * should free() it when done.
  */
 static struct changer_element_status *
-get_element_status(unsigned int type, unsigned int element)
+get_element_status(unsigned int type, unsigned int element, int use_voltags)
 {
 	struct changer_element_status_request cesr;
 	struct changer_element_status *ces;
@@ -1020,7 +1021,8 @@
 	cesr.cesr_element_type = (uint16_t)type;
 	cesr.cesr_element_base = (uint16_t)element;
 	cesr.cesr_element_count = 1;		/* Only this one element */
-	cesr.cesr_flags |= CESR_VOLTAGS;	/* Grab voltags as well */
+	if (use_voltags)
+		cesr.cesr_flags |= CESR_VOLTAGS; /* Grab voltags as well */
 	cesr.cesr_element_status = ces;
 
 	if (ioctl(changer_fd, CHIOGSTATUS, (char *)&cesr) == -1) {

==== //depot/projects/soc2008/trasz_nfs4acl/bin/cp/utils.c#7 (text+ko) ====

@@ -33,7 +33,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.56 2008/10/27 15:21:15 dds Exp $");
+__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.57 2008/10/30 14:05:57 ivoras Exp $");
 
 #include <sys/types.h>
 #include <sys/acl.h>
@@ -57,10 +57,22 @@
 
 #define	cp_pct(x, y)	((y == 0) ? 0 : (int)(100.0 * (x) / (y)))
 
+/* Memory strategy threshold, in pages: if physmem is larger then this, use a 
+ * large buffer */
+#define PHYSPAGES_THRESHOLD (32*1024)
+
+/* Maximum buffer size in bytes - do not allow it to grow larger than this */
+#define BUFSIZE_MAX (2*1024*1024)
+
+/* Small (default) buffer size in bytes. It's inefficient for this to be
+ * smaller than MAXPHYS */
+#define BUFSIZE_SMALL (MAXPHYS)
+
 int
 copy_file(const FTSENT *entp, int dne)
 {
-	static char buf[MAXBSIZE];
+	static char *buf = NULL;
+	static size_t bufsize;
 	struct stat *fs;
 	ssize_t wcount;
 	size_t wresid;
@@ -174,8 +186,23 @@
 		} else
 #endif
 		{
+			if (buf == NULL) {
+				/*
+				 * Note that buf and bufsize are static. If
+				 * malloc() fails, it will fail at the start
+				 * and not copy only some files. 
+				 */ 
+				if (sysconf(_SC_PHYS_PAGES) > 
+				    PHYSPAGES_THRESHOLD)
+					bufsize = MIN(BUFSIZE_MAX, MAXPHYS * 8);
+				else
+					bufsize = BUFSIZE_SMALL;
+				buf = malloc(bufsize);
+				if (buf == NULL)
+					err(1, "Not enough memory");
+			}
 			wtotal = 0;
-			while ((rcount = read(from_fd, buf, MAXBSIZE)) > 0) {
+			while ((rcount = read(from_fd, buf, bufsize)) > 0) {
 				for (bufp = buf, wresid = rcount; ;
 			    	bufp += wcount, wresid -= wcount) {
 					wcount = write(to_fd, bufp, wresid);

==== //depot/projects/soc2008/trasz_nfs4acl/contrib/smbfs/lib/smb/nb_name.c#2 (text+ko) ====

@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/contrib/smbfs/lib/smb/nb_name.c,v 1.2 2005/09/19 08:07:18 imura Exp $");
+__FBSDID("$FreeBSD: src/contrib/smbfs/lib/smb/nb_name.c,v 1.3 2008/11/02 19:48:15 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/endian.h>
@@ -169,7 +169,7 @@
 		memsetw(cp + 2, NB_NAMELEN - 1, NBENCODE(' '));
 		cp += NB_ENCNAMELEN;
 	} else {
-		for (i = 0; *name && i < NB_NAMELEN; i++, cp += 2, name++)
+		for (i = 0; *name && i < NB_NAMELEN - 1; i++, cp += 2, name++)
 			*(u_short*)cp = NBENCODE(toupper(*name));
 		i = NB_NAMELEN - i - 1;
 		if (i > 0) {

==== //depot/projects/soc2008/trasz_nfs4acl/etc/Makefile#6 (text+ko) ====

@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.11 (Berkeley) 5/21/91
-# $FreeBSD: src/etc/Makefile,v 1.372 2008/10/27 16:13:28 sam Exp $
+# $FreeBSD: src/etc/Makefile,v 1.373 2008/10/29 18:46:47 mp Exp $
 
 .include <bsd.own.mk>
 
@@ -154,7 +154,7 @@
 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
 		master.passwd nsmb.conf opieaccess ${DESTDIR}/etc;
 .if ${MK_TCSH} == "no"
-	sed -i "" -e 's;/bin/csh;;' ${DESTDIR}/etc/master.passwd
+	sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd
 .endif
 	pwd_mkdb ${PWD_MKDB_ENDIAN} -i -p -d ${DESTDIR}/etc \
 	    ${DESTDIR}/etc/master.passwd

==== //depot/projects/soc2008/trasz_nfs4acl/etc/devd.conf#5 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/devd.conf,v 1.43 2008/10/27 16:20:40 thompsa Exp $
+# $FreeBSD: src/etc/devd.conf,v 1.45 2008/11/04 23:03:36 delphij Exp $
 #
 # Refer to devd.conf(5) and devd(8) man pages for the details on how to
 # run and configure devd.
@@ -255,6 +255,28 @@
 	action "/etc/rc.resume acpi $notify";
 };
 
+# The next blocks enable volume hotkeys that can be found on the Asus laptops
+notify 0 {
+	match "system"		"ACPI";
+	match "subsystem"	"ASUS";
+	match "notify"		"0x32";
+	action			"mixer 0";
+};
+
+notify 0 {
+	match "system"		"ACPI";
+	match "subsystem"	"ASUS";
+	match "notify"		"0x31";
+	action			"mixer vol -10";
+};
+
+notify 0 {
+	match "system"		"ACPI";
+	match "subsystem"	"ASUS";
+	match "notify"		"0x30";
+	action			"mixer vol +10";
+};
+
 # The next blocks enable volume hotkeys that can be found on the Asus EeePC
 # The four keys above the keyboard notify 0x1a through to 0x1d respectively
 notify 0 {

==== //depot/projects/soc2008/trasz_nfs4acl/etc/gss/mech#2 (text+ko) ====

@@ -1,6 +1,6 @@
-# $FreeBSD: src/etc/gss/mech,v 1.3 2008/05/07 13:53:02 dfr Exp $
+# $FreeBSD: src/etc/gss/mech,v 1.4 2008/11/03 10:38:00 dfr Exp $
 #
 # Name		OID			Library name			Kernel module
-kerberosv5	1.2.840.113554.1.2.2	/usr/lib/libgssapi_krb5.so.10	-
+kerberosv5	1.2.840.113554.1.2.2	/usr/lib/libgssapi_krb5.so.10	kgssapi_krb5
 spnego		1.3.6.1.5.5.2		/usr/lib/libgssapi_spnego.so.10	-
 #ntlm		1.3.6.1.4.1.311.2.2.10	/usr/lib/libgssapi_ntlm.so.10	-

==== //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/Makefile#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/rc.d/Makefile,v 1.94 2008/08/25 16:28:54 des Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.95 2008/11/03 10:38:00 dfr Exp $
 
 .include <bsd.own.mk>
 
@@ -11,7 +11,7 @@
 	dmesg dumpon \
 	early.sh encswap \
 	fsck ftp-proxy ftpd \
-	gbde geli geli2 \
+	gbde geli geli2 gssd \
 	hcsecd \
 	hostapd hostid hostname \
 	idmapd inetd initrandom \

==== //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/netif#4 (text+ko) ====

@@ -22,7 +22,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/rc.d/netif,v 1.29 2008/06/23 20:50:11 mtm Exp $
+# $FreeBSD: src/etc/rc.d/netif,v 1.30 2008/10/30 20:24:25 pjd Exp $
 #
 
 # PROVIDE: netif
@@ -141,7 +141,9 @@
 		esac
 		echo "${_str} Network:${_ok}."
 		if [ -z "${rc_quiet}" ]; then
-			/sbin/ifconfig ${_ok}
+			for ifn in ${_ok}; do
+				/sbin/ifconfig ${ifn}
+			done
 		fi
 	fi
 

==== //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/nfsd#3 (text+ko) ====

@@ -1,10 +1,10 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/nfsd,v 1.15 2008/07/16 19:50:29 dougb Exp $
+# $FreeBSD: src/etc/rc.d/nfsd,v 1.16 2008/11/03 10:38:00 dfr Exp $
 #
 
 # PROVIDE: nfsd
-# REQUIRE: mountd
+# REQUIRE: mountd hostname gssd
 # KEYWORD: nojail shutdown
 
 . /etc/rc.subr

==== //depot/projects/soc2008/trasz_nfs4acl/include/rpc/xdr.h#2 (text+ko) ====

@@ -30,7 +30,7 @@
  *
  *	from: @(#)xdr.h 1.19 87/04/22 SMI
  *	from: @(#)xdr.h	2.2 88/07/29 4.0 RPCSRC
- * $FreeBSD: src/include/rpc/xdr.h,v 1.23 2003/03/07 13:19:40 nectar Exp $
+ * $FreeBSD: src/include/rpc/xdr.h,v 1.24 2008/11/03 10:38:00 dfr Exp $
  */
 
 /*
@@ -294,10 +294,13 @@
 extern bool_t	xdr_u_short(XDR *, u_short *);
 extern bool_t	xdr_int16_t(XDR *, int16_t *);
 extern bool_t	xdr_u_int16_t(XDR *, u_int16_t *);
+extern bool_t	xdr_uint16_t(XDR *, u_int16_t *);
 extern bool_t	xdr_int32_t(XDR *, int32_t *);
 extern bool_t	xdr_u_int32_t(XDR *, u_int32_t *);
+extern bool_t	xdr_uint32_t(XDR *, u_int32_t *);
 extern bool_t	xdr_int64_t(XDR *, int64_t *);
 extern bool_t	xdr_u_int64_t(XDR *, u_int64_t *);
+extern bool_t	xdr_uint64_t(XDR *, u_int64_t *);
 extern bool_t	xdr_bool(XDR *, bool_t *);
 extern bool_t	xdr_enum(XDR *, enum_t *);
 extern bool_t	xdr_array(XDR *, char **, u_int *, u_int, u_int, xdrproc_t);

==== //depot/projects/soc2008/trasz_nfs4acl/include/strings.h#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/include/strings.h,v 1.6 2004/07/23 07:13:35 tjr Exp $
+ * $FreeBSD: src/include/strings.h,v 1.7 2008/11/03 10:22:19 kib Exp $
  */
 
 #ifndef _STRINGS_H_
@@ -44,8 +44,10 @@
 int	 ffs(int) __pure2;
 #ifdef __BSD_VISIBLE
 int	 ffsl(long) __pure2;
+int	 ffsll(long long) __pure2;
 int	 fls(int) __pure2;
 int	 flsl(long) __pure2;

>>> TRUNCATED FOR MAIL (1000 lines) <<<
From peter at FreeBSD.org  Wed Nov  5 01:34:08 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Wed Nov  5 01:34:19 2008
Subject: PERFORCE change 152512 for review
Message-ID: <200811050934.mA59Y7jx067418@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152512

Change 152512 by peter@peter_overcee on 2008/11/05 09:33:31

	Make gettid() work.  (loosely from phk)

Affected files ...

.. //depot/projects/valgrind/coregrind/m_libcproc.c#6 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_libcproc.c#6 (text+ko) ====

@@ -368,15 +368,8 @@
    pids, etc
    ------------------------------------------------------------------ */
 
-#ifdef VGO_freebsd
 Int VG_(gettid)(void)
 {
-   // VG_(printf)("valgrind: gettid() faked\n");
-   return VG_(do_syscall0)(__NR_getpid).res;
-}
-#else
-Int VG_(gettid)(void)
-{
 #  if defined(VGO_aix5)
    SysRes res;
    Int    r;
@@ -385,6 +378,15 @@
    r = res.res;
    return r;
 
+#  elif defined(VGO_freebsd)
+   SysRes res;
+   long tid;
+
+   res = VG_(do_syscall1)(__NR_thr_self, (UWord)&tid);
+   if (res.isError)
+      tid = VG_(do_syscall0)(__NR_getpid).res;
+   return tid;
+
 #  else
    SysRes res = VG_(do_syscall0)(__NR_gettid);
 
@@ -415,7 +417,6 @@
    return res.res;
 #  endif
 }
-#endif
 
 /* You'd be amazed how many places need to know the current pid. */
 Int VG_(getpid) ( void )
From peter at FreeBSD.org  Wed Nov  5 01:34:09 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Wed Nov  5 01:34:19 2008
Subject: PERFORCE change 152513 for review
Message-ID: <200811050934.mA59Y7mU067423@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152513

Change 152513 by peter@peter_overcee on 2008/11/05 09:33:58

	Add thr_exit() delcaration

Affected files ...

.. //depot/projects/valgrind/coregrind/m_syswrap/priv_syswrap-freebsd.h#14 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_syswrap/priv_syswrap-freebsd.h#14 (text+ko) ====

@@ -204,6 +204,7 @@
 DECL_TEMPLATE(freebsd, sys_statfs6);
 DECL_TEMPLATE(freebsd, sys_fstatfs6);
 DECL_TEMPLATE(freebsd, sys_fhstatfs6);
+DECL_TEMPLATE(freebsd, sys_thr_exit);
 DECL_TEMPLATE(freebsd, sys_thr_self);
 DECL_TEMPLATE(freebsd, sys_thr_set_name);
 DECL_TEMPLATE(freebsd, sys_rtprio_thread);
From peter at FreeBSD.org  Wed Nov  5 01:45:20 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Wed Nov  5 01:45:26 2008
Subject: PERFORCE change 152515 for review
Message-ID: <200811050945.mA59jJJB068359@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152515

Change 152515 by peter@peter_overcee on 2008/11/05 09:44:49

	Make libthr threads work.  Exiting/shutdown leaves a bit to be desired.
	Sometimes everything exits without doing the final error report.  I think
	this is what happens if the last thread calls thr_exit() after the main
	thread has already called exit().

Affected files ...

.. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-amd64-freebsd.c#8 edit
.. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#25 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-amd64-freebsd.c#8 (text+ko) ====

@@ -149,6 +149,7 @@
    SysRes       res;
    vki_sigset_t blockall, savedmask;
    struct vki_thr_param tp;
+   Addr stk;
 
    PRINT("thr_new ( %#lx, %ld )",ARG1,ARG2);
    PRE_REG_READ2(int, "thr_new",
@@ -218,9 +219,22 @@
    /* start the thread with everything blocked */
    VG_(sigprocmask)(VKI_SIG_SETMASK, &blockall, &savedmask);
 
+   /* Set the client state for scheduler to run libthr's trampoline */
+   ctst->arch.vex.guest_RDI = (Addr)tp.arg;
+   ctst->arch.vex.guest_RSP = (Addr)tp.stack_base + tp.stack_size - 8;
+   ctst->arch.vex.guest_RIP = (Addr)tp.start_func;
 
+   /* But this is for thr_new() to run valgrind's trampoline */
+   tp.start_func = (void *)ML_(start_thread_NORETURN);
+   tp.arg = &VG_(threads)[ctid];
+
+   /* And valgrind's trampoline on its own stack */
+   stk = ML_(allocstack)(ctid);
+   tp.stack_base = (void *)ctst->os_state.valgrind_stack_base;
+   tp.stack_size = (Addr)stk - (Addr)tp.stack_base;
+
    /* Create the new thread */
-   res = VG_(do_syscall2)(__NR_thr_new, ARG1, ARG2);
+   res = VG_(do_syscall2)(__NR_thr_new, (UWord)&tp, sizeof(tp));
 
    VG_(sigprocmask)(VKI_SIG_SETMASK, &savedmask, NULL);
 
@@ -237,8 +251,11 @@
 
       /* Thread creation was successful; let the child have the chance
          to run */
-      /* *flags |= SfYieldAfter; */
+      *flags |= SfYieldAfter;
    }
+
+   /* "Complete" the syscall so that the wrapper doesn't call the kernel again. */
+   SET_STATUS_from_SysRes(res);
 }
 
 PRE(sys_sigreturn)

==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#25 (text+ko) ====

@@ -1761,6 +1761,19 @@
    POST_MEM_WRITE( ARG1, sizeof(long));
 }
 
+PRE(sys_thr_exit)
+{
+   ThreadState *tst;
+
+   tst = VG_(get_ThreadState)(tid);
+   tst->exitreason = VgSrc_ExitThread;
+
+   VG_(exit_thread)(tid);
+   PRINT( "sys_thr_exit ( %#lx )", ARG1 );
+   PRE_REG_READ1(long, "thr_exit", long *, "status");
+// PRE_MEM_WRITE( "thr_exit()", ARG1, sizeof(long));
+}
+
 PRE(sys_thr_set_name)
 {
    PRINT( "sys_thr_set_name ( %ld, %#lx )", ARG1, ARG2 );
@@ -3450,7 +3463,7 @@
    BSDX_(__NR___acl_aclcheck_link,	sys___acl_aclcheck_link),	// 428
    //!sigwait								   429
    // thr_create							   430
-   // thr_exit								   431
+   BSDX_(__NR_thr_exit,			sys_thr_exit),			// 431
 
    BSDXY(__NR_thr_self, 		sys_thr_self),			// 432
    // thr_kill								   433
From peter at FreeBSD.org  Wed Nov  5 01:48:23 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Wed Nov  5 01:48:30 2008
Subject: PERFORCE change 152516 for review
Message-ID: <200811050948.mA59mMFZ068557@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152516

Change 152516 by peter@peter_overcee on 2008/11/05 09:47:31

	Stub out thr_new for i386 for the moment.  This MIGHT make i386 compile
	again temporarily. I'll finish it tomorrow.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-x86-freebsd.c#10 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-x86-freebsd.c#10 (text+ko) ====

@@ -256,6 +256,13 @@
 #define PRE(name)       DEFN_PRE_TEMPLATE(freebsd, name)
 #define POST(name)      DEFN_POST_TEMPLATE(freebsd, name)
 
+
+PRE(sys_thr_new)
+{
+   PRINT("thr_new ( %#lx, %ld )",ARG1,ARG2);
+   SET_STATUS_Failure( VKI_EINVAL );
+}
+
 PRE(sys_sigreturn)
 {
    /* See comments on PRE(sys_rt_sigreturn) in syswrap-amd64-linux.c for
From peter at wemm.org  Wed Nov  5 02:22:21 2008
From: peter at wemm.org (Peter Wemm)
Date: Wed Nov  5 02:22:27 2008
Subject: PERFORCE change 152515 for review
In-Reply-To: <200811050945.mA59jJJB068359@repoman.freebsd.org>
References: <200811050945.mA59jJJB068359@repoman.freebsd.org>
Message-ID: <e7db6d980811050153n2d9b0629u8818560f5c977eb8@mail.gmail.com>

On Wed, Nov 5, 2008 at 1:45 AM, Peter Wemm <peter@freebsd.org> wrote:
> http://perforce.freebsd.org/chv.cgi?CH=152515
>
> Change 152515 by peter@peter_overcee on 2008/11/05 09:44:49
>
>        Make libthr threads work.  Exiting/shutdown leaves a bit to be desired.
>        Sometimes everything exits without doing the final error report.  I think
>        this is what happens if the last thread calls thr_exit() after the main
>        thread has already called exit().

peter@overcee[ 1:52AM]~/fbp4/valgrind-1342> valgrind
--leak-check=full ~/pp -v -i 1000 -n 4
==80442== Memcheck, a memory error detector.
==80442== Copyright (C) 2002-2008, and GNU GPL'd, by Julian Seward et al.
==80442== Using LibVEX rev export, a library for dynamic binary translation.
==80442== Copyright (C) 2004-2008, and GNU GPL'd, by OpenWorks LLP.
==80442== Using valgrind-3.4.0.SVN, a dynamic binary instrumentation framework.
==80442== Copyright (C) 2000-2008, and GNU GPL'd, by Julian Seward et al.
==80442== For more details, rerun with: -v
==80442==

PING-PONG CONFIGURATION:

target (-i) = 1000
ntables (-n) = 4
sleepms (-z) = 0
pthread_scope (-s) = process
pthread_process (-p) = private
concurrency (-c) = 0
stacksize (-S) = 0

8 threads initialised in 44ms
4 games completed in 149ms
==80442==
==80442== ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
==80442== malloc/free: in use at exit: 10,020 bytes in 41 blocks.
==80442== malloc/free: 44 allocs, 3 frees, 10,212 bytes allocated.
==80442== For counts of detected errors, rerun with: -v
==80442== searching for pointers to 41 not-freed blocks.
==80442== checked 17,202,640 bytes.
==80442==
==80442== LEAK SUMMARY:
==80442==    definitely lost: 0 bytes in 0 blocks.
==80442==      possibly lost: 0 bytes in 0 blocks.
==80442==    still reachable: 5,924 bytes in 40 blocks.
==80442==         suppressed: 4,096 bytes in 1 blocks.
==80442== Reachable blocks (those to which a pointer was found) are not shown.
==80442== To see them, rerun with: --leak-check=full --show-reachable=yes

-- 
Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com; KI6FJV
"All of this is for nothing if we don't go to the stars" - JMS/B5
"If Java had true garbage collection, most programs would delete
themselves upon execution." -- Robert Sewell
From ed at FreeBSD.org  Wed Nov  5 07:23:05 2008
From: ed at FreeBSD.org (Ed Schouten)
Date: Wed Nov  5 07:23:12 2008
Subject: PERFORCE change 152533 for review
Message-ID: <200811051523.mA5FN4df012681@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152533

Change 152533 by ed@ed_dull on 2008/11/05 15:22:56

	IFC snp(4) changes.

Affected files ...

.. //depot/projects/mpsafetty/etc/defaults/rc.conf#9 integrate
.. //depot/projects/mpsafetty/etc/devd.conf#3 integrate
.. //depot/projects/mpsafetty/lib/libutil/Makefile#2 integrate
.. //depot/projects/mpsafetty/lib/libutil/login_cap.c#2 integrate
.. //depot/projects/mpsafetty/lib/libutil/login_class.c#6 integrate
.. //depot/projects/mpsafetty/lib/libutil/pty.c#5 integrate
.. //depot/projects/mpsafetty/lib/libutil/realhostname.c#3 integrate
.. //depot/projects/mpsafetty/libexec/rpc.rquotad/Makefile#2 integrate
.. //depot/projects/mpsafetty/libexec/rpc.rquotad/rquotad.c#2 integrate
.. //depot/projects/mpsafetty/sbin/bsdlabel/bsdlabel.8#2 integrate
.. //depot/projects/mpsafetty/share/misc/committers-doc.dot#2 integrate
.. //depot/projects/mpsafetty/sys/compat/linprocfs/linprocfs.c#8 integrate
.. //depot/projects/mpsafetty/sys/conf/NOTES#17 integrate
.. //depot/projects/mpsafetty/sys/dev/acpi_support/acpi_asus.c#4 integrate
.. //depot/projects/mpsafetty/sys/dev/hwpmc/hwpmc_mod.c#5 integrate
.. //depot/projects/mpsafetty/sys/dev/snp/snp.c#15 integrate
.. //depot/projects/mpsafetty/sys/dev/usb2/wlan/if_zyd2.c#2 integrate
.. //depot/projects/mpsafetty/sys/fs/procfs/procfs.c#2 integrate
.. //depot/projects/mpsafetty/sys/fs/procfs/procfs_map.c#3 integrate
.. //depot/projects/mpsafetty/sys/fs/unionfs/union_vfsops.c#4 integrate
.. //depot/projects/mpsafetty/sys/kern/kern_descrip.c#8 integrate
.. //depot/projects/mpsafetty/sys/kern/kern_proc.c#10 integrate
.. //depot/projects/mpsafetty/sys/kern/kern_sig.c#6 integrate
.. //depot/projects/mpsafetty/sys/kern/kern_thr.c#5 integrate
.. //depot/projects/mpsafetty/sys/kern/kern_thread.c#7 integrate
.. //depot/projects/mpsafetty/sys/kern/subr_sleepqueue.c#8 integrate
.. //depot/projects/mpsafetty/sys/kern/sys_process.c#4 integrate
.. //depot/projects/mpsafetty/sys/kern/vfs_syscalls.c#9 integrate
.. //depot/projects/mpsafetty/sys/modules/Makefile#16 integrate
.. //depot/projects/mpsafetty/sys/modules/snp/Makefile#3 integrate
.. //depot/projects/mpsafetty/sys/net/if_arcsubr.c#3 integrate
.. //depot/projects/mpsafetty/sys/net/if_gif.c#4 integrate
.. //depot/projects/mpsafetty/sys/net/if_spppsubr.c#5 integrate
.. //depot/projects/mpsafetty/sys/net/if_tun.c#6 integrate
.. //depot/projects/mpsafetty/sys/net/radix_mpath.c#2 integrate
.. //depot/projects/mpsafetty/sys/nfsserver/nfs_srvkrpc.c#2 integrate
.. //depot/projects/mpsafetty/sys/security/audit/audit_arg.c#5 integrate
.. //depot/projects/mpsafetty/sys/security/audit/audit_bsm_klib.c#7 integrate
.. //depot/projects/mpsafetty/sys/sys/proc.h#10 integrate
.. //depot/projects/mpsafetty/sys/ufs/ufs/ufs_acl.c#2 integrate
.. //depot/projects/mpsafetty/sys/ufs/ufs/ufs_dirhash.c#5 integrate
.. //depot/projects/mpsafetty/usr.bin/du/du.c#2 integrate
.. //depot/projects/mpsafetty/usr.bin/tar/test/main.c#3 integrate
.. //depot/projects/mpsafetty/usr.bin/vmstat/vmstat.c#3 integrate
.. //depot/projects/mpsafetty/usr.sbin/gssd/gssd.8#2 integrate

Differences ...

==== //depot/projects/mpsafetty/etc/defaults/rc.conf#9 (text+ko) ====

@@ -15,7 +15,7 @@
 # For a more detailed explanation of all the rc.conf variables, please
 # refer to the rc.conf(5) manual page.
 #
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.345 2008/09/16 20:18:25 thompsa Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.346 2008/11/05 10:20:33 keramida Exp $
 
 ##############################################################
 ###  Important initial Boot-time options  ####################
@@ -265,6 +265,9 @@
 kpasswdd_server_enable="NO"	# Run kpasswdd (or NO)
 kpasswdd_server="/usr/libexec/kpasswdd"	# path to kerberos 5 passwd daemon
 
+gssd_enable="NO"		# Run the gssd daemon (or NO).
+gssd_flags=""			# Flags for gssd.
+
 rwhod_enable="NO"		# Run the rwho daemon (or NO).
 rwhod_flags=""			# Flags for rwhod
 rarpd_enable="NO"		# Run rarpd (or NO).

==== //depot/projects/mpsafetty/etc/devd.conf#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/devd.conf,v 1.43 2008/10/27 16:20:40 thompsa Exp $
+# $FreeBSD: src/etc/devd.conf,v 1.45 2008/11/04 23:03:36 delphij Exp $
 #
 # Refer to devd.conf(5) and devd(8) man pages for the details on how to
 # run and configure devd.
@@ -255,6 +255,28 @@
 	action "/etc/rc.resume acpi $notify";
 };
 
+# The next blocks enable volume hotkeys that can be found on the Asus laptops
+notify 0 {
+	match "system"		"ACPI";
+	match "subsystem"	"ASUS";
+	match "notify"		"0x32";
+	action			"mixer 0";
+};
+
+notify 0 {
+	match "system"		"ACPI";
+	match "subsystem"	"ASUS";
+	match "notify"		"0x31";
+	action			"mixer vol -10";
+};
+
+notify 0 {
+	match "system"		"ACPI";
+	match "subsystem"	"ASUS";
+	match "notify"		"0x30";
+	action			"mixer vol +10";
+};
+
 # The next blocks enable volume hotkeys that can be found on the Asus EeePC
 # The four keys above the keyboard notify 0x1a through to 0x1d respectively
 notify 0 {

==== //depot/projects/mpsafetty/lib/libutil/Makefile#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$FreeBSD: src/lib/libutil/Makefile,v 1.68 2008/07/01 22:30:57 jhb Exp $
+#	$FreeBSD: src/lib/libutil/Makefile,v 1.71 2008/11/05 11:06:10 des Exp $
 
 SHLIBDIR?= /lib
 
@@ -8,13 +8,15 @@
 LIB=	util
 SHLIB_MAJOR= 7
 
-SRCS=	_secure_path.c auth.c gr_util.c expand_number.c flopen.c fparseln.c \
+SRCS=	_secure_path.c auth.c expand_number.c flopen.c fparseln.c \
 	hexdump.c humanize_number.c kld.c login.c login_auth.c login_cap.c \
 	login_class.c login_crypt.c login_ok.c login_times.c login_tty.c \
 	logout.c logwtmp.c pidfile.c property.c pty.c pw_util.c realhostname.c \
 	stub.c trimdomain.c uucplock.c
 INCS=	libutil.h login_cap.h
 
+#WARNS?=	6
+
 CFLAGS+= -DLIBC_SCCS
 
 .if ${MK_INET6_SUPPORT} != "no"

==== //depot/projects/mpsafetty/lib/libutil/login_cap.c#2 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libutil/login_cap.c,v 1.34 2007/06/14 06:42:49 yar Exp $");
+__FBSDID("$FreeBSD: src/lib/libutil/login_cap.c,v 1.35 2008/11/04 13:49:53 des Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
@@ -61,6 +61,8 @@
 static size_t internal_arraysz = 0;
 static const char ** internal_array = NULL;
 
+static char path_login_conf[] = _PATH_LOGIN_CONF;
+
 static char *
 allocstr(const char *str)
 {
@@ -215,15 +217,14 @@
 
 	if (dir && snprintf(userpath, MAXPATHLEN, "%s/%s", dir,
 			    _FILE_LOGIN_CONF) < MAXPATHLEN) {
-	    login_dbarray[i] = userpath;
 	    if (_secure_path(userpath, pwd->pw_uid, pwd->pw_gid) != -1)
-		i++;		/* only use 'secure' data */
+		login_dbarray[i++] = userpath;
 	}
 	/*
 	 * XXX: Why to add the system database if the class is `me'?
 	 */
-	if (_secure_path(_PATH_LOGIN_CONF, 0, 0) != -1)
-	    login_dbarray[i++] = _PATH_LOGIN_CONF;
+	if (_secure_path(path_login_conf, 0, 0) != -1)
+	    login_dbarray[i++] = path_login_conf;
 	login_dbarray[i] = NULL;
 
 	memset(lc, 0, sizeof(login_cap_t));

==== //depot/projects/mpsafetty/lib/libutil/login_class.c#6 (text+ko) ====

@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libutil/login_class.c,v 1.29 2008/10/20 16:51:43 des Exp $");
+__FBSDID("$FreeBSD: src/lib/libutil/login_class.c,v 1.30 2008/11/04 13:49:53 des Exp $");
 
 #include <sys/param.h>
 #include <sys/cpuset.h>
@@ -142,14 +142,13 @@
 	int	tildes = 0;
 	int	dollas = 0;
 	char	*p;
+	const char *q;
 
 	if (pwd != NULL) {
-	    /* Count the number of ~'s in var to substitute */
-	    for (p = (char *)var; (p = strchr(p, '~')) != NULL; p++)
-		++tildes;
-	    /* Count the number of $'s in var to substitute */
-	    for (p = (char *)var; (p = strchr(p, '$')) != NULL; p++)
-		++dollas;
+	    for (q = var; *q != '\0'; ++q) {
+		tildes += (*q == '~');
+		dollas += (*q == '$');
+	    }
 	}
 
 	np = malloc(strlen(var) + (dollas * nlen)

==== //depot/projects/mpsafetty/lib/libutil/pty.c#5 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libutil/pty.c,v 1.24 2008/10/28 06:00:13 ed Exp $");
+__FBSDID("$FreeBSD: src/lib/libutil/pty.c,v 1.25 2008/11/04 13:50:50 des Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
@@ -47,6 +47,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <termios.h>
+#include <unistd.h>
 
 int
 openpty(int *amaster, int *aslave, char *name, struct termios *termp,

==== //depot/projects/mpsafetty/lib/libutil/realhostname.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libutil/realhostname.c,v 1.19 2008/10/17 21:21:14 delphij Exp $");
+__FBSDID("$FreeBSD: src/lib/libutil/realhostname.c,v 1.20 2008/11/05 12:13:10 des Exp $");
 
 #include <sys/param.h>
 #include <sys/socket.h>
@@ -83,6 +83,18 @@
 	return result;
 }
 
+/*
+ * struct sockaddr has very lax alignment requirements, since all its
+ * members are char or equivalent.  This is a problem when trying to
+ * dereference a struct sockaddr_in6 * that was passed in as a struct
+ * sockaddr *.  Although we know (or trust) that the passed-in struct was
+ * properly aligned, the compiler doesn't, and (rightly) complains.  These
+ * macros perform the cast in a way that the compiler will accept.
+ */
+#define SOCKADDR_IN6(p) ((struct sockaddr_in6 *)(void *)(p))
+#define SOCKADDR_IN(p) ((struct sockaddr_in *)(void *)(p))
+#define SOCKINET(p) ((struct sockinet *)(void *)(p))
+
 int
 realhostname_sa(char *host, size_t hsize, struct sockaddr *addr, int addrlen)
 {
@@ -96,10 +108,10 @@
 	/* IPv4 mapped IPv6 addr consideraton, specified in rfc2373. */
 	if (addr->sa_family == AF_INET6 &&
 	    addrlen == sizeof(struct sockaddr_in6) &&
-	    IN6_IS_ADDR_V4MAPPED(&((struct sockaddr_in6 *)addr)->sin6_addr)) {
+	    IN6_IS_ADDR_V4MAPPED(&SOCKADDR_IN6(addr)->sin6_addr)) {
 		struct sockaddr_in6 *sin6;
 
-		sin6 = (struct sockaddr_in6 *)addr;
+		sin6 = SOCKADDR_IN6(addr);
 
 		memset(&lsin, 0, sizeof(lsin));
 		lsin.sin_len = sizeof(struct sockaddr_in);
@@ -142,15 +154,16 @@
 			}
 			if (sa->sa_len == addrlen &&
 			    sa->sa_family == addr->sa_family) {
-				((struct sockinet *)sa)->si_port = ((struct sockinet *)addr)->si_port;
+				SOCKINET(sa)->si_port = SOCKINET(addr)->si_port;
 #ifdef INET6
 				/*
 				 * XXX: sin6_socpe_id may not been
 				 * filled by DNS
 				 */
 				if (sa->sa_family == AF_INET6 &&
-				    ((struct sockaddr_in6 *)sa)->sin6_scope_id == 0)
-					((struct sockaddr_in6 *)sa)->sin6_scope_id = ((struct sockaddr_in6 *)addr)->sin6_scope_id;
+				    SOCKADDR_IN6(sa)->sin6_scope_id == 0)
+					SOCKADDR_IN6(sa)->sin6_scope_id =
+					    SOCKADDR_IN6(addr)->sin6_scope_id;
 #endif
 				if (!memcmp(sa, addr, sa->sa_len)) {
 					result = HOSTNAME_FOUND;

==== //depot/projects/mpsafetty/libexec/rpc.rquotad/Makefile#2 (text+ko) ====

@@ -1,9 +1,11 @@
-# $FreeBSD: src/libexec/rpc.rquotad/Makefile,v 1.6 2001/03/26 14:22:07 ru Exp $
+# $FreeBSD: src/libexec/rpc.rquotad/Makefile,v 1.7 2008/11/04 14:17:49 des Exp $
 
 PROG =	rpc.rquotad
 SRCS =	rquotad.c
 MAN  =	rpc.rquotad.8
 
+WARNS ?= 6
+
 DPADD=	${LIBRPCSVC}
 LDADD=	-lrpcsvc
 

==== //depot/projects/mpsafetty/libexec/rpc.rquotad/rquotad.c#2 (text+ko) ====

@@ -1,40 +1,36 @@
 /*
  * by Manuel Bouyer (bouyer@ensta.fr)
- * 
+ *
  * There is no copyright, you can use it as you want.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD: src/libexec/rpc.rquotad/rquotad.c,v 1.9 2005/02/14 17:42:57 stefanf Exp $";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/libexec/rpc.rquotad/rquotad.c,v 1.10 2008/11/04 14:17:49 des Exp $");
 
 #include <sys/param.h>
-#include <sys/types.h>
 #include <sys/mount.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
-#include <signal.h>
+
+#include <ufs/ufs/quota.h>
+#include <rpc/rpc.h>
+#include <rpcsvc/rquota.h>
+#include <arpa/inet.h>
+#include <netdb.h>
 
 #include <ctype.h>
 #include <errno.h>
 #include <fstab.h>
 #include <grp.h>
 #include <pwd.h>
+#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <syslog.h>
 #include <unistd.h>
 
-#include <syslog.h>
-
-#include <ufs/ufs/quota.h>
-#include <rpc/rpc.h>
-#include <rpcsvc/rquota.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-
 void rquota_service(struct svc_req *request, SVCXPRT *transp);
 void sendquota(struct svc_req *request, SVCXPRT *transp);
 void printerr_reply(SVCXPRT *transp);
@@ -56,15 +52,17 @@
 
 int from_inetd = 1;
 
-void 
+static void
 cleanup(int sig)
 {
+
+	(void) sig;
 	(void) rpcb_unset(RQUOTAPROG, RQUOTAVERS, NULL);
 	exit(0);
 }
 
 int
-main(int argc, char *argv[])
+main(void)
 {
 	SVCXPRT *transp;
 	int ok;
@@ -101,19 +99,22 @@
 		ok = svc_create(rquota_service,
 				RQUOTAPROG, RQUOTAVERS, "udp");
 	if (!ok) {
-		syslog(LOG_ERR, "unable to register (RQUOTAPROG, RQUOTAVERS, %s)", (!from_inetd)?"udp":"(inetd)");
+		syslog(LOG_ERR,
+		    "unable to register (RQUOTAPROG, RQUOTAVERS, %s)",
+		    from_inetd ? "(inetd)" : "udp");
 		exit(1);
 	}
 
-	initfs();		/* init the fs_stat list */
+	initfs();
 	svc_run();
 	syslog(LOG_ERR, "svc_run returned");
 	exit(1);
 }
 
-void 
+void
 rquota_service(struct svc_req *request, SVCXPRT *transp)
 {
+
 	switch (request->rq_proc) {
 	case NULLPROC:
 		(void)svc_sendreply(transp, (xdrproc_t)xdr_void, (char *)NULL);
@@ -133,7 +134,7 @@
 }
 
 /* read quota for the specified id, and send it */
-void 
+void
 sendquota(struct svc_req *request, SVCXPRT *transp)
 {
 	struct getquota_args getq_args;
@@ -183,7 +184,7 @@
 	}
 }
 
-void 
+void
 printerr_reply(SVCXPRT *transp)	/* when a reply to a request failed */
 {
 	char name[INET6_ADDRSTRLEN];
@@ -203,7 +204,7 @@
 }
 
 /* initialise the fs_tab list from entries in /etc/fstab */
-void 
+void
 initfs(void)
 {
 	struct fs_stat *fs_current = NULL;
@@ -222,10 +223,12 @@
 		fs_current = (struct fs_stat *) malloc(sizeof(struct fs_stat));
 		fs_current->fs_next = fs_next;	/* next element */
 
-		fs_current->fs_file = malloc(sizeof(char) * (strlen(fs->fs_file) + 1));
+		fs_current->fs_file =
+		    malloc(sizeof(char) * (strlen(fs->fs_file) + 1));
 		strcpy(fs_current->fs_file, fs->fs_file);
 
-		fs_current->qfpathname = malloc(sizeof(char) * (strlen(qfpathname) + 1));
+		fs_current->qfpathname =
+		    malloc(sizeof(char) * (strlen(qfpathname) + 1));
 		strcpy(fs_current->qfpathname, qfpathname);
 
 		stat(fs_current->fs_file, &st);
@@ -242,7 +245,7 @@
  * Return 0 if fail, 1 otherwise
  */
 int
-getfsquota(long id, char   *path, struct dqblk *dqblk)
+getfsquota(long id, char *path, struct dqblk *dqblk)
 {
 	struct stat st_path;
 	struct fs_stat *fs;
@@ -301,8 +304,8 @@
 {
 	static char initname, usrname[100];
 	static char buf[BUFSIZ];
-	char	*opt, *cp;
-	char	*qfextension[] = INITQFNAMES;
+	char *opt, *cp;
+	const char *qfextension[] = INITQFNAMES;
 
 	if (!initname) {
 		sprintf(usrname, "%s%s", qfextension[USRQUOTA], QUOTAFILENAME);
@@ -321,7 +324,8 @@
 		*qfnamep = cp;
 		return (1);
 	}
-	sprintf(buf, "%s/%s.%s", fs->fs_file, QUOTAFILENAME, qfextension[USRQUOTA]);
+	sprintf(buf, "%s/%s.%s", fs->fs_file, QUOTAFILENAME,
+	    qfextension[USRQUOTA]);
 	*qfnamep = buf;
 	return (1);
 }

==== //depot/projects/mpsafetty/sbin/bsdlabel/bsdlabel.8#2 (text+ko) ====

@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)disklabel.8	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD: src/sbin/bsdlabel/bsdlabel.8,v 1.70 2007/12/08 23:41:13 remko Exp $
+.\" $FreeBSD: src/sbin/bsdlabel/bsdlabel.8,v 1.72 2008/11/05 09:28:30 maxim Exp $
 .\"
 .Dd December 8, 2007
 .Dt BSDLABEL 8
@@ -481,7 +481,7 @@
 labels are restricted to a maximum of 2^32-1 sectors.
 This usually means 2TB of disk space.
 Larger disks should be partitioned using another method such as
-.Xr gpt 8 .
+.Xr gpart 8 .
 .Pp
 The various
 .Bx Ns s
@@ -497,5 +497,5 @@
 .Xr disktab 5 ,
 .Xr boot0cfg 8 ,
 .Xr fdisk 8 ,
-.Xr gpt 8 ,
+.Xr gpart 8 ,
 .Xr newfs 8

==== //depot/projects/mpsafetty/share/misc/committers-doc.dot#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/misc/committers-doc.dot,v 1.25 2008/07/03 17:10:18 marcel Exp $
+# $FreeBSD: src/share/misc/committers-doc.dot,v 1.26 2008/11/04 19:20:19 remko Exp $
 
 # This file is meant to list all FreeBSD doc+www committers and describe the
 # mentor-mentee relationships between them.
@@ -66,6 +66,7 @@
 pav [label="Pav Lucistnik\npav@FreeBSD.org\n2005/08/12"]
 pgj [label="Gabor Pali\npgj@FreeBSD.org\n2008/04/21"]
 remko [label="Remko Lodder\nremko@FreeBSD.org\n2004/10/16"]
+rene [label="Rene Ladan\nrene@FreeBSD.org\n2008/11/03"]
 roam [label="Peter Pentchev\nroam@FreeBSD.org\n2003/02/14"]
 simon [label="Simon L. Nielsen\nsimon@FreeBSD.org\n2003/07/20"]
 trhodes [label="Tom Rhodes\ntrhodes@FreeBSD.org\n2002/03/25"]
@@ -116,6 +117,7 @@
 nik -> keramida
 
 remko -> jkois
+remko -> rene
 
 simon -> josef
 simon -> remko

==== //depot/projects/mpsafetty/sys/compat/linprocfs/linprocfs.c#8 (text+ko) ====

@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2000 Dag-Erling Coïdan Smørgrav
+ * Copyright (c) 2000 Dag-Erling Coïdan Smørgrav
  * Copyright (c) 1999 Pierre Beyssac
  * Copyright (c) 1993 Jan-Simon Pendry
  * Copyright (c) 1993
@@ -42,7 +42,7 @@
 #include "opt_compat.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.125 2008/10/04 14:08:16 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.127 2008/11/05 15:08:09 des Exp $");
 
 #include <sys/param.h>
 #include <sys/queue.h>
@@ -318,11 +318,13 @@
 	NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE, UIO_SYSSPACE, linux_emul_path, td);
 	flep = NULL;
 	error = namei(&nd);
-	VFS_UNLOCK_GIANT(NDHASGIANT(&nd));
-	if (error != 0 || vn_fullpath(td, nd.ni_vp, &dlep, &flep) != 0)
-		lep = linux_emul_path;
-	else
-		lep = dlep;
+	lep = linux_emul_path;
+	if (error == 0) {
+		if (vn_fullpath(td, nd.ni_vp, &dlep, &flep) != 0)
+			lep = dlep;
+		vrele(nd.ni_vp);
+		VFS_UNLOCK_GIANT(NDHASGIANT(&nd));
+	}
 	lep_len = strlen(lep);
 
 	mtx_lock(&mountlist_mtx);

==== //depot/projects/mpsafetty/sys/conf/NOTES#17 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1514 2008/11/03 00:53:54 scottl Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1515 2008/11/05 15:04:03 ed Exp $
 #
 # NOTES -- Lines that can be cut/pasted into kernel and hints configs.
 #
@@ -1278,6 +1278,7 @@
 device		pty		#BSD-style compatibility pseudo ttys
 device		nmdm		#back-to-back tty devices
 device		md		#Memory/malloc disk
+device		snp		#Snoop device - to look at pty/vty/etc..
 device		ccd		#Concatenated disk driver
 device		firmware	#firmware(9) support
 

==== //depot/projects/mpsafetty/sys/dev/acpi_support/acpi_asus.c#4 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_asus.c,v 1.38 2008/08/19 22:28:24 rpaulo Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_asus.c,v 1.39 2008/11/04 11:52:50 rpaulo Exp $");
 
 /*
  * Driver for extra ACPI-controlled gadgets (hotkeys, leds, etc) found on
@@ -93,6 +93,9 @@
 	char	*wlan_set;
 
 	void	(*n_func)(ACPI_HANDLE, UINT32, void *);
+
+	char	*lcdd;
+	void	(*lcdd_n_func)(ACPI_HANDLE, UINT32, void *);
 };
 
 struct acpi_asus_led {
@@ -113,6 +116,7 @@
 struct acpi_asus_softc {
 	device_t		dev;
 	ACPI_HANDLE		handle;
+	ACPI_HANDLE		lcdd_handle;
 
 	struct acpi_asus_model	*model;
 	struct sysctl_ctx_list	sysctl_ctx;
@@ -133,6 +137,9 @@
 	int			s_wlan;
 };
 
+static void	acpi_asus_lcdd_notify(ACPI_HANDLE h, UINT32 notify,
+    void *context);
+
 /*
  * We can identify Asus laptops from the string they return
  * as a result of calling the ATK0100 'INIT' method.
@@ -205,6 +212,20 @@
 		.disp_set	= "SDSP"
 	},
 	{
+		.name		= "A8SR",
+		.bled_set	= "BLED",
+		.mled_set	= "MLED",
+		.wled_set	= "WLED",
+		.lcd_get	= NULL,
+		.lcd_set	= "\\_SB.PCI0.SBRG.EC0._Q10",
+		.brn_get	= "GPLV",
+		.brn_set	= "SPLV",
+		.disp_get	= "\\_SB.PCI0.P0P1.VGA.GETD",
+		.disp_set	= "SDSP",
+		.lcdd		= "\\_SB.PCI0.P0P1.VGA.LCDD",
+		.lcdd_n_func	= acpi_asus_lcdd_notify
+	},
+	{
 		.name		= "D1x",
 		.mled_set	= "MLED",
 		.lcd_get	= "\\GP11",
@@ -762,6 +783,22 @@
 	AcpiInstallNotifyHandler(sc->handle, ACPI_SYSTEM_NOTIFY,
 	    sc->model->n_func, dev);
 
+	/* Find and hook the 'LCDD' object */
+	if (sc->model->lcdd != NULL && sc->model->lcdd_n_func != NULL) {
+		ACPI_STATUS res;
+
+		sc->lcdd_handle = NULL;
+		res = AcpiGetHandle((sc->model->lcdd[0] == '\\' ?
+		    NULL : sc->handle), sc->model->lcdd, &(sc->lcdd_handle));
+		if (ACPI_SUCCESS(res)) {
+			AcpiInstallNotifyHandler((sc->lcdd_handle),
+			    ACPI_DEVICE_NOTIFY, sc->model->lcdd_n_func, dev);
+	    	} else {
+	    		printf("%s: unable to find LCD device '%s'\n",
+	    		    __func__, sc->model->lcdd);
+	    	}
+	}
+
 	return (0);
 }
 
@@ -796,6 +833,13 @@
 	/* Remove notify handler */
 	AcpiRemoveNotifyHandler(sc->handle, ACPI_SYSTEM_NOTIFY,
 	    acpi_asus_notify);
+	
+	if (sc->lcdd_handle) {
+		KASSERT(sc->model->lcdd_n_func != NULL,
+		    ("model->lcdd_n_func is NULL, but lcdd_handle is non-zero"));
+		AcpiRemoveNotifyHandler((sc->lcdd_handle),
+		    ACPI_DEVICE_NOTIFY, sc->model->lcdd_n_func);
+	}
 
 	/* Free sysctl tree */
 	sysctl_ctx_free(&sc->sysctl_ctx);
@@ -1165,6 +1209,12 @@
 	} else if (notify == 0x34) {
 		sc->s_lcd = 0;
 		ACPI_VPRINT(sc->dev, acpi_sc, "LCD turned off\n");
+	} else if (notify == 0x86) {
+		acpi_asus_sysctl_set(sc, ACPI_ASUS_METHOD_BRN, sc->s_brn-1);
+		ACPI_VPRINT(sc->dev, acpi_sc, "Brightness decreased\n");
+	} else if (notify == 0x87) {
+		acpi_asus_sysctl_set(sc, ACPI_ASUS_METHOD_BRN, sc->s_brn+1);
+		ACPI_VPRINT(sc->dev, acpi_sc, "Brightness increased\n");
 	} else {
 		/* Notify devd(8) */
 		acpi_UserNotify("ASUS", h, notify);
@@ -1173,6 +1223,31 @@
 }
 
 static void
+acpi_asus_lcdd_notify(ACPI_HANDLE h, UINT32 notify, void *context)
+{
+	struct acpi_asus_softc	*sc;
+	struct acpi_softc	*acpi_sc;
+
+	ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
+
+	sc = device_get_softc((device_t)context);
+	acpi_sc = acpi_device_get_parent_softc(sc->dev);
+
+	ACPI_SERIAL_BEGIN(asus);
+	switch (notify) {
+	case 0x87:
+		acpi_asus_sysctl_set(sc, ACPI_ASUS_METHOD_BRN, sc->s_brn-1);
+		ACPI_VPRINT(sc->dev, acpi_sc, "Brightness decreased\n");
+		break;
+	case 0x86:
+		acpi_asus_sysctl_set(sc, ACPI_ASUS_METHOD_BRN, sc->s_brn+1);
+		ACPI_VPRINT(sc->dev, acpi_sc, "Brightness increased\n");
+		break;
+	}
+	ACPI_SERIAL_END(asus);
+}
+
+static void
 acpi_asus_eeepc_notify(ACPI_HANDLE h, UINT32 notify, void *context)
 {
 	struct acpi_asus_softc	*sc;

==== //depot/projects/mpsafetty/sys/dev/hwpmc/hwpmc_mod.c#5 (text+ko) ====

@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_mod.c,v 1.36 2008/10/23 20:26:15 des Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_mod.c,v 1.37 2008/11/04 19:04:01 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/eventhandler.h>
@@ -680,9 +680,7 @@
 
 	*fullpath = "unknown";
 	*freepath = NULL;
-	vn_lock(v, LK_CANRECURSE | LK_EXCLUSIVE | LK_RETRY);
 	vn_fullpath(curthread, v, fullpath, freepath);
-	VOP_UNLOCK(v, 0);
 }
 
 /*

==== //depot/projects/mpsafetty/sys/dev/snp/snp.c#15 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/snp/snp.c,v 1.111 2008/11/05 15:04:03 ed Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>

==== //depot/projects/mpsafetty/sys/dev/usb2/wlan/if_zyd2.c#2 (text+ko) ====

@@ -1,6 +1,6 @@
 /*	$OpenBSD: if_zyd.c,v 1.52 2007/02/11 00:08:04 jsg Exp $	*/
 /*	$NetBSD: if_zyd.c,v 1.7 2007/06/21 04:04:29 kiyohara Exp $	*/
-/*	$FreeBSD: src/sys/dev/usb2/wlan/if_zyd2.c,v 1.1 2008/11/04 02:31:03 alfred Exp $	*/
+/*	$FreeBSD: src/sys/dev/usb2/wlan/if_zyd2.c,v 1.3 2008/11/04 20:57:39 rink Exp $	*/
 
 /*-
  * Copyright (c) 2006 by Damien Bergamini <damien.bergamini@free.fr>
@@ -20,7 +20,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb2/wlan/if_zyd2.c,v 1.1 2008/11/04 02:31:03 alfred Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb2/wlan/if_zyd2.c,v 1.3 2008/11/04 20:57:39 rink Exp $");
 
 /*
  * ZyDAS ZD1211/ZD1211B USB WLAN driver
@@ -392,10 +392,10 @@
 		usb2_copy_out(xfer->frbuffers, 0,
 		    &sc->sc_intr_ibuf, actlen);
 
-		switch (cmd->code) {
-		case htole16(ZYD_NOTIF_RETRYSTATUS):
+		switch (le16toh(cmd->code)) {
+		case ZYD_NOTIF_RETRYSTATUS:
 			goto handle_notif_retrystatus;
-		case htole16(ZYD_NOTIF_IORD):
+		case ZYD_NOTIF_IORD:
 			goto handle_notif_iord;
 		default:
 			DPRINTFN(2, "unknown indication: 0x%04x\n",

==== //depot/projects/mpsafetty/sys/fs/procfs/procfs.c#2 (text+ko) ====

@@ -37,7 +37,7 @@
  *
  *	@(#)procfs_vfsops.c	8.7 (Berkeley) 5/10/95
  *
- * $FreeBSD: src/sys/fs/procfs/procfs.c,v 1.18 2008/01/13 14:44:05 attilio Exp $
+ * $FreeBSD: src/sys/fs/procfs/procfs.c,v 1.19 2008/11/04 19:04:01 jhb Exp $
  */
 
 #include <sys/param.h>
@@ -70,17 +70,13 @@
 	char *fullpath = "unknown";
 	char *freepath = NULL;
 	struct vnode *textvp;
-	int err;
 
+	PROC_LOCK(p);
 	textvp = p->p_textvp;
-	VI_LOCK(textvp);
-	vholdl(textvp);
-	err = vn_lock(textvp, LK_EXCLUSIVE | LK_INTERLOCK);
+	vhold(textvp);
+	PROC_UNLOCK(p);
+	vn_fullpath(td, textvp, &fullpath, &freepath);
 	vdrop(textvp);
-	if (err)
-		return (err);
-	vn_fullpath(td, textvp, &fullpath, &freepath);
-	VOP_UNLOCK(textvp, 0);
 	sbuf_printf(sb, "%s", fullpath);
 	if (freepath)
 		free(freepath, M_TEMP);

==== //depot/projects/mpsafetty/sys/fs/procfs/procfs_map.c#3 (text+ko) ====

@@ -32,7 +32,7 @@
  *
  *	@(#)procfs_status.c	8.3 (Berkeley) 2/17/94
  *
- * $FreeBSD: src/sys/fs/procfs/procfs_map.c,v 1.42 2008/10/04 14:08:16 kib Exp $
+ * $FreeBSD: src/sys/fs/procfs/procfs_map.c,v 1.43 2008/11/04 19:04:01 jhb Exp $
  */
 
 #include "opt_compat.h"
@@ -175,10 +175,9 @@
 			shadow_count = obj->shadow_count;
 			VM_OBJECT_UNLOCK(obj);
 			if (vp != NULL) {
+				vn_fullpath(td, vp, &fullpath, &freepath);
 				vfslocked = VFS_LOCK_GIANT(vp->v_mount);
-				vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
-				vn_fullpath(td, vp, &fullpath, &freepath);
-				vput(vp);
+				vrele(vp);
 				VFS_UNLOCK_GIANT(vfslocked);
 			}
 		} else {

==== //depot/projects/mpsafetty/sys/fs/unionfs/union_vfsops.c#4 (text+ko) ====

@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_vfsops.c	8.20 (Berkeley) 5/20/95
- * $FreeBSD: src/sys/fs/unionfs/union_vfsops.c,v 1.93 2008/11/03 10:38:00 dfr Exp $
+ * $FreeBSD: src/sys/fs/unionfs/union_vfsops.c,v 1.94 2008/11/04 18:54:44 jhb Exp $
  */
 
 #include <sys/param.h>
@@ -268,7 +268,7 @@
 	/*
 	 * Find upper node
 	 */
-	NDINIT(ndp, LOOKUP, FOLLOW | WANTPARENT | LOCKLEAF, UIO_SYSSPACE, target, td);
+	NDINIT(ndp, LOOKUP, FOLLOW | LOCKLEAF, UIO_SYSSPACE, target, td);
 	if ((error = namei(ndp)))
 		return (error);
 
@@ -278,9 +278,6 @@
 	lowerrootvp = mp->mnt_vnodecovered;
 	upperrootvp = ndp->ni_vp;
 
-	vrele(ndp->ni_dvp);
-	ndp->ni_dvp = NULLVP;
-
 	/* create unionfs_mount */
 	ump = (struct unionfs_mount *)malloc(sizeof(struct unionfs_mount),
 	    M_UNIONFSMNT, M_WAITOK | M_ZERO);

==== //depot/projects/mpsafetty/sys/kern/kern_descrip.c#8 (text+ko) ====

@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_descrip.c,v 1.341 2008/11/03 20:31:00 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_descrip.c,v 1.342 2008/11/04 19:04:01 jhb Exp $");
 
 #include "opt_compat.h"
 #include "opt_ddb.h"
@@ -2537,10 +2537,9 @@
 	freepath = NULL;
 	fullpath = "-";
 	FILEDESC_SUNLOCK(fdp);
+	vn_fullpath(curthread, vp, &fullpath, &freepath);
 	vfslocked = VFS_LOCK_GIANT(vp->v_mount);
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
-	vn_fullpath(curthread, vp, &fullpath, &freepath);
-	vput(vp);
+	vrele(vp);
 	VFS_UNLOCK_GIANT(vfslocked);
 	strlcpy(kif->kf_path, fullpath, sizeof(kif->kf_path));
 	if (freepath != NULL)
@@ -2708,10 +2707,9 @@
 			freepath = NULL;
 			fullpath = "-";
 			FILEDESC_SUNLOCK(fdp);
+			vn_fullpath(curthread, vp, &fullpath, &freepath);
 			vfslocked = VFS_LOCK_GIANT(vp->v_mount);
-			vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
-			vn_fullpath(curthread, vp, &fullpath, &freepath);
-			vput(vp);
+			vrele(vp);
 			VFS_UNLOCK_GIANT(vfslocked);
 			strlcpy(kif->kf_path, fullpath,
 			    sizeof(kif->kf_path));

==== //depot/projects/mpsafetty/sys/kern/kern_proc.c#10 (text+ko) ====

@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_proc.c,v 1.270 2008/10/31 05:43:19 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_proc.c,v 1.271 2008/11/04 19:04:01 jhb Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kdtrace.h"
@@ -1440,11 +1440,11 @@
 			kve->kve_shadow_count = obj->shadow_count;
 			VM_OBJECT_UNLOCK(obj);
 			if (vp != NULL) {
-				vfslocked = VFS_LOCK_GIANT(vp->v_mount);
-				vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 				vn_fullpath(curthread, vp, &fullpath,
 				    &freepath);
 				cred = curthread->td_ucred;
+				vfslocked = VFS_LOCK_GIANT(vp->v_mount);
+				vn_lock(vp, LK_SHARED | LK_RETRY);
 				if (VOP_GETATTR(vp, &va, cred) == 0) {
 					kve->kve_fileid = va.va_fileid;
 					kve->kve_fsid = va.va_fsid;

==== //depot/projects/mpsafetty/sys/kern/kern_sig.c#6 (text+ko) ====

@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.365 2008/10/23 07:55:38 davidxu Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.366 2008/11/05 03:01:23 davidxu Exp $");
 
 #include "opt_compat.h"
 #include "opt_kdtrace.h"
@@ -2115,15 +2115,19 @@
 			 * Otherwise, process goes back to sleep state.
 			 */
 			p->p_flag &= ~P_STOPPED_SIG;
+			PROC_SLOCK(p);
 			if (p->p_numthreads == p->p_suspcount) {
+				PROC_SUNLOCK(p);
 				p->p_flag |= P_CONTINUED;
 				p->p_xstat = SIGCONT;
 				PROC_LOCK(p->p_pptr);
 				childproc_continued(p);
 				PROC_UNLOCK(p->p_pptr);
+				PROC_SLOCK(p);
 			}
 			if (action == SIG_DFL) {
 				thread_unsuspend(p);
+				PROC_SUNLOCK(p);
 				sigqueue_delete(sigqueue, sig);
 				goto out;
 			}
@@ -2132,12 +2136,14 @@
 				 * The process wants to catch it so it needs
 				 * to run at least one thread, but which one?
 				 */
+				PROC_SUNLOCK(p);
 				goto runfast;
 			}
 			/*
 			 * The signal is not ignored or caught.
 			 */

>>> TRUNCATED FOR MAIL (1000 lines) <<<
From ed at FreeBSD.org  Wed Nov  5 08:23:11 2008
From: ed at FreeBSD.org (Ed Schouten)
Date: Wed Nov  5 08:23:17 2008
Subject: PERFORCE change 152535 for review
Message-ID: <200811051623.mA5GNAw5020632@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152535

Change 152535 by ed@ed_dull on 2008/11/05 16:22:28

	Don't forget to IFC the snp(4) manual page.

Affected files ...

.. //depot/projects/mpsafetty/share/man/man4/snp.4#5 integrate
.. //depot/projects/mpsafetty/share/man/man9/pseudofs.9#2 integrate

Differences ...

==== //depot/projects/mpsafetty/share/man/man4/snp.4#5 (text+ko) ====

@@ -1,7 +1,7 @@
 .\"
-.\" $FreeBSD: src/share/man/man4/snp.4,v 1.28 2008/08/15 13:07:07 ed Exp $
+.\" $FreeBSD: src/share/man/man4/snp.4,v 1.29 2008/11/05 15:04:03 ed Exp $
 .\"
-.Dd August 21, 2008
+.Dd November 5, 2008
 .Dt SNP 4
 .Os
 .Sh NAME
@@ -83,7 +83,17 @@
 .Nm
 driver was rewritten to work with the replaced TTY subsystem.
 .Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org
+The author of the current implementation is
+.An Ed Schouten Aq ed@FreeBSD.org .
+Previous versions of
+.Nm
+were based on code written by
+.An Ugen J.S. Antsilevich Aq ugen@NetVision.net.il .
 .Sh BUGS
-Caveat emptor!
-This manual page is horribly stale and wildly inaccurate in some places.
+This version of
+.Nm
+does not return proper error codes when calling
+.Dv FIONREAD .
+It also does not allow
+.Dv SNPSTTY
+to detach itself from the TTY.

==== //depot/projects/mpsafetty/share/man/man9/pseudofs.9#2 (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/man9/pseudofs.9,v 1.6 2007/04/20 15:38:06 brueffer Exp $
+.\" $FreeBSD: src/share/man/man9/pseudofs.9,v 1.7 2008/11/05 15:07:42 des Exp $
 .\"
 .Dd April 20, 2007
 .Dt PSEUDOFS 9
@@ -67,4 +67,4 @@
 The
 .Nm
 module and this manual page were written by
-.An Dag-Erling Sm\(/orgrav .
+.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org .
From rene at FreeBSD.org  Wed Nov  5 09:24:14 2008
From: rene at FreeBSD.org (Rene Ladan)
Date: Wed Nov  5 09:24:23 2008
Subject: PERFORCE change 152538 for review
Message-ID: <200811051724.mA5HODwU069097@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152538

Change 152538 by rene@rene_self on 2008/11/05 17:23:32

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#10 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#12 integrate
.. //depot/projects/docproj_nl/www/en/developers.sgml#10 integrate
.. //depot/projects/docproj_nl/www/share/sgml/news.xml#16 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#10 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.825 2008/10/06 15:02:21 roam Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.826 2008/11/04 21:05:15 rene Exp $ -->
 <!--
 	NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
 	order by first name.
@@ -7914,11 +7914,6 @@
     </listitem>
 
     <listitem>
-      <para>René C. Ladan
-	<email>r.c.ladan@gmail.com</email></para>
-    </listitem>
-
-    <listitem>
       <para>Revis Zinkov
 	<email>rzinkov@gmail.com</email></para>
     </listitem>

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#12 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.246 2008/11/01 11:08:11 versus Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.247 2008/11/04 21:05:47 rene Exp $ -->
 <!--
 	NOTE TO NEW COMMITTERS: Core and committers lists are sorted in
 	alphabetical order by last name. Please keep in mind that fact while
@@ -791,6 +791,10 @@
     </listitem>
 
     <listitem>
+      <para>&a.rene;</para>
+    </listitem>
+
+    <listitem>
       <para>&a.scottl;</para>
     </listitem>
 

==== //depot/projects/docproj_nl/www/en/developers.sgml#10 (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.208 2008/11/04 21:09:01 rene Exp $
+$FreeBSD: www/en/developers.sgml,v 1.209 2008/11/04 22:17:30 blackend Exp $
 
 -->
 
@@ -599,13 +599,13 @@
 <!ENTITY a.portmgr '&a.marcus;, &a.kris;, &a.erwin;, &a.linimon;, &a.pav;, &a.krion;, &a.flz;'>
 
 <!-- FreeBSD Release Engineering Teams -->
-<!ENTITY a.re.members '&a.murray;, &a.rwatson;, &a.dwhite;, &a.kensmith;, &a.hrs;, &a.mux;, &a.bmah;'>
+<!ENTITY a.re.members '&a.murray;, &a.rwatson;, &a.dwhite;, &a.kensmith;, &a.hrs;, &a.mux;, &a.bmah;, &a.kib;, &a.blackend;, &a.gnn;'>
 <!ENTITY a.re-alpha '&a.murray;, &a.rwatson;'>
 <!ENTITY a.re-amd64 '&a.obrien;'>
 <!ENTITY a.re-ia64 '&a.marcel;'>
 <!ENTITY a.re-i386 '&a.murray;, &a.rwatson;'>
 <!ENTITY a.re-pc98 '&a.nyan;'>
-<!ENTITY a.re-powerpc '&a.grehan;'>
+<!ENTITY a.re-powerpc '&a.grehan;, &a.marcel;'>
 <!ENTITY a.re-sparc64 '&a.jake;, &a.murray;, &a.phk;, &a.rwatson;, &a.tmm;, &a.kensmith;, &a.obrien;'>
 
 <!-- FreeBSD Security Officer -->

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

@@ -25,7 +25,7 @@
 <news>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/share/sgml/news.xml,v 1.205 2008/11/04 20:58:34 danger Exp $
+      $FreeBSD: www/share/sgml/news.xml,v 1.206 2008/11/04 21:24:43 rene Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -37,6 +37,10 @@
 
       <day>
 	<name>3</name>
+	<event>
+	  <p>New committer: <a href="mailto:rene@FreeBSD.org">
+	    René Ladan</a> (doc-nl)</p>
+         </event>
 
 	<event>
 	  <title>&os; 6.4-RC2 Available
From sam at FreeBSD.org  Wed Nov  5 12:21:15 2008
From: sam at FreeBSD.org (Sam Leffler)
Date: Wed Nov  5 12:21:21 2008
Subject: PERFORCE change 152543 for review
Message-ID: <200811052021.mA5KLEDO098377@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152543

Change 152543 by sam@sam_ebb on 2008/11/05 20:20:41

	print the extended tx/rx descriptor for 5416 and later parts

Affected files ...

.. //depot/projects/vap/sys/dev/ath/if_ath.c#119 edit

Differences ...

==== //depot/projects/vap/sys/dev/ath/if_ath.c#119 (text+ko) ====

@@ -280,8 +280,10 @@
 	if (sc->sc_debug & ATH_DEBUG_KEYCACHE)			\
 		ath_keyprint(sc, __func__, ix, hk, mac);	\
 } while (0)
-static	void ath_printrxbuf(const struct ath_buf *bf, u_int ix, int);
-static	void ath_printtxbuf(const struct ath_buf *bf, u_int qnum, u_int ix, int done);
+static	void ath_printrxbuf(struct ath_softc *, const struct ath_buf *bf,
+	u_int ix, int);
+static	void ath_printtxbuf(struct ath_softc *, const struct ath_buf *bf,
+	u_int qnum, u_int ix, int done);
 #else
 #define	IFF_DUMPPKTS(sc, m) \
 	((sc->sc_ifp->if_flags & (IFF_DEBUG|IFF_LINK2)) == (IFF_DEBUG|IFF_LINK2))
@@ -4044,7 +4046,7 @@
 				bf->bf_daddr, PA2DESC(sc, ds->ds_link), rs);
 #ifdef ATH_DEBUG
 		if (sc->sc_debug & ATH_DEBUG_RECV_DESC)
-			ath_printrxbuf(bf, 0, status == HAL_OK);
+			ath_printrxbuf(sc, bf, 0, status == HAL_OK);
 #endif
 		if (status == HAL_EINPROGRESS)
 			break;
@@ -5043,7 +5045,8 @@
 		status = ath_hal_txprocdesc(ah, ds, ts);
 #ifdef ATH_DEBUG
 		if (sc->sc_debug & ATH_DEBUG_XMIT_DESC)
-			ath_printtxbuf(bf, txq->axq_qnum, 0, status == HAL_OK);
+			ath_printtxbuf(sc, bf, txq->axq_qnum, 0,
+			    status == HAL_OK);
 #endif
 		if (status == HAL_EINPROGRESS) {
 			ATH_TXQ_UNLOCK(txq);
@@ -5262,7 +5265,7 @@
 		if (sc->sc_debug & ATH_DEBUG_RESET) {
 			struct ieee80211com *ic = sc->sc_ifp->if_l2com;
 
-			ath_printtxbuf(bf, txq->axq_qnum, ix,
+			ath_printtxbuf(sc, bf, txq->axq_qnum, ix,
 				ath_hal_txprocdesc(ah, bf->bf_desc,
 				    &bf->bf_status.ds_txstat) == HAL_OK);
 			ieee80211_dump_pkt(ic, mtod(bf->bf_m, caddr_t),
@@ -5330,7 +5333,7 @@
 	if (sc->sc_debug & ATH_DEBUG_RESET) {
 		struct ath_buf *bf = STAILQ_FIRST(&sc->sc_bbuf);
 		if (bf != NULL && bf->bf_m != NULL) {
-			ath_printtxbuf(bf, sc->sc_bhalq, 0,
+			ath_printtxbuf(sc, bf, sc->sc_bhalq, 0,
 				ath_hal_txprocdesc(ah, bf->bf_desc,
 				    &bf->bf_status.ds_txstat) == HAL_OK);
 			ieee80211_dump_pkt(ifp->if_l2com, mtod(bf->bf_m, caddr_t),
@@ -5371,7 +5374,7 @@
 			HAL_STATUS status = ath_hal_rxprocdesc(ah, ds,
 				bf->bf_daddr, PA2DESC(sc, ds->ds_link), rs);
 			if (status == HAL_OK || (sc->sc_debug & ATH_DEBUG_FATAL))
-				ath_printrxbuf(bf, ix, status == HAL_OK);
+				ath_printrxbuf(sc, bf, ix, status == HAL_OK);
 			ix++;
 		}
 	}
@@ -6281,9 +6284,11 @@
 
 #ifdef ATH_DEBUG
 static void
-ath_printrxbuf(const struct ath_buf *bf, u_int ix, int done)
+ath_printrxbuf(struct ath_softc *sc, const struct ath_buf *bf,
+	u_int ix, int done)
 {
 	const struct ath_rx_status *rs = &bf->bf_status.ds_rxstat;
+	struct ath_hal *ah = sc->sc_ah;
 	const struct ath_desc *ds;
 	int i;
 
@@ -6295,13 +6300,21 @@
 		    !done ? "" : (rs->rs_status == 0) ? " *" : " !",
 		    ds->ds_ctl0, ds->ds_ctl1,
 		    ds->ds_hw[0], ds->ds_hw[1]);
+		if (ah->ah_magic == 0x20065416) {
+			printf("        %08x %08x %08x %08x %08x %08x %08x\n",
+			    ds->ds_hw[2], ds->ds_hw[3], ds->ds_hw[4],
+			    ds->ds_hw[5], ds->ds_hw[6], ds->ds_hw[7],
+			    ds->ds_hw[8]);
+		}
 	}
 }
 
 static void
-ath_printtxbuf(const struct ath_buf *bf, u_int qnum, u_int ix, int done)
+ath_printtxbuf(struct ath_softc *sc, const struct ath_buf *bf,
+	u_int qnum, u_int ix, int done)
 {
 	const struct ath_tx_status *ts = &bf->bf_status.ds_txstat;
+	struct ath_hal *ah = sc->sc_ah;
 	const struct ath_desc *ds;
 	int i;
 
@@ -6314,6 +6327,16 @@
 		    !done ? "" : (ts->ts_status == 0) ? " *" : " !",
 		    ds->ds_ctl0, ds->ds_ctl1,
 		    ds->ds_hw[0], ds->ds_hw[1], ds->ds_hw[2], ds->ds_hw[3]);
+		if (ah->ah_magic == 0x20065416) {
+			printf("        %08x %08x %08x %08x %08x %08x %08x %08x\n",
+			    ds->ds_hw[4], ds->ds_hw[5], ds->ds_hw[6],
+			    ds->ds_hw[7], ds->ds_hw[8], ds->ds_hw[9],
+			    ds->ds_hw[10],ds->ds_hw[11]);
+			printf("        %08x %08x %08x %08x %08x %08x %08x %08x\n",
+			    ds->ds_hw[12],ds->ds_hw[13],ds->ds_hw[14],
+			    ds->ds_hw[15],ds->ds_hw[16],ds->ds_hw[17],
+			    ds->ds_hw[18], ds->ds_hw[19]);
+		}
 	}
 }
 #endif /* ATH_DEBUG */
From peter at FreeBSD.org  Wed Nov  5 12:53:49 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Wed Nov  5 12:53:57 2008
Subject: PERFORCE change 152547 for review
Message-ID: <200811052053.mA5KrnD5010397@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152547

Change 152547 by peter@peter_daintree on 2008/11/05 20:53:33

	Tidy up thr_exit wrapper a little.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#26 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#26 (text+ko) ====

@@ -168,6 +168,7 @@
          reallocation.  We need to make sure we don't touch the stack
          between marking it Empty and exiting.  Hence the
          assembler. */
+      /* QQQ might have to use thr_exit here */
 #if defined(VGP_x86_freebsd)	/* FreeBSD has args on the stack */
       asm volatile (
          "movl	%1, %0\n"	/* set tst->status = VgTs_Empty */
@@ -1765,13 +1766,15 @@
 {
    ThreadState *tst;
 
+   PRINT( "sys_thr_exit ( %#lx )", ARG1 );
+   PRE_REG_READ1(long, "thr_exit", long *, "status");
+
+   if (ARG1)
+      PRE_MEM_WRITE( "thr_exit(status)", ARG1, sizeof(long) );
    tst = VG_(get_ThreadState)(tid);
    tst->exitreason = VgSrc_ExitThread;
-
+   tst->os_state.exitcode = 0;
    VG_(exit_thread)(tid);
-   PRINT( "sys_thr_exit ( %#lx )", ARG1 );
-   PRE_REG_READ1(long, "thr_exit", long *, "status");
-// PRE_MEM_WRITE( "thr_exit()", ARG1, sizeof(long));
 }
 
 PRE(sys_thr_set_name)
From jb at FreeBSD.org  Wed Nov  5 13:31:29 2008
From: jb at FreeBSD.org (John Birrell)
Date: Wed Nov  5 13:31:36 2008
Subject: PERFORCE change 152549 for review
Message-ID: <200811052131.mA5LVRAC021737@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152549

Change 152549 by jb@freebsd3 on 2008/11/05 21:31:21

	IFC

Affected files ...

.. //depot/projects/dtrace/src/cddl/Makefile.inc#11 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c#7 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c#8 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c#8 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c#7 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.h#7 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_program.c#7 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h#7 integrate
.. //depot/projects/dtrace/src/etc/defaults/rc.conf#42 integrate
.. //depot/projects/dtrace/src/etc/devd.conf#9 integrate
.. //depot/projects/dtrace/src/etc/gss/mech#6 integrate
.. //depot/projects/dtrace/src/etc/rc.d/Makefile#21 integrate
.. //depot/projects/dtrace/src/etc/rc.d/gssd#1 branch
.. //depot/projects/dtrace/src/etc/rc.d/nfsd#6 integrate
.. //depot/projects/dtrace/src/include/rpc/xdr.h#4 integrate
.. //depot/projects/dtrace/src/include/strings.h#6 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/dirname.3#5 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/dirname.c#4 integrate
.. //depot/projects/dtrace/src/lib/libc/posix1e/acl_add_perm.3#4 integrate
.. //depot/projects/dtrace/src/lib/libc/posix1e/acl_calc_mask.3#4 integrate
.. //depot/projects/dtrace/src/lib/libc/posix1e/acl_calc_mask.c#4 integrate
.. //depot/projects/dtrace/src/lib/libc/posix1e/acl_clear_perms.3#4 integrate
.. //depot/projects/dtrace/src/lib/libc/posix1e/acl_copy.c#4 integrate
.. //depot/projects/dtrace/src/lib/libc/posix1e/acl_copy_entry.3#4 integrate
.. //depot/projects/dtrace/src/lib/libc/posix1e/acl_create_entry.3#4 integrate
.. //depot/projects/dtrace/src/lib/libc/posix1e/acl_delete_entry.3#4 integrate
.. //depot/projects/dtrace/src/lib/libc/posix1e/acl_delete_perm.3#4 integrate
.. //depot/projects/dtrace/src/lib/libc/posix1e/acl_get_entry.3#4 integrate
.. //depot/projects/dtrace/src/lib/libc/posix1e/acl_get_perm_np.3#4 integrate
.. //depot/projects/dtrace/src/lib/libc/posix1e/acl_get_permset.3#4 integrate
.. //depot/projects/dtrace/src/lib/libc/posix1e/acl_get_qualifier.3#4 integrate
.. //depot/projects/dtrace/src/lib/libc/posix1e/acl_get_tag_type.3#4 integrate
.. //depot/projects/dtrace/src/lib/libc/posix1e/acl_perm.c#4 integrate
.. //depot/projects/dtrace/src/lib/libc/posix1e/acl_set_permset.3#4 integrate
.. //depot/projects/dtrace/src/lib/libc/posix1e/acl_set_qualifier.3#4 integrate
.. //depot/projects/dtrace/src/lib/libc/posix1e/acl_set_tag_type.3#4 integrate
.. //depot/projects/dtrace/src/lib/libc/posix1e/acl_size.c#4 integrate
.. //depot/projects/dtrace/src/lib/libc/stdlib/malloc.3#13 integrate
.. //depot/projects/dtrace/src/lib/libc/stdlib/malloc.c#29 integrate
.. //depot/projects/dtrace/src/lib/libc/string/Makefile.inc#5 integrate
.. //depot/projects/dtrace/src/lib/libc/string/Symbol.map#5 integrate
.. //depot/projects/dtrace/src/lib/libc/string/ffs.3#6 integrate
.. //depot/projects/dtrace/src/lib/libc/string/ffsl.c#5 integrate
.. //depot/projects/dtrace/src/lib/libc/string/ffsll.c#1 branch
.. //depot/projects/dtrace/src/lib/libc/string/flsll.c#1 branch
.. //depot/projects/dtrace/src/lib/libc/sys/Symbol.map#15 integrate
.. //depot/projects/dtrace/src/lib/libc/xdr/Symbol.map#4 integrate
.. //depot/projects/dtrace/src/lib/libc/xdr/xdr.c#4 integrate
.. //depot/projects/dtrace/src/lib/libproc/libproc.h#7 integrate
.. //depot/projects/dtrace/src/lib/libproc/proc_create.c#7 integrate
.. //depot/projects/dtrace/src/lib/librpcsec_gss/svc_rpcsec_gss.c#3 integrate
.. //depot/projects/dtrace/src/lib/libusb20/Makefile#1 branch
.. //depot/projects/dtrace/src/lib/libusb20/libusb20.3#1 branch
.. //depot/projects/dtrace/src/lib/libusb20/libusb20.c#1 branch
.. //depot/projects/dtrace/src/lib/libusb20/libusb20.h#1 branch
.. //depot/projects/dtrace/src/lib/libusb20/libusb20_compat01.c#1 branch
.. //depot/projects/dtrace/src/lib/libusb20/libusb20_compat01.h#1 branch
.. //depot/projects/dtrace/src/lib/libusb20/libusb20_compat10.c#1 branch
.. //depot/projects/dtrace/src/lib/libusb20/libusb20_compat10.h#1 branch
.. //depot/projects/dtrace/src/lib/libusb20/libusb20_desc.c#1 branch
.. //depot/projects/dtrace/src/lib/libusb20/libusb20_desc.h#1 branch
.. //depot/projects/dtrace/src/lib/libusb20/libusb20_int.h#1 branch
.. //depot/projects/dtrace/src/lib/libusb20/libusb20_ugen20.c#1 branch
.. //depot/projects/dtrace/src/lib/libutil/Makefile#9 integrate
.. //depot/projects/dtrace/src/lib/libutil/login_cap.c#5 integrate
.. //depot/projects/dtrace/src/lib/libutil/login_class.c#8 integrate
.. //depot/projects/dtrace/src/lib/libutil/pty.c#9 integrate
.. //depot/projects/dtrace/src/lib/libutil/realhostname.c#5 integrate
.. //depot/projects/dtrace/src/libexec/rpc.rquotad/Makefile#4 integrate
.. //depot/projects/dtrace/src/libexec/rpc.rquotad/rquotad.c#4 integrate
.. //depot/projects/dtrace/src/sbin/bsdlabel/bsdlabel.8#9 integrate
.. //depot/projects/dtrace/src/sbin/mount_nfs/mount_nfs.c#10 integrate
.. //depot/projects/dtrace/src/share/man/man4/atapicam.4#4 integrate
.. //depot/projects/dtrace/src/share/man/man4/snd_hda.4#11 integrate
.. //depot/projects/dtrace/src/share/man/man4/snp.4#5 integrate
.. //depot/projects/dtrace/src/share/man/man4/usb2_bluetooth.4#1 branch
.. //depot/projects/dtrace/src/share/man/man4/usb2_controller.4#1 branch
.. //depot/projects/dtrace/src/share/man/man4/usb2_core.4#1 branch
.. //depot/projects/dtrace/src/share/man/man4/usb2_ethernet.4#1 branch
.. //depot/projects/dtrace/src/share/man/man4/usb2_image.4#1 branch
.. //depot/projects/dtrace/src/share/man/man4/usb2_input.4#1 branch
.. //depot/projects/dtrace/src/share/man/man4/usb2_misc.4#1 branch
.. //depot/projects/dtrace/src/share/man/man4/usb2_ndis.4#1 branch
.. //depot/projects/dtrace/src/share/man/man4/usb2_quirk.4#1 branch
.. //depot/projects/dtrace/src/share/man/man4/usb2_serial.4#1 branch
.. //depot/projects/dtrace/src/share/man/man4/usb2_sound.4#1 branch
.. //depot/projects/dtrace/src/share/man/man4/usb2_storage.4#1 branch
.. //depot/projects/dtrace/src/share/man/man4/usb2_template.4#1 branch
.. //depot/projects/dtrace/src/share/man/man4/usb2_wlan.4#1 branch
.. //depot/projects/dtrace/src/share/man/man9/pseudofs.9#5 integrate
.. //depot/projects/dtrace/src/share/misc/committers-doc.dot#8 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#4 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/types.h#4 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/uio.h#4 integrate
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#15 integrate
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c#6 integrate
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_ioctl.c#26 integrate
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#34 integrate
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_unload.c#30 integrate
.. //depot/projects/dtrace/src/sys/cddl/dev/systrace/systrace.c#13 integrate
.. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_proto.h#29 integrate
.. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_syscall.h#29 integrate
.. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_syscalls.c#29 integrate
.. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_sysent.c#29 integrate
.. //depot/projects/dtrace/src/sys/compat/freebsd32/syscalls.master#29 integrate
.. //depot/projects/dtrace/src/sys/compat/linprocfs/linprocfs.c#21 integrate
.. //depot/projects/dtrace/src/sys/conf/NOTES#69 integrate
.. //depot/projects/dtrace/src/sys/conf/files#108 integrate
.. //depot/projects/dtrace/src/sys/conf/kmod.mk#14 integrate
.. //depot/projects/dtrace/src/sys/conf/options#61 integrate
.. //depot/projects/dtrace/src/sys/dev/acpi_support/acpi_asus.c#12 integrate
.. //depot/projects/dtrace/src/sys/dev/acpica/Osd/OsdSchedule.c#8 integrate
.. //depot/projects/dtrace/src/sys/dev/cardbus/cardbus_cis.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/cardbus/cardbusreg.h#4 integrate
.. //depot/projects/dtrace/src/sys/dev/hwpmc/hwpmc_mod.c#15 integrate
.. //depot/projects/dtrace/src/sys/dev/pci/pcireg.h#11 integrate
.. //depot/projects/dtrace/src/sys/dev/snp/snp.c#10 integrate
.. //depot/projects/dtrace/src/sys/dev/sound/pcm/channel.c#9 integrate
.. //depot/projects/dtrace/src/sys/dev/sound/pcm/channel.h#7 integrate
.. //depot/projects/dtrace/src/sys/dev/sound/pcm/mixer.c#8 integrate
.. //depot/projects/dtrace/src/sys/dev/sound/pcm/mixer.h#7 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/u3g.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/usb_subr.c#8 integrate
.. //depot/projects/dtrace/src/sys/dev/usb2/bluetooth/TODO.TXT#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/bluetooth/ng_ubt2.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/bluetooth/ng_ubt2_var.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/bluetooth/ubtbcmfw2.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/bluetooth/usb2_bluetooth.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/bluetooth/usb2_bluetooth.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/controller/at91dci.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/controller/at91dci.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/controller/at91dci_atmelarm.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/controller/ehci2.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/controller/ehci2.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/controller/ehci2_pci.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/controller/musb2_otg.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/controller/musb2_otg.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/controller/ohci2.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/controller/ohci2.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/controller/ohci2_atmelarm.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/controller/ohci2_pci.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/controller/uhci2.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/controller/uhci2.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/controller/uhci2_pci.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/controller/usb2_bus.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/controller/usb2_controller.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/controller/usb2_controller.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/controller/usb2_pci.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/controller/uss820dci.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/controller/uss820dci.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/controller/uss820dci_atmelarm.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/controller/uss820dci_pccard.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/README.TXT#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usb2_busdma.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usb2_busdma.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usb2_compat_linux.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usb2_compat_linux.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usb2_config_td.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usb2_config_td.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usb2_core.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usb2_core.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usb2_debug.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usb2_debug.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usb2_dev.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usb2_dev.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usb2_device.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usb2_device.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usb2_dynamic.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usb2_dynamic.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usb2_error.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usb2_generic.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usb2_generic.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usb2_handle_request.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usb2_handle_request.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usb2_hid.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usb2_hid.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usb2_hub.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usb2_hub.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usb2_if.m#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usb2_lookup.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usb2_lookup.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usb2_mbuf.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usb2_mbuf.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usb2_msctest.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usb2_msctest.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usb2_parse.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usb2_parse.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usb2_process.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usb2_process.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usb2_request.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usb2_request.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usb2_sw_transfer.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usb2_sw_transfer.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usb2_transfer.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usb2_transfer.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usb2_util.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usb2_util.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/core/usbdevs#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/ethernet/if_aue2.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/ethernet/if_aue2_reg.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/ethernet/if_axe2.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/ethernet/if_axe2_reg.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/ethernet/if_cdce2.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/ethernet/if_cdce2_reg.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/ethernet/if_cue2.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/ethernet/if_cue2_reg.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/ethernet/if_kue2.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/ethernet/if_kue2_fw.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/ethernet/if_kue2_reg.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/ethernet/if_rue2.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/ethernet/if_rue2_reg.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/ethernet/if_udav2.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/ethernet/if_udav2_reg.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/ethernet/usb2_ethernet.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/ethernet/usb2_ethernet.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/image/usb2_image.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/image/usb2_image.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/image/uscanner2.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/include/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/include/ufm2_ioctl.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/include/urio2_ioctl.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/include/usb2_cdc.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/include/usb2_defs.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/include/usb2_devid.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/include/usb2_devtable.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/include/usb2_endian.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/include/usb2_error.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/include/usb2_hid.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/include/usb2_ioctl.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/include/usb2_mfunc.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/include/usb2_revision.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/include/usb2_standard.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/input/uhid2.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/input/ukbd2.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/input/ums2.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/input/usb2_input.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/input/usb2_input.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/input/usb2_rdesc.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/misc/udbp2.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/misc/udbp2.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/misc/ufm2.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/misc/usb2_misc.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/misc/usb2_misc.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/ndis/if_ndis_usb2.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/ndis/usb2_ndis.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/ndis/usb2_ndis.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/quirk/usb2_quirk.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/quirk/usb2_quirk.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/serial/uark2.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/serial/ubsa2.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/serial/ubser2.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/serial/uchcom2.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/serial/ucycom2.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/serial/ufoma2.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/serial/uftdi2.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/serial/uftdi2_reg.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/serial/ugensa2.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/serial/uipaq2.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/serial/ulpt2.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/serial/umct2.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/serial/umodem2.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/serial/umoscom2.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/serial/uplcom2.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/serial/usb2_serial.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/serial/usb2_serial.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/serial/uvisor2.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/serial/uvscom2.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/sound/uaudio2.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/sound/uaudio2.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/sound/uaudio2_pcm.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/sound/uaudio2_reg.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/sound/usb2_sound.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/sound/usb2_sound.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/storage/ata-usb2.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/storage/umass2.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/storage/urio2.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/storage/usb2_storage.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/storage/usb2_storage.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/storage/ustorage2_fs.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/template/usb2_template.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/template/usb2_template.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/template/usb2_template_cdce.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/template/usb2_template_msc.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/template/usb2_template_mtp.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/wlan/if_rum2.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/wlan/if_rum2_fw.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/wlan/if_rum2_reg.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/wlan/if_rum2_var.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/wlan/if_ural2.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/wlan/if_ural2_reg.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/wlan/if_ural2_var.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/wlan/if_zyd2.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/wlan/if_zyd2_fw.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/wlan/if_zyd2_reg.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/wlan/usb2_wlan.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/usb2/wlan/usb2_wlan.h#1 branch
.. //depot/projects/dtrace/src/sys/fs/coda/cnode.h#6 integrate
.. //depot/projects/dtrace/src/sys/fs/coda/coda_subr.c#5 integrate
.. //depot/projects/dtrace/src/sys/fs/coda/coda_venus.c#5 integrate
.. //depot/projects/dtrace/src/sys/fs/procfs/procfs.c#8 integrate
.. //depot/projects/dtrace/src/sys/fs/procfs/procfs_map.c#7 integrate
.. //depot/projects/dtrace/src/sys/fs/unionfs/union_vfsops.c#14 integrate
.. //depot/projects/dtrace/src/sys/kern/init_sysent.c#36 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_descrip.c#35 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_exec.c#34 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_proc.c#28 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_sig.c#30 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_thr.c#26 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_thread.c#28 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_sleepqueue.c#22 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_smp.c#16 integrate
.. //depot/projects/dtrace/src/sys/kern/sys_process.c#19 integrate
.. //depot/projects/dtrace/src/sys/kern/syscalls.c#35 integrate
.. //depot/projects/dtrace/src/sys/kern/syscalls.master#27 integrate
.. //depot/projects/dtrace/src/sys/kern/systrace_args.c#32 integrate
.. //depot/projects/dtrace/src/sys/kern/tty_pts.c#14 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_export.c#11 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_lookup.c#19 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_mount.c#41 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_subr.c#47 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_syscalls.c#29 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_vnops.c#21 integrate
.. //depot/projects/dtrace/src/sys/kgssapi/gss_accept_sec_context.c#1 branch
.. //depot/projects/dtrace/src/sys/kgssapi/gss_acquire_cred.c#1 branch
.. //depot/projects/dtrace/src/sys/kgssapi/gss_add_oid_set_member.c#1 branch
.. //depot/projects/dtrace/src/sys/kgssapi/gss_canonicalize_name.c#1 branch
.. //depot/projects/dtrace/src/sys/kgssapi/gss_create_empty_oid_set.c#1 branch
.. //depot/projects/dtrace/src/sys/kgssapi/gss_delete_sec_context.c#1 branch
.. //depot/projects/dtrace/src/sys/kgssapi/gss_display_status.c#1 branch
.. //depot/projects/dtrace/src/sys/kgssapi/gss_export_name.c#1 branch
.. //depot/projects/dtrace/src/sys/kgssapi/gss_get_mic.c#1 branch
.. //depot/projects/dtrace/src/sys/kgssapi/gss_impl.c#1 branch
.. //depot/projects/dtrace/src/sys/kgssapi/gss_import_name.c#1 branch
.. //depot/projects/dtrace/src/sys/kgssapi/gss_init_sec_context.c#1 branch
.. //depot/projects/dtrace/src/sys/kgssapi/gss_names.c#1 branch
.. //depot/projects/dtrace/src/sys/kgssapi/gss_pname_to_uid.c#1 branch
.. //depot/projects/dtrace/src/sys/kgssapi/gss_release_buffer.c#1 branch
.. //depot/projects/dtrace/src/sys/kgssapi/gss_release_cred.c#1 branch
.. //depot/projects/dtrace/src/sys/kgssapi/gss_release_name.c#1 branch
.. //depot/projects/dtrace/src/sys/kgssapi/gss_release_oid_set.c#1 branch
.. //depot/projects/dtrace/src/sys/kgssapi/gss_set_cred_option.c#1 branch
.. //depot/projects/dtrace/src/sys/kgssapi/gss_test_oid_set_member.c#1 branch
.. //depot/projects/dtrace/src/sys/kgssapi/gss_unwrap.c#1 branch
.. //depot/projects/dtrace/src/sys/kgssapi/gss_verify_mic.c#1 branch
.. //depot/projects/dtrace/src/sys/kgssapi/gss_wrap.c#1 branch
.. //depot/projects/dtrace/src/sys/kgssapi/gss_wrap_size_limit.c#1 branch
.. //depot/projects/dtrace/src/sys/kgssapi/gssapi.h#1 branch
.. //depot/projects/dtrace/src/sys/kgssapi/gssapi_impl.h#1 branch
.. //depot/projects/dtrace/src/sys/kgssapi/gssd.x#1 branch
.. //depot/projects/dtrace/src/sys/kgssapi/gssd_prot.c#1 branch
.. //depot/projects/dtrace/src/sys/kgssapi/gsstest.c#1 branch
.. //depot/projects/dtrace/src/sys/kgssapi/kgss_if.m#1 branch
.. //depot/projects/dtrace/src/sys/kgssapi/krb5/kcrypto.c#1 branch
.. //depot/projects/dtrace/src/sys/kgssapi/krb5/kcrypto.h#1 branch
.. //depot/projects/dtrace/src/sys/kgssapi/krb5/kcrypto_aes.c#1 branch
.. //depot/projects/dtrace/src/sys/kgssapi/krb5/kcrypto_arcfour.c#1 branch
.. //depot/projects/dtrace/src/sys/kgssapi/krb5/kcrypto_des.c#1 branch
.. //depot/projects/dtrace/src/sys/kgssapi/krb5/kcrypto_des3.c#1 branch
.. //depot/projects/dtrace/src/sys/kgssapi/krb5/krb5_mech.c#1 branch
.. //depot/projects/dtrace/src/sys/modules/Makefile#57 integrate
.. //depot/projects/dtrace/src/sys/modules/kgssapi/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/kgssapi_krb5/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/nfsclient/Makefile#4 integrate
.. //depot/projects/dtrace/src/sys/modules/nfsserver/Makefile#4 integrate
.. //depot/projects/dtrace/src/sys/modules/snp/Makefile#4 integrate
.. //depot/projects/dtrace/src/sys/modules/usb2/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/bluetooth/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/bluetooth_fw/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/bluetooth_ng/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/controller/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/controller_at91dci/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/controller_ehci/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/controller_musb/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/controller_ohci/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/controller_uhci/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/controller_uss820dci/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/core/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/ethernet/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/ethernet_aue/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/ethernet_axe/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/ethernet_cdce/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/ethernet_cue/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/ethernet_dav/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/ethernet_kue/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/ethernet_rue/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/image/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/input/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/input_hid/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/input_kbd/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/input_ms/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/misc/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/misc_dbp/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/misc_fm/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/ndis/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/quirk/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/scanner/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/serial/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/serial_ark/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/serial_bsa/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/serial_bser/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/serial_chcom/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/serial_cycom/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/serial_foma/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/serial_ftdi/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/serial_gensa/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/serial_ipaq/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/serial_lpt/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/serial_mct/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/serial_modem/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/serial_moscom/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/serial_plcom/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/serial_visor/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/serial_vscom/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/sound/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/storage/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/storage_ata/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/storage_fs/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/storage_mass/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/storage_rio/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/template/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/wlan/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/wlan_ral/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/wlan_rum/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/usb2/wlan_zyd/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/zfs/Makefile#9 integrate
.. //depot/projects/dtrace/src/sys/net/if_arcsubr.c#6 integrate
.. //depot/projects/dtrace/src/sys/net/if_gif.c#14 integrate
.. //depot/projects/dtrace/src/sys/net/if_spppsubr.c#11 integrate
.. //depot/projects/dtrace/src/sys/net/if_tun.c#14 integrate
.. //depot/projects/dtrace/src/sys/net/radix_mpath.c#5 integrate
.. //depot/projects/dtrace/src/sys/netsmb/smb_dev.c#7 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/nfs.h#10 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/nfs_krpc.c#1 branch
.. //depot/projects/dtrace/src/sys/nfsclient/nfs_socket.c#20 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/nfs_subs.c#17 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/nfs_vfsops.c#27 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/nfsmount.h#7 integrate
.. //depot/projects/dtrace/src/sys/nfsserver/nfs.h#9 integrate
.. //depot/projects/dtrace/src/sys/nfsserver/nfs_fha.c#1 branch
.. //depot/projects/dtrace/src/sys/nfsserver/nfs_fha.h#1 branch
.. //depot/projects/dtrace/src/sys/nfsserver/nfs_serv.c#16 integrate
.. //depot/projects/dtrace/src/sys/nfsserver/nfs_srvcache.c#8 integrate
.. //depot/projects/dtrace/src/sys/nfsserver/nfs_srvkrpc.c#1 branch
.. //depot/projects/dtrace/src/sys/nfsserver/nfs_srvsock.c#12 integrate
.. //depot/projects/dtrace/src/sys/nfsserver/nfs_srvsubs.c#14 integrate
.. //depot/projects/dtrace/src/sys/nfsserver/nfs_syscalls.c#14 integrate
.. //depot/projects/dtrace/src/sys/nfsserver/nfsm_subs.h#6 integrate
.. //depot/projects/dtrace/src/sys/nfsserver/nfsrvcache.h#5 integrate
.. //depot/projects/dtrace/src/sys/nlm/nlm.h#3 integrate
.. //depot/projects/dtrace/src/sys/nlm/nlm_advlock.c#3 integrate
.. //depot/projects/dtrace/src/sys/nlm/nlm_prot_impl.c#13 integrate
.. //depot/projects/dtrace/src/sys/nlm/nlm_prot_svc.c#3 integrate
.. //depot/projects/dtrace/src/sys/rpc/auth.h#2 integrate
.. //depot/projects/dtrace/src/sys/rpc/auth_none.c#2 integrate
.. //depot/projects/dtrace/src/sys/rpc/auth_unix.c#5 integrate
.. //depot/projects/dtrace/src/sys/rpc/clnt.h#3 integrate
.. //depot/projects/dtrace/src/sys/rpc/clnt_dg.c#4 integrate
.. //depot/projects/dtrace/src/sys/rpc/clnt_rc.c#6 integrate
.. //depot/projects/dtrace/src/sys/rpc/clnt_vc.c#4 integrate
.. //depot/projects/dtrace/src/sys/rpc/replay.c#1 branch
.. //depot/projects/dtrace/src/sys/rpc/replay.h#1 branch
.. //depot/projects/dtrace/src/sys/rpc/rpc_com.h#2 integrate
.. //depot/projects/dtrace/src/sys/rpc/rpc_generic.c#4 integrate
.. //depot/projects/dtrace/src/sys/rpc/rpc_msg.h#2 integrate
.. //depot/projects/dtrace/src/sys/rpc/rpc_prot.c#2 integrate
.. //depot/projects/dtrace/src/sys/rpc/rpcsec_gss.h#1 branch
.. //depot/projects/dtrace/src/sys/rpc/rpcsec_gss/rpcsec_gss.c#1 branch
.. //depot/projects/dtrace/src/sys/rpc/rpcsec_gss/rpcsec_gss_conf.c#1 branch
.. //depot/projects/dtrace/src/sys/rpc/rpcsec_gss/rpcsec_gss_int.h#1 branch
.. //depot/projects/dtrace/src/sys/rpc/rpcsec_gss/rpcsec_gss_misc.c#1 branch
.. //depot/projects/dtrace/src/sys/rpc/rpcsec_gss/rpcsec_gss_prot.c#1 branch
.. //depot/projects/dtrace/src/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c#1 branch
.. //depot/projects/dtrace/src/sys/rpc/svc.c#3 integrate
.. //depot/projects/dtrace/src/sys/rpc/svc.h#2 integrate
.. //depot/projects/dtrace/src/sys/rpc/svc_auth.c#2 integrate
.. //depot/projects/dtrace/src/sys/rpc/svc_auth.h#2 integrate
.. //depot/projects/dtrace/src/sys/rpc/svc_auth_unix.c#3 integrate
.. //depot/projects/dtrace/src/sys/rpc/svc_dg.c#3 integrate
.. //depot/projects/dtrace/src/sys/rpc/svc_generic.c#3 integrate
.. //depot/projects/dtrace/src/sys/rpc/svc_vc.c#4 integrate
.. //depot/projects/dtrace/src/sys/rpc/xdr.h#2 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit_arg.c#17 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit_bsm_klib.c#15 integrate
.. //depot/projects/dtrace/src/sys/sys/mount.h#15 integrate
.. //depot/projects/dtrace/src/sys/sys/proc.h#51 integrate
.. //depot/projects/dtrace/src/sys/sys/syscall.h#33 integrate
.. //depot/projects/dtrace/src/sys/sys/syscall.mk#33 integrate
.. //depot/projects/dtrace/src/sys/sys/sysent.h#13 integrate
.. //depot/projects/dtrace/src/sys/sys/sysproto.h#33 integrate
.. //depot/projects/dtrace/src/sys/tools/vnode_if.awk#5 integrate
.. //depot/projects/dtrace/src/sys/ufs/ufs/ufs_acl.c#5 integrate
.. //depot/projects/dtrace/src/sys/ufs/ufs/ufs_dirhash.c#7 integrate
.. //depot/projects/dtrace/src/sys/xdr/xdr_mbuf.c#2 integrate
.. //depot/projects/dtrace/src/tools/regression/kgssapi/Makefile#1 branch
.. //depot/projects/dtrace/src/tools/regression/kgssapi/gsstest.c#1 branch
.. //depot/projects/dtrace/src/tools/regression/rpcsec_gss/Makefile#1 branch
.. //depot/projects/dtrace/src/tools/regression/rpcsec_gss/rpctest.c#1 branch
.. //depot/projects/dtrace/src/usr.bin/du/du.c#8 integrate
.. //depot/projects/dtrace/src/usr.bin/fstat/zfs/Makefile#6 integrate
.. //depot/projects/dtrace/src/usr.bin/tar/test/main.c#5 integrate
.. //depot/projects/dtrace/src/usr.bin/vmstat/vmstat.c#11 integrate
.. //depot/projects/dtrace/src/usr.sbin/Makefile#34 integrate
.. //depot/projects/dtrace/src/usr.sbin/gssd/Makefile#1 branch
.. //depot/projects/dtrace/src/usr.sbin/gssd/gssd.8#1 branch
.. //depot/projects/dtrace/src/usr.sbin/gssd/gssd.c#1 branch
.. //depot/projects/dtrace/src/usr.sbin/mountd/exports.5#6 integrate
.. //depot/projects/dtrace/src/usr.sbin/mountd/mountd.c#14 integrate
.. //depot/projects/dtrace/src/usr.sbin/nfsd/nfsd.c#4 integrate
.. //depot/projects/dtrace/src/usr.sbin/usbconfig/Makefile#1 branch
.. //depot/projects/dtrace/src/usr.sbin/usbconfig/dump.c#1 branch
.. //depot/projects/dtrace/src/usr.sbin/usbconfig/dump.h#1 branch
.. //depot/projects/dtrace/src/usr.sbin/usbconfig/usbconfig.8#1 branch
.. //depot/projects/dtrace/src/usr.sbin/usbconfig/usbconfig.c#1 branch

Differences ...

==== //depot/projects/dtrace/src/cddl/Makefile.inc#11 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/Makefile.inc,v 1.4 2008/03/27 23:21:23 jb Exp $
+# $FreeBSD: src/cddl/Makefile.inc,v 1.5 2008/11/05 19:35:09 rodrigc Exp $
 
 OPENSOLARIS_USR_DISTDIR= ${.CURDIR}/../../../cddl/contrib/opensolaris
 OPENSOLARIS_SYS_DISTDIR= ${.CURDIR}/../../../sys/cddl/contrib/opensolaris

==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c#7 (text) ====


==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst#4 (text+ko) ====


==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c#8 (text) ====


==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c#8 (text) ====


==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c#7 (text) ====


==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.h#7 (text) ====


==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_program.c#7 (text) ====


==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h#7 (text) ====


==== //depot/projects/dtrace/src/etc/defaults/rc.conf#42 (text+ko) ====

@@ -15,7 +15,7 @@
 # For a more detailed explanation of all the rc.conf variables, please
 # refer to the rc.conf(5) manual page.
 #
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.345 2008/09/16 20:18:25 thompsa Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.346 2008/11/05 10:20:33 keramida Exp $
 
 ##############################################################
 ###  Important initial Boot-time options  ####################
@@ -265,6 +265,9 @@
 kpasswdd_server_enable="NO"	# Run kpasswdd (or NO)
 kpasswdd_server="/usr/libexec/kpasswdd"	# path to kerberos 5 passwd daemon
 
+gssd_enable="NO"		# Run the gssd daemon (or NO).
+gssd_flags=""			# Flags for gssd.
+
 rwhod_enable="NO"		# Run the rwho daemon (or NO).
 rwhod_flags=""			# Flags for rwhod
 rarpd_enable="NO"		# Run rarpd (or NO).

==== //depot/projects/dtrace/src/etc/devd.conf#9 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/devd.conf,v 1.43 2008/10/27 16:20:40 thompsa Exp $
+# $FreeBSD: src/etc/devd.conf,v 1.45 2008/11/04 23:03:36 delphij Exp $
 #
 # Refer to devd.conf(5) and devd(8) man pages for the details on how to
 # run and configure devd.
@@ -255,6 +255,28 @@
 	action "/etc/rc.resume acpi $notify";
 };
 
+# The next blocks enable volume hotkeys that can be found on the Asus laptops
+notify 0 {
+	match "system"		"ACPI";
+	match "subsystem"	"ASUS";
+	match "notify"		"0x32";
+	action			"mixer 0";
+};
+
+notify 0 {
+	match "system"		"ACPI";
+	match "subsystem"	"ASUS";
+	match "notify"		"0x31";
+	action			"mixer vol -10";
+};
+
+notify 0 {
+	match "system"		"ACPI";
+	match "subsystem"	"ASUS";
+	match "notify"		"0x30";
+	action			"mixer vol +10";
+};
+
 # The next blocks enable volume hotkeys that can be found on the Asus EeePC
 # The four keys above the keyboard notify 0x1a through to 0x1d respectively
 notify 0 {

==== //depot/projects/dtrace/src/etc/gss/mech#6 (text+ko) ====

@@ -1,6 +1,6 @@
-# $FreeBSD: src/etc/gss/mech,v 1.3 2008/05/07 13:53:02 dfr Exp $
+# $FreeBSD: src/etc/gss/mech,v 1.4 2008/11/03 10:38:00 dfr Exp $
 #
 # Name		OID			Library name			Kernel module
-kerberosv5	1.2.840.113554.1.2.2	/usr/lib/libgssapi_krb5.so.10	-
+kerberosv5	1.2.840.113554.1.2.2	/usr/lib/libgssapi_krb5.so.10	kgssapi_krb5
 spnego		1.3.6.1.5.5.2		/usr/lib/libgssapi_spnego.so.10	-
 #ntlm		1.3.6.1.4.1.311.2.2.10	/usr/lib/libgssapi_ntlm.so.10	-

==== //depot/projects/dtrace/src/etc/rc.d/Makefile#21 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/rc.d/Makefile,v 1.94 2008/08/25 16:28:54 des Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.95 2008/11/03 10:38:00 dfr Exp $
 
 .include 
 
@@ -11,7 +11,7 @@
 	dmesg dumpon \
 	early.sh encswap \
 	fsck ftp-proxy ftpd \
-	gbde geli geli2 \
+	gbde geli geli2 gssd \
 	hcsecd \
 	hostapd hostid hostname \
 	idmapd inetd initrandom \

==== //depot/projects/dtrace/src/etc/rc.d/nfsd#6 (text+ko) ====

@@ -1,10 +1,10 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/nfsd,v 1.15 2008/07/16 19:50:29 dougb Exp $
+# $FreeBSD: src/etc/rc.d/nfsd,v 1.16 2008/11/03 10:38:00 dfr Exp $
 #
 
 # PROVIDE: nfsd
-# REQUIRE: mountd
+# REQUIRE: mountd hostname gssd
 # KEYWORD: nojail shutdown
 
 . /etc/rc.subr

==== //depot/projects/dtrace/src/include/rpc/xdr.h#4 (text+ko) ====

@@ -30,7 +30,7 @@
  *
  *	from: @(#)xdr.h 1.19 87/04/22 SMI
  *	from: @(#)xdr.h	2.2 88/07/29 4.0 RPCSRC
- * $FreeBSD: src/include/rpc/xdr.h,v 1.23 2003/03/07 13:19:40 nectar Exp $
+ * $FreeBSD: src/include/rpc/xdr.h,v 1.24 2008/11/03 10:38:00 dfr Exp $
  */
 
 /*
@@ -294,10 +294,13 @@
 extern bool_t	xdr_u_short(XDR *, u_short *);
 extern bool_t	xdr_int16_t(XDR *, int16_t *);
 extern bool_t	xdr_u_int16_t(XDR *, u_int16_t *);
+extern bool_t	xdr_uint16_t(XDR *, u_int16_t *);
 extern bool_t	xdr_int32_t(XDR *, int32_t *);
 extern bool_t	xdr_u_int32_t(XDR *, u_int32_t *);
+extern bool_t	xdr_uint32_t(XDR *, u_int32_t *);
 extern bool_t	xdr_int64_t(XDR *, int64_t *);
 extern bool_t	xdr_u_int64_t(XDR *, u_int64_t *);
+extern bool_t	xdr_uint64_t(XDR *, u_int64_t *);
 extern bool_t	xdr_bool(XDR *, bool_t *);
 extern bool_t	xdr_enum(XDR *, enum_t *);
 extern bool_t	xdr_array(XDR *, char **, u_int *, u_int, u_int, xdrproc_t);

==== //depot/projects/dtrace/src/include/strings.h#6 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/include/strings.h,v 1.6 2004/07/23 07:13:35 tjr Exp $
+ * $FreeBSD: src/include/strings.h,v 1.7 2008/11/03 10:22:19 kib Exp $
  */
 
 #ifndef _STRINGS_H_
@@ -44,8 +44,10 @@
 int	 ffs(int) __pure2;
 #ifdef __BSD_VISIBLE
 int	 ffsl(long) __pure2;
+int	 ffsll(long long) __pure2;
 int	 fls(int) __pure2;
 int	 flsl(long) __pure2;
+int	 flsll(long long) __pure2;
 #endif
 char	*index(const char *, int) __pure;			/* LEGACY */
 char	*rindex(const char *, int) __pure;			/* LEGACY */

==== //depot/projects/dtrace/src/lib/libc/gen/dirname.3#5 (text+ko) ====

@@ -1,31 +1,20 @@
+.\" $OpenBSD: dirname.3,v 1.17 2007/05/31 19:19:28 jmc Exp $
 .\"
 .\" Copyright (c) 1997 Todd C. Miller 
-.\" All rights reserved.
 .\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission.
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
 .\"
-.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-.\" INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-.\" AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
-.\" THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-.\" EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-.\" PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-.\" OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-.\" WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-.\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-.\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $OpenBSD: dirname.3,v 1.9 2000/04/18 03:01:25 aaron Exp $
-.\" $FreeBSD: src/lib/libc/gen/dirname.3,v 1.9 2006/10/12 14:31:17 ru Exp $
+.\" $FreeBSD: src/lib/libc/gen/dirname.3,v 1.10 2008/11/03 05:19:45 delphij Exp $
 .\"
 .Dd October 12, 2006
 .Dt DIRNAME 3
@@ -40,8 +29,7 @@
 .Sh DESCRIPTION
 The
 .Fn dirname
-function
-is the converse of
+function is the converse of
 .Xr basename 3 ;
 it returns a pointer to the parent directory of the pathname pointed to by
 .Fa path .
@@ -108,4 +96,4 @@
 and
 .Fx 4.2 .
 .Sh AUTHORS
-.An "Todd C. Miller" Aq Todd.Miller@courtesan.com
+.An "Todd C. Miller"

==== //depot/projects/dtrace/src/lib/libc/gen/dirname.c#4 (text+ko) ====

@@ -1,37 +1,23 @@
+/*	$OpenBSD: dirname.c,v 1.13 2005/08/08 08:05:33 espie Exp $	*/
+
 /*
- * Copyright (c) 1997 Todd C. Miller 
- * All rights reserved.
+ * Copyright (c) 1997, 2004 Todd C. Miller 
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
  *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#if 0
-#ifndef lint
-static char rcsid[] = "$OpenBSD: dirname.c,v 1.4 1999/05/30 17:10:30 espie Exp $";
-#endif /* not lint */
-#endif
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/gen/dirname.c,v 1.7 2002/12/30 01:41:14 marcel Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/dirname.c,v 1.8 2008/11/03 05:19:45 delphij Exp $");
 
 #include 
 #include 
@@ -40,25 +26,26 @@
 #include 
 
 char *
-dirname(path)
-	const char *path;
+dirname(const char *path)
 {
-	static char *bname = NULL;
+	static char *dname = NULL;
+	size_t len;
 	const char *endp;
 
-	if (bname == NULL) {
-		bname = (char *)malloc(MAXPATHLEN);
-		if (bname == NULL)
+	if (dname == NULL) {
+		dname = (char *)malloc(MAXPATHLEN);
+		if (dname == NULL)
 			return(NULL);
 	}
 
 	/* Empty or NULL string gets treated as "." */
 	if (path == NULL || *path == '\0') {
-		(void)strcpy(bname, ".");
-		return(bname);
+		dname[0] = '.';
+		dname[1] = '\0';
+		return (dname);
 	}
 
-	/* Strip trailing slashes */
+	/* Strip any trailing slashes */
 	endp = path + strlen(path) - 1;
 	while (endp > path && *endp == '/')
 		endp--;
@@ -69,19 +56,22 @@
 
 	/* Either the dir is "/" or there are no slashes */
 	if (endp == path) {
-		(void)strcpy(bname, *endp == '/' ? "/" : ".");
-		return(bname);
+		dname[0] = *endp == '/' ? '/' : '.';
+		dname[1] = '\0';
+		return (dname);
 	} else {
+		/* Move forward past the separating slashes */
 		do {
 			endp--;
 		} while (endp > path && *endp == '/');
 	}
 
-	if (endp - path + 2 > MAXPATHLEN) {
+	len = endp - path + 1;
+	if (len >= MAXPATHLEN) {
 		errno = ENAMETOOLONG;
-		return(NULL);
+		return (NULL);
 	}
-	(void)strncpy(bname, path, endp - path + 1);
-	bname[endp - path + 1] = '\0';
-	return(bname);
+	memcpy(dname, path, len);
+	dname[len] = '\0';
+	return (dname);
 }

==== //depot/projects/dtrace/src/lib/libc/posix1e/acl_add_perm.3#4 (text+ko) ====

@@ -14,16 +14,16 @@
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR THE VOICES IN HIS HEAD BE
-.\" LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libc/posix1e/acl_add_perm.3,v 1.6 2002/12/18 12:45:09 ru Exp $
+.\" $FreeBSD: src/lib/libc/posix1e/acl_add_perm.3,v 1.7 2008/11/04 00:20:43 imp Exp $
 .\"
 .Dd March 10, 2001
 .Dt ACL_ADD_PERM 3

==== //depot/projects/dtrace/src/lib/libc/posix1e/acl_calc_mask.3#4 (text+ko) ====

@@ -14,16 +14,16 @@
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR THE VOICES IN HIS HEAD BE
-.\" LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libc/posix1e/acl_calc_mask.3,v 1.5 2002/12/18 12:45:09 ru Exp $
+.\" $FreeBSD: src/lib/libc/posix1e/acl_calc_mask.3,v 1.6 2008/11/04 00:20:43 imp Exp $
 .\"
 .Dd March 10, 2001
 .Dt ACL_CALC_MASK 3

==== //depot/projects/dtrace/src/lib/libc/posix1e/acl_calc_mask.c#4 (text+ko) ====

@@ -14,18 +14,18 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR THE VOICES IN HIS HEAD BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
+ * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  */
 
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_calc_mask.c,v 1.8 2002/03/22 21:52:38 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_calc_mask.c,v 1.9 2008/11/04 00:20:43 imp Exp $");
 
 #include 
 #include "namespace.h"

==== //depot/projects/dtrace/src/lib/libc/posix1e/acl_clear_perms.3#4 (text+ko) ====

@@ -14,16 +14,16 @@
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR THE VOICES IN HIS HEAD BE
-.\" LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE

>>> TRUNCATED FOR MAIL (1000 lines) <<<
From rene at FreeBSD.org  Wed Nov  5 13:53:52 2008
From: rene at FreeBSD.org (Rene Ladan)
Date: Wed Nov  5 13:53:59 2008
Subject: PERFORCE change 152550 for review
Message-ID: <200811052153.mA5LrpfU023432@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152550

Change 152550 by rene@rene_self on 2008/11/05 21:53:45

	MFen handbook/chapter.sgml -> 1.235 plus many local fixes.
	Checked whitespace, build

Affected files ...

.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml#7 edit

Differences ...

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml#7 (text+ko) ====

@@ -81,7 +81,7 @@
 
       
 	Hoe de instellingenbestanden in /etc
- 	  gebruikt worden;
+	  gebruikt worden;
       
 
       
@@ -1760,7 +1760,7 @@
 security.bsd.see_other_uids=0
     
   
-
+
   
     Optimaliseren met sysctl
 
@@ -1773,14 +1773,14 @@
     
 
     &man.sysctl.8; is een interface waarmee veranderingen gemaakt
-      kunnen worden aan een draaiend &os; systeem.  Er zijn onder meer
-      vele geavanceerde opties voor de TCP/IP stack
+      kunnen worden aan een draaiend &os;-systeem.  Er zijn onder meer
+      vele geavanceerde opties voor de TCP/IP-stack
       en het virtuele geheugensysteem, waarmee een ervaren
       systeembeheerder de systeemprestaties drastisch kan verbeteren.
-      Met &man.sysctl.8; kunnen meer dan vijfhonderd ststeemvariabelen
+      Met &man.sysctl.8; kunnen meer dan vijfhonderd systeemvariabelen
       opgevraagd en ingesteld worden.
 
-    In essentie heeft &man.sysctl.8; twee funkties: het lezen en
+    In essentie heeft &man.sysctl.8; twee functies: het lezen en
       wijzigen van systeeminstellingen.
 
     Om alle leesbare variabelen te tonen:
@@ -1800,7 +1800,7 @@
     &prompt.root; sysctl kern.maxfiles=5000
 kern.maxfiles: 2088 -> 5000
 
-    Waarden van sysctl variabelen zijn doorgaans strings (tekst),
+    Waarden van sysctl-variabelen zijn doorgaans strings (tekst),
       getallen of booleans (1 als waar,
       0 als onwaar).
 
@@ -1823,28 +1823,28 @@
 
     &man.sysctl.8; alleen-lezen
 
-    In sommige gevallen is het wenselijk zijn om &man.sysctl.8;
-      waarden die alleen-lezen zijn toch te wijzigen.  Hoewel dit soms
+    In sommige gevallen is het wenselijk om &man.sysctl.8;-waarden
+      die alleen-lezen zijn toch te wijzigen.  Hoewel dit soms
       onontkoombaar is, kan het alleen bij een (her)start gedaan
       worden.
 
     Op sommige laptops is bijvoorbeeld het apparaat
-      &man.cardbus.4; niet in staat om geheugenregio's af te tasten,
-      met als gevolg foutmeldingen als:
+      &man.cardbus.4; niet in staat om geheugenregio's af te tasten, met
+      als gevolg foutmeldingen als:
 
     cbb0: Could not map register memory
 device_probe_and_attach: cbb0 attach returned 12
 
     In dergelijke gevallen moeten er meestal enkele
-      &man.sysctl.8; instellingen gewijzigd worden die alleen-lezen
-      zijn en een standaardwaarde hebben.  Dit kan bereikt worden door
+      &man.sysctl.8;-instellingen gewijzigd worden die alleen-lezen zijn
+      en een standaardwaarde hebben.  Dit kan bereikt worden door
       &man.sysctl.8; OIDs in de lokale
       /boot/loader.conf te zetten.
       Standaardinstellingen staan in
       /boot/defaults/loader.conf.
 
     Om het bovenstaande probleem op te lossen moet in
-      in /boot/loader.conf/boot/loader.conf
       hw.pci.allow_unsupported_io_range=1 ingesteld
       worden.  Dan werkt &man.cardbus.4; wel goed.
     
@@ -1854,34 +1854,34 @@
     Harde schijven optimaliseren
 
     
-      Sysctl variabelen
+      Sysctl-variabelen
 
       
 	<varname>vfs.vmiodirenable</varname>
 
 	vfs.vmiodirenable
 
-	De sysctl variabele vfs.vmiodirenable
+	De sysctl-variabele vfs.vmiodirenable
 	  kan de waarde 0 (uit) of 1 (aan) hebben.  De standaardwaarde
-	  is 1.  Deze variabele bepaalt hoe mappen door het systeem
-	  in een cache bewaard worden.  De meeste mappen zijn
-	  klein en gebruiken slechts een klein fragment (typisch
-	  1 K) in het bestandssysteem en nog minder (typisch
-	  512 bytes) in de buffercache.  Als deze variabele
-	  uit staat (op 0) bewaart de buffercache slechts een bepaald
-	  aantal mappen in de cache, ook al is er een overvloed aan
-	  geheugen beschikbaar.  Wanneer deze aan staat (op 1), wordt
-	  de VM pagecache gebruikt, waardoor voor het cachen van mappen
-	  al het geheugen kan worden gebruikt.  Het is echter wel zo
-	  dat het minimale in-core geheugen dat gebruikt wordt om een
-	  map te cachen in dat geval de fysieke pagegrootte is
-	  (typisch 4 K) in plaats van 512  bytes.  Het is aan
-	  te raden deze optie aan te laten staat als gebruik gemaakt
-	  worden van diensten die met grote aantallen bestanden werken,
-	  zoals webcaches, grote mailsystemen en newsservers.  Als deze
-	  optie aan blijft staan, verlaagt die de prestaties niet, ook
-	  al kost het meer geheugen.  Door experimenteren is dit voor
-	  een systeem na te gaan.
+	  is 1.  Deze variabele bepaalt hoe mappen door het systeem in
+	  een cache bewaard worden.  De meeste mappen zijn klein en
+	  gebruiken slechts een klein fragment (typisch 1 K) in het
+	  bestandssysteem en nog minder (typisch 512 bytes) in de
+	  buffercache.  Als deze variabele uit staat (op 0) bewaart de
+	  buffercache slechts een bepaald aantal mappen in de cache, ook
+	  al is er een overvloed aan geheugen beschikbaar.  Wanneer deze
+	  aan staat (op 1), wordt de VM paginacache gebruikt, waardoor
+	  voor het cachen van mappen al het geheugen kan worden
+	  gebruikt.  Het is echter wel zo dat het minimale in-core
+	  geheugen dat gebruikt wordt om een map te cachen in dat geval
+	  de fysieke paginagrootte is (typisch 4 K) in plaats van
+	  512  bytes.  Het is aan te raden deze optie aan te laten
+	  staan als gebruik gemaakt wordt van diensten die met grote
+	  aantallen bestanden werken, zoals webcaches, grote
+	  mailsystemen en newsservers.  Als deze optie aan blijft staan,
+	  verlaagt die de prestaties niet, ook al kost het meer
+	  geheugen.  Door experimenteren is dit voor een systeem na te
+	  gaan.
       
 
      
@@ -1889,16 +1889,16 @@
 
 	vfs.write_behind
 
-	De sysctl variabele vfs.write_behind
+	De sysctl-variabele vfs.write_behind
 	  staat standaard aan (1).  Dit betekent dat
-	  het bestandssysteem gegevens naar het medium gaat schrijven
-	  op het moment dat er een volledig cluster aan data verzameld
+	  het bestandssysteem gegevens naar het medium gaat schrijven op
+	  het moment dat er een volledig cluster aan gegevens verzameld
 	  is.  Dit is meestal het geval bij het schrijven van grote
 	  sequentiële bestanden.  Het idee is om te voorkomen dat
 	  de buffercache verzadigd raakt met vuile buffers zonder dat
-	  dit bijdraagt aan de I/O prestaties.  Dit kan echter
-	  processen ophouden en onder sommige omstandigheden is het
-	  wellicht beter deze sysctl uit te zetten.
+	  dit bijdraagt aan de I/O-prestaties.  Dit kan echter processen
+	  ophouden en onder sommige omstandigheden is het wellicht beter
+	  deze sysctl uit te zetten.
       
 
       
@@ -1906,20 +1906,20 @@
 
 	vfs.hirunningspace
 
-	De sysctl variabele vfs.hirunningspace
+	De sysctl-variabele vfs.hirunningspace
 	  bepaalt hoeveel nog te schrijven gegevens er in het complete
 	  systeem op elk moment in de wachtrij naar schijfcontrollers
 	  mag staan.  De standaardwaarde is meestal voldoende, maar op
-	  machines met veel schijven, is het beter deze te verhogen
-	  naar vier of vijf megabyte.  Het
-	  instellen van een te hoge waarde (groter dan de
-	  schrijfdrempel van de buffercache) kan leiden tot zeer
-	  slechte prestaties bij clustering.  Stel deze waarde niet
-	  arbitrair hoog in!  Hogere schrijfwaarden kunnen vertraging
-	  veroorzaken in het lezen, als dit tegelijk plaatsvindt.
+	  machines met veel schijven, is het beter deze te verhogen naar
+	  vier of vijf megabyte.  Het instellen van
+	  een te hoge waarde (groter dan de schrijfdrempel van de
+	  buffercache) kan leiden tot zeer slechte prestaties bij
+	  clustering.  Stel deze waarde niet arbitrair hoog in!  Hogere
+	  schrijfwaarden kunnen vertraging veroorzaken in het lezen, als
+	  dit tegelijk plaatsvindt.
 
-	Er zijn verscheidene andere sysctls voor buffercache en
-	  VM pagecache.  Het wordt afgeraden deze te wijzigen.  Het
+	Er zijn verscheidene andere sysctl's voor buffercache en
+	  VM-pagecache.  Het wordt afgeraden deze te wijzigen.  Het
 	  VM-systeem is zeer goed in staat zichzelf automatisch te
 	  optimaliseren.
       
@@ -1929,14 +1929,14 @@
 
 	vm.swap_idle_enabled
 
-	De sysctl variabele
+	De sysctl-variabele
 	  vm.swap_idle_enabled is nuttig in grote
-	  multi-user systemen met veel gebruikers die af- en aanmelden
+	  meergebruikersystemen met veel gebruikers die af- en aanmelden
 	  en veel onbenutte processen.  Dergelijke systemen hebben de
 	  neiging om voortdurend de vrije geheugenreserves onder druk
 	  te zetten.  Het is mogelijk om de prioriteit van
-	  geheugenpages die verband houden met onbenutte processen
-	  sneller te laten dalen dan met het normale pageout algoritme,
+	  geheugenpagina's die verband houden met onbenutte processen
+	  sneller te laten dalen dan met het normale pageout-algoritme,
 	  door deze sysctl aan te zetten en via
 	  vm.swap_idle_threshold1 en
 	  vm.swap_idle_threshold2 de swapout
@@ -1947,7 +1947,7 @@
 	  wisselbestand- en schijfbandbreedte kost.  In een klein
 	  systeem heeft deze optie een voorspelbaar effect, maar in
 	  grote systemen waar al sprake is van een matige paging kan
-	  deze optie het mogelijk maken voor het VM systeem om hele
+	  deze optie het mogelijk maken voor het VM-systeem om hele
 	  processen gemakkelijk in en uit het geheugen te halen.
       
 
@@ -1957,25 +1957,25 @@
 	hw.ata.wc
 
 	Ten tijde van &os; 4.3 is er geflirt met het
-	  uitzetten van IDE schrijfcaching.  Hierdoor neemt de
-	  bandbraadte naar IDE schijven af, maar het werd als
+	  uitzetten van IDE-schrijfcaching.  Hierdoor neemt de
+	  bandbraadte naar IDE-schijven af, maar het werd als
 	  noodzakelijk beschouwd vanwege ernstige problemen met
 	  gegevensinconsistentie die door harde schijfproducenten
-	  geëintroduceerd waren.  Het probleem is dat IDE schijven
+	  geëintroduceerd waren.  Het probleem is dat IDE-schijven
 	  niet de waarheid vertellen over wanneer een schrijfactie
-	  klaar is.  Door IDE schrijfcaching wordt data niet alleen
+	  klaar is.  Door IDE-schrijfcaching wordt data niet alleen
 	  ongeordend geschreven, maar soms kan zelfs het schrijven van
-	  sommige blokken voortdurend uitgesteld worden als er sprake
-	  is van een hoge schijfbelasting.  Een crash of stroomstoring
-	  kan dan ernstige corruptie van het bestandssysteem
-	  veroorzaken.  Daarom werd de standaardinstelling van &os;
-	  voor alle zekerheid gewijzigd.  Helaas was het resultaat een
-	  groot verlies aan prestaties en na die release is de
-	  standaardwaarde weer terug veranderd.  Met de sysctl
-	  variabele hw.ata.wc kan gecontroleerd
-	  worden of schrijfcaching aan of uit staat.  Als
-	  schrijfcaching uit staat, het die weer aangezet worden door
-	  hw.ata.wc naar 1 te zetten.  Aangezien dit
+	  sommige blokken voortdurend uitgesteld worden als er sprake is
+	  van een hoge schijfbelasting.  Een crash of stroomstoring kan
+	  dan ernstige corruptie aan het bestandssysteem veroorzaken.
+	  Daarom werd de standaardinstelling van &os; voor alle
+	  zekerheid gewijzigd.  Helaas was het resultaat een groot
+	  verlies aan prestaties en na die uitgave is de
+	  standaardwaarde weer terug veranderd.  Met de sysctl-variabele
+	  hw.ata.wc kan gecontroleerd worden of
+	  schrijfcaching aan of uit staat.  Als schrijfcaching uit
+	  staat, kan het die weer aangezet worden door
+	  hw.ata.wc op 1 te zetten.  Aangezien dit
 	  een kernelvariabele is, moet deze ingesteld worden vanuit de
 	  bootloader tijdens het opstarten.  Nadat de kernel eenmaal
 	  opgestart is, heeft het wijzigen van deze sysctl geen
@@ -1996,10 +1996,10 @@
 	  SCSI_DELAY
 	
 
-	De SCSI_DELAY kernelinstelling kan
+	De kernelinstelling SCSI_DELAY kan
 	  gebruikt worden om de opstarttijd te versnellen.  De
 	  standaardwaarde is nogal hoog en kan 15
-	  seconden vertraging veroorzaken.  Met modernere SCSI systemen
+	  seconden vertraging veroorzaken.  Met modernere SCSI-systemen
 	  is 5 seconden al voldoende.  Nieuwere
 	  versies van &os; (5.0 en hoger) gebruiken de opstartvariabele
 	  kern.cam.scsi_delay.  Zowel deze als de
@@ -2026,26 +2026,26 @@
 &prompt.root; tunefs -n disable /filesystem
 
       Een bestandssysteem kan niet met &man.tunefs.8; gewijzigd
-	worden als het gemount is.  Softupdates aanzetten wordt dus in
-	het algemeen gedaan vanuit single-user modus, voordat partities
-	gemount zijn.
+	worden als het aangekoppeld is.  Softupdates aanzetten wordt dus
+	in het algemeen gedaan vanuit enkelegebruikermodus, voordat
+	partities aangekoppeld zijn.
 
       Softupdates zorgen voor een drastische verbetering van de
-	meta-data prestaties, met name het aanmaken en verwijderen van
-	bestanden, door gebruik van een geheugencache.  Het wordt dan
-	ook aangeraden om op alle bestandssystemen softupdates te
-	gebruiken.  Er zijn twee nadelen aan softupdates: softupdates
-	garandeert een consistent bestandssysteem in geval van een
-	crash, maar het kan makkelijk enkele seconden (zelfs een
-	minuut) achter liggen met het daadwerkelijk bijwerken op de
-	fysieke harde schijf.  Als een systeem crasht wordt wellicht
-	meer werk verloren dan anders het geval zou zijn.  Daarnaast
-	vertraagt softupdates het vrijgeven van bestandssysteemblokken.
-	Als een bestandssysteem (zoals de root partitie) bijna vol is,
-	dan kan het verrichten van een grote update, zoals
-	make installworld, ertoe leiden dat het
-	bestandssysteem ruimtegebrek krijgt en dat daardoor de operatie
-	mislukt.
+	prestaties met betrekking tot metagegevens, met name het
+	aanmaken en verwijderen van bestanden, door gebruik van een
+	geheugencache.  Het wordt dan ook aangeraden om op alle
+	bestandssystemen softupdates te gebruiken.  Er zijn twee nadelen
+	aan softupdates: softupdates garanderen een consistent
+	bestandssysteem in geval van een crash, maar het kan makkelijk
+	enkele seconden (zelfs een minuut) achter liggen met het
+	daadwerkelijk bijwerken op de fysieke harde schijf.  Als een
+	systeem crasht gaat wellicht meer werk verloren dan anders het
+	geval zou zijn.  Daarnaast vertragen softupdates het vrijgeven
+	van bestandssysteemblokken.  Als een bestandssysteem (zoals de
+	rootpartitie) bijna vol is, dan kan het verrichten van een grote
+	update, zoals make installworld, ertoe leiden
+	dat het bestandssysteem ruimtegebrek krijgt en dat daardoor de
+	operatie mislukt.
 
       
 	Meer over softupdates
@@ -2056,56 +2056,57 @@
 	  details
 	
 
-	Er zijn traditioneel twee methodes om de metadata van een
-	  bestandssysteem terug naar de schijf te schrijven.  Het
-	  bijwerken van metadata houdt het bijwerken van van
-	  niet-inhoudelijke data zoals inodes of mappen in.
+	Er zijn traditioneel twee methodes om de metagegevens van
+	  een bestandssysteem terug naar de schijf te schrijven.  Het
+	  bijwerken van metagegevens houdt het bijwerken van van
+	  niet-inhoudelijke gegevens zoals inodes of mappen in.
 
-	Historisch gezien was het gebruikelijk om metadataupdates
-	  synchroon weg te schrijven.  Als een map bijvoorbeeld
-	  gewijzigd was, wachtte het systeem totdat de verandering
-	  daadwerkelijk naar de schijf geschreven was.  De databuffers
-	  (de inhoud van een bestand) werden doorgeschoven naar de
-	  buffercache en op een later moment asynchroon op de schijf
-	  opgeslagen.  Het voordeel van deze benadering is dat ze
-	  altijd veilig is.  Als het systeem faalt tijdens het
-	  bijwerken, is de metadata nog altijd consistent.  Een bestand
-	  kan volledig gecreëerd zijn of helemaal niet.  Als de
-	  datablokken van een bestand nog niet van de buffercache naar
-	  de schijf geschreven zijn ten tijde van de crash, is
-	  &man.fsck.8; in staat om dit te herkennen en het
-	  bestandssysteem te repareren door de lengte van het bestand
-	  nul te maken.  Deze implementatie is ook helder en eenvoudig.
-	  Het nadeel is echter dat het wijzigen van metadata een traag
-	  proces is.  Een rm -r commando benadert
-	  bijvoorbeeld alle bestanden in een map sequentiëel, maar
-	  elke mapverandering (verwijderen van een bestand) wordt
-	  synchroon naar de schijf geschreven.  Dit omvat ook het
-	  bijwerken van de map zelf, van de inodetabel en mogelijk ook
-	  van indirecte blokken die voor het bestand in kwestie
-	  zijn gealloceerd.  Gelijksoortige processen spelen zich af
-	  bij een commando als tar -x, waarbij een
-	  grote bestandshiëearchie wordt uitgepakt.
+	Historisch gezien was het gebruikelijk om updates aan
+	  metagegevens synchroon weg te schrijven.  Als een map
+	  bijvoorbeeld gewijzigd was, wachtte het systeem totdat de
+	  verandering daadwerkelijk naar de schijf geschreven was.  De
+	  gegevensbuffers (de inhoud van een bestand) werden
+	  doorgeschoven naar de buffercache en op een later moment
+	  asynchroon op de schijf opgeslagen.  Het voordeel van deze
+	  benadering is dat ze altijd veilig is.  Als het systeem faalt
+	  tijdens het bijwerken, zijn de metagegevens nog altijd
+	  consistent.  Een bestand kan volledig gecreëerd zijn of
+	  helemaal niet.  Als de gegevensblokken van een bestand nog
+	  niet van de buffercache naar de schijf geschreven zijn ten
+	  tijde van de crash, is &man.fsck.8; in staat om dit te
+	  herkennen en het bestandssysteem te repareren door de lengte
+	  van het bestand nul te maken.  Deze implementatie is ook
+	  helder en eenvoudig.  Het nadeel is echter dat het wijzigen
+	  van metagegevens een traag proces is.  Een
+	  rm -r benadert bijvoorbeeld alle bestanden
+	  in een map sequentiëel, maar elke mapverandering
+	  (verwijderen van een bestand) wordt synchroon naar de schijf
+	  geschreven.  Dit omvat ook het bijwerken van de map zelf, van
+	  de inodetabel en mogelijk ook van indirecte blokken die voor
+	  het bestand in kwestie zijn gealloceerd.  Gelijksoortige
+	  processen spelen zich af bij een commando als
+	  tar -x, waarbij een grote
+	  bestandshiëearchie wordt uitgepakt.
 
-	De tweede mogelijkheid is om het bijwerken van metadata
-	  asynchroon weg te schrijven.  Dit is standaard in
-	  &linux;/ext2fs en als een *BSD ufs bestandssysteem met
-	  mount -o async gemount is, is de werking
-	  hetzelfde.  Alle bijwerkingen aan metagegevens worden
+	De tweede mogelijkheid is om het bijwerken van
+	  metagegevens asynchroon weg te schrijven.  Dit is standaard in
+	  &linux;/ext2fs en als een *BSD UFS-bestandssysteem met
+	  mount -o async aangekoppeld is, is de
+	  werking hetzelfde.  Alle bijwerkingen aan metagegevens worden
 	  eenvoudigweg doorgegeven aan de buffercache en vermengd met
 	  inhoudelijke updates van de bestandsgegevens.  Het voordeel
-	  is een grote winst aan snelheid, omdat er niet telkens
-	  gewacht hoeft te worden op het bijwerken van metagegevens tot
-	  deze daadwerkelijk naar de schijf geschreven zijn.  De
+	  is een grote winst aan snelheid, omdat er niet telkens gewacht
+	  hoeft te worden op het bijwerken van metagegevens tot deze
+	  daadwerkelijk naar de schijf geschreven zijn.  De
 	  implementatie is ook in dit geval helder en eenvoudig.  Het
 	  grote nadeel is uiteraard dat er geen enkele garantie is voor
 	  de consistentie van het bestandssysteem.  Als het systeem
 	  faalt tijdens een operatie waarbij veel metagegevens worden
 	  bijgewerkt (bijvoorbeeld door een stroomstoring of iemand
 	  drukt op de resetknop), blijft het bestandssysteem in een
-	  onvoorspelbare toestand achter.  Er is geen mogelijkheid om
-	  de toestand van het bestandssysteem te onderzoeken als het
-	  systeem weer opstart, want de datablokken van een bestand
+	  onvoorspelbare toestand achter.  Er is geen mogelijkheid om de
+	  toestand van het bestandssysteem te onderzoeken als het
+	  systeem weer opstart, want de gegevensblokken van een bestand
 	  kunnen al weggeschreven zijn geweest terwijl het wegschrijven
 	  van bijwerkingen aan de inodetabel of de bijhorende map nog
 	  niet plaats heeft gevonden.  Het is zelfs onmogelijk om een
@@ -2119,56 +2120,56 @@
 	De gebruikelijke oplossing voor dit probleem is het
 	  implementeren van dirty region logging,
 	  ook wel journaling genoemd, hoewel deze
-	  term niet consistent gebruikt wordt en soms ook wordt
-	  gebruikt voor andere vormen van transactielogging.  Het
-	  bijwerken van metagegevens wordt nog steeds synchroon
-	  geschreven, maar slechts naar een klein gebied van de schijf.
-	  Later worden ze dan naar de juiste locatie verplaatst.  Omdat
-	  het loggebied klein is, hoeven de koppen van de schijf zelfs
-	  tijdens schrijfintensieve operaties nog maar over een kleine
-	  fysieke afstand te bewegen en door deze snellere respons zijn
-	  dit soort operaties sneller dan op de traditionele manier.
-	  De extra complexiteit van de implementatie is nogal beperkt,
-	  dus het risico van introductie van extra bugs valt mee.  Een
+	  term niet consistent gebruikt wordt en soms ook wordt gebruikt
+	  voor andere vormen van transactielogging.  Het bijwerken van
+	  metagegevens wordt nog steeds synchroon geschreven, maar
+	  slechts naar een klein gebied van de schijf.  Later worden ze
+	  dan naar de juiste locatie verplaatst.  Omdat het loggebied
+	  klein is, hoeven de koppen van de schijf zelfs tijdens
+	  schrijfintensieve operaties nog maar over een kleine fysieke
+	  afstand te bewegen en door deze snellere respons zijn dit
+	  soort operaties sneller dan op de traditionele manier.  De
+	  extra complexiteit van de implementatie is nogal beperkt, dus
+	  het risico van introductie van extra bugs valt mee.  Een
 	  nadeel is dat alle metagegevens tweemaal geschreven worden
 	  (eerst naar het loggebied en later nog eens naar de
 	  definitieve locatie).  Dus bij normaal gebruik kan er sprake
 	  zijn van wat men wel noemt een performance
 	    pessimization.  Anderzijds kunnen in geval van een
 	  crash alle nog uitstaande metagegevensoperaties snel worden
-	  teruggedraaid of vanuit het loggebied alsnog worden
-	  afgemaakt, wanneer de machine weer opstart.  Het
-	  bestandssysteem start dan snel op.
+	  teruggedraaid of vanuit het loggebied alsnog worden afgemaakt
+	  wanneer de machine weer opstart.  Het bestandssysteem start
+	  dan snel op.
 
 	Kirk McKusick, de vader van het Berkeley FFS, loste dit
 	  probleem op met softupdates, wat betekent dat alle uitstaande
 	  acties voor het bijwerken van metagegevens in het geheugen
 	  bewaard worden en dan geordend naar de schijf geschreven
 	  worden.  Dit heeft het gevolg dat in geval van intensieve
-	  operaties met betrekking tot metagegevens, latere
-	  bijwerkingen aan een item eerdere bewerkingen opvangen
+	  operaties met betrekking tot metagegevens, latere bijwerkingen
+	  aan een item eerdere bewerkingen opvangen
 	  (catch) als deze nog in het geheugen zitten en
-	  nog niet weggeschreven waren.  Dus alle operaties,
-	  op bijvoorbeeld een map, worden in het algemeen eerst in het
+	  nog niet weggeschreven waren.  Dus alle operaties, op
+	  bijvoorbeeld een map, worden in het algemeen eerst in het
 	  geheugen uitgevoerd voordat er wordt bijgewerkt naar schijf.
-	  De datablokken worden geordend conform hun positie, zodat ze
-	  nooit weggeschreven worden voordat hun metagegevens
+	  De gegevensblokken worden geordend conform hun positie, zodat
+	  ze nooit weggeschreven worden voordat hun metagegevens
 	  geschreven zijn.  Als het systeem een crash ondervindt,
 	  veroorzaakt dat impliciet het terugdraaien van uitstaande
 	  operaties (log rewind): alle operaties die nog
 	  niet weggeschreven waren lijken nooit gebeurd te zijn.  Zo
 	  wordt een consistent bestandssysteem in stand gehouden dat
 	  eruit ziet alsof het 30 tot 60 seconden eerder was.  Het
-	  gebruikte algoritme garandeert dat alle bronnen die in
-	  gebruik zijn als zodanig gemarkeerd worden in hun daarvoor
-	  geschikte bitmaps: blokken en inodes.  Na een crash is de
-	  enige allocatiefout die kan optreden dat bronnen gemarkeerd
-	  kunnen zijn als in gebruik (used), terwijl ze
+	  gebruikte algoritme garandeert dat alle bronnen die in gebruik
+	  zijn als zodanig gemarkeerd worden in hun daarvoor geschikte
+	  bitmaps: blokken en inodes.  Na een crash is de enige
+	  allocatiefout die kan optreden dat bronnen gemarkeerd kunnen
+	  zijn als in gebruik (used), terwijl ze
 	  feitelijk alweer beschikbaar (free) zijn.
 	  &man.fsck.8; herkent deze situatie en stelt dergelijke vrij
 	  te maken bronnen opnieuw beschikbaar.  Het is volkomen veilig
-	  om na een crash te negeren dat het bestandssysteem niet
-	  schoon is en het tot mounten te dwingen met
+	  om na een crash te negeren dat het bestandssysteem niet schoon
+	  is en het tot aankoppelen te dwingen met
 	  mount -f.  Om niet langer gebruikte
 	  bronnen vrij te maken moet later &man.fsck.8; uitgevoerd
 	  worden.  Dit is dan ook het idee achter background
@@ -2176,38 +2177,39 @@
 	  opstarten is, wordt er alleen een
 	  snapshot van het systeem bewaard.
 	  fsck kan later uitgevoerd worden.  Alle
-	  bestandssystemen kunnen dirty gemount worden
-	  en het systeem kan gewoon verder opstarten naar multi-user
-	  modus.  Vervolgens zijn er fscks
-	  gepland die in de achtergrond draaien voor elk
-	  bestandssysteem dat niet schoon is en waarmee bezette bronnen
-	  vrijgegeven worden.  Bestandssystemen die geen gebruik maken
-	  van softupdates moeten echter nog steeds gebruik maken van de
-	  normale fsck in de voorgrond.
+	  bestandssystemen kunnen dirty aangekoppeld
+	  worden en het systeem kan gewoon verder opstarten naar
+	  meergebruikermodus.  Vervolgens zijn er
+	  fscks gepland die in de achtergrond draaien
+	  voor elk bestandssysteem dat niet schoon is en waarmee
+	  bezette bronnen vrijgegeven worden.  Bestandssystemen die geen
+	  gebruik maken van softupdates moeten echter nog steeds gebruik
+	  maken van de normale fsck in de
+	  voorgrond.
 
 	 Het voordeel van softupdates is dat operaties op
 	   metagegevens bijna net zo snel zijn als asynchrone updates
-	   (dat wil zeggen sneller dan met
-	   logging, waarbij de metagegevens keer
-	   keer geschreven worden).  Nadelen zijn de complexiteit van
-	   de code (wat een groter risico op bugs impliceert in een
-	   gebied dat bijzonder gevoelig is voor verlies van
-	   gebruikersgegevens) en een groter geheugenverbruik.  Tevens
-	   moet de gebruiker wennen aan enkele eigenaardigheden.  Na
-	   een crash lijkt de toestand van het bestandssysteem wat
-	   ouder.  In situaties waar de standaard
-	   synchrone benadering een aantal lege bestanden zou hebben
-	   achtergelaten na fsck, is het met
-	   softupdates juist zo dat dergelijke bestanden er helemaal
-	   niet zijn, omdat de metadata of de bestandsinhoud nooit naar
-	   de schijf is geschreven.  Schijfruimte wordt pas vrijgegeven
-	   als de bijwerkingen aan metagegevens en inhoudelijke
-	   bestandsdata weggeschreven zijn, wat mogelijk pas enige tijd
-	   na het uitvoeren van rm plaatsvindt.  Dit
-	   kan problemen veroorzaken als er grote hoeveelheden data
-	   naar een bestandssysteem geschreven worden dat onvoldoende
-	   vrije ruimte heeft om alle bestanden twee keer te kunnen
-	   bevatten (bijvoorbeeld in /tmp).
+	   (dat wil zeggen sneller dan met logging,
+	   waarbij de metagegevens keer op keer geschreven worden).
+	   Nadelen zijn de complexiteit van de code (wat een groter
+	   risico op bugs impliceert in een gebied dat bijzonder
+	   gevoelig is voor verlies van gebruikersgegevens) en een
+	   groter geheugenverbruik.  Tevens moet de gebruiker wennen aan
+	   enkele eigenaardigheden.  Na een crash lijkt de toestand van
+	   het bestandssysteem wat ouder.  In situaties
+	   waar de standaard synchrone benadering een aantal lege
+	   bestanden zou hebben achtergelaten na
+	   fsck, is het met softupdates juist zo dat
+	   dergelijke bestanden er helemaal niet zijn, omdat de
+	   metagegevens of de bestandsinhoud nooit naar de schijf zijn
+	   geschreven.  Schijfruimte wordt pas vrijgegeven als de
+	   bijwerkingen aan metagegevens en inhoudelijke
+	   bestandsgegevens weggeschreven zijn, wat mogelijk pas enige
+	   tijd na het uitvoeren van rm plaatsvindt.
+	   Dit kan problemen veroorzaken als er grote hoeveelheden
+	   gegevens naar een bestandssysteem geschreven worden dat
+	   onvoldoende vrije ruimte heeft om alle bestanden twee keer te
+	   kunnen bevatten (bijvoorbeeld in /tmp).
       
     
   
@@ -2230,30 +2232,28 @@
 	kern.maxfiles
 
 	kern.maxfiles kan worden verhoogd of
-	  verlaagd, afhankelijk van de systeembehoeften.  Deze
-	  variabele geeft het maximale aantal bestandsdescriptors op
-	  een systeem.  Als de bestandsdescriptortabel vol is,.toont de
-	  systeembuffer meerdere malen file: table is
-	  full, hetgeen achteraf te zien is net
-	  dmesg.
+	  verlaagd, afhankelijk van de systeembehoeften.  Deze variabele
+	  geeft het maximale aantal bestandsdescriptors op een systeem.
+	  Als de bestandsdescriptortabel vol is, toont de systeembuffer
+	  meerdere malen file: table is full, het
+	 geen achteraf te zien is met dmesg.
 
 	Elk geopend bestand, socket of fifo heeft een
 	  bestandsdescriptor.  Een grote produktieserver kan makkelijk
 	  enige duizenden bestandsdescriptors nodig hebben, afhankelijk
 	  van het soort en aantal diensten die tegelijk draaien.
 
-	In oudere versies van &os;, werd de standaard waarde van
-	  kern.maxfiles afgeleid van de
-	   optie in het kernel configuratie
-	  bestand.
+	In oudere versies van &os; werd de standaard waarde van
+	  kern.maxfiles afgeleid van de optie
+	   in het kernelconfiguratiebestand.
 	  kern.maxfiles groeit evenredig met de
 	  waarde van maxusers.  Als een aangepaste
-	  kernel wordt gebouwd, is het een goed idee om deze
-	  kerneloptie in te stellen afhankelijk van het gebruikt van
-	  een systeemhet (maar niet te laag).  Hoewel een
-	  produktieserver misschien niet 256 gebruikers gelijktijdige
-	  gebruikers heeft, kunnen de benodigde systeembronnen best
-	  vergelijkbaar zijn met een grootschalige webserver.
+	  kernel wordt gebouwd, is het een goed idee om deze kerneloptie
+	  in te stellen afhankelijk van het gebruikt van een systeem
+	  (maar niet te laag).  Hoewel een produktieserver misschien
+	  niet 256 gelijktijdige gebruikers heeft, kunnen de benodigde
+	  systeembronnen het beste vergeleken worden met een
+	  grootschalige webserver.
 
 	De optie maxusers stelt de grootte van
 	  een aantal belangrijke systeemtabellen in.  Dit aantal moet
@@ -2264,23 +2264,26 @@
 	  automatisch ingesteld tijdens het opstarten gebaseerd op de
 	  hoeveelheid beschikbare geheugen in het systeem en kan worden
 	  vastgesteld tijdens het draaien door te kijken naar de
-	  alleen-lezen kern.maxusers sysctl.  Sommige
+	  alleen-lezen sysctl kern.maxusers.  Sommige
 	  configuraties hebben grotere of kleinere waarden nodig van
 	  kern.maxusers, deze kunnen worden gezet
-	  als een opstart variabele.  Waardes van 64, 128 en 256 zijn
+	  als een opstartvariabele.  Waardes van 64, 128 en 256 zijn
 	  daarin niet ongewoon.  We raden aan om niet boven de 256 te
-	  gaan tenzij er heel veel filedescriptors benodigd zijn; veel
-	  van de aanpasbaare waarden die standaard worden bepaald door
-	  kern.maxusers kunnen individueel worden
-	  overschreven tijdens het opstarten en/of tijdens het draaien
-	  van het systeem in /boot/loader.conf
-	  (zie de &man.loader.conf.5; handleiding of het
-	  /boot/defaults/loader.conf bestand voor
-	  een paar aanwijzingen) of zoals ergens anders beschreven in
-	  dit document.  Systemen die ouder zijn dan &os; 4.4
-	  moeten deze waardes zetten via de kernel &man.config.8; optie
+	  gaan tenzij er heel veel bestandsdescriptors benodigd zijn;
+	  veel van de aanpasbaare waarden die standaard worden bepaald
+	  door kern.maxusers kunnen individueel
+	  worden overschreven tijdens het opstarten en/of tijdens het
+	  draaien van het systeem in
+	  /boot/loader.conf (zie de handleiding
+	  &man.loader.conf.5; of het bestand
+	  /boot/defaults/loader.conf voor een paar
+	  aanwijzingen) of zoals elders beschreven in dit document.
+	  
+	  Systemen die ouder zijn dan &os; 4.4 moeten deze waarden
+	  instellen via de kerneloptie &man.config.8;
 	  .
 
+	
 	Voor oudere versies stelt het systeem deze waarde zelf in
 	  als deze uitdrukkelijk op 0 is gezet.
 
@@ -2292,9 +2295,9 @@
 	  
 
 	Als het gewenst is om deze waarde zelf aan te geven, wordt
-	  aangeraden om maxusers minstens op 4 te zetten, met
-	  name als het X Window systeem in gebruik is of als er
-	  software gecompileerd wordt.  De reden hiervoor is dat de
+	  aangeraden om maxusers minstens op 4 te
+	  zetten, met name als het X Window systeem in gebruik is of als
+	  er software gecompileerd wordt.  De reden hiervoor is dat de
 	  belangrijkste tabel die door maxusers
 	  ingesteld wordt, het maximum aantal processen is, dat
 	  ingesteld wordt op 20 + 16 * maxusers, dus
@@ -2320,7 +2323,7 @@
 	
 	  maxusers stelt
 	    geen grens aan het aantal gebruikers
-	    dat op de machine kan aanmelden.  Het stelt gewoon
+	    dat zich op de machine kan aanmelden.  Het stelt gewoon
 	    verschillende tabelgroottes in op redelijke waardes,
 	    uitgaande van het maximum aantal gebruikers dat
 	    waarschijnlijk de machine gebruikt en van het aantal
@@ -2329,7 +2332,7 @@
 	    gelijktijdige aanmeldingen op afstand en X-terminalvensters
 	    begrensd is pseudo-device pty
-	        16.  In &os; 5.X kan dit getal
+		16.  In &os; 5.X kan dit getal
 	    genegeerd worden omdat daar het stuurprogramma &man.pty.4;
 	    auto-cloning is.  Er kan eenvoudig gebruik
 	    worden gemaakt van de regel device pty
@@ -2342,20 +2345,20 @@
 
 	kern.ipc.somaxconn
 
-	De sysctl variabele kern.ipc.somaxconn
+	De sysctl-variabele kern.ipc.somaxconn
 	  beparkt de grootte van de luisterwachtrij voor het accepteren
-	  van nieuwe TCP verbindingen.  De standaardwaarde van
+	  van nieuwe TCP-verbindingen.  De standaardwaarde van
 	  128 is meestal te laag voor robuuste
 	  behandeling van nieuwe verbindingen in een zwaarbeladen
-	  webserver omgeving.  Voor zulke omgevingen wordt aangeraden
+	  webserveromgeving.  Voor zulke omgevingen wordt aangeraden
 	  deze waarde te verhogen tot 1024 of hoger.
 	  De dienstdaemon beperkt misschien zelf de luisterwachtrij
 	  (bijvoorbeeld &man.sendmail.8; of
 	  Apache), maar heeft vaak een
 	  mogelijkheid in een configuratiebestand de wachtrijgrootte
-	  aan te passen.  Grote luisterwachtrijen zijn
-	  ook beter in het ontwijken van Ontzegging van Dienst
-	  (DoS) aanvallen.
+	  aan te passen.  Grote luisterwachtrijen zijn ook beter in het
+	  ontwijken van Ontzegging van Dienst (DoS)
+	  aanvallen.
       
     
 
@@ -2363,7 +2366,7 @@
       Netwerkbeperkingen
 
       De kerneloptie NMBCLUSTERS bepaalt het
-	aantal netwerk Mbufs dat beschikbaar is voor een systeem.  Een
+	aantal netwerk-Mbufs dat beschikbaar is voor een systeem.  Een
 	veel bezochte server met een laag aantal Mbufs beperkt de
 	mogelijkheden van &os;.  Elk cluster staat voor ongeveer
 	2 K geheugen, dus een waarde van 1024 stelt 2 megabyte
@@ -2371,33 +2374,33 @@
 	netwerkbuffers.  Een simpele berekening geeft aan hoeveel er
 	nodig is.  Stel dat een webserver met een maximum van 1000
 	simultane verbindingen voor elke verbinding 16 K aan
-	ontvangst netwerkbuffers en 16 K aan zendbuffers kost, dan
+	ontvangstnetwerkbuffers en 16 K aan zendbuffers kost, dan
 	is ongeveer 32 MB aan netbuffers nodig voor de webserver.
-	Een goede vuistregel is te vermeniguldigen met twee,
-	dus 2x32 MB / 2 KB = 64 MB /
+	Een goede vuistregel is te vermeniguldigen met twee, dus
+	2x32 MB / 2 KB = 64 MB /
 	2 kB = 32768.  Voor machines met veel geheugen wordt
 	4096 tot 32768 aangeraden.  Er moet in geen geval een arbitrair
 	hoge waarde voor deze sysctl opgegeven worden, want dat kan
 	leiden tot een crash tijdens het opstarten.  Met de optie
-	 van &man.netstat.1; kan clustergebruik
+	 van &man.netstat.1; kan het clustergebruik
 	van het netwerk bekeken worden.
 
       De loaderparameter kern.ipc.nmbclusters
-	moet gebruikt worden om dit tijdens het opstarten toe te
-	passen.  Alleen voor oudere versies van &os; is het nodig om de
+	moet gebruikt worden om dit tijdens het opstarten toe te passen.
+	Alleen voor oudere versies van &os; is het nodig om de
 	kerneloptie NMBCLUSTERS te gebruiken.
 
       Voor drukke servers die extensief gebruik maken van de
 	systeemaanroep &man.sendfile.2;, kan het nodig zijn het aantal
-	&man.sendfile.2; buffers te verhogen via de kerneloptie
+	&man.sendfile.2;-buffers te verhogen via de kerneloptie
 	NSFBUFS of door de waarde in te stellen in
 	/boot/loader.conf (in &man.loader.8; staan
 	details).  Als er in de procestabel processen staan met een
 	status sfbufa is dat een algemene indicator
-	dat deze parameter aangepast moet worden.  De sysctl variabele
-	kern.ipc.nsfbufs is alleen-lezen en
-	laat zien op welke waarde deze kernelvariabele is ingesteld.
-	Deze parameter schaalt engiszins met de variabele
+	dat deze parameter aangepast moet worden.  De sysctl-variabele
+	kern.ipc.nsfbufs is alleen-lezen en laat zien
+	op welke waarde deze kernelvariabele is ingesteld.  Deze
+	parameter schaalt engiszins met de variabele
 	kern.maxusers, maar het kan nodig zijn om
 	deze bij te stellen.
 
@@ -2414,10 +2417,10 @@
 
 	net.inet.ip.portrange.*
 
-	De sysctle variabelelen
-	  net.inet.ip.portrange.* bepalen welke
-	  reeks poortnummers automatisch gebonden wordt aan TCP en UDP
-	  sockets.  Er zijn drie gebieden: een laag gebied, een
+	De sysctl-variabelen
+	  net.inet.ip.portrange.* bepalen welke reeks
+	  poortnummers automatisch gebonden wordt aan TCP- en
+	  UDP-sockets.  Er zijn drie gebieden: een laag gebied, een
 	  (standaard) middengebied en een hoog gebied.  De meeste
 	  netwerkprogramma's gebruiken het standaardbereik, wat
 	  begrensd wordt door
@@ -2425,24 +2428,24 @@
 	  net.inet.ip.portrange.last met
 	  standaardwaarden van respectievelijk 1024 en 5000.  Gebonden
 	  poortreeksen worden gebruikt voor uitgaande verbindingen en
-	  het is onder bepaalde omstandigheden mogelijk dat poorten
-	  op raken.  Dit gebeurt meestal in het geval van een zwaar
-	  belaste webproxy.  Poortbereik is niet van belang als vooral
-	  diensten draaien die zich bezighouden met inkomende
-	  verbindingen, zoals een normale webserver, of als het aantal
-	  uitgaande verbindingen beperkt is, zoals bij een mailrelay.
-	  Voor situaties waarin een tekort aan poorten dreigt, wordt
+	  het is onder bepaalde omstandigheden mogelijk dat poorten op
+	  raken.  Dit gebeurt meestal in het geval van een zwaar belaste
+	  webproxy.  Poortbereik is niet van belang als vooral diensten
+	  draaien die zich bezighouden met inkomende verbindingen, zoals
+	  een normale webserver, of als het aantal uitgaande
+	  verbindingen beperkt is, zoals bij een mailrelay.  Voor
+	  situaties waarin een tekort aan poorten dreigt, wordt
 	  aangeraden om net.inet.ip.portrange.last
 	  bescheiden op te hogen.  Een waarde van
 	  10000, 20000 of
 	  30000 is redelijk.  Er moet ook rekening
 	  met effecten op firewalls gehouden worden als de poortreeks
-	  gewijzigd wordt.  Sommige firewalls kunnen grote
-	  poortreeksen blokkeren, meestal de lagere poorten, en
-	  verwachten dat andere systemen hogere poorten gebruiken voor
-	  uitgaande verbindingen.  Om deze reden wordt het niet
-	  aanbevolen om net.inet.ip.portrange.first
-	  te verlagen.
+	  gewijzigd wordt.  Sommige firewalls kunnen grote poortreeksen
+	  blokkeren, meestal de lagere poorten, en verwachten dat andere
+	  systemen hogere poorten gebruiken voor uitgaande verbindingen.
+	  Om deze reden wordt het niet aanbevolen om
+	  net.inet.ip.portrange.first te
+	  verlagen.
       
 
       
@@ -2455,50 +2458,51 @@
 	  net.inet.tcp.inflight.enable
 	
 
-	De TCP bandbreedtevertragingsproduct limitatie lijkt op
-	  TCP/Vegas in NetBSD.  Het kan aangezet worden door de sysctl
-	  variabelel net.inet.tcp.inflight.enable
-	  de waarde 1 te geven.  Het systeem
-	  tracht dan het bandbreedtevertragingssprodukt te berekenen
-	  voor elke verbinding en beperkt dan de hoeveelheid gegevens
-	  in de wachtrij naar het netwerk tot de hoeveelheid die
-	  vereist is om maximale doorvoer te kunnen handhaven.
+	De TCP-bandbreedtevertragingsproductlimitatie lijkt op
+	  TCP/Vegas in NetBSD.  Het kan aangezet worden door de
+	  sysctl-variabele
+	  net.inet.tcp.inflight.enable de waarde
+	  1 te geven.  Het systeem tracht dan het
+	  bandbreedtevertragingssprodukt te berekenen voor elke
+	  verbinding en beperkt dan de hoeveelheid gegevens in de
+	  wachtrij naar het netwerk tot de hoeveelheid die vereist is om
+	  maximale doorvoer te kunnen handhaven.
 
 	Dit is nuttig bij gebruik van modems, Gigabit Ethernet of
-	  zelfs bij hoge snelheid WAN links (of elke andere link met
-	  een groot bandbreedtevertragingsprodukt), in het bijzonder
-	  als ook windowschaling of een groot verzendwindow gebruikt
-	  wordt.  Als deze optie aangezet wordt, dient ook
-	  net.inet.tcp.inflight.debug de waarde
-	  0 te krijgen (geen debugging) en voor
-	  produktiegebruik kan het instellen van
+	  zelfs bij WAN-verbindingen met hoge snelheid (of elke andere
+	  verbinding met een groot bandbreedtevertragingsprodukt), in
+	  het bijzonder als ook windowschaling of een groot
+	  verzendwindow gebruikt wordt.  Als deze optie aangezet wordt,
+	  dient ook net.inet.tcp.inflight.debug de
+	  waarde 0 te krijgen (geen debugging) en
+	  voor produktiegebruik kan het instellen van
 	  net.inet.tcp.inflight.min naar minstens
-	  6144 voordeel opleveren.  Het instellen
-	  van hoge minima kan effectief het beperken van bandbreedte
-	  ondermijnen, afhankelijk van de link.  De mogelijkheid tot
-	  limitering zorgt ervoor dat de hoeveelheid data die opgebouwd
-	  wordt, in tussentijdse route- en switchwachtrijen verlaagd
-	  kan worden en tevens kan de hoeveelheid gegevens die
+	  6144 voordeel opleveren.  Het instellen van
+	  hoge minima kan effectief het beperken van bandbreedte
+	  ondermijnen, afhankelijk van de verbinding.  De mogelijkheid
+	  tot limitering zorgt ervoor dat de hoeveelheid gegevens die
+	  opgebouwd wordt, in tussentijdse route- en switchwachtrijen
+	  verlaagd kan worden en tevens kan de hoeveelheid gegevens die
 	  opgebouwd wordt in de interfacewachtrij van de lokale host
-	  verlaagd worden.  Met minder pakketten in wachtrijen, kunnen
+	  verlaagd worden.  Met minder pakketten in wachtrijen kunnen
 	  interactieve verbindingen opereren met lagere
-	  Round Trip tijden, met name over
-	  langzame modems.  Deze optie gaat alleen over datatransmissie
-	  (upload / serverkant) en heeft geen effect gegevensontvangst
-	  (download / clientkant).
+	  Round Trip tijden, met name over langzame
+	  modems.  Deze optie gaat alleen over datatransmissie (upload /
+	  serverkant) en heeft geen effect gegevensontvangst (download /
+	  cliëntkant).
 
 	Aanpassen van
 	  net.inet.tcp.inflight.stab wordt
 	  niet aangeraden.  Deze parameter krijgt
-	  standaard een waarde van 20, wat 2 maximale pakketten
-	  opgeteld bij de bandbreedtevensterberekening representeert.
-	  Het extra venster is nodig om het algoritme stabiel te houden
-	  en om de reactietijd bij veranderende omstandigheden te
-	  verbeteren, maar het kan ook leiden tot langere pingtijden
-	  over langzame verbindingen (zonder het inflight algoritme kan
-	  dit echter nog erger zijn).  In dergelijke gevallen kan deze
-	  parameter misschien verlaagd worden naar 15, 10 of 5 en
-	  misschien moet voor het gewenste effect ook
+	  standaard een waarde van 20, wat 2 maximale pakketten opgeteld
+	  bij de bandbreedtevensterberekening representeert.  Het extra
+	  venster is nodig om het algoritme stabiel te houden en om de
+	  reactietijd bij veranderende omstandigheden te verbeteren,
+	  maar het kan ook leiden tot langere pingtijden over langzame
+	  verbindingen (zonder het inflight-algoritme kan dit echter nog
+	  erger zijn).  In dergelijke gevallen kan deze parameter
+	  misschien verlaagd worden naar 15, 10 of 5 en misschien moet
+	  voor het gewenste effect ook
 	  net.inet.tcp.inflight.min verlaagd worden
 	  (bijvoorbeeld naar 3500).  Het verlagen van deze parameters
 	  moet pas in laatste instantie overwogen worden.
@@ -2512,15 +2516,15 @@
 	<varname>kern.maxvnodes</varname>
 
 	Een vnode is de interne representatie van een bestand of
-	  een map.  Het verlagen van het aantal beschikbare vnodes
-	  voor het besturingssysteem leidt dus tot een daling van disk
-	  I/O.  Normaliter wordt dit door het besturingssysteem
-	  afgehandeld en hoeft de instelling niet gewijzigd te worden.
-	  Im sommige gevallen kan disk I/O de beperkende factor zijn en
-	  kan het systeem alle beschikbare vnodes in gebruik hebben.
-	  Dan dient deze instelling gewijzigd te worden.  De
-	  hoeveelheid inactief en beschikbaar RAM dient meegenomen te
-	  worden in de beslissing.
+	  een map.  Het verlagen van het aantal beschikbare vnodes voor
+	  het besturingssysteem leidt dus tot een daling van schijf-I/O.
+	  Normaliter wordt dit door het besturingssysteem afgehandeld en
+	  hoeft de instelling niet gewijzigd te worden.  Im sommige
+	  gevallen kan schijf-I/O de beperkende factor zijn en kan het
+	  systeem alle beschikbare vnodes in gebruik hebben.  Dan dient
+	  deze instelling gewijzigd te worden.  De hoeveelheid inactief
+	  en beschikbaar RAM dient meegenomen te worden in de
+	  beslissing.
 
 	Het huidige aantal gebruikte vnodes kan als volgt bekeken
 	  worden:
@@ -2540,8 +2544,8 @@
 	  gehouden te worden.  Als de waarde weer tot aan het maximum
 	  stijgt, dan moet kern.maxvnodes verder
 	  opgehoogd worden.  Er dient een verschuiving op te treden in
-	  het door &man.top.1; gerapporteerde geheugengebruik.  Er
-	  hoort meer geheugen actief te zijn.
+	  het door &man.top.1; gerapporteerde geheugengebruik.  Er hoort
+	  meer geheugen actief te zijn.
       
     
   
@@ -2558,23 +2562,21 @@
       een wisselbestand maken op een bestaande (UFS of andere)
       partitie.
 
-    Voor informatie over het beveiligen van het wisselbestand,
-      welke opties hiervoor bestaan, en waarom dit gedaan zou moeten
-      worden, kijk dan in  van het
-      handbook.
+    Kijk voor informatie over het beveiligen van het
+      wisselbestand, welke opties hiervoor bestaan, en waarom dit gedaan
+      zou moeten worden in  van het
+      handboek.
 
     
-      Wisselbestand (partitie) op een nieuwe harde
-	schijf
+      Wisselbestand (partitie) op een nieuwe harde schijf
 
-      Dit is natuurlijk de beste manier om de
-	wisselbestandsruimte te vergroten en een goed excuus om een
-	extra harde schijf toe te voegen.  Die komt immers altijd wel
-	van pas.  In dat geval kan het beste de discussie over
-	wisselbestandruimte in 
-	nog eens herlezen worden om wat suggesties te krijgen over hoe
-	wisselbestandpartitie(s) het beste ingedeeld kunnen
-	worden.
+      Dit is natuurlijk de beste manier om de wisselbestandsruimte
+	te vergroten en een goed excuus om een extra harde schijf toe te
+	voegen.  Die komt immers altijd wel van pas.  In dat geval kan
+	het beste de discussie over wisselbestandruimte in  nog eens herlezen worden om
+	wat suggesties op te doen over hoe wisselbestandpartitie(s) het
+	beste ingedeeld kunnen worden.
     
 
     
@@ -2582,18 +2584,18 @@
 
       In het algemeen wordt swappen over NFS niet aangeraden
 	behalve als het onmogelijk is om naar een lokale schijf te
-	swappen.  NFS swappen wordt gelimiteerd door de hoeveelheid
-	beschikbare bandbreedte en belast het de NFS server.
+	swappen.  NFS-swappen wordt gelimiteerd door de hoeveelheid
+	beschikbare bandbreedte en belast het de NFS-server.
     

>>> TRUNCATED FOR MAIL (1000 lines) <<<
From rene at FreeBSD.org  Wed Nov  5 14:11:09 2008
From: rene at FreeBSD.org (Rene Ladan)
Date: Wed Nov  5 14:11:15 2008
Subject: PERFORCE change 152551 for review
Message-ID: <200811052211.mA5MB81k026551@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152551

Change 152551 by rene@rene_self on 2008/11/05 22:10:34

	MFen handbook/security 1.331 -> 1.332 (local fix)

Affected files ...

.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/security/chapter.sgml#7 edit

Differences ...

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/security/chapter.sgml#7 (text+ko) ====

@@ -5,7 +5,7 @@
      $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/security/chapter.sgml,v 1.80 2006/01/05 21:13:24 siebrand Exp $
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/security/chapter.sgml
-     %SRCID%	1.331
+     %SRCID%	1.332
 -->
 
 
@@ -1441,7 +1441,7 @@
       netwerkomgeving toegepast kunnen worden.  Het schijnt dat
       iedereen een firewall wil hebben om netwerkverbindingen af te
       handelen.  Ondanks dat een firewall veel kan, zijn er toch dingen
-      die hij niet kan, zoals tekst terugsturen naar ontstaansplaats
+      die het niet kan, zoals tekst terugsturen naar de ontstaansplaats
       van een verbinding.  De TCP Wrappers software
       kan dat en nog veel meer.  In dit onderdeel worden de
       TCP Wrappers mogelijkheden besproken en, waar
From hselasky at FreeBSD.org  Thu Nov  6 00:16:23 2008
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Thu Nov  6 00:16:31 2008
Subject: PERFORCE change 152556 for review
Message-ID: <200811060816.mA68GNFr005687@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152556

Change 152556 by hselasky@hselasky_laptop001 on 2008/11/06 08:16:00

	
	libusb20: Fix many compile warnings when using "make WARN=4".

Affected files ...

.. //depot/projects/usb/src/lib/libusb20/libusb20_compat01.c#6 edit
.. //depot/projects/usb/src/lib/libusb20/libusb20_compat01.h#3 edit
.. //depot/projects/usb/src/lib/libusb20/libusb20_desc.c#4 edit
.. //depot/projects/usb/src/lib/libusb20/libusb20_desc.h#4 edit
.. //depot/projects/usb/src/lib/libusb20/libusb20_ugen20.c#9 edit

Differences ...

==== //depot/projects/usb/src/lib/libusb20/libusb20_compat01.c#6 (text+ko) ====

@@ -194,13 +194,13 @@
 }
 
 int
-usb_get_string(usb_dev_handle * dev, int index,
+usb_get_string(usb_dev_handle * dev, int strindex,
     int langid, char *buf, size_t buflen)
 {
 	int err;
 
 	err = libusb20_dev_req_string_sync((void *)dev,
-	    index, langid, buf, buflen);
+	    strindex, langid, buf, buflen);
 
 	if (err)
 		return (-1);
@@ -209,13 +209,13 @@
 }
 
 int
-usb_get_string_simple(usb_dev_handle * dev, int index,
+usb_get_string_simple(usb_dev_handle * dev, int strindex,
     char *buf, size_t buflen)
 {
 	int err;
 
 	err = libusb20_dev_req_string_simple_sync((void *)dev,
-	    index, buf, buflen);
+	    strindex, buf, buflen);
 
 	if (err)
 		return (-1);
@@ -225,23 +225,23 @@
 
 int
 usb_get_descriptor_by_endpoint(usb_dev_handle * udev, int ep, uint8_t type,
-    uint8_t index, void *buf, int size)
+    uint8_t ep_index, void *buf, int size)
 {
 	memset(buf, 0, size);
 
 	return (usb_control_msg(udev, ep | USB_ENDPOINT_IN,
-	    USB_REQ_GET_DESCRIPTOR, (type << 8) + index, 0,
+	    USB_REQ_GET_DESCRIPTOR, (type << 8) + ep_index, 0,
 	    buf, size, 1000));
 }
 
 int
-usb_get_descriptor(usb_dev_handle * udev, uint8_t type, uint8_t index,
+usb_get_descriptor(usb_dev_handle * udev, uint8_t type, uint8_t desc_index,
     void *buf, int size)
 {
 	memset(buf, 0, size);
 
 	return (usb_control_msg(udev, USB_ENDPOINT_IN, USB_REQ_GET_DESCRIPTOR,
-	    (type << 8) + index, 0, buf, size, 1000));
+	    (type << 8) + desc_index, 0, buf, size, 1000));
 }
 
 int
@@ -646,7 +646,7 @@
 
 int
 usb_control_msg(usb_dev_handle * dev, int requesttype, int request,
-    int value, int index, char *bytes, int size, int timeout)
+    int value, int wIndex, char *bytes, int size, int timeout)
 {
 	struct LIBUSB20_CONTROL_SETUP_DECODED req;
 	int err;
@@ -657,7 +657,7 @@
 	req.bmRequestType = requesttype;
 	req.bRequest = request;
 	req.wValue = value;
-	req.wIndex = index;
+	req.wIndex = wIndex;
 	req.wLength = size;
 
 	err = libusb20_dev_request_sync((void *)dev, &req, bytes,
@@ -758,7 +758,7 @@
 	return (0);
 }
 
-char   *
+const char *
 usb_strerror(void)
 {
 	/* TODO */

==== //depot/projects/usb/src/lib/libusb20/libusb20_compat01.h#3 (text+ko) ====

@@ -291,7 +291,7 @@
 int	usb_resetep(usb_dev_handle * dev, unsigned int ep);
 int	usb_clear_halt(usb_dev_handle * dev, unsigned int ep);
 int	usb_reset(usb_dev_handle * dev);
-char   *usb_strerror(void);
+const char *usb_strerror(void);
 void	usb_init(void);
 void	usb_set_debug(int level);
 int	usb_find_busses(void);

==== //depot/projects/usb/src/lib/libusb20/libusb20_desc.c#4 (text+ko) ====

@@ -84,8 +84,8 @@
 	/* get "wTotalLength" and setup "pcdesc" */
 	pcdesc.ptr = LIBUSB20_ADD_BYTES(config_desc, 0);
 	pcdesc.len =
-	    ((uint8_t *)config_desc)[2] |
-	    (((uint8_t *)config_desc)[3] << 8);
+	    ((const uint8_t *)config_desc)[2] |
+	    (((const uint8_t *)config_desc)[3] << 8);
 	pcdesc.type = LIBUSB20_ME_IS_RAW;
 
 	/* descriptor pre-scan */
@@ -238,7 +238,7 @@
 libusb20_desc_foreach(const struct libusb20_me_struct *pdesc,
     const uint8_t *psubdesc)
 {
-	void *end;
+	const void *end;
 
 	if (pdesc == NULL) {
 		return (NULL);
@@ -250,8 +250,8 @@
 	} else {
 		psubdesc = LIBUSB20_ADD_BYTES(psubdesc, psubdesc[0]);
 	}
-	return (((((void *)psubdesc) >= ((void *)(pdesc->ptr))) &&
-	    (((void *)psubdesc) < end) &&
+	return (((((const void *)psubdesc) >= ((void *)(pdesc->ptr))) &&
+	    (((const void *)psubdesc) < end) &&
 	    (LIBUSB20_ADD_BYTES(psubdesc, psubdesc[0]) >= ((void *)(pdesc->ptr))) &&
 	    (LIBUSB20_ADD_BYTES(psubdesc, psubdesc[0]) <= end) &&
 	    (psubdesc[0] >= 3)) ? psubdesc : NULL);
@@ -306,7 +306,7 @@
 	len_old = len;
 	buf = ptr;
 	pd_offset = sizeof(void *);
-	pf = (*((struct libusb20_me_format **)pd))->format;
+	pf = (*((struct libusb20_me_format *const *)pd))->format;
 
 	/* scan */
 

==== //depot/projects/usb/src/lib/libusb20/libusb20_desc.h#4 (text+ko) ====

@@ -63,7 +63,7 @@
 #define	LIBUSB20_MIN(a,b) (((a) < (b)) ? (a) : (b))
 
 #define	LIBUSB20_ADD_BYTES(ptr,off) \
-  ((void *)(((const uint8_t *)(ptr)) + (off)))
+  ((void *)(((const uint8_t *)(ptr)) + (off) - ((const uint8_t *)0)))
 
 /* basic message elements */
 enum {

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

@@ -311,7 +311,7 @@
 ugen20_open_device(struct libusb20_device *pdev, uint16_t nMaxTransfer)
 {
 	struct usb2_fs_endpoint *pfse = NULL;
-	struct usb2_fs_init fs_init = { /* zero */ };
+	struct usb2_fs_init fs_init;
 	uint32_t size;
 	uint32_t plugtime;
 	char buf[64];
@@ -319,6 +319,8 @@
 	int g;
 	int error;
 
+	memset(&fs_init, 0, sizeof(fs_init));
+
 	snprintf(buf, sizeof(buf), "/dev/ugen%u.%u",
 	    pdev->bus_number, pdev->device_address);
 
@@ -384,9 +386,11 @@
 static int
 ugen20_close_device(struct libusb20_device *pdev)
 {
-	struct usb2_fs_uninit fs_uninit = { /* zero */ };
+	struct usb2_fs_uninit fs_uninit;
 	int error = 0;
 
+	memset(&fs_uninit, 0, sizeof(fs_uninit));
+
 	if (pdev->privBeData) {
 		if (ioctl(pdev->file, USB_FS_UNINIT, &fs_uninit)) {
 			error = LIBUSB20_ERROR_OTHER;
@@ -412,12 +416,14 @@
 ugen20_get_config_desc_full(struct libusb20_device *pdev,
     uint8_t **ppbuf, uint16_t *plen, uint8_t cfg_index)
 {
-	struct usb2_gen_descriptor gen_desc = { /* zero */ };
+	struct usb2_gen_descriptor gen_desc;
 	struct usb2_config_descriptor cdesc;
 	uint8_t *ptr;
 	uint16_t len;
 	int error;
 
+	memset(&gen_desc, 0, sizeof(gen_desc));
+
 	gen_desc.ugd_data = &cdesc;
 	gen_desc.ugd_maxlen = sizeof(cdesc);
 	gen_desc.ugd_config_index = cfg_index;
@@ -502,7 +508,9 @@
 ugen20_set_alt_index(struct libusb20_device *pdev,
     uint8_t iface_index, uint8_t alt_index)
 {
-	struct usb2_alt_interface alt_iface = { /* zero */ };
+	struct usb2_alt_interface alt_iface;
+
+	memset(&alt_iface, 0, sizeof(alt_iface));
 
 	alt_iface.uai_interface_index = iface_index;
 	alt_iface.uai_alt_index = alt_index;
@@ -615,7 +623,9 @@
     struct LIBUSB20_CONTROL_SETUP_DECODED *setup,
     void *data, uint16_t *pactlen, uint32_t timeout, uint8_t flags)
 {
-	struct usb2_ctl_request req = { /* zero */ };
+	struct usb2_ctl_request req;
+
+	memset(&req, 0, sizeof(req));
 
 	req.ucr_data = data;
 	if (!(flags & LIBUSB20_TRANSFER_SINGLE_SHORT_NOT_OK)) {
@@ -689,9 +699,11 @@
 ugen20_tr_open(struct libusb20_transfer *xfer, uint32_t MaxBufSize,
     uint32_t MaxFrameCount, uint8_t ep_no)
 {
-	struct usb2_fs_open temp = { /* zero */ };
+	struct usb2_fs_open temp;
 	struct usb2_fs_endpoint *fsep;
 
+	memset(&temp, 0, sizeof(temp));
+
 	fsep = xfer->pdev->privBeData;
 	fsep += xfer->trIndex;
 
@@ -720,7 +732,9 @@
 static int
 ugen20_tr_close(struct libusb20_transfer *xfer)
 {
-	struct usb2_fs_close temp = { /* zero */ };
+	struct usb2_fs_close temp;
+
+	memset(&temp, 0, sizeof(temp));
 
 	temp.ep_index = xfer->trIndex;
 
@@ -733,7 +747,9 @@
 static int
 ugen20_tr_clear_stall_sync(struct libusb20_transfer *xfer)
 {
-	struct usb2_fs_clear_stall_sync temp = { /* zero */ };
+	struct usb2_fs_clear_stall_sync temp;
+
+	memset(&temp, 0, sizeof(temp));
 
 	/* if the transfer is active, an error will be returned */
 
@@ -748,9 +764,11 @@
 static void
 ugen20_tr_submit(struct libusb20_transfer *xfer)
 {
-	struct usb2_fs_start temp = { /* zero */ };
+	struct usb2_fs_start temp;
 	struct usb2_fs_endpoint *fsep;
 
+	memset(&temp, 0, sizeof(temp));
+
 	fsep = xfer->pdev->privBeData;
 	fsep += xfer->trIndex;
 
@@ -781,7 +799,9 @@
 static void
 ugen20_tr_cancel_async(struct libusb20_transfer *xfer)
 {
-	struct usb2_fs_stop temp = { /* zero */ };
+	struct usb2_fs_stop temp;
+
+	memset(&temp, 0, sizeof(temp));
 
 	temp.ep_index = xfer->trIndex;
 
@@ -817,9 +837,11 @@
     uint8_t dev, uint8_t iface, uid_t *uid,
     gid_t *gid, mode_t *mode)
 {
-	struct usb2_dev_perm perm = { /* zero */ };
+	struct usb2_dev_perm perm;
 	int error;
 
+	memset(&perm, 0, sizeof(perm));
+
 	perm.bus_index = bus;
 	perm.dev_index = dev;
 	perm.iface_index = iface;
From zec at FreeBSD.org  Thu Nov  6 05:26:43 2008
From: zec at FreeBSD.org (Marko Zec)
Date: Thu Nov  6 05:26:51 2008
Subject: PERFORCE change 152570 for review
Message-ID: <200811061326.mA6DQgBi056505@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152570

Change 152570 by zec@zec_tpx32 on 2008/11/06 13:26:34

	IFC @ 152569

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/amd64/amd64/dump_machdep.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/amd64/minidump_machdep.c#12 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/powerpc/boot1.chrp/boot1.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/powerpc/boot1.chrp/bootinfo.txt#2 integrate
.. //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/sys/types.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/sys/uio.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/cddl/dev/dtrace/dtrace_ioctl.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/cddl/dev/dtrace/dtrace_load.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/cddl/dev/dtrace/dtrace_unload.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/cddl/dev/systrace/systrace.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_proto.h#8 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_syscall.h#8 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_syscalls.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_sysent.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/syscalls.master#8 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_emul.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/conf/NOTES#12 integrate
.. //depot/projects/vimage-commit2/src/sys/conf/files#14 integrate
.. //depot/projects/vimage-commit2/src/sys/conf/kmod.mk#3 integrate
.. //depot/projects/vimage-commit2/src/sys/conf/options#14 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/acpi_support/acpi_asus.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/acpica/Osd/OsdSchedule.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/adb/adb_bus.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/adb/adb_mouse.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/adb/adbvar.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/amr/amr.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/amr/amr_cam.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/amr/amrvar.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/an/if_an.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ath/if_ath.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/cardbus/cardbus_cis.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/cardbus/cardbusreg.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_main.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_osdep.h#6 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/e1000/if_em.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/e1000/if_igb.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/en/midway.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/hwpmc/hwpmc_mod.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mn/if_mn.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/pci/pcireg.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/snp/snp.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/hda/hdac.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/channel.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/channel.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/mixer.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/mixer.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/u3g.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_subr.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usbdevs#13 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/bluetooth/TODO.TXT#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/bluetooth/ng_ubt2.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/bluetooth/ng_ubt2_var.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/bluetooth/ubtbcmfw2.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/bluetooth/usb2_bluetooth.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/bluetooth/usb2_bluetooth.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/at91dci.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/at91dci.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/at91dci_atmelarm.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/ehci2.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/ehci2.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/ehci2_pci.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/musb2_otg.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/musb2_otg.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/ohci2.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/ohci2.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/ohci2_atmelarm.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/ohci2_pci.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/uhci2.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/uhci2.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/uhci2_pci.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/usb2_bus.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/usb2_controller.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/usb2_controller.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/usb2_pci.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/uss820dci.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/uss820dci.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/uss820dci_atmelarm.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/uss820dci_pccard.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/README.TXT#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_busdma.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_busdma.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_compat_linux.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_compat_linux.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_config_td.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_config_td.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_core.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_core.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_debug.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_debug.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_dev.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_dev.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_device.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_device.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_dynamic.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_dynamic.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_error.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_generic.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_generic.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_handle_request.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_handle_request.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_hid.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_hid.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_hub.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_hub.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_if.m#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_lookup.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_lookup.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_mbuf.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_mbuf.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_msctest.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_msctest.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_parse.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_parse.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_process.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_process.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_request.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_request.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_sw_transfer.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_sw_transfer.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_transfer.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_transfer.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_util.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_util.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usbdevs#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/ethernet/if_aue2.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/ethernet/if_aue2_reg.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/ethernet/if_axe2.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/ethernet/if_axe2_reg.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/ethernet/if_cdce2.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/ethernet/if_cdce2_reg.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/ethernet/if_cue2.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/ethernet/if_cue2_reg.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/ethernet/if_kue2.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/ethernet/if_kue2_fw.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/ethernet/if_kue2_reg.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/ethernet/if_rue2.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/ethernet/if_rue2_reg.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/ethernet/if_udav2.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/ethernet/if_udav2_reg.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/ethernet/usb2_ethernet.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/ethernet/usb2_ethernet.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/image/usb2_image.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/image/usb2_image.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/image/uscanner2.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/include/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/include/ufm2_ioctl.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/include/urio2_ioctl.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/include/usb2_cdc.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/include/usb2_defs.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/include/usb2_devid.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/include/usb2_devtable.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/include/usb2_endian.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/include/usb2_error.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/include/usb2_hid.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/include/usb2_ioctl.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/include/usb2_mfunc.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/include/usb2_revision.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/include/usb2_standard.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/input/uhid2.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/input/ukbd2.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/input/ums2.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/input/usb2_input.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/input/usb2_input.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/input/usb2_rdesc.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/misc/udbp2.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/misc/udbp2.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/misc/ufm2.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/misc/usb2_misc.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/misc/usb2_misc.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/ndis/if_ndis_usb2.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/ndis/usb2_ndis.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/ndis/usb2_ndis.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/quirk/usb2_quirk.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/quirk/usb2_quirk.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/uark2.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/ubsa2.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/ubser2.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/uchcom2.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/ucycom2.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/ufoma2.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/uftdi2.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/uftdi2_reg.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/ugensa2.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/uipaq2.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/ulpt2.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/umct2.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/umodem2.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/umoscom2.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/uplcom2.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/usb2_serial.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/usb2_serial.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/uvisor2.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/uvscom2.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/sound/uaudio2.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/sound/uaudio2.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/sound/uaudio2_pcm.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/sound/uaudio2_reg.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/sound/usb2_sound.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/sound/usb2_sound.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/storage/ata-usb2.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/storage/umass2.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/storage/urio2.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/storage/usb2_storage.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/storage/usb2_storage.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/storage/ustorage2_fs.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/template/usb2_template.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/template/usb2_template.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/template/usb2_template_cdce.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/template/usb2_template_msc.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/template/usb2_template_mtp.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/wlan/if_rum2.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/wlan/if_rum2_fw.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/wlan/if_rum2_reg.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/wlan/if_rum2_var.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/wlan/if_ural2.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/wlan/if_ural2_reg.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/wlan/if_ural2_var.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/wlan/if_zyd2.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/wlan/if_zyd2_fw.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/wlan/if_zyd2_reg.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/wlan/usb2_wlan.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb2/wlan/usb2_wlan.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/fs/coda/cnode.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/coda/coda_subr.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/coda/coda_venus.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/ntfs/ntfs_vnops.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/procfs/procfs.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/procfs/procfs_map.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/smbfs/smbfs_vfsops.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/unionfs/union_vfsops.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/geom_disk.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/journal/g_journal.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/part/g_part_apm.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/conf/XEN#4 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/i386/bios.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/i386/dump_machdep.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/i386/minidump_machdep.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/isa/isa_common.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/isa/isa_common.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/isa/isavar.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/isa/pnp.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/init_sysent.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_cons.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/kern/kern_descrip.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_exec.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_proc.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_sig.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_thr.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_thread.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/sched_ule.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/subr_sleepqueue.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/subr_smp.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/subr_stack.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/sys_process.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/syscalls.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/syscalls.master#4 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/systrace_args.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/tty.c#14 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/tty_cons.c#3 delete
.. //depot/projects/vimage-commit2/src/sys/kern/tty_pts.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/vfs_export.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/vfs_lookup.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/vfs_mount.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/vfs_subr.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/vfs_syscalls.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/vfs_vnops.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/kgssapi/gss_accept_sec_context.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/kgssapi/gss_acquire_cred.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/kgssapi/gss_add_oid_set_member.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/kgssapi/gss_canonicalize_name.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/kgssapi/gss_create_empty_oid_set.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/kgssapi/gss_delete_sec_context.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/kgssapi/gss_display_status.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/kgssapi/gss_export_name.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/kgssapi/gss_get_mic.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/kgssapi/gss_impl.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/kgssapi/gss_import_name.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/kgssapi/gss_init_sec_context.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/kgssapi/gss_names.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/kgssapi/gss_pname_to_uid.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/kgssapi/gss_release_buffer.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/kgssapi/gss_release_cred.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/kgssapi/gss_release_name.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/kgssapi/gss_release_oid_set.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/kgssapi/gss_set_cred_option.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/kgssapi/gss_test_oid_set_member.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/kgssapi/gss_unwrap.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/kgssapi/gss_verify_mic.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/kgssapi/gss_wrap.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/kgssapi/gss_wrap_size_limit.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/kgssapi/gssapi.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/kgssapi/gssapi_impl.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/kgssapi/gssd.x#1 branch
.. //depot/projects/vimage-commit2/src/sys/kgssapi/gssd_prot.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/kgssapi/gsstest.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/kgssapi/kgss_if.m#1 branch
.. //depot/projects/vimage-commit2/src/sys/kgssapi/krb5/kcrypto.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/kgssapi/krb5/kcrypto.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/kgssapi/krb5/kcrypto_aes.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/kgssapi/krb5/kcrypto_arcfour.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/kgssapi/krb5/kcrypto_des.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/kgssapi/krb5/kcrypto_des3.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/kgssapi/krb5/krb5_mech.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/mips/idt/if_kr.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/Makefile#11 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/amr/Makefile#2 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/amr/amr_cam/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/kgssapi/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/kgssapi_krb5/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/krpc/Makefile#2 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/nfsclient/Makefile#2 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/nfsserver/Makefile#2 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/rl/Makefile#2 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/snp/Makefile#2 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/bluetooth/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/bluetooth_fw/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/bluetooth_ng/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/controller/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/controller_at91dci/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/controller_ehci/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/controller_musb/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/controller_ohci/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/controller_uhci/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/controller_uss820dci/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/core/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/ethernet/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/ethernet_aue/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/ethernet_axe/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/ethernet_cdce/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/ethernet_cue/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/ethernet_dav/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/ethernet_kue/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/ethernet_rue/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/image/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/input/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/input_hid/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/input_kbd/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/input_ms/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/misc/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/misc_dbp/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/misc_fm/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/ndis/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/quirk/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/scanner/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/serial/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/serial_ark/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/serial_bsa/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/serial_bser/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/serial_chcom/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/serial_cycom/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/serial_foma/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/serial_ftdi/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/serial_gensa/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/serial_ipaq/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/serial_lpt/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/serial_mct/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/serial_modem/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/serial_moscom/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/serial_plcom/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/serial_visor/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/serial_vscom/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/sound/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/storage/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/storage_ata/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/storage_fs/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/storage_mass/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/storage_rio/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/template/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/wlan/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/wlan_ral/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/wlan_rum/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb2/wlan_zyd/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/zfs/Makefile#2 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_arcsubr.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_fddisubr.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_fwsubr.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_gif.c#12 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_iso88025subr.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_spppsubr.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_tun.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/net/radix_mpath.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_adhoc.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_hostap.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_sta.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_wds.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_input.c#22 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#23 integrate
.. //depot/projects/vimage-commit2/src/sys/netsmb/smb_conn.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/netsmb/smb_conn.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/netsmb/smb_dev.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_krpc.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_nfsiod.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_socket.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_subs.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vfsops.c#15 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfsmount.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs_fha.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs_fha.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs_serv.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs_srvcache.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs_srvkrpc.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs_srvsock.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs_srvsubs.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs_syscalls.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsserver/nfsm_subs.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsserver/nfsrvcache.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/nlm/nlm.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/nlm/nlm_advlock.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/nlm/nlm_prot_impl.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/nlm/nlm_prot_svc.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/opencrypto/cryptosoft.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/pci/if_mn.c#2 delete
.. //depot/projects/vimage-commit2/src/sys/pci/if_rl.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/pci/if_rlreg.h#7 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/include/cpufunc.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/cuda.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/pmu.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/rpc/auth.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/rpc/auth_none.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/rpc/auth_unix.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/rpc/clnt.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/rpc/clnt_dg.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/rpc/clnt_rc.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/rpc/clnt_vc.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/rpc/replay.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/rpc/replay.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/rpc/rpc_com.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/rpc/rpc_generic.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/rpc/rpc_msg.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/rpc/rpc_prot.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/rpc/rpcsec_gss.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/rpc/rpcsec_gss/rpcsec_gss.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/rpc/rpcsec_gss/rpcsec_gss_conf.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/rpc/rpcsec_gss/rpcsec_gss_int.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/rpc/rpcsec_gss/rpcsec_gss_misc.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/rpc/rpcsec_gss/rpcsec_gss_prot.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/rpc/svc.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/rpc/svc.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/rpc/svc_auth.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/rpc/svc_auth.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/rpc/svc_auth_unix.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/rpc/svc_dg.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/rpc/svc_generic.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/rpc/svc_vc.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/rpc/xdr.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/security/audit/audit_arg.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/security/audit/audit_bsm_klib.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/security/audit/audit_pipe.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/mount.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/param.h#15 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/proc.h#8 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/syscall.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/syscall.mk#4 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/sysent.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/sysproto.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/tty.h#6 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/user.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/tools/vnode_if.awk#2 integrate
.. //depot/projects/vimage-commit2/src/sys/ufs/ffs/ffs_softdep.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/ufs/ufs/ufs_acl.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/ufs/ufs/ufs_dirhash.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/ufs/ufs/ufs_vfsops.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/vm/uma.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/xdr/xdr_mbuf.c#2 integrate

Differences ...

==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/dump_machdep.c#10 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.16 2008/10/01 22:08:53 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.17 2008/10/31 10:11:35 kib Exp $");
 
 #include 
 #include 
@@ -165,7 +165,7 @@
 	va = 0;
 	pgs = mdp->md_size / PAGE_SIZE;
 	pa = mdp->md_start;
-	maxdumppgs = di->maxiosize / PAGE_SIZE;
+	maxdumppgs = min(di->maxiosize / PAGE_SIZE, MAXDUMPPGS);
 	if (maxdumppgs == 0)	/* seatbelt */
 		maxdumppgs = 1;
 

==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/minidump_machdep.c#12 (text) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.8 2008/10/01 22:08:53 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.9 2008/10/31 10:11:35 kib Exp $");
 
 #include 
 #include 
@@ -104,7 +104,7 @@
 	int error, i, c;
 	u_int maxdumpsz;
 
-	maxdumpsz = di->maxiosize;
+	maxdumpsz = min(di->maxiosize, MAXDUMPPGS * PAGE_SIZE);
 	if (maxdumpsz == 0)	/* seatbelt */
 		maxdumpsz = PAGE_SIZE;
 	error = 0;

==== //depot/projects/vimage-commit2/src/sys/boot/powerpc/boot1.chrp/boot1.c#2 (text+ko) ====

@@ -16,7 +16,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/boot/powerpc/boot1.chrp/boot1.c,v 1.1 2008/10/14 03:32:41 nwhitehorn Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/powerpc/boot1.chrp/boot1.c,v 1.2 2008/10/31 00:52:31 nwhitehorn Exp $");
 
 #include 
 #include 
@@ -561,6 +561,10 @@
 	va_list ap;
 	int ret;
 
+	/* Don't annoy the user as we probe for partitions */
+	if (strcmp(fmt,"Not ufs\n") == 0)
+		return 0;
+
 	va_start(ap, fmt);
 	ret = vprintf(fmt, ap);
 	va_end(ap);

==== //depot/projects/vimage-commit2/src/sys/boot/powerpc/boot1.chrp/bootinfo.txt#2 (text+ko) ====

@@ -1,12 +1,13 @@
 
 FreeBSD/powerpc bootloader
 FreeBSD
- $FreeBSD: src/sys/boot/powerpc/boot1.chrp/bootinfo.txt,v 1.1 2008/10/14 03:32:41 nwhitehorn Exp $ 
+ $FreeBSD: src/sys/boot/powerpc/boot1.chrp/bootinfo.txt,v 1.2 2008/10/31 00:52:31 nwhitehorn Exp $ 
 
 
 MacRISC MacRISC3 MacRISC4
 
 
+" screen" output
 boot &device;:&partition;,\ppc\boot1.elf
 
 

==== //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c,v 1.5 2008/05/24 19:30:38 bz Exp $");
+__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c,v 1.7 2008/11/05 20:32:13 rodrigc Exp $");
 
 #include 
 #include 
@@ -93,6 +93,10 @@
 zfs_kmem_free(void *buf, size_t size __unused)
 {
 #ifdef KMEM_DEBUG
+	if (buf == NULL) {
+		printf("%s: attempt to free NULL\n",__func__);
+		return;
+	}
 	struct kmem_item *i;
 
 	buf = (u_char *)buf - sizeof(struct kmem_item);
@@ -236,7 +240,8 @@
 }
 
 #ifdef KMEM_DEBUG
-static void
+void kmem_show(void *);
+void
 kmem_show(void *dummy __unused)
 {
 	struct kmem_item *i;
@@ -248,12 +253,10 @@
 		printf("KMEM_DEBUG: Leaked elements:\n\n");
 		LIST_FOREACH(i, &kmem_items, next) {
 			printf("address=%p\n", i);
-			stack_print(&i->stack);
-			printf("\n");
 		}
 	}
 	mtx_unlock(&kmem_items_mtx);
 }
 
-SYSUNINIT(sol_kmem, SI_SUB_DRIVERS, SI_ORDER_FIRST, kmem_show, NULL);
+SYSUNINIT(sol_kmem, SI_SUB_CPU, SI_ORDER_FIRST, kmem_show, NULL);
 #endif	/* KMEM_DEBUG */

==== //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/sys/types.h#2 (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/types.h,v 1.4 2008/03/28 22:16:06 jb Exp $
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/types.h,v 1.5 2008/11/05 19:39:11 rodrigc Exp $
  */
 
 #ifndef _OPENSOLARIS_SYS_TYPES_H_
@@ -64,12 +64,13 @@
 typedef	int64_t		rlim64_t;
 
 #else
-
+#ifdef NEED_SOLARIS_BOOLEAN
 #if defined(__XOPEN_OR_POSIX)
 typedef enum { _B_FALSE, _B_TRUE }	boolean_t;
 #else
 typedef enum { B_FALSE, B_TRUE }	boolean_t;
 #endif /* defined(__XOPEN_OR_POSIX) */
+#endif
 
 typedef	longlong_t	offset_t;
 typedef	u_longlong_t	u_offset_t;

==== //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/sys/uio.h#2 (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/uio.h,v 1.2 2008/03/28 22:16:06 jb Exp $
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/uio.h,v 1.3 2008/11/05 19:39:11 rodrigc Exp $
  */
 
 #ifndef _OPENSOLARIS_SYS_UIO_H_
@@ -51,6 +51,7 @@
 
 #define	uio_loffset	uio_offset
 
+#ifdef BUILDING_ZFS
 static __inline int
 zfs_uiomove(void *cp, size_t n, enum uio_rw dir, uio_t *uio)
 {
@@ -59,5 +60,6 @@
 	return (uiomove(cp, (int)n, uio));
 }
 #define	uiomove(cp, n, dir, uio)	zfs_uiomove((cp), (n), (dir), (uio))
+#endif
 
 #endif	/* !_OPENSOLARIS_SYS_UIO_H_ */

==== //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#5 (text+ko) ====

@@ -18,7 +18,7 @@
  *
  * CDDL HEADER END
  *
- * $FreeBSD: src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c,v 1.8 2008/09/27 17:52:48 jb Exp $
+ * $FreeBSD: src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c,v 1.9 2008/11/05 19:39:11 rodrigc Exp $
  */
 
 /*
@@ -3007,6 +3007,9 @@
 	case DIF_VAR_EXECARGS: {
 		struct pargs *p_args = curthread->td_proc->p_args;
 
+		if (p_args == NULL)
+			return(0);
+
 		return (dtrace_dif_varstrz(
 		    (uintptr_t) p_args->ar_args, p_args->ar_length, state, mstate));
 	}
@@ -10598,7 +10601,6 @@
 		/*
 		 * If there is already a buffer allocated for this CPU, it
 		 * is only possible that this is a DR event.  In this case,
-		 * the buffer size must match our specified size.
 		 */
 		if (buf->dtb_tomax != NULL) {
 			ASSERT(buf->dtb_size == size);
@@ -12815,11 +12817,7 @@
 	state = ddi_get_soft_state(dtrace_softstate, minor);
 #else
 	if (dev != NULL) {
-		/*
-		 * Disable this until we have the ability to set user
-		 * credentials for DTrace.
-		 * cr = dev->si_cred;
-		 */
+		cr = dev->si_cred;
 		m = dev2unit(dev);
 		}
 
@@ -15241,6 +15239,15 @@
 }
 #endif
 
+#if !defined(sun)
+#if __FreeBSD_version >= 800039
+static void
+dtrace_dtr(void *data __unused)
+{
+}
+#endif
+#endif
+
 /*ARGSUSED*/
 static int
 #if defined(sun)
@@ -15266,6 +15273,7 @@
 #else
 	cred_t *cred_p = NULL;
 
+#if __FreeBSD_version < 800039
 	/*
 	 * The first minor device is the one that is cloned so there is
 	 * nothing more to do here.
@@ -15281,6 +15289,7 @@
 	 */
 	if (dev->si_drv1 != NULL)
 		return (EBUSY);
+#endif
 
 	cred_p = dev->si_cred;
 #endif
@@ -15292,9 +15301,11 @@
 	dtrace_cred2priv(cred_p, &priv, &uid, &zoneid);
 	if (priv == DTRACE_PRIV_NONE) {
 #if !defined(sun)
+#if __FreeBSD_version < 800039
 		/* Destroy the cloned device. */
                 destroy_dev(dev);
 #endif
+#endif
 
 		return (EACCES);
 	}
@@ -15326,7 +15337,11 @@
 	state = dtrace_state_create(devp, cred_p);
 #else
 	state = dtrace_state_create(dev);
+#if __FreeBSD_version < 800039
 	dev->si_drv1 = state;
+#else
+	devfs_set_cdevpriv(state, dtrace_dtr);
+#endif
 #endif
 
 	mutex_exit(&cpu_lock);
@@ -15340,9 +15355,11 @@
 #endif
 		mutex_exit(&dtrace_lock);
 #if !defined(sun)
+#if __FreeBSD_version < 800039
 		/* Destroy the cloned device. */
                 destroy_dev(dev);
 #endif
+#endif
 		return (EAGAIN);
 	}
 
@@ -15368,11 +15385,16 @@
 
 	state = ddi_get_soft_state(dtrace_softstate, minor);
 #else
+#if __FreeBSD_version < 800039
 	dtrace_state_t *state = dev->si_drv1;
 
 	/* Check if this is not a cloned device. */
 	if (dev2unit(dev) == 0)
 		return (0);
+#else
+	dtrace_state_t *state;
+	devfs_get_cdevpriv((void **) &state);
+#endif
 
 #endif
 
@@ -15392,7 +15414,11 @@
 
 #if !defined(sun)
 		kmem_free(state, 0);
+#if __FreeBSD_version < 800039
 		dev->si_drv1 = NULL;
+#else
+		devfs_clear_cdevpriv();
+#endif
 #endif
 	}
 
@@ -15407,8 +15433,10 @@
 	mutex_exit(&dtrace_lock);
 	mutex_exit(&cpu_lock);
 
+#if __FreeBSD_version < 800039
 	/* Schedule this cloned device to be destroyed. */
 	destroy_dev_sched(dev);
+#endif
 
 	return (0);
 }
@@ -16442,16 +16470,20 @@
 static d_ioctl_t	dtrace_ioctl;
 static void		dtrace_load(void *);
 static int		dtrace_unload(void);
+#if __FreeBSD_version < 800039
 static void		dtrace_clone(void *, struct ucred *, char *, int , struct cdev **);
 static struct clonedevs	*dtrace_clones;		/* Ptr to the array of cloned devices. */
 static eventhandler_tag	eh_tag;			/* Event handler tag. */
+#else
+static struct cdev	*dtrace_dev;
+#endif
 
 void dtrace_invop_init(void);
 void dtrace_invop_uninit(void);
 
 static struct cdevsw dtrace_cdevsw = {
 	.d_version	= D_VERSION,
-	.d_flags	= D_NEEDMINOR,
+	.d_flags	= D_TRACKCLOSE | D_NEEDMINOR,
 	.d_close	= dtrace_close,
 	.d_ioctl	= dtrace_ioctl,
 	.d_open		= dtrace_open,
@@ -16459,7 +16491,9 @@
 };
 
 #include 
+#if __FreeBSD_version < 800039
 #include 
+#endif
 #include 
 #include 
 #include 

==== //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c#2 (text+ko) ====

@@ -2044,13 +2044,6 @@
 			    tp->ftt_proc->ftpc_acount != 0)
 				break;
 
-			/*
-			 * The count of active providers can only be
-			 * decremented (i.e. to zero) during exec, exit, and
-			 * removal of a meta provider so it should be
-			 * impossible to drop the count during this operation().
-			 */
-			ASSERT(tp->ftt_proc->ftpc_acount != 0);
 			tp = tp->ftt_next;
 		}
 

==== //depot/projects/vimage-commit2/src/sys/cddl/dev/dtrace/dtrace_ioctl.c#2 (text+ko) ====

@@ -18,7 +18,7 @@
  *
  * CDDL HEADER END
  *
- * $FreeBSD: src/sys/cddl/dev/dtrace/dtrace_ioctl.c,v 1.1 2008/05/23 05:59:41 jb Exp $
+ * $FreeBSD: src/sys/cddl/dev/dtrace/dtrace_ioctl.c,v 1.2 2008/11/05 19:39:11 rodrigc Exp $
  *
  */
 
@@ -32,7 +32,12 @@
 dtrace_ioctl(struct cdev *dev, u_long cmd, caddr_t addr,
     int flags __unused, struct thread *td)
 {
+#if __FreeBSD_version < 800039
 	dtrace_state_t *state = dev->si_drv1;
+#else
+	dtrace_state_t *state;
+	devfs_get_cdevpriv((void **) &state);
+#endif
 	int error = 0;
 	if (state == NULL)
 		return (EINVAL);

==== //depot/projects/vimage-commit2/src/sys/cddl/dev/dtrace/dtrace_load.c#2 (text+ko) ====

@@ -18,7 +18,7 @@
  *
  * CDDL HEADER END
  *
- * $FreeBSD: src/sys/cddl/dev/dtrace/dtrace_load.c,v 1.1 2008/05/23 05:59:41 jb Exp $
+ * $FreeBSD: src/sys/cddl/dev/dtrace/dtrace_load.c,v 1.2 2008/11/05 19:39:11 rodrigc Exp $
  *
  */
 
@@ -154,11 +154,15 @@
 
 	mutex_exit(&cpu_lock);
 
+#if __FreeBSD_version < 800039
 	/* Enable device cloning. */
 	clone_setup(&dtrace_clones);
 
 	/* Setup device cloning events. */
 	eh_tag = EVENTHANDLER_REGISTER(dev_clone, dtrace_clone, 0, 1000);
+#else
+	dtrace_dev = make_dev(&dtrace_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "dtrace/dtrace");
+#endif
 
 	return;
 }

==== //depot/projects/vimage-commit2/src/sys/cddl/dev/dtrace/dtrace_unload.c#2 (text+ko) ====

@@ -18,7 +18,7 @@
  *
  * CDDL HEADER END
  *
- * $FreeBSD: src/sys/cddl/dev/dtrace/dtrace_unload.c,v 1.1 2008/05/23 05:59:41 jb Exp $
+ * $FreeBSD: src/sys/cddl/dev/dtrace/dtrace_unload.c,v 1.2 2008/11/05 19:39:11 rodrigc Exp $
  *
  */
 
@@ -28,6 +28,7 @@
 	dtrace_state_t *state;
 	int error = 0;
 
+#if __FreeBSD_version < 800039
 	/*
 	 * Check if there is still an event handler callback
 	 * registered.
@@ -40,6 +41,9 @@
 		/* Stop device cloning. */
 		clone_cleanup(&dtrace_clones);
 	}
+#else
+	destroy_dev(dtrace_dev);
+#endif
 
 	mutex_enter(&dtrace_provider_lock);
 	mutex_enter(&dtrace_lock);

==== //depot/projects/vimage-commit2/src/sys/cddl/dev/systrace/systrace.c#2 (text+ko) ====

@@ -20,7 +20,7 @@
  *
  * Portions Copyright 2006-2008 John Birrell jb@freebsd.org
  *
- * $FreeBSD: src/sys/cddl/dev/systrace/systrace.c,v 1.1 2008/05/23 05:59:42 jb Exp $
+ * $FreeBSD: src/sys/cddl/dev/systrace/systrace.c,v 1.2 2008/11/05 19:39:11 rodrigc Exp $
  *
  */
 
@@ -50,15 +50,41 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
-#include 
 #include 
 #include 
 #include 
 
 #include 
 
+#ifdef LINUX_SYSTRACE
+#include 
+#include 
+#include 
+#include 
+#include 
+extern struct sysent linux_sysent[];
+#define	DEVNAME		"dtrace/linsystrace"
+#define	PROVNAME	"linsyscall"
+#define	MAXSYSCALL	LINUX_SYS_MAXSYSCALL
+#define	SYSCALLNAMES	linux_syscallnames
+#define	SYSENT		linux_sysent
+#else
+/*
+ * The syscall arguments are processed into a DTrace argument array
+ * using a generated function. See sys/kern/makesyscalls.sh.
+ */
+#include 
+#include 
+extern const char	*syscallnames[];
+#define	DEVNAME		"dtrace/systrace"
+#define	PROVNAME	"syscall"
+#define	MAXSYSCALL	SYS_MAXSYSCALL
+#define	SYSCALLNAMES	syscallnames

>>> TRUNCATED FOR MAIL (1000 lines) <<<
From zec at FreeBSD.org  Thu Nov  6 05:27:45 2008
From: zec at FreeBSD.org (Marko Zec)
Date: Thu Nov  6 05:27:53 2008
Subject: PERFORCE change 152571 for review
Message-ID: <200811061327.mA6DRiBG056571@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152571

Change 152571 by zec@zec_tca51 on 2008/11/06 13:27:01

	IFC @ 152569

Affected files ...

.. //depot/projects/vimage/src/sys/amd64/amd64/dump_machdep.c#11 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/minidump_machdep.c#13 integrate
.. //depot/projects/vimage/src/sys/boot/powerpc/boot1.chrp/boot1.c#2 integrate
.. //depot/projects/vimage/src/sys/boot/powerpc/boot1.chrp/bootinfo.txt#2 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#3 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/types.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/uio.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#5 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/dev/dtrace/dtrace_ioctl.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/dev/dtrace/dtrace_load.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/dev/dtrace/dtrace_unload.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/dev/systrace/systrace.c#2 integrate
.. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_proto.h#15 integrate
.. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscall.h#15 integrate
.. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscalls.c#15 integrate
.. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_sysent.c#15 integrate
.. //depot/projects/vimage/src/sys/compat/freebsd32/syscalls.master#16 integrate
.. //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#28 integrate
.. //depot/projects/vimage/src/sys/compat/linux/linux_emul.c#7 integrate
.. //depot/projects/vimage/src/sys/conf/NOTES#36 integrate
.. //depot/projects/vimage/src/sys/conf/files#42 integrate
.. //depot/projects/vimage/src/sys/conf/kmod.mk#8 integrate
.. //depot/projects/vimage/src/sys/conf/options#35 integrate
.. //depot/projects/vimage/src/sys/dev/acpi_support/acpi_asus.c#9 integrate
.. //depot/projects/vimage/src/sys/dev/acpica/Osd/OsdSchedule.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/acpica/acpi.c#15 integrate
.. //depot/projects/vimage/src/sys/dev/adb/adb_bus.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/adb/adb_mouse.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/adb/adbvar.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/amr/amr.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/amr/amr_cam.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/amr/amrvar.h#4 integrate
.. //depot/projects/vimage/src/sys/dev/an/if_an.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/ath/if_ath.c#22 integrate
.. //depot/projects/vimage/src/sys/dev/cardbus/cardbus_cis.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/cardbus/cardbusreg.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_main.c#18 integrate
.. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_osdep.h#13 integrate
.. //depot/projects/vimage/src/sys/dev/e1000/if_em.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/e1000/if_igb.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/en/midway.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_mod.c#10 integrate
.. //depot/projects/vimage/src/sys/dev/mn/if_mn.c#1 branch
.. //depot/projects/vimage/src/sys/dev/pci/pcireg.h#10 integrate
.. //depot/projects/vimage/src/sys/dev/snp/snp.c#9 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pci/hda/hdac.c#23 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pcm/channel.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pcm/channel.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pcm/mixer.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pcm/mixer.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/usb/u3g.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_subr.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usbdevs#34 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/bluetooth/TODO.TXT#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/bluetooth/ng_ubt2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/bluetooth/ng_ubt2_var.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/bluetooth/ubtbcmfw2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/bluetooth/usb2_bluetooth.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/bluetooth/usb2_bluetooth.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/at91dci.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/at91dci.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/at91dci_atmelarm.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/ehci2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/ehci2.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/ehci2_pci.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/musb2_otg.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/musb2_otg.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/ohci2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/ohci2.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/ohci2_atmelarm.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/ohci2_pci.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/uhci2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/uhci2.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/uhci2_pci.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/usb2_bus.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/usb2_controller.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/usb2_controller.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/usb2_pci.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/uss820dci.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/uss820dci.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/uss820dci_atmelarm.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/controller/uss820dci_pccard.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/README.TXT#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_busdma.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_busdma.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_compat_linux.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_compat_linux.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_config_td.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_config_td.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_core.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_core.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_debug.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_debug.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_dev.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_dev.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_device.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_device.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_dynamic.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_dynamic.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_error.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_generic.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_generic.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_handle_request.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_handle_request.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_hid.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_hid.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_hub.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_hub.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_if.m#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_lookup.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_lookup.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_mbuf.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_mbuf.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_msctest.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_msctest.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_parse.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_parse.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_process.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_process.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_request.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_request.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_sw_transfer.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_sw_transfer.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_transfer.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_transfer.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_util.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_util.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/core/usbdevs#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_aue2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_aue2_reg.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_axe2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_axe2_reg.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_cdce2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_cdce2_reg.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_cue2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_cue2_reg.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_kue2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_kue2_fw.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_kue2_reg.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_rue2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_rue2_reg.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_udav2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_udav2_reg.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/usb2_ethernet.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/usb2_ethernet.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/image/usb2_image.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/image/usb2_image.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/image/uscanner2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/include/Makefile#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/include/ufm2_ioctl.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/include/urio2_ioctl.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_cdc.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_defs.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_devid.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_devtable.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_endian.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_error.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_hid.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_ioctl.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_mfunc.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_revision.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_standard.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/input/uhid2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/input/ukbd2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/input/ums2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/input/usb2_input.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/input/usb2_input.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/input/usb2_rdesc.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/misc/udbp2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/misc/udbp2.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/misc/ufm2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/misc/usb2_misc.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/misc/usb2_misc.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/ndis/if_ndis_usb2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/ndis/usb2_ndis.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/ndis/usb2_ndis.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/quirk/usb2_quirk.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/quirk/usb2_quirk.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/serial/uark2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/serial/ubsa2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/serial/ubser2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/serial/uchcom2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/serial/ucycom2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/serial/ufoma2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/serial/uftdi2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/serial/uftdi2_reg.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/serial/ugensa2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/serial/uipaq2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/serial/ulpt2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/serial/umct2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/serial/umodem2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/serial/umoscom2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/serial/uplcom2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/serial/usb2_serial.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/serial/usb2_serial.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/serial/uvisor2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/serial/uvscom2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/sound/uaudio2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/sound/uaudio2.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/sound/uaudio2_pcm.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/sound/uaudio2_reg.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/sound/usb2_sound.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/sound/usb2_sound.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/storage/ata-usb2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/storage/umass2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/storage/urio2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/storage/usb2_storage.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/storage/usb2_storage.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/storage/ustorage2_fs.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/template/usb2_template.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/template/usb2_template.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/template/usb2_template_cdce.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/template/usb2_template_msc.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/template/usb2_template_mtp.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_rum2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_rum2_fw.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_rum2_reg.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_rum2_var.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_ural2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_ural2_reg.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_ural2_var.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_zyd2.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_zyd2_fw.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_zyd2_reg.h#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/wlan/usb2_wlan.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb2/wlan/usb2_wlan.h#1 branch
.. //depot/projects/vimage/src/sys/fs/coda/cnode.h#3 integrate
.. //depot/projects/vimage/src/sys/fs/coda/coda_subr.c#3 integrate
.. //depot/projects/vimage/src/sys/fs/coda/coda_venus.c#4 integrate
.. //depot/projects/vimage/src/sys/fs/ntfs/ntfs_vnops.c#6 integrate
.. //depot/projects/vimage/src/sys/fs/procfs/procfs.c#4 integrate
.. //depot/projects/vimage/src/sys/fs/procfs/procfs_map.c#6 integrate
.. //depot/projects/vimage/src/sys/fs/smbfs/smbfs_vfsops.c#6 integrate
.. //depot/projects/vimage/src/sys/fs/unionfs/union_vfsops.c#8 integrate
.. //depot/projects/vimage/src/sys/geom/geom_disk.c#7 integrate
.. //depot/projects/vimage/src/sys/geom/journal/g_journal.c#9 integrate
.. //depot/projects/vimage/src/sys/geom/part/g_part_apm.c#8 integrate
.. //depot/projects/vimage/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#12 integrate
.. //depot/projects/vimage/src/sys/i386/conf/XEN#4 integrate
.. //depot/projects/vimage/src/sys/i386/i386/bios.c#4 integrate
.. //depot/projects/vimage/src/sys/i386/i386/dump_machdep.c#13 integrate
.. //depot/projects/vimage/src/sys/i386/i386/minidump_machdep.c#13 integrate
.. //depot/projects/vimage/src/sys/isa/isa_common.c#4 integrate
.. //depot/projects/vimage/src/sys/isa/isa_common.h#3 integrate
.. //depot/projects/vimage/src/sys/isa/isavar.h#3 integrate
.. //depot/projects/vimage/src/sys/isa/pnp.c#2 integrate
.. //depot/projects/vimage/src/sys/kern/init_sysent.c#9 integrate
.. //depot/projects/vimage/src/sys/kern/kern_cons.c#1 branch
.. //depot/projects/vimage/src/sys/kern/kern_descrip.c#20 integrate
.. //depot/projects/vimage/src/sys/kern/kern_exec.c#18 integrate
.. //depot/projects/vimage/src/sys/kern/kern_proc.c#15 integrate
.. //depot/projects/vimage/src/sys/kern/kern_sig.c#16 integrate
.. //depot/projects/vimage/src/sys/kern/kern_thr.c#13 integrate
.. //depot/projects/vimage/src/sys/kern/kern_thread.c#18 integrate
.. //depot/projects/vimage/src/sys/kern/sched_ule.c#26 integrate
.. //depot/projects/vimage/src/sys/kern/subr_sleepqueue.c#14 integrate
.. //depot/projects/vimage/src/sys/kern/subr_smp.c#11 integrate
.. //depot/projects/vimage/src/sys/kern/subr_stack.c#6 integrate
.. //depot/projects/vimage/src/sys/kern/sys_process.c#10 integrate
.. //depot/projects/vimage/src/sys/kern/syscalls.c#9 integrate
.. //depot/projects/vimage/src/sys/kern/syscalls.master#10 integrate
.. //depot/projects/vimage/src/sys/kern/systrace_args.c#8 integrate
.. //depot/projects/vimage/src/sys/kern/tty.c#25 integrate
.. //depot/projects/vimage/src/sys/kern/tty_cons.c#8 delete
.. //depot/projects/vimage/src/sys/kern/tty_pts.c#9 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_export.c#15 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_lookup.c#16 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_mount.c#24 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_subr.c#20 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_syscalls.c#18 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_vnops.c#16 integrate
.. //depot/projects/vimage/src/sys/kgssapi/gss_accept_sec_context.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_acquire_cred.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_add_oid_set_member.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_canonicalize_name.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_create_empty_oid_set.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_delete_sec_context.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_display_status.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_export_name.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_get_mic.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_impl.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_import_name.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_init_sec_context.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_names.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_pname_to_uid.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_release_buffer.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_release_cred.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_release_name.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_release_oid_set.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_set_cred_option.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_test_oid_set_member.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_unwrap.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_verify_mic.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_wrap.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gss_wrap_size_limit.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gssapi.h#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gssapi_impl.h#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gssd.x#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gssd_prot.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/gsstest.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/kgss_if.m#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/krb5/kcrypto.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/krb5/kcrypto.h#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/krb5/kcrypto_aes.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/krb5/kcrypto_arcfour.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/krb5/kcrypto_des.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/krb5/kcrypto_des3.c#1 branch
.. //depot/projects/vimage/src/sys/kgssapi/krb5/krb5_mech.c#1 branch
.. //depot/projects/vimage/src/sys/mips/idt/if_kr.c#3 integrate
.. //depot/projects/vimage/src/sys/modules/Makefile#32 integrate
.. //depot/projects/vimage/src/sys/modules/amr/Makefile#3 integrate
.. //depot/projects/vimage/src/sys/modules/amr/amr_cam/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/kgssapi/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/kgssapi_krb5/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/krpc/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/nfsclient/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/nfsserver/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/rl/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/snp/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/usb2/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/bluetooth/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/bluetooth_fw/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/bluetooth_ng/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/controller/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/controller_at91dci/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/controller_ehci/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/controller_musb/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/controller_ohci/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/controller_uhci/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/controller_uss820dci/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/core/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/ethernet/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/ethernet_aue/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/ethernet_axe/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/ethernet_cdce/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/ethernet_cue/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/ethernet_dav/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/ethernet_kue/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/ethernet_rue/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/image/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/input/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/input_hid/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/input_kbd/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/input_ms/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/misc/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/misc_dbp/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/misc_fm/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/ndis/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/quirk/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/scanner/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/serial/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/serial_ark/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/serial_bsa/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/serial_bser/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/serial_chcom/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/serial_cycom/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/serial_foma/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/serial_ftdi/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/serial_gensa/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/serial_ipaq/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/serial_lpt/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/serial_mct/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/serial_modem/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/serial_moscom/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/serial_plcom/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/serial_visor/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/serial_vscom/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/sound/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/storage/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/storage_ata/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/storage_fs/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/storage_mass/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/storage_rio/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/template/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/wlan/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/wlan_ral/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/wlan_rum/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/wlan_zyd/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/zfs/Makefile#7 integrate
.. //depot/projects/vimage/src/sys/net/if_arcsubr.c#3 integrate
.. //depot/projects/vimage/src/sys/net/if_fddisubr.c#5 integrate
.. //depot/projects/vimage/src/sys/net/if_fwsubr.c#7 integrate
.. //depot/projects/vimage/src/sys/net/if_gif.c#20 integrate
.. //depot/projects/vimage/src/sys/net/if_iso88025subr.c#6 integrate
.. //depot/projects/vimage/src/sys/net/if_spppsubr.c#13 integrate
.. //depot/projects/vimage/src/sys/net/if_tun.c#11 integrate
.. //depot/projects/vimage/src/sys/net/radix_mpath.c#3 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_adhoc.c#5 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_hostap.c#5 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_sta.c#5 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_wds.c#4 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_input.c#42 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#57 integrate
.. //depot/projects/vimage/src/sys/netsmb/smb_conn.c#3 integrate
.. //depot/projects/vimage/src/sys/netsmb/smb_conn.h#3 integrate
.. //depot/projects/vimage/src/sys/netsmb/smb_dev.c#6 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfs.h#5 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfs_krpc.c#1 branch
.. //depot/projects/vimage/src/sys/nfsclient/nfs_nfsiod.c#4 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfs_socket.c#14 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfs_subs.c#8 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfs_vfsops.c#24 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfsmount.h#4 integrate
.. //depot/projects/vimage/src/sys/nfsserver/nfs.h#5 integrate
.. //depot/projects/vimage/src/sys/nfsserver/nfs_fha.c#1 branch
.. //depot/projects/vimage/src/sys/nfsserver/nfs_fha.h#1 branch
.. //depot/projects/vimage/src/sys/nfsserver/nfs_serv.c#12 integrate
.. //depot/projects/vimage/src/sys/nfsserver/nfs_srvcache.c#5 integrate
.. //depot/projects/vimage/src/sys/nfsserver/nfs_srvkrpc.c#1 branch
.. //depot/projects/vimage/src/sys/nfsserver/nfs_srvsock.c#9 integrate
.. //depot/projects/vimage/src/sys/nfsserver/nfs_srvsubs.c#11 integrate
.. //depot/projects/vimage/src/sys/nfsserver/nfs_syscalls.c#12 integrate
.. //depot/projects/vimage/src/sys/nfsserver/nfsm_subs.h#4 integrate
.. //depot/projects/vimage/src/sys/nfsserver/nfsrvcache.h#2 integrate
.. //depot/projects/vimage/src/sys/nlm/nlm.h#3 integrate
.. //depot/projects/vimage/src/sys/nlm/nlm_advlock.c#5 integrate
.. //depot/projects/vimage/src/sys/nlm/nlm_prot_impl.c#9 integrate
.. //depot/projects/vimage/src/sys/nlm/nlm_prot_svc.c#2 integrate
.. //depot/projects/vimage/src/sys/opencrypto/cryptosoft.c#5 integrate
.. //depot/projects/vimage/src/sys/pci/if_mn.c#4 delete
.. //depot/projects/vimage/src/sys/pci/if_rl.c#11 integrate
.. //depot/projects/vimage/src/sys/pci/if_rlreg.h#15 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/cpufunc.h#5 integrate
.. //depot/projects/vimage/src/sys/powerpc/powermac/cuda.c#2 integrate
.. //depot/projects/vimage/src/sys/powerpc/powermac/pmu.c#2 integrate
.. //depot/projects/vimage/src/sys/rpc/auth.h#2 integrate
.. //depot/projects/vimage/src/sys/rpc/auth_none.c#2 integrate
.. //depot/projects/vimage/src/sys/rpc/auth_unix.c#5 integrate
.. //depot/projects/vimage/src/sys/rpc/clnt.h#3 integrate
.. //depot/projects/vimage/src/sys/rpc/clnt_dg.c#4 integrate
.. //depot/projects/vimage/src/sys/rpc/clnt_rc.c#4 integrate
.. //depot/projects/vimage/src/sys/rpc/clnt_vc.c#3 integrate
.. //depot/projects/vimage/src/sys/rpc/replay.c#1 branch
.. //depot/projects/vimage/src/sys/rpc/replay.h#1 branch
.. //depot/projects/vimage/src/sys/rpc/rpc_com.h#2 integrate
.. //depot/projects/vimage/src/sys/rpc/rpc_generic.c#4 integrate
.. //depot/projects/vimage/src/sys/rpc/rpc_msg.h#2 integrate
.. //depot/projects/vimage/src/sys/rpc/rpc_prot.c#2 integrate
.. //depot/projects/vimage/src/sys/rpc/rpcsec_gss.h#1 branch
.. //depot/projects/vimage/src/sys/rpc/rpcsec_gss/rpcsec_gss.c#1 branch
.. //depot/projects/vimage/src/sys/rpc/rpcsec_gss/rpcsec_gss_conf.c#1 branch
.. //depot/projects/vimage/src/sys/rpc/rpcsec_gss/rpcsec_gss_int.h#1 branch
.. //depot/projects/vimage/src/sys/rpc/rpcsec_gss/rpcsec_gss_misc.c#1 branch
.. //depot/projects/vimage/src/sys/rpc/rpcsec_gss/rpcsec_gss_prot.c#1 branch
.. //depot/projects/vimage/src/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c#1 branch
.. //depot/projects/vimage/src/sys/rpc/svc.c#2 integrate
.. //depot/projects/vimage/src/sys/rpc/svc.h#2 integrate
.. //depot/projects/vimage/src/sys/rpc/svc_auth.c#2 integrate
.. //depot/projects/vimage/src/sys/rpc/svc_auth.h#2 integrate
.. //depot/projects/vimage/src/sys/rpc/svc_auth_unix.c#2 integrate
.. //depot/projects/vimage/src/sys/rpc/svc_dg.c#5 integrate
.. //depot/projects/vimage/src/sys/rpc/svc_generic.c#4 integrate
.. //depot/projects/vimage/src/sys/rpc/svc_vc.c#3 integrate
.. //depot/projects/vimage/src/sys/rpc/xdr.h#2 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit_arg.c#12 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit_bsm_klib.c#11 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit_pipe.c#10 integrate
.. //depot/projects/vimage/src/sys/sys/mount.h#13 integrate
.. //depot/projects/vimage/src/sys/sys/param.h#31 integrate
.. //depot/projects/vimage/src/sys/sys/proc.h#25 integrate
.. //depot/projects/vimage/src/sys/sys/syscall.h#9 integrate
.. //depot/projects/vimage/src/sys/sys/syscall.mk#9 integrate
.. //depot/projects/vimage/src/sys/sys/sysent.h#8 integrate
.. //depot/projects/vimage/src/sys/sys/sysproto.h#9 integrate
.. //depot/projects/vimage/src/sys/sys/tty.h#8 integrate
.. //depot/projects/vimage/src/sys/sys/user.h#9 integrate
.. //depot/projects/vimage/src/sys/tools/vnode_if.awk#2 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/ffs_softdep.c#12 integrate
.. //depot/projects/vimage/src/sys/ufs/ufs/ufs_acl.c#3 integrate
.. //depot/projects/vimage/src/sys/ufs/ufs/ufs_dirhash.c#6 integrate
.. //depot/projects/vimage/src/sys/ufs/ufs/ufs_vfsops.c#4 integrate
.. //depot/projects/vimage/src/sys/vm/uma.h#5 integrate
.. //depot/projects/vimage/src/sys/xdr/xdr_mbuf.c#2 integrate

Differences ...

==== //depot/projects/vimage/src/sys/amd64/amd64/dump_machdep.c#11 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.16 2008/10/01 22:08:53 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.17 2008/10/31 10:11:35 kib Exp $");
 
 #include 
 #include 
@@ -165,7 +165,7 @@
 	va = 0;
 	pgs = mdp->md_size / PAGE_SIZE;
 	pa = mdp->md_start;
-	maxdumppgs = di->maxiosize / PAGE_SIZE;
+	maxdumppgs = min(di->maxiosize / PAGE_SIZE, MAXDUMPPGS);
 	if (maxdumppgs == 0)	/* seatbelt */
 		maxdumppgs = 1;
 

==== //depot/projects/vimage/src/sys/amd64/amd64/minidump_machdep.c#13 (text) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.8 2008/10/01 22:08:53 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.9 2008/10/31 10:11:35 kib Exp $");
 
 #include 
 #include 
@@ -104,7 +104,7 @@
 	int error, i, c;
 	u_int maxdumpsz;
 
-	maxdumpsz = di->maxiosize;
+	maxdumpsz = min(di->maxiosize, MAXDUMPPGS * PAGE_SIZE);
 	if (maxdumpsz == 0)	/* seatbelt */
 		maxdumpsz = PAGE_SIZE;
 	error = 0;

==== //depot/projects/vimage/src/sys/boot/powerpc/boot1.chrp/boot1.c#2 (text+ko) ====

@@ -16,7 +16,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/boot/powerpc/boot1.chrp/boot1.c,v 1.1 2008/10/14 03:32:41 nwhitehorn Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/powerpc/boot1.chrp/boot1.c,v 1.2 2008/10/31 00:52:31 nwhitehorn Exp $");
 
 #include 
 #include 
@@ -561,6 +561,10 @@
 	va_list ap;
 	int ret;
 
+	/* Don't annoy the user as we probe for partitions */
+	if (strcmp(fmt,"Not ufs\n") == 0)
+		return 0;
+
 	va_start(ap, fmt);
 	ret = vprintf(fmt, ap);
 	va_end(ap);

==== //depot/projects/vimage/src/sys/boot/powerpc/boot1.chrp/bootinfo.txt#2 (text+ko) ====

@@ -1,12 +1,13 @@
 
 FreeBSD/powerpc bootloader
 FreeBSD
- $FreeBSD: src/sys/boot/powerpc/boot1.chrp/bootinfo.txt,v 1.1 2008/10/14 03:32:41 nwhitehorn Exp $ 
+ $FreeBSD: src/sys/boot/powerpc/boot1.chrp/bootinfo.txt,v 1.2 2008/10/31 00:52:31 nwhitehorn Exp $ 
 
 
 MacRISC MacRISC3 MacRISC4
 
 
+" screen" output
 boot &device;:&partition;,\ppc\boot1.elf
 
 

==== //depot/projects/vimage/src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c,v 1.5 2008/05/24 19:30:38 bz Exp $");
+__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c,v 1.7 2008/11/05 20:32:13 rodrigc Exp $");
 
 #include 
 #include 
@@ -93,6 +93,10 @@
 zfs_kmem_free(void *buf, size_t size __unused)
 {
 #ifdef KMEM_DEBUG
+	if (buf == NULL) {
+		printf("%s: attempt to free NULL\n",__func__);
+		return;
+	}
 	struct kmem_item *i;
 
 	buf = (u_char *)buf - sizeof(struct kmem_item);
@@ -236,7 +240,8 @@
 }
 
 #ifdef KMEM_DEBUG
-static void
+void kmem_show(void *);
+void
 kmem_show(void *dummy __unused)
 {
 	struct kmem_item *i;
@@ -248,12 +253,10 @@
 		printf("KMEM_DEBUG: Leaked elements:\n\n");
 		LIST_FOREACH(i, &kmem_items, next) {
 			printf("address=%p\n", i);
-			stack_print(&i->stack);
-			printf("\n");
 		}
 	}
 	mtx_unlock(&kmem_items_mtx);
 }
 
-SYSUNINIT(sol_kmem, SI_SUB_DRIVERS, SI_ORDER_FIRST, kmem_show, NULL);
+SYSUNINIT(sol_kmem, SI_SUB_CPU, SI_ORDER_FIRST, kmem_show, NULL);
 #endif	/* KMEM_DEBUG */

==== //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/types.h#2 (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/types.h,v 1.4 2008/03/28 22:16:06 jb Exp $
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/types.h,v 1.5 2008/11/05 19:39:11 rodrigc Exp $
  */
 
 #ifndef _OPENSOLARIS_SYS_TYPES_H_
@@ -64,12 +64,13 @@
 typedef	int64_t		rlim64_t;
 
 #else
-
+#ifdef NEED_SOLARIS_BOOLEAN
 #if defined(__XOPEN_OR_POSIX)
 typedef enum { _B_FALSE, _B_TRUE }	boolean_t;
 #else
 typedef enum { B_FALSE, B_TRUE }	boolean_t;
 #endif /* defined(__XOPEN_OR_POSIX) */
+#endif
 
 typedef	longlong_t	offset_t;
 typedef	u_longlong_t	u_offset_t;

==== //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/uio.h#2 (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/uio.h,v 1.2 2008/03/28 22:16:06 jb Exp $
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/uio.h,v 1.3 2008/11/05 19:39:11 rodrigc Exp $
  */
 
 #ifndef _OPENSOLARIS_SYS_UIO_H_
@@ -51,6 +51,7 @@
 
 #define	uio_loffset	uio_offset
 
+#ifdef BUILDING_ZFS
 static __inline int
 zfs_uiomove(void *cp, size_t n, enum uio_rw dir, uio_t *uio)
 {
@@ -59,5 +60,6 @@
 	return (uiomove(cp, (int)n, uio));
 }
 #define	uiomove(cp, n, dir, uio)	zfs_uiomove((cp), (n), (dir), (uio))
+#endif
 
 #endif	/* !_OPENSOLARIS_SYS_UIO_H_ */

==== //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#5 (text+ko) ====

@@ -18,7 +18,7 @@
  *
  * CDDL HEADER END
  *
- * $FreeBSD: src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c,v 1.8 2008/09/27 17:52:48 jb Exp $
+ * $FreeBSD: src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c,v 1.9 2008/11/05 19:39:11 rodrigc Exp $
  */
 
 /*
@@ -3007,6 +3007,9 @@
 	case DIF_VAR_EXECARGS: {
 		struct pargs *p_args = curthread->td_proc->p_args;
 
+		if (p_args == NULL)
+			return(0);
+
 		return (dtrace_dif_varstrz(
 		    (uintptr_t) p_args->ar_args, p_args->ar_length, state, mstate));
 	}
@@ -10598,7 +10601,6 @@
 		/*
 		 * If there is already a buffer allocated for this CPU, it
 		 * is only possible that this is a DR event.  In this case,
-		 * the buffer size must match our specified size.
 		 */
 		if (buf->dtb_tomax != NULL) {
 			ASSERT(buf->dtb_size == size);
@@ -12815,11 +12817,7 @@
 	state = ddi_get_soft_state(dtrace_softstate, minor);
 #else
 	if (dev != NULL) {
-		/*
-		 * Disable this until we have the ability to set user
-		 * credentials for DTrace.
-		 * cr = dev->si_cred;
-		 */
+		cr = dev->si_cred;
 		m = dev2unit(dev);
 		}
 
@@ -15241,6 +15239,15 @@
 }
 #endif
 
+#if !defined(sun)
+#if __FreeBSD_version >= 800039
+static void
+dtrace_dtr(void *data __unused)
+{
+}
+#endif
+#endif
+
 /*ARGSUSED*/
 static int
 #if defined(sun)
@@ -15266,6 +15273,7 @@
 #else
 	cred_t *cred_p = NULL;
 
+#if __FreeBSD_version < 800039
 	/*
 	 * The first minor device is the one that is cloned so there is
 	 * nothing more to do here.
@@ -15281,6 +15289,7 @@
 	 */
 	if (dev->si_drv1 != NULL)
 		return (EBUSY);
+#endif
 
 	cred_p = dev->si_cred;
 #endif
@@ -15292,9 +15301,11 @@
 	dtrace_cred2priv(cred_p, &priv, &uid, &zoneid);
 	if (priv == DTRACE_PRIV_NONE) {
 #if !defined(sun)
+#if __FreeBSD_version < 800039
 		/* Destroy the cloned device. */
                 destroy_dev(dev);
 #endif
+#endif
 
 		return (EACCES);
 	}
@@ -15326,7 +15337,11 @@
 	state = dtrace_state_create(devp, cred_p);
 #else
 	state = dtrace_state_create(dev);
+#if __FreeBSD_version < 800039
 	dev->si_drv1 = state;
+#else
+	devfs_set_cdevpriv(state, dtrace_dtr);
+#endif
 #endif
 
 	mutex_exit(&cpu_lock);
@@ -15340,9 +15355,11 @@
 #endif
 		mutex_exit(&dtrace_lock);
 #if !defined(sun)
+#if __FreeBSD_version < 800039
 		/* Destroy the cloned device. */
                 destroy_dev(dev);
 #endif
+#endif
 		return (EAGAIN);
 	}
 
@@ -15368,11 +15385,16 @@
 
 	state = ddi_get_soft_state(dtrace_softstate, minor);
 #else
+#if __FreeBSD_version < 800039
 	dtrace_state_t *state = dev->si_drv1;
 
 	/* Check if this is not a cloned device. */
 	if (dev2unit(dev) == 0)
 		return (0);
+#else
+	dtrace_state_t *state;
+	devfs_get_cdevpriv((void **) &state);
+#endif
 
 #endif
 
@@ -15392,7 +15414,11 @@
 
 #if !defined(sun)
 		kmem_free(state, 0);
+#if __FreeBSD_version < 800039
 		dev->si_drv1 = NULL;
+#else
+		devfs_clear_cdevpriv();
+#endif
 #endif
 	}
 
@@ -15407,8 +15433,10 @@
 	mutex_exit(&dtrace_lock);
 	mutex_exit(&cpu_lock);
 
+#if __FreeBSD_version < 800039
 	/* Schedule this cloned device to be destroyed. */
 	destroy_dev_sched(dev);
+#endif
 
 	return (0);
 }
@@ -16442,16 +16470,20 @@
 static d_ioctl_t	dtrace_ioctl;
 static void		dtrace_load(void *);
 static int		dtrace_unload(void);
+#if __FreeBSD_version < 800039
 static void		dtrace_clone(void *, struct ucred *, char *, int , struct cdev **);
 static struct clonedevs	*dtrace_clones;		/* Ptr to the array of cloned devices. */
 static eventhandler_tag	eh_tag;			/* Event handler tag. */
+#else
+static struct cdev	*dtrace_dev;
+#endif
 
 void dtrace_invop_init(void);
 void dtrace_invop_uninit(void);
 
 static struct cdevsw dtrace_cdevsw = {
 	.d_version	= D_VERSION,
-	.d_flags	= D_NEEDMINOR,
+	.d_flags	= D_TRACKCLOSE | D_NEEDMINOR,
 	.d_close	= dtrace_close,
 	.d_ioctl	= dtrace_ioctl,
 	.d_open		= dtrace_open,
@@ -16459,7 +16491,9 @@
 };
 
 #include 
+#if __FreeBSD_version < 800039
 #include 
+#endif
 #include 
 #include 
 #include 

==== //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c#2 (text+ko) ====

@@ -2044,13 +2044,6 @@
 			    tp->ftt_proc->ftpc_acount != 0)
 				break;
 
-			/*
-			 * The count of active providers can only be
-			 * decremented (i.e. to zero) during exec, exit, and
-			 * removal of a meta provider so it should be
-			 * impossible to drop the count during this operation().
-			 */
-			ASSERT(tp->ftt_proc->ftpc_acount != 0);
 			tp = tp->ftt_next;
 		}
 

==== //depot/projects/vimage/src/sys/cddl/dev/dtrace/dtrace_ioctl.c#2 (text+ko) ====

@@ -18,7 +18,7 @@
  *
  * CDDL HEADER END
  *
- * $FreeBSD: src/sys/cddl/dev/dtrace/dtrace_ioctl.c,v 1.1 2008/05/23 05:59:41 jb Exp $
+ * $FreeBSD: src/sys/cddl/dev/dtrace/dtrace_ioctl.c,v 1.2 2008/11/05 19:39:11 rodrigc Exp $
  *
  */
 
@@ -32,7 +32,12 @@
 dtrace_ioctl(struct cdev *dev, u_long cmd, caddr_t addr,
     int flags __unused, struct thread *td)
 {
+#if __FreeBSD_version < 800039
 	dtrace_state_t *state = dev->si_drv1;
+#else
+	dtrace_state_t *state;
+	devfs_get_cdevpriv((void **) &state);
+#endif
 	int error = 0;
 	if (state == NULL)
 		return (EINVAL);

==== //depot/projects/vimage/src/sys/cddl/dev/dtrace/dtrace_load.c#2 (text+ko) ====

@@ -18,7 +18,7 @@
  *
  * CDDL HEADER END
  *
- * $FreeBSD: src/sys/cddl/dev/dtrace/dtrace_load.c,v 1.1 2008/05/23 05:59:41 jb Exp $
+ * $FreeBSD: src/sys/cddl/dev/dtrace/dtrace_load.c,v 1.2 2008/11/05 19:39:11 rodrigc Exp $
  *
  */
 
@@ -154,11 +154,15 @@
 
 	mutex_exit(&cpu_lock);
 
+#if __FreeBSD_version < 800039
 	/* Enable device cloning. */
 	clone_setup(&dtrace_clones);
 
 	/* Setup device cloning events. */
 	eh_tag = EVENTHANDLER_REGISTER(dev_clone, dtrace_clone, 0, 1000);
+#else
+	dtrace_dev = make_dev(&dtrace_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "dtrace/dtrace");
+#endif
 
 	return;
 }

==== //depot/projects/vimage/src/sys/cddl/dev/dtrace/dtrace_unload.c#2 (text+ko) ====

@@ -18,7 +18,7 @@
  *
  * CDDL HEADER END
  *
- * $FreeBSD: src/sys/cddl/dev/dtrace/dtrace_unload.c,v 1.1 2008/05/23 05:59:41 jb Exp $
+ * $FreeBSD: src/sys/cddl/dev/dtrace/dtrace_unload.c,v 1.2 2008/11/05 19:39:11 rodrigc Exp $
  *
  */
 
@@ -28,6 +28,7 @@
 	dtrace_state_t *state;
 	int error = 0;
 
+#if __FreeBSD_version < 800039
 	/*
 	 * Check if there is still an event handler callback
 	 * registered.
@@ -40,6 +41,9 @@
 		/* Stop device cloning. */
 		clone_cleanup(&dtrace_clones);
 	}
+#else
+	destroy_dev(dtrace_dev);
+#endif
 
 	mutex_enter(&dtrace_provider_lock);
 	mutex_enter(&dtrace_lock);

==== //depot/projects/vimage/src/sys/cddl/dev/systrace/systrace.c#2 (text+ko) ====

@@ -20,7 +20,7 @@
  *
  * Portions Copyright 2006-2008 John Birrell jb@freebsd.org
  *
- * $FreeBSD: src/sys/cddl/dev/systrace/systrace.c,v 1.1 2008/05/23 05:59:42 jb Exp $
+ * $FreeBSD: src/sys/cddl/dev/systrace/systrace.c,v 1.2 2008/11/05 19:39:11 rodrigc Exp $
  *
  */
 
@@ -50,15 +50,41 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
-#include 
 #include 
 #include 
 #include 
 
 #include 
 
+#ifdef LINUX_SYSTRACE
+#include 
+#include 
+#include 
+#include 
+#include 
+extern struct sysent linux_sysent[];
+#define	DEVNAME		"dtrace/linsystrace"
+#define	PROVNAME	"linsyscall"
+#define	MAXSYSCALL	LINUX_SYS_MAXSYSCALL
+#define	SYSCALLNAMES	linux_syscallnames
+#define	SYSENT		linux_sysent
+#else
+/*
+ * The syscall arguments are processed into a DTrace argument array
+ * using a generated function. See sys/kern/makesyscalls.sh.
+ */
+#include 
+#include 
+extern const char	*syscallnames[];
+#define	DEVNAME		"dtrace/systrace"
+#define	PROVNAME	"syscall"
+#define	MAXSYSCALL	SYS_MAXSYSCALL
+#define	SYSCALLNAMES	syscallnames

>>> TRUNCATED FOR MAIL (1000 lines) <<<
From hselasky at FreeBSD.org  Thu Nov  6 09:06:33 2008
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Thu Nov  6 09:06:39 2008
Subject: PERFORCE change 152584 for review
Message-ID: <200811061706.mA6H6WWw091831@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152584

Change 152584 by hselasky@hselasky_laptop001 on 2008/11/06 17:05:48

	
	Remove "ucom" dependancy from USB serial drivers.
	Remove some device ID's from ugensa which are
	no longer present in usbdevs.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/serial/uark2.c#9 edit
.. //depot/projects/usb/src/sys/dev/usb2/serial/ubsa2.c#13 edit
.. //depot/projects/usb/src/sys/dev/usb2/serial/ubser2.c#9 edit
.. //depot/projects/usb/src/sys/dev/usb2/serial/uchcom2.c#10 edit
.. //depot/projects/usb/src/sys/dev/usb2/serial/ucycom2.c#10 edit
.. //depot/projects/usb/src/sys/dev/usb2/serial/ufoma2.c#12 edit
.. //depot/projects/usb/src/sys/dev/usb2/serial/uftdi2.c#10 edit
.. //depot/projects/usb/src/sys/dev/usb2/serial/ugensa2.c#13 edit
.. //depot/projects/usb/src/sys/dev/usb2/serial/uipaq2.c#11 edit
.. //depot/projects/usb/src/sys/dev/usb2/serial/umct2.c#9 edit
.. //depot/projects/usb/src/sys/dev/usb2/serial/umodem2.c#12 edit
.. //depot/projects/usb/src/sys/dev/usb2/serial/umoscom2.c#10 edit
.. //depot/projects/usb/src/sys/dev/usb2/serial/uplcom2.c#11 edit
.. //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.c#16 edit
.. //depot/projects/usb/src/sys/dev/usb2/serial/uvisor2.c#10 edit
.. //depot/projects/usb/src/sys/dev/usb2/serial/uvscom2.c#10 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/serial/uark2.c#9 (text+ko) ====

@@ -174,7 +174,6 @@
 DRIVER_MODULE(uark, ushub, uark_driver, uark_devclass, NULL, 0);
 MODULE_DEPEND(uark, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(uark, usb2_core, 1, 1, 1);
-MODULE_DEPEND(uark, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
 
 static const struct usb2_device_id uark_devs[] = {
 	{USB_VPI(USB_VENDOR_ARKMICRO, USB_PRODUCT_ARKMICRO_ARK3116, 0)},

==== //depot/projects/usb/src/sys/dev/usb2/serial/ubsa2.c#13 (text+ko) ====

@@ -293,7 +293,6 @@
 DRIVER_MODULE(ubsa, ushub, ubsa_driver, ubsa_devclass, NULL, 0);
 MODULE_DEPEND(ubsa, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(ubsa, usb2_core, 1, 1, 1);
-MODULE_DEPEND(ubsa, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
 
 static int
 ubsa_probe(device_t dev)

==== //depot/projects/usb/src/sys/dev/usb2/serial/ubser2.c#9 (text+ko) ====

@@ -227,7 +227,6 @@
 DRIVER_MODULE(ubser, ushub, ubser_driver, ubser_devclass, NULL, 0);
 MODULE_DEPEND(ubser, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(ubser, usb2_core, 1, 1, 1);
-MODULE_DEPEND(ubser, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
 
 static int
 ubser_probe(device_t dev)

==== //depot/projects/usb/src/sys/dev/usb2/serial/uchcom2.c#10 (text+ko) ====

@@ -1035,4 +1035,3 @@
 DRIVER_MODULE(uchcom, ushub, uchcom_driver, uchcom_devclass, NULL, 0);
 MODULE_DEPEND(uchcom, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(uchcom, usb2_core, 1, 1, 1);
-MODULE_DEPEND(uchcom, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);

==== //depot/projects/usb/src/sys/dev/usb2/serial/ucycom2.c#10 (text+ko) ====

@@ -173,7 +173,6 @@
 DRIVER_MODULE(ucycom, ushub, ucycom_driver, ucycom_devclass, NULL, 0);
 MODULE_DEPEND(ucycom, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(ucycom, usb2_core, 1, 1, 1);
-MODULE_DEPEND(ucycom, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
 
 /*
  * Supported devices

==== //depot/projects/usb/src/sys/dev/usb2/serial/ufoma2.c#12 (text+ko) ====

@@ -335,7 +335,6 @@
 DRIVER_MODULE(ufoma, ushub, ufoma_driver, ufoma_devclass, NULL, 0);
 MODULE_DEPEND(ufoma, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(ufoma, usb2_core, 1, 1, 1);
-MODULE_DEPEND(ufoma, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
 
 static int
 ufoma_probe(device_t dev)

==== //depot/projects/usb/src/sys/dev/usb2/serial/uftdi2.c#10 (text+ko) ====

@@ -222,7 +222,6 @@
 DRIVER_MODULE(uftdi, ushub, uftdi_driver, uftdi_devclass, NULL, 0);
 MODULE_DEPEND(uftdi, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(uftdi, usb2_core, 1, 1, 1);
-MODULE_DEPEND(uftdi, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
 
 static struct usb2_device_id uftdi_devs[] = {
 	{USB_VPI(USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_8U100AX, UFTDI_TYPE_SIO)},

==== //depot/projects/usb/src/sys/dev/usb2/serial/ugensa2.c#13 (text+ko) ====

@@ -172,14 +172,13 @@
 DRIVER_MODULE(ugensa, ushub, ugensa_driver, ugensa_devclass, NULL, 0);
 MODULE_DEPEND(ugensa, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(ugensa, usb2_core, 1, 1, 1);
-MODULE_DEPEND(ugensa, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
 
 static const struct usb2_device_id ugensa_devs[] = {
 	{USB_VPI(USB_VENDOR_AIRPRIME, USB_PRODUCT_AIRPRIME_PC5220, 0)},
 	{USB_VPI(USB_VENDOR_CMOTECH, USB_PRODUCT_CMOTECH_CDMA_MODEM1, 0)},
 	{USB_VPI(USB_VENDOR_KYOCERA2, USB_PRODUCT_KYOCERA2_CDMA_MSM_K, 0)},
 	{USB_VPI(USB_VENDOR_HP, USB_PRODUCT_HP_49GPLUS, 0)},
-	{USB_VPI(USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E270, 0)},
+/*	{USB_VPI(USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E270, 0)}, */
 	{USB_VPI(USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_MOBILE, 0)},
 	{USB_VPI(USB_VENDOR_MERLIN, USB_PRODUCT_MERLIN_V620, 0)},
 	{USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_CDMA_MODEM, 0)},
@@ -188,7 +187,7 @@
 	{USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U727, 0)},
 	{USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U740, 0)},
 	{USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U740_2, 0)},
-	{USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U950D, 0)},
+/*	{USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U950D, 0)}, */
 	{USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_V620, 0)},
 	{USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_V640, 0)},
 	{USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_V720, 0)},

==== //depot/projects/usb/src/sys/dev/usb2/serial/uipaq2.c#11 (text+ko) ====

@@ -1094,7 +1094,6 @@
 DRIVER_MODULE(uipaq, ushub, uipaq_driver, uipaq_devclass, NULL, 0);
 MODULE_DEPEND(uipaq, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(uipaq, usb2_core, 1, 1, 1);
-MODULE_DEPEND(uipaq, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
 
 static int
 uipaq_probe(device_t dev)

==== //depot/projects/usb/src/sys/dev/usb2/serial/umct2.c#9 (text+ko) ====

@@ -237,7 +237,6 @@
 DRIVER_MODULE(umct, ushub, umct_driver, umct_devclass, NULL, 0);
 MODULE_DEPEND(umct, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(umct, usb2_core, 1, 1, 1);
-MODULE_DEPEND(umct, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
 
 static int
 umct_probe(device_t dev)

==== //depot/projects/usb/src/sys/dev/usb2/serial/umodem2.c#12 (text+ko) ====

@@ -278,7 +278,6 @@
 DRIVER_MODULE(umodem, ushub, umodem_driver, umodem_devclass, NULL, 0);
 MODULE_DEPEND(umodem, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(umodem, usb2_core, 1, 1, 1);
-MODULE_DEPEND(umodem, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
 MODULE_VERSION(umodem, UMODEM_MODVER);
 
 static int

==== //depot/projects/usb/src/sys/dev/usb2/serial/umoscom2.c#10 (text+ko) ====

@@ -296,7 +296,6 @@
 DRIVER_MODULE(umoscom, ushub, umoscom_driver, umoscom_devclass, NULL, 0);
 MODULE_DEPEND(umoscom, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(umoscom, usb2_core, 1, 1, 1);
-MODULE_DEPEND(umoscom, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
 
 static const struct usb2_device_id umoscom_devs[] = {
 	{USB_VPI(USB_VENDOR_MOSCHIP, USB_PRODUCT_MOSCHIP_MCS7703, 0)}

==== //depot/projects/usb/src/sys/dev/usb2/serial/uplcom2.c#11 (text+ko) ====

@@ -331,7 +331,6 @@
 DRIVER_MODULE(uplcom, ushub, uplcom_driver, uplcom_devclass, NULL, 0);
 MODULE_DEPEND(uplcom, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(uplcom, usb2_core, 1, 1, 1);
-MODULE_DEPEND(uplcom, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
 MODULE_VERSION(uplcom, UPLCOM_MODVER);
 
 static int

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

@@ -147,8 +147,7 @@
 	.tsw_free = usb2_com_free,
 };
 
-MODULE_DEPEND(ucom, usb2_core, 1, 1, 1);
-MODULE_VERSION(ucom, UCOM_MODVER);
+MODULE_DEPEND(usb2_serial, usb2_core, 1, 1, 1);
 MODULE_VERSION(usb2_serial, 1);
 
 #define	UCOM_UNIT_MAX 0x1000		/* exclusive */

==== //depot/projects/usb/src/sys/dev/usb2/serial/uvisor2.c#10 (text+ko) ====

@@ -256,7 +256,6 @@
 DRIVER_MODULE(uvisor, ushub, uvisor_driver, uvisor_devclass, NULL, 0);
 MODULE_DEPEND(uvisor, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(uvisor, usb2_core, 1, 1, 1);
-MODULE_DEPEND(uvisor, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
 
 static const struct usb2_device_id uvisor_devs[] = {
 	{USB_VPI(USB_VENDOR_ACEECA, USB_PRODUCT_ACEECA_MEZ1000, UVISOR_FLAG_PALM4)},

==== //depot/projects/usb/src/sys/dev/usb2/serial/uvscom2.c#10 (text+ko) ====

@@ -283,7 +283,6 @@
 DRIVER_MODULE(uvscom, ushub, uvscom_driver, uvscom_devclass, NULL, 0);
 MODULE_DEPEND(uvscom, usb2_serial, 1, 1, 1);
 MODULE_DEPEND(uvscom, usb2_core, 1, 1, 1);
-MODULE_DEPEND(uvscom, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER);
 MODULE_VERSION(uvscom, UVSCOM_MODVER);
 
 static int
From bz at FreeBSD.org  Thu Nov  6 09:57:27 2008
From: bz at FreeBSD.org (Bjoern A. Zeeb)
Date: Thu Nov  6 09:57:35 2008
Subject: PERFORCE change 152586 for review
Message-ID: <200811061757.mA6HvOvE095939@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152586

Change 152586 by bz@bz_dumpster on 2008/11/06 17:57:10

	IFC @152585
	usb2, no-networking (INET) kernel should be possible now.

Affected files ...

.. //depot/projects/s390/UPDATING#18 integrate
.. //depot/projects/s390/bin/cat/cat.c#6 integrate
.. //depot/projects/s390/bin/chio/chio.c#4 integrate
.. //depot/projects/s390/bin/cp/utils.c#9 integrate
.. //depot/projects/s390/bin/rcp/rcp.c#7 integrate
.. //depot/projects/s390/cddl/Makefile.inc#2 integrate
.. //depot/projects/s390/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c#2 integrate
.. //depot/projects/s390/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst#2 integrate
.. //depot/projects/s390/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c#3 integrate
.. //depot/projects/s390/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c#2 integrate
.. //depot/projects/s390/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c#2 integrate
.. //depot/projects/s390/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.h#2 integrate
.. //depot/projects/s390/cddl/contrib/opensolaris/lib/libdtrace/common/dt_program.c#2 integrate
.. //depot/projects/s390/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h#2 integrate
.. //depot/projects/s390/contrib/smbfs/lib/smb/nb_name.c#3 integrate
.. //depot/projects/s390/etc/Makefile#17 integrate
.. //depot/projects/s390/etc/defaults/rc.conf#17 integrate
.. //depot/projects/s390/etc/devd.conf#10 integrate
.. //depot/projects/s390/etc/gss/mech#3 integrate
.. //depot/projects/s390/etc/rc.d/Makefile#13 integrate
.. //depot/projects/s390/etc/rc.d/gssd#1 branch
.. //depot/projects/s390/etc/rc.d/netif#7 integrate
.. //depot/projects/s390/etc/rc.d/nfsd#7 integrate
.. //depot/projects/s390/etc/remote#5 integrate
.. //depot/projects/s390/include/rpc/xdr.h#4 integrate
.. //depot/projects/s390/include/strings.h#4 integrate
.. //depot/projects/s390/lib/libarchive/archive_write.3#4 integrate
.. //depot/projects/s390/lib/libc/amd64/SYS.h#4 integrate
.. //depot/projects/s390/lib/libc/amd64/gen/_setjmp.S#4 integrate
.. //depot/projects/s390/lib/libc/amd64/gen/fabs.S#3 integrate
.. //depot/projects/s390/lib/libc/amd64/gen/modf.S#3 integrate
.. //depot/projects/s390/lib/libc/amd64/gen/rfork_thread.S#2 integrate
.. //depot/projects/s390/lib/libc/amd64/gen/setjmp.S#4 integrate
.. //depot/projects/s390/lib/libc/amd64/gen/sigsetjmp.S#4 integrate
.. //depot/projects/s390/lib/libc/amd64/stdlib/div.S#2 integrate
.. //depot/projects/s390/lib/libc/amd64/stdlib/ldiv.S#2 integrate
.. //depot/projects/s390/lib/libc/amd64/stdlib/lldiv.S#2 integrate
.. //depot/projects/s390/lib/libc/amd64/string/bcmp.S#2 integrate
.. //depot/projects/s390/lib/libc/amd64/string/bcopy.S#2 integrate
.. //depot/projects/s390/lib/libc/amd64/string/bzero.S#2 integrate
.. //depot/projects/s390/lib/libc/amd64/string/memcmp.S#2 integrate
.. //depot/projects/s390/lib/libc/amd64/string/memset.S#2 integrate
.. //depot/projects/s390/lib/libc/amd64/string/strcat.S#2 integrate
.. //depot/projects/s390/lib/libc/amd64/string/strcmp.S#2 integrate
.. //depot/projects/s390/lib/libc/amd64/string/strcpy.S#2 integrate
.. //depot/projects/s390/lib/libc/amd64/sys/brk.S#4 integrate
.. //depot/projects/s390/lib/libc/amd64/sys/exect.S#3 integrate
.. //depot/projects/s390/lib/libc/amd64/sys/getcontext.S#2 integrate
.. //depot/projects/s390/lib/libc/amd64/sys/pipe.S#4 integrate
.. //depot/projects/s390/lib/libc/amd64/sys/ptrace.S#3 integrate
.. //depot/projects/s390/lib/libc/amd64/sys/reboot.S#4 integrate
.. //depot/projects/s390/lib/libc/amd64/sys/sbrk.S#3 integrate
.. //depot/projects/s390/lib/libc/amd64/sys/setlogin.S#4 integrate
.. //depot/projects/s390/lib/libc/amd64/sys/vfork.S#4 integrate
.. //depot/projects/s390/lib/libc/gen/dirname.3#6 integrate
.. //depot/projects/s390/lib/libc/gen/dirname.c#4 integrate
.. //depot/projects/s390/lib/libc/gen/err.3#5 integrate
.. //depot/projects/s390/lib/libc/i386/SYS.h#4 integrate
.. //depot/projects/s390/lib/libc/i386/gen/_ctx_start.S#4 integrate
.. //depot/projects/s390/lib/libc/i386/gen/_setjmp.S#3 integrate
.. //depot/projects/s390/lib/libc/i386/gen/fabs.S#3 integrate
.. //depot/projects/s390/lib/libc/i386/gen/modf.S#3 integrate
.. //depot/projects/s390/lib/libc/i386/gen/rfork_thread.S#3 integrate
.. //depot/projects/s390/lib/libc/i386/gen/setjmp.S#3 integrate
.. //depot/projects/s390/lib/libc/i386/gen/sigsetjmp.S#3 integrate
.. //depot/projects/s390/lib/libc/i386/stdlib/abs.S#3 integrate
.. //depot/projects/s390/lib/libc/i386/stdlib/div.S#5 integrate
.. //depot/projects/s390/lib/libc/i386/stdlib/labs.S#3 integrate
.. //depot/projects/s390/lib/libc/i386/stdlib/ldiv.S#4 integrate
.. //depot/projects/s390/lib/libc/i386/string/bcmp.S#3 integrate
.. //depot/projects/s390/lib/libc/i386/string/bcopy.S#4 integrate
.. //depot/projects/s390/lib/libc/i386/string/bzero.S#2 integrate
.. //depot/projects/s390/lib/libc/i386/string/ffs.S#2 integrate
.. //depot/projects/s390/lib/libc/i386/string/index.S#2 integrate
.. //depot/projects/s390/lib/libc/i386/string/memchr.S#2 integrate
.. //depot/projects/s390/lib/libc/i386/string/memcmp.S#2 integrate
.. //depot/projects/s390/lib/libc/i386/string/memset.S#2 integrate
.. //depot/projects/s390/lib/libc/i386/string/rindex.S#2 integrate
.. //depot/projects/s390/lib/libc/i386/string/strcat.S#2 integrate
.. //depot/projects/s390/lib/libc/i386/string/strchr.S#2 integrate
.. //depot/projects/s390/lib/libc/i386/string/strcmp.S#2 integrate
.. //depot/projects/s390/lib/libc/i386/string/strcpy.S#2 integrate
.. //depot/projects/s390/lib/libc/i386/string/strlen.S#2 integrate
.. //depot/projects/s390/lib/libc/i386/string/strncmp.S#2 integrate
.. //depot/projects/s390/lib/libc/i386/string/strrchr.S#2 integrate
.. //depot/projects/s390/lib/libc/i386/string/swab.S#3 integrate
.. //depot/projects/s390/lib/libc/i386/string/wcschr.S#2 integrate
.. //depot/projects/s390/lib/libc/i386/string/wcscmp.S#2 integrate
.. //depot/projects/s390/lib/libc/i386/string/wcslen.S#2 integrate
.. //depot/projects/s390/lib/libc/i386/string/wmemchr.S#2 integrate
.. //depot/projects/s390/lib/libc/i386/sys/Ovfork.S#3 integrate
.. //depot/projects/s390/lib/libc/i386/sys/brk.S#3 integrate
.. //depot/projects/s390/lib/libc/i386/sys/exect.S#3 integrate
.. //depot/projects/s390/lib/libc/i386/sys/getcontext.S#2 integrate
.. //depot/projects/s390/lib/libc/i386/sys/pipe.S#3 integrate
.. //depot/projects/s390/lib/libc/i386/sys/ptrace.S#3 integrate
.. //depot/projects/s390/lib/libc/i386/sys/reboot.S#3 integrate
.. //depot/projects/s390/lib/libc/i386/sys/sbrk.S#4 integrate
.. //depot/projects/s390/lib/libc/i386/sys/setlogin.S#3 integrate
.. //depot/projects/s390/lib/libc/i386/sys/syscall.S#3 integrate
.. //depot/projects/s390/lib/libc/posix1e/acl_add_perm.3#3 integrate
.. //depot/projects/s390/lib/libc/posix1e/acl_calc_mask.3#3 integrate
.. //depot/projects/s390/lib/libc/posix1e/acl_calc_mask.c#2 integrate
.. //depot/projects/s390/lib/libc/posix1e/acl_clear_perms.3#3 integrate
.. //depot/projects/s390/lib/libc/posix1e/acl_copy.c#2 integrate
.. //depot/projects/s390/lib/libc/posix1e/acl_copy_entry.3#3 integrate
.. //depot/projects/s390/lib/libc/posix1e/acl_create_entry.3#3 integrate
.. //depot/projects/s390/lib/libc/posix1e/acl_delete_entry.3#4 integrate
.. //depot/projects/s390/lib/libc/posix1e/acl_delete_perm.3#4 integrate
.. //depot/projects/s390/lib/libc/posix1e/acl_get_entry.3#5 integrate
.. //depot/projects/s390/lib/libc/posix1e/acl_get_perm_np.3#3 integrate
.. //depot/projects/s390/lib/libc/posix1e/acl_get_permset.3#3 integrate
.. //depot/projects/s390/lib/libc/posix1e/acl_get_qualifier.3#5 integrate
.. //depot/projects/s390/lib/libc/posix1e/acl_get_tag_type.3#4 integrate
.. //depot/projects/s390/lib/libc/posix1e/acl_perm.c#2 integrate
.. //depot/projects/s390/lib/libc/posix1e/acl_set_permset.3#3 integrate
.. //depot/projects/s390/lib/libc/posix1e/acl_set_qualifier.3#4 integrate
.. //depot/projects/s390/lib/libc/posix1e/acl_set_tag_type.3#4 integrate
.. //depot/projects/s390/lib/libc/posix1e/acl_size.c#2 integrate
.. //depot/projects/s390/lib/libc/stdlib/malloc.3#10 integrate
.. //depot/projects/s390/lib/libc/stdlib/malloc.c#13 integrate
.. //depot/projects/s390/lib/libc/stdtime/strftime.c#4 integrate
.. //depot/projects/s390/lib/libc/string/Makefile.inc#8 integrate
.. //depot/projects/s390/lib/libc/string/Symbol.map#3 integrate
.. //depot/projects/s390/lib/libc/string/ffs.3#6 integrate
.. //depot/projects/s390/lib/libc/string/ffsl.c#3 integrate
.. //depot/projects/s390/lib/libc/string/ffsll.c#1 branch
.. //depot/projects/s390/lib/libc/string/flsll.c#1 branch
.. //depot/projects/s390/lib/libc/sys/Symbol.map#3 integrate
.. //depot/projects/s390/lib/libc/xdr/Symbol.map#3 integrate
.. //depot/projects/s390/lib/libc/xdr/xdr.c#3 integrate
.. //depot/projects/s390/lib/libcam/camlib.c#5 integrate
.. //depot/projects/s390/lib/libkvm/Makefile#5 integrate
.. //depot/projects/s390/lib/libkvm/kvm_arm.c#4 integrate
.. //depot/projects/s390/lib/libkvm/kvm_minidump_arm.c#1 branch
.. //depot/projects/s390/lib/libkvm/kvm_private.h#5 integrate
.. //depot/projects/s390/lib/libproc/libproc.h#2 integrate
.. //depot/projects/s390/lib/libproc/proc_create.c#2 integrate
.. //depot/projects/s390/lib/librpcsec_gss/svc_rpcsec_gss.c#2 integrate
.. //depot/projects/s390/lib/libstand/stand.h#6 integrate
.. //depot/projects/s390/lib/libusb20/Makefile#1 branch
.. //depot/projects/s390/lib/libusb20/libusb20.3#1 branch
.. //depot/projects/s390/lib/libusb20/libusb20.c#1 branch
.. //depot/projects/s390/lib/libusb20/libusb20.h#1 branch
.. //depot/projects/s390/lib/libusb20/libusb20_compat01.c#1 branch
.. //depot/projects/s390/lib/libusb20/libusb20_compat01.h#1 branch
.. //depot/projects/s390/lib/libusb20/libusb20_compat10.c#1 branch
.. //depot/projects/s390/lib/libusb20/libusb20_compat10.h#1 branch
.. //depot/projects/s390/lib/libusb20/libusb20_desc.c#1 branch
.. //depot/projects/s390/lib/libusb20/libusb20_desc.h#1 branch
.. //depot/projects/s390/lib/libusb20/libusb20_int.h#1 branch
.. //depot/projects/s390/lib/libusb20/libusb20_ugen20.c#1 branch
.. //depot/projects/s390/lib/libutil/Makefile#7 integrate
.. //depot/projects/s390/lib/libutil/login_cap.c#6 integrate
.. //depot/projects/s390/lib/libutil/login_class.c#7 integrate
.. //depot/projects/s390/lib/libutil/pty.c#6 integrate
.. //depot/projects/s390/lib/libutil/realhostname.c#5 integrate
.. //depot/projects/s390/libexec/rpc.rquotad/Makefile#2 integrate
.. //depot/projects/s390/libexec/rpc.rquotad/rquotad.c#5 integrate
.. //depot/projects/s390/sbin/bsdlabel/bsdlabel.8#8 integrate
.. //depot/projects/s390/sbin/mount_nfs/mount_nfs.c#8 integrate
.. //depot/projects/s390/share/man/man4/Makefile#19 integrate
.. //depot/projects/s390/share/man/man4/atapicam.4#4 integrate
.. //depot/projects/s390/share/man/man4/rl.4#10 integrate
.. //depot/projects/s390/share/man/man4/snd_hda.4#3 integrate
.. //depot/projects/s390/share/man/man4/snp.4#7 integrate
.. //depot/projects/s390/share/man/man4/u3g.4#3 integrate
.. //depot/projects/s390/share/man/man4/usb2_bluetooth.4#1 branch
.. //depot/projects/s390/share/man/man4/usb2_controller.4#1 branch
.. //depot/projects/s390/share/man/man4/usb2_core.4#1 branch
.. //depot/projects/s390/share/man/man4/usb2_ethernet.4#1 branch
.. //depot/projects/s390/share/man/man4/usb2_image.4#1 branch
.. //depot/projects/s390/share/man/man4/usb2_input.4#1 branch
.. //depot/projects/s390/share/man/man4/usb2_misc.4#1 branch
.. //depot/projects/s390/share/man/man4/usb2_ndis.4#1 branch
.. //depot/projects/s390/share/man/man4/usb2_quirk.4#1 branch
.. //depot/projects/s390/share/man/man4/usb2_serial.4#1 branch
.. //depot/projects/s390/share/man/man4/usb2_sound.4#1 branch
.. //depot/projects/s390/share/man/man4/usb2_storage.4#1 branch
.. //depot/projects/s390/share/man/man4/usb2_template.4#1 branch
.. //depot/projects/s390/share/man/man4/usb2_wlan.4#1 branch
.. //depot/projects/s390/share/man/man4/zyd.4#2 integrate
.. //depot/projects/s390/share/man/man9/VOP_ACCESS.9#6 integrate
.. //depot/projects/s390/share/man/man9/pseudofs.9#5 integrate
.. //depot/projects/s390/share/man/man9/style.9#10 integrate
.. //depot/projects/s390/share/man/man9/vaccess.9#4 integrate
.. //depot/projects/s390/share/man/man9/vaccess_acl_posix1e.9#3 integrate
.. //depot/projects/s390/share/man/man9/vfs_busy.9#4 integrate
.. //depot/projects/s390/share/misc/bsd-family-tree#13 integrate
.. //depot/projects/s390/share/misc/committers-doc.dot#2 integrate
.. //depot/projects/s390/share/zoneinfo/southamerica#9 integrate
.. //depot/projects/s390/share/zoneinfo/zone.tab#9 integrate
.. //depot/projects/s390/sys/amd64/amd64/dump_machdep.c#6 integrate
.. //depot/projects/s390/sys/amd64/amd64/local_apic.c#6 integrate
.. //depot/projects/s390/sys/amd64/amd64/minidump_machdep.c#3 integrate
.. //depot/projects/s390/sys/arm/arm/dump_machdep.c#4 integrate
.. //depot/projects/s390/sys/arm/arm/minidump_machdep.c#1 branch
.. //depot/projects/s390/sys/arm/arm/pmap.c#6 integrate
.. //depot/projects/s390/sys/arm/at91/at91_mci.c#2 integrate
.. //depot/projects/s390/sys/arm/include/md_var.h#4 integrate
.. //depot/projects/s390/sys/arm/include/minidump.h#1 branch
.. //depot/projects/s390/sys/arm/include/pmap.h#5 integrate
.. //depot/projects/s390/sys/arm/mv/mv_machdep.c#2 integrate
.. //depot/projects/s390/sys/boot/powerpc/boot1.chrp/boot1.c#2 integrate
.. //depot/projects/s390/sys/boot/powerpc/boot1.chrp/bootinfo.txt#2 integrate
.. //depot/projects/s390/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#2 integrate
.. //depot/projects/s390/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#2 integrate
.. //depot/projects/s390/sys/cddl/compat/opensolaris/sys/policy.h#2 integrate
.. //depot/projects/s390/sys/cddl/compat/opensolaris/sys/types.h#2 integrate
.. //depot/projects/s390/sys/cddl/compat/opensolaris/sys/uio.h#2 integrate
.. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#2 integrate
.. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c#2 integrate
.. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate
.. //depot/projects/s390/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate
.. //depot/projects/s390/sys/cddl/dev/dtrace/dtrace_ioctl.c#2 integrate
.. //depot/projects/s390/sys/cddl/dev/dtrace/dtrace_load.c#2 integrate
.. //depot/projects/s390/sys/cddl/dev/dtrace/dtrace_unload.c#2 integrate
.. //depot/projects/s390/sys/cddl/dev/systrace/systrace.c#2 integrate
.. //depot/projects/s390/sys/compat/freebsd32/freebsd32_proto.h#8 integrate
.. //depot/projects/s390/sys/compat/freebsd32/freebsd32_syscall.h#8 integrate
.. //depot/projects/s390/sys/compat/freebsd32/freebsd32_syscalls.c#8 integrate
.. //depot/projects/s390/sys/compat/freebsd32/freebsd32_sysent.c#8 integrate
.. //depot/projects/s390/sys/compat/freebsd32/syscalls.master#8 integrate
.. //depot/projects/s390/sys/compat/linprocfs/linprocfs.c#15 integrate
.. //depot/projects/s390/sys/compat/linux/linux_emul.c#2 integrate
.. //depot/projects/s390/sys/compat/linux/linux_getcwd.c#11 integrate
.. //depot/projects/s390/sys/conf/NOTES#23 integrate
.. //depot/projects/s390/sys/conf/files#25 integrate
.. //depot/projects/s390/sys/conf/files.arm#5 integrate
.. //depot/projects/s390/sys/conf/kmod.mk#16 integrate
.. //depot/projects/s390/sys/conf/options#20 integrate
.. //depot/projects/s390/sys/dev/acpi_support/acpi_asus.c#5 integrate
.. //depot/projects/s390/sys/dev/acpica/Osd/OsdSchedule.c#10 integrate
.. //depot/projects/s390/sys/dev/acpica/acpi.c#18 integrate
.. //depot/projects/s390/sys/dev/adb/adb_bus.c#2 integrate
.. //depot/projects/s390/sys/dev/adb/adb_mouse.c#2 integrate
.. //depot/projects/s390/sys/dev/adb/adbvar.h#2 integrate
.. //depot/projects/s390/sys/dev/amr/amr.c#17 integrate
.. //depot/projects/s390/sys/dev/amr/amr_cam.c#10 integrate
.. //depot/projects/s390/sys/dev/amr/amrvar.h#12 integrate
.. //depot/projects/s390/sys/dev/an/if_an.c#15 integrate
.. //depot/projects/s390/sys/dev/ath/ah_osdep.c#2 integrate
.. //depot/projects/s390/sys/dev/ath/ath_rate/amrr/amrr.c#4 integrate
.. //depot/projects/s390/sys/dev/ath/ath_rate/onoe/onoe.c#4 integrate
.. //depot/projects/s390/sys/dev/ath/ath_rate/sample/sample.c#5 integrate
.. //depot/projects/s390/sys/dev/ath/if_ath.c#10 integrate
.. //depot/projects/s390/sys/dev/ath/if_athrate.h#3 integrate
.. //depot/projects/s390/sys/dev/ath/if_athvar.h#9 integrate
.. //depot/projects/s390/sys/dev/bge/if_bge.c#18 integrate
.. //depot/projects/s390/sys/dev/cardbus/cardbus_cis.c#13 integrate
.. //depot/projects/s390/sys/dev/cardbus/cardbusreg.h#5 integrate
.. //depot/projects/s390/sys/dev/cxgb/cxgb_main.c#2 integrate
.. //depot/projects/s390/sys/dev/cxgb/cxgb_osdep.h#2 integrate
.. //depot/projects/s390/sys/dev/drm/i915_dma.c#6 integrate
.. //depot/projects/s390/sys/dev/drm/radeon_cp.c#11 integrate
.. //depot/projects/s390/sys/dev/drm/radeon_drv.h#11 integrate
.. //depot/projects/s390/sys/dev/e1000/if_em.c#2 integrate
.. //depot/projects/s390/sys/dev/e1000/if_igb.c#2 integrate
.. //depot/projects/s390/sys/dev/en/midway.c#15 integrate
.. //depot/projects/s390/sys/dev/hwpmc/hwpmc_mod.c#7 integrate
.. //depot/projects/s390/sys/dev/iwn/if_iwn.c#3 integrate
.. //depot/projects/s390/sys/dev/mmc/mmc.c#3 integrate
.. //depot/projects/s390/sys/dev/mmc/mmcbrvar.h#2 integrate
.. //depot/projects/s390/sys/dev/mmc/mmcsd.c#3 integrate
.. //depot/projects/s390/sys/dev/mmc/mmcvar.h#3 integrate
.. //depot/projects/s390/sys/dev/mn/if_mn.c#1 branch
.. //depot/projects/s390/sys/dev/pci/pcireg.h#10 integrate
.. //depot/projects/s390/sys/dev/ral/rt2560.c#3 integrate
.. //depot/projects/s390/sys/dev/ral/rt2661.c#3 integrate
.. //depot/projects/s390/sys/dev/sdhci/sdhci.c#2 integrate
.. //depot/projects/s390/sys/dev/snp/snp.c#11 integrate
.. //depot/projects/s390/sys/dev/sound/pci/hda/hdac.c#3 integrate
.. //depot/projects/s390/sys/dev/sound/pcm/channel.c#13 integrate
.. //depot/projects/s390/sys/dev/sound/pcm/channel.h#7 integrate
.. //depot/projects/s390/sys/dev/sound/pcm/mixer.c#12 integrate
.. //depot/projects/s390/sys/dev/sound/pcm/mixer.h#5 integrate
.. //depot/projects/s390/sys/dev/usb/if_zyd.c#2 integrate
.. //depot/projects/s390/sys/dev/usb/u3g.c#3 integrate
.. //depot/projects/s390/sys/dev/usb/usb_subr.c#10 integrate
.. //depot/projects/s390/sys/dev/usb/usbdevs#18 integrate
.. //depot/projects/s390/sys/dev/usb/usbdi.c#7 integrate
.. //depot/projects/s390/sys/dev/usb2/bluetooth/TODO.TXT#1 branch
.. //depot/projects/s390/sys/dev/usb2/bluetooth/ng_ubt2.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/bluetooth/ng_ubt2_var.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/bluetooth/ubtbcmfw2.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/bluetooth/usb2_bluetooth.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/bluetooth/usb2_bluetooth.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/controller/at91dci.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/controller/at91dci.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/controller/at91dci_atmelarm.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/controller/ehci2.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/controller/ehci2.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/controller/ehci2_pci.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/controller/musb2_otg.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/controller/musb2_otg.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/controller/musb2_otg_atmelarm.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/controller/ohci2.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/controller/ohci2.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/controller/ohci2_atmelarm.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/controller/ohci2_pci.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/controller/uhci2.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/controller/uhci2.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/controller/uhci2_pci.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/controller/usb2_bus.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/controller/usb2_controller.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/controller/usb2_controller.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/controller/usb2_pci.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/controller/uss820dci.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/controller/uss820dci.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/controller/uss820dci_atmelarm.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/controller/uss820dci_pccard.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/README.TXT#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usb2_busdma.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usb2_busdma.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usb2_compat_linux.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usb2_compat_linux.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usb2_config_td.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usb2_config_td.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usb2_core.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usb2_core.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usb2_debug.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usb2_debug.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usb2_dev.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usb2_dev.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usb2_device.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usb2_device.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usb2_dynamic.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usb2_dynamic.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usb2_error.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usb2_generic.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usb2_generic.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usb2_handle_request.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usb2_handle_request.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usb2_hid.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usb2_hid.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usb2_hub.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usb2_hub.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usb2_if.m#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usb2_lookup.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usb2_lookup.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usb2_mbuf.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usb2_mbuf.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usb2_msctest.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usb2_msctest.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usb2_parse.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usb2_parse.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usb2_process.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usb2_process.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usb2_request.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usb2_request.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usb2_sw_transfer.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usb2_sw_transfer.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usb2_transfer.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usb2_transfer.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usb2_util.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usb2_util.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/core/usbdevs#1 branch
.. //depot/projects/s390/sys/dev/usb2/ethernet/if_aue2.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/ethernet/if_aue2_reg.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/ethernet/if_axe2.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/ethernet/if_axe2_reg.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/ethernet/if_cdce2.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/ethernet/if_cdce2_reg.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/ethernet/if_cue2.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/ethernet/if_cue2_reg.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/ethernet/if_kue2.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/ethernet/if_kue2_fw.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/ethernet/if_kue2_reg.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/ethernet/if_rue2.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/ethernet/if_rue2_reg.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/ethernet/if_udav2.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/ethernet/if_udav2_reg.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/ethernet/usb2_ethernet.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/ethernet/usb2_ethernet.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/image/usb2_image.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/image/usb2_image.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/image/uscanner2.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/include/Makefile#1 branch
.. //depot/projects/s390/sys/dev/usb2/include/ufm2_ioctl.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/include/urio2_ioctl.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/include/usb2_cdc.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/include/usb2_defs.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/include/usb2_devid.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/include/usb2_devtable.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/include/usb2_endian.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/include/usb2_error.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/include/usb2_hid.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/include/usb2_ioctl.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/include/usb2_mfunc.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/include/usb2_revision.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/include/usb2_standard.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/input/uhid2.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/input/ukbd2.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/input/ums2.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/input/usb2_input.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/input/usb2_input.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/input/usb2_rdesc.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/misc/udbp2.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/misc/udbp2.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/misc/ufm2.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/misc/usb2_misc.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/misc/usb2_misc.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/ndis/if_ndis_usb2.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/ndis/usb2_ndis.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/ndis/usb2_ndis.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/quirk/usb2_quirk.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/quirk/usb2_quirk.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/serial/uark2.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/serial/ubsa2.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/serial/ubser2.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/serial/uchcom2.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/serial/ucycom2.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/serial/ufoma2.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/serial/uftdi2.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/serial/uftdi2_reg.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/serial/ugensa2.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/serial/uipaq2.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/serial/ulpt2.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/serial/umct2.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/serial/umodem2.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/serial/umoscom2.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/serial/uplcom2.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/serial/usb2_serial.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/serial/usb2_serial.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/serial/uvisor2.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/serial/uvscom2.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/sound/uaudio2.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/sound/uaudio2.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/sound/uaudio2_pcm.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/sound/uaudio2_reg.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/sound/usb2_sound.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/sound/usb2_sound.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/storage/ata-usb2.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/storage/umass2.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/storage/urio2.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/storage/usb2_storage.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/storage/usb2_storage.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/storage/ustorage2_fs.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/template/usb2_template.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/template/usb2_template.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/template/usb2_template_cdce.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/template/usb2_template_msc.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/template/usb2_template_mtp.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/wlan/if_rum2.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/wlan/if_rum2_fw.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/wlan/if_rum2_reg.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/wlan/if_rum2_var.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/wlan/if_ural2.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/wlan/if_ural2_reg.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/wlan/if_ural2_var.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/wlan/if_zyd2.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/wlan/if_zyd2_fw.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/wlan/if_zyd2_reg.h#1 branch
.. //depot/projects/s390/sys/dev/usb2/wlan/usb2_wlan.c#1 branch
.. //depot/projects/s390/sys/dev/usb2/wlan/usb2_wlan.h#1 branch
.. //depot/projects/s390/sys/dev/wpi/if_wpi.c#2 integrate
.. //depot/projects/s390/sys/fs/cd9660/cd9660_vfsops.c#3 integrate
.. //depot/projects/s390/sys/fs/cd9660/cd9660_vnops.c#3 integrate
.. //depot/projects/s390/sys/fs/coda/cnode.h#2 integrate
.. //depot/projects/s390/sys/fs/coda/coda_subr.c#2 integrate
.. //depot/projects/s390/sys/fs/coda/coda_venus.c#2 integrate
.. //depot/projects/s390/sys/fs/coda/coda_vnops.c#2 integrate
.. //depot/projects/s390/sys/fs/devfs/devfs_vnops.c#16 integrate
.. //depot/projects/s390/sys/fs/hpfs/hpfs_vnops.c#15 integrate
.. //depot/projects/s390/sys/fs/msdosfs/msdosfs_vfsops.c#13 integrate
.. //depot/projects/s390/sys/fs/msdosfs/msdosfs_vnops.c#14 integrate
.. //depot/projects/s390/sys/fs/ntfs/ntfs_vnops.c#13 integrate
.. //depot/projects/s390/sys/fs/nullfs/null_vnops.c#12 integrate
.. //depot/projects/s390/sys/fs/nwfs/nwfs_vnops.c#10 integrate
.. //depot/projects/s390/sys/fs/procfs/procfs.c#8 integrate
.. //depot/projects/s390/sys/fs/procfs/procfs_map.c#5 integrate
.. //depot/projects/s390/sys/fs/pseudofs/pseudofs_vnops.c#11 integrate
.. //depot/projects/s390/sys/fs/smbfs/smbfs_vfsops.c#12 integrate
.. //depot/projects/s390/sys/fs/smbfs/smbfs_vnops.c#13 integrate
.. //depot/projects/s390/sys/fs/tmpfs/tmpfs_vnops.c#2 integrate
.. //depot/projects/s390/sys/fs/udf/udf_vnops.c#17 integrate
.. //depot/projects/s390/sys/fs/unionfs/union_vfsops.c#10 integrate
.. //depot/projects/s390/sys/fs/unionfs/union_vnops.c#10 integrate
.. //depot/projects/s390/sys/geom/geom_disk.c#21 integrate
.. //depot/projects/s390/sys/geom/journal/g_journal.c#2 integrate
.. //depot/projects/s390/sys/geom/part/g_part_apm.c#2 integrate
.. //depot/projects/s390/sys/geom/part/g_part_gpt.c#2 integrate
.. //depot/projects/s390/sys/gnu/fs/ext2fs/ext2_vfsops.c#7 integrate
.. //depot/projects/s390/sys/gnu/fs/ext2fs/ext2_vnops.c#4 integrate
.. //depot/projects/s390/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#6 integrate
.. //depot/projects/s390/sys/gnu/fs/reiserfs/reiserfs_vnops.c#3 integrate
.. //depot/projects/s390/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#4 integrate
.. //depot/projects/s390/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#3 integrate
.. //depot/projects/s390/sys/i386/conf/XEN#2 integrate
.. //depot/projects/s390/sys/i386/i386/bios.c#9 integrate
.. //depot/projects/s390/sys/i386/i386/dump_machdep.c#8 integrate
.. //depot/projects/s390/sys/i386/i386/local_apic.c#6 integrate
.. //depot/projects/s390/sys/i386/i386/minidump_machdep.c#3 integrate
.. //depot/projects/s390/sys/i386/isa/pmtimer.c#6 integrate
.. //depot/projects/s390/sys/isa/isa_common.c#10 integrate
.. //depot/projects/s390/sys/isa/isa_common.h#6 integrate
.. //depot/projects/s390/sys/isa/isavar.h#6 integrate
.. //depot/projects/s390/sys/isa/pnp.c#7 integrate
.. //depot/projects/s390/sys/kern/init_main.c#17 integrate
.. //depot/projects/s390/sys/kern/init_sysent.c#15 integrate
.. //depot/projects/s390/sys/kern/kern_cons.c#1 branch
.. //depot/projects/s390/sys/kern/kern_descrip.c#19 integrate
.. //depot/projects/s390/sys/kern/kern_exec.c#18 integrate
.. //depot/projects/s390/sys/kern/kern_proc.c#20 integrate
.. //depot/projects/s390/sys/kern/kern_sig.c#19 integrate
.. //depot/projects/s390/sys/kern/kern_thr.c#9 integrate
.. //depot/projects/s390/sys/kern/kern_thread.c#18 integrate
.. //depot/projects/s390/sys/kern/kern_timeout.c#9 integrate
.. //depot/projects/s390/sys/kern/sched_ule.c#14 integrate
.. //depot/projects/s390/sys/kern/subr_acl_posix1e.c#2 integrate
.. //depot/projects/s390/sys/kern/subr_sleepqueue.c#7 integrate
.. //depot/projects/s390/sys/kern/subr_smp.c#10 integrate
.. //depot/projects/s390/sys/kern/subr_stack.c#4 integrate
.. //depot/projects/s390/sys/kern/sys_process.c#12 integrate
.. //depot/projects/s390/sys/kern/syscalls.c#15 integrate
.. //depot/projects/s390/sys/kern/syscalls.master#17 integrate
.. //depot/projects/s390/sys/kern/systrace_args.c#2 integrate
.. //depot/projects/s390/sys/kern/tty.c#16 integrate
.. //depot/projects/s390/sys/kern/tty_cons.c#12 delete
.. //depot/projects/s390/sys/kern/tty_pts.c#4 integrate
.. //depot/projects/s390/sys/kern/uipc_mqueue.c#5 integrate
.. //depot/projects/s390/sys/kern/uipc_shm.c#2 integrate
.. //depot/projects/s390/sys/kern/vfs_export.c#10 integrate
.. //depot/projects/s390/sys/kern/vfs_lookup.c#12 integrate
.. //depot/projects/s390/sys/kern/vfs_mount.c#19 integrate
.. //depot/projects/s390/sys/kern/vfs_subr.c#21 integrate
.. //depot/projects/s390/sys/kern/vfs_syscalls.c#18 integrate
.. //depot/projects/s390/sys/kern/vfs_vnops.c#15 integrate
.. //depot/projects/s390/sys/kern/vnode_if.src#8 integrate
.. //depot/projects/s390/sys/kgssapi/gss_accept_sec_context.c#1 branch
.. //depot/projects/s390/sys/kgssapi/gss_acquire_cred.c#1 branch
.. //depot/projects/s390/sys/kgssapi/gss_add_oid_set_member.c#1 branch
.. //depot/projects/s390/sys/kgssapi/gss_canonicalize_name.c#1 branch
.. //depot/projects/s390/sys/kgssapi/gss_create_empty_oid_set.c#1 branch
.. //depot/projects/s390/sys/kgssapi/gss_delete_sec_context.c#1 branch
.. //depot/projects/s390/sys/kgssapi/gss_display_status.c#1 branch
.. //depot/projects/s390/sys/kgssapi/gss_export_name.c#1 branch
.. //depot/projects/s390/sys/kgssapi/gss_get_mic.c#1 branch
.. //depot/projects/s390/sys/kgssapi/gss_impl.c#1 branch
.. //depot/projects/s390/sys/kgssapi/gss_import_name.c#1 branch
.. //depot/projects/s390/sys/kgssapi/gss_init_sec_context.c#1 branch
.. //depot/projects/s390/sys/kgssapi/gss_names.c#1 branch
.. //depot/projects/s390/sys/kgssapi/gss_pname_to_uid.c#1 branch
.. //depot/projects/s390/sys/kgssapi/gss_release_buffer.c#1 branch
.. //depot/projects/s390/sys/kgssapi/gss_release_cred.c#1 branch
.. //depot/projects/s390/sys/kgssapi/gss_release_name.c#1 branch
.. //depot/projects/s390/sys/kgssapi/gss_release_oid_set.c#1 branch
.. //depot/projects/s390/sys/kgssapi/gss_set_cred_option.c#1 branch
.. //depot/projects/s390/sys/kgssapi/gss_test_oid_set_member.c#1 branch
.. //depot/projects/s390/sys/kgssapi/gss_unwrap.c#1 branch
.. //depot/projects/s390/sys/kgssapi/gss_verify_mic.c#1 branch
.. //depot/projects/s390/sys/kgssapi/gss_wrap.c#1 branch
.. //depot/projects/s390/sys/kgssapi/gss_wrap_size_limit.c#1 branch
.. //depot/projects/s390/sys/kgssapi/gssapi.h#1 branch
.. //depot/projects/s390/sys/kgssapi/gssapi_impl.h#1 branch
.. //depot/projects/s390/sys/kgssapi/gssd.x#1 branch
.. //depot/projects/s390/sys/kgssapi/gssd_prot.c#1 branch
.. //depot/projects/s390/sys/kgssapi/gsstest.c#1 branch
.. //depot/projects/s390/sys/kgssapi/kgss_if.m#1 branch
.. //depot/projects/s390/sys/kgssapi/krb5/kcrypto.c#1 branch
.. //depot/projects/s390/sys/kgssapi/krb5/kcrypto.h#1 branch
.. //depot/projects/s390/sys/kgssapi/krb5/kcrypto_aes.c#1 branch
.. //depot/projects/s390/sys/kgssapi/krb5/kcrypto_arcfour.c#1 branch
.. //depot/projects/s390/sys/kgssapi/krb5/kcrypto_des.c#1 branch
.. //depot/projects/s390/sys/kgssapi/krb5/kcrypto_des3.c#1 branch
.. //depot/projects/s390/sys/kgssapi/krb5/krb5_mech.c#1 branch
.. //depot/projects/s390/sys/mips/idt/if_kr.c#2 integrate
.. //depot/projects/s390/sys/modules/Makefile#22 integrate
.. //depot/projects/s390/sys/modules/amr/Makefile#5 integrate
.. //depot/projects/s390/sys/modules/amr/amr_cam/Makefile#1 branch
.. //depot/projects/s390/sys/modules/kgssapi/Makefile#1 branch
.. //depot/projects/s390/sys/modules/kgssapi_krb5/Makefile#1 branch
.. //depot/projects/s390/sys/modules/krpc/Makefile#2 integrate
.. //depot/projects/s390/sys/modules/nfsclient/Makefile#6 integrate
.. //depot/projects/s390/sys/modules/nfsserver/Makefile#5 integrate
.. //depot/projects/s390/sys/modules/rl/Makefile#3 integrate
.. //depot/projects/s390/sys/modules/snp/Makefile#4 integrate
.. //depot/projects/s390/sys/modules/usb2/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/bluetooth/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/bluetooth_fw/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/bluetooth_ng/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/controller/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/controller_at91dci/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/controller_ehci/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/controller_musb/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/controller_ohci/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/controller_uhci/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/controller_uss820dci/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/core/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/ethernet/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/ethernet_aue/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/ethernet_axe/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/ethernet_cdce/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/ethernet_cue/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/ethernet_dav/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/ethernet_kue/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/ethernet_rue/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/image/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/input/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/input_hid/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/input_kbd/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/input_ms/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/misc/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/misc_dbp/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/misc_fm/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/ndis/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/quirk/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/scanner/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/serial/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/serial_ark/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/serial_bsa/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/serial_bser/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/serial_chcom/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/serial_cycom/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/serial_foma/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/serial_ftdi/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/serial_gensa/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/serial_ipaq/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/serial_lpt/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/serial_mct/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/serial_modem/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/serial_moscom/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/serial_plcom/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/serial_visor/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/serial_vscom/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/sound/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/storage/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/storage_ata/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/storage_fs/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/storage_mass/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/storage_rio/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/template/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/wlan/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/wlan_ral/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/wlan_rum/Makefile#1 branch
.. //depot/projects/s390/sys/modules/usb2/wlan_zyd/Makefile#1 branch
.. //depot/projects/s390/sys/modules/zfs/Makefile#2 integrate
.. //depot/projects/s390/sys/net/if.c#19 integrate
.. //depot/projects/s390/sys/net/if_arcsubr.c#12 integrate
.. //depot/projects/s390/sys/net/if_fddisubr.c#13 integrate
.. //depot/projects/s390/sys/net/if_fwsubr.c#5 integrate
.. //depot/projects/s390/sys/net/if_gif.c#12 integrate
.. //depot/projects/s390/sys/net/if_iso88025subr.c#15 integrate
.. //depot/projects/s390/sys/net/if_spppsubr.c#11 integrate
.. //depot/projects/s390/sys/net/if_tun.c#11 integrate
.. //depot/projects/s390/sys/net/radix_mpath.c#2 integrate
.. //depot/projects/s390/sys/net80211/ieee80211_adhoc.c#3 integrate
.. //depot/projects/s390/sys/net80211/ieee80211_hostap.c#3 integrate
.. //depot/projects/s390/sys/net80211/ieee80211_sta.c#3 integrate
.. //depot/projects/s390/sys/net80211/ieee80211_wds.c#2 integrate
.. //depot/projects/s390/sys/netinet/ip_dummynet.h#10 integrate
.. //depot/projects/s390/sys/netinet/sctp_os_bsd.h#3 integrate
.. //depot/projects/s390/sys/netinet/sctp_output.c#3 integrate
.. //depot/projects/s390/sys/netinet/sctp_timer.c#2 integrate
.. //depot/projects/s390/sys/netinet/sctp_timer.h#2 integrate
.. //depot/projects/s390/sys/netinet/tcp_input.c#22 integrate
.. //depot/projects/s390/sys/netinet/tcp_subr.c#21 integrate
.. //depot/projects/s390/sys/netinet/tcp_var.h#12 integrate
.. //depot/projects/s390/sys/netsmb/smb_conn.c#9 integrate
.. //depot/projects/s390/sys/netsmb/smb_conn.h#6 integrate
.. //depot/projects/s390/sys/netsmb/smb_dev.c#12 integrate
.. //depot/projects/s390/sys/nfs4client/nfs4_vnops.c#5 integrate
.. //depot/projects/s390/sys/nfsclient/nfs.h#7 integrate
.. //depot/projects/s390/sys/nfsclient/nfs_krpc.c#1 branch
.. //depot/projects/s390/sys/nfsclient/nfs_nfsiod.c#9 integrate
.. //depot/projects/s390/sys/nfsclient/nfs_socket.c#15 integrate
.. //depot/projects/s390/sys/nfsclient/nfs_subs.c#12 integrate
.. //depot/projects/s390/sys/nfsclient/nfs_vfsops.c#16 integrate
.. //depot/projects/s390/sys/nfsclient/nfs_vnops.c#19 integrate
.. //depot/projects/s390/sys/nfsclient/nfsmount.h#6 integrate
.. //depot/projects/s390/sys/nfsserver/nfs.h#7 integrate
.. //depot/projects/s390/sys/nfsserver/nfs_fha.c#1 branch
.. //depot/projects/s390/sys/nfsserver/nfs_fha.h#1 branch
.. //depot/projects/s390/sys/nfsserver/nfs_serv.c#18 integrate
.. //depot/projects/s390/sys/nfsserver/nfs_srvcache.c#9 integrate
.. //depot/projects/s390/sys/nfsserver/nfs_srvkrpc.c#1 branch
.. //depot/projects/s390/sys/nfsserver/nfs_srvsock.c#14 integrate
.. //depot/projects/s390/sys/nfsserver/nfs_srvsubs.c#12 integrate
.. //depot/projects/s390/sys/nfsserver/nfs_syscalls.c#13 integrate
.. //depot/projects/s390/sys/nfsserver/nfsm_subs.h#5 integrate
.. //depot/projects/s390/sys/nfsserver/nfsrvcache.h#5 integrate
.. //depot/projects/s390/sys/nlm/nlm.h#2 integrate
.. //depot/projects/s390/sys/nlm/nlm_advlock.c#2 integrate
.. //depot/projects/s390/sys/nlm/nlm_prot_impl.c#2 integrate
.. //depot/projects/s390/sys/nlm/nlm_prot_svc.c#2 integrate
.. //depot/projects/s390/sys/opencrypto/cryptosoft.c#8 integrate
.. //depot/projects/s390/sys/pci/if_mn.c#10 delete
.. //depot/projects/s390/sys/pci/if_rl.c#18 integrate
.. //depot/projects/s390/sys/pci/if_rlreg.h#14 integrate
.. //depot/projects/s390/sys/powerpc/include/cpufunc.h#7 integrate
.. //depot/projects/s390/sys/powerpc/include/endian.h#5 integrate
.. //depot/projects/s390/sys/powerpc/powermac/ata_dbdma.c#2 integrate
.. //depot/projects/s390/sys/powerpc/powermac/cuda.c#2 integrate
.. //depot/projects/s390/sys/powerpc/powermac/dbdma.c#2 integrate
.. //depot/projects/s390/sys/powerpc/powermac/dbdmavar.h#2 integrate
.. //depot/projects/s390/sys/powerpc/powermac/pmu.c#2 integrate
.. //depot/projects/s390/sys/rpc/auth.h#2 integrate
.. //depot/projects/s390/sys/rpc/auth_none.c#2 integrate
.. //depot/projects/s390/sys/rpc/auth_unix.c#2 integrate
.. //depot/projects/s390/sys/rpc/clnt.h#2 integrate
.. //depot/projects/s390/sys/rpc/clnt_dg.c#2 integrate
.. //depot/projects/s390/sys/rpc/clnt_rc.c#2 integrate
.. //depot/projects/s390/sys/rpc/clnt_vc.c#2 integrate
.. //depot/projects/s390/sys/rpc/replay.c#1 branch
.. //depot/projects/s390/sys/rpc/replay.h#1 branch
.. //depot/projects/s390/sys/rpc/rpc_com.h#2 integrate
.. //depot/projects/s390/sys/rpc/rpc_generic.c#2 integrate
.. //depot/projects/s390/sys/rpc/rpc_msg.h#2 integrate
.. //depot/projects/s390/sys/rpc/rpc_prot.c#2 integrate
.. //depot/projects/s390/sys/rpc/rpcsec_gss.h#1 branch
.. //depot/projects/s390/sys/rpc/rpcsec_gss/rpcsec_gss.c#1 branch
.. //depot/projects/s390/sys/rpc/rpcsec_gss/rpcsec_gss_conf.c#1 branch
.. //depot/projects/s390/sys/rpc/rpcsec_gss/rpcsec_gss_int.h#1 branch
.. //depot/projects/s390/sys/rpc/rpcsec_gss/rpcsec_gss_misc.c#1 branch
.. //depot/projects/s390/sys/rpc/rpcsec_gss/rpcsec_gss_prot.c#1 branch
.. //depot/projects/s390/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c#1 branch
.. //depot/projects/s390/sys/rpc/svc.c#2 integrate
.. //depot/projects/s390/sys/rpc/svc.h#2 integrate
.. //depot/projects/s390/sys/rpc/svc_auth.c#2 integrate
.. //depot/projects/s390/sys/rpc/svc_auth.h#2 integrate
.. //depot/projects/s390/sys/rpc/svc_auth_unix.c#2 integrate
.. //depot/projects/s390/sys/rpc/svc_dg.c#2 integrate
.. //depot/projects/s390/sys/rpc/svc_generic.c#2 integrate
.. //depot/projects/s390/sys/rpc/svc_vc.c#2 integrate
.. //depot/projects/s390/sys/rpc/xdr.h#2 integrate
.. //depot/projects/s390/sys/security/audit/audit_arg.c#3 integrate
.. //depot/projects/s390/sys/security/audit/audit_bsm_klib.c#3 integrate
.. //depot/projects/s390/sys/security/audit/audit_pipe.c#3 integrate
.. //depot/projects/s390/sys/security/mac/mac_cred.c#1 branch
.. //depot/projects/s390/sys/security/mac/mac_framework.h#3 integrate
.. //depot/projects/s390/sys/security/mac/mac_policy.h#3 integrate
.. //depot/projects/s390/sys/security/mac/mac_process.c#5 integrate
.. //depot/projects/s390/sys/security/mac/mac_syscalls.c#2 integrate
.. //depot/projects/s390/sys/security/mac/mac_vfs.c#5 integrate
.. //depot/projects/s390/sys/security/mac_biba/mac_biba.c#14 integrate
.. //depot/projects/s390/sys/security/mac_bsdextended/mac_bsdextended.c#13 integrate
.. //depot/projects/s390/sys/security/mac_bsdextended/ugidfw_internal.h#2 integrate
.. //depot/projects/s390/sys/security/mac_bsdextended/ugidfw_vnode.c#2 integrate
.. //depot/projects/s390/sys/security/mac_lomac/mac_lomac.c#12 integrate
.. //depot/projects/s390/sys/security/mac_mls/mac_mls.c#14 integrate
.. //depot/projects/s390/sys/security/mac_partition/mac_partition.c#8 integrate
.. //depot/projects/s390/sys/security/mac_stub/mac_stub.c#6 integrate
.. //depot/projects/s390/sys/security/mac_test/mac_test.c#10 integrate
.. //depot/projects/s390/sys/sparc64/pci/schizo.c#2 integrate
.. //depot/projects/s390/sys/sparc64/sparc64/db_trace.c#8 integrate
.. //depot/projects/s390/sys/sparc64/sparc64/stack_machdep.c#2 integrate
.. //depot/projects/s390/sys/sun4v/sun4v/db_trace.c#2 integrate
.. //depot/projects/s390/sys/sun4v/sun4v/stack_machdep.c#2 integrate
.. //depot/projects/s390/sys/sys/_types.h#12 integrate
.. //depot/projects/s390/sys/sys/cfictl.h#2 integrate
.. //depot/projects/s390/sys/sys/extattr.h#5 integrate
.. //depot/projects/s390/sys/sys/mount.h#15 integrate
.. //depot/projects/s390/sys/sys/param.h#22 integrate
.. //depot/projects/s390/sys/sys/proc.h#23 integrate
.. //depot/projects/s390/sys/sys/syscall.h#15 integrate
.. //depot/projects/s390/sys/sys/syscall.mk#15 integrate
.. //depot/projects/s390/sys/sys/sysent.h#7 integrate
.. //depot/projects/s390/sys/sys/sysproto.h#16 integrate
.. //depot/projects/s390/sys/sys/tty.h#9 integrate
.. //depot/projects/s390/sys/sys/types.h#12 integrate
.. //depot/projects/s390/sys/sys/user.h#10 integrate
.. //depot/projects/s390/sys/sys/vnode.h#17 integrate
.. //depot/projects/s390/sys/tools/vnode_if.awk#8 integrate
.. //depot/projects/s390/sys/ufs/ffs/ffs_softdep.c#18 integrate
.. //depot/projects/s390/sys/ufs/ffs/ffs_vfsops.c#20 integrate
.. //depot/projects/s390/sys/ufs/ufs/ufs_acl.c#6 integrate
.. //depot/projects/s390/sys/ufs/ufs/ufs_dirhash.c#10 integrate
.. //depot/projects/s390/sys/ufs/ufs/ufs_vfsops.c#7 integrate
.. //depot/projects/s390/sys/ufs/ufs/ufs_vnops.c#16 integrate
.. //depot/projects/s390/sys/vm/uma.h#10 integrate
.. //depot/projects/s390/sys/vm/vm_page.c#17 integrate
.. //depot/projects/s390/sys/xdr/xdr_mbuf.c#2 integrate
.. //depot/projects/s390/tools/regression/kgssapi/Makefile#1 branch
.. //depot/projects/s390/tools/regression/kgssapi/gsstest.c#1 branch
.. //depot/projects/s390/tools/regression/rpcsec_gss/Makefile#1 branch
.. //depot/projects/s390/tools/regression/rpcsec_gss/rpctest.c#1 branch
.. //depot/projects/s390/tools/tools/ath/athdebug/athdebug.c#3 integrate
.. //depot/projects/s390/tools/tools/ath/athstats/Makefile#4 integrate
.. //depot/projects/s390/tools/tools/ath/athstats/athstats.c#3 integrate
.. //depot/projects/s390/tools/tools/ath/athstats/main.c#2 integrate
.. //depot/projects/s390/usr.bin/du/du.1#6 integrate
.. //depot/projects/s390/usr.bin/du/du.c#9 integrate
.. //depot/projects/s390/usr.bin/fstat/zfs/Makefile#2 integrate
.. //depot/projects/s390/usr.bin/tar/test/main.c#2 integrate
.. //depot/projects/s390/usr.bin/vmstat/vmstat.c#9 integrate
.. //depot/projects/s390/usr.sbin/Makefile#19 integrate
.. //depot/projects/s390/usr.sbin/cron/crontab/crontab.c#6 integrate
.. //depot/projects/s390/usr.sbin/gssd/Makefile#1 branch
.. //depot/projects/s390/usr.sbin/gssd/gssd.8#1 branch
.. //depot/projects/s390/usr.sbin/gssd/gssd.c#1 branch
.. //depot/projects/s390/usr.sbin/mountd/exports.5#8 integrate
.. //depot/projects/s390/usr.sbin/mountd/mountd.c#10 integrate
.. //depot/projects/s390/usr.sbin/nfsd/nfsd.c#5 integrate
.. //depot/projects/s390/usr.sbin/pstat/pstat.c#11 integrate
.. //depot/projects/s390/usr.sbin/rpc.yppasswdd/yppasswdd_main.c#5 integrate
.. //depot/projects/s390/usr.sbin/usbconfig/Makefile#1 branch
.. //depot/projects/s390/usr.sbin/usbconfig/dump.c#1 branch
.. //depot/projects/s390/usr.sbin/usbconfig/dump.h#1 branch
.. //depot/projects/s390/usr.sbin/usbconfig/usbconfig.8#1 branch
.. //depot/projects/s390/usr.sbin/usbconfig/usbconfig.c#1 branch

Differences ...

==== //depot/projects/s390/UPDATING#18 (text+ko) ====

@@ -22,6 +22,9 @@
 	to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20081028:
+	dummynet(4) ABI has changed. ipfw(8) needs to be recompiled.
+
 20081009:
 	The uhci, ohci, ehci and slhci USB Host controller drivers have
 	been put into separate modules. If you load the usb module
@@ -1146,4 +1149,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.545 2008/10/10 06:37:51 n_hibma Exp $
+$FreeBSD: src/UPDATING,v 1.546 2008/10/28 14:14:57 oleg Exp $

==== //depot/projects/s390/bin/cat/cat.c#6 (text+ko) ====

@@ -44,7 +44,7 @@
 #endif
 #endif /* not lint */
 #include 
-__FBSDID("$FreeBSD: src/bin/cat/cat.c,v 1.32 2005/01/10 08:39:20 imp Exp $");
+__FBSDID("$FreeBSD: src/bin/cat/cat.c,v 1.33 2008/10/30 14:05:57 ivoras Exp $");
 
 #include 
 #include 
@@ -77,6 +77,17 @@
 static int udom_open(const char *path, int flags);
 #endif
 
+/* Memory strategy threshold, in pages: if physmem is larger then this, use a 
+ * large buffer */
+#define PHYSPAGES_THRESHOLD (32*1024)
+
+/* Maximum buffer size in bytes - do not allow it to grow larger than this */
+#define BUFSIZE_MAX (2*1024*1024)
+
+/* Small (default) buffer size in bytes. It's inefficient for this to be
+ * smaller than MAXPHYS */
+#define BUFSIZE_SMALL (MAXPHYS)
+
 int
 main(int argc, char *argv[])
 {
@@ -247,9 +258,17 @@
 	if (buf == NULL) {
 		if (fstat(wfd, &sbuf))
 			err(1, "%s", filename);
-		bsize = MAX(sbuf.st_blksize, 1024);
+		if (S_ISREG(sbuf.st_mode)) {
+			/* If there's plenty of RAM, use a large copy buffer */
+			if (sysconf(_SC_PHYS_PAGES) > PHYSPAGES_THRESHOLD)
+				bsize = MIN(BUFSIZE_MAX, MAXPHYS*8);
+			else
+				bsize = BUFSIZE_SMALL;
+		} else
+			bsize = MAX(sbuf.st_blksize, 
+					(blksize_t)sysconf(_SC_PAGESIZE));
 		if ((buf = malloc(bsize)) == NULL)
-			err(1, "buffer");
+			err(1, "malloc() failure of IO buffer");
 	}
 	while ((nr = read(rfd, buf, bsize)) > 0)
 		for (off = 0; nr; nr -= nw, off += nw)

==== //depot/projects/s390/bin/chio/chio.c#4 (text+ko) ====

@@ -43,7 +43,7 @@
 #endif
 
 #include 
-__FBSDID("$FreeBSD: src/bin/chio/chio.c,v 1.27 2005/01/10 08:39:20 imp Exp $");
+__FBSDID("$FreeBSD: src/bin/chio/chio.c,v 1.28 2008/10/30 19:51:02 joerg Exp $");
 
 #include 
 #include  
@@ -69,7 +69,7 @@
 
 static	void find_element(char *, uint16_t *, uint16_t *);
 static	struct changer_element_status *get_element_status
-	   (unsigned int, unsigned int);
+	   (unsigned int, unsigned int, int);
 
 static	int do_move(const char *, int, char **);
 static	int do_exchange(const char *, int, char **);
@@ -969,7 +969,8 @@
 	++argv; --argc;
 
 	/* Get the status */
-	ces = get_element_status((unsigned int)type, (unsigned int)element);
+	ces = get_element_status((unsigned int)type, (unsigned int)element,
+	    CHET_VT == type);
 
 	if (NULL == ces)
 		errx(1, "%s: null element status pointer", cname);
@@ -1004,7 +1005,7 @@
  * should free() it when done.
  */
 static struct changer_element_status *
-get_element_status(unsigned int type, unsigned int element)
+get_element_status(unsigned int type, unsigned int element, int use_voltags)
 {
 	struct changer_element_status_request cesr;
 	struct changer_element_status *ces;
@@ -1020,7 +1021,8 @@
 	cesr.cesr_element_type = (uint16_t)type;
 	cesr.cesr_element_base = (uint16_t)element;
 	cesr.cesr_element_count = 1;		/* Only this one element */
-	cesr.cesr_flags |= CESR_VOLTAGS;	/* Grab voltags as well */
+	if (use_voltags)
+		cesr.cesr_flags |= CESR_VOLTAGS; /* Grab voltags as well */
 	cesr.cesr_element_status = ces;
 
 	if (ioctl(changer_fd, CHIOGSTATUS, (char *)&cesr) == -1) {

==== //depot/projects/s390/bin/cp/utils.c#9 (text+ko) ====

@@ -33,7 +33,7 @@
 #endif
 #endif /* not lint */
 #include 
-__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.55 2008/09/09 12:31:42 trasz Exp $");
+__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.57 2008/10/30 14:05:57 ivoras Exp $");
 
 #include 
 #include 
@@ -57,10 +57,22 @@
 
 #define	cp_pct(x, y)	((y == 0) ? 0 : (int)(100.0 * (x) / (y)))
 
+/* Memory strategy threshold, in pages: if physmem is larger then this, use a 
+ * large buffer */
+#define PHYSPAGES_THRESHOLD (32*1024)
+
+/* Maximum buffer size in bytes - do not allow it to grow larger than this */
+#define BUFSIZE_MAX (2*1024*1024)
+
+/* Small (default) buffer size in bytes. It's inefficient for this to be
+ * smaller than MAXPHYS */
+#define BUFSIZE_SMALL (MAXPHYS)
+
 int
 copy_file(const FTSENT *entp, int dne)
 {
-	static char buf[MAXBSIZE];
+	static char *buf = NULL;
+	static size_t bufsize;
 	struct stat *fs;
 	ssize_t wcount;
 	size_t wresid;
@@ -137,47 +149,60 @@
 		 * Mmap and write if less than 8M (the limit is so we don't totally
 		 * trash memory on big files.  This is really a minor hack, but it
 		 * wins some CPU back.
+		 * Some filesystems, such as smbnetfs, don't support mmap,
+		 * so this is a best-effort attempt.
 		 */
 #ifdef VM_AND_BUFFER_CACHE_SYNCHRONIZED
 		if (S_ISREG(fs->st_mode) && fs->st_size > 0 &&
-	    	fs->st_size <= 8 * 1048576) {
-			if ((p = mmap(NULL, (size_t)fs->st_size, PROT_READ,
-		    	MAP_SHARED, from_fd, (off_t)0)) == MAP_FAILED) {
+	    	    fs->st_size <= 8 * 1024 * 1024 &&
+		    (p = mmap(NULL, (size_t)fs->st_size, PROT_READ,
+		    MAP_SHARED, from_fd, (off_t)0)) != MAP_FAILED) {
+			wtotal = 0;
+			for (bufp = p, wresid = fs->st_size; ;
+			bufp += wcount, wresid -= (size_t)wcount) {
+				wcount = write(to_fd, bufp, wresid);
+				if (wcount <= 0)
+					break;
+				wtotal += wcount;
+				if (info) {
+					info = 0;
+					(void)fprintf(stderr,
+					    "%s -> %s %3d%%\n",
+					    entp->fts_path, to.p_path,
+					    cp_pct(wtotal, fs->st_size));
+				}
+				if (wcount >= (ssize_t)wresid)
+					break;
+			}
+			if (wcount != (ssize_t)wresid) {
+				warn("%s", to.p_path);
+				rval = 1;
+			}

>>> TRUNCATED FOR MAIL (1000 lines) <<<
From bz at FreeBSD.org  Thu Nov  6 10:40:10 2008
From: bz at FreeBSD.org (Bjoern A. Zeeb)
Date: Thu Nov  6 10:40:16 2008
Subject: PERFORCE change 152589 for review
Message-ID: <200811061840.mA6IeAur000716@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152589

Change 152589 by bz@bz_dumpster on 2008/11/06 18:39:41

	Remove the networking; it's no longer needed to compile.

Affected files ...

.. //depot/projects/s390/sys/s390/conf/GENERIC#13 edit

Differences ...

==== //depot/projects/s390/sys/s390/conf/GENERIC#13 (text+ko) ====

@@ -79,7 +79,3 @@
 #device		dasd			# DASD device
 #device		ctca			# ESCON Channel-to-Channel Adapter
 
-# We do NOT want those but sys thinks we need them:(
-options		INET
-device		loop
-device		ether
From hselasky at FreeBSD.org  Thu Nov  6 15:02:43 2008
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Thu Nov  6 15:02:49 2008
Subject: PERFORCE change 152597 for review
Message-ID: <200811062302.mA6N2g3H036233@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152597

Change 152597 by hselasky@hselasky_laptop001 on 2008/11/06 23:02:19

	
	Sometimes it is convenient to process data at the
	expense of a userland process instead of a kernel
	process or thread. Add support for data filters.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.c#39 edit
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.h#14 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.c#39 (text+ko) ====

@@ -1777,9 +1777,16 @@
 				break;
 			}
 			continue;
-		} else {
-			tr_data = 1;
+		}
+		if (f->methods->f_filter_read) {
+			/*
+			 * Sometimes it is convenient to process data at the
+			 * expense of a userland process instead of a kernel
+			 * process.
+			 */
+			(f->methods->f_filter_read) (f, m);
 		}
+		tr_data = 1;
 
 		io_len = MIN(m->cur_data_len, uio->uio_resid);
 
@@ -1914,9 +1921,8 @@
 				break;
 			}
 			continue;
-		} else {
-			tr_data = 1;
 		}
+		tr_data = 1;
 
 		USB_MBUF_RESET(m);
 
@@ -1933,10 +1939,19 @@
 		if (err) {
 			USB_IF_ENQUEUE(&f->free_q, m);
 			break;
-		} else {
-			USB_IF_ENQUEUE(&f->used_q, m);
-			(f->methods->f_start_write) (f);
+		}
+		if (f->methods->f_filter_write) {
+			/*
+			 * Sometimes it is convenient to process data at the
+			 * expense of a userland process instead of a kernel
+			 * process.
+			 */
+			(f->methods->f_filter_write) (f, m);
 		}
+		USB_IF_ENQUEUE(&f->used_q, m);
+
+		(f->methods->f_start_write) (f);
+
 	} while (uio->uio_resid > 0);
 done:
 	mtx_unlock(f->priv_mtx);
@@ -2561,33 +2576,18 @@
 {
 	struct usb2_mbuf *m;
 
-	USB_IF_DEQUEUE(&f->used_q, m);
+	USB_IF_POLL(&f->used_q, m);
 
 	if (m) {
 		*plen = m->cur_data_len;
 		*pptr = m->cur_data_ptr;
 
-		USB_IF_PREPEND(&f->used_q, m);
 		return (1);
 	}
 	return (0);
 }
 
 void
-usb2_fifo_get_data_next(struct usb2_fifo *f)
-{
-	struct usb2_mbuf *m;
-
-	USB_IF_DEQUEUE(&f->used_q, m);
-
-	if (m) {
-		USB_IF_ENQUEUE(&f->free_q, m);
-		usb2_fifo_wakeup(f);
-	}
-	return;
-}
-
-void
 usb2_fifo_get_data_error(struct usb2_fifo *f)
 {
 	f->flag_iserror = 1;

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.h#14 (text+ko) ====

@@ -39,11 +39,13 @@
 #define	USB_FIFO_RX 1
 
 struct usb2_fifo;
+struct usb2_mbuf;
 
 typedef int (usb2_fifo_open_t)(struct usb2_fifo *fifo, int fflags, struct thread *td);
 typedef void (usb2_fifo_close_t)(struct usb2_fifo *fifo, int fflags, struct thread *td);
 typedef int (usb2_fifo_ioctl_t)(struct usb2_fifo *fifo, u_long cmd, void *addr, int fflags, struct thread *td);
 typedef void (usb2_fifo_cmd_t)(struct usb2_fifo *fifo);
+typedef void (usb2_fifo_filter_t)(struct usb2_fifo *fifo, struct usb2_mbuf *m);
 
 struct usb2_symlink {
 	TAILQ_ENTRY(usb2_symlink) sym_entry;
@@ -57,8 +59,8 @@
 
 /*
  * Locking note for the following functions.  All the
- * "usb2_fifo_cmd_t" functions are called locked. The others are
- * called unlocked.
+ * "usb2_fifo_cmd_t" and "usb2_fifo_filter_t" functions are called
+ * locked. The others are called unlocked.
  */
 struct usb2_fifo_methods {
 	usb2_fifo_open_t *f_open;
@@ -68,6 +70,8 @@
 	usb2_fifo_cmd_t *f_stop_read;
 	usb2_fifo_cmd_t *f_start_write;
 	usb2_fifo_cmd_t *f_stop_write;
+	usb2_fifo_filter_t *f_filter_read;
+	usb2_fifo_filter_t *f_filter_write;
 	const char *basename[4];
 	const char *postfix[4];
 };
@@ -134,7 +138,6 @@
 uint8_t	usb2_fifo_get_data(struct usb2_fifo *fifo, struct usb2_page_cache *pc, uint32_t offset, uint32_t len, uint32_t *actlen, uint8_t what);
 uint8_t	usb2_fifo_get_data_linear(struct usb2_fifo *fifo, void *ptr, uint32_t len, uint32_t *actlen, uint8_t what);
 uint8_t	usb2_fifo_get_data_buffer(struct usb2_fifo *f, void **pptr, uint32_t *plen);
-void	usb2_fifo_get_data_next(struct usb2_fifo *f);
 void	usb2_fifo_get_data_error(struct usb2_fifo *fifo);
 uint8_t	usb2_fifo_opened(struct usb2_fifo *fifo);
 void	usb2_fifo_free(struct usb2_fifo *f);
From hselasky at FreeBSD.org  Thu Nov  6 15:04:45 2008
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Thu Nov  6 15:05:03 2008
Subject: PERFORCE change 152598 for review
Message-ID: <200811062304.mA6N4ipd037521@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152598

Change 152598 by hselasky@hselasky_laptop001 on 2008/11/06 23:03:50

	
	Fix a problem setting the alternate setting of an
	interface while there are FIFOs attached to that
	interface.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#29 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#29 (text+ko) ====

@@ -47,6 +47,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -66,7 +67,7 @@
 static void usb2_check_strings(struct usb2_device *udev);
 static usb2_error_t usb2_fill_iface_data(struct usb2_device *udev, uint8_t iface_index, uint8_t alt_index);
 static void usb2_notify_addq(const char *type, struct usb2_device *udev);
-static void usb2_fifo_free_wrap(struct usb2_device *udev, uint8_t iface_index, uint8_t free_all);
+static void usb2_fifo_free_wrap(struct usb2_device *udev, uint8_t iface_index, uint8_t flag);
 
 /* static structures */
 
@@ -672,8 +673,11 @@
 	if (udev->flags.usb2_mode == USB_MODE_DEVICE) {
 		usb2_detach_device(udev, iface_index, 1);
 	}
-	/* free all FIFOs for this interface */
-	usb2_fifo_free_wrap(udev, iface_index, 0);
+	/*
+	 * Free all generic FIFOs for this interface, except control
+	 * endpoint FIFOs:
+	 */
+	usb2_fifo_free_wrap(udev, iface_index, 2);
 
 	err = usb2_fill_iface_data(udev, iface_index, alt_index);
 	if (err) {
@@ -2078,13 +2082,18 @@
  *	usb2_fifo_free_wrap
  *
  * The function will free the FIFOs.
+ *
+ * Flag values:
+ * 0: Free all FIFOs except control endpoints matching "iface_index".
+ * 1: Free all FIFOs matching "iface_index".
+ * 2: Free all generic FIFOs except control endpoints matching
+ * "iface_index".
  *------------------------------------------------------------------------*/
 static void
 usb2_fifo_free_wrap(struct usb2_device *udev,
-    uint8_t iface_index, uint8_t free_all)
+    uint8_t iface_index, uint8_t flag)
 {
 	struct usb2_fifo *f;
-	struct usb2_pipe *pipe;
 	uint16_t i;
 
 	/*
@@ -2095,11 +2104,20 @@
 		if (f == NULL) {
 			continue;
 		}
-		pipe = f->priv_sc0;
-		if ((pipe == &udev->default_pipe) && (free_all == 0)) {
-			/* don't free UGEN control endpoint yet */
-			continue;
+		/* Check if the FIFO is of generic type */
+		if (f->methods == &usb2_ugen_methods) {
+			if ((f->dev_ep_index == 0) &&
+			    ((flag == 0) || (flag == 2))) {
+				/* don't free UGEN control endpoint yet */
+				continue;
+			}
+		} else {
+			if (flag == 2) {
+				/* don't free non-generic FIFO */
+				continue;
+			}
 		}
+
 		/* Check if the interface index matches */
 		if ((iface_index == f->iface_index) ||
 		    (iface_index == USB_IFACE_INDEX_ANY)) {
From peter at FreeBSD.org  Thu Nov  6 15:13:55 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Thu Nov  6 15:14:01 2008
Subject: PERFORCE change 152601 for review
Message-ID: <200811062313.mA6NDsiV038307@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152601

Change 152601 by peter@peter_overcee on 2008/11/06 23:12:57

	Make freebsd-style orderly thread shutdown work.  On linux, each thread
	calls exit(2), and there is an exit_group(2) syscall exit and take your peers
	with you.
	On FreeBSD, we have thr_exit(2) for a thread to finish by itself, and exit(2)
	takes all your peers with you.
	Teach valgrind about our semantics and implement the thr_kill() call.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_libcsignal.c#5 edit
.. //depot/projects/valgrind/coregrind/m_syswrap/priv_syswrap-freebsd.h#15 edit
.. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#27 edit
.. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-generic.c#8 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_libcsignal.c#5 (text+ko) ====

@@ -191,7 +191,7 @@
 {
    SysRes res = VG_(mk_SysRes_Error)(VKI_ENOSYS);
 #ifdef VGO_freebsd
-   res = VG_(do_syscall2)(__NR_kill, tid, signo);
+   res = VG_(do_syscall2)(__NR_thr_kill, tid, signo);
 #else
    res = VG_(do_syscall2)(__NR_tkill, tid, signo);
    if (res.isError && res.err == VKI_ENOSYS)

==== //depot/projects/valgrind/coregrind/m_syswrap/priv_syswrap-freebsd.h#15 (text+ko) ====

@@ -44,6 +44,7 @@
 
 
 DECL_TEMPLATE(freebsd, sys_syscall);
+DECL_TEMPLATE(freebsd, sys_exit);
 DECL_TEMPLATE(freebsd, sys_getfsstat);
 DECL_TEMPLATE(freebsd, sys_mount);
 DECL_TEMPLATE(freebsd, sys_unmount);

==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#27 (text+ko) ====

@@ -168,27 +168,28 @@
          reallocation.  We need to make sure we don't touch the stack
          between marking it Empty and exiting.  Hence the
          assembler. */
-      /* QQQ might have to use thr_exit here */
 #if defined(VGP_x86_freebsd)	/* FreeBSD has args on the stack */
       asm volatile (
          "movl	%1, %0\n"	/* set tst->status = VgTs_Empty */
-         "movl	%2, %%eax\n"    /* set %eax = __NR_exit */
-         "movl	%3, %%ebx\n"    /* set %ebx = tst->os_state.exitcode */
+         "movl	%2, %%eax\n"    /* set %eax = __NR_thr_exit */
+         "leaq	%3, %%ebx\n"    /* set %ebx = tst->os_state.exitcode */
 	 "pushl	%%ebx\n"	/* arg on stack */
 	 "pushl	%%ebx\n"	/* fake return address */
-         "int	$0x80\n"	/* exit(tst->os_state.exitcode) */
+         "int	$0x80\n"	/* thr_exit(&tst->os_state.exitcode) */
 	 "popl	%%ebx\n"	/* fake return address */
 	 "popl	%%ebx\n"	/* arg off stack */
          : "=m" (tst->status)
-         : "n" (VgTs_Empty), "n" (__NR_exit), "m" (tst->os_state.exitcode));
+         : "n" (VgTs_Empty), "n" (__NR_thr_exit), "m" (tst->os_state.exitcode));
 #elif defined(VGP_amd64_freebsd)
       asm volatile (
          "movl	%1, %0\n"	/* set tst->status = VgTs_Empty */
-         "movq	%2, %%rax\n"    /* set %rax = __NR_exit */
-         "movq	%3, %%rdi\n"    /* set %rdi = tst->os_state.exitcode */
-         "syscall\n"		/* exit(tst->os_state.exitcode) */
+         "movq	%2, %%rax\n"    /* set %rax = __NR_thr_exit */
+         "leaq	%3, %%rdi\n"    /* set %rdi = tst->os_state.exitcode */
+	 "pushq	%%rdi\n"	/* fake return address */
+         "syscall\n"		/* thr_exit(&tst->os_state.exitcode) */
+	 "popq	%%rdi\n"	/* fake return address */
          : "=m" (tst->status)
-         : "n" (VgTs_Empty), "n" (__NR_exit), "m" (tst->os_state.exitcode));
+         : "n" (VgTs_Empty), "n" (__NR_thr_exit), "m" (tst->os_state.exitcode));
 #else
 # error Unknown platform
 #endif
@@ -681,7 +682,7 @@
       VG_(threads)[t].os_state.exitcode = ARG1;
 
       if (t != tid)
-	 VG_(kill_thread)(t);	/* unblock it, if blocked */
+	 VG_(get_thread_out_of_syscall)(t);	/* unblock it, if blocked */
    }
 
    /* We have to claim the syscall already succeeded. */
@@ -689,6 +690,35 @@
 }
 #endif
 
+/* On FreeBSD, if any thread calls exit(2), then they are all shut down, pretty
+ * much like linux's exit_group().
+ */
+PRE(sys_exit)
+{
+   ThreadId     t;
+   ThreadState* tst;
+
+   PRINT("exit( %ld )", ARG1);
+   PRE_REG_READ1(void, "exit", int, exitcode);
+   tst = VG_(get_ThreadState)(tid);
+
+   /* Mark all threads (including this one) to exit. */
+   for (t = 1; t < VG_N_THREADS; t++) {
+      if ( /* not alive */ VG_(threads)[t].status == VgTs_Empty )
+         continue;
+
+      VG_(threads)[t].exitreason = VgSrc_ExitThread;
+      VG_(threads)[t].os_state.exitcode = ARG1;
+
+      if (t != tid)
+	 VG_(get_thread_out_of_syscall)(t);	/* unblock it, if blocked */
+   }
+
+   /* We have to claim the syscall already succeeded. */
+   SET_STATUS_Success(0);
+}
+
+
 PRE(sys_getlogin)
 {
    PRINT("sys_getlogin ( %#lx, %ld )",ARG1,ARG2);
@@ -2929,7 +2959,7 @@
 
 const SyscallTableEntry ML_(syscall_table)[] = {
    // syscall (handled specially)					// 0
-   GENX_(__NR_exit,			sys_exit),			// 1
+   BSDX_(__NR_exit,			sys_exit),			// 1
    BSDX_(__NR_fork,			sys_fork),			// 2
    GENXY(__NR_read,			sys_read),			// 3
 

==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-generic.c#8 (text+ko) ====

@@ -2115,6 +2115,7 @@
 //zz //   VG_(core_panic)("syscall exit_group() not caught by the scheduler?!");
 //zz //}
 
+#if !defined(VGO_freebsd)	/* On freebsd, exit(2) is all-threads shutdown */
 PRE(sys_exit)
 {
    ThreadState* tst;
@@ -2128,6 +2129,7 @@
    tst->os_state.exitcode = ARG1;
    SET_STATUS_Success(0);
 }
+#endif
 
 PRE(sys_ni_syscall)
 {
From rene at FreeBSD.org  Thu Nov  6 15:50:32 2008
From: rene at FreeBSD.org (Rene Ladan)
Date: Thu Nov  6 15:50:38 2008
Subject: PERFORCE change 152602 for review
Message-ID: <200811062350.mA6NoVC6041027@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152602

Change 152602 by rene@rene_self on 2008/11/06 23:50:10

	Some language fixes, partially suggested by Remko.

Affected files ...

.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/security/chapter.sgml#8 edit

Differences ...

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/security/chapter.sgml#8 (text+ko) ====

@@ -1441,11 +1441,11 @@
       netwerkomgeving toegepast kunnen worden.  Het schijnt dat
       iedereen een firewall wil hebben om netwerkverbindingen af te
       handelen.  Ondanks dat een firewall veel kan, zijn er toch dingen
-      die het niet kan, zoals tekst terugsturen naar de ontstaansplaats
-      van een verbinding.  De TCP Wrappers software
-      kan dat en nog veel meer.  In dit onderdeel worden de
-      TCP Wrappers mogelijkheden besproken en, waar
-      dat van toepassing is, worden ook voorbeelden voor implementatie
+      die het niet kan, zoals tekst terugsturen naar de bron van een
+      verbinding.  De TCP Wrappers software kan dat
+      en nog veel meer.  In dit onderdeel worden de mogelijkheden van
+      TCP Wrappers besproken en, waar dat van
+      toepassing is, worden ook voorbeelden voor implementatie
       gegeven.
 
     De TCP Wrappers software vergroot de
From peter at FreeBSD.org  Thu Nov  6 19:32:18 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Thu Nov  6 19:32:28 2008
Subject: PERFORCE change 152605 for review
Message-ID: <200811070332.mA73WG4U073430@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152605

Change 152605 by peter@peter_hammer on 2008/11/07 03:31:43

	-Wunused on < freebsd-7

Affected files ...

.. //depot/projects/valgrind/coregrind/launcher-freebsd.c#5 edit

Differences ...

==== //depot/projects/valgrind/coregrind/launcher-freebsd.c#5 (text+ko) ====

@@ -186,8 +186,10 @@
    char launcher_name[PATH_MAX+1];
    char* new_line;
    char** new_env;
+#if __FreeBSD__ >= 7
    int oid[4];
    vki_size_t len;
+#endif
 
    /* Start the debugging-log system ASAP.  First find out how many 
       "-d"s were specified.  This is a pre-scan of the command line.
From peter at FreeBSD.org  Thu Nov  6 19:32:18 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Thu Nov  6 19:32:29 2008
Subject: PERFORCE change 152606 for review
Message-ID: <200811070332.mA73WHqk073435@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152606

Change 152606 by peter@peter_hammer on 2008/11/07 03:32:09

	Unused function for procfs reader.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-freebsd.c#11 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-freebsd.c#11 (text+ko) ====

@@ -3050,6 +3050,7 @@
    return n;
 }
 
+#if 0
 static Int readhex64 ( const Char* buf, ULong* val )
 {
    /* Read a potentially 64-bit hex number. */
@@ -3061,6 +3062,7 @@
    }
    return n;
 }
+#endif
 
 static Int readdec64 ( const Char* buf, ULong* val )
 {
From peter at FreeBSD.org  Thu Nov  6 19:34:20 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Thu Nov  6 19:34:26 2008
Subject: PERFORCE change 152607 for review
Message-ID: <200811070334.mA73YJ07073662@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152607

Change 152607 by peter@peter_hammer on 2008/11/07 03:33:31

	Make the Elf_Nhdr stuff work on 64 bit too.  It is needed for < 7.x.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_coredump/coredump-elf.c#4 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_coredump/coredump-elf.c#4 (text+ko) ====

@@ -57,8 +57,9 @@
 #define NT_PRXFPREG     0x46e62b7f      /* copied from gdb5.1/include/elf/common.h */
 #endif /* NT_PRXFPREG */
 
-#if defined(VGO_freebsd) && __FreeBSD_version < 500000
+#if defined(VGO_freebsd) && __FreeBSD_version < 700000
 typedef Elf_Note Elf32_Nhdr;
+typedef Elf_Note Elf64_Nhdr;
 __ElfType(Nhdr);
 #endif
 
From peter at FreeBSD.org  Thu Nov  6 19:38:24 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Thu Nov  6 19:38:30 2008
Subject: PERFORCE change 152608 for review
Message-ID: <200811070338.mA73cOA9073983@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152608

Change 152608 by peter@peter_hammer on 2008/11/07 03:38:03

	sendfile() wrapper was 32 bit centric.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#28 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#28 (text+ko) ====

@@ -923,7 +923,13 @@
 PRE(sys_sendfile)
 {
    *flags |= SfMayBlock;
+#if defined(VGP_x86_freebsd)
    PRINT("sys_sendfile ( %ld, %ld, %llu, %ld, %#lx, %#lx, %lu )", ARG1,ARG2,LOHI64(ARG3,ARG4),ARG5,ARG6,ARG7,ARG8);
+#elif defined(VGP_amd64_freebsd)
+   PRINT("sys_sendfile ( %ld, %ld, %lu, %ld, %#lx, %#lx, %lu )", ARG1,ARG2,ARG3,ARG4,ARG5,ARG6,ARG7);
+#else
+#  error Unknown platform
+#endif
    PRE_REG_READ7(ssize_t, "sendfile",
                  int, fd, int, s, unsigned int, offset_low,
 		 unsigned int, offset_high,
From peter at FreeBSD.org  Thu Nov  6 19:39:25 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Thu Nov  6 19:39:32 2008
Subject: PERFORCE change 152609 for review
Message-ID: <200811070339.mA73dP9Z074050@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152609

Change 152609 by peter@peter_hammer on 2008/11/07 03:38:43

	Shuffle typedefs to be after definitions.  gcc3 cares about this.

Affected files ...

.. //depot/projects/valgrind/coregrind/pub_core_initimg.h#3 edit

Differences ...

==== //depot/projects/valgrind/coregrind/pub_core_initimg.h#3 (text+ko) ====

@@ -40,26 +40,6 @@
 // the AIX kernel does most of the work for us.
 //--------------------------------------------------------------------
 
-/* These are OS-specific and defined below. */
-typedef  struct _IICreateImageInfo    IICreateImageInfo;
-typedef  struct _IIFinaliseImageInfo  IIFinaliseImageInfo;
-
-/* This is a two stage process.  The first stage, which is most of the
-   work, creates the initial image in memory to the extent possible.
-   To do this it takes a bundle of information in an IICreateImageInfo
-   structure, which is gathered in an OS-specific way at startup.
-   This returns an IIFinaliseImageInfo structure: */
-extern 
-IIFinaliseImageInfo VG_(ii_create_image)( IICreateImageInfo );
-
-/* Just before starting the client, we may need to make final
-   adjustments to its initial image.  Also we need to set up the VEX
-   guest state for thread 1 (the root thread) and copy in essential
-   starting values.  This is handed the IIFinaliseImageInfo created by
-   VG_(ii_create_image). */
-extern 
-void VG_(ii_finalise_image)( IIFinaliseImageInfo );
-
 
 /* Note that both IICreateImageInfo and IIFinaliseImageInfo are
    OS-specific.  We now go on to give instantiations of them
@@ -174,6 +154,25 @@
 #endif
 
 
+typedef  struct _IICreateImageInfo    IICreateImageInfo;
+typedef  struct _IIFinaliseImageInfo  IIFinaliseImageInfo;
+
+/* This is a two stage process.  The first stage, which is most of the
+   work, creates the initial image in memory to the extent possible.
+   To do this it takes a bundle of information in an IICreateImageInfo
+   structure, which is gathered in an OS-specific way at startup.
+   This returns an IIFinaliseImageInfo structure: */
+extern 
+IIFinaliseImageInfo VG_(ii_create_image)( IICreateImageInfo );
+
+/* Just before starting the client, we may need to make final
+   adjustments to its initial image.  Also we need to set up the VEX
+   guest state for thread 1 (the root thread) and copy in essential
+   starting values.  This is handed the IIFinaliseImageInfo created by
+   VG_(ii_create_image). */
+extern 
+void VG_(ii_finalise_image)( IIFinaliseImageInfo );
+
 #endif   // __PUB_CORE_INITIMG_H
 
 /*--------------------------------------------------------------------*/
From peter at FreeBSD.org  Thu Nov  6 19:40:27 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Thu Nov  6 19:40:33 2008
Subject: PERFORCE change 152610 for review
Message-ID: <200811070340.mA73eQfG074157@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152610

Change 152610 by peter@peter_hammer on 2008/11/07 03:40:14

	Hack to make size 0 functions sort-of work.  m_redir.c will patch them,
	but the stack tracer will ignore them.  This is (sadly) needed on old
	binaries.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_debuginfo/readelf.c#5 edit
.. //depot/projects/valgrind/coregrind/m_debuginfo/storage.c#4 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_debuginfo/readelf.c#5 (text+ko) ====

@@ -312,7 +312,12 @@
        || /* VG_(strlen)(sym_name) == 0 */
           /* equivalent but cheaper ... */
           sym_name[0] == 0
-       || sym->st_size == 0) {
+#if !defined(VGO_freebsd)
+       || sym->st_size == 0
+#else
+       || (sym->st_size == 0 && ELFXX_ST_TYPE(sym->st_info) != STT_FUNC)
+#endif
+       ) {
       TRACE_SYMTAB("    ignore -- size=0: %s\n", sym_name);
       return False;
    }

==== //depot/projects/valgrind/coregrind/m_debuginfo/storage.c#4 (text+ko) ====

@@ -205,6 +205,10 @@
    UInt   new_sz, i;
    DiSym* new_tab;
 
+#if defined(VGO_freebsd)
+   if (sym->size == 0)
+      sym->size = 1;
+#endif
    /* Ignore zero-sized syms. */
    if (sym->size == 0) return;
 
From peter at FreeBSD.org  Thu Nov  6 20:10:58 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Thu Nov  6 20:11:04 2008
Subject: PERFORCE change 152611 for review
Message-ID: <200811070410.mA74AvPu077710@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152611

Change 152611 by peter@peter_hammer on 2008/11/07 04:10:50

	Make this compile on 32 bit again

Affected files ...

.. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#29 edit
.. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-main.c#13 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#29 (text+ko) ====

@@ -172,7 +172,7 @@
       asm volatile (
          "movl	%1, %0\n"	/* set tst->status = VgTs_Empty */
          "movl	%2, %%eax\n"    /* set %eax = __NR_thr_exit */
-         "leaq	%3, %%ebx\n"    /* set %ebx = tst->os_state.exitcode */
+         "leal	%3, %%ebx\n"    /* set %ebx = tst->os_state.exitcode */
 	 "pushl	%%ebx\n"	/* arg on stack */
 	 "pushl	%%ebx\n"	/* fake return address */
          "int	$0x80\n"	/* thr_exit(&tst->os_state.exitcode) */

==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-main.c#13 (text+ko) ====

@@ -267,10 +267,10 @@
 #if defined(VGP_x86_freebsd)
    /* On FreeBSD, the success/fail status is returned */
    if (err == 1) {
-      LibVEX_Guestx86_put_eflag_c(1, &tst->arch.vex);
+      LibVEX_GuestX86_put_eflag_c(1, &tst->arch.vex);
       err = 0;
    } else {
-      LibVEX_Guestx86_put_eflag_c(0, &tst->arch.vex);
+      LibVEX_GuestX86_put_eflag_c(0, &tst->arch.vex);
    }
 #elif defined(VGP_amd64_freebsd)
    if (err == 1) {
@@ -1635,9 +1635,9 @@
 	 and still has to be fixed up here. */
       if (!(sci->flags & SfNoWriteResult)) {
         if (sres.isError)
-           LibVEX_Guestx86_put_eflag_c(1, &th_regs->vex);
+           LibVEX_GuestX86_put_eflag_c(1, &th_regs->vex);
         else
-           LibVEX_Guestx86_put_eflag_c(0, &th_regs->vex);
+           LibVEX_GuestX86_put_eflag_c(0, &th_regs->vex);
       }
 #elif defined(VGP_amd64_freebsd)
       if (!(sci->flags & SfNoWriteResult)) {
From peter at FreeBSD.org  Thu Nov  6 20:13:00 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Thu Nov  6 20:13:07 2008
Subject: PERFORCE change 152612 for review
Message-ID: <200811070412.mA74CxOc077849@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152612

Change 152612 by peter@peter_hammer on 2008/11/07 04:12:06

	Deal with execing 32 bit binaries and the interpreter subterfuge

Affected files ...

.. //depot/projects/valgrind/coregrind/m_ume.c#5 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_ume.c#5 (text+ko) ====

@@ -401,6 +401,14 @@
 	 buf[ph->p_filesz] = '\0';
 
 //VG_(printf)("interpreter is %s\n", buf);
+#if defined(VGP_x86_freebsd)
+         /* Hack.  FreeBSD's kernel overloads the interpreter name. */
+         if (VG_(strcmp)(buf, "/libexec/ld-elf.so.1") == 0 ||
+	     VG_(strcmp)(buf, "/usr/libexec/ld-elf.so.1") == 0) {
+	    sres = VG_(open)("/libexec/ld-elf32.so.1", VKI_O_RDONLY, 0);
+	 }
+	 if (sres.isError)
+#endif
 	 sres = VG_(open)(buf, VKI_O_RDONLY, 0);
          if (sres.isError) {
 	    VG_(printf)("valgrind: m_ume.c: can't open interpreter\n");
From peter at FreeBSD.org  Thu Nov  6 21:18:06 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Thu Nov  6 21:18:12 2008
Subject: PERFORCE change 152613 for review
Message-ID: <200811070518.mA75I5Zq093485@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152613

Change 152613 by peter@peter_overcee on 2008/11/07 05:17:39

	Turn off sigtimedwait syscall on freebsd-6.  It isn't present in
	the compat32 area.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_libcsignal.c#6 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_libcsignal.c#6 (text+ko) ====

@@ -227,7 +227,7 @@
    return res.isError ? -1 : res.res;
 }
 
-#elif defined(VGO_freebsd) && __FreeBSD__ >= 6
+#elif defined(VGO_freebsd) && __FreeBSD__ >= 7
 Int VG_(sigtimedwait_zero)( const vki_sigset_t *set, 
                             vki_siginfo_t *info )
 {
@@ -237,7 +237,7 @@
                                  (UWord)&zero);
    return res.isError ? -1 : res.res;
 }
-#elif defined(VGO_aix5) || (defined(VGO_freebsd) && __FreeBSD__ < 6)
+#elif defined(VGO_aix5) || (defined(VGO_freebsd) && __FreeBSD__ < 7)
 /* The general idea is:
    - use sigpending to find out which signals are pending
    - choose one
From peter at FreeBSD.org  Thu Nov  6 21:24:12 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Thu Nov  6 21:24:19 2008
Subject: PERFORCE change 152614 for review
Message-ID: <200811070524.mA75OClI093943@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152614

Change 152614 by peter@peter_hammer on 2008/11/07 05:24:12

	Hack.  AIX apparently has an extra _ in its sigpending/sigsuspend names.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_libcsignal.c#7 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_libcsignal.c#7 (text+ko) ====

@@ -238,6 +238,10 @@
    return res.isError ? -1 : res.res;
 }
 #elif defined(VGO_aix5) || (defined(VGO_freebsd) && __FreeBSD__ < 7)
+#if defined(VGO_freebsd)
+#define __NR__sigpending __NR_sigpending
+#define __NR__sigsuspend __NR_sigsuspend
+#endif
 /* The general idea is:
    - use sigpending to find out which signals are pending
    - choose one
@@ -327,6 +331,10 @@
 
   return i;
 }
+#if defined(VGO_freebsd)
+#undef __NR__sigpending
+#undef __NR__sigsuspend
+#endif
 
 #else
 #  error Unknown OS
From gonzo at FreeBSD.org  Thu Nov  6 22:48:38 2008
From: gonzo at FreeBSD.org (Oleksandr Tymoshenko)
Date: Thu Nov  6 22:48:44 2008
Subject: PERFORCE change 152615 for review
Message-ID: <200811070648.mA76mbZo001638@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152615

Change 152615 by gonzo@gonzo_jeeves on 2008/11/07 06:48:34

	- Move siba/siba_pcib entries to files.mips
	- Add siba/siba_pcib to BCM4704 build and add hints
	
	This is going to be a long and painful journey to the
	  land of broadcom chipsets...

Affected files ...

.. //depot/projects/mips2/src/sys/conf/files.mips#27 edit
.. //depot/projects/mips2/src/sys/mips/conf/BCM4704#2 edit
.. //depot/projects/mips2/src/sys/mips/conf/BCM4704.hints#1 add
.. //depot/projects/mips2/src/sys/mips/sentry5/files.sentry5#2 edit

Differences ...

==== //depot/projects/mips2/src/sys/conf/files.mips#27 (text+ko) ====

@@ -128,3 +128,6 @@
 dev/cfe/cfe_console.c		optional	cfe_console
 #dev/cfe/cfe_resource.c		optional	cfe	# not yet needed
 
+# SSB bus file
+dev/siba/siba.c					optional siba
+dev/siba/siba_pcib.c				optional siba pci

==== //depot/projects/mips2/src/sys/mips/conf/BCM4704#2 (text+ko) ====

@@ -8,6 +8,7 @@
 options		CPU_NOFPU
 options 	ISA_MIPS32
 files		"../bcm47xx/files.bcm47xx"
+hints		"SENTRY5.hints"
 
 options		CFE
 options		CFE_CONSOLE
@@ -36,6 +37,9 @@
 #device		uart
 #device		uart_ns8250
 
+device		siba			# Sonics SiliconBackplane
+device		pci			# siba_pcib
+
 device		loop
 device		ether
 device		md

==== //depot/projects/mips2/src/sys/mips/sentry5/files.sentry5#2 (text+ko) ====

@@ -4,10 +4,7 @@
 # for USB 1.1 OHCI, Ethernet and IPSEC cores
 # which are believed to be devices we have drivers for
 # which just need to be tweaked for attachment to an SSB system bus.
-
 mips/sentry5/s5_machdep.c		standard
-dev/siba/siba.c					optional siba
-dev/siba/siba_pcib.c				optional siba pci
 mips/sentry5/siba_cc.c			optional siba
 
 # notyet
From hselasky at FreeBSD.org  Fri Nov  7 09:03:11 2008
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Fri Nov  7 09:03:18 2008
Subject: PERFORCE change 152624 for review
Message-ID: <200811071703.mA7H3Bjp007449@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152624

Change 152624 by hselasky@hselasky_laptop001 on 2008/11/07 17:02:49

	
	Fix some problems related to busdma:
	Need to unload DMA maps before re-use!
	Fix a corner case when loading zero bytes.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_busdma.c#10 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_busdma.c#10 (text+ko) ====

@@ -597,6 +597,12 @@
 			uptag = pc->tag_parent;
 
 			/*
+			 * We have to unload the previous loaded DMA
+			 * pages before trying to load a new one!
+			 */
+			bus_dmamap_unload(pc->tag, pc->map);
+
+			/*
 			 * Try to load memory into DMA.
 			 */
 			err = bus_dmamap_load(
@@ -612,6 +618,12 @@
 		} else {
 
 			/*
+			 * We have to unload the previous loaded DMA
+			 * pages before trying to load a new one!
+			 */
+			bus_dmamap_unload(pc->tag, pc->map);
+
+			/*
 			 * Try to load memory into DMA. The callback
 			 * will be called in all cases:
 			 */
@@ -639,6 +651,10 @@
 void
 usb2_pc_cpu_invalidate(struct usb2_page_cache *pc)
 {
+	if (pc->page_offset_end == pc->page_offset_buf) {
+		/* nothing has been loaded into this page cache! */
+		return;
+	}
 	bus_dmamap_sync(pc->tag, pc->map,
 	    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 	return;
@@ -650,6 +666,10 @@
 void
 usb2_pc_cpu_flush(struct usb2_page_cache *pc)
 {
+	if (pc->page_offset_end == pc->page_offset_buf) {
+		/* nothing has been loaded into this page cache! */
+		return;
+	}
 	bus_dmamap_sync(pc->tag, pc->map,
 	    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 	return;
@@ -953,6 +973,12 @@
 
 	if (size > 0) {
 
+		/*
+		 * We have to unload the previous loaded DMA
+		 * pages before trying to load a new one!
+		 */
+		bus_dmamap_unload(pc->tag, pc->map);
+
 		/* try to load memory into DMA using using no wait option */
 		if (bus_dmamap_load(pc->tag, pc->map, pc->buffer,
 		    size, NULL, BUS_DMA_NOWAIT)) {
@@ -990,6 +1016,10 @@
 
 	len = pc->page_offset_end - pc->page_offset_buf;
 
+	if (len == 0) {
+		/* nothing has been loaded into this page cache */
+		return;
+	}
 	bus_dmamap_sync(pc->tag, pc->map, 0, len,
 	    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
 	return;
@@ -1005,6 +1035,10 @@
 
 	len = pc->page_offset_end - pc->page_offset_buf;
 
+	if (len == 0) {
+		/* nothing has been loaded into this page cache */
+		return;
+	}
 	bus_dmamap_sync(pc->tag, pc->map, 0, len,
 	    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 	return;
From sam at FreeBSD.org  Fri Nov  7 09:06:15 2008
From: sam at FreeBSD.org (Sam Leffler)
Date: Fri Nov  7 09:06:21 2008
Subject: PERFORCE change 152625 for review
Message-ID: <200811071706.mA7H6Em2007730@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152625

Change 152625 by sam@sam_ebb on 2008/11/07 17:05:16

	skip unused rates when check for an initial rate; this fixes
	wrongly selecting an HT rate from the hal's rate table

Affected files ...

.. //depot/projects/vap/sys/dev/ath/ath_rate/sample/sample.c#20 edit

Differences ...

==== //depot/projects/vap/sys/dev/ath/ath_rate/sample/sample.c#20 (text+ko) ====

@@ -280,6 +280,8 @@
 		if (!sn->packets_sent[size_bin] || best_rix == -1) {
 			/* no packet has been sent successfully yet */
 			for (rix = rt->rateCount-1; rix > 0; rix--) {
+				if ((sn->ratemask & (1<

http://perforce.freebsd.org/chv.cgi?CH=152627

Change 152627 by sam@sam_ebb on 2008/11/07 18:23:37

	sowl parts have "issues"; first crack at dealing with them (still
	have other unresolved bb hangs that could be misprogramming)

Affected files ...

.. //depot/projects/vap/sys/dev/ath/if_ath.c#120 edit

Differences ...

==== //depot/projects/vap/sys/dev/ath/if_ath.c#120 (text+ko) ====

@@ -1293,7 +1293,8 @@
 static void
 ath_bmiss_vap(struct ieee80211vap *vap)
 {
-	struct ath_softc *sc = vap->iv_ic->ic_ifp->if_softc;
+	struct ifnet *ifp = vap->iv_ic->ic_ifp;
+	struct ath_softc *sc = ifp->if_softc;
 	u_int64_t lastrx = sc->sc_lastrx;
 	u_int64_t tsf = ath_hal_gettsf64(sc->sc_ah);
 	u_int bmisstimeout =
@@ -1317,14 +1318,33 @@
 		sc->sc_stats.ast_bmiss_phantom++;
 }
 
+static int
+ath_hal_gethangstate(struct ath_hal *ah, uint32_t mask, uint32_t *hangs)
+{
+	uint32_t rsize;
+	void *sp;
+
+	if (!ath_hal_getdiagstate(ah, 32, &mask, sizeof(&mask), &sp, &rsize))
+		return 0;
+	KASSERT(rsize == sizeof(uint32_t), ("resultsize %u", rsize));
+	*hangs = *(uint32_t *)sp;
+	return 1;
+}
+
 static void
 ath_bmiss_proc(void *arg, int pending)
 {
 	struct ath_softc *sc = arg;
 	struct ifnet *ifp = sc->sc_ifp;
+	uint32_t hangs;
 
 	DPRINTF(sc, ATH_DEBUG_ANY, "%s: pending %u\n", __func__, pending);
-	ieee80211_beacon_miss(ifp->if_l2com);
+
+	if (ath_hal_gethangstate(sc->sc_ah, 0xff, &hangs) && hangs != 0) {
+		if_printf(ifp, "bb hang detected (0x%x), reseting\n", hangs); 
+		ath_reset(ifp);
+	} else
+		ieee80211_beacon_miss(ifp->if_l2com);
 }
 
 /*
@@ -5534,6 +5554,7 @@
 {
 	struct ath_softc *sc = arg;
 	struct ath_hal *ah = sc->sc_ah;
+	struct ifnet *ifp = sc->sc_ifp;
 	HAL_BOOL iqCalDone;
 
 	sc->sc_stats.ast_per_cal++;
@@ -5546,7 +5567,7 @@
 		DPRINTF(sc, ATH_DEBUG_CALIBRATE,
 			"%s: rfgain change\n", __func__);
 		sc->sc_stats.ast_per_rfgain++;
-		ath_reset(sc->sc_ifp);
+		ath_reset(ifp);
 	}
 	if (!ath_hal_calibrate(ah, &sc->sc_curchan, &iqCalDone)) {
 		DPRINTF(sc, ATH_DEBUG_ANY,
@@ -6347,7 +6368,14 @@
 	struct ath_softc *sc = ifp->if_softc;
 
 	if ((ifp->if_drv_flags & IFF_DRV_RUNNING) && !sc->sc_invalid) {
-		if_printf(ifp, "device timeout\n");
+		uint32_t hangs;
+
+		if (ath_hal_gethangstate(sc->sc_ah, 0xffff, &hangs) &&
+		    hangs != 0) {
+			if_printf(ifp, "%s hang detected (0x%x)\n",
+			    hangs & 0xff ? "bb" : "mac", hangs); 
+		} else
+			if_printf(ifp, "device timeout\n");
 		ath_reset(ifp);
 		ifp->if_oerrors++;
 		sc->sc_stats.ast_watchdog++;
From hselasky at FreeBSD.org  Fri Nov  7 10:27:37 2008
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Fri Nov  7 10:27:43 2008
Subject: PERFORCE change 152628 for review
Message-ID: <200811071827.mA7IRaHB017118@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152628

Change 152628 by hselasky@hselasky_laptop001 on 2008/11/07 18:27:23

	
	Libusb-0.1.12 compatibility issue: Need to translate from
	"bConfigurationValue" to configuration index when setting
	the configuration. The error was indirectly reported by
	Stefan Ehmann.

Affected files ...

.. //depot/projects/usb/src/lib/libusb20/libusb20_compat01.c#7 edit
.. //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.c#6 edit

Differences ...

==== //depot/projects/usb/src/lib/libusb20/libusb20_compat01.c#7 (text+ko) ====

@@ -670,11 +670,40 @@
 }
 
 int
-usb_set_configuration(usb_dev_handle * dev, int configuration)
+usb_set_configuration(usb_dev_handle * udev, int bConfigurationValue)
 {
+	struct usb_device *dev;
 	int err;
+	uint8_t i;
+
+	/*
+	 * Need to translate from "bConfigurationValue" to
+	 * configuration index:
+	 */
 
-	err = libusb20_dev_set_config_index((void *)dev, configuration);
+	if (bConfigurationValue == 0) {
+		/* unconfigure */
+		i = 255;
+	} else {
+		/* lookup configuration index */
+		dev = usb_device(udev);
+
+		/* check if the configuration array is not there */
+		if (dev->config == NULL) {
+			return (-1);
+		}
+		for (i = 0;; i++) {
+			if (i == dev->descriptor.bNumConfigurations) {
+				/* "bConfigurationValue" not found */
+				return (-1);
+			}
+			if ((dev->config + i)->bConfigurationValue == bConfigurationValue) {
+				break;
+			}
+		}
+	}
+
+	err = libusb20_dev_set_config_index((void *)udev, i);
 
 	if (err)
 		return (-1);

==== //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.c#6 (text+ko) ====

@@ -266,8 +266,8 @@
 	    "usbconfig - configure the USB subsystem" "\n"
 	    "usage: usbconfig -u  -a  -i  [cmds...]" "\n"
 	    "commands:" "\n"
-	    "  set_config " "\n"
-	    "  set_alt " "\n"
+	    "  set_config " "\n"
+	    "  set_alt " "\n"
 	    "  set_owner " "\n"
 	    "  set_perm " "\n"
 	    "  add_dev_quirk_vplh     " "\n"
From peter at FreeBSD.org  Fri Nov  7 12:22:34 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Fri Nov  7 12:22:39 2008
Subject: PERFORCE change 152632 for review
Message-ID: <200811072022.mA7KMXjF031321@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152632

Change 152632 by peter@peter_overcee on 2008/11/07 20:22:26

	Treat SIGSYS as a synchronous signal, like SIGBUS and SIGSEGV.
	Otherwise it gets queued up and turns up later at misleading times
	when it gets unmaked for an async syscall.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_libcsignal.c#8 edit
.. //depot/projects/valgrind/coregrind/m_main.c#10 edit
.. //depot/projects/valgrind/coregrind/m_scheduler/scheduler.c#3 edit
.. //depot/projects/valgrind/coregrind/m_signals.c#9 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_libcsignal.c#8 (text+ko) ====

@@ -261,6 +261,7 @@
    vg_assert(sig != VKI_SIGSEGV);
    vg_assert(sig != VKI_SIGBUS);
    vg_assert(sig != VKI_SIGTRAP);
+   vg_assert(sig != VKI_SIGSYS);
    /* do nothing */ 
 }
 

==== //depot/projects/valgrind/coregrind/m_main.c#10 (text+ko) ====

@@ -2284,6 +2284,7 @@
    VG_(set_default_handler)(VKI_SIGBUS);
    VG_(set_default_handler)(VKI_SIGILL);
    VG_(set_default_handler)(VKI_SIGFPE);
+   VG_(set_default_handler)(VKI_SIGSYS);
 
    // We were exiting, so assert that...
    vg_assert(VG_(is_exiting)(tid));

==== //depot/projects/valgrind/coregrind/m_scheduler/scheduler.c#3 (text+ko) ====

@@ -344,6 +344,7 @@
    VG_(sigdelset)(&mask, VKI_SIGFPE);
    VG_(sigdelset)(&mask, VKI_SIGILL);
    VG_(sigdelset)(&mask, VKI_SIGTRAP);
+   VG_(sigdelset)(&mask, VKI_SIGSYS);
 
    /* Can't block these anyway */
    VG_(sigdelset)(&mask, VKI_SIGSTOP);

==== //depot/projects/valgrind/coregrind/m_signals.c#9 (text+ko) ====

@@ -487,6 +487,7 @@
       case VKI_SIGFPE:
       case VKI_SIGILL:
       case VKI_SIGTRAP:
+      case VKI_SIGSYS:
 	 /* For these, we always want to catch them and report, even
 	    if the client code doesn't. */
 	 skss_handler = sync_signalhandler;
@@ -1192,6 +1193,7 @@
    case VKI_SIGTRAP:	/* core */
    case VKI_SIGXCPU:	/* core */
    case VKI_SIGXFSZ:	/* core */
+   case VKI_SIGSYS:	/* core */
       terminate = True;
       core = True;
       break;
@@ -1208,7 +1210,6 @@
 #ifdef VKI_SIGPWR
    case VKI_SIGPWR:	/* term */
 #endif
-   case VKI_SIGSYS:	/* term */
    case VKI_SIGPROF:	/* term */
    case VKI_SIGVTALRM:	/* term */
    case VKI_SIGRTMIN ... VKI_SIGRTMAX: /* term */
@@ -1763,7 +1764,8 @@
 	     sigNo == VKI_SIGBUS  ||
 	     sigNo == VKI_SIGFPE  ||
 	     sigNo == VKI_SIGILL  ||
-	     sigNo == VKI_SIGTRAP);
+	     sigNo == VKI_SIGTRAP ||
+	     sigNo == VKI_SIGSYS);
 #if 0
 VG_(printf)("signal %d\n", sigNo);
 VG_(printf)("si_signo %d\n", info->si_signo);
From peter at FreeBSD.org  Fri Nov  7 14:36:50 2008
From: peter at FreeBSD.org (Peter Wemm)
Date: Fri Nov  7 14:36:57 2008
Subject: PERFORCE change 152635 for review
Message-ID: <200811072236.mA7Mano2058175@repoman.freebsd.org>

http://perforce.freebsd.org/chv.cgi?CH=152635

Change 152635 by peter@peter_hammer on 2008/11/07 22:36:07

	Ugh.  FreeBSD-6 had sigtimedwait(), but it was missing from compat32.
	Add a detection for running under 32 bit emulation so we can emulate
	it on 6.x under compat32.  (This is also needed for other things too)

Affected files ...

.. //depot/projects/valgrind/coregrind/m_coredump/coredump-elf.c#5 edit
.. //depot/projects/valgrind/coregrind/m_libcproc.c#7 edit
.. //depot/projects/valgrind/coregrind/m_libcsignal.c#9 edit
.. //depot/projects/valgrind/coregrind/m_main.c#11 edit
.. //depot/projects/valgrind/coregrind/pub_core_libcproc.h#4 edit
.. //depot/projects/valgrind/include/vki/vki-freebsd.h#12 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_coredump/coredump-elf.c#5 (text+ko) ====

@@ -240,12 +240,6 @@
 			  const vki_siginfo_t *si)
 {
    struct vki_user_regs_struct *regs;
-   Int error, osreldate;
-   vki_size_t osreldatel;
-
-   osreldate = 0;
-   osreldatel = sizeof(osreldate);
-   error = VG_(sysctlbyname)("kern.osreldate", &osreldate, &osreldatel, 0, 0);
 
    VG_(memset)(prs, 0, sizeof(*prs));
 
@@ -253,7 +247,7 @@
    prs->pr_statussz = sizeof(struct vki_elf_prstatus);
    prs->pr_gregsetsz = sizeof(vki_elf_gregset_t);
    prs->pr_fpregsetsz = sizeof(vki_elf_fpregset_t);
-   prs->pr_osreldate = osreldate;
+   prs->pr_osreldate = VG_(getosreldate)();
 
    prs->pr_cursig = si->si_signo;
    prs->pr_pid = tst->os_state.lwpid;

==== //depot/projects/valgrind/coregrind/m_libcproc.c#7 (text+ko) ====

@@ -675,14 +675,51 @@
    return error;
 }
 
-Int VG_(modfind)(const Char *modname)
+Int VG_(getosreldate)(void)
+{
+   static Int osreldate = 0;
+   vki_size_t osreldatel;
+
+   if (osreldate == 0) {
+      osreldatel = sizeof(osreldate);
+      VG_(sysctlbyname)("kern.osreldate", &osreldate, &osreldatel, 0, 0);
+   }
+   return (osreldate);
+}
+
+Bool VG_(is32on64)(void)
 {
-   SysRes res;
+#if defined(VGP_amd64_freebsd)
+   return False;
+#elif defined(VGP_x86_freebsd)
+   Int oid[2], error;
+   vki_size_t len;
+   char machbuf[32];
+   static Int is32on64 = -1;
 
-   res = VG_(do_syscall1)(__NR_modfind, (UWord)modname);
-   if (res.isError)
-      return -1;
-   return res.res;
+   if (is32on64 == -1) {
+      oid[0] = VKI_CTL_HW;
+      oid[1] = VKI_HW_MACHINE;
+      len = sizeof(machbuf);
+      error =  VG_(sysctl)(oid, 2, machbuf, &len, NULL, 0);
+      if (error == 0) {
+	 machbuf[31] = '\0';
+	 if (VG_(strcmp)(machbuf, "amd64") == 0)
+	    is32on64 = 1;
+	 else
+	    is32on64 = 0;
+      } else {
+	 is32on64 = -2;
+      }
+   }
+   if (is32on64 == 1) {
+      return True;
+   } else {
+      return False;
+   }
+#else
+#  error Unknown platform
+#endif
 }
 #endif
 

==== //depot/projects/valgrind/coregrind/m_libcsignal.c#9 (text+ko) ====

@@ -36,6 +36,7 @@
 #include "pub_core_libcassert.h"
 #include "pub_core_syscall.h"
 #include "pub_core_libcsignal.h"    /* self */
+#include "pub_core_libcproc.h"
 
 /* sigemptyset, sigfullset, sigaddset and sigdelset return 0 on
    success and -1 on error.  */
@@ -227,21 +228,7 @@
    return res.isError ? -1 : res.res;
 }
 
-#elif defined(VGO_freebsd) && __FreeBSD__ >= 7
-Int VG_(sigtimedwait_zero)( const vki_sigset_t *set, 
-                            vki_siginfo_t *info )
-{
-   static const struct vki_timespec zero = { 0, 0 };
-   /* only on freebsd6.x and higher */
-   SysRes res = VG_(do_syscall3)(__NR_sigtimedwait, (UWord)set, (UWord)info, 
-                                 (UWord)&zero);
-   return res.isError ? -1 : res.res;
-}
-#elif defined(VGO_aix5) || (defined(VGO_freebsd) && __FreeBSD__ < 7)
-#if defined(VGO_freebsd)
-#define __NR__sigpending __NR_sigpending
-#define __NR__sigsuspend __NR_sigsuspend
-#endif
+#elif defined(VGO_aix5)
 /* The general idea is:
    - use sigpending to find out which signals are pending
    - choose one
@@ -332,10 +319,119 @@
 
   return i;
 }
-#if defined(VGO_freebsd)
-#undef __NR__sigpending
-#undef __NR__sigsuspend
+#elif defined(VGO_freebsd)
+
+/*
+ * This is a mess.  sigtimedwait() was added in FreeBSD-6.  However,
+ * there was no 32 bit syscall version until FreeBSD-7.  So on older
+ * platforms we have to check.
+ */
+#if __FreeBSD__ < 7
+static void sigtimedwait_zero_handler ( Int sig ) 
+{ 
+   vg_assert(sig != VKI_SIGILL);
+   vg_assert(sig != VKI_SIGSEGV);
+   vg_assert(sig != VKI_SIGBUS);
+   vg_assert(sig != VKI_SIGTRAP);
+   vg_assert(sig != VKI_SIGSYS);
+   /* do nothing */ 
+}
+#endif
+
+Int VG_(sigtimedwait_zero)( const vki_sigset_t *set, 
+                            vki_siginfo_t *info )
+{
+#if __FreeBSD__ < 7
+  Int    i, ir;
+  SysRes sr;
+  vki_sigset_t pending, blocked, allbutone;
+  struct vki_sigaction sa, saved_sa;
+  Int osreldate;
+#if defined(VGP_x86_freebsd)
+  Int is32on64;
+#endif
+#endif
+  Bool have_sigtimedwait_zero = True;
+  static const struct vki_timespec zero = { 0, 0 };
+
+#if __FreeBSD__ < 7
+  osreldate = VG_(getosreldate)();
+  if (osreldate < 600000)
+     have_sigtimedwait_zero = False;
+#if defined(VGP_x86_freebsd)
+  /* 32 bit emulation is busted, no sigtimedwait even though the kernel has it */
+  is32on64 = VG_(is32on64)();
+  if (is32on64 && osreldate < 700000)
+     have_sigtimedwait_zero = False;
+#endif
+#endif
+  if (have_sigtimedwait_zero) {
+     SysRes res = VG_(do_syscall3)(__NR_sigtimedwait, (UWord)set, (UWord)info, 
+                                   (UWord)&zero);
+     return res.isError ? -1 : res.res;
+  }
+
+#if __FreeBSD__ < 7
+  /* Find out what's pending: FreeBSD sigpending */
+  sr = VG_(do_syscall1)(__NR_sigpending, (UWord)&pending);
+  vg_assert(!sr.isError);
+
+  /* don't try for signals not in 'set' */
+  /* pending = pending `intersect` set */
+  for (i = 0; i < _VKI_NSIG_WORDS; i++)
+     pending.sig[i] &= set->sig[i];
+
+  /* don't try for signals not blocked at the moment */
+  ir = VG_(sigprocmask)(VKI_SIG_SETMASK, NULL, &blocked);
+  vg_assert(ir == 0);
+
+  /* pending = pending `intersect` blocked */
+  for (i = 0; i < _VKI_NSIG_WORDS; i++)
+     pending.sig[i] &= blocked.sig[i];
+
+  /* decide which signal we're going to snarf */
+  for (i = 1; i < _VKI_NSIG; i++)
+     if (VG_(sigismember)(&pending,i))
+        break;
+
+  if (i == _VKI_NSIG)
+     return 0;
+
+  /* fetch signal i.
+     pre: i is blocked and pending
+     pre: we are the only thread running 
+  */
+  /* Set up alternative signal handler */
+  VG_(sigfillset)(&allbutone);
+  VG_(sigdelset)(&allbutone, i);
+  sa.sa_mask     = allbutone;
+  sa.ksa_handler = &sigtimedwait_zero_handler;
+  sa.sa_flags    = 0;
+  ir = VG_(sigaction)(i, &sa, &saved_sa);
+  vg_assert(ir == 0);
+
+  /* Switch signal masks and wait for the signal.  This should happen
+     immediately, since we've already established it is pending and
+     blocked. */
+  sr = VG_(do_syscall1)(__NR_sigsuspend, (UWord)&allbutone);
+  vg_assert(sr.isError);
+  if (0)
+     VG_(debugLog)(0, "libcsignal",
+                      "sigtimedwait_zero: sigsuspend got res %ld err %ld\n", 
+                      sr.res, sr.err);
+  vg_assert(sr.res == (UWord)-1);
+
+  /* Restore signal's handler to whatever it was before */
+  ir = VG_(sigaction)(i, &saved_sa, NULL);
+  vg_assert(ir == 0);
+
+  /* This is bogus - we could get more info from the sighandler. */
+  VG_(memset)( info, 0, sizeof(*info) );
+  info->si_signo = i;
+
+  return i;
 #endif
+}
 
 #else
 #  error Unknown OS

==== //depot/projects/valgrind/coregrind/m_main.c#11 (text+ko) ====

@@ -324,25 +324,6 @@
    /* log to stderr by default, but usage message goes to stdout */
    tmp_log_fd = 2; 
 
-#if defined(VGO_freebsd) && 0
-   {
-      Int modid;
-
-      modid = VG_(modfind)("getpath_fromfd");
-      if (modid < 0) {
-	 struct vki_timespec ts = { 2, 0 };
-	 VG_(message)(Vg_UserMsg, "");
-	 VG_(message)(Vg_UserMsg, "*** WARNING! Functionality SEVERELY LIMITED without getpath_kern module!! ***");
-#if defined(for_yahoo)
-	 VG_(message)(Vg_UserMsg, "Please yinst install getpath_kern");
-#else
-	 VG_(message)(Vg_UserMsg, "There is a copy in valgrind/getpath/*");
-#endif
-	 VG_(message)(Vg_UserMsg, "");
-	 VG_(do_syscall2)(__NR_nanosleep, (UWord)&ts, (UWord)NULL);
-      }
-   }
-#endif
    /* Check for sane path in ./configure --prefix=... */
    if (VG_LIBDIR[0] != '/') 
       VG_(err_config_error)("Please use absolute paths