From owner-p4-projects@FreeBSD.ORG Sun Dec 9 01:25:08 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 88F8C16A41B; Sun, 9 Dec 2007 01:25:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3F57D16A419 for ; Sun, 9 Dec 2007 01:25:08 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2D82F13C458 for ; Sun, 9 Dec 2007 01:25:08 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB91P8eW055800 for ; Sun, 9 Dec 2007 01:25:08 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB91P3xl055796 for perforce@freebsd.org; Sun, 9 Dec 2007 01:25:03 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 9 Dec 2007 01:25:03 GMT Message-Id: <200712090125.lB91P3xl055796@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 130521 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Dec 2007 01:25:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=130521 Change 130521 by kmacy@kmacy_home:ethng on 2007/12/09 01:24:23 IFC #130518 Affected files ... .. //depot/projects/ethng/src/ObsoleteFiles.inc#10 integrate .. //depot/projects/ethng/src/bin/ed/Makefile#2 integrate .. //depot/projects/ethng/src/contrib/amd/amd/amd.8#3 integrate .. //depot/projects/ethng/src/contrib/amd/amq/amq.8#3 integrate .. //depot/projects/ethng/src/contrib/amd/amq/pawd.1#3 integrate .. //depot/projects/ethng/src/contrib/amd/fixmount/fixmount.8#3 integrate .. //depot/projects/ethng/src/contrib/amd/fsinfo/fsinfo.8#3 integrate .. //depot/projects/ethng/src/contrib/amd/hlfsd/hlfsd.8#3 integrate .. //depot/projects/ethng/src/contrib/amd/mk-amd-map/mk-amd-map.8#3 integrate .. //depot/projects/ethng/src/contrib/amd/scripts/amd.conf.5#3 integrate .. //depot/projects/ethng/src/contrib/amd/wire-test/wire-test.8#3 integrate .. //depot/projects/ethng/src/etc/rc.d/DAEMON#2 integrate .. //depot/projects/ethng/src/etc/rc.d/LOGIN#2 integrate .. //depot/projects/ethng/src/etc/rc.d/Makefile#8 integrate .. //depot/projects/ethng/src/etc/rc.d/NETWORKING#2 integrate .. //depot/projects/ethng/src/etc/rc.d/SERVERS#2 integrate .. //depot/projects/ethng/src/etc/rc.d/accounting#2 integrate .. //depot/projects/ethng/src/etc/rc.d/amd#4 integrate .. //depot/projects/ethng/src/etc/rc.d/apmd#2 integrate .. //depot/projects/ethng/src/etc/rc.d/bootconf.sh#2 delete .. //depot/projects/ethng/src/etc/rc.d/bootparams#2 integrate .. //depot/projects/ethng/src/etc/rc.d/ccd#2 integrate .. //depot/projects/ethng/src/etc/rc.d/cron#2 integrate .. //depot/projects/ethng/src/etc/rc.d/dhclient#2 integrate .. //depot/projects/ethng/src/etc/rc.d/dmesg#2 integrate .. //depot/projects/ethng/src/etc/rc.d/fsck#2 integrate .. //depot/projects/ethng/src/etc/rc.d/ftp-proxy#2 integrate .. //depot/projects/ethng/src/etc/rc.d/inetd#2 integrate .. //depot/projects/ethng/src/etc/rc.d/ipfilter#2 integrate .. //depot/projects/ethng/src/etc/rc.d/ipfs#2 integrate .. //depot/projects/ethng/src/etc/rc.d/ipmon#2 integrate .. //depot/projects/ethng/src/etc/rc.d/ipnat#2 integrate .. //depot/projects/ethng/src/etc/rc.d/ipsec#2 integrate .. //depot/projects/ethng/src/etc/rc.d/isdnd#2 integrate .. //depot/projects/ethng/src/etc/rc.d/keyserv#2 integrate .. //depot/projects/ethng/src/etc/rc.d/ldconfig#2 integrate .. //depot/projects/ethng/src/etc/rc.d/local#2 integrate .. //depot/projects/ethng/src/etc/rc.d/lockd#4 integrate .. //depot/projects/ethng/src/etc/rc.d/lpd#2 integrate .. //depot/projects/ethng/src/etc/rc.d/motd#2 integrate .. //depot/projects/ethng/src/etc/rc.d/mountcritlocal#2 integrate .. //depot/projects/ethng/src/etc/rc.d/mountcritremote#2 integrate .. //depot/projects/ethng/src/etc/rc.d/mountd#2 integrate .. //depot/projects/ethng/src/etc/rc.d/moused#2 integrate .. //depot/projects/ethng/src/etc/rc.d/mrouted#2 integrate .. //depot/projects/ethng/src/etc/rc.d/newsyslog#2 integrate .. //depot/projects/ethng/src/etc/rc.d/nfsd#2 integrate .. //depot/projects/ethng/src/etc/rc.d/power_profile#2 integrate .. //depot/projects/ethng/src/etc/rc.d/pwcheck#2 integrate .. //depot/projects/ethng/src/etc/rc.d/quota#2 integrate .. //depot/projects/ethng/src/etc/rc.d/rarpd#2 integrate .. //depot/projects/ethng/src/etc/rc.d/resolv#2 integrate .. //depot/projects/ethng/src/etc/rc.d/root#2 integrate .. //depot/projects/ethng/src/etc/rc.d/route6d#2 integrate .. //depot/projects/ethng/src/etc/rc.d/routed#2 integrate .. //depot/projects/ethng/src/etc/rc.d/rpcbind#2 integrate .. //depot/projects/ethng/src/etc/rc.d/rtadvd#2 integrate .. //depot/projects/ethng/src/etc/rc.d/rwho#2 integrate .. //depot/projects/ethng/src/etc/rc.d/savecore#2 integrate .. //depot/projects/ethng/src/etc/rc.d/securelevel#2 integrate .. //depot/projects/ethng/src/etc/rc.d/sendmail#2 integrate .. //depot/projects/ethng/src/etc/rc.d/sshd#2 integrate .. //depot/projects/ethng/src/etc/rc.d/statd#3 integrate .. //depot/projects/ethng/src/etc/rc.d/swap1#2 integrate .. //depot/projects/ethng/src/etc/rc.d/sysctl#2 integrate .. //depot/projects/ethng/src/etc/rc.d/syslogd#2 integrate .. //depot/projects/ethng/src/etc/rc.d/timed#2 integrate .. //depot/projects/ethng/src/etc/rc.d/tmp#2 integrate .. //depot/projects/ethng/src/etc/rc.d/ugidfw#2 integrate .. //depot/projects/ethng/src/etc/rc.d/var#2 integrate .. //depot/projects/ethng/src/etc/rc.d/virecover#2 integrate .. //depot/projects/ethng/src/etc/rc.d/ypbind#2 integrate .. //depot/projects/ethng/src/etc/rc.d/yppasswdd#2 integrate .. //depot/projects/ethng/src/etc/rc.d/ypserv#2 integrate .. //depot/projects/ethng/src/games/fortune/datfiles/Makefile#2 integrate .. //depot/projects/ethng/src/games/fortune/datfiles/fortunes#4 integrate .. //depot/projects/ethng/src/games/fortune/datfiles/fortunes-o.real#3 integrate .. //depot/projects/ethng/src/games/fortune/datfiles/fortunes-o.sp.ok#2 integrate .. //depot/projects/ethng/src/games/fortune/datfiles/fortunes.sp.ok#2 integrate .. //depot/projects/ethng/src/games/fortune/datfiles/fortunes2-o#2 delete .. //depot/projects/ethng/src/games/fortune/datfiles/freebsd-tips#2 integrate .. //depot/projects/ethng/src/games/fortune/datfiles/freebsd-tips.sp.ok#1 branch .. //depot/projects/ethng/src/games/fortune/datfiles/limerick#3 integrate .. //depot/projects/ethng/src/games/fortune/datfiles/limerick.sp.ok#1 branch .. //depot/projects/ethng/src/games/fortune/datfiles/murphy#2 integrate .. //depot/projects/ethng/src/games/fortune/datfiles/murphy-o#2 integrate .. //depot/projects/ethng/src/games/fortune/datfiles/murphy.sp.ok#1 branch .. //depot/projects/ethng/src/games/fortune/datfiles/startrek#2 integrate .. //depot/projects/ethng/src/games/fortune/datfiles/zippy#2 integrate .. //depot/projects/ethng/src/games/fortune/datfiles/zippy.sp.ok#2 integrate .. //depot/projects/ethng/src/lib/libc/sys/access.2#2 integrate .. //depot/projects/ethng/src/lib/libkse/thread/thr_kern.c#4 integrate .. //depot/projects/ethng/src/lib/libpmc/libpmc.c#4 integrate .. //depot/projects/ethng/src/release/fixit.profile#2 integrate .. //depot/projects/ethng/src/sbin/bsdlabel/bsdlabel.8#2 integrate .. //depot/projects/ethng/src/sbin/newfs_msdos/newfs_msdos.8#2 integrate .. //depot/projects/ethng/src/share/examples/cvsup/refuse#2 integrate .. //depot/projects/ethng/src/share/examples/cvsup/refuse.README#2 integrate .. //depot/projects/ethng/src/share/man/man4/aac.4#4 integrate .. //depot/projects/ethng/src/share/man/man4/hwpmc.4#4 integrate .. //depot/projects/ethng/src/share/man/man4/nve.4#2 integrate .. //depot/projects/ethng/src/share/man/man5/hosts.equiv.5#2 integrate .. //depot/projects/ethng/src/share/mk/bsd.subdir.mk#2 integrate .. //depot/projects/ethng/src/sys/amd64/amd64/exception.S#3 integrate .. //depot/projects/ethng/src/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/ethng/src/sys/amd64/amd64/pmap.c#7 integrate .. //depot/projects/ethng/src/sys/amd64/amd64/trap.c#4 integrate .. //depot/projects/ethng/src/sys/amd64/include/pmc_mdep.h#3 integrate .. //depot/projects/ethng/src/sys/amd64/include/specialreg.h#3 integrate .. //depot/projects/ethng/src/sys/arm/arm/pmap.c#7 integrate .. //depot/projects/ethng/src/sys/arm/include/pmc_mdep.h#2 integrate .. //depot/projects/ethng/src/sys/compat/freebsd32/freebsd32.h#2 integrate .. //depot/projects/ethng/src/sys/compat/freebsd32/freebsd32_ipc.h#1 branch .. //depot/projects/ethng/src/sys/compat/freebsd32/freebsd32_misc.c#4 integrate .. //depot/projects/ethng/src/sys/compat/freebsd32/freebsd32_proto.h#3 integrate .. //depot/projects/ethng/src/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate .. //depot/projects/ethng/src/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate .. //depot/projects/ethng/src/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/ethng/src/sys/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/ethng/src/sys/conf/Makefile.amd64#2 integrate .. //depot/projects/ethng/src/sys/conf/NOTES#7 integrate .. //depot/projects/ethng/src/sys/conf/files#12 integrate .. //depot/projects/ethng/src/sys/conf/options#7 integrate .. //depot/projects/ethng/src/sys/dev/aac/aac.c#5 integrate .. //depot/projects/ethng/src/sys/dev/aac/aac_cam.c#3 integrate .. //depot/projects/ethng/src/sys/dev/aac/aac_pci.c#4 integrate .. //depot/projects/ethng/src/sys/dev/aac/aacreg.h#2 integrate .. //depot/projects/ethng/src/sys/dev/aac/aacvar.h#2 integrate .. //depot/projects/ethng/src/sys/dev/arcmsr/arcmsr.c#2 integrate .. //depot/projects/ethng/src/sys/dev/arcmsr/arcmsr.h#2 integrate .. //depot/projects/ethng/src/sys/dev/ata/ata-chipset.c#8 integrate .. //depot/projects/ethng/src/sys/dev/cxgb/t3cdev.h#3 edit .. //depot/projects/ethng/src/sys/dev/hwpmc/hwpmc_amd.c#2 integrate .. //depot/projects/ethng/src/sys/dev/hwpmc/hwpmc_arm.c#2 integrate .. //depot/projects/ethng/src/sys/dev/hwpmc/hwpmc_ia64.c#2 integrate .. //depot/projects/ethng/src/sys/dev/hwpmc/hwpmc_logging.c#3 integrate .. //depot/projects/ethng/src/sys/dev/hwpmc/hwpmc_mod.c#2 integrate .. //depot/projects/ethng/src/sys/dev/hwpmc/hwpmc_piv.c#2 integrate .. //depot/projects/ethng/src/sys/dev/hwpmc/hwpmc_powerpc.c#2 integrate .. //depot/projects/ethng/src/sys/dev/hwpmc/hwpmc_ppro.c#2 integrate .. //depot/projects/ethng/src/sys/dev/hwpmc/hwpmc_sparc64.c#2 integrate .. //depot/projects/ethng/src/sys/dev/hwpmc/hwpmc_x86.c#4 integrate .. //depot/projects/ethng/src/sys/dev/if_ndis/if_ndis.c#5 integrate .. //depot/projects/ethng/src/sys/dev/re/if_re.c#5 integrate .. //depot/projects/ethng/src/sys/fs/tmpfs/tmpfs_subr.c#4 integrate .. //depot/projects/ethng/src/sys/fs/tmpfs/tmpfs_vfsops.c#6 integrate .. //depot/projects/ethng/src/sys/geom/geom_bsd.c#2 integrate .. //depot/projects/ethng/src/sys/geom/part/g_part.c#4 integrate .. //depot/projects/ethng/src/sys/geom/part/g_part.h#4 integrate .. //depot/projects/ethng/src/sys/geom/part/g_part_bsd.c#1 branch .. //depot/projects/ethng/src/sys/i386/bios/apm.c#4 integrate .. //depot/projects/ethng/src/sys/i386/i386/exception.s#2 integrate .. //depot/projects/ethng/src/sys/i386/i386/trap.c#4 integrate .. //depot/projects/ethng/src/sys/i386/include/pmc_mdep.h#2 integrate .. //depot/projects/ethng/src/sys/ia64/conf/DEFAULTS#2 integrate .. //depot/projects/ethng/src/sys/ia64/include/pmc_mdep.h#2 integrate .. //depot/projects/ethng/src/sys/kern/kern_module.c#2 integrate .. //depot/projects/ethng/src/sys/kern/kern_pmc.c#2 integrate .. //depot/projects/ethng/src/sys/kern/subr_trap.c#4 integrate .. //depot/projects/ethng/src/sys/net/if_var.h#8 integrate .. //depot/projects/ethng/src/sys/net/route.c#9 integrate .. //depot/projects/ethng/src/sys/net80211/ieee80211.c#4 integrate .. //depot/projects/ethng/src/sys/net80211/ieee80211_output.c#6 integrate .. //depot/projects/ethng/src/sys/netinet/in_pcb.h#4 integrate .. //depot/projects/ethng/src/sys/netinet/libalias/alias_util.c#3 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_output.c#12 integrate .. //depot/projects/ethng/src/sys/netinet/sctp_usrreq.c#11 integrate .. //depot/projects/ethng/src/sys/netinet/sctputil.c#13 integrate .. //depot/projects/ethng/src/sys/netinet/tcp_syncache.c#7 integrate .. //depot/projects/ethng/src/sys/netinet/tcp_var.h#4 integrate .. //depot/projects/ethng/src/sys/netinet6/in6.c#2 integrate .. //depot/projects/ethng/src/sys/pci/if_rlreg.h#3 integrate .. //depot/projects/ethng/src/sys/powerpc/include/pmc_mdep.h#2 integrate .. //depot/projects/ethng/src/sys/sparc64/include/pmc_mdep.h#2 integrate .. //depot/projects/ethng/src/sys/sun4v/include/pmc_mdep.h#2 integrate .. //depot/projects/ethng/src/sys/sys/disklabel.h#2 integrate .. //depot/projects/ethng/src/sys/sys/param.h#11 integrate .. //depot/projects/ethng/src/sys/sys/pmc.h#3 integrate .. //depot/projects/ethng/src/sys/sys/pmckern.h#2 integrate .. //depot/projects/ethng/src/sys/sys/pmclog.h#3 integrate .. //depot/projects/ethng/src/sys/sys/ucred.h#2 integrate .. //depot/projects/ethng/src/usr.bin/kdump/kdump.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/mtree/verify.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/pmcstat/Makefile#3 integrate .. //depot/projects/ethng/src/usr.sbin/pmcstat/pmcstat.8#2 integrate .. //depot/projects/ethng/src/usr.sbin/pmcstat/pmcstat.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/pmcstat/pmcstat.h#2 integrate .. //depot/projects/ethng/src/usr.sbin/pmcstat/pmcstat_log.c#3 integrate .. //depot/projects/ethng/src/usr.sbin/timed/timed/timed.8#2 integrate Differences ... ==== //depot/projects/ethng/src/ObsoleteFiles.inc#10 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.123 2007/11/29 21:49:08 brooks Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.124 2007/12/07 22:56:10 dougb Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,9 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20071207: Merged with fortunes-o.real +OLD_FILES+=usr/share/games/fortune/fortunes2-o +OLD_FILES+=usr/share/games/fortune/fortunes2-o.dat # 20071129: Disabled static versions of libkse by default .if ${DEFAULT_THREAD_LIB} != "libkse" && ${MK_LIBTHR} != "no" OLD_FILES+=usr/lib/libkse.a ==== //depot/projects/ethng/src/bin/ed/Makefile#2 (text+ko) ==== @@ -1,16 +1,16 @@ -# $FreeBSD: src/bin/ed/Makefile,v 1.33 2007/07/02 14:00:25 kensmith Exp $ +# $FreeBSD: src/bin/ed/Makefile,v 1.34 2007/12/09 00:14:27 marius Exp $ .include PROG= ed SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c +WARNS?= 2 LINKS= ${BINDIR}/ed ${BINDIR}/red MLINKS= ed.1 red.1 .if !defined(RELEASE_CRUNCH) .if ${MK_OPENSSL} != "no" CFLAGS+=-DDES -WARNS?= 2 DPADD= ${LIBCRYPTO} LDADD= -lcrypto .endif ==== //depot/projects/ethng/src/contrib/amd/amd/amd.8#3 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997-2004 Erez Zadok +.\" Copyright (c) 1997-2006 Erez Zadok .\" Copyright (c) 1989 Jan-Simon Pendry .\" Copyright (c) 1989 Imperial College of Science, Technology & Medicine .\" Copyright (c) 1989 The Regents of the University of California. @@ -39,7 +39,7 @@ .\" %W% (Berkeley) %G% .\" .\" $Id: amd.8,v 1.14.2.1 2006/01/02 18:48:23 ezk Exp $ -.\" $FreeBSD: src/contrib/amd/amd/amd.8,v 1.23 2007/12/05 15:59:33 obrien Exp $ +.\" $FreeBSD: src/contrib/amd/amd/amd.8,v 1.24 2007/12/07 20:16:19 ru Exp $ .\" .Dd January 2, 2006 .Dt AMD 8 @@ -48,30 +48,24 @@ .Nm amd .Nd automatically mount file systems .Sh SYNOPSIS -.Nm amd +.Nm .Fl H -.Nm amd +.Nm .Op Fl F Ar conf_file -.Nm amd +.Nm .Op Fl nprvHS .Op Fl a Ar mount_point .Op Fl c Ar duration .Op Fl d Ar domain -.Bk -words .Op Fl k Ar kernel-arch -.Ek .Op Fl l Ar logfile .Op Fl o Ar op_sys_ver .Op Fl t Ar timeout.retransmit -.Bk -words .Op Fl w Ar interval -.Ek .Op Fl x Ar log-option .Op Fl y Ar YP-domain .Op Fl A Ar arch -.Bk -words .Op Fl C Ar cluster-name -.Ek .Op Fl D Ar option .Op Fl F Ar conf_file .Op Fl O Ar op_sys_name @@ -82,41 +76,46 @@ .Oc .Ar ... .Sh DESCRIPTION -.Nm Amd -is a daemon that automatically mounts file systems whenever a file or directory +The +.Nm +utility +is a daemon that automatically mounts file systems +whenever a file or directory within that file system is accessed. -File systems are automatically unmounted -when they appear to be quiescent. +File systems are automatically unmounted when they +appear to be quiescent. .Pp -.Nm Amd +The +.Nm +utility operates by attaching itself as an .Tn NFS server to each of the specified .Ar directories . Lookups within the specified directories are handled by -.Nm amd , +.Nm , which uses the map defined by .Ar mapname to determine how to resolve the lookup. -Generally, this will be a host name, -some file system information and some mount options for the given file system. +Generally, this will be a host name, some file system information +and some mount options for the given file system. .Pp In the first form depicted above, -.Nm amd +.Nm will print a short help string. In the second form, if no options are specified, or if the .Fl F is used, -.Nm amd +.Nm will read configuration parameters from the file .Ar conf_file which defaults to .Pa /etc/amd.conf . The last form is described below. .Sh OPTIONS -.Bl -tag -width Ds +.Bl -tag -width indent .It Fl a Ar temporary-directory Specify an alternative location for the real mount points. The default is @@ -140,55 +139,63 @@ If .Ar logfile is the string -.Em syslog , -the log messages will be sent to the system log daemon by +.Dq Li syslog , +then the log messages will be sent to the system log daemon by .Xr syslog 3 . -The default syslog facility used is LOG_DAEMON. -If you wish to change it, append its name to the log file name, -delimited by a single colon. +The default syslog facility used is +.Dv LOG_DAEMON . +If you +wish to change it, append its name to the log file name, delimited by a +single colon. For example, if .Ar logfile is the string .Dq Li syslog:local7 then -.Nm amd +.Nm will log messages via .Xr syslog 3 -using the LOG_LOCAL7 facility (if it exists on the system). +using the +.Dv LOG_LOCAL7 +facility (if it exists on the system). .It Fl n Normalize hostnames. The name referred to by ${rhost} is normalized relative to the host database before being used. The effect is to translate -aliases into ``official'' names. +aliases into +.Dq official +names. .It Fl o Ar op_sys_ver Override the compiled-in version number of the operating system. -Useful when the built in version is not desired for backward -compatibility reasons. +Useful +when the built in version is not desired for backward compatibility reasons. For example, if the build in version is -.Dq 2.5.1 , +.Dq Li 2.5.1 , you can override it to -.Dq 5.5.1 , +.Dq Li 5.5.1 , and use older maps that were written with the latter in mind. .It Fl p -Print -.Em PID . -Outputs the process-id of -.Nm amd +Print PID. +Outputs the process ID of +.Nm to standard output where it can be saved into a file. .It Fl r Restart existing mounts. -.Nm Amd +The +.Nm +utility will scan the mount file table to determine which file systems are currently mounted. Whenever one of these would have been auto-mounted, -.Nm amd +.Nm .Em inherits it. .It Fl t Ar timeout.retransmit -Specify the NFS timeout -.Ar interval , +Specify the NFS +.Ar timeout +interval, in tenths of a second, between .Tn NFS/RPC retries (for UDP only). @@ -201,7 +208,10 @@ Useful defaults are supplied if either or both values are missing. .Pp -Amd relies on the kernel RPC retransmit mechanism to trigger mount retries. +The +.Xr amd 8 +utility +relies on the kernel RPC retransmit mechanism to trigger mount retries. The values of these parameters change the overall retry interval. Too long an interval gives poor interactive response; too short an interval causes @@ -212,13 +222,14 @@ .It Fl w Ar interval Specify an .Ar interval , -in seconds, between attempts to dismount file systems that have exceeded their -cached times. +in seconds, between attempts to dismount +file systems that have exceeded their cached times. The default is 2 minutes. .It Fl x Ar options Specify run-time logging options. -The options are a comma separated list -chosen from: fatal, error, user, warn, info, map, stats, all. +The options are a comma separated +list chosen from: +.Li fatal , error , user , warn , info , map , stats , all . .It Fl y Ar domain Specify an alternative .Tn NIS @@ -231,8 +242,7 @@ support is not available. .It Fl A Ar arch Specifies the OS architecture. -This is used solely to set the -.Em ${arch} +This is used solely to set the ${arch} selector. .It Fl C Ar cluster-name Specify an alternative HP-UX cluster name to use. @@ -240,11 +250,11 @@ Select from a variety of debug options. Prefixing an option with the string -.Em no +.Dq Li no reverses the effect of that option. Options are cumulative. The most useful option is -.Ar all . +.Dq Li all . .Pp Since .Fl D @@ -255,7 +265,7 @@ and a fuller description is available in the program source. .It Fl F Ar conf_file Specify an -.Nm amd +.Nm configuration file to use. See .Xr amd.conf 5 @@ -263,59 +273,63 @@ This configuration file is used to specify any options in lieu of typing many of them on the command line. The -.Nm amd.conf -file includes directives for every command line option amd has, -and many more that are only available via the configuration file -facility. -The configuration file specified by this option is -processed after all other options have been processed, regardless -of the actual location of this option on the command line. +.Xr amd.conf 5 +file includes directives for every command line option amd has, and many +more that are only available via the configuration file facility. +The +configuration file specified by this option is processed after all other +options had been processed, regardless of the actual location of this option +on the command line. .It Fl H Print help and usage string. .It Fl O Ar op_sys_name Override the compiled-in name of the operating system. -Useful when the built in name is not desired for backward -compatibility reasons. -For example, if the build in name is -.Dq sunos5 , +Useful when the +built in name is not desired for backward compatibility reasons. +For +example, if the build in name is +.Dq Li sunos5 , you can override it to -.Dq sos5 +.Dq Li sos5 and use older maps which were written with the latter in mind. .It Fl S Do not lock the running executable pages of -.Nm amd +.Nm into memory. To improve -.Nm amd's +.Nm Ns 's performance, systems that support the .Xr plock 3 call, could lock the -.Nm amd +.Nm process into memory. -This way there is less chance the operating system will -schedule, page out, and swap the -.Nm amd -process as needed. +This way there is less chance +the operating system will schedule, page out, and swap the +.Nm +process as +needed. This tends to improve -.Nm amd's -performance, at the cost of reserving the memory used by the -.Nm amd -process -(making it unavailable for other processes). +.Nm Ns 's +performance, at the cost of reserving the +memory used by the +.Nm +process (making it unavailable for other processes). If this behavior is not desired, use the .Fl S option. .It Fl T Ar tag Specify a tag to use with .Xr amd.conf 5 . -All Map entries tagged with tag will be processed. +All map entries tagged with +.Ar tag +will be processed. Map entries that are not tagged are always processed. Map entries that are tagged with a tag other than .Ar tag will not be processed. .El .Sh FILES -.Bl -tag -width /axx +.Bl -tag -width ".Pa /etc/amd.conf" .It Pa /.amd_mnt directory under which file systems are dynamically mounted .It Pa /etc/amd.conf @@ -329,20 +343,17 @@ file system can be incredibly inefficient. In most implementations of .Tn NFS , -their interpolations are not cached by -the kernel and each time a symbolic link is -encountered during a +their interpolations are not cached +by the kernel and each time a symbolic link is encountered during a .Em lookuppn translation it costs an .Tn RPC call to the .Tn NFS server. -A large improvement in real-time +It would appear that a large improvement in real-time performance could be gained by adding a cache somewhere. -Replacing -.Xr symlink 2 -with a suitable incarnation of the auto-mounter +Replacing symlinks with a suitable incarnation of the auto-mounter results in a large real-time speedup, but also causes a large number of process context switches. .Pp @@ -357,25 +368,34 @@ .Xr amq 8 , .Xr mount 8 , .Xr umount 8 +.Pp +.Dq am-utils +.Xr info 1 +entry. .Rs -.%T Amd \- The 4.4 BSD Automounter +.%A Erez Zadok +.%B "Linux NFS and Automounter Administration" +.%O ISBN 0-7821-2739-8 +.%I Sybex +.%D 2001 .Re .Pp .Pa http://www.am-utils.org/ -.Pp -.%T Linux NFS and Automounter Administration -by Erez Zadok, ISBN 0-7821-2739-8, (Sybex, 2001). +.Rs +.%T Amd \- The 4.4 BSD Automounter +.Re .Sh HISTORY The -.Nm amd +.Nm utility first appeared in .Bx 4.4 . .Sh AUTHORS .An Jan-Simon Pendry Aq jsp@doc.ic.ac.uk , Department of Computing, Imperial College, London, UK. .Pp -.An Erez Zadok Aq ezk@am-utils.org , -Department of Computer Science, Stony Brook University New York, USA. +.An Erez Zadok Aq ezk@cs.sunysb.edu , +Computer Science Department, Stony Brook +University, Stony Brook, New York, USA. .Pp Other authors and contributors to am-utils are listed in the .Pa AUTHORS ==== //depot/projects/ethng/src/contrib/amd/amq/amq.8#3 (text+ko) ==== @@ -39,7 +39,7 @@ .\" %W% (Berkeley) %G% .\" .\" $Id: amq.8,v 1.15.2.1 2006/01/02 18:48:24 ezk Exp $ -.\" $FreeBSD: src/contrib/amd/amq/amq.8,v 1.14 2007/12/05 15:59:33 obrien Exp $ +.\" $FreeBSD: src/contrib/amd/amq/amq.8,v 1.16 2007/12/07 20:22:59 ru Exp $ .\" .Dd January 2, 2006 .Dt AMQ 8 @@ -48,87 +48,105 @@ .Nm amq .Nd automounter query tool .Sh SYNOPSIS -.Nm amq -.Op Fl fmpsuvTU +.Nm +.Op Fl fmpsvwHTU .Op Fl h Ar hostname .Op Fl l Ar log_file .Op Fl x Ar log_options .Op Fl D Ar debug_options -.Op Fl M Ar mountmap_entry .Op Fl P Ar program_number -.Op Ar directory -.Ar ... +.Op Oo Fl u Oc Ar directory ... .Sh DESCRIPTION -.Nm Amq +The +.Nm +utility provides a simple way of determining the current state of the .Xr amd 8 program. Communication is by .Tn RPC . Three modes of operation are supported by the current protocol. -By default a list of mount points and auto-mounted file systems -is output. -An alternative host can be specified using the +By default +a list of mount points and auto-mounted file systems is output. +An +alternative host can be specified using the .Fl h option. .Pp -If directory names are given, as output by default, -then per file system information is displayed. +If +.Ar directory +names are given, as output by default, then per file system +information is displayed. .Sh OPTIONS -.Bl -tag -width Ds +.Bl -tag -width indent .It Fl f -Request automounter to flush the internal caches. +Ask the automounter to flush the internal caches and reload all the maps. .It Fl h Ar hostname -Query alternate host -.Ar hostname . +Specify an alternate host to query. By default the local host is used. -In an +In +an .Tn HP-UX -cluster, the root server is queried by default, since -that is the system on which the automounter is normally run. +cluster, the root server is queried by default, since that is the system on +which the automounter is normally run. .It Fl l Ar log_file -Tell amd to use +Tell +.Xr amd 8 +to use .Ar log_file as the log file name. -For security reasons, this must be the same log file which -.Nm amd +For security reasons, this must be the same log file +which +.Xr amd 8 used when started. This option is therefore only useful to refresh -.Nm amd Ns \'s -open file handle on the log file, so that it can be rotated and compressed via -daily cron jobs. +.Nm amd Ns 's +open file handle on the log file, so that it can be rotated +and compressed via daily cron jobs. .It Fl m -Request the automounter to provide a list of mounted file systems, -including the number of references to each file system and any error -which occurred while mounting. +Ask the automounter to provide a list of mounted file systems, including the +number of references to each file system and any error which occurred while +mounting. .It Fl p Return the process ID of the remote or locally running -.Nm amd . -Useful when you need to send a signal to the local -.Nm amd -process, and would rather not have to search through the process table. -This -option is used in the +.Xr amd 8 . +Useful when you +need to send a signal to the local +.Xr amd 8 +process, and would rather not have to +search through the process table. +This option is used in the .Pa ctl-amd script. .It Fl s -Request the automounter to provide system-wide mount statistics. +Ask the automounter to provide system-wide mount statistics. .It Fl u -Request the automounter to unmount the named file systems -instead of providing information about them. -Unmounts are requested, -not forced. -They merely cause the mounted file system to timeout, -which will be picked up by -.Nm amd Ns \'s +Ask the automounter to unmount the file systems named in +.Ar directory +instead of providing +information about them. +Unmounts are requested, not forced. +They merely +cause the mounted file system to timeout, which will be picked up by +.Nm amd Ns 's main scheduler thus causing the normal timeout action to be taken. .It Fl v -Request the automounter to provide version information. -This is a subset -of the information provided by -.Nm amd Ns \'s Fl v +Ask the automounter for its version information. +This is a subset of the +information output by +.Xr amd 8 Ns 's +.Fl v option. +.It Fl w +Translate a full pathname as returned by +.Xr getcwd 3 +into a short +.Xr amd 8 +pathname that goes through its mount points. +This option requires that +.Xr amd 8 +is running. .It Fl x Ar log_options Ask the automounter to use the logging options specified in .Ar log_options @@ -137,109 +155,113 @@ Ask the automounter to use the debugging options specified in .Ar debug_options from now on. -.It Fl M -Pass a mount map entry to -.Nm amd -and wait for it to be evaluated, possibly causing a mount. -This option is highly insecure. -By default, -.Nm amd -and -.Nm amq -do not support it. -It is necessary to configure -.Nm am-utils -with -.Ar --enable-amq-mount -to enable this option. +.It Fl H +Display short usage message. .It Fl P Ar program_number Contact an alternate running -.Nm amd -that had registered itself on a different RPC +.Xr amd 8 +that had registered itself on a different +.Tn RPC .Ar program_number and apply all other operations to that instance of the automounter. -This is useful when running multiple copies of -.Nm amd , -and need to manage each one separately. +This is +useful when you run multiple copies of +.Xr amd 8 , +and need to manage each +one separately. If not specified, -.Nm amq +.Nm will use the default program number for -.Nm amd , +.Xr amd 8 , 300019. For security reasons, the only alternate program numbers -.Nm amd +.Xr amd 8 can use range from 300019 to 300029, inclusive. .It Fl T Contact -.Nm amd +.Xr amd 8 using the TCP transport only. Normally -.Nm amq -will try TCP, and if that fails, will try UDP. +.Nm +will try TCP, and if that failed, will try UDP. .It Fl U Contact -.Nm amd +.Xr amd 8 using UDP (connectionless) transport only. Normally -.Nm amq -will try TCP, and if that fails, will try UDP. +.Nm +will try TCP, and if that failed, will try UDP. .El .Sh FILES -.Bl -tag -width amq.x -compact +.Bl -tag -width ".Pa amq.x" -compact .It Pa amq.x .Tn RPC protocol description. .El .Sh CAVEATS -.Nm Amq +The +.Nm +utility uses a Sun registered .Tn RPC program number (300019 decimal) which may not be in the -.Pa /etc/rpc +.Xr rpc 5 database. .Pp If the TCP wrappers library is available, and the -.It use_tcpwrappers +.Va use_tcpwrappers global -.It amd.conf +.Xr amd.conf 5 option is set to -.Qq yes , +.Dq Li yes , then -.Nm Amd +.Xr amd 8 will verify that the host running -.Nm Aamq +.Nm is authorized to connect. The -.Nm Amd -service name must used in the +.Dq Li amd +service name must be used in the .Pa /etc/hosts.allow and .Pa /etc/hosts.deny files. For example, to allow only localhost to connect to -.Nm Amd , +.Xr amd 8 , add this line to .Pa /etc/hosts.allow : -.Bd -literal -.nf - amd: localhost -.fi -.Ed +.Pp +.Dl "amd: localhost" .Pp and this line to .Pa /etc/hosts.deny : -.Bd -literal -.nf - amd: ALL -.fi -.Ed +.Pp +.Dl "amd: ALL" .Sh SEE ALSO .Xr amd.conf 5 , .Xr hosts_access 5 , .Xr amd 8 +.Pp +.Dq am-utils +.Xr info 1 +entry. +.Rs +.%A Erez Zadok +.%B "Linux NFS and Automounter Administration" +.%O ISBN 0-7821-2739-8 +.%I Sybex +.%D 2001 +.Re +.Pp +.Pa http://www.am-utils.org/ +.Rs +.%T Amd \- The 4.4 BSD Automounter +.Re .Sh HISTORY -.Nm Amq +The +.Nm +utility first appeared in .Bx 4.4 . .Sh AUTHORS @@ -247,8 +269,10 @@ Department of Computing, Imperial College, London, UK. .Pp .An Erez Zadok Aq ezk@cs.sunysb.edu , +Computer Science Department, Stony Brook +University, Stony Brook, New York, USA. .Pp -.An Other authors and contributors to +Other authors and contributors to .Nm am-utils are listed in the .Pa AUTHORS ==== //depot/projects/ethng/src/contrib/amd/amq/pawd.1#3 (text+ko) ==== @@ -39,7 +39,7 @@ .\" %W% (Berkeley) %G% >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Dec 9 01:30:14 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B11516A420; Sun, 9 Dec 2007 01:30:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A71C316A418 for ; Sun, 9 Dec 2007 01:30:13 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 977CE13C455 for ; Sun, 9 Dec 2007 01:30:13 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB91UDE9056060 for ; Sun, 9 Dec 2007 01:30:13 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB91UDr1056055 for perforce@freebsd.org; Sun, 9 Dec 2007 01:30:13 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 9 Dec 2007 01:30:13 GMT Message-Id: <200712090130.lB91UDr1056055@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 130522 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Dec 2007 01:30:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=130522 Change 130522 by kmacy@kmacy_home:ethng on 2007/12/09 01:29:35 fix contiguous pkthdr check - still need to make this more robust before pulling in to CVS Affected files ... .. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_sge.c#36 edit Differences ... ==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_sge.c#36 (text+ko) ==== @@ -1362,7 +1362,7 @@ return (0); } else if (tso_info) { - int eth_type; + int undersized, eth_type; struct cpl_tx_pkt_lso *hdr = (struct cpl_tx_pkt_lso *)txd; struct ip *ip; struct tcphdr *tcp; @@ -1381,7 +1381,11 @@ hdr->len = htonl(mlen | 0x80000000); DPRINTF("tso buf len=%d\n", mlen); - if (__predict_false(tmpmi->mi_len < TCPPKTHDRSIZE)) { + undersized = (((tmpmi->mi_len < TCPPKTHDRSIZE) && + (m0->m_flags & M_VLANTAG)) || + (tmpmi->mi_len < TCPPKTHDRSIZE - ETHER_VLAN_ENCAP_LEN)); + + if (__predict_false(undersized)) { pkthdr = tmp; dump_mi(mi); panic("discontig packet - fixxorz"); From owner-p4-projects@FreeBSD.ORG Sun Dec 9 01:41:31 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6CBD116A41B; Sun, 9 Dec 2007 01:41:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BDE5F16A418 for ; Sun, 9 Dec 2007 01:41:30 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AB83813C442 for ; Sun, 9 Dec 2007 01:41:30 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB91fUYs058016 for ; Sun, 9 Dec 2007 01:41:30 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB91fPhc057998 for perforce@freebsd.org; Sun, 9 Dec 2007 01:41:25 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 9 Dec 2007 01:41:25 GMT Message-Id: <200712090141.lB91fPhc057998@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 130523 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Dec 2007 01:41:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=130523 Change 130523 by kmacy@kmacy:storage:toestack on 2007/12/09 01:40:40 IFethng #130522 Affected files ... .. //depot/projects/toestack/ObsoleteFiles.inc#8 integrate .. //depot/projects/toestack/bin/ed/Makefile#2 integrate .. //depot/projects/toestack/contrib/amd/amd/amd.8#3 integrate .. //depot/projects/toestack/contrib/amd/amq/amq.8#3 integrate .. //depot/projects/toestack/contrib/amd/amq/pawd.1#3 integrate .. //depot/projects/toestack/contrib/amd/fixmount/fixmount.8#3 integrate .. //depot/projects/toestack/contrib/amd/fsinfo/fsinfo.8#3 integrate .. //depot/projects/toestack/contrib/amd/hlfsd/hlfsd.8#3 integrate .. //depot/projects/toestack/contrib/amd/mk-amd-map/mk-amd-map.8#3 integrate .. //depot/projects/toestack/contrib/amd/scripts/amd.conf.5#3 integrate .. //depot/projects/toestack/contrib/amd/wire-test/wire-test.8#3 integrate .. //depot/projects/toestack/etc/rc.d/DAEMON#2 integrate .. //depot/projects/toestack/etc/rc.d/LOGIN#2 integrate .. //depot/projects/toestack/etc/rc.d/Makefile#7 integrate .. //depot/projects/toestack/etc/rc.d/NETWORKING#2 integrate .. //depot/projects/toestack/etc/rc.d/SERVERS#2 integrate .. //depot/projects/toestack/etc/rc.d/accounting#2 integrate .. //depot/projects/toestack/etc/rc.d/amd#4 integrate .. //depot/projects/toestack/etc/rc.d/apmd#2 integrate .. //depot/projects/toestack/etc/rc.d/bootconf.sh#2 delete .. //depot/projects/toestack/etc/rc.d/bootparams#2 integrate .. //depot/projects/toestack/etc/rc.d/ccd#2 integrate .. //depot/projects/toestack/etc/rc.d/cron#2 integrate .. //depot/projects/toestack/etc/rc.d/dhclient#2 integrate .. //depot/projects/toestack/etc/rc.d/dmesg#2 integrate .. //depot/projects/toestack/etc/rc.d/fsck#2 integrate .. //depot/projects/toestack/etc/rc.d/ftp-proxy#2 integrate .. //depot/projects/toestack/etc/rc.d/inetd#2 integrate .. //depot/projects/toestack/etc/rc.d/ipfilter#2 integrate .. //depot/projects/toestack/etc/rc.d/ipfs#2 integrate .. //depot/projects/toestack/etc/rc.d/ipmon#2 integrate .. //depot/projects/toestack/etc/rc.d/ipnat#2 integrate .. //depot/projects/toestack/etc/rc.d/ipsec#2 integrate .. //depot/projects/toestack/etc/rc.d/isdnd#2 integrate .. //depot/projects/toestack/etc/rc.d/keyserv#2 integrate .. //depot/projects/toestack/etc/rc.d/ldconfig#2 integrate .. //depot/projects/toestack/etc/rc.d/local#2 integrate .. //depot/projects/toestack/etc/rc.d/lockd#2 integrate .. //depot/projects/toestack/etc/rc.d/lpd#2 integrate .. //depot/projects/toestack/etc/rc.d/motd#2 integrate .. //depot/projects/toestack/etc/rc.d/mountcritlocal#2 integrate .. //depot/projects/toestack/etc/rc.d/mountcritremote#2 integrate .. //depot/projects/toestack/etc/rc.d/mountd#2 integrate .. //depot/projects/toestack/etc/rc.d/moused#2 integrate .. //depot/projects/toestack/etc/rc.d/mrouted#2 integrate .. //depot/projects/toestack/etc/rc.d/newsyslog#2 integrate .. //depot/projects/toestack/etc/rc.d/nfsd#2 integrate .. //depot/projects/toestack/etc/rc.d/power_profile#2 integrate .. //depot/projects/toestack/etc/rc.d/pwcheck#2 integrate .. //depot/projects/toestack/etc/rc.d/quota#2 integrate .. //depot/projects/toestack/etc/rc.d/rarpd#2 integrate .. //depot/projects/toestack/etc/rc.d/resolv#2 integrate .. //depot/projects/toestack/etc/rc.d/root#2 integrate .. //depot/projects/toestack/etc/rc.d/route6d#2 integrate .. //depot/projects/toestack/etc/rc.d/routed#2 integrate .. //depot/projects/toestack/etc/rc.d/rpcbind#2 integrate .. //depot/projects/toestack/etc/rc.d/rtadvd#2 integrate .. //depot/projects/toestack/etc/rc.d/rwho#2 integrate .. //depot/projects/toestack/etc/rc.d/savecore#2 integrate .. //depot/projects/toestack/etc/rc.d/securelevel#2 integrate .. //depot/projects/toestack/etc/rc.d/sendmail#2 integrate .. //depot/projects/toestack/etc/rc.d/sshd#2 integrate .. //depot/projects/toestack/etc/rc.d/statd#2 integrate .. //depot/projects/toestack/etc/rc.d/swap1#2 integrate .. //depot/projects/toestack/etc/rc.d/sysctl#2 integrate .. //depot/projects/toestack/etc/rc.d/syslogd#2 integrate .. //depot/projects/toestack/etc/rc.d/timed#2 integrate .. //depot/projects/toestack/etc/rc.d/tmp#2 integrate .. //depot/projects/toestack/etc/rc.d/ugidfw#2 integrate .. //depot/projects/toestack/etc/rc.d/var#2 integrate .. //depot/projects/toestack/etc/rc.d/virecover#2 integrate .. //depot/projects/toestack/etc/rc.d/ypbind#2 integrate .. //depot/projects/toestack/etc/rc.d/yppasswdd#2 integrate .. //depot/projects/toestack/etc/rc.d/ypserv#2 integrate .. //depot/projects/toestack/games/fortune/datfiles/Makefile#2 integrate .. //depot/projects/toestack/games/fortune/datfiles/fortunes#4 integrate .. //depot/projects/toestack/games/fortune/datfiles/fortunes-o.real#3 integrate .. //depot/projects/toestack/games/fortune/datfiles/fortunes-o.sp.ok#2 integrate .. //depot/projects/toestack/games/fortune/datfiles/fortunes.sp.ok#2 integrate .. //depot/projects/toestack/games/fortune/datfiles/fortunes2-o#2 delete .. //depot/projects/toestack/games/fortune/datfiles/freebsd-tips#2 integrate .. //depot/projects/toestack/games/fortune/datfiles/freebsd-tips.sp.ok#1 branch .. //depot/projects/toestack/games/fortune/datfiles/limerick#3 integrate .. //depot/projects/toestack/games/fortune/datfiles/limerick.sp.ok#1 branch .. //depot/projects/toestack/games/fortune/datfiles/murphy#2 integrate .. //depot/projects/toestack/games/fortune/datfiles/murphy-o#2 integrate .. //depot/projects/toestack/games/fortune/datfiles/murphy.sp.ok#1 branch .. //depot/projects/toestack/games/fortune/datfiles/startrek#2 integrate .. //depot/projects/toestack/games/fortune/datfiles/zippy#2 integrate .. //depot/projects/toestack/games/fortune/datfiles/zippy.sp.ok#2 integrate .. //depot/projects/toestack/lib/libc/sys/access.2#2 integrate .. //depot/projects/toestack/lib/libkse/thread/thr_kern.c#3 integrate .. //depot/projects/toestack/lib/libpmc/libpmc.c#3 integrate .. //depot/projects/toestack/release/fixit.profile#2 integrate .. //depot/projects/toestack/sbin/bsdlabel/bsdlabel.8#2 integrate .. //depot/projects/toestack/sbin/newfs_msdos/newfs_msdos.8#2 integrate .. //depot/projects/toestack/share/examples/cvsup/refuse#2 integrate .. //depot/projects/toestack/share/examples/cvsup/refuse.README#2 integrate .. //depot/projects/toestack/share/man/man4/aac.4#3 integrate .. //depot/projects/toestack/share/man/man4/hwpmc.4#4 integrate .. //depot/projects/toestack/share/man/man4/nve.4#2 integrate .. //depot/projects/toestack/share/man/man5/hosts.equiv.5#2 integrate .. //depot/projects/toestack/share/mk/bsd.subdir.mk#2 integrate .. //depot/projects/toestack/sys/amd64/amd64/exception.S#3 integrate .. //depot/projects/toestack/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/toestack/sys/amd64/amd64/pmap.c#6 integrate .. //depot/projects/toestack/sys/amd64/amd64/trap.c#4 integrate .. //depot/projects/toestack/sys/amd64/include/pmc_mdep.h#2 integrate .. //depot/projects/toestack/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/toestack/sys/arm/arm/pmap.c#7 integrate .. //depot/projects/toestack/sys/arm/include/pmc_mdep.h#2 integrate .. //depot/projects/toestack/sys/compat/freebsd32/freebsd32.h#2 integrate .. //depot/projects/toestack/sys/compat/freebsd32/freebsd32_ipc.h#1 branch .. //depot/projects/toestack/sys/compat/freebsd32/freebsd32_misc.c#3 integrate .. //depot/projects/toestack/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/toestack/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/toestack/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/toestack/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/toestack/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/toestack/sys/conf/Makefile.amd64#2 integrate .. //depot/projects/toestack/sys/conf/NOTES#6 integrate .. //depot/projects/toestack/sys/conf/options#5 integrate .. //depot/projects/toestack/sys/dev/aac/aac.c#4 integrate .. //depot/projects/toestack/sys/dev/aac/aac_cam.c#3 integrate .. //depot/projects/toestack/sys/dev/aac/aac_pci.c#3 integrate .. //depot/projects/toestack/sys/dev/aac/aacreg.h#2 integrate .. //depot/projects/toestack/sys/dev/aac/aacvar.h#2 integrate .. //depot/projects/toestack/sys/dev/arcmsr/arcmsr.c#2 integrate .. //depot/projects/toestack/sys/dev/arcmsr/arcmsr.h#2 integrate .. //depot/projects/toestack/sys/dev/ata/ata-chipset.c#7 integrate .. //depot/projects/toestack/sys/dev/cxgb/cxgb_sge.c#15 edit .. //depot/projects/toestack/sys/dev/cxgb/t3cdev.h#4 integrate .. //depot/projects/toestack/sys/dev/hwpmc/hwpmc_amd.c#2 integrate .. //depot/projects/toestack/sys/dev/hwpmc/hwpmc_arm.c#2 integrate .. //depot/projects/toestack/sys/dev/hwpmc/hwpmc_ia64.c#2 integrate .. //depot/projects/toestack/sys/dev/hwpmc/hwpmc_logging.c#3 integrate .. //depot/projects/toestack/sys/dev/hwpmc/hwpmc_mod.c#2 integrate .. //depot/projects/toestack/sys/dev/hwpmc/hwpmc_piv.c#2 integrate .. //depot/projects/toestack/sys/dev/hwpmc/hwpmc_powerpc.c#2 integrate .. //depot/projects/toestack/sys/dev/hwpmc/hwpmc_ppro.c#2 integrate .. //depot/projects/toestack/sys/dev/hwpmc/hwpmc_sparc64.c#2 integrate .. //depot/projects/toestack/sys/dev/hwpmc/hwpmc_x86.c#3 integrate .. //depot/projects/toestack/sys/dev/if_ndis/if_ndis.c#5 integrate .. //depot/projects/toestack/sys/dev/re/if_re.c#4 integrate .. //depot/projects/toestack/sys/fs/tmpfs/tmpfs_subr.c#3 integrate .. //depot/projects/toestack/sys/fs/tmpfs/tmpfs_vfsops.c#5 integrate .. //depot/projects/toestack/sys/geom/geom_bsd.c#2 integrate .. //depot/projects/toestack/sys/geom/part/g_part.c#4 integrate .. //depot/projects/toestack/sys/geom/part/g_part.h#4 integrate .. //depot/projects/toestack/sys/geom/part/g_part_bsd.c#1 branch .. //depot/projects/toestack/sys/i386/bios/apm.c#4 integrate .. //depot/projects/toestack/sys/i386/i386/exception.s#2 integrate .. //depot/projects/toestack/sys/i386/i386/trap.c#4 integrate .. //depot/projects/toestack/sys/i386/include/pmc_mdep.h#2 integrate .. //depot/projects/toestack/sys/ia64/conf/DEFAULTS#2 integrate .. //depot/projects/toestack/sys/ia64/include/pmc_mdep.h#2 integrate .. //depot/projects/toestack/sys/kern/kern_module.c#2 integrate .. //depot/projects/toestack/sys/kern/kern_pmc.c#2 integrate .. //depot/projects/toestack/sys/kern/subr_trap.c#4 integrate .. //depot/projects/toestack/sys/net/if_var.h#5 edit .. //depot/projects/toestack/sys/net/route.c#8 integrate .. //depot/projects/toestack/sys/net80211/ieee80211.c#4 integrate .. //depot/projects/toestack/sys/net80211/ieee80211_output.c#5 integrate .. //depot/projects/toestack/sys/netinet/in_pcb.h#4 integrate .. //depot/projects/toestack/sys/netinet/libalias/alias_util.c#3 integrate .. //depot/projects/toestack/sys/netinet/sctp_output.c#9 integrate .. //depot/projects/toestack/sys/netinet/sctp_usrreq.c#8 integrate .. //depot/projects/toestack/sys/netinet/sctputil.c#9 integrate .. //depot/projects/toestack/sys/netinet/tcp_syncache.c#10 integrate .. //depot/projects/toestack/sys/netinet/tcp_var.h#7 integrate .. //depot/projects/toestack/sys/netinet/toedev.h#3 edit .. //depot/projects/toestack/sys/netinet6/in6.c#2 integrate .. //depot/projects/toestack/sys/pci/if_rlreg.h#3 integrate .. //depot/projects/toestack/sys/powerpc/include/pmc_mdep.h#2 integrate .. //depot/projects/toestack/sys/sparc64/include/pmc_mdep.h#2 integrate .. //depot/projects/toestack/sys/sun4v/include/pmc_mdep.h#2 integrate .. //depot/projects/toestack/sys/sys/disklabel.h#2 integrate .. //depot/projects/toestack/sys/sys/param.h#12 integrate .. //depot/projects/toestack/sys/sys/pmc.h#3 integrate .. //depot/projects/toestack/sys/sys/pmckern.h#2 integrate .. //depot/projects/toestack/sys/sys/pmclog.h#3 integrate .. //depot/projects/toestack/sys/sys/ucred.h#2 integrate .. //depot/projects/toestack/usr.bin/kdump/kdump.c#2 integrate .. //depot/projects/toestack/usr.sbin/mtree/verify.c#2 integrate .. //depot/projects/toestack/usr.sbin/pmcstat/Makefile#3 integrate .. //depot/projects/toestack/usr.sbin/pmcstat/pmcstat.8#2 integrate .. //depot/projects/toestack/usr.sbin/pmcstat/pmcstat.c#2 integrate .. //depot/projects/toestack/usr.sbin/pmcstat/pmcstat.h#2 integrate .. //depot/projects/toestack/usr.sbin/pmcstat/pmcstat_log.c#3 integrate .. //depot/projects/toestack/usr.sbin/timed/timed/timed.8#2 integrate Differences ... ==== //depot/projects/toestack/ObsoleteFiles.inc#8 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.123 2007/11/29 21:49:08 brooks Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.124 2007/12/07 22:56:10 dougb Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,9 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20071207: Merged with fortunes-o.real +OLD_FILES+=usr/share/games/fortune/fortunes2-o +OLD_FILES+=usr/share/games/fortune/fortunes2-o.dat # 20071129: Disabled static versions of libkse by default .if ${DEFAULT_THREAD_LIB} != "libkse" && ${MK_LIBTHR} != "no" OLD_FILES+=usr/lib/libkse.a ==== //depot/projects/toestack/bin/ed/Makefile#2 (text+ko) ==== @@ -1,16 +1,16 @@ -# $FreeBSD: src/bin/ed/Makefile,v 1.33 2007/07/02 14:00:25 kensmith Exp $ +# $FreeBSD: src/bin/ed/Makefile,v 1.34 2007/12/09 00:14:27 marius Exp $ .include PROG= ed SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c +WARNS?= 2 LINKS= ${BINDIR}/ed ${BINDIR}/red MLINKS= ed.1 red.1 .if !defined(RELEASE_CRUNCH) .if ${MK_OPENSSL} != "no" CFLAGS+=-DDES -WARNS?= 2 DPADD= ${LIBCRYPTO} LDADD= -lcrypto .endif ==== //depot/projects/toestack/contrib/amd/amd/amd.8#3 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997-2004 Erez Zadok +.\" Copyright (c) 1997-2006 Erez Zadok .\" Copyright (c) 1989 Jan-Simon Pendry .\" Copyright (c) 1989 Imperial College of Science, Technology & Medicine .\" Copyright (c) 1989 The Regents of the University of California. @@ -39,7 +39,7 @@ .\" %W% (Berkeley) %G% .\" .\" $Id: amd.8,v 1.14.2.1 2006/01/02 18:48:23 ezk Exp $ -.\" $FreeBSD: src/contrib/amd/amd/amd.8,v 1.23 2007/12/05 15:59:33 obrien Exp $ +.\" $FreeBSD: src/contrib/amd/amd/amd.8,v 1.24 2007/12/07 20:16:19 ru Exp $ .\" .Dd January 2, 2006 .Dt AMD 8 @@ -48,30 +48,24 @@ .Nm amd .Nd automatically mount file systems .Sh SYNOPSIS -.Nm amd +.Nm .Fl H -.Nm amd +.Nm .Op Fl F Ar conf_file -.Nm amd +.Nm .Op Fl nprvHS .Op Fl a Ar mount_point .Op Fl c Ar duration .Op Fl d Ar domain -.Bk -words .Op Fl k Ar kernel-arch -.Ek .Op Fl l Ar logfile .Op Fl o Ar op_sys_ver .Op Fl t Ar timeout.retransmit -.Bk -words .Op Fl w Ar interval -.Ek .Op Fl x Ar log-option .Op Fl y Ar YP-domain .Op Fl A Ar arch -.Bk -words .Op Fl C Ar cluster-name -.Ek .Op Fl D Ar option .Op Fl F Ar conf_file .Op Fl O Ar op_sys_name @@ -82,41 +76,46 @@ .Oc .Ar ... .Sh DESCRIPTION -.Nm Amd -is a daemon that automatically mounts file systems whenever a file or directory +The +.Nm +utility +is a daemon that automatically mounts file systems +whenever a file or directory within that file system is accessed. -File systems are automatically unmounted -when they appear to be quiescent. +File systems are automatically unmounted when they +appear to be quiescent. .Pp -.Nm Amd +The +.Nm +utility operates by attaching itself as an .Tn NFS server to each of the specified .Ar directories . Lookups within the specified directories are handled by -.Nm amd , +.Nm , which uses the map defined by .Ar mapname to determine how to resolve the lookup. -Generally, this will be a host name, -some file system information and some mount options for the given file system. +Generally, this will be a host name, some file system information +and some mount options for the given file system. .Pp In the first form depicted above, -.Nm amd +.Nm will print a short help string. In the second form, if no options are specified, or if the .Fl F is used, -.Nm amd +.Nm will read configuration parameters from the file .Ar conf_file which defaults to .Pa /etc/amd.conf . The last form is described below. .Sh OPTIONS -.Bl -tag -width Ds +.Bl -tag -width indent .It Fl a Ar temporary-directory Specify an alternative location for the real mount points. The default is @@ -140,55 +139,63 @@ If .Ar logfile is the string -.Em syslog , -the log messages will be sent to the system log daemon by +.Dq Li syslog , +then the log messages will be sent to the system log daemon by .Xr syslog 3 . -The default syslog facility used is LOG_DAEMON. -If you wish to change it, append its name to the log file name, -delimited by a single colon. +The default syslog facility used is +.Dv LOG_DAEMON . +If you +wish to change it, append its name to the log file name, delimited by a +single colon. For example, if .Ar logfile is the string .Dq Li syslog:local7 then -.Nm amd +.Nm will log messages via .Xr syslog 3 -using the LOG_LOCAL7 facility (if it exists on the system). +using the +.Dv LOG_LOCAL7 +facility (if it exists on the system). .It Fl n Normalize hostnames. The name referred to by ${rhost} is normalized relative to the host database before being used. The effect is to translate -aliases into ``official'' names. +aliases into +.Dq official +names. .It Fl o Ar op_sys_ver Override the compiled-in version number of the operating system. -Useful when the built in version is not desired for backward -compatibility reasons. +Useful +when the built in version is not desired for backward compatibility reasons. For example, if the build in version is -.Dq 2.5.1 , +.Dq Li 2.5.1 , you can override it to -.Dq 5.5.1 , +.Dq Li 5.5.1 , and use older maps that were written with the latter in mind. .It Fl p -Print -.Em PID . -Outputs the process-id of -.Nm amd +Print PID. +Outputs the process ID of +.Nm to standard output where it can be saved into a file. .It Fl r Restart existing mounts. -.Nm Amd +The +.Nm +utility will scan the mount file table to determine which file systems are currently mounted. Whenever one of these would have been auto-mounted, -.Nm amd +.Nm .Em inherits it. .It Fl t Ar timeout.retransmit -Specify the NFS timeout -.Ar interval , +Specify the NFS +.Ar timeout +interval, in tenths of a second, between .Tn NFS/RPC retries (for UDP only). @@ -201,7 +208,10 @@ Useful defaults are supplied if either or both values are missing. .Pp -Amd relies on the kernel RPC retransmit mechanism to trigger mount retries. +The +.Xr amd 8 +utility +relies on the kernel RPC retransmit mechanism to trigger mount retries. The values of these parameters change the overall retry interval. Too long an interval gives poor interactive response; too short an interval causes @@ -212,13 +222,14 @@ .It Fl w Ar interval Specify an .Ar interval , -in seconds, between attempts to dismount file systems that have exceeded their -cached times. +in seconds, between attempts to dismount +file systems that have exceeded their cached times. The default is 2 minutes. .It Fl x Ar options Specify run-time logging options. -The options are a comma separated list -chosen from: fatal, error, user, warn, info, map, stats, all. +The options are a comma separated +list chosen from: +.Li fatal , error , user , warn , info , map , stats , all . .It Fl y Ar domain Specify an alternative .Tn NIS @@ -231,8 +242,7 @@ support is not available. .It Fl A Ar arch Specifies the OS architecture. -This is used solely to set the -.Em ${arch} +This is used solely to set the ${arch} selector. .It Fl C Ar cluster-name Specify an alternative HP-UX cluster name to use. @@ -240,11 +250,11 @@ Select from a variety of debug options. Prefixing an option with the string -.Em no +.Dq Li no reverses the effect of that option. Options are cumulative. The most useful option is -.Ar all . +.Dq Li all . .Pp Since .Fl D @@ -255,7 +265,7 @@ and a fuller description is available in the program source. .It Fl F Ar conf_file Specify an -.Nm amd +.Nm configuration file to use. See .Xr amd.conf 5 @@ -263,59 +273,63 @@ This configuration file is used to specify any options in lieu of typing many of them on the command line. The -.Nm amd.conf -file includes directives for every command line option amd has, -and many more that are only available via the configuration file -facility. -The configuration file specified by this option is -processed after all other options have been processed, regardless -of the actual location of this option on the command line. +.Xr amd.conf 5 +file includes directives for every command line option amd has, and many +more that are only available via the configuration file facility. +The +configuration file specified by this option is processed after all other +options had been processed, regardless of the actual location of this option +on the command line. .It Fl H Print help and usage string. .It Fl O Ar op_sys_name Override the compiled-in name of the operating system. -Useful when the built in name is not desired for backward -compatibility reasons. -For example, if the build in name is -.Dq sunos5 , +Useful when the +built in name is not desired for backward compatibility reasons. +For +example, if the build in name is +.Dq Li sunos5 , you can override it to -.Dq sos5 +.Dq Li sos5 and use older maps which were written with the latter in mind. .It Fl S Do not lock the running executable pages of -.Nm amd +.Nm into memory. To improve -.Nm amd's +.Nm Ns 's performance, systems that support the .Xr plock 3 call, could lock the -.Nm amd +.Nm process into memory. -This way there is less chance the operating system will -schedule, page out, and swap the -.Nm amd -process as needed. +This way there is less chance +the operating system will schedule, page out, and swap the +.Nm +process as +needed. This tends to improve -.Nm amd's -performance, at the cost of reserving the memory used by the -.Nm amd -process -(making it unavailable for other processes). +.Nm Ns 's +performance, at the cost of reserving the +memory used by the +.Nm +process (making it unavailable for other processes). If this behavior is not desired, use the .Fl S option. .It Fl T Ar tag Specify a tag to use with .Xr amd.conf 5 . -All Map entries tagged with tag will be processed. +All map entries tagged with +.Ar tag +will be processed. Map entries that are not tagged are always processed. Map entries that are tagged with a tag other than .Ar tag will not be processed. .El .Sh FILES -.Bl -tag -width /axx +.Bl -tag -width ".Pa /etc/amd.conf" .It Pa /.amd_mnt directory under which file systems are dynamically mounted .It Pa /etc/amd.conf @@ -329,20 +343,17 @@ file system can be incredibly inefficient. In most implementations of .Tn NFS , -their interpolations are not cached by -the kernel and each time a symbolic link is -encountered during a +their interpolations are not cached +by the kernel and each time a symbolic link is encountered during a .Em lookuppn translation it costs an .Tn RPC call to the .Tn NFS server. -A large improvement in real-time +It would appear that a large improvement in real-time performance could be gained by adding a cache somewhere. -Replacing -.Xr symlink 2 -with a suitable incarnation of the auto-mounter +Replacing symlinks with a suitable incarnation of the auto-mounter results in a large real-time speedup, but also causes a large number of process context switches. .Pp @@ -357,25 +368,34 @@ .Xr amq 8 , .Xr mount 8 , .Xr umount 8 +.Pp +.Dq am-utils +.Xr info 1 +entry. .Rs -.%T Amd \- The 4.4 BSD Automounter +.%A Erez Zadok +.%B "Linux NFS and Automounter Administration" +.%O ISBN 0-7821-2739-8 +.%I Sybex +.%D 2001 .Re .Pp .Pa http://www.am-utils.org/ -.Pp -.%T Linux NFS and Automounter Administration -by Erez Zadok, ISBN 0-7821-2739-8, (Sybex, 2001). +.Rs +.%T Amd \- The 4.4 BSD Automounter +.Re .Sh HISTORY The -.Nm amd +.Nm utility first appeared in .Bx 4.4 . .Sh AUTHORS .An Jan-Simon Pendry Aq jsp@doc.ic.ac.uk , Department of Computing, Imperial College, London, UK. .Pp -.An Erez Zadok Aq ezk@am-utils.org , -Department of Computer Science, Stony Brook University New York, USA. +.An Erez Zadok Aq ezk@cs.sunysb.edu , +Computer Science Department, Stony Brook +University, Stony Brook, New York, USA. .Pp Other authors and contributors to am-utils are listed in the .Pa AUTHORS ==== //depot/projects/toestack/contrib/amd/amq/amq.8#3 (text+ko) ==== @@ -39,7 +39,7 @@ .\" %W% (Berkeley) %G% .\" .\" $Id: amq.8,v 1.15.2.1 2006/01/02 18:48:24 ezk Exp $ -.\" $FreeBSD: src/contrib/amd/amq/amq.8,v 1.14 2007/12/05 15:59:33 obrien Exp $ +.\" $FreeBSD: src/contrib/amd/amq/amq.8,v 1.16 2007/12/07 20:22:59 ru Exp $ .\" .Dd January 2, 2006 .Dt AMQ 8 @@ -48,87 +48,105 @@ .Nm amq .Nd automounter query tool .Sh SYNOPSIS -.Nm amq -.Op Fl fmpsuvTU +.Nm +.Op Fl fmpsvwHTU .Op Fl h Ar hostname .Op Fl l Ar log_file .Op Fl x Ar log_options .Op Fl D Ar debug_options -.Op Fl M Ar mountmap_entry .Op Fl P Ar program_number -.Op Ar directory -.Ar ... +.Op Oo Fl u Oc Ar directory ... .Sh DESCRIPTION -.Nm Amq +The +.Nm +utility provides a simple way of determining the current state of the .Xr amd 8 program. Communication is by .Tn RPC . Three modes of operation are supported by the current protocol. -By default a list of mount points and auto-mounted file systems -is output. -An alternative host can be specified using the +By default +a list of mount points and auto-mounted file systems is output. +An +alternative host can be specified using the .Fl h option. .Pp -If directory names are given, as output by default, -then per file system information is displayed. +If +.Ar directory +names are given, as output by default, then per file system +information is displayed. .Sh OPTIONS -.Bl -tag -width Ds +.Bl -tag -width indent .It Fl f -Request automounter to flush the internal caches. +Ask the automounter to flush the internal caches and reload all the maps. .It Fl h Ar hostname -Query alternate host -.Ar hostname . +Specify an alternate host to query. By default the local host is used. -In an +In +an .Tn HP-UX -cluster, the root server is queried by default, since -that is the system on which the automounter is normally run. +cluster, the root server is queried by default, since that is the system on +which the automounter is normally run. .It Fl l Ar log_file -Tell amd to use +Tell +.Xr amd 8 +to use .Ar log_file as the log file name. -For security reasons, this must be the same log file which -.Nm amd +For security reasons, this must be the same log file +which +.Xr amd 8 used when started. This option is therefore only useful to refresh -.Nm amd Ns \'s -open file handle on the log file, so that it can be rotated and compressed via -daily cron jobs. +.Nm amd Ns 's +open file handle on the log file, so that it can be rotated +and compressed via daily cron jobs. .It Fl m -Request the automounter to provide a list of mounted file systems, -including the number of references to each file system and any error -which occurred while mounting. +Ask the automounter to provide a list of mounted file systems, including the +number of references to each file system and any error which occurred while +mounting. .It Fl p Return the process ID of the remote or locally running -.Nm amd . -Useful when you need to send a signal to the local -.Nm amd -process, and would rather not have to search through the process table. -This -option is used in the +.Xr amd 8 . +Useful when you +need to send a signal to the local +.Xr amd 8 +process, and would rather not have to +search through the process table. +This option is used in the .Pa ctl-amd script. .It Fl s -Request the automounter to provide system-wide mount statistics. +Ask the automounter to provide system-wide mount statistics. .It Fl u -Request the automounter to unmount the named file systems -instead of providing information about them. -Unmounts are requested, -not forced. -They merely cause the mounted file system to timeout, -which will be picked up by -.Nm amd Ns \'s +Ask the automounter to unmount the file systems named in +.Ar directory +instead of providing +information about them. +Unmounts are requested, not forced. +They merely +cause the mounted file system to timeout, which will be picked up by +.Nm amd Ns 's main scheduler thus causing the normal timeout action to be taken. .It Fl v -Request the automounter to provide version information. -This is a subset -of the information provided by -.Nm amd Ns \'s Fl v +Ask the automounter for its version information. +This is a subset of the +information output by +.Xr amd 8 Ns 's +.Fl v option. +.It Fl w +Translate a full pathname as returned by +.Xr getcwd 3 +into a short +.Xr amd 8 +pathname that goes through its mount points. +This option requires that +.Xr amd 8 +is running. .It Fl x Ar log_options Ask the automounter to use the logging options specified in .Ar log_options @@ -137,109 +155,113 @@ Ask the automounter to use the debugging options specified in .Ar debug_options from now on. -.It Fl M -Pass a mount map entry to -.Nm amd -and wait for it to be evaluated, possibly causing a mount. -This option is highly insecure. -By default, -.Nm amd -and -.Nm amq -do not support it. -It is necessary to configure -.Nm am-utils -with -.Ar --enable-amq-mount -to enable this option. +.It Fl H +Display short usage message. .It Fl P Ar program_number Contact an alternate running -.Nm amd -that had registered itself on a different RPC +.Xr amd 8 +that had registered itself on a different +.Tn RPC .Ar program_number and apply all other operations to that instance of the automounter. -This is useful when running multiple copies of -.Nm amd , -and need to manage each one separately. +This is +useful when you run multiple copies of +.Xr amd 8 , +and need to manage each +one separately. If not specified, -.Nm amq +.Nm will use the default program number for -.Nm amd , +.Xr amd 8 , 300019. For security reasons, the only alternate program numbers -.Nm amd +.Xr amd 8 can use range from 300019 to 300029, inclusive. .It Fl T Contact -.Nm amd +.Xr amd 8 using the TCP transport only. Normally -.Nm amq -will try TCP, and if that fails, will try UDP. +.Nm +will try TCP, and if that failed, will try UDP. .It Fl U Contact -.Nm amd +.Xr amd 8 using UDP (connectionless) transport only. Normally -.Nm amq -will try TCP, and if that fails, will try UDP. +.Nm +will try TCP, and if that failed, will try UDP. .El .Sh FILES -.Bl -tag -width amq.x -compact +.Bl -tag -width ".Pa amq.x" -compact .It Pa amq.x .Tn RPC protocol description. .El .Sh CAVEATS -.Nm Amq +The +.Nm +utility uses a Sun registered .Tn RPC program number (300019 decimal) which may not be in the -.Pa /etc/rpc +.Xr rpc 5 database. .Pp If the TCP wrappers library is available, and the -.It use_tcpwrappers +.Va use_tcpwrappers global -.It amd.conf +.Xr amd.conf 5 option is set to -.Qq yes , +.Dq Li yes , then -.Nm Amd +.Xr amd 8 will verify that the host running -.Nm Aamq +.Nm is authorized to connect. The -.Nm Amd -service name must used in the +.Dq Li amd +service name must be used in the .Pa /etc/hosts.allow and .Pa /etc/hosts.deny files. For example, to allow only localhost to connect to -.Nm Amd , +.Xr amd 8 , add this line to .Pa /etc/hosts.allow : -.Bd -literal -.nf - amd: localhost -.fi -.Ed +.Pp +.Dl "amd: localhost" .Pp and this line to .Pa /etc/hosts.deny : -.Bd -literal -.nf - amd: ALL -.fi -.Ed +.Pp +.Dl "amd: ALL" .Sh SEE ALSO .Xr amd.conf 5 , .Xr hosts_access 5 , .Xr amd 8 +.Pp +.Dq am-utils +.Xr info 1 +entry. +.Rs +.%A Erez Zadok +.%B "Linux NFS and Automounter Administration" +.%O ISBN 0-7821-2739-8 +.%I Sybex +.%D 2001 +.Re +.Pp +.Pa http://www.am-utils.org/ +.Rs +.%T Amd \- The 4.4 BSD Automounter +.Re .Sh HISTORY -.Nm Amq +The +.Nm +utility first appeared in .Bx 4.4 . .Sh AUTHORS @@ -247,8 +269,10 @@ Department of Computing, Imperial College, London, UK. .Pp .An Erez Zadok Aq ezk@cs.sunysb.edu , +Computer Science Department, Stony Brook +University, Stony Brook, New York, USA. .Pp -.An Other authors and contributors to +Other authors and contributors to .Nm am-utils are listed in the .Pa AUTHORS ==== //depot/projects/toestack/contrib/amd/amq/pawd.1#3 (text+ko) ==== @@ -39,7 +39,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Dec 9 03:00:00 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E13516A419; Sun, 9 Dec 2007 03:00:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A3BF616A417 for ; Sun, 9 Dec 2007 02:59:59 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9157C13C447 for ; Sun, 9 Dec 2007 02:59:59 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB92xx7e073474 for ; Sun, 9 Dec 2007 02:59:59 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB92xtVT073470 for perforce@freebsd.org; Sun, 9 Dec 2007 02:59:55 GMT (envelope-from peter@freebsd.org) Date: Sun, 9 Dec 2007 02:59:55 GMT Message-Id: <200712090259.lB92xtVT073470@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 130526 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Dec 2007 03:00:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=130526 Change 130526 by peter@peter_overcee on 2007/12/09 02:59:44 IFC @130525 Affected files ... .. //depot/projects/hammer/ObsoleteFiles.inc#43 integrate .. //depot/projects/hammer/bin/ed/Makefile#12 integrate .. //depot/projects/hammer/contrib/amd/amd/amd.8#8 integrate .. //depot/projects/hammer/contrib/amd/amq/amq.8#8 integrate .. //depot/projects/hammer/contrib/amd/amq/pawd.1#6 integrate .. //depot/projects/hammer/contrib/amd/fixmount/fixmount.8#9 integrate .. //depot/projects/hammer/contrib/amd/fsinfo/fsinfo.8#9 integrate .. //depot/projects/hammer/contrib/amd/hlfsd/hlfsd.8#8 integrate .. //depot/projects/hammer/contrib/amd/mk-amd-map/mk-amd-map.8#6 integrate .. //depot/projects/hammer/contrib/amd/scripts/amd.conf.5#9 integrate .. //depot/projects/hammer/contrib/amd/wire-test/wire-test.8#6 integrate .. //depot/projects/hammer/etc/rc.d/DAEMON#5 integrate .. //depot/projects/hammer/etc/rc.d/LOGIN#5 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#58 integrate .. //depot/projects/hammer/etc/rc.d/NETWORKING#13 integrate .. //depot/projects/hammer/etc/rc.d/SERVERS#7 integrate .. //depot/projects/hammer/etc/rc.d/accounting#9 integrate .. //depot/projects/hammer/etc/rc.d/amd#15 integrate .. //depot/projects/hammer/etc/rc.d/apmd#10 integrate .. //depot/projects/hammer/etc/rc.d/bootconf.sh#6 delete .. //depot/projects/hammer/etc/rc.d/bootparams#6 integrate .. //depot/projects/hammer/etc/rc.d/ccd#5 integrate .. //depot/projects/hammer/etc/rc.d/cron#7 integrate .. //depot/projects/hammer/etc/rc.d/dhclient#20 integrate .. //depot/projects/hammer/etc/rc.d/dmesg#5 integrate .. //depot/projects/hammer/etc/rc.d/fsck#8 integrate .. //depot/projects/hammer/etc/rc.d/ftp-proxy#2 integrate .. //depot/projects/hammer/etc/rc.d/inetd#5 integrate .. //depot/projects/hammer/etc/rc.d/ipfilter#23 integrate .. //depot/projects/hammer/etc/rc.d/ipfs#6 integrate .. //depot/projects/hammer/etc/rc.d/ipmon#13 integrate .. //depot/projects/hammer/etc/rc.d/ipnat#13 integrate .. //depot/projects/hammer/etc/rc.d/ipsec#13 integrate .. //depot/projects/hammer/etc/rc.d/isdnd#13 integrate .. //depot/projects/hammer/etc/rc.d/keyserv#4 integrate .. //depot/projects/hammer/etc/rc.d/ldconfig#15 integrate .. //depot/projects/hammer/etc/rc.d/local#6 integrate .. //depot/projects/hammer/etc/rc.d/lockd#4 integrate .. //depot/projects/hammer/etc/rc.d/lpd#7 integrate .. //depot/projects/hammer/etc/rc.d/motd#8 integrate .. //depot/projects/hammer/etc/rc.d/mountcritlocal#12 integrate .. //depot/projects/hammer/etc/rc.d/mountcritremote#14 integrate .. //depot/projects/hammer/etc/rc.d/mountd#11 integrate .. //depot/projects/hammer/etc/rc.d/moused#11 integrate .. //depot/projects/hammer/etc/rc.d/mrouted#10 integrate .. //depot/projects/hammer/etc/rc.d/newsyslog#5 integrate .. //depot/projects/hammer/etc/rc.d/nfsd#8 integrate .. //depot/projects/hammer/etc/rc.d/power_profile#11 integrate .. //depot/projects/hammer/etc/rc.d/pwcheck#4 integrate .. //depot/projects/hammer/etc/rc.d/quota#6 integrate .. //depot/projects/hammer/etc/rc.d/rarpd#6 integrate .. //depot/projects/hammer/etc/rc.d/resolv#7 integrate .. //depot/projects/hammer/etc/rc.d/root#13 integrate .. //depot/projects/hammer/etc/rc.d/route6d#7 integrate .. //depot/projects/hammer/etc/rc.d/routed#11 integrate .. //depot/projects/hammer/etc/rc.d/rpcbind#8 integrate .. //depot/projects/hammer/etc/rc.d/rtadvd#8 integrate .. //depot/projects/hammer/etc/rc.d/rwho#4 integrate .. //depot/projects/hammer/etc/rc.d/savecore#9 integrate .. //depot/projects/hammer/etc/rc.d/securelevel#7 integrate .. //depot/projects/hammer/etc/rc.d/sendmail#14 integrate .. //depot/projects/hammer/etc/rc.d/sshd#10 integrate .. //depot/projects/hammer/etc/rc.d/statd#3 integrate .. //depot/projects/hammer/etc/rc.d/swap1#8 integrate .. //depot/projects/hammer/etc/rc.d/sysctl#8 integrate .. //depot/projects/hammer/etc/rc.d/syslogd#9 integrate .. //depot/projects/hammer/etc/rc.d/timed#5 integrate .. //depot/projects/hammer/etc/rc.d/tmp#7 integrate .. //depot/projects/hammer/etc/rc.d/ugidfw#6 integrate .. //depot/projects/hammer/etc/rc.d/var#9 integrate .. //depot/projects/hammer/etc/rc.d/virecover#8 integrate .. //depot/projects/hammer/etc/rc.d/ypbind#9 integrate .. //depot/projects/hammer/etc/rc.d/yppasswdd#8 integrate .. //depot/projects/hammer/etc/rc.d/ypserv#9 integrate .. //depot/projects/hammer/games/fortune/datfiles/Makefile#7 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#71 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes-o.real#8 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes-o.sp.ok#2 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes.sp.ok#6 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes2-o#14 delete .. //depot/projects/hammer/games/fortune/datfiles/freebsd-tips#16 integrate .. //depot/projects/hammer/games/fortune/datfiles/freebsd-tips.sp.ok#1 branch .. //depot/projects/hammer/games/fortune/datfiles/limerick#9 integrate .. //depot/projects/hammer/games/fortune/datfiles/limerick.sp.ok#1 branch .. //depot/projects/hammer/games/fortune/datfiles/murphy#7 integrate .. //depot/projects/hammer/games/fortune/datfiles/murphy-o#3 integrate .. //depot/projects/hammer/games/fortune/datfiles/murphy.sp.ok#1 branch .. //depot/projects/hammer/games/fortune/datfiles/startrek#10 integrate .. //depot/projects/hammer/games/fortune/datfiles/zippy#4 integrate .. //depot/projects/hammer/games/fortune/datfiles/zippy.sp.ok#2 integrate .. //depot/projects/hammer/lib/libc/sys/access.2#4 integrate .. //depot/projects/hammer/lib/libkse/thread/thr_kern.c#4 integrate .. //depot/projects/hammer/lib/libpmc/libpmc.c#8 integrate .. //depot/projects/hammer/release/fixit.profile#3 integrate .. //depot/projects/hammer/sbin/bsdlabel/bsdlabel.8#15 integrate .. //depot/projects/hammer/sbin/newfs_msdos/newfs_msdos.8#6 integrate .. //depot/projects/hammer/share/examples/cvsup/refuse#8 integrate .. //depot/projects/hammer/share/examples/cvsup/refuse.README#8 integrate .. //depot/projects/hammer/share/man/man4/aac.4#16 integrate .. //depot/projects/hammer/share/man/man4/hwpmc.4#17 integrate .. //depot/projects/hammer/share/man/man4/nve.4#8 integrate .. //depot/projects/hammer/share/man/man5/hosts.equiv.5#6 integrate .. //depot/projects/hammer/share/mk/bsd.subdir.mk#7 integrate .. //depot/projects/hammer/sys/amd64/amd64/exception.S#48 integrate .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#57 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#168 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#102 integrate .. //depot/projects/hammer/sys/amd64/include/pmc_mdep.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/specialreg.h#26 integrate .. //depot/projects/hammer/sys/arm/arm/pmap.c#46 integrate .. //depot/projects/hammer/sys/arm/include/pmc_mdep.h#3 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32.h#7 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_ipc.h#1 branch .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#53 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#49 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#46 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#46 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#46 integrate .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#51 integrate .. //depot/projects/hammer/sys/conf/Makefile.amd64#23 integrate .. //depot/projects/hammer/sys/dev/aac/aac.c#42 integrate .. //depot/projects/hammer/sys/dev/aac/aac_cam.c#20 integrate .. //depot/projects/hammer/sys/dev/aac/aac_pci.c#31 integrate .. //depot/projects/hammer/sys/dev/aac/aacreg.h#12 integrate .. //depot/projects/hammer/sys/dev/aac/aacvar.h#15 integrate .. //depot/projects/hammer/sys/dev/arcmsr/arcmsr.c#14 integrate .. //depot/projects/hammer/sys/dev/arcmsr/arcmsr.h#4 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#83 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_amd.c#10 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_arm.c#2 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_ia64.c#2 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_logging.c#9 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_mod.c#20 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_piv.c#11 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_powerpc.c#2 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_ppro.c#7 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_sparc64.c#2 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_x86.c#7 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#57 integrate .. //depot/projects/hammer/sys/dev/re/if_re.c#54 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_subr.c#7 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vfsops.c#10 integrate .. //depot/projects/hammer/sys/geom/geom_bsd.c#30 integrate .. //depot/projects/hammer/sys/geom/part/g_part.c#9 integrate .. //depot/projects/hammer/sys/geom/part/g_part_bsd.c#2 integrate .. //depot/projects/hammer/sys/i386/i386/exception.s#15 integrate .. //depot/projects/hammer/sys/i386/i386/trap.c#58 integrate .. //depot/projects/hammer/sys/i386/include/pmc_mdep.h#4 integrate .. //depot/projects/hammer/sys/ia64/include/pmc_mdep.h#3 integrate .. //depot/projects/hammer/sys/kern/kern_module.c#13 integrate .. //depot/projects/hammer/sys/kern/kern_pmc.c#6 integrate .. //depot/projects/hammer/sys/kern/subr_trap.c#41 integrate .. //depot/projects/hammer/sys/net/if_var.h#45 integrate .. //depot/projects/hammer/sys/net/route.c#28 integrate .. //depot/projects/hammer/sys/net80211/ieee80211.c#32 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_output.c#34 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.h#36 integrate .. //depot/projects/hammer/sys/netinet/libalias/alias_util.c#7 integrate .. //depot/projects/hammer/sys/netinet/sctp_output.c#20 integrate .. //depot/projects/hammer/sys/netinet/sctp_usrreq.c#20 integrate .. //depot/projects/hammer/sys/netinet/sctputil.c#23 integrate .. //depot/projects/hammer/sys/netinet/tcp_syncache.c#55 integrate .. //depot/projects/hammer/sys/netinet/tcp_var.h#49 integrate .. //depot/projects/hammer/sys/netinet6/in6.c#28 integrate .. //depot/projects/hammer/sys/pci/if_rlreg.h#29 integrate .. //depot/projects/hammer/sys/powerpc/include/pmc_mdep.h#3 integrate .. //depot/projects/hammer/sys/sparc64/include/pmc_mdep.h#3 integrate .. //depot/projects/hammer/sys/sun4v/include/pmc_mdep.h#2 integrate .. //depot/projects/hammer/sys/sys/disklabel.h#16 integrate .. //depot/projects/hammer/sys/sys/param.h#99 integrate .. //depot/projects/hammer/sys/sys/pmc.h#10 integrate .. //depot/projects/hammer/sys/sys/pmckern.h#7 integrate .. //depot/projects/hammer/sys/sys/pmclog.h#5 integrate .. //depot/projects/hammer/sys/sys/ucred.h#12 integrate .. //depot/projects/hammer/usr.bin/kdump/kdump.c#21 integrate .. //depot/projects/hammer/usr.sbin/mtree/verify.c#9 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/Makefile#8 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/add/pkg_add.1#16 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/create/pkg_create.1#13 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/delete/pkg_delete.1#4 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/info/pkg_info.1#12 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/search/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/pkg_install/search/pkg_search.1#1 branch .. //depot/projects/hammer/usr.sbin/pkg_install/search/pkg_search.sh#1 branch .. //depot/projects/hammer/usr.sbin/pkg_install/updating/pkg_updating.1#2 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/version/pkg_version.1#13 integrate .. //depot/projects/hammer/usr.sbin/pmcstat/Makefile#5 integrate .. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat.8#10 integrate .. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat.c#14 integrate .. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat.h#5 integrate .. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat_log.c#9 integrate .. //depot/projects/hammer/usr.sbin/timed/timed/timed.8#3 integrate Differences ... ==== //depot/projects/hammer/ObsoleteFiles.inc#43 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.123 2007/11/29 21:49:08 brooks Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.124 2007/12/07 22:56:10 dougb Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,9 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20071207: Merged with fortunes-o.real +OLD_FILES+=usr/share/games/fortune/fortunes2-o +OLD_FILES+=usr/share/games/fortune/fortunes2-o.dat # 20071129: Disabled static versions of libkse by default .if ${DEFAULT_THREAD_LIB} != "libkse" && ${MK_LIBTHR} != "no" OLD_FILES+=usr/lib/libkse.a ==== //depot/projects/hammer/bin/ed/Makefile#12 (text+ko) ==== @@ -1,16 +1,16 @@ -# $FreeBSD: src/bin/ed/Makefile,v 1.33 2007/07/02 14:00:25 kensmith Exp $ +# $FreeBSD: src/bin/ed/Makefile,v 1.34 2007/12/09 00:14:27 marius Exp $ .include PROG= ed SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c +WARNS?= 2 LINKS= ${BINDIR}/ed ${BINDIR}/red MLINKS= ed.1 red.1 .if !defined(RELEASE_CRUNCH) .if ${MK_OPENSSL} != "no" CFLAGS+=-DDES -WARNS?= 2 DPADD= ${LIBCRYPTO} LDADD= -lcrypto .endif ==== //depot/projects/hammer/contrib/amd/amd/amd.8#8 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997-2004 Erez Zadok +.\" Copyright (c) 1997-2006 Erez Zadok .\" Copyright (c) 1989 Jan-Simon Pendry .\" Copyright (c) 1989 Imperial College of Science, Technology & Medicine .\" Copyright (c) 1989 The Regents of the University of California. @@ -39,7 +39,7 @@ .\" %W% (Berkeley) %G% .\" .\" $Id: amd.8,v 1.14.2.1 2006/01/02 18:48:23 ezk Exp $ -.\" $FreeBSD: src/contrib/amd/amd/amd.8,v 1.23 2007/12/05 15:59:33 obrien Exp $ +.\" $FreeBSD: src/contrib/amd/amd/amd.8,v 1.24 2007/12/07 20:16:19 ru Exp $ .\" .Dd January 2, 2006 .Dt AMD 8 @@ -48,30 +48,24 @@ .Nm amd .Nd automatically mount file systems .Sh SYNOPSIS -.Nm amd +.Nm .Fl H -.Nm amd +.Nm .Op Fl F Ar conf_file -.Nm amd +.Nm .Op Fl nprvHS .Op Fl a Ar mount_point .Op Fl c Ar duration .Op Fl d Ar domain -.Bk -words .Op Fl k Ar kernel-arch -.Ek .Op Fl l Ar logfile .Op Fl o Ar op_sys_ver .Op Fl t Ar timeout.retransmit -.Bk -words .Op Fl w Ar interval -.Ek .Op Fl x Ar log-option .Op Fl y Ar YP-domain .Op Fl A Ar arch -.Bk -words .Op Fl C Ar cluster-name -.Ek .Op Fl D Ar option .Op Fl F Ar conf_file .Op Fl O Ar op_sys_name @@ -82,41 +76,46 @@ .Oc .Ar ... .Sh DESCRIPTION -.Nm Amd -is a daemon that automatically mounts file systems whenever a file or directory +The +.Nm +utility +is a daemon that automatically mounts file systems +whenever a file or directory within that file system is accessed. -File systems are automatically unmounted -when they appear to be quiescent. +File systems are automatically unmounted when they +appear to be quiescent. .Pp -.Nm Amd +The +.Nm +utility operates by attaching itself as an .Tn NFS server to each of the specified .Ar directories . Lookups within the specified directories are handled by -.Nm amd , +.Nm , which uses the map defined by .Ar mapname to determine how to resolve the lookup. -Generally, this will be a host name, -some file system information and some mount options for the given file system. +Generally, this will be a host name, some file system information +and some mount options for the given file system. .Pp In the first form depicted above, -.Nm amd +.Nm will print a short help string. In the second form, if no options are specified, or if the .Fl F is used, -.Nm amd +.Nm will read configuration parameters from the file .Ar conf_file which defaults to .Pa /etc/amd.conf . The last form is described below. .Sh OPTIONS -.Bl -tag -width Ds +.Bl -tag -width indent .It Fl a Ar temporary-directory Specify an alternative location for the real mount points. The default is @@ -140,55 +139,63 @@ If .Ar logfile is the string -.Em syslog , -the log messages will be sent to the system log daemon by +.Dq Li syslog , +then the log messages will be sent to the system log daemon by .Xr syslog 3 . -The default syslog facility used is LOG_DAEMON. -If you wish to change it, append its name to the log file name, -delimited by a single colon. +The default syslog facility used is +.Dv LOG_DAEMON . +If you +wish to change it, append its name to the log file name, delimited by a +single colon. For example, if .Ar logfile is the string .Dq Li syslog:local7 then -.Nm amd +.Nm will log messages via .Xr syslog 3 -using the LOG_LOCAL7 facility (if it exists on the system). +using the +.Dv LOG_LOCAL7 +facility (if it exists on the system). .It Fl n Normalize hostnames. The name referred to by ${rhost} is normalized relative to the host database before being used. The effect is to translate -aliases into ``official'' names. +aliases into +.Dq official +names. .It Fl o Ar op_sys_ver Override the compiled-in version number of the operating system. -Useful when the built in version is not desired for backward -compatibility reasons. +Useful +when the built in version is not desired for backward compatibility reasons. For example, if the build in version is -.Dq 2.5.1 , +.Dq Li 2.5.1 , you can override it to -.Dq 5.5.1 , +.Dq Li 5.5.1 , and use older maps that were written with the latter in mind. .It Fl p -Print -.Em PID . -Outputs the process-id of -.Nm amd +Print PID. +Outputs the process ID of +.Nm to standard output where it can be saved into a file. .It Fl r Restart existing mounts. -.Nm Amd +The +.Nm +utility will scan the mount file table to determine which file systems are currently mounted. Whenever one of these would have been auto-mounted, -.Nm amd +.Nm .Em inherits it. .It Fl t Ar timeout.retransmit -Specify the NFS timeout -.Ar interval , +Specify the NFS +.Ar timeout +interval, in tenths of a second, between .Tn NFS/RPC retries (for UDP only). @@ -201,7 +208,10 @@ Useful defaults are supplied if either or both values are missing. .Pp -Amd relies on the kernel RPC retransmit mechanism to trigger mount retries. +The +.Xr amd 8 +utility +relies on the kernel RPC retransmit mechanism to trigger mount retries. The values of these parameters change the overall retry interval. Too long an interval gives poor interactive response; too short an interval causes @@ -212,13 +222,14 @@ .It Fl w Ar interval Specify an .Ar interval , -in seconds, between attempts to dismount file systems that have exceeded their -cached times. +in seconds, between attempts to dismount +file systems that have exceeded their cached times. The default is 2 minutes. .It Fl x Ar options Specify run-time logging options. -The options are a comma separated list -chosen from: fatal, error, user, warn, info, map, stats, all. +The options are a comma separated +list chosen from: +.Li fatal , error , user , warn , info , map , stats , all . .It Fl y Ar domain Specify an alternative .Tn NIS @@ -231,8 +242,7 @@ support is not available. .It Fl A Ar arch Specifies the OS architecture. -This is used solely to set the -.Em ${arch} +This is used solely to set the ${arch} selector. .It Fl C Ar cluster-name Specify an alternative HP-UX cluster name to use. @@ -240,11 +250,11 @@ Select from a variety of debug options. Prefixing an option with the string -.Em no +.Dq Li no reverses the effect of that option. Options are cumulative. The most useful option is -.Ar all . +.Dq Li all . .Pp Since .Fl D @@ -255,7 +265,7 @@ and a fuller description is available in the program source. .It Fl F Ar conf_file Specify an -.Nm amd +.Nm configuration file to use. See .Xr amd.conf 5 @@ -263,59 +273,63 @@ This configuration file is used to specify any options in lieu of typing many of them on the command line. The -.Nm amd.conf -file includes directives for every command line option amd has, -and many more that are only available via the configuration file -facility. -The configuration file specified by this option is -processed after all other options have been processed, regardless -of the actual location of this option on the command line. +.Xr amd.conf 5 +file includes directives for every command line option amd has, and many +more that are only available via the configuration file facility. +The +configuration file specified by this option is processed after all other +options had been processed, regardless of the actual location of this option +on the command line. .It Fl H Print help and usage string. .It Fl O Ar op_sys_name Override the compiled-in name of the operating system. -Useful when the built in name is not desired for backward -compatibility reasons. -For example, if the build in name is -.Dq sunos5 , +Useful when the +built in name is not desired for backward compatibility reasons. +For +example, if the build in name is +.Dq Li sunos5 , you can override it to -.Dq sos5 +.Dq Li sos5 and use older maps which were written with the latter in mind. .It Fl S Do not lock the running executable pages of -.Nm amd +.Nm into memory. To improve -.Nm amd's +.Nm Ns 's performance, systems that support the .Xr plock 3 call, could lock the -.Nm amd +.Nm process into memory. -This way there is less chance the operating system will -schedule, page out, and swap the -.Nm amd -process as needed. +This way there is less chance +the operating system will schedule, page out, and swap the +.Nm +process as +needed. This tends to improve -.Nm amd's -performance, at the cost of reserving the memory used by the -.Nm amd -process -(making it unavailable for other processes). +.Nm Ns 's +performance, at the cost of reserving the +memory used by the +.Nm +process (making it unavailable for other processes). If this behavior is not desired, use the .Fl S option. .It Fl T Ar tag Specify a tag to use with .Xr amd.conf 5 . -All Map entries tagged with tag will be processed. +All map entries tagged with +.Ar tag +will be processed. Map entries that are not tagged are always processed. Map entries that are tagged with a tag other than .Ar tag will not be processed. .El .Sh FILES -.Bl -tag -width /axx +.Bl -tag -width ".Pa /etc/amd.conf" .It Pa /.amd_mnt directory under which file systems are dynamically mounted .It Pa /etc/amd.conf @@ -329,20 +343,17 @@ file system can be incredibly inefficient. In most implementations of .Tn NFS , -their interpolations are not cached by -the kernel and each time a symbolic link is -encountered during a +their interpolations are not cached +by the kernel and each time a symbolic link is encountered during a .Em lookuppn translation it costs an .Tn RPC call to the .Tn NFS server. -A large improvement in real-time +It would appear that a large improvement in real-time performance could be gained by adding a cache somewhere. -Replacing -.Xr symlink 2 -with a suitable incarnation of the auto-mounter +Replacing symlinks with a suitable incarnation of the auto-mounter results in a large real-time speedup, but also causes a large number of process context switches. .Pp @@ -357,25 +368,34 @@ .Xr amq 8 , .Xr mount 8 , .Xr umount 8 +.Pp +.Dq am-utils +.Xr info 1 +entry. .Rs -.%T Amd \- The 4.4 BSD Automounter +.%A Erez Zadok +.%B "Linux NFS and Automounter Administration" +.%O ISBN 0-7821-2739-8 +.%I Sybex +.%D 2001 .Re .Pp .Pa http://www.am-utils.org/ -.Pp -.%T Linux NFS and Automounter Administration -by Erez Zadok, ISBN 0-7821-2739-8, (Sybex, 2001). +.Rs +.%T Amd \- The 4.4 BSD Automounter +.Re .Sh HISTORY The -.Nm amd +.Nm utility first appeared in .Bx 4.4 . .Sh AUTHORS .An Jan-Simon Pendry Aq jsp@doc.ic.ac.uk , Department of Computing, Imperial College, London, UK. .Pp -.An Erez Zadok Aq ezk@am-utils.org , -Department of Computer Science, Stony Brook University New York, USA. +.An Erez Zadok Aq ezk@cs.sunysb.edu , +Computer Science Department, Stony Brook +University, Stony Brook, New York, USA. .Pp Other authors and contributors to am-utils are listed in the .Pa AUTHORS ==== //depot/projects/hammer/contrib/amd/amq/amq.8#8 (text+ko) ==== @@ -39,7 +39,7 @@ .\" %W% (Berkeley) %G% .\" .\" $Id: amq.8,v 1.15.2.1 2006/01/02 18:48:24 ezk Exp $ -.\" $FreeBSD: src/contrib/amd/amq/amq.8,v 1.14 2007/12/05 15:59:33 obrien Exp $ +.\" $FreeBSD: src/contrib/amd/amq/amq.8,v 1.16 2007/12/07 20:22:59 ru Exp $ .\" .Dd January 2, 2006 .Dt AMQ 8 @@ -48,87 +48,105 @@ .Nm amq .Nd automounter query tool .Sh SYNOPSIS -.Nm amq -.Op Fl fmpsuvTU +.Nm +.Op Fl fmpsvwHTU .Op Fl h Ar hostname .Op Fl l Ar log_file .Op Fl x Ar log_options .Op Fl D Ar debug_options -.Op Fl M Ar mountmap_entry .Op Fl P Ar program_number -.Op Ar directory -.Ar ... +.Op Oo Fl u Oc Ar directory ... .Sh DESCRIPTION -.Nm Amq +The +.Nm +utility provides a simple way of determining the current state of the .Xr amd 8 program. Communication is by .Tn RPC . Three modes of operation are supported by the current protocol. -By default a list of mount points and auto-mounted file systems -is output. -An alternative host can be specified using the +By default +a list of mount points and auto-mounted file systems is output. +An +alternative host can be specified using the .Fl h option. .Pp -If directory names are given, as output by default, -then per file system information is displayed. +If +.Ar directory +names are given, as output by default, then per file system +information is displayed. .Sh OPTIONS -.Bl -tag -width Ds +.Bl -tag -width indent .It Fl f -Request automounter to flush the internal caches. +Ask the automounter to flush the internal caches and reload all the maps. .It Fl h Ar hostname -Query alternate host -.Ar hostname . +Specify an alternate host to query. By default the local host is used. -In an +In +an .Tn HP-UX -cluster, the root server is queried by default, since -that is the system on which the automounter is normally run. +cluster, the root server is queried by default, since that is the system on +which the automounter is normally run. .It Fl l Ar log_file -Tell amd to use +Tell +.Xr amd 8 +to use .Ar log_file as the log file name. -For security reasons, this must be the same log file which -.Nm amd +For security reasons, this must be the same log file +which +.Xr amd 8 used when started. This option is therefore only useful to refresh -.Nm amd Ns \'s -open file handle on the log file, so that it can be rotated and compressed via -daily cron jobs. +.Nm amd Ns 's +open file handle on the log file, so that it can be rotated +and compressed via daily cron jobs. .It Fl m -Request the automounter to provide a list of mounted file systems, -including the number of references to each file system and any error -which occurred while mounting. +Ask the automounter to provide a list of mounted file systems, including the +number of references to each file system and any error which occurred while +mounting. .It Fl p Return the process ID of the remote or locally running -.Nm amd . -Useful when you need to send a signal to the local -.Nm amd -process, and would rather not have to search through the process table. -This -option is used in the +.Xr amd 8 . +Useful when you +need to send a signal to the local +.Xr amd 8 +process, and would rather not have to +search through the process table. +This option is used in the .Pa ctl-amd script. .It Fl s -Request the automounter to provide system-wide mount statistics. +Ask the automounter to provide system-wide mount statistics. .It Fl u -Request the automounter to unmount the named file systems -instead of providing information about them. -Unmounts are requested, -not forced. -They merely cause the mounted file system to timeout, -which will be picked up by -.Nm amd Ns \'s +Ask the automounter to unmount the file systems named in +.Ar directory +instead of providing +information about them. +Unmounts are requested, not forced. +They merely +cause the mounted file system to timeout, which will be picked up by +.Nm amd Ns 's main scheduler thus causing the normal timeout action to be taken. .It Fl v -Request the automounter to provide version information. -This is a subset -of the information provided by -.Nm amd Ns \'s Fl v +Ask the automounter for its version information. +This is a subset of the +information output by +.Xr amd 8 Ns 's +.Fl v option. +.It Fl w +Translate a full pathname as returned by +.Xr getcwd 3 +into a short +.Xr amd 8 +pathname that goes through its mount points. +This option requires that +.Xr amd 8 +is running. .It Fl x Ar log_options Ask the automounter to use the logging options specified in .Ar log_options @@ -137,109 +155,113 @@ Ask the automounter to use the debugging options specified in .Ar debug_options from now on. -.It Fl M -Pass a mount map entry to -.Nm amd -and wait for it to be evaluated, possibly causing a mount. -This option is highly insecure. -By default, -.Nm amd -and -.Nm amq -do not support it. -It is necessary to configure -.Nm am-utils -with -.Ar --enable-amq-mount -to enable this option. +.It Fl H +Display short usage message. .It Fl P Ar program_number Contact an alternate running -.Nm amd -that had registered itself on a different RPC +.Xr amd 8 +that had registered itself on a different +.Tn RPC .Ar program_number and apply all other operations to that instance of the automounter. -This is useful when running multiple copies of -.Nm amd , -and need to manage each one separately. +This is +useful when you run multiple copies of +.Xr amd 8 , +and need to manage each +one separately. If not specified, -.Nm amq +.Nm will use the default program number for -.Nm amd , +.Xr amd 8 , 300019. For security reasons, the only alternate program numbers -.Nm amd +.Xr amd 8 can use range from 300019 to 300029, inclusive. .It Fl T Contact -.Nm amd +.Xr amd 8 using the TCP transport only. Normally -.Nm amq -will try TCP, and if that fails, will try UDP. +.Nm +will try TCP, and if that failed, will try UDP. .It Fl U Contact -.Nm amd +.Xr amd 8 using UDP (connectionless) transport only. Normally -.Nm amq -will try TCP, and if that fails, will try UDP. +.Nm +will try TCP, and if that failed, will try UDP. .El .Sh FILES -.Bl -tag -width amq.x -compact +.Bl -tag -width ".Pa amq.x" -compact .It Pa amq.x .Tn RPC protocol description. .El .Sh CAVEATS -.Nm Amq +The +.Nm +utility uses a Sun registered .Tn RPC program number (300019 decimal) which may not be in the -.Pa /etc/rpc +.Xr rpc 5 database. .Pp If the TCP wrappers library is available, and the -.It use_tcpwrappers +.Va use_tcpwrappers global -.It amd.conf +.Xr amd.conf 5 option is set to -.Qq yes , +.Dq Li yes , then -.Nm Amd +.Xr amd 8 will verify that the host running -.Nm Aamq +.Nm is authorized to connect. The -.Nm Amd -service name must used in the +.Dq Li amd +service name must be used in the .Pa /etc/hosts.allow and .Pa /etc/hosts.deny files. For example, to allow only localhost to connect to -.Nm Amd , +.Xr amd 8 , add this line to .Pa /etc/hosts.allow : -.Bd -literal -.nf - amd: localhost -.fi -.Ed +.Pp +.Dl "amd: localhost" .Pp and this line to .Pa /etc/hosts.deny : -.Bd -literal -.nf - amd: ALL -.fi -.Ed +.Pp +.Dl "amd: ALL" .Sh SEE ALSO .Xr amd.conf 5 , .Xr hosts_access 5 , .Xr amd 8 +.Pp +.Dq am-utils +.Xr info 1 +entry. +.Rs +.%A Erez Zadok +.%B "Linux NFS and Automounter Administration" +.%O ISBN 0-7821-2739-8 +.%I Sybex +.%D 2001 +.Re +.Pp +.Pa http://www.am-utils.org/ +.Rs +.%T Amd \- The 4.4 BSD Automounter +.Re .Sh HISTORY -.Nm Amq +The +.Nm +utility first appeared in .Bx 4.4 . .Sh AUTHORS @@ -247,8 +269,10 @@ Department of Computing, Imperial College, London, UK. .Pp .An Erez Zadok Aq ezk@cs.sunysb.edu , +Computer Science Department, Stony Brook +University, Stony Brook, New York, USA. .Pp -.An Other authors and contributors to +Other authors and contributors to .Nm am-utils are listed in the .Pa AUTHORS ==== //depot/projects/hammer/contrib/amd/amq/pawd.1#6 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Dec 9 06:27:41 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9781B16A468; Sun, 9 Dec 2007 06:27:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1A8F616A420 for ; Sun, 9 Dec 2007 06:27:41 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0A2FB13C461 for ; Sun, 9 Dec 2007 06:27:41 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB96RelN017155 for ; Sun, 9 Dec 2007 06:27:40 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB96ReTk017152 for perforce@freebsd.org; Sun, 9 Dec 2007 06:27:40 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 9 Dec 2007 06:27:40 GMT Message-Id: <200712090627.lB96ReTk017152@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 130531 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Dec 2007 06:27:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=130531 Change 130531 by kmacy@kmacy:storage:toestack on 2007/12/09 06:26:59 add interface hook to allow TCP to tell the TOE that the upper level data structures are going away Affected files ... .. //depot/projects/toestack/sys/netinet/tcp_ofld.c#7 edit .. //depot/projects/toestack/sys/netinet/tcp_ofld.h#7 edit .. //depot/projects/toestack/sys/netinet/tcp_subr.c#9 edit Differences ... ==== //depot/projects/toestack/sys/netinet/tcp_ofld.c#7 (text+ko) ==== @@ -88,6 +88,12 @@ } void +ofld_detach(struct tcpcb *tp) +{ + tp->t_tu->tu_detach(tp); +} + +void ofld_listen_open(struct tcpcb *tp) { EVENTHANDLER_INVOKE(ofld_listen, OFLD_LISTEN_OPEN, tp); ==== //depot/projects/toestack/sys/netinet/tcp_ofld.h#7 (text+ko) ==== @@ -12,6 +12,7 @@ int ofld_rcvd(struct tcpcb *tp); int ofld_disconnect(struct tcpcb *tp); int ofld_abort(struct tcpcb *tp); +void ofld_detach(struct tcpcb *tp); void ofld_listen_open(struct tcpcb *tp); void ofld_listen_close(struct tcpcb *tp); @@ -96,6 +97,13 @@ { ofld_listen_close(tp); } + +static __inline void +tcp_gen_detach(struct tcpcb *tp) +{ + ofld_detach(tp); +} + #else static __inline int @@ -134,6 +142,12 @@ static __inline void tcp_gen_listen_close(struct tcpcb *tp) {} +static __inline void +tcp_gen_detach(struct tcpcb *tp) {} + + + + #endif struct toe_usrreqs { @@ -141,6 +155,7 @@ int (*tu_rcvd)(struct tcpcb *tp); int (*tu_disconnect)(struct tcpcb *tp); int (*tu_abort)(struct tcpcb *tp); + void (*tu_detach)(struct tcpcb *tp); }; ==== //depot/projects/toestack/sys/netinet/tcp_subr.c#9 (text+ko) ==== @@ -750,6 +750,9 @@ tp->t_segqlen--; tcp_reass_qsize--; } + if (tp->t_flags & TF_TOE) + tcp_gen_detach(tp); + tcp_free_sackholes(tp); inp->inp_ppcb = NULL; tp->t_inpcb = NULL; From owner-p4-projects@FreeBSD.ORG Sun Dec 9 06:28:42 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B7FFF16A421; Sun, 9 Dec 2007 06:28:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7D7D416A418 for ; Sun, 9 Dec 2007 06:28:42 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 616FC13C455 for ; Sun, 9 Dec 2007 06:28:42 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB96SgoB017219 for ; Sun, 9 Dec 2007 06:28:42 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB96SgXZ017216 for perforce@freebsd.org; Sun, 9 Dec 2007 06:28:42 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 9 Dec 2007 06:28:42 GMT Message-Id: <200712090628.lB96SgXZ017216@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 130532 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Dec 2007 06:28:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=130532 Change 130532 by kmacy@kmacy:storage:toestack on 2007/12/09 06:28:32 fix abort handling to work reliably Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#30 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#30 (text+ko) ==== @@ -141,6 +141,8 @@ extern int tcp_autosndbuf_max; static void t3_send_reset(struct socket *so); +static void send_abort_rpl(struct mbuf *m, struct toedev *tdev, int rst_status); + static inline int is_t3a(const struct toedev *dev) @@ -547,9 +549,18 @@ cxgb_toe_abort(struct tcpcb *tp) { struct socket *so; - + struct toepcb *toep; + so = tp->t_inpcb->inp_socket; t3_send_reset(so); + + /* + * unhook from socket + */ + tp->t_flags &= ~TF_TOE; + toep = tp->t_toe; + toep->tp_tp = NULL; + tp->t_toe = NULL; return (0); } @@ -575,11 +586,27 @@ return (0); } +static void +cxgb_toe_detach(struct tcpcb *tp) +{ + struct toepcb *toep; + + /* + * unhook from socket + */ + tp->t_flags &= ~TF_TOE; + toep = tp->t_toe; + toep->tp_tp = NULL; + tp->t_toe = NULL; +} + + static struct toe_usrreqs cxgb_toe_usrreqs = { .tu_disconnect = cxgb_toe_disconnect, .tu_abort = cxgb_toe_abort, .tu_send = cxgb_toe_send, .tu_rcvd = cxgb_toe_rcvd, + .tu_detach = cxgb_toe_detach, }; @@ -870,6 +897,7 @@ l2t_release(L2DATA(cdev), toep->tp_l2t); toep->tp_l2t = NULL; } + printf("setting toep->tp_tp to NULL\n"); toep->tp_tp = NULL; tp->t_toe = NULL; @@ -1145,15 +1173,14 @@ do_act_open_rpl(struct t3cdev *cdev, struct mbuf *m, void *ctx) { struct toepcb *toep = (struct toepcb *)ctx; - struct socket *so; - - so = toeptoso(toep); + struct socket *so = NULL; + struct cpl_act_open_rpl *rpl = cplhdr(m); - struct cpl_act_open_rpl *rpl = cplhdr(m); - if (cdev->type != T3A && act_open_has_tid(rpl->status)) cxgb_queue_tid_release(cdev, GET_TID(rpl)); - + if (toep->tp_tp != NULL) + so = toeptoso(toep); + active_open_failed(so, m); return (0); } @@ -1232,17 +1259,21 @@ soisconnecting(so); toep = tp->t_toe; m_set_toep(m, tp->t_toe); - - DPRINTF("toep=%p toep->tp_tp=%p\n", toep, toep->tp_tp); + + printf("sending off request\n"); l2t_send(d->cdev, (struct mbuf *)m, e); + if (toep->tp_ulp_mode) t3_enable_ddp(so, 0); return (0); free_tid: + printf("failing connect - free atid\n"); + free_atid(d->cdev, atid); out_err: + printf("return ENOMEM\n"); return (ENOMEM); } @@ -1938,6 +1969,9 @@ INP_LOCK(tp->t_inpcb); if (toep->tp_flags & TP_ABORT_RPL_PENDING) { + /* + * XXX panic on tcpdrop + */ if (!(toep->tp_flags & TP_ABORT_RPL_RCVD) && !is_t3a(TOE_DEV(so))) toep->tp_flags |= TP_ABORT_RPL_RCVD; else { @@ -1994,7 +2028,20 @@ if (!toep) goto discard; - so = toeptoso(toep); + if (toep->tp_tp == NULL) { + printf("removing tid for abort\n"); + cxgb_remove_tid(cdev, toep, toep->tp_tid); + if (toep->tp_l2t) + l2t_release(L2DATA(cdev), toep->tp_l2t); + + toepcb_release(toep); + goto discard; + } + + printf("toep=%p\n", toep); + printf("tp=%p\n", toep->tp_tp); + + so = toeptoso(toep); /* <- XXX panic */ toepcb_hold(toep); process_abort_rpl(so, m); toepcb_release(toep); @@ -2243,8 +2290,9 @@ printf("aborting tid=%d\n", toep->tp_tid); - if (toep->tp_flags & TP_SYN_RCVD) { + if ((toep->tp_flags & (TP_SYN_RCVD|TP_ABORT_REQ_RCVD)) == TP_SYN_RCVD) { cxgb_remove_tid(cdev, toep, toep->tp_tid); + toep->tp_flags |= TP_ABORT_REQ_RCVD; printf("sending abort rpl\n"); send_abort_rpl(m, toep->tp_toedev, CPL_ABORT_NO_RST); @@ -2253,11 +2301,16 @@ l2t_release(L2DATA(cdev), toep->tp_l2t); /* + * Unhook + */ + toep->tp_tp->t_toe = NULL; + toep->tp_tp->t_flags &= ~TF_TOE; + toep->tp_tp = NULL; + /* * XXX need to call syncache_chkrst - but we don't * have a way of doing that yet */ toepcb_release(toep); - printf("abort for unestablished connection :-(\n"); return (0); } @@ -2654,7 +2707,7 @@ newtoep->tp_flags = TP_SYN_RCVD; newtoep->tp_tid = tid; newtoep->tp_toedev = tdev; - + printf("inserting tid=%d\n", tid); cxgb_insert_tid(cdev, d->client, newtoep, tid); @@ -2945,6 +2998,7 @@ so->so_snd.sb_flags |= SB_TOE; so->so_rcv.sb_flags |= SB_TOE; toep->tp_tp = tp; + toep->tp_flags = 0; tp->t_toe = toep; reset_wr_list(tp); tp->rcv_wnd = select_rcv_wnd(so); From owner-p4-projects@FreeBSD.ORG Sun Dec 9 07:03:23 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D533516A41B; Sun, 9 Dec 2007 07:03:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6CC0216A419 for ; Sun, 9 Dec 2007 07:03:22 +0000 (UTC) (envelope-from delphij@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 59E4C13C447 for ; Sun, 9 Dec 2007 07:03:22 +0000 (UTC) (envelope-from delphij@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB973MW8023886 for ; Sun, 9 Dec 2007 07:03:22 GMT (envelope-from delphij@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB973Jug023839 for perforce@freebsd.org; Sun, 9 Dec 2007 07:03:19 GMT (envelope-from delphij@freebsd.org) Date: Sun, 9 Dec 2007 07:03:19 GMT Message-Id: <200712090703.lB973Jug023839@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to delphij@freebsd.org using -f From: Xin LI To: Perforce Change Reviews Cc: Subject: PERFORCE change 130534 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Dec 2007 07:03:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=130534 Change 130534 by delphij@charlie on 2007/12/09 07:03:09 IFC Affected files ... .. //depot/projects/delphij_fork/bin/ed/Makefile#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/DAEMON#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/LOGIN#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/Makefile#5 integrate .. //depot/projects/delphij_fork/etc/rc.d/NETWORKING#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/SERVERS#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/accounting#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/amd#3 integrate .. //depot/projects/delphij_fork/etc/rc.d/apmd#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/bootconf.sh#2 delete .. //depot/projects/delphij_fork/etc/rc.d/bootparams#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/ccd#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/cron#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/dhclient#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/dmesg#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/fsck#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/ftp-proxy#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/inetd#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/ipfilter#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/ipfs#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/ipmon#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/ipnat#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/ipsec#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/isdnd#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/keyserv#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/ldconfig#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/local#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/lockd#4 integrate .. //depot/projects/delphij_fork/etc/rc.d/lpd#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/motd#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/mountcritlocal#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/mountcritremote#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/mountd#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/moused#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/mrouted#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/newsyslog#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/nfsd#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/power_profile#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/pwcheck#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/quota#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/rarpd#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/resolv#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/root#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/route6d#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/routed#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/rpcbind#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/rtadvd#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/rwho#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/savecore#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/securelevel#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/sendmail#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/sshd#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/statd#3 integrate .. //depot/projects/delphij_fork/etc/rc.d/swap1#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/sysctl#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/syslogd#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/timed#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/tmp#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/ugidfw#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/var#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/virecover#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/ypbind#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/yppasswdd#2 integrate .. //depot/projects/delphij_fork/etc/rc.d/ypserv#2 integrate .. //depot/projects/delphij_fork/games/fortune/datfiles/fortunes#5 integrate .. //depot/projects/delphij_fork/games/fortune/datfiles/fortunes-o.real#4 integrate .. //depot/projects/delphij_fork/games/fortune/datfiles/fortunes-o.sp.ok#3 integrate .. //depot/projects/delphij_fork/games/fortune/datfiles/fortunes.sp.ok#3 integrate .. //depot/projects/delphij_fork/games/fortune/datfiles/freebsd-tips#3 integrate .. //depot/projects/delphij_fork/lib/libc/sys/access.2#2 integrate .. //depot/projects/delphij_fork/release/Makefile#9 integrate .. //depot/projects/delphij_fork/sbin/bsdlabel/bsdlabel.8#2 integrate .. //depot/projects/delphij_fork/sbin/newfs_msdos/newfs_msdos.8#2 integrate .. //depot/projects/delphij_fork/share/man/man4/nve.4#2 integrate .. //depot/projects/delphij_fork/share/man/man5/hosts.equiv.5#2 integrate .. //depot/projects/delphij_fork/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/delphij_fork/sys/amd64/amd64/pmap.c#6 integrate .. //depot/projects/delphij_fork/sys/amd64/include/specialreg.h#3 integrate .. //depot/projects/delphij_fork/sys/compat/freebsd32/freebsd32_misc.c#5 integrate .. //depot/projects/delphij_fork/sys/dev/arcmsr/arcmsr.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/arcmsr/arcmsr.h#2 integrate .. //depot/projects/delphij_fork/sys/dev/re/if_re.c#10 integrate .. //depot/projects/delphij_fork/sys/geom/part/g_part.c#4 integrate .. //depot/projects/delphij_fork/sys/geom/part/g_part_bsd.c#2 integrate .. //depot/projects/delphij_fork/sys/pci/if_rlreg.h#5 integrate .. //depot/projects/delphij_fork/sys/sys/disklabel.h#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pkg_install/Makefile#3 integrate .. //depot/projects/delphij_fork/usr.sbin/pkg_install/add/pkg_add.1#3 integrate .. //depot/projects/delphij_fork/usr.sbin/pkg_install/create/pkg_create.1#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pkg_install/delete/pkg_delete.1#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pkg_install/info/pkg_info.1#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pkg_install/search/Makefile#1 branch .. //depot/projects/delphij_fork/usr.sbin/pkg_install/search/pkg_search.1#1 branch .. //depot/projects/delphij_fork/usr.sbin/pkg_install/search/pkg_search.sh#1 branch .. //depot/projects/delphij_fork/usr.sbin/pkg_install/updating/pkg_updating.1#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pkg_install/version/pkg_version.1#2 integrate .. //depot/projects/delphij_fork/usr.sbin/sysinstall/media.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/sysinstall/system.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/timed/timed/timed.8#2 integrate .. //depot/user/howardsu/truss/bin/ed/Makefile#3 integrate .. //depot/user/howardsu/truss/etc/rc.d/DAEMON#2 integrate .. //depot/user/howardsu/truss/etc/rc.d/LOGIN#2 integrate .. //depot/user/howardsu/truss/etc/rc.d/Makefile#10 integrate .. //depot/user/howardsu/truss/etc/rc.d/NETWORKING#4 integrate .. //depot/user/howardsu/truss/etc/rc.d/SERVERS#2 integrate .. //depot/user/howardsu/truss/etc/rc.d/accounting#3 integrate .. //depot/user/howardsu/truss/etc/rc.d/amd#4 integrate .. //depot/user/howardsu/truss/etc/rc.d/apmd#2 integrate .. //depot/user/howardsu/truss/etc/rc.d/bootconf.sh#4 delete .. //depot/user/howardsu/truss/etc/rc.d/bootparams#2 integrate .. //depot/user/howardsu/truss/etc/rc.d/ccd#2 integrate .. //depot/user/howardsu/truss/etc/rc.d/cron#2 integrate .. //depot/user/howardsu/truss/etc/rc.d/dhclient#4 integrate .. //depot/user/howardsu/truss/etc/rc.d/dmesg#2 integrate .. //depot/user/howardsu/truss/etc/rc.d/fsck#3 integrate .. //depot/user/howardsu/truss/etc/rc.d/ftp-proxy#2 integrate .. //depot/user/howardsu/truss/etc/rc.d/inetd#2 integrate .. //depot/user/howardsu/truss/etc/rc.d/ipfilter#5 integrate .. //depot/user/howardsu/truss/etc/rc.d/ipfs#2 integrate .. //depot/user/howardsu/truss/etc/rc.d/ipmon#3 integrate .. //depot/user/howardsu/truss/etc/rc.d/ipnat#3 integrate .. //depot/user/howardsu/truss/etc/rc.d/ipsec#5 integrate .. //depot/user/howardsu/truss/etc/rc.d/isdnd#4 integrate .. //depot/user/howardsu/truss/etc/rc.d/keyserv#2 integrate .. //depot/user/howardsu/truss/etc/rc.d/ldconfig#3 integrate .. //depot/user/howardsu/truss/etc/rc.d/local#2 integrate .. //depot/user/howardsu/truss/etc/rc.d/lockd#3 integrate .. //depot/user/howardsu/truss/etc/rc.d/lpd#3 integrate .. //depot/user/howardsu/truss/etc/rc.d/motd#2 integrate .. //depot/user/howardsu/truss/etc/rc.d/mountcritlocal#3 integrate .. //depot/user/howardsu/truss/etc/rc.d/mountcritremote#5 integrate .. //depot/user/howardsu/truss/etc/rc.d/mountd#4 integrate .. //depot/user/howardsu/truss/etc/rc.d/moused#3 integrate .. //depot/user/howardsu/truss/etc/rc.d/mrouted#3 integrate .. //depot/user/howardsu/truss/etc/rc.d/newsyslog#2 integrate .. //depot/user/howardsu/truss/etc/rc.d/nfsd#2 integrate .. //depot/user/howardsu/truss/etc/rc.d/power_profile#4 integrate .. //depot/user/howardsu/truss/etc/rc.d/pwcheck#2 integrate .. //depot/user/howardsu/truss/etc/rc.d/quota#3 integrate .. //depot/user/howardsu/truss/etc/rc.d/rarpd#2 integrate .. //depot/user/howardsu/truss/etc/rc.d/resolv#3 integrate .. //depot/user/howardsu/truss/etc/rc.d/root#3 integrate .. //depot/user/howardsu/truss/etc/rc.d/route6d#2 integrate .. //depot/user/howardsu/truss/etc/rc.d/routed#2 integrate .. //depot/user/howardsu/truss/etc/rc.d/rpcbind#2 integrate .. //depot/user/howardsu/truss/etc/rc.d/rtadvd#2 integrate .. //depot/user/howardsu/truss/etc/rc.d/rwho#2 integrate .. //depot/user/howardsu/truss/etc/rc.d/savecore#2 integrate .. //depot/user/howardsu/truss/etc/rc.d/securelevel#2 integrate .. //depot/user/howardsu/truss/etc/rc.d/sendmail#3 integrate .. //depot/user/howardsu/truss/etc/rc.d/sshd#2 integrate .. //depot/user/howardsu/truss/etc/rc.d/statd#3 integrate .. //depot/user/howardsu/truss/etc/rc.d/swap1#2 integrate .. //depot/user/howardsu/truss/etc/rc.d/sysctl#2 integrate .. //depot/user/howardsu/truss/etc/rc.d/syslogd#3 integrate .. //depot/user/howardsu/truss/etc/rc.d/timed#2 integrate .. //depot/user/howardsu/truss/etc/rc.d/tmp#3 integrate .. //depot/user/howardsu/truss/etc/rc.d/ugidfw#3 integrate .. //depot/user/howardsu/truss/etc/rc.d/var#5 integrate .. //depot/user/howardsu/truss/etc/rc.d/virecover#2 integrate .. //depot/user/howardsu/truss/etc/rc.d/ypbind#3 integrate .. //depot/user/howardsu/truss/etc/rc.d/yppasswdd#3 integrate .. //depot/user/howardsu/truss/etc/rc.d/ypserv#3 integrate .. //depot/user/howardsu/truss/games/fortune/datfiles/fortunes#10 integrate .. //depot/user/howardsu/truss/games/fortune/datfiles/fortunes-o.real#6 integrate .. //depot/user/howardsu/truss/games/fortune/datfiles/fortunes-o.sp.ok#3 integrate .. //depot/user/howardsu/truss/games/fortune/datfiles/fortunes.sp.ok#4 integrate .. //depot/user/howardsu/truss/games/fortune/datfiles/freebsd-tips#4 integrate .. //depot/user/howardsu/truss/lib/libc/sys/access.2#3 integrate .. //depot/user/howardsu/truss/release/Makefile#11 integrate .. //depot/user/howardsu/truss/sbin/bsdlabel/bsdlabel.8#3 integrate .. //depot/user/howardsu/truss/sbin/newfs_msdos/newfs_msdos.8#2 integrate .. //depot/user/howardsu/truss/share/man/man4/nve.4#3 integrate .. //depot/user/howardsu/truss/share/man/man5/hosts.equiv.5#3 integrate .. //depot/user/howardsu/truss/sys/amd64/amd64/identcpu.c#5 integrate .. //depot/user/howardsu/truss/sys/amd64/amd64/pmap.c#14 integrate .. //depot/user/howardsu/truss/sys/amd64/include/specialreg.h#5 integrate .. //depot/user/howardsu/truss/sys/compat/freebsd32/freebsd32_misc.c#10 integrate .. //depot/user/howardsu/truss/sys/dev/arcmsr/arcmsr.c#7 integrate .. //depot/user/howardsu/truss/sys/dev/arcmsr/arcmsr.h#3 integrate .. //depot/user/howardsu/truss/sys/dev/re/if_re.c#14 integrate .. //depot/user/howardsu/truss/sys/geom/part/g_part.c#9 integrate .. //depot/user/howardsu/truss/sys/geom/part/g_part_bsd.c#2 integrate .. //depot/user/howardsu/truss/sys/pci/if_rlreg.h#7 integrate .. //depot/user/howardsu/truss/sys/sys/disklabel.h#2 integrate .. //depot/user/howardsu/truss/usr.sbin/pkg_install/Makefile#3 integrate .. //depot/user/howardsu/truss/usr.sbin/pkg_install/add/pkg_add.1#3 integrate .. //depot/user/howardsu/truss/usr.sbin/pkg_install/create/pkg_create.1#2 integrate .. //depot/user/howardsu/truss/usr.sbin/pkg_install/delete/pkg_delete.1#2 integrate .. //depot/user/howardsu/truss/usr.sbin/pkg_install/info/pkg_info.1#3 integrate .. //depot/user/howardsu/truss/usr.sbin/pkg_install/search/Makefile#1 branch .. //depot/user/howardsu/truss/usr.sbin/pkg_install/search/pkg_search.1#1 branch .. //depot/user/howardsu/truss/usr.sbin/pkg_install/search/pkg_search.sh#1 branch .. //depot/user/howardsu/truss/usr.sbin/pkg_install/updating/pkg_updating.1#2 integrate .. //depot/user/howardsu/truss/usr.sbin/pkg_install/version/pkg_version.1#2 integrate .. //depot/user/howardsu/truss/usr.sbin/sysinstall/media.c#2 integrate .. //depot/user/howardsu/truss/usr.sbin/sysinstall/system.c#4 integrate .. //depot/user/howardsu/truss/usr.sbin/timed/timed/timed.8#2 integrate Differences ... ==== //depot/projects/delphij_fork/bin/ed/Makefile#2 (text+ko) ==== @@ -1,16 +1,16 @@ -# $FreeBSD: src/bin/ed/Makefile,v 1.33 2007/07/02 14:00:25 kensmith Exp $ +# $FreeBSD: src/bin/ed/Makefile,v 1.34 2007/12/09 00:14:27 marius Exp $ .include PROG= ed SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c +WARNS?= 2 LINKS= ${BINDIR}/ed ${BINDIR}/red MLINKS= ed.1 red.1 .if !defined(RELEASE_CRUNCH) .if ${MK_OPENSSL} != "no" CFLAGS+=-DDES -WARNS?= 2 DPADD= ${LIBCRYPTO} LDADD= -lcrypto .endif ==== //depot/projects/delphij_fork/etc/rc.d/DAEMON#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: DAEMON,v 1.8 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/DAEMON,v 1.5 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/DAEMON,v 1.6 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: DAEMON ==== //depot/projects/delphij_fork/etc/rc.d/LOGIN#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: LOGIN,v 1.7 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/LOGIN,v 1.5 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/LOGIN,v 1.6 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: LOGIN ==== //depot/projects/delphij_fork/etc/rc.d/Makefile#5 (text+ko) ==== @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.87 2007/10/25 18:10:05 mtm Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.88 2007/12/08 07:20:22 dougb Exp $ .include ==== //depot/projects/delphij_fork/etc/rc.d/NETWORKING#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: NETWORKING,v 1.2 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/NETWORKING,v 1.13 2007/06/02 05:25:19 dougb Exp $ +# $FreeBSD: src/etc/rc.d/NETWORKING,v 1.14 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: NETWORKING NETWORK ==== //depot/projects/delphij_fork/etc/rc.d/SERVERS#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: SERVERS,v 1.9 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/SERVERS,v 1.7 2006/04/19 05:10:34 delphij Exp $ +# $FreeBSD: src/etc/rc.d/SERVERS,v 1.8 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: SERVERS ==== //depot/projects/delphij_fork/etc/rc.d/accounting#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: accounting,v 1.7 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/accounting,v 1.10 2006/12/30 22:53:20 yar Exp $ +# $FreeBSD: src/etc/rc.d/accounting,v 1.11 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: accounting ==== //depot/projects/delphij_fork/etc/rc.d/amd#3 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: amd,v 1.10 2002/04/29 12:08:17 lukem Exp $ -# $FreeBSD: src/etc/rc.d/amd,v 1.20 2007/10/25 16:59:06 mtm Exp $ +# $FreeBSD: src/etc/rc.d/amd,v 1.21 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: amd ==== //depot/projects/delphij_fork/etc/rc.d/apmd#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: apmd,v 1.5 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/apmd,v 1.12 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/apmd,v 1.13 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: apmd ==== //depot/projects/delphij_fork/etc/rc.d/bootparams#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: bootparams,v 1.6 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/bootparams,v 1.7 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/bootparams,v 1.8 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: bootparams ==== //depot/projects/delphij_fork/etc/rc.d/ccd#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: ccd,v 1.3 2000/05/13 08:45:06 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ccd,v 1.5 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ccd,v 1.6 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: disks ==== //depot/projects/delphij_fork/etc/rc.d/cron#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: cron,v 1.5 2000/09/19 13:04:38 lukem Exp $ -# $FreeBSD: src/etc/rc.d/cron,v 1.7 2005/01/16 03:12:03 obrien Exp $ +# $FreeBSD: src/etc/rc.d/cron,v 1.8 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: cron ==== //depot/projects/delphij_fork/etc/rc.d/dhclient#2 (text+ko) ==== @@ -1,12 +1,10 @@ #!/bin/sh # -# $NetBSD: dhclient,v 1.8 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/dhclient,v 1.28 2007/03/25 19:45:20 mtm Exp $ +# $FreeBSD: src/etc/rc.d/dhclient,v 1.30 2007/12/08 22:27:18 dougb Exp $ # # PROVIDE: dhclient # KEYWORD: nojail nostart -# . /etc/rc.subr . /etc/network.subr ==== //depot/projects/delphij_fork/etc/rc.d/dmesg#2 (text+ko) ==== @@ -1,13 +1,12 @@ #!/bin/sh # -# $NetBSD: dmesg,v 1.8 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/dmesg,v 1.5 2005/01/16 03:12:03 obrien Exp $ +# $FreeBSD: src/etc/rc.d/dmesg,v 1.7 2007/12/08 22:40:31 dougb Exp $ # # PROVIDE: dmesg # REQUIRE: mountcritremote cleanvar # BEFORE: DAEMON -# KEYWORD: Daemon nojail +# KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/delphij_fork/etc/rc.d/fsck#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: fsck,v 1.2 2001/06/18 06:42:35 lukem Exp $ -# $FreeBSD: src/etc/rc.d/fsck,v 1.11 2007/05/18 12:04:41 mtm Exp $ +# $FreeBSD: src/etc/rc.d/fsck,v 1.12 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: fsck ==== //depot/projects/delphij_fork/etc/rc.d/ftp-proxy#2 (text+ko) ==== @@ -1,11 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ftp-proxy,v 1.1 2007/09/06 21:00:48 mlaier Exp $ +# $FreeBSD: src/etc/rc.d/ftp-proxy,v 1.2 2007/12/08 22:27:18 dougb Exp $ # # PROVIDE: ftp-proxy # REQUIRE: DAEMON pf -# . /etc/rc.subr ==== //depot/projects/delphij_fork/etc/rc.d/inetd#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: inetd,v 1.6 2000/09/19 13:04:38 lukem Exp $ -# $FreeBSD: src/etc/rc.d/inetd,v 1.5 2005/01/16 03:12:03 obrien Exp $ +# $FreeBSD: src/etc/rc.d/inetd,v 1.6 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: inetd ==== //depot/projects/delphij_fork/etc/rc.d/ipfilter#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: ipfilter,v 1.10 2001/02/28 17:03:50 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipfilter,v 1.28 2007/04/09 08:53:40 des Exp $ +# $FreeBSD: src/etc/rc.d/ipfilter,v 1.29 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: ipfilter ==== //depot/projects/delphij_fork/etc/rc.d/ipfs#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: ipfs,v 1.3 2002/02/11 13:55:42 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipfs,v 1.6 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ipfs,v 1.7 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: ipfs ==== //depot/projects/delphij_fork/etc/rc.d/ipmon#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: ipmon,v 1.9 2002/04/18 05:02:01 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipmon,v 1.15 2007/04/02 22:53:07 des Exp $ +# $FreeBSD: src/etc/rc.d/ipmon,v 1.16 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: ipmon ==== //depot/projects/delphij_fork/etc/rc.d/ipnat#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: ipnat,v 1.6 2000/09/19 13:04:38 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipnat,v 1.15 2006/12/31 10:37:18 yar Exp $ +# $FreeBSD: src/etc/rc.d/ipnat,v 1.16 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: ipnat ==== //depot/projects/delphij_fork/etc/rc.d/ipsec#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: ipsec,v 1.7 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/ipsec,v 1.19 2007/05/18 12:04:41 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ipsec,v 1.20 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: ipsec ==== //depot/projects/delphij_fork/etc/rc.d/isdnd#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: isdnd,v 1.9 2002/04/10 23:37:13 martin Exp $ -# $FreeBSD: src/etc/rc.d/isdnd,v 1.23 2007/04/02 22:53:07 des Exp $ +# $FreeBSD: src/etc/rc.d/isdnd,v 1.24 2007/12/08 07:20:22 dougb Exp $ # # Mostly based on original script (/etc/rc.isdn) written by Hellmuth Michaelis # ==== //depot/projects/delphij_fork/etc/rc.d/keyserv#2 (text+ko) ==== @@ -1,10 +1,9 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/keyserv,v 1.3 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/keyserv,v 1.4 2007/12/08 22:27:18 dougb Exp $ # # Start keyserv if we are running Secure RPC -# # PROVIDE: keyserv # REQUIRE: ypbind ==== //depot/projects/delphij_fork/etc/rc.d/ldconfig#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: ldconfig,v 1.5 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/ldconfig,v 1.17 2006/12/30 22:53:20 yar Exp $ +# $FreeBSD: src/etc/rc.d/ldconfig,v 1.18 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: ldconfig ==== //depot/projects/delphij_fork/etc/rc.d/local#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: local,v 1.6 2002/03/22 04:33:59 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/local,v 1.6 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/local,v 1.7 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: local ==== //depot/projects/delphij_fork/etc/rc.d/lockd#4 (text+ko) ==== @@ -1,8 +1,7 @@ #!/bin/sh # -# $NetBSD: nfslocking,v 1.6 2002/03/24 15:52:41 lukem Exp $ # FreeBSD History: src/etc/rc.d/nfslocking,v 1.11 2004/10/07 13:55:26 mtm -# $FreeBSD: src/etc/rc.d/lockd,v 1.18 2007/09/03 02:02:31 mtm Exp $ +# $FreeBSD: src/etc/rc.d/lockd,v 1.19 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: lockd ==== //depot/projects/delphij_fork/etc/rc.d/lpd#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: lpd,v 1.5 2002/03/22 04:33:59 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/lpd,v 1.8 2006/12/30 22:53:20 yar Exp $ +# $FreeBSD: src/etc/rc.d/lpd,v 1.9 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: lpd ==== //depot/projects/delphij_fork/etc/rc.d/motd#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: motd,v 1.5 2000/09/19 13:04:38 lukem Exp $ -# $FreeBSD: src/etc/rc.d/motd,v 1.9 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/motd,v 1.10 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: motd ==== //depot/projects/delphij_fork/etc/rc.d/mountcritlocal#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: mountcritlocal,v 1.7 2002/04/29 12:29:53 lukem Exp $ -# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.14 2007/05/18 12:04:41 mtm Exp $ +# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.15 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: mountcritlocal ==== //depot/projects/delphij_fork/etc/rc.d/mountcritremote#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: mountcritremote,v 1.7 2002/04/29 12:29:53 lukem Exp $ -# $FreeBSD: src/etc/rc.d/mountcritremote,v 1.16 2007/04/09 08:53:40 des Exp $ +# $FreeBSD: src/etc/rc.d/mountcritremote,v 1.17 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: mountcritremote ==== //depot/projects/delphij_fork/etc/rc.d/mountd#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: mountd,v 1.11 2002/01/31 01:26:06 lukem Exp $ -# $FreeBSD: src/etc/rc.d/mountd,v 1.19 2007/04/13 10:29:25 pjd Exp $ +# $FreeBSD: src/etc/rc.d/mountd,v 1.20 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: mountd ==== //depot/projects/delphij_fork/etc/rc.d/moused#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: moused,v 1.1 2001/10/29 23:25:01 augustss Exp $ -# $FreeBSD: src/etc/rc.d/moused,v 1.11 2006/12/30 22:53:20 yar Exp $ +# $FreeBSD: src/etc/rc.d/moused,v 1.12 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: moused ==== //depot/projects/delphij_fork/etc/rc.d/mrouted#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: mrouted,v 1.6 2002/03/22 04:33:59 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/mrouted,v 1.10 2006/09/29 15:45:10 bms Exp $ +# $FreeBSD: src/etc/rc.d/mrouted,v 1.11 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: mrouted ==== //depot/projects/delphij_fork/etc/rc.d/newsyslog#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: newsyslog,v 1.5 2002/03/24 15:51:26 lukem Exp $ -# $FreeBSD: src/etc/rc.d/newsyslog,v 1.5 2005/12/21 09:54:15 dougb Exp $ +# $FreeBSD: src/etc/rc.d/newsyslog,v 1.6 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: newsyslog ==== //depot/projects/delphij_fork/etc/rc.d/nfsd#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: nfsd,v 1.4 2001/06/16 06:13:10 lukem Exp $ -# $FreeBSD: src/etc/rc.d/nfsd,v 1.13 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/nfsd,v 1.14 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: nfsd ==== //depot/projects/delphij_fork/etc/rc.d/power_profile#2 (text+ko) ==== @@ -5,7 +5,7 @@ # # Arguments: 0x00 (AC offline, economy) or 0x01 (AC online, performance) # -# $FreeBSD: src/etc/rc.d/power_profile,v 1.11 2007/04/02 22:53:07 des Exp $ +# $FreeBSD: src/etc/rc.d/power_profile,v 1.12 2007/12/08 23:00:28 dougb Exp $ # # PROVIDE: power_profile @@ -15,6 +15,7 @@ . /etc/rc.subr name="power_profile" +stop_cmd=':' LOGGER="logger -t power_profile -p daemon.notice" # Set a given sysctl node to a value. ==== //depot/projects/delphij_fork/etc/rc.d/pwcheck#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: pwcheck,v 1.4 2002/03/22 04:33:59 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/pwcheck,v 1.4 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/pwcheck,v 1.5 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: pwcheck ==== //depot/projects/delphij_fork/etc/rc.d/quota#2 (text+ko) ==== @@ -1,10 +1,9 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/quota,v 1.6 2007/01/20 04:24:20 mpp Exp $ +# $FreeBSD: src/etc/rc.d/quota,v 1.7 2007/12/08 22:27:18 dougb Exp $ # # Enable/Check the quotas (must be after ypbind if using NIS) -# # PROVIDE: quota # REQUIRE: mountcritremote ==== //depot/projects/delphij_fork/etc/rc.d/rarpd#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: rarpd,v 1.5 2002/03/22 04:33:59 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/rarpd,v 1.6 2005/01/16 03:12:03 obrien Exp $ +# $FreeBSD: src/etc/rc.d/rarpd,v 1.7 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: rarpd ==== //depot/projects/delphij_fork/etc/rc.d/resolv#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/resolv,v 1.37 2007/06/02 05:24:39 dougb Exp $ +# $FreeBSD: src/etc/rc.d/resolv,v 1.38 2007/12/08 23:00:28 dougb Exp $ # # PROVIDE: resolv @@ -34,6 +34,7 @@ . /etc/rc.subr name="resolv" +stop_cmd=':' load_rc_config $name ==== //depot/projects/delphij_fork/etc/rc.d/root#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: root,v 1.2 2000/05/13 08:45:09 lukem Exp $ -# $FreeBSD: src/etc/rc.d/root,v 1.15 2007/05/18 12:04:41 mtm Exp $ +# $FreeBSD: src/etc/rc.d/root,v 1.16 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: root ==== //depot/projects/delphij_fork/etc/rc.d/route6d#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: route6d,v 1.5 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/route6d,v 1.9 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/route6d,v 1.10 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: route6d ==== //depot/projects/delphij_fork/etc/rc.d/routed#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: routed,v 1.7 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/routed,v 1.12 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/routed,v 1.13 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: routed ==== //depot/projects/delphij_fork/etc/rc.d/rpcbind#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: rpcbind,v 1.6 2002/01/31 01:26:06 lukem Exp $ -# $FreeBSD: src/etc/rc.d/rpcbind,v 1.12 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/rpcbind,v 1.13 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: rpcbind ==== //depot/projects/delphij_fork/etc/rc.d/rtadvd#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: rtadvd,v 1.5 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/rtadvd,v 1.10 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/rtadvd,v 1.11 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: rtadvd ==== //depot/projects/delphij_fork/etc/rc.d/rwho#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: rwho,v 1.5 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/rwho,v 1.4 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/rwho,v 1.5 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: rwho ==== //depot/projects/delphij_fork/etc/rc.d/savecore#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: savecore,v 1.5 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/savecore,v 1.10 2004/10/24 13:04:09 des Exp $ +# $FreeBSD: src/etc/rc.d/savecore,v 1.11 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: savecore ==== //depot/projects/delphij_fork/etc/rc.d/securelevel#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: securelevel,v 1.4 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/securelevel,v 1.10 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/securelevel,v 1.11 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: securelevel ==== //depot/projects/delphij_fork/etc/rc.d/sendmail#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: sendmail,v 1.14 2002/02/12 01:26:36 lukem Exp $ -# $FreeBSD: src/etc/rc.d/sendmail,v 1.17 2007/06/12 17:33:23 gshapiro Exp $ +# $FreeBSD: src/etc/rc.d/sendmail,v 1.18 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: mail ==== //depot/projects/delphij_fork/etc/rc.d/sshd#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: sshd,v 1.18 2002/04/29 08:23:34 lukem Exp $ -# $FreeBSD: src/etc/rc.d/sshd,v 1.12 2006/08/22 11:17:28 flz Exp $ +# $FreeBSD: src/etc/rc.d/sshd,v 1.13 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: sshd ==== //depot/projects/delphij_fork/etc/rc.d/statd#3 (text+ko) ==== @@ -1,8 +1,7 @@ #!/bin/sh # -# $NetBSD: nfslocking,v 1.6 2002/03/24 15:52:41 lukem Exp $ # FreeBSD History: src/etc/rc.d/nfslocking,v 1.11 2004/10/07 13:55:26 mtm Exp -# $FreeBSD: src/etc/rc.d/statd,v 1.17 2007/08/18 04:08:53 mtm Exp $ +# $FreeBSD: src/etc/rc.d/statd,v 1.18 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: statd ==== //depot/projects/delphij_fork/etc/rc.d/swap1#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: swap1,v 1.8 2002/03/24 15:52:41 lukem Exp $ -# $FreeBSD: src/etc/rc.d/swap1,v 1.9 2004/11/05 12:38:27 pjd Exp $ +# $FreeBSD: src/etc/rc.d/swap1,v 1.10 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: localswap ==== //depot/projects/delphij_fork/etc/rc.d/sysctl#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: sysctl,v 1.12 2002/04/29 12:10:23 lukem Exp $ -# $FreeBSD: src/etc/rc.d/sysctl,v 1.17 2006/05/24 11:36:48 glebius Exp $ +# $FreeBSD: src/etc/rc.d/sysctl,v 1.18 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: sysctl ==== //depot/projects/delphij_fork/etc/rc.d/syslogd#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: syslogd,v 1.12 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/syslogd,v 1.12 2006/12/30 22:53:20 yar Exp $ +# $FreeBSD: src/etc/rc.d/syslogd,v 1.13 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: syslogd ==== //depot/projects/delphij_fork/etc/rc.d/timed#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: timed,v 1.5 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/timed,v 1.5 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/timed,v 1.6 2007/12/08 07:20:23 dougb Exp $ # # PROVIDE: timed ==== //depot/projects/delphij_fork/etc/rc.d/tmp#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/tmp,v 1.38 2007/05/24 05:54:37 rse Exp $ +# $FreeBSD: src/etc/rc.d/tmp,v 1.39 2007/12/08 23:00:28 dougb Exp $ # # PROVIDE: tmp @@ -33,6 +33,7 @@ . /etc/rc.subr name="tmp" +stop_cmd=':' load_rc_config $name ==== //depot/projects/delphij_fork/etc/rc.d/ugidfw#2 (text+ko) ==== @@ -1,9 +1,8 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ugidfw,v 1.5 2006/12/31 10:37:18 yar Exp $ +# $FreeBSD: src/etc/rc.d/ugidfw,v 1.6 2007/12/08 22:26:30 dougb Exp $ # PROVIDE: ugidfw -# REQUIRE: # BEFORE: LOGIN # KEYWORD: nojail ==== //depot/projects/delphij_fork/etc/rc.d/var#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/var,v 1.43 2007/05/24 05:54:37 rse Exp $ +# $FreeBSD: src/etc/rc.d/var,v 1.44 2007/12/08 23:00:28 dougb Exp $ # # PROVIDE: var @@ -33,6 +33,7 @@ . /etc/rc.subr name="var" +stop_cmd=':' load_rc_config $name ==== //depot/projects/delphij_fork/etc/rc.d/virecover#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: virecover,v 1.6 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/virecover,v 1.9 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/virecover,v 1.10 2007/12/08 07:20:23 dougb Exp $ # # PROVIDE: virecover ==== //depot/projects/delphij_fork/etc/rc.d/ypbind#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: ypbind,v 1.5 2002/03/22 04:34:01 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/ypbind,v 1.10 2006/12/30 22:53:20 yar Exp $ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Dec 9 07:33:55 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4EA2B16A421; Sun, 9 Dec 2007 07:33:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D89F716A418 for ; Sun, 9 Dec 2007 07:33:54 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C7FC613C442 for ; Sun, 9 Dec 2007 07:33:54 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB97Xskd028402 for ; Sun, 9 Dec 2007 07:33:54 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB97XsqX028399 for perforce@freebsd.org; Sun, 9 Dec 2007 07:33:54 GMT (envelope-from sam@freebsd.org) Date: Sun, 9 Dec 2007 07:33:54 GMT Message-Id: <200712090733.lB97XsqX028399@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 130535 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Dec 2007 07:33:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=130535 Change 130535 by sam@sam_ebb on 2007/12/09 07:33:29 de-ifdef code before conversion; this driver is clearly dead as it's not even been converted to allocate an ifnet Affected files ... .. //depot/projects/vap/sys/dev/awi/awi.c#6 edit .. //depot/projects/vap/sys/dev/awi/awivar.h#5 edit Differences ... ==== //depot/projects/vap/sys/dev/awi/awi.c#6 (text+ko) ==== @@ -85,20 +85,9 @@ */ #include -#ifdef __NetBSD__ -__KERNEL_RCSID(0, "$NetBSD: awi.c,v 1.62 2004/01/16 14:13:15 onoe Exp $"); -#endif -#ifdef __FreeBSD__ __FBSDID("$FreeBSD: src/sys/dev/awi/awi.c,v 1.45 2007/09/05 21:31:31 sam Exp $"); -#endif #include "opt_inet.h" -#ifdef __NetBSD__ -#include "bpfilter.h" -#endif -#ifdef __FreeBSD__ -#define NBPFILTER 1 -#endif #include #include @@ -110,53 +99,28 @@ #include #include #include -#ifdef __FreeBSD__ #include -#endif -#ifdef __NetBSD__ -#include -#endif #include #include -#ifdef __NetBSD__ -#include -#endif -#ifdef __FreeBSD__ #include #include -#endif #include #include #include -#ifdef __NetBSD__ -#include -#endif -#if NBPFILTER > 0 #include -#endif #include #include -#ifdef __NetBSD__ -#include -#include -#include -#include -#endif -#ifdef __FreeBSD__ #include #include #include #include -#endif -#ifdef __FreeBSD__ static void awi_init0(void *); -#endif static int awi_init(struct ifnet *); static void awi_stop(struct ifnet *, int); static void awi_start(struct ifnet *); @@ -219,31 +183,8 @@ { 0, 0 } }; -#ifdef __FreeBSD__ devclass_t awi_devclass; -#if __FreeBSD_version < 500043 -static char *ether_sprintf(u_int8_t *); - -static char * -ether_sprintf(u_int8_t *enaddr) -{ - static char strbuf[18]; - - sprintf(strbuf, "%6D", enaddr, ":"); - return strbuf; -} -#endif - -#if 0 /* ALTQ */ -#define IFQ_PURGE(ifq) IF_DRAIN(ifq) -#define IF_POLL(ifq, m) ((m) = (ifq)->ifq_head) -#define IFQ_POLL(ifq, m) IF_POLL((ifq), (m)) -#define IFQ_DEQUEUE(ifq, m) IF_DEQUEUE((ifq), (m)) -#endif - -#endif - #ifdef AWI_DEBUG int awi_debug = 0; @@ -287,18 +228,10 @@ ifp->if_ioctl = awi_ioctl; ifp->if_start = awi_start; ifp->if_watchdog = awi_watchdog; -#ifdef __NetBSD__ - ifp->if_init = awi_init; - ifp->if_stop = awi_stop; - IFQ_SET_READY(&ifp->if_snd); - memcpy(ifp->if_xname, sc->sc_dev.dv_xname, IFNAMSIZ); -#endif -#ifdef __FreeBSD__ ifp->if_init = awi_init0; ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; if_initname(ifp, device_get_name(sc->sc_dev), device_get_unit(sc->sc_dev)); -#endif ic->ic_ifp = ifp; ic->ic_caps = IEEE80211_C_WEP | IEEE80211_C_IBSS | IEEE80211_C_HOSTAP; @@ -320,9 +253,6 @@ printf("%s: IEEE802.11 %s (firmware %s)\n", ifp->if_xname, (ic->ic_phytype == IEEE80211_T_FH) ? "FH" : "DS", sc->sc_banner); -#ifdef __NetBSD__ - if_attach(ifp); -#endif ieee80211_ifattach(ic); sc->sc_newstate = ic->ic_newstate; @@ -350,14 +280,6 @@ } #undef ADD -#ifdef __NetBSD__ - if ((sc->sc_sdhook = shutdownhook_establish(awi_shutdown, sc)) == NULL) - printf("%s: WARNING: unable to establish shutdown hook\n", - ifp->if_xname); - if ((sc->sc_powerhook = powerhook_establish(awi_power, sc)) == NULL) - printf("%s: WARNING: unable to establish power hook\n", - ifp->if_xname); -#endif sc->sc_attached = 1; splx(s); @@ -388,71 +310,11 @@ } sc->sc_attached = 0; ieee80211_ifdetach(&sc->sc_ic); -#ifdef __NetBSD__ - if_detach(ifp); - shutdownhook_disestablish(sc->sc_sdhook); - powerhook_disestablish(sc->sc_powerhook); -#endif splx(s); return 0; } -#ifdef __NetBSD__ -int -awi_activate(struct device *self, enum devact act) -{ - struct awi_softc *sc = (struct awi_softc *)self; - struct ifnet *ifp = AC2IFP(&sc->sc_arp); - int s, error = 0; - - s = splnet(); - switch (act) { - case DVACT_ACTIVATE: - error = EOPNOTSUPP; - break; - case DVACT_DEACTIVATE: - sc->sc_invalid = 1; - if_deactivate(ifp); - break; - } - splx(s); - return error; -} - void -awi_power(int why, void *arg) -{ - struct awi_softc *sc = arg; - struct ifnet *ifp = AC2IFP(&sc->sc_arp); - int s; - int ocansleep; - - DPRINTF(("awi_power: %d\n", why)); - s = splnet(); - ocansleep = sc->sc_cansleep; - sc->sc_cansleep = 0; - switch (why) { - case PWR_SUSPEND: - case PWR_STANDBY: - awi_stop(ifp, 1); - break; - case PWR_RESUME: - if (ifp->if_flags & IFF_UP) { - awi_init(ifp); - (void)awi_intr(sc); /* make sure */ - } - break; - case PWR_SOFTSUSPEND: - case PWR_SOFTSTANDBY: - case PWR_SOFTRESUME: - break; - } - sc->sc_cansleep = ocansleep; - splx(s); -} -#endif /* __NetBSD__ */ - -void awi_shutdown(void *arg) { struct awi_softc *sc = arg; @@ -537,7 +399,6 @@ return handled; } -#ifdef __FreeBSD__ static void awi_init0(void *arg) { @@ -545,7 +406,6 @@ (void)awi_init(AC2IFP(&sc->sc_arp)); } -#endif static int awi_init(struct ifnet *ifp) @@ -797,9 +657,7 @@ break; } IFQ_DEQUEUE(&ifp->if_snd, m0); -#if NBPFILTER > 0 BPF_MTAP(ifp, m0); -#endif if ((ifp->if_flags & IFF_LINK0) || sc->sc_adhoc_ap) m0 = awi_ether_encap(sc, m0); else { @@ -839,10 +697,8 @@ } ifp->if_opackets++; } -#if NBPFILTER > 0 if (bpf_peers_present(ic->ic_rawbpf)) bpf_mtap(ic->ic_rawbpf, m0); -#endif if (dowep) { struct ieee80211_key *k; @@ -969,13 +825,7 @@ break; case SIOCADDMULTI: case SIOCDELMULTI: -#ifdef __FreeBSD__ error = ENETRESET; /* XXX */ -#else - error = (cmd == SIOCADDMULTI) ? - ether_addmulti(ifr, &sc->sc_ic.ic_ec) : - ether_delmulti(ifr, &sc->sc_ic.ic_ec); -#endif if (error == ENETRESET) { /* do not rescan */ if (sc->sc_enabled) @@ -1129,12 +979,7 @@ { struct ifnet *ifp = AC2IFP(&sc->sc_arp); int n, error; -#ifdef __FreeBSD__ struct ifmultiaddr *ifma; -#else - struct ether_multi *enm; - struct ether_multistep step; -#endif /* reinitialize muticast filter */ n = 0; @@ -1145,7 +990,6 @@ goto set_mib; } sc->sc_mib_mac.aPromiscuous_Enable = 0; -#ifdef __FreeBSD__ if (ifp->if_flags & IFF_ALLMULTI) goto set_mib; IF_ADDR_LOCK(ifp); @@ -1161,30 +1005,12 @@ n++; } IF_ADDR_UNLOCK(ifp); -#else - ETHER_FIRST_MULTI(step, &sc->sc_ic.ic_ec, enm); - while (enm != NULL) { - if (n == AWI_GROUP_ADDR_SIZE || - !IEEE80211_ADDR_EQ(enm->enm_addrlo, enm->enm_addrhi)) - goto set_mib; - IEEE80211_ADDR_COPY(sc->sc_mib_addr.aGroup_Addresses[n], - enm->enm_addrlo); - n++; - ETHER_NEXT_MULTI(step, enm); - } -#endif for (; n < AWI_GROUP_ADDR_SIZE; n++) memset(sc->sc_mib_addr.aGroup_Addresses[n], 0, IEEE80211_ADDR_LEN); sc->sc_mib_local.Accept_All_Multicast_Dis = 1; set_mib: -#ifndef __FreeBSD__ - if (sc->sc_mib_local.Accept_All_Multicast_Dis) - ifp->if_flags &= ~IFF_ALLMULTI; - else - ifp->if_flags |= IFF_ALLMULTI; -#endif sc->sc_mib_mgt.Wep_Required = (sc->sc_ic.ic_flags & IEEE80211_F_PRIVACY) ? AWI_WEP_ON : AWI_WEP_OFF; @@ -1793,11 +1619,7 @@ { int error = 0; -#ifdef __NetBSD__ - if (curlwp == NULL) -#else if (curproc == NULL) -#endif { /* * XXX ==== //depot/projects/vap/sys/dev/awi/awivar.h#5 (text+ko) ==== @@ -74,14 +74,8 @@ }; struct awi_softc { -#ifdef __NetBSD__ - struct device sc_dev; - void (*sc_power)(struct awi_softc *, int); -#endif -#ifdef __FreeBSD__ struct arpcom sc_arp; device_t sc_dev; -#endif struct am79c930_softc sc_chip; struct ieee80211com sc_ic; u_char sc_banner[AWI_BANNER_LEN]; @@ -151,10 +145,6 @@ int awi_attach(struct awi_softc *); int awi_detach(struct awi_softc *); -#ifdef __NetBSD__ -int awi_activate(struct device *, enum devact); -void awi_power(int, void *); -#endif void awi_shutdown(void *); int awi_intr(void *); From owner-p4-projects@FreeBSD.ORG Sun Dec 9 11:09:47 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A35F16A468; Sun, 9 Dec 2007 11:09:47 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A815816A420 for ; Sun, 9 Dec 2007 11:09:46 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 970F813C45A for ; Sun, 9 Dec 2007 11:09:46 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB9B9kbO072250 for ; Sun, 9 Dec 2007 11:09:46 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB9B9kLf072247 for perforce@freebsd.org; Sun, 9 Dec 2007 11:09:46 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 9 Dec 2007 11:09:46 GMT Message-Id: <200712091109.lB9B9kLf072247@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 130539 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Dec 2007 11:09:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=130539 Change 130539 by hselasky@hselasky_laptop001 on 2007/12/09 11:09:42 This commit is part of USB device side support. o Slightly tweak the way we setup USB control transfers. This leads to some changes and simplifications here and there. Here is an overview on how USB control transfers should be setup: Example1: SETUP + STATUS xfer->nframes = 1; xfer->frlenghts[0] = 8; usbd_start_hardware(xfer); Example2: SETUP + DATA + STATUS xfer->nframes = 2; xfer->frlenghts[0] = 8; xfer->frlenghts[1] = 1; usbd_start_hardware(xfer); Example3: SETUP + DATA + STATUS - split 1st callback: xfer->nframes = 1; xfer->frlenghts[0] = 8; usbd_start_hardware(xfer); 2nd callback: /* IMPORTANT: frbuffer[0] must still point at the setup packet! */ xfer->nframes = 2; xfer->frlenghts[0] = 0; xfer->frlenghts[1] = 1; usbd_start_hardware(xfer); Affected files ... .. //depot/projects/usb/src/sys/dev/ata/ata-usb.c#28 edit .. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#27 edit .. //depot/projects/usb/src/sys/dev/usb/README#26 edit .. //depot/projects/usb/src/sys/dev/usb/ehci.c#59 edit .. //depot/projects/usb/src/sys/dev/usb/ohci.c#48 edit .. //depot/projects/usb/src/sys/dev/usb/ucycom.c#27 edit .. //depot/projects/usb/src/sys/dev/usb/ufoma.c#34 edit .. //depot/projects/usb/src/sys/dev/usb/uhci.c#49 edit .. //depot/projects/usb/src/sys/dev/usb/uhid.c#26 edit .. //depot/projects/usb/src/sys/dev/usb/ukbd.c#35 edit .. //depot/projects/usb/src/sys/dev/usb/ulpt.c#35 edit .. //depot/projects/usb/src/sys/dev/usb/umass.c#38 edit .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#16 edit .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#66 edit .. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#21 edit Differences ... ==== //depot/projects/usb/src/sys/dev/ata/ata-usb.c#28 (text) ==== @@ -495,8 +495,7 @@ usbd_copy_in(xfer->frbuffers + 0, 0, &req, sizeof(req)); xfer->frlengths[0] = sizeof(req); - xfer->frlengths[1] = 0; - + xfer->nframes = 1; usbd_start_hardware(xfer); return; ==== //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#27 (text+ko) ==== @@ -3038,6 +3038,7 @@ xfer->frlengths[0] = sizeof(req); xfer->frlengths[1] = len; + xfer->nframes = xfer->frlengths[1] ? 2 : 1; usbd_start_hardware(xfer); return; } ==== //depot/projects/usb/src/sys/dev/usb/README#26 (text+ko) ==== @@ -93,15 +93,42 @@ } } -NOTE: An USB control transfer has three parts. First the SETUP packet, -then DATA packet(s) and then a STATUS packet. The SETUP packet is +=== Notes for USB control transfers === + +An USB control transfer has three parts. First the SETUP packet, then +DATA packet(s) and then a STATUS packet. The SETUP packet is always pointed to by "xfer->frbuffers[0]" and the length is stored in -"xfer->frlengths[0]". Zero-length entries in the "xfer->frlengths[]" array -will be ignored. Typically the DATA packet(s) are pointed to by -"xfer->frbuffers[1]" and the length is stored in "xfer->frlengths[1]". -The STATUS packet is automatically executed unless "xfer->flags.manual_status" -is set. If "xfer->flags.manual_status" is set the STATUS packet will -be executed if the length of last USB frame is zero. +"xfer->frlengths[0]" also if there should not be sent any SETUP +packet! If an USB control transfer has no DATA stage, then +"xfer->nframes" should be set to 1. Else the default value is +"xfer->nframes" equal to 2. + +Example1: SETUP + STATUS + xfer->nframes = 1; + xfer->frlenghts[0] = 8; + usbd_start_hardware(xfer); + +Example2: SETUP + DATA + STATUS + xfer->nframes = 2; + xfer->frlenghts[0] = 8; + xfer->frlenghts[1] = 1; + usbd_start_hardware(xfer); + +Example3: SETUP + DATA + STATUS - split +1st callback: + xfer->nframes = 1; + xfer->frlenghts[0] = 8; + usbd_start_hardware(xfer); + +2nd callback: + /* IMPORTANT: frbuffer[0] must still point at the setup packet! */ + xfer->nframes = 2; + xfer->frlenghts[0] = 0; + xfer->frlenghts[1] = 1; + usbd_start_hardware(xfer); + + +=== General USB transfer notes === 1) Something that one should be aware of is that all USB callbacks support recursation. That means one can start/stop whatever transfer from the callback @@ -319,11 +346,12 @@ This flag can not be changed during operation. manual_status - Setting this flag causes that the STATUS stage of a control - transfer needs to be sent separately like a zero-length USB - frame. This flag has currently no effect on non-control - transfers. This flag is mostly useful for the USB device side. - This flag can be changed during operation. + Setting this flag prevents an USB STATUS stage to be appended + to the end of the USB control transfer. If no control data is + transferred this flag must be cleared. Else an error will be + returned to the USB callback. This flag is mostly useful for + the USB device side. This flag can be changed during + operation. no_pipe_ok Setting this flag causes the USBD_NO_PIPE error to be ==== //depot/projects/usb/src/sys/dev/usb/ehci.c#59 (text+ko) ==== @@ -1240,10 +1240,12 @@ xfer->td_transfer_cache = xfer->td_transfer_first; - if (xfer->flags_int.control_xfr && - xfer->flags_int.control_hdr) { + if (xfer->flags_int.control_xfr) { + + if (xfer->flags_int.control_hdr) { err = ehci_non_isoc_done_sub(xfer); + } xfer->aframes = 1; @@ -1253,11 +1255,7 @@ } while (xfer->aframes != xfer->nframes) { - if ((!xfer->flags_int.control_xfr) || - (xfer->frlengths[xfer->aframes] > 0)) { - err = ehci_non_isoc_done_sub(xfer); - } xfer->aframes++; if (xfer->td_transfer_cache == NULL) { @@ -1826,12 +1824,11 @@ /* max 3 retries */ temp.qtd_status |= htole32(EHCI_QTD_SET_CERR(3)); } - x = 0; /* check if we should prepend a setup message */ - if (xfer->flags_int.control_xfr && - xfer->flags_int.control_hdr) { + if (xfer->flags_int.control_xfr) { + if (xfer->flags_int.control_hdr) { temp.qtd_status &= htole32(EHCI_QTD_SET_CERR(3)); temp.qtd_status |= htole32 @@ -1844,9 +1841,13 @@ temp.shortpkt = temp.len ? 1 : 0; ehci_setup_standard_chain_sub(&temp); + } x = 1; + } else { + x = 0; } + while (x != xfer->nframes) { /* DATA0 / DATA1 message */ @@ -1870,10 +1871,6 @@ temp.shortpkt = 0; - if (xfer->flags_int.control_xfr) { - /* we ignore zero length frames */ - continue; - } } else { /* regular data transfer */ ==== //depot/projects/usb/src/sys/dev/usb/ohci.c#48 (text+ko) ==== @@ -951,10 +951,12 @@ xfer->td_transfer_cache = xfer->td_transfer_first; - if (xfer->flags_int.control_xfr && - xfer->flags_int.control_hdr) { + if (xfer->flags_int.control_xfr) { + + if (xfer->flags_int.control_hdr) { err = ohci_non_isoc_done_sub(xfer); + } xfer->aframes = 1; @@ -964,11 +966,7 @@ } while (xfer->aframes != xfer->nframes) { - if ((!xfer->flags_int.control_xfr) || - (xfer->frlengths[xfer->aframes] > 0)) { - err = ohci_non_isoc_done_sub(xfer); - } xfer->aframes++; if (xfer->td_transfer_cache == NULL) { @@ -1532,12 +1530,10 @@ methods = xfer->pipe->methods; - x = 0; - /* check if we should prepend a setup message */ - if (xfer->flags_int.control_xfr && - xfer->flags_int.control_hdr) { + if (xfer->flags_int.control_xfr) { + if (xfer->flags_int.control_hdr) { temp.td_flags = htole32(OHCI_TD_SETUP | OHCI_TD_NOCC | OHCI_TD_TOGGLE_0 | OHCI_TD_NOINTR); @@ -1548,13 +1544,16 @@ ohci_setup_standard_chain_sub(&temp); - x = 1; - /* * XXX assume that the setup message is * contained within one USB packet: */ xfer->pipe->toggle_next = 1; + } + + x = 1; + } else { + x = 0; } temp.td_flags = htole32(OHCI_TD_NOCC | OHCI_TD_NOINTR); @@ -1592,10 +1591,6 @@ temp.shortpkt = 0; - if (xfer->flags_int.control_xfr) { - /* we ignore zero length frames */ - continue; - } } else { /* regular data transfer */ ==== //depot/projects/usb/src/sys/dev/usb/ucycom.c#27 (text+ko) ==== @@ -436,7 +436,7 @@ xfer->frlengths[0] = sizeof(req); xfer->frlengths[1] = sc->sc_olen; - + xfer->nframes = xfer->frlengths[1] ? 2 : 1; usbd_start_hardware(xfer); } return; ==== //depot/projects/usb/src/sys/dev/usb/ufoma.c#34 (text+ko) ==== @@ -600,7 +600,7 @@ xfer->frlengths[0] = sizeof(req); xfer->frlengths[1] = UFOMA_CMD_BUF_SIZE; - + xfer->nframes = 2; usbd_start_hardware(xfer); } return; @@ -644,6 +644,7 @@ xfer->frlengths[0] = sizeof(req); xfer->frlengths[1] = 1; + xfer->nframes = 2; usbd_start_hardware(xfer); } ==== //depot/projects/usb/src/sys/dev/usb/uhci.c#49 (text+ko) ==== @@ -1245,10 +1245,11 @@ xfer->td_transfer_cache = xfer->td_transfer_first; - if (xfer->flags_int.control_xfr && - xfer->flags_int.control_hdr) { + if (xfer->flags_int.control_xfr) { + if (xfer->flags_int.control_hdr) { err = uhci_non_isoc_done_sub(xfer); + } xfer->aframes = 1; @@ -1258,11 +1259,7 @@ } while (xfer->aframes != xfer->nframes) { - if ((!xfer->flags_int.control_xfr) || - (xfer->frlengths[xfer->aframes] > 0)) { - err = uhci_non_isoc_done_sub(xfer); - } xfer->aframes++; if (xfer->td_transfer_cache == NULL) { @@ -1821,12 +1818,12 @@ /* DATA1 is next */ temp.td_token |= htole32(UHCI_TD_SET_DT(1)); } - x = 0; /* check if we should prepend a setup message */ - if (xfer->flags_int.control_xfr && - xfer->flags_int.control_hdr) { + if (xfer->flags_int.control_xfr) { + + if (xfer->flags_int.control_hdr) { temp.td_token &= htole32(UHCI_TD_SET_DEVADDR(0x7F) | UHCI_TD_SET_ENDPT(0xF)); @@ -1838,9 +1835,13 @@ temp.shortpkt = temp.len ? 1 : 0; uhci_setup_standard_chain_sub(&temp); + } x = 1; + } else { + x = 0; } + while (x != xfer->nframes) { /* DATA0 / DATA1 message */ @@ -1868,10 +1869,6 @@ temp.shortpkt = 0; - if (xfer->flags_int.control_xfr) { - /* we ignore zero length frames */ - continue; - } } else { /* regular data transfer */ ==== //depot/projects/usb/src/sys/dev/usb/uhid.c#26 (text+ko) ==== @@ -237,7 +237,7 @@ xfer->frlengths[0] = sizeof(req); xfer->frlengths[1] = size; - + xfer->nframes = xfer->frlengths[1] ? 2 : 1; usbd_start_hardware(xfer); } return; @@ -274,7 +274,7 @@ xfer->frlengths[0] = sizeof(req); xfer->frlengths[1] = sc->sc_isize; - + xfer->nframes = xfer->frlengths[1] ? 2 : 1; usbd_start_hardware(xfer); } return; ==== //depot/projects/usb/src/sys/dev/usb/ukbd.c#35 (text+ko) ==== @@ -544,6 +544,7 @@ xfer->frlengths[0] = sizeof(req); xfer->frlengths[1] = sizeof(buf); + xfer->nframes = 2; usbd_start_hardware(xfer); } return; ==== //depot/projects/usb/src/sys/dev/usb/ulpt.c#35 (text+ko) ==== @@ -268,6 +268,7 @@ xfer->frlengths[0] = sizeof(req); xfer->frlengths[1] = 1; + xfer->nframes = 2; usbd_start_hardware(xfer); return; @@ -306,9 +307,8 @@ usbd_copy_in(xfer->frbuffers + 0, 0, &req, sizeof(req)); xfer->frlengths[0] = sizeof(req); - xfer->frlengths[1] = 0; + xfer->nframes = 1; usbd_start_hardware(xfer); - return; default: /* Error */ ==== //depot/projects/usb/src/sys/dev/usb/umass.c#38 (text+ko) ==== @@ -1760,7 +1760,7 @@ usbd_copy_in(xfer->frbuffers + 0, 0, &req, sizeof(req)); xfer->frlengths[0] = sizeof(req); - xfer->frlengths[1] = 0; + xfer->nframes = 1; usbd_start_hardware(xfer); return; @@ -2264,7 +2264,7 @@ xfer->frlengths[0] = sizeof(req); xfer->frlengths[1] = sizeof(buf); - + xfer->nframes = 2; usbd_start_hardware(xfer); return; @@ -2379,6 +2379,7 @@ xfer->frlengths[0] = sizeof(req); xfer->frlengths[1] = sc->sc_transfer.cmd_len; + xfer->nframes = xfer->frlengths[1] ? 2 : 1; DIF(UDMASS_CBI, umass_cbi_dump_cmd(sc, ==== //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#16 (text+ko) ==== @@ -1565,7 +1565,15 @@ urb->bsd_data_ptr, max_bulk); } xfer->frlengths[data_frame] = max_bulk; - xfer->nframes = data_frame + 1; + if (xfer->flags_int.control_xfr) { + if (max_bulk > 0) { + xfer->nframes = 2; + } else { + xfer->nframes = 1; + } + } else { + xfer->nframes = 1; + } usbd_start_hardware(xfer); return; ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#66 (text+ko) ==== @@ -431,9 +431,13 @@ parm->err = USBD_INVAL; goto done; } - n_frlengths = xfer->nframes; - n_frbuffers = 1; - + if (xfer->nframes == 0) { + /* + * this is not a valid value + */ + parm->err = USBD_ZERO_NFRAMES; + goto done; + } } else { /* @@ -458,25 +462,8 @@ } } } - if (type == UE_CONTROL) { - xfer->flags_int.control_xfr = 1; - if (xfer->nframes == 0) { - xfer->nframes = 2; - } - } else { - if (xfer->nframes == 0) { - xfer->nframes = 1; - } - } - - n_frlengths = xfer->nframes; - n_frbuffers = xfer->nframes; } - if (xfer->nframes == 0) { - parm->err = USBD_ZERO_NFRAMES; - goto done; - } /* * NOTE: we do not allow "max_packet_size" or "max_frame_size" * to be equal to zero when setting up USB transfers, hence @@ -548,6 +535,36 @@ } xfer->max_data_length = parm->bufsize; + /* Setup "n_frlengths" and "n_frbuffers" */ + + if (type == UE_ISOCHRONOUS) { + n_frlengths = xfer->nframes; + n_frbuffers = 1; + } else { + + if (type == UE_CONTROL) { + xfer->flags_int.control_xfr = 1; + if (xfer->nframes == 0) { + if (parm->bufsize <= REQ_SIZE) { + /* + * there will never be any data + * stage + */ + xfer->nframes = 1; + } else { + xfer->nframes = 2; + } + } + } else { + if (xfer->nframes == 0) { + xfer->nframes = 1; + } + } + + n_frlengths = xfer->nframes; + n_frbuffers = xfer->nframes; + } + /* * check if we have room for the * USB device request structure: @@ -1235,6 +1252,31 @@ } /*------------------------------------------------------------------------* + * usbd_control_transfer_init + *------------------------------------------------------------------------*/ +static void +usbd_control_transfer_init(struct usbd_xfer *xfer) +{ + usb_device_request_t req; + + /* copy out the USB request header */ + + usbd_copy_out(xfer->frbuffers + 0, 0, &req, sizeof(req)); + + /* setup remainder */ + + xfer->flags_int.control_rem = UGETW(req.wLength); + + /* copy direction to endpoint variable */ + + xfer->endpoint &= ~(UE_DIR_IN | UE_DIR_OUT); + xfer->endpoint |= + (req.bmRequestType & UT_READ) ? UE_DIR_IN : UE_DIR_OUT; + + return; +} + +/*------------------------------------------------------------------------* * usbd_start_hardware_sub * * To support split control transfers we need a special wrapper which @@ -1243,7 +1285,6 @@ static uint8_t usbd_start_hardware_sub(struct usbd_xfer *xfer) { - usb_device_request_t req; uint32_t len; /* @@ -1252,42 +1293,61 @@ */ if (xfer->flags_int.control_act) { - /* clear send header flag */ + if (xfer->flags_int.control_hdr) { + + /* clear send header flag */ - xfer->flags_int.control_hdr = 0; + xfer->flags_int.control_hdr = 0; + /* setup control transfer */ + if (xfer->flags_int.usb_mode == USB_MODE_DEVICE) { + usbd_control_transfer_init(xfer); + } + } /* get data length */ len = xfer->sumlen; } else { - /* set send header flag */ - - xfer->flags_int.control_hdr = 1; - /* the size of the SETUP structure is hardcoded ! */ - if (xfer->frlengths[0] != sizeof(req)) { + if (xfer->frlengths[0] != sizeof(usb_device_request_t)) { goto error; } - /* copy out the USB request header */ + /* check USB mode */ + if (xfer->flags_int.usb_mode == USB_MODE_DEVICE) { - usbd_copy_out(xfer->frbuffers + 0, 0, &req, sizeof(req)); + /* check number of frames */ + if (xfer->nframes != 1) { + /* + * We need to receive the setup + * message first so that we know the + * data direction! + */ + PRINTFN(0, ("Misconfigured transfer\n")); + goto error; + } + /* + * Set a dummy "control_rem" value. This + * variable will be overwritten later by a + * call to "usbd_control_transfer_init()" ! + */ + xfer->flags_int.control_rem = 0xFFFF; + } else { - /* setup remainder */ + /* setup "endpoint" and "control_rem" */ - xfer->flags_int.control_rem = UGETW(req.wLength); + usbd_control_transfer_init(xfer); + } - /* copy direction to endpoint variable */ + /* set transfer-header flag */ - xfer->endpoint &= ~(UE_DIR_IN | UE_DIR_OUT); - xfer->endpoint |= - (req.bmRequestType & UT_READ) ? UE_DIR_IN : UE_DIR_OUT; + xfer->flags_int.control_hdr = 1; /* get data length */ - len = (xfer->sumlen - sizeof(req)); + len = (xfer->sumlen - sizeof(usb_device_request_t)); } /* check if there is a length mismatch */ @@ -1299,26 +1359,24 @@ /* the status part is executed when "control_act" is 0 */ - if (xfer->flags_int.control_rem > 0) { - /* - * Moving no data is not allowed - * in this case: - */ - if (xfer->sumlen == 0) { - goto error; - } + if ((xfer->flags_int.control_rem > 0) || + (xfer->flags.manual_status)) { + /* don't execute the STATUS stage yet */ xfer->flags_int.control_act = 1; - } else if (xfer->flags.manual_status && - xfer->frlengths[xfer->nframes - 1]) { + /* sanity check */ + if ((!xfer->flags_int.control_hdr) && + (xfer->nframes == 1)) { + /* + * This is not a valid operation! + */ - /* - * A zero length frame last signals - * a manual status stage - */ - xfer->flags_int.control_act = 1; - + PRINTFN(-1, ("Invalid parameter " + "combination\n")); + goto error; + } } else { + /* time to execute the STATUS stage */ xfer->flags_int.control_act = 0; } return (0); @@ -1965,21 +2023,23 @@ /* set correct USB state for callback */ if (!xfer->flags_int.transferring) { xfer->usb_state = USBD_ST_SETUP; - } else { - xfer->flags_int.transferring = 0; - if (xfer->error) { - xfer->usb_state = USBD_ST_ERROR; - } else { - xfer->usb_state = USBD_ST_TRANSFERRED; + goto callback; + } + xfer->flags_int.transferring = 0; - /* sync any DMA memory */ - if (xfer->flags_int.bdma_enable && - (!xfer->flags_int.bdma_no_post_sync)) { - usbd_bdma_post_sync(xfer); - } - } + if (xfer->error) { + xfer->usb_state = USBD_ST_ERROR; + goto callback; } + /* set transferred state */ + xfer->usb_state = USBD_ST_TRANSFERRED; + /* sync DMA memory, if any */ + if (xfer->flags_int.bdma_enable && + (!xfer->flags_int.bdma_no_post_sync)) { + usbd_bdma_post_sync(xfer); + } + callback: /* call processing routine */ (xfer->callback) (xfer); @@ -2289,6 +2349,9 @@ uc[0].bufsize = 1024; /* bytes */ uc[0].flags.proxy_buffer = 1; uc[0].flags.short_xfer_ok = 1; + if (udev->usb_mode == USB_MODE_DEVICE) { + uc[0].flags.manual_status = 1; + } uc[0].cb[USB_MODE_HOST] = &usbd_do_request_callback; uc[0].cb[USB_MODE_DEVICE] = &usbd_serve_request_callback; @@ -2423,10 +2486,12 @@ if (!(req->bmRequestType & UT_READ)) { usbd_copy_in(xfer->frbuffers + 1, 0, data, temp); } + xfer->nframes = 2; } else { if (xfer->frlengths[0] == 0) { break; } + xfer->nframes = 1; } usbd_transfer_start(xfer); ==== //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#21 (text+ko) ==== @@ -723,6 +723,7 @@ xfer->frlengths[0] = sizeof(req); xfer->frlengths[1] = m->m_pkthdr.len; + xfer->nframes = xfer->frlengths[1] ? 2 : 1; NG_FREE_M(m); From owner-p4-projects@FreeBSD.ORG Sun Dec 9 11:13:52 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 14EE016A420; Sun, 9 Dec 2007 11:13:52 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A34A616A417 for ; Sun, 9 Dec 2007 11:13:51 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 93C6413C461 for ; Sun, 9 Dec 2007 11:13:51 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB9BDpVU073543 for ; Sun, 9 Dec 2007 11:13:51 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB9BDpqD073540 for perforce@freebsd.org; Sun, 9 Dec 2007 11:13:51 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 9 Dec 2007 11:13:51 GMT Message-Id: <200712091113.lB9BDpqD073540@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 130540 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Dec 2007 11:13:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=130540 Change 130540 by hselasky@hselasky_laptop001 on 2007/12/09 11:13:24 Update documentation. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/README#27 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/README#27 (text+ko) ==== @@ -127,6 +127,19 @@ xfer->frlenghts[1] = 1; usbd_start_hardware(xfer); +Example4: SETUP + STATUS - split +1st callback: + xfer->nframes = 1; + xfer->frlenghts[0] = 8; + xfer->flags.manual_status = 1; + usbd_start_hardware(xfer); + +2nd callback: + xfer->nframes = 1; + xfer->frlenghts[0] = 0; + xfer->flags.manual_status = 0; + usbd_start_hardware(xfer); + === General USB transfer notes === From owner-p4-projects@FreeBSD.ORG Sun Dec 9 11:16:56 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F14E716A420; Sun, 9 Dec 2007 11:16:55 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5A9C216A41B for ; Sun, 9 Dec 2007 11:16:55 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4A4FC13C47E for ; Sun, 9 Dec 2007 11:16:55 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB9BGsGC073658 for ; Sun, 9 Dec 2007 11:16:54 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB9BGsgi073655 for perforce@freebsd.org; Sun, 9 Dec 2007 11:16:54 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 9 Dec 2007 11:16:54 GMT Message-Id: <200712091116.lB9BGsgi073655@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 130541 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Dec 2007 11:16:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=130541 Change 130541 by hselasky@hselasky_laptop001 on 2007/12/09 11:15:59 Style change resulting from running "usb_style.sh". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ehci.c#60 edit .. //depot/projects/usb/src/sys/dev/usb/ohci.c#49 edit .. //depot/projects/usb/src/sys/dev/usb/uhci.c#50 edit .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#17 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ehci.c#60 (text+ko) ==== @@ -1242,11 +1242,10 @@ if (xfer->flags_int.control_xfr) { - if (xfer->flags_int.control_hdr) { + if (xfer->flags_int.control_hdr) { - err = ehci_non_isoc_done_sub(xfer); - } - + err = ehci_non_isoc_done_sub(xfer); + } xfer->aframes = 1; if (xfer->td_transfer_cache == NULL) { @@ -1255,7 +1254,7 @@ } while (xfer->aframes != xfer->nframes) { - err = ehci_non_isoc_done_sub(xfer); + err = ehci_non_isoc_done_sub(xfer); xfer->aframes++; if (xfer->td_transfer_cache == NULL) { @@ -1824,25 +1823,23 @@ /* max 3 retries */ temp.qtd_status |= htole32(EHCI_QTD_SET_CERR(3)); } - /* check if we should prepend a setup message */ if (xfer->flags_int.control_xfr) { - if (xfer->flags_int.control_hdr) { + if (xfer->flags_int.control_hdr) { - temp.qtd_status &= htole32(EHCI_QTD_SET_CERR(3)); - temp.qtd_status |= htole32 - (EHCI_QTD_ACTIVE | - EHCI_QTD_SET_PID(EHCI_QTD_PID_SETUP) | - EHCI_QTD_SET_TOGGLE(0)); + temp.qtd_status &= htole32(EHCI_QTD_SET_CERR(3)); + temp.qtd_status |= htole32 + (EHCI_QTD_ACTIVE | + EHCI_QTD_SET_PID(EHCI_QTD_PID_SETUP) | + EHCI_QTD_SET_TOGGLE(0)); - temp.len = xfer->frlengths[0]; - temp.pc = xfer->frbuffers + 0; - temp.shortpkt = temp.len ? 1 : 0; + temp.len = xfer->frlengths[0]; + temp.pc = xfer->frbuffers + 0; + temp.shortpkt = temp.len ? 1 : 0; - ehci_setup_standard_chain_sub(&temp); - } - + ehci_setup_standard_chain_sub(&temp); + } x = 1; } else { x = 0; ==== //depot/projects/usb/src/sys/dev/usb/ohci.c#49 (text+ko) ==== @@ -953,11 +953,10 @@ if (xfer->flags_int.control_xfr) { - if (xfer->flags_int.control_hdr) { + if (xfer->flags_int.control_hdr) { - err = ohci_non_isoc_done_sub(xfer); - } - + err = ohci_non_isoc_done_sub(xfer); + } xfer->aframes = 1; if (xfer->td_transfer_cache == NULL) { @@ -966,7 +965,7 @@ } while (xfer->aframes != xfer->nframes) { - err = ohci_non_isoc_done_sub(xfer); + err = ohci_non_isoc_done_sub(xfer); xfer->aframes++; if (xfer->td_transfer_cache == NULL) { @@ -1533,24 +1532,23 @@ /* check if we should prepend a setup message */ if (xfer->flags_int.control_xfr) { - if (xfer->flags_int.control_hdr) { + if (xfer->flags_int.control_hdr) { - temp.td_flags = htole32(OHCI_TD_SETUP | OHCI_TD_NOCC | - OHCI_TD_TOGGLE_0 | OHCI_TD_NOINTR); + temp.td_flags = htole32(OHCI_TD_SETUP | OHCI_TD_NOCC | + OHCI_TD_TOGGLE_0 | OHCI_TD_NOINTR); - temp.len = xfer->frlengths[0]; - temp.pc = xfer->frbuffers + 0; - temp.shortpkt = temp.len ? 1 : 0; + temp.len = xfer->frlengths[0]; + temp.pc = xfer->frbuffers + 0; + temp.shortpkt = temp.len ? 1 : 0; - ohci_setup_standard_chain_sub(&temp); + ohci_setup_standard_chain_sub(&temp); - /* - * XXX assume that the setup message is - * contained within one USB packet: - */ - xfer->pipe->toggle_next = 1; - } - + /* + * XXX assume that the setup message is + * contained within one USB packet: + */ + xfer->pipe->toggle_next = 1; + } x = 1; } else { x = 0; ==== //depot/projects/usb/src/sys/dev/usb/uhci.c#50 (text+ko) ==== @@ -1246,11 +1246,10 @@ xfer->td_transfer_cache = xfer->td_transfer_first; if (xfer->flags_int.control_xfr) { - if (xfer->flags_int.control_hdr) { + if (xfer->flags_int.control_hdr) { - err = uhci_non_isoc_done_sub(xfer); - } - + err = uhci_non_isoc_done_sub(xfer); + } xfer->aframes = 1; if (xfer->td_transfer_cache == NULL) { @@ -1259,7 +1258,7 @@ } while (xfer->aframes != xfer->nframes) { - err = uhci_non_isoc_done_sub(xfer); + err = uhci_non_isoc_done_sub(xfer); xfer->aframes++; if (xfer->td_transfer_cache == NULL) { @@ -1818,25 +1817,23 @@ /* DATA1 is next */ temp.td_token |= htole32(UHCI_TD_SET_DT(1)); } - /* check if we should prepend a setup message */ if (xfer->flags_int.control_xfr) { - if (xfer->flags_int.control_hdr) { + if (xfer->flags_int.control_hdr) { - temp.td_token &= htole32(UHCI_TD_SET_DEVADDR(0x7F) | - UHCI_TD_SET_ENDPT(0xF)); - temp.td_token |= htole32(UHCI_TD_PID_SETUP | - UHCI_TD_SET_DT(0)); + temp.td_token &= htole32(UHCI_TD_SET_DEVADDR(0x7F) | + UHCI_TD_SET_ENDPT(0xF)); + temp.td_token |= htole32(UHCI_TD_PID_SETUP | + UHCI_TD_SET_DT(0)); - temp.len = xfer->frlengths[0]; - temp.ml.buf_pc = xfer->frbuffers + 0; - temp.shortpkt = temp.len ? 1 : 0; + temp.len = xfer->frlengths[0]; + temp.ml.buf_pc = xfer->frbuffers + 0; + temp.shortpkt = temp.len ? 1 : 0; - uhci_setup_standard_chain_sub(&temp); - } - + uhci_setup_standard_chain_sub(&temp); + } x = 1; } else { x = 0; ==== //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#17 (text+ko) ==== @@ -1566,13 +1566,13 @@ } xfer->frlengths[data_frame] = max_bulk; if (xfer->flags_int.control_xfr) { - if (max_bulk > 0) { - xfer->nframes = 2; - } else { - xfer->nframes = 1; - } + if (max_bulk > 0) { + xfer->nframes = 2; + } else { + xfer->nframes = 1; + } } else { - xfer->nframes = 1; + xfer->nframes = 1; } usbd_start_hardware(xfer); return; From owner-p4-projects@FreeBSD.ORG Sun Dec 9 12:32:17 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D959616A421; Sun, 9 Dec 2007 12:32:16 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3981B16A418 for ; Sun, 9 Dec 2007 12:32:16 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2971C13C457 for ; Sun, 9 Dec 2007 12:32:16 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB9CWGdh090530 for ; Sun, 9 Dec 2007 12:32:16 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB9CWFMH090524 for perforce@freebsd.org; Sun, 9 Dec 2007 12:32:15 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 9 Dec 2007 12:32:15 GMT Message-Id: <200712091232.lB9CWFMH090524@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 130543 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Dec 2007 12:32:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=130543 Change 130543 by hselasky@hselasky_laptop001 on 2007/12/09 12:31:44 Add information to the USB transfer structure about what context the callback is called from. This can be used to make smart decisions about whether to hand certain commands over to another thread or not. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#72 edit .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#67 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#72 (text+ko) ==== @@ -136,6 +136,15 @@ USBD_STD_ROOT_TR_PRE_CALLBACK, }; +/* USB contexts */ + +enum { + USBD_CONTEXT_UNDEFINED, + USBD_CONTEXT_START, + USBD_CONTEXT_STOP, + USBD_CONTEXT_CALLBACK, +}; + struct usbd_temp_setup { void *buf; uint32_t size; @@ -433,6 +442,7 @@ * operation */ uint8_t isochronous_xfr:1; /* set if isochronous transfer */ uint8_t usb_mode:1; /* shadow copy of "udev->usb_mode" */ + uint8_t context:2; /* see USBD_CONTEXT_XXX */ }; struct usbd_config { @@ -810,7 +820,6 @@ void usbd_transfer_drain(struct usbd_xfer *xfer); void usbd_set_frame_data(struct usbd_xfer *xfer, void *ptr, uint32_t frindex); void usbd_set_frame_offset(struct usbd_xfer *xfer, uint32_t offset, uint32_t frindex); -void usbd_callback_wrapper(struct usbd_xfer *xfer); void usbd_do_callback(struct usbd_xfer **pp_xfer, struct thread *td); void usbd_transfer_enqueue(struct usbd_xfer *xfer); void usbd_transfer_dequeue(struct usbd_xfer *xfer, usbd_status_t error); ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#67 (text+ko) ==== @@ -59,6 +59,7 @@ static void usbd_delayed_transfer_start(void *arg); static void usbd_bdma_work_loop(struct usbd_memory_info *info); static void usbd_bdma_cancel_event(struct usbd_xfer *xfer); +static void usbd_callback_wrapper(struct usbd_xfer *xfer, uint8_t context); #ifdef USB_DEBUG void @@ -1391,7 +1392,7 @@ mtx_lock(xfer->usb_mtx); usbd_transfer_dequeue(xfer, error); mtx_unlock(xfer->usb_mtx); - usbd_callback_wrapper(xfer); + usbd_callback_wrapper(xfer, USBD_CONTEXT_CALLBACK); return; } @@ -1830,7 +1831,7 @@ return; } /* call callback */ - usbd_callback_wrapper(xfer); + usbd_callback_wrapper(xfer, USBD_CONTEXT_START); /* * wait for completion if polling is selected @@ -1915,7 +1916,7 @@ * call callback, which will clear * "flags_int.transferring" */ - usbd_callback_wrapper(xfer); + usbd_callback_wrapper(xfer, USBD_CONTEXT_STOP); } return; } @@ -2008,8 +2009,8 @@ * This is a wrapper for USB callbacks, which handles * recursation, which can happen during boot. *------------------------------------------------------------------------*/ -void -usbd_callback_wrapper(struct usbd_xfer *xfer) +static void +usbd_callback_wrapper(struct usbd_xfer *xfer, uint8_t context) { mtx_assert(xfer->priv_mtx, MA_OWNED); @@ -2020,6 +2021,9 @@ xfer->flags_int.recursed_1 = 1; xfer->flags_int.recursed_2 = 1; + /* set which context we are in */ + xfer->flags_int.context = context; + /* set correct USB state for callback */ if (!xfer->flags_int.transferring) { xfer->usb_state = USBD_ST_SETUP; @@ -2083,7 +2087,7 @@ if (tmp) { /* call callback */ - usbd_callback_wrapper(xfer); + usbd_callback_wrapper(xfer, USBD_CONTEXT_CALLBACK); } /* * else already called back ! From owner-p4-projects@FreeBSD.ORG Sun Dec 9 16:59:02 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A29D516A420; Sun, 9 Dec 2007 16:59:02 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5614716A418 for ; Sun, 9 Dec 2007 16:59:02 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4705113C467 for ; Sun, 9 Dec 2007 16:59:02 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB9Gx2GT052998 for ; Sun, 9 Dec 2007 16:59:02 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB9Gx2eZ052995 for perforce@freebsd.org; Sun, 9 Dec 2007 16:59:02 GMT (envelope-from gonzo@FreeBSD.org) Date: Sun, 9 Dec 2007 16:59:02 GMT Message-Id: <200712091659.lB9Gx2eZ052995@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 130550 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Dec 2007 16:59:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=130550 Change 130550 by gonzo@gonzo_jeeves on 2007/12/09 16:58:33 o Panic in case of bus error/address error exceptions from kernel land. More sophisticated check should be applied, like check if it's userland address in kernel mode or pure kernel exception. But on the moment this stub will do the trick and eliminate deadlock on unaligned access to KVA. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/trap.c#23 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/trap.c#23 (text+ko) ==== @@ -281,21 +281,17 @@ goto done; break; - case TrAdEL: - case TrDBE: - if (trap_error == -1/* && trap_addr == badvaddr*/) { - /* - * XXX Would like to check trap_addr==badvaddr, - * but it doesn't seem that CPUs set that in the DBE - * case :( - * - * XXX do an onfault thing like other ports? - */ - trap_error = EINVAL; - tf->tf_regs[TF_EPC] += 4; - goto done; - } - call_trapsignal(curthread, SIGSEGV, 0); + case TrAdEL + TrUser: + case TrAdES + TrUser: + case TrDBE + TrUser: + case TrIBE + TrUser: + /* + * XXX: On the moment just deliver SIGBUS to userland apps + * and panic if it's kernelland exception. Otherwise we'll + * get alignment issues silently ignored and deadlock as a + * result. + */ + call_trapsignal(curthread, SIGBUS, 0); goto done; break; default: From owner-p4-projects@FreeBSD.ORG Sun Dec 9 19:35:51 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 56B4D16A41A; Sun, 9 Dec 2007 19:35:51 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C727C16A418 for ; Sun, 9 Dec 2007 19:35:50 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B5FD813C448 for ; Sun, 9 Dec 2007 19:35:50 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB9JZoJu090162 for ; Sun, 9 Dec 2007 19:35:50 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB9JZovg090159 for perforce@freebsd.org; Sun, 9 Dec 2007 19:35:50 GMT (envelope-from gonzo@FreeBSD.org) Date: Sun, 9 Dec 2007 19:35:50 GMT Message-Id: <200712091935.lB9JZovg090159@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 130555 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Dec 2007 19:35:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=130555 Change 130555 by gonzo@gonzo_jeeves on 2007/12/09 19:35:44 o Update RC32434 Ethernet adapter driver, it's usable now though uncomplete and unstable. It could be used to mount root over NFS now. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips32/idt/if_kr.c#2 edit .. //depot/projects/mips2/src/sys/mips/mips32/idt/if_krreg.h#2 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips32/idt/if_kr.c#2 (text+ko) ==== @@ -42,6 +42,7 @@ #include #include #include +#include #include #include @@ -70,16 +71,44 @@ #include +#define KR_DEBUG + static int kr_attach(device_t); static int kr_detach(device_t); +static int kr_ifmedia_upd(struct ifnet *); +static void kr_ifmedia_sts(struct ifnet *, struct ifmediareq *); +static int kr_ioctl(struct ifnet *, u_long, caddr_t); +static void kr_init(void *); +static void kr_init_locked(struct kr_softc *); +static void kr_link_task(void *, int); static int kr_miibus_readreg(device_t, int, int); static void kr_miibus_statchg(device_t); static int kr_miibus_writereg(device_t, int, int, int); static int kr_probe(device_t); +static void kr_reset(struct kr_softc *); static int kr_resume(device_t); +static int kr_rx_ring_init(struct kr_softc *); +static int kr_tx_ring_init(struct kr_softc *); static void kr_shutdown(device_t); +static void kr_start(struct ifnet *); +static void kr_start_locked(struct ifnet *); +static void kr_stop(struct kr_softc *); static int kr_suspend(device_t); +static void kr_rx(struct kr_softc *); +static void kr_tx(struct kr_softc *); +static void kr_rx_intr(void *); +static void kr_tx_intr(void *); +static void kr_rx_und_intr(void *); +static void kr_tx_ovr_intr(void *); +static void kr_tick(void *); + +static void kr_dmamap_cb(void *, bus_dma_segment_t *, int, int); +static int kr_dma_alloc(struct kr_softc *); +static void kr_dma_free(struct kr_softc *); +static int kr_newbuf(struct kr_softc *, int); +static __inline void kr_fixup_rx(struct mbuf *); + static device_method_t kr_methods[] = { /* Device interface */ DEVMETHOD(device_probe, kr_probe), @@ -124,12 +153,10 @@ static int kr_attach(device_t dev) { -#ifdef notyet uint8_t eaddr[ETHER_ADDR_LEN]; struct ifnet *ifp; -#endif struct kr_softc *sc; - int error = 0, i, rid; + int error = 0, rid; int unit; sc = device_get_softc(dev); @@ -138,11 +165,13 @@ mtx_init(&sc->kr_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, MTX_DEF); + callout_init_mtx(&sc->kr_stat_callout, &sc->kr_mtx, 0); + TASK_INIT(&sc->kr_link_task, 0, kr_link_task, sc); pci_enable_busmaster(dev); /* Map control/status registers. */ - rid = 0; - sc->kr_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, + sc->kr_rid = 0; + sc->kr_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &sc->kr_rid, RF_ACTIVE); if (sc->kr_res == NULL) { @@ -154,58 +183,198 @@ sc->kr_btag = rman_get_bustag(sc->kr_res); sc->kr_bhandle = rman_get_bushandle(sc->kr_res); - /* Accept only packets destined for THIS Ethernet device address */ - CSR_WRITE_4(sc, KR_ETHARC, 0); + /* Allocate interrupts */ + rid = 0; + sc->kr_rx_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, KR_RX_IRQ, + KR_RX_IRQ, 1, RF_SHAREABLE | RF_ACTIVE); + + if (sc->kr_rx_irq == NULL) { + device_printf(dev, "couldn't map rx interrupt\n"); + error = ENXIO; + goto fail; + } + + rid = 0; + sc->kr_tx_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, KR_TX_IRQ, + KR_TX_IRQ, 1, RF_SHAREABLE | RF_ACTIVE); + + if (sc->kr_tx_irq == NULL) { + device_printf(dev, "couldn't map tx interrupt\n"); + error = ENXIO; + goto fail; + } + + rid = 0; + sc->kr_rx_und_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, + KR_RX_UND_IRQ, KR_RX_UND_IRQ, 1, RF_SHAREABLE | RF_ACTIVE); + + if (sc->kr_rx_und_irq == NULL) { + device_printf(dev, "couldn't map rx underrun interrupt\n"); + error = ENXIO; + goto fail; + } + + rid = 0; + sc->kr_tx_ovr_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, + KR_TX_OVR_IRQ, KR_TX_OVR_IRQ, 1, RF_SHAREABLE | RF_ACTIVE); + + if (sc->kr_tx_irq == NULL) { + device_printf(dev, "couldn't map tx overrun interrupt\n"); + error = ENXIO; + goto fail; + } + + /* Allocate ifnet structure. */ + ifp = sc->kr_ifp = if_alloc(IFT_ETHER); - /* - * Set all Ethernet address registers to the same initial values - * set all four addresses to 66-88-aa-cc-dd-ee - */ - CSR_WRITE_4(sc, KR_ETHSAL0, 0xaaccddee); - CSR_WRITE_4(sc, KR_ETHSAH0, 0x00006688); + if (ifp == NULL) { + device_printf(dev, "couldn't allocate ifnet structure\n"); + error = ENOSPC; + goto fail; + } + ifp->if_softc = sc; + if_initname(ifp, device_get_name(dev), device_get_unit(dev)); + ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; + ifp->if_ioctl = kr_ioctl; + ifp->if_start = kr_start; + ifp->if_init = kr_init; - CSR_WRITE_4(sc, KR_ETHSAL1, 0xaaccddee); - CSR_WRITE_4(sc, KR_ETHSAH1, 0x00006688); + /* XXX: add real size */ + IFQ_SET_MAXLEN(&ifp->if_snd, 9); + ifp->if_snd.ifq_maxlen = 9; + IFQ_SET_READY(&ifp->if_snd); - CSR_WRITE_4(sc, KR_ETHSAL2, 0xaaccddee); - CSR_WRITE_4(sc, KR_ETHSAH2, 0x00006688); + ifp->if_capenable = ifp->if_capabilities; - CSR_WRITE_4(sc, KR_ETHSAL3, 0xaaccddee); - CSR_WRITE_4(sc, KR_ETHSAH3, 0x00006688); + eaddr[0] = 0x00; + eaddr[1] = 0x0C; + eaddr[2] = 0x42; + eaddr[3] = 0x09; + eaddr[4] = 0x5E; + eaddr[5] = 0x6B; - CSR_WRITE_4(sc, KR_ETHMAC1, KR_ETH_MAC1_RE); - CSR_WRITE_4(sc, KR_ETHMAC2, KR_ETH_MAC2_FD); - CSR_WRITE_4(sc, KR_ETHIPGT, KR_ETHIPGT_FULL_DUPLEX); - CSR_WRITE_4(sc, KR_ETHIPGR, 0x12); /* minimum value */ + if (kr_dma_alloc(sc) != 0) { + error = ENXIO; + goto fail; + } /* TODO: calculate prescale */ - CSR_WRITE_4(sc, KR_ETHMCP, 0x28); + CSR_WRITE_4(sc, KR_ETHMCP, (165000000 / (1250000 + 1)) & ~1); + + CSR_WRITE_4(sc, KR_MIIMCFG, KR_MIIMCFG_R); + DELAY(1000); + CSR_WRITE_4(sc, KR_MIIMCFG, 0); + + /* Do MII setup. */ + if (mii_phy_probe(dev, &sc->kr_miibus, + kr_ifmedia_upd, kr_ifmedia_sts)) { + device_printf(dev, "MII without any phy!\n"); + error = ENXIO; + goto fail; + } + + /* Call MI attach routine. */ + ether_ifattach(ifp, eaddr); + + /* Hook interrupt last to avoid having to lock softc */ + error = bus_setup_intr(dev, sc->kr_rx_irq, INTR_TYPE_NET | INTR_MPSAFE, + NULL, kr_rx_intr, sc, &sc->kr_rx_intrhand); + + if (error) { + device_printf(dev, "couldn't set up rx irq\n"); + ether_ifdetach(ifp); + goto fail; + } - CSR_WRITE_4(sc, KR_ETHINTFC, 0x0); + error = bus_setup_intr(dev, sc->kr_tx_irq, INTR_TYPE_NET | INTR_MPSAFE, + NULL, kr_tx_intr, sc, &sc->kr_tx_intrhand); - i = 0xffff; + if (error) { + device_printf(dev, "couldn't set up tx irq\n"); + ether_ifdetach(ifp); + goto fail; + } - /* wait for reset to complete */ - while (i && (CSR_READ_4(sc, KR_ETHINTFC) & ETH_INTFC_RIP)) - i--; + error = bus_setup_intr(dev, sc->kr_rx_und_irq, + INTR_TYPE_NET | INTR_MPSAFE, NULL, kr_rx_und_intr, sc, + &sc->kr_rx_und_intrhand); - CSR_WRITE_4(sc, KR_ETHINTFC, ETH_INTFC_EN); + if (error) { + device_printf(dev, "couldn't set up rx underrun irq\n"); + ether_ifdetach(ifp); + goto fail; + } - /* FIFO Tx threshold level */ - CSR_WRITE_4(sc, KR_ETHFIFOTT, 0x40); + error = bus_setup_intr(dev, sc->kr_tx_ovr_irq, + INTR_TYPE_NET | INTR_MPSAFE, NULL, kr_tx_ovr_intr, sc, + &sc->kr_tx_ovr_intrhand); - /* TODO: Reset ethernet phy */ + if (error) { + device_printf(dev, "couldn't set up tx overrun irq\n"); + ether_ifdetach(ifp); + goto fail; + } fail: + if (error) + kr_detach(dev); + return (error); } static int kr_detach(device_t dev) { + struct kr_softc *sc = device_get_softc(dev); + struct ifnet *ifp = sc->kr_ifp; + + KASSERT(mtx_initialized(&sc->kr_mtx), ("vr mutex not initialized")); + + /* These should only be active if attach succeeded */ + if (device_is_attached(dev)) { + KR_LOCK(sc); + sc->kr_detach = 1; + kr_stop(sc); + KR_UNLOCK(sc); + taskqueue_drain(taskqueue_swi, &sc->kr_link_task); + ether_ifdetach(ifp); + } + if (sc->kr_miibus) + device_delete_child(dev, sc->kr_miibus); + bus_generic_detach(dev); + + if (sc->kr_rx_intrhand) + bus_teardown_intr(dev, sc->kr_rx_irq, sc->kr_rx_intrhand); + if (sc->kr_rx_irq) + bus_release_resource(dev, SYS_RES_IRQ, 0, sc->kr_rx_irq); + if (sc->kr_tx_intrhand) + bus_teardown_intr(dev, sc->kr_tx_irq, sc->kr_tx_intrhand); + if (sc->kr_tx_irq) + bus_release_resource(dev, SYS_RES_IRQ, 0, sc->kr_tx_irq); + if (sc->kr_rx_und_intrhand) + bus_teardown_intr(dev, sc->kr_rx_und_irq, + sc->kr_rx_und_intrhand); + if (sc->kr_rx_und_irq) + bus_release_resource(dev, SYS_RES_IRQ, 0, sc->kr_rx_und_irq); + if (sc->kr_tx_ovr_intrhand) + bus_teardown_intr(dev, sc->kr_tx_ovr_irq, + sc->kr_tx_ovr_intrhand); + if (sc->kr_tx_ovr_irq) + bus_release_resource(dev, SYS_RES_IRQ, 0, sc->kr_tx_ovr_irq); + + if (sc->kr_res) + bus_release_resource(dev, SYS_RES_MEMORY, sc->kr_rid, + sc->kr_res); + + if (ifp) + if_free(ifp); + + kr_dma_free(sc); + + mtx_destroy(&sc->kr_mtx); + + return (0); - panic("%s", __func__); - return 0; } static int @@ -227,15 +396,20 @@ static void kr_shutdown(device_t dev) { + struct kr_softc *sc; - panic("%s", __func__); + sc = device_get_softc(dev); + + KR_LOCK(sc); + kr_stop(sc); + KR_UNLOCK(sc); } static int kr_miibus_readreg(device_t dev, int phy, int reg) { struct kr_softc * sc = device_get_softc(dev); - int i; + int i, result; i = KR_MII_TIMEOUT; while ((CSR_READ_4(sc, KR_MIIMIND) & KR_MIIMIND_BSY) && i) @@ -267,7 +441,10 @@ printf("phy mii readreg failed %d:%d: data not valid\n", phy, reg); - return CSR_READ_4(sc , KR_MIIMRDD); + result = CSR_READ_4(sc , KR_MIIMRDD); + CSR_WRITE_4(sc, KR_MIIMCMD, 0); + + return (result); } static int @@ -307,4 +484,1127 @@ static void kr_miibus_statchg(device_t dev) { + struct kr_softc *sc; + + sc = device_get_softc(dev); + taskqueue_enqueue(taskqueue_swi, &sc->kr_link_task); +} + +static void +kr_link_task(void *arg, int pending) +{ + struct kr_softc *sc; + struct mii_data *mii; + struct ifnet *ifp; + /* int lfdx, mfdx; */ + + sc = (struct kr_softc *)arg; + + KR_LOCK(sc); + mii = device_get_softc(sc->kr_miibus); + ifp = sc->kr_ifp; + if (mii == NULL || ifp == NULL || + (ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) { + KR_UNLOCK(sc); + return; + } + + if (mii->mii_media_status & IFM_ACTIVE) { + if (IFM_SUBTYPE(mii->mii_media_active) != IFM_NONE) + sc->kr_link_status = 1; + } else + sc->kr_link_status = 0; + + KR_UNLOCK(sc); +} + +static void +kr_reset(struct kr_softc *sc) +{ + int i; + + CSR_WRITE_4(sc, KR_ETHINTFC, 0); + + for (i = 0; i < KR_TIMEOUT; i++) { + DELAY(10); + if (!(CSR_READ_4(sc, KR_ETHINTFC) & ETH_INTFC_RIP)) + break; + } + + if (i == KR_TIMEOUT) + device_printf(sc->kr_dev, "reset time out\n"); +} + +static void +kr_init(void *xsc) +{ + struct kr_softc *sc = xsc; + + KR_LOCK(sc); + kr_init_locked(sc); + KR_UNLOCK(sc); +} + +static void +kr_init_locked(struct kr_softc *sc) +{ + struct ifnet *ifp = sc->kr_ifp; + struct mii_data *mii; + + KR_LOCK_ASSERT(sc); + + mii = device_get_softc(sc->kr_miibus); + + kr_stop(sc); + kr_reset(sc); + + CSR_WRITE_4(sc, KR_ETHINTFC, ETH_INTFC_EN); + + /* Init circular RX list. */ + if (kr_rx_ring_init(sc) != 0) { + device_printf(sc->kr_dev, + "initialization failed: no memory for rx buffers\n"); + kr_stop(sc); + return; + } + + /* Init tx descriptors. */ + kr_tx_ring_init(sc); + + KR_DMA_WRITE_REG(KR_DMA_RXCHAN, DMA_S, 0); + KR_DMA_WRITE_REG(KR_DMA_RXCHAN, DMA_NDPTR, 0); + KR_DMA_WRITE_REG(KR_DMA_RXCHAN, DMA_DPTR, + sc->kr_rdata.kr_rx_ring_paddr); + + + KR_DMA_CLEARBITS_REG(KR_DMA_RXCHAN, DMA_SM, + DMA_SM_H | DMA_SM_E | DMA_SM_D) ; + + KR_DMA_WRITE_REG(KR_DMA_TXCHAN, DMA_S, 0); + KR_DMA_WRITE_REG(KR_DMA_TXCHAN, DMA_NDPTR, 0); + KR_DMA_WRITE_REG(KR_DMA_TXCHAN, DMA_DPTR, 0); + KR_DMA_CLEARBITS_REG(KR_DMA_TXCHAN, DMA_SM, + DMA_SM_F | DMA_SM_E); + + + /* Accept only packets destined for THIS Ethernet device address */ + CSR_WRITE_4(sc, KR_ETHARC, 1); + + /* + * Set all Ethernet address registers to the same initial values + * set all four addresses to 66-88-aa-cc-dd-ee + */ + CSR_WRITE_4(sc, KR_ETHSAL0, 0x42095E6B); + CSR_WRITE_4(sc, KR_ETHSAH0, 0x0000000C); + + CSR_WRITE_4(sc, KR_ETHSAL1, 0x42095E6B); + CSR_WRITE_4(sc, KR_ETHSAH1, 0x0000000C); + + CSR_WRITE_4(sc, KR_ETHSAL2, 0x42095E6B); + CSR_WRITE_4(sc, KR_ETHSAH2, 0x0000000C); + + CSR_WRITE_4(sc, KR_ETHSAL3, 0x42095E6B); + CSR_WRITE_4(sc, KR_ETHSAH3, 0x0000000C); + + CSR_WRITE_4(sc, KR_ETHMAC2, + KR_ETH_MAC2_PEN | KR_ETH_MAC2_CEN | KR_ETH_MAC2_FD); + + CSR_WRITE_4(sc, KR_ETHIPGT, KR_ETHIPGT_FULL_DUPLEX); + CSR_WRITE_4(sc, KR_ETHIPGR, 0x12); /* minimum value */ + + CSR_WRITE_4(sc, KR_MIIMCFG, KR_MIIMCFG_R); + DELAY(1000); + CSR_WRITE_4(sc, KR_MIIMCFG, 0); + + /* TODO: calculate prescale */ + CSR_WRITE_4(sc, KR_ETHMCP, (165000000 / (1250000 + 1)) & ~1); + + /* FIFO Tx threshold level */ + CSR_WRITE_4(sc, KR_ETHFIFOTT, 0x30); + + CSR_WRITE_4(sc, KR_ETHMAC1, KR_ETH_MAC1_RE); + + sc->kr_link_status = 0; + mii_mediachg(mii); + + ifp->if_drv_flags |= IFF_DRV_RUNNING; + ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; + + callout_reset(&sc->kr_stat_callout, hz, kr_tick, sc); +} + +static void +kr_start(struct ifnet *ifp) +{ + struct kr_softc *sc; + + sc = ifp->if_softc; + + KR_LOCK(sc); + kr_start_locked(ifp); + KR_UNLOCK(sc); +} + +/* + * Encapsulate an mbuf chain in a descriptor by coupling the mbuf data + * pointers to the fragment pointers. + */ +static int +kr_encap(struct kr_softc *sc, struct mbuf **m_head) +{ + struct kr_txdesc *txd; + struct kr_desc *desc, *prev_desc; + bus_dma_segment_t txsegs[KR_MAXFRAGS]; + uint32_t link_addr; + int error, i, nsegs, prod, si, prev_prod; + + KR_LOCK_ASSERT(sc); + + prod = sc->kr_cdata.kr_tx_prod; + txd = &sc->kr_cdata.kr_txdesc[prod]; + error = bus_dmamap_load_mbuf_sg(sc->kr_cdata.kr_tx_tag, txd->tx_dmamap, + *m_head, txsegs, &nsegs, BUS_DMA_NOWAIT); + if (error == EFBIG) { + panic("EFBIG"); + } else if (error != 0) + return (error); + if (nsegs == 0) { + m_freem(*m_head); + *m_head = NULL; + return (EIO); + } + + /* Check number of available descriptors. */ + if (sc->kr_cdata.kr_tx_cnt + nsegs >= (KR_TX_RING_CNT - 1)) { + bus_dmamap_unload(sc->kr_cdata.kr_tx_tag, txd->tx_dmamap); + return (ENOBUFS); + } + + txd->tx_m = *m_head; + bus_dmamap_sync(sc->kr_cdata.kr_tx_tag, txd->tx_dmamap, + BUS_DMASYNC_PREWRITE); + + si = prod; + + /* + * Make a list of descriptors for this packet. DMA controller will + * walk through it while kr_link is not zero. The last one should + * have COF flag set, to pickup next chain from NDPTR + */ + prev_prod = prod; + desc = prev_desc = NULL; + for (i = 0; i < nsegs; i++) { + desc = &sc->kr_rdata.kr_tx_ring[prod]; + desc->kr_ctl = KR_DMASIZE(txsegs[i].ds_len) | KR_CTL_IOF; + if (i == 0) + desc->kr_devcs = KR_DMATX_DEVCS_FD; + desc->kr_ca = txsegs[i].ds_addr; + desc->kr_link = 0; + /* link with previous descriptor */ + if (prev_desc) + prev_desc->kr_link = KR_TX_RING_ADDR(sc, prod); + + sc->kr_cdata.kr_tx_cnt++; + prev_desc = desc; + KR_INC(prod, KR_TX_RING_CNT); + } + + /* + * Set COF for last descriptor and mark last fragment with LD flag + */ + if (desc) { + desc->kr_ctl |= KR_CTL_COF; + desc->kr_devcs |= KR_DMATX_DEVCS_LD; + } + + /* Update producer index. */ + sc->kr_cdata.kr_tx_prod = prod; + + /* Sync descriptors. */ + bus_dmamap_sync(sc->kr_cdata.kr_tx_ring_tag, + sc->kr_cdata.kr_tx_ring_map, + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); + + /* Start transmitting */ + /* Check if new list is queued in NDPTR */ + if (KR_DMA_READ_REG(KR_DMA_TXCHAN, DMA_NDPTR) == 0) { + /* NDPTR is not busy - start new list */ + KR_DMA_WRITE_REG(KR_DMA_TXCHAN, DMA_NDPTR, + KR_TX_RING_ADDR(sc, si)); + } + else { + link_addr = KR_TX_RING_ADDR(sc, si); + /* Get previous descriptor */ + si = (si + KR_TX_RING_CNT - 1) % KR_TX_RING_CNT; + desc = &sc->kr_rdata.kr_tx_ring[si]; + desc->kr_link = link_addr; + } + + return (0); +} + +static void +kr_start_locked(struct ifnet *ifp) +{ + struct kr_softc *sc; + struct mbuf *m_head; + int enq; + + sc = ifp->if_softc; + + KR_LOCK_ASSERT(sc); + + if ((ifp->if_drv_flags & (IFF_DRV_RUNNING | IFF_DRV_OACTIVE)) != + IFF_DRV_RUNNING || sc->kr_link_status == 0 ) + return; + + for (enq = 0; !IFQ_DRV_IS_EMPTY(&ifp->if_snd) && + sc->kr_cdata.kr_tx_cnt < KR_TX_RING_CNT - 2; ) { + IFQ_DRV_DEQUEUE(&ifp->if_snd, m_head); + if (m_head == NULL) + break; + /* + * Pack the data into the transmit ring. If we + * don't have room, set the OACTIVE flag and wait + * for the NIC to drain the ring. + */ + if (kr_encap(sc, &m_head)) { + if (m_head == NULL) + break; + IFQ_DRV_PREPEND(&ifp->if_snd, m_head); + ifp->if_drv_flags |= IFF_DRV_OACTIVE; + break; + } + + enq++; + /* + * If there's a BPF listener, bounce a copy of this frame + * to him. + */ + ETHER_BPF_MTAP(ifp, m_head); + } +} + +static void +kr_stop(struct kr_softc *sc) +{ + struct ifnet *ifp; + + KR_LOCK_ASSERT(sc); + + + ifp = sc->kr_ifp; + ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); + callout_stop(&sc->kr_stat_callout); + + /* mask out RX interrupts */ + KR_DMA_SETBITS_REG(KR_DMA_RXCHAN, DMA_SM, + DMA_SM_D | DMA_SM_H | DMA_SM_E); + + /* mask out TX interrupts */ + KR_DMA_SETBITS_REG(KR_DMA_TXCHAN, DMA_SM, + DMA_SM_F | DMA_SM_E); + + /* Abort RX DMA transactions */ + if (KR_DMA_READ_REG(KR_DMA_RXCHAN, DMA_C) & DMA_C_R) { + /* Set ABORT bit if trunsuction is in progress */ + KR_DMA_WRITE_REG(KR_DMA_RXCHAN, DMA_C, DMA_C_ABORT); + /* XXX: Add timeout */ + while ((KR_DMA_READ_REG(KR_DMA_RXCHAN, DMA_S) & DMA_S_H) == 0) + DELAY(10); + KR_DMA_WRITE_REG(KR_DMA_RXCHAN, DMA_S, 0); + } + KR_DMA_WRITE_REG(KR_DMA_RXCHAN, DMA_DPTR, 0); + KR_DMA_WRITE_REG(KR_DMA_RXCHAN, DMA_NDPTR, 0); + + /* Abort TX DMA transactions */ + if (KR_DMA_READ_REG(KR_DMA_TXCHAN, DMA_C) & DMA_C_R) { + /* Set ABORT bit if trunsuction is in progress */ + KR_DMA_WRITE_REG(KR_DMA_TXCHAN, DMA_C, DMA_C_ABORT); + /* XXX: Add timeout */ + while ((KR_DMA_READ_REG(KR_DMA_TXCHAN, DMA_S) & DMA_S_H) == 0) + DELAY(10); + KR_DMA_WRITE_REG(KR_DMA_TXCHAN, DMA_S, 0); + } + KR_DMA_WRITE_REG(KR_DMA_TXCHAN, DMA_DPTR, 0); + KR_DMA_WRITE_REG(KR_DMA_TXCHAN, DMA_NDPTR, 0); + + CSR_WRITE_4(sc, KR_ETHINTFC, 0); +} + + +static int +kr_ioctl(struct ifnet *ifp, u_long command, caddr_t data) +{ + struct kr_softc *sc = ifp->if_softc; + struct ifreq *ifr = (struct ifreq *) data; + struct mii_data *mii; + int error; + + switch (command) { + case SIOCSIFFLAGS: +#if 0 + KR_LOCK(sc); + if (ifp->if_flags & IFF_UP) { + if (ifp->if_drv_flags & IFF_DRV_RUNNING) { + if ((ifp->if_flags ^ sc->kr_if_flags) & + (IFF_PROMISC | IFF_ALLMULTI)) + kr_set_filter(sc); + } else { + if (sc->kr_detach == 0) + kr_init_locked(sc); + } + } else { + if (ifp->if_drv_flags & IFF_DRV_RUNNING) + kr_stop(sc); + } + sc->kr_if_flags = ifp->if_flags; + KR_UNLOCK(sc); +#endif + error = 0; + break; + case SIOCADDMULTI: + case SIOCDELMULTI: +#if 0 + KR_LOCK(sc); + kr_set_filter(sc); + KR_UNLOCK(sc); +#endif + error = 0; + break; + case SIOCGIFMEDIA: + case SIOCSIFMEDIA: + mii = device_get_softc(sc->kr_miibus); + error = ifmedia_ioctl(ifp, ifr, &mii->mii_media, command); + break; + case SIOCSIFCAP: + error = 0; +#if 0 + mask = ifr->ifr_reqcap ^ ifp->if_capenable; + if ((mask & IFCAP_HWCSUM) != 0) { + ifp->if_capenable ^= IFCAP_HWCSUM; + if ((IFCAP_HWCSUM & ifp->if_capenable) && + (IFCAP_HWCSUM & ifp->if_capabilities)) + ifp->if_hwassist = KR_CSUM_FEATURES; + else + ifp->if_hwassist = 0; + } + if ((mask & IFCAP_VLAN_HWTAGGING) != 0) { + ifp->if_capenable ^= IFCAP_VLAN_HWTAGGING; + if (IFCAP_VLAN_HWTAGGING & ifp->if_capenable && + IFCAP_VLAN_HWTAGGING & ifp->if_capabilities && + ifp->if_drv_flags & IFF_DRV_RUNNING) { + KR_LOCK(sc); + kr_vlan_setup(sc); + KR_UNLOCK(sc); + } + } + VLAN_CAPABILITIES(ifp); +#endif + break; + default: + error = ether_ioctl(ifp, command, data); + break; + } + + return (error); +} + +/* + * Set media options. + */ +static int +kr_ifmedia_upd(struct ifnet *ifp) +{ + struct kr_softc *sc; + struct mii_data *mii; + struct mii_softc *miisc; + int error; + + sc = ifp->if_softc; + KR_LOCK(sc); + mii = device_get_softc(sc->kr_miibus); + if (mii->mii_instance) { + LIST_FOREACH(miisc, &mii->mii_phys, mii_list) + mii_phy_reset(miisc); + } + error = mii_mediachg(mii); + KR_UNLOCK(sc); + + return (error); +} + +/* + * Report current media status. + */ +static void +kr_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr) +{ + struct kr_softc *sc = ifp->if_softc; + struct mii_data *mii; + + mii = device_get_softc(sc->kr_miibus); + KR_LOCK(sc); + mii_pollstat(mii); + KR_UNLOCK(sc); + ifmr->ifm_active = mii->mii_media_active; + ifmr->ifm_status = mii->mii_media_status; +} + +struct kr_dmamap_arg { + bus_addr_t kr_busaddr; +}; + +static void +kr_dmamap_cb(void *arg, bus_dma_segment_t *segs, int nseg, int error) +{ + struct kr_dmamap_arg *ctx; + + if (error != 0) + return; + ctx = arg; + ctx->kr_busaddr = segs[0].ds_addr; +} + +static int +kr_dma_alloc(struct kr_softc *sc) +{ + struct kr_dmamap_arg ctx; + struct kr_txdesc *txd; + struct kr_rxdesc *rxd; + int error, i; + + /* Create parent DMA tag. */ + error = bus_dma_tag_create( + bus_get_dma_tag(sc->kr_dev), /* parent */ + 1, 0, /* alignment, boundary */ + BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ + NULL, NULL, /* filter, filterarg */ + BUS_SPACE_MAXSIZE_32BIT, /* maxsize */ + 0, /* nsegments */ + BUS_SPACE_MAXSIZE_32BIT, /* maxsegsize */ + 0, /* flags */ + NULL, NULL, /* lockfunc, lockarg */ + &sc->kr_cdata.kr_parent_tag); + if (error != 0) { + device_printf(sc->kr_dev, "failed to create parent DMA tag\n"); + goto fail; + } + /* Create tag for Tx ring. */ + error = bus_dma_tag_create( + sc->kr_cdata.kr_parent_tag, /* parent */ + KR_RING_ALIGN, 0, /* alignment, boundary */ + BUS_SPACE_MAXADDR, /* lowaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ + NULL, NULL, /* filter, filterarg */ + KR_TX_RING_SIZE, /* maxsize */ + 1, /* nsegments */ + KR_TX_RING_SIZE, /* maxsegsize */ + 0, /* flags */ + NULL, NULL, /* lockfunc, lockarg */ + &sc->kr_cdata.kr_tx_ring_tag); + if (error != 0) { + device_printf(sc->kr_dev, "failed to create Tx ring DMA tag\n"); + goto fail; + } + + /* Create tag for Rx ring. */ + error = bus_dma_tag_create( + sc->kr_cdata.kr_parent_tag, /* parent */ + KR_RING_ALIGN, 0, /* alignment, boundary */ + BUS_SPACE_MAXADDR, /* lowaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ + NULL, NULL, /* filter, filterarg */ + KR_RX_RING_SIZE, /* maxsize */ + 1, /* nsegments */ + KR_RX_RING_SIZE, /* maxsegsize */ + 0, /* flags */ + NULL, NULL, /* lockfunc, lockarg */ + &sc->kr_cdata.kr_rx_ring_tag); + if (error != 0) { + device_printf(sc->kr_dev, "failed to create Rx ring DMA tag\n"); + goto fail; + } + + /* Create tag for Tx buffers. */ + error = bus_dma_tag_create( + sc->kr_cdata.kr_parent_tag, /* parent */ + sizeof(uint32_t), 0, /* alignment, boundary */ + BUS_SPACE_MAXADDR, /* lowaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ + NULL, NULL, /* filter, filterarg */ + MCLBYTES * KR_MAXFRAGS, /* maxsize */ + KR_MAXFRAGS, /* nsegments */ + MCLBYTES, /* maxsegsize */ + 0, /* flags */ + NULL, NULL, /* lockfunc, lockarg */ + &sc->kr_cdata.kr_tx_tag); + if (error != 0) { + device_printf(sc->kr_dev, "failed to create Tx DMA tag\n"); + goto fail; + } + + /* Create tag for Rx buffers. */ + error = bus_dma_tag_create( + sc->kr_cdata.kr_parent_tag, /* parent */ + KR_RX_ALIGN, 0, /* alignment, boundary */ + BUS_SPACE_MAXADDR, /* lowaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ + NULL, NULL, /* filter, filterarg */ + MCLBYTES, /* maxsize */ + 1, /* nsegments */ + MCLBYTES, /* maxsegsize */ + 0, /* flags */ + NULL, NULL, /* lockfunc, lockarg */ + &sc->kr_cdata.kr_rx_tag); + if (error != 0) { + device_printf(sc->kr_dev, "failed to create Rx DMA tag\n"); + goto fail; + } + + /* Allocate DMA'able memory and load the DMA map for Tx ring. */ + error = bus_dmamem_alloc(sc->kr_cdata.kr_tx_ring_tag, + (void **)&sc->kr_rdata.kr_tx_ring, BUS_DMA_WAITOK | + BUS_DMA_COHERENT | BUS_DMA_ZERO, &sc->kr_cdata.kr_tx_ring_map); + if (error != 0) { + device_printf(sc->kr_dev, + "failed to allocate DMA'able memory for Tx ring\n"); + goto fail; + } + + ctx.kr_busaddr = 0; + error = bus_dmamap_load(sc->kr_cdata.kr_tx_ring_tag, + sc->kr_cdata.kr_tx_ring_map, sc->kr_rdata.kr_tx_ring, + KR_TX_RING_SIZE, kr_dmamap_cb, &ctx, 0); + if (error != 0 || ctx.kr_busaddr == 0) { + device_printf(sc->kr_dev, + "failed to load DMA'able memory for Tx ring\n"); + goto fail; + } + sc->kr_rdata.kr_tx_ring_paddr = ctx.kr_busaddr; + + /* Allocate DMA'able memory and load the DMA map for Rx ring. */ + error = bus_dmamem_alloc(sc->kr_cdata.kr_rx_ring_tag, + (void **)&sc->kr_rdata.kr_rx_ring, BUS_DMA_WAITOK | + BUS_DMA_COHERENT | BUS_DMA_ZERO, &sc->kr_cdata.kr_rx_ring_map); + if (error != 0) { + device_printf(sc->kr_dev, + "failed to allocate DMA'able memory for Rx ring\n"); + goto fail; + } + + ctx.kr_busaddr = 0; + error = bus_dmamap_load(sc->kr_cdata.kr_rx_ring_tag, + sc->kr_cdata.kr_rx_ring_map, sc->kr_rdata.kr_rx_ring, + KR_RX_RING_SIZE, kr_dmamap_cb, &ctx, 0); + if (error != 0 || ctx.kr_busaddr == 0) { + device_printf(sc->kr_dev, + "failed to load DMA'able memory for Rx ring\n"); + goto fail; + } + sc->kr_rdata.kr_rx_ring_paddr = ctx.kr_busaddr; + + /* Create DMA maps for Tx buffers. */ + for (i = 0; i < KR_TX_RING_CNT; i++) { + txd = &sc->kr_cdata.kr_txdesc[i]; + txd->tx_m = NULL; + txd->tx_dmamap = NULL; + error = bus_dmamap_create(sc->kr_cdata.kr_tx_tag, 0, + &txd->tx_dmamap); + if (error != 0) { + device_printf(sc->kr_dev, + "failed to create Tx dmamap\n"); + goto fail; + } + } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Dec 9 23:21:00 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 516E916A418; Sun, 9 Dec 2007 23:21:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F230116A41B for ; Sun, 9 Dec 2007 23:20:59 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E13D313C455 for ; Sun, 9 Dec 2007 23:20:59 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB9NKxA3044367 for ; Sun, 9 Dec 2007 23:20:59 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB9NKx1F044364 for perforce@freebsd.org; Sun, 9 Dec 2007 23:20:59 GMT (envelope-from peter@freebsd.org) Date: Sun, 9 Dec 2007 23:20:59 GMT Message-Id: <200712092320.lB9NKx1F044364@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 130569 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Dec 2007 23:21:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=130569 Change 130569 by peter@peter_overcee on 2007/12/09 23:20:12 Teach at(1) about "sunrise" and "sunset". eg: "at sunrise + 30 minutes" -> 30 min after sunrise Also, allow the "+" modifier to be negative. eg: "at sunset + -10 minutes" --> 10 min before sunset Affected files ... .. //depot/projects/hammer/usr.bin/at/Makefile#2 edit .. //depot/projects/hammer/usr.bin/at/parsetime.c#4 edit .. //depot/projects/hammer/usr.bin/at/parsetime.h#2 edit .. //depot/projects/hammer/usr.bin/at/suntime.c#1 add Differences ... ==== //depot/projects/hammer/usr.bin/at/Makefile#2 (text+ko) ==== @@ -3,7 +3,7 @@ .include "${.CURDIR}/Makefile.inc" PROG= at -SRCS= at.c panic.c parsetime.c perm.c +SRCS= at.c panic.c parsetime.c perm.c suntime.c LINKS= ${BINDIR}/at ${BINDIR}/atq \ ${BINDIR}/at ${BINDIR}/atrm \ ${BINDIR}/at ${BINDIR}/batch @@ -14,6 +14,8 @@ BINOWN= root BINMODE= 4555 CLEANFILES+= at.1 +LDADD+= -lm +DPADD+= ${LIBM} at.1: at.man @${ECHO} Making ${.TARGET:T} from ${.ALLSRC:T}; \ ==== //depot/projects/hammer/usr.bin/at/parsetime.c#4 (text+ko) ==== @@ -61,7 +61,7 @@ /* Structures and unions */ enum { /* symbols */ - MIDNIGHT, NOON, TEATIME, + MIDNIGHT, NOON, TEATIME, SUNRISE, SUNSET, PM, AM, TOMORROW, TODAY, NOW, MINUTES, HOURS, DAYS, WEEKS, MONTHS, YEARS, NUMBER, PLUS, DOT, SLASH, ID, JUNK, @@ -80,6 +80,8 @@ { "midnight", MIDNIGHT,0 }, /* 00:00:00 of today or tomorrow */ { "noon", NOON,0 }, /* 12:00:00 of today or tomorrow */ { "teatime", TEATIME,0 }, /* 16:00:00 of today or tomorrow */ + { "sunrise", SUNRISE, 0 }, /* Sunrise */ + { "sunset", SUNSET, 0 }, /* Sunset */ { "am", AM,0 }, /* morning times for 0-12 clock */ { "pm", PM,0 }, /* evening times for 0-12 clock */ { "tomorrow", TOMORROW,0 }, /* execute 24 hours from time */ @@ -230,7 +232,8 @@ /* then see what it is */ - if (isdigit(sc_token[0])) { + if (isdigit(sc_token[0]) || sc_token[0] == '-') { + sc_token[++idx] = *sct++; while (isdigit(*sct)) sc_token[++idx] = *sct++; sc_token[++idx] = 0; @@ -564,6 +567,11 @@ struct tm nowtime, runtime; int hr = 0; /* this MUST be initialized to zero for midnight/noon/teatime */ + int mn, r; + double lat, lon; + + lat = 37.798325; /* where I live, so there. */ + lon = -121.970223; nowtimer = time(NULL); nowtime = *localtime(&nowtimer); @@ -593,6 +601,26 @@ month(&runtime); break; + case SUNRISE: + r = sun_time(1, lat, lon, nowtime.tm_gmtoff / 3600, nowtime.tm_yday + 1, &hr, &mn); + if (r == -1) + panic("no sunrise!"); + runtime.tm_hour = hr; + runtime.tm_min = mn; + token(); + month(&runtime); + break; + + case SUNSET: + r = sun_time(0, lat, lon, nowtime.tm_gmtoff / 3600, nowtime.tm_yday + 1, &hr, &mn); + if (r == -1) + panic("no sunrise!"); + runtime.tm_hour = hr; + runtime.tm_min = mn; + token(); + month(&runtime); + break; + /* evil coding for TEATIME|NOON|MIDNIGHT - we've initialised * hr to zero up above, then fall into this case in such a * way so we add +12 +4 hours to it for teatime, +12 hours ==== //depot/projects/hammer/usr.bin/at/parsetime.h#2 (text+ko) ==== @@ -24,3 +24,4 @@ */ time_t parsetime(int argc, char **argv); +int sun_time(int rise, double lat, double lon, int tz, int yday, int *hr, int *mn); From owner-p4-projects@FreeBSD.ORG Mon Dec 10 02:02:10 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A91C16A421; Mon, 10 Dec 2007 02:02:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 12CC416A418 for ; Mon, 10 Dec 2007 02:02:10 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F386B13C442 for ; Mon, 10 Dec 2007 02:02:09 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBA229M8079708 for ; Mon, 10 Dec 2007 02:02:09 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBA21opW079598 for perforce@freebsd.org; Mon, 10 Dec 2007 02:01:50 GMT (envelope-from marcel@freebsd.org) Date: Mon, 10 Dec 2007 02:01:50 GMT Message-Id: <200712100201.lBA21opW079598@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 130572 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Dec 2007 02:02:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=130572 Change 130572 by marcel@marcel_xcllnt on 2007/12/10 02:01:44 IFC @130571 Affected files ... .. //depot/projects/busdma/amd64/amd64/busdma_machdep.c#5 integrate .. //depot/projects/busdma/amd64/amd64/db_trace.c#4 integrate .. //depot/projects/busdma/amd64/amd64/exception.S#3 integrate .. //depot/projects/busdma/amd64/amd64/genassym.c#4 integrate .. //depot/projects/busdma/amd64/amd64/identcpu.c#5 integrate .. //depot/projects/busdma/amd64/amd64/intr_machdep.c#5 integrate .. //depot/projects/busdma/amd64/amd64/legacy.c#3 integrate .. //depot/projects/busdma/amd64/amd64/local_apic.c#5 integrate .. //depot/projects/busdma/amd64/amd64/machdep.c#7 integrate .. //depot/projects/busdma/amd64/amd64/msi.c#3 integrate .. //depot/projects/busdma/amd64/amd64/nexus.c#5 integrate .. //depot/projects/busdma/amd64/amd64/pmap.c#7 integrate .. //depot/projects/busdma/amd64/amd64/prof_machdep.c#3 integrate .. //depot/projects/busdma/amd64/amd64/stack_machdep.c#1 branch .. //depot/projects/busdma/amd64/amd64/trap.c#6 integrate .. //depot/projects/busdma/amd64/amd64/uma_machdep.c#3 integrate .. //depot/projects/busdma/amd64/amd64/vm_machdep.c#4 integrate .. //depot/projects/busdma/amd64/conf/DEFAULTS#5 integrate .. //depot/projects/busdma/amd64/conf/GENERIC#8 integrate .. //depot/projects/busdma/amd64/conf/GENERIC.hints#3 integrate .. //depot/projects/busdma/amd64/conf/NOTES#8 integrate .. //depot/projects/busdma/amd64/include/clock.h#5 integrate .. //depot/projects/busdma/amd64/include/legacyvar.h#2 integrate .. //depot/projects/busdma/amd64/include/pc/bios.h#2 integrate .. //depot/projects/busdma/amd64/include/pci_cfgreg.h#2 integrate .. //depot/projects/busdma/amd64/include/pmc_mdep.h#2 integrate .. //depot/projects/busdma/amd64/include/smp.h#4 integrate .. //depot/projects/busdma/amd64/include/specialreg.h#5 integrate .. //depot/projects/busdma/amd64/include/stack.h#1 branch .. //depot/projects/busdma/amd64/include/vmparam.h#4 integrate .. //depot/projects/busdma/amd64/isa/clock.c#5 integrate .. //depot/projects/busdma/amd64/linux32/linux.h#4 integrate .. //depot/projects/busdma/amd64/linux32/linux32_proto.h#7 integrate .. //depot/projects/busdma/amd64/linux32/linux32_syscall.h#7 integrate .. //depot/projects/busdma/amd64/linux32/linux32_sysent.c#7 integrate .. //depot/projects/busdma/amd64/linux32/linux32_sysvec.c#6 integrate .. //depot/projects/busdma/amd64/linux32/syscalls.master#7 integrate .. //depot/projects/busdma/amd64/pci/pci_bus.c#4 integrate .. //depot/projects/busdma/amd64/pci/pci_cfgreg.c#2 integrate .. //depot/projects/busdma/arm/arm/bcopy_page.S#2 integrate .. //depot/projects/busdma/arm/arm/bcopyinout.S#2 integrate .. //depot/projects/busdma/arm/arm/busdma_machdep.c#6 integrate .. //depot/projects/busdma/arm/arm/cpufunc.c#5 integrate .. //depot/projects/busdma/arm/arm/cpufunc_asm_arm11.S#1 branch .. //depot/projects/busdma/arm/arm/cpufunc_asm_armv5.S#1 branch .. //depot/projects/busdma/arm/arm/cpufunc_asm_armv5_ec.S#1 branch .. //depot/projects/busdma/arm/arm/db_trace.c#3 integrate .. //depot/projects/busdma/arm/arm/identcpu.c#5 integrate .. //depot/projects/busdma/arm/arm/in_cksum_arm.S#2 integrate .. //depot/projects/busdma/arm/arm/locore.S#4 integrate .. //depot/projects/busdma/arm/arm/nexus_io.c#3 delete .. //depot/projects/busdma/arm/arm/nexus_io_asm.S#2 delete .. //depot/projects/busdma/arm/arm/pmap.c#6 integrate .. //depot/projects/busdma/arm/arm/stack_machdep.c#1 branch .. //depot/projects/busdma/arm/arm/support.S#3 integrate .. //depot/projects/busdma/arm/arm/swtch.S#3 integrate .. //depot/projects/busdma/arm/arm/trap.c#5 integrate .. //depot/projects/busdma/arm/arm/vm_machdep.c#6 integrate .. //depot/projects/busdma/arm/at91/at91_mci.c#2 integrate .. //depot/projects/busdma/arm/at91/at91_mcireg.h#2 integrate .. //depot/projects/busdma/arm/at91/at91_pmc.c#5 integrate .. //depot/projects/busdma/arm/at91/at91rm92reg.h#5 integrate .. //depot/projects/busdma/arm/at91/if_ate.c#6 integrate .. //depot/projects/busdma/arm/at91/kb920x_machdep.c#6 integrate .. //depot/projects/busdma/arm/at91/ohci_atmelarm.c#4 integrate .. //depot/projects/busdma/arm/at91/std.at91#4 integrate .. //depot/projects/busdma/arm/at91/std.kb920x#4 integrate .. //depot/projects/busdma/arm/at91/uart_cpu_at91rm9200usart.c#5 integrate .. //depot/projects/busdma/arm/conf/AVILA#3 integrate .. //depot/projects/busdma/arm/conf/BWCT#2 integrate .. //depot/projects/busdma/arm/conf/CRB#2 integrate .. //depot/projects/busdma/arm/conf/EP80219#3 integrate .. //depot/projects/busdma/arm/conf/HL200#1 branch .. //depot/projects/busdma/arm/conf/IQ31244#4 integrate .. //depot/projects/busdma/arm/conf/KB920X#6 integrate .. //depot/projects/busdma/arm/conf/SIMICS#4 integrate .. //depot/projects/busdma/arm/conf/SKYEYE#4 integrate .. //depot/projects/busdma/arm/include/armreg.h#5 integrate .. //depot/projects/busdma/arm/include/asm.h#4 integrate .. //depot/projects/busdma/arm/include/asmacros.h#2 integrate .. //depot/projects/busdma/arm/include/atomic.h#4 integrate .. //depot/projects/busdma/arm/include/cpuconf.h#5 integrate .. //depot/projects/busdma/arm/include/cpufunc.h#6 integrate .. //depot/projects/busdma/arm/include/endian.h#2 integrate .. //depot/projects/busdma/arm/include/pmc_mdep.h#2 integrate .. //depot/projects/busdma/arm/include/stack.h#1 branch .. //depot/projects/busdma/arm/include/vmparam.h#4 integrate .. //depot/projects/busdma/arm/sa11x0/assabet_machdep.c#5 integrate .. //depot/projects/busdma/arm/sa11x0/files.sa11x0#2 integrate .. //depot/projects/busdma/arm/sa11x0/uart_dev_sa1110.c#4 integrate .. //depot/projects/busdma/arm/xscale/i80321/ep80219_machdep.c#4 integrate .. //depot/projects/busdma/arm/xscale/i80321/i80321.c#3 integrate .. //depot/projects/busdma/arm/xscale/i80321/i80321_pci.c#5 integrate .. //depot/projects/busdma/arm/xscale/i80321/iq31244_machdep.c#6 integrate .. //depot/projects/busdma/arm/xscale/i8134x/crb_machdep.c#2 integrate .. //depot/projects/busdma/arm/xscale/i8134x/files.crb#2 integrate .. //depot/projects/busdma/arm/xscale/i8134x/i81342.c#2 integrate .. //depot/projects/busdma/arm/xscale/i8134x/i81342_pci.c#2 integrate .. //depot/projects/busdma/arm/xscale/i8134x/i81342reg.h#2 integrate .. //depot/projects/busdma/arm/xscale/i8134x/iq81342_7seg.c#1 branch .. //depot/projects/busdma/arm/xscale/i8134x/iq81342reg.h#1 branch .. //depot/projects/busdma/arm/xscale/i8134x/iq81342var.h#1 branch .. //depot/projects/busdma/arm/xscale/ixp425/avila_machdep.c#3 integrate .. //depot/projects/busdma/arm/xscale/ixp425/files.ixp425#2 integrate .. //depot/projects/busdma/arm/xscale/ixp425/if_npe.c#3 integrate .. //depot/projects/busdma/arm/xscale/ixp425/ixp425_npe.c#3 integrate .. //depot/projects/busdma/arm/xscale/ixp425/ixp425_npevar.h#3 integrate .. //depot/projects/busdma/arm/xscale/ixp425/ixp425_pci.c#2 integrate .. //depot/projects/busdma/arm/xscale/ixp425/ixp425_qmgr.c#2 integrate .. //depot/projects/busdma/boot/arm/at91/boot2/boot2.c#3 integrate .. //depot/projects/busdma/boot/arm/at91/libat91/eeprom.c#4 integrate .. //depot/projects/busdma/boot/arm/at91/libat91/emac.c#5 integrate .. //depot/projects/busdma/boot/arm/at91/libat91/emac_init.c#3 integrate .. //depot/projects/busdma/boot/arm/at91/libat91/lib.h#4 integrate .. //depot/projects/busdma/boot/common/loader.8#6 integrate .. //depot/projects/busdma/boot/common/module.c#2 integrate .. //depot/projects/busdma/boot/common/ufsread.c#2 integrate .. //depot/projects/busdma/boot/ficl/Makefile#4 integrate .. //depot/projects/busdma/boot/forth/loader.conf#6 integrate .. //depot/projects/busdma/boot/i386/Makefile#3 integrate .. //depot/projects/busdma/boot/i386/boot2/boot2.c#3 integrate .. //depot/projects/busdma/boot/i386/cdboot/cdboot.s#3 integrate .. //depot/projects/busdma/boot/i386/gptboot/Makefile#1 branch .. //depot/projects/busdma/boot/i386/gptboot/gptboot.c#1 branch .. //depot/projects/busdma/boot/i386/gptboot/gptldr.S#1 branch .. //depot/projects/busdma/boot/i386/libi386/Makefile#2 integrate .. //depot/projects/busdma/boot/i386/libi386/bioscd.c#3 integrate .. //depot/projects/busdma/boot/i386/libi386/biosdisk.c#4 integrate .. //depot/projects/busdma/boot/i386/libi386/biosmem.c#2 integrate .. //depot/projects/busdma/boot/i386/libi386/biossmap.c#3 integrate .. //depot/projects/busdma/boot/i386/libi386/devicename.c#3 integrate .. //depot/projects/busdma/boot/i386/libi386/pxe.c#2 integrate .. //depot/projects/busdma/boot/i386/loader/main.c#5 integrate .. //depot/projects/busdma/boot/i386/pmbr/Makefile#1 branch .. //depot/projects/busdma/boot/i386/pmbr/pmbr.s#1 branch .. //depot/projects/busdma/boot/pc98/Makefile.inc#2 integrate .. //depot/projects/busdma/boot/pc98/boot2/boot.c#3 integrate .. //depot/projects/busdma/boot/pc98/cdboot/cdboot.s#3 integrate .. //depot/projects/busdma/boot/pc98/libpc98/bioscd.c#3 integrate .. //depot/projects/busdma/boot/pc98/libpc98/biosdisk.c#3 integrate .. //depot/projects/busdma/boot/pc98/loader/main.c#4 integrate .. //depot/projects/busdma/bsm/audit.h#6 integrate .. //depot/projects/busdma/cam/cam_xpt.c#7 integrate .. //depot/projects/busdma/cam/scsi/scsi_all.h#5 integrate .. //depot/projects/busdma/compat/freebsd32/freebsd32.h#3 integrate .. //depot/projects/busdma/compat/freebsd32/freebsd32_ipc.h#1 branch .. //depot/projects/busdma/compat/freebsd32/freebsd32_misc.c#6 integrate .. //depot/projects/busdma/compat/freebsd32/freebsd32_proto.h#6 integrate .. //depot/projects/busdma/compat/freebsd32/freebsd32_syscall.h#6 integrate .. //depot/projects/busdma/compat/freebsd32/freebsd32_syscalls.c#6 integrate .. //depot/projects/busdma/compat/freebsd32/freebsd32_sysent.c#6 integrate .. //depot/projects/busdma/compat/freebsd32/syscalls.master#6 integrate .. //depot/projects/busdma/compat/ia32/ia32_sysvec.c#4 integrate .. //depot/projects/busdma/compat/linprocfs/linprocfs.c#8 integrate .. //depot/projects/busdma/compat/linux/linux_file.c#6 integrate .. //depot/projects/busdma/compat/linux/linux_getcwd.c#3 integrate .. //depot/projects/busdma/compat/linux/linux_ioctl.c#5 integrate .. //depot/projects/busdma/compat/linux/linux_ioctl.h#4 integrate .. //depot/projects/busdma/compat/linux/linux_misc.c#7 integrate .. //depot/projects/busdma/compat/linux/linux_stats.c#6 integrate .. //depot/projects/busdma/compat/ndis/ndis_var.h#3 integrate .. //depot/projects/busdma/compat/ndis/ntoskrnl_var.h#3 integrate .. //depot/projects/busdma/compat/ndis/subr_ndis.c#5 integrate .. //depot/projects/busdma/compat/ndis/subr_ntoskrnl.c#5 integrate .. //depot/projects/busdma/compat/opensolaris/kern/opensolaris_vfs.c#3 integrate .. //depot/projects/busdma/compat/opensolaris/rpc/xdr.h#2 integrate .. //depot/projects/busdma/compat/opensolaris/sys/atomic.h#2 integrate .. //depot/projects/busdma/compat/opensolaris/sys/bitmap.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/cpupart.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/cpuvar.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/cyclic.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/elf.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/kcondvar.h#2 integrate .. //depot/projects/busdma/compat/opensolaris/sys/kmem.h#2 integrate .. //depot/projects/busdma/compat/opensolaris/sys/mman.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/modctl.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/mutex.h#3 integrate .. //depot/projects/busdma/compat/opensolaris/sys/objfs.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/param.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/pcpu.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/proc.h#3 integrate .. //depot/projects/busdma/compat/opensolaris/sys/rwlock.h#3 integrate .. //depot/projects/busdma/compat/opensolaris/sys/stat.h#1 branch .. //depot/projects/busdma/compat/opensolaris/sys/time.h#2 integrate .. //depot/projects/busdma/compat/opensolaris/sys/types.h#3 integrate .. //depot/projects/busdma/compat/pecoff/imgact_pecoff.c#3 integrate .. //depot/projects/busdma/compat/svr4/imgact_svr4.c#2 integrate .. //depot/projects/busdma/compat/svr4/svr4_fcntl.c#4 integrate .. //depot/projects/busdma/compat/svr4/svr4_misc.c#6 integrate .. //depot/projects/busdma/conf/Makefile.amd64#3 integrate .. //depot/projects/busdma/conf/NOTES#8 integrate .. //depot/projects/busdma/conf/files#8 integrate .. //depot/projects/busdma/conf/files.amd64#8 integrate .. //depot/projects/busdma/conf/files.arm#6 integrate .. //depot/projects/busdma/conf/files.i386#8 integrate .. //depot/projects/busdma/conf/files.ia64#6 integrate .. //depot/projects/busdma/conf/files.pc98#7 integrate .. //depot/projects/busdma/conf/files.powerpc#6 integrate .. //depot/projects/busdma/conf/files.sparc64#4 integrate .. //depot/projects/busdma/conf/files.sun4v#4 integrate .. //depot/projects/busdma/conf/kmod.mk#7 integrate .. //depot/projects/busdma/conf/newvers.sh#2 integrate .. //depot/projects/busdma/conf/options#8 integrate .. //depot/projects/busdma/conf/options.amd64#5 integrate .. //depot/projects/busdma/conf/options.arm#6 integrate .. //depot/projects/busdma/conf/options.i386#6 integrate .. //depot/projects/busdma/contrib/dev/acpica/evmisc.c#3 integrate .. //depot/projects/busdma/contrib/dev/acpica/evxface.c#3 integrate .. //depot/projects/busdma/contrib/dev/npe/IxNpeMicrocode.dat.uu#1 branch .. //depot/projects/busdma/contrib/dev/npe/LICENSE#1 branch .. //depot/projects/busdma/contrib/dev/wpi/LICENSE#1 branch .. //depot/projects/busdma/contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu#1 branch .. //depot/projects/busdma/contrib/ipfilter/netinet/fil.c#4 integrate .. //depot/projects/busdma/contrib/ipfilter/netinet/ip_auth.c#4 integrate .. //depot/projects/busdma/contrib/ipfilter/netinet/ip_compat.h#4 integrate .. //depot/projects/busdma/contrib/ipfilter/netinet/ip_fil.h#4 integrate .. //depot/projects/busdma/contrib/ipfilter/netinet/ip_fil_freebsd.c#4 integrate .. //depot/projects/busdma/contrib/ipfilter/netinet/ip_frag.c#4 integrate .. //depot/projects/busdma/contrib/ipfilter/netinet/ip_htable.c#3 integrate .. //depot/projects/busdma/contrib/ipfilter/netinet/ip_log.c#4 integrate .. //depot/projects/busdma/contrib/ipfilter/netinet/ip_lookup.c#3 integrate .. //depot/projects/busdma/contrib/ipfilter/netinet/ip_lookup.h#3 integrate .. //depot/projects/busdma/contrib/ipfilter/netinet/ip_nat.c#4 integrate .. //depot/projects/busdma/contrib/ipfilter/netinet/ip_nat.h#3 integrate .. //depot/projects/busdma/contrib/ipfilter/netinet/ip_pool.c#3 integrate .. //depot/projects/busdma/contrib/ipfilter/netinet/ip_pool.h#3 integrate .. //depot/projects/busdma/contrib/ipfilter/netinet/ip_proxy.c#4 integrate .. //depot/projects/busdma/contrib/ipfilter/netinet/ip_rpcb_pxy.c#3 integrate .. //depot/projects/busdma/contrib/ipfilter/netinet/ip_scan.c#4 integrate .. //depot/projects/busdma/contrib/ipfilter/netinet/ip_state.c#5 integrate .. //depot/projects/busdma/contrib/ipfilter/netinet/ip_state.h#3 integrate .. //depot/projects/busdma/contrib/ipfilter/netinet/ip_sync.c#4 integrate .. //depot/projects/busdma/contrib/ipfilter/netinet/ipl.h#4 integrate .. //depot/projects/busdma/contrib/ipfilter/netinet/mlfk_ipl.c#4 integrate .. //depot/projects/busdma/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/busdma/contrib/opensolaris/common/avl/avl.c#2 integrate .. //depot/projects/busdma/contrib/opensolaris/common/nvpair/nvpair.c#2 integrate .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 integrate .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 integrate .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/vdev.c#3 integrate .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 integrate .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 integrate .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 integrate .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 integrate .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#3 integrate .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 integrate .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/zil.c#3 integrate .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/zio.c#3 integrate .. //depot/projects/busdma/contrib/opensolaris/uts/common/fs/zfs/zvol.c#3 integrate .. //depot/projects/busdma/contrib/opensolaris/uts/common/rpc/xdr.c#2 integrate .. //depot/projects/busdma/contrib/opensolaris/uts/common/rpc/xdr.h#2 integrate .. //depot/projects/busdma/contrib/opensolaris/uts/common/sys/byteorder.h#2 integrate .. //depot/projects/busdma/contrib/opensolaris/uts/common/sys/isa_defs.h#2 integrate .. //depot/projects/busdma/contrib/opensolaris/uts/common/sys/procset.h#2 integrate .. //depot/projects/busdma/contrib/opensolaris/uts/common/sys/sysmacros.h#2 integrate .. //depot/projects/busdma/contrib/opensolaris/uts/common/sys/vfs.h#2 delete .. //depot/projects/busdma/contrib/opensolaris/uts/common/sys/vmem.h#2 integrate .. //depot/projects/busdma/contrib/pf/net/pf.c#5 integrate .. //depot/projects/busdma/contrib/pf/net/pf_if.c#3 integrate .. //depot/projects/busdma/contrib/pf/net/pf_ioctl.c#6 integrate .. //depot/projects/busdma/contrib/pf/net/pf_table.c#3 integrate .. //depot/projects/busdma/ddb/db_examine.c#3 integrate .. //depot/projects/busdma/ddb/db_ps.c#5 integrate .. //depot/projects/busdma/dev/aac/aac.c#3 integrate .. //depot/projects/busdma/dev/aac/aac_cam.c#5 integrate .. //depot/projects/busdma/dev/aac/aac_debug.c#2 integrate .. //depot/projects/busdma/dev/aac/aac_pci.c#5 integrate .. //depot/projects/busdma/dev/aac/aacreg.h#2 integrate .. //depot/projects/busdma/dev/aac/aacvar.h#3 integrate .. //depot/projects/busdma/dev/acpi_support/acpi_ibm.c#5 integrate .. //depot/projects/busdma/dev/acpica/acpi.c#7 integrate .. //depot/projects/busdma/dev/acpica/acpi_battery.c#4 integrate .. //depot/projects/busdma/dev/acpica/acpi_cpu.c#4 integrate .. //depot/projects/busdma/dev/acpica/acpi_ec.c#4 integrate .. //depot/projects/busdma/dev/acpica/acpi_hpet.c#6 integrate .. //depot/projects/busdma/dev/acpica/acpi_pci.c#3 integrate .. //depot/projects/busdma/dev/acpica/acpi_pci_link.c#4 integrate .. //depot/projects/busdma/dev/acpica/acpi_pcib_acpi.c#4 integrate .. //depot/projects/busdma/dev/acpica/acpi_thermal.c#5 integrate .. //depot/projects/busdma/dev/acpica/acpivar.h#6 integrate .. //depot/projects/busdma/dev/agp/agp.c#1 branch .. //depot/projects/busdma/dev/agp/agp_ali.c#1 branch .. //depot/projects/busdma/dev/agp/agp_amd.c#1 branch .. //depot/projects/busdma/dev/agp/agp_amd64.c#1 branch .. //depot/projects/busdma/dev/agp/agp_ati.c#1 branch .. //depot/projects/busdma/dev/agp/agp_i810.c#1 branch .. //depot/projects/busdma/dev/agp/agp_if.m#1 branch .. //depot/projects/busdma/dev/agp/agp_intel.c#1 branch .. //depot/projects/busdma/dev/agp/agp_nvidia.c#1 branch .. //depot/projects/busdma/dev/agp/agp_sis.c#1 branch .. //depot/projects/busdma/dev/agp/agp_via.c#1 branch .. //depot/projects/busdma/dev/agp/agppriv.h#1 branch .. //depot/projects/busdma/dev/agp/agpreg.h#1 branch .. //depot/projects/busdma/dev/agp/agpvar.h#1 branch .. //depot/projects/busdma/dev/aic7xxx/aic_osm_lib.c#4 integrate .. //depot/projects/busdma/dev/aic7xxx/aic_osm_lib.h#3 integrate .. //depot/projects/busdma/dev/amr/amr.c#4 integrate .. //depot/projects/busdma/dev/amr/amr_cam.c#4 integrate .. //depot/projects/busdma/dev/amr/amr_pci.c#3 integrate .. //depot/projects/busdma/dev/an/if_an.c#5 integrate .. //depot/projects/busdma/dev/an/if_anreg.h#2 integrate .. //depot/projects/busdma/dev/arcmsr/arcmsr.c#6 integrate .. //depot/projects/busdma/dev/arcmsr/arcmsr.h#3 integrate .. //depot/projects/busdma/dev/asmc/asmc.c#1 branch .. //depot/projects/busdma/dev/asmc/asmcvar.h#1 branch .. //depot/projects/busdma/dev/ata/ata-all.c#5 integrate .. //depot/projects/busdma/dev/ata/ata-all.h#5 integrate .. //depot/projects/busdma/dev/ata/ata-chipset.c#8 integrate .. //depot/projects/busdma/dev/ata/ata-disk.c#5 integrate .. //depot/projects/busdma/dev/ata/ata-dma.c#4 integrate .. //depot/projects/busdma/dev/ata/ata-pci.c#4 integrate .. //depot/projects/busdma/dev/ata/ata-pci.h#6 integrate .. //depot/projects/busdma/dev/ata/atapi-cd.c#4 integrate .. //depot/projects/busdma/dev/ata/atapi-cd.h#3 integrate .. //depot/projects/busdma/dev/ata/atapi-fd.c#3 integrate .. //depot/projects/busdma/dev/ata/atapi-tape.c#3 integrate .. //depot/projects/busdma/dev/ath/ath_rate/sample/sample.c#4 integrate .. //depot/projects/busdma/dev/ath/if_ath.c#8 integrate .. //depot/projects/busdma/dev/ath/if_ath_pci.c#6 integrate .. //depot/projects/busdma/dev/awi/awi.c#4 integrate .. //depot/projects/busdma/dev/bce/if_bce.c#6 integrate .. //depot/projects/busdma/dev/bfe/if_bfe.c#5 integrate .. //depot/projects/busdma/dev/bge/if_bge.c#7 integrate .. //depot/projects/busdma/dev/bktr/msp34xx.c#2 integrate .. //depot/projects/busdma/dev/cardbus/cardbus.c#5 integrate .. //depot/projects/busdma/dev/ciss/ciss.c#5 integrate .. //depot/projects/busdma/dev/cm/smc90cx6.c#4 integrate .. //depot/projects/busdma/dev/coretemp/coretemp.c#2 integrate .. //depot/projects/busdma/dev/ctau/if_ct.c#5 integrate .. //depot/projects/busdma/dev/cx/if_cx.c#5 integrate .. //depot/projects/busdma/dev/cxgb/common/cxgb_common.h#3 integrate .. //depot/projects/busdma/dev/cxgb/common/cxgb_ctl_defs.h#2 integrate .. //depot/projects/busdma/dev/cxgb/common/cxgb_sge_defs.h#3 integrate .. //depot/projects/busdma/dev/cxgb/common/cxgb_t3_hw.c#3 integrate .. //depot/projects/busdma/dev/cxgb/common/cxgb_vsc7323.c#2 integrate .. //depot/projects/busdma/dev/cxgb/common/cxgb_vsc8211.c#3 integrate .. //depot/projects/busdma/dev/cxgb/common/cxgb_xgmac.c#3 integrate .. //depot/projects/busdma/dev/cxgb/cxgb_adapter.h#3 integrate .. //depot/projects/busdma/dev/cxgb/cxgb_include.h#2 integrate .. //depot/projects/busdma/dev/cxgb/cxgb_lro.c#3 integrate .. //depot/projects/busdma/dev/cxgb/cxgb_main.c#3 integrate .. //depot/projects/busdma/dev/cxgb/cxgb_offload.h#2 integrate .. //depot/projects/busdma/dev/cxgb/cxgb_osdep.h#3 integrate .. //depot/projects/busdma/dev/cxgb/cxgb_sge.c#3 integrate .. //depot/projects/busdma/dev/cxgb/t3fw-4.5.0.bin.gz.uu#2 delete .. //depot/projects/busdma/dev/cxgb/t3fw-4.7.0.bin.gz.uu#1 branch .. //depot/projects/busdma/dev/dc/dcphy.c#4 integrate .. //depot/projects/busdma/dev/dc/if_dc.c#6 integrate .. //depot/projects/busdma/dev/drm/drmP.h#4 integrate .. //depot/projects/busdma/dev/drm/drm_agpsupport.c#3 integrate .. //depot/projects/busdma/dev/em/e1000_80003es2lan.c#2 integrate .. //depot/projects/busdma/dev/em/e1000_80003es2lan.h#2 integrate .. //depot/projects/busdma/dev/em/e1000_82540.c#2 integrate .. //depot/projects/busdma/dev/em/e1000_82541.c#2 integrate .. //depot/projects/busdma/dev/em/e1000_82541.h#2 integrate .. //depot/projects/busdma/dev/em/e1000_82542.c#2 integrate .. //depot/projects/busdma/dev/em/e1000_82543.c#2 integrate .. //depot/projects/busdma/dev/em/e1000_82543.h#2 integrate .. //depot/projects/busdma/dev/em/e1000_82571.c#2 integrate .. //depot/projects/busdma/dev/em/e1000_82571.h#2 integrate .. //depot/projects/busdma/dev/em/e1000_82575.c#2 integrate .. //depot/projects/busdma/dev/em/e1000_82575.h#2 integrate .. //depot/projects/busdma/dev/em/e1000_api.c#2 integrate .. //depot/projects/busdma/dev/em/e1000_api.h#2 integrate .. //depot/projects/busdma/dev/em/e1000_defines.h#2 integrate .. //depot/projects/busdma/dev/em/e1000_hw.h#2 integrate .. //depot/projects/busdma/dev/em/e1000_ich8lan.c#2 integrate .. //depot/projects/busdma/dev/em/e1000_ich8lan.h#2 integrate .. //depot/projects/busdma/dev/em/e1000_mac.c#2 integrate .. //depot/projects/busdma/dev/em/e1000_mac.h#2 integrate .. //depot/projects/busdma/dev/em/e1000_manage.c#2 integrate .. //depot/projects/busdma/dev/em/e1000_manage.h#2 integrate .. //depot/projects/busdma/dev/em/e1000_nvm.c#2 integrate .. //depot/projects/busdma/dev/em/e1000_nvm.h#2 integrate .. //depot/projects/busdma/dev/em/e1000_osdep.h#2 integrate .. //depot/projects/busdma/dev/em/e1000_phy.c#2 integrate .. //depot/projects/busdma/dev/em/e1000_phy.h#2 integrate .. //depot/projects/busdma/dev/em/e1000_regs.h#2 integrate .. //depot/projects/busdma/dev/em/if_em.c#6 integrate .. //depot/projects/busdma/dev/em/if_em.h#5 integrate .. //depot/projects/busdma/dev/esp/esp_sbus.c#3 integrate .. //depot/projects/busdma/dev/fdc/fdc.c#5 integrate .. //depot/projects/busdma/dev/firewire/firewire.c#4 integrate .. //depot/projects/busdma/dev/flash/at45d.c#2 integrate .. //depot/projects/busdma/dev/gem/if_gem.c#6 integrate .. //depot/projects/busdma/dev/gem/if_gem_pci.c#4 integrate .. //depot/projects/busdma/dev/gem/if_gemreg.h#3 integrate .. //depot/projects/busdma/dev/gem/if_gemvar.h#4 integrate .. //depot/projects/busdma/dev/hptmv/entry.c#5 integrate .. //depot/projects/busdma/dev/hwpmc/hwpmc_amd.c#2 integrate .. //depot/projects/busdma/dev/hwpmc/hwpmc_arm.c#2 integrate .. //depot/projects/busdma/dev/hwpmc/hwpmc_ia64.c#2 integrate .. //depot/projects/busdma/dev/hwpmc/hwpmc_logging.c#3 integrate .. //depot/projects/busdma/dev/hwpmc/hwpmc_mod.c#5 integrate .. //depot/projects/busdma/dev/hwpmc/hwpmc_piv.c#3 integrate .. //depot/projects/busdma/dev/hwpmc/hwpmc_powerpc.c#2 integrate .. //depot/projects/busdma/dev/hwpmc/hwpmc_ppro.c#2 integrate .. //depot/projects/busdma/dev/hwpmc/hwpmc_sparc64.c#2 integrate .. //depot/projects/busdma/dev/hwpmc/hwpmc_x86.c#2 integrate .. //depot/projects/busdma/dev/ichsmb/ichsmb_pci.c#3 integrate .. //depot/projects/busdma/dev/ichwd/ichwd.c#4 integrate .. //depot/projects/busdma/dev/ichwd/ichwd.h#3 integrate .. //depot/projects/busdma/dev/idt/idt_pci.c#3 integrate .. //depot/projects/busdma/dev/if_ndis/if_ndis.c#4 integrate .. //depot/projects/busdma/dev/if_ndis/if_ndis_pci.c#2 integrate .. //depot/projects/busdma/dev/if_ndis/if_ndisvar.h#3 integrate .. //depot/projects/busdma/dev/ipmi/ipmi_kcs.c#2 integrate .. //depot/projects/busdma/dev/ipmi/ipmi_smic.c#2 integrate .. //depot/projects/busdma/dev/ipmi/ipmi_ssif.c#3 integrate .. //depot/projects/busdma/dev/ipw/if_ipw.c#5 integrate .. //depot/projects/busdma/dev/ipw/if_ipwreg.h#2 integrate .. //depot/projects/busdma/dev/ipw/if_ipwvar.h#4 integrate .. //depot/projects/busdma/dev/iscsi/initiator/isc_sm.c#2 integrate .. //depot/projects/busdma/dev/iscsi/initiator/isc_soc.c#2 integrate .. //depot/projects/busdma/dev/isp/isp_freebsd.c#6 integrate .. //depot/projects/busdma/dev/isp/isp_freebsd.h#6 integrate .. //depot/projects/busdma/dev/isp/isp_sbus.c#5 integrate .. //depot/projects/busdma/dev/isp/isp_target.c#4 integrate .. //depot/projects/busdma/dev/iwi/if_iwi.c#6 integrate .. //depot/projects/busdma/dev/ixgbe/ixgbe.c#2 integrate .. //depot/projects/busdma/dev/ixgbe/ixgbe.h#2 integrate .. //depot/projects/busdma/dev/ixgbe/ixgbe_82598.c#2 integrate .. //depot/projects/busdma/dev/ixgbe/ixgbe_api.c#2 integrate .. //depot/projects/busdma/dev/ixgbe/ixgbe_api.h#2 integrate .. //depot/projects/busdma/dev/ixgbe/ixgbe_common.c#2 integrate .. //depot/projects/busdma/dev/ixgbe/ixgbe_common.h#2 integrate .. //depot/projects/busdma/dev/ixgbe/ixgbe_osdep.h#2 integrate .. //depot/projects/busdma/dev/ixgbe/ixgbe_phy.c#2 integrate .. //depot/projects/busdma/dev/ixgbe/ixgbe_phy.h#2 integrate .. //depot/projects/busdma/dev/ixgbe/ixgbe_type.h#2 integrate .. //depot/projects/busdma/dev/lge/if_lge.c#5 integrate .. //depot/projects/busdma/dev/md/md.c#4 integrate .. //depot/projects/busdma/dev/mfi/mfi.c#7 integrate .. //depot/projects/busdma/dev/mfi/mfi_cam.c#2 integrate .. //depot/projects/busdma/dev/mfi/mfi_pci.c#5 integrate .. //depot/projects/busdma/dev/mfi/mfireg.h#6 integrate .. //depot/projects/busdma/dev/mfi/mfivar.h#6 integrate .. //depot/projects/busdma/dev/mii/amphy.c#4 integrate .. //depot/projects/busdma/dev/mii/e1000phy.c#5 integrate .. //depot/projects/busdma/dev/mii/e1000phyreg.h#3 integrate .. //depot/projects/busdma/dev/mii/gentbi.c#3 integrate .. //depot/projects/busdma/dev/mii/miidevs#5 integrate .. //depot/projects/busdma/dev/mii/nsphy.c#4 integrate .. //depot/projects/busdma/dev/mii/rgephy.c#6 integrate .. //depot/projects/busdma/dev/mii/rgephyreg.h#2 integrate .. //depot/projects/busdma/dev/mii/rlphy.c#5 integrate .. //depot/projects/busdma/dev/mii/tdkphy.c#5 integrate .. //depot/projects/busdma/dev/mii/ukphy_subr.c#3 integrate .. //depot/projects/busdma/dev/mmc/mmcsd.c#3 integrate .. //depot/projects/busdma/dev/mpt/mpt.c#7 integrate .. //depot/projects/busdma/dev/mpt/mpt.h#8 integrate .. //depot/projects/busdma/dev/mpt/mpt_cam.c#8 integrate .. //depot/projects/busdma/dev/mpt/mpt_pci.c#8 integrate .. //depot/projects/busdma/dev/mpt/mpt_raid.c#6 integrate .. //depot/projects/busdma/dev/msk/if_msk.c#3 integrate .. //depot/projects/busdma/dev/msk/if_mskreg.h#3 integrate .. //depot/projects/busdma/dev/mxge/if_mxge.c#5 integrate .. //depot/projects/busdma/dev/mxge/if_mxge_var.h#5 integrate .. //depot/projects/busdma/dev/my/if_my.c#5 integrate .. //depot/projects/busdma/dev/nfe/if_nfe.c#5 integrate .. //depot/projects/busdma/dev/nge/if_nge.c#5 integrate .. //depot/projects/busdma/dev/nve/if_nve.c#5 integrate .. //depot/projects/busdma/dev/nvram/nvram.c#1 branch .. //depot/projects/busdma/dev/nxge/if_nxge.c#2 integrate .. //depot/projects/busdma/dev/nxge/if_nxge.h#2 integrate .. //depot/projects/busdma/dev/nxge/include/build-version.h#2 integrate .. //depot/projects/busdma/dev/nxge/include/version.h#2 integrate .. //depot/projects/busdma/dev/nxge/include/xge-debug.h#2 integrate .. //depot/projects/busdma/dev/nxge/include/xge-defs.h#2 integrate .. //depot/projects/busdma/dev/nxge/include/xge-list.h#2 integrate .. //depot/projects/busdma/dev/nxge/include/xge-os-pal.h#2 integrate .. //depot/projects/busdma/dev/nxge/include/xge-os-template.h#2 delete .. //depot/projects/busdma/dev/nxge/include/xge-queue.h#2 integrate .. //depot/projects/busdma/dev/nxge/include/xgehal-channel.h#2 integrate .. //depot/projects/busdma/dev/nxge/include/xgehal-config.h#2 integrate .. //depot/projects/busdma/dev/nxge/include/xgehal-device.h#2 integrate .. //depot/projects/busdma/dev/nxge/include/xgehal-driver.h#2 integrate .. //depot/projects/busdma/dev/nxge/include/xgehal-event.h#2 integrate .. //depot/projects/busdma/dev/nxge/include/xgehal-fifo.h#2 integrate .. //depot/projects/busdma/dev/nxge/include/xgehal-mgmt.h#2 integrate .. //depot/projects/busdma/dev/nxge/include/xgehal-mgmtaux.h#2 integrate .. //depot/projects/busdma/dev/nxge/include/xgehal-mm.h#2 integrate .. //depot/projects/busdma/dev/nxge/include/xgehal-regs.h#2 integrate .. //depot/projects/busdma/dev/nxge/include/xgehal-ring.h#2 integrate .. //depot/projects/busdma/dev/nxge/include/xgehal-stats.h#2 integrate .. //depot/projects/busdma/dev/nxge/include/xgehal-types.h#2 integrate .. //depot/projects/busdma/dev/nxge/include/xgehal.h#2 integrate .. //depot/projects/busdma/dev/nxge/xge-osdep.h#2 integrate .. //depot/projects/busdma/dev/nxge/xgehal/xge-queue.c#2 integrate .. //depot/projects/busdma/dev/nxge/xgehal/xgehal-channel-fp.c#2 integrate .. //depot/projects/busdma/dev/nxge/xgehal/xgehal-channel.c#2 integrate .. //depot/projects/busdma/dev/nxge/xgehal/xgehal-config.c#2 integrate .. //depot/projects/busdma/dev/nxge/xgehal/xgehal-device-fp.c#2 integrate .. //depot/projects/busdma/dev/nxge/xgehal/xgehal-device.c#2 integrate .. //depot/projects/busdma/dev/nxge/xgehal/xgehal-driver.c#2 integrate .. //depot/projects/busdma/dev/nxge/xgehal/xgehal-fifo-fp.c#2 integrate .. //depot/projects/busdma/dev/nxge/xgehal/xgehal-fifo.c#2 integrate .. //depot/projects/busdma/dev/nxge/xgehal/xgehal-mgmt.c#2 integrate .. //depot/projects/busdma/dev/nxge/xgehal/xgehal-mgmtaux.c#2 integrate .. //depot/projects/busdma/dev/nxge/xgehal/xgehal-mm.c#2 integrate .. //depot/projects/busdma/dev/nxge/xgehal/xgehal-ring-fp.c#2 integrate .. //depot/projects/busdma/dev/nxge/xgehal/xgehal-ring.c#2 integrate .. //depot/projects/busdma/dev/nxge/xgehal/xgehal-stats.c#2 integrate .. //depot/projects/busdma/dev/nxge/xgell-version.h#2 integrate .. //depot/projects/busdma/dev/ofw/ofw_disk.c#2 integrate .. //depot/projects/busdma/dev/pccard/pccard_cis_quirks.c#2 integrate .. //depot/projects/busdma/dev/pccard/pccarddevs#6 integrate .. //depot/projects/busdma/dev/pccbb/pccbb.c#6 integrate .. //depot/projects/busdma/dev/pccbb/pccbb_pci.c#6 integrate .. //depot/projects/busdma/dev/pccbb/pccbbvar.h#5 integrate .. //depot/projects/busdma/dev/pci/pci.c#6 integrate .. //depot/projects/busdma/dev/pci/pci_pci.c#4 integrate .. //depot/projects/busdma/dev/pci/pci_private.h#4 integrate .. //depot/projects/busdma/dev/pci/pci_user.c#3 integrate .. //depot/projects/busdma/dev/pci/pcib_private.h#4 integrate .. //depot/projects/busdma/dev/pci/pcireg.h#5 integrate .. //depot/projects/busdma/dev/pci/pcivar.h#5 integrate .. //depot/projects/busdma/dev/puc/puc_pci.c#3 integrate .. //depot/projects/busdma/dev/ral/rt2560.c#6 integrate .. //depot/projects/busdma/dev/ral/rt2661.c#5 integrate .. //depot/projects/busdma/dev/random/harvest.c#2 integrate .. //depot/projects/busdma/dev/random/randomdev_soft.c#4 integrate .. //depot/projects/busdma/dev/random/yarrow.c#3 integrate .. //depot/projects/busdma/dev/ray/if_ray.c#3 integrate .. //depot/projects/busdma/dev/re/if_re.c#7 integrate .. //depot/projects/busdma/dev/safe/safe.c#4 integrate .. //depot/projects/busdma/dev/si/si_pci.c#3 integrate .. //depot/projects/busdma/dev/sio/sio.c#6 integrate .. //depot/projects/busdma/dev/sio/sio_isa.c#2 integrate .. //depot/projects/busdma/dev/sio/sio_puc.c#2 integrate .. //depot/projects/busdma/dev/sk/if_sk.c#7 integrate .. //depot/projects/busdma/dev/snp/snp.c#4 integrate .. //depot/projects/busdma/dev/sound/isa/ad1816.c#4 integrate .. //depot/projects/busdma/dev/sound/isa/ad1816.h#3 integrate .. //depot/projects/busdma/dev/sound/midi/sequencer.c#4 integrate .. //depot/projects/busdma/dev/sound/pci/atiixp.c#5 integrate .. //depot/projects/busdma/dev/sound/pci/atiixp.h#3 integrate .. //depot/projects/busdma/dev/sound/pci/emu10kx-midi.c#2 integrate .. //depot/projects/busdma/dev/sound/pci/emu10kx-pcm.c#4 integrate .. //depot/projects/busdma/dev/sound/pci/emu10kx.c#4 integrate .. //depot/projects/busdma/dev/sound/pci/emu10kx.h#3 integrate .. //depot/projects/busdma/dev/sound/pci/envy24.c#5 integrate .. //depot/projects/busdma/dev/sound/pci/envy24ht.c#4 integrate .. //depot/projects/busdma/dev/sound/pci/hda/hdac.c#4 integrate .. //depot/projects/busdma/dev/sound/pci/t4dwave.c#4 integrate .. //depot/projects/busdma/dev/sound/pcm/ac97.c#5 integrate .. //depot/projects/busdma/dev/sound/pcm/ac97_patch.c#5 integrate .. //depot/projects/busdma/dev/sound/pcm/channel.c#5 integrate .. //depot/projects/busdma/dev/sound/sbus/cs4231.c#4 integrate .. //depot/projects/busdma/dev/stge/if_stge.c#4 integrate .. //depot/projects/busdma/dev/syscons/syscons.c#6 integrate .. //depot/projects/busdma/dev/syscons/syscons.h#4 integrate .. //depot/projects/busdma/dev/ti/if_ti.c#4 integrate .. //depot/projects/busdma/dev/twa/tw_cl_init.c#3 integrate .. //depot/projects/busdma/dev/twa/tw_cl_intr.c#3 integrate .. //depot/projects/busdma/dev/twa/tw_cl_io.c#3 integrate .. //depot/projects/busdma/dev/twa/tw_cl_misc.c#3 integrate .. //depot/projects/busdma/dev/twa/tw_cl_share.h#3 integrate .. //depot/projects/busdma/dev/twa/tw_osl.h#3 integrate .. //depot/projects/busdma/dev/twa/tw_osl_cam.c#4 integrate .. //depot/projects/busdma/dev/twa/tw_osl_freebsd.c#4 integrate .. //depot/projects/busdma/dev/twa/tw_osl_share.h#4 integrate .. //depot/projects/busdma/dev/txp/if_txp.c#6 integrate .. //depot/projects/busdma/dev/usb/ehci_pci.c#6 integrate .. //depot/projects/busdma/dev/usb/if_axe.c#6 integrate .. //depot/projects/busdma/dev/usb/if_axereg.h#4 integrate .. //depot/projects/busdma/dev/usb/if_rum.c#2 integrate .. //depot/projects/busdma/dev/usb/if_ural.c#7 integrate .. //depot/projects/busdma/dev/usb/if_zyd.c#1 branch .. //depot/projects/busdma/dev/usb/if_zydfw.h#1 branch .. //depot/projects/busdma/dev/usb/if_zydreg.h#1 branch .. //depot/projects/busdma/dev/usb/uchcom.c#1 branch .. //depot/projects/busdma/dev/usb/uhci_pci.c#5 integrate .. //depot/projects/busdma/dev/usb/uipaq.c#3 integrate .. //depot/projects/busdma/dev/usb/ukbd.c#5 integrate .. //depot/projects/busdma/dev/usb/usb.c#6 integrate .. //depot/projects/busdma/dev/usb/usb_port.h#4 integrate .. //depot/projects/busdma/dev/usb/usb_quirks.c#5 integrate .. //depot/projects/busdma/dev/usb/usbdevs#7 integrate .. //depot/projects/busdma/dev/usb/uscanner.c#5 integrate .. //depot/projects/busdma/dev/utopia/utopia.c#2 integrate .. //depot/projects/busdma/dev/vge/if_vge.c#4 integrate .. //depot/projects/busdma/dev/vx/if_vx_pci.c#3 integrate .. //depot/projects/busdma/dev/wi/if_wi.c#6 integrate .. //depot/projects/busdma/dev/wpi/if_wpi.c#1 branch .. //depot/projects/busdma/dev/wpi/if_wpireg.h#1 branch .. //depot/projects/busdma/dev/wpi/if_wpivar.h#1 branch .. //depot/projects/busdma/fs/cd9660/cd9660_vfsops.c#2 integrate .. //depot/projects/busdma/fs/coda/coda_vfsops.c#2 integrate .. //depot/projects/busdma/fs/devfs/devfs_devs.c#5 integrate .. //depot/projects/busdma/fs/devfs/devfs_vnops.c#6 integrate .. //depot/projects/busdma/fs/fdescfs/fdesc_vfsops.c#4 integrate .. //depot/projects/busdma/fs/hpfs/hpfs_vfsops.c#4 integrate .. //depot/projects/busdma/fs/msdosfs/denode.h#5 integrate .. //depot/projects/busdma/fs/msdosfs/direntry.h#3 integrate .. //depot/projects/busdma/fs/msdosfs/msdosfs_conv.c#5 integrate .. //depot/projects/busdma/fs/msdosfs/msdosfs_denode.c#4 integrate .. //depot/projects/busdma/fs/msdosfs/msdosfs_fat.c#4 integrate .. //depot/projects/busdma/fs/msdosfs/msdosfs_lookup.c#3 integrate .. //depot/projects/busdma/fs/msdosfs/msdosfs_vfsops.c#6 integrate .. //depot/projects/busdma/fs/msdosfs/msdosfs_vnops.c#4 integrate .. //depot/projects/busdma/fs/ntfs/ntfs_ihash.c#2 integrate .. //depot/projects/busdma/fs/ntfs/ntfs_vfsops.c#5 integrate .. //depot/projects/busdma/fs/nullfs/null_subr.c#3 integrate .. //depot/projects/busdma/fs/nullfs/null_vfsops.c#6 integrate .. //depot/projects/busdma/fs/nullfs/null_vnops.c#4 integrate .. //depot/projects/busdma/fs/nwfs/nwfs_vfsops.c#3 integrate .. //depot/projects/busdma/fs/portalfs/portal_vfsops.c#4 integrate .. //depot/projects/busdma/fs/procfs/procfs_status.c#4 integrate .. //depot/projects/busdma/fs/pseudofs/pseudofs.c#4 integrate .. //depot/projects/busdma/fs/pseudofs/pseudofs_vnops.c#5 integrate .. //depot/projects/busdma/fs/smbfs/smbfs_vfsops.c#3 integrate .. //depot/projects/busdma/fs/tmpfs/tmpfs.h#2 integrate .. //depot/projects/busdma/fs/tmpfs/tmpfs_subr.c#2 integrate .. //depot/projects/busdma/fs/tmpfs/tmpfs_vfsops.c#2 integrate .. //depot/projects/busdma/fs/tmpfs/tmpfs_vnops.c#2 integrate .. //depot/projects/busdma/fs/udf/udf_vfsops.c#6 integrate .. //depot/projects/busdma/fs/unionfs/union.h#4 integrate .. //depot/projects/busdma/fs/unionfs/union_subr.c#4 integrate .. //depot/projects/busdma/fs/unionfs/union_vfsops.c#4 integrate .. //depot/projects/busdma/fs/unionfs/union_vnops.c#5 integrate .. //depot/projects/busdma/geom/bde/g_bde.c#2 integrate .. //depot/projects/busdma/geom/bde/g_bde_work.c#3 integrate .. //depot/projects/busdma/geom/eli/g_eli.c#6 integrate .. //depot/projects/busdma/geom/eli/g_eli.h#4 integrate .. //depot/projects/busdma/geom/eli/g_eli_crypto.c#3 integrate .. //depot/projects/busdma/geom/geom_bsd.c#3 integrate .. //depot/projects/busdma/geom/geom_bsd_enc.c#2 integrate .. //depot/projects/busdma/geom/geom_event.c#3 integrate .. //depot/projects/busdma/geom/geom_io.c#5 integrate .. //depot/projects/busdma/geom/journal/g_journal.c#3 integrate .. //depot/projects/busdma/geom/label/g_label_reiserfs.c#2 integrate .. //depot/projects/busdma/geom/mirror/g_mirror.c#6 integrate .. //depot/projects/busdma/geom/multipath/g_multipath.c#2 integrate .. //depot/projects/busdma/geom/part/g_part.c#3 integrate .. //depot/projects/busdma/geom/part/g_part.h#3 integrate .. //depot/projects/busdma/geom/part/g_part_apm.c#3 integrate .. //depot/projects/busdma/geom/part/g_part_bsd.c#1 branch .. //depot/projects/busdma/geom/part/g_part_gpt.c#3 integrate .. //depot/projects/busdma/geom/raid3/g_raid3.c#7 integrate .. //depot/projects/busdma/geom/vinum/geom_vinum_drive.c#2 integrate .. //depot/projects/busdma/geom/vinum/geom_vinum_init.c#2 integrate .. //depot/projects/busdma/geom/vinum/geom_vinum_plex.c#2 integrate .. //depot/projects/busdma/geom/vinum/geom_vinum_volume.c#2 integrate .. //depot/projects/busdma/geom/virstor/binstream.c#1 branch .. //depot/projects/busdma/geom/virstor/binstream.h#1 branch .. //depot/projects/busdma/geom/virstor/g_virstor.c#1 branch .. //depot/projects/busdma/geom/virstor/g_virstor.h#1 branch .. //depot/projects/busdma/geom/virstor/g_virstor_md.c#1 branch .. //depot/projects/busdma/geom/virstor/g_virstor_md.h#1 branch .. //depot/projects/busdma/gnu/fs/ext2fs/ext2_vfsops.c#6 integrate .. //depot/projects/busdma/gnu/fs/reiserfs/reiserfs_vfsops.c#6 integrate .. //depot/projects/busdma/gnu/fs/xfs/FreeBSD/xfs_vfs.c#3 integrate .. //depot/projects/busdma/i386/acpica/madt.c#5 integrate .. //depot/projects/busdma/i386/bios/apm.c#4 integrate .. //depot/projects/busdma/i386/conf/DEFAULTS#5 integrate .. //depot/projects/busdma/i386/conf/GENERIC#7 integrate .. //depot/projects/busdma/i386/conf/GENERIC.hints#3 integrate .. //depot/projects/busdma/i386/conf/NOTES#8 integrate .. //depot/projects/busdma/i386/conf/PAE#6 integrate .. //depot/projects/busdma/i386/conf/XBOX#5 integrate .. //depot/projects/busdma/i386/i386/busdma_machdep.c#6 integrate .. //depot/projects/busdma/i386/i386/db_trace.c#5 integrate .. //depot/projects/busdma/i386/i386/exception.s#3 integrate .. //depot/projects/busdma/i386/i386/genassym.c#4 integrate .. //depot/projects/busdma/i386/i386/geode.c#3 integrate .. //depot/projects/busdma/i386/i386/in_cksum.c#2 integrate .. //depot/projects/busdma/i386/i386/intr_machdep.c#5 integrate .. //depot/projects/busdma/i386/i386/legacy.c#3 integrate .. //depot/projects/busdma/i386/i386/local_apic.c#5 integrate .. //depot/projects/busdma/i386/i386/locore.s#3 integrate .. //depot/projects/busdma/i386/i386/machdep.c#7 integrate .. //depot/projects/busdma/i386/i386/mp_machdep.c#6 integrate .. //depot/projects/busdma/i386/i386/msi.c#3 integrate .. //depot/projects/busdma/i386/i386/pmap.c#7 integrate .. //depot/projects/busdma/i386/i386/stack_machdep.c#1 branch .. //depot/projects/busdma/i386/i386/trap.c#6 integrate .. //depot/projects/busdma/i386/i386/vm_machdep.c#5 integrate .. //depot/projects/busdma/i386/ibcs2/ibcs2_misc.c#5 integrate .. //depot/projects/busdma/i386/ibcs2/imgact_coff.c#4 integrate .. //depot/projects/busdma/i386/include/bootinfo.h#2 integrate .. //depot/projects/busdma/i386/include/clock.h#5 integrate .. //depot/projects/busdma/i386/include/in_cksum.h#2 integrate .. //depot/projects/busdma/i386/include/legacyvar.h#2 integrate .. //depot/projects/busdma/i386/include/pc/bios.h#2 integrate .. //depot/projects/busdma/i386/include/pmap.h#4 integrate .. //depot/projects/busdma/i386/include/pmc_mdep.h#2 integrate .. //depot/projects/busdma/i386/include/smp.h#4 integrate .. //depot/projects/busdma/i386/include/stack.h#1 branch .. //depot/projects/busdma/i386/include/vmparam.h#4 integrate .. //depot/projects/busdma/i386/isa/clock.c#5 integrate .. //depot/projects/busdma/i386/isa/isa.c#3 integrate .. //depot/projects/busdma/i386/isa/prof_machdep.c#3 integrate .. //depot/projects/busdma/i386/linux/imgact_linux.c#3 integrate .. //depot/projects/busdma/i386/linux/linux.h#4 integrate .. //depot/projects/busdma/i386/linux/linux_machdep.c#5 integrate .. //depot/projects/busdma/i386/linux/linux_proto.h#7 integrate .. //depot/projects/busdma/i386/linux/linux_ptrace.c#2 integrate .. //depot/projects/busdma/i386/linux/linux_syscall.h#7 integrate .. //depot/projects/busdma/i386/linux/linux_sysent.c#7 integrate .. //depot/projects/busdma/i386/linux/linux_sysvec.c#5 integrate .. //depot/projects/busdma/i386/linux/syscalls.master#7 integrate .. //depot/projects/busdma/i386/pci/pci_bus.c#4 integrate .. //depot/projects/busdma/i386/pci/pci_cfgreg.c#3 integrate .. //depot/projects/busdma/i4b/layer1/isic/i4b_avm_a1.c#4 integrate .. //depot/projects/busdma/i4b/layer1/isic/i4b_elsa_pcc16.c#4 integrate .. //depot/projects/busdma/i4b/layer1/isic/i4b_isic.c#3 integrate .. //depot/projects/busdma/i4b/layer1/isic/i4b_itk_ix1.c#4 integrate .. //depot/projects/busdma/i4b/layer1/isic/i4b_tel_s016.c#4 integrate .. //depot/projects/busdma/i4b/layer1/isic/i4b_tel_s0163.c#4 integrate .. //depot/projects/busdma/i4b/layer1/isic/i4b_tel_s08.c#4 integrate .. //depot/projects/busdma/ia64/conf/DEFAULTS#6 integrate .. //depot/projects/busdma/ia64/conf/GENERIC#7 integrate .. //depot/projects/busdma/ia64/disasm/disasm.h#3 integrate .. //depot/projects/busdma/ia64/ia64/busdma_machdep.c#5 integrate .. //depot/projects/busdma/ia64/ia64/db_machdep.c#4 integrate .. //depot/projects/busdma/ia64/ia64/exception.S#3 integrate .. //depot/projects/busdma/ia64/ia64/interrupt.c#4 integrate .. //depot/projects/busdma/ia64/ia64/machdep.c#5 integrate .. //depot/projects/busdma/ia64/ia64/pmap.c#7 integrate .. //depot/projects/busdma/ia64/ia64/stack_machdep.c#1 branch .. //depot/projects/busdma/ia64/ia64/support.S#4 integrate .. //depot/projects/busdma/ia64/ia64/trap.c#7 integrate .. //depot/projects/busdma/ia64/ia64/uma_machdep.c#3 integrate .. //depot/projects/busdma/ia64/ia64/vm_machdep.c#4 integrate .. //depot/projects/busdma/ia64/include/atomic.h#3 integrate .. //depot/projects/busdma/ia64/include/pmc_mdep.h#2 integrate .. //depot/projects/busdma/ia64/include/vmparam.h#5 integrate .. //depot/projects/busdma/kern/imgact_aout.c#2 integrate .. //depot/projects/busdma/kern/imgact_elf.c#4 integrate .. //depot/projects/busdma/kern/imgact_gzip.c#2 integrate .. //depot/projects/busdma/kern/init_main.c#6 integrate .. //depot/projects/busdma/kern/kern_acct.c#6 integrate .. //depot/projects/busdma/kern/kern_alq.c#4 integrate .. //depot/projects/busdma/kern/kern_clock.c#5 integrate .. //depot/projects/busdma/kern/kern_conf.c#5 integrate .. //depot/projects/busdma/kern/kern_cpu.c#4 integrate .. //depot/projects/busdma/kern/kern_descrip.c#6 integrate .. //depot/projects/busdma/kern/kern_environment.c#4 integrate .. //depot/projects/busdma/kern/kern_exec.c#7 integrate .. //depot/projects/busdma/kern/kern_exit.c#6 integrate .. //depot/projects/busdma/kern/kern_fork.c#6 integrate .. //depot/projects/busdma/kern/kern_idle.c#4 integrate .. //depot/projects/busdma/kern/kern_intr.c#5 integrate .. //depot/projects/busdma/kern/kern_jail.c#4 integrate .. //depot/projects/busdma/kern/kern_kse.c#4 integrate .. //depot/projects/busdma/kern/kern_kthread.c#4 integrate .. //depot/projects/busdma/kern/kern_ktrace.c#6 integrate .. //depot/projects/busdma/kern/kern_linker.c#7 integrate .. //depot/projects/busdma/kern/kern_lock.c#5 integrate .. //depot/projects/busdma/kern/kern_mbuf.c#6 integrate .. //depot/projects/busdma/kern/kern_mib.c#4 integrate .. //depot/projects/busdma/kern/kern_module.c#5 integrate .. //depot/projects/busdma/kern/kern_mutex.c#6 integrate .. //depot/projects/busdma/kern/kern_pmc.c#2 integrate .. //depot/projects/busdma/kern/kern_proc.c#5 integrate .. //depot/projects/busdma/kern/kern_prot.c#6 integrate .. //depot/projects/busdma/kern/kern_rmlock.c#1 branch .. //depot/projects/busdma/kern/kern_rwlock.c#5 integrate .. //depot/projects/busdma/kern/kern_shutdown.c#4 integrate .. //depot/projects/busdma/kern/kern_sig.c#7 integrate .. //depot/projects/busdma/kern/kern_switch.c#5 integrate .. //depot/projects/busdma/kern/kern_sx.c#5 integrate .. //depot/projects/busdma/kern/kern_synch.c#5 integrate .. //depot/projects/busdma/kern/kern_sysctl.c#5 integrate .. //depot/projects/busdma/kern/kern_thr.c#5 integrate .. //depot/projects/busdma/kern/kern_thread.c#6 integrate .. //depot/projects/busdma/kern/kern_timeout.c#4 integrate .. //depot/projects/busdma/kern/kern_umtx.c#7 integrate .. //depot/projects/busdma/kern/link_elf.c#6 integrate .. //depot/projects/busdma/kern/link_elf_obj.c#5 integrate .. //depot/projects/busdma/kern/linker_if.m#2 integrate .. //depot/projects/busdma/kern/p1003_1b.c#2 integrate .. //depot/projects/busdma/kern/sched_4bsd.c#7 integrate .. //depot/projects/busdma/kern/sched_ule.c#6 integrate .. //depot/projects/busdma/kern/subr_bus.c#6 integrate .. //depot/projects/busdma/kern/subr_kdb.c#3 integrate .. //depot/projects/busdma/kern/subr_lock.c#4 integrate .. //depot/projects/busdma/kern/subr_param.c#2 integrate .. //depot/projects/busdma/kern/subr_pcpu.c#2 integrate .. //depot/projects/busdma/kern/subr_sleepqueue.c#4 integrate .. //depot/projects/busdma/kern/subr_smp.c#4 integrate .. //depot/projects/busdma/kern/subr_stack.c#3 integrate .. //depot/projects/busdma/kern/subr_taskqueue.c#5 integrate .. //depot/projects/busdma/kern/subr_trap.c#4 integrate .. //depot/projects/busdma/kern/subr_turnstile.c#5 integrate .. //depot/projects/busdma/kern/subr_witness.c#5 integrate .. //depot/projects/busdma/kern/sys_generic.c#5 integrate .. //depot/projects/busdma/kern/sys_pipe.c#5 integrate .. //depot/projects/busdma/kern/sys_process.c#5 integrate .. //depot/projects/busdma/kern/sys_socket.c#5 integrate .. //depot/projects/busdma/kern/syscalls.master#6 integrate .. //depot/projects/busdma/kern/sysv_msg.c#6 integrate .. //depot/projects/busdma/kern/sysv_sem.c#7 integrate .. //depot/projects/busdma/kern/sysv_shm.c#5 integrate .. //depot/projects/busdma/kern/tty_pty.c#5 integrate .. //depot/projects/busdma/kern/uipc_mbuf.c#6 integrate .. //depot/projects/busdma/kern/uipc_mbuf2.c#3 integrate .. //depot/projects/busdma/kern/uipc_sem.c#4 integrate .. //depot/projects/busdma/kern/uipc_sockbuf.c#4 integrate .. //depot/projects/busdma/kern/uipc_socket.c#6 integrate .. //depot/projects/busdma/kern/uipc_syscalls.c#6 integrate .. //depot/projects/busdma/kern/uipc_usrreq.c#7 integrate .. //depot/projects/busdma/kern/vfs_acl.c#2 integrate .. //depot/projects/busdma/kern/vfs_aio.c#7 integrate .. //depot/projects/busdma/kern/vfs_bio.c#5 integrate .. //depot/projects/busdma/kern/vfs_cache.c#5 integrate .. //depot/projects/busdma/kern/vfs_extattr.c#2 integrate .. //depot/projects/busdma/kern/vfs_lookup.c#5 integrate .. //depot/projects/busdma/kern/vfs_mount.c#7 integrate .. //depot/projects/busdma/kern/vfs_subr.c#7 integrate .. //depot/projects/busdma/kern/vfs_syscalls.c#7 integrate .. //depot/projects/busdma/kern/vfs_vnops.c#6 integrate .. //depot/projects/busdma/libkern/arm/ffs.S#2 integrate .. //depot/projects/busdma/modules/Makefile#8 integrate .. //depot/projects/busdma/modules/acpi/acpi/Makefile#4 integrate .. //depot/projects/busdma/modules/agp/Makefile#3 integrate .. //depot/projects/busdma/modules/amr/Makefile#2 integrate .. //depot/projects/busdma/modules/asmc/Makefile#1 branch .. //depot/projects/busdma/modules/cxgb/Makefile#3 integrate .. //depot/projects/busdma/modules/geom/Makefile#4 integrate .. //depot/projects/busdma/modules/geom/geom_virstor/Makefile#1 branch .. //depot/projects/busdma/modules/ixgbe/Makefile#1 branch .. //depot/projects/busdma/modules/nvram/Makefile#1 branch .. //depot/projects/busdma/modules/nxge/Makefile#2 integrate .. //depot/projects/busdma/modules/sound/driver/emu10kx/Makefile#3 integrate .. //depot/projects/busdma/modules/uchcom/Makefile#1 branch .. //depot/projects/busdma/modules/wpi/Makefile#1 branch .. //depot/projects/busdma/modules/wpifw/Makefile#1 branch .. //depot/projects/busdma/modules/zfs/Makefile#3 integrate .. //depot/projects/busdma/modules/zyd/Makefile#1 branch .. //depot/projects/busdma/net/bpf.c#8 integrate .. //depot/projects/busdma/net/bpf.h#5 integrate .. //depot/projects/busdma/net/bpf_filter.c#3 integrate .. //depot/projects/busdma/net/bridgestp.c#5 integrate .. //depot/projects/busdma/net/bridgestp.h#4 integrate .. //depot/projects/busdma/net/bsd_comp.c#3 integrate .. //depot/projects/busdma/net/ethernet.h#4 integrate .. //depot/projects/busdma/net/ieee8023ad_lacp.c#3 integrate .. //depot/projects/busdma/net/if.c#7 integrate .. //depot/projects/busdma/net/if_atmsubr.c#4 integrate .. //depot/projects/busdma/net/if_bridge.c#6 integrate .. //depot/projects/busdma/net/if_bridgevar.h#5 integrate .. //depot/projects/busdma/net/if_disc.c#5 integrate .. //depot/projects/busdma/net/if_enc.c#4 integrate .. //depot/projects/busdma/net/if_ethersubr.c#5 integrate .. //depot/projects/busdma/net/if_fddisubr.c#3 integrate .. //depot/projects/busdma/net/if_fwsubr.c#5 integrate .. //depot/projects/busdma/net/if_gif.c#6 integrate .. //depot/projects/busdma/net/if_iso88025subr.c#3 integrate .. //depot/projects/busdma/net/if_lagg.c#3 integrate .. //depot/projects/busdma/net/if_lagg.h#3 integrate .. //depot/projects/busdma/net/if_loop.c#5 integrate .. //depot/projects/busdma/net/if_media.h#5 integrate .. //depot/projects/busdma/net/if_ppp.c#5 integrate .. //depot/projects/busdma/net/if_stf.c#6 integrate .. //depot/projects/busdma/net/if_tun.c#6 integrate .. //depot/projects/busdma/net/if_var.h#6 integrate .. //depot/projects/busdma/net/if_vlan.c#6 integrate .. //depot/projects/busdma/net/pfil.c#2 integrate .. //depot/projects/busdma/net/pfil.h#3 integrate .. //depot/projects/busdma/net/route.c#6 integrate .. //depot/projects/busdma/net/rtsock.c#5 integrate .. //depot/projects/busdma/net80211/_ieee80211.h#4 integrate .. //depot/projects/busdma/net80211/ieee80211.c#5 integrate .. //depot/projects/busdma/net80211/ieee80211.h#5 integrate .. //depot/projects/busdma/net80211/ieee80211_freebsd.c#6 integrate .. //depot/projects/busdma/net80211/ieee80211_freebsd.h#5 integrate .. //depot/projects/busdma/net80211/ieee80211_ht.c#2 integrate .. //depot/projects/busdma/net80211/ieee80211_ht.h#2 integrate .. //depot/projects/busdma/net80211/ieee80211_input.c#6 integrate .. //depot/projects/busdma/net80211/ieee80211_ioctl.c#5 integrate .. //depot/projects/busdma/net80211/ieee80211_ioctl.h#4 integrate .. //depot/projects/busdma/net80211/ieee80211_node.c#5 integrate .. //depot/projects/busdma/net80211/ieee80211_node.h#4 integrate .. //depot/projects/busdma/net80211/ieee80211_output.c#5 integrate .. //depot/projects/busdma/net80211/ieee80211_power.c#2 integrate .. //depot/projects/busdma/net80211/ieee80211_proto.c#5 integrate .. //depot/projects/busdma/net80211/ieee80211_proto.h#5 integrate .. //depot/projects/busdma/net80211/ieee80211_regdomain.c#2 integrate .. //depot/projects/busdma/net80211/ieee80211_scan.c#2 integrate .. //depot/projects/busdma/net80211/ieee80211_scan_ap.c#2 integrate .. //depot/projects/busdma/net80211/ieee80211_scan_sta.c#2 integrate .. //depot/projects/busdma/net80211/ieee80211_var.h#5 integrate .. //depot/projects/busdma/netatalk/aarp.c#3 integrate .. //depot/projects/busdma/netatalk/ddp_input.c#3 integrate .. //depot/projects/busdma/netatalk/ddp_output.c#3 integrate .. //depot/projects/busdma/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#5 integrate .. //depot/projects/busdma/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#4 integrate .. //depot/projects/busdma/netgraph/netgraph.h#5 integrate .. //depot/projects/busdma/netgraph/ng_base.c#5 integrate .. //depot/projects/busdma/netgraph/ng_cisco.c#2 integrate .. //depot/projects/busdma/netgraph/ng_l2tp.c#3 integrate .. //depot/projects/busdma/netgraph/ng_ppp.c#4 integrate .. //depot/projects/busdma/netgraph/ng_pppoe.c#3 integrate .. //depot/projects/busdma/netgraph/ng_socket.c#6 integrate .. //depot/projects/busdma/netinet/accf_data.c#2 integrate .. //depot/projects/busdma/netinet/accf_http.c#2 integrate .. //depot/projects/busdma/netinet/if_ether.c#7 integrate .. //depot/projects/busdma/netinet/igmp.c#3 integrate .. //depot/projects/busdma/netinet/in.c#5 integrate .. //depot/projects/busdma/netinet/in_cksum.c#3 integrate .. //depot/projects/busdma/netinet/in_gif.c#4 integrate .. //depot/projects/busdma/netinet/in_pcb.c#7 integrate .. //depot/projects/busdma/netinet/in_pcb.h#5 integrate .. //depot/projects/busdma/netinet/in_proto.c#4 integrate .. //depot/projects/busdma/netinet/in_rmx.c#4 integrate .. //depot/projects/busdma/netinet/ip.h#4 integrate .. //depot/projects/busdma/netinet/ip_carp.c#6 integrate .. //depot/projects/busdma/netinet/ip_divert.c#6 integrate .. //depot/projects/busdma/netinet/ip_dummynet.c#5 integrate .. //depot/projects/busdma/netinet/ip_dummynet.h#3 integrate .. //depot/projects/busdma/netinet/ip_ecn.c#3 integrate .. //depot/projects/busdma/netinet/ip_encap.c#4 integrate .. //depot/projects/busdma/netinet/ip_fastfwd.c#4 integrate .. //depot/projects/busdma/netinet/ip_fw2.c#8 integrate .. //depot/projects/busdma/netinet/ip_fw_pfil.c#4 integrate .. //depot/projects/busdma/netinet/ip_gre.c#3 integrate .. //depot/projects/busdma/netinet/ip_icmp.c#4 integrate .. //depot/projects/busdma/netinet/ip_id.c#3 integrate .. //depot/projects/busdma/netinet/ip_input.c#7 integrate .. //depot/projects/busdma/netinet/ip_ipsec.c#5 integrate .. //depot/projects/busdma/netinet/ip_mroute.c#6 integrate .. //depot/projects/busdma/netinet/ip_options.c#4 integrate .. //depot/projects/busdma/netinet/ip_output.c#7 integrate .. //depot/projects/busdma/netinet/libalias/alias_util.c#4 integrate .. //depot/projects/busdma/netinet/raw_ip.c#6 integrate .. //depot/projects/busdma/netinet/sctp.h#3 integrate .. //depot/projects/busdma/netinet/sctp_asconf.c#3 integrate .. //depot/projects/busdma/netinet/sctp_asconf.h#3 integrate .. //depot/projects/busdma/netinet/sctp_auth.c#3 integrate .. //depot/projects/busdma/netinet/sctp_bsd_addr.c#3 integrate .. //depot/projects/busdma/netinet/sctp_cc_functions.c#2 integrate .. //depot/projects/busdma/netinet/sctp_cc_functions.h#2 integrate .. //depot/projects/busdma/netinet/sctp_constants.h#3 integrate .. //depot/projects/busdma/netinet/sctp_indata.c#3 integrate .. //depot/projects/busdma/netinet/sctp_input.c#3 integrate .. //depot/projects/busdma/netinet/sctp_lock_bsd.h#3 integrate .. //depot/projects/busdma/netinet/sctp_os_bsd.h#3 integrate .. //depot/projects/busdma/netinet/sctp_output.c#3 integrate .. //depot/projects/busdma/netinet/sctp_output.h#3 integrate .. //depot/projects/busdma/netinet/sctp_pcb.c#3 integrate .. //depot/projects/busdma/netinet/sctp_pcb.h#3 integrate .. //depot/projects/busdma/netinet/sctp_peeloff.c#3 integrate .. //depot/projects/busdma/netinet/sctp_structs.h#3 integrate .. //depot/projects/busdma/netinet/sctp_sysctl.c#3 integrate .. //depot/projects/busdma/netinet/sctp_sysctl.h#3 integrate .. //depot/projects/busdma/netinet/sctp_timer.c#3 integrate .. //depot/projects/busdma/netinet/sctp_timer.h#3 integrate .. //depot/projects/busdma/netinet/sctp_uio.h#3 integrate .. //depot/projects/busdma/netinet/sctp_usrreq.c#3 integrate .. //depot/projects/busdma/netinet/sctp_var.h#3 integrate .. //depot/projects/busdma/netinet/sctputil.c#3 integrate .. //depot/projects/busdma/netinet/sctputil.h#3 integrate .. //depot/projects/busdma/netinet/tcp_debug.c#3 integrate .. //depot/projects/busdma/netinet/tcp_hostcache.c#4 integrate .. //depot/projects/busdma/netinet/tcp_input.c#7 integrate .. //depot/projects/busdma/netinet/tcp_output.c#5 integrate .. //depot/projects/busdma/netinet/tcp_reass.c#2 integrate .. //depot/projects/busdma/netinet/tcp_subr.c#5 integrate .. //depot/projects/busdma/netinet/tcp_syncache.c#7 integrate .. //depot/projects/busdma/netinet/tcp_timer.c#7 integrate .. //depot/projects/busdma/netinet/tcp_timer.h#5 integrate .. //depot/projects/busdma/netinet/tcp_timewait.c#2 integrate .. //depot/projects/busdma/netinet/tcp_usrreq.c#7 integrate .. //depot/projects/busdma/netinet/tcp_var.h#7 integrate .. //depot/projects/busdma/netinet/udp_usrreq.c#7 integrate .. //depot/projects/busdma/netinet6/in6.c#7 integrate .. //depot/projects/busdma/netinet6/ip6_output.c#5 integrate .. //depot/projects/busdma/netinet6/nd6.c#6 integrate .. //depot/projects/busdma/netinet6/sctp6_usrreq.c#3 integrate .. //depot/projects/busdma/netinet6/sctp6_var.h#3 integrate .. //depot/projects/busdma/netinet6/udp6_usrreq.c#6 integrate .. //depot/projects/busdma/netipsec/ipsec.c#5 integrate .. //depot/projects/busdma/netipsec/ipsec.h#4 integrate .. //depot/projects/busdma/netipsec/ipsec_input.c#6 integrate .. //depot/projects/busdma/netipsec/ipsec_output.c#4 integrate .. //depot/projects/busdma/netipsec/keysock.c#4 integrate .. //depot/projects/busdma/netipsec/xform.h#2 integrate .. //depot/projects/busdma/netipsec/xform_ipip.c#4 integrate .. //depot/projects/busdma/netsmb/smb_iod.c#3 integrate .. //depot/projects/busdma/nfs4client/nfs4_vfsops.c#5 integrate .. //depot/projects/busdma/nfsclient/nfs.h#4 integrate .. //depot/projects/busdma/nfsclient/nfs_bio.c#5 integrate .. //depot/projects/busdma/nfsclient/nfs_nfsiod.c#3 integrate .. //depot/projects/busdma/nfsclient/nfs_socket.c#7 integrate .. //depot/projects/busdma/nfsclient/nfs_subs.c#6 integrate .. //depot/projects/busdma/nfsclient/nfs_vfsops.c#6 integrate .. //depot/projects/busdma/nfsclient/nfs_vnops.c#6 integrate .. //depot/projects/busdma/nfsclient/nfsmount.h#3 integrate .. //depot/projects/busdma/nfsserver/nfs.h#4 integrate .. //depot/projects/busdma/nfsserver/nfs_serv.c#5 integrate .. //depot/projects/busdma/nfsserver/nfs_srvsock.c#5 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Dec 10 02:17:31 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F96616A419; Mon, 10 Dec 2007 02:17:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9322F16A417 for ; Mon, 10 Dec 2007 02:17:30 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7FF2E13C468 for ; Mon, 10 Dec 2007 02:17:30 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBA2HUPP082858 for ; Mon, 10 Dec 2007 02:17:30 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBA2HQ0l082849 for perforce@freebsd.org; Mon, 10 Dec 2007 02:17:26 GMT (envelope-from marcel@freebsd.org) Date: Mon, 10 Dec 2007 02:17:26 GMT Message-Id: <200712100217.lBA2HQ0l082849@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 130575 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Dec 2007 02:17:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=130575 Change 130575 by marcel@marcel_xcllnt on 2007/12/10 02:16:49 IFC @130571 Affected files ... .. //depot/projects/ia64/bin/ed/Makefile#14 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/freebsd.h#12 integrate .. //depot/projects/ia64/etc/rc.d/DAEMON#6 integrate .. //depot/projects/ia64/etc/rc.d/LOGIN#6 integrate .. //depot/projects/ia64/etc/rc.d/Makefile#46 integrate .. //depot/projects/ia64/etc/rc.d/NETWORKING#13 integrate .. //depot/projects/ia64/etc/rc.d/SERVERS#8 integrate .. //depot/projects/ia64/etc/rc.d/accounting#9 integrate .. //depot/projects/ia64/etc/rc.d/amd#16 integrate .. //depot/projects/ia64/etc/rc.d/apmd#12 integrate .. //depot/projects/ia64/etc/rc.d/bootconf.sh#7 delete .. //depot/projects/ia64/etc/rc.d/bootparams#7 integrate .. //depot/projects/ia64/etc/rc.d/ccd#6 integrate .. //depot/projects/ia64/etc/rc.d/cron#8 integrate .. //depot/projects/ia64/etc/rc.d/dhclient#19 integrate .. //depot/projects/ia64/etc/rc.d/dmesg#6 integrate .. //depot/projects/ia64/etc/rc.d/fsck#9 integrate .. //depot/projects/ia64/etc/rc.d/ftp-proxy#2 integrate .. //depot/projects/ia64/etc/rc.d/inetd#6 integrate .. //depot/projects/ia64/etc/rc.d/ipfilter#22 integrate .. //depot/projects/ia64/etc/rc.d/ipfs#6 integrate .. //depot/projects/ia64/etc/rc.d/ipmon#14 integrate .. //depot/projects/ia64/etc/rc.d/ipnat#14 integrate .. //depot/projects/ia64/etc/rc.d/ipsec#14 integrate .. //depot/projects/ia64/etc/rc.d/isdnd#15 integrate .. //depot/projects/ia64/etc/rc.d/keyserv#4 integrate .. //depot/projects/ia64/etc/rc.d/ldconfig#16 integrate .. //depot/projects/ia64/etc/rc.d/local#7 integrate .. //depot/projects/ia64/etc/rc.d/lockd#3 integrate .. //depot/projects/ia64/etc/rc.d/lpd#8 integrate .. //depot/projects/ia64/etc/rc.d/motd#10 integrate .. //depot/projects/ia64/etc/rc.d/mountcritlocal#13 integrate .. //depot/projects/ia64/etc/rc.d/mountcritremote#15 integrate .. //depot/projects/ia64/etc/rc.d/mountd#14 integrate .. //depot/projects/ia64/etc/rc.d/moused#11 integrate .. //depot/projects/ia64/etc/rc.d/mrouted#11 integrate .. //depot/projects/ia64/etc/rc.d/newsyslog#6 integrate .. //depot/projects/ia64/etc/rc.d/nfsd#13 integrate .. //depot/projects/ia64/etc/rc.d/power_profile#10 integrate .. //depot/projects/ia64/etc/rc.d/pwcheck#5 integrate .. //depot/projects/ia64/etc/rc.d/quota#7 integrate .. //depot/projects/ia64/etc/rc.d/rarpd#7 integrate .. //depot/projects/ia64/etc/rc.d/resolv#6 integrate .. //depot/projects/ia64/etc/rc.d/root#13 integrate .. //depot/projects/ia64/etc/rc.d/route6d#9 integrate .. //depot/projects/ia64/etc/rc.d/routed#11 integrate .. //depot/projects/ia64/etc/rc.d/rpcbind#11 integrate .. //depot/projects/ia64/etc/rc.d/rtadvd#9 integrate .. //depot/projects/ia64/etc/rc.d/rwho#5 integrate .. //depot/projects/ia64/etc/rc.d/savecore#7 integrate .. //depot/projects/ia64/etc/rc.d/securelevel#9 integrate .. //depot/projects/ia64/etc/rc.d/sendmail#15 integrate .. //depot/projects/ia64/etc/rc.d/sshd#11 integrate .. //depot/projects/ia64/etc/rc.d/statd#2 integrate .. //depot/projects/ia64/etc/rc.d/swap1#9 integrate .. //depot/projects/ia64/etc/rc.d/sysctl#11 integrate .. //depot/projects/ia64/etc/rc.d/syslogd#10 integrate .. //depot/projects/ia64/etc/rc.d/timed#6 integrate .. //depot/projects/ia64/etc/rc.d/tmp#7 integrate .. //depot/projects/ia64/etc/rc.d/ugidfw#6 integrate .. //depot/projects/ia64/etc/rc.d/var#9 integrate .. //depot/projects/ia64/etc/rc.d/virecover#9 integrate .. //depot/projects/ia64/etc/rc.d/ypbind#10 integrate .. //depot/projects/ia64/etc/rc.d/yppasswdd#10 integrate .. //depot/projects/ia64/etc/rc.d/ypserv#11 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes#69 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes-o.real#11 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes-o.sp.ok#3 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes.sp.ok#7 integrate .. //depot/projects/ia64/lib/libc/gdtoa/_ldtoa.c#4 integrate .. //depot/projects/ia64/lib/libc/stdio/vfscanf.c#20 integrate .. //depot/projects/ia64/lib/libc/stdio/vfwscanf.c#13 integrate .. //depot/projects/ia64/lib/libc/sys/access.2#6 integrate .. //depot/projects/ia64/release/Makefile#107 integrate .. //depot/projects/ia64/release/doc/zh_CN.GB2312/Makefile#3 integrate .. //depot/projects/ia64/release/doc/zh_CN.GB2312/errata/Makefile#2 integrate .. //depot/projects/ia64/release/doc/zh_CN.GB2312/hardware/Makefile#2 integrate .. //depot/projects/ia64/release/doc/zh_CN.GB2312/hardware/Makefile.inc#2 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/hardware/amd64/Makefile#2 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/hardware/amd64/article.sgml#2 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/hardware/amd64/proc-amd64.sgml#4 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/hardware/article.sgml#1 branch .. //depot/projects/ia64/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml#5 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#10 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/hardware/common/hw.ent#3 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/hardware/common/intro.sgml#3 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/hardware/i386/Makefile#2 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/hardware/i386/article.sgml#2 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/hardware/i386/proc-i386.sgml#4 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/installation/Makefile#3 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/installation/Makefile.inc#2 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/installation/amd64/Makefile#2 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/installation/amd64/article.sgml#2 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/installation/common/abstract.sgml#2 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/installation/common/artheader.sgml#5 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/installation/common/install.ent#2 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/installation/common/install.sgml#6 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/installation/common/layout.sgml#4 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/installation/common/trouble.sgml#5 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/installation/common/upgrade.sgml#3 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/installation/i386/Makefile#2 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/installation/i386/article.sgml#2 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/installation/ia64/Makefile#2 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/installation/ia64/article.sgml#2 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/installation/pc98/Makefile#2 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/installation/pc98/article.sgml#2 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/installation/sparc64/Makefile#2 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/installation/sparc64/article.sgml#2 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/installation/sparc64/install.sgml#3 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/readme/article.sgml#3 integrate .. //depot/projects/ia64/release/doc/zh_CN.GB2312/relnotes/Makefile#3 integrate .. //depot/projects/ia64/release/doc/zh_CN.GB2312/relnotes/Makefile.inc#2 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/relnotes/amd64/Makefile#2 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/relnotes/amd64/article.sgml#3 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/relnotes/article.sgml#1 branch .. //depot/projects/ia64/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#9 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/relnotes/common/relnotes.ent#2 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/relnotes/i386/Makefile#2 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/relnotes/i386/article.sgml#2 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/relnotes/ia64/Makefile#2 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/relnotes/ia64/article.sgml#2 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/relnotes/pc98/Makefile#2 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/relnotes/pc98/article.sgml#2 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/relnotes/powerpc/Makefile#2 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/relnotes/powerpc/article.sgml#2 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/relnotes/sparc64/Makefile#3 delete .. //depot/projects/ia64/release/doc/zh_CN.GB2312/relnotes/sparc64/article.sgml#3 delete .. //depot/projects/ia64/sbin/bsdlabel/bsdlabel.8#16 integrate .. //depot/projects/ia64/sbin/bsdlabel/bsdlabel.c#20 integrate .. //depot/projects/ia64/sbin/newfs_msdos/newfs_msdos.8#8 integrate .. //depot/projects/ia64/share/man/man4/nve.4#6 integrate .. //depot/projects/ia64/share/man/man5/hosts.equiv.5#7 integrate .. //depot/projects/ia64/share/man/man5/src.conf.5#10 integrate .. //depot/projects/ia64/sys/amd64/amd64/identcpu.c#22 integrate .. //depot/projects/ia64/sys/amd64/amd64/pmap.c#67 integrate .. //depot/projects/ia64/sys/amd64/include/specialreg.h#15 integrate .. //depot/projects/ia64/sys/conf/files.amd64#48 integrate .. //depot/projects/ia64/sys/conf/files.i386#87 integrate .. //depot/projects/ia64/sys/dev/arcmsr/arcmsr.c#13 integrate .. //depot/projects/ia64/sys/dev/arcmsr/arcmsr.h#5 integrate .. //depot/projects/ia64/sys/dev/if_ndis/if_ndis.c#29 integrate .. //depot/projects/ia64/sys/geom/geom_bsd_enc.c#6 integrate .. //depot/projects/ia64/sys/geom/part/g_part.c#9 integrate .. //depot/projects/ia64/sys/geom/part/g_part_bsd.c#5 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#107 integrate .. //depot/projects/ia64/sys/kern/kern_proc.c#74 integrate .. //depot/projects/ia64/sys/net/bridgestp.c#16 integrate .. //depot/projects/ia64/sys/net/bridgestp.h#8 integrate .. //depot/projects/ia64/sys/netinet/ip_fw2.c#69 integrate .. //depot/projects/ia64/sys/sys/cdefs.h#31 integrate .. //depot/projects/ia64/sys/sys/disklabel.h#31 integrate .. //depot/projects/ia64/tools/build/options/WITHOUT_INSTALLLIB#1 branch .. //depot/projects/ia64/tools/regression/lib/libc/stdio/test-scanfloat.c#7 integrate .. //depot/projects/ia64/tools/regression/lib/msun/test-lround.c#2 integrate .. //depot/projects/ia64/tools/regression/lib/msun/test-next.c#2 integrate .. //depot/projects/ia64/usr.bin/make/Makefile.dist#4 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/Makefile#9 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/add/pkg_add.1#18 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/create/pkg_create.1#17 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/delete/pkg_delete.1#5 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/info/pkg_info.1#14 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/updating/pkg_updating.1#2 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/version/pkg_version.1#15 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/media.c#9 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/system.c#11 integrate .. //depot/projects/ia64/usr.sbin/timed/timed/timed.8#6 integrate Differences ... ==== //depot/projects/ia64/bin/ed/Makefile#14 (text+ko) ==== @@ -1,16 +1,16 @@ -# $FreeBSD: src/bin/ed/Makefile,v 1.33 2007/07/02 14:00:25 kensmith Exp $ +# $FreeBSD: src/bin/ed/Makefile,v 1.34 2007/12/09 00:14:27 marius Exp $ .include PROG= ed SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c +WARNS?= 2 LINKS= ${BINDIR}/ed ${BINDIR}/red MLINKS= ed.1 red.1 .if !defined(RELEASE_CRUNCH) .if ${MK_OPENSSL} != "no" CFLAGS+=-DDES -WARNS?= 2 DPADD= ${LIBCRYPTO} LDADD= -lcrypto .endif ==== //depot/projects/ia64/contrib/gcc/config/sparc/freebsd.h#12 (text+ko) ==== @@ -19,24 +19,26 @@ the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* $FreeBSD: src/contrib/gcc/config/sparc/freebsd.h,v 1.10 2007/05/19 02:30:20 kan Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/sparc/freebsd.h,v 1.11 2007/12/09 17:41:47 marius Exp $ */ #undef SUBTARGET_EXTRA_SPECS #define SUBTARGET_EXTRA_SPECS \ { "fbsd_dynamic_linker", FBSD_DYNAMIC_LINKER } /* FreeBSD needs the platform name (sparc64) defined. - Emacs needs to know if the arch is 64 or 32-bits. */ - -#undef CPP_CPU64_DEFAULT_SPEC -#define CPP_CPU64_DEFAULT_SPEC \ - "-D__sparc64__ -D__sparc_v9__ -D__sparcv9 -D__sparc__ -D__arch64__" + Emacs needs to know if the arch is 64 or 32-bits. + This also selects which targets are available via -mcpu. */ #undef FBSD_TARGET_CPU_CPP_BUILTINS #define FBSD_TARGET_CPU_CPP_BUILTINS() \ do \ { \ builtin_define ("__LP64__"); \ + builtin_define ("__sparc64__"); \ + builtin_define ("__sparc_v9__"); \ + builtin_define ("__sparcv9"); \ + builtin_define ("__sparc__"); \ + builtin_define ("__arch64__"); \ } \ while (0) ==== //depot/projects/ia64/etc/rc.d/DAEMON#6 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: DAEMON,v 1.8 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/DAEMON,v 1.5 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/DAEMON,v 1.6 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: DAEMON ==== //depot/projects/ia64/etc/rc.d/LOGIN#6 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: LOGIN,v 1.7 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/LOGIN,v 1.5 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/LOGIN,v 1.6 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: LOGIN ==== //depot/projects/ia64/etc/rc.d/Makefile#46 (text+ko) ==== @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.87 2007/10/25 18:10:05 mtm Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.88 2007/12/08 07:20:22 dougb Exp $ .include ==== //depot/projects/ia64/etc/rc.d/NETWORKING#13 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: NETWORKING,v 1.2 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/NETWORKING,v 1.13 2007/06/02 05:25:19 dougb Exp $ +# $FreeBSD: src/etc/rc.d/NETWORKING,v 1.14 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: NETWORKING NETWORK ==== //depot/projects/ia64/etc/rc.d/SERVERS#8 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: SERVERS,v 1.9 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/SERVERS,v 1.7 2006/04/19 05:10:34 delphij Exp $ +# $FreeBSD: src/etc/rc.d/SERVERS,v 1.8 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: SERVERS ==== //depot/projects/ia64/etc/rc.d/accounting#9 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: accounting,v 1.7 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/accounting,v 1.10 2006/12/30 22:53:20 yar Exp $ +# $FreeBSD: src/etc/rc.d/accounting,v 1.11 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: accounting ==== //depot/projects/ia64/etc/rc.d/amd#16 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: amd,v 1.10 2002/04/29 12:08:17 lukem Exp $ -# $FreeBSD: src/etc/rc.d/amd,v 1.20 2007/10/25 16:59:06 mtm Exp $ +# $FreeBSD: src/etc/rc.d/amd,v 1.21 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: amd ==== //depot/projects/ia64/etc/rc.d/apmd#12 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: apmd,v 1.5 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/apmd,v 1.12 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/apmd,v 1.13 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: apmd ==== //depot/projects/ia64/etc/rc.d/bootparams#7 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: bootparams,v 1.6 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/bootparams,v 1.7 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/bootparams,v 1.8 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: bootparams ==== //depot/projects/ia64/etc/rc.d/ccd#6 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: ccd,v 1.3 2000/05/13 08:45:06 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ccd,v 1.5 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ccd,v 1.6 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: disks ==== //depot/projects/ia64/etc/rc.d/cron#8 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: cron,v 1.5 2000/09/19 13:04:38 lukem Exp $ -# $FreeBSD: src/etc/rc.d/cron,v 1.7 2005/01/16 03:12:03 obrien Exp $ +# $FreeBSD: src/etc/rc.d/cron,v 1.8 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: cron ==== //depot/projects/ia64/etc/rc.d/dhclient#19 (text+ko) ==== @@ -1,12 +1,10 @@ #!/bin/sh # -# $NetBSD: dhclient,v 1.8 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/dhclient,v 1.28 2007/03/25 19:45:20 mtm Exp $ +# $FreeBSD: src/etc/rc.d/dhclient,v 1.30 2007/12/08 22:27:18 dougb Exp $ # # PROVIDE: dhclient # KEYWORD: nojail nostart -# . /etc/rc.subr . /etc/network.subr ==== //depot/projects/ia64/etc/rc.d/dmesg#6 (text+ko) ==== @@ -1,13 +1,12 @@ #!/bin/sh # -# $NetBSD: dmesg,v 1.8 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/dmesg,v 1.5 2005/01/16 03:12:03 obrien Exp $ +# $FreeBSD: src/etc/rc.d/dmesg,v 1.7 2007/12/08 22:40:31 dougb Exp $ # # PROVIDE: dmesg # REQUIRE: mountcritremote cleanvar # BEFORE: DAEMON -# KEYWORD: Daemon nojail +# KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/ia64/etc/rc.d/fsck#9 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: fsck,v 1.2 2001/06/18 06:42:35 lukem Exp $ -# $FreeBSD: src/etc/rc.d/fsck,v 1.11 2007/05/18 12:04:41 mtm Exp $ +# $FreeBSD: src/etc/rc.d/fsck,v 1.12 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: fsck ==== //depot/projects/ia64/etc/rc.d/ftp-proxy#2 (text+ko) ==== @@ -1,11 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ftp-proxy,v 1.1 2007/09/06 21:00:48 mlaier Exp $ +# $FreeBSD: src/etc/rc.d/ftp-proxy,v 1.2 2007/12/08 22:27:18 dougb Exp $ # # PROVIDE: ftp-proxy # REQUIRE: DAEMON pf -# . /etc/rc.subr ==== //depot/projects/ia64/etc/rc.d/inetd#6 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: inetd,v 1.6 2000/09/19 13:04:38 lukem Exp $ -# $FreeBSD: src/etc/rc.d/inetd,v 1.5 2005/01/16 03:12:03 obrien Exp $ +# $FreeBSD: src/etc/rc.d/inetd,v 1.6 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: inetd ==== //depot/projects/ia64/etc/rc.d/ipfilter#22 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: ipfilter,v 1.10 2001/02/28 17:03:50 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipfilter,v 1.28 2007/04/09 08:53:40 des Exp $ +# $FreeBSD: src/etc/rc.d/ipfilter,v 1.29 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: ipfilter ==== //depot/projects/ia64/etc/rc.d/ipfs#6 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: ipfs,v 1.3 2002/02/11 13:55:42 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipfs,v 1.6 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ipfs,v 1.7 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: ipfs ==== //depot/projects/ia64/etc/rc.d/ipmon#14 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: ipmon,v 1.9 2002/04/18 05:02:01 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipmon,v 1.15 2007/04/02 22:53:07 des Exp $ +# $FreeBSD: src/etc/rc.d/ipmon,v 1.16 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: ipmon ==== //depot/projects/ia64/etc/rc.d/ipnat#14 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: ipnat,v 1.6 2000/09/19 13:04:38 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipnat,v 1.15 2006/12/31 10:37:18 yar Exp $ +# $FreeBSD: src/etc/rc.d/ipnat,v 1.16 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: ipnat ==== //depot/projects/ia64/etc/rc.d/ipsec#14 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: ipsec,v 1.7 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/ipsec,v 1.19 2007/05/18 12:04:41 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ipsec,v 1.20 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: ipsec ==== //depot/projects/ia64/etc/rc.d/isdnd#15 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: isdnd,v 1.9 2002/04/10 23:37:13 martin Exp $ -# $FreeBSD: src/etc/rc.d/isdnd,v 1.23 2007/04/02 22:53:07 des Exp $ +# $FreeBSD: src/etc/rc.d/isdnd,v 1.24 2007/12/08 07:20:22 dougb Exp $ # # Mostly based on original script (/etc/rc.isdn) written by Hellmuth Michaelis # ==== //depot/projects/ia64/etc/rc.d/keyserv#4 (text+ko) ==== @@ -1,10 +1,9 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/keyserv,v 1.3 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/keyserv,v 1.4 2007/12/08 22:27:18 dougb Exp $ # # Start keyserv if we are running Secure RPC -# # PROVIDE: keyserv # REQUIRE: ypbind ==== //depot/projects/ia64/etc/rc.d/ldconfig#16 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: ldconfig,v 1.5 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/ldconfig,v 1.17 2006/12/30 22:53:20 yar Exp $ +# $FreeBSD: src/etc/rc.d/ldconfig,v 1.18 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: ldconfig ==== //depot/projects/ia64/etc/rc.d/local#7 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: local,v 1.6 2002/03/22 04:33:59 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/local,v 1.6 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/local,v 1.7 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: local ==== //depot/projects/ia64/etc/rc.d/lockd#3 (text+ko) ==== @@ -1,8 +1,7 @@ #!/bin/sh # -# $NetBSD: nfslocking,v 1.6 2002/03/24 15:52:41 lukem Exp $ # FreeBSD History: src/etc/rc.d/nfslocking,v 1.11 2004/10/07 13:55:26 mtm -# $FreeBSD: src/etc/rc.d/lockd,v 1.18 2007/09/03 02:02:31 mtm Exp $ +# $FreeBSD: src/etc/rc.d/lockd,v 1.19 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: lockd ==== //depot/projects/ia64/etc/rc.d/lpd#8 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: lpd,v 1.5 2002/03/22 04:33:59 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/lpd,v 1.8 2006/12/30 22:53:20 yar Exp $ +# $FreeBSD: src/etc/rc.d/lpd,v 1.9 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: lpd ==== //depot/projects/ia64/etc/rc.d/motd#10 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: motd,v 1.5 2000/09/19 13:04:38 lukem Exp $ -# $FreeBSD: src/etc/rc.d/motd,v 1.9 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/motd,v 1.10 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: motd ==== //depot/projects/ia64/etc/rc.d/mountcritlocal#13 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: mountcritlocal,v 1.7 2002/04/29 12:29:53 lukem Exp $ -# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.14 2007/05/18 12:04:41 mtm Exp $ +# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.15 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: mountcritlocal ==== //depot/projects/ia64/etc/rc.d/mountcritremote#15 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: mountcritremote,v 1.7 2002/04/29 12:29:53 lukem Exp $ -# $FreeBSD: src/etc/rc.d/mountcritremote,v 1.16 2007/04/09 08:53:40 des Exp $ +# $FreeBSD: src/etc/rc.d/mountcritremote,v 1.17 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: mountcritremote ==== //depot/projects/ia64/etc/rc.d/mountd#14 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: mountd,v 1.11 2002/01/31 01:26:06 lukem Exp $ -# $FreeBSD: src/etc/rc.d/mountd,v 1.19 2007/04/13 10:29:25 pjd Exp $ +# $FreeBSD: src/etc/rc.d/mountd,v 1.20 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: mountd ==== //depot/projects/ia64/etc/rc.d/moused#11 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: moused,v 1.1 2001/10/29 23:25:01 augustss Exp $ -# $FreeBSD: src/etc/rc.d/moused,v 1.11 2006/12/30 22:53:20 yar Exp $ +# $FreeBSD: src/etc/rc.d/moused,v 1.12 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: moused ==== //depot/projects/ia64/etc/rc.d/mrouted#11 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: mrouted,v 1.6 2002/03/22 04:33:59 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/mrouted,v 1.10 2006/09/29 15:45:10 bms Exp $ +# $FreeBSD: src/etc/rc.d/mrouted,v 1.11 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: mrouted ==== //depot/projects/ia64/etc/rc.d/newsyslog#6 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: newsyslog,v 1.5 2002/03/24 15:51:26 lukem Exp $ -# $FreeBSD: src/etc/rc.d/newsyslog,v 1.5 2005/12/21 09:54:15 dougb Exp $ +# $FreeBSD: src/etc/rc.d/newsyslog,v 1.6 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: newsyslog ==== //depot/projects/ia64/etc/rc.d/nfsd#13 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: nfsd,v 1.4 2001/06/16 06:13:10 lukem Exp $ -# $FreeBSD: src/etc/rc.d/nfsd,v 1.13 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/nfsd,v 1.14 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: nfsd ==== //depot/projects/ia64/etc/rc.d/power_profile#10 (text+ko) ==== @@ -5,7 +5,7 @@ # # Arguments: 0x00 (AC offline, economy) or 0x01 (AC online, performance) # -# $FreeBSD: src/etc/rc.d/power_profile,v 1.11 2007/04/02 22:53:07 des Exp $ +# $FreeBSD: src/etc/rc.d/power_profile,v 1.12 2007/12/08 23:00:28 dougb Exp $ # # PROVIDE: power_profile @@ -15,6 +15,7 @@ . /etc/rc.subr name="power_profile" +stop_cmd=':' LOGGER="logger -t power_profile -p daemon.notice" # Set a given sysctl node to a value. ==== //depot/projects/ia64/etc/rc.d/pwcheck#5 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: pwcheck,v 1.4 2002/03/22 04:33:59 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/pwcheck,v 1.4 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/pwcheck,v 1.5 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: pwcheck ==== //depot/projects/ia64/etc/rc.d/quota#7 (text+ko) ==== @@ -1,10 +1,9 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/quota,v 1.6 2007/01/20 04:24:20 mpp Exp $ +# $FreeBSD: src/etc/rc.d/quota,v 1.7 2007/12/08 22:27:18 dougb Exp $ # # Enable/Check the quotas (must be after ypbind if using NIS) -# # PROVIDE: quota # REQUIRE: mountcritremote ==== //depot/projects/ia64/etc/rc.d/rarpd#7 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: rarpd,v 1.5 2002/03/22 04:33:59 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/rarpd,v 1.6 2005/01/16 03:12:03 obrien Exp $ +# $FreeBSD: src/etc/rc.d/rarpd,v 1.7 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: rarpd ==== //depot/projects/ia64/etc/rc.d/resolv#6 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/resolv,v 1.37 2007/06/02 05:24:39 dougb Exp $ +# $FreeBSD: src/etc/rc.d/resolv,v 1.38 2007/12/08 23:00:28 dougb Exp $ # # PROVIDE: resolv @@ -34,6 +34,7 @@ . /etc/rc.subr name="resolv" +stop_cmd=':' load_rc_config $name ==== //depot/projects/ia64/etc/rc.d/root#13 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: root,v 1.2 2000/05/13 08:45:09 lukem Exp $ -# $FreeBSD: src/etc/rc.d/root,v 1.15 2007/05/18 12:04:41 mtm Exp $ +# $FreeBSD: src/etc/rc.d/root,v 1.16 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: root ==== //depot/projects/ia64/etc/rc.d/route6d#9 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: route6d,v 1.5 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/route6d,v 1.9 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/route6d,v 1.10 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: route6d ==== //depot/projects/ia64/etc/rc.d/routed#11 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: routed,v 1.7 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/routed,v 1.12 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/routed,v 1.13 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: routed ==== //depot/projects/ia64/etc/rc.d/rpcbind#11 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: rpcbind,v 1.6 2002/01/31 01:26:06 lukem Exp $ -# $FreeBSD: src/etc/rc.d/rpcbind,v 1.12 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/rpcbind,v 1.13 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: rpcbind ==== //depot/projects/ia64/etc/rc.d/rtadvd#9 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: rtadvd,v 1.5 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/rtadvd,v 1.10 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/rtadvd,v 1.11 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: rtadvd ==== //depot/projects/ia64/etc/rc.d/rwho#5 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: rwho,v 1.5 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/rwho,v 1.4 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/rwho,v 1.5 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: rwho ==== //depot/projects/ia64/etc/rc.d/savecore#7 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: savecore,v 1.5 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/savecore,v 1.10 2004/10/24 13:04:09 des Exp $ +# $FreeBSD: src/etc/rc.d/savecore,v 1.11 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: savecore ==== //depot/projects/ia64/etc/rc.d/securelevel#9 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: securelevel,v 1.4 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/securelevel,v 1.10 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/securelevel,v 1.11 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: securelevel ==== //depot/projects/ia64/etc/rc.d/sendmail#15 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: sendmail,v 1.14 2002/02/12 01:26:36 lukem Exp $ -# $FreeBSD: src/etc/rc.d/sendmail,v 1.17 2007/06/12 17:33:23 gshapiro Exp $ +# $FreeBSD: src/etc/rc.d/sendmail,v 1.18 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: mail ==== //depot/projects/ia64/etc/rc.d/sshd#11 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: sshd,v 1.18 2002/04/29 08:23:34 lukem Exp $ -# $FreeBSD: src/etc/rc.d/sshd,v 1.12 2006/08/22 11:17:28 flz Exp $ +# $FreeBSD: src/etc/rc.d/sshd,v 1.13 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: sshd ==== //depot/projects/ia64/etc/rc.d/statd#2 (text+ko) ==== @@ -1,8 +1,7 @@ #!/bin/sh # -# $NetBSD: nfslocking,v 1.6 2002/03/24 15:52:41 lukem Exp $ # FreeBSD History: src/etc/rc.d/nfslocking,v 1.11 2004/10/07 13:55:26 mtm Exp -# $FreeBSD: src/etc/rc.d/statd,v 1.17 2007/08/18 04:08:53 mtm Exp $ +# $FreeBSD: src/etc/rc.d/statd,v 1.18 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: statd ==== //depot/projects/ia64/etc/rc.d/swap1#9 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: swap1,v 1.8 2002/03/24 15:52:41 lukem Exp $ -# $FreeBSD: src/etc/rc.d/swap1,v 1.9 2004/11/05 12:38:27 pjd Exp $ +# $FreeBSD: src/etc/rc.d/swap1,v 1.10 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: localswap ==== //depot/projects/ia64/etc/rc.d/sysctl#11 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: sysctl,v 1.12 2002/04/29 12:10:23 lukem Exp $ -# $FreeBSD: src/etc/rc.d/sysctl,v 1.17 2006/05/24 11:36:48 glebius Exp $ +# $FreeBSD: src/etc/rc.d/sysctl,v 1.18 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: sysctl ==== //depot/projects/ia64/etc/rc.d/syslogd#10 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: syslogd,v 1.12 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/syslogd,v 1.12 2006/12/30 22:53:20 yar Exp $ +# $FreeBSD: src/etc/rc.d/syslogd,v 1.13 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: syslogd ==== //depot/projects/ia64/etc/rc.d/timed#6 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: timed,v 1.5 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/timed,v 1.5 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/timed,v 1.6 2007/12/08 07:20:23 dougb Exp $ # # PROVIDE: timed ==== //depot/projects/ia64/etc/rc.d/tmp#7 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/tmp,v 1.38 2007/05/24 05:54:37 rse Exp $ +# $FreeBSD: src/etc/rc.d/tmp,v 1.39 2007/12/08 23:00:28 dougb Exp $ # # PROVIDE: tmp @@ -33,6 +33,7 @@ . /etc/rc.subr name="tmp" +stop_cmd=':' load_rc_config $name ==== //depot/projects/ia64/etc/rc.d/ugidfw#6 (text+ko) ==== @@ -1,9 +1,8 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ugidfw,v 1.5 2006/12/31 10:37:18 yar Exp $ +# $FreeBSD: src/etc/rc.d/ugidfw,v 1.6 2007/12/08 22:26:30 dougb Exp $ # PROVIDE: ugidfw -# REQUIRE: # BEFORE: LOGIN # KEYWORD: nojail ==== //depot/projects/ia64/etc/rc.d/var#9 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/var,v 1.43 2007/05/24 05:54:37 rse Exp $ +# $FreeBSD: src/etc/rc.d/var,v 1.44 2007/12/08 23:00:28 dougb Exp $ # # PROVIDE: var @@ -33,6 +33,7 @@ . /etc/rc.subr name="var" +stop_cmd=':' load_rc_config $name ==== //depot/projects/ia64/etc/rc.d/virecover#9 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: virecover,v 1.6 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/virecover,v 1.9 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/virecover,v 1.10 2007/12/08 07:20:23 dougb Exp $ # # PROVIDE: virecover ==== //depot/projects/ia64/etc/rc.d/ypbind#10 (text+ko) ==== @@ -1,7 +1,6 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Dec 10 02:40:45 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 25A5E16A420; Mon, 10 Dec 2007 02:40:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 78DBF16A418 for ; Mon, 10 Dec 2007 02:40:44 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6524213C44B for ; Mon, 10 Dec 2007 02:40:44 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBA2eiJU087506 for ; Mon, 10 Dec 2007 02:40:44 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBA2dskN087209 for perforce@freebsd.org; Mon, 10 Dec 2007 02:39:54 GMT (envelope-from marcel@freebsd.org) Date: Mon, 10 Dec 2007 02:39:54 GMT Message-Id: <200712100239.lBA2dskN087209@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 130577 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Dec 2007 02:40:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=130577 Change 130577 by marcel@marcel_xcllnt on 2007/12/10 02:39:39 IFC @130571 Affected files ... .. //depot/projects/powerpc/Makefile.inc1#10 integrate .. //depot/projects/powerpc/ObsoleteFiles.inc#12 integrate .. //depot/projects/powerpc/UPDATING#13 integrate .. //depot/projects/powerpc/bin/ed/Makefile#3 integrate .. //depot/projects/powerpc/bin/ln/ln.1#2 integrate .. //depot/projects/powerpc/bin/ln/ln.c#2 integrate .. //depot/projects/powerpc/bin/sh/Makefile#2 integrate .. //depot/projects/powerpc/bin/sh/sh.1#3 integrate .. //depot/projects/powerpc/cddl/Makefile.inc#3 integrate .. //depot/projects/powerpc/cddl/lib/libnvpair/Makefile#3 integrate .. //depot/projects/powerpc/compat/opensolaris/include/alloca.h#1 branch .. //depot/projects/powerpc/compat/opensolaris/include/fcntl.h#1 branch .. //depot/projects/powerpc/compat/opensolaris/include/stdio.h#1 branch .. //depot/projects/powerpc/compat/opensolaris/include/stdlib.h#1 branch .. //depot/projects/powerpc/compat/opensolaris/include/strings.h#1 branch .. //depot/projects/powerpc/compat/opensolaris/include/unistd.h#1 branch .. //depot/projects/powerpc/contrib/amd/AUTHORS#2 integrate .. //depot/projects/powerpc/contrib/amd/BUGS#2 integrate .. //depot/projects/powerpc/contrib/amd/COPYING#2 integrate .. //depot/projects/powerpc/contrib/amd/ChangeLog#2 integrate .. //depot/projects/powerpc/contrib/amd/FAQ#1 branch .. //depot/projects/powerpc/contrib/amd/INSTALL#2 integrate .. //depot/projects/powerpc/contrib/amd/NEWS#2 integrate .. //depot/projects/powerpc/contrib/amd/README.attrcache#1 branch .. //depot/projects/powerpc/contrib/amd/README.ldap#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/am_ops.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/amd.8#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/amd.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/amd.h#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/amfs_auto.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/amfs_direct.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/amfs_error.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/amfs_generic.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/amfs_host.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/amfs_inherit.c#2 delete .. //depot/projects/powerpc/contrib/amd/amd/amfs_link.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/amfs_linkx.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/amfs_nfsl.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/amfs_nfsx.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/amfs_program.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/amfs_root.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/amfs_toplvl.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/amfs_union.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/amq_subr.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/amq_svc.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/autil.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/clock.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/conf.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/conf_parse.y#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/conf_tok.l#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/get_args.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/info_exec.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/info_file.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/info_hesiod.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/info_ldap.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/info_ndbm.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/info_nis.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/info_nisplus.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/info_passwd.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/info_union.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/map.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/mapc.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/mntfs.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/nfs_prot_svc.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/nfs_start.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/nfs_subr.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/ops_TEMPLATE.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/ops_cachefs.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/ops_cdfs.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/ops_efs.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/ops_lofs.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/ops_mfs.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/ops_nfs.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/ops_nfs3.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/ops_nullfs.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/ops_pcfs.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/ops_tfs.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/ops_tmpfs.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/ops_ufs.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/ops_umapfs.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/ops_unionfs.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/ops_xfs.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/opts.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/readdir.c#1 branch .. //depot/projects/powerpc/contrib/amd/amd/restart.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/rpc_fwd.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/sched.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/srvr_amfs_auto.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amd/srvr_nfs.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amq/amq.8#3 integrate .. //depot/projects/powerpc/contrib/amd/amq/amq.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amq/amq.h#2 integrate .. //depot/projects/powerpc/contrib/amd/amq/amq_clnt.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amq/amq_xdr.c#2 integrate .. //depot/projects/powerpc/contrib/amd/amq/pawd.1#2 integrate .. //depot/projects/powerpc/contrib/amd/amq/pawd.c#2 integrate .. //depot/projects/powerpc/contrib/amd/aux_conf.h.in#2 integrate .. //depot/projects/powerpc/contrib/amd/bootstrap#2 integrate .. //depot/projects/powerpc/contrib/amd/conf/checkmount/checkmount_bsd44.c#2 integrate .. //depot/projects/powerpc/contrib/amd/conf/mtab/mtab_bsd.c#2 integrate .. //depot/projects/powerpc/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#2 integrate .. //depot/projects/powerpc/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#2 integrate .. //depot/projects/powerpc/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#2 integrate .. //depot/projects/powerpc/contrib/amd/conf/transp/transp_sockets.c#2 integrate .. //depot/projects/powerpc/contrib/amd/conf/trap/trap_default.h#2 integrate .. //depot/projects/powerpc/contrib/amd/conf/umount/umount_bsd44.c#2 integrate .. //depot/projects/powerpc/contrib/amd/doc/am-utils.texi#2 integrate .. //depot/projects/powerpc/contrib/amd/doc/stamp-vti#1 branch .. //depot/projects/powerpc/contrib/amd/doc/texinfo.tex#2 integrate .. //depot/projects/powerpc/contrib/amd/doc/version.texi#2 integrate .. //depot/projects/powerpc/contrib/amd/fixmount/fixmount.8#2 integrate .. //depot/projects/powerpc/contrib/amd/fixmount/fixmount.c#2 integrate .. //depot/projects/powerpc/contrib/amd/fsinfo/fsi_analyze.c#2 integrate .. //depot/projects/powerpc/contrib/amd/fsinfo/fsi_data.h#2 integrate .. //depot/projects/powerpc/contrib/amd/fsinfo/fsi_dict.c#2 integrate .. //depot/projects/powerpc/contrib/amd/fsinfo/fsi_gram.y#2 integrate .. //depot/projects/powerpc/contrib/amd/fsinfo/fsi_lex.l#2 integrate .. //depot/projects/powerpc/contrib/amd/fsinfo/fsi_util.c#2 integrate .. //depot/projects/powerpc/contrib/amd/fsinfo/fsinfo.8#2 integrate .. //depot/projects/powerpc/contrib/amd/fsinfo/fsinfo.c#2 integrate .. //depot/projects/powerpc/contrib/amd/fsinfo/fsinfo.h#2 integrate .. //depot/projects/powerpc/contrib/amd/fsinfo/wr_atab.c#2 integrate .. //depot/projects/powerpc/contrib/amd/fsinfo/wr_bparam.c#2 integrate .. //depot/projects/powerpc/contrib/amd/fsinfo/wr_dumpset.c#2 integrate .. //depot/projects/powerpc/contrib/amd/fsinfo/wr_exportfs.c#2 integrate .. //depot/projects/powerpc/contrib/amd/fsinfo/wr_fstab.c#2 integrate .. //depot/projects/powerpc/contrib/amd/hlfsd/hlfsd.8#2 integrate .. //depot/projects/powerpc/contrib/amd/hlfsd/hlfsd.c#2 integrate .. //depot/projects/powerpc/contrib/amd/hlfsd/hlfsd.h#3 integrate .. //depot/projects/powerpc/contrib/amd/hlfsd/homedir.c#2 integrate .. //depot/projects/powerpc/contrib/amd/hlfsd/nfs_prot_svc.c#2 integrate .. //depot/projects/powerpc/contrib/amd/hlfsd/stubs.c#2 integrate .. //depot/projects/powerpc/contrib/amd/include/am_compat.h#2 integrate .. //depot/projects/powerpc/contrib/amd/include/am_defs.h#2 integrate .. //depot/projects/powerpc/contrib/amd/include/am_utils.h#2 integrate .. //depot/projects/powerpc/contrib/amd/include/am_xdr_func.h#2 integrate .. //depot/projects/powerpc/contrib/amd/include/amq_defs.h#2 integrate .. //depot/projects/powerpc/contrib/amd/include/mount_headers1.h#2 integrate .. //depot/projects/powerpc/contrib/amd/include/mount_headers2.h#2 integrate .. //depot/projects/powerpc/contrib/amd/ldap-id.ms#2 integrate .. //depot/projects/powerpc/contrib/amd/ldap.schema#1 branch .. //depot/projects/powerpc/contrib/amd/libamu/alloca.c#2 delete .. //depot/projects/powerpc/contrib/amd/libamu/amu.h#2 integrate .. //depot/projects/powerpc/contrib/amd/libamu/hasmntopt.c#2 integrate .. //depot/projects/powerpc/contrib/amd/libamu/misc_rpc.c#2 integrate .. //depot/projects/powerpc/contrib/amd/libamu/mount_fs.c#2 integrate .. //depot/projects/powerpc/contrib/amd/libamu/mtab.c#2 integrate .. //depot/projects/powerpc/contrib/amd/libamu/nfs_prot_xdr.c#2 integrate .. //depot/projects/powerpc/contrib/amd/libamu/strerror.c#2 integrate .. //depot/projects/powerpc/contrib/amd/libamu/strutil.c#1 branch .. //depot/projects/powerpc/contrib/amd/libamu/util.c#2 delete .. //depot/projects/powerpc/contrib/amd/libamu/wire.c#2 integrate .. //depot/projects/powerpc/contrib/amd/libamu/xdr_func.c#2 integrate .. //depot/projects/powerpc/contrib/amd/libamu/xutil.c#2 integrate .. //depot/projects/powerpc/contrib/amd/m4/GNUmakefile#2 delete .. //depot/projects/powerpc/contrib/amd/m4/amdgrep#2 delete .. //depot/projects/powerpc/contrib/amd/m4/amindent#2 delete .. //depot/projects/powerpc/contrib/amd/m4/autopat#2 delete .. //depot/projects/powerpc/contrib/amd/m4/chop-aclocal.pl#2 delete .. //depot/projects/powerpc/contrib/amd/m4/copy-if-newbig#2 delete .. //depot/projects/powerpc/contrib/amd/m4/macros/HEADER#2 delete .. //depot/projects/powerpc/contrib/amd/m4/macros/TRAILER#2 delete .. //depot/projects/powerpc/contrib/amd/m4/mk-aclocal#2 delete .. //depot/projects/powerpc/contrib/amd/m4/mkconf#2 delete .. //depot/projects/powerpc/contrib/amd/m4/rmtspc#2 delete .. //depot/projects/powerpc/contrib/amd/m4/update_build_version#2 delete .. //depot/projects/powerpc/contrib/amd/mk-amd-map/mk-amd-map.8#2 integrate .. //depot/projects/powerpc/contrib/amd/mk-amd-map/mk-amd-map.c#2 integrate .. //depot/projects/powerpc/contrib/amd/scripts/am-eject.in#2 integrate .. //depot/projects/powerpc/contrib/amd/scripts/amd.conf-sample#2 integrate .. //depot/projects/powerpc/contrib/amd/scripts/amd.conf.5#2 integrate .. //depot/projects/powerpc/contrib/amd/scripts/amd2ldif.in#2 integrate .. //depot/projects/powerpc/contrib/amd/scripts/amd2sun.in#2 integrate .. //depot/projects/powerpc/contrib/amd/scripts/automount2amd.8#2 integrate .. //depot/projects/powerpc/contrib/amd/scripts/automount2amd.in#2 integrate .. //depot/projects/powerpc/contrib/amd/scripts/ctl-amd.in#2 integrate .. //depot/projects/powerpc/contrib/amd/scripts/ctl-hlfsd.in#2 integrate .. //depot/projects/powerpc/contrib/amd/scripts/expn.1#2 integrate .. //depot/projects/powerpc/contrib/amd/scripts/expn.in#2 integrate .. //depot/projects/powerpc/contrib/amd/scripts/fix-amd-map.in#2 integrate .. //depot/projects/powerpc/contrib/amd/scripts/fixrmtab.in#2 integrate .. //depot/projects/powerpc/contrib/amd/scripts/redhat-ctl-amd.in#2 integrate .. //depot/projects/powerpc/contrib/amd/scripts/test-attrcache.in#1 branch .. //depot/projects/powerpc/contrib/amd/scripts/wait4amd.in#2 integrate .. //depot/projects/powerpc/contrib/amd/scripts/wait4amd2die.in#2 integrate .. //depot/projects/powerpc/contrib/amd/tasks#2 integrate .. //depot/projects/powerpc/contrib/amd/vers.m4#1 branch .. //depot/projects/powerpc/contrib/amd/wire-test/wire-test.8#2 integrate .. //depot/projects/powerpc/contrib/amd/wire-test/wire-test.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/CHANGES#5 integrate .. //depot/projects/powerpc/contrib/bind9/COPYRIGHT#3 integrate .. //depot/projects/powerpc/contrib/bind9/FAQ#4 integrate .. //depot/projects/powerpc/contrib/bind9/FAQ.xml#4 integrate .. //depot/projects/powerpc/contrib/bind9/Makefile.in#3 integrate .. //depot/projects/powerpc/contrib/bind9/README#5 integrate .. //depot/projects/powerpc/contrib/bind9/bin/check/check-tool.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/check/named-checkconf.8#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/check/named-checkconf.docbook#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/check/named-checkconf.html#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/check/named-checkzone.8#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/check/named-checkzone.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/check/named-checkzone.docbook#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/check/named-checkzone.html#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dig/dig.1#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dig/dig.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dig/dig.docbook#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dig/dig.html#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dig/dighost.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dig/host.1#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dig/host.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dig/host.docbook#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dig/host.html#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dig/include/dig/dig.h#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dig/nslookup.1#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dig/nslookup.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dig/nslookup.docbook#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dig/nslookup.html#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dnssec/dnssec-keygen.8#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dnssec/dnssec-keygen.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dnssec/dnssec-keygen.html#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dnssec/dnssec-signzone.8#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dnssec/dnssec-signzone.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/dnssec/dnssec-signzone.html#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/client.c#4 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/config.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/control.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/lwresd.8#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/lwresd.docbook#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/lwresd.html#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/named.8#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/named.conf.5#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/named.conf.docbook#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/named.conf.html#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/named.docbook#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/named.html#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/query.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/server.c#4 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/update.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/nsupdate/nsupdate.8#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/nsupdate/nsupdate.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/nsupdate/nsupdate.docbook#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/nsupdate/nsupdate.html#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/rndc/Makefile.in#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/rndc/rndc-confgen.docbook#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/rndc/rndc.8#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/rndc/rndc.conf.5#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/rndc/rndc.conf.docbook#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/rndc/rndc.conf.html#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/rndc/rndc.docbook#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/rndc/rndc.html#3 integrate .. //depot/projects/powerpc/contrib/bind9/configure.in#3 integrate .. //depot/projects/powerpc/contrib/bind9/doc/arm/Bv9ARM-book.xml#4 integrate .. //depot/projects/powerpc/contrib/bind9/doc/arm/Bv9ARM.ch01.html#4 integrate .. //depot/projects/powerpc/contrib/bind9/doc/arm/Bv9ARM.ch02.html#4 integrate .. //depot/projects/powerpc/contrib/bind9/doc/arm/Bv9ARM.ch03.html#4 integrate .. //depot/projects/powerpc/contrib/bind9/doc/arm/Bv9ARM.ch04.html#4 integrate .. //depot/projects/powerpc/contrib/bind9/doc/arm/Bv9ARM.ch05.html#4 integrate .. //depot/projects/powerpc/contrib/bind9/doc/arm/Bv9ARM.ch06.html#4 integrate .. //depot/projects/powerpc/contrib/bind9/doc/arm/Bv9ARM.ch07.html#4 integrate .. //depot/projects/powerpc/contrib/bind9/doc/arm/Bv9ARM.ch08.html#4 integrate .. //depot/projects/powerpc/contrib/bind9/doc/arm/Bv9ARM.ch09.html#4 integrate .. //depot/projects/powerpc/contrib/bind9/doc/arm/Bv9ARM.ch10.html#3 integrate .. //depot/projects/powerpc/contrib/bind9/doc/arm/Bv9ARM.html#4 integrate .. //depot/projects/powerpc/contrib/bind9/doc/arm/Bv9ARM.pdf#4 integrate .. //depot/projects/powerpc/contrib/bind9/doc/arm/Makefile.in#3 integrate .. //depot/projects/powerpc/contrib/bind9/doc/arm/man.dig.html#3 integrate .. //depot/projects/powerpc/contrib/bind9/doc/arm/man.dnssec-keygen.html#3 integrate .. //depot/projects/powerpc/contrib/bind9/doc/arm/man.dnssec-signzone.html#3 integrate .. //depot/projects/powerpc/contrib/bind9/doc/arm/man.host.html#3 integrate .. //depot/projects/powerpc/contrib/bind9/doc/arm/man.named-checkconf.html#3 integrate .. //depot/projects/powerpc/contrib/bind9/doc/arm/man.named-checkzone.html#3 integrate .. //depot/projects/powerpc/contrib/bind9/doc/arm/man.named.html#3 integrate .. //depot/projects/powerpc/contrib/bind9/doc/arm/man.rndc-confgen.html#3 integrate .. //depot/projects/powerpc/contrib/bind9/doc/arm/man.rndc.conf.html#3 integrate .. //depot/projects/powerpc/contrib/bind9/doc/arm/man.rndc.html#3 integrate .. //depot/projects/powerpc/contrib/bind9/doc/draft/draft-schlitt-spf-classic-02.txt#2 delete .. //depot/projects/powerpc/contrib/bind9/doc/misc/Makefile.in#3 integrate .. //depot/projects/powerpc/contrib/bind9/doc/misc/migration#3 integrate .. //depot/projects/powerpc/contrib/bind9/doc/rfc/index#3 integrate .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc4398.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc4408.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc4470.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc4634.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/doc/rfc/rfc4641.txt#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/bind/api#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/config.h.in#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/configure#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/configure.in#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/dst/dst_api.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/dst/hmac_link.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/gai_strerror.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/irs/irs_data.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/isc/ctl_clnt.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/make/rules.in#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/nameser/ns_parse.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/port_before.h.in#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/resolv/res_data.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/resolv/res_init.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind9/api#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind9/check.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/adb.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/api#4 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/dispatch.c#4 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/dnssec.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/db.h#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/dispatch.h#4 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/validator.h#4 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/journal.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/lookup.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/master.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/message.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/openssl_link.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/openssldh_link.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/openssldsa_link.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rbtdb.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdata/generic/ds_43.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rdataslab.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/resolver.c#4 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/rootns.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/sdb.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/sdlz.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/tsig.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/validator.c#4 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/view.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/xfrin.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/zone.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/Makefile.in#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/alpha/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/isc/alpha/include/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/isc/alpha/include/isc/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/isc/api#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/arm/include/isc/atomic.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/hmacsha.c#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/ia64/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/isc/ia64/include/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/isc/ia64/include/isc/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/platform.h.in#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/string.h#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/mem.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/mips/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/isc/mips/include/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/isc/mips/include/isc/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/isc/noatomic/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/isc/noatomic/include/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/isc/noatomic/include/isc/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/isc/powerpc/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/isc/powerpc/include/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/isc/powerpc/include/isc/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h#2 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/sparc64/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/isc/sparc64/include/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/isc/sparc64/include/isc/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/isc/timer.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/net.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/socket.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/syslog.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/x86_32/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/isc/x86_32/include/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/isc/x86_32/include/isc/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/isc/x86_64/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/isc/x86_64/include/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/isc/x86_64/include/isc/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/bind9/lib/isccc/symtab.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isccfg/api#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/api#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/context.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/getaddrinfo.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/getipnode.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/lwres_gnba.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres.docbook#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_config.docbook#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_context.docbook#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_noop.docbook#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_packet.docbook#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#3 integrate .. //depot/projects/powerpc/contrib/bind9/make/rules.in#3 integrate .. //depot/projects/powerpc/contrib/bind9/version#5 integrate .. //depot/projects/powerpc/contrib/binutils/opcodes/ppc-dis.c#2 integrate .. //depot/projects/powerpc/contrib/csup/mux.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/config/sparc/freebsd.h#3 integrate .. //depot/projects/powerpc/contrib/gdb/gdb/i386fbsd-nat.c#2 integrate .. //depot/projects/powerpc/contrib/less/LICENSE#2 integrate .. //depot/projects/powerpc/contrib/less/Makefile.dsm#2 delete .. //depot/projects/powerpc/contrib/less/NEWS#4 integrate .. //depot/projects/powerpc/contrib/less/README#4 integrate .. //depot/projects/powerpc/contrib/less/ch.c#4 integrate .. //depot/projects/powerpc/contrib/less/command.c#3 integrate .. //depot/projects/powerpc/contrib/less/configure#4 integrate .. //depot/projects/powerpc/contrib/less/configure.ac#4 integrate .. //depot/projects/powerpc/contrib/less/decode.c#3 integrate .. //depot/projects/powerpc/contrib/less/defines.ds#3 integrate .. //depot/projects/powerpc/contrib/less/defines.h.in#3 integrate .. //depot/projects/powerpc/contrib/less/defines.o2#3 integrate .. //depot/projects/powerpc/contrib/less/defines.o9#3 integrate .. //depot/projects/powerpc/contrib/less/defines.wn#3 integrate .. //depot/projects/powerpc/contrib/less/edit.c#3 integrate .. //depot/projects/powerpc/contrib/less/filename.c#4 integrate .. //depot/projects/powerpc/contrib/less/funcs.h#4 integrate .. //depot/projects/powerpc/contrib/less/less.h#4 integrate .. //depot/projects/powerpc/contrib/less/less.man#4 integrate .. //depot/projects/powerpc/contrib/less/less.nro#4 integrate .. //depot/projects/powerpc/contrib/less/lessecho.man#4 integrate .. //depot/projects/powerpc/contrib/less/lessecho.nro#4 integrate .. //depot/projects/powerpc/contrib/less/lesskey.man#4 integrate .. //depot/projects/powerpc/contrib/less/lesskey.nro#4 integrate .. //depot/projects/powerpc/contrib/less/line.c#4 integrate .. //depot/projects/powerpc/contrib/less/optfunc.c#3 integrate .. //depot/projects/powerpc/contrib/less/opttbl.c#3 integrate .. //depot/projects/powerpc/contrib/less/screen.c#3 integrate .. //depot/projects/powerpc/contrib/less/search.c#4 integrate .. //depot/projects/powerpc/contrib/less/tags.c#3 integrate .. //depot/projects/powerpc/contrib/less/version.c#4 integrate .. //depot/projects/powerpc/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#4 integrate .. //depot/projects/powerpc/contrib/tcpdump/tcpdump.c#3 integrate .. //depot/projects/powerpc/etc/defaults/periodic.conf#5 integrate .. //depot/projects/powerpc/etc/etc.amd64/ttys#3 integrate .. //depot/projects/powerpc/etc/etc.arm/ttys#4 integrate .. //depot/projects/powerpc/etc/etc.i386/ttys#3 integrate .. //depot/projects/powerpc/etc/etc.ia64/ttys#3 integrate .. //depot/projects/powerpc/etc/etc.powerpc/ttys#4 integrate .. //depot/projects/powerpc/etc/etc.sparc64/ttys#3 integrate .. //depot/projects/powerpc/etc/freebsd-update.conf#3 integrate .. //depot/projects/powerpc/etc/gss/mech#2 integrate .. //depot/projects/powerpc/etc/periodic/security/100.chksetuid#2 integrate .. //depot/projects/powerpc/etc/rc.d/DAEMON#2 integrate .. //depot/projects/powerpc/etc/rc.d/LOGIN#2 integrate .. //depot/projects/powerpc/etc/rc.d/Makefile#5 integrate .. //depot/projects/powerpc/etc/rc.d/NETWORKING#4 integrate .. //depot/projects/powerpc/etc/rc.d/SERVERS#2 integrate .. //depot/projects/powerpc/etc/rc.d/accounting#3 integrate .. //depot/projects/powerpc/etc/rc.d/amd#3 integrate .. //depot/projects/powerpc/etc/rc.d/apmd#2 integrate .. //depot/projects/powerpc/etc/rc.d/bootconf.sh#4 delete .. //depot/projects/powerpc/etc/rc.d/bootparams#2 integrate .. //depot/projects/powerpc/etc/rc.d/ccd#2 integrate .. //depot/projects/powerpc/etc/rc.d/cron#2 integrate .. //depot/projects/powerpc/etc/rc.d/dhclient#4 integrate .. //depot/projects/powerpc/etc/rc.d/dmesg#2 integrate .. //depot/projects/powerpc/etc/rc.d/fsck#3 integrate .. //depot/projects/powerpc/etc/rc.d/ftp-proxy#2 integrate .. //depot/projects/powerpc/etc/rc.d/hostapd#2 integrate .. //depot/projects/powerpc/etc/rc.d/inetd#2 integrate .. //depot/projects/powerpc/etc/rc.d/ipfilter#4 integrate .. //depot/projects/powerpc/etc/rc.d/ipfs#2 integrate .. //depot/projects/powerpc/etc/rc.d/ipmon#3 integrate .. //depot/projects/powerpc/etc/rc.d/ipnat#3 integrate .. //depot/projects/powerpc/etc/rc.d/ipsec#4 integrate .. //depot/projects/powerpc/etc/rc.d/isdnd#4 integrate .. //depot/projects/powerpc/etc/rc.d/keyserv#2 integrate .. //depot/projects/powerpc/etc/rc.d/ldconfig#3 integrate .. //depot/projects/powerpc/etc/rc.d/local#2 integrate .. //depot/projects/powerpc/etc/rc.d/lockd#4 integrate .. //depot/projects/powerpc/etc/rc.d/lpd#3 integrate .. //depot/projects/powerpc/etc/rc.d/motd#2 integrate .. //depot/projects/powerpc/etc/rc.d/mountcritlocal#3 integrate .. //depot/projects/powerpc/etc/rc.d/mountcritremote#4 integrate .. //depot/projects/powerpc/etc/rc.d/mountd#3 integrate .. //depot/projects/powerpc/etc/rc.d/moused#3 integrate .. //depot/projects/powerpc/etc/rc.d/mrouted#2 integrate .. //depot/projects/powerpc/etc/rc.d/newsyslog#2 integrate .. //depot/projects/powerpc/etc/rc.d/nfsd#2 integrate .. //depot/projects/powerpc/etc/rc.d/power_profile#4 integrate .. //depot/projects/powerpc/etc/rc.d/pwcheck#2 integrate .. //depot/projects/powerpc/etc/rc.d/quota#3 integrate .. //depot/projects/powerpc/etc/rc.d/rarpd#2 integrate .. //depot/projects/powerpc/etc/rc.d/resolv#3 integrate .. //depot/projects/powerpc/etc/rc.d/root#3 integrate .. //depot/projects/powerpc/etc/rc.d/route6d#2 integrate .. //depot/projects/powerpc/etc/rc.d/routed#2 integrate .. //depot/projects/powerpc/etc/rc.d/rpcbind#2 integrate .. //depot/projects/powerpc/etc/rc.d/rtadvd#2 integrate .. //depot/projects/powerpc/etc/rc.d/rwho#2 integrate .. //depot/projects/powerpc/etc/rc.d/savecore#2 integrate .. //depot/projects/powerpc/etc/rc.d/securelevel#2 integrate .. //depot/projects/powerpc/etc/rc.d/sendmail#3 integrate .. //depot/projects/powerpc/etc/rc.d/sshd#2 integrate .. //depot/projects/powerpc/etc/rc.d/statd#3 integrate .. //depot/projects/powerpc/etc/rc.d/swap1#2 integrate .. //depot/projects/powerpc/etc/rc.d/sysctl#2 integrate .. //depot/projects/powerpc/etc/rc.d/syslogd#3 integrate .. //depot/projects/powerpc/etc/rc.d/timed#2 integrate .. //depot/projects/powerpc/etc/rc.d/tmp#3 integrate .. //depot/projects/powerpc/etc/rc.d/ugidfw#3 integrate .. //depot/projects/powerpc/etc/rc.d/var#5 integrate .. //depot/projects/powerpc/etc/rc.d/virecover#2 integrate .. //depot/projects/powerpc/etc/rc.d/ypbind#3 integrate .. //depot/projects/powerpc/etc/rc.d/yppasswdd#3 integrate .. //depot/projects/powerpc/etc/rc.d/ypserv#3 integrate .. //depot/projects/powerpc/games/fortune/datfiles/Makefile#2 integrate .. //depot/projects/powerpc/games/fortune/datfiles/fortunes#8 integrate .. //depot/projects/powerpc/games/fortune/datfiles/fortunes-o.real#5 integrate .. //depot/projects/powerpc/games/fortune/datfiles/fortunes-o.sp.ok#2 integrate .. //depot/projects/powerpc/games/fortune/datfiles/fortunes.sp.ok#3 integrate .. //depot/projects/powerpc/games/fortune/datfiles/fortunes2-o#3 delete .. //depot/projects/powerpc/games/fortune/datfiles/freebsd-tips#2 integrate .. //depot/projects/powerpc/games/fortune/datfiles/freebsd-tips.sp.ok#1 branch .. //depot/projects/powerpc/games/fortune/datfiles/limerick#3 integrate .. //depot/projects/powerpc/games/fortune/datfiles/limerick.sp.ok#1 branch .. //depot/projects/powerpc/games/fortune/datfiles/murphy#2 integrate .. //depot/projects/powerpc/games/fortune/datfiles/murphy-o#2 integrate .. //depot/projects/powerpc/games/fortune/datfiles/murphy.sp.ok#1 branch .. //depot/projects/powerpc/games/fortune/datfiles/startrek#2 integrate .. //depot/projects/powerpc/games/fortune/datfiles/zippy#3 integrate .. //depot/projects/powerpc/games/fortune/datfiles/zippy.sp.ok#2 integrate .. //depot/projects/powerpc/gnu/lib/libobjc/Makefile#4 integrate .. //depot/projects/powerpc/gnu/usr.bin/cc/cc_tools/Makefile#3 integrate .. //depot/projects/powerpc/gnu/usr.bin/gdb/arch/arm/Makefile#2 integrate .. //depot/projects/powerpc/gnu/usr.bin/gdb/arch/arm/armfbsd-nat.c#2 integrate .. //depot/projects/powerpc/gnu/usr.bin/gdb/arch/arm/armfbsd-tdep.c#2 integrate .. //depot/projects/powerpc/gnu/usr.bin/gdb/arch/arm/init.c#2 integrate .. //depot/projects/powerpc/gnu/usr.bin/gdb/arch/arm/nm-fbsd.h#2 integrate .. //depot/projects/powerpc/gnu/usr.bin/gdb/kgdb/kgdb.h#4 integrate .. //depot/projects/powerpc/gnu/usr.bin/gdb/kgdb/kthr.c#4 integrate .. //depot/projects/powerpc/gnu/usr.bin/gdb/kgdb/trgt_i386.c#3 integrate .. //depot/projects/powerpc/gnu/usr.bin/groff/tmac/mdoc.local#4 integrate .. //depot/projects/powerpc/include/assert.h#2 integrate .. //depot/projects/powerpc/include/dirent.h#2 integrate .. //depot/projects/powerpc/include/elf.h#2 integrate .. //depot/projects/powerpc/kerberos5/lib/Makefile.inc#2 integrate .. //depot/projects/powerpc/lib/Makefile#6 integrate .. //depot/projects/powerpc/lib/bind/bind/Makefile#3 integrate .. //depot/projects/powerpc/lib/bind/bind/config.h#3 integrate .. //depot/projects/powerpc/lib/bind/bind/port_before.h#3 integrate .. //depot/projects/powerpc/lib/bind/config.h#4 integrate .. //depot/projects/powerpc/lib/bind/config.mk#3 integrate .. //depot/projects/powerpc/lib/bind/isc/isc/platform.h#3 integrate .. //depot/projects/powerpc/lib/bind/lwres/Makefile#3 integrate .. //depot/projects/powerpc/lib/csu/common/crtbrand.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_support_format_zip.c#8 integrate .. //depot/projects/powerpc/lib/libc/amd64/Makefile.inc#2 integrate .. //depot/projects/powerpc/lib/libc/gdtoa/_ldtoa.c#2 integrate .. //depot/projects/powerpc/lib/libc/gdtoa/machdep_ldisQ.c#2 integrate .. //depot/projects/powerpc/lib/libc/gdtoa/machdep_ldisx.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/Symbol.map#6 integrate .. //depot/projects/powerpc/lib/libc/gen/closedir.c#3 integrate .. //depot/projects/powerpc/lib/libc/gen/readdir.c#3 integrate .. //depot/projects/powerpc/lib/libc/gen/seekdir.c#3 integrate .. //depot/projects/powerpc/lib/libc/gen/telldir.c#3 integrate .. //depot/projects/powerpc/lib/libc/i386/Makefile.inc#2 integrate .. //depot/projects/powerpc/lib/libc/ia64/Makefile.inc#2 integrate .. //depot/projects/powerpc/lib/libc/nameser/ns_parse.c#3 integrate .. //depot/projects/powerpc/lib/libc/net/Makefile.inc#6 integrate .. //depot/projects/powerpc/lib/libc/resolv/res_data.c#3 integrate .. //depot/projects/powerpc/lib/libc/resolv/res_init.c#5 integrate .. //depot/projects/powerpc/lib/libc/rpc/authdes_prot.c#2 integrate .. //depot/projects/powerpc/lib/libc/rpc/authunix_prot.c#2 integrate .. //depot/projects/powerpc/lib/libc/rpc/key_prot_xdr.c#2 integrate .. //depot/projects/powerpc/lib/libc/rpc/rpc_callmsg.c#2 integrate .. //depot/projects/powerpc/lib/libc/rpc/rpc_prot.c#2 integrate .. //depot/projects/powerpc/lib/libc/rpc/rpcb_prot.c#2 integrate .. //depot/projects/powerpc/lib/libc/rpc/rpcb_st_xdr.c#2 integrate .. //depot/projects/powerpc/lib/libc/sparc64/Makefile.inc#2 integrate .. //depot/projects/powerpc/lib/libc/sparc64/fpu/fpu_explode.c#3 integrate .. //depot/projects/powerpc/lib/libc/stdio/vfscanf.c#3 integrate .. //depot/projects/powerpc/lib/libc/stdio/vfwscanf.c#3 integrate .. //depot/projects/powerpc/lib/libc/stdlib/malloc.3#4 integrate .. //depot/projects/powerpc/lib/libc/stdlib/malloc.c#6 integrate .. //depot/projects/powerpc/lib/libc/sys/access.2#3 integrate .. //depot/projects/powerpc/lib/libdisk/libdisk.3#2 integrate .. //depot/projects/powerpc/lib/libdisk/libdisk.h#2 integrate .. //depot/projects/powerpc/lib/libelf/elf.3#4 integrate .. //depot/projects/powerpc/lib/libelf/gelf_xlatetof.3#2 integrate .. //depot/projects/powerpc/lib/libelf/libelf_data.c#3 integrate .. //depot/projects/powerpc/lib/libelf/libelf_xlate.c#3 integrate .. //depot/projects/powerpc/lib/libgssapi/Makefile#2 integrate .. //depot/projects/powerpc/lib/libgssapi/gss_acquire_cred.c#2 integrate .. //depot/projects/powerpc/lib/libkse/Makefile#2 integrate .. //depot/projects/powerpc/lib/libkse/arch/amd64/include/atomic_ops.h#2 integrate .. //depot/projects/powerpc/lib/libkse/arch/amd64/include/pthread_md.h#2 integrate .. //depot/projects/powerpc/lib/libkse/arch/arm/include/atomic_ops.h#2 integrate .. //depot/projects/powerpc/lib/libkse/arch/i386/include/atomic_ops.h#2 integrate .. //depot/projects/powerpc/lib/libkse/arch/i386/include/pthread_md.h#2 integrate .. //depot/projects/powerpc/lib/libkse/arch/ia64/include/atomic_ops.h#2 integrate .. //depot/projects/powerpc/lib/libkse/arch/ia64/include/pthread_md.h#2 integrate .. //depot/projects/powerpc/lib/libkse/arch/powerpc/include/atomic_ops.h#2 integrate .. //depot/projects/powerpc/lib/libkse/arch/powerpc/include/pthread_md.h#2 integrate .. //depot/projects/powerpc/lib/libkse/arch/sparc64/include/atomic_ops.h#2 integrate .. //depot/projects/powerpc/lib/libkse/arch/sparc64/include/pthread_md.h#2 integrate .. //depot/projects/powerpc/lib/libkse/kse.map#2 integrate .. //depot/projects/powerpc/lib/libkse/sys/lock.c#2 integrate .. //depot/projects/powerpc/lib/libkse/sys/lock.h#2 integrate .. //depot/projects/powerpc/lib/libkse/sys/thr_error.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_accept.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_aio_suspend.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_atfork.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_attr_destroy.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_attr_get_np.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_attr_getdetachstate.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_attr_getguardsize.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_attr_getinheritsched.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_attr_getschedparam.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_attr_getschedpolicy.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_attr_getscope.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_attr_getstack.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_attr_getstackaddr.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_attr_getstacksize.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_attr_init.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_attr_setcreatesuspend_np.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_attr_setdetachstate.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_attr_setguardsize.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_attr_setinheritsched.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_attr_setschedparam.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_attr_setschedpolicy.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_attr_setscope.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_attr_setstack.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_attr_setstackaddr.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_attr_setstacksize.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_barrier.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_barrierattr.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_cancel.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_clean.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_close.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_concurrency.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_cond.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_condattr_destroy.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_condattr_init.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_condattr_pshared.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_connect.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_creat.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_create.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_detach.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_equal.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_execve.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_exit.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_fcntl.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_find_thread.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_fork.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_fsync.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_getschedparam.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_info.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_init.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_join.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_kern.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_kill.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_main_np.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_mattr_init.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_mattr_kind_np.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_mattr_pshared.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_msync.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_multi_np.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_mutex.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_mutex_prioceiling.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_mutex_protocol.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_mutexattr_destroy.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_nanosleep.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_once.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_open.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_pause.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_poll.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_priority_queue.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_private.h#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_pselect.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_pspinlock.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_raise.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_read.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_readv.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_resume_np.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_rtld.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_rwlock.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_rwlockattr.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_select.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_self.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_seterrno.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_setprio.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_setschedparam.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_sig.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_sigaction.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_sigaltstack.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_sigmask.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_sigpending.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_sigprocmask.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_sigsuspend.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_sigwait.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_single_np.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_sleep.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_spec.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_spinlock.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_stack.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_suspend_np.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_switch_np.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_symbols.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_system.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_tcdrain.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_vfork.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_wait.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_wait4.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_waitpid.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_write.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_writev.c#2 integrate .. //depot/projects/powerpc/lib/libkse/thread/thr_yield.c#2 integrate .. //depot/projects/powerpc/lib/libpmc/Makefile#2 integrate .. //depot/projects/powerpc/lib/libpmc/libpmc.c#3 integrate .. //depot/projects/powerpc/lib/libpmc/pmc.3#4 integrate .. //depot/projects/powerpc/lib/libpmc/pmc_allocate.3#1 branch .. //depot/projects/powerpc/lib/libpmc/pmc_attach.3#1 branch .. //depot/projects/powerpc/lib/libpmc/pmc_capabilities.3#1 branch .. //depot/projects/powerpc/lib/libpmc/pmc_configure_logfile.3#1 branch .. //depot/projects/powerpc/lib/libpmc/pmc_disable.3#1 branch .. //depot/projects/powerpc/lib/libpmc/pmc_event_names_of_class.3#1 branch .. //depot/projects/powerpc/lib/libpmc/pmc_get_driver_stats.3#1 branch .. //depot/projects/powerpc/lib/libpmc/pmc_get_msr.3#1 branch .. //depot/projects/powerpc/lib/libpmc/pmc_init.3#1 branch .. //depot/projects/powerpc/lib/libpmc/pmc_name_of_capability.3#1 branch .. //depot/projects/powerpc/lib/libpmc/pmc_read.3#1 branch .. //depot/projects/powerpc/lib/libpmc/pmc_set.3#1 branch .. //depot/projects/powerpc/lib/libpmc/pmc_start.3#1 branch .. //depot/projects/powerpc/lib/libpmc/pmclog.c#2 integrate .. //depot/projects/powerpc/lib/libpmc/pmclog.h#2 integrate .. //depot/projects/powerpc/lib/libsdp/search.c#2 integrate .. //depot/projects/powerpc/lib/libthr/Makefile#6 integrate .. //depot/projects/powerpc/lib/libthr/pthread.map#3 integrate .. //depot/projects/powerpc/lib/libthr/thread/thr_mutex.c#6 integrate .. //depot/projects/powerpc/lib/libthr/thread/thr_private.h#5 integrate .. //depot/projects/powerpc/lib/libthr/thread/thr_rtld.c#2 integrate .. //depot/projects/powerpc/lib/libthr/thread/thr_sem.c#2 integrate .. //depot/projects/powerpc/lib/libthr/thread/thr_sig.c#2 integrate .. //depot/projects/powerpc/lib/libthr/thread/thr_suspend_np.c#3 integrate .. //depot/projects/powerpc/lib/libthr/thread/thr_umtx.c#5 integrate .. //depot/projects/powerpc/lib/libthr/thread/thr_umtx.h#3 integrate .. //depot/projects/powerpc/lib/libthread_db/arch/arm/libpthread_md.c#1 branch .. //depot/projects/powerpc/lib/libutil/expand_number.3#2 integrate .. //depot/projects/powerpc/lib/libutil/expand_number.c#2 integrate .. //depot/projects/powerpc/lib/libutil/libutil.h#4 integrate .. //depot/projects/powerpc/lib/libutil/pty.c#3 integrate .. //depot/projects/powerpc/libexec/rtld-elf/powerpc/reloc.c#3 integrate .. //depot/projects/powerpc/libexec/rtld-elf/sparc64/rtld_machdep.h#2 integrate .. //depot/projects/powerpc/libexec/tftpd/Makefile#2 integrate .. //depot/projects/powerpc/libexec/tftpd/tftpd.8#3 integrate .. //depot/projects/powerpc/libexec/tftpd/tftpd.c#2 integrate .. //depot/projects/powerpc/release/Makefile#6 integrate .. //depot/projects/powerpc/release/doc/en_US.ISO8859-1/relnotes/article.sgml#13 integrate .. //depot/projects/powerpc/release/doc/share/sgml/release.ent#5 integrate .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/Makefile#2 integrate .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/errata/Makefile#2 integrate .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/hardware/Makefile#2 integrate .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/hardware/Makefile.inc#2 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/hardware/amd64/Makefile#2 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/hardware/amd64/article.sgml#2 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/hardware/amd64/proc-amd64.sgml#2 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/hardware/article.sgml#1 branch .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml#2 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#2 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/hardware/common/hw.ent#2 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/hardware/common/intro.sgml#2 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/hardware/i386/Makefile#2 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/hardware/i386/article.sgml#2 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/hardware/i386/proc-i386.sgml#2 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/installation/Makefile#2 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/installation/Makefile.inc#2 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/installation/amd64/Makefile#2 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/installation/amd64/article.sgml#2 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/installation/common/abstract.sgml#2 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/installation/common/artheader.sgml#2 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/installation/common/install.ent#2 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/installation/common/install.sgml#3 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/installation/common/layout.sgml#2 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/installation/common/trouble.sgml#2 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/installation/common/upgrade.sgml#2 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/installation/i386/Makefile#2 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/installation/i386/article.sgml#2 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/installation/ia64/Makefile#2 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/installation/ia64/article.sgml#2 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/installation/pc98/Makefile#2 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/installation/pc98/article.sgml#2 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/installation/sparc64/Makefile#2 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/installation/sparc64/article.sgml#2 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/installation/sparc64/install.sgml#2 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/readme/article.sgml#2 integrate .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/relnotes/Makefile#2 integrate .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/relnotes/Makefile.inc#2 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/relnotes/amd64/Makefile#2 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/relnotes/amd64/article.sgml#2 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/relnotes/article.sgml#1 branch .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#2 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/relnotes/common/relnotes.ent#2 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/relnotes/i386/Makefile#2 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/relnotes/i386/article.sgml#2 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/relnotes/ia64/Makefile#2 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/relnotes/ia64/article.sgml#2 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/relnotes/pc98/Makefile#2 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/relnotes/pc98/article.sgml#2 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/relnotes/powerpc/Makefile#2 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/relnotes/powerpc/article.sgml#2 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/relnotes/sparc64/Makefile#2 delete .. //depot/projects/powerpc/release/doc/zh_CN.GB2312/relnotes/sparc64/article.sgml#2 delete .. //depot/projects/powerpc/release/fixit.profile#2 integrate .. //depot/projects/powerpc/release/picobsd/bridge/PICOBSD#2 integrate .. //depot/projects/powerpc/release/picobsd/bridge/crunch.conf#2 integrate .. //depot/projects/powerpc/release/picobsd/build/Makefile.conf#2 integrate .. //depot/projects/powerpc/release/picobsd/build/picobsd#2 integrate .. //depot/projects/powerpc/release/picobsd/tinyware/login/Makefile#2 integrate .. //depot/projects/powerpc/release/picobsd/tinyware/msg/msg.c#2 integrate .. //depot/projects/powerpc/sbin/atacontrol/atacontrol.8#2 integrate .. //depot/projects/powerpc/sbin/bsdlabel/bsdlabel.8#3 integrate .. //depot/projects/powerpc/sbin/bsdlabel/bsdlabel.c#2 integrate .. //depot/projects/powerpc/sbin/clri/clri.c#2 integrate .. //depot/projects/powerpc/sbin/devd/Makefile#2 integrate .. //depot/projects/powerpc/sbin/dhclient/dispatch.c#2 integrate .. //depot/projects/powerpc/sbin/geom/class/journal/gjournal.8#2 integrate .. //depot/projects/powerpc/sbin/geom/class/nop/gnop.8#2 integrate .. //depot/projects/powerpc/sbin/geom/class/virstor/geom_virstor.c#2 integrate .. //depot/projects/powerpc/sbin/init/init.c#3 integrate .. //depot/projects/powerpc/sbin/ipf/ipftest/Makefile#2 integrate .. //depot/projects/powerpc/sbin/ipfw/ipfw.8#8 integrate .. //depot/projects/powerpc/sbin/mdconfig/mdconfig.8#5 integrate .. //depot/projects/powerpc/sbin/mdconfig/mdconfig.c#3 integrate .. //depot/projects/powerpc/sbin/mount/mount.8#4 integrate .. //depot/projects/powerpc/sbin/mount_ntfs/mount_ntfs.8#2 integrate .. //depot/projects/powerpc/sbin/newfs/newfs.8#2 integrate .. //depot/projects/powerpc/sbin/newfs/newfs.c#3 integrate .. //depot/projects/powerpc/sbin/newfs/newfs.h#2 integrate .. //depot/projects/powerpc/sbin/newfs_msdos/newfs_msdos.8#2 integrate .. //depot/projects/powerpc/sbin/ping6/ping6.8#2 integrate .. //depot/projects/powerpc/sbin/ping6/ping6.c#4 integrate .. //depot/projects/powerpc/sbin/spppcontrol/spppcontrol.c#2 integrate .. //depot/projects/powerpc/sbin/sysctl/sysctl.8#4 integrate .. //depot/projects/powerpc/share/colldef/sv_SE.ISO8859-1.src#2 integrate .. //depot/projects/powerpc/share/colldef/sv_SE.ISO8859-15.src#2 integrate .. //depot/projects/powerpc/share/examples/cvsup/refuse#2 integrate .. //depot/projects/powerpc/share/examples/cvsup/refuse.README#2 integrate .. //depot/projects/powerpc/share/man/man4/aac.4#4 integrate .. //depot/projects/powerpc/share/man/man4/agp.4#2 integrate .. //depot/projects/powerpc/share/man/man4/enc.4#4 integrate .. //depot/projects/powerpc/share/man/man4/hwpmc.4#4 integrate .. //depot/projects/powerpc/share/man/man4/ichsmb.4#2 integrate .. //depot/projects/powerpc/share/man/man4/msk.4#4 integrate .. //depot/projects/powerpc/share/man/man4/nfe.4#5 integrate .. //depot/projects/powerpc/share/man/man4/nve.4#3 integrate .. //depot/projects/powerpc/share/man/man4/rl.4#3 integrate .. //depot/projects/powerpc/share/man/man4/wpi.4#2 integrate .. //depot/projects/powerpc/share/man/man5/hosts.equiv.5#2 integrate .. //depot/projects/powerpc/share/man/man5/src.conf.5#8 integrate .. //depot/projects/powerpc/share/man/man9/Makefile#9 integrate .. //depot/projects/powerpc/share/man/man9/rwlock.9#3 integrate .. //depot/projects/powerpc/share/man/man9/stack.9#1 branch .. //depot/projects/powerpc/share/man/man9/sx.9#5 integrate .. //depot/projects/powerpc/share/man/man9/timeout.9#2 integrate .. //depot/projects/powerpc/share/misc/iso3166#2 integrate .. //depot/projects/powerpc/share/mk/bsd.subdir.mk#2 integrate .. //depot/projects/powerpc/share/mk/bsd.sys.mk#3 integrate .. //depot/projects/powerpc/share/mk/sys.mk#5 integrate .. //depot/projects/powerpc/share/zoneinfo/asia#4 integrate .. //depot/projects/powerpc/share/zoneinfo/northamerica#5 integrate .. //depot/projects/powerpc/share/zoneinfo/southamerica#4 integrate .. //depot/projects/powerpc/share/zoneinfo/zone.tab#4 integrate .. //depot/projects/powerpc/sys/amd64/amd64/busdma_machdep.c#6 integrate .. //depot/projects/powerpc/sys/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/powerpc/sys/amd64/amd64/exception.S#4 integrate .. //depot/projects/powerpc/sys/amd64/amd64/genassym.c#6 integrate .. //depot/projects/powerpc/sys/amd64/amd64/identcpu.c#5 integrate .. //depot/projects/powerpc/sys/amd64/amd64/intr_machdep.c#7 integrate .. //depot/projects/powerpc/sys/amd64/amd64/machdep.c#9 integrate .. //depot/projects/powerpc/sys/amd64/amd64/pmap.c#10 integrate .. //depot/projects/powerpc/sys/amd64/amd64/prof_machdep.c#3 integrate .. //depot/projects/powerpc/sys/amd64/amd64/stack_machdep.c#1 branch .. //depot/projects/powerpc/sys/amd64/amd64/trap.c#7 integrate .. //depot/projects/powerpc/sys/amd64/amd64/vm_machdep.c#4 integrate .. //depot/projects/powerpc/sys/amd64/conf/GENERIC#9 integrate .. //depot/projects/powerpc/sys/amd64/conf/NOTES#7 integrate .. //depot/projects/powerpc/sys/amd64/include/pci_cfgreg.h#2 integrate .. //depot/projects/powerpc/sys/amd64/include/pmc_mdep.h#2 integrate .. //depot/projects/powerpc/sys/amd64/include/specialreg.h#6 integrate .. //depot/projects/powerpc/sys/amd64/include/stack.h#1 branch .. //depot/projects/powerpc/sys/amd64/pci/pci_cfgreg.c#2 integrate .. //depot/projects/powerpc/sys/arm/arm/busdma_machdep.c#8 integrate .. //depot/projects/powerpc/sys/arm/arm/cpufunc.c#5 integrate .. //depot/projects/powerpc/sys/arm/arm/db_trace.c#2 integrate .. //depot/projects/powerpc/sys/arm/arm/nexus_io.c#2 delete .. //depot/projects/powerpc/sys/arm/arm/nexus_io_asm.S#2 delete .. //depot/projects/powerpc/sys/arm/arm/pmap.c#8 integrate .. //depot/projects/powerpc/sys/arm/arm/stack_machdep.c#1 branch .. //depot/projects/powerpc/sys/arm/arm/trap.c#5 integrate .. //depot/projects/powerpc/sys/arm/arm/vm_machdep.c#7 integrate .. //depot/projects/powerpc/sys/arm/conf/AVILA#5 integrate .. //depot/projects/powerpc/sys/arm/conf/BWCT#2 integrate .. //depot/projects/powerpc/sys/arm/conf/CRB#3 integrate .. //depot/projects/powerpc/sys/arm/conf/EP80219#3 integrate .. //depot/projects/powerpc/sys/arm/conf/HL200#1 branch .. //depot/projects/powerpc/sys/arm/conf/IQ31244#3 integrate .. //depot/projects/powerpc/sys/arm/conf/KB920X#4 integrate .. //depot/projects/powerpc/sys/arm/conf/SIMICS#3 integrate .. //depot/projects/powerpc/sys/arm/conf/SKYEYE#2 integrate .. //depot/projects/powerpc/sys/arm/include/asmacros.h#3 integrate .. //depot/projects/powerpc/sys/arm/include/atomic.h#3 integrate .. //depot/projects/powerpc/sys/arm/include/pmc_mdep.h#2 integrate .. //depot/projects/powerpc/sys/arm/include/stack.h#1 branch .. //depot/projects/powerpc/sys/arm/sa11x0/files.sa11x0#2 integrate .. //depot/projects/powerpc/sys/boot/i386/cdboot/cdboot.s#4 integrate .. //depot/projects/powerpc/sys/boot/i386/gptboot/gptldr.S#2 integrate .. //depot/projects/powerpc/sys/boot/i386/pmbr/pmbr.s#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/cdboot/cdboot.s#3 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_all.h#6 integrate .. //depot/projects/powerpc/sys/compat/freebsd32/freebsd32.h#2 integrate .. //depot/projects/powerpc/sys/compat/freebsd32/freebsd32_ipc.h#1 branch .. //depot/projects/powerpc/sys/compat/freebsd32/freebsd32_misc.c#7 integrate .. //depot/projects/powerpc/sys/compat/freebsd32/freebsd32_proto.h#5 integrate .. //depot/projects/powerpc/sys/compat/freebsd32/freebsd32_syscall.h#5 integrate .. //depot/projects/powerpc/sys/compat/freebsd32/freebsd32_syscalls.c#5 integrate .. //depot/projects/powerpc/sys/compat/freebsd32/freebsd32_sysent.c#5 integrate .. //depot/projects/powerpc/sys/compat/freebsd32/syscalls.master#5 integrate .. //depot/projects/powerpc/sys/compat/linprocfs/linprocfs.c#14 integrate .. //depot/projects/powerpc/sys/compat/ndis/ndis_var.h#3 integrate .. //depot/projects/powerpc/sys/compat/ndis/ntoskrnl_var.h#2 integrate .. //depot/projects/powerpc/sys/compat/ndis/subr_ndis.c#4 integrate .. //depot/projects/powerpc/sys/compat/ndis/subr_ntoskrnl.c#6 integrate .. //depot/projects/powerpc/sys/compat/opensolaris/rpc/xdr.h#2 integrate .. //depot/projects/powerpc/sys/compat/opensolaris/sys/atomic.h#2 integrate .. //depot/projects/powerpc/sys/compat/opensolaris/sys/bitmap.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/cpupart.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/cpuvar.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/cyclic.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/elf.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/kmem.h#2 integrate .. //depot/projects/powerpc/sys/compat/opensolaris/sys/mman.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/modctl.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/objfs.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/param.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/pcpu.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/proc.h#4 integrate .. //depot/projects/powerpc/sys/compat/opensolaris/sys/stat.h#1 branch .. //depot/projects/powerpc/sys/compat/opensolaris/sys/time.h#2 integrate .. //depot/projects/powerpc/sys/compat/opensolaris/sys/types.h#3 integrate .. //depot/projects/powerpc/sys/conf/Makefile.amd64#3 integrate .. //depot/projects/powerpc/sys/conf/NOTES#15 integrate .. //depot/projects/powerpc/sys/conf/files#17 integrate .. //depot/projects/powerpc/sys/conf/files.amd64#8 integrate .. //depot/projects/powerpc/sys/conf/files.arm#5 integrate .. //depot/projects/powerpc/sys/conf/files.i386#11 integrate .. //depot/projects/powerpc/sys/conf/files.ia64#8 integrate .. //depot/projects/powerpc/sys/conf/files.pc98#10 integrate .. //depot/projects/powerpc/sys/conf/files.powerpc#10 integrate .. //depot/projects/powerpc/sys/conf/files.sparc64#9 integrate .. //depot/projects/powerpc/sys/conf/files.sun4v#5 integrate .. //depot/projects/powerpc/sys/conf/kmod.mk#10 integrate .. //depot/projects/powerpc/sys/conf/options#18 integrate .. //depot/projects/powerpc/sys/conf/options.amd64#3 integrate .. //depot/projects/powerpc/sys/conf/options.i386#6 integrate .. //depot/projects/powerpc/sys/contrib/ipfilter/netinet/fil.c#7 integrate .. //depot/projects/powerpc/sys/contrib/ipfilter/netinet/ip_auth.c#6 integrate .. //depot/projects/powerpc/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#4 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/common/avl/avl.c#2 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/common/nvpair/nvpair.c#2 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#4 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#3 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#3 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/rpc/xdr.c#2 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/rpc/xdr.h#2 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/byteorder.h#2 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#2 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/procset.h#2 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#2 integrate .. //depot/projects/powerpc/sys/contrib/opensolaris/uts/common/sys/vmem.h#2 integrate .. //depot/projects/powerpc/sys/contrib/pf/net/pf.c#7 integrate .. //depot/projects/powerpc/sys/contrib/pf/net/pf_if.c#4 integrate .. //depot/projects/powerpc/sys/contrib/pf/net/pf_ioctl.c#5 integrate .. //depot/projects/powerpc/sys/dev/aac/aac.c#8 integrate .. //depot/projects/powerpc/sys/dev/aac/aac_cam.c#7 integrate .. //depot/projects/powerpc/sys/dev/aac/aac_debug.c#5 integrate .. //depot/projects/powerpc/sys/dev/aac/aac_pci.c#8 integrate .. //depot/projects/powerpc/sys/dev/aac/aacreg.h#5 integrate .. //depot/projects/powerpc/sys/dev/aac/aacvar.h#6 integrate .. //depot/projects/powerpc/sys/dev/acpica/acpi_battery.c#7 integrate .. //depot/projects/powerpc/sys/dev/agp/agp_i810.c#2 integrate .. //depot/projects/powerpc/sys/dev/amr/amr.c#5 integrate .. //depot/projects/powerpc/sys/dev/amr/amr_cam.c#6 integrate .. //depot/projects/powerpc/sys/dev/amr/amr_pci.c#6 integrate .. //depot/projects/powerpc/sys/dev/an/if_an.c#8 integrate .. //depot/projects/powerpc/sys/dev/an/if_anreg.h#5 integrate .. //depot/projects/powerpc/sys/dev/arcmsr/arcmsr.c#10 integrate .. //depot/projects/powerpc/sys/dev/arcmsr/arcmsr.h#5 integrate .. //depot/projects/powerpc/sys/dev/asmc/asmc.c#2 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-all.h#9 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-chipset.c#8 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-disk.c#8 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-dma.c#7 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Dec 10 03:29:40 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D547416A468; Mon, 10 Dec 2007 03:29:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 720CA16A419 for ; Mon, 10 Dec 2007 03:29:39 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5E54013C457 for ; Mon, 10 Dec 2007 03:29:39 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBA3Td9V095461 for ; Mon, 10 Dec 2007 03:29:39 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBA3Rpfo095441 for perforce@freebsd.org; Mon, 10 Dec 2007 03:27:51 GMT (envelope-from marcel@freebsd.org) Date: Mon, 10 Dec 2007 03:27:51 GMT Message-Id: <200712100327.lBA3Rpfo095441@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 130579 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Dec 2007 03:29:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=130579 Change 130579 by marcel@marcel_xcllnt on 2007/12/10 03:27:48 IFC @130571 Affected files ... .. //depot/projects/tty/Makefile#23 integrate .. //depot/projects/tty/Makefile.inc1#36 integrate .. //depot/projects/tty/ObsoleteFiles.inc#13 integrate .. //depot/projects/tty/UPDATING#38 integrate .. //depot/projects/tty/bin/ed/Makefile#8 integrate .. //depot/projects/tty/bin/getfacl/getfacl.c#4 integrate .. //depot/projects/tty/bin/ln/ln.1#6 integrate .. //depot/projects/tty/bin/ln/ln.c#7 integrate .. //depot/projects/tty/bin/mv/mv.1#5 integrate .. //depot/projects/tty/bin/ps/extern.h#5 integrate .. //depot/projects/tty/bin/ps/keyword.c#9 integrate .. //depot/projects/tty/bin/ps/print.c#8 integrate .. //depot/projects/tty/bin/ps/ps.c#8 integrate .. //depot/projects/tty/bin/sh/Makefile#6 integrate .. //depot/projects/tty/bin/sh/eval.c#8 integrate .. //depot/projects/tty/bin/sh/sh.1#17 integrate .. //depot/projects/tty/cddl/Makefile.inc#2 integrate .. //depot/projects/tty/cddl/lib/Makefile#3 integrate .. //depot/projects/tty/cddl/lib/libnvpair/Makefile#2 integrate .. //depot/projects/tty/cddl/sbin/zfs/Makefile#2 integrate .. //depot/projects/tty/cddl/sbin/zpool/Makefile#2 integrate .. //depot/projects/tty/cddl/usr.bin/Makefile#3 integrate .. //depot/projects/tty/cddl/usr.bin/ztest/Makefile#2 integrate .. //depot/projects/tty/cddl/usr.sbin/Makefile#3 integrate .. //depot/projects/tty/cddl/usr.sbin/zdb/Makefile#2 integrate .. //depot/projects/tty/compat/opensolaris/include/alloca.h#1 branch .. //depot/projects/tty/compat/opensolaris/include/fcntl.h#1 branch .. //depot/projects/tty/compat/opensolaris/include/stdio.h#1 branch .. //depot/projects/tty/compat/opensolaris/include/stdlib.h#1 branch .. //depot/projects/tty/compat/opensolaris/include/strings.h#1 branch .. //depot/projects/tty/compat/opensolaris/include/unistd.h#1 branch .. //depot/projects/tty/contrib/amd/AUTHORS#4 integrate .. //depot/projects/tty/contrib/amd/BUGS#4 integrate .. //depot/projects/tty/contrib/amd/COPYING#4 integrate .. //depot/projects/tty/contrib/amd/ChangeLog#4 integrate .. //depot/projects/tty/contrib/amd/FAQ#1 branch .. //depot/projects/tty/contrib/amd/INSTALL#4 integrate .. //depot/projects/tty/contrib/amd/NEWS#4 integrate .. //depot/projects/tty/contrib/amd/README.attrcache#1 branch .. //depot/projects/tty/contrib/amd/README.ldap#3 integrate .. //depot/projects/tty/contrib/amd/amd/am_ops.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/amd.8#6 integrate .. //depot/projects/tty/contrib/amd/amd/amd.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/amd.h#4 integrate .. //depot/projects/tty/contrib/amd/amd/amfs_auto.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/amfs_direct.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/amfs_error.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/amfs_generic.c#1 branch .. //depot/projects/tty/contrib/amd/amd/amfs_host.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/amfs_inherit.c#4 delete .. //depot/projects/tty/contrib/amd/amd/amfs_link.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/amfs_linkx.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/amfs_nfsl.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/amfs_nfsx.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/amfs_program.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/amfs_root.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/amfs_toplvl.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/amfs_union.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/amq_subr.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/amq_svc.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/autil.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/clock.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/conf.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/conf_parse.y#4 integrate .. //depot/projects/tty/contrib/amd/amd/conf_tok.l#4 integrate .. //depot/projects/tty/contrib/amd/amd/get_args.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/info_exec.c#1 branch .. //depot/projects/tty/contrib/amd/amd/info_file.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/info_hesiod.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/info_ldap.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/info_ndbm.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/info_nis.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/info_nisplus.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/info_passwd.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/info_union.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/map.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/mapc.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/mntfs.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/nfs_prot_svc.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/nfs_start.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/nfs_subr.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/ops_TEMPLATE.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/ops_cachefs.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/ops_cdfs.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/ops_efs.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/ops_lofs.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/ops_mfs.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/ops_nfs.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/ops_nfs3.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/ops_nullfs.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/ops_pcfs.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/ops_tfs.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/ops_tmpfs.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/ops_ufs.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/ops_umapfs.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/ops_unionfs.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/ops_xfs.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/opts.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/readdir.c#1 branch .. //depot/projects/tty/contrib/amd/amd/restart.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/rpc_fwd.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/sched.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/srvr_amfs_auto.c#4 integrate .. //depot/projects/tty/contrib/amd/amd/srvr_nfs.c#4 integrate .. //depot/projects/tty/contrib/amd/amq/amq.8#6 integrate .. //depot/projects/tty/contrib/amd/amq/amq.c#4 integrate .. //depot/projects/tty/contrib/amd/amq/amq.h#4 integrate .. //depot/projects/tty/contrib/amd/amq/amq_clnt.c#4 integrate .. //depot/projects/tty/contrib/amd/amq/amq_xdr.c#4 integrate .. //depot/projects/tty/contrib/amd/amq/pawd.1#5 integrate .. //depot/projects/tty/contrib/amd/amq/pawd.c#4 integrate .. //depot/projects/tty/contrib/amd/aux_conf.h.in#3 integrate .. //depot/projects/tty/contrib/amd/bootstrap#3 integrate .. //depot/projects/tty/contrib/amd/conf/checkmount/checkmount_bsd44.c#4 integrate .. //depot/projects/tty/contrib/amd/conf/mtab/mtab_bsd.c#4 integrate .. //depot/projects/tty/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#4 integrate .. //depot/projects/tty/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#4 integrate .. //depot/projects/tty/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#2 integrate .. //depot/projects/tty/contrib/amd/conf/transp/transp_sockets.c#5 integrate .. //depot/projects/tty/contrib/amd/conf/trap/trap_default.h#4 integrate .. //depot/projects/tty/contrib/amd/conf/umount/umount_bsd44.c#4 integrate .. //depot/projects/tty/contrib/amd/doc/am-utils.texi#4 integrate .. //depot/projects/tty/contrib/amd/doc/stamp-vti#3 branch .. //depot/projects/tty/contrib/amd/doc/texinfo.tex#3 integrate .. //depot/projects/tty/contrib/amd/doc/version.texi#3 integrate .. //depot/projects/tty/contrib/amd/fixmount/fixmount.8#7 integrate .. //depot/projects/tty/contrib/amd/fixmount/fixmount.c#4 integrate .. //depot/projects/tty/contrib/amd/fsinfo/fsi_analyze.c#4 integrate .. //depot/projects/tty/contrib/amd/fsinfo/fsi_data.h#4 integrate .. //depot/projects/tty/contrib/amd/fsinfo/fsi_dict.c#4 integrate .. //depot/projects/tty/contrib/amd/fsinfo/fsi_gram.y#4 integrate .. //depot/projects/tty/contrib/amd/fsinfo/fsi_lex.l#4 integrate .. //depot/projects/tty/contrib/amd/fsinfo/fsi_util.c#4 integrate .. //depot/projects/tty/contrib/amd/fsinfo/fsinfo.8#7 integrate .. //depot/projects/tty/contrib/amd/fsinfo/fsinfo.c#4 integrate .. //depot/projects/tty/contrib/amd/fsinfo/fsinfo.h#4 integrate .. //depot/projects/tty/contrib/amd/fsinfo/wr_atab.c#4 integrate .. //depot/projects/tty/contrib/amd/fsinfo/wr_bparam.c#4 integrate .. //depot/projects/tty/contrib/amd/fsinfo/wr_dumpset.c#4 integrate .. //depot/projects/tty/contrib/amd/fsinfo/wr_exportfs.c#4 integrate .. //depot/projects/tty/contrib/amd/fsinfo/wr_fstab.c#4 integrate .. //depot/projects/tty/contrib/amd/hlfsd/hlfsd.8#6 integrate .. //depot/projects/tty/contrib/amd/hlfsd/hlfsd.c#4 integrate .. //depot/projects/tty/contrib/amd/hlfsd/hlfsd.h#5 integrate .. //depot/projects/tty/contrib/amd/hlfsd/homedir.c#4 integrate .. //depot/projects/tty/contrib/amd/hlfsd/nfs_prot_svc.c#4 integrate .. //depot/projects/tty/contrib/amd/hlfsd/stubs.c#4 integrate .. //depot/projects/tty/contrib/amd/include/am_compat.h#3 integrate .. //depot/projects/tty/contrib/amd/include/am_defs.h#4 integrate .. //depot/projects/tty/contrib/amd/include/am_utils.h#4 integrate .. //depot/projects/tty/contrib/amd/include/am_xdr_func.h#4 integrate .. //depot/projects/tty/contrib/amd/include/amq_defs.h#4 integrate .. //depot/projects/tty/contrib/amd/include/mount_headers1.h#3 integrate .. //depot/projects/tty/contrib/amd/include/mount_headers2.h#2 integrate .. //depot/projects/tty/contrib/amd/ldap-id.ms#2 integrate .. //depot/projects/tty/contrib/amd/ldap.schema#1 branch .. //depot/projects/tty/contrib/amd/libamu/alloca.c#2 delete .. //depot/projects/tty/contrib/amd/libamu/amu.h#4 integrate .. //depot/projects/tty/contrib/amd/libamu/hasmntopt.c#4 integrate .. //depot/projects/tty/contrib/amd/libamu/misc_rpc.c#4 integrate .. //depot/projects/tty/contrib/amd/libamu/mount_fs.c#4 integrate .. //depot/projects/tty/contrib/amd/libamu/mtab.c#4 integrate .. //depot/projects/tty/contrib/amd/libamu/nfs_prot_xdr.c#4 integrate .. //depot/projects/tty/contrib/amd/libamu/strerror.c#3 integrate .. //depot/projects/tty/contrib/amd/libamu/strutil.c#1 branch .. //depot/projects/tty/contrib/amd/libamu/util.c#4 delete .. //depot/projects/tty/contrib/amd/libamu/wire.c#4 integrate .. //depot/projects/tty/contrib/amd/libamu/xdr_func.c#4 integrate .. //depot/projects/tty/contrib/amd/libamu/xutil.c#4 integrate .. //depot/projects/tty/contrib/amd/m4/GNUmakefile#2 delete .. //depot/projects/tty/contrib/amd/m4/amdgrep#2 delete .. //depot/projects/tty/contrib/amd/m4/amindent#2 delete .. //depot/projects/tty/contrib/amd/m4/autopat#2 delete .. //depot/projects/tty/contrib/amd/m4/chop-aclocal.pl#2 delete .. //depot/projects/tty/contrib/amd/m4/copy-if-newbig#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/HEADER#2 delete .. //depot/projects/tty/contrib/amd/m4/macros/TRAILER#2 delete .. //depot/projects/tty/contrib/amd/m4/mk-aclocal#2 delete .. //depot/projects/tty/contrib/amd/m4/mkconf#2 delete .. //depot/projects/tty/contrib/amd/m4/rmtspc#2 delete .. //depot/projects/tty/contrib/amd/m4/update_build_version#2 delete .. //depot/projects/tty/contrib/amd/mk-amd-map/mk-amd-map.8#5 integrate .. //depot/projects/tty/contrib/amd/mk-amd-map/mk-amd-map.c#4 integrate .. //depot/projects/tty/contrib/amd/scripts/am-eject.in#2 integrate .. //depot/projects/tty/contrib/amd/scripts/amd.conf-sample#4 integrate .. //depot/projects/tty/contrib/amd/scripts/amd.conf.5#7 integrate .. //depot/projects/tty/contrib/amd/scripts/amd2ldif.in#2 integrate .. //depot/projects/tty/contrib/amd/scripts/amd2sun.in#2 integrate .. //depot/projects/tty/contrib/amd/scripts/automount2amd.8#4 integrate .. //depot/projects/tty/contrib/amd/scripts/automount2amd.in#2 integrate .. //depot/projects/tty/contrib/amd/scripts/ctl-amd.in#3 integrate .. //depot/projects/tty/contrib/amd/scripts/ctl-hlfsd.in#3 integrate .. //depot/projects/tty/contrib/amd/scripts/expn.1#4 integrate .. //depot/projects/tty/contrib/amd/scripts/expn.in#4 integrate .. //depot/projects/tty/contrib/amd/scripts/fix-amd-map.in#2 integrate .. //depot/projects/tty/contrib/amd/scripts/fixrmtab.in#2 integrate .. //depot/projects/tty/contrib/amd/scripts/redhat-ctl-amd.in#2 integrate .. //depot/projects/tty/contrib/amd/scripts/test-attrcache.in#1 branch .. //depot/projects/tty/contrib/amd/scripts/wait4amd.in#2 integrate .. //depot/projects/tty/contrib/amd/scripts/wait4amd2die.in#2 integrate .. //depot/projects/tty/contrib/amd/tasks#4 integrate .. //depot/projects/tty/contrib/amd/vers.m4#1 branch .. //depot/projects/tty/contrib/amd/wire-test/wire-test.8#5 integrate .. //depot/projects/tty/contrib/amd/wire-test/wire-test.c#4 integrate .. //depot/projects/tty/contrib/bind9/CHANGES#8 integrate .. //depot/projects/tty/contrib/bind9/COPYRIGHT#5 integrate .. //depot/projects/tty/contrib/bind9/FAQ#6 integrate .. //depot/projects/tty/contrib/bind9/FAQ.xml#4 integrate .. //depot/projects/tty/contrib/bind9/Makefile.in#4 integrate .. //depot/projects/tty/contrib/bind9/README#6 integrate .. //depot/projects/tty/contrib/bind9/bin/check/check-tool.c#4 integrate .. //depot/projects/tty/contrib/bind9/bin/check/named-checkconf.8#5 integrate .. //depot/projects/tty/contrib/bind9/bin/check/named-checkconf.docbook#4 integrate .. //depot/projects/tty/contrib/bind9/bin/check/named-checkconf.html#5 integrate .. //depot/projects/tty/contrib/bind9/bin/check/named-checkzone.8#5 integrate .. //depot/projects/tty/contrib/bind9/bin/check/named-checkzone.c#4 integrate .. //depot/projects/tty/contrib/bind9/bin/check/named-checkzone.docbook#5 integrate .. //depot/projects/tty/contrib/bind9/bin/check/named-checkzone.html#5 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/dig.1#5 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/dig.c#6 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/dig.docbook#4 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/dig.html#5 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/dighost.c#6 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/host.1#5 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/host.c#6 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/host.docbook#4 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/host.html#5 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/include/dig/dig.h#6 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/nslookup.1#5 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/nslookup.c#6 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/nslookup.docbook#5 integrate .. //depot/projects/tty/contrib/bind9/bin/dig/nslookup.html#5 integrate .. //depot/projects/tty/contrib/bind9/bin/dnssec/dnssec-keygen.8#5 integrate .. //depot/projects/tty/contrib/bind9/bin/dnssec/dnssec-keygen.c#3 integrate .. //depot/projects/tty/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#4 integrate .. //depot/projects/tty/contrib/bind9/bin/dnssec/dnssec-keygen.html#5 integrate .. //depot/projects/tty/contrib/bind9/bin/dnssec/dnssec-signzone.8#5 integrate .. //depot/projects/tty/contrib/bind9/bin/dnssec/dnssec-signzone.c#6 integrate .. //depot/projects/tty/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#4 integrate .. //depot/projects/tty/contrib/bind9/bin/dnssec/dnssec-signzone.html#5 integrate .. //depot/projects/tty/contrib/bind9/bin/named/client.c#6 integrate .. //depot/projects/tty/contrib/bind9/bin/named/config.c#5 integrate .. //depot/projects/tty/contrib/bind9/bin/named/control.c#6 integrate .. //depot/projects/tty/contrib/bind9/bin/named/lwresd.8#5 integrate .. //depot/projects/tty/contrib/bind9/bin/named/lwresd.docbook#4 integrate .. //depot/projects/tty/contrib/bind9/bin/named/lwresd.html#5 integrate .. //depot/projects/tty/contrib/bind9/bin/named/named.8#5 integrate .. //depot/projects/tty/contrib/bind9/bin/named/named.conf.5#6 integrate .. //depot/projects/tty/contrib/bind9/bin/named/named.conf.docbook#6 integrate .. //depot/projects/tty/contrib/bind9/bin/named/named.conf.html#6 integrate .. //depot/projects/tty/contrib/bind9/bin/named/named.docbook#5 integrate .. //depot/projects/tty/contrib/bind9/bin/named/named.html#5 integrate .. //depot/projects/tty/contrib/bind9/bin/named/query.c#6 integrate .. //depot/projects/tty/contrib/bind9/bin/named/server.c#6 integrate .. //depot/projects/tty/contrib/bind9/bin/named/update.c#6 integrate .. //depot/projects/tty/contrib/bind9/bin/nsupdate/nsupdate.8#5 integrate .. //depot/projects/tty/contrib/bind9/bin/nsupdate/nsupdate.c#6 integrate .. //depot/projects/tty/contrib/bind9/bin/nsupdate/nsupdate.docbook#4 integrate .. //depot/projects/tty/contrib/bind9/bin/nsupdate/nsupdate.html#5 integrate .. //depot/projects/tty/contrib/bind9/bin/rndc/Makefile.in#3 integrate .. //depot/projects/tty/contrib/bind9/bin/rndc/rndc-confgen.docbook#4 integrate .. //depot/projects/tty/contrib/bind9/bin/rndc/rndc.8#5 integrate .. //depot/projects/tty/contrib/bind9/bin/rndc/rndc.conf.5#5 integrate .. //depot/projects/tty/contrib/bind9/bin/rndc/rndc.conf.docbook#4 integrate .. //depot/projects/tty/contrib/bind9/bin/rndc/rndc.conf.html#5 integrate .. //depot/projects/tty/contrib/bind9/bin/rndc/rndc.docbook#4 integrate .. //depot/projects/tty/contrib/bind9/bin/rndc/rndc.html#5 integrate .. //depot/projects/tty/contrib/bind9/configure.in#6 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM-book.xml#6 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM.ch01.html#5 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM.ch02.html#5 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM.ch03.html#6 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM.ch04.html#6 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM.ch05.html#6 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM.ch06.html#6 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM.ch07.html#6 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM.ch08.html#6 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM.ch09.html#6 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM.ch10.html#2 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM.html#6 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Bv9ARM.pdf#4 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/Makefile.in#4 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/man.dig.html#2 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/man.dnssec-keygen.html#2 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/man.dnssec-signzone.html#2 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/man.host.html#2 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/man.named-checkconf.html#2 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/man.named-checkzone.html#2 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/man.named.html#2 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/man.rndc-confgen.html#2 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/man.rndc.conf.html#2 integrate .. //depot/projects/tty/contrib/bind9/doc/arm/man.rndc.html#2 integrate .. //depot/projects/tty/contrib/bind9/doc/draft/draft-schlitt-spf-classic-02.txt#2 delete .. //depot/projects/tty/contrib/bind9/doc/misc/Makefile.in#3 integrate .. //depot/projects/tty/contrib/bind9/doc/misc/migration#4 integrate .. //depot/projects/tty/contrib/bind9/doc/rfc/index#4 integrate .. //depot/projects/tty/contrib/bind9/doc/rfc/rfc4398.txt#1 branch .. //depot/projects/tty/contrib/bind9/doc/rfc/rfc4408.txt#1 branch .. //depot/projects/tty/contrib/bind9/doc/rfc/rfc4470.txt#1 branch .. //depot/projects/tty/contrib/bind9/doc/rfc/rfc4634.txt#1 branch .. //depot/projects/tty/contrib/bind9/doc/rfc/rfc4641.txt#1 branch .. //depot/projects/tty/contrib/bind9/lib/bind/api#6 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/config.h.in#5 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/configure#6 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/configure.in#6 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/dst/dst_api.c#6 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/dst/hmac_link.c#5 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/irs/gai_strerror.c#5 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/irs/irs_data.c#5 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/isc/ctl_clnt.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/make/rules.in#4 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/nameser/ns_parse.c#4 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/port_before.h.in#5 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/resolv/res_data.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/bind/resolv/res_init.c#5 integrate .. //depot/projects/tty/contrib/bind9/lib/bind9/api#6 integrate .. //depot/projects/tty/contrib/bind9/lib/bind9/check.c#6 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/adb.c#6 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/api#6 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/dispatch.c#4 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/dnssec.c#4 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/include/dns/db.h#3 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/include/dns/dispatch.h#3 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/include/dns/validator.h#5 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/journal.c#5 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/lookup.c#4 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/master.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/message.c#5 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/openssl_link.c#4 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/openssldh_link.c#4 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/openssldsa_link.c#4 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/rbtdb.c#5 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/rdata/generic/ds_43.c#4 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/rdataslab.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/resolver.c#8 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/rootns.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/sdb.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/sdlz.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/tsig.c#5 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/validator.c#6 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/view.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/xfrin.c#6 integrate .. //depot/projects/tty/contrib/bind9/lib/dns/zone.c#6 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/Makefile.in#3 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/alpha/Makefile.in#1 branch .. //depot/projects/tty/contrib/bind9/lib/isc/alpha/include/Makefile.in#1 branch .. //depot/projects/tty/contrib/bind9/lib/isc/alpha/include/isc/Makefile.in#1 branch .. //depot/projects/tty/contrib/bind9/lib/isc/api#6 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/arm/include/isc/atomic.h#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/hmacsha.c#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/ia64/Makefile.in#1 branch .. //depot/projects/tty/contrib/bind9/lib/isc/ia64/include/Makefile.in#1 branch .. //depot/projects/tty/contrib/bind9/lib/isc/ia64/include/isc/Makefile.in#1 branch .. //depot/projects/tty/contrib/bind9/lib/isc/include/isc/platform.h.in#3 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/include/isc/string.h#3 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/mem.c#4 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/mips/Makefile.in#1 branch .. //depot/projects/tty/contrib/bind9/lib/isc/mips/include/Makefile.in#1 branch .. //depot/projects/tty/contrib/bind9/lib/isc/mips/include/isc/Makefile.in#1 branch .. //depot/projects/tty/contrib/bind9/lib/isc/noatomic/Makefile.in#1 branch .. //depot/projects/tty/contrib/bind9/lib/isc/noatomic/include/Makefile.in#1 branch .. //depot/projects/tty/contrib/bind9/lib/isc/noatomic/include/isc/Makefile.in#1 branch .. //depot/projects/tty/contrib/bind9/lib/isc/powerpc/Makefile.in#1 branch .. //depot/projects/tty/contrib/bind9/lib/isc/powerpc/include/Makefile.in#1 branch .. //depot/projects/tty/contrib/bind9/lib/isc/powerpc/include/isc/Makefile.in#1 branch .. //depot/projects/tty/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h#2 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/sparc64/Makefile.in#1 branch .. //depot/projects/tty/contrib/bind9/lib/isc/sparc64/include/Makefile.in#1 branch .. //depot/projects/tty/contrib/bind9/lib/isc/sparc64/include/isc/Makefile.in#1 branch .. //depot/projects/tty/contrib/bind9/lib/isc/timer.c#5 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#6 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/unix/net.c#4 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/unix/socket.c#6 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/unix/syslog.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/isc/x86_32/Makefile.in#1 branch .. //depot/projects/tty/contrib/bind9/lib/isc/x86_32/include/Makefile.in#1 branch .. //depot/projects/tty/contrib/bind9/lib/isc/x86_32/include/isc/Makefile.in#1 branch .. //depot/projects/tty/contrib/bind9/lib/isc/x86_64/Makefile.in#1 branch .. //depot/projects/tty/contrib/bind9/lib/isc/x86_64/include/Makefile.in#1 branch .. //depot/projects/tty/contrib/bind9/lib/isc/x86_64/include/isc/Makefile.in#1 branch .. //depot/projects/tty/contrib/bind9/lib/isccc/symtab.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/isccfg/api#5 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/api#6 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/context.c#4 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/getaddrinfo.c#5 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/getipnode.c#4 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/lwres_gnba.c#3 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres.docbook#4 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#4 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_config.docbook#4 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_context.docbook#4 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#4 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#4 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#4 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#4 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#4 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#4 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#4 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#4 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#4 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#4 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_noop.docbook#4 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_packet.docbook#4 integrate .. //depot/projects/tty/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#4 integrate .. //depot/projects/tty/contrib/bind9/make/rules.in#5 integrate .. //depot/projects/tty/contrib/bind9/version#8 integrate .. //depot/projects/tty/contrib/binutils/opcodes/ppc-dis.c#3 integrate .. //depot/projects/tty/contrib/csup/mux.c#2 integrate .. //depot/projects/tty/contrib/gcc/config/sparc/freebsd.h#6 integrate .. //depot/projects/tty/contrib/gcc/opts.c#3 integrate .. //depot/projects/tty/contrib/gdb/gdb/i386fbsd-nat.c#3 integrate .. //depot/projects/tty/contrib/groff/tmac/doc-common#12 integrate .. //depot/projects/tty/contrib/groff/tmac/doc-syms#9 integrate .. //depot/projects/tty/contrib/groff/tmac/groff_mdoc.man#10 integrate .. //depot/projects/tty/contrib/ipfilter/BSD/Makefile#7 integrate .. //depot/projects/tty/contrib/ipfilter/BSD/kupgrade#6 integrate .. //depot/projects/tty/contrib/ipfilter/HISTORY#8 integrate .. //depot/projects/tty/contrib/ipfilter/Makefile#9 integrate .. //depot/projects/tty/contrib/ipfilter/ip_fil.c#4 integrate .. //depot/projects/tty/contrib/ipfilter/iplang/Makefile#3 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/iptests.c#7 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/sock.c#7 integrate .. //depot/projects/tty/contrib/ipfilter/l4check/Makefile#2 integrate .. //depot/projects/tty/contrib/ipfilter/l4check/l4check.c#3 integrate .. //depot/projects/tty/contrib/ipfilter/lib/Makefile#5 integrate .. //depot/projects/tty/contrib/ipfilter/lib/alist_new.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/ipft_tx.c#5 integrate .. //depot/projects/tty/contrib/ipfilter/lib/printnat.c#4 integrate .. //depot/projects/tty/contrib/ipfilter/lib/printpacket.c#4 integrate .. //depot/projects/tty/contrib/ipfilter/lib/printpool_live.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/lib/printstate.c#5 integrate .. //depot/projects/tty/contrib/ipfilter/man/ippool.5#2 integrate .. //depot/projects/tty/contrib/ipfilter/md5.h#2 integrate .. //depot/projects/tty/contrib/ipfilter/radix.c#4 integrate .. //depot/projects/tty/contrib/ipfilter/radix_ipf.h#4 integrate .. //depot/projects/tty/contrib/ipfilter/test/Makefile#8 integrate .. //depot/projects/tty/contrib/ipfilter/test/dotest#4 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/Makefile#1 branch .. //depot/projects/tty/contrib/ipfilter/test/expected/f11#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/f24#1 branch .. //depot/projects/tty/contrib/ipfilter/test/expected/i19.dist#1 branch .. //depot/projects/tty/contrib/ipfilter/test/expected/i21#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/in1#5 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/in6#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/ipv6.6#1 branch .. //depot/projects/tty/contrib/ipfilter/test/expected/n16#1 branch .. //depot/projects/tty/contrib/ipfilter/test/input/f11#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/input/f24#1 branch .. //depot/projects/tty/contrib/ipfilter/test/input/ipv6.6#1 branch .. //depot/projects/tty/contrib/ipfilter/test/input/l1#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/input/n16#1 branch .. //depot/projects/tty/contrib/ipfilter/test/nattest#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/f24#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/i21#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/i3#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/in1#5 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/in6#3 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/ipv6.6#1 branch .. //depot/projects/tty/contrib/ipfilter/test/regress/n16#1 branch .. //depot/projects/tty/contrib/ipfilter/test/test.format#5 integrate .. //depot/projects/tty/contrib/ipfilter/tools/ipf_y.y#6 integrate .. //depot/projects/tty/contrib/ipfilter/tools/ipfstat.c#5 integrate .. //depot/projects/tty/contrib/ipfilter/tools/ipmon.c#7 integrate .. //depot/projects/tty/contrib/ipfilter/tools/ipnat.c#4 integrate .. //depot/projects/tty/contrib/ipfilter/tools/ipnat_y.y#5 integrate .. //depot/projects/tty/contrib/ipfilter/tools/lexer.c#4 integrate .. //depot/projects/tty/contrib/less/FREEBSD-upgrade#1 branch .. //depot/projects/tty/contrib/less/LICENSE#4 integrate .. //depot/projects/tty/contrib/less/Makefile.dsm#2 delete .. //depot/projects/tty/contrib/less/NEWS#5 integrate .. //depot/projects/tty/contrib/less/README#5 integrate .. //depot/projects/tty/contrib/less/ch.c#5 integrate .. //depot/projects/tty/contrib/less/charset.c#5 integrate .. //depot/projects/tty/contrib/less/command.c#5 integrate .. //depot/projects/tty/contrib/less/configure#5 integrate .. //depot/projects/tty/contrib/less/configure.ac#4 integrate .. //depot/projects/tty/contrib/less/decode.c#5 integrate .. //depot/projects/tty/contrib/less/defines.ds#5 integrate .. //depot/projects/tty/contrib/less/defines.h.in#5 integrate .. //depot/projects/tty/contrib/less/defines.o2#5 integrate .. //depot/projects/tty/contrib/less/defines.o9#4 integrate .. //depot/projects/tty/contrib/less/defines.wn#5 integrate .. //depot/projects/tty/contrib/less/edit.c#5 integrate .. //depot/projects/tty/contrib/less/filename.c#5 integrate .. //depot/projects/tty/contrib/less/funcs.h#5 integrate .. //depot/projects/tty/contrib/less/jump.c#5 integrate .. //depot/projects/tty/contrib/less/less.h#5 integrate .. //depot/projects/tty/contrib/less/less.man#5 integrate .. //depot/projects/tty/contrib/less/less.nro#5 integrate .. //depot/projects/tty/contrib/less/lessecho.man#3 integrate .. //depot/projects/tty/contrib/less/lessecho.nro#3 integrate .. //depot/projects/tty/contrib/less/lesskey.man#5 integrate .. //depot/projects/tty/contrib/less/lesskey.nro#5 integrate .. //depot/projects/tty/contrib/less/line.c#6 integrate .. //depot/projects/tty/contrib/less/main.c#5 integrate .. //depot/projects/tty/contrib/less/optfunc.c#5 integrate .. //depot/projects/tty/contrib/less/opttbl.c#5 integrate .. //depot/projects/tty/contrib/less/screen.c#5 integrate .. //depot/projects/tty/contrib/less/search.c#5 integrate .. //depot/projects/tty/contrib/less/signal.c#5 integrate .. //depot/projects/tty/contrib/less/tags.c#5 integrate .. //depot/projects/tty/contrib/less/version.c#5 integrate .. //depot/projects/tty/contrib/libpcap/CHANGES#6 integrate .. //depot/projects/tty/contrib/libpcap/CREDITS#6 integrate .. //depot/projects/tty/contrib/libpcap/FILES#5 integrate .. //depot/projects/tty/contrib/libpcap/INSTALL#2 delete .. //depot/projects/tty/contrib/libpcap/INSTALL.txt#5 integrate .. //depot/projects/tty/contrib/libpcap/Makefile.in#4 integrate .. //depot/projects/tty/contrib/libpcap/README.dag#3 integrate .. //depot/projects/tty/contrib/libpcap/TODO#2 integrate .. //depot/projects/tty/contrib/libpcap/VERSION#7 integrate .. //depot/projects/tty/contrib/libpcap/bpf_image.c#4 integrate .. //depot/projects/tty/contrib/libpcap/config.h.in#6 integrate .. //depot/projects/tty/contrib/libpcap/configure#6 integrate .. //depot/projects/tty/contrib/libpcap/configure.in#6 integrate .. //depot/projects/tty/contrib/libpcap/fad-getad.c#4 integrate .. //depot/projects/tty/contrib/libpcap/fad-win32.c#4 integrate .. //depot/projects/tty/contrib/libpcap/gencode.c#8 integrate .. //depot/projects/tty/contrib/libpcap/gencode.h#6 integrate .. //depot/projects/tty/contrib/libpcap/grammar.y#6 integrate .. //depot/projects/tty/contrib/libpcap/inet.c#5 integrate .. //depot/projects/tty/contrib/libpcap/lbl/gnuc.h#2 delete .. //depot/projects/tty/contrib/libpcap/nametoaddr.c#5 integrate .. //depot/projects/tty/contrib/libpcap/optimize.c#4 integrate .. //depot/projects/tty/contrib/libpcap/packaging/pcap.spec.in#1 branch .. //depot/projects/tty/contrib/libpcap/pcap-bpf.c#10 integrate .. //depot/projects/tty/contrib/libpcap/pcap-bpf.h#5 integrate .. //depot/projects/tty/contrib/libpcap/pcap-dag.c#5 integrate .. //depot/projects/tty/contrib/libpcap/pcap-dlpi.c#6 integrate .. //depot/projects/tty/contrib/libpcap/pcap-int.h#7 integrate .. //depot/projects/tty/contrib/libpcap/pcap-linux.c#6 integrate .. //depot/projects/tty/contrib/libpcap/pcap-win32.c#5 integrate .. //depot/projects/tty/contrib/libpcap/pcap.3#8 integrate .. //depot/projects/tty/contrib/libpcap/pcap.c#7 integrate .. //depot/projects/tty/contrib/libpcap/pcap.h#7 integrate .. //depot/projects/tty/contrib/libpcap/pf.h#3 delete .. //depot/projects/tty/contrib/libpcap/savefile.c#6 integrate .. //depot/projects/tty/contrib/libpcap/scanner.l#7 integrate .. //depot/projects/tty/contrib/libreadline/FREEBSD-upgrade#7 integrate .. //depot/projects/tty/contrib/libreadline/complete.c#7 integrate .. //depot/projects/tty/contrib/libreadline/display.c#7 integrate .. //depot/projects/tty/contrib/libreadline/input.c#6 integrate .. //depot/projects/tty/contrib/libreadline/isearch.c#5 integrate .. //depot/projects/tty/contrib/libreadline/misc.c#5 integrate .. //depot/projects/tty/contrib/libreadline/readline.c#7 integrate .. //depot/projects/tty/contrib/libreadline/text.c#5 integrate .. //depot/projects/tty/contrib/libreadline/vi_mode.c#7 integrate .. //depot/projects/tty/contrib/one-true-awk/FIXES#7 integrate .. //depot/projects/tty/contrib/one-true-awk/FREEBSD-upgrade#6 integrate .. //depot/projects/tty/contrib/one-true-awk/lib.c#5 integrate .. //depot/projects/tty/contrib/one-true-awk/tran.c#3 integrate .. //depot/projects/tty/contrib/openbsm/HISTORY#7 integrate .. //depot/projects/tty/contrib/openbsm/Makefile.in#3 integrate .. //depot/projects/tty/contrib/openbsm/VERSION#7 integrate .. //depot/projects/tty/contrib/openbsm/aclocal.m4#2 integrate .. //depot/projects/tty/contrib/openbsm/bin/Makefile.in#3 integrate .. //depot/projects/tty/contrib/openbsm/bin/audit/Makefile.in#2 integrate .. //depot/projects/tty/contrib/openbsm/bin/auditd/Makefile.in#2 integrate .. //depot/projects/tty/contrib/openbsm/bin/auditfilterd/Makefile.in#2 integrate .. //depot/projects/tty/contrib/openbsm/bin/auditreduce/Makefile.in#2 integrate .. //depot/projects/tty/contrib/openbsm/bin/auditreduce/auditreduce.c#5 integrate .. //depot/projects/tty/contrib/openbsm/bin/praudit/Makefile.in#2 integrate .. //depot/projects/tty/contrib/openbsm/bin/praudit/praudit.c#3 integrate .. //depot/projects/tty/contrib/openbsm/bsm/Makefile.in#3 integrate .. //depot/projects/tty/contrib/openbsm/config/config.h#6 integrate .. //depot/projects/tty/contrib/openbsm/config/config.h.in#4 integrate .. //depot/projects/tty/contrib/openbsm/config/ltmain.sh#3 integrate .. //depot/projects/tty/contrib/openbsm/configure#7 integrate .. //depot/projects/tty/contrib/openbsm/configure.ac#7 integrate .. //depot/projects/tty/contrib/openbsm/etc/audit_class#2 integrate .. //depot/projects/tty/contrib/openbsm/etc/audit_event#6 integrate .. //depot/projects/tty/contrib/openbsm/libbsm/Makefile.in#3 integrate .. //depot/projects/tty/contrib/openbsm/libbsm/bsm_event.c#3 integrate .. //depot/projects/tty/contrib/openbsm/libbsm/bsm_io.c#6 integrate .. //depot/projects/tty/contrib/openbsm/man/Makefile.in#2 integrate .. //depot/projects/tty/contrib/openbsm/modules/Makefile.in#2 integrate .. //depot/projects/tty/contrib/openbsm/modules/auditfilter_noop/Makefile.in#2 integrate .. //depot/projects/tty/contrib/openbsm/test/Makefile.in#2 integrate .. //depot/projects/tty/contrib/openbsm/test/bsm/Makefile.in#2 integrate .. //depot/projects/tty/contrib/openbsm/tools/Makefile.in#3 integrate .. //depot/projects/tty/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/tty/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#3 integrate .. //depot/projects/tty/contrib/pf/pflogd/pflogd.c#8 integrate .. //depot/projects/tty/contrib/pf/pflogd/pidfile.c#6 delete .. //depot/projects/tty/contrib/pf/pflogd/pidfile.h#4 delete .. //depot/projects/tty/contrib/sendmail/CACerts#2 integrate .. //depot/projects/tty/contrib/sendmail/FREEBSD-upgrade#14 integrate .. //depot/projects/tty/contrib/sendmail/INSTALL#2 integrate .. //depot/projects/tty/contrib/sendmail/RELEASE_NOTES#14 integrate .. //depot/projects/tty/contrib/sendmail/cf/cf/submit.cf#14 integrate .. //depot/projects/tty/contrib/sendmail/cf/feature/ldap_routing.m4#3 integrate .. //depot/projects/tty/contrib/sendmail/cf/m4/proto.m4#11 integrate .. //depot/projects/tty/contrib/sendmail/cf/m4/version.m4#14 integrate .. //depot/projects/tty/contrib/sendmail/contrib/buildvirtuser#4 integrate .. //depot/projects/tty/contrib/sendmail/doc/op/op.me#11 integrate .. //depot/projects/tty/contrib/sendmail/editmap/editmap.c#3 integrate .. //depot/projects/tty/contrib/sendmail/include/sm/conf.h#11 integrate .. //depot/projects/tty/contrib/sendmail/include/sm/ldap.h#5 integrate .. //depot/projects/tty/contrib/sendmail/include/sm/tailq.h#2 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/docs/xxfi_unknown.html#2 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/engine.c#10 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/listener.c#11 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/main.c#8 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/monitor.c#2 integrate .. //depot/projects/tty/contrib/sendmail/libmilter/smfi.c#6 integrate .. //depot/projects/tty/contrib/sendmail/libsm/ldap.c#9 integrate .. //depot/projects/tty/contrib/sendmail/libsm/mpeix.c#2 integrate .. //depot/projects/tty/contrib/sendmail/makemap/makemap.c#5 integrate .. //depot/projects/tty/contrib/sendmail/praliases/praliases.c#3 integrate .. //depot/projects/tty/contrib/sendmail/src/Makefile.m4#5 integrate .. //depot/projects/tty/contrib/sendmail/src/conf.c#15 integrate .. //depot/projects/tty/contrib/sendmail/src/deliver.c#13 integrate .. //depot/projects/tty/contrib/sendmail/src/envelope.c#8 integrate .. //depot/projects/tty/contrib/sendmail/src/headers.c#14 integrate .. //depot/projects/tty/contrib/sendmail/src/macro.c#4 integrate .. //depot/projects/tty/contrib/sendmail/src/main.c#12 integrate .. //depot/projects/tty/contrib/sendmail/src/map.c#10 integrate .. //depot/projects/tty/contrib/sendmail/src/milter.c#12 integrate .. //depot/projects/tty/contrib/sendmail/src/mime.c#9 integrate .. //depot/projects/tty/contrib/sendmail/src/parseaddr.c#13 integrate .. //depot/projects/tty/contrib/sendmail/src/queue.c#14 integrate .. //depot/projects/tty/contrib/sendmail/src/readcf.c#10 integrate .. //depot/projects/tty/contrib/sendmail/src/recipient.c#8 integrate .. //depot/projects/tty/contrib/sendmail/src/sendmail.8#5 integrate .. //depot/projects/tty/contrib/sendmail/src/sendmail.h#13 integrate .. //depot/projects/tty/contrib/sendmail/src/sm_resolve.c#6 integrate .. //depot/projects/tty/contrib/sendmail/src/srvrsmtp.c#14 integrate .. //depot/projects/tty/contrib/sendmail/src/usersmtp.c#10 integrate .. //depot/projects/tty/contrib/sendmail/src/util.c#10 integrate .. //depot/projects/tty/contrib/sendmail/src/version.c#14 integrate .. //depot/projects/tty/contrib/sendmail/vacation/vacation.c#6 integrate .. //depot/projects/tty/contrib/tcpdump/CHANGES#7 integrate .. //depot/projects/tty/contrib/tcpdump/CREDITS#7 integrate .. //depot/projects/tty/contrib/tcpdump/FILES#7 integrate .. //depot/projects/tty/contrib/tcpdump/INSTALL#7 integrate .. //depot/projects/tty/contrib/tcpdump/Makefile.in#6 integrate .. //depot/projects/tty/contrib/tcpdump/README#5 integrate .. //depot/projects/tty/contrib/tcpdump/VERSION#8 integrate .. //depot/projects/tty/contrib/tcpdump/addrtoname.c#7 integrate .. //depot/projects/tty/contrib/tcpdump/af.c#1 branch .. //depot/projects/tty/contrib/tcpdump/af.h#1 branch .. //depot/projects/tty/contrib/tcpdump/bootp.h#3 integrate .. //depot/projects/tty/contrib/tcpdump/config.h.in#6 integrate .. //depot/projects/tty/contrib/tcpdump/configure#7 integrate .. //depot/projects/tty/contrib/tcpdump/configure.in#7 integrate .. //depot/projects/tty/contrib/tcpdump/dccp.h#2 integrate .. //depot/projects/tty/contrib/tcpdump/ieee802_11.h#4 integrate .. //depot/projects/tty/contrib/tcpdump/ieee802_11_radio.h#3 integrate .. //depot/projects/tty/contrib/tcpdump/interface.h#7 integrate .. //depot/projects/tty/contrib/tcpdump/ip.h#4 integrate .. //depot/projects/tty/contrib/tcpdump/llc.h#6 integrate .. //depot/projects/tty/contrib/tcpdump/nameser.h#3 integrate .. //depot/projects/tty/contrib/tcpdump/netdissect.h#3 integrate .. //depot/projects/tty/contrib/tcpdump/ospf.h#5 integrate .. //depot/projects/tty/contrib/tcpdump/parsenfsfh.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/pf.h#3 delete .. //depot/projects/tty/contrib/tcpdump/print-802_11.c#8 integrate .. //depot/projects/tty/contrib/tcpdump/print-atm.c#6 integrate .. //depot/projects/tty/contrib/tcpdump/print-bfd.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-bgp.c#8 integrate .. //depot/projects/tty/contrib/tcpdump/print-bootp.c#6 integrate .. //depot/projects/tty/contrib/tcpdump/print-chdlc.c#6 integrate .. //depot/projects/tty/contrib/tcpdump/print-dccp.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-dhcp6.c#5 integrate .. //depot/projects/tty/contrib/tcpdump/print-domain.c#5 integrate .. //depot/projects/tty/contrib/tcpdump/print-ether.c#7 integrate .. //depot/projects/tty/contrib/tcpdump/print-fddi.c#6 integrate .. //depot/projects/tty/contrib/tcpdump/print-fr.c#6 integrate .. //depot/projects/tty/contrib/tcpdump/print-icmp.c#6 integrate .. //depot/projects/tty/contrib/tcpdump/print-ip.c#7 integrate .. //depot/projects/tty/contrib/tcpdump/print-ip6.c#6 integrate .. //depot/projects/tty/contrib/tcpdump/print-ipfc.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-isoclns.c#8 integrate .. //depot/projects/tty/contrib/tcpdump/print-juniper.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-l2tp.c#6 integrate .. //depot/projects/tty/contrib/tcpdump/print-lane.c#5 integrate .. //depot/projects/tty/contrib/tcpdump/print-ldp.c#5 integrate .. //depot/projects/tty/contrib/tcpdump/print-llc.c#6 integrate .. //depot/projects/tty/contrib/tcpdump/print-lmp.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-lspping.c#3 integrate .. //depot/projects/tty/contrib/tcpdump/print-nfs.c#6 integrate .. //depot/projects/tty/contrib/tcpdump/print-null.c#7 integrate .. //depot/projects/tty/contrib/tcpdump/print-olsr.c#1 branch .. //depot/projects/tty/contrib/tcpdump/print-ospf.c#6 integrate .. //depot/projects/tty/contrib/tcpdump/print-pflog.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-pim.c#7 integrate .. //depot/projects/tty/contrib/tcpdump/print-ppp.c#6 integrate .. //depot/projects/tty/contrib/tcpdump/print-pptp.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-rsvp.c#6 integrate .. //depot/projects/tty/contrib/tcpdump/print-rx.c#5 integrate .. //depot/projects/tty/contrib/tcpdump/print-sctp.c#7 integrate .. //depot/projects/tty/contrib/tcpdump/print-sll.c#7 integrate .. //depot/projects/tty/contrib/tcpdump/print-smb.c#6 integrate .. //depot/projects/tty/contrib/tcpdump/print-tcp.c#7 integrate .. //depot/projects/tty/contrib/tcpdump/print-tftp.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/print-token.c#5 integrate .. //depot/projects/tty/contrib/tcpdump/print-udp.c#4 integrate .. //depot/projects/tty/contrib/tcpdump/smbutil.c#6 integrate .. //depot/projects/tty/contrib/tcpdump/tcp.h#4 integrate .. //depot/projects/tty/contrib/tcpdump/tcpdump-stdinc.h#5 integrate .. //depot/projects/tty/contrib/tcpdump/tcpdump.1#8 integrate .. //depot/projects/tty/contrib/tcpdump/tcpdump.c#7 integrate .. //depot/projects/tty/contrib/tcpdump/tests/print-capX.out#2 integrate .. //depot/projects/tty/contrib/tcpdump/tests/print-capXX.out#2 integrate .. //depot/projects/tty/contrib/tcpdump/tftp.h#1 branch .. //depot/projects/tty/contrib/tcpdump/udp.h#4 integrate .. //depot/projects/tty/contrib/tcpdump/util.c#6 integrate .. //depot/projects/tty/contrib/tcsh/sh.c#5 integrate .. //depot/projects/tty/contrib/tcsh/sh.lex.c#5 integrate .. //depot/projects/tty/contrib/tcsh/sh.proc.c#5 integrate .. //depot/projects/tty/contrib/tcsh/tc.const.c#5 integrate .. //depot/projects/tty/contrib/wpa_supplicant/main.c#3 integrate .. //depot/projects/tty/crypto/heimdal/appl/su/Makefile.am#3 integrate .. //depot/projects/tty/crypto/heimdal/appl/su/su.c#4 integrate .. //depot/projects/tty/crypto/openssl/ssl/d1_both.c#2 integrate .. //depot/projects/tty/crypto/openssl/ssl/dtls1.h#2 integrate .. //depot/projects/tty/crypto/openssl/ssl/ssl.h#8 integrate .. //depot/projects/tty/crypto/openssl/ssl/ssl_err.c#5 integrate .. //depot/projects/tty/crypto/openssl/ssl/ssl_lib.c#9 integrate .. //depot/projects/tty/etc/Makefile#21 integrate .. //depot/projects/tty/etc/cached.conf#2 delete .. //depot/projects/tty/etc/defaults/Makefile#6 integrate .. //depot/projects/tty/etc/defaults/devfs.rules#5 integrate .. //depot/projects/tty/etc/defaults/pccard.conf#10 delete .. //depot/projects/tty/etc/defaults/periodic.conf#13 integrate .. //depot/projects/tty/etc/defaults/rc.conf#27 integrate .. //depot/projects/tty/etc/etc.amd64/ttys#4 integrate .. //depot/projects/tty/etc/etc.arm/ttys#5 integrate .. //depot/projects/tty/etc/etc.i386/ttys#4 integrate .. //depot/projects/tty/etc/etc.ia64/ttys#6 integrate .. //depot/projects/tty/etc/etc.powerpc/ttys#6 integrate .. //depot/projects/tty/etc/etc.sparc64/ttys#10 integrate .. //depot/projects/tty/etc/freebsd-update.conf#2 integrate .. //depot/projects/tty/etc/gss/mech#2 integrate .. //depot/projects/tty/etc/mtree/BSD.include.dist#24 integrate .. //depot/projects/tty/etc/mtree/BSD.local.dist#15 integrate .. //depot/projects/tty/etc/mtree/BSD.usr.dist#19 integrate .. //depot/projects/tty/etc/mtree/BSD.x11-4.dist#9 integrate .. //depot/projects/tty/etc/mtree/README#2 integrate .. //depot/projects/tty/etc/namedb/named.root#4 integrate .. //depot/projects/tty/etc/network.subr#13 integrate .. //depot/projects/tty/etc/nscd.conf#1 branch .. //depot/projects/tty/etc/periodic/security/100.chksetuid#3 integrate .. //depot/projects/tty/etc/pf.conf#4 delete .. //depot/projects/tty/etc/rc.d/DAEMON#4 integrate .. //depot/projects/tty/etc/rc.d/LOGIN#4 integrate .. //depot/projects/tty/etc/rc.d/Makefile#20 integrate .. //depot/projects/tty/etc/rc.d/NETWORKING#10 integrate .. //depot/projects/tty/etc/rc.d/SERVERS#5 integrate .. //depot/projects/tty/etc/rc.d/accounting#5 integrate .. //depot/projects/tty/etc/rc.d/amd#7 integrate .. //depot/projects/tty/etc/rc.d/apmd#7 integrate .. //depot/projects/tty/etc/rc.d/bootconf.sh#3 delete .. //depot/projects/tty/etc/rc.d/bootparams#4 integrate .. //depot/projects/tty/etc/rc.d/cached#3 delete .. //depot/projects/tty/etc/rc.d/ccd#4 integrate .. //depot/projects/tty/etc/rc.d/cron#5 integrate .. //depot/projects/tty/etc/rc.d/dhclient#11 integrate .. //depot/projects/tty/etc/rc.d/dmesg#4 integrate .. //depot/projects/tty/etc/rc.d/early.sh#3 integrate .. //depot/projects/tty/etc/rc.d/fsck#5 integrate .. //depot/projects/tty/etc/rc.d/ftp-proxy#1 branch .. //depot/projects/tty/etc/rc.d/hostapd#2 integrate .. //depot/projects/tty/etc/rc.d/inetd#4 integrate .. //depot/projects/tty/etc/rc.d/ipfilter#10 integrate .. //depot/projects/tty/etc/rc.d/ipfs#5 integrate .. //depot/projects/tty/etc/rc.d/ipmon#9 integrate .. //depot/projects/tty/etc/rc.d/ipnat#8 integrate .. //depot/projects/tty/etc/rc.d/ipsec#10 integrate .. //depot/projects/tty/etc/rc.d/isdnd#8 integrate .. //depot/projects/tty/etc/rc.d/kerberos#6 integrate .. //depot/projects/tty/etc/rc.d/keyserv#3 integrate .. //depot/projects/tty/etc/rc.d/ldconfig#10 integrate .. //depot/projects/tty/etc/rc.d/local#4 integrate .. //depot/projects/tty/etc/rc.d/lockd#2 integrate .. //depot/projects/tty/etc/rc.d/lpd#6 integrate .. //depot/projects/tty/etc/rc.d/motd#7 integrate .. //depot/projects/tty/etc/rc.d/mountcritlocal#7 integrate .. //depot/projects/tty/etc/rc.d/mountcritremote#9 integrate .. //depot/projects/tty/etc/rc.d/mountd#6 integrate .. //depot/projects/tty/etc/rc.d/moused#6 integrate .. //depot/projects/tty/etc/rc.d/mrouted#7 integrate .. //depot/projects/tty/etc/rc.d/named#8 integrate .. //depot/projects/tty/etc/rc.d/newsyslog#5 integrate .. //depot/projects/tty/etc/rc.d/nfsd#4 integrate .. //depot/projects/tty/etc/rc.d/nfslocking#7 delete .. //depot/projects/tty/etc/rc.d/nscd#2 integrate .. //depot/projects/tty/etc/rc.d/power_profile#7 integrate .. //depot/projects/tty/etc/rc.d/ppp#5 integrate .. //depot/projects/tty/etc/rc.d/pwcheck#4 integrate .. //depot/projects/tty/etc/rc.d/quota#5 integrate .. //depot/projects/tty/etc/rc.d/rarpd#4 integrate .. //depot/projects/tty/etc/rc.d/resolv#6 integrate .. //depot/projects/tty/etc/rc.d/root#7 integrate .. //depot/projects/tty/etc/rc.d/route6d#4 integrate .. //depot/projects/tty/etc/rc.d/routed#7 integrate .. //depot/projects/tty/etc/rc.d/rpcbind#5 integrate .. //depot/projects/tty/etc/rc.d/rtadvd#4 integrate .. //depot/projects/tty/etc/rc.d/rwho#4 integrate .. //depot/projects/tty/etc/rc.d/savecore#4 integrate .. //depot/projects/tty/etc/rc.d/securelevel#6 integrate .. //depot/projects/tty/etc/rc.d/sendmail#8 integrate .. //depot/projects/tty/etc/rc.d/sshd#9 integrate .. //depot/projects/tty/etc/rc.d/statd#2 integrate .. //depot/projects/tty/etc/rc.d/swap1#5 integrate .. //depot/projects/tty/etc/rc.d/sysctl#6 integrate .. //depot/projects/tty/etc/rc.d/syslogd#6 integrate .. //depot/projects/tty/etc/rc.d/timed#4 integrate .. //depot/projects/tty/etc/rc.d/tmp#6 integrate .. //depot/projects/tty/etc/rc.d/ugidfw#5 integrate .. //depot/projects/tty/etc/rc.d/var#7 integrate .. //depot/projects/tty/etc/rc.d/virecover#6 integrate .. //depot/projects/tty/etc/rc.d/ypbind#6 integrate .. //depot/projects/tty/etc/rc.d/yppasswdd#6 integrate .. //depot/projects/tty/etc/rc.d/ypserv#6 integrate .. //depot/projects/tty/etc/rc.subr#19 integrate .. //depot/projects/tty/etc/sendmail/freebsd.mc#9 integrate .. //depot/projects/tty/etc/sendmail/freebsd.submit.mc#6 integrate .. //depot/projects/tty/etc/services#11 integrate .. //depot/projects/tty/games/fortune/datfiles/Makefile#5 integrate .. //depot/projects/tty/games/fortune/datfiles/fortunes#31 integrate .. //depot/projects/tty/games/fortune/datfiles/fortunes-o.real#6 integrate .. //depot/projects/tty/games/fortune/datfiles/fortunes-o.sp.ok#2 integrate .. //depot/projects/tty/games/fortune/datfiles/fortunes.sp.ok#6 integrate .. //depot/projects/tty/games/fortune/datfiles/fortunes2-o#10 delete .. //depot/projects/tty/games/fortune/datfiles/freebsd-tips#10 integrate .. //depot/projects/tty/games/fortune/datfiles/freebsd-tips.sp.ok#1 branch .. //depot/projects/tty/games/fortune/datfiles/limerick#8 integrate .. //depot/projects/tty/games/fortune/datfiles/limerick.sp.ok#1 branch .. //depot/projects/tty/games/fortune/datfiles/murphy#5 integrate .. //depot/projects/tty/games/fortune/datfiles/murphy-o#3 integrate .. //depot/projects/tty/games/fortune/datfiles/murphy.sp.ok#1 branch .. //depot/projects/tty/games/fortune/datfiles/startrek#7 integrate .. //depot/projects/tty/games/fortune/datfiles/zippy#4 integrate .. //depot/projects/tty/games/fortune/datfiles/zippy.sp.ok#2 integrate .. //depot/projects/tty/games/fortune/fortune/fortune.6#4 integrate .. //depot/projects/tty/games/fortune/fortune/fortune.c#7 integrate .. //depot/projects/tty/gnu/lib/csu/Makefile#8 integrate .. //depot/projects/tty/gnu/lib/libobjc/Makefile#12 integrate .. //depot/projects/tty/gnu/usr.bin/binutils/ld/Makefile#6 integrate .. //depot/projects/tty/gnu/usr.bin/binutils/ld/genscripts.sh#4 integrate .. //depot/projects/tty/gnu/usr.bin/cc/cc_int/Makefile#11 integrate .. //depot/projects/tty/gnu/usr.bin/cc/cc_tools/Makefile#11 integrate .. //depot/projects/tty/gnu/usr.bin/cc/cc_tools/auto-host.h#8 integrate .. //depot/projects/tty/gnu/usr.bin/cc/cc_tools/freebsd-native.h#7 integrate .. //depot/projects/tty/gnu/usr.bin/diff/Makefile#4 integrate .. //depot/projects/tty/gnu/usr.bin/gdb/arch/arm/Makefile#2 integrate .. //depot/projects/tty/gnu/usr.bin/gdb/arch/arm/armfbsd-nat.c#2 integrate .. //depot/projects/tty/gnu/usr.bin/gdb/arch/arm/armfbsd-tdep.c#2 integrate .. //depot/projects/tty/gnu/usr.bin/gdb/arch/arm/init.c#2 integrate .. //depot/projects/tty/gnu/usr.bin/gdb/arch/arm/nm-fbsd.h#2 integrate .. //depot/projects/tty/gnu/usr.bin/gdb/kgdb/kgdb.h#6 integrate .. //depot/projects/tty/gnu/usr.bin/gdb/kgdb/kthr.c#6 integrate .. //depot/projects/tty/gnu/usr.bin/gdb/kgdb/trgt_i386.c#5 integrate .. //depot/projects/tty/gnu/usr.bin/groff/tmac/mdoc.local#15 integrate .. //depot/projects/tty/gnu/usr.bin/man/man/man.c#4 integrate .. //depot/projects/tty/gnu/usr.bin/sort/Makefile#5 integrate .. //depot/projects/tty/gnu/usr.bin/texinfo/info/Makefile#2 integrate .. //depot/projects/tty/include/Makefile#26 integrate .. //depot/projects/tty/include/_ctype.h#2 integrate .. //depot/projects/tty/include/assert.h#2 integrate .. //depot/projects/tty/include/ctype.h#4 integrate .. //depot/projects/tty/include/dirent.h#3 integrate .. //depot/projects/tty/include/elf.h#3 integrate .. //depot/projects/tty/include/pthread.h#11 integrate .. //depot/projects/tty/include/pthread_np.h#3 integrate .. //depot/projects/tty/include/wctype.h#4 integrate .. //depot/projects/tty/kerberos5/lib/Makefile.inc#4 integrate .. //depot/projects/tty/kerberos5/usr.bin/ksu/Makefile#7 integrate .. //depot/projects/tty/lib/Makefile#26 integrate .. //depot/projects/tty/lib/bind/bind/Makefile#6 integrate .. //depot/projects/tty/lib/bind/bind/config.h#5 integrate .. //depot/projects/tty/lib/bind/bind/port_before.h#5 integrate .. //depot/projects/tty/lib/bind/config.h#7 integrate .. //depot/projects/tty/lib/bind/config.mk#7 integrate .. //depot/projects/tty/lib/bind/isc/isc/platform.h#5 integrate .. //depot/projects/tty/lib/bind/lwres/Makefile#6 integrate .. //depot/projects/tty/lib/csu/common/crtbrand.c#4 integrate .. //depot/projects/tty/lib/libarchive/archive_read.3#12 integrate .. //depot/projects/tty/lib/libarchive/archive_read_support_compression_none.c#6 integrate .. //depot/projects/tty/lib/libarchive/archive_read_support_format_tar.c#13 integrate .. //depot/projects/tty/lib/libarchive/archive_read_support_format_zip.c#7 integrate .. //depot/projects/tty/lib/libarchive/archive_write_disk.c#5 integrate .. //depot/projects/tty/lib/libarchive/archive_write_set_format_cpio.c#6 integrate .. //depot/projects/tty/lib/libarchive/archive_write_set_format_cpio_newc.c#2 integrate .. //depot/projects/tty/lib/libarchive/test/test_write_disk.c#4 integrate .. //depot/projects/tty/lib/libarchive/test/test_write_format_cpio.c#2 integrate .. //depot/projects/tty/lib/libbsm/Makefile#5 integrate .. //depot/projects/tty/lib/libc/Makefile#15 integrate .. //depot/projects/tty/lib/libc/amd64/Makefile.inc#4 integrate .. //depot/projects/tty/lib/libc/arm/Symbol.map#4 integrate .. //depot/projects/tty/lib/libc/arm/string/ffs.S#3 integrate .. //depot/projects/tty/lib/libc/arm/string/memcpy.S#2 integrate .. //depot/projects/tty/lib/libc/arm/string/memset.S#3 integrate .. //depot/projects/tty/lib/libc/gdtoa/Symbol.map#3 integrate .. //depot/projects/tty/lib/libc/gdtoa/_ldtoa.c#3 integrate .. //depot/projects/tty/lib/libc/gdtoa/machdep_ldisQ.c#3 integrate .. //depot/projects/tty/lib/libc/gdtoa/machdep_ldisx.c#3 integrate .. //depot/projects/tty/lib/libc/gen/Makefile.inc#18 integrate .. //depot/projects/tty/lib/libc/gen/Symbol.map#5 integrate .. //depot/projects/tty/lib/libc/gen/closedir.c#3 integrate .. //depot/projects/tty/lib/libc/gen/readdir.c#4 integrate .. //depot/projects/tty/lib/libc/gen/seekdir.c#3 integrate .. //depot/projects/tty/lib/libc/gen/sysctl.3#9 integrate .. //depot/projects/tty/lib/libc/gen/telldir.c#3 integrate .. //depot/projects/tty/lib/libc/gen/valloc.3#4 integrate .. //depot/projects/tty/lib/libc/i386/Makefile.inc#3 integrate .. //depot/projects/tty/lib/libc/ia64/Makefile.inc#4 integrate .. //depot/projects/tty/lib/libc/ia64/Symbol.map#4 integrate .. //depot/projects/tty/lib/libc/locale/Symbol.map#3 integrate .. //depot/projects/tty/lib/libc/locale/big5.c#5 integrate .. //depot/projects/tty/lib/libc/locale/euc.c#6 integrate .. //depot/projects/tty/lib/libc/locale/gb18030.c#4 integrate .. //depot/projects/tty/lib/libc/locale/gb2312.c#4 integrate .. //depot/projects/tty/lib/libc/locale/gbk.c#6 integrate .. //depot/projects/tty/lib/libc/locale/isctype.c#3 integrate .. //depot/projects/tty/lib/libc/locale/iswctype.c#3 integrate .. //depot/projects/tty/lib/libc/locale/mblocal.h#5 integrate .. //depot/projects/tty/lib/libc/locale/mskanji.c#5 integrate .. //depot/projects/tty/lib/libc/locale/none.c#7 integrate .. //depot/projects/tty/lib/libc/locale/setrunelocale.c#10 integrate .. //depot/projects/tty/lib/libc/locale/utf8.c#8 integrate .. //depot/projects/tty/lib/libc/nameser/ns_parse.c#3 integrate .. //depot/projects/tty/lib/libc/net/Makefile.inc#15 integrate .. //depot/projects/tty/lib/libc/net/ethers.3#5 integrate .. //depot/projects/tty/lib/libc/net/getaddrinfo.c#17 integrate .. //depot/projects/tty/lib/libc/net/nscache.c#2 integrate .. //depot/projects/tty/lib/libc/net/sctp_connectx.3#3 integrate .. //depot/projects/tty/lib/libc/net/sctp_opt_info.3#3 integrate .. //depot/projects/tty/lib/libc/net/sctp_recvmsg.3#3 integrate .. //depot/projects/tty/lib/libc/net/sctp_send.3#3 integrate .. //depot/projects/tty/lib/libc/net/sctp_sendmsg.3#3 integrate .. //depot/projects/tty/lib/libc/powerpc/Symbol.map#4 integrate .. //depot/projects/tty/lib/libc/resolv/res_data.c#3 integrate .. //depot/projects/tty/lib/libc/resolv/res_init.c#5 integrate .. //depot/projects/tty/lib/libc/rpc/auth_time.c#4 integrate .. //depot/projects/tty/lib/libc/rpc/authdes_prot.c#2 integrate .. //depot/projects/tty/lib/libc/rpc/authunix_prot.c#3 integrate .. //depot/projects/tty/lib/libc/rpc/getnetconfig.c#8 integrate .. //depot/projects/tty/lib/libc/rpc/getnetpath.c#6 integrate .. //depot/projects/tty/lib/libc/rpc/key_prot_xdr.c#3 integrate .. //depot/projects/tty/lib/libc/rpc/rpc_callmsg.c#3 integrate .. //depot/projects/tty/lib/libc/rpc/rpc_generic.c#5 integrate .. //depot/projects/tty/lib/libc/rpc/rpc_prot.c#3 integrate .. //depot/projects/tty/lib/libc/rpc/rpcb_clnt.c#7 integrate .. //depot/projects/tty/lib/libc/rpc/rpcb_prot.c#5 integrate .. //depot/projects/tty/lib/libc/rpc/rpcb_st_xdr.c#2 integrate .. //depot/projects/tty/lib/libc/sparc64/Makefile.inc#4 integrate .. //depot/projects/tty/lib/libc/sparc64/fpu/fpu_explode.c#4 integrate .. //depot/projects/tty/lib/libc/stdio/vfscanf.c#9 integrate .. //depot/projects/tty/lib/libc/stdio/vfwscanf.c#8 integrate .. //depot/projects/tty/lib/libc/stdlib/atoi.3#3 integrate .. //depot/projects/tty/lib/libc/stdlib/getenv.c#5 integrate .. //depot/projects/tty/lib/libc/stdlib/malloc.3#10 integrate .. //depot/projects/tty/lib/libc/stdlib/malloc.c#20 integrate .. //depot/projects/tty/lib/libc/sys/Makefile.inc#14 integrate .. //depot/projects/tty/lib/libc/sys/access.2#3 integrate .. //depot/projects/tty/lib/libc/sys/kldstat.2#3 integrate .. //depot/projects/tty/lib/libc/sys/kqueue.2#10 integrate .. //depot/projects/tty/lib/libc/sys/minherit.2#4 integrate .. //depot/projects/tty/lib/libc/sys/ntp_adjtime.2#4 integrate .. //depot/projects/tty/lib/libc/sys/ntp_gettime.2#4 delete .. //depot/projects/tty/lib/libc/sys/sctp_generic_recvmsg.2#2 integrate .. //depot/projects/tty/lib/libc/sys/sctp_generic_sendmsg.2#2 integrate .. //depot/projects/tty/lib/libc/sys/sctp_peeloff.2#2 integrate .. //depot/projects/tty/lib/libdisk/libdisk.3#10 integrate .. //depot/projects/tty/lib/libdisk/libdisk.h#8 integrate .. //depot/projects/tty/lib/libdisk/open_disk.c#7 integrate .. //depot/projects/tty/lib/libdisk/open_ia64_disk.c#3 integrate .. //depot/projects/tty/lib/libelf/elf.3#2 integrate .. //depot/projects/tty/lib/libelf/elf_flagdata.3#2 integrate .. //depot/projects/tty/lib/libelf/elf_getscn.3#2 integrate .. //depot/projects/tty/lib/libelf/elf_update.3#2 integrate .. //depot/projects/tty/lib/libelf/elf_update.c#2 integrate .. //depot/projects/tty/lib/libelf/gelf_getphdr.3#2 integrate .. //depot/projects/tty/lib/libelf/gelf_newehdr.3#2 integrate .. //depot/projects/tty/lib/libelf/gelf_newphdr.3#2 integrate .. //depot/projects/tty/lib/libelf/gelf_xlatetof.3#2 integrate .. //depot/projects/tty/lib/libelf/libelf_convert.m4#2 integrate .. //depot/projects/tty/lib/libelf/libelf_data.c#2 integrate .. //depot/projects/tty/lib/libelf/libelf_xlate.c#2 integrate .. //depot/projects/tty/lib/libgssapi/Makefile#2 integrate .. //depot/projects/tty/lib/libgssapi/gss_accept_sec_context.3#2 integrate .. //depot/projects/tty/lib/libgssapi/gss_acquire_cred.3#2 integrate .. //depot/projects/tty/lib/libgssapi/gss_acquire_cred.c#2 integrate .. //depot/projects/tty/lib/libgssapi/gss_add_cred.3#2 integrate .. //depot/projects/tty/lib/libgssapi/gss_add_oid_set_member.3#2 integrate .. //depot/projects/tty/lib/libgssapi/gss_canonicalize_name.3#2 integrate .. //depot/projects/tty/lib/libgssapi/gss_compare_name.3#2 integrate .. //depot/projects/tty/lib/libgssapi/gss_context_time.3#2 integrate .. //depot/projects/tty/lib/libgssapi/gss_create_empty_oid_set.3#2 integrate .. //depot/projects/tty/lib/libgssapi/gss_delete_sec_context.3#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Dec 10 03:46:58 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C71E16A468; Mon, 10 Dec 2007 03:46:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 084C016A41B for ; Mon, 10 Dec 2007 03:46:58 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EA17813C442 for ; Mon, 10 Dec 2007 03:46:57 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBA3kv14098279 for ; Mon, 10 Dec 2007 03:46:57 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBA3kvN4098276 for perforce@freebsd.org; Mon, 10 Dec 2007 03:46:57 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 10 Dec 2007 03:46:57 GMT Message-Id: <200712100346.lBA3kvN4098276@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 130580 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Dec 2007 03:46:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=130580 Change 130580 by kmacy@kmacy:storage:toestack on 2007/12/10 03:46:32 the rtentry doesn't necessarily contain the ip address that we need to resolve the L2 address for - extend the interface to pass the address in directly Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/cxgb_l2t.c#12 edit .. //depot/projects/toestack/sys/dev/cxgb/cxgb_l2t.h#11 edit .. //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.c#21 edit .. //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.h#7 edit .. //depot/projects/toestack/sys/dev/cxgb/t3cdev.h#5 edit .. //depot/projects/toestack/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_cm.c#2 edit .. //depot/projects/toestack/sys/net/route.c#9 edit .. //depot/projects/toestack/sys/net/route.h#7 edit .. //depot/projects/toestack/sys/netinet/if_ether.c#14 edit .. //depot/projects/toestack/sys/netinet/ip_icmp.c#8 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_l2t.c#12 (text+ko) ==== @@ -166,18 +166,20 @@ } int -t3_l2t_send_slow(struct t3cdev *dev, struct mbuf *m, - struct l2t_entry *e) +t3_l2t_send_slow(struct t3cdev *dev, struct mbuf *m, struct l2t_entry *e) { - struct rtentry *rt; + struct rtentry *rt = e->neigh; + struct sockaddr_in sin; + sin.sin_family = AF_INET; + sin.sin_len = sizeof(struct sockaddr_in); + sin.sin_addr.s_addr = htonl(e->addr); - rt = e->neigh; - printf("send slow on rt=%p\n", rt); + printf("send slow on rt=%p eaddr=0x%08x\n", rt, e->addr); again: switch (e->state) { case L2T_STATE_STALE: /* entry is stale, kick off revalidation */ - arpresolve(rt->rt_ifp, rt, NULL, rt_key(rt), e->dmac); + arpresolve(rt->rt_ifp, rt, NULL, (struct sockaddr *)&sin, e->dmac); mtx_lock(&e->lock); if (e->state == L2T_STATE_STALE) e->state = L2T_STATE_VALID; @@ -202,8 +204,11 @@ * A better way would be to use a work request to retry L2T * entries when there's no memory. */ - printf("doing arpresolve\n"); - if (arpresolve(rt->rt_ifp, rt, NULL, rt_key(rt), e->dmac) == 0) { + printf("doing arpresolve on 0x%x \n", e->addr); + if (arpresolve(rt->rt_ifp, rt, NULL, (struct sockaddr *)&sin, e->dmac) == 0) { + printf("mac=%x:%x:%x:%x:%x:%x\n", + e->dmac[0], e->dmac[1], e->dmac[2], e->dmac[3], e->dmac[4], e->dmac[5]); + if ((m = m_gethdr(M_NOWAIT, MT_DATA)) == NULL) return (ENOMEM); @@ -224,6 +229,10 @@ { struct rtentry *rt; struct mbuf *m0; + struct sockaddr_in sin; + sin.sin_family = AF_INET; + sin.sin_len = sizeof(struct sockaddr_in); + sin.sin_addr.s_addr = htonl(e->addr); if ((m0 = m_gethdr(M_NOWAIT, MT_DATA)) == NULL) return; @@ -232,7 +241,7 @@ again: switch (e->state) { case L2T_STATE_STALE: /* entry is stale, kick off revalidation */ - arpresolve(rt->rt_ifp, rt, m0, rt_key(rt), e->dmac); + arpresolve(rt->rt_ifp, rt, m0, (struct sockaddr *)&sin, e->dmac); mtx_lock(&e->lock); if (e->state == L2T_STATE_STALE) { e->state = L2T_STATE_VALID; @@ -259,7 +268,7 @@ * A better way would be to use a work request to retry L2T * entries when there's no memory. */ - arpresolve(rt->rt_ifp, rt, m0, rt_key(rt), e->dmac); + arpresolve(rt->rt_ifp, rt, m0, (struct sockaddr *)&sin, e->dmac); } return; @@ -358,11 +367,12 @@ } struct l2t_entry * -t3_l2t_get(struct t3cdev *dev, struct rtentry *neigh, struct ifnet *ifp) +t3_l2t_get(struct t3cdev *dev, struct rtentry *neigh, struct ifnet *ifp, + struct sockaddr *sa) { struct l2t_entry *e; struct l2t_data *d = L2DATA(dev); - u32 addr = *(u32 *) rt_key(neigh); + u32 addr = ((struct sockaddr_in *)sa)->sin_addr.s_addr; int ifidx = neigh->rt_ifp->if_index; int hash = arp_hash(addr, ifidx, d); unsigned int smt_idx = ((struct port_info *)ifp->if_softc)->port_id; @@ -394,6 +404,7 @@ atomic_store_rel_int(&e->refcnt, 1); e->neigh = NULL; + neigh_replace(e, neigh); #ifdef notyet /* @@ -444,19 +455,19 @@ } void -t3_l2t_update(struct t3cdev *dev, struct rtentry *neigh) +t3_l2t_update(struct t3cdev *dev, struct rtentry *neigh, struct sockaddr *sa) { struct l2t_entry *e; struct mbuf *arpq = NULL; struct l2t_data *d = L2DATA(dev); - u32 addr = *(u32 *) rt_key(neigh); + u32 addr = *(u32 *) &((struct sockaddr_in *)sa)->sin_addr; int ifidx = neigh->rt_ifp->if_index; int hash = arp_hash(addr, ifidx, d); struct llinfo_arp *la; u_char edst[ETHER_ADDR_LEN]; - + - arpresolve(neigh->rt_ifp, neigh, NULL, rt_key(neigh), edst); + printf("t3_l2t_update called with arp info\n"); rw_rlock(&d->lock); for (e = d->l2tab[hash].first; e; e = e->next) @@ -465,9 +476,13 @@ goto found; } rw_runlock(&d->lock); + printf("addr=0x%08x not found\n", addr); return; found: + printf("found 0x%08x\n", addr); + arpresolve(neigh->rt_ifp, neigh, NULL, sa, edst); + rw_runlock(&d->lock); memcpy(e->dmac, edst, ETHER_ADDR_LEN); ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_l2t.h#11 (text+ko) ==== @@ -118,9 +118,9 @@ #define L2DATA(dev) ((dev)->l2opt) void t3_l2e_free(struct l2t_data *d, struct l2t_entry *e); -void t3_l2t_update(struct t3cdev *dev, struct rtentry *ifp); +void t3_l2t_update(struct t3cdev *dev, struct rtentry *rt, struct sockaddr *sa); struct l2t_entry *t3_l2t_get(struct t3cdev *dev, struct rtentry *neigh, - struct ifnet *ifp); + struct ifnet *ifp, struct sockaddr *sa); int t3_l2t_send_slow(struct t3cdev *dev, struct mbuf *m, struct l2t_entry *e); void t3_l2t_send_event(struct t3cdev *dev, struct l2t_entry *e); ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.c#21 (text+ko) ==== @@ -477,7 +477,7 @@ } static void -dummy_neigh_update(struct t3cdev *dev, struct rtentry *neigh) +dummy_neigh_update(struct t3cdev *dev, struct rtentry *neigh, struct sockaddr *sa) { } @@ -613,6 +613,8 @@ m = m_get(M_NOWAIT, MT_DATA); if (__predict_true(m != NULL)) { mk_tid_release(m, tid); + printf("sending tid release\n"); + cxgb_ofld_send(tdev, m); t->tid_tab[tid].ctx = NULL; } else @@ -881,14 +883,14 @@ } static void -cxgb_route_event(void *unused, int event, struct rtentry *rt0, struct rtentry *rt1) +cxgb_route_event(void *unused, int event, struct rtentry *rt0, + struct rtentry *rt1, struct sockaddr *sa) { struct toedev *tdev0, *tdev1 = NULL; /* * ignore events on non-offloaded interfaces */ - tdev0 = TOEDEV(rt0->rt_ifp); if (rt1) tdev1 = TOEDEV(rt1->rt_ifp); @@ -907,12 +909,12 @@ switch (event) { case RTEVENT_ARP_UPDATE: { - cxgb_neigh_update(rt0); + cxgb_neigh_update(rt0, sa); break; } case RTEVENT_REDIRECT_UPDATE: { - cxgb_redirect(rt0, rt1); - cxgb_neigh_update(rt1); + cxgb_redirect(rt0, rt1, sa); + cxgb_neigh_update(rt1, sa); break; } @@ -1034,14 +1036,14 @@ } void -cxgb_neigh_update(struct rtentry *rt) +cxgb_neigh_update(struct rtentry *rt, struct sockaddr *sa) { if (is_offloading(rt->rt_ifp)) { struct t3cdev *tdev = T3CDEV(rt->rt_ifp); BUG_ON(!tdev); - t3_l2t_update(tdev, rt); + t3_l2t_update(tdev, rt, sa); } } @@ -1072,7 +1074,7 @@ } void -cxgb_redirect(struct rtentry *old, struct rtentry *new) +cxgb_redirect(struct rtentry *old, struct rtentry *new, struct sockaddr *sa) { struct ifnet *olddev, *newdev; struct tid_info *ti; @@ -1100,7 +1102,7 @@ } /* Add new L2T entry */ - e = t3_l2t_get(tdev, new, new->rt_ifp); + e = t3_l2t_get(tdev, new, new->rt_ifp, sa); if (!e) { log(LOG_ERR, "%s: couldn't allocate new l2t entry!\n", __FUNCTION__); ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.h#7 (text+ko) ==== @@ -252,8 +252,8 @@ void *cxgb_alloc_mem(unsigned long size); void cxgb_free_mem(void *addr); -void cxgb_neigh_update(struct rtentry *rt); -void cxgb_redirect(struct rtentry *old, struct rtentry *new); +void cxgb_neigh_update(struct rtentry *rt, struct sockaddr *sa); +void cxgb_redirect(struct rtentry *old, struct rtentry *new, struct sockaddr *sa); int process_rx(struct t3cdev *dev, struct mbuf **m, int n); int attach_t3cdev(struct t3cdev *dev); void detach_t3cdev(struct t3cdev *dev); ==== //depot/projects/toestack/sys/dev/cxgb/t3cdev.h#5 (text+ko) ==== @@ -22,7 +22,7 @@ int (*send)(struct t3cdev *dev, struct mbuf *m); int (*recv)(struct t3cdev *dev, struct mbuf **m, int n); int (*ctl)(struct t3cdev *dev, unsigned int req, void *data); - void (*arp_update)(struct t3cdev *dev, struct rtentry *neigh); + void (*arp_update)(struct t3cdev *dev, struct rtentry *neigh, struct sockaddr *sa); void *priv; /* driver private data */ void *l2opt; /* optional layer 2 data */ void *l3opt; /* optional layer 3 data */ ==== //depot/projects/toestack/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_iwch_cm.c#2 (text+ko) ==== @@ -1365,7 +1365,11 @@ struct rtentry *dst; struct l2t_entry *l2t; struct iff_mac tim; + struct sockaddr_in sin; + sin.sin_len = sizeof(struct sockaddr_in); + sin.sin_family = AF_INET; + PDBG("%s parent ep %p tid %u\n", __FUNCTION__, parent_ep, hwtid); if (state_read(&parent_ep->com) != LISTEN) { @@ -1402,7 +1406,8 @@ printf("%s - failed to find route !\n", __FUNCTION__); goto reject; } - l2t = t3_l2t_get(tdev, dst, dst->rt_ifp); + sin.sin_addr.s_addr = req->peer_ip; + l2t = t3_l2t_get(tdev, dst, dst->rt_ifp, (struct sockaddr *)&sin); if (l2t == NULL) { printf("%s - failed to allocate l2t entry!\n", __FUNCTION__); RTFREE(dst); @@ -1877,6 +1882,10 @@ struct iwch_dev *h = to_iwch_dev(cm_id->device); struct iwch_ep *ep; struct rtentry *rt; + struct sockaddr_in sin; + + sin.sin_len = sizeof(struct sockaddr_in); + sin.sin_family = AF_INET; ep = alloc_ep(sizeof(*ep), M_NOWAIT); if (!ep) { @@ -1924,8 +1933,9 @@ ep->dst = rt; /* get a l2t entry */ + sin.sin_addr.s_addr = cm_id->remote_addr.sin_addr.s_addr; ep->l2t = t3_l2t_get(ep->com.tdev, ep->dst, - ep->dst->rt_ifp); + ep->dst->rt_ifp, (struct sockaddr *)&sin); if (!ep->l2t) { printf("%s - cannot alloc l2e.\n", __FUNCTION__); err = ENOMEM; ==== //depot/projects/toestack/sys/net/route.c#9 (text+ko) ==== @@ -499,7 +499,7 @@ error = rtrequest1(RTM_ADD, &info, &rt); if (rt != NULL) { RT_LOCK(rt); - EVENTHANDLER_INVOKE(route_event, RTEVENT_REDIRECT_UPDATE, rt0, rt); + EVENTHANDLER_INVOKE(route_event, RTEVENT_REDIRECT_UPDATE, rt0, rt, dst); flags = rt->rt_flags; } if (rt0) @@ -521,7 +521,7 @@ */ rt_setgate(rt, rt_key(rt), gateway); gwrt = rtalloc1(gateway, 1, 0); - EVENTHANDLER_INVOKE(route_event, RTEVENT_REDIRECT_UPDATE, rt, gwrt); + EVENTHANDLER_INVOKE(route_event, RTEVENT_REDIRECT_UPDATE, rt, gwrt, dst); RTFREE_LOCKED(gwrt); } } else ==== //depot/projects/toestack/sys/net/route.h#7 (text+ko) ==== @@ -370,7 +370,7 @@ #define RTEVENT_ARP_UPDATE 1 #define RTEVENT_PMTU_UPDATE 2 #define RTEVENT_REDIRECT_UPDATE 3 -typedef void (*rtevent_fn)(void *, int, struct rtentry *, struct rtentry *); +typedef void (*rtevent_fn)(void *, int, struct rtentry *, struct rtentry *, struct sockaddr *); EVENTHANDLER_DECLARE(route_event, rtevent_fn); ==== //depot/projects/toestack/sys/netinet/if_ether.c#14 (text+ko) ==== @@ -51,6 +51,7 @@ #include #include #include +#include #include #include @@ -582,7 +583,10 @@ #ifdef DEV_CARP int carp_match = 0; #endif - + struct sockaddr_in sin; + sin.sin_len = sizeof(struct sockaddr_in); + sin.sin_family = AF_INET; + if (ifp->if_bridge) bridged = 1; @@ -777,7 +781,9 @@ la->la_preempt = arp_maxtries; hold = la->la_hold; la->la_hold = NULL; - EVENTHANDLER_INVOKE(route_event, RTEVENT_ARP_UPDATE, rt, NULL); + + sin.sin_addr.s_addr = be32toh(itaddr.s_addr); + EVENTHANDLER_INVOKE(route_event, RTEVENT_ARP_UPDATE, rt, NULL, (struct sockaddr *)&sin); RT_UNLOCK(rt); if (hold != NULL) (*ifp->if_output)(ifp, hold, rt_key(rt), rt); ==== //depot/projects/toestack/sys/netinet/ip_icmp.c#8 (text+ko) ==== @@ -154,7 +154,7 @@ #endif if (mtu >= 296 && rt->rt_rmx.rmx_mtu > mtu) { rt->rt_rmx.rmx_mtu = mtu; - EVENTHANDLER_INVOKE(route_event, RTEVENT_PMTU_UPDATE, rt, NULL); + EVENTHANDLER_INVOKE(route_event, RTEVENT_PMTU_UPDATE, rt, NULL, icmpsrc); } } if (rt) From owner-p4-projects@FreeBSD.ORG Mon Dec 10 03:49:42 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B9FD216A419; Mon, 10 Dec 2007 03:49:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4D3D916A417 for ; Mon, 10 Dec 2007 03:49:41 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 399F513C448 for ; Mon, 10 Dec 2007 03:49:41 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBA3ne0B098365 for ; Mon, 10 Dec 2007 03:49:40 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBA3n07Q098346 for perforce@freebsd.org; Mon, 10 Dec 2007 03:49:00 GMT (envelope-from marcel@freebsd.org) Date: Mon, 10 Dec 2007 03:49:00 GMT Message-Id: <200712100349.lBA3n07Q098346@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 130581 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Dec 2007 03:49:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=130581 Change 130581 by marcel@marcel_xcllnt on 2007/12/10 03:48:43 IFC @130571 Affected files ... .. //depot/projects/uart/amd64/amd64/busdma_machdep.c#21 integrate .. //depot/projects/uart/amd64/amd64/db_trace.c#14 integrate .. //depot/projects/uart/amd64/amd64/exception.S#10 integrate .. //depot/projects/uart/amd64/amd64/genassym.c#12 integrate .. //depot/projects/uart/amd64/amd64/identcpu.c#15 integrate .. //depot/projects/uart/amd64/amd64/intr_machdep.c#15 integrate .. //depot/projects/uart/amd64/amd64/legacy.c#6 integrate .. //depot/projects/uart/amd64/amd64/local_apic.c#16 integrate .. //depot/projects/uart/amd64/amd64/machdep.c#29 integrate .. //depot/projects/uart/amd64/amd64/msi.c#5 integrate .. //depot/projects/uart/amd64/amd64/nexus.c#12 integrate .. //depot/projects/uart/amd64/amd64/pmap.c#48 integrate .. //depot/projects/uart/amd64/amd64/prof_machdep.c#7 integrate .. //depot/projects/uart/amd64/amd64/stack_machdep.c#1 branch .. //depot/projects/uart/amd64/amd64/trap.c#20 integrate .. //depot/projects/uart/amd64/amd64/uma_machdep.c#4 integrate .. //depot/projects/uart/amd64/amd64/vm_machdep.c#16 integrate .. //depot/projects/uart/amd64/conf/DEFAULTS#7 integrate .. //depot/projects/uart/amd64/conf/GENERIC#30 integrate .. //depot/projects/uart/amd64/conf/GENERIC.hints#4 integrate .. //depot/projects/uart/amd64/conf/NOTES#17 integrate .. //depot/projects/uart/amd64/include/clock.h#10 integrate .. //depot/projects/uart/amd64/include/legacyvar.h#6 integrate .. //depot/projects/uart/amd64/include/pc/bios.h#3 integrate .. //depot/projects/uart/amd64/include/pci_cfgreg.h#5 integrate .. //depot/projects/uart/amd64/include/pmc_mdep.h#3 integrate .. //depot/projects/uart/amd64/include/smp.h#12 integrate .. //depot/projects/uart/amd64/include/specialreg.h#10 integrate .. //depot/projects/uart/amd64/include/stack.h#1 branch .. //depot/projects/uart/amd64/include/vmparam.h#8 integrate .. //depot/projects/uart/amd64/isa/clock.c#14 integrate .. //depot/projects/uart/amd64/linux32/linux.h#7 integrate .. //depot/projects/uart/amd64/linux32/linux32_proto.h#14 integrate .. //depot/projects/uart/amd64/linux32/linux32_syscall.h#14 integrate .. //depot/projects/uart/amd64/linux32/linux32_sysent.c#14 integrate .. //depot/projects/uart/amd64/linux32/linux32_sysvec.c#18 integrate .. //depot/projects/uart/amd64/linux32/syscalls.master#14 integrate .. //depot/projects/uart/amd64/pci/pci_bus.c#15 integrate .. //depot/projects/uart/amd64/pci/pci_cfgreg.c#7 integrate .. //depot/projects/uart/arm/arm/bcopy_page.S#5 integrate .. //depot/projects/uart/arm/arm/bcopyinout.S#6 integrate .. //depot/projects/uart/arm/arm/busdma_machdep.c#15 integrate .. //depot/projects/uart/arm/arm/cpufunc.c#11 integrate .. //depot/projects/uart/arm/arm/cpufunc_asm_arm11.S#1 branch .. //depot/projects/uart/arm/arm/cpufunc_asm_armv5.S#1 branch .. //depot/projects/uart/arm/arm/cpufunc_asm_armv5_ec.S#1 branch .. //depot/projects/uart/arm/arm/db_trace.c#8 integrate .. //depot/projects/uart/arm/arm/identcpu.c#11 integrate .. //depot/projects/uart/arm/arm/in_cksum_arm.S#6 integrate .. //depot/projects/uart/arm/arm/locore.S#10 integrate .. //depot/projects/uart/arm/arm/nexus_io.c#5 delete .. //depot/projects/uart/arm/arm/nexus_io_asm.S#4 delete .. //depot/projects/uart/arm/arm/pmap.c#24 integrate .. //depot/projects/uart/arm/arm/stack_machdep.c#1 branch .. //depot/projects/uart/arm/arm/support.S#7 integrate .. //depot/projects/uart/arm/arm/swtch.S#10 integrate .. //depot/projects/uart/arm/arm/trap.c#17 integrate .. //depot/projects/uart/arm/arm/vm_machdep.c#18 integrate .. //depot/projects/uart/arm/at91/at91_mci.c#3 integrate .. //depot/projects/uart/arm/at91/at91_mcireg.h#2 integrate .. //depot/projects/uart/arm/at91/at91_pmc.c#5 integrate .. //depot/projects/uart/arm/at91/at91rm92reg.h#6 integrate .. //depot/projects/uart/arm/at91/if_ate.c#11 integrate .. //depot/projects/uart/arm/at91/kb920x_machdep.c#12 integrate .. //depot/projects/uart/arm/at91/ohci_atmelarm.c#4 integrate .. //depot/projects/uart/arm/at91/std.at91#4 integrate .. //depot/projects/uart/arm/at91/std.kb920x#5 integrate .. //depot/projects/uart/arm/at91/uart_cpu_at91rm9200usart.c#5 integrate .. //depot/projects/uart/arm/conf/AVILA#3 integrate .. //depot/projects/uart/arm/conf/BWCT#2 integrate .. //depot/projects/uart/arm/conf/CRB#2 integrate .. //depot/projects/uart/arm/conf/EP80219#4 integrate .. //depot/projects/uart/arm/conf/HL200#1 branch .. //depot/projects/uart/arm/conf/IQ31244#13 integrate .. //depot/projects/uart/arm/conf/KB920X#9 integrate .. //depot/projects/uart/arm/conf/SIMICS#10 integrate .. //depot/projects/uart/arm/conf/SKYEYE#6 integrate .. //depot/projects/uart/arm/include/armreg.h#7 integrate .. //depot/projects/uart/arm/include/asm.h#6 integrate .. //depot/projects/uart/arm/include/asmacros.h#5 integrate .. //depot/projects/uart/arm/include/atomic.h#12 integrate .. //depot/projects/uart/arm/include/cpuconf.h#10 integrate .. //depot/projects/uart/arm/include/cpufunc.h#11 integrate .. //depot/projects/uart/arm/include/endian.h#9 integrate .. //depot/projects/uart/arm/include/pmc_mdep.h#3 integrate .. //depot/projects/uart/arm/include/stack.h#1 branch .. //depot/projects/uart/arm/include/vmparam.h#7 integrate .. //depot/projects/uart/arm/sa11x0/assabet_machdep.c#13 integrate .. //depot/projects/uart/arm/sa11x0/files.sa11x0#2 integrate .. //depot/projects/uart/arm/sa11x0/uart_dev_sa1110.c#8 integrate .. //depot/projects/uart/arm/xscale/i80321/ep80219_machdep.c#6 integrate .. //depot/projects/uart/arm/xscale/i80321/i80321.c#7 integrate .. //depot/projects/uart/arm/xscale/i80321/i80321_pci.c#11 integrate .. //depot/projects/uart/arm/xscale/i80321/iq31244_machdep.c#19 integrate .. //depot/projects/uart/arm/xscale/i8134x/crb_machdep.c#2 integrate .. //depot/projects/uart/arm/xscale/i8134x/files.crb#2 integrate .. //depot/projects/uart/arm/xscale/i8134x/i81342.c#2 integrate .. //depot/projects/uart/arm/xscale/i8134x/i81342_pci.c#2 integrate .. //depot/projects/uart/arm/xscale/i8134x/i81342reg.h#2 integrate .. //depot/projects/uart/arm/xscale/i8134x/iq81342_7seg.c#1 branch .. //depot/projects/uart/arm/xscale/i8134x/iq81342reg.h#1 branch .. //depot/projects/uart/arm/xscale/i8134x/iq81342var.h#1 branch .. //depot/projects/uart/arm/xscale/ixp425/avila_machdep.c#3 integrate .. //depot/projects/uart/arm/xscale/ixp425/files.ixp425#2 integrate .. //depot/projects/uart/arm/xscale/ixp425/if_npe.c#3 integrate .. //depot/projects/uart/arm/xscale/ixp425/ixp425_npe.c#3 integrate .. //depot/projects/uart/arm/xscale/ixp425/ixp425_npevar.h#3 integrate .. //depot/projects/uart/arm/xscale/ixp425/ixp425_pci.c#2 integrate .. //depot/projects/uart/arm/xscale/ixp425/ixp425_qmgr.c#2 integrate .. //depot/projects/uart/boot/arm/at91/boot2/boot2.c#6 integrate .. //depot/projects/uart/boot/arm/at91/libat91/eeprom.c#4 integrate .. //depot/projects/uart/boot/arm/at91/libat91/emac.c#7 integrate .. //depot/projects/uart/boot/arm/at91/libat91/emac_init.c#4 integrate .. //depot/projects/uart/boot/arm/at91/libat91/lib.h#5 integrate .. //depot/projects/uart/boot/common/loader.8#14 integrate .. //depot/projects/uart/boot/common/module.c#4 integrate .. //depot/projects/uart/boot/common/ufsread.c#5 integrate .. //depot/projects/uart/boot/ficl/Makefile#8 integrate .. //depot/projects/uart/boot/forth/loader.conf#16 integrate .. //depot/projects/uart/boot/i386/Makefile#4 integrate .. //depot/projects/uart/boot/i386/boot2/boot2.c#8 integrate .. //depot/projects/uart/boot/i386/cdboot/cdboot.s#5 integrate .. //depot/projects/uart/boot/i386/gptboot/Makefile#1 branch .. //depot/projects/uart/boot/i386/gptboot/gptboot.c#1 branch .. //depot/projects/uart/boot/i386/gptboot/gptldr.S#1 branch .. //depot/projects/uart/boot/i386/libi386/Makefile#9 integrate .. //depot/projects/uart/boot/i386/libi386/bioscd.c#6 integrate .. //depot/projects/uart/boot/i386/libi386/biosdisk.c#7 integrate .. //depot/projects/uart/boot/i386/libi386/biosmem.c#4 integrate .. //depot/projects/uart/boot/i386/libi386/biossmap.c#6 integrate .. //depot/projects/uart/boot/i386/libi386/devicename.c#5 integrate .. //depot/projects/uart/boot/i386/libi386/pxe.c#5 integrate .. //depot/projects/uart/boot/i386/loader/main.c#12 integrate .. //depot/projects/uart/boot/i386/pmbr/Makefile#1 branch .. //depot/projects/uart/boot/i386/pmbr/pmbr.s#1 branch .. //depot/projects/uart/boot/pc98/Makefile.inc#4 integrate .. //depot/projects/uart/boot/pc98/boot2/boot.c#7 integrate .. //depot/projects/uart/boot/pc98/cdboot/cdboot.s#3 integrate .. //depot/projects/uart/boot/pc98/libpc98/bioscd.c#3 integrate .. //depot/projects/uart/boot/pc98/libpc98/biosdisk.c#7 integrate .. //depot/projects/uart/boot/pc98/loader/main.c#9 integrate .. //depot/projects/uart/bsm/audit.h#9 integrate .. //depot/projects/uart/cam/cam_xpt.c#20 integrate .. //depot/projects/uart/cam/scsi/scsi_all.h#7 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32.h#5 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_ipc.h#1 branch .. //depot/projects/uart/compat/freebsd32/freebsd32_misc.c#21 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_proto.h#21 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_syscall.h#21 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_syscalls.c#21 integrate .. //depot/projects/uart/compat/freebsd32/freebsd32_sysent.c#21 integrate .. //depot/projects/uart/compat/freebsd32/syscalls.master#20 integrate .. //depot/projects/uart/compat/ia32/ia32_sysvec.c#10 integrate .. //depot/projects/uart/compat/linprocfs/linprocfs.c#28 integrate .. //depot/projects/uart/compat/linux/linux_file.c#15 integrate .. //depot/projects/uart/compat/linux/linux_getcwd.c#11 integrate .. //depot/projects/uart/compat/linux/linux_ioctl.c#13 integrate .. //depot/projects/uart/compat/linux/linux_ioctl.h#7 integrate .. //depot/projects/uart/compat/linux/linux_misc.c#24 integrate .. //depot/projects/uart/compat/linux/linux_stats.c#15 integrate .. //depot/projects/uart/compat/ndis/ndis_var.h#8 integrate .. //depot/projects/uart/compat/ndis/ntoskrnl_var.h#8 integrate .. //depot/projects/uart/compat/ndis/subr_ndis.c#12 integrate .. //depot/projects/uart/compat/ndis/subr_ntoskrnl.c#12 integrate .. //depot/projects/uart/compat/opensolaris/kern/opensolaris_vfs.c#5 integrate .. //depot/projects/uart/compat/opensolaris/rpc/xdr.h#2 integrate .. //depot/projects/uart/compat/opensolaris/sys/atomic.h#2 integrate .. //depot/projects/uart/compat/opensolaris/sys/bitmap.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/cpupart.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/cpuvar.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/cyclic.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/elf.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/kcondvar.h#2 integrate .. //depot/projects/uart/compat/opensolaris/sys/kmem.h#2 integrate .. //depot/projects/uart/compat/opensolaris/sys/mman.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/modctl.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/mutex.h#3 integrate .. //depot/projects/uart/compat/opensolaris/sys/objfs.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/param.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/pcpu.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/proc.h#3 integrate .. //depot/projects/uart/compat/opensolaris/sys/rwlock.h#3 integrate .. //depot/projects/uart/compat/opensolaris/sys/stat.h#1 branch .. //depot/projects/uart/compat/opensolaris/sys/time.h#2 integrate .. //depot/projects/uart/compat/opensolaris/sys/types.h#3 integrate .. //depot/projects/uart/compat/pecoff/imgact_pecoff.c#9 integrate .. //depot/projects/uart/compat/svr4/imgact_svr4.c#5 integrate .. //depot/projects/uart/compat/svr4/svr4_fcntl.c#8 integrate .. //depot/projects/uart/compat/svr4/svr4_misc.c#15 integrate .. //depot/projects/uart/conf/Makefile.amd64#8 integrate .. //depot/projects/uart/conf/NOTES#54 integrate .. //depot/projects/uart/conf/files#85 integrate .. //depot/projects/uart/conf/files.amd64#31 integrate .. //depot/projects/uart/conf/files.arm#11 integrate .. //depot/projects/uart/conf/files.i386#37 integrate .. //depot/projects/uart/conf/files.ia64#23 integrate .. //depot/projects/uart/conf/files.pc98#31 integrate .. //depot/projects/uart/conf/files.powerpc#17 integrate .. //depot/projects/uart/conf/files.sparc64#19 integrate .. //depot/projects/uart/conf/files.sun4v#6 integrate .. //depot/projects/uart/conf/kmod.mk#28 integrate .. //depot/projects/uart/conf/newvers.sh#6 integrate .. //depot/projects/uart/conf/options#51 integrate .. //depot/projects/uart/conf/options.amd64#12 integrate .. //depot/projects/uart/conf/options.arm#13 integrate .. //depot/projects/uart/conf/options.i386#18 integrate .. //depot/projects/uart/contrib/dev/acpica/evmisc.c#7 integrate .. //depot/projects/uart/contrib/dev/acpica/evxface.c#7 integrate .. //depot/projects/uart/contrib/dev/npe/IxNpeMicrocode.dat.uu#1 branch .. //depot/projects/uart/contrib/dev/npe/LICENSE#1 branch .. //depot/projects/uart/contrib/dev/wpi/LICENSE#1 branch .. //depot/projects/uart/contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu#1 branch .. //depot/projects/uart/contrib/ipfilter/netinet/fil.c#11 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_auth.c#9 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_compat.h#9 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_fil.h#9 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_fil_freebsd.c#6 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_frag.c#8 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_htable.c#5 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_log.c#9 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_lookup.c#4 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_lookup.h#4 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_nat.c#8 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_nat.h#7 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_pool.c#4 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_pool.h#4 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_proxy.c#7 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_rpcb_pxy.c#4 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_scan.c#5 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_state.c#9 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_state.h#7 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_sync.c#6 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ipl.h#7 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/mlfk_ipl.c#9 integrate .. //depot/projects/uart/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/uart/contrib/opensolaris/common/avl/avl.c#2 integrate .. //depot/projects/uart/contrib/opensolaris/common/nvpair/nvpair.c#2 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/vdev.c#3 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#5 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#4 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zil.c#3 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zio.c#3 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/fs/zfs/zvol.c#3 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/rpc/xdr.c#2 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/rpc/xdr.h#2 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/byteorder.h#2 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/isa_defs.h#2 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/procset.h#2 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/sysmacros.h#2 integrate .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/vfs.h#2 delete .. //depot/projects/uart/contrib/opensolaris/uts/common/sys/vmem.h#2 integrate .. //depot/projects/uart/contrib/pf/net/pf.c#15 integrate .. //depot/projects/uart/contrib/pf/net/pf_if.c#6 integrate .. //depot/projects/uart/contrib/pf/net/pf_ioctl.c#13 integrate .. //depot/projects/uart/contrib/pf/net/pf_table.c#4 integrate .. //depot/projects/uart/ddb/db_examine.c#4 integrate .. //depot/projects/uart/ddb/db_ps.c#15 integrate .. //depot/projects/uart/dev/aac/aac.c#19 integrate .. //depot/projects/uart/dev/aac/aac_cam.c#13 integrate .. //depot/projects/uart/dev/aac/aac_debug.c#7 integrate .. //depot/projects/uart/dev/aac/aac_pci.c#17 integrate .. //depot/projects/uart/dev/aac/aacreg.h#7 integrate .. //depot/projects/uart/dev/aac/aacvar.h#7 integrate .. //depot/projects/uart/dev/acpi_support/acpi_ibm.c#9 integrate .. //depot/projects/uart/dev/acpica/acpi.c#30 integrate .. //depot/projects/uart/dev/acpica/acpi_battery.c#9 integrate .. //depot/projects/uart/dev/acpica/acpi_cpu.c#12 integrate .. //depot/projects/uart/dev/acpica/acpi_ec.c#20 integrate .. //depot/projects/uart/dev/acpica/acpi_hpet.c#7 integrate .. //depot/projects/uart/dev/acpica/acpi_pci.c#10 integrate .. //depot/projects/uart/dev/acpica/acpi_pci_link.c#14 integrate .. //depot/projects/uart/dev/acpica/acpi_pcib_acpi.c#14 integrate .. //depot/projects/uart/dev/acpica/acpi_thermal.c#13 integrate .. //depot/projects/uart/dev/acpica/acpivar.h#18 integrate .. //depot/projects/uart/dev/agp/agp.c#1 branch .. //depot/projects/uart/dev/agp/agp_ali.c#1 branch .. //depot/projects/uart/dev/agp/agp_amd.c#1 branch .. //depot/projects/uart/dev/agp/agp_amd64.c#1 branch .. //depot/projects/uart/dev/agp/agp_ati.c#1 branch .. //depot/projects/uart/dev/agp/agp_i810.c#1 branch .. //depot/projects/uart/dev/agp/agp_if.m#1 branch .. //depot/projects/uart/dev/agp/agp_intel.c#1 branch .. //depot/projects/uart/dev/agp/agp_nvidia.c#1 branch .. //depot/projects/uart/dev/agp/agp_sis.c#1 branch .. //depot/projects/uart/dev/agp/agp_via.c#1 branch .. //depot/projects/uart/dev/agp/agppriv.h#1 branch .. //depot/projects/uart/dev/agp/agpreg.h#1 branch .. //depot/projects/uart/dev/agp/agpvar.h#1 branch .. //depot/projects/uart/dev/aic7xxx/aic_osm_lib.c#5 integrate .. //depot/projects/uart/dev/aic7xxx/aic_osm_lib.h#5 integrate .. //depot/projects/uart/dev/amr/amr.c#18 integrate .. //depot/projects/uart/dev/amr/amr_cam.c#12 integrate .. //depot/projects/uart/dev/amr/amr_pci.c#16 integrate .. //depot/projects/uart/dev/an/if_an.c#15 integrate .. //depot/projects/uart/dev/an/if_anreg.h#7 integrate .. //depot/projects/uart/dev/arcmsr/arcmsr.c#10 integrate .. //depot/projects/uart/dev/arcmsr/arcmsr.h#3 integrate .. //depot/projects/uart/dev/asmc/asmc.c#1 branch .. //depot/projects/uart/dev/asmc/asmcvar.h#1 branch .. //depot/projects/uart/dev/ata/ata-all.c#26 integrate .. //depot/projects/uart/dev/ata/ata-all.h#19 integrate .. //depot/projects/uart/dev/ata/ata-chipset.c#28 integrate .. //depot/projects/uart/dev/ata/ata-disk.c#20 integrate .. //depot/projects/uart/dev/ata/ata-dma.c#15 integrate .. //depot/projects/uart/dev/ata/ata-pci.c#16 integrate .. //depot/projects/uart/dev/ata/ata-pci.h#20 integrate .. //depot/projects/uart/dev/ata/atapi-cd.c#22 integrate .. //depot/projects/uart/dev/ata/atapi-cd.h#10 integrate .. //depot/projects/uart/dev/ata/atapi-fd.c#13 integrate .. //depot/projects/uart/dev/ata/atapi-tape.c#10 integrate .. //depot/projects/uart/dev/ath/ath_rate/sample/sample.c#10 integrate .. //depot/projects/uart/dev/ath/if_ath.c#39 integrate .. //depot/projects/uart/dev/ath/if_ath_pci.c#13 integrate .. //depot/projects/uart/dev/awi/awi.c#9 integrate .. //depot/projects/uart/dev/bce/if_bce.c#10 integrate .. //depot/projects/uart/dev/bfe/if_bfe.c#17 integrate .. //depot/projects/uart/dev/bge/if_bge.c#36 integrate .. //depot/projects/uart/dev/bktr/msp34xx.c#4 integrate .. //depot/projects/uart/dev/cardbus/cardbus.c#14 integrate .. //depot/projects/uart/dev/ciss/ciss.c#23 integrate .. //depot/projects/uart/dev/cm/smc90cx6.c#7 integrate .. //depot/projects/uart/dev/coretemp/coretemp.c#2 integrate .. //depot/projects/uart/dev/ctau/if_ct.c#10 integrate .. //depot/projects/uart/dev/cx/if_cx.c#9 integrate .. //depot/projects/uart/dev/cxgb/common/cxgb_common.h#4 integrate .. //depot/projects/uart/dev/cxgb/common/cxgb_ctl_defs.h#3 integrate .. //depot/projects/uart/dev/cxgb/common/cxgb_sge_defs.h#3 integrate .. //depot/projects/uart/dev/cxgb/common/cxgb_t3_hw.c#4 integrate .. //depot/projects/uart/dev/cxgb/common/cxgb_vsc7323.c#2 integrate .. //depot/projects/uart/dev/cxgb/common/cxgb_vsc8211.c#3 integrate .. //depot/projects/uart/dev/cxgb/common/cxgb_xgmac.c#4 integrate .. //depot/projects/uart/dev/cxgb/cxgb_adapter.h#6 integrate .. //depot/projects/uart/dev/cxgb/cxgb_include.h#2 integrate .. //depot/projects/uart/dev/cxgb/cxgb_lro.c#5 integrate .. //depot/projects/uart/dev/cxgb/cxgb_main.c#7 integrate .. //depot/projects/uart/dev/cxgb/cxgb_offload.h#3 integrate .. //depot/projects/uart/dev/cxgb/cxgb_osdep.h#5 integrate .. //depot/projects/uart/dev/cxgb/cxgb_sge.c#7 integrate .. //depot/projects/uart/dev/cxgb/t3fw-4.5.0.bin.gz.uu#2 delete .. //depot/projects/uart/dev/cxgb/t3fw-4.7.0.bin.gz.uu#1 branch .. //depot/projects/uart/dev/dc/dcphy.c#4 integrate .. //depot/projects/uart/dev/dc/if_dc.c#12 integrate .. //depot/projects/uart/dev/drm/drmP.h#12 integrate .. //depot/projects/uart/dev/drm/drm_agpsupport.c#7 integrate .. //depot/projects/uart/dev/em/e1000_80003es2lan.c#2 integrate .. //depot/projects/uart/dev/em/e1000_80003es2lan.h#2 integrate .. //depot/projects/uart/dev/em/e1000_82540.c#2 integrate .. //depot/projects/uart/dev/em/e1000_82541.c#2 integrate .. //depot/projects/uart/dev/em/e1000_82541.h#2 integrate .. //depot/projects/uart/dev/em/e1000_82542.c#2 integrate .. //depot/projects/uart/dev/em/e1000_82543.c#2 integrate .. //depot/projects/uart/dev/em/e1000_82543.h#2 integrate .. //depot/projects/uart/dev/em/e1000_82571.c#2 integrate .. //depot/projects/uart/dev/em/e1000_82571.h#2 integrate .. //depot/projects/uart/dev/em/e1000_82575.c#2 integrate .. //depot/projects/uart/dev/em/e1000_82575.h#2 integrate .. //depot/projects/uart/dev/em/e1000_api.c#2 integrate .. //depot/projects/uart/dev/em/e1000_api.h#2 integrate .. //depot/projects/uart/dev/em/e1000_defines.h#2 integrate .. //depot/projects/uart/dev/em/e1000_hw.h#2 integrate .. //depot/projects/uart/dev/em/e1000_ich8lan.c#2 integrate .. //depot/projects/uart/dev/em/e1000_ich8lan.h#2 integrate .. //depot/projects/uart/dev/em/e1000_mac.c#2 integrate .. //depot/projects/uart/dev/em/e1000_mac.h#2 integrate .. //depot/projects/uart/dev/em/e1000_manage.c#2 integrate .. //depot/projects/uart/dev/em/e1000_manage.h#2 integrate .. //depot/projects/uart/dev/em/e1000_nvm.c#2 integrate .. //depot/projects/uart/dev/em/e1000_nvm.h#2 integrate .. //depot/projects/uart/dev/em/e1000_osdep.h#2 integrate .. //depot/projects/uart/dev/em/e1000_phy.c#2 integrate .. //depot/projects/uart/dev/em/e1000_phy.h#2 integrate .. //depot/projects/uart/dev/em/e1000_regs.h#2 integrate .. //depot/projects/uart/dev/em/if_em.c#30 integrate .. //depot/projects/uart/dev/em/if_em.h#25 integrate .. //depot/projects/uart/dev/esp/esp_sbus.c#6 integrate .. //depot/projects/uart/dev/fdc/fdc.c#16 integrate .. //depot/projects/uart/dev/firewire/firewire.c#16 integrate .. //depot/projects/uart/dev/flash/at45d.c#2 integrate .. //depot/projects/uart/dev/gem/if_gem.c#13 integrate .. //depot/projects/uart/dev/gem/if_gem_pci.c#11 integrate .. //depot/projects/uart/dev/gem/if_gemreg.h#4 integrate .. //depot/projects/uart/dev/gem/if_gemvar.h#7 integrate .. //depot/projects/uart/dev/hptmv/entry.c#10 integrate .. //depot/projects/uart/dev/hwpmc/hwpmc_amd.c#4 integrate .. //depot/projects/uart/dev/hwpmc/hwpmc_arm.c#2 integrate .. //depot/projects/uart/dev/hwpmc/hwpmc_ia64.c#2 integrate .. //depot/projects/uart/dev/hwpmc/hwpmc_logging.c#6 integrate .. //depot/projects/uart/dev/hwpmc/hwpmc_mod.c#13 integrate .. //depot/projects/uart/dev/hwpmc/hwpmc_piv.c#7 integrate .. //depot/projects/uart/dev/hwpmc/hwpmc_powerpc.c#2 integrate .. //depot/projects/uart/dev/hwpmc/hwpmc_ppro.c#3 integrate .. //depot/projects/uart/dev/hwpmc/hwpmc_sparc64.c#2 integrate .. //depot/projects/uart/dev/hwpmc/hwpmc_x86.c#4 integrate .. //depot/projects/uart/dev/ichsmb/ichsmb_pci.c#11 integrate .. //depot/projects/uart/dev/ichwd/ichwd.c#7 integrate .. //depot/projects/uart/dev/ichwd/ichwd.h#5 integrate .. //depot/projects/uart/dev/idt/idt_pci.c#8 integrate .. //depot/projects/uart/dev/if_ndis/if_ndis.c#14 integrate .. //depot/projects/uart/dev/if_ndis/if_ndis_pci.c#5 integrate .. //depot/projects/uart/dev/if_ndis/if_ndisvar.h#8 integrate .. //depot/projects/uart/dev/ipmi/ipmi_kcs.c#2 integrate .. //depot/projects/uart/dev/ipmi/ipmi_smic.c#2 integrate .. //depot/projects/uart/dev/ipmi/ipmi_ssif.c#3 integrate .. //depot/projects/uart/dev/ipw/if_ipw.c#11 integrate .. //depot/projects/uart/dev/ipw/if_ipwreg.h#3 integrate .. //depot/projects/uart/dev/ipw/if_ipwvar.h#6 integrate .. //depot/projects/uart/dev/iscsi/initiator/isc_sm.c#2 integrate .. //depot/projects/uart/dev/iscsi/initiator/isc_soc.c#2 integrate .. //depot/projects/uart/dev/isp/isp_freebsd.c#25 integrate .. //depot/projects/uart/dev/isp/isp_freebsd.h#20 integrate .. //depot/projects/uart/dev/isp/isp_sbus.c#18 integrate .. //depot/projects/uart/dev/isp/isp_target.c#13 integrate .. //depot/projects/uart/dev/iwi/if_iwi.c#16 integrate .. //depot/projects/uart/dev/ixgbe/ixgbe.c#2 integrate .. //depot/projects/uart/dev/ixgbe/ixgbe.h#2 integrate .. //depot/projects/uart/dev/ixgbe/ixgbe_82598.c#2 integrate .. //depot/projects/uart/dev/ixgbe/ixgbe_api.c#2 integrate .. //depot/projects/uart/dev/ixgbe/ixgbe_api.h#2 integrate .. //depot/projects/uart/dev/ixgbe/ixgbe_common.c#2 integrate .. //depot/projects/uart/dev/ixgbe/ixgbe_common.h#2 integrate .. //depot/projects/uart/dev/ixgbe/ixgbe_osdep.h#2 integrate .. //depot/projects/uart/dev/ixgbe/ixgbe_phy.c#2 integrate .. //depot/projects/uart/dev/ixgbe/ixgbe_phy.h#2 integrate .. //depot/projects/uart/dev/ixgbe/ixgbe_type.h#2 integrate .. //depot/projects/uart/dev/lge/if_lge.c#16 integrate .. //depot/projects/uart/dev/md/md.c#21 integrate .. //depot/projects/uart/dev/mfi/mfi.c#13 integrate .. //depot/projects/uart/dev/mfi/mfi_cam.c#3 integrate .. //depot/projects/uart/dev/mfi/mfi_pci.c#7 integrate .. //depot/projects/uart/dev/mfi/mfireg.h#9 integrate .. //depot/projects/uart/dev/mfi/mfivar.h#8 integrate .. //depot/projects/uart/dev/mii/amphy.c#8 integrate .. //depot/projects/uart/dev/mii/e1000phy.c#9 integrate .. //depot/projects/uart/dev/mii/e1000phyreg.h#5 integrate .. //depot/projects/uart/dev/mii/gentbi.c#3 integrate .. //depot/projects/uart/dev/mii/miidevs#14 integrate .. //depot/projects/uart/dev/mii/nsphy.c#8 integrate .. //depot/projects/uart/dev/mii/rgephy.c#10 integrate .. //depot/projects/uart/dev/mii/rgephyreg.h#3 integrate .. //depot/projects/uart/dev/mii/rlphy.c#10 integrate .. //depot/projects/uart/dev/mii/tdkphy.c#9 integrate .. //depot/projects/uart/dev/mii/ukphy_subr.c#5 integrate .. //depot/projects/uart/dev/mmc/mmcsd.c#3 integrate .. //depot/projects/uart/dev/mpt/mpt.c#25 integrate .. //depot/projects/uart/dev/mpt/mpt.h#23 integrate .. //depot/projects/uart/dev/mpt/mpt_cam.c#27 integrate .. //depot/projects/uart/dev/mpt/mpt_pci.c#27 integrate .. //depot/projects/uart/dev/mpt/mpt_raid.c#10 integrate .. //depot/projects/uart/dev/msk/if_msk.c#5 integrate .. //depot/projects/uart/dev/msk/if_mskreg.h#4 integrate .. //depot/projects/uart/dev/mxge/if_mxge.c#12 integrate .. //depot/projects/uart/dev/mxge/if_mxge_var.h#7 integrate .. //depot/projects/uart/dev/my/if_my.c#13 integrate .. //depot/projects/uart/dev/nfe/if_nfe.c#7 integrate .. //depot/projects/uart/dev/nge/if_nge.c#17 integrate .. //depot/projects/uart/dev/nve/if_nve.c#10 integrate .. //depot/projects/uart/dev/nvram/nvram.c#1 branch .. //depot/projects/uart/dev/nxge/if_nxge.c#2 integrate .. //depot/projects/uart/dev/nxge/if_nxge.h#2 integrate .. //depot/projects/uart/dev/nxge/include/build-version.h#2 integrate .. //depot/projects/uart/dev/nxge/include/version.h#2 integrate .. //depot/projects/uart/dev/nxge/include/xge-debug.h#2 integrate .. //depot/projects/uart/dev/nxge/include/xge-defs.h#2 integrate .. //depot/projects/uart/dev/nxge/include/xge-list.h#2 integrate .. //depot/projects/uart/dev/nxge/include/xge-os-pal.h#2 integrate .. //depot/projects/uart/dev/nxge/include/xge-os-template.h#2 delete .. //depot/projects/uart/dev/nxge/include/xge-queue.h#2 integrate .. //depot/projects/uart/dev/nxge/include/xgehal-channel.h#2 integrate .. //depot/projects/uart/dev/nxge/include/xgehal-config.h#2 integrate .. //depot/projects/uart/dev/nxge/include/xgehal-device.h#2 integrate .. //depot/projects/uart/dev/nxge/include/xgehal-driver.h#2 integrate .. //depot/projects/uart/dev/nxge/include/xgehal-event.h#2 integrate .. //depot/projects/uart/dev/nxge/include/xgehal-fifo.h#2 integrate .. //depot/projects/uart/dev/nxge/include/xgehal-mgmt.h#2 integrate .. //depot/projects/uart/dev/nxge/include/xgehal-mgmtaux.h#2 integrate .. //depot/projects/uart/dev/nxge/include/xgehal-mm.h#2 integrate .. //depot/projects/uart/dev/nxge/include/xgehal-regs.h#2 integrate .. //depot/projects/uart/dev/nxge/include/xgehal-ring.h#2 integrate .. //depot/projects/uart/dev/nxge/include/xgehal-stats.h#2 integrate .. //depot/projects/uart/dev/nxge/include/xgehal-types.h#2 integrate .. //depot/projects/uart/dev/nxge/include/xgehal.h#2 integrate .. //depot/projects/uart/dev/nxge/xge-osdep.h#2 integrate .. //depot/projects/uart/dev/nxge/xgehal/xge-queue.c#2 integrate .. //depot/projects/uart/dev/nxge/xgehal/xgehal-channel-fp.c#2 integrate .. //depot/projects/uart/dev/nxge/xgehal/xgehal-channel.c#2 integrate .. //depot/projects/uart/dev/nxge/xgehal/xgehal-config.c#2 integrate .. //depot/projects/uart/dev/nxge/xgehal/xgehal-device-fp.c#2 integrate .. //depot/projects/uart/dev/nxge/xgehal/xgehal-device.c#2 integrate .. //depot/projects/uart/dev/nxge/xgehal/xgehal-driver.c#2 integrate .. //depot/projects/uart/dev/nxge/xgehal/xgehal-fifo-fp.c#2 integrate .. //depot/projects/uart/dev/nxge/xgehal/xgehal-fifo.c#2 integrate .. //depot/projects/uart/dev/nxge/xgehal/xgehal-mgmt.c#2 integrate .. //depot/projects/uart/dev/nxge/xgehal/xgehal-mgmtaux.c#2 integrate .. //depot/projects/uart/dev/nxge/xgehal/xgehal-mm.c#2 integrate .. //depot/projects/uart/dev/nxge/xgehal/xgehal-ring-fp.c#2 integrate .. //depot/projects/uart/dev/nxge/xgehal/xgehal-ring.c#2 integrate .. //depot/projects/uart/dev/nxge/xgehal/xgehal-stats.c#2 integrate .. //depot/projects/uart/dev/nxge/xgell-version.h#2 integrate .. //depot/projects/uart/dev/ofw/ofw_disk.c#7 integrate .. //depot/projects/uart/dev/pccard/pccard_cis_quirks.c#8 integrate .. //depot/projects/uart/dev/pccard/pccarddevs#22 integrate .. //depot/projects/uart/dev/pccbb/pccbb.c#25 integrate .. //depot/projects/uart/dev/pccbb/pccbb_pci.c#14 integrate .. //depot/projects/uart/dev/pccbb/pccbbvar.h#12 integrate .. //depot/projects/uart/dev/pci/pci.c#33 integrate .. //depot/projects/uart/dev/pci/pci_pci.c#14 integrate .. //depot/projects/uart/dev/pci/pci_private.h#12 integrate .. //depot/projects/uart/dev/pci/pci_user.c#10 integrate .. //depot/projects/uart/dev/pci/pcib_private.h#8 integrate .. //depot/projects/uart/dev/pci/pcireg.h#16 integrate .. //depot/projects/uart/dev/pci/pcivar.h#14 integrate .. //depot/projects/uart/dev/puc/puc_pci.c#15 integrate .. //depot/projects/uart/dev/ral/rt2560.c#10 integrate .. //depot/projects/uart/dev/ral/rt2661.c#9 integrate .. //depot/projects/uart/dev/random/harvest.c#4 integrate .. //depot/projects/uart/dev/random/randomdev_soft.c#11 integrate .. //depot/projects/uart/dev/random/yarrow.c#7 integrate .. //depot/projects/uart/dev/ray/if_ray.c#11 integrate .. //depot/projects/uart/dev/re/if_re.c#25 integrate .. //depot/projects/uart/dev/safe/safe.c#12 integrate .. //depot/projects/uart/dev/si/si_pci.c#8 integrate .. //depot/projects/uart/dev/sio/sio.c#20 integrate .. //depot/projects/uart/dev/sio/sio_isa.c#7 integrate .. //depot/projects/uart/dev/sio/sio_puc.c#7 integrate .. //depot/projects/uart/dev/sk/if_sk.c#16 integrate .. //depot/projects/uart/dev/snp/snp.c#12 integrate .. //depot/projects/uart/dev/sound/isa/ad1816.c#12 integrate .. //depot/projects/uart/dev/sound/isa/ad1816.h#4 integrate .. //depot/projects/uart/dev/sound/midi/sequencer.c#9 integrate .. //depot/projects/uart/dev/sound/pci/atiixp.c#11 integrate .. //depot/projects/uart/dev/sound/pci/atiixp.h#4 integrate .. //depot/projects/uart/dev/sound/pci/emu10kx-midi.c#2 integrate .. //depot/projects/uart/dev/sound/pci/emu10kx-pcm.c#6 integrate .. //depot/projects/uart/dev/sound/pci/emu10kx.c#6 integrate .. //depot/projects/uart/dev/sound/pci/emu10kx.h#4 integrate .. //depot/projects/uart/dev/sound/pci/envy24.c#7 integrate .. //depot/projects/uart/dev/sound/pci/envy24ht.c#6 integrate .. //depot/projects/uart/dev/sound/pci/hda/hdac.c#8 integrate .. //depot/projects/uart/dev/sound/pci/t4dwave.c#12 integrate .. //depot/projects/uart/dev/sound/pcm/ac97.c#18 integrate .. //depot/projects/uart/dev/sound/pcm/ac97_patch.c#9 integrate .. //depot/projects/uart/dev/sound/pcm/channel.c#15 integrate .. //depot/projects/uart/dev/sound/sbus/cs4231.c#8 integrate .. //depot/projects/uart/dev/stge/if_stge.c#5 integrate .. //depot/projects/uart/dev/syscons/syscons.c#20 integrate .. //depot/projects/uart/dev/syscons/syscons.h#9 integrate .. //depot/projects/uart/dev/ti/if_ti.c#5 integrate .. //depot/projects/uart/dev/twa/tw_cl_init.c#4 integrate .. //depot/projects/uart/dev/twa/tw_cl_intr.c#4 integrate .. //depot/projects/uart/dev/twa/tw_cl_io.c#4 integrate .. //depot/projects/uart/dev/twa/tw_cl_misc.c#4 integrate .. //depot/projects/uart/dev/twa/tw_cl_share.h#4 integrate .. //depot/projects/uart/dev/twa/tw_osl.h#4 integrate .. //depot/projects/uart/dev/twa/tw_osl_cam.c#9 integrate .. //depot/projects/uart/dev/twa/tw_osl_freebsd.c#5 integrate .. //depot/projects/uart/dev/twa/tw_osl_share.h#6 integrate .. //depot/projects/uart/dev/txp/if_txp.c#16 integrate .. //depot/projects/uart/dev/usb/ehci_pci.c#16 integrate .. //depot/projects/uart/dev/usb/if_axe.c#19 integrate .. //depot/projects/uart/dev/usb/if_axereg.h#10 integrate .. //depot/projects/uart/dev/usb/if_rum.c#3 integrate .. //depot/projects/uart/dev/usb/if_ural.c#18 integrate .. //depot/projects/uart/dev/usb/if_zyd.c#1 branch .. //depot/projects/uart/dev/usb/if_zydfw.h#1 branch .. //depot/projects/uart/dev/usb/if_zydreg.h#1 branch .. //depot/projects/uart/dev/usb/uchcom.c#1 branch .. //depot/projects/uart/dev/usb/uhci_pci.c#10 integrate .. //depot/projects/uart/dev/usb/uipaq.c#3 integrate .. //depot/projects/uart/dev/usb/ukbd.c#14 integrate .. //depot/projects/uart/dev/usb/usb.c#16 integrate .. //depot/projects/uart/dev/usb/usb_port.h#15 integrate .. //depot/projects/uart/dev/usb/usb_quirks.c#14 integrate .. //depot/projects/uart/dev/usb/usbdevs#34 integrate .. //depot/projects/uart/dev/usb/uscanner.c#17 integrate .. //depot/projects/uart/dev/utopia/utopia.c#8 integrate .. //depot/projects/uart/dev/vge/if_vge.c#11 integrate .. //depot/projects/uart/dev/vx/if_vx_pci.c#11 integrate .. //depot/projects/uart/dev/wi/if_wi.c#23 integrate .. //depot/projects/uart/dev/wpi/if_wpi.c#1 branch .. //depot/projects/uart/dev/wpi/if_wpireg.h#1 branch .. //depot/projects/uart/dev/wpi/if_wpivar.h#1 branch .. //depot/projects/uart/fs/cd9660/cd9660_vfsops.c#2 integrate .. //depot/projects/uart/fs/coda/coda_vfsops.c#2 integrate .. //depot/projects/uart/fs/devfs/devfs_devs.c#13 integrate .. //depot/projects/uart/fs/devfs/devfs_vnops.c#25 integrate .. //depot/projects/uart/fs/fdescfs/fdesc_vfsops.c#11 integrate .. //depot/projects/uart/fs/hpfs/hpfs_vfsops.c#14 integrate .. //depot/projects/uart/fs/msdosfs/denode.h#10 integrate .. //depot/projects/uart/fs/msdosfs/direntry.h#7 integrate .. //depot/projects/uart/fs/msdosfs/msdosfs_conv.c#13 integrate .. //depot/projects/uart/fs/msdosfs/msdosfs_denode.c#14 integrate .. //depot/projects/uart/fs/msdosfs/msdosfs_fat.c#6 integrate .. //depot/projects/uart/fs/msdosfs/msdosfs_lookup.c#8 integrate .. //depot/projects/uart/fs/msdosfs/msdosfs_vfsops.c#21 integrate .. //depot/projects/uart/fs/msdosfs/msdosfs_vnops.c#17 integrate .. //depot/projects/uart/fs/ntfs/ntfs_ihash.c#5 integrate .. //depot/projects/uart/fs/ntfs/ntfs_vfsops.c#18 integrate .. //depot/projects/uart/fs/nullfs/null_subr.c#9 integrate .. //depot/projects/uart/fs/nullfs/null_vfsops.c#14 integrate .. //depot/projects/uart/fs/nullfs/null_vnops.c#14 integrate .. //depot/projects/uart/fs/nwfs/nwfs_vfsops.c#9 integrate .. //depot/projects/uart/fs/portalfs/portal_vfsops.c#9 integrate .. //depot/projects/uart/fs/procfs/procfs_status.c#9 integrate .. //depot/projects/uart/fs/pseudofs/pseudofs.c#10 integrate .. //depot/projects/uart/fs/pseudofs/pseudofs_vnops.c#16 integrate .. //depot/projects/uart/fs/smbfs/smbfs_vfsops.c#13 integrate .. //depot/projects/uart/fs/tmpfs/tmpfs.h#2 integrate .. //depot/projects/uart/fs/tmpfs/tmpfs_subr.c#2 integrate .. //depot/projects/uart/fs/tmpfs/tmpfs_vfsops.c#2 integrate .. //depot/projects/uart/fs/tmpfs/tmpfs_vnops.c#2 integrate .. //depot/projects/uart/fs/udf/udf_vfsops.c#19 integrate .. //depot/projects/uart/fs/unionfs/union.h#7 integrate .. //depot/projects/uart/fs/unionfs/union_subr.c#12 integrate .. //depot/projects/uart/fs/unionfs/union_vfsops.c#11 integrate .. //depot/projects/uart/fs/unionfs/union_vnops.c#13 integrate .. //depot/projects/uart/geom/bde/g_bde.c#4 integrate .. //depot/projects/uart/geom/bde/g_bde_work.c#7 integrate .. //depot/projects/uart/geom/eli/g_eli.c#15 integrate .. //depot/projects/uart/geom/eli/g_eli.h#6 integrate .. //depot/projects/uart/geom/eli/g_eli_crypto.c#5 integrate .. //depot/projects/uart/geom/geom_bsd.c#9 integrate .. //depot/projects/uart/geom/geom_bsd_enc.c#3 integrate .. //depot/projects/uart/geom/geom_event.c#8 integrate .. //depot/projects/uart/geom/geom_io.c#15 integrate .. //depot/projects/uart/geom/journal/g_journal.c#6 integrate .. //depot/projects/uart/geom/label/g_label_reiserfs.c#2 integrate .. //depot/projects/uart/geom/mirror/g_mirror.c#21 integrate .. //depot/projects/uart/geom/multipath/g_multipath.c#2 integrate .. //depot/projects/uart/geom/part/g_part.c#4 integrate .. //depot/projects/uart/geom/part/g_part.h#4 integrate .. //depot/projects/uart/geom/part/g_part_apm.c#4 integrate .. //depot/projects/uart/geom/part/g_part_bsd.c#1 branch .. //depot/projects/uart/geom/part/g_part_gpt.c#4 integrate .. //depot/projects/uart/geom/raid3/g_raid3.c#24 integrate .. //depot/projects/uart/geom/vinum/geom_vinum_drive.c#8 integrate .. //depot/projects/uart/geom/vinum/geom_vinum_init.c#7 integrate .. //depot/projects/uart/geom/vinum/geom_vinum_plex.c#6 integrate .. //depot/projects/uart/geom/vinum/geom_vinum_volume.c#6 integrate .. //depot/projects/uart/geom/virstor/binstream.c#1 branch .. //depot/projects/uart/geom/virstor/binstream.h#1 branch .. //depot/projects/uart/geom/virstor/g_virstor.c#1 branch .. //depot/projects/uart/geom/virstor/g_virstor.h#1 branch .. //depot/projects/uart/geom/virstor/g_virstor_md.c#1 branch .. //depot/projects/uart/geom/virstor/g_virstor_md.h#1 branch .. //depot/projects/uart/gnu/fs/ext2fs/ext2_vfsops.c#10 integrate .. //depot/projects/uart/gnu/fs/reiserfs/reiserfs_vfsops.c#8 integrate .. //depot/projects/uart/gnu/fs/xfs/FreeBSD/xfs_vfs.c#3 integrate .. //depot/projects/uart/i386/acpica/madt.c#10 integrate .. //depot/projects/uart/i386/bios/apm.c#8 integrate .. //depot/projects/uart/i386/conf/DEFAULTS#7 integrate .. //depot/projects/uart/i386/conf/GENERIC#29 integrate .. //depot/projects/uart/i386/conf/GENERIC.hints#5 integrate .. //depot/projects/uart/i386/conf/NOTES#28 integrate .. //depot/projects/uart/i386/conf/PAE#15 integrate .. //depot/projects/uart/i386/conf/XBOX#7 integrate .. //depot/projects/uart/i386/i386/busdma_machdep.c#24 integrate .. //depot/projects/uart/i386/i386/db_trace.c#15 integrate .. //depot/projects/uart/i386/i386/exception.s#10 integrate .. //depot/projects/uart/i386/i386/genassym.c#10 integrate .. //depot/projects/uart/i386/i386/geode.c#7 integrate .. //depot/projects/uart/i386/i386/in_cksum.c#4 integrate .. //depot/projects/uart/i386/i386/intr_machdep.c#13 integrate .. //depot/projects/uart/i386/i386/legacy.c#7 integrate .. //depot/projects/uart/i386/i386/local_apic.c#17 integrate .. //depot/projects/uart/i386/i386/locore.s#11 integrate .. //depot/projects/uart/i386/i386/machdep.c#31 integrate .. //depot/projects/uart/i386/i386/mp_machdep.c#31 integrate .. //depot/projects/uart/i386/i386/msi.c#5 integrate .. //depot/projects/uart/i386/i386/pmap.c#51 integrate .. //depot/projects/uart/i386/i386/stack_machdep.c#1 branch .. //depot/projects/uart/i386/i386/trap.c#22 integrate .. //depot/projects/uart/i386/i386/vm_machdep.c#21 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_misc.c#13 integrate .. //depot/projects/uart/i386/ibcs2/imgact_coff.c#9 integrate .. //depot/projects/uart/i386/include/bootinfo.h#2 integrate .. //depot/projects/uart/i386/include/clock.h#13 integrate .. //depot/projects/uart/i386/include/in_cksum.h#4 integrate .. //depot/projects/uart/i386/include/legacyvar.h#5 integrate .. //depot/projects/uart/i386/include/pc/bios.h#4 integrate .. //depot/projects/uart/i386/include/pmap.h#15 integrate .. //depot/projects/uart/i386/include/pmc_mdep.h#3 integrate .. //depot/projects/uart/i386/include/smp.h#11 integrate .. //depot/projects/uart/i386/include/stack.h#1 branch .. //depot/projects/uart/i386/include/vmparam.h#8 integrate .. //depot/projects/uart/i386/isa/clock.c#16 integrate .. //depot/projects/uart/i386/isa/isa.c#6 integrate .. //depot/projects/uart/i386/isa/prof_machdep.c#7 integrate .. //depot/projects/uart/i386/linux/imgact_linux.c#7 integrate .. //depot/projects/uart/i386/linux/linux.h#9 integrate .. //depot/projects/uart/i386/linux/linux_machdep.c#12 integrate .. //depot/projects/uart/i386/linux/linux_proto.h#16 integrate .. //depot/projects/uart/i386/linux/linux_ptrace.c#6 integrate .. //depot/projects/uart/i386/linux/linux_syscall.h#16 integrate .. //depot/projects/uart/i386/linux/linux_sysent.c#16 integrate .. //depot/projects/uart/i386/linux/linux_sysvec.c#15 integrate .. //depot/projects/uart/i386/linux/syscalls.master#16 integrate .. //depot/projects/uart/i386/pci/pci_bus.c#14 integrate .. //depot/projects/uart/i386/pci/pci_cfgreg.c#8 integrate .. //depot/projects/uart/i4b/layer1/isic/i4b_avm_a1.c#7 integrate .. //depot/projects/uart/i4b/layer1/isic/i4b_elsa_pcc16.c#6 integrate .. //depot/projects/uart/i4b/layer1/isic/i4b_isic.c#4 integrate .. //depot/projects/uart/i4b/layer1/isic/i4b_itk_ix1.c#7 integrate .. //depot/projects/uart/i4b/layer1/isic/i4b_tel_s016.c#7 integrate .. //depot/projects/uart/i4b/layer1/isic/i4b_tel_s0163.c#7 integrate .. //depot/projects/uart/i4b/layer1/isic/i4b_tel_s08.c#6 integrate .. //depot/projects/uart/ia64/conf/DEFAULTS#9 integrate .. //depot/projects/uart/ia64/conf/GENERIC#20 integrate .. //depot/projects/uart/ia64/disasm/disasm.h#4 integrate .. //depot/projects/uart/ia64/ia64/busdma_machdep.c#12 integrate .. //depot/projects/uart/ia64/ia64/db_machdep.c#4 integrate .. //depot/projects/uart/ia64/ia64/exception.S#10 integrate .. //depot/projects/uart/ia64/ia64/interrupt.c#18 integrate .. //depot/projects/uart/ia64/ia64/machdep.c#32 integrate .. //depot/projects/uart/ia64/ia64/pmap.c#30 integrate .. //depot/projects/uart/ia64/ia64/stack_machdep.c#1 branch .. //depot/projects/uart/ia64/ia64/support.S#7 integrate .. //depot/projects/uart/ia64/ia64/trap.c#23 integrate .. //depot/projects/uart/ia64/ia64/uma_machdep.c#4 integrate .. //depot/projects/uart/ia64/ia64/vm_machdep.c#16 integrate .. //depot/projects/uart/ia64/include/atomic.h#6 integrate .. //depot/projects/uart/ia64/include/pmc_mdep.h#3 integrate .. //depot/projects/uart/ia64/include/vmparam.h#10 integrate .. //depot/projects/uart/kern/imgact_aout.c#10 integrate .. //depot/projects/uart/kern/imgact_elf.c#11 integrate .. //depot/projects/uart/kern/imgact_gzip.c#7 integrate .. //depot/projects/uart/kern/init_main.c#22 integrate .. //depot/projects/uart/kern/kern_acct.c#16 integrate .. //depot/projects/uart/kern/kern_alq.c#11 integrate .. //depot/projects/uart/kern/kern_clock.c#16 integrate .. //depot/projects/uart/kern/kern_conf.c#16 integrate .. //depot/projects/uart/kern/kern_cpu.c#8 integrate .. //depot/projects/uart/kern/kern_descrip.c#31 integrate .. //depot/projects/uart/kern/kern_environment.c#13 integrate .. //depot/projects/uart/kern/kern_exec.c#26 integrate .. //depot/projects/uart/kern/kern_exit.c#23 integrate .. //depot/projects/uart/kern/kern_fork.c#23 integrate .. //depot/projects/uart/kern/kern_idle.c#9 integrate .. //depot/projects/uart/kern/kern_intr.c#18 integrate .. //depot/projects/uart/kern/kern_jail.c#13 integrate .. //depot/projects/uart/kern/kern_kse.c#16 integrate .. //depot/projects/uart/kern/kern_kthread.c#8 integrate .. //depot/projects/uart/kern/kern_ktrace.c#18 integrate .. //depot/projects/uart/kern/kern_linker.c#15 integrate .. //depot/projects/uart/kern/kern_lock.c#19 integrate .. //depot/projects/uart/kern/kern_mbuf.c#17 integrate .. //depot/projects/uart/kern/kern_mib.c#9 integrate .. //depot/projects/uart/kern/kern_module.c#9 integrate .. //depot/projects/uart/kern/kern_mutex.c#23 integrate .. //depot/projects/uart/kern/kern_pmc.c#4 integrate .. //depot/projects/uart/kern/kern_proc.c#22 integrate .. //depot/projects/uart/kern/kern_prot.c#17 integrate .. //depot/projects/uart/kern/kern_rmlock.c#1 branch .. //depot/projects/uart/kern/kern_rwlock.c#13 integrate .. //depot/projects/uart/kern/kern_shutdown.c#13 integrate .. //depot/projects/uart/kern/kern_sig.c#37 integrate .. //depot/projects/uart/kern/kern_switch.c#16 integrate .. //depot/projects/uart/kern/kern_sx.c#16 integrate .. //depot/projects/uart/kern/kern_synch.c#24 integrate .. //depot/projects/uart/kern/kern_sysctl.c#13 integrate .. //depot/projects/uart/kern/kern_thr.c#18 integrate .. //depot/projects/uart/kern/kern_thread.c#29 integrate .. //depot/projects/uart/kern/kern_timeout.c#12 integrate .. //depot/projects/uart/kern/kern_umtx.c#19 integrate .. //depot/projects/uart/kern/link_elf.c#13 integrate .. //depot/projects/uart/kern/link_elf_obj.c#8 integrate .. //depot/projects/uart/kern/linker_if.m#4 integrate .. //depot/projects/uart/kern/p1003_1b.c#3 integrate .. //depot/projects/uart/kern/sched_4bsd.c#19 integrate .. //depot/projects/uart/kern/sched_ule.c#24 integrate .. //depot/projects/uart/kern/subr_bus.c#21 integrate .. //depot/projects/uart/kern/subr_kdb.c#8 integrate .. //depot/projects/uart/kern/subr_lock.c#7 integrate .. //depot/projects/uart/kern/subr_param.c#10 integrate .. //depot/projects/uart/kern/subr_pcpu.c#4 integrate .. //depot/projects/uart/kern/subr_sleepqueue.c#16 integrate .. //depot/projects/uart/kern/subr_smp.c#9 integrate .. //depot/projects/uart/kern/subr_stack.c#3 integrate .. //depot/projects/uart/kern/subr_taskqueue.c#13 integrate .. //depot/projects/uart/kern/subr_trap.c#14 integrate .. //depot/projects/uart/kern/subr_turnstile.c#15 integrate .. //depot/projects/uart/kern/subr_witness.c#26 integrate .. //depot/projects/uart/kern/sys_generic.c#20 integrate .. //depot/projects/uart/kern/sys_pipe.c#24 integrate .. //depot/projects/uart/kern/sys_process.c#19 integrate .. //depot/projects/uart/kern/sys_socket.c#12 integrate .. //depot/projects/uart/kern/syscalls.master#23 integrate .. //depot/projects/uart/kern/sysv_msg.c#14 integrate .. //depot/projects/uart/kern/sysv_sem.c#18 integrate .. //depot/projects/uart/kern/sysv_shm.c#16 integrate .. //depot/projects/uart/kern/tty_pty.c#13 integrate .. //depot/projects/uart/kern/uipc_mbuf.c#19 integrate .. //depot/projects/uart/kern/uipc_mbuf2.c#7 integrate .. //depot/projects/uart/kern/uipc_sem.c#12 integrate .. //depot/projects/uart/kern/uipc_sockbuf.c#6 integrate .. //depot/projects/uart/kern/uipc_socket.c#29 integrate .. //depot/projects/uart/kern/uipc_syscalls.c#31 integrate .. //depot/projects/uart/kern/uipc_usrreq.c#23 integrate .. //depot/projects/uart/kern/vfs_acl.c#2 integrate .. //depot/projects/uart/kern/vfs_aio.c#22 integrate .. //depot/projects/uart/kern/vfs_bio.c#32 integrate .. //depot/projects/uart/kern/vfs_cache.c#16 integrate .. //depot/projects/uart/kern/vfs_extattr.c#2 integrate .. //depot/projects/uart/kern/vfs_lookup.c#20 integrate .. //depot/projects/uart/kern/vfs_mount.c#36 integrate .. //depot/projects/uart/kern/vfs_subr.c#44 integrate .. //depot/projects/uart/kern/vfs_syscalls.c#36 integrate .. //depot/projects/uart/kern/vfs_vnops.c#25 integrate .. //depot/projects/uart/libkern/arm/ffs.S#4 integrate .. //depot/projects/uart/modules/Makefile#51 integrate .. //depot/projects/uart/modules/acpi/acpi/Makefile#8 integrate .. //depot/projects/uart/modules/agp/Makefile#8 integrate .. //depot/projects/uart/modules/amr/Makefile#3 integrate .. //depot/projects/uart/modules/asmc/Makefile#1 branch .. //depot/projects/uart/modules/cxgb/Makefile#5 integrate .. //depot/projects/uart/modules/geom/Makefile#8 integrate .. //depot/projects/uart/modules/geom/geom_virstor/Makefile#1 branch .. //depot/projects/uart/modules/ixgbe/Makefile#1 branch .. //depot/projects/uart/modules/nvram/Makefile#1 branch .. //depot/projects/uart/modules/nxge/Makefile#2 integrate .. //depot/projects/uart/modules/sound/driver/emu10kx/Makefile#3 integrate .. //depot/projects/uart/modules/uchcom/Makefile#1 branch .. //depot/projects/uart/modules/wpi/Makefile#1 branch .. //depot/projects/uart/modules/wpifw/Makefile#1 branch .. //depot/projects/uart/modules/zfs/Makefile#4 integrate .. //depot/projects/uart/modules/zyd/Makefile#1 branch .. //depot/projects/uart/net/bpf.c#22 integrate .. //depot/projects/uart/net/bpf.h#10 integrate .. //depot/projects/uart/net/bpf_filter.c#7 integrate .. //depot/projects/uart/net/bridgestp.c#11 integrate .. //depot/projects/uart/net/bridgestp.h#6 integrate .. //depot/projects/uart/net/bsd_comp.c#6 integrate .. //depot/projects/uart/net/ethernet.h#6 integrate .. //depot/projects/uart/net/ieee8023ad_lacp.c#5 integrate .. //depot/projects/uart/net/if.c#31 integrate .. //depot/projects/uart/net/if_atmsubr.c#10 integrate .. //depot/projects/uart/net/if_bridge.c#18 integrate .. //depot/projects/uart/net/if_bridgevar.h#11 integrate .. //depot/projects/uart/net/if_disc.c#11 integrate .. //depot/projects/uart/net/if_enc.c#4 integrate .. //depot/projects/uart/net/if_ethersubr.c#26 integrate .. //depot/projects/uart/net/if_fddisubr.c#9 integrate .. //depot/projects/uart/net/if_fwsubr.c#12 integrate .. //depot/projects/uart/net/if_gif.c#13 integrate .. //depot/projects/uart/net/if_iso88025subr.c#9 integrate .. //depot/projects/uart/net/if_lagg.c#4 integrate .. //depot/projects/uart/net/if_lagg.h#4 integrate .. //depot/projects/uart/net/if_loop.c#13 integrate .. //depot/projects/uart/net/if_media.h#13 integrate .. //depot/projects/uart/net/if_ppp.c#13 integrate .. //depot/projects/uart/net/if_stf.c#14 integrate .. //depot/projects/uart/net/if_tun.c#13 integrate .. //depot/projects/uart/net/if_var.h#18 integrate .. //depot/projects/uart/net/if_vlan.c#21 integrate .. //depot/projects/uart/net/pfil.c#7 integrate .. //depot/projects/uart/net/pfil.h#7 integrate .. //depot/projects/uart/net/route.c#14 integrate .. //depot/projects/uart/net/rtsock.c#17 integrate .. //depot/projects/uart/net80211/_ieee80211.h#6 integrate .. //depot/projects/uart/net80211/ieee80211.c#17 integrate .. //depot/projects/uart/net80211/ieee80211.h#9 integrate .. //depot/projects/uart/net80211/ieee80211_freebsd.c#10 integrate .. //depot/projects/uart/net80211/ieee80211_freebsd.h#7 integrate .. //depot/projects/uart/net80211/ieee80211_ht.c#2 integrate .. //depot/projects/uart/net80211/ieee80211_ht.h#2 integrate .. //depot/projects/uart/net80211/ieee80211_input.c#22 integrate .. //depot/projects/uart/net80211/ieee80211_ioctl.c#22 integrate .. //depot/projects/uart/net80211/ieee80211_ioctl.h#12 integrate .. //depot/projects/uart/net80211/ieee80211_node.c#21 integrate .. //depot/projects/uart/net80211/ieee80211_node.h#16 integrate .. //depot/projects/uart/net80211/ieee80211_output.c#22 integrate .. //depot/projects/uart/net80211/ieee80211_power.c#2 integrate .. //depot/projects/uart/net80211/ieee80211_proto.c#16 integrate .. //depot/projects/uart/net80211/ieee80211_proto.h#13 integrate .. //depot/projects/uart/net80211/ieee80211_regdomain.c#2 integrate .. //depot/projects/uart/net80211/ieee80211_scan.c#2 integrate .. //depot/projects/uart/net80211/ieee80211_scan_ap.c#2 integrate .. //depot/projects/uart/net80211/ieee80211_scan_sta.c#2 integrate .. //depot/projects/uart/net80211/ieee80211_var.h#18 integrate .. //depot/projects/uart/netatalk/aarp.c#10 integrate .. //depot/projects/uart/netatalk/ddp_input.c#6 integrate .. //depot/projects/uart/netatalk/ddp_output.c#9 integrate .. //depot/projects/uart/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#13 integrate .. //depot/projects/uart/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#12 integrate .. //depot/projects/uart/netgraph/netgraph.h#13 integrate .. //depot/projects/uart/netgraph/ng_base.c#20 integrate .. //depot/projects/uart/netgraph/ng_cisco.c#7 integrate .. //depot/projects/uart/netgraph/ng_l2tp.c#7 integrate .. //depot/projects/uart/netgraph/ng_ppp.c#9 integrate .. //depot/projects/uart/netgraph/ng_pppoe.c#11 integrate .. //depot/projects/uart/netgraph/ng_socket.c#16 integrate .. //depot/projects/uart/netinet/accf_data.c#3 integrate .. //depot/projects/uart/netinet/accf_http.c#4 integrate .. //depot/projects/uart/netinet/if_ether.c#20 integrate .. //depot/projects/uart/netinet/igmp.c#11 integrate .. //depot/projects/uart/netinet/in.c#17 integrate .. //depot/projects/uart/netinet/in_cksum.c#5 integrate .. //depot/projects/uart/netinet/in_gif.c#11 integrate .. //depot/projects/uart/netinet/in_pcb.c#27 integrate .. //depot/projects/uart/netinet/in_pcb.h#17 integrate .. //depot/projects/uart/netinet/in_proto.c#13 integrate .. //depot/projects/uart/netinet/in_rmx.c#9 integrate .. //depot/projects/uart/netinet/ip.h#6 integrate .. //depot/projects/uart/netinet/ip_carp.c#12 integrate .. //depot/projects/uart/netinet/ip_divert.c#19 integrate .. //depot/projects/uart/netinet/ip_dummynet.c#20 integrate .. //depot/projects/uart/netinet/ip_dummynet.h#11 integrate .. //depot/projects/uart/netinet/ip_ecn.c#5 integrate .. //depot/projects/uart/netinet/ip_encap.c#7 integrate .. //depot/projects/uart/netinet/ip_fastfwd.c#13 integrate .. //depot/projects/uart/netinet/ip_fw2.c#34 integrate .. //depot/projects/uart/netinet/ip_fw_pfil.c#10 integrate .. //depot/projects/uart/netinet/ip_gre.c#8 integrate .. //depot/projects/uart/netinet/ip_icmp.c#14 integrate .. //depot/projects/uart/netinet/ip_id.c#5 integrate .. //depot/projects/uart/netinet/ip_input.c#24 integrate .. //depot/projects/uart/netinet/ip_ipsec.c#6 integrate .. //depot/projects/uart/netinet/ip_mroute.c#17 integrate .. //depot/projects/uart/netinet/ip_options.c#4 integrate .. //depot/projects/uart/netinet/ip_output.c#24 integrate .. //depot/projects/uart/netinet/libalias/alias_util.c#5 integrate .. //depot/projects/uart/netinet/raw_ip.c#23 integrate .. //depot/projects/uart/netinet/sctp.h#5 integrate .. //depot/projects/uart/netinet/sctp_asconf.c#6 integrate .. //depot/projects/uart/netinet/sctp_asconf.h#5 integrate .. //depot/projects/uart/netinet/sctp_auth.c#6 integrate .. //depot/projects/uart/netinet/sctp_bsd_addr.c#5 integrate .. //depot/projects/uart/netinet/sctp_cc_functions.c#2 integrate .. //depot/projects/uart/netinet/sctp_cc_functions.h#2 integrate .. //depot/projects/uart/netinet/sctp_constants.h#8 integrate .. //depot/projects/uart/netinet/sctp_indata.c#8 integrate .. //depot/projects/uart/netinet/sctp_input.c#8 integrate .. //depot/projects/uart/netinet/sctp_lock_bsd.h#6 integrate .. //depot/projects/uart/netinet/sctp_os_bsd.h#7 integrate .. //depot/projects/uart/netinet/sctp_output.c#8 integrate .. //depot/projects/uart/netinet/sctp_output.h#5 integrate .. //depot/projects/uart/netinet/sctp_pcb.c#8 integrate .. //depot/projects/uart/netinet/sctp_pcb.h#7 integrate .. //depot/projects/uart/netinet/sctp_peeloff.c#6 integrate .. //depot/projects/uart/netinet/sctp_structs.h#7 integrate .. //depot/projects/uart/netinet/sctp_sysctl.c#6 integrate .. //depot/projects/uart/netinet/sctp_sysctl.h#6 integrate .. //depot/projects/uart/netinet/sctp_timer.c#7 integrate .. //depot/projects/uart/netinet/sctp_timer.h#5 integrate .. //depot/projects/uart/netinet/sctp_uio.h#8 integrate .. //depot/projects/uart/netinet/sctp_usrreq.c#8 integrate .. //depot/projects/uart/netinet/sctp_var.h#6 integrate .. //depot/projects/uart/netinet/sctputil.c#8 integrate .. //depot/projects/uart/netinet/sctputil.h#6 integrate .. //depot/projects/uart/netinet/tcp_debug.c#5 integrate .. //depot/projects/uart/netinet/tcp_hostcache.c#8 integrate .. //depot/projects/uart/netinet/tcp_input.c#36 integrate .. //depot/projects/uart/netinet/tcp_output.c#18 integrate .. //depot/projects/uart/netinet/tcp_reass.c#2 integrate .. //depot/projects/uart/netinet/tcp_subr.c#31 integrate .. //depot/projects/uart/netinet/tcp_syncache.c#25 integrate .. //depot/projects/uart/netinet/tcp_timer.c#21 integrate .. //depot/projects/uart/netinet/tcp_timer.h#10 integrate .. //depot/projects/uart/netinet/tcp_timewait.c#3 integrate .. //depot/projects/uart/netinet/tcp_usrreq.c#23 integrate .. //depot/projects/uart/netinet/tcp_var.h#21 integrate .. //depot/projects/uart/netinet/udp_usrreq.c#26 integrate .. //depot/projects/uart/netinet6/in6.c#18 integrate .. //depot/projects/uart/netinet6/ip6_output.c#16 integrate .. //depot/projects/uart/netinet6/nd6.c#19 integrate .. //depot/projects/uart/netinet6/sctp6_usrreq.c#8 integrate .. //depot/projects/uart/netinet6/sctp6_var.h#5 integrate .. //depot/projects/uart/netinet6/udp6_usrreq.c#19 integrate .. //depot/projects/uart/netipsec/ipsec.c#18 integrate .. //depot/projects/uart/netipsec/ipsec.h#10 integrate .. //depot/projects/uart/netipsec/ipsec_input.c#11 integrate .. //depot/projects/uart/netipsec/ipsec_output.c#10 integrate .. //depot/projects/uart/netipsec/keysock.c#12 integrate .. //depot/projects/uart/netipsec/xform.h#4 integrate .. //depot/projects/uart/netipsec/xform_ipip.c#8 integrate .. //depot/projects/uart/netsmb/smb_iod.c#6 integrate .. //depot/projects/uart/nfs4client/nfs4_vfsops.c#12 integrate .. //depot/projects/uart/nfsclient/nfs.h#11 integrate .. //depot/projects/uart/nfsclient/nfs_bio.c#18 integrate .. //depot/projects/uart/nfsclient/nfs_nfsiod.c#9 integrate .. //depot/projects/uart/nfsclient/nfs_socket.c#20 integrate .. //depot/projects/uart/nfsclient/nfs_subs.c#13 integrate .. //depot/projects/uart/nfsclient/nfs_vfsops.c#20 integrate .. //depot/projects/uart/nfsclient/nfs_vnops.c#23 integrate .. //depot/projects/uart/nfsclient/nfsmount.h#7 integrate .. //depot/projects/uart/nfsserver/nfs.h#9 integrate .. //depot/projects/uart/nfsserver/nfs_serv.c#17 integrate .. //depot/projects/uart/nfsserver/nfs_srvsock.c#15 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Dec 10 03:50:42 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C0FC516A420; Mon, 10 Dec 2007 03:50:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 85C0816A418 for ; Mon, 10 Dec 2007 03:50:42 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 73D3213C448 for ; Mon, 10 Dec 2007 03:50:42 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBA3ogqK098678 for ; Mon, 10 Dec 2007 03:50:42 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBA3ogJR098675 for perforce@freebsd.org; Mon, 10 Dec 2007 03:50:42 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 10 Dec 2007 03:50:42 GMT Message-Id: <200712100350.lBA3ogJR098675@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 130582 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Dec 2007 03:50:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=130582 Change 130582 by kmacy@kmacy:storage:toestack on 2007/12/10 03:50:20 - remove mk_pass_sock - change "release" functions to use the toepcb to better handle case of socket going away - add locking around detach to fix races Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#31 edit .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#4 edit .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#3 edit .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom.h#14 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#31 (text+ko) ==== @@ -142,7 +142,7 @@ static void t3_send_reset(struct socket *so); static void send_abort_rpl(struct mbuf *m, struct toedev *tdev, int rst_status); - +static inline void free_atid(struct t3cdev *cdev, unsigned int tid); static inline int is_t3a(const struct toedev *dev) @@ -356,7 +356,7 @@ } m0->m_type = MT_DONTFREE; - enqueue_wr(tp, m0); + enqueue_wr(toep, m0); DPRINTF("sending offload tx with %d bytes in %d segments\n", bytes, count); @@ -590,14 +590,20 @@ cxgb_toe_detach(struct tcpcb *tp) { struct toepcb *toep; + /* + * XXX how do we handle teardown in the SYN_SENT state? + * + */ + INP_INFO_WLOCK(&tcbinfo); + toep = tp->t_toe; + toep->tp_tp = NULL; /* * unhook from socket */ tp->t_flags &= ~TF_TOE; - toep = tp->t_toe; - toep->tp_tp = NULL; tp->t_toe = NULL; + INP_INFO_WUNLOCK(&tcbinfo); } @@ -844,7 +850,7 @@ } void -t3_release_ddp_resources(struct socket *so) +t3_release_ddp_resources(struct toepcb *toep) { /* * This is a no-op until we have DDP support @@ -864,24 +870,22 @@ * Release resources held by an offload connection (TID, L2T entry, etc.) */ static void -t3_release_offload_resources(struct socket *so) +t3_release_offload_resources(struct toepcb *toep) { - struct tcpcb *tp = sototcpcb(so); - struct toepcb *toep = tp->t_toe; - struct toedev *tdev = TOE_DEV(so); + struct tcpcb *tp = toep->tp_tp; + struct toedev *tdev = toep->tp_toedev; struct t3cdev *cdev; unsigned int tid = toep->tp_tid; if (!tdev) return; - cdev = T3C_DEV(so); + cdev = TOEP_T3C_DEV(toep); if (!cdev) return; - INP_LOCK_ASSERT(tp->t_inpcb); toep->tp_qset = 0; - t3_release_ddp_resources(so); + t3_release_ddp_resources(toep); #ifdef CTRL_SKB_CACHE kfree_skb(CTRL_SKB_CACHE(tp)); @@ -889,8 +893,8 @@ #endif if (toep->tp_wr_avail != toep->tp_wr_max) { - purge_wr_queue(tp); - reset_wr_list(tp); + purge_wr_queue(toep); + reset_wr_list(toep); } if (toep->tp_l2t) { @@ -900,10 +904,13 @@ printf("setting toep->tp_tp to NULL\n"); toep->tp_tp = NULL; - tp->t_toe = NULL; - tp->t_flags &= ~TF_TOE; + if (tp) { + INP_LOCK_ASSERT(tp->t_inpcb); + tp->t_toe = NULL; + tp->t_flags &= ~TF_TOE; + } - if (tp->t_state == TCPS_SYN_SENT) { + if (toep->tp_state == TCPS_SYN_SENT) { free_atid(cdev, tid); #ifdef notyet __skb_queue_purge(&tp->out_of_order_queue); @@ -1014,7 +1021,7 @@ tp->rcv_wnd >= MIN_DDP_RCV_WIN ? ULP_MODE_TCPDDP : 0; toep->tp_qset_idx = 0; - reset_wr_list(tp); + reset_wr_list(toep); DPRINTF("initialization done\n"); } @@ -1113,13 +1120,15 @@ } static void -fail_act_open(struct socket *so, int errno) +fail_act_open(struct toepcb *toep, int errno) { - struct tcpcb *tp = sototcpcb(so); + struct tcpcb *tp = toep->tp_tp; - INP_LOCK_ASSERT(tp->t_inpcb); - t3_release_offload_resources(so); - tcp_drop(tp, errno); + t3_release_offload_resources(toep); + if (tp) { + INP_LOCK_ASSERT(tp->t_inpcb); + tcp_drop(tp, errno); + } #ifdef notyet TCP_INC_STATS_BH(TCP_MIB_ATTEMPTFAILS); @@ -1130,13 +1139,18 @@ * Handle active open failures. */ static void -active_open_failed(struct socket *so, struct mbuf *m) +active_open_failed(struct toepcb *toep, struct mbuf *m) { struct cpl_act_open_rpl *rpl = cplhdr(m); - struct inpcb *inp = sotoinpcb(so); - + struct inpcb *inp; + INP_INFO_WLOCK(&tcbinfo); + if (toep->tp_tp == NULL) + goto done; + + inp = toep->tp_tp->t_inpcb; INP_LOCK(inp); + /* * Don't handle connection retry for now */ @@ -1150,9 +1164,11 @@ jiffies + HZ / 2); } else #endif - fail_act_open(so, act_open_rpl_status_to_errno(rpl->status)); + fail_act_open(toep, act_open_rpl_status_to_errno(rpl->status)); INP_UNLOCK(inp); +done: INP_INFO_WUNLOCK(&tcbinfo); + m_free(m); } @@ -1173,15 +1189,12 @@ do_act_open_rpl(struct t3cdev *cdev, struct mbuf *m, void *ctx) { struct toepcb *toep = (struct toepcb *)ctx; - struct socket *so = NULL; struct cpl_act_open_rpl *rpl = cplhdr(m); if (cdev->type != T3A && act_open_has_tid(rpl->status)) cxgb_queue_tid_release(cdev, GET_TID(rpl)); - if (toep->tp_tp != NULL) - so = toeptoso(toep); - active_open_failed(so, m); + active_open_failed(toep, m); return (0); } @@ -1236,7 +1249,7 @@ if ((atid = cxgb_alloc_atid(d->cdev, d->client, toep)) < 0) goto out_err; - e = t3_l2t_get(d->cdev, dst, egress_ifp); + e = t3_l2t_get(d->cdev, dst, egress_ifp, &inp->inp_route.ro_dst); if (!e) goto free_tid; @@ -1262,6 +1275,7 @@ printf("sending off request\n"); + toep->tp_state = TCPS_SYN_SENT; l2t_send(d->cdev, (struct mbuf *)m, e); if (toep->tp_ulp_mode) @@ -1814,7 +1828,7 @@ * time of generating the RST but we must wait for HW). * Otherwise we enter TIME_WAIT. */ - t3_release_offload_resources(so); + t3_release_offload_resources(toep); if (toep->tp_flags & TP_ABORT_RPL_PENDING) { tp = tcp_close(tp); } else @@ -1884,7 +1898,7 @@ INP_LOCK(tp->t_inpcb); switch (tp->t_state) { case TCPS_CLOSING: /* see FIN_WAIT2 case in do_peer_fin */ - t3_release_offload_resources(so); + t3_release_offload_resources(toep); if (toep->tp_flags & TP_ABORT_RPL_PENDING) { tp = tcp_close(tp); @@ -1897,7 +1911,7 @@ * If we've sent abort_req it was post-close and was sent too * late, this close_con_rpl is the actual last message. */ - t3_release_offload_resources(so); + t3_release_offload_resources(toep); tp = tcp_close(tp); break; case TCPS_FIN_WAIT_1: @@ -1982,7 +1996,7 @@ panic("TP_ABORT_REQ_RCVD set"); INP_INFO_WLOCK(&tcbinfo); INP_LOCK(tp->t_inpcb); - t3_release_offload_resources(so); + t3_release_offload_resources(toep); tp = tcp_close(tp); INP_INFO_WUNLOCK(&tcbinfo); } @@ -2176,7 +2190,7 @@ cleanup_syn_rcv_conn(child, parent); INP_INFO_WLOCK(&tcbinfo); INP_LOCK(childtp->t_inpcb); - t3_release_offload_resources(child); + t3_release_offload_resources(childtp->t_toe); childtp = tcp_close(childtp); INP_INFO_WUNLOCK(&tcbinfo); if (childtp) @@ -2260,7 +2274,7 @@ if ((tp->t_state == TCPS_SYN_RECEIVED) && !abort_syn_rcv(so, m)) goto skip; - t3_release_offload_resources(so); + t3_release_offload_resources(toep); tp = tcp_close(tp); } if (tp) @@ -2403,95 +2417,6 @@ } /* - * Create a new socket as a child of the listening socket 'lsk' and initialize - * with the information in the supplied PASS_ACCEPT_REQ message. - */ -#ifdef notyet -static struct socket * -mk_pass_sock(struct socket *lso, struct toedev *dev, int tid, - struct cpl_pass_accept_req *req) -{ - UNIMPLEMENTED(); - -#ifdef notyet - struct socket *newso; - struct l2t_entry *e; - struct rtentry *dst; - struct tcpcb *newtp; - struct ifp *egress; - struct socket *oreq = reqsk_alloc(&t3_rsk_ops); - - if (!oreq) - goto out_err; - - tcp_rsk(oreq)->rcv_isn = ntohl(req->rcv_isn); - inet_rsk(oreq)->rmt_port = req->peer_port; - t3_set_req_addr(oreq, req->local_ip, req->peer_ip); - t3_set_req_opt(oreq, NULL); - if (sysctl_tcp_window_scaling) { - inet_rsk(oreq)->wscale_ok = 1; - inet_rsk(oreq)->snd_wscale = req->tcp_options.wsf; - } - - dst = route_req(lsk, oreq); - if (!dst) - goto free_or; - - newsk = tcp_create_openreq_child(lsk, oreq, tcphdr_skb); - if (!newsk) - goto free_dst; - - egress = offload_get_phys_egress(dst->neighbour->dev, newsk, TOE_OPEN); - if (!egress || TOEDEV(egress) != dev) - goto free_dst; - - e = t3_l2t_get(TOM_DATA(dev)->cdev, dst->neighbour, egress); - if (!e) - goto free_sk; - - - if (sock_flag(newsk, SOCK_KEEPOPEN)) - inet_csk_delete_keepalive_timer(newsk); - oreq->ts_recent = G_PASS_OPEN_TID(ntohl(req->tos_tid)); - newsk->sk_user_data = oreq; - sk_setup_caps(newsk, dst); - - newtp = tcp_sk(newsk); - init_offload_sk(newsk, dev, tid, e, dst); - DELACK_SEQ(newtp) = newtp->rcv_nxt; - RCV_WSCALE(newtp) = select_rcv_wscale(tcp_full_space(newsk), - WSCALE_OK(newtp), - newtp->window_clamp); - -#ifdef LINUX_2_4 - newsk->daddr = req->peer_ip; - newsk->rcv_saddr = req->local_ip; - newsk->saddr = req->local_ip; -#else - inet_sk(newsk)->daddr = req->peer_ip; - inet_sk(newsk)->rcv_saddr = req->local_ip; - inet_sk(newsk)->saddr = req->local_ip; -#endif /* LINUX_2_4 */ - - lsk->sk_prot->hash(newsk); - inet_inherit_port(&tcp_hashinfo, lsk, newsk); - install_offload_ops(newsk); - bh_unlock_sock(newsk); // counters tcp_create_openreq_child() - return newsk; - -free_sk: - sk_free(newsk); -free_dst: - dst_release(dst); -free_or: - __reqsk_free(oreq); -out_err: -#endif - return NULL; -} -#endif - -/* * Populate a reject CPL_PASS_ACCEPT_RPL WR. */ static void @@ -2686,7 +2611,7 @@ nam.sin_len = sizeof(struct sockaddr_in); nam.sin_family = AF_INET; - memcpy(&nam.sin_addr, &req->peer_ip, 4); + nam.sin_addr.s_addr =req->peer_ip; dst = rtalloc2((struct sockaddr *)&nam, 1, 0); if (dst == NULL) { @@ -2694,7 +2619,8 @@ DPRINTF("failed to find route\n"); } - e = newtoep->tp_l2t = t3_l2t_get(d->cdev, dst, tim.dev); + e = newtoep->tp_l2t = t3_l2t_get(d->cdev, dst, tim.dev, + (struct sockaddr *)&nam); if (e == NULL) { DPRINTF("failed to get l2t\n"); @@ -3000,7 +2926,7 @@ toep->tp_tp = tp; toep->tp_flags = 0; tp->t_toe = toep; - reset_wr_list(tp); + reset_wr_list(toep); tp->rcv_wnd = select_rcv_wnd(so); DPRINTF("rcv_wnd=%ld\n", tp->rcv_wnd); install_offload_ops(so); @@ -3141,7 +3067,7 @@ #endif soisconnected(so); - tp->t_state = TCPS_ESTABLISHED; + toep->tp_state = tp->t_state = TCPS_ESTABLISHED; tcpstat.tcps_connects++; } @@ -3157,10 +3083,19 @@ unsigned int atid = G_PASS_OPEN_TID(ntohl(req->tos_tid)); struct toepcb *toep = (struct toepcb *)ctx; struct tcpcb *tp = toep->tp_tp; - struct socket *so = toeptoso(toep); - struct toedev *tdev = TOE_DEV(so); /* blow up here if link was down */ - struct tom_data *d = TOM_DATA(tdev); - + struct socket *so; + struct toedev *tdev; + struct tom_data *d; + + if (tp == NULL) { + free_atid(cdev, atid); + return (0); + } + + so = toeptoso(toep); + tdev = TOE_DEV(so); /* blow up here if link was down */ + d = TOM_DATA(tdev); + INP_LOCK(tp->t_inpcb); /* @@ -3175,7 +3110,7 @@ socket_act_establish(so, m); INP_UNLOCK(tp->t_inpcb); - return 0; + return (0); } /* @@ -3201,7 +3136,7 @@ toep->tp_wr_unacked = toep->tp_wr_max - toep->tp_wr_avail; while (credits) { - struct mbuf *p = peek_wr(tp); + struct mbuf *p = peek_wr(toep); DPRINTF("p->credits=%d p->bytes=%d\n", p->m_pkthdr.csum_data, p->m_pkthdr.len) ; if (__predict_false(!p)) { @@ -3227,7 +3162,7 @@ p->m_pkthdr.csum_data -= credits; break; } else { - dequeue_wr(tp); + dequeue_wr(toep); credits -= p->m_pkthdr.csum_data; bytes += p->m_pkthdr.len; DPRINTF("done with wr of %d bytes\n", p->m_pkthdr.len); @@ -3323,8 +3258,12 @@ TAILQ_FOREACH(so, &listen_so->so_comp, so_list) { tp = sototcpcb(so); - if (tp->t_flags & TF_TOE) + if (tp->t_flags & TF_TOE) { + INP_LOCK(tp->t_inpcb); t3_reset_listen_child(so); + INP_UNLOCK(tp->t_inpcb); + } + } } ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#4 (text+ko) ==== @@ -173,7 +173,7 @@ int rcv_flags, int modulate, int post_kbuf); int t3_enter_ddp(struct socket *so, unsigned int kbuf_size, unsigned int waitall); void t3_cleanup_ddp(struct socket *so); -void t3_release_ddp_resources(struct socket *so); +void t3_release_ddp_resources(struct toepcb *toep); void t3_cancel_ddpbuf(struct socket *so, unsigned int bufidx); void t3_overlay_ddpbuf(struct socket *so, unsigned int bufidx, unsigned int tag0, unsigned int tag1, unsigned int len); ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#3 (text+ko) ==== @@ -20,7 +20,8 @@ int tp_flags; int tp_enqueued_bytes; int tp_page_count; - + int tp_state; + tcp_seq tp_iss; tcp_seq tp_delack_seq; tcp_seq tp_rcv_wup; @@ -40,41 +41,32 @@ struct ddp_state tp_ddp_state; }; -static inline void reset_wr_list(struct tcpcb *tp) +static inline void reset_wr_list(struct toepcb *toep) { - struct toepcb *toep = tp->t_toe; - mbufq_init(&toep->wr_list); } -static inline void purge_wr_queue(struct tcpcb *tp) +static inline void purge_wr_queue(struct toepcb *toep) { - struct toepcb *toep = tp->t_toe; struct mbuf *m; while ((m = mbufq_dequeue(&toep->wr_list)) != NULL) m_freem(m); } -static inline void enqueue_wr(struct tcpcb *tp, struct mbuf *m) +static inline void enqueue_wr(struct toepcb *toep, struct mbuf *m) { - struct toepcb *toep = tp->t_toe; - mbufq_tail(&toep->wr_list, m); } -static inline struct mbuf *peek_wr(struct tcpcb *tp) +static inline struct mbuf *peek_wr(struct toepcb *toep) { - struct toepcb *toep = tp->t_toe; - return mbufq_peek(&toep->wr_list); } -static inline struct mbuf *dequeue_wr(struct tcpcb *tp) +static inline struct mbuf *dequeue_wr(struct toepcb *toep) { - struct toepcb *toep = tp->t_toe; - return mbufq_dequeue(&toep->wr_list); } ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom.h#14 (text+ko) ==== @@ -122,6 +122,7 @@ #define TOM_DATA(dev) (*(struct tom_data **)&(dev)->l4opt) #define T3C_DEV(sk) ((TOM_DATA(TOE_DEV(sk)))->cdev) +#define TOEP_T3C_DEV(toep) (TOM_DATA(toep->tp_toedev)->cdev) #define TOM_TUNABLE(dev, param) (TOM_DATA(dev)->conf.param) #define TP_DATASENT (1 << 0) From owner-p4-projects@FreeBSD.ORG Mon Dec 10 04:06:18 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB0E716A421; Mon, 10 Dec 2007 04:06:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0D21316A41A for ; Mon, 10 Dec 2007 04:06:17 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ED8EF13C44B for ; Mon, 10 Dec 2007 04:06:16 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBA46G4P002490 for ; Mon, 10 Dec 2007 04:06:16 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBA45xWQ002474 for perforce@freebsd.org; Mon, 10 Dec 2007 04:05:59 GMT (envelope-from marcel@freebsd.org) Date: Mon, 10 Dec 2007 04:05:59 GMT Message-Id: <200712100405.lBA45xWQ002474@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 130583 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Dec 2007 04:06:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=130583 Change 130583 by marcel@marcel_xcllnt on 2007/12/10 04:05:29 IFC @130571 Affected files ... .. //depot/projects/usiii/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/usiii/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/usiii/amd64/amd64/exception.S#2 integrate .. //depot/projects/usiii/amd64/amd64/genassym.c#3 integrate .. //depot/projects/usiii/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/usiii/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/usiii/amd64/amd64/local_apic.c#3 integrate .. //depot/projects/usiii/amd64/amd64/machdep.c#2 integrate .. //depot/projects/usiii/amd64/amd64/msi.c#2 integrate .. //depot/projects/usiii/amd64/amd64/nexus.c#2 integrate .. //depot/projects/usiii/amd64/amd64/pmap.c#2 integrate .. //depot/projects/usiii/amd64/amd64/prof_machdep.c#2 integrate .. //depot/projects/usiii/amd64/amd64/stack_machdep.c#1 branch .. //depot/projects/usiii/amd64/amd64/trap.c#2 integrate .. //depot/projects/usiii/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/usiii/amd64/conf/DEFAULTS#2 integrate .. //depot/projects/usiii/amd64/conf/GENERIC#3 integrate .. //depot/projects/usiii/amd64/conf/GENERIC.hints#2 integrate .. //depot/projects/usiii/amd64/conf/NOTES#2 integrate .. //depot/projects/usiii/amd64/include/clock.h#2 integrate .. //depot/projects/usiii/amd64/include/pc/bios.h#2 integrate .. //depot/projects/usiii/amd64/include/pci_cfgreg.h#2 integrate .. //depot/projects/usiii/amd64/include/pmc_mdep.h#2 integrate .. //depot/projects/usiii/amd64/include/specialreg.h#2 integrate .. //depot/projects/usiii/amd64/include/stack.h#1 branch .. //depot/projects/usiii/amd64/isa/clock.c#3 integrate .. //depot/projects/usiii/amd64/pci/pci_cfgreg.c#2 integrate .. //depot/projects/usiii/arm/arm/bcopy_page.S#2 integrate .. //depot/projects/usiii/arm/arm/bcopyinout.S#2 integrate .. //depot/projects/usiii/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/usiii/arm/arm/cpufunc.c#2 integrate .. //depot/projects/usiii/arm/arm/cpufunc_asm_arm11.S#1 branch .. //depot/projects/usiii/arm/arm/cpufunc_asm_armv5.S#1 branch .. //depot/projects/usiii/arm/arm/cpufunc_asm_armv5_ec.S#1 branch .. //depot/projects/usiii/arm/arm/db_trace.c#2 integrate .. //depot/projects/usiii/arm/arm/identcpu.c#2 integrate .. //depot/projects/usiii/arm/arm/in_cksum_arm.S#2 integrate .. //depot/projects/usiii/arm/arm/nexus_io.c#2 delete .. //depot/projects/usiii/arm/arm/nexus_io_asm.S#2 delete .. //depot/projects/usiii/arm/arm/pmap.c#3 integrate .. //depot/projects/usiii/arm/arm/stack_machdep.c#1 branch .. //depot/projects/usiii/arm/arm/support.S#2 integrate .. //depot/projects/usiii/arm/arm/swtch.S#2 integrate .. //depot/projects/usiii/arm/arm/trap.c#2 integrate .. //depot/projects/usiii/arm/arm/vm_machdep.c#3 integrate .. //depot/projects/usiii/arm/at91/at91_mcireg.h#2 integrate .. //depot/projects/usiii/arm/at91/at91rm92reg.h#2 integrate .. //depot/projects/usiii/arm/at91/if_ate.c#2 integrate .. //depot/projects/usiii/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/usiii/arm/at91/ohci_atmelarm.c#2 integrate .. //depot/projects/usiii/arm/at91/std.at91#2 integrate .. //depot/projects/usiii/arm/at91/std.kb920x#2 integrate .. //depot/projects/usiii/arm/at91/uart_cpu_at91rm9200usart.c#2 integrate .. //depot/projects/usiii/arm/conf/AVILA#3 integrate .. //depot/projects/usiii/arm/conf/BWCT#2 integrate .. //depot/projects/usiii/arm/conf/CRB#3 integrate .. //depot/projects/usiii/arm/conf/EP80219#2 integrate .. //depot/projects/usiii/arm/conf/HL200#1 branch .. //depot/projects/usiii/arm/conf/IQ31244#2 integrate .. //depot/projects/usiii/arm/conf/KB920X#2 integrate .. //depot/projects/usiii/arm/conf/SIMICS#2 integrate .. //depot/projects/usiii/arm/conf/SKYEYE#2 integrate .. //depot/projects/usiii/arm/include/armreg.h#2 integrate .. //depot/projects/usiii/arm/include/asm.h#2 integrate .. //depot/projects/usiii/arm/include/asmacros.h#3 integrate .. //depot/projects/usiii/arm/include/atomic.h#2 integrate .. //depot/projects/usiii/arm/include/cpuconf.h#2 integrate .. //depot/projects/usiii/arm/include/cpufunc.h#2 integrate .. //depot/projects/usiii/arm/include/pmc_mdep.h#2 integrate .. //depot/projects/usiii/arm/include/stack.h#1 branch .. //depot/projects/usiii/arm/sa11x0/assabet_machdep.c#2 integrate .. //depot/projects/usiii/arm/sa11x0/files.sa11x0#2 integrate .. //depot/projects/usiii/arm/xscale/i80321/ep80219_machdep.c#2 integrate .. //depot/projects/usiii/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/usiii/arm/xscale/i8134x/crb_machdep.c#3 integrate .. //depot/projects/usiii/arm/xscale/ixp425/avila_machdep.c#2 integrate .. //depot/projects/usiii/arm/xscale/ixp425/if_npe.c#2 integrate .. //depot/projects/usiii/arm/xscale/ixp425/ixp425_qmgr.c#2 integrate .. //depot/projects/usiii/boot/arm/at91/boot2/boot2.c#2 integrate .. //depot/projects/usiii/boot/arm/at91/libat91/eeprom.c#2 integrate .. //depot/projects/usiii/boot/arm/at91/libat91/emac.c#2 integrate .. //depot/projects/usiii/boot/arm/at91/libat91/emac_init.c#2 integrate .. //depot/projects/usiii/boot/arm/at91/libat91/lib.h#2 integrate .. //depot/projects/usiii/boot/common/loader.8#2 integrate .. //depot/projects/usiii/boot/common/module.c#2 integrate .. //depot/projects/usiii/boot/common/ufsread.c#2 integrate .. //depot/projects/usiii/boot/ficl/Makefile#2 integrate .. //depot/projects/usiii/boot/i386/Makefile#2 integrate .. //depot/projects/usiii/boot/i386/boot2/boot2.c#2 integrate .. //depot/projects/usiii/boot/i386/cdboot/cdboot.s#2 integrate .. //depot/projects/usiii/boot/i386/gptboot/Makefile#1 branch .. //depot/projects/usiii/boot/i386/gptboot/gptboot.c#1 branch .. //depot/projects/usiii/boot/i386/gptboot/gptldr.S#1 branch .. //depot/projects/usiii/boot/i386/libi386/Makefile#2 integrate .. //depot/projects/usiii/boot/i386/libi386/bioscd.c#2 integrate .. //depot/projects/usiii/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/projects/usiii/boot/i386/libi386/biosmem.c#2 integrate .. //depot/projects/usiii/boot/i386/libi386/biossmap.c#2 integrate .. //depot/projects/usiii/boot/i386/libi386/devicename.c#2 integrate .. //depot/projects/usiii/boot/i386/libi386/pxe.c#2 integrate .. //depot/projects/usiii/boot/i386/loader/main.c#2 integrate .. //depot/projects/usiii/boot/i386/pmbr/Makefile#1 branch .. //depot/projects/usiii/boot/i386/pmbr/pmbr.s#1 branch .. //depot/projects/usiii/boot/pc98/Makefile.inc#2 integrate .. //depot/projects/usiii/boot/pc98/boot2/boot.c#2 integrate .. //depot/projects/usiii/boot/pc98/cdboot/cdboot.s#2 integrate .. //depot/projects/usiii/boot/pc98/libpc98/bioscd.c#2 integrate .. //depot/projects/usiii/boot/pc98/libpc98/biosdisk.c#2 integrate .. //depot/projects/usiii/boot/pc98/loader/main.c#2 integrate .. //depot/projects/usiii/bsm/audit.h#2 integrate .. //depot/projects/usiii/cam/cam_xpt.c#2 integrate .. //depot/projects/usiii/cam/scsi/scsi_all.h#2 integrate .. //depot/projects/usiii/compat/freebsd32/freebsd32.h#2 integrate .. //depot/projects/usiii/compat/freebsd32/freebsd32_ipc.h#1 branch .. //depot/projects/usiii/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/usiii/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/usiii/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/usiii/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/usiii/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/usiii/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/usiii/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/usiii/compat/linux/linux_file.c#2 integrate .. //depot/projects/usiii/compat/linux/linux_getcwd.c#2 integrate .. //depot/projects/usiii/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/usiii/compat/linux/linux_ioctl.h#2 integrate .. //depot/projects/usiii/compat/linux/linux_misc.c#2 integrate .. //depot/projects/usiii/compat/ndis/ndis_var.h#2 integrate .. //depot/projects/usiii/compat/ndis/ntoskrnl_var.h#2 integrate .. //depot/projects/usiii/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/usiii/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/usiii/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate .. //depot/projects/usiii/compat/opensolaris/rpc/xdr.h#2 integrate .. //depot/projects/usiii/compat/opensolaris/sys/atomic.h#2 integrate .. //depot/projects/usiii/compat/opensolaris/sys/bitmap.h#1 branch .. //depot/projects/usiii/compat/opensolaris/sys/cpupart.h#1 branch .. //depot/projects/usiii/compat/opensolaris/sys/cpuvar.h#1 branch .. //depot/projects/usiii/compat/opensolaris/sys/cyclic.h#1 branch .. //depot/projects/usiii/compat/opensolaris/sys/elf.h#1 branch .. //depot/projects/usiii/compat/opensolaris/sys/kcondvar.h#2 integrate .. //depot/projects/usiii/compat/opensolaris/sys/kmem.h#2 integrate .. //depot/projects/usiii/compat/opensolaris/sys/mman.h#1 branch .. //depot/projects/usiii/compat/opensolaris/sys/modctl.h#1 branch .. //depot/projects/usiii/compat/opensolaris/sys/mutex.h#2 integrate .. //depot/projects/usiii/compat/opensolaris/sys/objfs.h#1 branch .. //depot/projects/usiii/compat/opensolaris/sys/param.h#1 branch .. //depot/projects/usiii/compat/opensolaris/sys/pcpu.h#1 branch .. //depot/projects/usiii/compat/opensolaris/sys/proc.h#2 integrate .. //depot/projects/usiii/compat/opensolaris/sys/rwlock.h#2 integrate .. //depot/projects/usiii/compat/opensolaris/sys/stat.h#1 branch .. //depot/projects/usiii/compat/opensolaris/sys/time.h#2 integrate .. //depot/projects/usiii/compat/opensolaris/sys/types.h#2 integrate .. //depot/projects/usiii/compat/pecoff/imgact_pecoff.c#2 integrate .. //depot/projects/usiii/compat/svr4/imgact_svr4.c#2 integrate .. //depot/projects/usiii/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/usiii/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/usiii/conf/Makefile.amd64#2 integrate .. //depot/projects/usiii/conf/NOTES#4 integrate .. //depot/projects/usiii/conf/files#3 integrate .. //depot/projects/usiii/conf/files.amd64#2 integrate .. //depot/projects/usiii/conf/files.arm#2 integrate .. //depot/projects/usiii/conf/files.i386#2 integrate .. //depot/projects/usiii/conf/files.ia64#2 integrate .. //depot/projects/usiii/conf/files.pc98#2 integrate .. //depot/projects/usiii/conf/files.powerpc#2 integrate .. //depot/projects/usiii/conf/files.sparc64#3 integrate .. //depot/projects/usiii/conf/files.sun4v#2 integrate .. //depot/projects/usiii/conf/kmod.mk#2 integrate .. //depot/projects/usiii/conf/newvers.sh#2 integrate .. //depot/projects/usiii/conf/options#3 integrate .. //depot/projects/usiii/conf/options.amd64#2 integrate .. //depot/projects/usiii/conf/options.arm#2 integrate .. //depot/projects/usiii/conf/options.i386#2 integrate .. //depot/projects/usiii/contrib/dev/wpi/LICENSE#1 branch .. //depot/projects/usiii/contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu#1 branch .. //depot/projects/usiii/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/projects/usiii/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/usiii/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/usiii/contrib/ipfilter/netinet/ip_fil.h#2 integrate .. //depot/projects/usiii/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/usiii/contrib/ipfilter/netinet/ip_frag.c#2 integrate .. //depot/projects/usiii/contrib/ipfilter/netinet/ip_htable.c#2 integrate .. //depot/projects/usiii/contrib/ipfilter/netinet/ip_log.c#2 integrate .. //depot/projects/usiii/contrib/ipfilter/netinet/ip_lookup.c#2 integrate .. //depot/projects/usiii/contrib/ipfilter/netinet/ip_lookup.h#2 integrate .. //depot/projects/usiii/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/usiii/contrib/ipfilter/netinet/ip_nat.h#2 integrate .. //depot/projects/usiii/contrib/ipfilter/netinet/ip_pool.c#2 integrate .. //depot/projects/usiii/contrib/ipfilter/netinet/ip_pool.h#2 integrate .. //depot/projects/usiii/contrib/ipfilter/netinet/ip_proxy.c#2 integrate .. //depot/projects/usiii/contrib/ipfilter/netinet/ip_rpcb_pxy.c#2 integrate .. //depot/projects/usiii/contrib/ipfilter/netinet/ip_scan.c#2 integrate .. //depot/projects/usiii/contrib/ipfilter/netinet/ip_state.c#2 integrate .. //depot/projects/usiii/contrib/ipfilter/netinet/ip_state.h#2 integrate .. //depot/projects/usiii/contrib/ipfilter/netinet/ip_sync.c#2 integrate .. //depot/projects/usiii/contrib/ipfilter/netinet/ipl.h#2 integrate .. //depot/projects/usiii/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate .. //depot/projects/usiii/contrib/opensolaris/common/avl/avl.c#2 integrate .. //depot/projects/usiii/contrib/opensolaris/common/nvpair/nvpair.c#2 integrate .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/arc.c#4 integrate .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 integrate .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 integrate .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 integrate .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 integrate .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 integrate .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 integrate .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 integrate .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 integrate .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/zio.c#2 integrate .. //depot/projects/usiii/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 integrate .. //depot/projects/usiii/contrib/opensolaris/uts/common/rpc/xdr.c#2 integrate .. //depot/projects/usiii/contrib/opensolaris/uts/common/rpc/xdr.h#2 integrate .. //depot/projects/usiii/contrib/opensolaris/uts/common/sys/byteorder.h#2 integrate .. //depot/projects/usiii/contrib/opensolaris/uts/common/sys/isa_defs.h#2 integrate .. //depot/projects/usiii/contrib/opensolaris/uts/common/sys/procset.h#2 integrate .. //depot/projects/usiii/contrib/opensolaris/uts/common/sys/sysmacros.h#2 integrate .. //depot/projects/usiii/contrib/opensolaris/uts/common/sys/vfs.h#2 delete .. //depot/projects/usiii/contrib/opensolaris/uts/common/sys/vmem.h#2 integrate .. //depot/projects/usiii/contrib/pf/net/pf.c#2 integrate .. //depot/projects/usiii/contrib/pf/net/pf_if.c#2 integrate .. //depot/projects/usiii/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/usiii/contrib/pf/net/pf_table.c#2 integrate .. //depot/projects/usiii/ddb/db_examine.c#2 integrate .. //depot/projects/usiii/ddb/db_ps.c#3 integrate .. //depot/projects/usiii/dev/aac/aac.c#2 integrate .. //depot/projects/usiii/dev/aac/aac_cam.c#2 integrate .. //depot/projects/usiii/dev/aac/aac_debug.c#2 integrate .. //depot/projects/usiii/dev/aac/aac_pci.c#2 integrate .. //depot/projects/usiii/dev/aac/aacreg.h#2 integrate .. //depot/projects/usiii/dev/aac/aacvar.h#2 integrate .. //depot/projects/usiii/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/usiii/dev/acpica/acpi.c#3 integrate .. //depot/projects/usiii/dev/acpica/acpi_battery.c#2 integrate .. //depot/projects/usiii/dev/acpica/acpi_cpu.c#3 integrate .. //depot/projects/usiii/dev/acpica/acpi_ec.c#3 integrate .. //depot/projects/usiii/dev/acpica/acpi_hpet.c#2 integrate .. //depot/projects/usiii/dev/acpica/acpi_pci.c#3 integrate .. //depot/projects/usiii/dev/acpica/acpi_pci_link.c#2 integrate .. //depot/projects/usiii/dev/acpica/acpi_thermal.c#2 integrate .. //depot/projects/usiii/dev/acpica/acpivar.h#2 integrate .. //depot/projects/usiii/dev/agp/agp.c#1 branch .. //depot/projects/usiii/dev/agp/agp_ali.c#1 branch .. //depot/projects/usiii/dev/agp/agp_amd.c#1 branch .. //depot/projects/usiii/dev/agp/agp_amd64.c#1 branch .. //depot/projects/usiii/dev/agp/agp_ati.c#1 branch .. //depot/projects/usiii/dev/agp/agp_i810.c#1 branch .. //depot/projects/usiii/dev/agp/agp_if.m#1 branch .. //depot/projects/usiii/dev/agp/agp_intel.c#1 branch .. //depot/projects/usiii/dev/agp/agp_nvidia.c#1 branch .. //depot/projects/usiii/dev/agp/agp_sis.c#1 branch .. //depot/projects/usiii/dev/agp/agp_via.c#1 branch .. //depot/projects/usiii/dev/agp/agppriv.h#1 branch .. //depot/projects/usiii/dev/agp/agpreg.h#1 branch .. //depot/projects/usiii/dev/agp/agpvar.h#1 branch .. //depot/projects/usiii/dev/aic7xxx/aic_osm_lib.c#2 integrate .. //depot/projects/usiii/dev/aic7xxx/aic_osm_lib.h#2 integrate .. //depot/projects/usiii/dev/amr/amr.c#2 integrate .. //depot/projects/usiii/dev/amr/amr_cam.c#2 integrate .. //depot/projects/usiii/dev/amr/amr_pci.c#2 integrate .. //depot/projects/usiii/dev/an/if_an.c#3 integrate .. //depot/projects/usiii/dev/an/if_anreg.h#2 integrate .. //depot/projects/usiii/dev/arcmsr/arcmsr.c#2 integrate .. //depot/projects/usiii/dev/arcmsr/arcmsr.h#2 integrate .. //depot/projects/usiii/dev/asmc/asmc.c#1 branch .. //depot/projects/usiii/dev/asmc/asmcvar.h#1 branch .. //depot/projects/usiii/dev/ata/ata-all.c#2 integrate .. //depot/projects/usiii/dev/ata/ata-all.h#2 integrate .. //depot/projects/usiii/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/usiii/dev/ata/ata-disk.c#2 integrate .. //depot/projects/usiii/dev/ata/ata-dma.c#2 integrate .. //depot/projects/usiii/dev/ata/ata-pci.c#2 integrate .. //depot/projects/usiii/dev/ata/ata-pci.h#3 integrate .. //depot/projects/usiii/dev/ata/atapi-cd.c#2 integrate .. //depot/projects/usiii/dev/ata/atapi-cd.h#2 integrate .. //depot/projects/usiii/dev/ata/atapi-fd.c#2 integrate .. //depot/projects/usiii/dev/ata/atapi-tape.c#2 integrate .. //depot/projects/usiii/dev/ath/ath_rate/sample/sample.c#3 integrate .. //depot/projects/usiii/dev/ath/if_ath_pci.c#2 integrate .. //depot/projects/usiii/dev/bce/if_bce.c#2 integrate .. //depot/projects/usiii/dev/bfe/if_bfe.c#2 integrate .. //depot/projects/usiii/dev/bge/if_bge.c#4 integrate .. //depot/projects/usiii/dev/bktr/msp34xx.c#2 integrate .. //depot/projects/usiii/dev/ciss/ciss.c#2 integrate .. //depot/projects/usiii/dev/cm/smc90cx6.c#2 integrate .. //depot/projects/usiii/dev/coretemp/coretemp.c#2 integrate .. //depot/projects/usiii/dev/ctau/if_ct.c#2 integrate .. //depot/projects/usiii/dev/cx/if_cx.c#2 integrate .. //depot/projects/usiii/dev/dc/dcphy.c#2 integrate .. //depot/projects/usiii/dev/dc/if_dc.c#2 integrate .. //depot/projects/usiii/dev/drm/drmP.h#2 integrate .. //depot/projects/usiii/dev/drm/drm_agpsupport.c#2 integrate .. //depot/projects/usiii/dev/em/e1000_80003es2lan.c#2 integrate .. //depot/projects/usiii/dev/em/e1000_80003es2lan.h#2 integrate .. //depot/projects/usiii/dev/em/e1000_82540.c#2 integrate .. //depot/projects/usiii/dev/em/e1000_82541.c#2 integrate .. //depot/projects/usiii/dev/em/e1000_82541.h#2 integrate .. //depot/projects/usiii/dev/em/e1000_82542.c#2 integrate .. //depot/projects/usiii/dev/em/e1000_82543.c#2 integrate .. //depot/projects/usiii/dev/em/e1000_82543.h#2 integrate .. //depot/projects/usiii/dev/em/e1000_82571.c#2 integrate .. //depot/projects/usiii/dev/em/e1000_82571.h#2 integrate .. //depot/projects/usiii/dev/em/e1000_82575.c#2 integrate .. //depot/projects/usiii/dev/em/e1000_82575.h#2 integrate .. //depot/projects/usiii/dev/em/e1000_api.c#2 integrate .. //depot/projects/usiii/dev/em/e1000_api.h#2 integrate .. //depot/projects/usiii/dev/em/e1000_defines.h#2 integrate .. //depot/projects/usiii/dev/em/e1000_hw.h#2 integrate .. //depot/projects/usiii/dev/em/e1000_ich8lan.c#2 integrate .. //depot/projects/usiii/dev/em/e1000_ich8lan.h#2 integrate .. //depot/projects/usiii/dev/em/e1000_mac.c#2 integrate .. //depot/projects/usiii/dev/em/e1000_mac.h#2 integrate .. //depot/projects/usiii/dev/em/e1000_manage.c#2 integrate .. //depot/projects/usiii/dev/em/e1000_manage.h#2 integrate .. //depot/projects/usiii/dev/em/e1000_nvm.c#2 integrate .. //depot/projects/usiii/dev/em/e1000_nvm.h#2 integrate .. //depot/projects/usiii/dev/em/e1000_osdep.h#2 integrate .. //depot/projects/usiii/dev/em/e1000_phy.c#2 integrate .. //depot/projects/usiii/dev/em/e1000_phy.h#2 integrate .. //depot/projects/usiii/dev/em/e1000_regs.h#2 integrate .. //depot/projects/usiii/dev/em/if_em.c#3 integrate .. //depot/projects/usiii/dev/em/if_em.h#3 integrate .. //depot/projects/usiii/dev/esp/esp_sbus.c#2 integrate .. //depot/projects/usiii/dev/fdc/fdc.c#2 integrate .. //depot/projects/usiii/dev/firewire/firewire.c#2 integrate .. //depot/projects/usiii/dev/flash/at45d.c#2 integrate .. //depot/projects/usiii/dev/gem/if_gem.c#4 integrate .. //depot/projects/usiii/dev/hptmv/entry.c#2 integrate .. //depot/projects/usiii/dev/hwpmc/hwpmc_amd.c#2 integrate .. //depot/projects/usiii/dev/hwpmc/hwpmc_arm.c#2 integrate .. //depot/projects/usiii/dev/hwpmc/hwpmc_ia64.c#2 integrate .. //depot/projects/usiii/dev/hwpmc/hwpmc_logging.c#2 integrate .. //depot/projects/usiii/dev/hwpmc/hwpmc_mod.c#2 integrate .. //depot/projects/usiii/dev/hwpmc/hwpmc_piv.c#2 integrate .. //depot/projects/usiii/dev/hwpmc/hwpmc_powerpc.c#2 integrate .. //depot/projects/usiii/dev/hwpmc/hwpmc_ppro.c#2 integrate .. //depot/projects/usiii/dev/hwpmc/hwpmc_sparc64.c#2 integrate .. //depot/projects/usiii/dev/hwpmc/hwpmc_x86.c#2 integrate .. //depot/projects/usiii/dev/ichsmb/ichsmb_pci.c#2 integrate .. //depot/projects/usiii/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/usiii/dev/ichwd/ichwd.h#2 integrate .. //depot/projects/usiii/dev/idt/idt_pci.c#2 integrate .. //depot/projects/usiii/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/usiii/dev/if_ndis/if_ndis_pci.c#2 integrate .. //depot/projects/usiii/dev/if_ndis/if_ndisvar.h#2 integrate .. //depot/projects/usiii/dev/ipmi/ipmi_kcs.c#2 integrate .. //depot/projects/usiii/dev/ipmi/ipmi_smic.c#2 integrate .. //depot/projects/usiii/dev/ipmi/ipmi_ssif.c#2 integrate .. //depot/projects/usiii/dev/ipw/if_ipw.c#3 integrate .. //depot/projects/usiii/dev/ipw/if_ipwreg.h#2 integrate .. //depot/projects/usiii/dev/ipw/if_ipwvar.h#2 integrate .. //depot/projects/usiii/dev/iscsi/initiator/isc_sm.c#2 integrate .. //depot/projects/usiii/dev/iscsi/initiator/isc_soc.c#2 integrate .. //depot/projects/usiii/dev/isp/isp_freebsd.c#2 integrate .. //depot/projects/usiii/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/usiii/dev/isp/isp_target.c#2 integrate .. //depot/projects/usiii/dev/iwi/if_iwi.c#3 integrate .. //depot/projects/usiii/dev/lge/if_lge.c#2 integrate .. //depot/projects/usiii/dev/md/md.c#2 integrate .. //depot/projects/usiii/dev/mfi/mfi_cam.c#2 integrate .. //depot/projects/usiii/dev/mii/amphy.c#2 integrate .. //depot/projects/usiii/dev/mii/e1000phy.c#2 integrate .. //depot/projects/usiii/dev/mii/e1000phyreg.h#2 integrate .. //depot/projects/usiii/dev/mii/gentbi.c#2 integrate .. //depot/projects/usiii/dev/mii/miidevs#2 integrate .. //depot/projects/usiii/dev/mii/nsphy.c#2 integrate .. //depot/projects/usiii/dev/mii/rgephy.c#2 integrate .. //depot/projects/usiii/dev/mii/rgephyreg.h#2 integrate .. //depot/projects/usiii/dev/mii/rlphy.c#2 integrate .. //depot/projects/usiii/dev/mii/tdkphy.c#2 integrate .. //depot/projects/usiii/dev/mii/ukphy_subr.c#2 integrate .. //depot/projects/usiii/dev/mmc/mmcsd.c#2 integrate .. //depot/projects/usiii/dev/mpt/mpt.c#2 integrate .. //depot/projects/usiii/dev/mpt/mpt.h#2 integrate .. //depot/projects/usiii/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/usiii/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/usiii/dev/msk/if_msk.c#2 integrate .. //depot/projects/usiii/dev/msk/if_mskreg.h#2 integrate .. //depot/projects/usiii/dev/my/if_my.c#2 integrate .. //depot/projects/usiii/dev/nfe/if_nfe.c#3 integrate .. //depot/projects/usiii/dev/nge/if_nge.c#2 integrate .. //depot/projects/usiii/dev/nve/if_nve.c#2 integrate .. //depot/projects/usiii/dev/nvram/nvram.c#1 branch .. //depot/projects/usiii/dev/nxge/if_nxge.c#2 integrate .. //depot/projects/usiii/dev/nxge/if_nxge.h#2 integrate .. //depot/projects/usiii/dev/nxge/include/build-version.h#2 integrate .. //depot/projects/usiii/dev/nxge/include/version.h#2 integrate .. //depot/projects/usiii/dev/nxge/include/xge-debug.h#2 integrate .. //depot/projects/usiii/dev/nxge/include/xge-defs.h#2 integrate .. //depot/projects/usiii/dev/nxge/include/xge-list.h#2 integrate .. //depot/projects/usiii/dev/nxge/include/xge-os-pal.h#2 integrate .. //depot/projects/usiii/dev/nxge/include/xge-os-template.h#2 delete .. //depot/projects/usiii/dev/nxge/include/xge-queue.h#2 integrate .. //depot/projects/usiii/dev/nxge/include/xgehal-channel.h#2 integrate .. //depot/projects/usiii/dev/nxge/include/xgehal-config.h#2 integrate .. //depot/projects/usiii/dev/nxge/include/xgehal-device.h#2 integrate .. //depot/projects/usiii/dev/nxge/include/xgehal-driver.h#2 integrate .. //depot/projects/usiii/dev/nxge/include/xgehal-event.h#2 integrate .. //depot/projects/usiii/dev/nxge/include/xgehal-fifo.h#2 integrate .. //depot/projects/usiii/dev/nxge/include/xgehal-mgmt.h#2 integrate .. //depot/projects/usiii/dev/nxge/include/xgehal-mgmtaux.h#2 integrate .. //depot/projects/usiii/dev/nxge/include/xgehal-mm.h#2 integrate .. //depot/projects/usiii/dev/nxge/include/xgehal-regs.h#2 integrate .. //depot/projects/usiii/dev/nxge/include/xgehal-ring.h#2 integrate .. //depot/projects/usiii/dev/nxge/include/xgehal-stats.h#2 integrate .. //depot/projects/usiii/dev/nxge/include/xgehal-types.h#2 integrate .. //depot/projects/usiii/dev/nxge/include/xgehal.h#2 integrate .. //depot/projects/usiii/dev/nxge/xge-osdep.h#2 integrate .. //depot/projects/usiii/dev/nxge/xgehal/xge-queue.c#2 integrate .. //depot/projects/usiii/dev/nxge/xgehal/xgehal-channel-fp.c#2 integrate .. //depot/projects/usiii/dev/nxge/xgehal/xgehal-channel.c#2 integrate .. //depot/projects/usiii/dev/nxge/xgehal/xgehal-config.c#2 integrate .. //depot/projects/usiii/dev/nxge/xgehal/xgehal-device-fp.c#2 integrate .. //depot/projects/usiii/dev/nxge/xgehal/xgehal-device.c#2 integrate .. //depot/projects/usiii/dev/nxge/xgehal/xgehal-driver.c#2 integrate .. //depot/projects/usiii/dev/nxge/xgehal/xgehal-fifo-fp.c#2 integrate .. //depot/projects/usiii/dev/nxge/xgehal/xgehal-fifo.c#2 integrate .. //depot/projects/usiii/dev/nxge/xgehal/xgehal-mgmt.c#2 integrate .. //depot/projects/usiii/dev/nxge/xgehal/xgehal-mgmtaux.c#2 integrate .. //depot/projects/usiii/dev/nxge/xgehal/xgehal-mm.c#2 integrate .. //depot/projects/usiii/dev/nxge/xgehal/xgehal-ring-fp.c#2 integrate .. //depot/projects/usiii/dev/nxge/xgehal/xgehal-ring.c#2 integrate .. //depot/projects/usiii/dev/nxge/xgehal/xgehal-stats.c#2 integrate .. //depot/projects/usiii/dev/nxge/xgell-version.h#2 integrate .. //depot/projects/usiii/dev/ofw/ofw_disk.c#2 integrate .. //depot/projects/usiii/dev/pccard/pccard_cis_quirks.c#2 integrate .. //depot/projects/usiii/dev/pccard/pccarddevs#2 integrate .. //depot/projects/usiii/dev/pccbb/pccbb.c#3 integrate .. //depot/projects/usiii/dev/pccbb/pccbb_pci.c#3 integrate .. //depot/projects/usiii/dev/pci/pci.c#4 integrate .. //depot/projects/usiii/dev/pci/pci_user.c#3 integrate .. //depot/projects/usiii/dev/puc/puc_pci.c#2 integrate .. //depot/projects/usiii/dev/ral/rt2560.c#4 integrate .. //depot/projects/usiii/dev/ral/rt2661.c#4 integrate .. //depot/projects/usiii/dev/random/harvest.c#2 integrate .. //depot/projects/usiii/dev/random/randomdev_soft.c#2 integrate .. //depot/projects/usiii/dev/random/yarrow.c#2 integrate .. //depot/projects/usiii/dev/re/if_re.c#2 integrate .. //depot/projects/usiii/dev/safe/safe.c#2 integrate .. //depot/projects/usiii/dev/si/si_pci.c#2 integrate .. //depot/projects/usiii/dev/sio/sio.c#2 integrate .. //depot/projects/usiii/dev/sio/sio_isa.c#2 integrate .. //depot/projects/usiii/dev/sio/sio_puc.c#2 integrate .. //depot/projects/usiii/dev/sk/if_sk.c#2 integrate .. //depot/projects/usiii/dev/snp/snp.c#2 integrate .. //depot/projects/usiii/dev/sound/isa/ad1816.c#2 integrate .. //depot/projects/usiii/dev/sound/isa/ad1816.h#2 integrate .. //depot/projects/usiii/dev/sound/midi/sequencer.c#2 integrate .. //depot/projects/usiii/dev/sound/pci/atiixp.c#2 integrate .. //depot/projects/usiii/dev/sound/pci/atiixp.h#2 integrate .. //depot/projects/usiii/dev/sound/pci/emu10kx.c#3 integrate .. //depot/projects/usiii/dev/sound/pci/envy24.c#2 integrate .. //depot/projects/usiii/dev/sound/pci/envy24ht.c#2 integrate .. //depot/projects/usiii/dev/sound/pci/hda/hdac.c#2 integrate .. //depot/projects/usiii/dev/sound/pci/t4dwave.c#2 integrate .. //depot/projects/usiii/dev/sound/pcm/ac97.c#2 integrate .. //depot/projects/usiii/dev/sound/pcm/ac97_patch.c#2 integrate .. //depot/projects/usiii/dev/sound/pcm/channel.c#2 integrate .. //depot/projects/usiii/dev/sound/sbus/cs4231.c#2 integrate .. //depot/projects/usiii/dev/stge/if_stge.c#2 integrate .. //depot/projects/usiii/dev/ti/if_ti.c#2 integrate .. //depot/projects/usiii/dev/twa/tw_cl_init.c#2 integrate .. //depot/projects/usiii/dev/twa/tw_cl_intr.c#2 integrate .. //depot/projects/usiii/dev/twa/tw_cl_io.c#2 integrate .. //depot/projects/usiii/dev/twa/tw_cl_misc.c#2 integrate .. //depot/projects/usiii/dev/twa/tw_cl_share.h#2 integrate .. //depot/projects/usiii/dev/twa/tw_osl.h#2 integrate .. //depot/projects/usiii/dev/twa/tw_osl_cam.c#2 integrate .. //depot/projects/usiii/dev/twa/tw_osl_freebsd.c#2 integrate .. //depot/projects/usiii/dev/twa/tw_osl_share.h#2 integrate .. //depot/projects/usiii/dev/txp/if_txp.c#2 integrate .. //depot/projects/usiii/dev/usb/ehci_pci.c#3 integrate .. //depot/projects/usiii/dev/usb/if_axe.c#3 integrate .. //depot/projects/usiii/dev/usb/if_axereg.h#3 integrate .. //depot/projects/usiii/dev/usb/if_rum.c#4 integrate .. //depot/projects/usiii/dev/usb/if_ural.c#4 integrate .. //depot/projects/usiii/dev/usb/if_zyd.c#4 integrate .. //depot/projects/usiii/dev/usb/if_zydfw.h#2 integrate .. //depot/projects/usiii/dev/usb/if_zydreg.h#2 integrate .. //depot/projects/usiii/dev/usb/uchcom.c#1 branch .. //depot/projects/usiii/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/usiii/dev/usb/uipaq.c#2 integrate .. //depot/projects/usiii/dev/usb/ukbd.c#2 integrate .. //depot/projects/usiii/dev/usb/usb.c#2 integrate .. //depot/projects/usiii/dev/usb/usb_port.h#2 integrate .. //depot/projects/usiii/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/usiii/dev/usb/usbdevs#3 integrate .. //depot/projects/usiii/dev/usb/uscanner.c#2 integrate .. //depot/projects/usiii/dev/utopia/utopia.c#2 integrate .. //depot/projects/usiii/dev/vge/if_vge.c#2 integrate .. //depot/projects/usiii/dev/vx/if_vx_pci.c#2 integrate .. //depot/projects/usiii/dev/wpi/if_wpi.c#1 branch .. //depot/projects/usiii/dev/wpi/if_wpireg.h#1 branch .. //depot/projects/usiii/dev/wpi/if_wpivar.h#1 branch .. //depot/projects/usiii/fs/cd9660/cd9660_vfsops.c#2 integrate .. //depot/projects/usiii/fs/coda/coda_vfsops.c#2 integrate .. //depot/projects/usiii/fs/devfs/devfs_devs.c#2 integrate .. //depot/projects/usiii/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/usiii/fs/fdescfs/fdesc_vfsops.c#2 integrate .. //depot/projects/usiii/fs/hpfs/hpfs_vfsops.c#2 integrate .. //depot/projects/usiii/fs/msdosfs/denode.h#2 integrate .. //depot/projects/usiii/fs/msdosfs/msdosfs_denode.c#2 integrate .. //depot/projects/usiii/fs/msdosfs/msdosfs_fat.c#3 integrate .. //depot/projects/usiii/fs/msdosfs/msdosfs_lookup.c#3 integrate .. //depot/projects/usiii/fs/msdosfs/msdosfs_vfsops.c#2 integrate .. //depot/projects/usiii/fs/msdosfs/msdosfs_vnops.c#3 integrate .. //depot/projects/usiii/fs/ntfs/ntfs_ihash.c#2 integrate .. //depot/projects/usiii/fs/ntfs/ntfs_vfsops.c#3 integrate .. //depot/projects/usiii/fs/nullfs/null_subr.c#2 integrate .. //depot/projects/usiii/fs/nullfs/null_vfsops.c#2 integrate .. //depot/projects/usiii/fs/nullfs/null_vnops.c#2 integrate .. //depot/projects/usiii/fs/nwfs/nwfs_vfsops.c#2 integrate .. //depot/projects/usiii/fs/portalfs/portal_vfsops.c#2 integrate .. //depot/projects/usiii/fs/pseudofs/pseudofs.c#2 integrate .. //depot/projects/usiii/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/usiii/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/usiii/fs/tmpfs/tmpfs.h#2 integrate .. //depot/projects/usiii/fs/tmpfs/tmpfs_subr.c#2 integrate .. //depot/projects/usiii/fs/tmpfs/tmpfs_vfsops.c#2 integrate .. //depot/projects/usiii/fs/tmpfs/tmpfs_vnops.c#2 integrate .. //depot/projects/usiii/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/usiii/fs/unionfs/union.h#2 integrate .. //depot/projects/usiii/fs/unionfs/union_subr.c#2 integrate .. //depot/projects/usiii/fs/unionfs/union_vfsops.c#2 integrate .. //depot/projects/usiii/fs/unionfs/union_vnops.c#2 integrate .. //depot/projects/usiii/geom/bde/g_bde.c#2 integrate .. //depot/projects/usiii/geom/bde/g_bde_work.c#2 integrate .. //depot/projects/usiii/geom/eli/g_eli.c#2 integrate .. //depot/projects/usiii/geom/eli/g_eli_crypto.c#3 integrate .. //depot/projects/usiii/geom/geom_bsd.c#2 integrate .. //depot/projects/usiii/geom/geom_bsd_enc.c#2 integrate .. //depot/projects/usiii/geom/geom_io.c#2 integrate .. //depot/projects/usiii/geom/journal/g_journal.c#2 integrate .. //depot/projects/usiii/geom/label/g_label_reiserfs.c#2 integrate .. //depot/projects/usiii/geom/mirror/g_mirror.c#2 integrate .. //depot/projects/usiii/geom/multipath/g_multipath.c#2 integrate .. //depot/projects/usiii/geom/part/g_part.c#2 integrate .. //depot/projects/usiii/geom/part/g_part.h#2 integrate .. //depot/projects/usiii/geom/part/g_part_apm.c#2 integrate .. //depot/projects/usiii/geom/part/g_part_bsd.c#1 branch .. //depot/projects/usiii/geom/part/g_part_gpt.c#2 integrate .. //depot/projects/usiii/geom/raid3/g_raid3.c#2 integrate .. //depot/projects/usiii/geom/vinum/geom_vinum_drive.c#2 integrate .. //depot/projects/usiii/geom/vinum/geom_vinum_init.c#2 integrate .. //depot/projects/usiii/geom/vinum/geom_vinum_plex.c#2 integrate .. //depot/projects/usiii/geom/vinum/geom_vinum_volume.c#2 integrate .. //depot/projects/usiii/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate .. //depot/projects/usiii/gnu/fs/reiserfs/reiserfs_vfsops.c#2 integrate .. //depot/projects/usiii/gnu/fs/xfs/FreeBSD/xfs_vfs.c#2 integrate .. //depot/projects/usiii/i386/bios/apm.c#2 integrate .. //depot/projects/usiii/i386/conf/DEFAULTS#2 integrate .. //depot/projects/usiii/i386/conf/GENERIC#3 integrate .. //depot/projects/usiii/i386/conf/GENERIC.hints#2 integrate .. //depot/projects/usiii/i386/conf/NOTES#2 integrate .. //depot/projects/usiii/i386/conf/PAE#2 integrate .. //depot/projects/usiii/i386/conf/XBOX#2 integrate .. //depot/projects/usiii/i386/i386/busdma_machdep.c#2 integrate .. //depot/projects/usiii/i386/i386/db_trace.c#2 integrate .. //depot/projects/usiii/i386/i386/exception.s#2 integrate .. //depot/projects/usiii/i386/i386/genassym.c#3 integrate .. //depot/projects/usiii/i386/i386/in_cksum.c#2 integrate .. //depot/projects/usiii/i386/i386/intr_machdep.c#2 integrate .. //depot/projects/usiii/i386/i386/locore.s#2 integrate .. //depot/projects/usiii/i386/i386/machdep.c#2 integrate .. //depot/projects/usiii/i386/i386/mp_machdep.c#2 integrate .. //depot/projects/usiii/i386/i386/msi.c#2 integrate .. //depot/projects/usiii/i386/i386/pmap.c#2 integrate .. //depot/projects/usiii/i386/i386/stack_machdep.c#1 branch .. //depot/projects/usiii/i386/i386/trap.c#2 integrate .. //depot/projects/usiii/i386/i386/vm_machdep.c#2 integrate .. //depot/projects/usiii/i386/ibcs2/ibcs2_misc.c#2 integrate .. //depot/projects/usiii/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/usiii/i386/include/bootinfo.h#2 integrate .. //depot/projects/usiii/i386/include/clock.h#2 integrate .. //depot/projects/usiii/i386/include/in_cksum.h#2 integrate .. //depot/projects/usiii/i386/include/pc/bios.h#2 integrate .. //depot/projects/usiii/i386/include/pmap.h#2 integrate .. //depot/projects/usiii/i386/include/pmc_mdep.h#2 integrate .. //depot/projects/usiii/i386/include/stack.h#1 branch .. //depot/projects/usiii/i386/isa/clock.c#2 integrate .. //depot/projects/usiii/i386/isa/prof_machdep.c#2 integrate .. //depot/projects/usiii/i386/linux/imgact_linux.c#2 integrate .. //depot/projects/usiii/i386/linux/linux_machdep.c#2 integrate .. //depot/projects/usiii/i386/pci/pci_cfgreg.c#2 integrate .. //depot/projects/usiii/i4b/layer1/isic/i4b_avm_a1.c#2 integrate .. //depot/projects/usiii/i4b/layer1/isic/i4b_elsa_pcc16.c#2 integrate .. //depot/projects/usiii/i4b/layer1/isic/i4b_isic.c#2 integrate .. //depot/projects/usiii/i4b/layer1/isic/i4b_itk_ix1.c#2 integrate .. //depot/projects/usiii/i4b/layer1/isic/i4b_tel_s016.c#2 integrate .. //depot/projects/usiii/i4b/layer1/isic/i4b_tel_s0163.c#2 integrate .. //depot/projects/usiii/i4b/layer1/isic/i4b_tel_s08.c#2 integrate .. //depot/projects/usiii/ia64/conf/DEFAULTS#2 integrate .. //depot/projects/usiii/ia64/conf/GENERIC#3 integrate .. //depot/projects/usiii/ia64/disasm/disasm.h#2 integrate .. //depot/projects/usiii/ia64/ia64/busdma_machdep.c#2 integrate .. //depot/projects/usiii/ia64/ia64/db_machdep.c#2 integrate .. //depot/projects/usiii/ia64/ia64/exception.S#2 integrate .. //depot/projects/usiii/ia64/ia64/interrupt.c#2 integrate .. //depot/projects/usiii/ia64/ia64/machdep.c#2 integrate .. //depot/projects/usiii/ia64/ia64/pmap.c#2 integrate .. //depot/projects/usiii/ia64/ia64/stack_machdep.c#1 branch .. //depot/projects/usiii/ia64/ia64/support.S#2 integrate .. //depot/projects/usiii/ia64/ia64/trap.c#2 integrate .. //depot/projects/usiii/ia64/ia64/vm_machdep.c#2 integrate .. //depot/projects/usiii/ia64/include/atomic.h#2 integrate .. //depot/projects/usiii/ia64/include/pmc_mdep.h#2 integrate .. //depot/projects/usiii/kern/imgact_aout.c#2 integrate .. //depot/projects/usiii/kern/imgact_elf.c#2 integrate .. //depot/projects/usiii/kern/imgact_gzip.c#2 integrate .. //depot/projects/usiii/kern/init_main.c#3 integrate .. //depot/projects/usiii/kern/kern_acct.c#3 integrate .. //depot/projects/usiii/kern/kern_alq.c#2 integrate .. //depot/projects/usiii/kern/kern_clock.c#3 integrate .. //depot/projects/usiii/kern/kern_conf.c#2 integrate .. //depot/projects/usiii/kern/kern_cpu.c#2 integrate .. //depot/projects/usiii/kern/kern_descrip.c#2 integrate .. //depot/projects/usiii/kern/kern_environment.c#2 integrate .. //depot/projects/usiii/kern/kern_exec.c#3 integrate .. //depot/projects/usiii/kern/kern_exit.c#2 integrate .. //depot/projects/usiii/kern/kern_fork.c#3 integrate .. //depot/projects/usiii/kern/kern_idle.c#2 integrate .. //depot/projects/usiii/kern/kern_intr.c#2 integrate .. //depot/projects/usiii/kern/kern_jail.c#2 integrate .. //depot/projects/usiii/kern/kern_kse.c#3 integrate .. //depot/projects/usiii/kern/kern_kthread.c#2 integrate .. //depot/projects/usiii/kern/kern_ktrace.c#3 integrate .. //depot/projects/usiii/kern/kern_linker.c#2 integrate .. //depot/projects/usiii/kern/kern_lock.c#2 integrate .. //depot/projects/usiii/kern/kern_mbuf.c#2 integrate .. //depot/projects/usiii/kern/kern_mib.c#2 integrate .. //depot/projects/usiii/kern/kern_module.c#2 integrate .. //depot/projects/usiii/kern/kern_mutex.c#2 integrate .. //depot/projects/usiii/kern/kern_pmc.c#2 integrate .. //depot/projects/usiii/kern/kern_proc.c#3 integrate .. //depot/projects/usiii/kern/kern_prot.c#2 integrate .. //depot/projects/usiii/kern/kern_rmlock.c#1 branch .. //depot/projects/usiii/kern/kern_rwlock.c#2 integrate .. //depot/projects/usiii/kern/kern_shutdown.c#2 integrate .. //depot/projects/usiii/kern/kern_sig.c#2 integrate .. //depot/projects/usiii/kern/kern_switch.c#3 integrate .. //depot/projects/usiii/kern/kern_sx.c#2 integrate .. //depot/projects/usiii/kern/kern_synch.c#3 integrate .. //depot/projects/usiii/kern/kern_sysctl.c#3 integrate .. //depot/projects/usiii/kern/kern_thr.c#2 integrate .. //depot/projects/usiii/kern/kern_thread.c#3 integrate .. //depot/projects/usiii/kern/kern_timeout.c#4 integrate .. //depot/projects/usiii/kern/kern_umtx.c#2 integrate .. //depot/projects/usiii/kern/link_elf.c#2 integrate .. //depot/projects/usiii/kern/link_elf_obj.c#2 integrate .. //depot/projects/usiii/kern/linker_if.m#2 integrate .. //depot/projects/usiii/kern/p1003_1b.c#2 integrate .. //depot/projects/usiii/kern/sched_4bsd.c#3 integrate .. //depot/projects/usiii/kern/sched_ule.c#4 integrate .. //depot/projects/usiii/kern/subr_bus.c#2 integrate .. //depot/projects/usiii/kern/subr_lock.c#3 integrate .. //depot/projects/usiii/kern/subr_param.c#2 integrate .. //depot/projects/usiii/kern/subr_pcpu.c#2 integrate .. //depot/projects/usiii/kern/subr_sleepqueue.c#3 integrate .. //depot/projects/usiii/kern/subr_smp.c#3 integrate .. //depot/projects/usiii/kern/subr_stack.c#2 integrate .. //depot/projects/usiii/kern/subr_taskqueue.c#2 integrate .. //depot/projects/usiii/kern/subr_trap.c#3 integrate .. //depot/projects/usiii/kern/subr_turnstile.c#2 integrate .. //depot/projects/usiii/kern/subr_witness.c#3 integrate .. //depot/projects/usiii/kern/sys_generic.c#2 integrate .. //depot/projects/usiii/kern/sys_pipe.c#2 integrate .. //depot/projects/usiii/kern/sys_process.c#3 integrate .. //depot/projects/usiii/kern/sys_socket.c#2 integrate .. //depot/projects/usiii/kern/syscalls.master#2 integrate .. //depot/projects/usiii/kern/sysv_msg.c#2 integrate .. //depot/projects/usiii/kern/sysv_sem.c#2 integrate .. //depot/projects/usiii/kern/sysv_shm.c#2 integrate .. //depot/projects/usiii/kern/tty_pty.c#2 integrate .. //depot/projects/usiii/kern/uipc_mbuf.c#2 integrate .. //depot/projects/usiii/kern/uipc_mbuf2.c#2 integrate .. //depot/projects/usiii/kern/uipc_sem.c#2 integrate .. //depot/projects/usiii/kern/uipc_sockbuf.c#2 integrate .. //depot/projects/usiii/kern/uipc_socket.c#2 integrate .. //depot/projects/usiii/kern/uipc_syscalls.c#2 integrate .. //depot/projects/usiii/kern/uipc_usrreq.c#2 integrate .. //depot/projects/usiii/kern/vfs_acl.c#2 integrate .. //depot/projects/usiii/kern/vfs_aio.c#2 integrate .. //depot/projects/usiii/kern/vfs_bio.c#3 integrate .. //depot/projects/usiii/kern/vfs_cache.c#3 integrate .. //depot/projects/usiii/kern/vfs_extattr.c#2 integrate .. //depot/projects/usiii/kern/vfs_lookup.c#3 integrate .. //depot/projects/usiii/kern/vfs_mount.c#3 integrate .. //depot/projects/usiii/kern/vfs_subr.c#3 integrate .. //depot/projects/usiii/kern/vfs_syscalls.c#3 integrate .. //depot/projects/usiii/kern/vfs_vnops.c#2 integrate .. //depot/projects/usiii/libkern/arm/ffs.S#2 integrate .. //depot/projects/usiii/modules/Makefile#4 integrate .. //depot/projects/usiii/modules/agp/Makefile#2 integrate .. //depot/projects/usiii/modules/amr/Makefile#2 integrate .. //depot/projects/usiii/modules/asmc/Makefile#1 branch .. //depot/projects/usiii/modules/geom/Makefile#2 integrate .. //depot/projects/usiii/modules/nvram/Makefile#1 branch .. //depot/projects/usiii/modules/nxge/Makefile#2 integrate .. //depot/projects/usiii/modules/uchcom/Makefile#1 branch .. //depot/projects/usiii/modules/wpi/Makefile#1 branch .. //depot/projects/usiii/modules/wpifw/Makefile#1 branch .. //depot/projects/usiii/modules/zfs/Makefile#2 integrate .. //depot/projects/usiii/net/bpf.c#3 integrate .. //depot/projects/usiii/net/bpf.h#2 integrate .. //depot/projects/usiii/net/bridgestp.c#2 integrate .. //depot/projects/usiii/net/bridgestp.h#2 integrate .. //depot/projects/usiii/net/bsd_comp.c#2 integrate .. //depot/projects/usiii/net/ethernet.h#2 integrate .. //depot/projects/usiii/net/ieee8023ad_lacp.c#2 integrate .. //depot/projects/usiii/net/if.c#2 integrate .. //depot/projects/usiii/net/if_atmsubr.c#2 integrate .. //depot/projects/usiii/net/if_bridge.c#3 integrate .. //depot/projects/usiii/net/if_bridgevar.h#2 integrate .. //depot/projects/usiii/net/if_disc.c#2 integrate .. //depot/projects/usiii/net/if_enc.c#2 integrate .. //depot/projects/usiii/net/if_ethersubr.c#3 integrate .. //depot/projects/usiii/net/if_fddisubr.c#2 integrate .. //depot/projects/usiii/net/if_fwsubr.c#2 integrate .. //depot/projects/usiii/net/if_gif.c#2 integrate .. //depot/projects/usiii/net/if_iso88025subr.c#2 integrate .. //depot/projects/usiii/net/if_lagg.c#3 integrate .. //depot/projects/usiii/net/if_lagg.h#2 integrate .. //depot/projects/usiii/net/if_loop.c#2 integrate .. //depot/projects/usiii/net/if_ppp.c#2 integrate .. //depot/projects/usiii/net/if_stf.c#3 integrate .. //depot/projects/usiii/net/if_tun.c#2 integrate .. //depot/projects/usiii/net/if_var.h#2 integrate .. //depot/projects/usiii/net/if_vlan.c#2 integrate .. //depot/projects/usiii/net/pfil.c#2 integrate .. //depot/projects/usiii/net/pfil.h#2 integrate .. //depot/projects/usiii/net/route.c#2 integrate .. //depot/projects/usiii/net80211/ieee80211.c#3 integrate .. //depot/projects/usiii/net80211/ieee80211.h#3 integrate .. //depot/projects/usiii/net80211/ieee80211_freebsd.c#2 integrate .. //depot/projects/usiii/net80211/ieee80211_freebsd.h#3 integrate .. //depot/projects/usiii/net80211/ieee80211_ht.c#4 integrate .. //depot/projects/usiii/net80211/ieee80211_ht.h#3 integrate .. //depot/projects/usiii/net80211/ieee80211_input.c#3 integrate .. //depot/projects/usiii/net80211/ieee80211_ioctl.c#3 integrate .. //depot/projects/usiii/net80211/ieee80211_ioctl.h#4 integrate .. //depot/projects/usiii/net80211/ieee80211_node.c#4 integrate .. //depot/projects/usiii/net80211/ieee80211_node.h#3 integrate .. //depot/projects/usiii/net80211/ieee80211_output.c#3 integrate .. //depot/projects/usiii/net80211/ieee80211_proto.c#4 integrate .. //depot/projects/usiii/net80211/ieee80211_proto.h#4 integrate .. //depot/projects/usiii/net80211/ieee80211_scan.c#2 integrate .. //depot/projects/usiii/net80211/ieee80211_scan_ap.c#2 integrate .. //depot/projects/usiii/net80211/ieee80211_scan_sta.c#2 integrate .. //depot/projects/usiii/net80211/ieee80211_var.h#4 integrate .. //depot/projects/usiii/netatalk/aarp.c#2 integrate .. //depot/projects/usiii/netatalk/ddp_input.c#2 integrate .. //depot/projects/usiii/netatalk/ddp_output.c#2 integrate .. //depot/projects/usiii/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 integrate .. //depot/projects/usiii/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#2 integrate .. //depot/projects/usiii/netgraph/netgraph.h#2 integrate .. //depot/projects/usiii/netgraph/ng_base.c#2 integrate .. //depot/projects/usiii/netgraph/ng_cisco.c#2 integrate .. //depot/projects/usiii/netgraph/ng_l2tp.c#2 integrate .. //depot/projects/usiii/netgraph/ng_pppoe.c#3 integrate .. //depot/projects/usiii/netgraph/ng_socket.c#2 integrate .. //depot/projects/usiii/netinet/accf_data.c#2 integrate .. //depot/projects/usiii/netinet/accf_http.c#2 integrate .. //depot/projects/usiii/netinet/if_ether.c#2 integrate .. //depot/projects/usiii/netinet/igmp.c#2 integrate .. //depot/projects/usiii/netinet/in.c#2 integrate .. //depot/projects/usiii/netinet/in_cksum.c#2 integrate .. //depot/projects/usiii/netinet/in_gif.c#3 integrate .. //depot/projects/usiii/netinet/in_pcb.c#2 integrate .. //depot/projects/usiii/netinet/in_pcb.h#2 integrate .. //depot/projects/usiii/netinet/in_proto.c#2 integrate .. //depot/projects/usiii/netinet/in_rmx.c#2 integrate .. //depot/projects/usiii/netinet/ip.h#2 integrate .. //depot/projects/usiii/netinet/ip_carp.c#2 integrate .. //depot/projects/usiii/netinet/ip_divert.c#2 integrate .. //depot/projects/usiii/netinet/ip_dummynet.c#2 integrate .. //depot/projects/usiii/netinet/ip_dummynet.h#2 integrate .. //depot/projects/usiii/netinet/ip_ecn.c#2 integrate .. //depot/projects/usiii/netinet/ip_encap.c#2 integrate .. //depot/projects/usiii/netinet/ip_fastfwd.c#2 integrate .. //depot/projects/usiii/netinet/ip_fw2.c#4 integrate .. //depot/projects/usiii/netinet/ip_fw_pfil.c#2 integrate .. //depot/projects/usiii/netinet/ip_gre.c#2 integrate .. //depot/projects/usiii/netinet/ip_icmp.c#2 integrate .. //depot/projects/usiii/netinet/ip_id.c#2 integrate .. //depot/projects/usiii/netinet/ip_input.c#2 integrate .. //depot/projects/usiii/netinet/ip_ipsec.c#2 integrate .. //depot/projects/usiii/netinet/ip_mroute.c#2 integrate .. //depot/projects/usiii/netinet/ip_options.c#2 integrate .. //depot/projects/usiii/netinet/ip_output.c#2 integrate .. //depot/projects/usiii/netinet/libalias/alias_util.c#2 integrate .. //depot/projects/usiii/netinet/raw_ip.c#2 integrate .. //depot/projects/usiii/netinet/sctp.h#3 integrate .. //depot/projects/usiii/netinet/sctp_asconf.c#3 integrate .. //depot/projects/usiii/netinet/sctp_bsd_addr.c#3 integrate .. //depot/projects/usiii/netinet/sctp_constants.h#3 integrate .. //depot/projects/usiii/netinet/sctp_indata.c#3 integrate .. //depot/projects/usiii/netinet/sctp_input.c#3 integrate .. //depot/projects/usiii/netinet/sctp_output.c#3 integrate .. //depot/projects/usiii/netinet/sctp_output.h#3 integrate .. //depot/projects/usiii/netinet/sctp_pcb.c#3 integrate .. //depot/projects/usiii/netinet/sctp_pcb.h#3 integrate .. //depot/projects/usiii/netinet/sctp_structs.h#3 integrate .. //depot/projects/usiii/netinet/sctp_timer.c#3 integrate .. //depot/projects/usiii/netinet/sctp_usrreq.c#3 integrate .. //depot/projects/usiii/netinet/sctp_var.h#3 integrate .. //depot/projects/usiii/netinet/sctputil.c#3 integrate .. //depot/projects/usiii/netinet/sctputil.h#3 integrate .. //depot/projects/usiii/netinet/tcp_debug.c#2 integrate .. //depot/projects/usiii/netinet/tcp_hostcache.c#2 integrate .. //depot/projects/usiii/netinet/tcp_input.c#3 integrate .. //depot/projects/usiii/netinet/tcp_output.c#2 integrate .. //depot/projects/usiii/netinet/tcp_reass.c#2 integrate .. //depot/projects/usiii/netinet/tcp_subr.c#4 integrate .. //depot/projects/usiii/netinet/tcp_syncache.c#2 integrate .. //depot/projects/usiii/netinet/tcp_timer.c#4 integrate .. //depot/projects/usiii/netinet/tcp_timewait.c#2 integrate .. //depot/projects/usiii/netinet/tcp_usrreq.c#4 integrate .. //depot/projects/usiii/netinet/tcp_var.h#4 integrate .. //depot/projects/usiii/netinet/udp_usrreq.c#3 integrate .. //depot/projects/usiii/netinet6/in6.c#2 integrate .. //depot/projects/usiii/netinet6/ip6_output.c#2 integrate .. //depot/projects/usiii/netinet6/nd6.c#2 integrate .. //depot/projects/usiii/netinet6/udp6_usrreq.c#3 integrate .. //depot/projects/usiii/netipsec/ipsec.c#2 integrate .. //depot/projects/usiii/netipsec/ipsec.h#2 integrate .. //depot/projects/usiii/netipsec/ipsec_input.c#3 integrate .. //depot/projects/usiii/netipsec/ipsec_output.c#2 integrate .. //depot/projects/usiii/netipsec/keysock.c#2 integrate .. //depot/projects/usiii/netipsec/xform.h#2 integrate .. //depot/projects/usiii/netipsec/xform_ipip.c#2 integrate .. //depot/projects/usiii/netsmb/smb_iod.c#2 integrate .. //depot/projects/usiii/nfs4client/nfs4_vfsops.c#2 integrate .. //depot/projects/usiii/nfsclient/nfs.h#2 integrate .. //depot/projects/usiii/nfsclient/nfs_nfsiod.c#3 integrate .. //depot/projects/usiii/nfsclient/nfs_socket.c#2 integrate .. //depot/projects/usiii/nfsclient/nfs_subs.c#2 integrate .. //depot/projects/usiii/nfsclient/nfs_vfsops.c#2 integrate .. //depot/projects/usiii/nfsclient/nfs_vnops.c#2 integrate .. //depot/projects/usiii/nfsclient/nfsmount.h#2 integrate .. //depot/projects/usiii/nfsserver/nfs.h#2 integrate .. //depot/projects/usiii/nfsserver/nfs_serv.c#2 integrate .. //depot/projects/usiii/nfsserver/nfs_srvsock.c#2 integrate .. //depot/projects/usiii/nfsserver/nfs_srvsubs.c#2 integrate .. //depot/projects/usiii/nfsserver/nfs_syscalls.c#2 integrate .. //depot/projects/usiii/opencrypto/crypto.c#2 integrate .. //depot/projects/usiii/opencrypto/cryptodev.c#2 integrate .. //depot/projects/usiii/pc98/cbus/sio.c#2 integrate .. //depot/projects/usiii/pc98/conf/GENERIC#3 integrate .. //depot/projects/usiii/pc98/include/stack.h#1 branch .. //depot/projects/usiii/pc98/pc98/machdep.c#2 integrate .. //depot/projects/usiii/pci/agp.c#2 delete .. //depot/projects/usiii/pci/agp_ali.c#2 delete .. //depot/projects/usiii/pci/agp_amd.c#2 delete .. //depot/projects/usiii/pci/agp_amd64.c#2 delete .. //depot/projects/usiii/pci/agp_ati.c#2 delete .. //depot/projects/usiii/pci/agp_i810.c#3 delete .. //depot/projects/usiii/pci/agp_if.m#2 delete .. //depot/projects/usiii/pci/agp_intel.c#2 delete .. //depot/projects/usiii/pci/agp_nvidia.c#2 delete .. //depot/projects/usiii/pci/agp_sis.c#2 delete .. //depot/projects/usiii/pci/agp_via.c#3 delete .. //depot/projects/usiii/pci/agppriv.h#2 delete .. //depot/projects/usiii/pci/agpreg.h#2 delete .. //depot/projects/usiii/pci/agpvar.h#2 delete .. //depot/projects/usiii/pci/if_rl.c#2 integrate .. //depot/projects/usiii/pci/if_rlreg.h#2 integrate .. //depot/projects/usiii/pci/if_sf.c#2 integrate .. //depot/projects/usiii/pci/if_ste.c#2 integrate .. //depot/projects/usiii/pci/if_vr.c#2 integrate .. //depot/projects/usiii/pci/if_wb.c#2 integrate .. //depot/projects/usiii/pci/if_xl.c#2 integrate .. //depot/projects/usiii/pci/intpm.c#2 integrate .. //depot/projects/usiii/pci/nfsmb.c#2 integrate .. //depot/projects/usiii/pci/xrpu.c#2 delete .. //depot/projects/usiii/powerpc/conf/GENERIC#3 integrate .. //depot/projects/usiii/powerpc/include/atomic.h#2 integrate .. //depot/projects/usiii/powerpc/include/md_var.h#2 integrate .. //depot/projects/usiii/powerpc/include/pmc_mdep.h#2 integrate .. //depot/projects/usiii/powerpc/include/stack.h#1 branch .. //depot/projects/usiii/powerpc/powerpc/clock.c#2 integrate .. //depot/projects/usiii/powerpc/powerpc/db_trace.c#2 integrate .. //depot/projects/usiii/powerpc/powerpc/genassym.c#2 integrate .. //depot/projects/usiii/powerpc/powerpc/intr_machdep.c#2 integrate .. //depot/projects/usiii/powerpc/powerpc/machdep.c#2 integrate .. //depot/projects/usiii/powerpc/powerpc/mmu_if.m#2 integrate .. //depot/projects/usiii/powerpc/powerpc/mmu_oea.c#2 integrate .. //depot/projects/usiii/powerpc/powerpc/pmap_dispatch.c#2 integrate .. //depot/projects/usiii/powerpc/powerpc/stack_machdep.c#1 branch .. //depot/projects/usiii/powerpc/powerpc/swtch.S#2 integrate .. //depot/projects/usiii/powerpc/powerpc/trap.c#2 integrate .. //depot/projects/usiii/powerpc/powerpc/vm_machdep.c#2 integrate .. //depot/projects/usiii/security/audit/audit.c#2 integrate .. //depot/projects/usiii/security/audit/audit.h#2 integrate .. //depot/projects/usiii/security/audit/audit_bsm.c#2 integrate .. //depot/projects/usiii/security/audit/audit_bsm_klib.c#2 integrate .. //depot/projects/usiii/security/audit/audit_pipe.c#2 integrate .. //depot/projects/usiii/security/audit/audit_syscalls.c#2 integrate .. //depot/projects/usiii/security/audit/audit_worker.c#2 integrate .. //depot/projects/usiii/security/mac/mac_atalk.c#1 branch .. //depot/projects/usiii/security/mac/mac_audit.c#2 integrate .. //depot/projects/usiii/security/mac/mac_framework.h#3 integrate .. //depot/projects/usiii/security/mac/mac_inet.c#2 integrate .. //depot/projects/usiii/security/mac/mac_inet6.c#1 branch .. //depot/projects/usiii/security/mac/mac_internal.h#2 integrate .. //depot/projects/usiii/security/mac/mac_net.c#2 integrate .. //depot/projects/usiii/security/mac/mac_pipe.c#2 integrate .. //depot/projects/usiii/security/mac/mac_policy.h#3 integrate .. //depot/projects/usiii/security/mac/mac_posix_sem.c#2 integrate .. //depot/projects/usiii/security/mac/mac_process.c#2 integrate .. //depot/projects/usiii/security/mac/mac_socket.c#2 integrate .. //depot/projects/usiii/security/mac/mac_syscalls.c#2 integrate .. //depot/projects/usiii/security/mac/mac_system.c#2 integrate .. //depot/projects/usiii/security/mac/mac_sysv_msg.c#2 integrate .. //depot/projects/usiii/security/mac/mac_sysv_sem.c#2 integrate .. //depot/projects/usiii/security/mac/mac_sysv_shm.c#2 integrate .. //depot/projects/usiii/security/mac/mac_vfs.c#3 integrate .. //depot/projects/usiii/security/mac_biba/mac_biba.c#3 integrate .. //depot/projects/usiii/security/mac_bsdextended/mac_bsdextended.c#3 integrate .. //depot/projects/usiii/security/mac_ifoff/mac_ifoff.c#2 integrate .. //depot/projects/usiii/security/mac_lomac/mac_lomac.c#3 integrate .. //depot/projects/usiii/security/mac_mls/mac_mls.c#3 integrate .. //depot/projects/usiii/security/mac_none/mac_none.c#2 integrate .. //depot/projects/usiii/security/mac_partition/mac_partition.c#2 integrate .. //depot/projects/usiii/security/mac_portacl/mac_portacl.c#2 integrate .. //depot/projects/usiii/security/mac_seeotheruids/mac_seeotheruids.c#2 integrate .. //depot/projects/usiii/security/mac_stub/mac_stub.c#3 integrate .. //depot/projects/usiii/security/mac_test/mac_test.c#3 integrate .. //depot/projects/usiii/sparc64/conf/DEFAULTS#2 integrate .. //depot/projects/usiii/sparc64/conf/GENERIC#3 integrate .. //depot/projects/usiii/sparc64/include/pmc_mdep.h#2 integrate .. //depot/projects/usiii/sparc64/include/stack.h#1 branch .. //depot/projects/usiii/sparc64/isa/isa.c#2 integrate .. //depot/projects/usiii/sparc64/pci/ofw_pcibus.c#5 integrate .. //depot/projects/usiii/sparc64/pci/psycho.c#5 integrate .. //depot/projects/usiii/sparc64/pci/psychovar.h#2 integrate .. //depot/projects/usiii/sparc64/sparc64/db_trace.c#2 integrate .. //depot/projects/usiii/sparc64/sparc64/elf_machdep.c#2 integrate .. //depot/projects/usiii/sparc64/sparc64/intr_machdep.c#4 integrate .. //depot/projects/usiii/sparc64/sparc64/machdep.c#2 integrate .. //depot/projects/usiii/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/usiii/sparc64/sparc64/stack_machdep.c#1 branch .. //depot/projects/usiii/sparc64/sparc64/vm_machdep.c#3 integrate .. //depot/projects/usiii/sun4v/conf/GENERIC#3 integrate .. //depot/projects/usiii/sun4v/include/pcpu.h#2 integrate .. //depot/projects/usiii/sun4v/include/pmc_mdep.h#2 integrate .. //depot/projects/usiii/sun4v/include/stack.h#1 branch .. //depot/projects/usiii/sun4v/include/stdarg.h#2 integrate .. //depot/projects/usiii/sun4v/sun4v/db_trace.c#2 integrate .. //depot/projects/usiii/sun4v/sun4v/machdep.c#2 integrate .. //depot/projects/usiii/sun4v/sun4v/pmap.c#2 integrate .. //depot/projects/usiii/sun4v/sun4v/simdisk.c#2 integrate .. //depot/projects/usiii/sun4v/sun4v/stack_machdep.c#1 branch .. //depot/projects/usiii/sun4v/sun4v/trap.c#2 integrate .. //depot/projects/usiii/sun4v/sun4v/vm_machdep.c#3 integrate .. //depot/projects/usiii/sys/_elf_solaris.h#2 delete .. //depot/projects/usiii/sys/_rmlock.h#1 branch .. //depot/projects/usiii/sys/apm.h#2 integrate .. //depot/projects/usiii/sys/ata.h#2 integrate .. //depot/projects/usiii/sys/callout.h#3 integrate .. //depot/projects/usiii/sys/cdefs.h#2 integrate .. //depot/projects/usiii/sys/disklabel.h#2 integrate .. //depot/projects/usiii/sys/elf.h#2 integrate .. //depot/projects/usiii/sys/elf_common.h#2 integrate .. //depot/projects/usiii/sys/eventhandler.h#2 integrate .. //depot/projects/usiii/sys/gpt.h#2 integrate .. //depot/projects/usiii/sys/kernel.h#2 integrate .. //depot/projects/usiii/sys/kthread.h#2 integrate .. //depot/projects/usiii/sys/linker.h#2 integrate .. //depot/projects/usiii/sys/lock.h#2 integrate .. //depot/projects/usiii/sys/lockmgr.h#2 integrate .. //depot/projects/usiii/sys/malloc.h#2 integrate .. //depot/projects/usiii/sys/mbuf.h#2 integrate .. //depot/projects/usiii/sys/mutex.h#2 integrate .. //depot/projects/usiii/sys/param.h#3 integrate .. //depot/projects/usiii/sys/pciio.h#3 integrate .. //depot/projects/usiii/sys/pcpu.h#2 integrate .. //depot/projects/usiii/sys/pmc.h#2 integrate .. //depot/projects/usiii/sys/pmckern.h#2 integrate .. //depot/projects/usiii/sys/pmclog.h#2 integrate .. //depot/projects/usiii/sys/priv.h#2 integrate .. //depot/projects/usiii/sys/proc.h#3 integrate .. //depot/projects/usiii/sys/resource.h#2 integrate .. //depot/projects/usiii/sys/rmlock.h#1 branch .. //depot/projects/usiii/sys/signal.h#2 integrate .. //depot/projects/usiii/sys/signalvar.h#2 integrate .. //depot/projects/usiii/sys/smp.h#2 integrate .. //depot/projects/usiii/sys/stack.h#2 integrate .. //depot/projects/usiii/sys/stat.h#2 integrate .. //depot/projects/usiii/sys/sysctl.h#2 integrate .. //depot/projects/usiii/sys/systm.h#2 integrate .. //depot/projects/usiii/sys/time.h#2 integrate .. //depot/projects/usiii/sys/types.h#2 integrate .. //depot/projects/usiii/sys/ucred.h#2 integrate .. //depot/projects/usiii/sys/umtx.h#2 integrate .. //depot/projects/usiii/sys/user.h#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Dec 10 04:45:50 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E7EEC16A469; Mon, 10 Dec 2007 04:45:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 55F8016A421 for ; Mon, 10 Dec 2007 04:45:49 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 40E9A13C4CE for ; Mon, 10 Dec 2007 04:45:49 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBA4jmPa008249 for ; Mon, 10 Dec 2007 04:45:48 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBA4hq7i007981 for perforce@freebsd.org; Mon, 10 Dec 2007 04:43:52 GMT (envelope-from marcel@freebsd.org) Date: Mon, 10 Dec 2007 04:43:52 GMT Message-Id: <200712100443.lBA4hq7i007981@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 130584 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Dec 2007 04:45:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=130584 Change 130584 by marcel@marcel_xcllnt on 2007/12/10 04:43:48 IFC @130571 Affected files ... .. //depot/projects/gdb/Makefile#15 integrate .. //depot/projects/gdb/Makefile.inc1#21 integrate .. //depot/projects/gdb/ObsoleteFiles.inc#7 integrate .. //depot/projects/gdb/UPDATING#30 integrate .. //depot/projects/gdb/bin/ed/Makefile#5 integrate .. //depot/projects/gdb/bin/getfacl/getfacl.c#3 integrate .. //depot/projects/gdb/bin/ln/ln.1#6 integrate .. //depot/projects/gdb/bin/ln/ln.c#4 integrate .. //depot/projects/gdb/bin/mv/mv.1#5 integrate .. //depot/projects/gdb/bin/ps/extern.h#6 integrate .. //depot/projects/gdb/bin/ps/keyword.c#8 integrate .. //depot/projects/gdb/bin/ps/print.c#10 integrate .. //depot/projects/gdb/bin/ps/ps.c#17 integrate .. //depot/projects/gdb/bin/sh/Makefile#6 integrate .. //depot/projects/gdb/bin/sh/eval.c#5 integrate .. //depot/projects/gdb/bin/sh/sh.1#8 integrate .. //depot/projects/gdb/cddl/Makefile.inc#2 integrate .. //depot/projects/gdb/cddl/lib/Makefile#3 integrate .. //depot/projects/gdb/cddl/lib/libnvpair/Makefile#2 integrate .. //depot/projects/gdb/cddl/sbin/zfs/Makefile#2 integrate .. //depot/projects/gdb/cddl/sbin/zpool/Makefile#2 integrate .. //depot/projects/gdb/cddl/usr.bin/Makefile#3 integrate .. //depot/projects/gdb/cddl/usr.bin/ztest/Makefile#2 integrate .. //depot/projects/gdb/cddl/usr.sbin/Makefile#3 integrate .. //depot/projects/gdb/cddl/usr.sbin/zdb/Makefile#2 integrate .. //depot/projects/gdb/compat/opensolaris/include/alloca.h#1 branch .. //depot/projects/gdb/compat/opensolaris/include/fcntl.h#1 branch .. //depot/projects/gdb/compat/opensolaris/include/stdio.h#1 branch .. //depot/projects/gdb/compat/opensolaris/include/stdlib.h#1 branch .. //depot/projects/gdb/compat/opensolaris/include/strings.h#1 branch .. //depot/projects/gdb/compat/opensolaris/include/unistd.h#1 branch .. //depot/projects/gdb/contrib/amd/AUTHORS#3 integrate .. //depot/projects/gdb/contrib/amd/BUGS#3 integrate .. //depot/projects/gdb/contrib/amd/COPYING#3 integrate .. //depot/projects/gdb/contrib/amd/ChangeLog#3 integrate .. //depot/projects/gdb/contrib/amd/FAQ#1 branch .. //depot/projects/gdb/contrib/amd/INSTALL#3 integrate .. //depot/projects/gdb/contrib/amd/NEWS#3 integrate .. //depot/projects/gdb/contrib/amd/README.attrcache#1 branch .. //depot/projects/gdb/contrib/amd/README.ldap#2 integrate .. //depot/projects/gdb/contrib/amd/amd/am_ops.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/amd.8#4 integrate .. //depot/projects/gdb/contrib/amd/amd/amd.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/amd.h#3 integrate .. //depot/projects/gdb/contrib/amd/amd/amfs_auto.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/amfs_direct.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/amfs_error.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/amfs_generic.c#1 branch .. //depot/projects/gdb/contrib/amd/amd/amfs_host.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/amfs_inherit.c#3 delete .. //depot/projects/gdb/contrib/amd/amd/amfs_link.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/amfs_linkx.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/amfs_nfsl.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/amfs_nfsx.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/amfs_program.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/amfs_root.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/amfs_toplvl.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/amfs_union.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/amq_subr.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/amq_svc.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/autil.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/clock.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/conf.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/conf_parse.y#3 integrate .. //depot/projects/gdb/contrib/amd/amd/conf_tok.l#3 integrate .. //depot/projects/gdb/contrib/amd/amd/get_args.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/info_exec.c#1 branch .. //depot/projects/gdb/contrib/amd/amd/info_file.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/info_hesiod.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/info_ldap.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/info_ndbm.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/info_nis.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/info_nisplus.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/info_passwd.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/info_union.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/map.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/mapc.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/mntfs.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/nfs_prot_svc.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/nfs_start.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/nfs_subr.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/ops_TEMPLATE.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/ops_cachefs.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/ops_cdfs.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/ops_efs.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/ops_lofs.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/ops_mfs.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/ops_nfs.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/ops_nfs3.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/ops_nullfs.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/ops_pcfs.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/ops_tfs.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/ops_tmpfs.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/ops_ufs.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/ops_umapfs.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/ops_unionfs.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/ops_xfs.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/opts.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/readdir.c#1 branch .. //depot/projects/gdb/contrib/amd/amd/restart.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/rpc_fwd.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/sched.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/srvr_amfs_auto.c#3 integrate .. //depot/projects/gdb/contrib/amd/amd/srvr_nfs.c#3 integrate .. //depot/projects/gdb/contrib/amd/amq/amq.8#5 integrate .. //depot/projects/gdb/contrib/amd/amq/amq.c#3 integrate .. //depot/projects/gdb/contrib/amd/amq/amq.h#3 integrate .. //depot/projects/gdb/contrib/amd/amq/amq_clnt.c#3 integrate .. //depot/projects/gdb/contrib/amd/amq/amq_xdr.c#3 integrate .. //depot/projects/gdb/contrib/amd/amq/pawd.1#4 integrate .. //depot/projects/gdb/contrib/amd/amq/pawd.c#3 integrate .. //depot/projects/gdb/contrib/amd/aux_conf.h.in#2 integrate .. //depot/projects/gdb/contrib/amd/bootstrap#3 integrate .. //depot/projects/gdb/contrib/amd/conf/checkmount/checkmount_bsd44.c#3 integrate .. //depot/projects/gdb/contrib/amd/conf/mtab/mtab_bsd.c#3 integrate .. //depot/projects/gdb/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#3 integrate .. //depot/projects/gdb/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#3 integrate .. //depot/projects/gdb/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#2 integrate .. //depot/projects/gdb/contrib/amd/conf/transp/transp_sockets.c#3 integrate .. //depot/projects/gdb/contrib/amd/conf/trap/trap_default.h#4 integrate .. //depot/projects/gdb/contrib/amd/conf/umount/umount_bsd44.c#3 integrate .. //depot/projects/gdb/contrib/amd/doc/am-utils.texi#3 integrate .. //depot/projects/gdb/contrib/amd/doc/stamp-vti#1 branch .. //depot/projects/gdb/contrib/amd/doc/texinfo.tex#2 integrate .. //depot/projects/gdb/contrib/amd/doc/version.texi#2 integrate .. //depot/projects/gdb/contrib/amd/fixmount/fixmount.8#4 integrate .. //depot/projects/gdb/contrib/amd/fixmount/fixmount.c#3 integrate .. //depot/projects/gdb/contrib/amd/fsinfo/fsi_analyze.c#3 integrate .. //depot/projects/gdb/contrib/amd/fsinfo/fsi_data.h#3 integrate .. //depot/projects/gdb/contrib/amd/fsinfo/fsi_dict.c#3 integrate .. //depot/projects/gdb/contrib/amd/fsinfo/fsi_gram.y#3 integrate .. //depot/projects/gdb/contrib/amd/fsinfo/fsi_lex.l#3 integrate .. //depot/projects/gdb/contrib/amd/fsinfo/fsi_util.c#3 integrate .. //depot/projects/gdb/contrib/amd/fsinfo/fsinfo.8#4 integrate .. //depot/projects/gdb/contrib/amd/fsinfo/fsinfo.c#3 integrate .. //depot/projects/gdb/contrib/amd/fsinfo/fsinfo.h#3 integrate .. //depot/projects/gdb/contrib/amd/fsinfo/wr_atab.c#3 integrate .. //depot/projects/gdb/contrib/amd/fsinfo/wr_bparam.c#3 integrate .. //depot/projects/gdb/contrib/amd/fsinfo/wr_dumpset.c#3 integrate .. //depot/projects/gdb/contrib/amd/fsinfo/wr_exportfs.c#3 integrate .. //depot/projects/gdb/contrib/amd/fsinfo/wr_fstab.c#3 integrate .. //depot/projects/gdb/contrib/amd/hlfsd/hlfsd.8#4 integrate .. //depot/projects/gdb/contrib/amd/hlfsd/hlfsd.c#3 integrate .. //depot/projects/gdb/contrib/amd/hlfsd/hlfsd.h#4 integrate .. //depot/projects/gdb/contrib/amd/hlfsd/homedir.c#3 integrate .. //depot/projects/gdb/contrib/amd/hlfsd/nfs_prot_svc.c#3 integrate .. //depot/projects/gdb/contrib/amd/hlfsd/stubs.c#3 integrate .. //depot/projects/gdb/contrib/amd/include/am_compat.h#2 integrate .. //depot/projects/gdb/contrib/amd/include/am_defs.h#3 integrate .. //depot/projects/gdb/contrib/amd/include/am_utils.h#3 integrate .. //depot/projects/gdb/contrib/amd/include/am_xdr_func.h#3 integrate .. //depot/projects/gdb/contrib/amd/include/amq_defs.h#3 integrate .. //depot/projects/gdb/contrib/amd/include/mount_headers1.h#2 integrate .. //depot/projects/gdb/contrib/amd/include/mount_headers2.h#2 integrate .. //depot/projects/gdb/contrib/amd/ldap-id.ms#2 integrate .. //depot/projects/gdb/contrib/amd/ldap.schema#1 branch .. //depot/projects/gdb/contrib/amd/libamu/alloca.c#2 delete .. //depot/projects/gdb/contrib/amd/libamu/amu.h#3 integrate .. //depot/projects/gdb/contrib/amd/libamu/hasmntopt.c#3 integrate .. //depot/projects/gdb/contrib/amd/libamu/misc_rpc.c#3 integrate .. //depot/projects/gdb/contrib/amd/libamu/mount_fs.c#3 integrate .. //depot/projects/gdb/contrib/amd/libamu/mtab.c#3 integrate .. //depot/projects/gdb/contrib/amd/libamu/nfs_prot_xdr.c#3 integrate .. //depot/projects/gdb/contrib/amd/libamu/strerror.c#3 integrate .. //depot/projects/gdb/contrib/amd/libamu/strutil.c#1 branch .. //depot/projects/gdb/contrib/amd/libamu/util.c#3 delete .. //depot/projects/gdb/contrib/amd/libamu/wire.c#3 integrate .. //depot/projects/gdb/contrib/amd/libamu/xdr_func.c#3 integrate .. //depot/projects/gdb/contrib/amd/libamu/xutil.c#3 integrate .. //depot/projects/gdb/contrib/amd/m4/GNUmakefile#2 delete .. //depot/projects/gdb/contrib/amd/m4/amdgrep#2 delete .. //depot/projects/gdb/contrib/amd/m4/amindent#2 delete .. //depot/projects/gdb/contrib/amd/m4/autopat#2 delete .. //depot/projects/gdb/contrib/amd/m4/chop-aclocal.pl#2 delete .. //depot/projects/gdb/contrib/amd/m4/copy-if-newbig#2 delete .. //depot/projects/gdb/contrib/amd/m4/macros/HEADER#2 delete .. //depot/projects/gdb/contrib/amd/m4/macros/TRAILER#2 delete .. //depot/projects/gdb/contrib/amd/m4/mk-aclocal#2 delete .. //depot/projects/gdb/contrib/amd/m4/mkconf#2 delete .. //depot/projects/gdb/contrib/amd/m4/rmtspc#2 delete .. //depot/projects/gdb/contrib/amd/m4/update_build_version#2 delete .. //depot/projects/gdb/contrib/amd/mk-amd-map/mk-amd-map.8#4 integrate .. //depot/projects/gdb/contrib/amd/mk-amd-map/mk-amd-map.c#3 integrate .. //depot/projects/gdb/contrib/amd/scripts/am-eject.in#2 integrate .. //depot/projects/gdb/contrib/amd/scripts/amd.conf-sample#3 integrate .. //depot/projects/gdb/contrib/amd/scripts/amd.conf.5#5 integrate .. //depot/projects/gdb/contrib/amd/scripts/amd2ldif.in#2 integrate .. //depot/projects/gdb/contrib/amd/scripts/amd2sun.in#2 integrate .. //depot/projects/gdb/contrib/amd/scripts/automount2amd.8#3 integrate .. //depot/projects/gdb/contrib/amd/scripts/automount2amd.in#2 integrate .. //depot/projects/gdb/contrib/amd/scripts/ctl-amd.in#2 integrate .. //depot/projects/gdb/contrib/amd/scripts/ctl-hlfsd.in#2 integrate .. //depot/projects/gdb/contrib/amd/scripts/expn.1#3 integrate .. //depot/projects/gdb/contrib/amd/scripts/expn.in#3 integrate .. //depot/projects/gdb/contrib/amd/scripts/fix-amd-map.in#2 integrate .. //depot/projects/gdb/contrib/amd/scripts/fixrmtab.in#2 integrate .. //depot/projects/gdb/contrib/amd/scripts/redhat-ctl-amd.in#2 integrate .. //depot/projects/gdb/contrib/amd/scripts/test-attrcache.in#1 branch .. //depot/projects/gdb/contrib/amd/scripts/wait4amd.in#2 integrate .. //depot/projects/gdb/contrib/amd/scripts/wait4amd2die.in#2 integrate .. //depot/projects/gdb/contrib/amd/tasks#3 integrate .. //depot/projects/gdb/contrib/amd/vers.m4#1 branch .. //depot/projects/gdb/contrib/amd/wire-test/wire-test.8#4 integrate .. //depot/projects/gdb/contrib/amd/wire-test/wire-test.c#3 integrate .. //depot/projects/gdb/contrib/bind9/CHANGES#5 integrate .. //depot/projects/gdb/contrib/bind9/COPYRIGHT#4 integrate .. //depot/projects/gdb/contrib/bind9/FAQ#4 integrate .. //depot/projects/gdb/contrib/bind9/FAQ.xml#4 integrate .. //depot/projects/gdb/contrib/bind9/Makefile.in#4 integrate .. //depot/projects/gdb/contrib/bind9/README#4 integrate .. //depot/projects/gdb/contrib/bind9/bin/check/check-tool.c#3 integrate .. //depot/projects/gdb/contrib/bind9/bin/check/named-checkconf.8#4 integrate .. //depot/projects/gdb/contrib/bind9/bin/check/named-checkconf.docbook#3 integrate .. //depot/projects/gdb/contrib/bind9/bin/check/named-checkconf.html#4 integrate .. //depot/projects/gdb/contrib/bind9/bin/check/named-checkzone.8#4 integrate .. //depot/projects/gdb/contrib/bind9/bin/check/named-checkzone.c#3 integrate .. //depot/projects/gdb/contrib/bind9/bin/check/named-checkzone.docbook#4 integrate .. //depot/projects/gdb/contrib/bind9/bin/check/named-checkzone.html#4 integrate .. //depot/projects/gdb/contrib/bind9/bin/dig/dig.1#4 integrate .. //depot/projects/gdb/contrib/bind9/bin/dig/dig.c#4 integrate .. //depot/projects/gdb/contrib/bind9/bin/dig/dig.docbook#3 integrate .. //depot/projects/gdb/contrib/bind9/bin/dig/dig.html#4 integrate .. //depot/projects/gdb/contrib/bind9/bin/dig/dighost.c#4 integrate .. //depot/projects/gdb/contrib/bind9/bin/dig/host.1#4 integrate .. //depot/projects/gdb/contrib/bind9/bin/dig/host.c#4 integrate .. //depot/projects/gdb/contrib/bind9/bin/dig/host.docbook#3 integrate .. //depot/projects/gdb/contrib/bind9/bin/dig/host.html#4 integrate .. //depot/projects/gdb/contrib/bind9/bin/dig/include/dig/dig.h#4 integrate .. //depot/projects/gdb/contrib/bind9/bin/dig/nslookup.1#4 integrate .. //depot/projects/gdb/contrib/bind9/bin/dig/nslookup.c#4 integrate .. //depot/projects/gdb/contrib/bind9/bin/dig/nslookup.docbook#4 integrate .. //depot/projects/gdb/contrib/bind9/bin/dig/nslookup.html#4 integrate .. //depot/projects/gdb/contrib/bind9/bin/dnssec/dnssec-keygen.8#4 integrate .. //depot/projects/gdb/contrib/bind9/bin/dnssec/dnssec-keygen.c#3 integrate .. //depot/projects/gdb/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#3 integrate .. //depot/projects/gdb/contrib/bind9/bin/dnssec/dnssec-keygen.html#4 integrate .. //depot/projects/gdb/contrib/bind9/bin/dnssec/dnssec-signzone.8#4 integrate .. //depot/projects/gdb/contrib/bind9/bin/dnssec/dnssec-signzone.c#4 integrate .. //depot/projects/gdb/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#3 integrate .. //depot/projects/gdb/contrib/bind9/bin/dnssec/dnssec-signzone.html#4 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/client.c#4 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/config.c#4 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/control.c#3 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/lwresd.8#4 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/lwresd.docbook#3 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/lwresd.html#4 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/named.8#4 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/named.conf.5#4 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/named.conf.docbook#4 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/named.conf.html#4 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/named.docbook#4 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/named.html#4 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/query.c#5 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/server.c#4 integrate .. //depot/projects/gdb/contrib/bind9/bin/named/update.c#4 integrate .. //depot/projects/gdb/contrib/bind9/bin/nsupdate/nsupdate.8#4 integrate .. //depot/projects/gdb/contrib/bind9/bin/nsupdate/nsupdate.c#4 integrate .. //depot/projects/gdb/contrib/bind9/bin/nsupdate/nsupdate.docbook#3 integrate .. //depot/projects/gdb/contrib/bind9/bin/nsupdate/nsupdate.html#4 integrate .. //depot/projects/gdb/contrib/bind9/bin/rndc/Makefile.in#3 integrate .. //depot/projects/gdb/contrib/bind9/bin/rndc/rndc-confgen.docbook#3 integrate .. //depot/projects/gdb/contrib/bind9/bin/rndc/rndc.8#4 integrate .. //depot/projects/gdb/contrib/bind9/bin/rndc/rndc.conf.5#4 integrate .. //depot/projects/gdb/contrib/bind9/bin/rndc/rndc.conf.docbook#3 integrate .. //depot/projects/gdb/contrib/bind9/bin/rndc/rndc.conf.html#4 integrate .. //depot/projects/gdb/contrib/bind9/bin/rndc/rndc.docbook#3 integrate .. //depot/projects/gdb/contrib/bind9/bin/rndc/rndc.html#4 integrate .. //depot/projects/gdb/contrib/bind9/configure.in#4 integrate .. //depot/projects/gdb/contrib/bind9/doc/arm/Bv9ARM-book.xml#4 integrate .. //depot/projects/gdb/contrib/bind9/doc/arm/Bv9ARM.ch01.html#4 integrate .. //depot/projects/gdb/contrib/bind9/doc/arm/Bv9ARM.ch02.html#4 integrate .. //depot/projects/gdb/contrib/bind9/doc/arm/Bv9ARM.ch03.html#4 integrate .. //depot/projects/gdb/contrib/bind9/doc/arm/Bv9ARM.ch04.html#4 integrate .. //depot/projects/gdb/contrib/bind9/doc/arm/Bv9ARM.ch05.html#4 integrate .. //depot/projects/gdb/contrib/bind9/doc/arm/Bv9ARM.ch06.html#4 integrate .. //depot/projects/gdb/contrib/bind9/doc/arm/Bv9ARM.ch07.html#4 integrate .. //depot/projects/gdb/contrib/bind9/doc/arm/Bv9ARM.ch08.html#4 integrate .. //depot/projects/gdb/contrib/bind9/doc/arm/Bv9ARM.ch09.html#4 integrate .. //depot/projects/gdb/contrib/bind9/doc/arm/Bv9ARM.ch10.html#2 integrate .. //depot/projects/gdb/contrib/bind9/doc/arm/Bv9ARM.html#4 integrate .. //depot/projects/gdb/contrib/bind9/doc/arm/Bv9ARM.pdf#4 integrate .. //depot/projects/gdb/contrib/bind9/doc/arm/Makefile.in#3 integrate .. //depot/projects/gdb/contrib/bind9/doc/arm/man.dig.html#2 integrate .. //depot/projects/gdb/contrib/bind9/doc/arm/man.dnssec-keygen.html#2 integrate .. //depot/projects/gdb/contrib/bind9/doc/arm/man.dnssec-signzone.html#2 integrate .. //depot/projects/gdb/contrib/bind9/doc/arm/man.host.html#2 integrate .. //depot/projects/gdb/contrib/bind9/doc/arm/man.named-checkconf.html#2 integrate .. //depot/projects/gdb/contrib/bind9/doc/arm/man.named-checkzone.html#2 integrate .. //depot/projects/gdb/contrib/bind9/doc/arm/man.named.html#2 integrate .. //depot/projects/gdb/contrib/bind9/doc/arm/man.rndc-confgen.html#2 integrate .. //depot/projects/gdb/contrib/bind9/doc/arm/man.rndc.conf.html#2 integrate .. //depot/projects/gdb/contrib/bind9/doc/arm/man.rndc.html#2 integrate .. //depot/projects/gdb/contrib/bind9/doc/draft/draft-schlitt-spf-classic-02.txt#2 delete .. //depot/projects/gdb/contrib/bind9/doc/misc/Makefile.in#3 integrate .. //depot/projects/gdb/contrib/bind9/doc/misc/migration#3 integrate .. //depot/projects/gdb/contrib/bind9/doc/rfc/index#3 integrate .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc4398.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc4408.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc4470.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc4634.txt#1 branch .. //depot/projects/gdb/contrib/bind9/doc/rfc/rfc4641.txt#1 branch .. //depot/projects/gdb/contrib/bind9/lib/bind/api#4 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/config.h.in#3 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/configure#4 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/configure.in#4 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/dst/dst_api.c#4 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/dst/hmac_link.c#4 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/gai_strerror.c#4 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/irs/irs_data.c#4 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/isc/ctl_clnt.c#3 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/make/rules.in#3 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/nameser/ns_parse.c#3 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/port_before.h.in#4 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/resolv/res_data.c#3 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind/resolv/res_init.c#4 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind9/api#4 integrate .. //depot/projects/gdb/contrib/bind9/lib/bind9/check.c#4 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/adb.c#4 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/api#4 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/dispatch.c#4 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/dnssec.c#4 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/include/dns/db.h#3 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/include/dns/dispatch.h#3 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/include/dns/validator.h#4 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/journal.c#3 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/lookup.c#4 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/master.c#3 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/message.c#4 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/openssl_link.c#4 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/openssldh_link.c#4 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/openssldsa_link.c#4 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/rbtdb.c#4 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#3 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/rdata/generic/ds_43.c#3 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/rdataslab.c#3 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/resolver.c#5 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/rootns.c#3 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/sdb.c#3 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/sdlz.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/tsig.c#4 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/validator.c#4 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/view.c#3 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/xfrin.c#4 integrate .. //depot/projects/gdb/contrib/bind9/lib/dns/zone.c#4 integrate .. //depot/projects/gdb/contrib/bind9/lib/isc/Makefile.in#3 integrate .. //depot/projects/gdb/contrib/bind9/lib/isc/alpha/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/lib/isc/alpha/include/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/lib/isc/alpha/include/isc/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/lib/isc/api#4 integrate .. //depot/projects/gdb/contrib/bind9/lib/isc/arm/include/isc/atomic.h#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/isc/hmacsha.c#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/isc/ia64/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/lib/isc/ia64/include/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/lib/isc/ia64/include/isc/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/lib/isc/include/isc/platform.h.in#3 integrate .. //depot/projects/gdb/contrib/bind9/lib/isc/include/isc/string.h#3 integrate .. //depot/projects/gdb/contrib/bind9/lib/isc/mem.c#3 integrate .. //depot/projects/gdb/contrib/bind9/lib/isc/mips/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/lib/isc/mips/include/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/lib/isc/mips/include/isc/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/lib/isc/noatomic/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/lib/isc/noatomic/include/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/lib/isc/noatomic/include/isc/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/lib/isc/powerpc/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/lib/isc/powerpc/include/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/lib/isc/powerpc/include/isc/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h#2 integrate .. //depot/projects/gdb/contrib/bind9/lib/isc/sparc64/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/lib/isc/sparc64/include/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/lib/isc/sparc64/include/isc/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/lib/isc/timer.c#4 integrate .. //depot/projects/gdb/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c#3 integrate .. //depot/projects/gdb/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#4 integrate .. //depot/projects/gdb/contrib/bind9/lib/isc/unix/net.c#3 integrate .. //depot/projects/gdb/contrib/bind9/lib/isc/unix/socket.c#4 integrate .. //depot/projects/gdb/contrib/bind9/lib/isc/unix/syslog.c#3 integrate .. //depot/projects/gdb/contrib/bind9/lib/isc/x86_32/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/lib/isc/x86_32/include/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/lib/isc/x86_32/include/isc/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/lib/isc/x86_64/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/lib/isc/x86_64/include/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/lib/isc/x86_64/include/isc/Makefile.in#1 branch .. //depot/projects/gdb/contrib/bind9/lib/isccc/symtab.c#3 integrate .. //depot/projects/gdb/contrib/bind9/lib/isccfg/api#3 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/api#4 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/context.c#3 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/getaddrinfo.c#4 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/getipnode.c#3 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/lwres_gnba.c#3 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres.docbook#3 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#3 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_config.docbook#3 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_context.docbook#3 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#3 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#3 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#3 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#3 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#3 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#3 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#3 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#3 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#3 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#3 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_noop.docbook#3 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_packet.docbook#3 integrate .. //depot/projects/gdb/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#3 integrate .. //depot/projects/gdb/contrib/bind9/make/rules.in#4 integrate .. //depot/projects/gdb/contrib/bind9/version#5 integrate .. //depot/projects/gdb/contrib/binutils/opcodes/ppc-dis.c#5 integrate .. //depot/projects/gdb/contrib/csup/mux.c#2 integrate .. //depot/projects/gdb/contrib/gcc/config/sparc/freebsd.h#4 integrate .. //depot/projects/gdb/contrib/gcc/opts.c#3 integrate .. //depot/projects/gdb/contrib/gdb/gdb/i386fbsd-nat.c#7 integrate .. //depot/projects/gdb/contrib/groff/tmac/doc-common#5 integrate .. //depot/projects/gdb/contrib/groff/tmac/doc-syms#6 integrate .. //depot/projects/gdb/contrib/groff/tmac/groff_mdoc.man#5 integrate .. //depot/projects/gdb/contrib/ipfilter/BSD/Makefile#5 integrate .. //depot/projects/gdb/contrib/ipfilter/BSD/kupgrade#4 integrate .. //depot/projects/gdb/contrib/ipfilter/HISTORY#6 integrate .. //depot/projects/gdb/contrib/ipfilter/Makefile#6 integrate .. //depot/projects/gdb/contrib/ipfilter/ip_fil.c#4 integrate .. //depot/projects/gdb/contrib/ipfilter/iplang/Makefile#3 integrate .. //depot/projects/gdb/contrib/ipfilter/ipsend/iptests.c#5 integrate .. //depot/projects/gdb/contrib/ipfilter/ipsend/sock.c#5 integrate .. //depot/projects/gdb/contrib/ipfilter/l4check/Makefile#2 integrate .. //depot/projects/gdb/contrib/ipfilter/l4check/l4check.c#3 integrate .. //depot/projects/gdb/contrib/ipfilter/lib/Makefile#4 integrate .. //depot/projects/gdb/contrib/ipfilter/lib/alist_new.c#2 integrate .. //depot/projects/gdb/contrib/ipfilter/lib/ipft_tx.c#4 integrate .. //depot/projects/gdb/contrib/ipfilter/lib/printnat.c#3 integrate .. //depot/projects/gdb/contrib/ipfilter/lib/printpacket.c#3 integrate .. //depot/projects/gdb/contrib/ipfilter/lib/printpool_live.c#2 integrate .. //depot/projects/gdb/contrib/ipfilter/lib/printstate.c#3 integrate .. //depot/projects/gdb/contrib/ipfilter/man/ippool.5#2 integrate .. //depot/projects/gdb/contrib/ipfilter/md5.h#2 integrate .. //depot/projects/gdb/contrib/ipfilter/radix.c#3 integrate .. //depot/projects/gdb/contrib/ipfilter/radix_ipf.h#3 integrate .. //depot/projects/gdb/contrib/ipfilter/test/Makefile#6 integrate .. //depot/projects/gdb/contrib/ipfilter/test/dotest#3 integrate .. //depot/projects/gdb/contrib/ipfilter/test/expected/Makefile#1 branch .. //depot/projects/gdb/contrib/ipfilter/test/expected/f11#2 integrate .. //depot/projects/gdb/contrib/ipfilter/test/expected/f24#1 branch .. //depot/projects/gdb/contrib/ipfilter/test/expected/i19.dist#1 branch .. //depot/projects/gdb/contrib/ipfilter/test/expected/i21#2 integrate .. //depot/projects/gdb/contrib/ipfilter/test/expected/in1#4 integrate .. //depot/projects/gdb/contrib/ipfilter/test/expected/in6#2 integrate .. //depot/projects/gdb/contrib/ipfilter/test/expected/ipv6.6#1 branch .. //depot/projects/gdb/contrib/ipfilter/test/expected/n16#1 branch .. //depot/projects/gdb/contrib/ipfilter/test/input/f11#3 integrate .. //depot/projects/gdb/contrib/ipfilter/test/input/f24#1 branch .. //depot/projects/gdb/contrib/ipfilter/test/input/ipv6.6#1 branch .. //depot/projects/gdb/contrib/ipfilter/test/input/l1#3 integrate .. //depot/projects/gdb/contrib/ipfilter/test/input/n16#1 branch .. //depot/projects/gdb/contrib/ipfilter/test/nattest#3 integrate .. //depot/projects/gdb/contrib/ipfilter/test/regress/f24#1 branch .. //depot/projects/gdb/contrib/ipfilter/test/regress/i21#2 integrate .. //depot/projects/gdb/contrib/ipfilter/test/regress/i3#3 integrate .. //depot/projects/gdb/contrib/ipfilter/test/regress/in1#4 integrate .. //depot/projects/gdb/contrib/ipfilter/test/regress/in6#2 integrate .. //depot/projects/gdb/contrib/ipfilter/test/regress/ipv6.6#1 branch .. //depot/projects/gdb/contrib/ipfilter/test/regress/n16#1 branch .. //depot/projects/gdb/contrib/ipfilter/test/test.format#4 integrate .. //depot/projects/gdb/contrib/ipfilter/tools/ipf_y.y#4 integrate .. //depot/projects/gdb/contrib/ipfilter/tools/ipfstat.c#4 integrate .. //depot/projects/gdb/contrib/ipfilter/tools/ipmon.c#4 integrate .. //depot/projects/gdb/contrib/ipfilter/tools/ipnat.c#3 integrate .. //depot/projects/gdb/contrib/ipfilter/tools/ipnat_y.y#4 integrate .. //depot/projects/gdb/contrib/ipfilter/tools/lexer.c#4 integrate .. //depot/projects/gdb/contrib/less/FREEBSD-upgrade#1 branch .. //depot/projects/gdb/contrib/less/LICENSE#4 integrate .. //depot/projects/gdb/contrib/less/Makefile.dsm#2 delete .. //depot/projects/gdb/contrib/less/NEWS#5 integrate .. //depot/projects/gdb/contrib/less/README#5 integrate .. //depot/projects/gdb/contrib/less/ch.c#5 integrate .. //depot/projects/gdb/contrib/less/charset.c#5 integrate .. //depot/projects/gdb/contrib/less/command.c#5 integrate .. //depot/projects/gdb/contrib/less/configure#5 integrate .. //depot/projects/gdb/contrib/less/configure.ac#4 integrate .. //depot/projects/gdb/contrib/less/decode.c#5 integrate .. //depot/projects/gdb/contrib/less/defines.ds#5 integrate .. //depot/projects/gdb/contrib/less/defines.h.in#5 integrate .. //depot/projects/gdb/contrib/less/defines.o2#5 integrate .. //depot/projects/gdb/contrib/less/defines.o9#4 integrate .. //depot/projects/gdb/contrib/less/defines.wn#5 integrate .. //depot/projects/gdb/contrib/less/edit.c#5 integrate .. //depot/projects/gdb/contrib/less/filename.c#5 integrate .. //depot/projects/gdb/contrib/less/funcs.h#5 integrate .. //depot/projects/gdb/contrib/less/jump.c#5 integrate .. //depot/projects/gdb/contrib/less/less.h#5 integrate .. //depot/projects/gdb/contrib/less/less.man#5 integrate .. //depot/projects/gdb/contrib/less/less.nro#5 integrate .. //depot/projects/gdb/contrib/less/lessecho.man#3 integrate .. //depot/projects/gdb/contrib/less/lessecho.nro#3 integrate .. //depot/projects/gdb/contrib/less/lesskey.man#5 integrate .. //depot/projects/gdb/contrib/less/lesskey.nro#5 integrate .. //depot/projects/gdb/contrib/less/line.c#6 integrate .. //depot/projects/gdb/contrib/less/main.c#5 integrate .. //depot/projects/gdb/contrib/less/optfunc.c#5 integrate .. //depot/projects/gdb/contrib/less/opttbl.c#5 integrate .. //depot/projects/gdb/contrib/less/screen.c#5 integrate .. //depot/projects/gdb/contrib/less/search.c#5 integrate .. //depot/projects/gdb/contrib/less/signal.c#5 integrate .. //depot/projects/gdb/contrib/less/tags.c#5 integrate .. //depot/projects/gdb/contrib/less/version.c#5 integrate .. //depot/projects/gdb/contrib/libpcap/CHANGES#5 integrate .. //depot/projects/gdb/contrib/libpcap/CREDITS#5 integrate .. //depot/projects/gdb/contrib/libpcap/FILES#4 integrate .. //depot/projects/gdb/contrib/libpcap/INSTALL#2 delete .. //depot/projects/gdb/contrib/libpcap/INSTALL.txt#4 integrate .. //depot/projects/gdb/contrib/libpcap/Makefile.in#4 integrate .. //depot/projects/gdb/contrib/libpcap/README.dag#3 integrate .. //depot/projects/gdb/contrib/libpcap/TODO#2 integrate .. //depot/projects/gdb/contrib/libpcap/VERSION#5 integrate .. //depot/projects/gdb/contrib/libpcap/bpf_image.c#4 integrate .. //depot/projects/gdb/contrib/libpcap/config.h.in#5 integrate .. //depot/projects/gdb/contrib/libpcap/configure#5 integrate .. //depot/projects/gdb/contrib/libpcap/configure.in#5 integrate .. //depot/projects/gdb/contrib/libpcap/fad-getad.c#3 integrate .. //depot/projects/gdb/contrib/libpcap/fad-win32.c#4 integrate .. //depot/projects/gdb/contrib/libpcap/gencode.c#5 integrate .. //depot/projects/gdb/contrib/libpcap/gencode.h#5 integrate .. //depot/projects/gdb/contrib/libpcap/grammar.y#5 integrate .. //depot/projects/gdb/contrib/libpcap/inet.c#4 integrate .. //depot/projects/gdb/contrib/libpcap/lbl/gnuc.h#2 delete .. //depot/projects/gdb/contrib/libpcap/nametoaddr.c#4 integrate .. //depot/projects/gdb/contrib/libpcap/optimize.c#4 integrate .. //depot/projects/gdb/contrib/libpcap/packaging/pcap.spec.in#1 branch .. //depot/projects/gdb/contrib/libpcap/pcap-bpf.c#8 integrate .. //depot/projects/gdb/contrib/libpcap/pcap-bpf.h#4 integrate .. //depot/projects/gdb/contrib/libpcap/pcap-dag.c#4 integrate .. //depot/projects/gdb/contrib/libpcap/pcap-dlpi.c#5 integrate .. //depot/projects/gdb/contrib/libpcap/pcap-int.h#5 integrate .. //depot/projects/gdb/contrib/libpcap/pcap-linux.c#5 integrate .. //depot/projects/gdb/contrib/libpcap/pcap-win32.c#4 integrate .. //depot/projects/gdb/contrib/libpcap/pcap.3#5 integrate .. //depot/projects/gdb/contrib/libpcap/pcap.c#5 integrate .. //depot/projects/gdb/contrib/libpcap/pcap.h#5 integrate .. //depot/projects/gdb/contrib/libpcap/pf.h#3 delete .. //depot/projects/gdb/contrib/libpcap/savefile.c#5 integrate .. //depot/projects/gdb/contrib/libpcap/scanner.l#5 integrate .. //depot/projects/gdb/contrib/libreadline/FREEBSD-upgrade#5 integrate .. //depot/projects/gdb/contrib/libreadline/complete.c#5 integrate .. //depot/projects/gdb/contrib/libreadline/display.c#5 integrate .. //depot/projects/gdb/contrib/libreadline/input.c#4 integrate .. //depot/projects/gdb/contrib/libreadline/isearch.c#4 integrate .. //depot/projects/gdb/contrib/libreadline/misc.c#4 integrate .. //depot/projects/gdb/contrib/libreadline/readline.c#5 integrate .. //depot/projects/gdb/contrib/libreadline/text.c#4 integrate .. //depot/projects/gdb/contrib/libreadline/vi_mode.c#5 integrate .. //depot/projects/gdb/contrib/one-true-awk/FIXES#5 integrate .. //depot/projects/gdb/contrib/one-true-awk/FREEBSD-upgrade#5 integrate .. //depot/projects/gdb/contrib/one-true-awk/lib.c#4 integrate .. //depot/projects/gdb/contrib/one-true-awk/tran.c#3 integrate .. //depot/projects/gdb/contrib/openbsm/HISTORY#5 integrate .. //depot/projects/gdb/contrib/openbsm/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/openbsm/VERSION#5 integrate .. //depot/projects/gdb/contrib/openbsm/aclocal.m4#2 integrate .. //depot/projects/gdb/contrib/openbsm/bin/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/openbsm/bin/audit/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/openbsm/bin/auditd/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/openbsm/bin/auditfilterd/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/openbsm/bin/auditreduce/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/openbsm/bin/auditreduce/auditreduce.c#4 integrate .. //depot/projects/gdb/contrib/openbsm/bin/praudit/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/openbsm/bin/praudit/praudit.c#3 integrate .. //depot/projects/gdb/contrib/openbsm/bsm/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/openbsm/config/config.h#5 integrate .. //depot/projects/gdb/contrib/openbsm/config/config.h.in#3 integrate .. //depot/projects/gdb/contrib/openbsm/config/ltmain.sh#2 integrate .. //depot/projects/gdb/contrib/openbsm/configure#5 integrate .. //depot/projects/gdb/contrib/openbsm/configure.ac#5 integrate .. //depot/projects/gdb/contrib/openbsm/etc/audit_class#2 integrate .. //depot/projects/gdb/contrib/openbsm/etc/audit_event#5 integrate .. //depot/projects/gdb/contrib/openbsm/libbsm/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/openbsm/libbsm/bsm_event.c#3 integrate .. //depot/projects/gdb/contrib/openbsm/libbsm/bsm_io.c#5 integrate .. //depot/projects/gdb/contrib/openbsm/man/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/openbsm/modules/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/openbsm/modules/auditfilter_noop/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/openbsm/test/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/openbsm/test/bsm/Makefile.in#2 integrate .. //depot/projects/gdb/contrib/openbsm/tools/Makefile.in#3 integrate .. //depot/projects/gdb/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch .. //depot/projects/gdb/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#3 integrate .. //depot/projects/gdb/contrib/pf/pflogd/pflogd.c#6 integrate .. //depot/projects/gdb/contrib/sendmail/CACerts#2 integrate .. //depot/projects/gdb/contrib/sendmail/FREEBSD-upgrade#8 integrate .. //depot/projects/gdb/contrib/sendmail/INSTALL#2 integrate .. //depot/projects/gdb/contrib/sendmail/RELEASE_NOTES#7 integrate .. //depot/projects/gdb/contrib/sendmail/cf/cf/submit.cf#7 integrate .. //depot/projects/gdb/contrib/sendmail/cf/feature/ldap_routing.m4#3 integrate .. //depot/projects/gdb/contrib/sendmail/cf/m4/proto.m4#6 integrate .. //depot/projects/gdb/contrib/sendmail/cf/m4/version.m4#7 integrate .. //depot/projects/gdb/contrib/sendmail/contrib/buildvirtuser#3 integrate .. //depot/projects/gdb/contrib/sendmail/doc/op/op.me#6 integrate .. //depot/projects/gdb/contrib/sendmail/editmap/editmap.c#3 integrate .. //depot/projects/gdb/contrib/sendmail/include/sm/conf.h#6 integrate .. //depot/projects/gdb/contrib/sendmail/include/sm/ldap.h#5 integrate .. //depot/projects/gdb/contrib/sendmail/include/sm/tailq.h#2 integrate .. //depot/projects/gdb/contrib/sendmail/libmilter/docs/xxfi_unknown.html#2 integrate .. //depot/projects/gdb/contrib/sendmail/libmilter/engine.c#7 integrate .. //depot/projects/gdb/contrib/sendmail/libmilter/listener.c#7 integrate .. //depot/projects/gdb/contrib/sendmail/libmilter/main.c#6 integrate .. //depot/projects/gdb/contrib/sendmail/libmilter/monitor.c#2 integrate .. //depot/projects/gdb/contrib/sendmail/libmilter/smfi.c#5 integrate .. //depot/projects/gdb/contrib/sendmail/libsm/ldap.c#6 integrate .. //depot/projects/gdb/contrib/sendmail/libsm/mpeix.c#2 integrate .. //depot/projects/gdb/contrib/sendmail/makemap/makemap.c#4 integrate .. //depot/projects/gdb/contrib/sendmail/praliases/praliases.c#2 integrate .. //depot/projects/gdb/contrib/sendmail/src/Makefile.m4#4 integrate .. //depot/projects/gdb/contrib/sendmail/src/conf.c#6 integrate .. //depot/projects/gdb/contrib/sendmail/src/deliver.c#6 integrate .. //depot/projects/gdb/contrib/sendmail/src/envelope.c#5 integrate .. //depot/projects/gdb/contrib/sendmail/src/headers.c#6 integrate .. //depot/projects/gdb/contrib/sendmail/src/macro.c#4 integrate .. //depot/projects/gdb/contrib/sendmail/src/main.c#7 integrate .. //depot/projects/gdb/contrib/sendmail/src/map.c#5 integrate .. //depot/projects/gdb/contrib/sendmail/src/milter.c#6 integrate .. //depot/projects/gdb/contrib/sendmail/src/mime.c#6 integrate .. //depot/projects/gdb/contrib/sendmail/src/parseaddr.c#5 integrate .. //depot/projects/gdb/contrib/sendmail/src/queue.c#7 integrate .. //depot/projects/gdb/contrib/sendmail/src/readcf.c#6 integrate .. //depot/projects/gdb/contrib/sendmail/src/recipient.c#6 integrate .. //depot/projects/gdb/contrib/sendmail/src/sendmail.8#4 integrate .. //depot/projects/gdb/contrib/sendmail/src/sendmail.h#6 integrate .. //depot/projects/gdb/contrib/sendmail/src/sm_resolve.c#5 integrate .. //depot/projects/gdb/contrib/sendmail/src/srvrsmtp.c#7 integrate .. //depot/projects/gdb/contrib/sendmail/src/usersmtp.c#5 integrate .. //depot/projects/gdb/contrib/sendmail/src/util.c#6 integrate .. //depot/projects/gdb/contrib/sendmail/src/version.c#7 integrate .. //depot/projects/gdb/contrib/sendmail/vacation/vacation.c#5 integrate .. //depot/projects/gdb/contrib/tcpdump/CHANGES#5 integrate .. //depot/projects/gdb/contrib/tcpdump/CREDITS#5 integrate .. //depot/projects/gdb/contrib/tcpdump/FILES#5 integrate .. //depot/projects/gdb/contrib/tcpdump/INSTALL#5 integrate .. //depot/projects/gdb/contrib/tcpdump/Makefile.in#5 integrate .. //depot/projects/gdb/contrib/tcpdump/README#4 integrate .. //depot/projects/gdb/contrib/tcpdump/VERSION#5 integrate .. //depot/projects/gdb/contrib/tcpdump/addrtoname.c#5 integrate .. //depot/projects/gdb/contrib/tcpdump/af.c#1 branch .. //depot/projects/gdb/contrib/tcpdump/af.h#1 branch .. //depot/projects/gdb/contrib/tcpdump/bootp.h#3 integrate .. //depot/projects/gdb/contrib/tcpdump/config.h.in#4 integrate .. //depot/projects/gdb/contrib/tcpdump/configure#5 integrate .. //depot/projects/gdb/contrib/tcpdump/configure.in#5 integrate .. //depot/projects/gdb/contrib/tcpdump/dccp.h#2 integrate .. //depot/projects/gdb/contrib/tcpdump/ieee802_11.h#4 integrate .. //depot/projects/gdb/contrib/tcpdump/ieee802_11_radio.h#3 integrate .. //depot/projects/gdb/contrib/tcpdump/interface.h#5 integrate .. //depot/projects/gdb/contrib/tcpdump/ip.h#4 integrate .. //depot/projects/gdb/contrib/tcpdump/llc.h#5 integrate .. //depot/projects/gdb/contrib/tcpdump/nameser.h#3 integrate .. //depot/projects/gdb/contrib/tcpdump/netdissect.h#3 integrate .. //depot/projects/gdb/contrib/tcpdump/ospf.h#5 integrate .. //depot/projects/gdb/contrib/tcpdump/parsenfsfh.c#4 integrate .. //depot/projects/gdb/contrib/tcpdump/pf.h#3 delete .. //depot/projects/gdb/contrib/tcpdump/print-802_11.c#6 integrate .. //depot/projects/gdb/contrib/tcpdump/print-atm.c#5 integrate .. //depot/projects/gdb/contrib/tcpdump/print-bfd.c#3 integrate .. //depot/projects/gdb/contrib/tcpdump/print-bgp.c#5 integrate .. //depot/projects/gdb/contrib/tcpdump/print-bootp.c#4 integrate .. //depot/projects/gdb/contrib/tcpdump/print-chdlc.c#5 integrate .. //depot/projects/gdb/contrib/tcpdump/print-dccp.c#2 integrate .. //depot/projects/gdb/contrib/tcpdump/print-dhcp6.c#4 integrate .. //depot/projects/gdb/contrib/tcpdump/print-domain.c#4 integrate .. //depot/projects/gdb/contrib/tcpdump/print-ether.c#5 integrate .. //depot/projects/gdb/contrib/tcpdump/print-fddi.c#5 integrate .. //depot/projects/gdb/contrib/tcpdump/print-fr.c#5 integrate .. //depot/projects/gdb/contrib/tcpdump/print-icmp.c#4 integrate .. //depot/projects/gdb/contrib/tcpdump/print-ip.c#5 integrate .. //depot/projects/gdb/contrib/tcpdump/print-ip6.c#5 integrate .. //depot/projects/gdb/contrib/tcpdump/print-ipfc.c#4 integrate .. //depot/projects/gdb/contrib/tcpdump/print-isoclns.c#5 integrate .. //depot/projects/gdb/contrib/tcpdump/print-juniper.c#3 integrate .. //depot/projects/gdb/contrib/tcpdump/print-l2tp.c#4 integrate .. //depot/projects/gdb/contrib/tcpdump/print-lane.c#5 integrate .. //depot/projects/gdb/contrib/tcpdump/print-ldp.c#4 integrate .. //depot/projects/gdb/contrib/tcpdump/print-llc.c#5 integrate .. //depot/projects/gdb/contrib/tcpdump/print-lmp.c#2 integrate .. //depot/projects/gdb/contrib/tcpdump/print-lspping.c#2 integrate .. //depot/projects/gdb/contrib/tcpdump/print-nfs.c#4 integrate .. //depot/projects/gdb/contrib/tcpdump/print-null.c#5 integrate .. //depot/projects/gdb/contrib/tcpdump/print-olsr.c#1 branch .. //depot/projects/gdb/contrib/tcpdump/print-ospf.c#5 integrate .. //depot/projects/gdb/contrib/tcpdump/print-pflog.c#4 integrate .. //depot/projects/gdb/contrib/tcpdump/print-pim.c#5 integrate .. //depot/projects/gdb/contrib/tcpdump/print-ppp.c#4 integrate .. //depot/projects/gdb/contrib/tcpdump/print-pptp.c#4 integrate .. //depot/projects/gdb/contrib/tcpdump/print-rsvp.c#4 integrate .. //depot/projects/gdb/contrib/tcpdump/print-rx.c#4 integrate .. //depot/projects/gdb/contrib/tcpdump/print-sctp.c#5 integrate .. //depot/projects/gdb/contrib/tcpdump/print-sll.c#5 integrate .. //depot/projects/gdb/contrib/tcpdump/print-smb.c#4 integrate .. //depot/projects/gdb/contrib/tcpdump/print-tcp.c#5 integrate .. //depot/projects/gdb/contrib/tcpdump/print-tftp.c#4 integrate .. //depot/projects/gdb/contrib/tcpdump/print-token.c#5 integrate .. //depot/projects/gdb/contrib/tcpdump/print-udp.c#4 integrate .. //depot/projects/gdb/contrib/tcpdump/smbutil.c#4 integrate .. //depot/projects/gdb/contrib/tcpdump/tcp.h#4 integrate .. //depot/projects/gdb/contrib/tcpdump/tcpdump-stdinc.h#4 integrate .. //depot/projects/gdb/contrib/tcpdump/tcpdump.1#5 integrate .. //depot/projects/gdb/contrib/tcpdump/tcpdump.c#5 integrate .. //depot/projects/gdb/contrib/tcpdump/tests/print-capX.out#2 integrate .. //depot/projects/gdb/contrib/tcpdump/tests/print-capXX.out#2 integrate .. //depot/projects/gdb/contrib/tcpdump/tftp.h#1 branch .. //depot/projects/gdb/contrib/tcpdump/udp.h#4 integrate .. //depot/projects/gdb/contrib/tcpdump/util.c#4 integrate .. //depot/projects/gdb/contrib/tcsh/sh.c#5 integrate .. //depot/projects/gdb/contrib/tcsh/sh.lex.c#5 integrate .. //depot/projects/gdb/contrib/tcsh/sh.proc.c#5 integrate .. //depot/projects/gdb/contrib/tcsh/tc.const.c#5 integrate .. //depot/projects/gdb/contrib/wpa_supplicant/main.c#3 integrate .. //depot/projects/gdb/crypto/heimdal/appl/su/Makefile.am#3 integrate .. //depot/projects/gdb/crypto/heimdal/appl/su/su.c#3 integrate .. //depot/projects/gdb/crypto/openssl/ssl/d1_both.c#2 integrate .. //depot/projects/gdb/crypto/openssl/ssl/dtls1.h#2 integrate .. //depot/projects/gdb/crypto/openssl/ssl/ssl.h#6 integrate .. //depot/projects/gdb/crypto/openssl/ssl/ssl_err.c#4 integrate .. //depot/projects/gdb/crypto/openssl/ssl/ssl_lib.c#6 integrate .. //depot/projects/gdb/etc/Makefile#9 integrate .. //depot/projects/gdb/etc/cached.conf#2 delete .. //depot/projects/gdb/etc/defaults/Makefile#3 integrate .. //depot/projects/gdb/etc/defaults/devfs.rules#4 integrate .. //depot/projects/gdb/etc/defaults/pccard.conf#5 delete .. //depot/projects/gdb/etc/defaults/periodic.conf#8 integrate .. //depot/projects/gdb/etc/defaults/rc.conf#21 integrate .. //depot/projects/gdb/etc/etc.amd64/ttys#3 integrate .. //depot/projects/gdb/etc/etc.arm/ttys#4 integrate .. //depot/projects/gdb/etc/etc.i386/ttys#3 integrate .. //depot/projects/gdb/etc/etc.ia64/ttys#4 integrate .. //depot/projects/gdb/etc/etc.powerpc/ttys#5 integrate .. //depot/projects/gdb/etc/etc.sparc64/ttys#4 integrate .. //depot/projects/gdb/etc/freebsd-update.conf#2 integrate .. //depot/projects/gdb/etc/gss/mech#2 integrate .. //depot/projects/gdb/etc/mtree/BSD.include.dist#15 integrate .. //depot/projects/gdb/etc/mtree/BSD.local.dist#11 integrate .. //depot/projects/gdb/etc/mtree/BSD.usr.dist#13 integrate .. //depot/projects/gdb/etc/mtree/BSD.x11-4.dist#4 integrate .. //depot/projects/gdb/etc/mtree/README#2 integrate .. //depot/projects/gdb/etc/namedb/named.root#4 integrate .. //depot/projects/gdb/etc/network.subr#8 integrate .. //depot/projects/gdb/etc/nscd.conf#1 branch .. //depot/projects/gdb/etc/periodic/security/100.chksetuid#3 integrate .. //depot/projects/gdb/etc/pf.conf#3 delete .. //depot/projects/gdb/etc/rc.d/DAEMON#4 integrate .. //depot/projects/gdb/etc/rc.d/LOGIN#4 integrate .. //depot/projects/gdb/etc/rc.d/Makefile#16 integrate .. //depot/projects/gdb/etc/rc.d/NETWORKING#7 integrate .. //depot/projects/gdb/etc/rc.d/SERVERS#4 integrate .. //depot/projects/gdb/etc/rc.d/accounting#7 integrate .. //depot/projects/gdb/etc/rc.d/amd#7 integrate .. //depot/projects/gdb/etc/rc.d/apmd#5 integrate .. //depot/projects/gdb/etc/rc.d/bootconf.sh#3 delete .. //depot/projects/gdb/etc/rc.d/bootparams#5 integrate .. //depot/projects/gdb/etc/rc.d/cached#2 delete .. //depot/projects/gdb/etc/rc.d/ccd#5 integrate .. //depot/projects/gdb/etc/rc.d/cron#4 integrate .. //depot/projects/gdb/etc/rc.d/dhclient#10 integrate .. //depot/projects/gdb/etc/rc.d/dmesg#4 integrate .. //depot/projects/gdb/etc/rc.d/early.sh#3 integrate .. //depot/projects/gdb/etc/rc.d/fsck#7 integrate .. //depot/projects/gdb/etc/rc.d/ftp-proxy#1 branch .. //depot/projects/gdb/etc/rc.d/hostapd#2 integrate .. //depot/projects/gdb/etc/rc.d/inetd#4 integrate .. //depot/projects/gdb/etc/rc.d/ipfilter#9 integrate .. //depot/projects/gdb/etc/rc.d/ipfs#5 integrate .. //depot/projects/gdb/etc/rc.d/ipmon#8 integrate .. //depot/projects/gdb/etc/rc.d/ipnat#6 integrate .. //depot/projects/gdb/etc/rc.d/ipsec#8 integrate .. //depot/projects/gdb/etc/rc.d/isdnd#6 integrate .. //depot/projects/gdb/etc/rc.d/kerberos#4 integrate .. //depot/projects/gdb/etc/rc.d/keyserv#3 integrate .. //depot/projects/gdb/etc/rc.d/ldconfig#6 integrate .. //depot/projects/gdb/etc/rc.d/local#4 integrate .. //depot/projects/gdb/etc/rc.d/lockd#2 integrate .. //depot/projects/gdb/etc/rc.d/lpd#5 integrate .. //depot/projects/gdb/etc/rc.d/motd#4 integrate .. //depot/projects/gdb/etc/rc.d/mountcritlocal#6 integrate .. //depot/projects/gdb/etc/rc.d/mountcritremote#6 integrate .. //depot/projects/gdb/etc/rc.d/mountd#7 integrate .. //depot/projects/gdb/etc/rc.d/moused#6 integrate .. //depot/projects/gdb/etc/rc.d/mrouted#6 integrate .. //depot/projects/gdb/etc/rc.d/named#5 integrate .. //depot/projects/gdb/etc/rc.d/newsyslog#3 integrate .. //depot/projects/gdb/etc/rc.d/nfsd#5 integrate .. //depot/projects/gdb/etc/rc.d/nfslocking#8 delete .. //depot/projects/gdb/etc/rc.d/nscd#2 integrate .. //depot/projects/gdb/etc/rc.d/power_profile#6 integrate .. //depot/projects/gdb/etc/rc.d/ppp#4 integrate .. //depot/projects/gdb/etc/rc.d/pwcheck#4 integrate .. //depot/projects/gdb/etc/rc.d/quota#5 integrate .. //depot/projects/gdb/etc/rc.d/rarpd#5 integrate .. //depot/projects/gdb/etc/rc.d/resolv#5 integrate .. //depot/projects/gdb/etc/rc.d/root#6 integrate .. //depot/projects/gdb/etc/rc.d/route6d#5 integrate .. //depot/projects/gdb/etc/rc.d/routed#6 integrate .. //depot/projects/gdb/etc/rc.d/rpcbind#5 integrate .. //depot/projects/gdb/etc/rc.d/rtadvd#5 integrate .. //depot/projects/gdb/etc/rc.d/rwho#4 integrate .. //depot/projects/gdb/etc/rc.d/savecore#6 integrate .. //depot/projects/gdb/etc/rc.d/securelevel#4 integrate .. //depot/projects/gdb/etc/rc.d/sendmail#8 integrate .. //depot/projects/gdb/etc/rc.d/sshd#6 integrate .. //depot/projects/gdb/etc/rc.d/statd#2 integrate .. //depot/projects/gdb/etc/rc.d/swap1#5 integrate .. //depot/projects/gdb/etc/rc.d/sysctl#4 integrate .. //depot/projects/gdb/etc/rc.d/syslogd#6 integrate .. //depot/projects/gdb/etc/rc.d/timed#5 integrate .. //depot/projects/gdb/etc/rc.d/tmp#4 integrate .. //depot/projects/gdb/etc/rc.d/ugidfw#3 integrate .. //depot/projects/gdb/etc/rc.d/var#5 integrate .. //depot/projects/gdb/etc/rc.d/virecover#5 integrate .. //depot/projects/gdb/etc/rc.d/ypbind#5 integrate .. //depot/projects/gdb/etc/rc.d/yppasswdd#5 integrate .. //depot/projects/gdb/etc/rc.d/ypserv#5 integrate .. //depot/projects/gdb/etc/rc.subr#15 integrate .. //depot/projects/gdb/etc/sendmail/freebsd.mc#5 integrate .. //depot/projects/gdb/etc/sendmail/freebsd.submit.mc#5 integrate .. //depot/projects/gdb/etc/services#9 integrate .. //depot/projects/gdb/games/fortune/datfiles/Makefile#3 integrate .. //depot/projects/gdb/games/fortune/datfiles/fortunes#17 integrate .. //depot/projects/gdb/games/fortune/datfiles/fortunes-o.real#4 integrate .. //depot/projects/gdb/games/fortune/datfiles/fortunes-o.sp.ok#2 integrate .. //depot/projects/gdb/games/fortune/datfiles/fortunes.sp.ok#5 integrate .. //depot/projects/gdb/games/fortune/datfiles/fortunes2-o#6 delete .. //depot/projects/gdb/games/fortune/datfiles/freebsd-tips#5 integrate .. //depot/projects/gdb/games/fortune/datfiles/freebsd-tips.sp.ok#1 branch .. //depot/projects/gdb/games/fortune/datfiles/limerick#4 integrate .. //depot/projects/gdb/games/fortune/datfiles/limerick.sp.ok#1 branch .. //depot/projects/gdb/games/fortune/datfiles/murphy#4 integrate .. //depot/projects/gdb/games/fortune/datfiles/murphy-o#2 integrate .. //depot/projects/gdb/games/fortune/datfiles/murphy.sp.ok#1 branch .. //depot/projects/gdb/games/fortune/datfiles/startrek#4 integrate .. //depot/projects/gdb/games/fortune/datfiles/zippy#4 integrate .. //depot/projects/gdb/games/fortune/datfiles/zippy.sp.ok#2 integrate .. //depot/projects/gdb/games/fortune/fortune/fortune.6#4 integrate .. //depot/projects/gdb/games/fortune/fortune/fortune.c#4 integrate .. //depot/projects/gdb/gnu/lib/csu/Makefile#6 integrate .. //depot/projects/gdb/gnu/lib/libobjc/Makefile#5 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/ld/Makefile#7 integrate .. //depot/projects/gdb/gnu/usr.bin/binutils/ld/genscripts.sh#4 integrate .. //depot/projects/gdb/gnu/usr.bin/cc/cc_int/Makefile#8 integrate .. //depot/projects/gdb/gnu/usr.bin/cc/cc_tools/Makefile#9 integrate .. //depot/projects/gdb/gnu/usr.bin/cc/cc_tools/auto-host.h#5 integrate .. //depot/projects/gdb/gnu/usr.bin/cc/cc_tools/freebsd-native.h#6 integrate .. //depot/projects/gdb/gnu/usr.bin/diff/Makefile#4 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/arm/Makefile#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/arm/armfbsd-nat.c#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/arm/armfbsd-tdep.c#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/arm/init.c#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/arch/arm/nm-fbsd.h#2 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/kgdb.h#8 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/kthr.c#8 integrate .. //depot/projects/gdb/gnu/usr.bin/gdb/kgdb/trgt_i386.c#6 integrate .. //depot/projects/gdb/gnu/usr.bin/groff/tmac/mdoc.local#9 integrate .. //depot/projects/gdb/gnu/usr.bin/man/man/man.c#3 integrate .. //depot/projects/gdb/gnu/usr.bin/sort/Makefile#5 integrate .. //depot/projects/gdb/gnu/usr.bin/texinfo/info/Makefile#2 integrate .. //depot/projects/gdb/include/Makefile#16 integrate .. //depot/projects/gdb/include/_ctype.h#3 integrate .. //depot/projects/gdb/include/assert.h#2 integrate .. //depot/projects/gdb/include/ctype.h#5 integrate .. //depot/projects/gdb/include/dirent.h#2 integrate .. //depot/projects/gdb/include/elf.h#3 integrate .. //depot/projects/gdb/include/pthread.h#3 integrate .. //depot/projects/gdb/include/pthread_np.h#3 integrate .. //depot/projects/gdb/include/wctype.h#5 integrate .. //depot/projects/gdb/kerberos5/lib/Makefile.inc#3 integrate .. //depot/projects/gdb/kerberos5/usr.bin/ksu/Makefile#4 integrate .. //depot/projects/gdb/lib/Makefile#17 integrate .. //depot/projects/gdb/lib/bind/bind/Makefile#3 integrate .. //depot/projects/gdb/lib/bind/bind/config.h#3 integrate .. //depot/projects/gdb/lib/bind/bind/port_before.h#4 integrate .. //depot/projects/gdb/lib/bind/config.h#4 integrate .. //depot/projects/gdb/lib/bind/config.mk#3 integrate .. //depot/projects/gdb/lib/bind/isc/isc/platform.h#3 integrate .. //depot/projects/gdb/lib/bind/lwres/Makefile#3 integrate .. //depot/projects/gdb/lib/csu/common/crtbrand.c#2 integrate .. //depot/projects/gdb/lib/libarchive/archive_read.3#16 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_compression_none.c#10 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_format_tar.c#22 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_format_zip.c#4 integrate .. //depot/projects/gdb/lib/libarchive/archive_write_disk.c#3 integrate .. //depot/projects/gdb/lib/libarchive/archive_write_set_format_cpio.c#8 integrate .. //depot/projects/gdb/lib/libarchive/archive_write_set_format_cpio_newc.c#2 integrate .. //depot/projects/gdb/lib/libarchive/test/test_write_disk.c#3 integrate .. //depot/projects/gdb/lib/libarchive/test/test_write_format_cpio.c#2 integrate .. //depot/projects/gdb/lib/libbsm/Makefile#4 integrate .. //depot/projects/gdb/lib/libc/Makefile#9 integrate .. //depot/projects/gdb/lib/libc/amd64/Makefile.inc#3 integrate .. //depot/projects/gdb/lib/libc/arm/Symbol.map#3 integrate .. //depot/projects/gdb/lib/libc/arm/string/ffs.S#3 integrate .. //depot/projects/gdb/lib/libc/arm/string/memcpy.S#2 integrate .. //depot/projects/gdb/lib/libc/arm/string/memset.S#3 integrate .. //depot/projects/gdb/lib/libc/gdtoa/Symbol.map#3 integrate .. //depot/projects/gdb/lib/libc/gdtoa/_ldtoa.c#3 integrate .. //depot/projects/gdb/lib/libc/gdtoa/machdep_ldisQ.c#2 integrate .. //depot/projects/gdb/lib/libc/gdtoa/machdep_ldisx.c#2 integrate .. //depot/projects/gdb/lib/libc/gen/Makefile.inc#11 integrate .. //depot/projects/gdb/lib/libc/gen/Symbol.map#4 integrate .. //depot/projects/gdb/lib/libc/gen/closedir.c#3 integrate .. //depot/projects/gdb/lib/libc/gen/readdir.c#4 integrate .. //depot/projects/gdb/lib/libc/gen/seekdir.c#3 integrate .. //depot/projects/gdb/lib/libc/gen/sysctl.3#7 integrate .. //depot/projects/gdb/lib/libc/gen/telldir.c#3 integrate .. //depot/projects/gdb/lib/libc/gen/valloc.3#4 integrate .. //depot/projects/gdb/lib/libc/i386/Makefile.inc#2 integrate .. //depot/projects/gdb/lib/libc/ia64/Makefile.inc#3 integrate .. //depot/projects/gdb/lib/libc/ia64/Symbol.map#3 integrate .. //depot/projects/gdb/lib/libc/locale/Symbol.map#3 integrate .. //depot/projects/gdb/lib/libc/locale/big5.c#9 integrate .. //depot/projects/gdb/lib/libc/locale/euc.c#10 integrate .. //depot/projects/gdb/lib/libc/locale/gb18030.c#8 integrate .. //depot/projects/gdb/lib/libc/locale/gb2312.c#8 integrate .. //depot/projects/gdb/lib/libc/locale/gbk.c#10 integrate .. //depot/projects/gdb/lib/libc/locale/isctype.c#3 integrate .. //depot/projects/gdb/lib/libc/locale/iswctype.c#3 integrate .. //depot/projects/gdb/lib/libc/locale/mblocal.h#4 integrate .. //depot/projects/gdb/lib/libc/locale/mskanji.c#8 integrate .. //depot/projects/gdb/lib/libc/locale/none.c#8 integrate .. //depot/projects/gdb/lib/libc/locale/setrunelocale.c#9 integrate .. //depot/projects/gdb/lib/libc/locale/utf8.c#10 integrate .. //depot/projects/gdb/lib/libc/nameser/ns_parse.c#3 integrate .. //depot/projects/gdb/lib/libc/net/Makefile.inc#6 integrate .. //depot/projects/gdb/lib/libc/net/ethers.3#4 integrate .. //depot/projects/gdb/lib/libc/net/getaddrinfo.c#6 integrate .. //depot/projects/gdb/lib/libc/net/nscache.c#2 integrate .. //depot/projects/gdb/lib/libc/net/sctp_connectx.3#3 integrate .. //depot/projects/gdb/lib/libc/net/sctp_opt_info.3#3 integrate .. //depot/projects/gdb/lib/libc/net/sctp_recvmsg.3#3 integrate .. //depot/projects/gdb/lib/libc/net/sctp_send.3#3 integrate .. //depot/projects/gdb/lib/libc/net/sctp_sendmsg.3#3 integrate .. //depot/projects/gdb/lib/libc/powerpc/Symbol.map#3 integrate .. //depot/projects/gdb/lib/libc/resolv/res_data.c#3 integrate .. //depot/projects/gdb/lib/libc/resolv/res_init.c#5 integrate .. //depot/projects/gdb/lib/libc/rpc/auth_time.c#3 integrate .. //depot/projects/gdb/lib/libc/rpc/authdes_prot.c#2 integrate .. //depot/projects/gdb/lib/libc/rpc/authunix_prot.c#3 integrate .. //depot/projects/gdb/lib/libc/rpc/getnetconfig.c#6 integrate .. //depot/projects/gdb/lib/libc/rpc/getnetpath.c#5 integrate .. //depot/projects/gdb/lib/libc/rpc/key_prot_xdr.c#3 integrate .. //depot/projects/gdb/lib/libc/rpc/rpc_callmsg.c#3 integrate .. //depot/projects/gdb/lib/libc/rpc/rpc_generic.c#3 integrate .. //depot/projects/gdb/lib/libc/rpc/rpc_prot.c#3 integrate .. //depot/projects/gdb/lib/libc/rpc/rpcb_clnt.c#4 integrate .. //depot/projects/gdb/lib/libc/rpc/rpcb_prot.c#5 integrate .. //depot/projects/gdb/lib/libc/rpc/rpcb_st_xdr.c#2 integrate .. //depot/projects/gdb/lib/libc/sparc64/Makefile.inc#3 integrate .. //depot/projects/gdb/lib/libc/sparc64/fpu/fpu_explode.c#4 integrate .. //depot/projects/gdb/lib/libc/stdio/vfscanf.c#7 integrate .. //depot/projects/gdb/lib/libc/stdio/vfwscanf.c#7 integrate .. //depot/projects/gdb/lib/libc/stdlib/atoi.3#3 integrate .. //depot/projects/gdb/lib/libc/stdlib/getenv.c#4 integrate .. //depot/projects/gdb/lib/libc/stdlib/malloc.3#7 integrate .. //depot/projects/gdb/lib/libc/stdlib/malloc.c#12 integrate .. //depot/projects/gdb/lib/libc/sys/Makefile.inc#7 integrate .. //depot/projects/gdb/lib/libc/sys/access.2#3 integrate .. //depot/projects/gdb/lib/libc/sys/kldstat.2#3 integrate .. //depot/projects/gdb/lib/libc/sys/kqueue.2#9 integrate .. //depot/projects/gdb/lib/libc/sys/minherit.2#4 integrate .. //depot/projects/gdb/lib/libc/sys/ntp_adjtime.2#3 integrate .. //depot/projects/gdb/lib/libc/sys/ntp_gettime.2#3 delete .. //depot/projects/gdb/lib/libc/sys/sctp_generic_recvmsg.2#2 integrate .. //depot/projects/gdb/lib/libc/sys/sctp_generic_sendmsg.2#2 integrate .. //depot/projects/gdb/lib/libc/sys/sctp_peeloff.2#2 integrate .. //depot/projects/gdb/lib/libdisk/libdisk.3#5 integrate .. //depot/projects/gdb/lib/libdisk/libdisk.h#6 integrate .. //depot/projects/gdb/lib/libdisk/open_disk.c#8 integrate .. //depot/projects/gdb/lib/libdisk/open_ia64_disk.c#3 integrate .. //depot/projects/gdb/lib/libelf/elf.3#2 integrate .. //depot/projects/gdb/lib/libelf/elf_flagdata.3#2 integrate .. //depot/projects/gdb/lib/libelf/elf_getscn.3#2 integrate .. //depot/projects/gdb/lib/libelf/elf_update.3#2 integrate .. //depot/projects/gdb/lib/libelf/elf_update.c#2 integrate .. //depot/projects/gdb/lib/libelf/gelf_getphdr.3#2 integrate .. //depot/projects/gdb/lib/libelf/gelf_newehdr.3#2 integrate .. //depot/projects/gdb/lib/libelf/gelf_newphdr.3#2 integrate .. //depot/projects/gdb/lib/libelf/gelf_xlatetof.3#2 integrate .. //depot/projects/gdb/lib/libelf/libelf_convert.m4#2 integrate .. //depot/projects/gdb/lib/libelf/libelf_data.c#2 integrate .. //depot/projects/gdb/lib/libelf/libelf_xlate.c#2 integrate .. //depot/projects/gdb/lib/libgssapi/Makefile#2 integrate .. //depot/projects/gdb/lib/libgssapi/gss_accept_sec_context.3#2 integrate .. //depot/projects/gdb/lib/libgssapi/gss_acquire_cred.3#2 integrate .. //depot/projects/gdb/lib/libgssapi/gss_acquire_cred.c#2 integrate .. //depot/projects/gdb/lib/libgssapi/gss_add_cred.3#2 integrate .. //depot/projects/gdb/lib/libgssapi/gss_add_oid_set_member.3#2 integrate .. //depot/projects/gdb/lib/libgssapi/gss_canonicalize_name.3#2 integrate .. //depot/projects/gdb/lib/libgssapi/gss_compare_name.3#2 integrate .. //depot/projects/gdb/lib/libgssapi/gss_context_time.3#2 integrate .. //depot/projects/gdb/lib/libgssapi/gss_create_empty_oid_set.3#2 integrate .. //depot/projects/gdb/lib/libgssapi/gss_delete_sec_context.3#2 integrate .. //depot/projects/gdb/lib/libgssapi/gss_display_name.3#2 integrate .. //depot/projects/gdb/lib/libgssapi/gss_display_status.3#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Dec 10 05:46:55 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 272CA16A419; Mon, 10 Dec 2007 05:46:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5A8D016A420 for ; Mon, 10 Dec 2007 05:46:54 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 48F4C13C44B for ; Mon, 10 Dec 2007 05:46:54 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBA5ks8u089497 for ; Mon, 10 Dec 2007 05:46:54 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBA5ks6A089494 for perforce@freebsd.org; Mon, 10 Dec 2007 05:46:54 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 10 Dec 2007 05:46:54 GMT Message-Id: <200712100546.lBA5ks6A089494@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 130585 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Dec 2007 05:46:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=130585 Change 130585 by kmacy@kmacy:storage:toestack on 2007/12/10 05:46:06 restructure to take advantage of padding - remove syncache event handler and toepcb out of in_conninfo in to syncache entry - add extra syncache function to pass values in directly - remove padding already accounted for in the tcpcb Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#32 edit .. //depot/projects/toestack/sys/netinet/in_pcb.h#5 edit .. //depot/projects/toestack/sys/netinet/tcp_ofld.h#8 edit .. //depot/projects/toestack/sys/netinet/tcp_syncache.c#11 edit .. //depot/projects/toestack/sys/netinet/tcp_syncache.h#2 edit .. //depot/projects/toestack/sys/netinet/tcp_var.h#8 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#32 (text+ko) ==== @@ -143,6 +143,8 @@ static void t3_send_reset(struct socket *so); static void send_abort_rpl(struct mbuf *m, struct toedev *tdev, int rst_status); static inline void free_atid(struct t3cdev *cdev, unsigned int tid); +static void handle_syncache_event(int event, void *arg); + static inline int is_t3a(const struct toedev *dev) @@ -613,6 +615,8 @@ .tu_send = cxgb_toe_send, .tu_rcvd = cxgb_toe_rcvd, .tu_detach = cxgb_toe_detach, + .tu_detach = cxgb_toe_detach, + .tu_syncache_event = handle_syncache_event, }; @@ -2505,8 +2509,6 @@ inc.inc_len = 0; inc.inc_faddr.s_addr = req->peer_ip; inc.inc_laddr.s_addr = req->local_ip; - inc.inc_ext = toep; - inc.inc_eh = handle_syncache_event; DPRINTF("syncache add of %d:%d %d:%d\n", ntohl(req->local_ip), ntohs(req->local_port), @@ -2522,7 +2524,7 @@ INP_INFO_WLOCK(&tcbinfo); INP_LOCK(inp); - syncache_add(&inc, &to, &th, inp, &lso, NULL); + syncache_offload_add(&inc, &to, &th, inp, &lso, &cxgb_toe_usrreqs, toep); } @@ -2860,9 +2862,6 @@ inc.inc_faddr.s_addr = req->peer_ip; inc.inc_laddr.s_addr = req->local_ip; - inc.inc_ext = toep; - inc.inc_eh = handle_syncache_event; - mss = td->mtus[G_TCPOPT_MSS(opt)] - 40; wsf = G_TCPOPT_WSCALE_OK(opt); ts = G_TCPOPT_TSTAMP(opt); ==== //depot/projects/toestack/sys/netinet/in_pcb.h#5 (text+ko) ==== @@ -106,8 +106,6 @@ u_int16_t inc_pad; /* XXX alignment for in_endpoints */ /* protocol dependent part */ struct in_endpoints inc_ie; - sc_eh_t inc_eh; /* syncache event handler - timeout or already present */ - void *inc_ext; /* external TCP connection state */ }; #define inc_isipv6 inc_flags /* temp compatability */ #define inc_fport inc_ie.ie_fport ==== //depot/projects/toestack/sys/netinet/tcp_ofld.h#8 (text+ko) ==== @@ -156,6 +156,7 @@ int (*tu_disconnect)(struct tcpcb *tp); int (*tu_abort)(struct tcpcb *tp); void (*tu_detach)(struct tcpcb *tp); + void (*tu_syncache_event)(int event, void *toep); }; ==== //depot/projects/toestack/sys/netinet/tcp_syncache.c#11 (text+ko) ==== @@ -78,6 +78,7 @@ #include #include #include +#include #ifdef INET6 #include #endif @@ -136,7 +137,8 @@ #define SCF_SIGNATURE 0x20 /* send MD5 digests */ #define SCF_SACK 0x80 /* send SACK option */ #ifndef DISABLE_TCP_OFFLOAD - void *sc_pspare[2]; /* toepcb / toe_usrreqs */ + struct toe_usrreqs *sc_tu; /* TOE operations */ + void *sc_toepcb; /* TOE protocol block */ #endif #ifdef MAC struct label *sc_label; /* MAC label reference */ @@ -361,8 +363,8 @@ sch->sch_length--; #ifndef DISABLE_TCP_OFFLOAD - if (sc->sc_inc.inc_eh && sc->sc_inc.inc_ext) - sc->sc_inc.inc_eh(SC_DROP, sc->sc_inc.inc_ext); + if (sc->sc_tu) + sc->sc_tu->tu_syncache_event(SC_DROP, sc->sc_toepcb); #endif syncache_free(sc); tcp_syncache.cache_count--; @@ -880,7 +882,7 @@ * Segment validation: * ACK must match our initial sequence number + 1 (the SYN|ACK). */ - if (th->th_ack != sc->sc_iss + 1 && sc->sc_inc.inc_eh == NULL) { + if (th->th_ack != sc->sc_iss + 1 && sc->sc_toepcb == NULL) { if ((s = tcp_log_addrs(inc, th, NULL, NULL))) log(LOG_DEBUG, "%s; %s: ACK %u != ISS+1 %u, segment " "rejected\n", s, __func__, th->th_ack, sc->sc_iss); @@ -891,29 +893,13 @@ * number + 1 (the SYN) because we didn't ACK any data that * may have come with the SYN. */ - if (th->th_seq != sc->sc_irs + 1 && sc->sc_inc.inc_eh == NULL) { + if (th->th_seq != sc->sc_irs + 1 && sc->sc_toepcb == NULL) { if ((s = tcp_log_addrs(inc, th, NULL, NULL))) log(LOG_DEBUG, "%s; %s: SEQ %u != IRS+1 %u, segment " "rejected\n", s, __func__, th->th_seq, sc->sc_irs); goto failed; } -#if 0 - /* - * If timestamps were present in the SYN and we accepted - * them in our SYN|ACK we require them to be present from - * now on. And vice versa. - * - * Unfortunately, during testing of 7.0 some users found - * network devices that violate this constraint, so it must - * be disabled. - */ - if ((sc->sc_flags & SCF_TIMESTAMP) && !(to->to_flags & TOF_TS)) { - if ((s = tcp_log_addrs(inc, th, NULL, NULL))) - log(LOG_DEBUG, "%s; %s: Timestamp missing, " - "segment rejected\n", s, __func__); - goto failed; - } -#endif + if (!(sc->sc_flags & SCF_TIMESTAMP) && (to->to_flags & TOF_TS)) { if ((s = tcp_log_addrs(inc, th, NULL, NULL))) log(LOG_DEBUG, "%s; %s: Timestamp not expected, " @@ -924,7 +910,8 @@ * If timestamps were negotiated the reflected timestamp * must be equal to what we actually sent in the SYN|ACK. */ - if ((to->to_flags & TOF_TS) && to->to_tsecr != sc->sc_ts && sc->sc_inc.inc_eh == NULL) { + if ((to->to_flags & TOF_TS) && to->to_tsecr != sc->sc_ts && + sc->sc_toepcb == NULL) { if ((s = tcp_log_addrs(inc, th, NULL, NULL))) log(LOG_DEBUG, "%s; %s: TSECR %u != TS %u, " "segment rejected\n", @@ -964,9 +951,10 @@ * consume all available buffer space if it were ACKed. By not ACKing * the data, we avoid this DoS scenario. */ -void -syncache_add(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, - struct inpcb *inp, struct socket **lsop, struct mbuf *m) +static void +_syncache_add(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, + struct inpcb *inp, struct socket **lsop, struct mbuf *m, + struct toe_usrreqs *tu, void *toepcb) { struct tcpcb *tp; struct socket *so; @@ -1045,8 +1033,9 @@ SCH_LOCK_ASSERT(sch); if (sc != NULL) { #ifndef DISABLE_TCP_OFFLOAD - if (sc->sc_inc.inc_eh && sc->sc_inc.inc_ext) - sc->sc_inc.inc_eh(SC_ENTRY_PRESENT, sc->sc_inc.inc_ext); + if (sc->sc_tu) + sc->sc_tu->tu_syncache_event(SC_ENTRY_PRESENT, + sc->sc_toepcb); #endif tcpstat.tcps_sc_dupsyn++; if (ipopts) { @@ -1082,7 +1071,7 @@ s, __func__); free(s, M_TCPLOG); } - if ((inc->inc_eh == NULL) && syncache_respond(sc) == 0) { + if ((sc->sc_toepcb == NULL) && syncache_respond(sc) == 0) { sc->sc_rxmits = 0; syncache_timeout(sc, sch, 1); tcpstat.tcps_sndacks++; @@ -1115,7 +1104,7 @@ } } } - + /* * Fill in the syncache values. */ @@ -1131,7 +1120,10 @@ sc->sc_ip_tos = ip_tos; sc->sc_ip_ttl = ip_ttl; } - +#ifndef DISABLE_TCP_OFFLOAD + sc->sc_tu = tu; + sc->sc_toepcb = toepcb; +#endif sc->sc_irs = th->th_seq; sc->sc_iss = arc4random(); sc->sc_flags = 0; @@ -1223,7 +1215,7 @@ /* * Do a standard 3-way handshake. */ - if (inc->inc_ext != NULL || syncache_respond(sc) == 0) { + if (sc->sc_toepcb || syncache_respond(sc) == 0) { if (tcp_syncookies && tcp_syncookiesonly && sc != &scs) syncache_free(sc); else if (sc != &scs) @@ -1404,6 +1396,21 @@ return (error); } +void +syncache_add(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, + struct inpcb *inp, struct socket **lsop, struct mbuf *m) +{ + _syncache_add(inc, to, th, inp, lsop, m, NULL, NULL); +} + +void +syncache_offload_add(struct in_conninfo *inc, struct tcpopt *to, + struct tcphdr *th, struct inpcb *inp, struct socket **lsop, + struct toe_usrreqs *tu, void *toepcb) +{ + _syncache_add(inc, to, th, inp, lsop, NULL, tu, toepcb); +} + /* * The purpose of SYN cookies is to avoid keeping track of all SYN's we * receive and to be able to handle SYN floods from bogus source addresses ==== //depot/projects/toestack/sys/netinet/tcp_syncache.h#2 (text+ko) ==== @@ -40,6 +40,9 @@ struct tcphdr *, struct socket **, struct mbuf *); void syncache_add(struct in_conninfo *, struct tcpopt *, struct tcphdr *, struct inpcb *, struct socket **, struct mbuf *); +void syncache_offload_add(struct in_conninfo *, struct tcpopt *, + struct tcphdr *, struct inpcb *, struct socket **, + struct toe_usrreqs *tu, void *toepcb); void syncache_chkrst(struct in_conninfo *, struct tcphdr *); void syncache_badack(struct in_conninfo *); int syncache_pcbcount(void); ==== //depot/projects/toestack/sys/netinet/tcp_var.h#8 (text+ko) ==== @@ -207,10 +207,10 @@ int t_rttlow; /* smallest observerved RTT */ u_int32_t rfbuf_ts; /* recv buffer autoscaling timestamp */ int rfbuf_cnt; /* recv buffer autoscaling byte count */ - void *t_pspare[5]; /* toe usrreqs / toepcb * / congestion algo / vimage / 1 general use */ struct toe_usrreqs *t_tu; /* offload operations vector */ void *t_toe; char *t_cong_control; /* congestion control algorithm name*/ + void *t_pspare[2]; /* vimage / 1 general use */ }; #define IN_FASTRECOVERY(tp) (tp->t_flags & TF_FASTRECOVERY) From owner-p4-projects@FreeBSD.ORG Mon Dec 10 06:45:16 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8AD9416A41B; Mon, 10 Dec 2007 06:45:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B5E0316A417 for ; Mon, 10 Dec 2007 06:45:15 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A1BB713C4EE for ; Mon, 10 Dec 2007 06:45:15 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBA6jFmp098953 for ; Mon, 10 Dec 2007 06:45:15 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBA6jF4Y098934 for perforce@freebsd.org; Mon, 10 Dec 2007 06:45:15 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 10 Dec 2007 06:45:15 GMT Message-Id: <200712100645.lBA6jF4Y098934@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 130586 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Dec 2007 06:45:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=130586 Change 130586 by kmacy@kmacy:freefall:toehead on 2007/12/10 06:45:08 initial commit Affected files ... .. //depot/projects/toehead/COPYRIGHT#1 branch .. //depot/projects/toehead/LOCKS#1 branch .. //depot/projects/toehead/MAINTAINERS#1 branch .. //depot/projects/toehead/Makefile#1 branch .. //depot/projects/toehead/Makefile.inc1#1 branch .. //depot/projects/toehead/ObsoleteFiles.inc#1 branch .. //depot/projects/toehead/README#1 branch .. //depot/projects/toehead/UPDATING#1 branch .. //depot/projects/toehead/bin/Makefile#1 branch .. //depot/projects/toehead/bin/Makefile.inc#1 branch .. //depot/projects/toehead/bin/cat/Makefile#1 branch .. //depot/projects/toehead/bin/cat/cat.1#1 branch .. //depot/projects/toehead/bin/cat/cat.c#1 branch .. //depot/projects/toehead/bin/chflags/Makefile#1 branch .. //depot/projects/toehead/bin/chflags/chflags.1#1 branch .. //depot/projects/toehead/bin/chflags/chflags.c#1 branch .. //depot/projects/toehead/bin/chio/Makefile#1 branch .. //depot/projects/toehead/bin/chio/chio.1#1 branch .. //depot/projects/toehead/bin/chio/chio.c#1 branch .. //depot/projects/toehead/bin/chio/defs.h#1 branch .. //depot/projects/toehead/bin/chio/pathnames.h#1 branch .. //depot/projects/toehead/bin/chmod/Makefile#1 branch .. //depot/projects/toehead/bin/chmod/chmod.1#1 branch .. //depot/projects/toehead/bin/chmod/chmod.c#1 branch .. //depot/projects/toehead/bin/cp/Makefile#1 branch .. //depot/projects/toehead/bin/cp/cp.1#1 branch .. //depot/projects/toehead/bin/cp/cp.c#1 branch .. //depot/projects/toehead/bin/cp/extern.h#1 branch .. //depot/projects/toehead/bin/cp/utils.c#1 branch .. //depot/projects/toehead/bin/csh/Makefile#1 branch .. //depot/projects/toehead/bin/csh/USD.doc/csh.1#1 branch .. //depot/projects/toehead/bin/csh/USD.doc/csh.2#1 branch .. //depot/projects/toehead/bin/csh/USD.doc/csh.3#1 branch .. //depot/projects/toehead/bin/csh/USD.doc/csh.4#1 branch .. //depot/projects/toehead/bin/csh/USD.doc/csh.a#1 branch .. //depot/projects/toehead/bin/csh/USD.doc/csh.g#1 branch .. //depot/projects/toehead/bin/csh/USD.doc/tabs#1 branch .. //depot/projects/toehead/bin/csh/config.h#1 branch .. //depot/projects/toehead/bin/csh/config_p.h#1 branch .. //depot/projects/toehead/bin/csh/host.defs#1 branch .. //depot/projects/toehead/bin/csh/iconv.h#1 branch .. //depot/projects/toehead/bin/csh/iconv_stub.c#1 branch .. //depot/projects/toehead/bin/date/Makefile#1 branch .. //depot/projects/toehead/bin/date/date.1#1 branch .. //depot/projects/toehead/bin/date/date.c#1 branch .. //depot/projects/toehead/bin/date/extern.h#1 branch .. //depot/projects/toehead/bin/date/netdate.c#1 branch .. //depot/projects/toehead/bin/date/vary.c#1 branch .. //depot/projects/toehead/bin/date/vary.h#1 branch .. //depot/projects/toehead/bin/dd/Makefile#1 branch .. //depot/projects/toehead/bin/dd/args.c#1 branch .. //depot/projects/toehead/bin/dd/conv.c#1 branch .. //depot/projects/toehead/bin/dd/conv_tab.c#1 branch .. //depot/projects/toehead/bin/dd/dd.1#1 branch .. //depot/projects/toehead/bin/dd/dd.c#1 branch .. //depot/projects/toehead/bin/dd/dd.h#1 branch .. //depot/projects/toehead/bin/dd/extern.h#1 branch .. //depot/projects/toehead/bin/dd/gen.c#1 branch .. //depot/projects/toehead/bin/dd/misc.c#1 branch .. //depot/projects/toehead/bin/dd/position.c#1 branch .. //depot/projects/toehead/bin/dd/ref.ascii#1 branch .. //depot/projects/toehead/bin/dd/ref.ebcdic#1 branch .. //depot/projects/toehead/bin/dd/ref.ibm#1 branch .. //depot/projects/toehead/bin/dd/ref.lcase#1 branch .. //depot/projects/toehead/bin/dd/ref.oldascii#1 branch .. //depot/projects/toehead/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/toehead/bin/dd/ref.oldibm#1 branch .. //depot/projects/toehead/bin/dd/ref.pareven#1 branch .. //depot/projects/toehead/bin/dd/ref.parnone#1 branch .. //depot/projects/toehead/bin/dd/ref.parodd#1 branch .. //depot/projects/toehead/bin/dd/ref.parset#1 branch .. //depot/projects/toehead/bin/dd/ref.swab#1 branch .. //depot/projects/toehead/bin/dd/ref.ucase#1 branch .. //depot/projects/toehead/bin/df/Makefile#1 branch .. //depot/projects/toehead/bin/df/df.1#1 branch .. //depot/projects/toehead/bin/df/df.c#1 branch .. //depot/projects/toehead/bin/domainname/Makefile#1 branch .. //depot/projects/toehead/bin/domainname/domainname.1#1 branch .. //depot/projects/toehead/bin/domainname/domainname.c#1 branch .. //depot/projects/toehead/bin/echo/Makefile#1 branch .. //depot/projects/toehead/bin/echo/echo.1#1 branch .. //depot/projects/toehead/bin/echo/echo.c#1 branch .. //depot/projects/toehead/bin/ed/Makefile#1 branch .. //depot/projects/toehead/bin/ed/POSIX#1 branch .. //depot/projects/toehead/bin/ed/README#1 branch .. //depot/projects/toehead/bin/ed/buf.c#1 branch .. //depot/projects/toehead/bin/ed/cbc.c#1 branch .. //depot/projects/toehead/bin/ed/ed.1#1 branch .. //depot/projects/toehead/bin/ed/ed.h#1 branch .. //depot/projects/toehead/bin/ed/glbl.c#1 branch .. //depot/projects/toehead/bin/ed/io.c#1 branch .. //depot/projects/toehead/bin/ed/main.c#1 branch .. //depot/projects/toehead/bin/ed/re.c#1 branch .. //depot/projects/toehead/bin/ed/sub.c#1 branch .. //depot/projects/toehead/bin/ed/test/=.err#1 branch .. //depot/projects/toehead/bin/ed/test/Makefile#1 branch .. //depot/projects/toehead/bin/ed/test/README#1 branch .. //depot/projects/toehead/bin/ed/test/TODO#1 branch .. //depot/projects/toehead/bin/ed/test/a.d#1 branch .. //depot/projects/toehead/bin/ed/test/a.r#1 branch .. //depot/projects/toehead/bin/ed/test/a.t#1 branch .. //depot/projects/toehead/bin/ed/test/a1.err#1 branch .. //depot/projects/toehead/bin/ed/test/a2.err#1 branch .. //depot/projects/toehead/bin/ed/test/addr.d#1 branch .. //depot/projects/toehead/bin/ed/test/addr.r#1 branch .. //depot/projects/toehead/bin/ed/test/addr.t#1 branch .. //depot/projects/toehead/bin/ed/test/addr1.err#1 branch .. //depot/projects/toehead/bin/ed/test/addr2.err#1 branch .. //depot/projects/toehead/bin/ed/test/ascii.d.uu#1 branch .. //depot/projects/toehead/bin/ed/test/ascii.r.uu#1 branch .. //depot/projects/toehead/bin/ed/test/ascii.t#1 branch .. //depot/projects/toehead/bin/ed/test/bang1.d#1 branch .. //depot/projects/toehead/bin/ed/test/bang1.err#1 branch .. //depot/projects/toehead/bin/ed/test/bang1.r#1 branch .. //depot/projects/toehead/bin/ed/test/bang1.t#1 branch .. //depot/projects/toehead/bin/ed/test/bang2.err#1 branch .. //depot/projects/toehead/bin/ed/test/c.d#1 branch .. //depot/projects/toehead/bin/ed/test/c.r#1 branch .. //depot/projects/toehead/bin/ed/test/c.t#1 branch .. //depot/projects/toehead/bin/ed/test/c1.err#1 branch .. //depot/projects/toehead/bin/ed/test/c2.err#1 branch .. //depot/projects/toehead/bin/ed/test/ckscripts.sh#1 branch .. //depot/projects/toehead/bin/ed/test/d.d#1 branch .. //depot/projects/toehead/bin/ed/test/d.err#1 branch .. //depot/projects/toehead/bin/ed/test/d.r#1 branch .. //depot/projects/toehead/bin/ed/test/d.t#1 branch .. //depot/projects/toehead/bin/ed/test/e1.d#1 branch .. //depot/projects/toehead/bin/ed/test/e1.err#1 branch .. //depot/projects/toehead/bin/ed/test/e1.r#1 branch .. //depot/projects/toehead/bin/ed/test/e1.t#1 branch .. //depot/projects/toehead/bin/ed/test/e2.d#1 branch .. //depot/projects/toehead/bin/ed/test/e2.err#1 branch .. //depot/projects/toehead/bin/ed/test/e2.r#1 branch .. //depot/projects/toehead/bin/ed/test/e2.t#1 branch .. //depot/projects/toehead/bin/ed/test/e3.d#1 branch .. //depot/projects/toehead/bin/ed/test/e3.err#1 branch .. //depot/projects/toehead/bin/ed/test/e3.r#1 branch .. //depot/projects/toehead/bin/ed/test/e3.t#1 branch .. //depot/projects/toehead/bin/ed/test/e4.d#1 branch .. //depot/projects/toehead/bin/ed/test/e4.r#1 branch .. //depot/projects/toehead/bin/ed/test/e4.t#1 branch .. //depot/projects/toehead/bin/ed/test/f1.err#1 branch .. //depot/projects/toehead/bin/ed/test/f2.err#1 branch .. //depot/projects/toehead/bin/ed/test/g1.d#1 branch .. //depot/projects/toehead/bin/ed/test/g1.err#1 branch .. //depot/projects/toehead/bin/ed/test/g1.r#1 branch .. //depot/projects/toehead/bin/ed/test/g1.t#1 branch .. //depot/projects/toehead/bin/ed/test/g2.d#1 branch .. //depot/projects/toehead/bin/ed/test/g2.err#1 branch .. //depot/projects/toehead/bin/ed/test/g2.r#1 branch .. //depot/projects/toehead/bin/ed/test/g2.t#1 branch .. //depot/projects/toehead/bin/ed/test/g3.d#1 branch .. //depot/projects/toehead/bin/ed/test/g3.err#1 branch .. //depot/projects/toehead/bin/ed/test/g3.r#1 branch .. //depot/projects/toehead/bin/ed/test/g3.t#1 branch .. //depot/projects/toehead/bin/ed/test/g4.d#1 branch .. //depot/projects/toehead/bin/ed/test/g4.r#1 branch .. //depot/projects/toehead/bin/ed/test/g4.t#1 branch .. //depot/projects/toehead/bin/ed/test/g5.d#1 branch .. //depot/projects/toehead/bin/ed/test/g5.r#1 branch .. //depot/projects/toehead/bin/ed/test/g5.t#1 branch .. //depot/projects/toehead/bin/ed/test/h.err#1 branch .. //depot/projects/toehead/bin/ed/test/i.d#1 branch .. //depot/projects/toehead/bin/ed/test/i.r#1 branch .. //depot/projects/toehead/bin/ed/test/i.t#1 branch .. //depot/projects/toehead/bin/ed/test/i1.err#1 branch .. //depot/projects/toehead/bin/ed/test/i2.err#1 branch .. //depot/projects/toehead/bin/ed/test/i3.err#1 branch .. //depot/projects/toehead/bin/ed/test/j.d#1 branch .. //depot/projects/toehead/bin/ed/test/j.r#1 branch .. //depot/projects/toehead/bin/ed/test/j.t#1 branch .. //depot/projects/toehead/bin/ed/test/k.d#1 branch .. //depot/projects/toehead/bin/ed/test/k.r#1 branch .. //depot/projects/toehead/bin/ed/test/k.t#1 branch .. //depot/projects/toehead/bin/ed/test/k1.err#1 branch .. //depot/projects/toehead/bin/ed/test/k2.err#1 branch .. //depot/projects/toehead/bin/ed/test/k3.err#1 branch .. //depot/projects/toehead/bin/ed/test/k4.err#1 branch .. //depot/projects/toehead/bin/ed/test/l.d#1 branch .. //depot/projects/toehead/bin/ed/test/l.r#1 branch .. //depot/projects/toehead/bin/ed/test/l.t#1 branch .. //depot/projects/toehead/bin/ed/test/m.d#1 branch .. //depot/projects/toehead/bin/ed/test/m.err#1 branch .. //depot/projects/toehead/bin/ed/test/m.r#1 branch .. //depot/projects/toehead/bin/ed/test/m.t#1 branch .. //depot/projects/toehead/bin/ed/test/mkscripts.sh#1 branch .. //depot/projects/toehead/bin/ed/test/n.d#1 branch .. //depot/projects/toehead/bin/ed/test/n.r#1 branch .. //depot/projects/toehead/bin/ed/test/n.t#1 branch .. //depot/projects/toehead/bin/ed/test/nl.err#1 branch .. //depot/projects/toehead/bin/ed/test/nl1.d#1 branch .. //depot/projects/toehead/bin/ed/test/nl1.r#1 branch .. //depot/projects/toehead/bin/ed/test/nl1.t#1 branch .. //depot/projects/toehead/bin/ed/test/nl2.d#1 branch .. //depot/projects/toehead/bin/ed/test/nl2.r#1 branch .. //depot/projects/toehead/bin/ed/test/nl2.t#1 branch .. //depot/projects/toehead/bin/ed/test/p.d#1 branch .. //depot/projects/toehead/bin/ed/test/p.r#1 branch .. //depot/projects/toehead/bin/ed/test/p.t#1 branch .. //depot/projects/toehead/bin/ed/test/q.d#1 branch .. //depot/projects/toehead/bin/ed/test/q.r#1 branch .. //depot/projects/toehead/bin/ed/test/q.t#1 branch .. //depot/projects/toehead/bin/ed/test/q1.err#1 branch .. //depot/projects/toehead/bin/ed/test/r1.d#1 branch .. //depot/projects/toehead/bin/ed/test/r1.err#1 branch .. //depot/projects/toehead/bin/ed/test/r1.r#1 branch .. //depot/projects/toehead/bin/ed/test/r1.t#1 branch .. //depot/projects/toehead/bin/ed/test/r2.d#1 branch .. //depot/projects/toehead/bin/ed/test/r2.err#1 branch .. //depot/projects/toehead/bin/ed/test/r2.r#1 branch .. //depot/projects/toehead/bin/ed/test/r2.t#1 branch .. //depot/projects/toehead/bin/ed/test/r3.d#1 branch .. //depot/projects/toehead/bin/ed/test/r3.r#1 branch .. //depot/projects/toehead/bin/ed/test/r3.t#1 branch .. //depot/projects/toehead/bin/ed/test/s1.d#1 branch .. //depot/projects/toehead/bin/ed/test/s1.err#1 branch .. //depot/projects/toehead/bin/ed/test/s1.r#1 branch .. //depot/projects/toehead/bin/ed/test/s1.t#1 branch .. //depot/projects/toehead/bin/ed/test/s10.err#1 branch .. //depot/projects/toehead/bin/ed/test/s2.d#1 branch .. //depot/projects/toehead/bin/ed/test/s2.err#1 branch .. //depot/projects/toehead/bin/ed/test/s2.r#1 branch .. //depot/projects/toehead/bin/ed/test/s2.t#1 branch .. //depot/projects/toehead/bin/ed/test/s3.d#1 branch .. //depot/projects/toehead/bin/ed/test/s3.err#1 branch .. //depot/projects/toehead/bin/ed/test/s3.r#1 branch .. //depot/projects/toehead/bin/ed/test/s3.t#1 branch .. //depot/projects/toehead/bin/ed/test/s4.err#1 branch .. //depot/projects/toehead/bin/ed/test/s5.err#1 branch .. //depot/projects/toehead/bin/ed/test/s6.err#1 branch .. //depot/projects/toehead/bin/ed/test/s7.err#1 branch .. //depot/projects/toehead/bin/ed/test/s8.err#1 branch .. //depot/projects/toehead/bin/ed/test/s9.err#1 branch .. //depot/projects/toehead/bin/ed/test/t.d#1 branch .. //depot/projects/toehead/bin/ed/test/t.r#1 branch .. //depot/projects/toehead/bin/ed/test/t1.d#1 branch .. //depot/projects/toehead/bin/ed/test/t1.err#1 branch .. //depot/projects/toehead/bin/ed/test/t1.r#1 branch .. //depot/projects/toehead/bin/ed/test/t1.t#1 branch .. //depot/projects/toehead/bin/ed/test/t2.d#1 branch .. //depot/projects/toehead/bin/ed/test/t2.err#1 branch .. //depot/projects/toehead/bin/ed/test/t2.r#1 branch .. //depot/projects/toehead/bin/ed/test/t2.t#1 branch .. //depot/projects/toehead/bin/ed/test/u.d#1 branch .. //depot/projects/toehead/bin/ed/test/u.err#1 branch .. //depot/projects/toehead/bin/ed/test/u.r#1 branch .. //depot/projects/toehead/bin/ed/test/u.t#1 branch .. //depot/projects/toehead/bin/ed/test/v.d#1 branch .. //depot/projects/toehead/bin/ed/test/v.r#1 branch .. //depot/projects/toehead/bin/ed/test/v.t#1 branch .. //depot/projects/toehead/bin/ed/test/w.d#1 branch .. //depot/projects/toehead/bin/ed/test/w.r#1 branch .. //depot/projects/toehead/bin/ed/test/w.t#1 branch .. //depot/projects/toehead/bin/ed/test/w1.err#1 branch .. //depot/projects/toehead/bin/ed/test/w2.err#1 branch .. //depot/projects/toehead/bin/ed/test/w3.err#1 branch .. //depot/projects/toehead/bin/ed/test/x.err#1 branch .. //depot/projects/toehead/bin/ed/test/z.err#1 branch .. //depot/projects/toehead/bin/ed/undo.c#1 branch .. //depot/projects/toehead/bin/expr/Makefile#1 branch .. //depot/projects/toehead/bin/expr/expr.1#1 branch .. //depot/projects/toehead/bin/expr/expr.y#1 branch .. //depot/projects/toehead/bin/getfacl/Makefile#1 branch .. //depot/projects/toehead/bin/getfacl/getfacl.1#1 branch .. //depot/projects/toehead/bin/getfacl/getfacl.c#1 branch .. //depot/projects/toehead/bin/hostname/Makefile#1 branch .. //depot/projects/toehead/bin/hostname/hostname.1#1 branch .. //depot/projects/toehead/bin/hostname/hostname.c#1 branch .. //depot/projects/toehead/bin/kenv/Makefile#1 branch .. //depot/projects/toehead/bin/kenv/kenv.1#1 branch .. //depot/projects/toehead/bin/kenv/kenv.c#1 branch .. //depot/projects/toehead/bin/kill/Makefile#1 branch .. //depot/projects/toehead/bin/kill/kill.1#1 branch .. //depot/projects/toehead/bin/kill/kill.c#1 branch .. //depot/projects/toehead/bin/ln/Makefile#1 branch .. //depot/projects/toehead/bin/ln/ln.1#1 branch .. //depot/projects/toehead/bin/ln/ln.c#1 branch .. //depot/projects/toehead/bin/ln/symlink.7#1 branch .. //depot/projects/toehead/bin/ls/Makefile#1 branch .. //depot/projects/toehead/bin/ls/cmp.c#1 branch .. //depot/projects/toehead/bin/ls/extern.h#1 branch .. //depot/projects/toehead/bin/ls/ls.1#1 branch .. //depot/projects/toehead/bin/ls/ls.c#1 branch .. //depot/projects/toehead/bin/ls/ls.h#1 branch .. //depot/projects/toehead/bin/ls/print.c#1 branch .. //depot/projects/toehead/bin/ls/util.c#1 branch .. //depot/projects/toehead/bin/mkdir/Makefile#1 branch .. //depot/projects/toehead/bin/mkdir/mkdir.1#1 branch .. //depot/projects/toehead/bin/mkdir/mkdir.c#1 branch .. //depot/projects/toehead/bin/mv/Makefile#1 branch .. //depot/projects/toehead/bin/mv/mv.1#1 branch .. //depot/projects/toehead/bin/mv/mv.c#1 branch .. //depot/projects/toehead/bin/pax/Makefile#1 branch .. //depot/projects/toehead/bin/pax/ar_io.c#1 branch .. //depot/projects/toehead/bin/pax/ar_subs.c#1 branch .. //depot/projects/toehead/bin/pax/buf_subs.c#1 branch .. //depot/projects/toehead/bin/pax/cache.c#1 branch .. //depot/projects/toehead/bin/pax/cache.h#1 branch .. //depot/projects/toehead/bin/pax/cpio.1#1 branch .. //depot/projects/toehead/bin/pax/cpio.c#1 branch .. //depot/projects/toehead/bin/pax/cpio.h#1 branch .. //depot/projects/toehead/bin/pax/extern.h#1 branch .. //depot/projects/toehead/bin/pax/file_subs.c#1 branch .. //depot/projects/toehead/bin/pax/ftree.c#1 branch .. //depot/projects/toehead/bin/pax/ftree.h#1 branch .. //depot/projects/toehead/bin/pax/gen_subs.c#1 branch .. //depot/projects/toehead/bin/pax/getoldopt.c#1 branch .. //depot/projects/toehead/bin/pax/options.c#1 branch .. //depot/projects/toehead/bin/pax/options.h#1 branch .. //depot/projects/toehead/bin/pax/pat_rep.c#1 branch .. //depot/projects/toehead/bin/pax/pat_rep.h#1 branch .. //depot/projects/toehead/bin/pax/pax.1#1 branch .. //depot/projects/toehead/bin/pax/pax.c#1 branch .. //depot/projects/toehead/bin/pax/pax.h#1 branch .. //depot/projects/toehead/bin/pax/sel_subs.c#1 branch .. //depot/projects/toehead/bin/pax/sel_subs.h#1 branch .. //depot/projects/toehead/bin/pax/tables.c#1 branch .. //depot/projects/toehead/bin/pax/tables.h#1 branch .. //depot/projects/toehead/bin/pax/tar.1#1 branch .. //depot/projects/toehead/bin/pax/tar.c#1 branch .. //depot/projects/toehead/bin/pax/tar.h#1 branch .. //depot/projects/toehead/bin/pax/tty_subs.c#1 branch .. //depot/projects/toehead/bin/ps/Makefile#1 branch .. //depot/projects/toehead/bin/ps/extern.h#1 branch .. //depot/projects/toehead/bin/ps/fmt.c#1 branch .. //depot/projects/toehead/bin/ps/keyword.c#1 branch .. //depot/projects/toehead/bin/ps/nlist.c#1 branch .. //depot/projects/toehead/bin/ps/print.c#1 branch .. //depot/projects/toehead/bin/ps/ps.1#1 branch .. //depot/projects/toehead/bin/ps/ps.c#1 branch .. //depot/projects/toehead/bin/ps/ps.h#1 branch .. //depot/projects/toehead/bin/pwd/Makefile#1 branch .. //depot/projects/toehead/bin/pwd/pwd.1#1 branch .. //depot/projects/toehead/bin/pwd/pwd.c#1 branch .. //depot/projects/toehead/bin/rcp/Makefile#1 branch .. //depot/projects/toehead/bin/rcp/extern.h#1 branch .. //depot/projects/toehead/bin/rcp/rcp.1#1 branch .. //depot/projects/toehead/bin/rcp/rcp.c#1 branch .. //depot/projects/toehead/bin/rcp/util.c#1 branch .. //depot/projects/toehead/bin/realpath/Makefile#1 branch .. //depot/projects/toehead/bin/realpath/realpath.1#1 branch .. //depot/projects/toehead/bin/realpath/realpath.c#1 branch .. //depot/projects/toehead/bin/rm/Makefile#1 branch .. //depot/projects/toehead/bin/rm/rm.1#1 branch .. //depot/projects/toehead/bin/rm/rm.c#1 branch .. //depot/projects/toehead/bin/rmail/Makefile#1 branch .. //depot/projects/toehead/bin/rmdir/Makefile#1 branch .. //depot/projects/toehead/bin/rmdir/rmdir.1#1 branch .. //depot/projects/toehead/bin/rmdir/rmdir.c#1 branch .. //depot/projects/toehead/bin/setfacl/Makefile#1 branch .. //depot/projects/toehead/bin/setfacl/file.c#1 branch .. //depot/projects/toehead/bin/setfacl/mask.c#1 branch .. //depot/projects/toehead/bin/setfacl/merge.c#1 branch .. //depot/projects/toehead/bin/setfacl/remove.c#1 branch .. //depot/projects/toehead/bin/setfacl/setfacl.1#1 branch .. //depot/projects/toehead/bin/setfacl/setfacl.c#1 branch .. //depot/projects/toehead/bin/setfacl/setfacl.h#1 branch .. //depot/projects/toehead/bin/setfacl/util.c#1 branch .. //depot/projects/toehead/bin/sh/Makefile#1 branch .. //depot/projects/toehead/bin/sh/TOUR#1 branch .. //depot/projects/toehead/bin/sh/alias.c#1 branch .. //depot/projects/toehead/bin/sh/alias.h#1 branch .. //depot/projects/toehead/bin/sh/arith.h#1 branch .. //depot/projects/toehead/bin/sh/arith.y#1 branch .. //depot/projects/toehead/bin/sh/arith_lex.l#1 branch .. //depot/projects/toehead/bin/sh/bltin/bltin.h#1 branch .. //depot/projects/toehead/bin/sh/bltin/echo.1#1 branch .. //depot/projects/toehead/bin/sh/bltin/echo.c#1 branch .. //depot/projects/toehead/bin/sh/builtins.def#1 branch .. //depot/projects/toehead/bin/sh/cd.c#1 branch .. //depot/projects/toehead/bin/sh/cd.h#1 branch .. //depot/projects/toehead/bin/sh/error.c#1 branch .. //depot/projects/toehead/bin/sh/error.h#1 branch .. //depot/projects/toehead/bin/sh/eval.c#1 branch .. //depot/projects/toehead/bin/sh/eval.h#1 branch .. //depot/projects/toehead/bin/sh/exec.c#1 branch .. //depot/projects/toehead/bin/sh/exec.h#1 branch .. //depot/projects/toehead/bin/sh/expand.c#1 branch .. //depot/projects/toehead/bin/sh/expand.h#1 branch .. //depot/projects/toehead/bin/sh/funcs/cmv#1 branch .. //depot/projects/toehead/bin/sh/funcs/dirs#1 branch .. //depot/projects/toehead/bin/sh/funcs/kill#1 branch .. //depot/projects/toehead/bin/sh/funcs/login#1 branch .. //depot/projects/toehead/bin/sh/funcs/newgrp#1 branch .. //depot/projects/toehead/bin/sh/funcs/popd#1 branch .. //depot/projects/toehead/bin/sh/funcs/pushd#1 branch .. //depot/projects/toehead/bin/sh/funcs/suspend#1 branch .. //depot/projects/toehead/bin/sh/histedit.c#1 branch .. //depot/projects/toehead/bin/sh/init.h#1 branch .. //depot/projects/toehead/bin/sh/input.c#1 branch .. //depot/projects/toehead/bin/sh/input.h#1 branch .. //depot/projects/toehead/bin/sh/jobs.c#1 branch .. //depot/projects/toehead/bin/sh/jobs.h#1 branch .. //depot/projects/toehead/bin/sh/mail.c#1 branch .. //depot/projects/toehead/bin/sh/mail.h#1 branch .. //depot/projects/toehead/bin/sh/main.c#1 branch .. //depot/projects/toehead/bin/sh/main.h#1 branch .. //depot/projects/toehead/bin/sh/memalloc.c#1 branch .. //depot/projects/toehead/bin/sh/memalloc.h#1 branch .. //depot/projects/toehead/bin/sh/miscbltin.c#1 branch .. //depot/projects/toehead/bin/sh/mkbuiltins#1 branch .. //depot/projects/toehead/bin/sh/mkinit.c#1 branch .. //depot/projects/toehead/bin/sh/mknodes.c#1 branch .. //depot/projects/toehead/bin/sh/mksyntax.c#1 branch .. //depot/projects/toehead/bin/sh/mktokens#1 branch .. //depot/projects/toehead/bin/sh/myhistedit.h#1 branch .. //depot/projects/toehead/bin/sh/mystring.c#1 branch .. //depot/projects/toehead/bin/sh/mystring.h#1 branch .. //depot/projects/toehead/bin/sh/nodes.c.pat#1 branch .. //depot/projects/toehead/bin/sh/nodetypes#1 branch .. //depot/projects/toehead/bin/sh/options.c#1 branch .. //depot/projects/toehead/bin/sh/options.h#1 branch .. //depot/projects/toehead/bin/sh/output.c#1 branch .. //depot/projects/toehead/bin/sh/output.h#1 branch .. //depot/projects/toehead/bin/sh/parser.c#1 branch .. //depot/projects/toehead/bin/sh/parser.h#1 branch .. //depot/projects/toehead/bin/sh/redir.c#1 branch .. //depot/projects/toehead/bin/sh/redir.h#1 branch .. //depot/projects/toehead/bin/sh/sh.1#1 branch .. //depot/projects/toehead/bin/sh/shell.h#1 branch .. //depot/projects/toehead/bin/sh/show.c#1 branch .. //depot/projects/toehead/bin/sh/show.h#1 branch .. //depot/projects/toehead/bin/sh/trap.c#1 branch .. //depot/projects/toehead/bin/sh/trap.h#1 branch .. //depot/projects/toehead/bin/sh/var.c#1 branch .. //depot/projects/toehead/bin/sh/var.h#1 branch .. //depot/projects/toehead/bin/sleep/Makefile#1 branch .. //depot/projects/toehead/bin/sleep/sleep.1#1 branch .. //depot/projects/toehead/bin/sleep/sleep.c#1 branch .. //depot/projects/toehead/bin/stty/Makefile#1 branch .. //depot/projects/toehead/bin/stty/cchar.c#1 branch .. //depot/projects/toehead/bin/stty/extern.h#1 branch .. //depot/projects/toehead/bin/stty/gfmt.c#1 branch .. //depot/projects/toehead/bin/stty/key.c#1 branch .. //depot/projects/toehead/bin/stty/modes.c#1 branch .. //depot/projects/toehead/bin/stty/print.c#1 branch .. //depot/projects/toehead/bin/stty/stty.1#1 branch .. //depot/projects/toehead/bin/stty/stty.c#1 branch .. //depot/projects/toehead/bin/stty/stty.h#1 branch .. //depot/projects/toehead/bin/stty/util.c#1 branch .. //depot/projects/toehead/bin/sync/Makefile#1 branch .. //depot/projects/toehead/bin/sync/sync.8#1 branch .. //depot/projects/toehead/bin/sync/sync.c#1 branch .. //depot/projects/toehead/bin/test/Makefile#1 branch .. //depot/projects/toehead/bin/test/TEST.README#1 branch .. //depot/projects/toehead/bin/test/TEST.csh#1 branch .. //depot/projects/toehead/bin/test/TEST.sh#1 branch .. //depot/projects/toehead/bin/test/test.1#1 branch .. //depot/projects/toehead/bin/test/test.c#1 branch .. //depot/projects/toehead/cddl/Makefile#1 branch .. //depot/projects/toehead/cddl/Makefile.inc#1 branch .. //depot/projects/toehead/cddl/lib/Makefile#1 branch .. //depot/projects/toehead/cddl/lib/Makefile.inc#1 branch .. //depot/projects/toehead/cddl/lib/libavl/Makefile#1 branch .. //depot/projects/toehead/cddl/lib/libnvpair/Makefile#1 branch .. //depot/projects/toehead/cddl/lib/libumem/Makefile#1 branch .. //depot/projects/toehead/cddl/lib/libuutil/Makefile#1 branch .. //depot/projects/toehead/cddl/lib/libzfs/Makefile#1 branch .. //depot/projects/toehead/cddl/lib/libzpool/Makefile#1 branch .. //depot/projects/toehead/cddl/sbin/Makefile#1 branch .. //depot/projects/toehead/cddl/sbin/Makefile.inc#1 branch .. //depot/projects/toehead/cddl/sbin/zfs/Makefile#1 branch .. //depot/projects/toehead/cddl/sbin/zpool/Makefile#1 branch .. //depot/projects/toehead/cddl/usr.bin/Makefile#1 branch .. //depot/projects/toehead/cddl/usr.bin/Makefile.inc#1 branch .. //depot/projects/toehead/cddl/usr.bin/ztest/Makefile#1 branch .. //depot/projects/toehead/cddl/usr.sbin/Makefile#1 branch .. //depot/projects/toehead/cddl/usr.sbin/Makefile.inc#1 branch .. //depot/projects/toehead/cddl/usr.sbin/zdb/Makefile#1 branch .. //depot/projects/toehead/compat/opensolaris/include/alloca.h#1 branch .. //depot/projects/toehead/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/toehead/compat/opensolaris/include/fcntl.h#1 branch .. //depot/projects/toehead/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/toehead/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/toehead/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/toehead/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/toehead/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/toehead/compat/opensolaris/include/stdio.h#1 branch .. //depot/projects/toehead/compat/opensolaris/include/stdlib.h#1 branch .. //depot/projects/toehead/compat/opensolaris/include/strings.h#1 branch .. //depot/projects/toehead/compat/opensolaris/include/unistd.h#1 branch .. //depot/projects/toehead/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/toehead/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/toehead/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/toehead/compat/opensolaris/misc/deviceid.c#1 branch .. //depot/projects/toehead/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/toehead/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/toehead/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/toehead/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/toehead/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/toehead/contrib/amd/AUTHORS#1 branch .. //depot/projects/toehead/contrib/amd/BUGS#1 branch .. //depot/projects/toehead/contrib/amd/COPYING#1 branch .. //depot/projects/toehead/contrib/amd/ChangeLog#1 branch .. //depot/projects/toehead/contrib/amd/FAQ#1 branch .. //depot/projects/toehead/contrib/amd/FREEBSD-Xlist#1 branch .. //depot/projects/toehead/contrib/amd/FREEBSD-upgrade#1 branch .. //depot/projects/toehead/contrib/amd/INSTALL#1 branch .. //depot/projects/toehead/contrib/amd/MIRRORS.html#1 branch .. //depot/projects/toehead/contrib/amd/MIRRORS.txt#1 branch .. //depot/projects/toehead/contrib/amd/NEWS#1 branch .. //depot/projects/toehead/contrib/amd/README#1 branch .. //depot/projects/toehead/contrib/amd/README.attrcache#1 branch .. //depot/projects/toehead/contrib/amd/README.ldap#1 branch .. //depot/projects/toehead/contrib/amd/README.y2k#1 branch .. //depot/projects/toehead/contrib/amd/amd/am_ops.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/amd.8#1 branch .. //depot/projects/toehead/contrib/amd/amd/amd.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/amd.h#1 branch .. //depot/projects/toehead/contrib/amd/amd/amfs_auto.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/amfs_direct.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/amfs_error.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/amfs_generic.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/amfs_host.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/amfs_link.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/amfs_linkx.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/amfs_nfsl.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/amfs_nfsx.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/amfs_program.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/amfs_root.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/amfs_toplvl.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/amfs_union.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/amq_subr.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/amq_svc.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/autil.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/clock.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/conf.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/conf_parse.y#1 branch .. //depot/projects/toehead/contrib/amd/amd/conf_tok.l#1 branch .. //depot/projects/toehead/contrib/amd/amd/get_args.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/info_exec.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/info_file.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/info_hesiod.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/info_ldap.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/info_ndbm.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/info_nis.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/info_nisplus.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/info_passwd.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/info_union.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/map.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/mapc.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/mntfs.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/nfs_prot_svc.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/nfs_start.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/nfs_subr.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/ops_TEMPLATE.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/ops_cachefs.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/ops_cdfs.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/ops_efs.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/ops_lofs.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/ops_mfs.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/ops_nfs.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/ops_nfs3.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/ops_nullfs.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/ops_pcfs.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/ops_tfs.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/ops_tmpfs.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/ops_ufs.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/ops_umapfs.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/ops_unionfs.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/ops_xfs.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/opts.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/readdir.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/restart.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/rpc_fwd.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/sched.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/srvr_amfs_auto.c#1 branch .. //depot/projects/toehead/contrib/amd/amd/srvr_nfs.c#1 branch .. //depot/projects/toehead/contrib/amd/amq/amq.8#1 branch .. //depot/projects/toehead/contrib/amd/amq/amq.c#1 branch .. //depot/projects/toehead/contrib/amd/amq/amq.h#1 branch .. //depot/projects/toehead/contrib/amd/amq/amq_clnt.c#1 branch .. //depot/projects/toehead/contrib/amd/amq/amq_xdr.c#1 branch .. //depot/projects/toehead/contrib/amd/amq/pawd.1#1 branch .. //depot/projects/toehead/contrib/amd/amq/pawd.c#1 branch .. //depot/projects/toehead/contrib/amd/aux_conf.h.in#1 branch .. //depot/projects/toehead/contrib/amd/bootstrap#1 branch .. //depot/projects/toehead/contrib/amd/conf/checkmount/checkmount_bsd44.c#1 branch .. //depot/projects/toehead/contrib/amd/conf/fh_dref/fh_dref_freebsd22.h#1 branch .. //depot/projects/toehead/contrib/amd/conf/mtab/mtab_bsd.c#1 branch .. //depot/projects/toehead/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#1 branch .. //depot/projects/toehead/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#1 branch .. //depot/projects/toehead/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#1 branch .. //depot/projects/toehead/contrib/amd/conf/transp/transp_sockets.c#1 branch .. //depot/projects/toehead/contrib/amd/conf/trap/trap_default.h#1 branch .. //depot/projects/toehead/contrib/amd/conf/umount/umount_bsd44.c#1 branch .. //depot/projects/toehead/contrib/amd/doc/am-utils.texi#1 branch .. //depot/projects/toehead/contrib/amd/doc/stamp-vti#1 branch .. //depot/projects/toehead/contrib/amd/doc/texinfo.tex#1 branch .. //depot/projects/toehead/contrib/amd/doc/version.texi#1 branch .. //depot/projects/toehead/contrib/amd/fixmount/fixmount.8#1 branch .. //depot/projects/toehead/contrib/amd/fixmount/fixmount.c#1 branch .. //depot/projects/toehead/contrib/amd/fsinfo/fsi_analyze.c#1 branch .. //depot/projects/toehead/contrib/amd/fsinfo/fsi_data.h#1 branch .. //depot/projects/toehead/contrib/amd/fsinfo/fsi_dict.c#1 branch .. //depot/projects/toehead/contrib/amd/fsinfo/fsi_gram.y#1 branch .. //depot/projects/toehead/contrib/amd/fsinfo/fsi_lex.l#1 branch .. //depot/projects/toehead/contrib/amd/fsinfo/fsi_util.c#1 branch .. //depot/projects/toehead/contrib/amd/fsinfo/fsinfo.8#1 branch .. //depot/projects/toehead/contrib/amd/fsinfo/fsinfo.c#1 branch .. //depot/projects/toehead/contrib/amd/fsinfo/fsinfo.h#1 branch .. //depot/projects/toehead/contrib/amd/fsinfo/wr_atab.c#1 branch .. //depot/projects/toehead/contrib/amd/fsinfo/wr_bparam.c#1 branch .. //depot/projects/toehead/contrib/amd/fsinfo/wr_dumpset.c#1 branch .. //depot/projects/toehead/contrib/amd/fsinfo/wr_exportfs.c#1 branch .. //depot/projects/toehead/contrib/amd/fsinfo/wr_fstab.c#1 branch .. //depot/projects/toehead/contrib/amd/hlfsd/hlfsd.8#1 branch .. //depot/projects/toehead/contrib/amd/hlfsd/hlfsd.c#1 branch .. //depot/projects/toehead/contrib/amd/hlfsd/hlfsd.h#1 branch .. //depot/projects/toehead/contrib/amd/hlfsd/homedir.c#1 branch .. //depot/projects/toehead/contrib/amd/hlfsd/nfs_prot_svc.c#1 branch .. //depot/projects/toehead/contrib/amd/hlfsd/stubs.c#1 branch .. //depot/projects/toehead/contrib/amd/include/am_compat.h#1 branch .. //depot/projects/toehead/contrib/amd/include/am_defs.h#1 branch .. //depot/projects/toehead/contrib/amd/include/am_utils.h#1 branch .. //depot/projects/toehead/contrib/amd/include/am_xdr_func.h#1 branch .. //depot/projects/toehead/contrib/amd/include/amq_defs.h#1 branch .. //depot/projects/toehead/contrib/amd/include/mount_headers1.h#1 branch .. //depot/projects/toehead/contrib/amd/include/mount_headers2.h#1 branch .. //depot/projects/toehead/contrib/amd/ldap-id.ms#1 branch .. //depot/projects/toehead/contrib/amd/ldap-id.txt#1 branch .. //depot/projects/toehead/contrib/amd/ldap.schema#1 branch .. //depot/projects/toehead/contrib/amd/libamu/amu.h#1 branch .. //depot/projects/toehead/contrib/amd/libamu/hasmntopt.c#1 branch .. //depot/projects/toehead/contrib/amd/libamu/misc_rpc.c#1 branch .. //depot/projects/toehead/contrib/amd/libamu/mount_fs.c#1 branch .. //depot/projects/toehead/contrib/amd/libamu/mtab.c#1 branch .. //depot/projects/toehead/contrib/amd/libamu/nfs_prot_xdr.c#1 branch .. //depot/projects/toehead/contrib/amd/libamu/strerror.c#1 branch .. //depot/projects/toehead/contrib/amd/libamu/strutil.c#1 branch .. //depot/projects/toehead/contrib/amd/libamu/wire.c#1 branch .. //depot/projects/toehead/contrib/amd/libamu/xdr_func.c#1 branch .. //depot/projects/toehead/contrib/amd/libamu/xutil.c#1 branch .. //depot/projects/toehead/contrib/amd/mk-amd-map/mk-amd-map.8#1 branch .. //depot/projects/toehead/contrib/amd/mk-amd-map/mk-amd-map.c#1 branch .. //depot/projects/toehead/contrib/amd/scripts/Makefile.am#1 branch .. //depot/projects/toehead/contrib/amd/scripts/Makefile.in#1 branch .. //depot/projects/toehead/contrib/amd/scripts/am-eject.in#1 branch .. //depot/projects/toehead/contrib/amd/scripts/amd.conf-sample#1 branch .. //depot/projects/toehead/contrib/amd/scripts/amd.conf.5#1 branch .. //depot/projects/toehead/contrib/amd/scripts/amd2ldif.in#1 branch .. //depot/projects/toehead/contrib/amd/scripts/amd2sun.in#1 branch .. //depot/projects/toehead/contrib/amd/scripts/automount2amd.8#1 branch .. //depot/projects/toehead/contrib/amd/scripts/automount2amd.in#1 branch .. //depot/projects/toehead/contrib/amd/scripts/ctl-amd.in#1 branch .. //depot/projects/toehead/contrib/amd/scripts/ctl-hlfsd.in#1 branch .. //depot/projects/toehead/contrib/amd/scripts/expn.1#1 branch .. //depot/projects/toehead/contrib/amd/scripts/expn.in#1 branch .. //depot/projects/toehead/contrib/amd/scripts/fix-amd-map.in#1 branch .. //depot/projects/toehead/contrib/amd/scripts/fixrmtab.in#1 branch .. //depot/projects/toehead/contrib/amd/scripts/redhat-ctl-amd.in#1 branch .. //depot/projects/toehead/contrib/amd/scripts/test-attrcache.in#1 branch .. //depot/projects/toehead/contrib/amd/scripts/wait4amd.in#1 branch .. //depot/projects/toehead/contrib/amd/scripts/wait4amd2die.in#1 branch .. //depot/projects/toehead/contrib/amd/tasks#1 branch .. //depot/projects/toehead/contrib/amd/vers.m4#1 branch .. //depot/projects/toehead/contrib/amd/wire-test/wire-test.8#1 branch .. //depot/projects/toehead/contrib/amd/wire-test/wire-test.c#1 branch .. //depot/projects/toehead/contrib/bc/AUTHORS#1 branch .. //depot/projects/toehead/contrib/bc/ChangeLog#1 branch .. //depot/projects/toehead/contrib/bc/Examples/ckbook.b#1 branch .. //depot/projects/toehead/contrib/bc/Examples/pi.b#1 branch .. //depot/projects/toehead/contrib/bc/Examples/primes.b#1 branch .. //depot/projects/toehead/contrib/bc/Examples/twins.b#1 branch .. //depot/projects/toehead/contrib/bc/FAQ#1 branch .. //depot/projects/toehead/contrib/bc/FREEBSD-upgrade#1 branch .. //depot/projects/toehead/contrib/bc/INSTALL#1 branch .. //depot/projects/toehead/contrib/bc/Makefile.am#1 branch .. //depot/projects/toehead/contrib/bc/Makefile.in#1 branch .. //depot/projects/toehead/contrib/bc/NEWS#1 branch .. //depot/projects/toehead/contrib/bc/README#1 branch .. //depot/projects/toehead/contrib/bc/Test/BUG.bc#1 branch .. //depot/projects/toehead/contrib/bc/Test/array.b#1 branch .. //depot/projects/toehead/contrib/bc/Test/arrayp.b#1 branch .. //depot/projects/toehead/contrib/bc/Test/aryprm.b#1 branch .. //depot/projects/toehead/contrib/bc/Test/atan.b#1 branch .. //depot/projects/toehead/contrib/bc/Test/checklib.b#1 branch .. //depot/projects/toehead/contrib/bc/Test/div.b#1 branch .. //depot/projects/toehead/contrib/bc/Test/exp.b#1 branch .. //depot/projects/toehead/contrib/bc/Test/fact.b#1 branch .. //depot/projects/toehead/contrib/bc/Test/jn.b#1 branch .. //depot/projects/toehead/contrib/bc/Test/ln.b#1 branch .. //depot/projects/toehead/contrib/bc/Test/mul.b#1 branch .. //depot/projects/toehead/contrib/bc/Test/raise.b#1 branch .. //depot/projects/toehead/contrib/bc/Test/signum#1 branch .. //depot/projects/toehead/contrib/bc/Test/sine.b#1 branch .. //depot/projects/toehead/contrib/bc/Test/sqrt.b#1 branch .. //depot/projects/toehead/contrib/bc/Test/sqrt1.b#1 branch .. //depot/projects/toehead/contrib/bc/Test/sqrt2.b#1 branch .. //depot/projects/toehead/contrib/bc/Test/testfn.b#1 branch .. //depot/projects/toehead/contrib/bc/Test/timetest#1 branch .. //depot/projects/toehead/contrib/bc/acconfig.h#1 branch .. //depot/projects/toehead/contrib/bc/aclocal.m4#1 branch .. //depot/projects/toehead/contrib/bc/bc/Makefile.am#1 branch .. //depot/projects/toehead/contrib/bc/bc/Makefile.in#1 branch .. //depot/projects/toehead/contrib/bc/bc/bc.y#1 branch .. //depot/projects/toehead/contrib/bc/bc/bcdefs.h#1 branch .. //depot/projects/toehead/contrib/bc/bc/const.h#1 branch .. //depot/projects/toehead/contrib/bc/bc/execute.c#1 branch .. //depot/projects/toehead/contrib/bc/bc/fix-libmath_h#1 branch .. //depot/projects/toehead/contrib/bc/bc/global.c#1 branch .. //depot/projects/toehead/contrib/bc/bc/global.h#1 branch .. //depot/projects/toehead/contrib/bc/bc/libmath.b#1 branch .. //depot/projects/toehead/contrib/bc/bc/libmath.h#1 branch .. //depot/projects/toehead/contrib/bc/bc/load.c#1 branch .. //depot/projects/toehead/contrib/bc/bc/main.c#1 branch .. //depot/projects/toehead/contrib/bc/bc/proto.h#1 branch .. //depot/projects/toehead/contrib/bc/bc/sbc.y#1 branch .. //depot/projects/toehead/contrib/bc/bc/scan.l#1 branch .. //depot/projects/toehead/contrib/bc/bc/storage.c#1 branch .. //depot/projects/toehead/contrib/bc/bc/util.c#1 branch .. //depot/projects/toehead/contrib/bc/config.h.in#1 branch .. //depot/projects/toehead/contrib/bc/configure#1 branch .. //depot/projects/toehead/contrib/bc/configure.in#1 branch .. //depot/projects/toehead/contrib/bc/dc/Makefile.am#1 branch .. //depot/projects/toehead/contrib/bc/dc/Makefile.in#1 branch .. //depot/projects/toehead/contrib/bc/dc/array.c#1 branch .. //depot/projects/toehead/contrib/bc/dc/dc-proto.h#1 branch .. //depot/projects/toehead/contrib/bc/dc/dc-regdef.h#1 branch .. //depot/projects/toehead/contrib/bc/dc/dc.c#1 branch .. //depot/projects/toehead/contrib/bc/dc/dc.h#1 branch .. //depot/projects/toehead/contrib/bc/dc/eval.c#1 branch .. //depot/projects/toehead/contrib/bc/dc/misc.c#1 branch .. //depot/projects/toehead/contrib/bc/dc/numeric.c#1 branch .. //depot/projects/toehead/contrib/bc/dc/stack.c#1 branch .. //depot/projects/toehead/contrib/bc/dc/string.c#1 branch .. //depot/projects/toehead/contrib/bc/doc/Makefile.am#1 branch .. //depot/projects/toehead/contrib/bc/doc/Makefile.in#1 branch .. //depot/projects/toehead/contrib/bc/doc/bc.1#1 branch .. //depot/projects/toehead/contrib/bc/doc/bc.texi#1 branch .. //depot/projects/toehead/contrib/bc/doc/dc.1#1 branch .. //depot/projects/toehead/contrib/bc/doc/dc.texi#1 branch .. //depot/projects/toehead/contrib/bc/h/number.h#1 branch .. //depot/projects/toehead/contrib/bc/install-sh#1 branch .. //depot/projects/toehead/contrib/bc/lib/Makefile.am#1 branch .. //depot/projects/toehead/contrib/bc/lib/Makefile.in#1 branch .. //depot/projects/toehead/contrib/bc/lib/number.c#1 branch .. //depot/projects/toehead/contrib/bc/lib/testmul.c#1 branch .. //depot/projects/toehead/contrib/bc/lib/vfprintf.c#1 branch .. //depot/projects/toehead/contrib/bc/missing#1 branch .. //depot/projects/toehead/contrib/bc/mkinstalldirs#1 branch .. //depot/projects/toehead/contrib/bc/stamp-h.in#1 branch .. //depot/projects/toehead/contrib/bind9/CHANGES#1 branch .. //depot/projects/toehead/contrib/bind9/COPYRIGHT#1 branch .. //depot/projects/toehead/contrib/bind9/FAQ#1 branch .. //depot/projects/toehead/contrib/bind9/FAQ.xml#1 branch .. //depot/projects/toehead/contrib/bind9/FREEBSD-Upgrade#1 branch .. //depot/projects/toehead/contrib/bind9/FREEBSD-Xlist#1 branch .. //depot/projects/toehead/contrib/bind9/Makefile.in#1 branch .. //depot/projects/toehead/contrib/bind9/README#1 branch .. //depot/projects/toehead/contrib/bind9/README.idnkit#1 branch .. //depot/projects/toehead/contrib/bind9/acconfig.h#1 branch .. //depot/projects/toehead/contrib/bind9/bin/Makefile.in#1 branch .. //depot/projects/toehead/contrib/bind9/bin/check/Makefile.in#1 branch .. //depot/projects/toehead/contrib/bind9/bin/check/check-tool.c#1 branch .. //depot/projects/toehead/contrib/bind9/bin/check/check-tool.h#1 branch .. //depot/projects/toehead/contrib/bind9/bin/check/named-checkconf.8#1 branch .. //depot/projects/toehead/contrib/bind9/bin/check/named-checkconf.c#1 branch .. //depot/projects/toehead/contrib/bind9/bin/check/named-checkconf.docbook#1 branch .. //depot/projects/toehead/contrib/bind9/bin/check/named-checkconf.html#1 branch .. //depot/projects/toehead/contrib/bind9/bin/check/named-checkzone.8#1 branch .. //depot/projects/toehead/contrib/bind9/bin/check/named-checkzone.c#1 branch .. //depot/projects/toehead/contrib/bind9/bin/check/named-checkzone.docbook#1 branch .. //depot/projects/toehead/contrib/bind9/bin/check/named-checkzone.html#1 branch .. //depot/projects/toehead/contrib/bind9/bin/dig/Makefile.in#1 branch .. //depot/projects/toehead/contrib/bind9/bin/dig/dig.1#1 branch .. //depot/projects/toehead/contrib/bind9/bin/dig/dig.c#1 branch .. //depot/projects/toehead/contrib/bind9/bin/dig/dig.docbook#1 branch .. //depot/projects/toehead/contrib/bind9/bin/dig/dig.html#1 branch .. //depot/projects/toehead/contrib/bind9/bin/dig/dighost.c#1 branch .. //depot/projects/toehead/contrib/bind9/bin/dig/host.1#1 branch .. //depot/projects/toehead/contrib/bind9/bin/dig/host.c#1 branch .. //depot/projects/toehead/contrib/bind9/bin/dig/host.docbook#1 branch .. //depot/projects/toehead/contrib/bind9/bin/dig/host.html#1 branch .. //depot/projects/toehead/contrib/bind9/bin/dig/include/dig/dig.h#1 branch .. //depot/projects/toehead/contrib/bind9/bin/dig/nslookup.1#1 branch .. //depot/projects/toehead/contrib/bind9/bin/dig/nslookup.c#1 branch .. //depot/projects/toehead/contrib/bind9/bin/dig/nslookup.docbook#1 branch .. //depot/projects/toehead/contrib/bind9/bin/dig/nslookup.html#1 branch .. //depot/projects/toehead/contrib/bind9/bin/dnssec/Makefile.in#1 branch .. //depot/projects/toehead/contrib/bind9/bin/dnssec/dnssec-keygen.8#1 branch .. //depot/projects/toehead/contrib/bind9/bin/dnssec/dnssec-keygen.c#1 branch .. //depot/projects/toehead/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#1 branch .. //depot/projects/toehead/contrib/bind9/bin/dnssec/dnssec-keygen.html#1 branch .. //depot/projects/toehead/contrib/bind9/bin/dnssec/dnssec-signzone.8#1 branch .. //depot/projects/toehead/contrib/bind9/bin/dnssec/dnssec-signzone.c#1 branch .. //depot/projects/toehead/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#1 branch .. //depot/projects/toehead/contrib/bind9/bin/dnssec/dnssec-signzone.html#1 branch .. //depot/projects/toehead/contrib/bind9/bin/dnssec/dnssectool.c#1 branch .. //depot/projects/toehead/contrib/bind9/bin/dnssec/dnssectool.h#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/Makefile.in#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/builtin.c#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/client.c#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/config.c#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/control.c#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/controlconf.c#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/include/named/builtin.h#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/include/named/client.h#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/include/named/config.h#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/include/named/control.h#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/include/named/globals.h#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/include/named/interfacemgr.h#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/include/named/listenlist.h#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/include/named/log.h#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/include/named/logconf.h#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/include/named/lwaddr.h#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/include/named/lwdclient.h#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/include/named/lwresd.h#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/include/named/lwsearch.h#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/include/named/main.h#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/include/named/notify.h#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/include/named/query.h#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/include/named/server.h#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/include/named/sortlist.h#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/include/named/tkeyconf.h#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/include/named/tsigconf.h#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/include/named/types.h#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/include/named/update.h#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/include/named/xfrout.h#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/include/named/zoneconf.h#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/interfacemgr.c#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/listenlist.c#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/log.c#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/logconf.c#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/lwaddr.c#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/lwdclient.c#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/lwderror.c#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/lwdgabn.c#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/lwdgnba.c#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/lwdgrbn.c#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/lwdnoop.c#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/lwresd.8#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/lwresd.c#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/lwresd.docbook#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/lwresd.html#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/lwsearch.c#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/main.c#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/named.8#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/named.conf.5#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/named.conf.docbook#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/named.conf.html#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/named.docbook#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/named.html#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/notify.c#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/query.c#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/server.c#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/sortlist.c#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/tkeyconf.c#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/tsigconf.c#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/unix/Makefile.in#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/unix/include/named/os.h#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/unix/os.c#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/update.c#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/xfrout.c#1 branch .. //depot/projects/toehead/contrib/bind9/bin/named/zoneconf.c#1 branch .. //depot/projects/toehead/contrib/bind9/bin/nsupdate/Makefile.in#1 branch .. //depot/projects/toehead/contrib/bind9/bin/nsupdate/nsupdate.8#1 branch .. //depot/projects/toehead/contrib/bind9/bin/nsupdate/nsupdate.c#1 branch .. //depot/projects/toehead/contrib/bind9/bin/nsupdate/nsupdate.docbook#1 branch .. //depot/projects/toehead/contrib/bind9/bin/nsupdate/nsupdate.html#1 branch .. //depot/projects/toehead/contrib/bind9/bin/rndc/Makefile.in#1 branch .. //depot/projects/toehead/contrib/bind9/bin/rndc/include/rndc/os.h#1 branch .. //depot/projects/toehead/contrib/bind9/bin/rndc/rndc-confgen.8#1 branch .. //depot/projects/toehead/contrib/bind9/bin/rndc/rndc-confgen.c#1 branch .. //depot/projects/toehead/contrib/bind9/bin/rndc/rndc-confgen.docbook#1 branch .. //depot/projects/toehead/contrib/bind9/bin/rndc/rndc-confgen.html#1 branch .. //depot/projects/toehead/contrib/bind9/bin/rndc/rndc.8#1 branch .. //depot/projects/toehead/contrib/bind9/bin/rndc/rndc.c#1 branch .. //depot/projects/toehead/contrib/bind9/bin/rndc/rndc.conf#1 branch .. //depot/projects/toehead/contrib/bind9/bin/rndc/rndc.conf.5#1 branch .. //depot/projects/toehead/contrib/bind9/bin/rndc/rndc.conf.docbook#1 branch .. //depot/projects/toehead/contrib/bind9/bin/rndc/rndc.conf.html#1 branch .. //depot/projects/toehead/contrib/bind9/bin/rndc/rndc.docbook#1 branch .. //depot/projects/toehead/contrib/bind9/bin/rndc/rndc.html#1 branch .. //depot/projects/toehead/contrib/bind9/bin/rndc/unix/Makefile.in#1 branch .. //depot/projects/toehead/contrib/bind9/bin/rndc/unix/os.c#1 branch .. //depot/projects/toehead/contrib/bind9/bin/rndc/util.c#1 branch .. //depot/projects/toehead/contrib/bind9/bin/rndc/util.h#1 branch .. //depot/projects/toehead/contrib/bind9/config.guess#1 branch .. //depot/projects/toehead/contrib/bind9/config.sub#1 branch .. //depot/projects/toehead/contrib/bind9/config.threads.in#1 branch .. //depot/projects/toehead/contrib/bind9/configure.in#1 branch .. //depot/projects/toehead/contrib/bind9/doc/Makefile.in#1 branch .. //depot/projects/toehead/contrib/bind9/doc/arm/Bv9ARM-book.xml#1 branch .. //depot/projects/toehead/contrib/bind9/doc/arm/Bv9ARM.ch01.html#1 branch .. //depot/projects/toehead/contrib/bind9/doc/arm/Bv9ARM.ch02.html#1 branch .. //depot/projects/toehead/contrib/bind9/doc/arm/Bv9ARM.ch03.html#1 branch .. //depot/projects/toehead/contrib/bind9/doc/arm/Bv9ARM.ch04.html#1 branch .. //depot/projects/toehead/contrib/bind9/doc/arm/Bv9ARM.ch05.html#1 branch .. //depot/projects/toehead/contrib/bind9/doc/arm/Bv9ARM.ch06.html#1 branch .. //depot/projects/toehead/contrib/bind9/doc/arm/Bv9ARM.ch07.html#1 branch .. //depot/projects/toehead/contrib/bind9/doc/arm/Bv9ARM.ch08.html#1 branch .. //depot/projects/toehead/contrib/bind9/doc/arm/Bv9ARM.ch09.html#1 branch .. //depot/projects/toehead/contrib/bind9/doc/arm/Bv9ARM.ch10.html#1 branch .. //depot/projects/toehead/contrib/bind9/doc/arm/Bv9ARM.html#1 branch .. //depot/projects/toehead/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch .. //depot/projects/toehead/contrib/bind9/doc/arm/Makefile.in#1 branch .. //depot/projects/toehead/contrib/bind9/doc/arm/README-SGML#1 branch .. //depot/projects/toehead/contrib/bind9/doc/arm/isc-logo.eps#1 branch .. //depot/projects/toehead/contrib/bind9/doc/arm/isc-logo.pdf#1 branch .. //depot/projects/toehead/contrib/bind9/doc/arm/man.dig.html#1 branch .. //depot/projects/toehead/contrib/bind9/doc/arm/man.dnssec-keygen.html#1 branch .. //depot/projects/toehead/contrib/bind9/doc/arm/man.dnssec-signzone.html#1 branch .. //depot/projects/toehead/contrib/bind9/doc/arm/man.host.html#1 branch .. //depot/projects/toehead/contrib/bind9/doc/arm/man.named-checkconf.html#1 branch .. //depot/projects/toehead/contrib/bind9/doc/arm/man.named-checkzone.html#1 branch .. //depot/projects/toehead/contrib/bind9/doc/arm/man.named.html#1 branch .. //depot/projects/toehead/contrib/bind9/doc/arm/man.rndc-confgen.html#1 branch .. //depot/projects/toehead/contrib/bind9/doc/arm/man.rndc.conf.html#1 branch .. //depot/projects/toehead/contrib/bind9/doc/arm/man.rndc.html#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-12.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-02.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-rsasha256-00.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-ietf-dnsext-ds-sha256-05.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-04.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-ietf-dnsext-nsid-01.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-02.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-06.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-10.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-05.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-08.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-06.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/draft/update#1 branch .. //depot/projects/toehead/contrib/bind9/doc/misc/Makefile.in#1 branch .. //depot/projects/toehead/contrib/bind9/doc/misc/dnssec#1 branch .. //depot/projects/toehead/contrib/bind9/doc/misc/format-options.pl#1 branch .. //depot/projects/toehead/contrib/bind9/doc/misc/ipv6#1 branch .. //depot/projects/toehead/contrib/bind9/doc/misc/migration#1 branch .. //depot/projects/toehead/contrib/bind9/doc/misc/migration-4to9#1 branch .. //depot/projects/toehead/contrib/bind9/doc/misc/options#1 branch .. //depot/projects/toehead/contrib/bind9/doc/misc/rfc-compliance#1 branch .. //depot/projects/toehead/contrib/bind9/doc/misc/roadmap#1 branch .. //depot/projects/toehead/contrib/bind9/doc/misc/sdb#1 branch .. //depot/projects/toehead/contrib/bind9/doc/rfc/index#1 branch .. //depot/projects/toehead/contrib/bind9/doc/rfc/rfc1032.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/rfc/rfc1033.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/rfc/rfc1034.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/rfc/rfc1035.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/rfc/rfc1101.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/rfc/rfc1122.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/rfc/rfc1123.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/rfc/rfc1183.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/rfc/rfc1348.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/rfc/rfc1535.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/rfc/rfc1536.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/rfc/rfc1537.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/rfc/rfc1591.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/rfc/rfc1611.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/rfc/rfc1612.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/rfc/rfc1706.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/rfc/rfc1712.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/rfc/rfc1750.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/rfc/rfc1876.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/rfc/rfc1886.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/rfc/rfc1982.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/rfc/rfc1995.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/rfc/rfc1996.txt#1 branch .. //depot/projects/toehead/contrib/bind9/doc/rfc/rfc2052.txt#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Dec 10 10:25:48 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3505E16A419; Mon, 10 Dec 2007 10:25:48 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CFF5E16A417 for ; Mon, 10 Dec 2007 10:25:47 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BEBA713C474 for ; Mon, 10 Dec 2007 10:25:47 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBAAPlJp047619 for ; Mon, 10 Dec 2007 10:25:47 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBAAPL0H047599 for perforce@freebsd.org; Mon, 10 Dec 2007 10:25:21 GMT (envelope-from zec@FreeBSD.org) Date: Mon, 10 Dec 2007 10:25:21 GMT Message-Id: <200712101025.lBAAPL0H047599@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 130589 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Dec 2007 10:25:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=130589 Change 130589 by zec@zec_tpx32 on 2007/12/10 10:25:19 IFC Affected files ... .. //depot/projects/vimage/src/sys/amd64/amd64/busdma_machdep.c#5 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/exception.S#3 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/genassym.c#6 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/intr_machdep.c#6 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/local_apic.c#8 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/machdep.c#7 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/msi.c#5 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/nexus.c#6 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/pmap.c#10 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/prof_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/trap.c#6 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/vm_machdep.c#4 integrate .. //depot/projects/vimage/src/sys/amd64/conf/DEFAULTS#3 integrate .. //depot/projects/vimage/src/sys/amd64/conf/GENERIC#11 integrate .. //depot/projects/vimage/src/sys/amd64/conf/NOTES#7 integrate .. //depot/projects/vimage/src/sys/amd64/include/clock.h#3 integrate .. //depot/projects/vimage/src/sys/amd64/include/pc/bios.h#2 integrate .. //depot/projects/vimage/src/sys/amd64/include/pci_cfgreg.h#2 integrate .. //depot/projects/vimage/src/sys/amd64/isa/clock.c#7 integrate .. //depot/projects/vimage/src/sys/amd64/pci/pci_cfgreg.c#2 integrate .. //depot/projects/vimage/src/sys/arm/arm/busdma_machdep.c#8 integrate .. //depot/projects/vimage/src/sys/arm/arm/cpufunc.c#6 integrate .. //depot/projects/vimage/src/sys/arm/arm/nexus_io.c#2 delete .. //depot/projects/vimage/src/sys/arm/arm/nexus_io_asm.S#2 delete .. //depot/projects/vimage/src/sys/arm/arm/pmap.c#9 integrate .. //depot/projects/vimage/src/sys/arm/arm/trap.c#5 integrate .. //depot/projects/vimage/src/sys/arm/arm/vm_machdep.c#6 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91rm92reg.h#3 integrate .. //depot/projects/vimage/src/sys/arm/at91/if_ate.c#5 integrate .. //depot/projects/vimage/src/sys/arm/at91/kb920x_machdep.c#6 integrate .. //depot/projects/vimage/src/sys/arm/at91/ohci_atmelarm.c#4 integrate .. //depot/projects/vimage/src/sys/arm/at91/std.at91#2 integrate .. //depot/projects/vimage/src/sys/arm/at91/std.kb920x#2 integrate .. //depot/projects/vimage/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#4 integrate .. //depot/projects/vimage/src/sys/arm/conf/AVILA#5 integrate .. //depot/projects/vimage/src/sys/arm/conf/BWCT#2 integrate .. //depot/projects/vimage/src/sys/arm/conf/CRB#3 integrate .. //depot/projects/vimage/src/sys/arm/conf/EP80219#3 integrate .. //depot/projects/vimage/src/sys/arm/conf/HL200#1 branch .. //depot/projects/vimage/src/sys/arm/conf/IQ31244#3 integrate .. //depot/projects/vimage/src/sys/arm/conf/KB920X#4 integrate .. //depot/projects/vimage/src/sys/arm/conf/SIMICS#3 integrate .. //depot/projects/vimage/src/sys/arm/conf/SKYEYE#2 integrate .. //depot/projects/vimage/src/sys/arm/include/asmacros.h#3 integrate .. //depot/projects/vimage/src/sys/arm/include/atomic.h#3 integrate .. //depot/projects/vimage/src/sys/arm/include/cpuconf.h#3 integrate .. //depot/projects/vimage/src/sys/arm/sa11x0/assabet_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/arm/sa11x0/files.sa11x0#2 integrate .. //depot/projects/vimage/src/sys/arm/xscale/i80321/ep80219_machdep.c#5 integrate .. //depot/projects/vimage/src/sys/arm/xscale/i80321/iq31244_machdep.c#5 integrate .. //depot/projects/vimage/src/sys/arm/xscale/i8134x/crb_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/avila_machdep.c#6 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/if_npe.c#5 integrate .. //depot/projects/vimage/src/sys/boot/arm/at91/boot2/boot2.c#5 integrate .. //depot/projects/vimage/src/sys/boot/arm/at91/libat91/eeprom.c#3 integrate .. //depot/projects/vimage/src/sys/boot/arm/at91/libat91/emac.c#5 integrate .. //depot/projects/vimage/src/sys/boot/arm/at91/libat91/emac_init.c#3 integrate .. //depot/projects/vimage/src/sys/boot/arm/at91/libat91/lib.h#3 integrate .. //depot/projects/vimage/src/sys/boot/common/loader.8#5 integrate .. //depot/projects/vimage/src/sys/boot/common/ufsread.c#2 integrate .. //depot/projects/vimage/src/sys/boot/i386/Makefile#3 integrate .. //depot/projects/vimage/src/sys/boot/i386/boot2/boot2.c#2 integrate .. //depot/projects/vimage/src/sys/boot/i386/cdboot/cdboot.s#3 integrate .. //depot/projects/vimage/src/sys/boot/i386/gptboot/Makefile#1 branch .. //depot/projects/vimage/src/sys/boot/i386/gptboot/gptboot.c#1 branch .. //depot/projects/vimage/src/sys/boot/i386/gptboot/gptldr.S#1 branch .. //depot/projects/vimage/src/sys/boot/i386/libi386/bioscd.c#2 integrate .. //depot/projects/vimage/src/sys/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/projects/vimage/src/sys/boot/i386/libi386/biosmem.c#2 integrate .. //depot/projects/vimage/src/sys/boot/i386/libi386/biossmap.c#2 integrate .. //depot/projects/vimage/src/sys/boot/i386/libi386/devicename.c#2 integrate .. //depot/projects/vimage/src/sys/boot/i386/loader/main.c#3 integrate .. //depot/projects/vimage/src/sys/boot/i386/pmbr/Makefile#1 branch .. //depot/projects/vimage/src/sys/boot/i386/pmbr/pmbr.s#1 branch .. //depot/projects/vimage/src/sys/boot/pc98/boot2/boot.c#3 integrate .. //depot/projects/vimage/src/sys/boot/pc98/cdboot/cdboot.s#3 integrate .. //depot/projects/vimage/src/sys/boot/pc98/libpc98/bioscd.c#2 integrate .. //depot/projects/vimage/src/sys/boot/pc98/libpc98/biosdisk.c#2 integrate .. //depot/projects/vimage/src/sys/boot/pc98/loader/main.c#2 integrate .. //depot/projects/vimage/src/sys/bsm/audit.h#5 integrate .. //depot/projects/vimage/src/sys/cam/cam_xpt.c#10 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_all.h#4 integrate .. //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#14 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_file.c#7 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_getcwd.c#2 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_ioctl.c#7 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_ioctl.h#3 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_misc.c#12 integrate .. //depot/projects/vimage/src/sys/compat/ndis/ndis_var.h#3 integrate .. //depot/projects/vimage/src/sys/compat/ndis/ntoskrnl_var.h#2 integrate .. //depot/projects/vimage/src/sys/compat/ndis/subr_ndis.c#4 integrate .. //depot/projects/vimage/src/sys/compat/ndis/subr_ntoskrnl.c#5 integrate .. //depot/projects/vimage/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#4 integrate .. //depot/projects/vimage/src/sys/compat/opensolaris/rpc/xdr.h#2 integrate .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/atomic.h#2 integrate .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/bitmap.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/cpupart.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/cpuvar.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/cyclic.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/elf.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/kcondvar.h#2 integrate .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/kmem.h#2 integrate .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/mman.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/modctl.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/mutex.h#3 integrate .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/objfs.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/param.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/pcpu.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/proc.h#3 integrate .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/rwlock.h#3 integrate .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/stat.h#1 branch .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/time.h#2 integrate .. //depot/projects/vimage/src/sys/compat/opensolaris/sys/types.h#3 integrate .. //depot/projects/vimage/src/sys/compat/pecoff/imgact_pecoff.c#3 integrate .. //depot/projects/vimage/src/sys/compat/svr4/imgact_svr4.c#2 integrate .. //depot/projects/vimage/src/sys/compat/svr4/svr4_fcntl.c#3 integrate .. //depot/projects/vimage/src/sys/compat/svr4/svr4_misc.c#4 integrate .. //depot/projects/vimage/src/sys/conf/NOTES#18 integrate .. //depot/projects/vimage/src/sys/conf/files#21 integrate .. //depot/projects/vimage/src/sys/conf/files.amd64#8 integrate .. //depot/projects/vimage/src/sys/conf/files.arm#4 integrate .. //depot/projects/vimage/src/sys/conf/files.i386#8 integrate .. //depot/projects/vimage/src/sys/conf/files.ia64#4 integrate .. //depot/projects/vimage/src/sys/conf/files.pc98#6 integrate .. //depot/projects/vimage/src/sys/conf/files.powerpc#6 integrate .. //depot/projects/vimage/src/sys/conf/files.sun4v#5 integrate .. //depot/projects/vimage/src/sys/conf/kmod.mk#5 integrate .. //depot/projects/vimage/src/sys/conf/options#20 integrate .. //depot/projects/vimage/src/sys/conf/options.amd64#3 integrate .. //depot/projects/vimage/src/sys/conf/options.arm#5 integrate .. //depot/projects/vimage/src/sys/conf/options.i386#3 integrate .. //depot/projects/vimage/src/sys/contrib/dev/wpi/LICENSE#1 branch .. //depot/projects/vimage/src/sys/contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu#1 branch .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/fil.c#4 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_auth.c#4 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_compat.h#4 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#4 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_log.c#4 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_nat.c#4 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_state.c#5 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/common/avl/avl.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/common/nvpair/nvpair.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#5 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#3 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#4 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#5 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#3 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#4 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#3 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/rpc/xdr.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/rpc/xdr.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/byteorder.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/procset.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/vfs.h#2 delete .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/vmem.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/pf/net/pf.c#9 integrate .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_if.c#5 integrate .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_ioctl.c#9 integrate .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_table.c#4 integrate .. //depot/projects/vimage/src/sys/ddb/db_examine.c#2 integrate .. //depot/projects/vimage/src/sys/dev/aac/aac.c#4 integrate .. //depot/projects/vimage/src/sys/dev/aac/aac_cam.c#5 integrate .. //depot/projects/vimage/src/sys/dev/aac/aac_debug.c#2 integrate .. //depot/projects/vimage/src/sys/dev/acpi_support/acpi_ibm.c#4 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_battery.c#4 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_cpu.c#6 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_ec.c#5 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_pci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_pci_link.c#3 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_thermal.c#3 integrate .. //depot/projects/vimage/src/sys/dev/agp/agp.c#1 branch .. //depot/projects/vimage/src/sys/dev/agp/agp_ali.c#1 branch .. //depot/projects/vimage/src/sys/dev/agp/agp_amd.c#1 branch .. //depot/projects/vimage/src/sys/dev/agp/agp_amd64.c#1 branch .. //depot/projects/vimage/src/sys/dev/agp/agp_ati.c#1 branch .. //depot/projects/vimage/src/sys/dev/agp/agp_i810.c#1 branch .. //depot/projects/vimage/src/sys/dev/agp/agp_if.m#1 branch .. //depot/projects/vimage/src/sys/dev/agp/agp_intel.c#1 branch .. //depot/projects/vimage/src/sys/dev/agp/agp_nvidia.c#1 branch .. //depot/projects/vimage/src/sys/dev/agp/agp_sis.c#1 branch .. //depot/projects/vimage/src/sys/dev/agp/agp_via.c#1 branch .. //depot/projects/vimage/src/sys/dev/agp/agppriv.h#1 branch .. //depot/projects/vimage/src/sys/dev/agp/agpreg.h#1 branch .. //depot/projects/vimage/src/sys/dev/agp/agpvar.h#1 branch .. //depot/projects/vimage/src/sys/dev/aic7xxx/aic_osm_lib.c#4 integrate .. //depot/projects/vimage/src/sys/dev/aic7xxx/aic_osm_lib.h#3 integrate .. //depot/projects/vimage/src/sys/dev/amr/amr.c#2 integrate .. //depot/projects/vimage/src/sys/dev/amr/amr_cam.c#4 integrate .. //depot/projects/vimage/src/sys/dev/an/if_an.c#6 integrate .. //depot/projects/vimage/src/sys/dev/an/if_anreg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/asmc/asmc.c#1 branch .. //depot/projects/vimage/src/sys/dev/asmc/asmcvar.h#1 branch .. //depot/projects/vimage/src/sys/dev/ata/ata-all.h#5 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-chipset.c#10 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-disk.c#6 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-dma.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-pci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-pci.h#8 integrate .. //depot/projects/vimage/src/sys/dev/ata/atapi-cd.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ata/atapi-cd.h#3 integrate .. //depot/projects/vimage/src/sys/dev/ata/atapi-fd.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ata/atapi-tape.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_ath_pci.c#5 integrate .. //depot/projects/vimage/src/sys/dev/bce/if_bce.c#10 integrate .. //depot/projects/vimage/src/sys/dev/bfe/if_bfe.c#3 integrate .. //depot/projects/vimage/src/sys/dev/bge/if_bge.c#9 integrate .. //depot/projects/vimage/src/sys/dev/bktr/msp34xx.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ciss/ciss.c#8 integrate .. //depot/projects/vimage/src/sys/dev/dc/dcphy.c#2 integrate .. //depot/projects/vimage/src/sys/dev/dc/if_dc.c#6 integrate .. //depot/projects/vimage/src/sys/dev/drm/drmP.h#2 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_agpsupport.c#3 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_80003es2lan.c#3 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_80003es2lan.h#3 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_82540.c#3 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_82541.c#3 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_82541.h#3 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_82542.c#3 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_82543.c#3 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_82543.h#3 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_82571.c#3 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_82571.h#3 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_82575.c#3 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_82575.h#3 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_api.c#3 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_api.h#3 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_defines.h#3 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_hw.h#3 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_ich8lan.c#3 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_ich8lan.h#3 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_mac.c#3 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_mac.h#3 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_manage.c#3 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_manage.h#3 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_nvm.c#3 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_nvm.h#3 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_osdep.h#3 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_phy.c#3 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_phy.h#3 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_regs.h#3 integrate .. //depot/projects/vimage/src/sys/dev/em/if_em.c#9 integrate .. //depot/projects/vimage/src/sys/dev/em/if_em.h#5 integrate .. //depot/projects/vimage/src/sys/dev/esp/esp_sbus.c#5 integrate .. //depot/projects/vimage/src/sys/dev/fdc/fdc.c#3 integrate .. //depot/projects/vimage/src/sys/dev/firewire/firewire.c#10 integrate .. //depot/projects/vimage/src/sys/dev/flash/at45d.c#2 integrate .. //depot/projects/vimage/src/sys/dev/hptmv/entry.c#6 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_logging.c#3 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_x86.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ichsmb/ichsmb_pci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ichwd/ichwd.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ichwd/ichwd.h#3 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis.c#7 integrate .. //depot/projects/vimage/src/sys/dev/ipmi/ipmi_kcs.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ipmi/ipmi_smic.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ipmi/ipmi_ssif.c#3 integrate .. //depot/projects/vimage/src/sys/dev/iscsi/initiator/isc_sm.c#2 integrate .. //depot/projects/vimage/src/sys/dev/iscsi/initiator/isc_soc.c#2 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp_freebsd.c#12 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp_sbus.c#8 integrate .. //depot/projects/vimage/src/sys/dev/iwi/if_iwi.c#8 edit .. //depot/projects/vimage/src/sys/dev/lge/if_lge.c#3 integrate .. //depot/projects/vimage/src/sys/dev/md/md.c#4 integrate .. //depot/projects/vimage/src/sys/dev/mii/amphy.c#4 integrate .. //depot/projects/vimage/src/sys/dev/mii/e1000phy.c#3 integrate .. //depot/projects/vimage/src/sys/dev/mii/e1000phyreg.h#3 integrate .. //depot/projects/vimage/src/sys/dev/mii/gentbi.c#3 integrate .. //depot/projects/vimage/src/sys/dev/mii/miidevs#8 integrate .. //depot/projects/vimage/src/sys/dev/mii/nsphy.c#4 integrate .. //depot/projects/vimage/src/sys/dev/mii/rgephy.c#4 integrate .. //depot/projects/vimage/src/sys/dev/mii/rgephyreg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/mii/rlphy.c#7 integrate .. //depot/projects/vimage/src/sys/dev/mii/tdkphy.c#3 integrate .. //depot/projects/vimage/src/sys/dev/mii/ukphy_subr.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mmc/mmcsd.c#4 integrate .. //depot/projects/vimage/src/sys/dev/mpt/mpt.c#8 integrate .. //depot/projects/vimage/src/sys/dev/mpt/mpt.h#8 integrate .. //depot/projects/vimage/src/sys/dev/mpt/mpt_cam.c#11 integrate .. //depot/projects/vimage/src/sys/dev/mpt/mpt_raid.c#4 integrate .. //depot/projects/vimage/src/sys/dev/msk/if_msk.c#9 integrate .. //depot/projects/vimage/src/sys/dev/msk/if_mskreg.h#5 integrate .. //depot/projects/vimage/src/sys/dev/nfe/if_nfe.c#6 integrate .. //depot/projects/vimage/src/sys/dev/nge/if_nge.c#3 integrate .. //depot/projects/vimage/src/sys/dev/nve/if_nve.c#5 integrate .. //depot/projects/vimage/src/sys/dev/nvram/nvram.c#1 branch .. //depot/projects/vimage/src/sys/dev/nxge/if_nxge.c#4 integrate .. //depot/projects/vimage/src/sys/dev/nxge/if_nxge.h#2 integrate .. //depot/projects/vimage/src/sys/dev/nxge/include/build-version.h#2 integrate .. //depot/projects/vimage/src/sys/dev/nxge/include/version.h#2 integrate .. //depot/projects/vimage/src/sys/dev/nxge/include/xge-debug.h#2 integrate .. //depot/projects/vimage/src/sys/dev/nxge/include/xge-defs.h#2 integrate .. //depot/projects/vimage/src/sys/dev/nxge/include/xge-list.h#2 integrate .. //depot/projects/vimage/src/sys/dev/nxge/include/xge-os-pal.h#2 integrate .. //depot/projects/vimage/src/sys/dev/nxge/include/xge-os-template.h#2 delete .. //depot/projects/vimage/src/sys/dev/nxge/include/xge-queue.h#2 integrate .. //depot/projects/vimage/src/sys/dev/nxge/include/xgehal-channel.h#2 integrate .. //depot/projects/vimage/src/sys/dev/nxge/include/xgehal-config.h#2 integrate .. //depot/projects/vimage/src/sys/dev/nxge/include/xgehal-device.h#2 integrate .. //depot/projects/vimage/src/sys/dev/nxge/include/xgehal-driver.h#2 integrate .. //depot/projects/vimage/src/sys/dev/nxge/include/xgehal-event.h#2 integrate .. //depot/projects/vimage/src/sys/dev/nxge/include/xgehal-fifo.h#2 integrate .. //depot/projects/vimage/src/sys/dev/nxge/include/xgehal-mgmt.h#2 integrate .. //depot/projects/vimage/src/sys/dev/nxge/include/xgehal-mgmtaux.h#2 integrate .. //depot/projects/vimage/src/sys/dev/nxge/include/xgehal-mm.h#2 integrate .. //depot/projects/vimage/src/sys/dev/nxge/include/xgehal-regs.h#2 integrate .. //depot/projects/vimage/src/sys/dev/nxge/include/xgehal-ring.h#2 integrate .. //depot/projects/vimage/src/sys/dev/nxge/include/xgehal-stats.h#2 integrate .. //depot/projects/vimage/src/sys/dev/nxge/include/xgehal-types.h#2 integrate .. //depot/projects/vimage/src/sys/dev/nxge/include/xgehal.h#2 integrate .. //depot/projects/vimage/src/sys/dev/nxge/xge-osdep.h#2 integrate .. //depot/projects/vimage/src/sys/dev/nxge/xgehal/xge-queue.c#2 integrate .. //depot/projects/vimage/src/sys/dev/nxge/xgehal/xgehal-channel-fp.c#2 integrate .. //depot/projects/vimage/src/sys/dev/nxge/xgehal/xgehal-channel.c#2 integrate .. //depot/projects/vimage/src/sys/dev/nxge/xgehal/xgehal-config.c#2 integrate .. //depot/projects/vimage/src/sys/dev/nxge/xgehal/xgehal-device-fp.c#2 integrate .. //depot/projects/vimage/src/sys/dev/nxge/xgehal/xgehal-device.c#2 integrate .. //depot/projects/vimage/src/sys/dev/nxge/xgehal/xgehal-driver.c#2 integrate .. //depot/projects/vimage/src/sys/dev/nxge/xgehal/xgehal-fifo-fp.c#2 integrate .. //depot/projects/vimage/src/sys/dev/nxge/xgehal/xgehal-fifo.c#2 integrate .. //depot/projects/vimage/src/sys/dev/nxge/xgehal/xgehal-mgmt.c#2 integrate .. //depot/projects/vimage/src/sys/dev/nxge/xgehal/xgehal-mgmtaux.c#2 integrate .. //depot/projects/vimage/src/sys/dev/nxge/xgehal/xgehal-mm.c#2 integrate .. //depot/projects/vimage/src/sys/dev/nxge/xgehal/xgehal-ring-fp.c#2 integrate .. //depot/projects/vimage/src/sys/dev/nxge/xgehal/xgehal-ring.c#2 integrate .. //depot/projects/vimage/src/sys/dev/nxge/xgehal/xgehal-stats.c#2 integrate .. //depot/projects/vimage/src/sys/dev/nxge/xgell-version.h#2 integrate .. //depot/projects/vimage/src/sys/dev/ofw/ofw_disk.c#2 integrate .. //depot/projects/vimage/src/sys/dev/pccbb/pccbb.c#6 integrate .. //depot/projects/vimage/src/sys/dev/pccbb/pccbb_pci.c#5 integrate .. //depot/projects/vimage/src/sys/dev/pci/pci.c#11 integrate .. //depot/projects/vimage/src/sys/dev/pci/pci_user.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ral/rt2560.c#11 integrate .. //depot/projects/vimage/src/sys/dev/ral/rt2661.c#10 integrate .. //depot/projects/vimage/src/sys/dev/random/harvest.c#2 integrate .. //depot/projects/vimage/src/sys/dev/random/randomdev_soft.c#4 integrate .. //depot/projects/vimage/src/sys/dev/random/yarrow.c#3 integrate .. //depot/projects/vimage/src/sys/dev/re/if_re.c#12 integrate .. //depot/projects/vimage/src/sys/dev/safe/safe.c#3 integrate .. //depot/projects/vimage/src/sys/dev/si/si_pci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sio/sio_isa.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sio/sio_puc.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sk/if_sk.c#7 integrate .. //depot/projects/vimage/src/sys/dev/sound/midi/sequencer.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/atiixp.c#7 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/atiixp.h#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/hda/hdac.c#14 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/t4dwave.c#5 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/ac97.c#5 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/ac97_patch.c#6 integrate .. //depot/projects/vimage/src/sys/dev/stge/if_stge.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ti/if_ti.c#4 integrate .. //depot/projects/vimage/src/sys/dev/txp/if_txp.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/ehci_pci.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_axe.c#9 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_axereg.h#7 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_rum.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_ural.c#11 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_zyd.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_zydfw.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_zydreg.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/uhci_pci.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/uipaq.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/ukbd.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_port.h#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_quirks.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/usbdevs#15 integrate .. //depot/projects/vimage/src/sys/dev/utopia/utopia.c#2 integrate .. //depot/projects/vimage/src/sys/dev/vge/if_vge.c#3 integrate .. //depot/projects/vimage/src/sys/dev/vx/if_vx_pci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/wpi/if_wpi.c#1 branch .. //depot/projects/vimage/src/sys/dev/wpi/if_wpireg.h#1 branch .. //depot/projects/vimage/src/sys/dev/wpi/if_wpivar.h#1 branch .. //depot/projects/vimage/src/sys/fs/devfs/devfs_devs.c#3 integrate .. //depot/projects/vimage/src/sys/fs/devfs/devfs_vnops.c#8 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/denode.h#4 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_fat.c#8 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_vfsops.c#12 integrate .. //depot/projects/vimage/src/sys/fs/ntfs/ntfs_ihash.c#2 integrate .. //depot/projects/vimage/src/sys/fs/ntfs/ntfs_vfsops.c#5 integrate .. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs.h#5 integrate .. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs_subr.c#5 integrate .. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs_vfsops.c#7 integrate .. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs_vnops.c#7 integrate .. //depot/projects/vimage/src/sys/fs/unionfs/union_subr.c#8 integrate .. //depot/projects/vimage/src/sys/geom/bde/g_bde.c#2 integrate .. //depot/projects/vimage/src/sys/geom/bde/g_bde_work.c#2 integrate .. //depot/projects/vimage/src/sys/geom/eli/g_eli.c#5 integrate .. //depot/projects/vimage/src/sys/geom/eli/g_eli_crypto.c#4 integrate .. //depot/projects/vimage/src/sys/geom/geom_io.c#4 integrate .. //depot/projects/vimage/src/sys/geom/journal/g_journal.c#6 integrate .. //depot/projects/vimage/src/sys/geom/label/g_label_reiserfs.c#2 integrate .. //depot/projects/vimage/src/sys/geom/mirror/g_mirror.c#3 integrate .. //depot/projects/vimage/src/sys/geom/multipath/g_multipath.c#2 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part.c#5 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part.h#4 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_apm.c#4 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_gpt.c#4 integrate .. //depot/projects/vimage/src/sys/geom/raid3/g_raid3.c#3 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_drive.c#2 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_init.c#2 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_plex.c#2 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_volume.c#2 integrate .. //depot/projects/vimage/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#6 integrate .. //depot/projects/vimage/src/sys/i386/bios/apm.c#3 edit .. //depot/projects/vimage/src/sys/i386/conf/DEFAULTS#6 integrate .. //depot/projects/vimage/src/sys/i386/conf/GENERIC#13 integrate .. //depot/projects/vimage/src/sys/i386/conf/NOTES#12 integrate .. //depot/projects/vimage/src/sys/i386/conf/PAE#7 integrate .. //depot/projects/vimage/src/sys/i386/conf/XBOX#5 integrate .. //depot/projects/vimage/src/sys/i386/i386/busdma_machdep.c#5 integrate .. //depot/projects/vimage/src/sys/i386/i386/genassym.c#6 integrate .. //depot/projects/vimage/src/sys/i386/i386/in_cksum.c#2 integrate .. //depot/projects/vimage/src/sys/i386/i386/intr_machdep.c#6 integrate .. //depot/projects/vimage/src/sys/i386/i386/locore.s#3 integrate .. //depot/projects/vimage/src/sys/i386/i386/machdep.c#9 integrate .. //depot/projects/vimage/src/sys/i386/i386/mp_machdep.c#8 integrate .. //depot/projects/vimage/src/sys/i386/i386/msi.c#5 integrate .. //depot/projects/vimage/src/sys/i386/i386/pmap.c#10 integrate .. //depot/projects/vimage/src/sys/i386/i386/trap.c#7 integrate .. //depot/projects/vimage/src/sys/i386/i386/vm_machdep.c#6 integrate .. //depot/projects/vimage/src/sys/i386/ibcs2/ibcs2_misc.c#3 integrate .. //depot/projects/vimage/src/sys/i386/ibcs2/imgact_coff.c#3 integrate .. //depot/projects/vimage/src/sys/i386/include/bootinfo.h#2 integrate .. //depot/projects/vimage/src/sys/i386/include/clock.h#3 integrate .. //depot/projects/vimage/src/sys/i386/include/in_cksum.h#2 integrate .. //depot/projects/vimage/src/sys/i386/include/pc/bios.h#2 integrate .. //depot/projects/vimage/src/sys/i386/include/pmap.h#4 integrate .. //depot/projects/vimage/src/sys/i386/isa/clock.c#6 integrate .. //depot/projects/vimage/src/sys/i386/isa/prof_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/i386/linux/imgact_linux.c#3 integrate .. //depot/projects/vimage/src/sys/i386/linux/linux_machdep.c#9 integrate .. //depot/projects/vimage/src/sys/i386/pci/pci_cfgreg.c#3 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/busdma_machdep.c#4 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/interrupt.c#6 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/machdep.c#9 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/pmap.c#7 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/trap.c#4 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/vm_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/ia64/include/atomic.h#3 integrate .. //depot/projects/vimage/src/sys/kern/imgact_aout.c#2 integrate .. //depot/projects/vimage/src/sys/kern/imgact_elf.c#4 integrate .. //depot/projects/vimage/src/sys/kern/imgact_gzip.c#2 integrate .. //depot/projects/vimage/src/sys/kern/init_main.c#15 integrate .. //depot/projects/vimage/src/sys/kern/kern_acct.c#6 integrate .. //depot/projects/vimage/src/sys/kern/kern_alq.c#4 integrate .. //depot/projects/vimage/src/sys/kern/kern_clock.c#13 integrate .. //depot/projects/vimage/src/sys/kern/kern_cpu.c#5 integrate .. //depot/projects/vimage/src/sys/kern/kern_descrip.c#10 integrate .. //depot/projects/vimage/src/sys/kern/kern_environment.c#4 integrate .. //depot/projects/vimage/src/sys/kern/kern_exec.c#7 integrate .. //depot/projects/vimage/src/sys/kern/kern_exit.c#14 integrate .. //depot/projects/vimage/src/sys/kern/kern_fork.c#14 integrate .. //depot/projects/vimage/src/sys/kern/kern_idle.c#5 integrate .. //depot/projects/vimage/src/sys/kern/kern_intr.c#8 integrate .. //depot/projects/vimage/src/sys/kern/kern_jail.c#6 integrate .. //depot/projects/vimage/src/sys/kern/kern_kse.c#10 integrate .. //depot/projects/vimage/src/sys/kern/kern_kthread.c#4 integrate .. //depot/projects/vimage/src/sys/kern/kern_ktrace.c#7 integrate .. //depot/projects/vimage/src/sys/kern/kern_linker.c#11 integrate .. //depot/projects/vimage/src/sys/kern/kern_lock.c#4 integrate .. //depot/projects/vimage/src/sys/kern/kern_mbuf.c#6 integrate .. //depot/projects/vimage/src/sys/kern/kern_mutex.c#9 integrate .. //depot/projects/vimage/src/sys/kern/kern_proc.c#6 integrate .. //depot/projects/vimage/src/sys/kern/kern_prot.c#8 integrate .. //depot/projects/vimage/src/sys/kern/kern_rmlock.c#1 branch .. //depot/projects/vimage/src/sys/kern/kern_rwlock.c#8 integrate .. //depot/projects/vimage/src/sys/kern/kern_shutdown.c#4 integrate .. //depot/projects/vimage/src/sys/kern/kern_sig.c#7 integrate .. //depot/projects/vimage/src/sys/kern/kern_switch.c#11 integrate .. //depot/projects/vimage/src/sys/kern/kern_sx.c#9 integrate .. //depot/projects/vimage/src/sys/kern/kern_synch.c#14 integrate .. //depot/projects/vimage/src/sys/kern/kern_sysctl.c#10 integrate .. //depot/projects/vimage/src/sys/kern/kern_thr.c#8 integrate .. //depot/projects/vimage/src/sys/kern/kern_thread.c#10 integrate .. //depot/projects/vimage/src/sys/kern/kern_timeout.c#8 integrate .. //depot/projects/vimage/src/sys/kern/kern_umtx.c#6 integrate .. //depot/projects/vimage/src/sys/kern/link_elf.c#4 integrate .. //depot/projects/vimage/src/sys/kern/link_elf_obj.c#3 integrate .. //depot/projects/vimage/src/sys/kern/linker_if.m#2 integrate .. //depot/projects/vimage/src/sys/kern/p1003_1b.c#4 integrate .. //depot/projects/vimage/src/sys/kern/sched_4bsd.c#17 integrate .. //depot/projects/vimage/src/sys/kern/sched_ule.c#18 integrate .. //depot/projects/vimage/src/sys/kern/subr_bus.c#5 integrate .. //depot/projects/vimage/src/sys/kern/subr_lock.c#8 integrate .. //depot/projects/vimage/src/sys/kern/subr_pcpu.c#5 integrate .. //depot/projects/vimage/src/sys/kern/subr_sleepqueue.c#6 integrate .. //depot/projects/vimage/src/sys/kern/subr_smp.c#6 integrate .. //depot/projects/vimage/src/sys/kern/subr_stack.c#2 integrate .. //depot/projects/vimage/src/sys/kern/subr_taskqueue.c#4 integrate .. //depot/projects/vimage/src/sys/kern/subr_trap.c#7 integrate .. //depot/projects/vimage/src/sys/kern/subr_turnstile.c#7 integrate .. //depot/projects/vimage/src/sys/kern/subr_witness.c#7 integrate .. //depot/projects/vimage/src/sys/kern/sys_generic.c#7 integrate .. //depot/projects/vimage/src/sys/kern/sys_pipe.c#5 integrate .. //depot/projects/vimage/src/sys/kern/sys_process.c#6 integrate .. //depot/projects/vimage/src/sys/kern/sys_socket.c#7 integrate .. //depot/projects/vimage/src/sys/kern/sysv_msg.c#5 integrate .. //depot/projects/vimage/src/sys/kern/sysv_sem.c#4 integrate .. //depot/projects/vimage/src/sys/kern/sysv_shm.c#3 integrate .. //depot/projects/vimage/src/sys/kern/tty_pty.c#3 integrate .. //depot/projects/vimage/src/sys/kern/uipc_mbuf2.c#2 integrate .. //depot/projects/vimage/src/sys/kern/uipc_sem.c#3 integrate .. //depot/projects/vimage/src/sys/kern/uipc_socket.c#14 integrate .. //depot/projects/vimage/src/sys/kern/uipc_syscalls.c#14 integrate .. //depot/projects/vimage/src/sys/kern/uipc_usrreq.c#12 integrate .. //depot/projects/vimage/src/sys/kern/vfs_acl.c#2 integrate .. //depot/projects/vimage/src/sys/kern/vfs_aio.c#5 integrate .. //depot/projects/vimage/src/sys/kern/vfs_bio.c#9 integrate .. //depot/projects/vimage/src/sys/kern/vfs_cache.c#6 integrate .. //depot/projects/vimage/src/sys/kern/vfs_extattr.c#2 integrate .. //depot/projects/vimage/src/sys/kern/vfs_lookup.c#10 integrate .. //depot/projects/vimage/src/sys/kern/vfs_mount.c#11 integrate .. //depot/projects/vimage/src/sys/kern/vfs_subr.c#8 integrate .. //depot/projects/vimage/src/sys/kern/vfs_syscalls.c#10 integrate .. //depot/projects/vimage/src/sys/kern/vfs_vnops.c#6 integrate .. //depot/projects/vimage/src/sys/modules/Makefile#14 integrate .. //depot/projects/vimage/src/sys/modules/agp/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/asmc/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/geom/Makefile#3 integrate .. //depot/projects/vimage/src/sys/modules/nvram/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/nxge/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/wpi/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/wpifw/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/zfs/Makefile#4 integrate .. //depot/projects/vimage/src/sys/net/bpf.c#16 integrate .. //depot/projects/vimage/src/sys/net/bpf.h#3 integrate .. //depot/projects/vimage/src/sys/net/bsd_comp.c#2 integrate .. //depot/projects/vimage/src/sys/net/ieee8023ad_lacp.c#7 integrate .. //depot/projects/vimage/src/sys/net/if.c#23 integrate .. //depot/projects/vimage/src/sys/net/if_atmsubr.c#3 integrate .. //depot/projects/vimage/src/sys/net/if_bridge.c#9 integrate .. //depot/projects/vimage/src/sys/net/if_bridgevar.h#6 integrate .. //depot/projects/vimage/src/sys/net/if_disc.c#3 integrate .. //depot/projects/vimage/src/sys/net/if_enc.c#3 integrate .. //depot/projects/vimage/src/sys/net/if_ethersubr.c#18 integrate .. //depot/projects/vimage/src/sys/net/if_fddisubr.c#2 integrate .. //depot/projects/vimage/src/sys/net/if_fwsubr.c#4 integrate .. //depot/projects/vimage/src/sys/net/if_gif.c#12 integrate .. //depot/projects/vimage/src/sys/net/if_iso88025subr.c#2 integrate .. //depot/projects/vimage/src/sys/net/if_lagg.c#12 integrate .. //depot/projects/vimage/src/sys/net/if_loop.c#18 edit .. //depot/projects/vimage/src/sys/net/if_ppp.c#7 integrate .. //depot/projects/vimage/src/sys/net/if_stf.c#7 integrate .. //depot/projects/vimage/src/sys/net/if_tun.c#4 integrate .. //depot/projects/vimage/src/sys/net/pfil.c#2 integrate .. //depot/projects/vimage/src/sys/net/pfil.h#3 integrate .. //depot/projects/vimage/src/sys/net/route.c#11 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211.c#9 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211.h#5 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_freebsd.c#6 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_freebsd.h#7 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_ht.c#4 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_ht.h#3 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_input.c#8 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_ioctl.c#6 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_ioctl.h#5 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_node.c#8 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_node.h#5 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_output.c#8 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_proto.c#8 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_proto.h#7 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_scan.c#3 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_scan_ap.c#2 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_scan_sta.c#5 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_var.h#8 integrate .. //depot/projects/vimage/src/sys/netatalk/aarp.c#3 integrate .. //depot/projects/vimage/src/sys/netatalk/ddp_input.c#3 integrate .. //depot/projects/vimage/src/sys/netatalk/ddp_output.c#3 integrate .. //depot/projects/vimage/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#5 integrate .. //depot/projects/vimage/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#4 integrate .. //depot/projects/vimage/src/sys/netgraph/netgraph.h#6 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_base.c#23 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_cisco.c#3 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_gif.c#3 edit .. //depot/projects/vimage/src/sys/netinet/if_ether.c#15 integrate .. //depot/projects/vimage/src/sys/netinet/igmp.c#12 integrate .. //depot/projects/vimage/src/sys/netinet/in_pcb.c#18 integrate .. //depot/projects/vimage/src/sys/netinet/ip_divert.c#8 integrate .. //depot/projects/vimage/src/sys/netinet/ip_dummynet.c#7 integrate .. //depot/projects/vimage/src/sys/netinet/ip_dummynet.h#3 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#28 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw_pfil.c#7 integrate .. //depot/projects/vimage/src/sys/netinet/ip_icmp.c#10 integrate .. //depot/projects/vimage/src/sys/netinet/ip_input.c#24 integrate .. //depot/projects/vimage/src/sys/netinet/ip_options.c#7 integrate .. //depot/projects/vimage/src/sys/netinet/ip_output.c#12 integrate .. //depot/projects/vimage/src/sys/netinet/libalias/alias_util.c#3 integrate .. //depot/projects/vimage/src/sys/netinet/raw_ip.c#17 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_bsd_addr.c#10 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_constants.h#19 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_indata.c#21 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_output.c#21 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_pcb.c#21 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_pcb.h#14 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_usrreq.c#22 integrate .. //depot/projects/vimage/src/sys/netinet/sctputil.c#22 integrate .. //depot/projects/vimage/src/sys/netinet/sctputil.h#14 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_input.c#25 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_output.c#14 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#37 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#23 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_timewait.c#12 integrate .. //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#22 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_mroute.c#11 edit .. //depot/projects/vimage/src/sys/netinet6/ip6_output.c#12 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6.c#23 integrate .. //depot/projects/vimage/src/sys/netinet6/udp6_usrreq.c#19 integrate .. //depot/projects/vimage/src/sys/netipsec/ipsec.c#17 integrate .. //depot/projects/vimage/src/sys/netipsec/ipsec.h#5 integrate .. //depot/projects/vimage/src/sys/netipsec/ipsec_input.c#11 integrate .. //depot/projects/vimage/src/sys/netipsec/ipsec_output.c#10 integrate .. //depot/projects/vimage/src/sys/netipsec/keysock.c#8 integrate .. //depot/projects/vimage/src/sys/netipsec/xform.h#2 integrate .. //depot/projects/vimage/src/sys/netipsec/xform_ipip.c#12 integrate .. //depot/projects/vimage/src/sys/netsmb/smb_iod.c#2 integrate .. //depot/projects/vimage/src/sys/nfs4client/nfs4_vfsops.c#4 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_nfsiod.c#3 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_vfsops.c#10 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_vnops.c#9 integrate .. //depot/projects/vimage/src/sys/nfsserver/nfs.h#3 integrate .. //depot/projects/vimage/src/sys/nfsserver/nfs_srvsock.c#5 integrate .. //depot/projects/vimage/src/sys/nfsserver/nfs_srvsubs.c#6 integrate .. //depot/projects/vimage/src/sys/opencrypto/crypto.c#3 integrate .. //depot/projects/vimage/src/sys/pc98/conf/GENERIC#7 integrate .. //depot/projects/vimage/src/sys/pc98/pc98/machdep.c#7 integrate .. //depot/projects/vimage/src/sys/pci/agp.c#3 delete .. //depot/projects/vimage/src/sys/pci/agp_ali.c#2 delete .. //depot/projects/vimage/src/sys/pci/agp_amd.c#2 delete .. //depot/projects/vimage/src/sys/pci/agp_amd64.c#2 delete .. //depot/projects/vimage/src/sys/pci/agp_ati.c#2 delete .. //depot/projects/vimage/src/sys/pci/agp_i810.c#4 delete .. //depot/projects/vimage/src/sys/pci/agp_if.m#2 delete .. //depot/projects/vimage/src/sys/pci/agp_intel.c#3 delete .. //depot/projects/vimage/src/sys/pci/agp_nvidia.c#2 delete .. //depot/projects/vimage/src/sys/pci/agp_sis.c#2 delete .. //depot/projects/vimage/src/sys/pci/agp_via.c#3 delete .. //depot/projects/vimage/src/sys/pci/agppriv.h#3 delete .. //depot/projects/vimage/src/sys/pci/agpreg.h#4 delete .. //depot/projects/vimage/src/sys/pci/agpvar.h#2 delete .. //depot/projects/vimage/src/sys/pci/if_rl.c#7 integrate .. //depot/projects/vimage/src/sys/pci/if_rlreg.h#7 integrate .. //depot/projects/vimage/src/sys/pci/if_sf.c#3 integrate .. //depot/projects/vimage/src/sys/pci/if_ste.c#4 integrate .. //depot/projects/vimage/src/sys/pci/if_vr.c#6 integrate .. //depot/projects/vimage/src/sys/pci/if_xl.c#6 integrate .. //depot/projects/vimage/src/sys/pci/nfsmb.c#3 integrate .. //depot/projects/vimage/src/sys/pci/xrpu.c#2 delete .. //depot/projects/vimage/src/sys/powerpc/conf/GENERIC#6 integrate .. //depot/projects/vimage/src/sys/powerpc/include/atomic.h#3 integrate .. //depot/projects/vimage/src/sys/powerpc/include/md_var.h#4 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/clock.c#3 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/genassym.c#2 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/intr_machdep.c#7 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/machdep.c#7 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/mmu_if.m#3 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/mmu_oea.c#4 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/pmap_dispatch.c#3 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/swtch.S#2 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/trap.c#6 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/vm_machdep.c#4 integrate .. //depot/projects/vimage/src/sys/security/audit/audit.c#7 integrate .. //depot/projects/vimage/src/sys/security/audit/audit.h#5 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_bsm.c#5 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_bsm_klib.c#5 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_pipe.c#4 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_syscalls.c#8 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_worker.c#4 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_atalk.c#1 branch .. //depot/projects/vimage/src/sys/security/mac/mac_audit.c#3 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_framework.h#7 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_inet.c#6 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_inet6.c#1 branch .. //depot/projects/vimage/src/sys/security/mac/mac_internal.h#5 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_net.c#5 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_pipe.c#5 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_policy.h#8 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_posix_sem.c#4 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_process.c#4 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_socket.c#4 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_syscalls.c#4 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_system.c#5 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_sysv_msg.c#4 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_sysv_sem.c#4 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_sysv_shm.c#4 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_vfs.c#7 integrate .. //depot/projects/vimage/src/sys/security/mac_biba/mac_biba.c#6 integrate .. //depot/projects/vimage/src/sys/security/mac_bsdextended/mac_bsdextended.c#8 integrate .. //depot/projects/vimage/src/sys/security/mac_ifoff/mac_ifoff.c#5 integrate .. //depot/projects/vimage/src/sys/security/mac_lomac/mac_lomac.c#7 integrate .. //depot/projects/vimage/src/sys/security/mac_mls/mac_mls.c#7 integrate .. //depot/projects/vimage/src/sys/security/mac_none/mac_none.c#4 integrate .. //depot/projects/vimage/src/sys/security/mac_partition/mac_partition.c#5 integrate .. //depot/projects/vimage/src/sys/security/mac_portacl/mac_portacl.c#6 integrate .. //depot/projects/vimage/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#6 integrate .. //depot/projects/vimage/src/sys/security/mac_stub/mac_stub.c#8 integrate .. //depot/projects/vimage/src/sys/security/mac_test/mac_test.c#7 integrate .. //depot/projects/vimage/src/sys/sparc64/conf/DEFAULTS#3 integrate .. //depot/projects/vimage/src/sys/sparc64/conf/GENERIC#6 integrate .. //depot/projects/vimage/src/sys/sparc64/isa/isa.c#4 integrate .. //depot/projects/vimage/src/sys/sparc64/pci/ofw_pcibus.c#5 integrate .. //depot/projects/vimage/src/sys/sparc64/pci/psycho.c#9 integrate .. //depot/projects/vimage/src/sys/sparc64/pci/psychovar.h#4 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/intr_machdep.c#5 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/machdep.c#7 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/pmap.c#6 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/vm_machdep.c#4 integrate .. //depot/projects/vimage/src/sys/sun4v/conf/GENERIC#7 integrate .. //depot/projects/vimage/src/sys/sun4v/include/pcpu.h#6 integrate .. //depot/projects/vimage/src/sys/sun4v/include/stdarg.h#2 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/machdep.c#5 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/pmap.c#7 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/simdisk.c#2 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/trap.c#5 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/vm_machdep.c#5 integrate .. //depot/projects/vimage/src/sys/sys/_elf_solaris.h#2 delete .. //depot/projects/vimage/src/sys/sys/_rmlock.h#1 branch .. //depot/projects/vimage/src/sys/sys/apm.h#2 integrate .. //depot/projects/vimage/src/sys/sys/callout.h#4 integrate .. //depot/projects/vimage/src/sys/sys/elf.h#2 integrate .. //depot/projects/vimage/src/sys/sys/elf_common.h#3 integrate .. //depot/projects/vimage/src/sys/sys/eventhandler.h#4 integrate .. //depot/projects/vimage/src/sys/sys/gpt.h#2 integrate .. //depot/projects/vimage/src/sys/sys/kernel.h#8 integrate .. //depot/projects/vimage/src/sys/sys/kthread.h#2 integrate .. //depot/projects/vimage/src/sys/sys/linker.h#2 integrate .. //depot/projects/vimage/src/sys/sys/lock.h#4 integrate .. //depot/projects/vimage/src/sys/sys/lockmgr.h#3 integrate .. //depot/projects/vimage/src/sys/sys/malloc.h#2 integrate .. //depot/projects/vimage/src/sys/sys/mutex.h#9 integrate .. //depot/projects/vimage/src/sys/sys/param.h#13 integrate .. //depot/projects/vimage/src/sys/sys/pciio.h#3 integrate .. //depot/projects/vimage/src/sys/sys/pcpu.h#5 integrate .. //depot/projects/vimage/src/sys/sys/priv.h#6 integrate .. //depot/projects/vimage/src/sys/sys/proc.h#14 integrate .. //depot/projects/vimage/src/sys/sys/resource.h#5 integrate .. //depot/projects/vimage/src/sys/sys/rmlock.h#1 branch .. //depot/projects/vimage/src/sys/sys/signal.h#2 integrate .. //depot/projects/vimage/src/sys/sys/signalvar.h#2 integrate .. //depot/projects/vimage/src/sys/sys/smp.h#2 integrate .. //depot/projects/vimage/src/sys/sys/stack.h#2 integrate .. //depot/projects/vimage/src/sys/sys/stat.h#2 integrate .. //depot/projects/vimage/src/sys/sys/sysctl.h#13 integrate .. //depot/projects/vimage/src/sys/sys/time.h#2 integrate .. //depot/projects/vimage/src/sys/sys/types.h#2 integrate .. //depot/projects/vimage/src/sys/sys/umtx.h#5 integrate .. //depot/projects/vimage/src/sys/sys/user.h#3 integrate .. //depot/projects/vimage/src/sys/sys/vimage.h#52 edit .. //depot/projects/vimage/src/sys/sys/xrpuio.h#2 delete .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_alloc.c#6 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_balloc.c#2 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_inode.c#3 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_snapshot.c#6 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_softdep.c#6 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vfsops.c#5 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vnops.c#7 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/ufs_bmap.c#3 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/ufs_lookup.c#3 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/ufs_vnops.c#5 integrate .. //depot/projects/vimage/src/sys/vm/phys_pager.c#6 integrate .. //depot/projects/vimage/src/sys/vm/pmap.h#2 integrate .. //depot/projects/vimage/src/sys/vm/redzone.c#2 integrate .. //depot/projects/vimage/src/sys/vm/swap_pager.c#9 integrate .. //depot/projects/vimage/src/sys/vm/vm_contig.c#7 integrate .. //depot/projects/vimage/src/sys/vm/vm_extern.h#2 integrate .. //depot/projects/vimage/src/sys/vm/vm_glue.c#7 integrate .. //depot/projects/vimage/src/sys/vm/vm_kern.c#5 integrate .. //depot/projects/vimage/src/sys/vm/vm_map.c#8 integrate .. //depot/projects/vimage/src/sys/vm/vm_map.h#3 integrate .. //depot/projects/vimage/src/sys/vm/vm_mmap.c#7 integrate .. //depot/projects/vimage/src/sys/vm/vm_object.c#10 integrate .. //depot/projects/vimage/src/sys/vm/vm_page.c#12 integrate .. //depot/projects/vimage/src/sys/vm/vm_pageout.c#8 integrate .. //depot/projects/vimage/src/sys/vm/vm_pageout.h#2 integrate .. //depot/projects/vimage/src/sys/vm/vm_zeroidle.c#7 integrate .. //depot/projects/vimage/src/sys/vm/vnode_pager.c#5 integrate Differences ... ==== //depot/projects/vimage/src/sys/amd64/amd64/busdma_machdep.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.83 2007/06/17 04:21:58 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.84 2007/11/27 17:28:11 jhb Exp $"); #include #include @@ -580,7 +580,6 @@ bus_addr_t curaddr, lastaddr, baddr, bmask; vm_offset_t vaddr; bus_addr_t paddr; - int needbounce = 0; int seg; if (map == NULL) @@ -604,10 +603,8 @@ while (vaddr < vendaddr) { paddr = pmap_kextract(vaddr); - if (run_filter(dmat, paddr) != 0) { - needbounce = 1; + if (run_filter(dmat, paddr) != 0) map->pagesneeded++; - } vaddr += PAGE_SIZE; } CTR1(KTR_BUSDMA, "pagesneeded= %d\n", map->pagesneeded); @@ -679,7 +676,7 @@ segs[seg].ds_len = sgsize; first = 0; } else { - if (needbounce == 0 && curaddr == lastaddr && + if (curaddr == lastaddr && (segs[seg].ds_len + sgsize) <= dmat->maxsegsz && (dmat->boundary == 0 || (segs[seg].ds_addr & bmask) == (curaddr & bmask))) ==== //depot/projects/vimage/src/sys/amd64/amd64/db_trace.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.80 2006/11/17 20:27:00 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.81 2007/11/15 22:00:56 jhb Exp $"); #include #include @@ -317,7 +317,8 @@ if (name != NULL) { if (strcmp(name, "calltrap") == 0 || strcmp(name, "fork_trampoline") == 0 || - strcmp(name, "nmi_calltrap") == 0) + strcmp(name, "nmi_calltrap") == 0 || + strcmp(name, "Xdblfault") == 0) frame_type = TRAP; else if (strncmp(name, "Xatpic_intr", 11) == 0 || strncmp(name, "Xapic_isr", 9) == 0 || ==== //depot/projects/vimage/src/sys/amd64/amd64/exception.S#3 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.129 2006/12/23 03:30:50 davidxu Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.130 2007/11/15 22:00:56 jhb Exp $ */ #include "opt_atpic.h" @@ -187,10 +187,28 @@ IDTVEC(dblfault) subq $TF_ERR,%rsp movq $T_DOUBLEFLT,TF_TRAPNO(%rsp) + movq $0,TF_ADDR(%rsp) + movq $0,TF_ERR(%rsp) + movq %rdi,TF_RDI(%rsp) + movq %rsi,TF_RSI(%rsp) + movq %rdx,TF_RDX(%rsp) + movq %rcx,TF_RCX(%rsp) + movq %r8,TF_R8(%rsp) + movq %r9,TF_R9(%rsp) + movq %rax,TF_RAX(%rsp) + movq %rbx,TF_RBX(%rsp) + movq %rbp,TF_RBP(%rsp) + movq %r10,TF_R10(%rsp) + movq %r11,TF_R11(%rsp) + movq %r12,TF_R12(%rsp) + movq %r13,TF_R13(%rsp) + movq %r14,TF_R14(%rsp) + movq %r15,TF_R15(%rsp) testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */ jz 1f /* already running with kernel GS.base */ swapgs -1: call dblfault_handler +1: movq %rsp, %rdi + call dblfault_handler 2: hlt jmp 2b ==== //depot/projects/vimage/src/sys/amd64/amd64/genassym.c#6 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.165 2007/09/17 21:55:28 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.166 2007/11/23 03:03:29 jkoshy Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" @@ -78,12 +78,15 @@ ASSYM(TD_LOCK, offsetof(struct thread, td_lock)); ASSYM(TD_FLAGS, offsetof(struct thread, td_flags)); ASSYM(TD_PCB, offsetof(struct thread, td_pcb)); +ASSYM(TD_PFLAGS, offsetof(struct thread, td_pflags)); ASSYM(TD_PROC, offsetof(struct thread, td_proc)); ASSYM(TD_TID, offsetof(struct thread, td_tid)); ASSYM(TDF_ASTPENDING, TDF_ASTPENDING); ASSYM(TDF_NEEDRESCHED, TDF_NEEDRESCHED); +ASSYM(TDP_CALLCHAIN, TDP_CALLCHAIN); + ASSYM(V_TRAP, offsetof(struct vmmeter, v_trap)); ASSYM(V_SYSCALL, offsetof(struct vmmeter, v_syscall)); ASSYM(V_INTR, offsetof(struct vmmeter, v_intr)); ==== //depot/projects/vimage/src/sys/amd64/amd64/intr_machdep.c#6 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.34 2007/06/04 21:38:44 attilio Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.35 2007/11/21 04:03:50 scottl Exp $ */ /* @@ -390,13 +390,13 @@ isrc->is_pic->pic_disable_source(isrc, PIC_EOI); else isrc->is_pic->pic_eoi_source(isrc); - critical_exit(); /* Schedule the ithread if needed. */ if (thread) { error = intr_event_schedule_thread(ie); KASSERT(error == 0, ("bad stray interrupt")); } + critical_exit(); td->td_intr_nesting_level--; } #endif ==== //depot/projects/vimage/src/sys/amd64/amd64/local_apic.c#8 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.42 2007/09/11 22:54:08 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.43 2007/10/27 13:34:53 jhb Exp $"); #include "opt_hwpmc_hooks.h" @@ -1007,10 +1007,6 @@ struct apic_enumerator *enumerator; int retval, best; - /* We only support built in local APICs. */ - if (!(cpu_feature & CPUID_APIC)) - return; - /* Don't probe if APIC mode is disabled. */ if (resource_disabled("apic", 0)) return; ==== //depot/projects/vimage/src/sys/amd64/amd64/machdep.c#7 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.675 2007/06/06 07:35:07 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.678 2007/11/15 22:00:57 jhb Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -138,7 +138,6 @@ CTASSERT(offsetof(struct pcpu, pc_curthread) == 0); extern u_int64_t hammer_time(u_int64_t, u_int64_t); -extern void dblfault_handler(void); extern void printcpuinfo(void); /* XXX header file */ extern void identify_cpu(void); @@ -881,7 +880,7 @@ printf("SMAP type=%02x base=%016lx len=%016lx\n", smap->type, smap->base, smap->length); - if (smap->type != 0x01) + if (smap->type != SMAP_TYPE_MEMORY) continue; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Dec 10 21:09:29 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 46A1F16A477; Mon, 10 Dec 2007 21:09:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E93A416A421 for ; Mon, 10 Dec 2007 21:09:28 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D308513C45A for ; Mon, 10 Dec 2007 21:09:28 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBAL9SLh003823 for ; Mon, 10 Dec 2007 21:09:28 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBAL9ObD003819 for perforce@freebsd.org; Mon, 10 Dec 2007 21:09:24 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 10 Dec 2007 21:09:24 GMT Message-Id: <200712102109.lBAL9ObD003819@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 130603 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Dec 2007 21:09:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=130603 Change 130603 by kmacy@entropy_kmacy_xen31 on 2007/12/10 21:09:22 IFC #130599 Affected files ... .. //depot/projects/xen31/ObsoleteFiles.inc#7 integrate .. //depot/projects/xen31/bin/ed/Makefile#2 integrate .. //depot/projects/xen31/contrib/amd/amd/amd.8#3 integrate .. //depot/projects/xen31/contrib/amd/amq/amq.8#3 integrate .. //depot/projects/xen31/contrib/amd/amq/pawd.1#3 integrate .. //depot/projects/xen31/contrib/amd/fixmount/fixmount.8#3 integrate .. //depot/projects/xen31/contrib/amd/fsinfo/fsinfo.8#3 integrate .. //depot/projects/xen31/contrib/amd/hlfsd/hlfsd.8#3 integrate .. //depot/projects/xen31/contrib/amd/mk-amd-map/mk-amd-map.8#3 integrate .. //depot/projects/xen31/contrib/amd/scripts/amd.conf.5#3 integrate .. //depot/projects/xen31/contrib/amd/wire-test/wire-test.8#3 integrate .. //depot/projects/xen31/contrib/gcc/config/sparc/freebsd.h#2 integrate .. //depot/projects/xen31/etc/rc.d/DAEMON#2 integrate .. //depot/projects/xen31/etc/rc.d/LOGIN#2 integrate .. //depot/projects/xen31/etc/rc.d/Makefile#3 integrate .. //depot/projects/xen31/etc/rc.d/NETWORKING#2 integrate .. //depot/projects/xen31/etc/rc.d/SERVERS#2 integrate .. //depot/projects/xen31/etc/rc.d/accounting#2 integrate .. //depot/projects/xen31/etc/rc.d/amd#3 integrate .. //depot/projects/xen31/etc/rc.d/apmd#2 integrate .. //depot/projects/xen31/etc/rc.d/bootconf.sh#2 delete .. //depot/projects/xen31/etc/rc.d/bootparams#2 integrate .. //depot/projects/xen31/etc/rc.d/ccd#2 integrate .. //depot/projects/xen31/etc/rc.d/cron#2 integrate .. //depot/projects/xen31/etc/rc.d/dhclient#2 integrate .. //depot/projects/xen31/etc/rc.d/dmesg#2 integrate .. //depot/projects/xen31/etc/rc.d/fsck#2 integrate .. //depot/projects/xen31/etc/rc.d/ftp-proxy#2 integrate .. //depot/projects/xen31/etc/rc.d/inetd#2 integrate .. //depot/projects/xen31/etc/rc.d/ipfilter#2 integrate .. //depot/projects/xen31/etc/rc.d/ipfs#2 integrate .. //depot/projects/xen31/etc/rc.d/ipmon#2 integrate .. //depot/projects/xen31/etc/rc.d/ipnat#2 integrate .. //depot/projects/xen31/etc/rc.d/ipsec#2 integrate .. //depot/projects/xen31/etc/rc.d/isdnd#2 integrate .. //depot/projects/xen31/etc/rc.d/keyserv#2 integrate .. //depot/projects/xen31/etc/rc.d/ldconfig#2 integrate .. //depot/projects/xen31/etc/rc.d/local#2 integrate .. //depot/projects/xen31/etc/rc.d/lockd#2 integrate .. //depot/projects/xen31/etc/rc.d/lpd#2 integrate .. //depot/projects/xen31/etc/rc.d/motd#2 integrate .. //depot/projects/xen31/etc/rc.d/mountcritlocal#2 integrate .. //depot/projects/xen31/etc/rc.d/mountcritremote#2 integrate .. //depot/projects/xen31/etc/rc.d/mountd#2 integrate .. //depot/projects/xen31/etc/rc.d/moused#2 integrate .. //depot/projects/xen31/etc/rc.d/mrouted#2 integrate .. //depot/projects/xen31/etc/rc.d/newsyslog#2 integrate .. //depot/projects/xen31/etc/rc.d/nfsd#2 integrate .. //depot/projects/xen31/etc/rc.d/power_profile#2 integrate .. //depot/projects/xen31/etc/rc.d/pwcheck#2 integrate .. //depot/projects/xen31/etc/rc.d/quota#2 integrate .. //depot/projects/xen31/etc/rc.d/rarpd#2 integrate .. //depot/projects/xen31/etc/rc.d/resolv#2 integrate .. //depot/projects/xen31/etc/rc.d/root#2 integrate .. //depot/projects/xen31/etc/rc.d/route6d#2 integrate .. //depot/projects/xen31/etc/rc.d/routed#2 integrate .. //depot/projects/xen31/etc/rc.d/rpcbind#2 integrate .. //depot/projects/xen31/etc/rc.d/rtadvd#2 integrate .. //depot/projects/xen31/etc/rc.d/rwho#2 integrate .. //depot/projects/xen31/etc/rc.d/savecore#2 integrate .. //depot/projects/xen31/etc/rc.d/securelevel#2 integrate .. //depot/projects/xen31/etc/rc.d/sendmail#2 integrate .. //depot/projects/xen31/etc/rc.d/sshd#2 integrate .. //depot/projects/xen31/etc/rc.d/statd#2 integrate .. //depot/projects/xen31/etc/rc.d/swap1#2 integrate .. //depot/projects/xen31/etc/rc.d/sysctl#2 integrate .. //depot/projects/xen31/etc/rc.d/syslogd#2 integrate .. //depot/projects/xen31/etc/rc.d/timed#2 integrate .. //depot/projects/xen31/etc/rc.d/tmp#2 integrate .. //depot/projects/xen31/etc/rc.d/ugidfw#2 integrate .. //depot/projects/xen31/etc/rc.d/var#2 integrate .. //depot/projects/xen31/etc/rc.d/virecover#2 integrate .. //depot/projects/xen31/etc/rc.d/ypbind#2 integrate .. //depot/projects/xen31/etc/rc.d/yppasswdd#2 integrate .. //depot/projects/xen31/etc/rc.d/ypserv#2 integrate .. //depot/projects/xen31/games/fortune/datfiles/Makefile#2 integrate .. //depot/projects/xen31/games/fortune/datfiles/fortunes#4 integrate .. //depot/projects/xen31/games/fortune/datfiles/fortunes-o.real#2 integrate .. //depot/projects/xen31/games/fortune/datfiles/fortunes-o.sp.ok#2 integrate .. //depot/projects/xen31/games/fortune/datfiles/fortunes.sp.ok#2 integrate .. //depot/projects/xen31/games/fortune/datfiles/fortunes2-o#2 delete .. //depot/projects/xen31/games/fortune/datfiles/freebsd-tips#2 integrate .. //depot/projects/xen31/games/fortune/datfiles/freebsd-tips.sp.ok#1 branch .. //depot/projects/xen31/games/fortune/datfiles/limerick#2 integrate .. //depot/projects/xen31/games/fortune/datfiles/limerick.sp.ok#1 branch .. //depot/projects/xen31/games/fortune/datfiles/murphy#2 integrate .. //depot/projects/xen31/games/fortune/datfiles/murphy-o#2 integrate .. //depot/projects/xen31/games/fortune/datfiles/murphy.sp.ok#1 branch .. //depot/projects/xen31/games/fortune/datfiles/startrek#2 integrate .. //depot/projects/xen31/games/fortune/datfiles/zippy#2 integrate .. //depot/projects/xen31/games/fortune/datfiles/zippy.sp.ok#2 integrate .. //depot/projects/xen31/lib/Makefile#4 integrate .. //depot/projects/xen31/lib/libc/gdtoa/_ldtoa.c#4 integrate .. //depot/projects/xen31/lib/libc/stdio/vfscanf.c#2 integrate .. //depot/projects/xen31/lib/libc/stdio/vfwscanf.c#2 integrate .. //depot/projects/xen31/lib/libc/sys/access.2#2 integrate .. //depot/projects/xen31/lib/libpmc/libpmc.c#2 integrate .. //depot/projects/xen31/release/Makefile#5 integrate .. //depot/projects/xen31/release/doc/zh_CN.GB2312/Makefile#2 integrate .. //depot/projects/xen31/release/doc/zh_CN.GB2312/errata/Makefile#2 integrate .. //depot/projects/xen31/release/doc/zh_CN.GB2312/hardware/Makefile#2 integrate .. //depot/projects/xen31/release/doc/zh_CN.GB2312/hardware/Makefile.inc#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/hardware/amd64/Makefile#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/hardware/amd64/article.sgml#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/hardware/amd64/proc-amd64.sgml#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/hardware/article.sgml#1 branch .. //depot/projects/xen31/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/hardware/common/hw.ent#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/hardware/common/intro.sgml#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/hardware/i386/Makefile#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/hardware/i386/article.sgml#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/hardware/i386/proc-i386.sgml#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/installation/Makefile#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/installation/Makefile.inc#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/installation/amd64/Makefile#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/installation/amd64/article.sgml#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/installation/common/abstract.sgml#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/installation/common/artheader.sgml#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/installation/common/install.ent#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/installation/common/install.sgml#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/installation/common/layout.sgml#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/installation/common/trouble.sgml#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/installation/common/upgrade.sgml#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/installation/i386/Makefile#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/installation/i386/article.sgml#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/installation/ia64/Makefile#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/installation/ia64/article.sgml#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/installation/pc98/Makefile#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/installation/pc98/article.sgml#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/installation/sparc64/Makefile#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/installation/sparc64/article.sgml#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/installation/sparc64/install.sgml#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/readme/article.sgml#2 integrate .. //depot/projects/xen31/release/doc/zh_CN.GB2312/relnotes/Makefile#2 integrate .. //depot/projects/xen31/release/doc/zh_CN.GB2312/relnotes/Makefile.inc#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/relnotes/amd64/Makefile#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/relnotes/amd64/article.sgml#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/relnotes/article.sgml#1 branch .. //depot/projects/xen31/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/relnotes/common/relnotes.ent#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/relnotes/i386/Makefile#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/relnotes/i386/article.sgml#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/relnotes/ia64/Makefile#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/relnotes/ia64/article.sgml#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/relnotes/pc98/Makefile#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/relnotes/pc98/article.sgml#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/relnotes/powerpc/Makefile#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/relnotes/powerpc/article.sgml#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/relnotes/sparc64/Makefile#2 delete .. //depot/projects/xen31/release/doc/zh_CN.GB2312/relnotes/sparc64/article.sgml#2 delete .. //depot/projects/xen31/sbin/bsdlabel/bsdlabel.8#2 integrate .. //depot/projects/xen31/sbin/bsdlabel/bsdlabel.c#2 integrate .. //depot/projects/xen31/sbin/ifconfig/ifconfig.8#3 integrate .. //depot/projects/xen31/sbin/ifconfig/ifconfig.c#2 integrate .. //depot/projects/xen31/sbin/natd/natd.8#2 integrate .. //depot/projects/xen31/sbin/newfs_msdos/newfs_msdos.8#2 integrate .. //depot/projects/xen31/share/examples/cvsup/refuse#2 integrate .. //depot/projects/xen31/share/examples/cvsup/refuse.README#2 integrate .. //depot/projects/xen31/share/man/man4/hwpmc.4#3 integrate .. //depot/projects/xen31/share/man/man4/nve.4#2 integrate .. //depot/projects/xen31/share/man/man5/hosts.equiv.5#2 integrate .. //depot/projects/xen31/share/man/man5/src.conf.5#2 integrate .. //depot/projects/xen31/share/mk/bsd.own.mk#2 integrate .. //depot/projects/xen31/share/mk/bsd.subdir.mk#2 integrate .. //depot/projects/xen31/sys/amd64/amd64/exception.S#3 integrate .. //depot/projects/xen31/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/xen31/sys/amd64/amd64/pmap.c#6 integrate .. //depot/projects/xen31/sys/amd64/amd64/trap.c#4 integrate .. //depot/projects/xen31/sys/amd64/include/pmc_mdep.h#2 integrate .. //depot/projects/xen31/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/xen31/sys/arm/arm/pmap.c#6 integrate .. //depot/projects/xen31/sys/arm/include/pmc_mdep.h#2 integrate .. //depot/projects/xen31/sys/compat/freebsd32/freebsd32_misc.c#4 integrate .. //depot/projects/xen31/sys/conf/Makefile.amd64#2 integrate .. //depot/projects/xen31/sys/conf/files.amd64#5 integrate .. //depot/projects/xen31/sys/conf/files.i386#8 integrate .. //depot/projects/xen31/sys/dev/aac/aac.c#4 integrate .. //depot/projects/xen31/sys/dev/aac/aac_cam.c#3 integrate .. //depot/projects/xen31/sys/dev/aac/aac_pci.c#4 integrate .. //depot/projects/xen31/sys/dev/aac/aacreg.h#2 integrate .. //depot/projects/xen31/sys/dev/arcmsr/arcmsr.c#2 integrate .. //depot/projects/xen31/sys/dev/arcmsr/arcmsr.h#2 integrate .. //depot/projects/xen31/sys/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/xen31/sys/dev/hwpmc/hwpmc_amd.c#2 integrate .. //depot/projects/xen31/sys/dev/hwpmc/hwpmc_arm.c#2 integrate .. //depot/projects/xen31/sys/dev/hwpmc/hwpmc_ia64.c#2 integrate .. //depot/projects/xen31/sys/dev/hwpmc/hwpmc_logging.c#2 integrate .. //depot/projects/xen31/sys/dev/hwpmc/hwpmc_mod.c#2 integrate .. //depot/projects/xen31/sys/dev/hwpmc/hwpmc_piv.c#2 integrate .. //depot/projects/xen31/sys/dev/hwpmc/hwpmc_powerpc.c#2 integrate .. //depot/projects/xen31/sys/dev/hwpmc/hwpmc_ppro.c#2 integrate .. //depot/projects/xen31/sys/dev/hwpmc/hwpmc_sparc64.c#2 integrate .. //depot/projects/xen31/sys/dev/hwpmc/hwpmc_x86.c#3 integrate .. //depot/projects/xen31/sys/dev/if_ndis/if_ndis.c#4 integrate .. //depot/projects/xen31/sys/dev/re/if_re.c#5 integrate .. //depot/projects/xen31/sys/geom/geom_bsd_enc.c#2 integrate .. //depot/projects/xen31/sys/geom/part/g_part.c#4 integrate .. //depot/projects/xen31/sys/geom/part/g_part_bsd.c#2 integrate .. //depot/projects/xen31/sys/i386/i386/exception.s#2 integrate .. //depot/projects/xen31/sys/i386/i386/pmap.c#6 integrate .. //depot/projects/xen31/sys/i386/i386/trap.c#4 integrate .. //depot/projects/xen31/sys/i386/include/pmc_mdep.h#2 integrate .. //depot/projects/xen31/sys/ia64/include/pmc_mdep.h#2 integrate .. //depot/projects/xen31/sys/kern/kern_pmc.c#2 integrate .. //depot/projects/xen31/sys/kern/kern_proc.c#5 integrate .. //depot/projects/xen31/sys/kern/subr_trap.c#3 integrate .. //depot/projects/xen31/sys/net/bridgestp.c#2 integrate .. //depot/projects/xen31/sys/net/bridgestp.h#2 integrate .. //depot/projects/xen31/sys/net/if.h#2 integrate .. //depot/projects/xen31/sys/netinet/ip_fw2.c#4 integrate .. //depot/projects/xen31/sys/netinet6/dest6.c#2 integrate .. //depot/projects/xen31/sys/netinet6/frag6.c#2 integrate .. //depot/projects/xen31/sys/netinet6/icmp6.c#2 integrate .. //depot/projects/xen31/sys/netinet6/in6.c#3 integrate .. //depot/projects/xen31/sys/netinet6/in6.h#2 integrate .. //depot/projects/xen31/sys/netinet6/in6_cksum.c#2 integrate .. //depot/projects/xen31/sys/netinet6/in6_gif.c#2 integrate .. //depot/projects/xen31/sys/netinet6/in6_gif.h#2 integrate .. //depot/projects/xen31/sys/netinet6/in6_ifattach.c#2 integrate .. //depot/projects/xen31/sys/netinet6/in6_ifattach.h#2 integrate .. //depot/projects/xen31/sys/netinet6/in6_pcb.c#2 integrate .. //depot/projects/xen31/sys/netinet6/in6_pcb.h#2 integrate .. //depot/projects/xen31/sys/netinet6/in6_proto.c#2 integrate .. //depot/projects/xen31/sys/netinet6/in6_rmx.c#2 integrate .. //depot/projects/xen31/sys/netinet6/in6_src.c#2 integrate .. //depot/projects/xen31/sys/netinet6/in6_var.h#2 integrate .. //depot/projects/xen31/sys/netinet6/ip6_ecn.h#2 integrate .. //depot/projects/xen31/sys/netinet6/ip6_forward.c#2 integrate .. //depot/projects/xen31/sys/netinet6/ip6_id.c#2 integrate .. //depot/projects/xen31/sys/netinet6/ip6_input.c#2 integrate .. //depot/projects/xen31/sys/netinet6/ip6_ipsec.c#2 integrate .. //depot/projects/xen31/sys/netinet6/ip6_ipsec.h#2 integrate .. //depot/projects/xen31/sys/netinet6/ip6_mroute.c#2 integrate .. //depot/projects/xen31/sys/netinet6/ip6_mroute.h#2 integrate .. //depot/projects/xen31/sys/netinet6/ip6_output.c#3 integrate .. //depot/projects/xen31/sys/netinet6/ip6_var.h#2 integrate .. //depot/projects/xen31/sys/netinet6/ip6protosw.h#2 integrate .. //depot/projects/xen31/sys/netinet6/mld6.c#2 integrate .. //depot/projects/xen31/sys/netinet6/mld6_var.h#2 integrate .. //depot/projects/xen31/sys/netinet6/nd6.c#4 integrate .. //depot/projects/xen31/sys/netinet6/nd6.h#2 integrate .. //depot/projects/xen31/sys/netinet6/nd6_nbr.c#2 integrate .. //depot/projects/xen31/sys/netinet6/nd6_rtr.c#2 integrate .. //depot/projects/xen31/sys/netinet6/pim6.h#2 integrate .. //depot/projects/xen31/sys/netinet6/pim6_var.h#2 integrate .. //depot/projects/xen31/sys/netinet6/raw_ip6.c#2 integrate .. //depot/projects/xen31/sys/netinet6/raw_ip6.h#2 integrate .. //depot/projects/xen31/sys/netinet6/route6.c#2 integrate .. //depot/projects/xen31/sys/netinet6/scope6.c#2 integrate .. //depot/projects/xen31/sys/netinet6/scope6_var.h#2 integrate .. //depot/projects/xen31/sys/netinet6/sctp6_usrreq.c#2 integrate .. //depot/projects/xen31/sys/netinet6/sctp6_var.h#2 integrate .. //depot/projects/xen31/sys/netinet6/tcp6_var.h#2 integrate .. //depot/projects/xen31/sys/netinet6/udp6_usrreq.c#3 integrate .. //depot/projects/xen31/sys/netinet6/udp6_var.h#2 integrate .. //depot/projects/xen31/sys/pci/if_rlreg.h#3 integrate .. //depot/projects/xen31/sys/powerpc/include/pmc_mdep.h#2 integrate .. //depot/projects/xen31/sys/sparc64/include/pmc_mdep.h#2 integrate .. //depot/projects/xen31/sys/sun4v/include/pmc_mdep.h#2 integrate .. //depot/projects/xen31/sys/sys/cdefs.h#2 integrate .. //depot/projects/xen31/sys/sys/disklabel.h#2 integrate .. //depot/projects/xen31/sys/sys/param.h#9 integrate .. //depot/projects/xen31/sys/sys/pmc.h#3 integrate .. //depot/projects/xen31/sys/sys/pmckern.h#2 integrate .. //depot/projects/xen31/sys/sys/pmclog.h#3 integrate .. //depot/projects/xen31/tools/build/options/WITHOUT_INSTALLLIB#1 branch .. //depot/projects/xen31/tools/build/options/WITHOUT_KERBEROS#2 integrate .. //depot/projects/xen31/tools/build/options/WITH_GSSAPI#1 branch .. //depot/projects/xen31/tools/regression/lib/libc/stdio/test-scanfloat.c#3 integrate .. //depot/projects/xen31/tools/regression/lib/msun/test-lround.c#2 integrate .. //depot/projects/xen31/tools/regression/lib/msun/test-next.c#2 integrate .. //depot/projects/xen31/usr.bin/make/Makefile.dist#2 integrate .. //depot/projects/xen31/usr.sbin/mtree/verify.c#2 integrate .. //depot/projects/xen31/usr.sbin/pkg_install/Makefile#3 integrate .. //depot/projects/xen31/usr.sbin/pkg_install/add/pkg_add.1#3 integrate .. //depot/projects/xen31/usr.sbin/pkg_install/create/pkg_create.1#2 integrate .. //depot/projects/xen31/usr.sbin/pkg_install/delete/pkg_delete.1#2 integrate .. //depot/projects/xen31/usr.sbin/pkg_install/info/pkg_info.1#2 integrate .. //depot/projects/xen31/usr.sbin/pkg_install/updating/pkg_updating.1#2 integrate .. //depot/projects/xen31/usr.sbin/pkg_install/version/pkg_version.1#2 integrate .. //depot/projects/xen31/usr.sbin/pmcstat/Makefile#2 integrate .. //depot/projects/xen31/usr.sbin/pmcstat/pmcstat.8#2 integrate .. //depot/projects/xen31/usr.sbin/pmcstat/pmcstat.c#2 integrate .. //depot/projects/xen31/usr.sbin/pmcstat/pmcstat.h#2 integrate .. //depot/projects/xen31/usr.sbin/pmcstat/pmcstat_log.c#3 integrate .. //depot/projects/xen31/usr.sbin/sysinstall/media.c#2 integrate .. //depot/projects/xen31/usr.sbin/sysinstall/system.c#2 integrate .. //depot/projects/xen31/usr.sbin/timed/timed/timed.8#2 integrate Differences ... ==== //depot/projects/xen31/ObsoleteFiles.inc#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.123 2007/11/29 21:49:08 brooks Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.124 2007/12/07 22:56:10 dougb Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,9 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20071207: Merged with fortunes-o.real +OLD_FILES+=usr/share/games/fortune/fortunes2-o +OLD_FILES+=usr/share/games/fortune/fortunes2-o.dat # 20071129: Disabled static versions of libkse by default .if ${DEFAULT_THREAD_LIB} != "libkse" && ${MK_LIBTHR} != "no" OLD_FILES+=usr/lib/libkse.a ==== //depot/projects/xen31/bin/ed/Makefile#2 (text+ko) ==== @@ -1,16 +1,16 @@ -# $FreeBSD: src/bin/ed/Makefile,v 1.33 2007/07/02 14:00:25 kensmith Exp $ +# $FreeBSD: src/bin/ed/Makefile,v 1.34 2007/12/09 00:14:27 marius Exp $ .include PROG= ed SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c +WARNS?= 2 LINKS= ${BINDIR}/ed ${BINDIR}/red MLINKS= ed.1 red.1 .if !defined(RELEASE_CRUNCH) .if ${MK_OPENSSL} != "no" CFLAGS+=-DDES -WARNS?= 2 DPADD= ${LIBCRYPTO} LDADD= -lcrypto .endif ==== //depot/projects/xen31/contrib/amd/amd/amd.8#3 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997-2004 Erez Zadok +.\" Copyright (c) 1997-2006 Erez Zadok .\" Copyright (c) 1989 Jan-Simon Pendry .\" Copyright (c) 1989 Imperial College of Science, Technology & Medicine .\" Copyright (c) 1989 The Regents of the University of California. @@ -39,7 +39,7 @@ .\" %W% (Berkeley) %G% .\" .\" $Id: amd.8,v 1.14.2.1 2006/01/02 18:48:23 ezk Exp $ -.\" $FreeBSD: src/contrib/amd/amd/amd.8,v 1.23 2007/12/05 15:59:33 obrien Exp $ +.\" $FreeBSD: src/contrib/amd/amd/amd.8,v 1.24 2007/12/07 20:16:19 ru Exp $ .\" .Dd January 2, 2006 .Dt AMD 8 @@ -48,30 +48,24 @@ .Nm amd .Nd automatically mount file systems .Sh SYNOPSIS -.Nm amd +.Nm .Fl H -.Nm amd +.Nm .Op Fl F Ar conf_file -.Nm amd +.Nm .Op Fl nprvHS .Op Fl a Ar mount_point .Op Fl c Ar duration .Op Fl d Ar domain -.Bk -words .Op Fl k Ar kernel-arch -.Ek .Op Fl l Ar logfile .Op Fl o Ar op_sys_ver .Op Fl t Ar timeout.retransmit -.Bk -words .Op Fl w Ar interval -.Ek .Op Fl x Ar log-option .Op Fl y Ar YP-domain .Op Fl A Ar arch -.Bk -words .Op Fl C Ar cluster-name -.Ek .Op Fl D Ar option .Op Fl F Ar conf_file .Op Fl O Ar op_sys_name @@ -82,41 +76,46 @@ .Oc .Ar ... .Sh DESCRIPTION -.Nm Amd -is a daemon that automatically mounts file systems whenever a file or directory +The +.Nm +utility +is a daemon that automatically mounts file systems +whenever a file or directory within that file system is accessed. -File systems are automatically unmounted -when they appear to be quiescent. +File systems are automatically unmounted when they +appear to be quiescent. .Pp -.Nm Amd +The +.Nm +utility operates by attaching itself as an .Tn NFS server to each of the specified .Ar directories . Lookups within the specified directories are handled by -.Nm amd , +.Nm , which uses the map defined by .Ar mapname to determine how to resolve the lookup. -Generally, this will be a host name, -some file system information and some mount options for the given file system. +Generally, this will be a host name, some file system information +and some mount options for the given file system. .Pp In the first form depicted above, -.Nm amd +.Nm will print a short help string. In the second form, if no options are specified, or if the .Fl F is used, -.Nm amd +.Nm will read configuration parameters from the file .Ar conf_file which defaults to .Pa /etc/amd.conf . The last form is described below. .Sh OPTIONS -.Bl -tag -width Ds +.Bl -tag -width indent .It Fl a Ar temporary-directory Specify an alternative location for the real mount points. The default is @@ -140,55 +139,63 @@ If .Ar logfile is the string -.Em syslog , -the log messages will be sent to the system log daemon by +.Dq Li syslog , +then the log messages will be sent to the system log daemon by .Xr syslog 3 . -The default syslog facility used is LOG_DAEMON. -If you wish to change it, append its name to the log file name, -delimited by a single colon. +The default syslog facility used is +.Dv LOG_DAEMON . +If you +wish to change it, append its name to the log file name, delimited by a +single colon. For example, if .Ar logfile is the string .Dq Li syslog:local7 then -.Nm amd +.Nm will log messages via .Xr syslog 3 -using the LOG_LOCAL7 facility (if it exists on the system). +using the +.Dv LOG_LOCAL7 +facility (if it exists on the system). .It Fl n Normalize hostnames. The name referred to by ${rhost} is normalized relative to the host database before being used. The effect is to translate -aliases into ``official'' names. +aliases into +.Dq official +names. .It Fl o Ar op_sys_ver Override the compiled-in version number of the operating system. -Useful when the built in version is not desired for backward -compatibility reasons. +Useful +when the built in version is not desired for backward compatibility reasons. For example, if the build in version is -.Dq 2.5.1 , +.Dq Li 2.5.1 , you can override it to -.Dq 5.5.1 , +.Dq Li 5.5.1 , and use older maps that were written with the latter in mind. .It Fl p -Print -.Em PID . -Outputs the process-id of -.Nm amd +Print PID. +Outputs the process ID of +.Nm to standard output where it can be saved into a file. .It Fl r Restart existing mounts. -.Nm Amd +The +.Nm +utility will scan the mount file table to determine which file systems are currently mounted. Whenever one of these would have been auto-mounted, -.Nm amd +.Nm .Em inherits it. .It Fl t Ar timeout.retransmit -Specify the NFS timeout -.Ar interval , +Specify the NFS +.Ar timeout +interval, in tenths of a second, between .Tn NFS/RPC retries (for UDP only). @@ -201,7 +208,10 @@ Useful defaults are supplied if either or both values are missing. .Pp -Amd relies on the kernel RPC retransmit mechanism to trigger mount retries. +The +.Xr amd 8 +utility +relies on the kernel RPC retransmit mechanism to trigger mount retries. The values of these parameters change the overall retry interval. Too long an interval gives poor interactive response; too short an interval causes @@ -212,13 +222,14 @@ .It Fl w Ar interval Specify an .Ar interval , -in seconds, between attempts to dismount file systems that have exceeded their -cached times. +in seconds, between attempts to dismount +file systems that have exceeded their cached times. The default is 2 minutes. .It Fl x Ar options Specify run-time logging options. -The options are a comma separated list -chosen from: fatal, error, user, warn, info, map, stats, all. +The options are a comma separated +list chosen from: +.Li fatal , error , user , warn , info , map , stats , all . .It Fl y Ar domain Specify an alternative .Tn NIS @@ -231,8 +242,7 @@ support is not available. .It Fl A Ar arch Specifies the OS architecture. -This is used solely to set the -.Em ${arch} +This is used solely to set the ${arch} selector. .It Fl C Ar cluster-name Specify an alternative HP-UX cluster name to use. @@ -240,11 +250,11 @@ Select from a variety of debug options. Prefixing an option with the string -.Em no +.Dq Li no reverses the effect of that option. Options are cumulative. The most useful option is -.Ar all . +.Dq Li all . .Pp Since .Fl D @@ -255,7 +265,7 @@ and a fuller description is available in the program source. .It Fl F Ar conf_file Specify an -.Nm amd +.Nm configuration file to use. See .Xr amd.conf 5 @@ -263,59 +273,63 @@ This configuration file is used to specify any options in lieu of typing many of them on the command line. The -.Nm amd.conf -file includes directives for every command line option amd has, -and many more that are only available via the configuration file -facility. -The configuration file specified by this option is -processed after all other options have been processed, regardless -of the actual location of this option on the command line. +.Xr amd.conf 5 +file includes directives for every command line option amd has, and many +more that are only available via the configuration file facility. +The +configuration file specified by this option is processed after all other +options had been processed, regardless of the actual location of this option +on the command line. .It Fl H Print help and usage string. .It Fl O Ar op_sys_name Override the compiled-in name of the operating system. -Useful when the built in name is not desired for backward -compatibility reasons. -For example, if the build in name is -.Dq sunos5 , +Useful when the +built in name is not desired for backward compatibility reasons. +For +example, if the build in name is +.Dq Li sunos5 , you can override it to -.Dq sos5 +.Dq Li sos5 and use older maps which were written with the latter in mind. .It Fl S Do not lock the running executable pages of -.Nm amd +.Nm into memory. To improve -.Nm amd's +.Nm Ns 's performance, systems that support the .Xr plock 3 call, could lock the -.Nm amd +.Nm process into memory. -This way there is less chance the operating system will -schedule, page out, and swap the -.Nm amd -process as needed. +This way there is less chance +the operating system will schedule, page out, and swap the +.Nm +process as +needed. This tends to improve -.Nm amd's -performance, at the cost of reserving the memory used by the -.Nm amd -process -(making it unavailable for other processes). +.Nm Ns 's +performance, at the cost of reserving the +memory used by the +.Nm +process (making it unavailable for other processes). If this behavior is not desired, use the .Fl S option. .It Fl T Ar tag Specify a tag to use with .Xr amd.conf 5 . -All Map entries tagged with tag will be processed. +All map entries tagged with +.Ar tag +will be processed. Map entries that are not tagged are always processed. Map entries that are tagged with a tag other than .Ar tag will not be processed. .El .Sh FILES -.Bl -tag -width /axx +.Bl -tag -width ".Pa /etc/amd.conf" .It Pa /.amd_mnt directory under which file systems are dynamically mounted .It Pa /etc/amd.conf @@ -329,20 +343,17 @@ file system can be incredibly inefficient. In most implementations of .Tn NFS , -their interpolations are not cached by -the kernel and each time a symbolic link is -encountered during a +their interpolations are not cached +by the kernel and each time a symbolic link is encountered during a .Em lookuppn translation it costs an .Tn RPC call to the .Tn NFS server. -A large improvement in real-time +It would appear that a large improvement in real-time performance could be gained by adding a cache somewhere. -Replacing -.Xr symlink 2 -with a suitable incarnation of the auto-mounter +Replacing symlinks with a suitable incarnation of the auto-mounter results in a large real-time speedup, but also causes a large number of process context switches. .Pp @@ -357,25 +368,34 @@ .Xr amq 8 , .Xr mount 8 , .Xr umount 8 +.Pp +.Dq am-utils +.Xr info 1 +entry. .Rs -.%T Amd \- The 4.4 BSD Automounter +.%A Erez Zadok +.%B "Linux NFS and Automounter Administration" +.%O ISBN 0-7821-2739-8 +.%I Sybex +.%D 2001 .Re .Pp .Pa http://www.am-utils.org/ -.Pp -.%T Linux NFS and Automounter Administration -by Erez Zadok, ISBN 0-7821-2739-8, (Sybex, 2001). +.Rs +.%T Amd \- The 4.4 BSD Automounter +.Re .Sh HISTORY The -.Nm amd +.Nm utility first appeared in .Bx 4.4 . .Sh AUTHORS .An Jan-Simon Pendry Aq jsp@doc.ic.ac.uk , Department of Computing, Imperial College, London, UK. .Pp -.An Erez Zadok Aq ezk@am-utils.org , -Department of Computer Science, Stony Brook University New York, USA. +.An Erez Zadok Aq ezk@cs.sunysb.edu , +Computer Science Department, Stony Brook +University, Stony Brook, New York, USA. .Pp Other authors and contributors to am-utils are listed in the .Pa AUTHORS ==== //depot/projects/xen31/contrib/amd/amq/amq.8#3 (text+ko) ==== @@ -39,7 +39,7 @@ .\" %W% (Berkeley) %G% .\" .\" $Id: amq.8,v 1.15.2.1 2006/01/02 18:48:24 ezk Exp $ -.\" $FreeBSD: src/contrib/amd/amq/amq.8,v 1.14 2007/12/05 15:59:33 obrien Exp $ +.\" $FreeBSD: src/contrib/amd/amq/amq.8,v 1.16 2007/12/07 20:22:59 ru Exp $ .\" .Dd January 2, 2006 .Dt AMQ 8 @@ -48,87 +48,105 @@ .Nm amq .Nd automounter query tool .Sh SYNOPSIS -.Nm amq -.Op Fl fmpsuvTU +.Nm +.Op Fl fmpsvwHTU .Op Fl h Ar hostname .Op Fl l Ar log_file .Op Fl x Ar log_options .Op Fl D Ar debug_options -.Op Fl M Ar mountmap_entry .Op Fl P Ar program_number -.Op Ar directory -.Ar ... +.Op Oo Fl u Oc Ar directory ... .Sh DESCRIPTION -.Nm Amq +The +.Nm +utility provides a simple way of determining the current state of the .Xr amd 8 program. Communication is by .Tn RPC . Three modes of operation are supported by the current protocol. -By default a list of mount points and auto-mounted file systems -is output. -An alternative host can be specified using the +By default +a list of mount points and auto-mounted file systems is output. +An +alternative host can be specified using the .Fl h option. .Pp -If directory names are given, as output by default, -then per file system information is displayed. +If +.Ar directory +names are given, as output by default, then per file system +information is displayed. .Sh OPTIONS -.Bl -tag -width Ds +.Bl -tag -width indent .It Fl f -Request automounter to flush the internal caches. +Ask the automounter to flush the internal caches and reload all the maps. .It Fl h Ar hostname -Query alternate host -.Ar hostname . +Specify an alternate host to query. By default the local host is used. -In an +In +an .Tn HP-UX -cluster, the root server is queried by default, since -that is the system on which the automounter is normally run. +cluster, the root server is queried by default, since that is the system on +which the automounter is normally run. .It Fl l Ar log_file -Tell amd to use +Tell +.Xr amd 8 +to use .Ar log_file as the log file name. -For security reasons, this must be the same log file which -.Nm amd +For security reasons, this must be the same log file +which +.Xr amd 8 used when started. This option is therefore only useful to refresh -.Nm amd Ns \'s -open file handle on the log file, so that it can be rotated and compressed via -daily cron jobs. +.Nm amd Ns 's +open file handle on the log file, so that it can be rotated +and compressed via daily cron jobs. .It Fl m -Request the automounter to provide a list of mounted file systems, -including the number of references to each file system and any error -which occurred while mounting. +Ask the automounter to provide a list of mounted file systems, including the +number of references to each file system and any error which occurred while +mounting. .It Fl p Return the process ID of the remote or locally running -.Nm amd . -Useful when you need to send a signal to the local -.Nm amd -process, and would rather not have to search through the process table. -This -option is used in the +.Xr amd 8 . +Useful when you +need to send a signal to the local +.Xr amd 8 +process, and would rather not have to +search through the process table. +This option is used in the .Pa ctl-amd script. .It Fl s -Request the automounter to provide system-wide mount statistics. +Ask the automounter to provide system-wide mount statistics. .It Fl u -Request the automounter to unmount the named file systems -instead of providing information about them. -Unmounts are requested, -not forced. -They merely cause the mounted file system to timeout, -which will be picked up by -.Nm amd Ns \'s +Ask the automounter to unmount the file systems named in +.Ar directory +instead of providing +information about them. +Unmounts are requested, not forced. +They merely +cause the mounted file system to timeout, which will be picked up by +.Nm amd Ns 's main scheduler thus causing the normal timeout action to be taken. .It Fl v -Request the automounter to provide version information. -This is a subset -of the information provided by -.Nm amd Ns \'s Fl v +Ask the automounter for its version information. +This is a subset of the +information output by +.Xr amd 8 Ns 's +.Fl v option. +.It Fl w +Translate a full pathname as returned by +.Xr getcwd 3 +into a short +.Xr amd 8 +pathname that goes through its mount points. +This option requires that +.Xr amd 8 +is running. .It Fl x Ar log_options Ask the automounter to use the logging options specified in .Ar log_options @@ -137,109 +155,113 @@ Ask the automounter to use the debugging options specified in .Ar debug_options from now on. -.It Fl M -Pass a mount map entry to -.Nm amd -and wait for it to be evaluated, possibly causing a mount. -This option is highly insecure. -By default, -.Nm amd -and -.Nm amq -do not support it. -It is necessary to configure -.Nm am-utils -with -.Ar --enable-amq-mount -to enable this option. +.It Fl H +Display short usage message. .It Fl P Ar program_number Contact an alternate running -.Nm amd -that had registered itself on a different RPC +.Xr amd 8 +that had registered itself on a different +.Tn RPC .Ar program_number and apply all other operations to that instance of the automounter. -This is useful when running multiple copies of -.Nm amd , -and need to manage each one separately. +This is +useful when you run multiple copies of +.Xr amd 8 , +and need to manage each +one separately. If not specified, -.Nm amq +.Nm will use the default program number for -.Nm amd , +.Xr amd 8 , 300019. For security reasons, the only alternate program numbers -.Nm amd +.Xr amd 8 can use range from 300019 to 300029, inclusive. .It Fl T Contact -.Nm amd +.Xr amd 8 using the TCP transport only. Normally -.Nm amq -will try TCP, and if that fails, will try UDP. +.Nm +will try TCP, and if that failed, will try UDP. .It Fl U Contact -.Nm amd +.Xr amd 8 using UDP (connectionless) transport only. Normally -.Nm amq -will try TCP, and if that fails, will try UDP. +.Nm +will try TCP, and if that failed, will try UDP. .El .Sh FILES -.Bl -tag -width amq.x -compact +.Bl -tag -width ".Pa amq.x" -compact .It Pa amq.x .Tn RPC protocol description. .El .Sh CAVEATS -.Nm Amq +The +.Nm +utility >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Dec 11 07:10:08 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB75116A469; Tue, 11 Dec 2007 07:10:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4088316A41A for ; Tue, 11 Dec 2007 07:10:07 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2FE8813C442 for ; Tue, 11 Dec 2007 07:10:07 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBB7A6qY045644 for ; Tue, 11 Dec 2007 07:10:06 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBB7A6XD045641 for perforce@freebsd.org; Tue, 11 Dec 2007 07:10:06 GMT (envelope-from imp@freebsd.org) Date: Tue, 11 Dec 2007 07:10:06 GMT Message-Id: <200712110710.lBB7A6XD045641@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 130615 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Dec 2007 07:10:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=130615 Change 130615 by imp@imp_mbp on 2007/12/11 07:10:03 IPFILTER can't default to both YES and NO, so default it to yes for the moment. # Haven't checked the base FreeBSD yet to see if this is the # right way to resolve the conflict. Affected files ... .. //depot/projects/arm/src/share/mk/bsd.own.mk#17 edit Differences ... ==== //depot/projects/arm/src/share/mk/bsd.own.mk#17 (text+ko) ==== @@ -387,8 +387,7 @@ .for var in \ BIND_LIBS \ HESIOD \ - IDEA \ - IPFILTER + IDEA .if defined(WITH_${var}) && defined(WITHOUT_${var}) .error WITH_${var} and WITHOUT_${var} can't both be set. .endif From owner-p4-projects@FreeBSD.ORG Tue Dec 11 07:11:08 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E50216A41B; Tue, 11 Dec 2007 07:11:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3416616A41A for ; Tue, 11 Dec 2007 07:11:08 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 23E4813C474 for ; Tue, 11 Dec 2007 07:11:08 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBB7B8iL045926 for ; Tue, 11 Dec 2007 07:11:08 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBB7B8Q1045922 for perforce@freebsd.org; Tue, 11 Dec 2007 07:11:08 GMT (envelope-from imp@freebsd.org) Date: Tue, 11 Dec 2007 07:11:08 GMT Message-Id: <200712110711.lBB7B8Q1045922@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 130616 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Dec 2007 07:11:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=130616 Change 130616 by imp@imp_mbp on 2007/12/11 07:10:43 Don't assume make is a bsdmake. It isn't on Darwin/OS X. Affected files ... .. //depot/projects/arm/src/Makefile#13 edit Differences ... ==== //depot/projects/arm/src/Makefile#13 (text+ko) ==== @@ -113,6 +113,7 @@ (in make.conf(5)) or command-line variable. .endif MAKEPATH= ${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE} +BSDMAKE?=make BINMAKE= \ `if [ -x ${MAKEPATH}/make ]; then echo ${MAKEPATH}/make; else echo ${MAKE}; fi` \ -m ${.CURDIR}/share/mk @@ -236,7 +237,7 @@ PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \ PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \ then \ - (cd ${.CURDIR} && make make); \ + (cd ${.CURDIR} && ${BSDMAKE} make); \ fi # @@ -245,8 +246,9 @@ # MMAKEENV= MAKEOBJDIRPREFIX=${MAKEPATH} \ DESTDIR= \ + LIBC= \ INSTALL="sh ${.CURDIR}/tools/install.sh" -MMAKE= ${MMAKEENV} make \ +MMAKE= ${MMAKEENV} ${BSDMAKE} \ -D_UPGRADING \ -DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \ -DNO_CPU_CFLAGS -DNO_WERROR From owner-p4-projects@FreeBSD.ORG Tue Dec 11 07:15:13 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5476016A46E; Tue, 11 Dec 2007 07:15:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EFB2A16A420 for ; Tue, 11 Dec 2007 07:15:12 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DDEDA13C448 for ; Tue, 11 Dec 2007 07:15:12 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBB7FCsi046925 for ; Tue, 11 Dec 2007 07:15:12 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBB7FCkB046922 for perforce@freebsd.org; Tue, 11 Dec 2007 07:15:12 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 11 Dec 2007 07:15:12 GMT Message-Id: <200712110715.lBB7FCkB046922@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 130617 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Dec 2007 07:15:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=130617 Change 130617 by kmacy@entropy_kmacy_xen31 on 2007/12/11 07:14:22 get kernel to build in PAE mode - fix xenpmap interfaces to expect vm_paddr_t rather than uint32_t switch to ELFNOTE style interface to the xen loader Affected files ... .. //depot/projects/xen31/sys/conf/Makefile.i386#2 edit .. //depot/projects/xen31/sys/conf/kern.mk#2 edit .. //depot/projects/xen31/sys/i386/i386/genassym.c#3 edit .. //depot/projects/xen31/sys/i386/include/asmacros.h#2 edit .. //depot/projects/xen31/sys/i386/include/pmap.h#6 edit .. //depot/projects/xen31/sys/i386/include/xen/xen-public/arch-x86_32.h#2 edit .. //depot/projects/xen31/sys/i386/include/xen/xen-public/elfnote.h#1 add .. //depot/projects/xen31/sys/i386/include/xen/xenpmap.h#2 edit .. //depot/projects/xen31/sys/i386/include/xen/xenvar.h#2 edit .. //depot/projects/xen31/sys/i386/xen/locore.s#3 edit .. //depot/projects/xen31/sys/i386/xen/pmap.c#5 edit .. //depot/projects/xen31/sys/i386/xen/xen_machdep.c#3 edit Differences ... ==== //depot/projects/xen31/sys/conf/Makefile.i386#2 (text+ko) ==== @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600004 +%VERSREQ= 600003 STD8X16FONT?= iso ==== //depot/projects/xen31/sys/conf/kern.mk#2 (text+ko) ==== @@ -13,9 +13,6 @@ CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ ${_wundef} ${_Wno_pointer_sign} -fformat-extensions -.if !defined(WITH_GCC3) -_Wno_pointer_sign=-Wno-pointer-sign -.endif .if !defined(NO_UNDEF) _wundef= -Wundef .endif ==== //depot/projects/xen31/sys/i386/i386/genassym.c#3 (text+ko) ==== @@ -231,3 +231,8 @@ ASSYM(BUS_SPACE_HANDLE_BASE, offsetof(struct bus_space_handle, bsh_base)); ASSYM(BUS_SPACE_HANDLE_IAT, offsetof(struct bus_space_handle, bsh_iat)); #endif + +#ifdef XEN +#include +ASSYM(HYPERVISOR_VIRT_START, __HYPERVISOR_VIRT_START); +#endif ==== //depot/projects/xen31/sys/i386/include/asmacros.h#2 (text+ko) ==== @@ -178,4 +178,30 @@ #endif /* LOCORE */ + +#ifdef __STDC__ +#define ELFNOTE(name, type, desctype, descdata...) \ +.pushsection .note.name ; \ + .align 4 ; \ + .long 2f - 1f /* namesz */ ; \ + .long 4f - 3f /* descsz */ ; \ + .long type ; \ +1:.asciz #name ; \ +2:.align 4 ; \ +3:desctype descdata ; \ +4:.align 4 ; \ +.popsection +#else /* !__STDC__, i.e. -traditional */ +#define ELFNOTE(name, type, desctype, descdata) \ +.pushsection .note.name ; \ + .align 4 ; \ + .long 2f - 1f /* namesz */ ; \ + .long 4f - 3f /* descsz */ ; \ + .long type ; \ +1:.asciz "name" ; \ +2:.align 4 ; \ +3:desctype descdata ; \ +4:.align 4 ; \ +.popsection +#endif /* __STDC__ */ #endif /* !_MACHINE_ASMACROS_H_ */ ==== //depot/projects/xen31/sys/i386/include/pmap.h#6 (text+ko) ==== @@ -251,6 +251,10 @@ #define pte_store(ptep, pte) pte_load_store((ptep), (pt_entry_t)pte) #define pte_clear(ptep) pte_load_store((ptep), (pt_entry_t)0ULL) +#ifdef PAE +extern pt_entry_t pg_nx; +#endif + #else /* * Routine: pmap_kextract ==== //depot/projects/xen31/sys/i386/include/xen/xen-public/arch-x86_32.h#2 (text+ko) ==== @@ -70,7 +70,7 @@ * Virtual addresses beyond this are not modifiable by guest OSes. The * machine->physical mapping table starts at this address, read-only. */ -#ifdef CONFIG_X86_PAE +#ifdef PAE #define __HYPERVISOR_VIRT_START 0xF5800000 #else #define __HYPERVISOR_VIRT_START 0xFC000000 ==== //depot/projects/xen31/sys/i386/include/xen/xenpmap.h#2 (text+ko) ==== @@ -36,15 +36,15 @@ void xen_invlpg(vm_offset_t); void xen_load_cr3(vm_paddr_t); void xen_queue_pt_update(vm_paddr_t, vm_paddr_t); -void xen_pt_switch(uint32_t); -void xen_set_ldt(unsigned long, unsigned long); +void xen_pt_switch(vm_paddr_t); +void xen_set_ldt(vm_paddr_t, unsigned long); void xen_tlb_flush(void); -void xen_pgd_pin(unsigned long); -void xen_pgd_unpin(unsigned long); -void xen_pt_pin(unsigned long); -void xen_pt_unpin(unsigned long); +void xen_pgd_pin(vm_paddr_t); +void xen_pgd_unpin(vm_paddr_t); +void xen_pt_pin(vm_paddr_t); +void xen_pt_unpin(vm_paddr_t); void xen_flush_queue(void); -void pmap_ref(pt_entry_t *pte, unsigned long ma); +void pmap_ref(pt_entry_t *pte, vm_paddr_t ma); #ifdef PMAP_DEBUG @@ -169,14 +169,14 @@ xen_flush_queue(); \ } while (/*CONSTCOND*/0) -static __inline uint32_t -xpmap_mtop(uint32_t mpa) +static __inline vm_paddr_t +xpmap_mtop(vm_paddr_t mpa) { return machtophys(mpa) | (mpa & ~PG_FRAME); } static __inline vm_paddr_t -xpmap_ptom(uint32_t ppa) +xpmap_ptom(vm_paddr_t ppa) { return phystomach(ppa) | (ppa & ~PG_FRAME); } ==== //depot/projects/xen31/sys/i386/include/xen/xenvar.h#2 (text+ko) ==== @@ -8,7 +8,7 @@ #else #define XENPRINTF printf #endif -extern unsigned long *xen_phys_machine; +extern vm_paddr_t *xen_phys_machine; #if 0 #define TRACE_ENTER XENPRINTF("(file=%s, line=%d) entered %s\n", __FILE__, __LINE__, __FUNCTION__) @@ -21,7 +21,7 @@ #define TRACE_DEBUG(argflags, _f, _a...) #endif -extern unsigned long *xen_machine_phys; +extern vm_paddr_t *xen_machine_phys; /* Xen starts physical pages after the 4MB ISA hole - * FreeBSD doesn't */ @@ -38,14 +38,14 @@ #endif -#define PFNTOMFN(i) (((unsigned long *)xen_phys_machine)[(i)]) +#define PFNTOMFN(i) (((vm_paddr_t *)xen_phys_machine)[(i)]) #define MFNTOPFN(i) (xen_machine_phys[i]) -#define VTOP(x) ((unsigned long)(x) - KERNBASE) -#define PTOV(x) ((unsigned long)(x) + KERNBASE) +#define VTOP(x) ((vm_paddr_t)((uintptr_t)x) - KERNBASE) +#define PTOV(x) ((vm_paddr_t)(x) + KERNBASE) #define VTOPFN(x) (VTOP(x) >> PAGE_SHIFT) -#define PFNTOV(x) PTOV((unsigned long)(x) << PAGE_SHIFT) +#define PFNTOV(x) PTOV((vm_paddr_t)(x) << PAGE_SHIFT) #define VTOMFN(va) (vtomach(va) >> PAGE_SHIFT) #define PFN_UP(x) (((x) + PAGE_SIZE-1) >> PAGE_SHIFT) ==== //depot/projects/xen31/sys/i386/xen/locore.s#3 (text+ko) ==== @@ -54,6 +54,9 @@ #include #include +#define __ASSEMBLY__ +#include + /* The defines below have been lifted out of */ #define FLAT_RING1_CS 0xe019 /* GDT index 259 */ #define FLAT_RING1_DS 0xe021 /* GDT index 260 */ @@ -63,8 +66,37 @@ #include "assym.s" .section __xen_guest +#if 0 .ascii "LOADER=generic,GUEST_OS=freebsd,GUEST_VER=7.0,XEN_VER=xen-3.0,BSD_SYMTAB,VIRT_BASE=0xc0000000" .byte 0 +#endif + ELFNOTE(Xen, XEN_ELFNOTE_GUEST_OS, .asciz, "FreeBSD") + ELFNOTE(Xen, XEN_ELFNOTE_GUEST_VERSION, .asciz, "HEAD") + ELFNOTE(Xen, XEN_ELFNOTE_XEN_VERSION, .asciz, "xen-3.0") + ELFNOTE(Xen, XEN_ELFNOTE_VIRT_BASE, .long, KERNBASE) + ELFNOTE(Xen, XEN_ELFNOTE_PADDR_OFFSET, .long, 0) + ELFNOTE(Xen, XEN_ELFNOTE_ENTRY, .long, btext) +#ifdef notyet + ELFNOTE(Xen, XEN_ELFNOTE_HYPERCALL_PAGE, .long, hypercall_page) +#endif + ELFNOTE(Xen, XEN_ELFNOTE_HV_START_LOW, .long, HYPERVISOR_VIRT_START) +#ifdef notyet + ELFNOTE(Xen, XEN_ELFNOTE_FEATURES, .asciz, "writable_page_tables|writable_descriptor_tables|auto_translated_physmap|pae_pgdir_above_4gb|supervisor_mode_kernel") +#else + ELFNOTE(Xen, XEN_ELFNOTE_FEATURES, .asciz, "pae_pgdir_above_4gb|supervisor_mode_kernel") +#endif + +#ifdef PAE + ELFNOTE(Xen, XEN_ELFNOTE_PAE_MODE, .asciz, "yes") + ELFNOTE(Xen, XEN_ELFNOTE_L1_MFN_VALID, .long, PG_V, PG_V) +#else + ELFNOTE(Xen, XEN_ELFNOTE_PAE_MODE, .asciz, "no") + ELFNOTE(Xen, XEN_ELFNOTE_L1_MFN_VALID, .long, PG_V, PG_V) +#endif + ELFNOTE(Xen, XEN_ELFNOTE_LOADER, .asciz, "generic") + ELFNOTE(Xen, XEN_ELFNOTE_SUSPEND_CANCEL, .long, 1) + + /* * XXX @@ -263,7 +295,7 @@ pushl %eax testl $PSL_VM,UC_EFLAGS(%eax) jne 1f - movl UC_GS(%eax),%gs /* restore %gs */ + mov UC_GS(%eax), %gs /* restore %gs */ 1: movl $SYS_sigreturn,%eax pushl %eax /* junk to fake return addr. */ @@ -280,7 +312,7 @@ pushl %eax testl $PSL_VM,UC4_EFLAGS(%eax) jne 1f - movl UC4_GS(%eax),%gs /* restore %gs */ + mov UC4_GS(%eax),%gs /* restore %gs */ 1: movl $344,%eax /* 4.x SYS_sigreturn */ pushl %eax /* junk to fake return addr. */ ==== //depot/projects/xen31/sys/i386/xen/pmap.c#5 (text+ko) ==== @@ -254,8 +254,8 @@ #endif static pt_entry_t *PMAP1 = 0, *PMAP2; static pt_entry_t *PADDR1 = 0, *PADDR2; +static int PMAP1_inuse = 0, PMAP2_inuse = 0; #ifdef SMP -static int PMAP1_inuse = 0, PMAP2_inuse = 0; static int PMAP1cpu; static int PMAP1changedcpu; SYSCTL_INT(_debug, OID_AUTO, PMAP1changedcpu, CTLFLAG_RD, @@ -1439,6 +1439,8 @@ /* re-map page directory read-only and pin */ PT_SET_MA(pmap->pm_pdir + i*PAGE_SIZE, (ma | PG_V | PG_A)); + PT_SET_MA(pmap->pm_pdpt + i*PAGE_SIZE, + (ma | PG_V | PG_A)); xen_pgd_pin(ma); /* add L1 shadow of L2 */ xen_queue_pt_update(vtomach(&pmap->pm_pdir[PTDPTDI + i]), @@ -1447,8 +1449,8 @@ vtomach(pmap->pm_pdir) | PG_V | PG_A); #ifdef PAE - #error "unsupported currently" - pmap->pm_pdpt[i] = ma | PG_V; + xen_queue_pt_update(vtomach(&pmap->pm_pdpt[i]), + ma_shadow | PG_V | PG_A); #endif } xen_flush_queue(); ==== //depot/projects/xen31/sys/i386/xen/xen_machdep.c#3 (text+ko) ==== @@ -75,8 +75,8 @@ int xendebug_flags; start_info_t *xen_start_info; shared_info_t *HYPERVISOR_shared_info; -unsigned long *xen_machine_phys = ((unsigned long *)VADDR(1008, 0)); -unsigned long *xen_phys_machine; +vm_paddr_t *xen_machine_phys = ((vm_paddr_t *)VADDR(1008, 0)); +vm_paddr_t *xen_phys_machine; int preemptable, init_first; extern unsigned int avail_space; @@ -261,7 +261,7 @@ } void -xen_load_cr3(uint32_t val) +xen_load_cr3(vm_paddr_t val) { struct mmuext_op op; op.cmd = MMUEXT_NEW_BASEPTR; @@ -293,7 +293,7 @@ } void -xen_pgd_pin(unsigned long ma) +xen_pgd_pin(vm_paddr_t ma) { struct mmuext_op op; op.cmd = MMUEXT_PIN_L2_TABLE; @@ -303,7 +303,7 @@ } void -xen_pgd_unpin(unsigned long ma) +xen_pgd_unpin(vm_paddr_t ma) { struct mmuext_op op; op.cmd = MMUEXT_UNPIN_TABLE; @@ -313,7 +313,7 @@ } void -xen_pt_pin(unsigned long ma) +xen_pt_pin(vm_paddr_t ma) { struct mmuext_op op; op.cmd = MMUEXT_PIN_L1_TABLE; @@ -324,7 +324,7 @@ } void -xen_pt_unpin(unsigned long ma) +xen_pt_unpin(vm_paddr_t ma) { struct mmuext_op op; op.cmd = MMUEXT_UNPIN_TABLE; @@ -334,7 +334,7 @@ } void -xen_set_ldt(unsigned long ptr, unsigned long len) +xen_set_ldt(vm_paddr_t ptr, unsigned long len) { struct mmuext_op op; op.cmd = MMUEXT_SET_LDT; @@ -588,6 +588,7 @@ bootmem_current -= size; } +#if 0 static vm_paddr_t xpmap_mtop2(vm_paddr_t mpa) { @@ -595,7 +596,7 @@ ) | (mpa & ~PG_FRAME); } -static pd_entry_t +static pd_entry_t xpmap_get_bootpde(vm_paddr_t va) { @@ -614,7 +615,7 @@ (xpmap_mtop2(pde & PG_FRAME) + KERNBASE); } -static pt_entry_t * +static pt_entry_t 8* xpmap_get_bootptep(vm_paddr_t va) { pd_entry_t pde; @@ -632,7 +633,7 @@ return xpmap_get_bootptep(va)[0]; } - +#endif static vm_offset_t *pdir_shadow; @@ -675,7 +676,7 @@ { int i; unsigned int cur_space = avail_space; - vm_paddr_t pdir_shadow_ma, KPTphys, *IdlePTDma; + vm_paddr_t pdir_shadow_ma, KPTphys, IdlePTDma; physdev_op_t op; printk("initvalues(): wooh - availmem=%x,%x\n",avail_space, cur_space); @@ -686,7 +687,7 @@ #endif xen_start_info = startinfo; - xen_phys_machine = (unsigned long *)startinfo->mfn_list; + xen_phys_machine = (vm_paddr_t *)startinfo->mfn_list; /* number of pages allocated after the pts + 1*/; printk("KERNBASE=%x,pt_base=%x, VTOPFN(base)=%x, nr_pt_frames=%x\n", KERNBASE,xen_start_info->pt_base, VTOPFN(xen_start_info->pt_base), xen_start_info->nr_pt_frames); @@ -707,8 +708,8 @@ bzero((char *)cur_space, (cur_space + 0x3fffff) % 0x400000); */ - IdlePTD = (pd_entry_t *)VTOP(startinfo->pt_base); - IdlePTDma = (pd_entry_t *)xpmap_ptom(VTOP(startinfo->pt_base)); + IdlePTD = (pd_entry_t *)startinfo->pt_base; + IdlePTDma = xpmap_ptom(VTOP(startinfo->pt_base)); KPTphys = xpmap_ptom(VTOP(startinfo->pt_base + PAGE_SIZE)); XENPRINTF("IdlePTD %p\n", IdlePTD); XENPRINTF("nr_pages: %ld shared_info: 0x%lx flags: 0x%lx pt_base: 0x%lx " @@ -716,10 +717,10 @@ xen_start_info->nr_pages, xen_start_info->shared_info, xen_start_info->flags, xen_start_info->pt_base, xen_start_info->mod_start, xen_start_info->mod_len); - +#if 0 XENPRINTF("c0100000: %08x\n", xpmap_get_bootpte(0xc0100000)); - +#endif /* Map proc0's KSTACK */ proc0kstack = cur_space; cur_space += (KSTACK_PAGES * PAGE_SIZE); printk("proc0kstack=%u\n", proc0kstack); From owner-p4-projects@FreeBSD.ORG Tue Dec 11 07:15:14 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 08B3116A50C; Tue, 11 Dec 2007 07:15:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3178716A469 for ; Tue, 11 Dec 2007 07:15:13 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 216F513C4E1 for ; Tue, 11 Dec 2007 07:15:13 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBB7FDgk046932 for ; Tue, 11 Dec 2007 07:15:13 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBB7FCT9046928 for perforce@freebsd.org; Tue, 11 Dec 2007 07:15:12 GMT (envelope-from imp@freebsd.org) Date: Tue, 11 Dec 2007 07:15:12 GMT Message-Id: <200712110715.lBB7FCT9046928@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 130618 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Dec 2007 07:15:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=130618 Change 130618 by imp@imp_mbp on 2007/12/11 07:14:48 Darwin doesn't like it when you try to setrlimit NOFILE, so ignore the error in that case. This is lame, and I'm not sure what the right fix for this is. # Now we get to the version check in legacy before we barf-o-rama Affected files ... .. //depot/projects/arm/src/usr.bin/make/main.c#5 edit Differences ... ==== //depot/projects/arm/src/usr.bin/make/main.c#5 (text+ko) ==== @@ -901,7 +901,9 @@ #ifdef RLIMIT_NOFILE /* - * get rid of resource limit on file descriptors + * get rid of resource limit on file descriptors, but don't + * fail if we can't because OS X has this define, but we get + * EINVAL when we try to set it. */ { struct rlimit rl; @@ -909,9 +911,7 @@ err(2, "getrlimit"); } rl.rlim_cur = rl.rlim_max; - if (setrlimit(RLIMIT_NOFILE, &rl) == -1) { - err(2, "setrlimit"); - } + setrlimit(RLIMIT_NOFILE, &rl); } #endif From owner-p4-projects@FreeBSD.ORG Tue Dec 11 07:22:21 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5149316A46B; Tue, 11 Dec 2007 07:22:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F31C316A418 for ; Tue, 11 Dec 2007 07:22:20 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CB79213C469 for ; Tue, 11 Dec 2007 07:22:20 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBB7MKVo047957 for ; Tue, 11 Dec 2007 07:22:20 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBB7MKZb047954 for perforce@freebsd.org; Tue, 11 Dec 2007 07:22:20 GMT (envelope-from imp@freebsd.org) Date: Tue, 11 Dec 2007 07:22:20 GMT Message-Id: <200712110722.lBB7MKZb047954@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 130619 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Dec 2007 07:22:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=130619 Change 130619 by imp@imp_mbp on 2007/12/11 07:21:47 Leave a hint behind so I can recall what I needed to do to make this work. Affected files ... .. //depot/projects/arm/src/Makefile#14 edit Differences ... ==== //depot/projects/arm/src/Makefile#14 (text+ko) ==== @@ -1,3 +1,4 @@ +#OSX hint: bsdmake BSDMKAE=bsdmake MACHINE_ARCH=i386 # # $FreeBSD: src/Makefile,v 1.342 2007/10/18 08:41:52 delphij Exp $ # From owner-p4-projects@FreeBSD.ORG Tue Dec 11 07:50:54 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E80A116A419; Tue, 11 Dec 2007 07:50:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 830F516A418 for ; Tue, 11 Dec 2007 07:50:53 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4045D13C467 for ; Tue, 11 Dec 2007 07:50:53 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBB7orAi051714 for ; Tue, 11 Dec 2007 07:50:53 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBB7orbe051711 for perforce@freebsd.org; Tue, 11 Dec 2007 07:50:53 GMT (envelope-from imp@freebsd.org) Date: Tue, 11 Dec 2007 07:50:53 GMT Message-Id: <200712110750.lBB7orbe051711@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 130622 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Dec 2007 07:50:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=130622 Change 130622 by imp@imp_paco-paco on 2007/12/11 07:50:42 Only enforce the legacy stuff if we're building on FreeBSD. Affected files ... .. //depot/projects/arm/src/Makefile.inc1#31 edit Differences ... ==== //depot/projects/arm/src/Makefile.inc1#31 (text+ko) ==== @@ -811,11 +811,12 @@ # to attempt to manually finish it. If in doubt, 'make world' again. # +UNAME_SYSTEM!= uname # # legacy: Build compatibility shims for the next three targets # legacy: -.if ${BOOTSTRAPPING} < 503000 +.if ${BOOTSTRAPPING} < 503000 && ${UNAME_SYSTEM} == "FreeBSD" @echo "ERROR: Source upgrades from versions prior to 5.3 not supported."; \ false .endif From owner-p4-projects@FreeBSD.ORG Tue Dec 11 10:17:32 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 53F4E16A41B; Tue, 11 Dec 2007 10:17:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B1F9316A418; Tue, 11 Dec 2007 10:17:31 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.freebsd.org (Postfix) with ESMTP id 9464B13C457; Tue, 11 Dec 2007 10:17:31 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from fledge.watson.org (fledge.watson.org [209.31.154.41]) by cyrus.watson.org (Postfix) with ESMTP id 10C3049E4A; Tue, 11 Dec 2007 05:17:31 -0500 (EST) Date: Tue, 11 Dec 2007 10:17:30 +0000 (GMT) From: Robert Watson X-X-Sender: robert@fledge.watson.org To: Warner Losh In-Reply-To: <200712110715.lBB7FCT9046928@repoman.freebsd.org> Message-ID: <20071211101708.U71658@fledge.watson.org> References: <200712110715.lBB7FCT9046928@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Perforce Change Reviews Subject: Re: PERFORCE change 130618 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Dec 2007 10:17:32 -0000 On Tue, 11 Dec 2007, Warner Losh wrote: > http://perforce.freebsd.org/chv.cgi?CH=130618 > > Change 130618 by imp@imp_mbp on 2007/12/11 07:14:48 > > Darwin doesn't like it when you try to setrlimit NOFILE, so > ignore the error in that case. This is lame, and I'm not sure > what the right fix for this is. > > # Now we get to the version check in legacy before we barf-o-rama FYI, you can always take a look at the Darwin source for most UNIXesque tools, including their variations on GNU and BSD makes. Robert N M Watson Computer Laboratory University of Cambridge > > Affected files ... > > .. //depot/projects/arm/src/usr.bin/make/main.c#5 edit > > Differences ... > > ==== //depot/projects/arm/src/usr.bin/make/main.c#5 (text+ko) ==== > > @@ -901,7 +901,9 @@ > > #ifdef RLIMIT_NOFILE > /* > - * get rid of resource limit on file descriptors > + * get rid of resource limit on file descriptors, but don't > + * fail if we can't because OS X has this define, but we get > + * EINVAL when we try to set it. > */ > { > struct rlimit rl; > @@ -909,9 +911,7 @@ > err(2, "getrlimit"); > } > rl.rlim_cur = rl.rlim_max; > - if (setrlimit(RLIMIT_NOFILE, &rl) == -1) { > - err(2, "setrlimit"); > - } > + setrlimit(RLIMIT_NOFILE, &rl); > } > #endif > > From owner-p4-projects@FreeBSD.ORG Tue Dec 11 17:11:41 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7301416A420; Tue, 11 Dec 2007 17:11:41 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C920116A419; Tue, 11 Dec 2007 17:11:40 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id 989C013C45D; Tue, 11 Dec 2007 17:11:40 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.14.1/8.14.1) with ESMTP id lBBH8r1D052985; Tue, 11 Dec 2007 10:08:53 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Tue, 11 Dec 2007 10:09:31 -0700 (MST) Message-Id: <20071211.100931.-1149476179.imp@bsdimp.com> To: rwatson@FreeBSD.org From: "M. Warner Losh" In-Reply-To: <20071211101708.U71658@fledge.watson.org> References: <200712110715.lBB7FCT9046928@repoman.freebsd.org> <20071211101708.U71658@fledge.watson.org> X-Mailer: Mew version 5.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: perforce@FreeBSD.org Subject: Re: PERFORCE change 130618 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Dec 2007 17:11:41 -0000 In message: <20071211101708.U71658@fledge.watson.org> Robert Watson writes: : : On Tue, 11 Dec 2007, Warner Losh wrote: : : > http://perforce.freebsd.org/chv.cgi?CH=130618 : > : > Change 130618 by imp@imp_mbp on 2007/12/11 07:14:48 : > : > Darwin doesn't like it when you try to setrlimit NOFILE, so : > ignore the error in that case. This is lame, and I'm not sure : > what the right fix for this is. : > : > # Now we get to the version check in legacy before we barf-o-rama : : FYI, you can always take a look at the Darwin source for most UNIXesque tools, : including their variations on GNU and BSD makes. Cool. There's a bug on Darwin that both our make and their bsdmake have. MACHINE_ARCH is always unknown. I'll fix that in our sources and go take a look at Darwin. Warner : Robert N M Watson : Computer Laboratory : University of Cambridge : : > : > Affected files ... : > : > .. //depot/projects/arm/src/usr.bin/make/main.c#5 edit : > : > Differences ... : > : > ==== //depot/projects/arm/src/usr.bin/make/main.c#5 (text+ko) ==== : > : > @@ -901,7 +901,9 @@ : > : > #ifdef RLIMIT_NOFILE : > /* : > - * get rid of resource limit on file descriptors : > + * get rid of resource limit on file descriptors, but don't : > + * fail if we can't because OS X has this define, but we get : > + * EINVAL when we try to set it. : > */ : > { : > struct rlimit rl; : > @@ -909,9 +911,7 @@ : > err(2, "getrlimit"); : > } : > rl.rlim_cur = rl.rlim_max; : > - if (setrlimit(RLIMIT_NOFILE, &rl) == -1) { : > - err(2, "setrlimit"); : > - } : > + setrlimit(RLIMIT_NOFILE, &rl); : > } : > #endif : > : > : From owner-p4-projects@FreeBSD.ORG Tue Dec 11 21:56:08 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E89916A41B; Tue, 11 Dec 2007 21:56:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D482116A41A for ; Tue, 11 Dec 2007 21:56:07 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B8EF313C461 for ; Tue, 11 Dec 2007 21:56:07 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBBLu7GZ007408 for ; Tue, 11 Dec 2007 21:56:07 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBBLu76i007405 for perforce@freebsd.org; Tue, 11 Dec 2007 21:56:07 GMT (envelope-from imp@freebsd.org) Date: Tue, 11 Dec 2007 21:56:07 GMT Message-Id: <200712112156.lBBLu76i007405@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 130642 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Dec 2007 21:56:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=130642 Change 130642 by imp@imp_paco-paco on 2007/12/11 21:56:04 For now, don't biuld libkse on mips. Affected files ... .. //depot/projects/mips2/src/lib/Makefile#8 edit Differences ... ==== //depot/projects/mips2/src/lib/Makefile#8 (text+ko) ==== @@ -100,7 +100,7 @@ _libsmb= libsmb .endif -.if ${MK_LIBKSE} != "no" +.if ${MK_LIBKSE} != "no" && ${MACHINE_ARCH} != "mips" _libkse= libkse .endif From owner-p4-projects@FreeBSD.ORG Tue Dec 11 23:31:54 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D753F16A41A; Tue, 11 Dec 2007 23:31:53 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 60FDF16A417 for ; Tue, 11 Dec 2007 23:31:53 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5DC7C13C43E for ; Tue, 11 Dec 2007 23:31:53 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBBNVrAJ026185 for ; Tue, 11 Dec 2007 23:31:53 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBBNVr6X026180 for perforce@freebsd.org; Tue, 11 Dec 2007 23:31:53 GMT (envelope-from gonzo@FreeBSD.org) Date: Tue, 11 Dec 2007 23:31:53 GMT Message-Id: <200712112331.lBBNVr6X026180@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 130651 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Dec 2007 23:31:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=130651 Change 130651 by gonzo@gonzo_jeeves on 2007/12/11 23:31:33 o Since gcc with -O does not bother to store ra on stack for breakpoint() use initial RA value from thread PCB. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/db_trace.c#6 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/db_trace.c#6 (text+ko) ==== @@ -42,7 +42,8 @@ #include #include -void db_stack_trace_cmd(db_expr_t pc_addr, db_expr_t sp, db_expr_t count); +void db_stack_trace_cmd(db_expr_t pc_addr, db_expr_t ra, db_expr_t sp, + db_expr_t count); void db_print_backtrace(void); struct db_variable db_regs[] = { @@ -112,7 +113,8 @@ * this implementation is good enough for practical use. */ void -db_stack_trace_cmd(db_expr_t pc_addr, db_expr_t sp_addr, db_expr_t count) +db_stack_trace_cmd(db_expr_t pc_addr, db_expr_t ra_addr, db_expr_t sp_addr, + db_expr_t count) { u_register_t sp, ra = 0, pc, i, stacksize, func; short ra_stack_pos = 0; @@ -123,7 +125,10 @@ sp = sp_addr; pc = pc_addr; + ra = ra_addr; + ra -= 2 * sizeof(insn); + for (;;) { func = 0; stacksize = 0; @@ -233,15 +238,15 @@ int db_trace_thread(struct thread *thr, int count) { - u_register_t pc; - u_register_t sp; + u_register_t pc, ra, sp; struct pcb *ctx; ctx = kdb_thr_ctx(thr); pc = ctx->pcb_regs[PCB_REG_PC]; sp = ctx->pcb_regs[PCB_REG_SP]; + ra = ctx->pcb_regs[PCB_REG_RA]; - db_stack_trace_cmd(pc, sp, -1); + db_stack_trace_cmd(pc, ra, sp, -1); return (0); } From owner-p4-projects@FreeBSD.ORG Tue Dec 11 23:50:46 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D2EDF16A469; Tue, 11 Dec 2007 23:50:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3E6FD16A41B for ; Tue, 11 Dec 2007 23:50:45 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7445F13C478 for ; Tue, 11 Dec 2007 23:50:44 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBBNog2p028445 for ; Tue, 11 Dec 2007 23:50:42 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBBNof5L028432 for perforce@freebsd.org; Tue, 11 Dec 2007 23:50:41 GMT (envelope-from julian@freebsd.org) Date: Tue, 11 Dec 2007 23:50:41 GMT Message-Id: <200712112350.lBBNof5L028432@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 130652 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Dec 2007 23:50:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=130652 Change 130652 by julian@julian_trafmon1-6 on 2007/12/11 23:50:34 branch for arp rewriting Affected files ... .. //depot/projects/arp-v2/src/COPYRIGHT#1 branch .. //depot/projects/arp-v2/src/LOCKS#1 branch .. //depot/projects/arp-v2/src/MAINTAINERS#1 branch .. //depot/projects/arp-v2/src/Makefile#1 branch .. //depot/projects/arp-v2/src/Makefile.inc1#1 branch .. //depot/projects/arp-v2/src/ObsoleteFiles.inc#1 branch .. //depot/projects/arp-v2/src/README#1 branch .. //depot/projects/arp-v2/src/UPDATING#1 branch .. //depot/projects/arp-v2/src/bin/Makefile#1 branch .. //depot/projects/arp-v2/src/bin/Makefile.inc#1 branch .. //depot/projects/arp-v2/src/bin/cat/Makefile#1 branch .. //depot/projects/arp-v2/src/bin/cat/cat.1#1 branch .. //depot/projects/arp-v2/src/bin/cat/cat.c#1 branch .. //depot/projects/arp-v2/src/bin/chflags/Makefile#1 branch .. //depot/projects/arp-v2/src/bin/chflags/chflags.1#1 branch .. //depot/projects/arp-v2/src/bin/chflags/chflags.c#1 branch .. //depot/projects/arp-v2/src/bin/chio/Makefile#1 branch .. //depot/projects/arp-v2/src/bin/chio/chio.1#1 branch .. //depot/projects/arp-v2/src/bin/chio/chio.c#1 branch .. //depot/projects/arp-v2/src/bin/chio/defs.h#1 branch .. //depot/projects/arp-v2/src/bin/chio/pathnames.h#1 branch .. //depot/projects/arp-v2/src/bin/chmod/Makefile#1 branch .. //depot/projects/arp-v2/src/bin/chmod/chmod.1#1 branch .. //depot/projects/arp-v2/src/bin/chmod/chmod.c#1 branch .. //depot/projects/arp-v2/src/bin/cp/Makefile#1 branch .. //depot/projects/arp-v2/src/bin/cp/cp.1#1 branch .. //depot/projects/arp-v2/src/bin/cp/cp.c#1 branch .. //depot/projects/arp-v2/src/bin/cp/extern.h#1 branch .. //depot/projects/arp-v2/src/bin/cp/utils.c#1 branch .. //depot/projects/arp-v2/src/bin/csh/Makefile#1 branch .. //depot/projects/arp-v2/src/bin/csh/USD.doc/csh.1#1 branch .. //depot/projects/arp-v2/src/bin/csh/USD.doc/csh.2#1 branch .. //depot/projects/arp-v2/src/bin/csh/USD.doc/csh.3#1 branch .. //depot/projects/arp-v2/src/bin/csh/USD.doc/csh.4#1 branch .. //depot/projects/arp-v2/src/bin/csh/USD.doc/csh.a#1 branch .. //depot/projects/arp-v2/src/bin/csh/USD.doc/csh.g#1 branch .. //depot/projects/arp-v2/src/bin/csh/USD.doc/tabs#1 branch .. //depot/projects/arp-v2/src/bin/csh/config.h#1 branch .. //depot/projects/arp-v2/src/bin/csh/config_p.h#1 branch .. //depot/projects/arp-v2/src/bin/csh/host.defs#1 branch .. //depot/projects/arp-v2/src/bin/csh/iconv.h#1 branch .. //depot/projects/arp-v2/src/bin/csh/iconv_stub.c#1 branch .. //depot/projects/arp-v2/src/bin/date/Makefile#1 branch .. //depot/projects/arp-v2/src/bin/date/date.1#1 branch .. //depot/projects/arp-v2/src/bin/date/date.c#1 branch .. //depot/projects/arp-v2/src/bin/date/extern.h#1 branch .. //depot/projects/arp-v2/src/bin/date/netdate.c#1 branch .. //depot/projects/arp-v2/src/bin/date/vary.c#1 branch .. //depot/projects/arp-v2/src/bin/date/vary.h#1 branch .. //depot/projects/arp-v2/src/bin/dd/Makefile#1 branch .. //depot/projects/arp-v2/src/bin/dd/args.c#1 branch .. //depot/projects/arp-v2/src/bin/dd/conv.c#1 branch .. //depot/projects/arp-v2/src/bin/dd/conv_tab.c#1 branch .. //depot/projects/arp-v2/src/bin/dd/dd.1#1 branch .. //depot/projects/arp-v2/src/bin/dd/dd.c#1 branch .. //depot/projects/arp-v2/src/bin/dd/dd.h#1 branch .. //depot/projects/arp-v2/src/bin/dd/extern.h#1 branch .. //depot/projects/arp-v2/src/bin/dd/gen.c#1 branch .. //depot/projects/arp-v2/src/bin/dd/misc.c#1 branch .. //depot/projects/arp-v2/src/bin/dd/position.c#1 branch .. //depot/projects/arp-v2/src/bin/dd/ref.ascii#1 branch .. //depot/projects/arp-v2/src/bin/dd/ref.ebcdic#1 branch .. //depot/projects/arp-v2/src/bin/dd/ref.ibm#1 branch .. //depot/projects/arp-v2/src/bin/dd/ref.lcase#1 branch .. //depot/projects/arp-v2/src/bin/dd/ref.oldascii#1 branch .. //depot/projects/arp-v2/src/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/arp-v2/src/bin/dd/ref.oldibm#1 branch .. //depot/projects/arp-v2/src/bin/dd/ref.pareven#1 branch .. //depot/projects/arp-v2/src/bin/dd/ref.parnone#1 branch .. //depot/projects/arp-v2/src/bin/dd/ref.parodd#1 branch .. //depot/projects/arp-v2/src/bin/dd/ref.parset#1 branch .. //depot/projects/arp-v2/src/bin/dd/ref.swab#1 branch .. //depot/projects/arp-v2/src/bin/dd/ref.ucase#1 branch .. //depot/projects/arp-v2/src/bin/df/Makefile#1 branch .. //depot/projects/arp-v2/src/bin/df/df.1#1 branch .. //depot/projects/arp-v2/src/bin/df/df.c#1 branch .. //depot/projects/arp-v2/src/bin/domainname/Makefile#1 branch .. //depot/projects/arp-v2/src/bin/domainname/domainname.1#1 branch .. //depot/projects/arp-v2/src/bin/domainname/domainname.c#1 branch .. //depot/projects/arp-v2/src/bin/echo/Makefile#1 branch .. //depot/projects/arp-v2/src/bin/echo/echo.1#1 branch .. //depot/projects/arp-v2/src/bin/echo/echo.c#1 branch .. //depot/projects/arp-v2/src/bin/ed/Makefile#1 branch .. //depot/projects/arp-v2/src/bin/ed/POSIX#1 branch .. //depot/projects/arp-v2/src/bin/ed/README#1 branch .. //depot/projects/arp-v2/src/bin/ed/buf.c#1 branch .. //depot/projects/arp-v2/src/bin/ed/cbc.c#1 branch .. //depot/projects/arp-v2/src/bin/ed/ed.1#1 branch .. //depot/projects/arp-v2/src/bin/ed/ed.h#1 branch .. //depot/projects/arp-v2/src/bin/ed/glbl.c#1 branch .. //depot/projects/arp-v2/src/bin/ed/io.c#1 branch .. //depot/projects/arp-v2/src/bin/ed/main.c#1 branch .. //depot/projects/arp-v2/src/bin/ed/re.c#1 branch .. //depot/projects/arp-v2/src/bin/ed/sub.c#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/=.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/Makefile#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/README#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/TODO#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/a.d#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/a.r#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/a.t#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/a1.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/a2.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/addr.d#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/addr.r#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/addr.t#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/addr1.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/addr2.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/ascii.d.uu#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/ascii.r.uu#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/ascii.t#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/bang1.d#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/bang1.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/bang1.r#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/bang1.t#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/bang2.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/c.d#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/c.r#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/c.t#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/c1.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/c2.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/ckscripts.sh#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/d.d#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/d.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/d.r#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/d.t#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/e1.d#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/e1.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/e1.r#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/e1.t#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/e2.d#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/e2.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/e2.r#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/e2.t#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/e3.d#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/e3.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/e3.r#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/e3.t#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/e4.d#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/e4.r#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/e4.t#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/f1.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/f2.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/g1.d#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/g1.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/g1.r#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/g1.t#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/g2.d#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/g2.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/g2.r#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/g2.t#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/g3.d#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/g3.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/g3.r#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/g3.t#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/g4.d#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/g4.r#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/g4.t#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/g5.d#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/g5.r#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/g5.t#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/h.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/i.d#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/i.r#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/i.t#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/i1.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/i2.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/i3.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/j.d#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/j.r#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/j.t#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/k.d#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/k.r#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/k.t#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/k1.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/k2.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/k3.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/k4.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/l.d#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/l.r#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/l.t#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/m.d#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/m.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/m.r#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/m.t#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/mkscripts.sh#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/n.d#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/n.r#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/n.t#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/nl.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/nl1.d#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/nl1.r#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/nl1.t#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/nl2.d#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/nl2.r#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/nl2.t#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/p.d#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/p.r#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/p.t#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/q.d#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/q.r#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/q.t#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/q1.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/r1.d#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/r1.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/r1.r#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/r1.t#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/r2.d#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/r2.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/r2.r#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/r2.t#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/r3.d#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/r3.r#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/r3.t#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/s1.d#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/s1.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/s1.r#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/s1.t#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/s10.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/s2.d#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/s2.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/s2.r#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/s2.t#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/s3.d#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/s3.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/s3.r#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/s3.t#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/s4.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/s5.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/s6.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/s7.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/s8.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/s9.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/t.d#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/t.r#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/t1.d#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/t1.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/t1.r#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/t1.t#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/t2.d#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/t2.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/t2.r#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/t2.t#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/u.d#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/u.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/u.r#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/u.t#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/v.d#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/v.r#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/v.t#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/w.d#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/w.r#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/w.t#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/w1.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/w2.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/w3.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/x.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/test/z.err#1 branch .. //depot/projects/arp-v2/src/bin/ed/undo.c#1 branch .. //depot/projects/arp-v2/src/bin/expr/Makefile#1 branch .. //depot/projects/arp-v2/src/bin/expr/expr.1#1 branch .. //depot/projects/arp-v2/src/bin/expr/expr.y#1 branch .. //depot/projects/arp-v2/src/bin/getfacl/Makefile#1 branch .. //depot/projects/arp-v2/src/bin/getfacl/getfacl.1#1 branch .. //depot/projects/arp-v2/src/bin/getfacl/getfacl.c#1 branch .. //depot/projects/arp-v2/src/bin/hostname/Makefile#1 branch .. //depot/projects/arp-v2/src/bin/hostname/hostname.1#1 branch .. //depot/projects/arp-v2/src/bin/hostname/hostname.c#1 branch .. //depot/projects/arp-v2/src/bin/kenv/Makefile#1 branch .. //depot/projects/arp-v2/src/bin/kenv/kenv.1#1 branch .. //depot/projects/arp-v2/src/bin/kenv/kenv.c#1 branch .. //depot/projects/arp-v2/src/bin/kill/Makefile#1 branch .. //depot/projects/arp-v2/src/bin/kill/kill.1#1 branch .. //depot/projects/arp-v2/src/bin/kill/kill.c#1 branch .. //depot/projects/arp-v2/src/bin/ln/Makefile#1 branch .. //depot/projects/arp-v2/src/bin/ln/ln.1#1 branch .. //depot/projects/arp-v2/src/bin/ln/ln.c#1 branch .. //depot/projects/arp-v2/src/bin/ln/symlink.7#1 branch .. //depot/projects/arp-v2/src/bin/ls/Makefile#1 branch .. //depot/projects/arp-v2/src/bin/ls/cmp.c#1 branch .. //depot/projects/arp-v2/src/bin/ls/extern.h#1 branch .. //depot/projects/arp-v2/src/bin/ls/ls.1#1 branch .. //depot/projects/arp-v2/src/bin/ls/ls.c#1 branch .. //depot/projects/arp-v2/src/bin/ls/ls.h#1 branch .. //depot/projects/arp-v2/src/bin/ls/print.c#1 branch .. //depot/projects/arp-v2/src/bin/ls/util.c#1 branch .. //depot/projects/arp-v2/src/bin/mkdir/Makefile#1 branch .. //depot/projects/arp-v2/src/bin/mkdir/mkdir.1#1 branch .. //depot/projects/arp-v2/src/bin/mkdir/mkdir.c#1 branch .. //depot/projects/arp-v2/src/bin/mv/Makefile#1 branch .. //depot/projects/arp-v2/src/bin/mv/mv.1#1 branch .. //depot/projects/arp-v2/src/bin/mv/mv.c#1 branch .. //depot/projects/arp-v2/src/bin/pax/Makefile#1 branch .. //depot/projects/arp-v2/src/bin/pax/ar_io.c#1 branch .. //depot/projects/arp-v2/src/bin/pax/ar_subs.c#1 branch .. //depot/projects/arp-v2/src/bin/pax/buf_subs.c#1 branch .. //depot/projects/arp-v2/src/bin/pax/cache.c#1 branch .. //depot/projects/arp-v2/src/bin/pax/cache.h#1 branch .. //depot/projects/arp-v2/src/bin/pax/cpio.1#1 branch .. //depot/projects/arp-v2/src/bin/pax/cpio.c#1 branch .. //depot/projects/arp-v2/src/bin/pax/cpio.h#1 branch .. //depot/projects/arp-v2/src/bin/pax/extern.h#1 branch .. //depot/projects/arp-v2/src/bin/pax/file_subs.c#1 branch .. //depot/projects/arp-v2/src/bin/pax/ftree.c#1 branch .. //depot/projects/arp-v2/src/bin/pax/ftree.h#1 branch .. //depot/projects/arp-v2/src/bin/pax/gen_subs.c#1 branch .. //depot/projects/arp-v2/src/bin/pax/getoldopt.c#1 branch .. //depot/projects/arp-v2/src/bin/pax/options.c#1 branch .. //depot/projects/arp-v2/src/bin/pax/options.h#1 branch .. //depot/projects/arp-v2/src/bin/pax/pat_rep.c#1 branch .. //depot/projects/arp-v2/src/bin/pax/pat_rep.h#1 branch .. //depot/projects/arp-v2/src/bin/pax/pax.1#1 branch .. //depot/projects/arp-v2/src/bin/pax/pax.c#1 branch .. //depot/projects/arp-v2/src/bin/pax/pax.h#1 branch .. //depot/projects/arp-v2/src/bin/pax/sel_subs.c#1 branch .. //depot/projects/arp-v2/src/bin/pax/sel_subs.h#1 branch .. //depot/projects/arp-v2/src/bin/pax/tables.c#1 branch .. //depot/projects/arp-v2/src/bin/pax/tables.h#1 branch .. //depot/projects/arp-v2/src/bin/pax/tar.1#1 branch .. //depot/projects/arp-v2/src/bin/pax/tar.c#1 branch .. //depot/projects/arp-v2/src/bin/pax/tar.h#1 branch .. //depot/projects/arp-v2/src/bin/pax/tty_subs.c#1 branch .. //depot/projects/arp-v2/src/bin/ps/Makefile#1 branch .. //depot/projects/arp-v2/src/bin/ps/extern.h#1 branch .. //depot/projects/arp-v2/src/bin/ps/fmt.c#1 branch .. //depot/projects/arp-v2/src/bin/ps/keyword.c#1 branch .. //depot/projects/arp-v2/src/bin/ps/nlist.c#1 branch .. //depot/projects/arp-v2/src/bin/ps/print.c#1 branch .. //depot/projects/arp-v2/src/bin/ps/ps.1#1 branch .. //depot/projects/arp-v2/src/bin/ps/ps.c#1 branch .. //depot/projects/arp-v2/src/bin/ps/ps.h#1 branch .. //depot/projects/arp-v2/src/bin/pwd/Makefile#1 branch .. //depot/projects/arp-v2/src/bin/pwd/pwd.1#1 branch .. //depot/projects/arp-v2/src/bin/pwd/pwd.c#1 branch .. //depot/projects/arp-v2/src/bin/rcp/Makefile#1 branch .. //depot/projects/arp-v2/src/bin/rcp/extern.h#1 branch .. //depot/projects/arp-v2/src/bin/rcp/rcp.1#1 branch .. //depot/projects/arp-v2/src/bin/rcp/rcp.c#1 branch .. //depot/projects/arp-v2/src/bin/rcp/util.c#1 branch .. //depot/projects/arp-v2/src/bin/realpath/Makefile#1 branch .. //depot/projects/arp-v2/src/bin/realpath/realpath.1#1 branch .. //depot/projects/arp-v2/src/bin/realpath/realpath.c#1 branch .. //depot/projects/arp-v2/src/bin/rm/Makefile#1 branch .. //depot/projects/arp-v2/src/bin/rm/rm.1#1 branch .. //depot/projects/arp-v2/src/bin/rm/rm.c#1 branch .. //depot/projects/arp-v2/src/bin/rmail/Makefile#1 branch .. //depot/projects/arp-v2/src/bin/rmdir/Makefile#1 branch .. //depot/projects/arp-v2/src/bin/rmdir/rmdir.1#1 branch .. //depot/projects/arp-v2/src/bin/rmdir/rmdir.c#1 branch .. //depot/projects/arp-v2/src/bin/setfacl/Makefile#1 branch .. //depot/projects/arp-v2/src/bin/setfacl/file.c#1 branch .. //depot/projects/arp-v2/src/bin/setfacl/mask.c#1 branch .. //depot/projects/arp-v2/src/bin/setfacl/merge.c#1 branch .. //depot/projects/arp-v2/src/bin/setfacl/remove.c#1 branch .. //depot/projects/arp-v2/src/bin/setfacl/setfacl.1#1 branch .. //depot/projects/arp-v2/src/bin/setfacl/setfacl.c#1 branch .. //depot/projects/arp-v2/src/bin/setfacl/setfacl.h#1 branch .. //depot/projects/arp-v2/src/bin/setfacl/util.c#1 branch .. //depot/projects/arp-v2/src/bin/sh/Makefile#1 branch .. //depot/projects/arp-v2/src/bin/sh/TOUR#1 branch .. //depot/projects/arp-v2/src/bin/sh/alias.c#1 branch .. //depot/projects/arp-v2/src/bin/sh/alias.h#1 branch .. //depot/projects/arp-v2/src/bin/sh/arith.h#1 branch .. //depot/projects/arp-v2/src/bin/sh/arith.y#1 branch .. //depot/projects/arp-v2/src/bin/sh/arith_lex.l#1 branch .. //depot/projects/arp-v2/src/bin/sh/bltin/bltin.h#1 branch .. //depot/projects/arp-v2/src/bin/sh/bltin/echo.1#1 branch .. //depot/projects/arp-v2/src/bin/sh/bltin/echo.c#1 branch .. //depot/projects/arp-v2/src/bin/sh/builtins.def#1 branch .. //depot/projects/arp-v2/src/bin/sh/cd.c#1 branch .. //depot/projects/arp-v2/src/bin/sh/cd.h#1 branch .. //depot/projects/arp-v2/src/bin/sh/error.c#1 branch .. //depot/projects/arp-v2/src/bin/sh/error.h#1 branch .. //depot/projects/arp-v2/src/bin/sh/eval.c#1 branch .. //depot/projects/arp-v2/src/bin/sh/eval.h#1 branch .. //depot/projects/arp-v2/src/bin/sh/exec.c#1 branch .. //depot/projects/arp-v2/src/bin/sh/exec.h#1 branch .. //depot/projects/arp-v2/src/bin/sh/expand.c#1 branch .. //depot/projects/arp-v2/src/bin/sh/expand.h#1 branch .. //depot/projects/arp-v2/src/bin/sh/funcs/cmv#1 branch .. //depot/projects/arp-v2/src/bin/sh/funcs/dirs#1 branch .. //depot/projects/arp-v2/src/bin/sh/funcs/kill#1 branch .. //depot/projects/arp-v2/src/bin/sh/funcs/login#1 branch .. //depot/projects/arp-v2/src/bin/sh/funcs/newgrp#1 branch .. //depot/projects/arp-v2/src/bin/sh/funcs/popd#1 branch .. //depot/projects/arp-v2/src/bin/sh/funcs/pushd#1 branch .. //depot/projects/arp-v2/src/bin/sh/funcs/suspend#1 branch .. //depot/projects/arp-v2/src/bin/sh/histedit.c#1 branch .. //depot/projects/arp-v2/src/bin/sh/init.h#1 branch .. //depot/projects/arp-v2/src/bin/sh/input.c#1 branch .. //depot/projects/arp-v2/src/bin/sh/input.h#1 branch .. //depot/projects/arp-v2/src/bin/sh/jobs.c#1 branch .. //depot/projects/arp-v2/src/bin/sh/jobs.h#1 branch .. //depot/projects/arp-v2/src/bin/sh/mail.c#1 branch .. //depot/projects/arp-v2/src/bin/sh/mail.h#1 branch .. //depot/projects/arp-v2/src/bin/sh/main.c#1 branch .. //depot/projects/arp-v2/src/bin/sh/main.h#1 branch .. //depot/projects/arp-v2/src/bin/sh/memalloc.c#1 branch .. //depot/projects/arp-v2/src/bin/sh/memalloc.h#1 branch .. //depot/projects/arp-v2/src/bin/sh/miscbltin.c#1 branch .. //depot/projects/arp-v2/src/bin/sh/mkbuiltins#1 branch .. //depot/projects/arp-v2/src/bin/sh/mkinit.c#1 branch .. //depot/projects/arp-v2/src/bin/sh/mknodes.c#1 branch .. //depot/projects/arp-v2/src/bin/sh/mksyntax.c#1 branch .. //depot/projects/arp-v2/src/bin/sh/mktokens#1 branch .. //depot/projects/arp-v2/src/bin/sh/myhistedit.h#1 branch .. //depot/projects/arp-v2/src/bin/sh/mystring.c#1 branch .. //depot/projects/arp-v2/src/bin/sh/mystring.h#1 branch .. //depot/projects/arp-v2/src/bin/sh/nodes.c.pat#1 branch .. //depot/projects/arp-v2/src/bin/sh/nodetypes#1 branch .. //depot/projects/arp-v2/src/bin/sh/options.c#1 branch .. //depot/projects/arp-v2/src/bin/sh/options.h#1 branch .. //depot/projects/arp-v2/src/bin/sh/output.c#1 branch .. //depot/projects/arp-v2/src/bin/sh/output.h#1 branch .. //depot/projects/arp-v2/src/bin/sh/parser.c#1 branch .. //depot/projects/arp-v2/src/bin/sh/parser.h#1 branch .. //depot/projects/arp-v2/src/bin/sh/redir.c#1 branch .. //depot/projects/arp-v2/src/bin/sh/redir.h#1 branch .. //depot/projects/arp-v2/src/bin/sh/sh.1#1 branch .. //depot/projects/arp-v2/src/bin/sh/shell.h#1 branch .. //depot/projects/arp-v2/src/bin/sh/show.c#1 branch .. //depot/projects/arp-v2/src/bin/sh/show.h#1 branch .. //depot/projects/arp-v2/src/bin/sh/trap.c#1 branch .. //depot/projects/arp-v2/src/bin/sh/trap.h#1 branch .. //depot/projects/arp-v2/src/bin/sh/var.c#1 branch .. //depot/projects/arp-v2/src/bin/sh/var.h#1 branch .. //depot/projects/arp-v2/src/bin/sleep/Makefile#1 branch .. //depot/projects/arp-v2/src/bin/sleep/sleep.1#1 branch .. //depot/projects/arp-v2/src/bin/sleep/sleep.c#1 branch .. //depot/projects/arp-v2/src/bin/stty/Makefile#1 branch .. //depot/projects/arp-v2/src/bin/stty/cchar.c#1 branch .. //depot/projects/arp-v2/src/bin/stty/extern.h#1 branch .. //depot/projects/arp-v2/src/bin/stty/gfmt.c#1 branch .. //depot/projects/arp-v2/src/bin/stty/key.c#1 branch .. //depot/projects/arp-v2/src/bin/stty/modes.c#1 branch .. //depot/projects/arp-v2/src/bin/stty/print.c#1 branch .. //depot/projects/arp-v2/src/bin/stty/stty.1#1 branch .. //depot/projects/arp-v2/src/bin/stty/stty.c#1 branch .. //depot/projects/arp-v2/src/bin/stty/stty.h#1 branch .. //depot/projects/arp-v2/src/bin/stty/util.c#1 branch .. //depot/projects/arp-v2/src/bin/sync/Makefile#1 branch .. //depot/projects/arp-v2/src/bin/sync/sync.8#1 branch .. //depot/projects/arp-v2/src/bin/sync/sync.c#1 branch .. //depot/projects/arp-v2/src/bin/test/Makefile#1 branch .. //depot/projects/arp-v2/src/bin/test/TEST.README#1 branch .. //depot/projects/arp-v2/src/bin/test/TEST.csh#1 branch .. //depot/projects/arp-v2/src/bin/test/TEST.sh#1 branch .. //depot/projects/arp-v2/src/bin/test/test.1#1 branch .. //depot/projects/arp-v2/src/bin/test/test.c#1 branch .. //depot/projects/arp-v2/src/cddl/Makefile#1 branch .. //depot/projects/arp-v2/src/cddl/Makefile.inc#1 branch .. //depot/projects/arp-v2/src/cddl/lib/Makefile#1 branch .. //depot/projects/arp-v2/src/cddl/lib/Makefile.inc#1 branch .. //depot/projects/arp-v2/src/cddl/lib/libavl/Makefile#1 branch .. //depot/projects/arp-v2/src/cddl/lib/libnvpair/Makefile#1 branch .. //depot/projects/arp-v2/src/cddl/lib/libumem/Makefile#1 branch .. //depot/projects/arp-v2/src/cddl/lib/libuutil/Makefile#1 branch .. //depot/projects/arp-v2/src/cddl/lib/libzfs/Makefile#1 branch .. //depot/projects/arp-v2/src/cddl/lib/libzpool/Makefile#1 branch .. //depot/projects/arp-v2/src/cddl/sbin/Makefile#1 branch .. //depot/projects/arp-v2/src/cddl/sbin/Makefile.inc#1 branch .. //depot/projects/arp-v2/src/cddl/sbin/zfs/Makefile#1 branch .. //depot/projects/arp-v2/src/cddl/sbin/zpool/Makefile#1 branch .. //depot/projects/arp-v2/src/cddl/usr.bin/Makefile#1 branch .. //depot/projects/arp-v2/src/cddl/usr.bin/Makefile.inc#1 branch .. //depot/projects/arp-v2/src/cddl/usr.bin/ztest/Makefile#1 branch .. //depot/projects/arp-v2/src/cddl/usr.sbin/Makefile#1 branch .. //depot/projects/arp-v2/src/cddl/usr.sbin/Makefile.inc#1 branch .. //depot/projects/arp-v2/src/cddl/usr.sbin/zdb/Makefile#1 branch .. //depot/projects/arp-v2/src/compat/opensolaris/include/alloca.h#1 branch .. //depot/projects/arp-v2/src/compat/opensolaris/include/devid.h#1 branch .. //depot/projects/arp-v2/src/compat/opensolaris/include/fcntl.h#1 branch .. //depot/projects/arp-v2/src/compat/opensolaris/include/fsshare.h#1 branch .. //depot/projects/arp-v2/src/compat/opensolaris/include/libintl.h#1 branch .. //depot/projects/arp-v2/src/compat/opensolaris/include/mnttab.h#1 branch .. //depot/projects/arp-v2/src/compat/opensolaris/include/priv.h#1 branch .. //depot/projects/arp-v2/src/compat/opensolaris/include/solaris.h#1 branch .. //depot/projects/arp-v2/src/compat/opensolaris/include/stdio.h#1 branch .. //depot/projects/arp-v2/src/compat/opensolaris/include/stdlib.h#1 branch .. //depot/projects/arp-v2/src/compat/opensolaris/include/strings.h#1 branch .. //depot/projects/arp-v2/src/compat/opensolaris/include/unistd.h#1 branch .. //depot/projects/arp-v2/src/compat/opensolaris/include/zone.h#1 branch .. //depot/projects/arp-v2/src/compat/opensolaris/lib/libumem/umem.c#1 branch .. //depot/projects/arp-v2/src/compat/opensolaris/lib/libumem/umem.h#1 branch .. //depot/projects/arp-v2/src/compat/opensolaris/misc/deviceid.c#1 branch .. //depot/projects/arp-v2/src/compat/opensolaris/misc/fsshare.c#1 branch .. //depot/projects/arp-v2/src/compat/opensolaris/misc/mkdirp.c#1 branch .. //depot/projects/arp-v2/src/compat/opensolaris/misc/mnttab.c#1 branch .. //depot/projects/arp-v2/src/compat/opensolaris/misc/zmount.c#1 branch .. //depot/projects/arp-v2/src/compat/opensolaris/misc/zone.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/AUTHORS#1 branch .. //depot/projects/arp-v2/src/contrib/amd/BUGS#1 branch .. //depot/projects/arp-v2/src/contrib/amd/COPYING#1 branch .. //depot/projects/arp-v2/src/contrib/amd/ChangeLog#1 branch .. //depot/projects/arp-v2/src/contrib/amd/FAQ#1 branch .. //depot/projects/arp-v2/src/contrib/amd/FREEBSD-Xlist#1 branch .. //depot/projects/arp-v2/src/contrib/amd/FREEBSD-upgrade#1 branch .. //depot/projects/arp-v2/src/contrib/amd/INSTALL#1 branch .. //depot/projects/arp-v2/src/contrib/amd/MIRRORS.html#1 branch .. //depot/projects/arp-v2/src/contrib/amd/MIRRORS.txt#1 branch .. //depot/projects/arp-v2/src/contrib/amd/NEWS#1 branch .. //depot/projects/arp-v2/src/contrib/amd/README#1 branch .. //depot/projects/arp-v2/src/contrib/amd/README.attrcache#1 branch .. //depot/projects/arp-v2/src/contrib/amd/README.ldap#1 branch .. //depot/projects/arp-v2/src/contrib/amd/README.y2k#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/am_ops.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/amd.8#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/amd.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/amd.h#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/amfs_auto.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/amfs_direct.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/amfs_error.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/amfs_generic.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/amfs_host.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/amfs_link.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/amfs_linkx.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/amfs_nfsl.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/amfs_nfsx.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/amfs_program.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/amfs_root.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/amfs_toplvl.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/amfs_union.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/amq_subr.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/amq_svc.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/autil.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/clock.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/conf.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/conf_parse.y#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/conf_tok.l#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/get_args.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/info_exec.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/info_file.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/info_hesiod.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/info_ldap.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/info_ndbm.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/info_nis.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/info_nisplus.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/info_passwd.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/info_union.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/map.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/mapc.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/mntfs.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/nfs_prot_svc.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/nfs_start.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/nfs_subr.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/ops_TEMPLATE.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/ops_cachefs.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/ops_cdfs.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/ops_efs.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/ops_lofs.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/ops_mfs.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/ops_nfs.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/ops_nfs3.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/ops_nullfs.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/ops_pcfs.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/ops_tfs.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/ops_tmpfs.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/ops_ufs.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/ops_umapfs.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/ops_unionfs.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/ops_xfs.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/opts.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/readdir.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/restart.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/rpc_fwd.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/sched.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/srvr_amfs_auto.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amd/srvr_nfs.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amq/amq.8#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amq/amq.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amq/amq.h#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amq/amq_clnt.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amq/amq_xdr.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amq/pawd.1#1 branch .. //depot/projects/arp-v2/src/contrib/amd/amq/pawd.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/aux_conf.h.in#1 branch .. //depot/projects/arp-v2/src/contrib/amd/bootstrap#1 branch .. //depot/projects/arp-v2/src/contrib/amd/conf/checkmount/checkmount_bsd44.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/conf/fh_dref/fh_dref_freebsd22.h#1 branch .. //depot/projects/arp-v2/src/contrib/amd/conf/mtab/mtab_bsd.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#1 branch .. //depot/projects/arp-v2/src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#1 branch .. //depot/projects/arp-v2/src/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#1 branch .. //depot/projects/arp-v2/src/contrib/amd/conf/transp/transp_sockets.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/conf/trap/trap_default.h#1 branch .. //depot/projects/arp-v2/src/contrib/amd/conf/umount/umount_bsd44.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/doc/am-utils.texi#1 branch .. //depot/projects/arp-v2/src/contrib/amd/doc/stamp-vti#1 branch .. //depot/projects/arp-v2/src/contrib/amd/doc/texinfo.tex#1 branch .. //depot/projects/arp-v2/src/contrib/amd/doc/version.texi#1 branch .. //depot/projects/arp-v2/src/contrib/amd/fixmount/fixmount.8#1 branch .. //depot/projects/arp-v2/src/contrib/amd/fixmount/fixmount.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/fsinfo/fsi_analyze.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/fsinfo/fsi_data.h#1 branch .. //depot/projects/arp-v2/src/contrib/amd/fsinfo/fsi_dict.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/fsinfo/fsi_gram.y#1 branch .. //depot/projects/arp-v2/src/contrib/amd/fsinfo/fsi_lex.l#1 branch .. //depot/projects/arp-v2/src/contrib/amd/fsinfo/fsi_util.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/fsinfo/fsinfo.8#1 branch .. //depot/projects/arp-v2/src/contrib/amd/fsinfo/fsinfo.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/fsinfo/fsinfo.h#1 branch .. //depot/projects/arp-v2/src/contrib/amd/fsinfo/wr_atab.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/fsinfo/wr_bparam.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/fsinfo/wr_dumpset.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/fsinfo/wr_exportfs.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/fsinfo/wr_fstab.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/hlfsd/hlfsd.8#1 branch .. //depot/projects/arp-v2/src/contrib/amd/hlfsd/hlfsd.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/hlfsd/hlfsd.h#1 branch .. //depot/projects/arp-v2/src/contrib/amd/hlfsd/homedir.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/hlfsd/nfs_prot_svc.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/hlfsd/stubs.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/include/am_compat.h#1 branch .. //depot/projects/arp-v2/src/contrib/amd/include/am_defs.h#1 branch .. //depot/projects/arp-v2/src/contrib/amd/include/am_utils.h#1 branch .. //depot/projects/arp-v2/src/contrib/amd/include/am_xdr_func.h#1 branch .. //depot/projects/arp-v2/src/contrib/amd/include/amq_defs.h#1 branch .. //depot/projects/arp-v2/src/contrib/amd/include/mount_headers1.h#1 branch .. //depot/projects/arp-v2/src/contrib/amd/include/mount_headers2.h#1 branch .. //depot/projects/arp-v2/src/contrib/amd/ldap-id.ms#1 branch .. //depot/projects/arp-v2/src/contrib/amd/ldap-id.txt#1 branch .. //depot/projects/arp-v2/src/contrib/amd/ldap.schema#1 branch .. //depot/projects/arp-v2/src/contrib/amd/libamu/amu.h#1 branch .. //depot/projects/arp-v2/src/contrib/amd/libamu/hasmntopt.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/libamu/misc_rpc.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/libamu/mount_fs.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/libamu/mtab.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/libamu/nfs_prot_xdr.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/libamu/strerror.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/libamu/strutil.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/libamu/wire.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/libamu/xdr_func.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/libamu/xutil.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/mk-amd-map/mk-amd-map.8#1 branch .. //depot/projects/arp-v2/src/contrib/amd/mk-amd-map/mk-amd-map.c#1 branch .. //depot/projects/arp-v2/src/contrib/amd/scripts/Makefile.am#1 branch .. //depot/projects/arp-v2/src/contrib/amd/scripts/Makefile.in#1 branch .. //depot/projects/arp-v2/src/contrib/amd/scripts/am-eject.in#1 branch .. //depot/projects/arp-v2/src/contrib/amd/scripts/amd.conf-sample#1 branch .. //depot/projects/arp-v2/src/contrib/amd/scripts/amd.conf.5#1 branch .. //depot/projects/arp-v2/src/contrib/amd/scripts/amd2ldif.in#1 branch .. //depot/projects/arp-v2/src/contrib/amd/scripts/amd2sun.in#1 branch .. //depot/projects/arp-v2/src/contrib/amd/scripts/automount2amd.8#1 branch .. //depot/projects/arp-v2/src/contrib/amd/scripts/automount2amd.in#1 branch .. //depot/projects/arp-v2/src/contrib/amd/scripts/ctl-amd.in#1 branch .. //depot/projects/arp-v2/src/contrib/amd/scripts/ctl-hlfsd.in#1 branch .. //depot/projects/arp-v2/src/contrib/amd/scripts/expn.1#1 branch .. //depot/projects/arp-v2/src/contrib/amd/scripts/expn.in#1 branch .. //depot/projects/arp-v2/src/contrib/amd/scripts/fix-amd-map.in#1 branch .. //depot/projects/arp-v2/src/contrib/amd/scripts/fixrmtab.in#1 branch .. //depot/projects/arp-v2/src/contrib/amd/scripts/redhat-ctl-amd.in#1 branch .. //depot/projects/arp-v2/src/contrib/amd/scripts/test-attrcache.in#1 branch .. //depot/projects/arp-v2/src/contrib/amd/scripts/wait4amd.in#1 branch .. //depot/projects/arp-v2/src/contrib/amd/scripts/wait4amd2die.in#1 branch .. //depot/projects/arp-v2/src/contrib/amd/tasks#1 branch .. //depot/projects/arp-v2/src/contrib/amd/vers.m4#1 branch .. //depot/projects/arp-v2/src/contrib/amd/wire-test/wire-test.8#1 branch .. //depot/projects/arp-v2/src/contrib/amd/wire-test/wire-test.c#1 branch .. //depot/projects/arp-v2/src/contrib/bc/AUTHORS#1 branch .. //depot/projects/arp-v2/src/contrib/bc/ChangeLog#1 branch .. //depot/projects/arp-v2/src/contrib/bc/Examples/ckbook.b#1 branch .. //depot/projects/arp-v2/src/contrib/bc/Examples/pi.b#1 branch .. //depot/projects/arp-v2/src/contrib/bc/Examples/primes.b#1 branch .. //depot/projects/arp-v2/src/contrib/bc/Examples/twins.b#1 branch .. //depot/projects/arp-v2/src/contrib/bc/FAQ#1 branch .. //depot/projects/arp-v2/src/contrib/bc/FREEBSD-upgrade#1 branch .. //depot/projects/arp-v2/src/contrib/bc/INSTALL#1 branch .. //depot/projects/arp-v2/src/contrib/bc/Makefile.am#1 branch .. //depot/projects/arp-v2/src/contrib/bc/Makefile.in#1 branch .. //depot/projects/arp-v2/src/contrib/bc/NEWS#1 branch .. //depot/projects/arp-v2/src/contrib/bc/README#1 branch .. //depot/projects/arp-v2/src/contrib/bc/Test/BUG.bc#1 branch .. //depot/projects/arp-v2/src/contrib/bc/Test/array.b#1 branch .. //depot/projects/arp-v2/src/contrib/bc/Test/arrayp.b#1 branch .. //depot/projects/arp-v2/src/contrib/bc/Test/aryprm.b#1 branch .. //depot/projects/arp-v2/src/contrib/bc/Test/atan.b#1 branch .. //depot/projects/arp-v2/src/contrib/bc/Test/checklib.b#1 branch .. //depot/projects/arp-v2/src/contrib/bc/Test/div.b#1 branch .. //depot/projects/arp-v2/src/contrib/bc/Test/exp.b#1 branch .. //depot/projects/arp-v2/src/contrib/bc/Test/fact.b#1 branch .. //depot/projects/arp-v2/src/contrib/bc/Test/jn.b#1 branch .. //depot/projects/arp-v2/src/contrib/bc/Test/ln.b#1 branch .. //depot/projects/arp-v2/src/contrib/bc/Test/mul.b#1 branch .. //depot/projects/arp-v2/src/contrib/bc/Test/raise.b#1 branch .. //depot/projects/arp-v2/src/contrib/bc/Test/signum#1 branch .. //depot/projects/arp-v2/src/contrib/bc/Test/sine.b#1 branch .. //depot/projects/arp-v2/src/contrib/bc/Test/sqrt.b#1 branch .. //depot/projects/arp-v2/src/contrib/bc/Test/sqrt1.b#1 branch .. //depot/projects/arp-v2/src/contrib/bc/Test/sqrt2.b#1 branch .. //depot/projects/arp-v2/src/contrib/bc/Test/testfn.b#1 branch .. //depot/projects/arp-v2/src/contrib/bc/Test/timetest#1 branch .. //depot/projects/arp-v2/src/contrib/bc/acconfig.h#1 branch .. //depot/projects/arp-v2/src/contrib/bc/aclocal.m4#1 branch .. //depot/projects/arp-v2/src/contrib/bc/bc/Makefile.am#1 branch .. //depot/projects/arp-v2/src/contrib/bc/bc/Makefile.in#1 branch .. //depot/projects/arp-v2/src/contrib/bc/bc/bc.y#1 branch .. //depot/projects/arp-v2/src/contrib/bc/bc/bcdefs.h#1 branch .. //depot/projects/arp-v2/src/contrib/bc/bc/const.h#1 branch .. //depot/projects/arp-v2/src/contrib/bc/bc/execute.c#1 branch .. //depot/projects/arp-v2/src/contrib/bc/bc/fix-libmath_h#1 branch .. //depot/projects/arp-v2/src/contrib/bc/bc/global.c#1 branch .. //depot/projects/arp-v2/src/contrib/bc/bc/global.h#1 branch .. //depot/projects/arp-v2/src/contrib/bc/bc/libmath.b#1 branch .. //depot/projects/arp-v2/src/contrib/bc/bc/libmath.h#1 branch .. //depot/projects/arp-v2/src/contrib/bc/bc/load.c#1 branch .. //depot/projects/arp-v2/src/contrib/bc/bc/main.c#1 branch .. //depot/projects/arp-v2/src/contrib/bc/bc/proto.h#1 branch .. //depot/projects/arp-v2/src/contrib/bc/bc/sbc.y#1 branch .. //depot/projects/arp-v2/src/contrib/bc/bc/scan.l#1 branch .. //depot/projects/arp-v2/src/contrib/bc/bc/storage.c#1 branch .. //depot/projects/arp-v2/src/contrib/bc/bc/util.c#1 branch .. //depot/projects/arp-v2/src/contrib/bc/config.h.in#1 branch .. //depot/projects/arp-v2/src/contrib/bc/configure#1 branch .. //depot/projects/arp-v2/src/contrib/bc/configure.in#1 branch .. //depot/projects/arp-v2/src/contrib/bc/dc/Makefile.am#1 branch .. //depot/projects/arp-v2/src/contrib/bc/dc/Makefile.in#1 branch .. //depot/projects/arp-v2/src/contrib/bc/dc/array.c#1 branch .. //depot/projects/arp-v2/src/contrib/bc/dc/dc-proto.h#1 branch .. //depot/projects/arp-v2/src/contrib/bc/dc/dc-regdef.h#1 branch .. //depot/projects/arp-v2/src/contrib/bc/dc/dc.c#1 branch .. //depot/projects/arp-v2/src/contrib/bc/dc/dc.h#1 branch .. //depot/projects/arp-v2/src/contrib/bc/dc/eval.c#1 branch .. //depot/projects/arp-v2/src/contrib/bc/dc/misc.c#1 branch .. //depot/projects/arp-v2/src/contrib/bc/dc/numeric.c#1 branch .. //depot/projects/arp-v2/src/contrib/bc/dc/stack.c#1 branch .. //depot/projects/arp-v2/src/contrib/bc/dc/string.c#1 branch .. //depot/projects/arp-v2/src/contrib/bc/doc/Makefile.am#1 branch .. //depot/projects/arp-v2/src/contrib/bc/doc/Makefile.in#1 branch .. //depot/projects/arp-v2/src/contrib/bc/doc/bc.1#1 branch .. //depot/projects/arp-v2/src/contrib/bc/doc/bc.texi#1 branch .. //depot/projects/arp-v2/src/contrib/bc/doc/dc.1#1 branch .. //depot/projects/arp-v2/src/contrib/bc/doc/dc.texi#1 branch .. //depot/projects/arp-v2/src/contrib/bc/h/number.h#1 branch .. //depot/projects/arp-v2/src/contrib/bc/install-sh#1 branch .. //depot/projects/arp-v2/src/contrib/bc/lib/Makefile.am#1 branch .. //depot/projects/arp-v2/src/contrib/bc/lib/Makefile.in#1 branch .. //depot/projects/arp-v2/src/contrib/bc/lib/number.c#1 branch .. //depot/projects/arp-v2/src/contrib/bc/lib/testmul.c#1 branch .. //depot/projects/arp-v2/src/contrib/bc/lib/vfprintf.c#1 branch .. //depot/projects/arp-v2/src/contrib/bc/missing#1 branch .. //depot/projects/arp-v2/src/contrib/bc/mkinstalldirs#1 branch .. //depot/projects/arp-v2/src/contrib/bc/stamp-h.in#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/CHANGES#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/COPYRIGHT#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/FAQ#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/FAQ.xml#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/FREEBSD-Upgrade#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/FREEBSD-Xlist#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/Makefile.in#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/README#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/README.idnkit#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/acconfig.h#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/Makefile.in#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/check/Makefile.in#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/check/check-tool.c#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/check/check-tool.h#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/check/named-checkconf.8#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/check/named-checkconf.c#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/check/named-checkconf.docbook#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/check/named-checkconf.html#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/check/named-checkzone.8#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/check/named-checkzone.c#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/check/named-checkzone.docbook#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/check/named-checkzone.html#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/dig/Makefile.in#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/dig/dig.1#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/dig/dig.c#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/dig/dig.docbook#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/dig/dig.html#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/dig/dighost.c#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/dig/host.1#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/dig/host.c#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/dig/host.docbook#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/dig/host.html#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/dig/include/dig/dig.h#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/dig/nslookup.1#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/dig/nslookup.c#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/dig/nslookup.docbook#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/dig/nslookup.html#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/dnssec/Makefile.in#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/dnssec/dnssec-keygen.8#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/dnssec/dnssec-keygen.c#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/dnssec/dnssec-keygen.html#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/dnssec/dnssec-signzone.8#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/dnssec/dnssec-signzone.c#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/dnssec/dnssec-signzone.html#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/dnssec/dnssectool.c#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/dnssec/dnssectool.h#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/Makefile.in#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/builtin.c#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/client.c#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/config.c#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/control.c#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/controlconf.c#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/include/named/builtin.h#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/include/named/client.h#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/include/named/config.h#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/include/named/control.h#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/include/named/globals.h#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/include/named/interfacemgr.h#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/include/named/listenlist.h#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/include/named/log.h#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/include/named/logconf.h#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/include/named/lwaddr.h#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/include/named/lwdclient.h#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/include/named/lwresd.h#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/include/named/lwsearch.h#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/include/named/main.h#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/include/named/notify.h#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/include/named/query.h#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/include/named/server.h#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/include/named/sortlist.h#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/include/named/tkeyconf.h#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/include/named/tsigconf.h#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/include/named/types.h#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/include/named/update.h#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/include/named/xfrout.h#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/include/named/zoneconf.h#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/interfacemgr.c#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/listenlist.c#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/log.c#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/logconf.c#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/lwaddr.c#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/lwdclient.c#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/lwderror.c#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/lwdgabn.c#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/lwdgnba.c#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/lwdgrbn.c#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/lwdnoop.c#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/lwresd.8#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/lwresd.c#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/lwresd.docbook#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/lwresd.html#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/lwsearch.c#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/main.c#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/named.8#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/named.conf.5#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/named.conf.docbook#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/named.conf.html#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/named.docbook#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/named.html#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/notify.c#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/query.c#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/server.c#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/sortlist.c#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/tkeyconf.c#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/tsigconf.c#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/unix/Makefile.in#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/unix/include/named/os.h#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/unix/os.c#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/update.c#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/xfrout.c#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/named/zoneconf.c#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/nsupdate/Makefile.in#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/nsupdate/nsupdate.8#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/nsupdate/nsupdate.c#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/nsupdate/nsupdate.docbook#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/nsupdate/nsupdate.html#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/rndc/Makefile.in#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/rndc/include/rndc/os.h#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/rndc/rndc-confgen.8#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/rndc/rndc-confgen.c#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/rndc/rndc-confgen.docbook#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/rndc/rndc-confgen.html#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/rndc/rndc.8#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/rndc/rndc.c#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/rndc/rndc.conf#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/rndc/rndc.conf.5#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/rndc/rndc.conf.docbook#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/rndc/rndc.conf.html#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/rndc/rndc.docbook#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/rndc/rndc.html#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/rndc/unix/Makefile.in#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/rndc/unix/os.c#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/rndc/util.c#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/bin/rndc/util.h#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/config.guess#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/config.sub#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/config.threads.in#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/configure.in#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/Makefile.in#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/arm/Bv9ARM-book.xml#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/arm/Bv9ARM.ch01.html#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/arm/Bv9ARM.ch02.html#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/arm/Bv9ARM.ch03.html#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/arm/Bv9ARM.ch04.html#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/arm/Bv9ARM.ch05.html#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/arm/Bv9ARM.ch06.html#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/arm/Bv9ARM.ch07.html#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/arm/Bv9ARM.ch08.html#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/arm/Bv9ARM.ch09.html#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/arm/Bv9ARM.ch10.html#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/arm/Bv9ARM.html#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/arm/Makefile.in#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/arm/README-SGML#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/arm/isc-logo.eps#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/arm/isc-logo.pdf#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/arm/man.dig.html#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/arm/man.dnssec-keygen.html#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/arm/man.dnssec-signzone.html#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/arm/man.host.html#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/arm/man.named-checkconf.html#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/arm/man.named-checkzone.html#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/arm/man.named.html#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/arm/man.rndc-confgen.html#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/arm/man.rndc.conf.html#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/arm/man.rndc.html#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-12.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-02.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-rsasha256-00.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-ietf-dnsext-ds-sha256-05.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-04.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-ietf-dnsext-nsid-01.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-02.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-06.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-10.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-05.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-08.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-06.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/draft/update#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/misc/Makefile.in#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/misc/dnssec#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/misc/format-options.pl#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/misc/ipv6#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/misc/migration#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/misc/migration-4to9#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/misc/options#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/misc/rfc-compliance#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/misc/roadmap#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/misc/sdb#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/rfc/index#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/rfc/rfc1032.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/rfc/rfc1033.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/rfc/rfc1034.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/rfc/rfc1035.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/rfc/rfc1101.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/rfc/rfc1122.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/rfc/rfc1123.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/rfc/rfc1183.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/rfc/rfc1348.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/rfc/rfc1535.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/rfc/rfc1536.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/rfc/rfc1537.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/rfc/rfc1591.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/rfc/rfc1611.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/rfc/rfc1612.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/rfc/rfc1706.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/rfc/rfc1712.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/rfc/rfc1750.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/rfc/rfc1876.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/rfc/rfc1886.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/rfc/rfc1982.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/rfc/rfc1995.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/rfc/rfc1996.txt#1 branch .. //depot/projects/arp-v2/src/contrib/bind9/doc/rfc/rfc2052.txt#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Dec 12 02:20:27 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 211EA16A468; Wed, 12 Dec 2007 02:20:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B913116A418 for ; Wed, 12 Dec 2007 02:20:26 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9FEE213C461 for ; Wed, 12 Dec 2007 02:20:26 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBC2KQOr066796 for ; Wed, 12 Dec 2007 02:20:26 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBC2KPJH066790 for perforce@freebsd.org; Wed, 12 Dec 2007 02:20:25 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 12 Dec 2007 02:20:25 GMT Message-Id: <200712120220.lBC2KPJH066790@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 130657 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 02:20:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=130657 Change 130657 by kmacy@kmacy:storage:toehead on 2007/12/12 02:20:02 IFC 130640 Affected files ... .. //depot/projects/toehead/Makefile#2 integrate .. //depot/projects/toehead/contrib/amd/FREEBSD-Xlist#2 integrate .. //depot/projects/toehead/contrib/amd/FREEBSD-upgrade#2 integrate .. //depot/projects/toehead/contrib/gcc/fold-const.c#2 integrate .. //depot/projects/toehead/lib/Makefile#2 integrate .. //depot/projects/toehead/lib/libc/stdlib/rand.c#2 integrate .. //depot/projects/toehead/lib/libthr/thread/thr_mutex.c#2 integrate .. //depot/projects/toehead/sbin/natd/natd.8#2 integrate .. //depot/projects/toehead/share/man/man4/nve.4#2 integrate .. //depot/projects/toehead/share/man/man5/src.conf.5#2 integrate .. //depot/projects/toehead/share/man/man7/build.7#2 integrate .. //depot/projects/toehead/share/mk/bsd.own.mk#2 integrate .. //depot/projects/toehead/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/toehead/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/toehead/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/toehead/sys/dev/usb/umass.c#2 integrate .. //depot/projects/toehead/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/toehead/sys/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/toehead/sys/kern/kern_resource.c#2 integrate .. //depot/projects/toehead/sys/kern/sched_4bsd.c#2 integrate .. //depot/projects/toehead/sys/kern/sched_ule.c#2 integrate .. //depot/projects/toehead/sys/netinet6/dest6.c#2 integrate .. //depot/projects/toehead/sys/netinet6/frag6.c#2 integrate .. //depot/projects/toehead/sys/netinet6/icmp6.c#2 integrate .. //depot/projects/toehead/sys/netinet6/in6.c#2 integrate .. //depot/projects/toehead/sys/netinet6/in6.h#2 integrate .. //depot/projects/toehead/sys/netinet6/in6_cksum.c#2 integrate .. //depot/projects/toehead/sys/netinet6/in6_gif.c#2 integrate .. //depot/projects/toehead/sys/netinet6/in6_gif.h#2 integrate .. //depot/projects/toehead/sys/netinet6/in6_ifattach.c#2 integrate .. //depot/projects/toehead/sys/netinet6/in6_ifattach.h#2 integrate .. //depot/projects/toehead/sys/netinet6/in6_pcb.c#2 integrate .. //depot/projects/toehead/sys/netinet6/in6_pcb.h#2 integrate .. //depot/projects/toehead/sys/netinet6/in6_proto.c#2 integrate .. //depot/projects/toehead/sys/netinet6/in6_rmx.c#2 integrate .. //depot/projects/toehead/sys/netinet6/in6_src.c#2 integrate .. //depot/projects/toehead/sys/netinet6/in6_var.h#2 integrate .. //depot/projects/toehead/sys/netinet6/ip6_ecn.h#2 integrate .. //depot/projects/toehead/sys/netinet6/ip6_forward.c#2 integrate .. //depot/projects/toehead/sys/netinet6/ip6_id.c#2 integrate .. //depot/projects/toehead/sys/netinet6/ip6_input.c#2 integrate .. //depot/projects/toehead/sys/netinet6/ip6_ipsec.c#2 integrate .. //depot/projects/toehead/sys/netinet6/ip6_ipsec.h#2 integrate .. //depot/projects/toehead/sys/netinet6/ip6_mroute.c#2 integrate .. //depot/projects/toehead/sys/netinet6/ip6_mroute.h#2 integrate .. //depot/projects/toehead/sys/netinet6/ip6_output.c#2 integrate .. //depot/projects/toehead/sys/netinet6/ip6_var.h#2 integrate .. //depot/projects/toehead/sys/netinet6/ip6protosw.h#2 integrate .. //depot/projects/toehead/sys/netinet6/mld6.c#2 integrate .. //depot/projects/toehead/sys/netinet6/mld6_var.h#2 integrate .. //depot/projects/toehead/sys/netinet6/nd6.c#2 integrate .. //depot/projects/toehead/sys/netinet6/nd6.h#2 integrate .. //depot/projects/toehead/sys/netinet6/nd6_nbr.c#2 integrate .. //depot/projects/toehead/sys/netinet6/nd6_rtr.c#2 integrate .. //depot/projects/toehead/sys/netinet6/pim6.h#2 integrate .. //depot/projects/toehead/sys/netinet6/pim6_var.h#2 integrate .. //depot/projects/toehead/sys/netinet6/raw_ip6.c#2 integrate .. //depot/projects/toehead/sys/netinet6/raw_ip6.h#2 integrate .. //depot/projects/toehead/sys/netinet6/route6.c#2 integrate .. //depot/projects/toehead/sys/netinet6/scope6.c#2 integrate .. //depot/projects/toehead/sys/netinet6/scope6_var.h#2 integrate .. //depot/projects/toehead/sys/netinet6/sctp6_usrreq.c#2 integrate .. //depot/projects/toehead/sys/netinet6/sctp6_var.h#2 integrate .. //depot/projects/toehead/sys/netinet6/tcp6_var.h#2 integrate .. //depot/projects/toehead/sys/netinet6/udp6_usrreq.c#2 integrate .. //depot/projects/toehead/sys/netinet6/udp6_var.h#2 integrate .. //depot/projects/toehead/sys/vm/vm_page.c#2 integrate .. //depot/projects/toehead/tools/build/options/WITHOUT_KERBEROS#2 integrate .. //depot/projects/toehead/tools/build/options/WITH_GSSAPI#1 branch .. //depot/projects/toehead/usr.bin/procstat/procstat_args.c#2 integrate .. //depot/projects/toehead/usr.bin/procstat/procstat_bin.c#2 integrate .. //depot/projects/toehead/usr.bin/procstat/procstat_cred.c#2 integrate .. //depot/projects/toehead/usr.bin/procstat/procstat_files.c#2 integrate .. //depot/projects/toehead/usr.sbin/syslogd/syslogd.c#2 integrate Differences ... ==== //depot/projects/toehead/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.342 2007/10/18 08:41:52 delphij Exp $ +# $FreeBSD: src/Makefile,v 1.343 2007/12/11 20:00:55 imp Exp $ # # The user-driven targets are: # @@ -234,17 +234,19 @@ PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \ PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \ then \ - (cd ${.CURDIR} && make make); \ + (cd ${.CURDIR} && ${BSDMAKE} make); \ fi # # Upgrade make(1) to the current version using the installed -# headers, libraries and tools. +# headers, libraries and tools. Also, allow the location of +# the system bsdmake-like utility to be overridden. # +BSDMAKE?=make MMAKEENV= MAKEOBJDIRPREFIX=${MAKEPATH} \ DESTDIR= \ INSTALL="sh ${.CURDIR}/tools/install.sh" -MMAKE= ${MMAKEENV} make \ +MMAKE= ${MMAKEENV} ${BSDMAKE} \ -D_UPGRADING \ -DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \ -DNO_CPU_CFLAGS -DNO_WERROR ==== //depot/projects/toehead/contrib/amd/FREEBSD-Xlist#2 (text+ko) ==== @@ -1,7 +1,8 @@ -$FreeBSD: src/contrib/amd/FREEBSD-Xlist,v 1.5 2004/07/06 12:52:27 mbr Exp $ +$FreeBSD: src/contrib/amd/FREEBSD-Xlist,v 1.6 2007/12/11 19:15:17 obrien Exp $ *LSM.am-utils *Makefile.* *README.autofs +*README.osx *ac*.m4 *.old *acconfig.h @@ -15,6 +16,7 @@ *missing *mkinstalldirs *stamp-h.in +*amd/test1.sh *amd/Makefile.* *amq/Makefile.* *commit @@ -38,10 +40,13 @@ *conf/fh_dref/fh_dref_sunos3.h *conf/fh_dref/fh_dref_sunos4.h *conf/fh_dref/fh_dref_svr4.h +*conf/hn_dref/hn_dref_default.h, *conf/hn_dref/hn_dref_isc3.h *conf/hn_dref/hn_dref_linux.h *conf/mount/mount_aix.c +*conf/mount/mount_aix3.c *conf/mount/mount_bsdi3.c +*conf/mount/mount_default.c *conf/mount/mount_freebsd3.c *conf/mount/mount_hpux.c *conf/mount/mount_irix5.c @@ -54,6 +59,7 @@ *conf/mtab/mtab_aix.c *conf/mtab/mtab_file.c *conf/mtab/mtab_isc3.c +*conf/mtab/mtab_linux.c *conf/mtab/mtab_mach3.c *conf/mtab/mtab_osf.c *conf/mtab/mtab_svr4.c @@ -63,6 +69,7 @@ *conf/nfs_prot/nfs_prot_aix4_2.h *conf/nfs_prot/nfs_prot_aix4_3.h *conf/nfs_prot/nfs_prot_aix5_1.h +*conf/nfs_prot/nfs_prot_aix5_2.h *conf/nfs_prot/nfs_prot_bsdi2.h *conf/nfs_prot/nfs_prot_bsdi3.h *conf/nfs_prot/nfs_prot_darwin.h @@ -92,6 +99,12 @@ *conf/nfs_prot/nfs_prot_sunos5_8.h *conf/nfs_prot/nfs_prot_svr4.h *conf/nfs_prot/nfs_prot_ultrix.h +*conf/autofs/autofs_linux.h +*conf/autofs/autofs_linux.c +*conf/autofs/autofs_solaris_v1.h +*conf/autofs/autofs_solaris_v1.c +*conf/autofs/autofs_solaris_v2_v3.h +*conf/autofs/autofs_solaris_v2_v3.c *conf/sa_dref/sa_dref_386bsd.h *conf/sa_dref/sa_dref_aix3.h *conf/sa_dref/sa_dref_aoi.h @@ -103,6 +116,7 @@ *conf/trap/trap_aix3.h *conf/trap/trap_aux.h *conf/trap/trap_dgux.h +*conf/trap/trap_freebsd3.h *conf/trap/trap_hcx.h *conf/trap/trap_hpux.h *conf/trap/trap_hpux11.h @@ -115,7 +129,9 @@ *conf/trap/trap_stellix.h *conf/trap/trap_svr4.h *conf/trap/trap_ultrix.h +*conf/umount/umount_aix.c *conf/umount/umount_default.c +*conf/umount/umount_linux.c *conf/umount/umount_osf.c *doc/Makefile.am *doc/Makefile.in @@ -135,11 +151,118 @@ *fsinfo/Makefile.* *hlfsd/Makefile.* *libamu/Makefile.* +*libamu/alloca.c *libamu/clnt_sperrno.c *libamu/memcmp.c *libamu/strcasecmp.c *libamu/strdup.c *libamu/strstr.c +*libamu/strlcat.c +*libamu/strlcpy.c *libamu/ualarm.c *mk-amd-map/Makefile.* *wire-test/Makefile.* +*m4/GNUmakefile +*m4/amdgrep* +*m4/amindent* +*m4/autopat* +*m4/chop-aclocal.pl* +*m4/copy-if-newbig* +*m4/mk-aclocal* +*m4/mkconf* +*m4/rmtspc* +*m4/update_build_version* +*m4/macros/HEADER +*m4/macros/TRAILER +*m4/macros/c_void_p.m4 +*m4/macros/cache_check_dynamic.m4 +*m4/macros/check_amu_fs.m4 +*m4/macros/check_checkmount_style.m4 +*m4/macros/check_extern.m4 +*m4/macros/check_fhandle.m4 +*m4/macros/check_field.m4 +*m4/macros/check_fs_headers.m4 +*m4/macros/check_fs_mntent.m4 +*m4/macros/check_gnu_getopt.m4 +*m4/macros/check_hide_mount_type.m4 +*m4/macros/check_lib2.m4 +*m4/macros/check_map_funcs.m4 +*m4/macros/check_mnt2_cdfs_opt.m4 +*m4/macros/check_mnt2_gen_opt.m4 +*m4/macros/check_mnt2_nfs_opt.m4 +*m4/macros/check_mnttab_file_name.m4 +*m4/macros/check_mnttab_location.m4 +*m4/macros/check_mnttab_opt.m4 +*m4/macros/check_mnttab_style.m4 +*m4/macros/check_mnttab_type.m4 +*m4/macros/check_mount_style.m4 +*m4/macros/check_mount_trap.m4 +*m4/macros/check_mount_type.m4 +*m4/macros/check_mtype_printf_type.m4 +*m4/macros/check_mtype_type.m4 +*m4/macros/check_network_transport_type.m4 +*m4/macros/check_nfs_fh_dref.m4 +*m4/macros/check_nfs_hn_dref.m4 +*m4/macros/check_nfs_prot_headers.m4 +*m4/macros/check_nfs_sa_dref.m4 +*m4/macros/check_nfs_socket_connection.m4 +*m4/macros/check_os_libs.m4 +*m4/macros/check_restartable_signal_handler.m4 +*m4/macros/check_umount_style.m4 +*m4/macros/check_unmount_args.m4 +*m4/macros/check_unmount_call.m4 +*m4/macros/expand_cpp_hex.m4 +*m4/macros/expand_cpp_int.m4 +*m4/macros/expand_cpp_string.m4 +*m4/macros/expand_run_string.m4 +*m4/macros/extern_optarg.m4 +*m4/macros/extern_sys_errlist.m4 +*m4/macros/field_mntent_t_mnt_time_string.m4 +*m4/macros/func_bad_memcmp.m4 +*m4/macros/func_bad_yp_all.m4 +*m4/macros/header_templates.m4 +*m4/macros/host_macros.m4 +*m4/macros/linux_headers.m4 +*m4/macros/localconfig.m4 +*m4/macros/mount_headers.m4 +*m4/macros/name_package.m4 +*m4/macros/name_version.m4 +*m4/macros/opt_amu_cflags.m4 +*m4/macros/opt_cppflags.m4 +*m4/macros/opt_debug.m4 +*m4/macros/opt_ldflags.m4 +*m4/macros/opt_libs.m4 +*m4/macros/os_cflags.m4 +*m4/macros/os_cppflags.m4 +*m4/macros/os_ldflags.m4 +*m4/macros/package_bugreport.m4 +*m4/macros/package_name.m4 +*m4/macros/package_version.m4 +*m4/macros/save_state.m4 +*m4/macros/struct_field_nfs_fh.m4 +*m4/macros/struct_mntent.m4 +*m4/macros/struct_mnttab.m4 +*m4/macros/struct_nfs_args.m4 +*m4/macros/struct_nfs_fh.m4 +*m4/macros/struct_nfs_fh3.m4 +*m4/macros/struct_nfs_gfs_mount.m4 +*m4/macros/try_compile_anyfs.m4 +*m4/macros/try_compile_nfs.m4 +*m4/macros/try_compile_rpc.m4 +*m4/macros/type_auth_create_gidlist.m4 +*m4/macros/type_cachefs_args.m4 +*m4/macros/type_cdfs_args.m4 +*m4/macros/type_efs_args.m4 +*m4/macros/type_lofs_args.m4 +*m4/macros/type_mfs_args.m4 +*m4/macros/type_pcfs_args.m4 +*m4/macros/type_recvfrom_fromlen.m4 +*m4/macros/type_rfs_args.m4 +*m4/macros/type_svc_in_arg.m4 +*m4/macros/type_time_t.m4 +*m4/macros/type_tmpfs_args.m4 +*m4/macros/type_ufs_args.m4 +*m4/macros/type_xdrproc_t.m4 +*m4/macros/type_xfs_args.m4 +*m4/macros/type_yp_order_outorder.m4 +*m4/macros/with_addon.m4 ==== //depot/projects/toehead/contrib/amd/FREEBSD-upgrade#2 (text+ko) ==== @@ -1,21 +1,19 @@ # ex:ts=8 -$FreeBSD: src/contrib/amd/FREEBSD-upgrade,v 1.15 2004/05/14 13:29:48 mbr Exp $ +$FreeBSD: src/contrib/amd/FREEBSD-upgrade,v 1.16 2007/12/11 19:16:51 obrien Exp $ -AMD (am-utils) 6.0.9 - originals can be found at: ftp://shekel.mcl.cs.columbia.edu/pub/am-utils/ - (http://www.cs.columbia.edu/~ezk/am-utils/index.html) - +AMD (am-utils) 6.1.5 + originals can be found at: ftp://ftp.am-utils.org/pub/am-utils/ For the import of AMD many files were pruned by: - tar -X FREEBSD-Xlist -xzf am-utils-6.0.9.tar.gz + tar -X FREEBSD-Xlist -xf am-utils-6.1.5.tar.gz and `find . -name '.cvsignore' -delete` Then imported by: - cvs import -m 'Virgin import of AMD (am-utils) v6.0.9' \ - src/contrib/amd COLUMBIA amd_6_0_9 + cvs import -m 'Virgin import of AMD (am-utils) v6.1.5' \ + src/contrib/amd COLUMBIA amd_6_1_5 After the import, a separate extraction of am-utils was GNU configured in the "normal" way. The resulting config.h file should be compared with @@ -25,8 +23,11 @@ To make local changes to amd, simply patch and commit to the main branch (aka HEAD). Never make local changes on the vendor (COLUMBIA) branch. -All local changes should be submitted to "amd-dev@majordomo.cs.columbia.edu" -for inclusion in the next vendor release. +Note, we don't trim anything in scripts/ as sysadmins may find the bits +as a useful reference. + +All local changes should be submitted to "am-utils@am-utils.org" or +https://bugzilla.am-utils.org for inclusion in the next vendor release. Local changes: ==== //depot/projects/toehead/contrib/gcc/fold-const.c#2 (text+ko) ==== @@ -5661,6 +5661,9 @@ } break; } + /* If the constant is negative, we cannot simplify this. */ + if (tree_int_cst_sgn (c) == -1) + break; /* FALLTHROUGH */ case NEGATE_EXPR: if ((t1 = extract_muldiv (op0, c, code, wide_type, strict_overflow_p)) ==== //depot/projects/toehead/lib/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.226 2007/11/17 21:29:02 cognet Exp $ +# $FreeBSD: src/lib/Makefile,v 1.227 2007/12/10 19:09:24 dougb Exp $ .include @@ -31,7 +31,7 @@ libbegemot ${_libbluetooth} libbsnmp libbz2 \ libcalendar libcam libcompat libdevinfo libdevstat libdisk \ libedit libexpat libfetch libftpio libgeom ${_libgpib} \ - libgssapi libipsec \ + ${_libgssapi} libipsec \ ${_libipx} libkiconv libmagic libmemstat ${_libmilter} ${_libmp} \ ${_libncp} ${_libngatm} libopie libpam libpcap \ libpmc ${_libkse} librt ${_libsdp} ${_libsm} ${_libsmb} \ @@ -62,6 +62,14 @@ _libsdp= libsdp .endif +.if ${MK_KERBEROS} != "no" +_libgssapi= libgssapi +.else +.if ${MK_GSSAPI} == "yes" +_libgssapi= libgssapi +.endif +.endif + .if ${MK_IPX} != "no" _libipx= libipx .endif ==== //depot/projects/toehead/lib/libc/stdlib/rand.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ static char sccsid[] = "@(#)rand.c 8.1 (Berkeley) 6/14/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/rand.c,v 1.16 2007/01/09 00:28:10 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/rand.c,v 1.17 2007/12/11 20:39:32 ache Exp $"); #include "namespace.h" #include /* for sranddev() */ @@ -60,7 +60,7 @@ #else /* !USE_WEAK_SEEDING */ /* * Compute x = (7^5 * x) mod (2^31 - 1) - * wihout overflowing 31 bits: + * without overflowing 31 bits: * (2^31 - 1) = 127773 * (7^5) + 2836 * From "Random number generators: good ones are hard to find", * Park and Miller, Communications of the ACM, vol. 31, no. 10, ==== //depot/projects/toehead/lib/libthr/thread/thr_mutex.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.63 2007/11/28 00:16:24 jasone Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.64 2007/12/11 08:00:58 davidxu Exp $ */ #include "namespace.h" @@ -296,13 +296,15 @@ #define ENQUEUE_MUTEX(curthread, m) \ - m->m_owner = curthread; \ + do { \ + (m)->m_owner = curthread; \ /* Add to the list of owned mutexes: */ \ - MUTEX_ASSERT_NOT_OWNED(m); \ - if ((m->m_lock.m_flags & UMUTEX_PRIO_PROTECT) == 0) \ - TAILQ_INSERT_TAIL(&curthread->mutexq, m, m_qe); \ + MUTEX_ASSERT_NOT_OWNED((m)); \ + if (((m)->m_lock.m_flags & UMUTEX_PRIO_PROTECT) == 0) \ + TAILQ_INSERT_TAIL(&curthread->mutexq, (m), m_qe);\ else \ - TAILQ_INSERT_TAIL(&curthread->pp_mutexq, m, m_qe) + TAILQ_INSERT_TAIL(&curthread->pp_mutexq, (m), m_qe);\ + } while (0) static int mutex_trylock_common(struct pthread *curthread, pthread_mutex_t *mutex) ==== //depot/projects/toehead/sbin/natd/natd.8#2 (text+ko) ==== @@ -1,5 +1,5 @@ -.\" $FreeBSD: src/sbin/natd/natd.8,v 1.62 2005/01/15 12:28:00 ru Exp $ -.Dd February 28, 2003 +.\" $FreeBSD: src/sbin/natd/natd.8,v 1.64 2007/12/10 12:03:23 ceri Exp $ +.Dd December 10, 2007 .Dt NATD 8 .Os .Sh NAME @@ -421,6 +421,26 @@ is synonymous with .Fl log . .Pp +Options can be divided to several sections. Each section applies to own +.Nm +instance. This ability allow to configure one +.Nm +process for several NAT instances. The first instance that always exists is +a "default" instance. Each another instance should begin with +.Pp +.Dl instance Ar instance_name +.Pp +At the next should be placed a configuration option. Example: +.Pp +.Dl \&# default instance +.Dl port 8668 +.Dl alias_address 158.152.17.1 +.Pp +.Dl \&# second instance +.Dl instance dsl1 +.Dl port 8888 +.Dl alias_address 192.168.0.1 +.Pp Trailing spaces and empty lines are ignored. A .Ql \&# ==== //depot/projects/toehead/share/man/man4/nve.4#2 (text+ko) ==== @@ -24,7 +24,7 @@ .\" .\" $Id: nvnet.4,v 1.1 2003/10/09 16:48:01 q Exp $ .\" -.\" $FreeBSD: src/share/man/man4/nve.4,v 1.10 2007/12/08 23:42:01 remko Exp $ +.\" $FreeBSD: src/share/man/man4/nve.4,v 1.11 2007/12/10 12:01:27 ceri Exp $ .\" .Dd December 8, 2007 .Dt NVE 4 @@ -115,8 +115,8 @@ the network connection (cable). .El .Sh BUGS -There are mentionings that when the card is in auto select mode, -ifconfig output reports a 10baseT/UTP output while the leds and +There are reports that when the card is in auto select mode, +ifconfig output reports a 10baseT/UTP output while the LEDs and bandwidth show that the card is actually in 100baseTX mode. .Sh SEE ALSO .Xr altq 4 , ==== //depot/projects/toehead/share/man/man5/src.conf.5#2 (text) ==== @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: src/tools/build/options/makeman,v 1.7 2007/11/06 23:12:53 danger Exp -.\" $FreeBSD: src/share/man/man5/src.conf.5,v 1.21 2007/12/09 21:57:27 dougb Exp $ -.Dd December 9, 2007 +.\" $FreeBSD: src/share/man/man5/src.conf.5,v 1.22 2007/12/10 19:11:56 dougb Exp $ +.Dd December 10, 2007 .Dt SRC.CONF 5 .Os .Sh NAME @@ -288,6 +288,11 @@ .\" from FreeBSD: src/tools/build/options/WITHOUT_GROFF,v 1.1 2006/03/21 07:50:49 ru Exp Set to not build .Xr groff 1 . +.It Va WITH_GSSAPI +.\" from FreeBSD: src/tools/build/options/WITH_GSSAPI,v 1.1 2007/12/10 19:09:24 dougb Exp +Set to build libgssapi when +.Va WITHOUT_KERBEROS +is set. .It Va WITH_HESIOD .\" from FreeBSD: src/tools/build/options/WITH_HESIOD,v 1.1 2006/03/21 07:50:50 ru Exp Set to build Hesiod support. @@ -346,8 +351,13 @@ .\" from FreeBSD: src/tools/build/options/WITHOUT_IPX_SUPPORT,v 1.1 2006/03/21 07:50:50 ru Exp Set to build some programs without IPX support. .It Va WITHOUT_KERBEROS -.\" from FreeBSD: src/tools/build/options/WITHOUT_KERBEROS,v 1.1 2006/03/21 07:50:50 ru Exp +.\" from FreeBSD: src/tools/build/options/WITHOUT_KERBEROS,v 1.2 2007/12/10 19:09:24 dougb Exp Set this if you do not want to build Kerberos 5 (KTH Heimdal). +This option implies +.Va WITHOUT_GSSAPI . +Set +.Va WITH_GSSAPI +to override. When set, it also enforces the following options: .Pp .Bl -item -compact ==== //depot/projects/toehead/share/man/man7/build.7#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/share/man/man7/build.7,v 1.46 2006/12/14 13:37:08 mpp Exp $ +.\" $FreeBSD: src/share/man/man7/build.7,v 1.47 2007/12/11 21:14:10 imp Exp $ .\" .Dd October 1, 2006 .Dt BUILD 7 @@ -335,6 +335,16 @@ .Xr make 1 variables: .Bl -tag -width ".Va SUBDIR_OVERRIDE" +.It Va BSDMAKE +If set, this variable supplies the name of the +program to use in early boot strapping that is compatible with the +default +.Fx +.Xr make 1 +program. +This program is subjected to the normal make regression tests at the +start of the build, and is used to build a more compatible make, if +necessary, which is used to build the rest of the system. .It Va LOCAL_DIRS If set, this variable supplies a list of additional directories to build, relative to the root of the source tree. @@ -366,7 +376,10 @@ Set this to cross-build for a different architecture. If not set, .Va TARGET_ARCH -defaults to the current machine architecture. +defaults to the current machine architecture, unless +.Va TARGET +is also set, in which case it defaults to the appropriate +value for that platform. .El .Pp Builds under directory @@ -402,8 +415,8 @@ system for the sparc64 architecture on an i386 host: .Bd -literal -offset indent cd /usr/src -make TARGET_ARCH=sparc64 buildworld -make TARGET_ARCH=sparc64 DESTDIR=/clients/sparc64 installworld +make TARGET=sparc64 buildworld +make TARGET=sparc64 DESTDIR=/clients/sparc64 installworld .Ed .Sh SEE ALSO .Xr cc 1 , ==== //depot/projects/toehead/share/mk/bsd.own.mk#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.own.mk,v 1.69 2007/10/20 19:01:49 ru Exp $ +# $FreeBSD: src/share/mk/bsd.own.mk,v 1.70 2007/12/10 19:09:24 dougb Exp $ # # The include file set common variables for owner, # group, mode, and directories. Defaults are in brackets. @@ -381,6 +381,7 @@ # .for var in \ BIND_LIBS \ + GSSAPI \ HESIOD \ IDEA .if defined(WITH_${var}) && defined(WITHOUT_${var}) ==== //depot/projects/toehead/sys/arm/arm/pmap.c#2 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.92 2007/12/07 10:42:11 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.93 2007/12/11 20:35:44 cognet Exp $"); #include #include #include @@ -3277,7 +3277,6 @@ if (pg != NULL) { f = pmap_modify_pv(pg, pm, sva, PVF_WRITE, 0); - pmap_vac_me_harder(pg, pm, sva); vm_page_dirty(pg); } else f = PVF_REF | PVF_EXEC; ==== //depot/projects/toehead/sys/cam/scsi/scsi_da.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.224 2007/07/01 17:42:07 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.225 2007/12/11 06:41:38 davidxu Exp $"); #include @@ -535,6 +535,10 @@ {T_DIRECT, SIP_MEDIA_REMOVABLE, "ChipsBnk", "USB*", "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE }, + { + {T_DIRECT, SIP_MEDIA_REMOVABLE, "Netac", "OnlyDisk*", + "2000"}, /*quirks*/ DA_Q_NO_SYNC_CACHE + } }; static disk_strategy_t dastrategy; ==== //depot/projects/toehead/sys/compat/freebsd32/freebsd32_misc.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.73 2007/12/08 01:41:31 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.74 2007/12/10 19:42:23 jhb Exp $"); #include "opt_compat.h" @@ -145,7 +145,7 @@ } #ifdef COMPAT_FREEBSD4 -static int +static void copy_statfs(struct statfs *in, struct statfs32 *out) { @@ -157,25 +157,21 @@ CP(*in, *out, f_bfree); CP(*in, *out, f_bavail); out->f_files = MIN(in->f_files, INT32_MAX); - if (in->f_ffree < 0) - out->f_ffree = MAX(in->f_ffree, INT32_MIN); - else - out->f_ffree = MIN(in->f_ffree, INT32_MAX); + out->f_ffree = MIN(in->f_ffree, INT32_MAX); CP(*in, *out, f_fsid); CP(*in, *out, f_owner); CP(*in, *out, f_type); CP(*in, *out, f_flags); - CP(*in, *out, f_syncwrites); - CP(*in, *out, f_asyncwrites); + out->f_syncwrites = MIN(in->f_syncwrites, INT32_MAX); + out->f_asyncwrites = MIN(in->f_asyncwrites, INT32_MAX); strlcpy(out->f_fstypename, in->f_fstypename, MFSNAMELEN); strlcpy(out->f_mntonname, in->f_mntonname, min(MNAMELEN, FREEBSD4_MNAMELEN)); - CP(*in, *out, f_syncreads); - CP(*in, *out, f_asyncreads); + out->f_syncreads = MIN(in->f_syncreads, INT32_MAX); + out->f_asyncreads = MIN(in->f_asyncreads, INT32_MAX); strlcpy(out->f_mntfromname, in->f_mntfromname, min(MNAMELEN, FREEBSD4_MNAMELEN)); - return (0); } #endif @@ -195,9 +191,7 @@ count = td->td_retval[0]; sp = buf; while (count > 0 && error == 0) { - error = copy_statfs(sp, &stat32); - if (error) - break; + copy_statfs(sp, &stat32); error = copyout(&stat32, uap->buf, sizeof(stat32)); sp++; uap->buf++; @@ -1272,9 +1266,7 @@ error = kern_statfs(td, uap->path, UIO_USERSPACE, &s); if (error) return (error); - error = copy_statfs(&s, &s32); - if (error) - return (error); + copy_statfs(&s, &s32); return (copyout(&s32, uap->buf, sizeof(s32))); } #endif @@ -1290,9 +1282,7 @@ error = kern_fstatfs(td, uap->fd, &s); if (error) return (error); - error = copy_statfs(&s, &s32); - if (error) - return (error); + copy_statfs(&s, &s32); return (copyout(&s32, uap->buf, sizeof(s32))); } #endif @@ -1311,9 +1301,7 @@ error = kern_fhstatfs(td, fh, &s); if (error) return (error); - error = copy_statfs(&s, &s32); - if (error) - return (error); + copy_statfs(&s, &s32); return (copyout(&s32, uap->buf, sizeof(s32))); } #endif ==== //depot/projects/toehead/sys/dev/usb/umass.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/umass.c,v 1.160 2007/07/05 05:26:08 imp Exp $ + * $FreeBSD: src/sys/dev/usb/umass.c,v 1.161 2007/12/11 06:41:38 davidxu Exp $ * $NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $ */ @@ -564,6 +564,10 @@ UMASS_PROTO_SCSI | UMASS_PROTO_BBB, NO_INQUIRY }, + { USB_VENDOR_NETAC, USB_PRODUCT_NETAC_ONLYDISK, RID_WILDCARD, + UMASS_PROTO_SCSI | UMASS_PROTO_BBB, + IGNORE_RESIDUE + }, { USB_VENDOR_NETCHIP, USB_PRODUCT_NETCHIP_CLIK_40, RID_WILDCARD, UMASS_PROTO_ATAPI, NO_INQUIRY ==== //depot/projects/toehead/sys/dev/usb/usbdevs#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.335 2007/11/26 05:47:15 jb Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.336 2007/12/11 06:41:38 davidxu Exp $ /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */ /*- @@ -1737,6 +1737,7 @@ /* Netac products */ product NETAC CF_CARD 0x1060 USB-CF-Card +product NETAC ONLYDISK 0x0003 OnlyDisk /* NetChip Technology Products */ product NETCHIP TURBOCONNECT 0x1080 Turbo-Connect ==== //depot/projects/toehead/sys/fs/udf/udf_vfsops.c#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/fs/udf/udf_vfsops.c,v 1.49 2007/10/16 10:54:54 alfred Exp $ + * $FreeBSD: src/sys/fs/udf/udf_vfsops.c,v 1.50 2007/12/11 19:49:40 markus Exp $ */ /* udf_vfsops.c */ @@ -290,7 +290,7 @@ if (le16toh(tag->id) != id) return (EINVAL); - for (i = 0; i < 15; i++) + for (i = 0; i < 16; i++) cksum = cksum + itag[i]; cksum = cksum - itag[4]; ==== //depot/projects/toehead/sys/kern/kern_resource.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_resource.c,v 1.180 2007/07/17 01:08:09 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_resource.c,v 1.181 2007/12/11 08:25:35 davidxu Exp $"); #include "opt_compat.h" @@ -56,6 +56,7 @@ #include #include #include +#include #include #include @@ -482,6 +483,7 @@ rtp_to_pri(struct rtprio *rtp, struct thread *td) { u_char newpri; + u_char oldpri; if (rtp->prio > RTP_PRIO_MAX) return (EINVAL); @@ -501,10 +503,15 @@ return (EINVAL); } sched_class(td, rtp->type); /* XXX fix */ + oldpri = td->td_user_pri; sched_user_prio(td, newpri); if (curthread == td) sched_prio(curthread, td->td_user_pri); /* XXX dubious */ - thread_unlock(td); + if (TD_ON_UPILOCK(td) && oldpri != newpri) { + thread_unlock(td); + umtx_pi_adjust(td, oldpri); + } else + thread_unlock(td); return (0); } ==== //depot/projects/toehead/sys/kern/sched_4bsd.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.110 2007/11/14 06:21:22 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.111 2007/12/11 08:25:36 davidxu Exp $"); #include "opt_hwpmc_hooks.h" @@ -762,14 +762,12 @@ { u_char oldprio; + THREAD_LOCK_ASSERT(td, MA_OWNED); td->td_base_user_pri = prio; if (td->td_flags & TDF_UBORROWING && td->td_user_pri <= prio) return; oldprio = td->td_user_pri; td->td_user_pri = prio; - - if (TD_ON_UPILOCK(td) && oldprio != prio) - umtx_pi_adjust(td, oldprio); } void @@ -777,13 +775,10 @@ { u_char oldprio; + THREAD_LOCK_ASSERT(td, MA_OWNED); td->td_flags |= TDF_UBORROWING; - oldprio = td->td_user_pri; td->td_user_pri = prio; - - if (TD_ON_UPILOCK(td) && oldprio != prio) - umtx_pi_adjust(td, oldprio); } void @@ -791,12 +786,14 @@ { u_char base_pri; + THREAD_LOCK_ASSERT(td, MA_OWNED); base_pri = td->td_base_user_pri; if (prio >= base_pri) { td->td_flags &= ~TDF_UBORROWING; sched_user_prio(td, base_pri); - } else + } else { sched_lend_user_prio(td, prio); + } } void ==== //depot/projects/toehead/sys/kern/sched_ule.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.217 2007/11/14 06:21:23 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.218 2007/12/11 08:25:36 davidxu Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_sched.h" @@ -1709,9 +1709,6 @@ return; oldprio = td->td_user_pri; td->td_user_pri = prio; - - if (TD_ON_UPILOCK(td) && oldprio != prio) - umtx_pi_adjust(td, oldprio); } void @@ -1719,13 +1716,10 @@ { u_char oldprio; + THREAD_LOCK_ASSERT(td, MA_OWNED); td->td_flags |= TDF_UBORROWING; - oldprio = td->td_user_pri; td->td_user_pri = prio; - - if (TD_ON_UPILOCK(td) && oldprio != prio) - umtx_pi_adjust(td, oldprio); } void @@ -1733,12 +1727,14 @@ { u_char base_pri; + THREAD_LOCK_ASSERT(td, MA_OWNED); base_pri = td->td_base_user_pri; if (prio >= base_pri) { td->td_flags &= ~TDF_UBORROWING; sched_user_prio(td, base_pri); - } else + } else { sched_lend_user_prio(td, prio); + } } /* ==== //depot/projects/toehead/sys/netinet6/dest6.c#2 (text+ko) ==== @@ -1,6 +1,3 @@ -/* $FreeBSD: src/sys/netinet6/dest6.c,v 1.11 2007/07/05 16:23:46 delphij Exp $ */ -/* $KAME: dest6.c,v 1.59 2003/07/11 13:21:16 t-momose Exp $ */ - /*- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. * All rights reserved. @@ -28,8 +25,13 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Dec 12 02:23:33 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BF20616A41A; Wed, 12 Dec 2007 02:23:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5190916A46B for ; Wed, 12 Dec 2007 02:23:33 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4698E13C448 for ; Wed, 12 Dec 2007 02:23:33 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBC2NXk3067912 for ; Wed, 12 Dec 2007 02:23:33 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBC2NUEI067875 for perforce@freebsd.org; Wed, 12 Dec 2007 02:23:30 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Dec 2007 02:23:30 GMT Message-Id: <200712120223.lBC2NUEI067875@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130658 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 02:23:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=130658 Change 130658 by jb@jb_freebsd1 on 2007/12/12 02:22:57 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/nanobsd/article.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#6 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#15 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#14 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#49 integrate .. //depot/projects/dtrace/ports/KNOBS#11 integrate .. //depot/projects/dtrace/ports/MOVED#53 integrate .. //depot/projects/dtrace/src/Makefile#15 integrate .. //depot/projects/dtrace/src/bin/ed/Makefile#5 integrate .. //depot/projects/dtrace/src/contrib/amd/FREEBSD-Xlist#4 integrate .. //depot/projects/dtrace/src/contrib/amd/FREEBSD-upgrade#4 integrate .. //depot/projects/dtrace/src/contrib/gcc/config/sparc/freebsd.h#5 integrate .. //depot/projects/dtrace/src/contrib/gcc/fold-const.c#6 integrate .. //depot/projects/dtrace/src/etc/rc.d/DAEMON#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/LOGIN#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/Makefile#15 integrate .. //depot/projects/dtrace/src/etc/rc.d/NETWORKING#5 integrate .. //depot/projects/dtrace/src/etc/rc.d/SERVERS#5 integrate .. //depot/projects/dtrace/src/etc/rc.d/accounting#5 integrate .. //depot/projects/dtrace/src/etc/rc.d/amd#8 integrate .. //depot/projects/dtrace/src/etc/rc.d/apmd#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/bootconf.sh#6 delete .. //depot/projects/dtrace/src/etc/rc.d/bootparams#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/ccd#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/cron#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/dhclient#8 integrate .. //depot/projects/dtrace/src/etc/rc.d/dmesg#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/fsck#5 integrate .. //depot/projects/dtrace/src/etc/rc.d/ftp-proxy#2 integrate .. //depot/projects/dtrace/src/etc/rc.d/inetd#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/ipfilter#7 integrate .. //depot/projects/dtrace/src/etc/rc.d/ipfs#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/ipmon#5 integrate .. //depot/projects/dtrace/src/etc/rc.d/ipnat#5 integrate .. //depot/projects/dtrace/src/etc/rc.d/ipsec#5 integrate .. //depot/projects/dtrace/src/etc/rc.d/isdnd#6 integrate .. //depot/projects/dtrace/src/etc/rc.d/keyserv#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/ldconfig#5 integrate .. //depot/projects/dtrace/src/etc/rc.d/local#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/lockd#2 integrate .. //depot/projects/dtrace/src/etc/rc.d/lpd#5 integrate .. //depot/projects/dtrace/src/etc/rc.d/motd#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/mountcritlocal#6 integrate .. //depot/projects/dtrace/src/etc/rc.d/mountcritremote#6 integrate .. //depot/projects/dtrace/src/etc/rc.d/mountd#5 integrate .. //depot/projects/dtrace/src/etc/rc.d/moused#6 integrate .. //depot/projects/dtrace/src/etc/rc.d/mrouted#5 integrate .. //depot/projects/dtrace/src/etc/rc.d/newsyslog#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/nfsd#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/power_profile#6 integrate .. //depot/projects/dtrace/src/etc/rc.d/pwcheck#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/quota#5 integrate .. //depot/projects/dtrace/src/etc/rc.d/rarpd#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/resolv#5 integrate .. //depot/projects/dtrace/src/etc/rc.d/root#5 integrate .. //depot/projects/dtrace/src/etc/rc.d/route6d#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/routed#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/rpcbind#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/rtadvd#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/rwho#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/savecore#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/securelevel#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/sendmail#5 integrate .. //depot/projects/dtrace/src/etc/rc.d/sshd#6 integrate .. //depot/projects/dtrace/src/etc/rc.d/statd#2 integrate .. //depot/projects/dtrace/src/etc/rc.d/swap1#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/sysctl#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/syslogd#5 integrate .. //depot/projects/dtrace/src/etc/rc.d/timed#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/tmp#5 integrate .. //depot/projects/dtrace/src/etc/rc.d/ugidfw#5 integrate .. //depot/projects/dtrace/src/etc/rc.d/var#6 integrate .. //depot/projects/dtrace/src/etc/rc.d/virecover#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/ypbind#5 integrate .. //depot/projects/dtrace/src/etc/rc.d/yppasswdd#5 integrate .. //depot/projects/dtrace/src/etc/rc.d/ypserv#5 integrate .. //depot/projects/dtrace/src/games/fortune/datfiles/fortunes#24 integrate .. //depot/projects/dtrace/src/games/fortune/datfiles/fortunes-o.real#8 integrate .. //depot/projects/dtrace/src/games/fortune/datfiles/fortunes-o.sp.ok#5 integrate .. //depot/projects/dtrace/src/games/fortune/datfiles/fortunes.sp.ok#6 integrate .. //depot/projects/dtrace/src/lib/Makefile#17 integrate .. //depot/projects/dtrace/src/lib/libc/gdtoa/_ldtoa.c#6 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/vfscanf.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/stdio/vfwscanf.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/stdlib/rand.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/sys/access.2#5 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_mutex.c#14 integrate .. //depot/projects/dtrace/src/release/Makefile#17 integrate .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/Makefile#4 integrate .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/errata/Makefile#4 integrate .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/hardware/Makefile#4 integrate .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/hardware/Makefile.inc#4 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/hardware/amd64/Makefile#4 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/hardware/amd64/article.sgml#4 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/hardware/amd64/proc-amd64.sgml#4 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/hardware/article.sgml#1 branch .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml#5 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#7 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/hardware/common/hw.ent#5 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/hardware/common/intro.sgml#4 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/hardware/i386/Makefile#4 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/hardware/i386/article.sgml#4 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/hardware/i386/proc-i386.sgml#4 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/installation/Makefile#5 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/installation/Makefile.inc#4 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/installation/amd64/Makefile#4 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/installation/amd64/article.sgml#4 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/installation/common/abstract.sgml#4 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/installation/common/artheader.sgml#5 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/installation/common/install.ent#4 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/installation/common/install.sgml#6 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/installation/common/layout.sgml#5 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/installation/common/trouble.sgml#4 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/installation/common/upgrade.sgml#4 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/installation/i386/Makefile#4 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/installation/i386/article.sgml#4 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/installation/ia64/Makefile#4 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/installation/ia64/article.sgml#4 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/installation/pc98/Makefile#4 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/installation/pc98/article.sgml#4 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/installation/sparc64/Makefile#4 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/installation/sparc64/article.sgml#4 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/installation/sparc64/install.sgml#4 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/readme/article.sgml#4 integrate .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/relnotes/Makefile#5 integrate .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/relnotes/Makefile.inc#4 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/relnotes/amd64/Makefile#4 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/relnotes/amd64/article.sgml#4 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/relnotes/article.sgml#1 branch .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#7 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/relnotes/common/relnotes.ent#4 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/relnotes/i386/Makefile#4 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/relnotes/i386/article.sgml#4 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/relnotes/ia64/Makefile#4 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/relnotes/ia64/article.sgml#4 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/relnotes/pc98/Makefile#4 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/relnotes/pc98/article.sgml#4 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/relnotes/powerpc/Makefile#2 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/relnotes/powerpc/article.sgml#2 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/relnotes/sparc64/Makefile#5 delete .. //depot/projects/dtrace/src/release/doc/zh_CN.GB2312/relnotes/sparc64/article.sgml#4 delete .. //depot/projects/dtrace/src/sbin/bsdlabel/bsdlabel.8#8 integrate .. //depot/projects/dtrace/src/sbin/bsdlabel/bsdlabel.c#5 integrate .. //depot/projects/dtrace/src/sbin/ifconfig/ifconfig.8#16 integrate .. //depot/projects/dtrace/src/sbin/ifconfig/ifconfig.c#9 integrate .. //depot/projects/dtrace/src/sbin/natd/natd.8#4 integrate .. //depot/projects/dtrace/src/sbin/newfs_msdos/newfs_msdos.8#4 integrate .. //depot/projects/dtrace/src/share/man/man4/nve.4#5 integrate .. //depot/projects/dtrace/src/share/man/man5/hosts.equiv.5#5 integrate .. //depot/projects/dtrace/src/share/man/man5/src.conf.5#11 integrate .. //depot/projects/dtrace/src/share/man/man7/build.7#8 integrate .. //depot/projects/dtrace/src/share/mk/bsd.own.mk#17 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/identcpu.c#9 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#27 integrate .. //depot/projects/dtrace/src/sys/amd64/include/specialreg.h#9 integrate .. //depot/projects/dtrace/src/sys/arm/arm/pmap.c#24 integrate .. //depot/projects/dtrace/src/sys/cam/scsi/scsi_da.c#13 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_misc.c#13 integrate .. //depot/projects/dtrace/src/sys/conf/files.amd64#24 integrate .. //depot/projects/dtrace/src/sys/conf/files.i386#28 integrate .. //depot/projects/dtrace/src/sys/dev/arcmsr/arcmsr.c#10 integrate .. //depot/projects/dtrace/src/sys/dev/arcmsr/arcmsr.h#6 integrate .. //depot/projects/dtrace/src/sys/dev/if_ndis/if_ndis.c#11 integrate .. //depot/projects/dtrace/src/sys/dev/usb/umass.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usbdevs#22 integrate .. //depot/projects/dtrace/src/sys/fs/udf/udf_vfsops.c#11 integrate .. //depot/projects/dtrace/src/sys/geom/geom_bsd_enc.c#4 integrate .. //depot/projects/dtrace/src/sys/geom/part/g_part.c#5 integrate .. //depot/projects/dtrace/src/sys/geom/part/g_part_bsd.c#2 integrate .. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#23 integrate .. //depot/projects/dtrace/src/sys/kern/kern_proc.c#14 integrate .. //depot/projects/dtrace/src/sys/kern/kern_resource.c#13 integrate .. //depot/projects/dtrace/src/sys/kern/sched_4bsd.c#27 integrate .. //depot/projects/dtrace/src/sys/kern/sched_ule.c#19 integrate .. //depot/projects/dtrace/src/sys/net/bridgestp.c#16 integrate .. //depot/projects/dtrace/src/sys/net/bridgestp.h#10 integrate .. //depot/projects/dtrace/src/sys/net/if.h#7 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_fw2.c#24 integrate .. //depot/projects/dtrace/src/sys/netinet6/dest6.c#5 integrate .. //depot/projects/dtrace/src/sys/netinet6/frag6.c#10 integrate .. //depot/projects/dtrace/src/sys/netinet6/icmp6.c#10 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6.c#12 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6.h#5 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_cksum.c#7 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_gif.c#7 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_gif.h#4 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_ifattach.c#9 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_ifattach.h#4 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_pcb.c#11 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_pcb.h#6 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_proto.c#8 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_rmx.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_src.c#9 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_var.h#6 integrate .. //depot/projects/dtrace/src/sys/netinet6/ip6_ecn.h#4 integrate .. //depot/projects/dtrace/src/sys/netinet6/ip6_forward.c#9 integrate .. //depot/projects/dtrace/src/sys/netinet6/ip6_id.c#5 integrate .. //depot/projects/dtrace/src/sys/netinet6/ip6_input.c#8 integrate .. //depot/projects/dtrace/src/sys/netinet6/ip6_ipsec.c#2 integrate .. //depot/projects/dtrace/src/sys/netinet6/ip6_ipsec.h#2 integrate .. //depot/projects/dtrace/src/sys/netinet6/ip6_mroute.c#8 integrate .. //depot/projects/dtrace/src/sys/netinet6/ip6_mroute.h#6 integrate .. //depot/projects/dtrace/src/sys/netinet6/ip6_output.c#8 integrate .. //depot/projects/dtrace/src/sys/netinet6/ip6_var.h#5 integrate .. //depot/projects/dtrace/src/sys/netinet6/ip6protosw.h#4 integrate .. //depot/projects/dtrace/src/sys/netinet6/mld6.c#7 integrate .. //depot/projects/dtrace/src/sys/netinet6/mld6_var.h#4 integrate .. //depot/projects/dtrace/src/sys/netinet6/nd6.c#14 integrate .. //depot/projects/dtrace/src/sys/netinet6/nd6.h#4 integrate .. //depot/projects/dtrace/src/sys/netinet6/nd6_nbr.c#7 integrate .. //depot/projects/dtrace/src/sys/netinet6/nd6_rtr.c#7 integrate .. //depot/projects/dtrace/src/sys/netinet6/pim6.h#4 integrate .. //depot/projects/dtrace/src/sys/netinet6/pim6_var.h#4 integrate .. //depot/projects/dtrace/src/sys/netinet6/raw_ip6.c#7 integrate .. //depot/projects/dtrace/src/sys/netinet6/raw_ip6.h#4 integrate .. //depot/projects/dtrace/src/sys/netinet6/route6.c#5 integrate .. //depot/projects/dtrace/src/sys/netinet6/scope6.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet6/scope6_var.h#4 integrate .. //depot/projects/dtrace/src/sys/netinet6/sctp6_usrreq.c#7 integrate .. //depot/projects/dtrace/src/sys/netinet6/sctp6_var.h#4 integrate .. //depot/projects/dtrace/src/sys/netinet6/tcp6_var.h#4 integrate .. //depot/projects/dtrace/src/sys/netinet6/udp6_usrreq.c#13 integrate .. //depot/projects/dtrace/src/sys/netinet6/udp6_var.h#5 integrate .. //depot/projects/dtrace/src/sys/sys/cdefs.h#5 integrate .. //depot/projects/dtrace/src/sys/sys/disklabel.h#6 integrate .. //depot/projects/dtrace/src/sys/vm/vm_page.c#26 integrate .. //depot/projects/dtrace/src/tools/build/options/WITHOUT_INSTALLLIB#1 branch .. //depot/projects/dtrace/src/tools/build/options/WITHOUT_KERBEROS#3 integrate .. //depot/projects/dtrace/src/tools/build/options/WITH_GSSAPI#1 branch .. //depot/projects/dtrace/src/tools/regression/lib/libc/stdio/test-scanfloat.c#6 integrate .. //depot/projects/dtrace/src/tools/regression/lib/msun/test-lround.c#4 integrate .. //depot/projects/dtrace/src/tools/regression/lib/msun/test-next.c#4 integrate .. //depot/projects/dtrace/src/usr.bin/make/Makefile.dist#4 integrate .. //depot/projects/dtrace/src/usr.bin/procstat/procstat_args.c#2 integrate .. //depot/projects/dtrace/src/usr.bin/procstat/procstat_bin.c#2 integrate .. //depot/projects/dtrace/src/usr.bin/procstat/procstat_cred.c#2 integrate .. //depot/projects/dtrace/src/usr.bin/procstat/procstat_files.c#2 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/Makefile#5 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/add/pkg_add.1#5 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/create/pkg_create.1#4 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/delete/pkg_delete.1#4 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/info/pkg_info.1#6 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/updating/pkg_updating.1#2 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/version/pkg_version.1#4 integrate .. //depot/projects/dtrace/src/usr.sbin/sysinstall/media.c#4 integrate .. //depot/projects/dtrace/src/usr.sbin/sysinstall/system.c#5 integrate .. //depot/projects/dtrace/src/usr.sbin/syslogd/syslogd.c#7 integrate .. //depot/projects/dtrace/src/usr.sbin/timed/timed/timed.8#4 integrate .. //depot/projects/dtrace/www/en/platforms/amd64.sgml#5 integrate .. //depot/projects/dtrace/www/en/releases/6.3R/schedule.sgml#4 integrate .. //depot/projects/dtrace/www/en/releases/7.0R/schedule.sgml#9 integrate .. //depot/projects/dtrace/www/en/releng/index.sgml#24 integrate .. //depot/projects/dtrace/www/en/snapshots/index.sgml#19 integrate .. //depot/projects/dtrace/www/share/sgml/commercial.consult.xml#10 integrate .. //depot/projects/dtrace/www/share/sgml/events.xml#14 integrate .. //depot/projects/dtrace/www/share/sgml/news.xml#27 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/nanobsd/article.sgml#3 (text+ko) ==== @@ -15,7 +15,7 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/nanobsd/article.sgml,v 1.1 2006/05/16 13:58:44 keramida Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/nanobsd/article.sgml,v 1.2 2007/12/10 21:44:19 blackend Exp $ 2006 @@ -434,7 +434,7 @@ According to which services are available on host serving new NanoBSD image and what type of - transfer is prefered, it is possible to examine one of these + transfer is preferred, it is possible to examine one of these three ways: @@ -450,7 +450,7 @@ Using &man.ssh.1; - If a secure transfer is prefered, consider using this + If a secure transfer is preferred, consider using this example: &prompt.root; ssh myhost cat _.disk.image.gz | zcat | sh updatep1 @@ -471,7 +471,7 @@ Make sure that the used port is not blocked to - receive incomming connections from + receive incoming connections from NanoBSD host by firewall. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#6 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -290,6 +290,41 @@ booting process and the programs involved. + + + Changing Console Video Modes + + The FreeBSD console default video mode may be adjusted to + 1024x768, 1280x1024, or any other size supported by your + graphics chip and monitor. To use a different video mode, you + first must recompile your kernel and include two additional + options: + + OPTIONS VESA +OPTIONS SC_PIXEL_MODE + + Once the kernel has been recompiled with these two + options, you can then determine what video modes are supported + by your hardware by using the &man.vidcontrol.1; utility. To + get a list of supported video modes, type the following in a + root console: + + &prompt.root; vidcontrol -i mode + + The output of this command is a list of video modes that + are supported by your hardware. You can then choose to use a + new video mode by passing it to vidcontrol in a root console, + as in this example: + + &prompt.root; vidcontrol MODE_279 + + If the new video mode is acceptable, it can be permanently + set on boot by including the following in your + /etc/rc.conf file, again using the above + example: + + allscreens_flags="MODE_279" + ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#15 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -4092,9 +4092,24 @@ located in the Start> Programs > System Tools menu. - &os; can support &ms-dos; based file systems (FAT16 and FAT32). - This requires you use the &man.mount.8; command - with the required parameters. The utility most common usage is: + &os; can support &ms-dos; file systems (sometimes called + FAT file systems). The &man.mount.msdosfs.8; command grafts such file + systems onto the existing directory hierarchy, allowing the file + system's contents to be accessed. &man.mount.msdosfs.8; is not usually + invoked directly; instead, it is called by the system through a line + in /etc/fstab or by a call to the &man.mount.8; + utility with the appropriate parameters. + + A typical line in /etc/fstab is: + + /dev/ad0sN /dos msdosfs rw 0 0 + + The /dos directory must already + exist for this to work. For details about the format of + /etc/fstab, see &man.fstab.5;. + + A typicall call to &man.mount.8; for a &ms-dos; file system + looks like: &prompt.root; mount -t msdosfs /dev/ad0s1 /mnt @@ -4103,13 +4118,12 @@ the dmesg, and mount commands. They should produce enough information to give an idea of the partition layout. - Extended &ms-dos; file systems are usually mapped after the &os; - partitions. In other words, the slice number may be higher than the ones - &os; is using. For instance, the first &ms-dos; partition may be - /dev/ad0s1, the &os; partition may be - /dev/ad0s2, with the extended &ms-dos; partition being - located on /dev/ad0s3. To some, this can be confusing - at first. + &os; may number disk slices (that is, &ms-dos; partitions) + differently than other operating systems. In particular, extended + &ms-dos; partitions are usually given higher slice numbers than + primary &ms-dos; partitions. The &man.fdisk.8; utility can help + determine which slices belong to &os; and which belong to other + operating systems. NTFS partitions can also be mounted in a similar manner using the &man.mount.ntfs.8; command. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#14 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -1291,8 +1291,10 @@ doc/el_* doc/es_* doc/fr_* +doc/hu_* doc/it_* doc/ja_* +doc/mn_* doc/nl_* doc/no_* doc/pl_* ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#49 (text+ko) ==== @@ -1,7 +1,7 @@ 800004 + + 8.0-CURRENT after the addition of callgraph + capture functionality to &man.hwpmc.4;. + 800006 + ==== //depot/projects/dtrace/ports/KNOBS#11 (text+ko) ==== @@ -1,7 +1,7 @@ # # KNOBS - A list of popular knobs and descriptions # -# $FreeBSD: ports/KNOBS,v 1.21 2007/09/03 07:09:40 sat Exp $ +# $FreeBSD: ports/KNOBS,v 1.22 2007/12/11 21:21:20 lioux Exp $ # # Rules to adding knobs: # @@ -103,6 +103,7 @@ THEORA Theora video codec support TREMOR Tremor (integer-only Vorbis) audio support UNIXODBC Use UNIXODBC as the ODBC driver +USB Add devel/libusb support for USB devices VORBIS OGG/Vorbis audio support WX wxWindows support X11 Support for X11 ==== //depot/projects/dtrace/ports/MOVED#53 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1513 2007/12/03 09:43:40 dougb Exp $ +# $FreeBSD: ports/MOVED,v 1.1517 2007/12/11 21:47:57 lioux Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -3329,3 +3329,9 @@ dns/bind8||2007-12-03|EOL: Use dns/bind94 instead dns/bind84||2007-12-03|EOL: Use dns/bind94 instead mail/smc-milter||2007-12-03|Relies on BIND 8, which is EOL +net-p2p/xmule||2007-12-11|It is no longer developed +audio/liba52-devel||2007-12-11|Does not work +www/squid25||2007-12-11|Has expired: This version is no longer supported by the developers +x11-themes/kde-icons-gorilla_svg||2007-12-11|Unfetchable +x11-themes/kde-icons-kids||2007-12-11|Unfetchable +x11-themes/kde-icons-outline||2007-12-11|Unfetchable ==== //depot/projects/dtrace/src/Makefile#15 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.342 2007/10/18 08:41:52 delphij Exp $ +# $FreeBSD: src/Makefile,v 1.343 2007/12/11 20:00:55 imp Exp $ # # The user-driven targets are: # @@ -234,17 +234,19 @@ PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \ PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \ then \ - (cd ${.CURDIR} && make make); \ + (cd ${.CURDIR} && ${BSDMAKE} make); \ fi # # Upgrade make(1) to the current version using the installed -# headers, libraries and tools. +# headers, libraries and tools. Also, allow the location of +# the system bsdmake-like utility to be overridden. # +BSDMAKE?=make MMAKEENV= MAKEOBJDIRPREFIX=${MAKEPATH} \ DESTDIR= \ INSTALL="sh ${.CURDIR}/tools/install.sh" -MMAKE= ${MMAKEENV} make \ +MMAKE= ${MMAKEENV} ${BSDMAKE} \ -D_UPGRADING \ -DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \ -DNO_CPU_CFLAGS -DNO_WERROR ==== //depot/projects/dtrace/src/bin/ed/Makefile#5 (text+ko) ==== @@ -1,16 +1,16 @@ -# $FreeBSD: src/bin/ed/Makefile,v 1.33 2007/07/02 14:00:25 kensmith Exp $ +# $FreeBSD: src/bin/ed/Makefile,v 1.34 2007/12/09 00:14:27 marius Exp $ .include PROG= ed SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c +WARNS?= 2 LINKS= ${BINDIR}/ed ${BINDIR}/red MLINKS= ed.1 red.1 .if !defined(RELEASE_CRUNCH) .if ${MK_OPENSSL} != "no" CFLAGS+=-DDES -WARNS?= 2 DPADD= ${LIBCRYPTO} LDADD= -lcrypto .endif ==== //depot/projects/dtrace/src/contrib/amd/FREEBSD-Xlist#4 (text+ko) ==== @@ -1,7 +1,8 @@ -$FreeBSD: src/contrib/amd/FREEBSD-Xlist,v 1.5 2004/07/06 12:52:27 mbr Exp $ +$FreeBSD: src/contrib/amd/FREEBSD-Xlist,v 1.6 2007/12/11 19:15:17 obrien Exp $ *LSM.am-utils *Makefile.* *README.autofs +*README.osx *ac*.m4 *.old *acconfig.h @@ -15,6 +16,7 @@ *missing *mkinstalldirs *stamp-h.in +*amd/test1.sh *amd/Makefile.* *amq/Makefile.* *commit @@ -38,10 +40,13 @@ *conf/fh_dref/fh_dref_sunos3.h *conf/fh_dref/fh_dref_sunos4.h *conf/fh_dref/fh_dref_svr4.h +*conf/hn_dref/hn_dref_default.h, *conf/hn_dref/hn_dref_isc3.h *conf/hn_dref/hn_dref_linux.h *conf/mount/mount_aix.c +*conf/mount/mount_aix3.c *conf/mount/mount_bsdi3.c +*conf/mount/mount_default.c *conf/mount/mount_freebsd3.c *conf/mount/mount_hpux.c *conf/mount/mount_irix5.c @@ -54,6 +59,7 @@ *conf/mtab/mtab_aix.c *conf/mtab/mtab_file.c *conf/mtab/mtab_isc3.c +*conf/mtab/mtab_linux.c *conf/mtab/mtab_mach3.c *conf/mtab/mtab_osf.c *conf/mtab/mtab_svr4.c @@ -63,6 +69,7 @@ *conf/nfs_prot/nfs_prot_aix4_2.h *conf/nfs_prot/nfs_prot_aix4_3.h *conf/nfs_prot/nfs_prot_aix5_1.h +*conf/nfs_prot/nfs_prot_aix5_2.h *conf/nfs_prot/nfs_prot_bsdi2.h *conf/nfs_prot/nfs_prot_bsdi3.h *conf/nfs_prot/nfs_prot_darwin.h @@ -92,6 +99,12 @@ *conf/nfs_prot/nfs_prot_sunos5_8.h *conf/nfs_prot/nfs_prot_svr4.h *conf/nfs_prot/nfs_prot_ultrix.h +*conf/autofs/autofs_linux.h +*conf/autofs/autofs_linux.c +*conf/autofs/autofs_solaris_v1.h +*conf/autofs/autofs_solaris_v1.c +*conf/autofs/autofs_solaris_v2_v3.h +*conf/autofs/autofs_solaris_v2_v3.c *conf/sa_dref/sa_dref_386bsd.h *conf/sa_dref/sa_dref_aix3.h *conf/sa_dref/sa_dref_aoi.h @@ -103,6 +116,7 @@ *conf/trap/trap_aix3.h *conf/trap/trap_aux.h *conf/trap/trap_dgux.h +*conf/trap/trap_freebsd3.h *conf/trap/trap_hcx.h *conf/trap/trap_hpux.h *conf/trap/trap_hpux11.h @@ -115,7 +129,9 @@ *conf/trap/trap_stellix.h *conf/trap/trap_svr4.h *conf/trap/trap_ultrix.h +*conf/umount/umount_aix.c *conf/umount/umount_default.c +*conf/umount/umount_linux.c *conf/umount/umount_osf.c *doc/Makefile.am *doc/Makefile.in @@ -135,11 +151,118 @@ *fsinfo/Makefile.* *hlfsd/Makefile.* *libamu/Makefile.* +*libamu/alloca.c *libamu/clnt_sperrno.c *libamu/memcmp.c *libamu/strcasecmp.c *libamu/strdup.c *libamu/strstr.c +*libamu/strlcat.c +*libamu/strlcpy.c *libamu/ualarm.c *mk-amd-map/Makefile.* *wire-test/Makefile.* +*m4/GNUmakefile +*m4/amdgrep* +*m4/amindent* +*m4/autopat* +*m4/chop-aclocal.pl* +*m4/copy-if-newbig* +*m4/mk-aclocal* +*m4/mkconf* +*m4/rmtspc* +*m4/update_build_version* +*m4/macros/HEADER +*m4/macros/TRAILER +*m4/macros/c_void_p.m4 +*m4/macros/cache_check_dynamic.m4 +*m4/macros/check_amu_fs.m4 +*m4/macros/check_checkmount_style.m4 +*m4/macros/check_extern.m4 +*m4/macros/check_fhandle.m4 +*m4/macros/check_field.m4 +*m4/macros/check_fs_headers.m4 +*m4/macros/check_fs_mntent.m4 +*m4/macros/check_gnu_getopt.m4 +*m4/macros/check_hide_mount_type.m4 +*m4/macros/check_lib2.m4 +*m4/macros/check_map_funcs.m4 +*m4/macros/check_mnt2_cdfs_opt.m4 +*m4/macros/check_mnt2_gen_opt.m4 +*m4/macros/check_mnt2_nfs_opt.m4 +*m4/macros/check_mnttab_file_name.m4 +*m4/macros/check_mnttab_location.m4 +*m4/macros/check_mnttab_opt.m4 +*m4/macros/check_mnttab_style.m4 +*m4/macros/check_mnttab_type.m4 +*m4/macros/check_mount_style.m4 +*m4/macros/check_mount_trap.m4 +*m4/macros/check_mount_type.m4 +*m4/macros/check_mtype_printf_type.m4 +*m4/macros/check_mtype_type.m4 +*m4/macros/check_network_transport_type.m4 +*m4/macros/check_nfs_fh_dref.m4 +*m4/macros/check_nfs_hn_dref.m4 +*m4/macros/check_nfs_prot_headers.m4 +*m4/macros/check_nfs_sa_dref.m4 +*m4/macros/check_nfs_socket_connection.m4 +*m4/macros/check_os_libs.m4 +*m4/macros/check_restartable_signal_handler.m4 +*m4/macros/check_umount_style.m4 +*m4/macros/check_unmount_args.m4 +*m4/macros/check_unmount_call.m4 +*m4/macros/expand_cpp_hex.m4 +*m4/macros/expand_cpp_int.m4 +*m4/macros/expand_cpp_string.m4 +*m4/macros/expand_run_string.m4 +*m4/macros/extern_optarg.m4 +*m4/macros/extern_sys_errlist.m4 +*m4/macros/field_mntent_t_mnt_time_string.m4 +*m4/macros/func_bad_memcmp.m4 +*m4/macros/func_bad_yp_all.m4 +*m4/macros/header_templates.m4 +*m4/macros/host_macros.m4 +*m4/macros/linux_headers.m4 +*m4/macros/localconfig.m4 +*m4/macros/mount_headers.m4 +*m4/macros/name_package.m4 +*m4/macros/name_version.m4 +*m4/macros/opt_amu_cflags.m4 +*m4/macros/opt_cppflags.m4 +*m4/macros/opt_debug.m4 +*m4/macros/opt_ldflags.m4 +*m4/macros/opt_libs.m4 +*m4/macros/os_cflags.m4 +*m4/macros/os_cppflags.m4 +*m4/macros/os_ldflags.m4 +*m4/macros/package_bugreport.m4 +*m4/macros/package_name.m4 +*m4/macros/package_version.m4 +*m4/macros/save_state.m4 +*m4/macros/struct_field_nfs_fh.m4 +*m4/macros/struct_mntent.m4 +*m4/macros/struct_mnttab.m4 +*m4/macros/struct_nfs_args.m4 +*m4/macros/struct_nfs_fh.m4 +*m4/macros/struct_nfs_fh3.m4 +*m4/macros/struct_nfs_gfs_mount.m4 +*m4/macros/try_compile_anyfs.m4 +*m4/macros/try_compile_nfs.m4 +*m4/macros/try_compile_rpc.m4 +*m4/macros/type_auth_create_gidlist.m4 +*m4/macros/type_cachefs_args.m4 +*m4/macros/type_cdfs_args.m4 +*m4/macros/type_efs_args.m4 +*m4/macros/type_lofs_args.m4 +*m4/macros/type_mfs_args.m4 +*m4/macros/type_pcfs_args.m4 +*m4/macros/type_recvfrom_fromlen.m4 +*m4/macros/type_rfs_args.m4 +*m4/macros/type_svc_in_arg.m4 +*m4/macros/type_time_t.m4 +*m4/macros/type_tmpfs_args.m4 +*m4/macros/type_ufs_args.m4 +*m4/macros/type_xdrproc_t.m4 +*m4/macros/type_xfs_args.m4 +*m4/macros/type_yp_order_outorder.m4 +*m4/macros/with_addon.m4 ==== //depot/projects/dtrace/src/contrib/amd/FREEBSD-upgrade#4 (text+ko) ==== @@ -1,21 +1,19 @@ # ex:ts=8 -$FreeBSD: src/contrib/amd/FREEBSD-upgrade,v 1.15 2004/05/14 13:29:48 mbr Exp $ +$FreeBSD: src/contrib/amd/FREEBSD-upgrade,v 1.16 2007/12/11 19:16:51 obrien Exp $ -AMD (am-utils) 6.0.9 - originals can be found at: ftp://shekel.mcl.cs.columbia.edu/pub/am-utils/ - (http://www.cs.columbia.edu/~ezk/am-utils/index.html) - +AMD (am-utils) 6.1.5 + originals can be found at: ftp://ftp.am-utils.org/pub/am-utils/ For the import of AMD many files were pruned by: - tar -X FREEBSD-Xlist -xzf am-utils-6.0.9.tar.gz + tar -X FREEBSD-Xlist -xf am-utils-6.1.5.tar.gz and `find . -name '.cvsignore' -delete` Then imported by: - cvs import -m 'Virgin import of AMD (am-utils) v6.0.9' \ - src/contrib/amd COLUMBIA amd_6_0_9 + cvs import -m 'Virgin import of AMD (am-utils) v6.1.5' \ + src/contrib/amd COLUMBIA amd_6_1_5 After the import, a separate extraction of am-utils was GNU configured in the "normal" way. The resulting config.h file should be compared with @@ -25,8 +23,11 @@ To make local changes to amd, simply patch and commit to the main branch (aka HEAD). Never make local changes on the vendor (COLUMBIA) branch. -All local changes should be submitted to "amd-dev@majordomo.cs.columbia.edu" -for inclusion in the next vendor release. +Note, we don't trim anything in scripts/ as sysadmins may find the bits +as a useful reference. + +All local changes should be submitted to "am-utils@am-utils.org" or +https://bugzilla.am-utils.org for inclusion in the next vendor release. Local changes: ==== //depot/projects/dtrace/src/contrib/gcc/config/sparc/freebsd.h#5 (text+ko) ==== @@ -19,24 +19,26 @@ the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* $FreeBSD: src/contrib/gcc/config/sparc/freebsd.h,v 1.10 2007/05/19 02:30:20 kan Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/sparc/freebsd.h,v 1.11 2007/12/09 17:41:47 marius Exp $ */ #undef SUBTARGET_EXTRA_SPECS #define SUBTARGET_EXTRA_SPECS \ { "fbsd_dynamic_linker", FBSD_DYNAMIC_LINKER } /* FreeBSD needs the platform name (sparc64) defined. - Emacs needs to know if the arch is 64 or 32-bits. */ - -#undef CPP_CPU64_DEFAULT_SPEC -#define CPP_CPU64_DEFAULT_SPEC \ - "-D__sparc64__ -D__sparc_v9__ -D__sparcv9 -D__sparc__ -D__arch64__" + Emacs needs to know if the arch is 64 or 32-bits. + This also selects which targets are available via -mcpu. */ #undef FBSD_TARGET_CPU_CPP_BUILTINS #define FBSD_TARGET_CPU_CPP_BUILTINS() \ do \ { \ builtin_define ("__LP64__"); \ + builtin_define ("__sparc64__"); \ + builtin_define ("__sparc_v9__"); \ + builtin_define ("__sparcv9"); \ + builtin_define ("__sparc__"); \ + builtin_define ("__arch64__"); \ } \ while (0) ==== //depot/projects/dtrace/src/contrib/gcc/fold-const.c#6 (text+ko) ==== @@ -5661,6 +5661,9 @@ } break; } + /* If the constant is negative, we cannot simplify this. */ + if (tree_int_cst_sgn (c) == -1) + break; /* FALLTHROUGH */ case NEGATE_EXPR: if ((t1 = extract_muldiv (op0, c, code, wide_type, strict_overflow_p)) ==== //depot/projects/dtrace/src/etc/rc.d/DAEMON#4 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: DAEMON,v 1.8 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/DAEMON,v 1.5 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/DAEMON,v 1.6 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: DAEMON ==== //depot/projects/dtrace/src/etc/rc.d/LOGIN#4 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: LOGIN,v 1.7 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/LOGIN,v 1.5 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/LOGIN,v 1.6 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: LOGIN ==== //depot/projects/dtrace/src/etc/rc.d/Makefile#15 (text+ko) ==== @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.87 2007/10/25 18:10:05 mtm Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.88 2007/12/08 07:20:22 dougb Exp $ .include ==== //depot/projects/dtrace/src/etc/rc.d/NETWORKING#5 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: NETWORKING,v 1.2 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/NETWORKING,v 1.13 2007/06/02 05:25:19 dougb Exp $ +# $FreeBSD: src/etc/rc.d/NETWORKING,v 1.14 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: NETWORKING NETWORK ==== //depot/projects/dtrace/src/etc/rc.d/SERVERS#5 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: SERVERS,v 1.9 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/SERVERS,v 1.7 2006/04/19 05:10:34 delphij Exp $ +# $FreeBSD: src/etc/rc.d/SERVERS,v 1.8 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: SERVERS ==== //depot/projects/dtrace/src/etc/rc.d/accounting#5 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: accounting,v 1.7 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/accounting,v 1.10 2006/12/30 22:53:20 yar Exp $ +# $FreeBSD: src/etc/rc.d/accounting,v 1.11 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: accounting ==== //depot/projects/dtrace/src/etc/rc.d/amd#8 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: amd,v 1.10 2002/04/29 12:08:17 lukem Exp $ -# $FreeBSD: src/etc/rc.d/amd,v 1.20 2007/10/25 16:59:06 mtm Exp $ +# $FreeBSD: src/etc/rc.d/amd,v 1.21 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: amd ==== //depot/projects/dtrace/src/etc/rc.d/apmd#4 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: apmd,v 1.5 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/apmd,v 1.12 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/apmd,v 1.13 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: apmd ==== //depot/projects/dtrace/src/etc/rc.d/bootparams#4 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: bootparams,v 1.6 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/bootparams,v 1.7 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/bootparams,v 1.8 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: bootparams ==== //depot/projects/dtrace/src/etc/rc.d/ccd#4 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: ccd,v 1.3 2000/05/13 08:45:06 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ccd,v 1.5 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ccd,v 1.6 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: disks ==== //depot/projects/dtrace/src/etc/rc.d/cron#4 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: cron,v 1.5 2000/09/19 13:04:38 lukem Exp $ -# $FreeBSD: src/etc/rc.d/cron,v 1.7 2005/01/16 03:12:03 obrien Exp $ +# $FreeBSD: src/etc/rc.d/cron,v 1.8 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: cron ==== //depot/projects/dtrace/src/etc/rc.d/dhclient#8 (text+ko) ==== @@ -1,12 +1,10 @@ #!/bin/sh # -# $NetBSD: dhclient,v 1.8 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/dhclient,v 1.28 2007/03/25 19:45:20 mtm Exp $ +# $FreeBSD: src/etc/rc.d/dhclient,v 1.30 2007/12/08 22:27:18 dougb Exp $ # # PROVIDE: dhclient # KEYWORD: nojail nostart -# >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Dec 12 02:31:45 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9550F16A46B; Wed, 12 Dec 2007 02:31:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 44F6A16A468 for ; Wed, 12 Dec 2007 02:31:45 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3A3C113C45B for ; Wed, 12 Dec 2007 02:31:45 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBC2VjnO069110 for ; Wed, 12 Dec 2007 02:31:45 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBC2VfGw069107 for perforce@freebsd.org; Wed, 12 Dec 2007 02:31:41 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Dec 2007 02:31:41 GMT Message-Id: <200712120231.lBC2VfGw069107@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130659 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 02:31:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=130659 Change 130659 by jb@jb_freebsd1 on 2007/12/12 02:30:51 IFC Affected files ... .. //depot/projects/binutils/src/Makefile#4 integrate .. //depot/projects/binutils/src/bin/ed/Makefile#3 integrate .. //depot/projects/binutils/src/contrib/amd/FREEBSD-Xlist#2 integrate .. //depot/projects/binutils/src/contrib/amd/FREEBSD-upgrade#2 integrate .. //depot/projects/binutils/src/contrib/gcc/config/sparc/freebsd.h#3 integrate .. //depot/projects/binutils/src/contrib/gcc/fold-const.c#3 integrate .. //depot/projects/binutils/src/etc/rc.d/DAEMON#2 integrate .. //depot/projects/binutils/src/etc/rc.d/LOGIN#2 integrate .. //depot/projects/binutils/src/etc/rc.d/Makefile#3 integrate .. //depot/projects/binutils/src/etc/rc.d/NETWORKING#3 integrate .. //depot/projects/binutils/src/etc/rc.d/SERVERS#2 integrate .. //depot/projects/binutils/src/etc/rc.d/accounting#3 integrate .. //depot/projects/binutils/src/etc/rc.d/amd#3 integrate .. //depot/projects/binutils/src/etc/rc.d/apmd#2 integrate .. //depot/projects/binutils/src/etc/rc.d/bootconf.sh#3 delete .. //depot/projects/binutils/src/etc/rc.d/bootparams#2 integrate .. //depot/projects/binutils/src/etc/rc.d/ccd#2 integrate .. //depot/projects/binutils/src/etc/rc.d/cron#2 integrate .. //depot/projects/binutils/src/etc/rc.d/dhclient#3 integrate .. //depot/projects/binutils/src/etc/rc.d/dmesg#2 integrate .. //depot/projects/binutils/src/etc/rc.d/fsck#3 integrate .. //depot/projects/binutils/src/etc/rc.d/ftp-proxy#2 integrate .. //depot/projects/binutils/src/etc/rc.d/inetd#2 integrate .. //depot/projects/binutils/src/etc/rc.d/ipfilter#3 integrate .. //depot/projects/binutils/src/etc/rc.d/ipfs#2 integrate .. //depot/projects/binutils/src/etc/rc.d/ipmon#3 integrate .. //depot/projects/binutils/src/etc/rc.d/ipnat#3 integrate .. //depot/projects/binutils/src/etc/rc.d/ipsec#3 integrate .. //depot/projects/binutils/src/etc/rc.d/isdnd#3 integrate .. //depot/projects/binutils/src/etc/rc.d/keyserv#2 integrate .. //depot/projects/binutils/src/etc/rc.d/ldconfig#3 integrate .. //depot/projects/binutils/src/etc/rc.d/local#2 integrate .. //depot/projects/binutils/src/etc/rc.d/lockd#2 integrate .. //depot/projects/binutils/src/etc/rc.d/lpd#3 integrate .. //depot/projects/binutils/src/etc/rc.d/motd#2 integrate .. //depot/projects/binutils/src/etc/rc.d/mountcritlocal#3 integrate .. //depot/projects/binutils/src/etc/rc.d/mountcritremote#3 integrate .. //depot/projects/binutils/src/etc/rc.d/mountd#3 integrate .. //depot/projects/binutils/src/etc/rc.d/moused#3 integrate .. //depot/projects/binutils/src/etc/rc.d/mrouted#2 integrate .. //depot/projects/binutils/src/etc/rc.d/newsyslog#2 integrate .. //depot/projects/binutils/src/etc/rc.d/nfsd#2 integrate .. //depot/projects/binutils/src/etc/rc.d/power_profile#3 integrate .. //depot/projects/binutils/src/etc/rc.d/pwcheck#2 integrate .. //depot/projects/binutils/src/etc/rc.d/quota#3 integrate .. //depot/projects/binutils/src/etc/rc.d/rarpd#2 integrate .. //depot/projects/binutils/src/etc/rc.d/resolv#3 integrate .. //depot/projects/binutils/src/etc/rc.d/root#3 integrate .. //depot/projects/binutils/src/etc/rc.d/route6d#2 integrate .. //depot/projects/binutils/src/etc/rc.d/routed#2 integrate .. //depot/projects/binutils/src/etc/rc.d/rpcbind#2 integrate .. //depot/projects/binutils/src/etc/rc.d/rtadvd#2 integrate .. //depot/projects/binutils/src/etc/rc.d/rwho#2 integrate .. //depot/projects/binutils/src/etc/rc.d/savecore#2 integrate .. //depot/projects/binutils/src/etc/rc.d/securelevel#2 integrate .. //depot/projects/binutils/src/etc/rc.d/sendmail#3 integrate .. //depot/projects/binutils/src/etc/rc.d/sshd#2 integrate .. //depot/projects/binutils/src/etc/rc.d/statd#2 integrate .. //depot/projects/binutils/src/etc/rc.d/swap1#2 integrate .. //depot/projects/binutils/src/etc/rc.d/sysctl#2 integrate .. //depot/projects/binutils/src/etc/rc.d/syslogd#3 integrate .. //depot/projects/binutils/src/etc/rc.d/timed#2 integrate .. //depot/projects/binutils/src/etc/rc.d/tmp#3 integrate .. //depot/projects/binutils/src/etc/rc.d/ugidfw#3 integrate .. //depot/projects/binutils/src/etc/rc.d/var#3 integrate .. //depot/projects/binutils/src/etc/rc.d/virecover#2 integrate .. //depot/projects/binutils/src/etc/rc.d/ypbind#3 integrate .. //depot/projects/binutils/src/etc/rc.d/yppasswdd#3 integrate .. //depot/projects/binutils/src/etc/rc.d/ypserv#3 integrate .. //depot/projects/binutils/src/games/fortune/datfiles/fortunes#4 integrate .. //depot/projects/binutils/src/games/fortune/datfiles/fortunes-o.real#4 integrate .. //depot/projects/binutils/src/games/fortune/datfiles/fortunes-o.sp.ok#3 integrate .. //depot/projects/binutils/src/games/fortune/datfiles/fortunes.sp.ok#4 integrate .. //depot/projects/binutils/src/lib/Makefile#3 integrate .. //depot/projects/binutils/src/lib/libc/gdtoa/_ldtoa.c#4 integrate .. //depot/projects/binutils/src/lib/libc/stdio/vfscanf.c#3 integrate .. //depot/projects/binutils/src/lib/libc/stdio/vfwscanf.c#3 integrate .. //depot/projects/binutils/src/lib/libc/stdlib/rand.c#3 integrate .. //depot/projects/binutils/src/lib/libc/sys/access.2#3 integrate .. //depot/projects/binutils/src/lib/libthr/thread/thr_mutex.c#3 integrate .. //depot/projects/binutils/src/release/Makefile#4 integrate .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/Makefile#2 integrate .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/errata/Makefile#2 integrate .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/hardware/Makefile#2 integrate .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/hardware/Makefile.inc#2 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/hardware/amd64/Makefile#2 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/hardware/amd64/article.sgml#2 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/hardware/amd64/proc-amd64.sgml#2 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/hardware/article.sgml#1 branch .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml#2 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#2 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/hardware/common/hw.ent#2 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/hardware/common/intro.sgml#2 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/hardware/i386/Makefile#2 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/hardware/i386/article.sgml#2 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/hardware/i386/proc-i386.sgml#2 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/installation/Makefile#2 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/installation/Makefile.inc#2 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/installation/amd64/Makefile#2 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/installation/amd64/article.sgml#2 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/installation/common/abstract.sgml#2 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/installation/common/artheader.sgml#2 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/installation/common/install.ent#2 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/installation/common/install.sgml#3 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/installation/common/layout.sgml#2 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/installation/common/trouble.sgml#2 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/installation/common/upgrade.sgml#2 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/installation/i386/Makefile#2 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/installation/i386/article.sgml#2 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/installation/ia64/Makefile#2 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/installation/ia64/article.sgml#2 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/installation/pc98/Makefile#2 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/installation/pc98/article.sgml#2 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/installation/sparc64/Makefile#2 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/installation/sparc64/article.sgml#2 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/installation/sparc64/install.sgml#2 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/readme/article.sgml#2 integrate .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/relnotes/Makefile#2 integrate .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/relnotes/Makefile.inc#2 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/relnotes/amd64/Makefile#2 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/relnotes/amd64/article.sgml#2 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/relnotes/article.sgml#1 branch .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#2 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/relnotes/common/relnotes.ent#2 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/relnotes/i386/Makefile#2 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/relnotes/i386/article.sgml#2 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/relnotes/ia64/Makefile#2 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/relnotes/ia64/article.sgml#2 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/relnotes/pc98/Makefile#2 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/relnotes/pc98/article.sgml#2 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/relnotes/powerpc/Makefile#2 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/relnotes/powerpc/article.sgml#2 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/relnotes/sparc64/Makefile#2 delete .. //depot/projects/binutils/src/release/doc/zh_CN.GB2312/relnotes/sparc64/article.sgml#2 delete .. //depot/projects/binutils/src/sbin/bsdlabel/bsdlabel.8#3 integrate .. //depot/projects/binutils/src/sbin/bsdlabel/bsdlabel.c#2 integrate .. //depot/projects/binutils/src/sbin/ifconfig/ifconfig.8#3 integrate .. //depot/projects/binutils/src/sbin/ifconfig/ifconfig.c#3 integrate .. //depot/projects/binutils/src/sbin/natd/natd.8#2 integrate .. //depot/projects/binutils/src/sbin/newfs_msdos/newfs_msdos.8#2 integrate .. //depot/projects/binutils/src/share/man/man4/nve.4#3 integrate .. //depot/projects/binutils/src/share/man/man5/hosts.equiv.5#2 integrate .. //depot/projects/binutils/src/share/man/man5/src.conf.5#3 integrate .. //depot/projects/binutils/src/share/man/man7/build.7#3 integrate .. //depot/projects/binutils/src/share/mk/bsd.own.mk#3 integrate .. //depot/projects/binutils/src/sys/amd64/amd64/identcpu.c#3 integrate .. //depot/projects/binutils/src/sys/amd64/amd64/pmap.c#5 integrate .. //depot/projects/binutils/src/sys/amd64/include/specialreg.h#3 integrate .. //depot/projects/binutils/src/sys/arm/arm/pmap.c#6 integrate .. //depot/projects/binutils/src/sys/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/binutils/src/sys/compat/freebsd32/freebsd32_misc.c#6 integrate .. //depot/projects/binutils/src/sys/conf/files.amd64#4 integrate .. //depot/projects/binutils/src/sys/conf/files.i386#4 integrate .. //depot/projects/binutils/src/sys/dev/arcmsr/arcmsr.c#3 integrate .. //depot/projects/binutils/src/sys/dev/arcmsr/arcmsr.h#3 integrate .. //depot/projects/binutils/src/sys/dev/if_ndis/if_ndis.c#7 integrate .. //depot/projects/binutils/src/sys/dev/usb/umass.c#3 integrate .. //depot/projects/binutils/src/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/binutils/src/sys/fs/udf/udf_vfsops.c#4 integrate .. //depot/projects/binutils/src/sys/geom/geom_bsd_enc.c#2 integrate .. //depot/projects/binutils/src/sys/geom/part/g_part.c#3 integrate .. //depot/projects/binutils/src/sys/geom/part/g_part_bsd.c#2 integrate .. //depot/projects/binutils/src/sys/i386/i386/pmap.c#5 integrate .. //depot/projects/binutils/src/sys/kern/kern_proc.c#4 integrate .. //depot/projects/binutils/src/sys/kern/kern_resource.c#4 integrate .. //depot/projects/binutils/src/sys/kern/sched_4bsd.c#3 integrate .. //depot/projects/binutils/src/sys/kern/sched_ule.c#4 integrate .. //depot/projects/binutils/src/sys/net/bridgestp.c#3 integrate .. //depot/projects/binutils/src/sys/net/bridgestp.h#3 integrate .. //depot/projects/binutils/src/sys/net/if.h#3 integrate .. //depot/projects/binutils/src/sys/netinet/ip_fw2.c#4 integrate .. //depot/projects/binutils/src/sys/netinet6/dest6.c#3 integrate .. //depot/projects/binutils/src/sys/netinet6/frag6.c#3 integrate .. //depot/projects/binutils/src/sys/netinet6/icmp6.c#3 integrate .. //depot/projects/binutils/src/sys/netinet6/in6.c#5 integrate .. //depot/projects/binutils/src/sys/netinet6/in6.h#3 integrate .. //depot/projects/binutils/src/sys/netinet6/in6_cksum.c#3 integrate .. //depot/projects/binutils/src/sys/netinet6/in6_gif.c#3 integrate .. //depot/projects/binutils/src/sys/netinet6/in6_gif.h#2 integrate .. //depot/projects/binutils/src/sys/netinet6/in6_ifattach.c#3 integrate .. //depot/projects/binutils/src/sys/netinet6/in6_ifattach.h#2 integrate .. //depot/projects/binutils/src/sys/netinet6/in6_pcb.c#4 integrate .. //depot/projects/binutils/src/sys/netinet6/in6_pcb.h#3 integrate .. //depot/projects/binutils/src/sys/netinet6/in6_proto.c#3 integrate .. //depot/projects/binutils/src/sys/netinet6/in6_rmx.c#3 integrate .. //depot/projects/binutils/src/sys/netinet6/in6_src.c#4 integrate .. //depot/projects/binutils/src/sys/netinet6/in6_var.h#3 integrate .. //depot/projects/binutils/src/sys/netinet6/ip6_ecn.h#2 integrate .. //depot/projects/binutils/src/sys/netinet6/ip6_forward.c#3 integrate .. //depot/projects/binutils/src/sys/netinet6/ip6_id.c#3 integrate .. //depot/projects/binutils/src/sys/netinet6/ip6_input.c#3 integrate .. //depot/projects/binutils/src/sys/netinet6/ip6_ipsec.c#2 integrate .. //depot/projects/binutils/src/sys/netinet6/ip6_ipsec.h#2 integrate .. //depot/projects/binutils/src/sys/netinet6/ip6_mroute.c#3 integrate .. //depot/projects/binutils/src/sys/netinet6/ip6_mroute.h#3 integrate .. //depot/projects/binutils/src/sys/netinet6/ip6_output.c#3 integrate .. //depot/projects/binutils/src/sys/netinet6/ip6_var.h#3 integrate .. //depot/projects/binutils/src/sys/netinet6/ip6protosw.h#2 integrate .. //depot/projects/binutils/src/sys/netinet6/mld6.c#3 integrate .. //depot/projects/binutils/src/sys/netinet6/mld6_var.h#2 integrate .. //depot/projects/binutils/src/sys/netinet6/nd6.c#3 integrate .. //depot/projects/binutils/src/sys/netinet6/nd6.h#2 integrate .. //depot/projects/binutils/src/sys/netinet6/nd6_nbr.c#3 integrate .. //depot/projects/binutils/src/sys/netinet6/nd6_rtr.c#3 integrate .. //depot/projects/binutils/src/sys/netinet6/pim6.h#2 integrate .. //depot/projects/binutils/src/sys/netinet6/pim6_var.h#2 integrate .. //depot/projects/binutils/src/sys/netinet6/raw_ip6.c#3 integrate .. //depot/projects/binutils/src/sys/netinet6/raw_ip6.h#2 integrate .. //depot/projects/binutils/src/sys/netinet6/route6.c#3 integrate .. //depot/projects/binutils/src/sys/netinet6/scope6.c#3 integrate .. //depot/projects/binutils/src/sys/netinet6/scope6_var.h#2 integrate .. //depot/projects/binutils/src/sys/netinet6/sctp6_usrreq.c#6 integrate .. //depot/projects/binutils/src/sys/netinet6/sctp6_var.h#3 integrate .. //depot/projects/binutils/src/sys/netinet6/tcp6_var.h#2 integrate .. //depot/projects/binutils/src/sys/netinet6/udp6_usrreq.c#4 integrate .. //depot/projects/binutils/src/sys/netinet6/udp6_var.h#3 integrate .. //depot/projects/binutils/src/sys/sys/cdefs.h#2 integrate .. //depot/projects/binutils/src/sys/sys/disklabel.h#2 integrate .. //depot/projects/binutils/src/sys/vm/vm_page.c#5 integrate .. //depot/projects/binutils/src/tools/build/options/WITHOUT_INSTALLLIB#1 branch .. //depot/projects/binutils/src/tools/build/options/WITHOUT_KERBEROS#2 integrate .. //depot/projects/binutils/src/tools/build/options/WITH_GSSAPI#1 branch .. //depot/projects/binutils/src/tools/regression/lib/libc/stdio/test-scanfloat.c#4 integrate .. //depot/projects/binutils/src/tools/regression/lib/msun/test-lround.c#2 integrate .. //depot/projects/binutils/src/tools/regression/lib/msun/test-next.c#2 integrate .. //depot/projects/binutils/src/usr.bin/make/Makefile.dist#2 integrate .. //depot/projects/binutils/src/usr.bin/procstat/procstat_args.c#2 integrate .. //depot/projects/binutils/src/usr.bin/procstat/procstat_bin.c#2 integrate .. //depot/projects/binutils/src/usr.bin/procstat/procstat_cred.c#2 integrate .. //depot/projects/binutils/src/usr.bin/procstat/procstat_files.c#2 integrate .. //depot/projects/binutils/src/usr.sbin/pkg_install/Makefile#3 integrate .. //depot/projects/binutils/src/usr.sbin/pkg_install/add/pkg_add.1#3 integrate .. //depot/projects/binutils/src/usr.sbin/pkg_install/create/pkg_create.1#2 integrate .. //depot/projects/binutils/src/usr.sbin/pkg_install/delete/pkg_delete.1#2 integrate .. //depot/projects/binutils/src/usr.sbin/pkg_install/info/pkg_info.1#3 integrate .. //depot/projects/binutils/src/usr.sbin/pkg_install/updating/pkg_updating.1#2 integrate .. //depot/projects/binutils/src/usr.sbin/pkg_install/version/pkg_version.1#2 integrate .. //depot/projects/binutils/src/usr.sbin/sysinstall/media.c#2 integrate .. //depot/projects/binutils/src/usr.sbin/sysinstall/system.c#3 integrate .. //depot/projects/binutils/src/usr.sbin/syslogd/syslogd.c#3 integrate .. //depot/projects/binutils/src/usr.sbin/timed/timed/timed.8#2 integrate Differences ... ==== //depot/projects/binutils/src/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.342 2007/10/18 08:41:52 delphij Exp $ +# $FreeBSD: src/Makefile,v 1.343 2007/12/11 20:00:55 imp Exp $ # # The user-driven targets are: # @@ -234,17 +234,19 @@ PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \ PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \ then \ - (cd ${.CURDIR} && make make); \ + (cd ${.CURDIR} && ${BSDMAKE} make); \ fi # # Upgrade make(1) to the current version using the installed -# headers, libraries and tools. +# headers, libraries and tools. Also, allow the location of +# the system bsdmake-like utility to be overridden. # +BSDMAKE?=make MMAKEENV= MAKEOBJDIRPREFIX=${MAKEPATH} \ DESTDIR= \ INSTALL="sh ${.CURDIR}/tools/install.sh" -MMAKE= ${MMAKEENV} make \ +MMAKE= ${MMAKEENV} ${BSDMAKE} \ -D_UPGRADING \ -DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \ -DNO_CPU_CFLAGS -DNO_WERROR ==== //depot/projects/binutils/src/bin/ed/Makefile#3 (text+ko) ==== @@ -1,16 +1,16 @@ -# $FreeBSD: src/bin/ed/Makefile,v 1.33 2007/07/02 14:00:25 kensmith Exp $ +# $FreeBSD: src/bin/ed/Makefile,v 1.34 2007/12/09 00:14:27 marius Exp $ .include PROG= ed SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c +WARNS?= 2 LINKS= ${BINDIR}/ed ${BINDIR}/red MLINKS= ed.1 red.1 .if !defined(RELEASE_CRUNCH) .if ${MK_OPENSSL} != "no" CFLAGS+=-DDES -WARNS?= 2 DPADD= ${LIBCRYPTO} LDADD= -lcrypto .endif ==== //depot/projects/binutils/src/contrib/amd/FREEBSD-Xlist#2 (text+ko) ==== @@ -1,7 +1,8 @@ -$FreeBSD: src/contrib/amd/FREEBSD-Xlist,v 1.5 2004/07/06 12:52:27 mbr Exp $ +$FreeBSD: src/contrib/amd/FREEBSD-Xlist,v 1.6 2007/12/11 19:15:17 obrien Exp $ *LSM.am-utils *Makefile.* *README.autofs +*README.osx *ac*.m4 *.old *acconfig.h @@ -15,6 +16,7 @@ *missing *mkinstalldirs *stamp-h.in +*amd/test1.sh *amd/Makefile.* *amq/Makefile.* *commit @@ -38,10 +40,13 @@ *conf/fh_dref/fh_dref_sunos3.h *conf/fh_dref/fh_dref_sunos4.h *conf/fh_dref/fh_dref_svr4.h +*conf/hn_dref/hn_dref_default.h, *conf/hn_dref/hn_dref_isc3.h *conf/hn_dref/hn_dref_linux.h *conf/mount/mount_aix.c +*conf/mount/mount_aix3.c *conf/mount/mount_bsdi3.c +*conf/mount/mount_default.c *conf/mount/mount_freebsd3.c *conf/mount/mount_hpux.c *conf/mount/mount_irix5.c @@ -54,6 +59,7 @@ *conf/mtab/mtab_aix.c *conf/mtab/mtab_file.c *conf/mtab/mtab_isc3.c +*conf/mtab/mtab_linux.c *conf/mtab/mtab_mach3.c *conf/mtab/mtab_osf.c *conf/mtab/mtab_svr4.c @@ -63,6 +69,7 @@ *conf/nfs_prot/nfs_prot_aix4_2.h *conf/nfs_prot/nfs_prot_aix4_3.h *conf/nfs_prot/nfs_prot_aix5_1.h +*conf/nfs_prot/nfs_prot_aix5_2.h *conf/nfs_prot/nfs_prot_bsdi2.h *conf/nfs_prot/nfs_prot_bsdi3.h *conf/nfs_prot/nfs_prot_darwin.h @@ -92,6 +99,12 @@ *conf/nfs_prot/nfs_prot_sunos5_8.h *conf/nfs_prot/nfs_prot_svr4.h *conf/nfs_prot/nfs_prot_ultrix.h +*conf/autofs/autofs_linux.h +*conf/autofs/autofs_linux.c +*conf/autofs/autofs_solaris_v1.h +*conf/autofs/autofs_solaris_v1.c +*conf/autofs/autofs_solaris_v2_v3.h +*conf/autofs/autofs_solaris_v2_v3.c *conf/sa_dref/sa_dref_386bsd.h *conf/sa_dref/sa_dref_aix3.h *conf/sa_dref/sa_dref_aoi.h @@ -103,6 +116,7 @@ *conf/trap/trap_aix3.h *conf/trap/trap_aux.h *conf/trap/trap_dgux.h +*conf/trap/trap_freebsd3.h *conf/trap/trap_hcx.h *conf/trap/trap_hpux.h *conf/trap/trap_hpux11.h @@ -115,7 +129,9 @@ *conf/trap/trap_stellix.h *conf/trap/trap_svr4.h *conf/trap/trap_ultrix.h +*conf/umount/umount_aix.c *conf/umount/umount_default.c +*conf/umount/umount_linux.c *conf/umount/umount_osf.c *doc/Makefile.am *doc/Makefile.in @@ -135,11 +151,118 @@ *fsinfo/Makefile.* *hlfsd/Makefile.* *libamu/Makefile.* +*libamu/alloca.c *libamu/clnt_sperrno.c *libamu/memcmp.c *libamu/strcasecmp.c *libamu/strdup.c *libamu/strstr.c +*libamu/strlcat.c +*libamu/strlcpy.c *libamu/ualarm.c *mk-amd-map/Makefile.* *wire-test/Makefile.* +*m4/GNUmakefile +*m4/amdgrep* +*m4/amindent* +*m4/autopat* +*m4/chop-aclocal.pl* +*m4/copy-if-newbig* +*m4/mk-aclocal* +*m4/mkconf* +*m4/rmtspc* +*m4/update_build_version* +*m4/macros/HEADER +*m4/macros/TRAILER +*m4/macros/c_void_p.m4 +*m4/macros/cache_check_dynamic.m4 +*m4/macros/check_amu_fs.m4 +*m4/macros/check_checkmount_style.m4 +*m4/macros/check_extern.m4 +*m4/macros/check_fhandle.m4 +*m4/macros/check_field.m4 +*m4/macros/check_fs_headers.m4 +*m4/macros/check_fs_mntent.m4 +*m4/macros/check_gnu_getopt.m4 +*m4/macros/check_hide_mount_type.m4 +*m4/macros/check_lib2.m4 +*m4/macros/check_map_funcs.m4 +*m4/macros/check_mnt2_cdfs_opt.m4 +*m4/macros/check_mnt2_gen_opt.m4 +*m4/macros/check_mnt2_nfs_opt.m4 +*m4/macros/check_mnttab_file_name.m4 +*m4/macros/check_mnttab_location.m4 +*m4/macros/check_mnttab_opt.m4 +*m4/macros/check_mnttab_style.m4 +*m4/macros/check_mnttab_type.m4 +*m4/macros/check_mount_style.m4 +*m4/macros/check_mount_trap.m4 +*m4/macros/check_mount_type.m4 +*m4/macros/check_mtype_printf_type.m4 +*m4/macros/check_mtype_type.m4 +*m4/macros/check_network_transport_type.m4 +*m4/macros/check_nfs_fh_dref.m4 +*m4/macros/check_nfs_hn_dref.m4 +*m4/macros/check_nfs_prot_headers.m4 +*m4/macros/check_nfs_sa_dref.m4 +*m4/macros/check_nfs_socket_connection.m4 +*m4/macros/check_os_libs.m4 +*m4/macros/check_restartable_signal_handler.m4 +*m4/macros/check_umount_style.m4 +*m4/macros/check_unmount_args.m4 +*m4/macros/check_unmount_call.m4 +*m4/macros/expand_cpp_hex.m4 +*m4/macros/expand_cpp_int.m4 +*m4/macros/expand_cpp_string.m4 +*m4/macros/expand_run_string.m4 +*m4/macros/extern_optarg.m4 +*m4/macros/extern_sys_errlist.m4 +*m4/macros/field_mntent_t_mnt_time_string.m4 +*m4/macros/func_bad_memcmp.m4 +*m4/macros/func_bad_yp_all.m4 +*m4/macros/header_templates.m4 +*m4/macros/host_macros.m4 +*m4/macros/linux_headers.m4 +*m4/macros/localconfig.m4 +*m4/macros/mount_headers.m4 +*m4/macros/name_package.m4 +*m4/macros/name_version.m4 +*m4/macros/opt_amu_cflags.m4 +*m4/macros/opt_cppflags.m4 +*m4/macros/opt_debug.m4 +*m4/macros/opt_ldflags.m4 +*m4/macros/opt_libs.m4 +*m4/macros/os_cflags.m4 +*m4/macros/os_cppflags.m4 +*m4/macros/os_ldflags.m4 +*m4/macros/package_bugreport.m4 +*m4/macros/package_name.m4 +*m4/macros/package_version.m4 +*m4/macros/save_state.m4 +*m4/macros/struct_field_nfs_fh.m4 +*m4/macros/struct_mntent.m4 +*m4/macros/struct_mnttab.m4 +*m4/macros/struct_nfs_args.m4 +*m4/macros/struct_nfs_fh.m4 +*m4/macros/struct_nfs_fh3.m4 +*m4/macros/struct_nfs_gfs_mount.m4 +*m4/macros/try_compile_anyfs.m4 +*m4/macros/try_compile_nfs.m4 +*m4/macros/try_compile_rpc.m4 +*m4/macros/type_auth_create_gidlist.m4 +*m4/macros/type_cachefs_args.m4 +*m4/macros/type_cdfs_args.m4 +*m4/macros/type_efs_args.m4 +*m4/macros/type_lofs_args.m4 +*m4/macros/type_mfs_args.m4 +*m4/macros/type_pcfs_args.m4 +*m4/macros/type_recvfrom_fromlen.m4 +*m4/macros/type_rfs_args.m4 +*m4/macros/type_svc_in_arg.m4 +*m4/macros/type_time_t.m4 +*m4/macros/type_tmpfs_args.m4 +*m4/macros/type_ufs_args.m4 +*m4/macros/type_xdrproc_t.m4 +*m4/macros/type_xfs_args.m4 +*m4/macros/type_yp_order_outorder.m4 +*m4/macros/with_addon.m4 ==== //depot/projects/binutils/src/contrib/amd/FREEBSD-upgrade#2 (text+ko) ==== @@ -1,21 +1,19 @@ # ex:ts=8 -$FreeBSD: src/contrib/amd/FREEBSD-upgrade,v 1.15 2004/05/14 13:29:48 mbr Exp $ +$FreeBSD: src/contrib/amd/FREEBSD-upgrade,v 1.16 2007/12/11 19:16:51 obrien Exp $ -AMD (am-utils) 6.0.9 - originals can be found at: ftp://shekel.mcl.cs.columbia.edu/pub/am-utils/ - (http://www.cs.columbia.edu/~ezk/am-utils/index.html) - +AMD (am-utils) 6.1.5 + originals can be found at: ftp://ftp.am-utils.org/pub/am-utils/ For the import of AMD many files were pruned by: - tar -X FREEBSD-Xlist -xzf am-utils-6.0.9.tar.gz + tar -X FREEBSD-Xlist -xf am-utils-6.1.5.tar.gz and `find . -name '.cvsignore' -delete` Then imported by: - cvs import -m 'Virgin import of AMD (am-utils) v6.0.9' \ - src/contrib/amd COLUMBIA amd_6_0_9 + cvs import -m 'Virgin import of AMD (am-utils) v6.1.5' \ + src/contrib/amd COLUMBIA amd_6_1_5 After the import, a separate extraction of am-utils was GNU configured in the "normal" way. The resulting config.h file should be compared with @@ -25,8 +23,11 @@ To make local changes to amd, simply patch and commit to the main branch (aka HEAD). Never make local changes on the vendor (COLUMBIA) branch. -All local changes should be submitted to "amd-dev@majordomo.cs.columbia.edu" -for inclusion in the next vendor release. +Note, we don't trim anything in scripts/ as sysadmins may find the bits +as a useful reference. + +All local changes should be submitted to "am-utils@am-utils.org" or +https://bugzilla.am-utils.org for inclusion in the next vendor release. Local changes: ==== //depot/projects/binutils/src/contrib/gcc/config/sparc/freebsd.h#3 (text+ko) ==== @@ -19,24 +19,26 @@ the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* $FreeBSD: src/contrib/gcc/config/sparc/freebsd.h,v 1.10 2007/05/19 02:30:20 kan Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/sparc/freebsd.h,v 1.11 2007/12/09 17:41:47 marius Exp $ */ #undef SUBTARGET_EXTRA_SPECS #define SUBTARGET_EXTRA_SPECS \ { "fbsd_dynamic_linker", FBSD_DYNAMIC_LINKER } /* FreeBSD needs the platform name (sparc64) defined. - Emacs needs to know if the arch is 64 or 32-bits. */ - -#undef CPP_CPU64_DEFAULT_SPEC -#define CPP_CPU64_DEFAULT_SPEC \ - "-D__sparc64__ -D__sparc_v9__ -D__sparcv9 -D__sparc__ -D__arch64__" + Emacs needs to know if the arch is 64 or 32-bits. + This also selects which targets are available via -mcpu. */ #undef FBSD_TARGET_CPU_CPP_BUILTINS #define FBSD_TARGET_CPU_CPP_BUILTINS() \ do \ { \ builtin_define ("__LP64__"); \ + builtin_define ("__sparc64__"); \ + builtin_define ("__sparc_v9__"); \ + builtin_define ("__sparcv9"); \ + builtin_define ("__sparc__"); \ + builtin_define ("__arch64__"); \ } \ while (0) ==== //depot/projects/binutils/src/contrib/gcc/fold-const.c#3 (text+ko) ==== @@ -5661,6 +5661,9 @@ } break; } + /* If the constant is negative, we cannot simplify this. */ + if (tree_int_cst_sgn (c) == -1) + break; /* FALLTHROUGH */ case NEGATE_EXPR: if ((t1 = extract_muldiv (op0, c, code, wide_type, strict_overflow_p)) ==== //depot/projects/binutils/src/etc/rc.d/DAEMON#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: DAEMON,v 1.8 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/DAEMON,v 1.5 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/DAEMON,v 1.6 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: DAEMON ==== //depot/projects/binutils/src/etc/rc.d/LOGIN#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: LOGIN,v 1.7 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/LOGIN,v 1.5 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/LOGIN,v 1.6 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: LOGIN ==== //depot/projects/binutils/src/etc/rc.d/Makefile#3 (text+ko) ==== @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.87 2007/10/25 18:10:05 mtm Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.88 2007/12/08 07:20:22 dougb Exp $ .include ==== //depot/projects/binutils/src/etc/rc.d/NETWORKING#3 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: NETWORKING,v 1.2 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/NETWORKING,v 1.13 2007/06/02 05:25:19 dougb Exp $ +# $FreeBSD: src/etc/rc.d/NETWORKING,v 1.14 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: NETWORKING NETWORK ==== //depot/projects/binutils/src/etc/rc.d/SERVERS#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: SERVERS,v 1.9 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/SERVERS,v 1.7 2006/04/19 05:10:34 delphij Exp $ +# $FreeBSD: src/etc/rc.d/SERVERS,v 1.8 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: SERVERS ==== //depot/projects/binutils/src/etc/rc.d/accounting#3 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: accounting,v 1.7 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/accounting,v 1.10 2006/12/30 22:53:20 yar Exp $ +# $FreeBSD: src/etc/rc.d/accounting,v 1.11 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: accounting ==== //depot/projects/binutils/src/etc/rc.d/amd#3 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: amd,v 1.10 2002/04/29 12:08:17 lukem Exp $ -# $FreeBSD: src/etc/rc.d/amd,v 1.20 2007/10/25 16:59:06 mtm Exp $ +# $FreeBSD: src/etc/rc.d/amd,v 1.21 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: amd ==== //depot/projects/binutils/src/etc/rc.d/apmd#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: apmd,v 1.5 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/apmd,v 1.12 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/apmd,v 1.13 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: apmd ==== //depot/projects/binutils/src/etc/rc.d/bootparams#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: bootparams,v 1.6 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/bootparams,v 1.7 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/bootparams,v 1.8 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: bootparams ==== //depot/projects/binutils/src/etc/rc.d/ccd#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: ccd,v 1.3 2000/05/13 08:45:06 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ccd,v 1.5 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ccd,v 1.6 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: disks ==== //depot/projects/binutils/src/etc/rc.d/cron#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: cron,v 1.5 2000/09/19 13:04:38 lukem Exp $ -# $FreeBSD: src/etc/rc.d/cron,v 1.7 2005/01/16 03:12:03 obrien Exp $ +# $FreeBSD: src/etc/rc.d/cron,v 1.8 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: cron ==== //depot/projects/binutils/src/etc/rc.d/dhclient#3 (text+ko) ==== @@ -1,12 +1,10 @@ #!/bin/sh # -# $NetBSD: dhclient,v 1.8 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/dhclient,v 1.28 2007/03/25 19:45:20 mtm Exp $ +# $FreeBSD: src/etc/rc.d/dhclient,v 1.30 2007/12/08 22:27:18 dougb Exp $ # # PROVIDE: dhclient # KEYWORD: nojail nostart -# . /etc/rc.subr . /etc/network.subr ==== //depot/projects/binutils/src/etc/rc.d/dmesg#2 (text+ko) ==== @@ -1,13 +1,12 @@ #!/bin/sh # -# $NetBSD: dmesg,v 1.8 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/dmesg,v 1.5 2005/01/16 03:12:03 obrien Exp $ +# $FreeBSD: src/etc/rc.d/dmesg,v 1.7 2007/12/08 22:40:31 dougb Exp $ # # PROVIDE: dmesg # REQUIRE: mountcritremote cleanvar # BEFORE: DAEMON -# KEYWORD: Daemon nojail +# KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/binutils/src/etc/rc.d/fsck#3 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: fsck,v 1.2 2001/06/18 06:42:35 lukem Exp $ -# $FreeBSD: src/etc/rc.d/fsck,v 1.11 2007/05/18 12:04:41 mtm Exp $ +# $FreeBSD: src/etc/rc.d/fsck,v 1.12 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: fsck ==== //depot/projects/binutils/src/etc/rc.d/ftp-proxy#2 (text+ko) ==== @@ -1,11 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ftp-proxy,v 1.1 2007/09/06 21:00:48 mlaier Exp $ +# $FreeBSD: src/etc/rc.d/ftp-proxy,v 1.2 2007/12/08 22:27:18 dougb Exp $ # # PROVIDE: ftp-proxy # REQUIRE: DAEMON pf -# . /etc/rc.subr ==== //depot/projects/binutils/src/etc/rc.d/inetd#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: inetd,v 1.6 2000/09/19 13:04:38 lukem Exp $ -# $FreeBSD: src/etc/rc.d/inetd,v 1.5 2005/01/16 03:12:03 obrien Exp $ +# $FreeBSD: src/etc/rc.d/inetd,v 1.6 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: inetd ==== //depot/projects/binutils/src/etc/rc.d/ipfilter#3 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: ipfilter,v 1.10 2001/02/28 17:03:50 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipfilter,v 1.28 2007/04/09 08:53:40 des Exp $ +# $FreeBSD: src/etc/rc.d/ipfilter,v 1.29 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: ipfilter ==== //depot/projects/binutils/src/etc/rc.d/ipfs#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: ipfs,v 1.3 2002/02/11 13:55:42 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipfs,v 1.6 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ipfs,v 1.7 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: ipfs ==== //depot/projects/binutils/src/etc/rc.d/ipmon#3 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: ipmon,v 1.9 2002/04/18 05:02:01 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipmon,v 1.15 2007/04/02 22:53:07 des Exp $ +# $FreeBSD: src/etc/rc.d/ipmon,v 1.16 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: ipmon ==== //depot/projects/binutils/src/etc/rc.d/ipnat#3 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: ipnat,v 1.6 2000/09/19 13:04:38 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipnat,v 1.15 2006/12/31 10:37:18 yar Exp $ +# $FreeBSD: src/etc/rc.d/ipnat,v 1.16 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: ipnat ==== //depot/projects/binutils/src/etc/rc.d/ipsec#3 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: ipsec,v 1.7 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/ipsec,v 1.19 2007/05/18 12:04:41 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ipsec,v 1.20 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: ipsec ==== //depot/projects/binutils/src/etc/rc.d/isdnd#3 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: isdnd,v 1.9 2002/04/10 23:37:13 martin Exp $ -# $FreeBSD: src/etc/rc.d/isdnd,v 1.23 2007/04/02 22:53:07 des Exp $ +# $FreeBSD: src/etc/rc.d/isdnd,v 1.24 2007/12/08 07:20:22 dougb Exp $ # # Mostly based on original script (/etc/rc.isdn) written by Hellmuth Michaelis # ==== //depot/projects/binutils/src/etc/rc.d/keyserv#2 (text+ko) ==== @@ -1,10 +1,9 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/keyserv,v 1.3 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/keyserv,v 1.4 2007/12/08 22:27:18 dougb Exp $ # # Start keyserv if we are running Secure RPC -# # PROVIDE: keyserv # REQUIRE: ypbind ==== //depot/projects/binutils/src/etc/rc.d/ldconfig#3 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: ldconfig,v 1.5 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/ldconfig,v 1.17 2006/12/30 22:53:20 yar Exp $ +# $FreeBSD: src/etc/rc.d/ldconfig,v 1.18 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: ldconfig ==== //depot/projects/binutils/src/etc/rc.d/local#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: local,v 1.6 2002/03/22 04:33:59 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/local,v 1.6 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/local,v 1.7 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: local ==== //depot/projects/binutils/src/etc/rc.d/lockd#2 (text+ko) ==== @@ -1,8 +1,7 @@ #!/bin/sh # -# $NetBSD: nfslocking,v 1.6 2002/03/24 15:52:41 lukem Exp $ # FreeBSD History: src/etc/rc.d/nfslocking,v 1.11 2004/10/07 13:55:26 mtm -# $FreeBSD: src/etc/rc.d/lockd,v 1.18 2007/09/03 02:02:31 mtm Exp $ +# $FreeBSD: src/etc/rc.d/lockd,v 1.19 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: lockd ==== //depot/projects/binutils/src/etc/rc.d/lpd#3 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: lpd,v 1.5 2002/03/22 04:33:59 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/lpd,v 1.8 2006/12/30 22:53:20 yar Exp $ +# $FreeBSD: src/etc/rc.d/lpd,v 1.9 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: lpd ==== //depot/projects/binutils/src/etc/rc.d/motd#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: motd,v 1.5 2000/09/19 13:04:38 lukem Exp $ -# $FreeBSD: src/etc/rc.d/motd,v 1.9 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/motd,v 1.10 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: motd ==== //depot/projects/binutils/src/etc/rc.d/mountcritlocal#3 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: mountcritlocal,v 1.7 2002/04/29 12:29:53 lukem Exp $ -# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.14 2007/05/18 12:04:41 mtm Exp $ +# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.15 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: mountcritlocal ==== //depot/projects/binutils/src/etc/rc.d/mountcritremote#3 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: mountcritremote,v 1.7 2002/04/29 12:29:53 lukem Exp $ -# $FreeBSD: src/etc/rc.d/mountcritremote,v 1.16 2007/04/09 08:53:40 des Exp $ +# $FreeBSD: src/etc/rc.d/mountcritremote,v 1.17 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: mountcritremote ==== //depot/projects/binutils/src/etc/rc.d/mountd#3 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: mountd,v 1.11 2002/01/31 01:26:06 lukem Exp $ -# $FreeBSD: src/etc/rc.d/mountd,v 1.19 2007/04/13 10:29:25 pjd Exp $ +# $FreeBSD: src/etc/rc.d/mountd,v 1.20 2007/12/08 07:20:22 dougb Exp $ # # PROVIDE: mountd ==== //depot/projects/binutils/src/etc/rc.d/moused#3 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: moused,v 1.1 2001/10/29 23:25:01 augustss Exp $ -# $FreeBSD: src/etc/rc.d/moused,v 1.11 2006/12/30 22:53:20 yar Exp $ +# $FreeBSD: src/etc/rc.d/moused,v 1.12 2007/12/08 07:20:22 dougb Exp $ # >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Dec 12 04:29:59 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7355916A476; Wed, 12 Dec 2007 04:29:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1EFF616A417 for ; Wed, 12 Dec 2007 04:29:59 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 101A013C43E for ; Wed, 12 Dec 2007 04:29:59 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBC4TwMB089551 for ; Wed, 12 Dec 2007 04:29:58 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBC4TwGC089548 for perforce@freebsd.org; Wed, 12 Dec 2007 04:29:58 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 12 Dec 2007 04:29:58 GMT Message-Id: <200712120429.lBC4TwGC089548@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 130663 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 04:29:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=130663 Change 130663 by kmacy@kmacy:storage:toehead on 2007/12/12 04:29:25 add TOE interface to TCP Affected files ... .. //depot/projects/toehead/sys/conf/files#2 edit .. //depot/projects/toehead/sys/netinet/tcp_ofld.c#1 add .. //depot/projects/toehead/sys/netinet/tcp_ofld.h#1 add .. //depot/projects/toehead/sys/netinet/tcp_var.h#2 edit .. //depot/projects/toehead/sys/netinet/toedev.h#1 add .. //depot/projects/toehead/sys/sys/socket.h#2 edit Differences ... ==== //depot/projects/toehead/sys/conf/files#2 (text+ko) ==== @@ -1888,6 +1888,7 @@ netinet/tcp_hostcache.c optional inet netinet/tcp_input.c optional inet netinet/tcp_output.c optional inet +netinet/tcp_ofld.c optional inet netinet/tcp_reass.c optional inet netinet/tcp_sack.c optional inet netinet/tcp_subr.c optional inet ==== //depot/projects/toehead/sys/netinet/tcp_var.h#2 (text+ko) ==== @@ -123,6 +123,7 @@ #define TF_SIGNATURE 0x400000 /* require MD5 digests (RFC2385) */ #define TF_FORCEDATA 0x800000 /* force out a byte */ #define TF_TSO 0x1000000 /* TSO enabled on this connection */ +#define TF_TOE 0x2000000 /* this connection is offloaded */ tcp_seq snd_una; /* send unacknowledged */ tcp_seq snd_max; /* highest sequence number sent; @@ -206,7 +207,9 @@ int t_rttlow; /* smallest observerved RTT */ u_int32_t rfbuf_ts; /* recv buffer autoscaling timestamp */ int rfbuf_cnt; /* recv buffer autoscaling byte count */ - void *t_pspare[5]; /* toe usrreqs / toepcb * / congestion algo / vimage / 1 general use */ + void *t_pspare[3]; /* toe usrreqs / toepcb * / congestion algo / vimage / 1 general use */ + struct toe_usrreqs *t_tu; /* offload operations vector */ + void *t_toe; /* TOE pcb pointer */ }; #define IN_FASTRECOVERY(tp) (tp->t_flags & TF_FASTRECOVERY) ==== //depot/projects/toehead/sys/sys/socket.h#2 (text+ko) ==== @@ -118,6 +118,8 @@ #define SO_ACCEPTFILTER 0x1000 /* there is an accept filter */ #define SO_BINTIME 0x2000 /* timestamp received dgram traffic */ #endif +#define SO_NOOFFLOAD 0x4000 /* socket cannot be offloaded */ +#define SO_NO_DDP 0x8000 /* disable direct data placement */ /* * Additional options, not kept in so_options. From owner-p4-projects@FreeBSD.ORG Wed Dec 12 05:00:33 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E394916A419; Wed, 12 Dec 2007 05:00:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7146C16A420 for ; Wed, 12 Dec 2007 05:00:32 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6135713C45B for ; Wed, 12 Dec 2007 05:00:32 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBC50W6a004602 for ; Wed, 12 Dec 2007 05:00:32 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBC50WtG004599 for perforce@freebsd.org; Wed, 12 Dec 2007 05:00:32 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 12 Dec 2007 05:00:32 GMT Message-Id: <200712120500.lBC50WtG004599@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 130667 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 05:00:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=130667 Change 130667 by kmacy@kmacy:storage:toehead on 2007/12/12 05:00:16 add interface for allowing consumers to register for ARP updates, redirects, and path MTU changes Affected files ... .. //depot/projects/toehead/sys/net/route.c#2 edit .. //depot/projects/toehead/sys/net/route.h#2 edit .. //depot/projects/toehead/sys/netinet/if_ether.c#2 edit Differences ... ==== //depot/projects/toehead/sys/net/route.c#2 (text+ko) ==== @@ -318,7 +318,7 @@ int flags, struct sockaddr *src) { - struct rtentry *rt; + struct rtentry *rt, *rt0 = NULL; int error = 0; short *stat = NULL; struct rt_addrinfo info; @@ -362,8 +362,8 @@ * Create new route, rather than smashing route to net. */ create: - if (rt) - rtfree(rt); + rt0 = rt; + flags |= RTF_GATEWAY | RTF_DYNAMIC; bzero((caddr_t)&info, sizeof(info)); info.rti_info[RTAX_DST] = dst; @@ -375,10 +375,16 @@ error = rtrequest1(RTM_ADD, &info, &rt); if (rt != NULL) { RT_LOCK(rt); + EVENTHANDLER_INVOKE(route_event, RTEVENT_REDIRECT_UPDATE, rt0, rt, dst); flags = rt->rt_flags; } + if (rt0) + RTFREE_LOCKED(rt0); + stat = &rtstat.rts_dynamic; } else { + struct rtentry *gwrt; + /* * Smash the current notion of the gateway to * this destination. Should check about netmask!!! @@ -390,6 +396,9 @@ * add the key and gateway (in one malloc'd chunk). */ rt_setgate(rt, rt_key(rt), gateway); + gwrt = rtalloc1(gateway, 1, 0); + EVENTHANDLER_INVOKE(route_event, RTEVENT_REDIRECT_UPDATE, rt, gwrt, dst); + RTFREE_LOCKED(gwrt); } } else error = EHOSTUNREACH; ==== //depot/projects/toehead/sys/net/route.h#2 (text+ko) ==== @@ -359,6 +359,13 @@ struct sockaddr *, struct sockaddr *, int, struct rtentry **); int rtrequest1(int, struct rt_addrinfo *, struct rtentry **); int rt_check(struct rtentry **, struct rtentry **, struct sockaddr *); + +#include +#define RTEVENT_ARP_UPDATE 1 +#define RTEVENT_PMTU_UPDATE 2 +#define RTEVENT_REDIRECT_UPDATE 3 +typedef void (*rtevent_fn)(void *, int, struct rtentry *, struct rtentry *, struct sockaddr *); +EVENTHANDLER_DECLARE(route_event, rtevent_fn); #endif #endif ==== //depot/projects/toehead/sys/netinet/if_ether.c#2 (text+ko) ==== @@ -578,7 +578,10 @@ #ifdef DEV_CARP int carp_match = 0; #endif - + struct sockaddr_in sin; + sin.sin_len = sizeof(struct sockaddr_in); + sin.sin_family = AF_INET; + if (ifp->if_bridge) bridged = 1; @@ -772,6 +775,10 @@ la->la_preempt = arp_maxtries; hold = la->la_hold; la->la_hold = NULL; + + sin.sin_addr.s_addr = ntohl(itaddr.s_addr); + EVENTHANDLER_INVOKE(route_event, RTEVENT_ARP_UPDATE, rt, NULL, + (struct sockaddr *)&sin); RT_UNLOCK(rt); if (hold != NULL) (*ifp->if_output)(ifp, hold, rt_key(rt), rt); From owner-p4-projects@FreeBSD.ORG Wed Dec 12 05:15:51 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 62ADF16A41A; Wed, 12 Dec 2007 05:15:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 942C116A419 for ; Wed, 12 Dec 2007 05:15:50 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6B60913C457 for ; Wed, 12 Dec 2007 05:15:50 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBC5Fo3S008726 for ; Wed, 12 Dec 2007 05:15:50 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBC5FoCr008723 for perforce@freebsd.org; Wed, 12 Dec 2007 05:15:50 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 12 Dec 2007 05:15:50 GMT Message-Id: <200712120515.lBC5FoCr008723@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 130668 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 05:15:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=130668 Change 130668 by kmacy@kmacy:storage:toehead on 2007/12/12 05:14:54 remove debug printf Affected files ... .. //depot/projects/toehead/sys/netinet/tcp_ofld.h#2 edit Differences ... ==== //depot/projects/toehead/sys/netinet/tcp_ofld.h#2 (text+ko) ==== @@ -26,9 +26,6 @@ if (!SO_OFFLOADABLE(so) || (error = ofld_connect(so, nam)) != 0) error = tcp_output(tp); - else - printf("connection offloaded\n"); - return (error); } From owner-p4-projects@FreeBSD.ORG Wed Dec 12 05:20:56 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D0B4316A479; Wed, 12 Dec 2007 05:20:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3A47216A477 for ; Wed, 12 Dec 2007 05:20:56 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 10EEF13C46E for ; Wed, 12 Dec 2007 05:20:56 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBC5KtoF009306 for ; Wed, 12 Dec 2007 05:20:55 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBC5Ktkb009303 for perforce@freebsd.org; Wed, 12 Dec 2007 05:20:55 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 12 Dec 2007 05:20:55 GMT Message-Id: <200712120520.lBC5Ktkb009303@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 130669 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 05:20:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=130669 Change 130669 by kmacy@kmacy:storage:toehead on 2007/12/12 05:20:49 move check into detach Affected files ... .. //depot/projects/toehead/sys/netinet/tcp_ofld.h#3 edit Differences ... ==== //depot/projects/toehead/sys/netinet/tcp_ofld.h#3 (text+ko) ==== @@ -98,7 +98,8 @@ static __inline void tcp_gen_detach(struct tcpcb *tp) { - ofld_detach(tp); + if (tp_offload(tp)) + ofld_detach(tp); } #else From owner-p4-projects@FreeBSD.ORG Wed Dec 12 05:42:20 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D421D16A473; Wed, 12 Dec 2007 05:42:19 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 293DC16A417 for ; Wed, 12 Dec 2007 05:42:19 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 173E613C447 for ; Wed, 12 Dec 2007 05:42:19 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBC5gIve018651 for ; Wed, 12 Dec 2007 05:42:18 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBC5gIl3018647 for perforce@freebsd.org; Wed, 12 Dec 2007 05:42:18 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 12 Dec 2007 05:42:18 GMT Message-Id: <200712120542.lBC5gIl3018647@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 130670 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 05:42:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=130670 Change 130670 by kmacy@kmacy:storage:toehead on 2007/12/12 05:41:51 move rt = NULL up to make the intent of the code clearer Affected files ... .. //depot/projects/toehead/sys/net/route.c#3 edit Differences ... ==== //depot/projects/toehead/sys/net/route.c#3 (text+ko) ==== @@ -363,7 +363,8 @@ */ create: rt0 = rt; - + rt = NULL; + flags |= RTF_GATEWAY | RTF_DYNAMIC; bzero((caddr_t)&info, sizeof(info)); info.rti_info[RTAX_DST] = dst; @@ -371,7 +372,6 @@ info.rti_info[RTAX_NETMASK] = netmask; info.rti_ifa = ifa; info.rti_flags = flags; - rt = NULL; error = rtrequest1(RTM_ADD, &info, &rt); if (rt != NULL) { RT_LOCK(rt); From owner-p4-projects@FreeBSD.ORG Wed Dec 12 05:51:29 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B10516A418; Wed, 12 Dec 2007 05:51:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B0F4016A421 for ; Wed, 12 Dec 2007 05:51:28 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9F0CA13C478 for ; Wed, 12 Dec 2007 05:51:28 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBC5pSAN020029 for ; Wed, 12 Dec 2007 05:51:28 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBC5pSaO020025 for perforce@freebsd.org; Wed, 12 Dec 2007 05:51:28 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 12 Dec 2007 05:51:28 GMT Message-Id: <200712120551.lBC5pSaO020025@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 130671 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 05:51:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=130671 Change 130671 by kmacy@kmacy:storage:toehead on 2007/12/12 05:51:17 Integrate TCP offload hooks for active open, transmit, and close Affected files ... .. //depot/projects/toehead/sys/netinet/tcp_subr.c#2 edit .. //depot/projects/toehead/sys/netinet/tcp_usrreq.c#2 edit Differences ... ==== //depot/projects/toehead/sys/netinet/tcp_subr.c#2 (text+ko) ==== @@ -85,6 +85,7 @@ #include #include #include +#include #ifdef INET6 #include #endif @@ -651,7 +652,7 @@ if (TCPS_HAVERCVDSYN(tp->t_state)) { tp->t_state = TCPS_CLOSED; - (void) tcp_output(tp); + (void) tcp_gen_abort(tp); tcpstat.tcps_drops++; } else tcpstat.tcps_conndrops++; @@ -749,6 +750,9 @@ tp->t_segqlen--; tcp_reass_qsize--; } + /* disconnect offload device, if any */ + tcp_gen_detach(tp); + tcp_free_sackholes(tp); inp->inp_ppcb = NULL; tp->t_inpcb = NULL; @@ -768,6 +772,9 @@ INP_INFO_WLOCK_ASSERT(&tcbinfo); INP_LOCK_ASSERT(inp); + if (tp->t_state == TCPS_LISTEN) + tcp_gen_listen_close(tp); + in_pcbdrop(inp); tcpstat.tcps_closed++; KASSERT(inp->inp_socket != NULL, ("tcp_close: inp_socket NULL")); @@ -1562,7 +1569,7 @@ tp->snd_recover = tp->snd_max; if (tp->t_flags & TF_SACK_PERMIT) EXIT_FASTRECOVERY(tp); - tcp_output(tp); + tcp_gen_send(tp); return (inp); } ==== //depot/projects/toehead/sys/netinet/tcp_usrreq.c#2 (text+ko) ==== @@ -85,6 +85,7 @@ #ifdef TCPDEBUG #include #endif +#include /* * TCP protocol interface to socket abstraction. @@ -385,6 +386,7 @@ if (error == 0) { tp->t_state = TCPS_LISTEN; solisten_proto(so, backlog); + tcp_gen_listen_open(tp); } SOCK_UNLOCK(so); @@ -476,7 +478,7 @@ TCPDEBUG1(); if ((error = tcp_connect(tp, nam, td)) != 0) goto out; - error = tcp_output(tp); + error = tcp_gen_connect(so, nam); out: TCPDEBUG2(PRU_CONNECT); INP_UNLOCK(inp); @@ -528,7 +530,7 @@ inp->inp_vflag &= ~INP_IPV6; if ((error = tcp_connect(tp, (struct sockaddr *)&sin, td)) != 0) goto out; - error = tcp_output(tp); + error = tcp_gen_connect(so, nam); goto out; } inp->inp_vflag &= ~INP_IPV4; @@ -536,7 +538,7 @@ inp->inp_inc.inc_isipv6 = 1; if ((error = tcp6_connect(tp, nam, td)) != 0) goto out; - error = tcp_output(tp); + error = tcp_gen_connect(so, nam); out: TCPDEBUG2(PRU_CONNECT); @@ -703,7 +705,7 @@ TCPDEBUG1(); socantsendmore(so); tcp_usrclosed(tp); - error = tcp_output(tp); + error = tcp_gen_disconnect(tp); out: TCPDEBUG2(PRU_SHUTDOWN); @@ -733,7 +735,7 @@ } tp = intotcpcb(inp); TCPDEBUG1(); - tcp_output(tp); + tcp_gen_rcvd(tp); out: TCPDEBUG2(PRU_RCVD); @@ -838,7 +840,7 @@ if (tp != NULL) { if (flags & PRUS_MORETOCOME) tp->t_flags |= TF_MORETOCOME; - error = tcp_output(tp); + error = tcp_gen_send(tp); if (flags & PRUS_MORETOCOME) tp->t_flags &= ~TF_MORETOCOME; } @@ -889,7 +891,7 @@ } tp->snd_up = tp->snd_una + so->so_snd.sb_cc; tp->t_flags |= TF_FORCEDATA; - error = tcp_output(tp); + error = tcp_gen_send(tp); tp->t_flags &= ~TF_FORCEDATA; } out: @@ -1489,7 +1491,7 @@ sbflush(&so->so_rcv); tcp_usrclosed(tp); if (!(inp->inp_vflag & INP_DROPPED)) - tcp_output(tp); + tcp_gen_disconnect(tp); } } @@ -1511,8 +1513,9 @@ INP_LOCK_ASSERT(tp->t_inpcb); switch (tp->t_state) { + case TCPS_LISTEN: + tcp_gen_listen_close(tp); case TCPS_CLOSED: - case TCPS_LISTEN: tp->t_state = TCPS_CLOSED; tp = tcp_close(tp); /* From owner-p4-projects@FreeBSD.ORG Wed Dec 12 06:33:35 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A0AD316A468; Wed, 12 Dec 2007 06:33:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4D56F16A417 for ; Wed, 12 Dec 2007 06:33:35 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 387AF13C458 for ; Wed, 12 Dec 2007 06:33:35 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBC6XZRm029729 for ; Wed, 12 Dec 2007 06:33:35 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBC6XZrB029726 for perforce@freebsd.org; Wed, 12 Dec 2007 06:33:35 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 12 Dec 2007 06:33:35 GMT Message-Id: <200712120633.lBC6XZrB029726@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 130676 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 06:33:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=130676 Change 130676 by kmacy@kmacy:storage:toehead on 2007/12/12 06:32:45 IFC 130674 Affected files ... .. //depot/projects/toehead/sys/dev/amr/amr.c#2 integrate .. //depot/projects/toehead/sys/dev/amr/amr_cam.c#2 integrate .. //depot/projects/toehead/sys/dev/amr/amr_pci.c#2 integrate .. //depot/projects/toehead/sys/dev/amr/amrvar.h#2 integrate .. //depot/projects/toehead/sys/netinet/tcp_syncache.c#2 integrate Differences ... ==== //depot/projects/toehead/sys/dev/amr/amr.c#2 (text+ko) ==== @@ -56,7 +56,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/amr/amr.c,v 1.83 2007/12/02 19:54:45 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/amr/amr.c,v 1.84 2007/12/12 05:55:03 scottl Exp $"); /* * Driver for the AMI MegaRaid family of controllers. @@ -140,9 +140,9 @@ static void amr_unmapcmd(struct amr_command *ac); static int amr_start(struct amr_command *ac); static void amr_complete(void *context, int pending); -static void amr_setup_dmamap(void *arg, bus_dma_segment_t *segs, int nsegments, int error); -static void amr_setup_dma64map(void *arg, bus_dma_segment_t *segs, int nsegments, int error); -static void amr_setup_data_dmamap(void *arg, bus_dma_segment_t *segs, int nsegments, int error); +static void amr_setup_sg(void *arg, bus_dma_segment_t *segs, int nsegments, int error); +static void amr_setup_data(void *arg, bus_dma_segment_t *segs, int nsegments, int error); +static void amr_setup_ccb(void *arg, bus_dma_segment_t *segs, int nsegments, int error); /* * Status monitoring @@ -572,9 +572,6 @@ adapter = (ali.ui.fcs.adapno) ^ 'm' << 8; - ap = malloc(sizeof(struct amr_passthrough), - M_AMR, M_WAITOK | M_ZERO); - mb = (void *)&ali.mbox[0]; if ((ali.mbox[0] == FC_DEL_LOGDRV && ali.mbox[2] == OP_DEL_LOGDRV) || /* delete */ @@ -587,6 +584,12 @@ } if (ali.mbox[0] == AMR_CMD_PASS) { + mtx_lock(&sc->amr_list_lock); + while ((ac = amr_alloccmd(sc)) == NULL) + msleep(sc, &sc->amr_list_lock, PPAUSE, "amrioc", hz); + mtx_unlock(&sc->amr_list_lock); + ap = &ac->ac_ccb->ccb_pthru; + error = copyin((void *)(uintptr_t)mb->mb_physaddr, ap, sizeof(struct amr_passthrough)); if (error) @@ -603,21 +606,16 @@ break; } - mtx_lock(&sc->amr_list_lock); - while ((ac = amr_alloccmd(sc)) == NULL) - msleep(sc, &sc->amr_list_lock, PPAUSE, "amrioc", hz); - - ac_flags = AMR_CMD_DATAIN|AMR_CMD_DATAOUT|AMR_CMD_CCB_DATAIN|AMR_CMD_CCB_DATAOUT; + ac_flags = AMR_CMD_DATAIN|AMR_CMD_DATAOUT|AMR_CMD_CCB; bzero(&ac->ac_mailbox, sizeof(ac->ac_mailbox)); ac->ac_mailbox.mb_command = AMR_CMD_PASS; ac->ac_flags = ac_flags; - ac->ac_data = ap; - ac->ac_length = sizeof(struct amr_passthrough); - ac->ac_ccb_data = dp; - ac->ac_ccb_length = ap->ap_data_transfer_length; + ac->ac_data = dp; + ac->ac_length = ap->ap_data_transfer_length; temp = (void *)(uintptr_t)ap->ap_data_transfer_address; + mtx_lock(&sc->amr_list_lock); error = amr_wait_command(ac); mtx_unlock(&sc->amr_list_lock); if (error) @@ -706,8 +704,6 @@ mtx_unlock(&sc->amr_list_lock); if (dp != NULL) free(dp, M_AMR); - if (ap != NULL) - free(ap, M_AMR); return(error); } @@ -729,7 +725,7 @@ unsigned long au_length; unsigned char *au_cmd; int *au_statusp, au_direction; - int error, ac_flags = 0; + int error; struct amr_passthrough *ap; /* 60 bytes */ int logical_drives_changed = 0; @@ -832,8 +828,6 @@ } /* Allocate this now before the mutex gets held */ - if (au_cmd[0] == AMR_CMD_PASS) - ap = malloc(sizeof(struct amr_passthrough), M_AMR, M_WAITOK|M_ZERO); mtx_lock(&sc->amr_list_lock); while ((ac = amr_alloccmd(sc)) == NULL) @@ -843,6 +837,9 @@ if (au_cmd[0] == AMR_CMD_PASS) { int len; + ap = &ac->ac_ccb->ccb_pthru; + bzero(ap, sizeof(struct amr_passthrough)); + /* copy cdb */ len = au_cmd[2]; ap->ap_cdb_length = len; @@ -860,13 +857,8 @@ /* XXX what about the request-sense area? does the caller want it? */ /* build command */ - ac->ac_data = ap; - ac->ac_length = sizeof(struct amr_passthrough); - ac->ac_ccb_data = dp; - ac->ac_ccb_length = au_length; - ac->ac_mailbox.mb_command = AMR_CMD_PASS; - ac_flags = AMR_CMD_DATAIN|AMR_CMD_DATAOUT|AMR_CMD_CCB_DATAIN|AMR_CMD_CCB_DATAOUT; + ac->ac_flags = AMR_CMD_CCB; } else { /* direct command to controller */ @@ -878,14 +870,13 @@ mbi->mb_param = au_cmd[2]; mbi->mb_pad[0] = au_cmd[3]; mbi->mb_drive = au_cmd[4]; - - /* build the command */ - ac->ac_data = dp; - ac->ac_length = au_length; - ac_flags = AMR_CMD_DATAIN|AMR_CMD_DATAOUT; + ac->ac_flags = 0; } - ac->ac_flags = ac_flags; + /* build the command */ + ac->ac_data = dp; + ac->ac_length = au_length; + ac->ac_flags |= AMR_CMD_DATAIN|AMR_CMD_DATAOUT; /* run the command */ error = amr_wait_command(ac); @@ -899,7 +890,7 @@ } debug(2, "copyout %ld bytes from %p -> %p", au_length, dp, au_buffer); if (dp != NULL) - debug(2, "%jd", (uintptr_t)dp); + debug(2, "%p status 0x%x", dp, ac->ac_status); *au_statusp = ac->ac_status; out: @@ -913,8 +904,6 @@ mtx_unlock(&sc->amr_list_lock); if (dp != NULL) free(dp, M_AMR); - if (ap != NULL) - free(ap, M_AMR); #ifndef LSI if (logical_drives_changed) @@ -1420,21 +1409,24 @@ { struct amr_command *ac = arg; struct amr_softc *sc = ac->ac_sc; - int flags; + int mb_channel; + + amr_setup_sg(arg, segs, nsegs, err); - flags = 0; - if (ac->ac_flags & AMR_CMD_DATAIN) - flags |= BUS_DMASYNC_PREREAD; - if (ac->ac_flags & AMR_CMD_DATAOUT) - flags |= BUS_DMASYNC_PREWRITE; + /* for AMR_CMD_CONFIG Read/Write the s/g count goes elsewhere */ + mb_channel = ((struct amr_mailbox_ioctl *)&ac->ac_mailbox)->mb_channel; + if (ac->ac_mailbox.mb_command == AMR_CMD_CONFIG && + ((mb_channel == AMR_CONFIG_READ_NVRAM_CONFIG) || + (mb_channel == AMR_CONFIG_WRITE_NVRAM_CONFIG))) + ((struct amr_mailbox_ioctl *)&ac->ac_mailbox)->mb_param = ac->ac_nsegments; + ac->ac_mailbox.mb_nsgelem = ac->ac_nsegments; + ac->ac_mailbox.mb_physaddr = ac->ac_mb_physaddr; if (AC_IS_SG64(ac)) { - amr_setup_dma64map(arg, segs, nsegs, err); - bus_dmamap_sync(sc->amr_buffer64_dmat,ac->ac_dma64map, flags); - } else { - amr_setup_dmamap(arg, segs, nsegs, err); - bus_dmamap_sync(sc->amr_buffer_dmat,ac->ac_dmamap, flags); + ac->ac_sg64_hi = 0; + ac->ac_sg64_lo = ac->ac_sgbusaddr; } + sc->amr_poll_command1(sc, ac); } @@ -1445,8 +1437,6 @@ static int amr_quartz_poll_command(struct amr_command *ac) { - bus_dma_tag_t tag; - bus_dmamap_t datamap; struct amr_softc *sc = ac->ac_sc; int error; @@ -1455,17 +1445,17 @@ error = 0; if (AC_IS_SG64(ac)) { - tag = sc->amr_buffer64_dmat; - datamap = ac->ac_dma64map; + ac->ac_tag = sc->amr_buffer64_dmat; + ac->ac_datamap = ac->ac_dma64map; } else { - tag = sc->amr_buffer_dmat; - datamap = ac->ac_dmamap; + ac->ac_tag = sc->amr_buffer_dmat; + ac->ac_datamap = ac->ac_dmamap; } /* now we have a slot, we can map the command (unmapped in amr_complete) */ if (ac->ac_data != 0) { - if (bus_dmamap_load(tag, datamap, ac->ac_data, ac->ac_length, - amr_setup_polled_dmamap, ac, BUS_DMA_NOWAIT) != 0) { + if (bus_dmamap_load(ac->ac_tag, ac->ac_datamap, ac->ac_data, + ac->ac_length, amr_setup_polled_dmamap, ac, BUS_DMA_NOWAIT) != 0) { error = 1; } } else { @@ -1494,10 +1484,7 @@ device_printf(sc->amr_dev, "adapter is busy\n"); mtx_unlock(&sc->amr_hw_lock); if (ac->ac_data != NULL) { - if (AC_IS_SG64(ac)) - bus_dmamap_unload(sc->amr_buffer64_dmat, ac->ac_dma64map); - else - bus_dmamap_unload(sc->amr_buffer_dmat, ac->ac_dmamap); + bus_dmamap_unload(ac->ac_tag, ac->ac_datamap); } ac->ac_status=0; return(1); @@ -1535,17 +1522,12 @@ /* unmap the command's data buffer */ if (ac->ac_flags & AMR_CMD_DATAIN) { - bus_dmamap_sync(sc->amr_buffer_dmat,ac->ac_dmamap, - BUS_DMASYNC_POSTREAD); + bus_dmamap_sync(ac->ac_tag, ac->ac_datamap, BUS_DMASYNC_POSTREAD); } if (ac->ac_flags & AMR_CMD_DATAOUT) { - bus_dmamap_sync(sc->amr_buffer_dmat,ac->ac_dmamap, - BUS_DMASYNC_POSTWRITE); + bus_dmamap_sync(ac->ac_tag, ac->ac_datamap, BUS_DMASYNC_POSTWRITE); } - if (AC_IS_SG64(ac)) - bus_dmamap_unload(sc->amr_buffer64_dmat, ac->ac_dma64map); - else - bus_dmamap_unload(sc->amr_buffer_dmat, ac->ac_dmamap); + bus_dmamap_unload(ac->ac_tag, ac->ac_datamap); return(error); } @@ -1574,289 +1556,141 @@ * These functions may be safely called multiple times on a given command. */ static void -amr_setup_dmamap(void *arg, bus_dma_segment_t *segs, int nsegments, int error) +amr_setup_sg(void *arg, bus_dma_segment_t *segs, int nsegments, int error) { struct amr_command *ac = (struct amr_command *)arg; struct amr_sgentry *sg; - int i; - u_int8_t *sgc; + struct amr_sg64entry *sg64; + int flags, i; debug_called(3); - /* get base address of s/g table */ - sg = ac->ac_sg.sg32; - - /* save data physical address */ - - /* for AMR_CMD_CONFIG Read/Write the s/g count goes elsewhere */ - if (ac->ac_mailbox.mb_command == AMR_CMD_CONFIG && ( - ((struct amr_mailbox_ioctl *)&ac->ac_mailbox)->mb_channel == AMR_CONFIG_READ_NVRAM_CONFIG || - ((struct amr_mailbox_ioctl *)&ac->ac_mailbox)->mb_channel == AMR_CONFIG_WRITE_NVRAM_CONFIG)) { - sgc = &(((struct amr_mailbox_ioctl *)&ac->ac_mailbox)->mb_param); - } else { - sgc = &ac->ac_mailbox.mb_nsgelem; - } + if (error) + printf("amr_setup_sg: error %d\n", error); - /* decide whether we need to populate the s/g table */ - if (nsegments < 2) { - *sgc = 0; - ac->ac_mailbox.mb_nsgelem = 0; - ac->ac_mailbox.mb_physaddr = segs[0].ds_addr; - } else { - ac->ac_mailbox.mb_nsgelem = nsegments; - *sgc = nsegments; - /* XXX Setting these to 0 might not be needed. */ - ac->ac_sg64_lo = 0; - ac->ac_sg64_hi = 0; - ac->ac_mailbox.mb_physaddr = ac->ac_sgbusaddr; - for (i = 0; i < nsegments; i++, sg++) { - sg->sg_addr = segs[i].ds_addr; - sg->sg_count = segs[i].ds_len; - } - } - -} - -static void -amr_setup_dma64map(void *arg, bus_dma_segment_t *segs, int nsegments, int error) -{ - struct amr_command *ac = (struct amr_command *)arg; - struct amr_sg64entry *sg; - int i; - u_int8_t *sgc; - - debug_called(3); - /* get base address of s/g table */ - sg = ac->ac_sg.sg64; - - /* save data physical address */ - - /* for AMR_CMD_CONFIG Read/Write the s/g count goes elsewhere */ - if (ac->ac_mailbox.mb_command == AMR_CMD_CONFIG && ( - ((struct amr_mailbox_ioctl *)&ac->ac_mailbox)->mb_channel == AMR_CONFIG_READ_NVRAM_CONFIG || - ((struct amr_mailbox_ioctl *)&ac->ac_mailbox)->mb_channel == AMR_CONFIG_WRITE_NVRAM_CONFIG)) { - sgc = &(((struct amr_mailbox_ioctl *)&ac->ac_mailbox)->mb_param); - } else { - sgc = &ac->ac_mailbox.mb_nsgelem; - } - - ac->ac_mailbox.mb_nsgelem = nsegments; - *sgc = nsegments; - ac->ac_sg64_hi = 0; - ac->ac_sg64_lo = ac->ac_sgbusaddr; - ac->ac_mailbox.mb_physaddr = 0xffffffff; - for (i = 0; i < nsegments; i++, sg++) { - sg->sg_addr = segs[i].ds_addr; - sg->sg_count = segs[i].ds_len; - } -} - -static void -amr_setup_ccbmap(void *arg, bus_dma_segment_t *segs, int nsegments, int error) -{ - struct amr_command *ac = (struct amr_command *)arg; - struct amr_softc *sc = ac->ac_sc; - struct amr_sgentry *sg; - struct amr_passthrough *ap = (struct amr_passthrough *)ac->ac_data; - struct amr_ext_passthrough *aep = (struct amr_ext_passthrough *)ac->ac_data; - int i; - - /* get base address of s/g table */ sg = ac->ac_sg.sg32; + sg64 = ac->ac_sg.sg64; - /* decide whether we need to populate the s/g table */ - if( ac->ac_mailbox.mb_command == AMR_CMD_EXTPASS ) { - if (nsegments < 2) { - aep->ap_no_sg_elements = 0; - aep->ap_data_transfer_address = segs[0].ds_addr; - } else { - /* save s/g table information in passthrough */ - aep->ap_no_sg_elements = nsegments; - aep->ap_data_transfer_address = ac->ac_sgbusaddr; - /* - * populate s/g table (overwrites previous call which mapped the - * passthrough) - */ - for (i = 0; i < nsegments; i++, sg++) { - sg->sg_addr = segs[i].ds_addr; - sg->sg_count = segs[i].ds_len; - debug(3, " %d: 0x%x/%d", i, sg->sg_addr, sg->sg_count); - } + if (AC_IS_SG64(ac)) { + ac->ac_nsegments = nsegments; + ac->ac_mb_physaddr = 0xffffffff; + for (i = 0; i < nsegments; i++, sg64++) { + sg64->sg_addr = segs[i].ds_addr; + sg64->sg_count = segs[i].ds_len; } - debug(3, "slot %d %d segments at 0x%x\n", ac->ac_slot, - aep->ap_no_sg_elements, aep->ap_data_transfer_address); } else { + /* decide whether we need to populate the s/g table */ if (nsegments < 2) { - ap->ap_no_sg_elements = 0; - ap->ap_data_transfer_address = segs[0].ds_addr; + ac->ac_nsegments = 0; + ac->ac_mb_physaddr = segs[0].ds_addr; } else { - /* save s/g table information in passthrough */ - ap->ap_no_sg_elements = nsegments; - ap->ap_data_transfer_address = ac->ac_sgbusaddr; - /* - * populate s/g table (overwrites previous call which mapped the - * passthrough) - */ + ac->ac_nsegments = nsegments; + ac->ac_mb_physaddr = ac->ac_sgbusaddr; for (i = 0; i < nsegments; i++, sg++) { sg->sg_addr = segs[i].ds_addr; sg->sg_count = segs[i].ds_len; - debug(3, " %d: 0x%x/%d", i, sg->sg_addr, sg->sg_count); } } - debug(3, "slot %d %d segments at 0x%x\n", ac->ac_slot, - ap->ap_no_sg_elements, ap->ap_data_transfer_address); } - if (ac->ac_flags & AMR_CMD_CCB_DATAIN) - bus_dmamap_sync(sc->amr_buffer_dmat, ac->ac_ccb_dmamap, - BUS_DMASYNC_PREREAD); - if (ac->ac_flags & AMR_CMD_CCB_DATAOUT) - bus_dmamap_sync(sc->amr_buffer_dmat, ac->ac_ccb_dmamap, - BUS_DMASYNC_PREWRITE); - if ((ac->ac_flags & (AMR_CMD_CCB_DATAIN | AMR_CMD_CCB_DATAOUT)) == 0) - panic("no direction for ccb?\n"); + flags = 0; if (ac->ac_flags & AMR_CMD_DATAIN) - bus_dmamap_sync(sc->amr_buffer_dmat,ac->ac_dmamap,BUS_DMASYNC_PREREAD); + flags |= BUS_DMASYNC_PREREAD; if (ac->ac_flags & AMR_CMD_DATAOUT) - bus_dmamap_sync(sc->amr_buffer_dmat,ac->ac_dmamap,BUS_DMASYNC_PREWRITE); - + flags |= BUS_DMASYNC_PREWRITE; + bus_dmamap_sync(ac->ac_tag, ac->ac_datamap, flags); ac->ac_flags |= AMR_CMD_MAPPED; - - if (sc->amr_submit_command(ac) == EBUSY) { - amr_freeslot(ac); - amr_requeue_ready(ac); - } } static void -amr_setup_ccb64map(void *arg, bus_dma_segment_t *segs, int nsegments, int error) +amr_setup_data(void *arg, bus_dma_segment_t *segs, int nsegs, int err) { - struct amr_command *ac = (struct amr_command *)arg; - struct amr_softc *sc = ac->ac_sc; - struct amr_sg64entry *sg; - struct amr_passthrough *ap = (struct amr_passthrough *)ac->ac_data; - struct amr_ext_passthrough *aep = (struct amr_ext_passthrough *)ac->ac_data; - int i; + struct amr_command *ac = arg; + struct amr_softc *sc = ac->ac_sc; + int mb_channel; + + amr_setup_sg(arg, segs, nsegs, err); - /* get base address of s/g table */ - sg = ac->ac_sg.sg64; + /* for AMR_CMD_CONFIG Read/Write the s/g count goes elsewhere */ + mb_channel = ((struct amr_mailbox_ioctl *)&ac->ac_mailbox)->mb_channel; + if (ac->ac_mailbox.mb_command == AMR_CMD_CONFIG && + ((mb_channel == AMR_CONFIG_READ_NVRAM_CONFIG) || + (mb_channel == AMR_CONFIG_WRITE_NVRAM_CONFIG))) + ((struct amr_mailbox_ioctl *)&ac->ac_mailbox)->mb_param = ac->ac_nsegments; - /* decide whether we need to populate the s/g table */ - if( ac->ac_mailbox.mb_command == AMR_CMD_EXTPASS ) { - /* save s/g table information in passthrough */ - aep->ap_no_sg_elements = nsegments; - aep->ap_data_transfer_address = ac->ac_sgbusaddr; - /* - * populate s/g table (overwrites previous call which mapped the - * passthrough) - */ - for (i = 0; i < nsegments; i++, sg++) { - sg->sg_addr = segs[i].ds_addr; - sg->sg_count = segs[i].ds_len; - debug(3, " %d: 0x%lx/%d", i, (u_long)sg->sg_addr, sg->sg_count); - } - debug(3, "slot %d %d segments at 0x%x\n", ac->ac_slot, - aep->ap_no_sg_elements, aep->ap_data_transfer_address); - } else { - /* save s/g table information in passthrough */ - ap->ap_no_sg_elements = nsegments; - ap->ap_data_transfer_address = ac->ac_sgbusaddr; - /* - * populate s/g table (overwrites previous call which mapped the - * passthrough) - */ - for (i = 0; i < nsegments; i++, sg++) { - sg->sg_addr = segs[i].ds_addr; - sg->sg_count = segs[i].ds_len; - debug(3, " %d: 0x%lx/%d", i, (u_long)sg->sg_addr, sg->sg_count); - } - debug(3, "slot %d %d segments at 0x%x\n", ac->ac_slot, - ap->ap_no_sg_elements, ap->ap_data_transfer_address); + ac->ac_mailbox.mb_nsgelem = ac->ac_nsegments; + ac->ac_mailbox.mb_physaddr = ac->ac_mb_physaddr; + if (AC_IS_SG64(ac)) { + ac->ac_sg64_hi = 0; + ac->ac_sg64_lo = ac->ac_sgbusaddr; } - if (ac->ac_flags & AMR_CMD_CCB_DATAIN) - bus_dmamap_sync(sc->amr_buffer64_dmat, ac->ac_ccb_dma64map, - BUS_DMASYNC_PREREAD); - if (ac->ac_flags & AMR_CMD_CCB_DATAOUT) - bus_dmamap_sync(sc->amr_buffer64_dmat, ac->ac_ccb_dma64map, - BUS_DMASYNC_PREWRITE); - if ((ac->ac_flags & (AMR_CMD_CCB_DATAIN | AMR_CMD_CCB_DATAOUT)) == 0) - panic("no direction for ccb?\n"); - if (ac->ac_flags & AMR_CMD_DATAIN) - bus_dmamap_sync(sc->amr_buffer64_dmat, ac->ac_dma64map, - BUS_DMASYNC_PREREAD); - if (ac->ac_flags & AMR_CMD_DATAOUT) - bus_dmamap_sync(sc->amr_buffer64_dmat, ac->ac_dma64map, - BUS_DMASYNC_PREWRITE); - - ac->ac_flags |= AMR_CMD_MAPPED; - if (sc->amr_submit_command(ac) == EBUSY) { amr_freeslot(ac); amr_requeue_ready(ac); } } - + static void -amr_setup_dmamap_cb(void *arg, bus_dma_segment_t *segs, int nsegments, - int error) +amr_setup_ccb(void *arg, bus_dma_segment_t *segs, int nsegs, int err) { - struct amr_command *ac = (struct amr_command *)arg; - struct amr_softc *sc = ac->ac_sc; + struct amr_command *ac = arg; + struct amr_softc *sc = ac->ac_sc; + struct amr_passthrough *ap = &ac->ac_ccb->ccb_pthru; + struct amr_ext_passthrough *aep = &ac->ac_ccb->ccb_epthru; + + /* Set up the mailbox portion of the command to point at the ccb */ + ac->ac_mailbox.mb_nsgelem = 0; + ac->ac_mailbox.mb_physaddr = ac->ac_ccb_busaddr; - amr_setup_dmamap(arg, segs, nsegments, error); + amr_setup_sg(arg, segs, nsegs, err); - if (bus_dmamap_load(sc->amr_buffer_dmat, ac->ac_ccb_dmamap, - ac->ac_ccb_data, ac->ac_ccb_length, amr_setup_ccbmap, ac, - 0) == EINPROGRESS) { - sc->amr_state |= AMR_STATE_QUEUE_FRZN; + switch (ac->ac_mailbox.mb_command) { + case AMR_CMD_EXTPASS: + aep->ap_no_sg_elements = ac->ac_nsegments; + aep->ap_data_transfer_address = ac->ac_mb_physaddr; + break; + case AMR_CMD_PASS: + ap->ap_no_sg_elements = ac->ac_nsegments; + ap->ap_data_transfer_address = ac->ac_mb_physaddr; + break; + default: + panic("Unknown ccb command"); } -} -static void -amr_setup_dma64map_cb(void *arg, bus_dma_segment_t *segs, int nsegments, - int error) -{ - struct amr_command *ac = (struct amr_command *)arg; - struct amr_softc *sc = ac->ac_sc; - - amr_setup_dma64map(arg, segs, nsegments, error); - - if (bus_dmamap_load(sc->amr_buffer64_dmat, ac->ac_ccb_dma64map, - ac->ac_ccb_data, ac->ac_ccb_length, amr_setup_ccb64map, ac, - 0) == EINPROGRESS) { - sc->amr_state |= AMR_STATE_QUEUE_FRZN; + if (sc->amr_submit_command(ac) == EBUSY) { + amr_freeslot(ac); + amr_requeue_ready(ac); } } static int amr_mapcmd(struct amr_command *ac) { - bus_dma_tag_t tag; - bus_dmamap_t datamap; bus_dmamap_callback_t *cb; struct amr_softc *sc = ac->ac_sc; debug_called(3); if (AC_IS_SG64(ac)) { - tag = sc->amr_buffer64_dmat; - datamap = ac->ac_dma64map; - cb = amr_setup_dma64map_cb; + ac->ac_tag = sc->amr_buffer64_dmat; + ac->ac_datamap = ac->ac_dma64map; } else { - tag = sc->amr_buffer_dmat; - datamap = ac->ac_dmamap; - cb = amr_setup_dmamap_cb; + ac->ac_tag = sc->amr_buffer_dmat; + ac->ac_datamap = ac->ac_dmamap; } + if (ac->ac_flags & AMR_CMD_CCB) + cb = amr_setup_ccb; + else + cb = amr_setup_data; + /* if the command involves data at all, and hasn't been mapped */ if ((ac->ac_flags & AMR_CMD_MAPPED) == 0 && (ac->ac_data != NULL)) { - if (ac->ac_ccb_data == NULL) - cb = amr_setup_data_dmamap; /* map the data buffers into bus space and build the s/g list */ - if (bus_dmamap_load(tag, datamap, ac->ac_data, ac->ac_length, - cb, ac, 0) == EINPROGRESS) { + if (bus_dmamap_load(ac->ac_tag, ac->ac_datamap, ac->ac_data, + ac->ac_length, cb, ac, 0) == EINPROGRESS) { sc->amr_state |= AMR_STATE_QUEUE_FRZN; } } else { @@ -1872,7 +1706,6 @@ static void amr_unmapcmd(struct amr_command *ac) { - struct amr_softc *sc = ac->ac_sc; int flag; debug_called(3); @@ -1888,63 +1721,14 @@ if (ac->ac_flags & AMR_CMD_DATAOUT) flag |= BUS_DMASYNC_POSTWRITE; - if (AC_IS_SG64(ac)) { - bus_dmamap_sync(sc->amr_buffer64_dmat, ac->ac_dma64map, flag); - bus_dmamap_unload(sc->amr_buffer64_dmat, ac->ac_dma64map); - } else { - bus_dmamap_sync(sc->amr_buffer_dmat, ac->ac_dmamap, flag); - bus_dmamap_unload(sc->amr_buffer_dmat, ac->ac_dmamap); - } + bus_dmamap_sync(ac->ac_tag, ac->ac_datamap, flag); + bus_dmamap_unload(ac->ac_tag, ac->ac_datamap); } - if (ac->ac_ccb_data != NULL) { - - flag = 0; - if (ac->ac_flags & AMR_CMD_CCB_DATAIN) - flag |= BUS_DMASYNC_POSTREAD; - if (ac->ac_flags & AMR_CMD_CCB_DATAOUT) - flag |= BUS_DMASYNC_POSTWRITE; - - if (AC_IS_SG64(ac)) { - bus_dmamap_sync(sc->amr_buffer64_dmat,ac->ac_ccb_dma64map,flag); - bus_dmamap_unload(sc->amr_buffer64_dmat, ac->ac_ccb_dma64map); - } else { - bus_dmamap_sync(sc->amr_buffer_dmat, ac->ac_ccb_dmamap, flag); - bus_dmamap_unload(sc->amr_buffer_dmat, ac->ac_ccb_dmamap); - } - } ac->ac_flags &= ~AMR_CMD_MAPPED; } } -static void -amr_setup_data_dmamap(void *arg, bus_dma_segment_t *segs, int nsegs, int err) -{ - struct amr_command *ac = arg; - struct amr_softc *sc = ac->ac_sc; - int flags; - - flags = 0; - if (ac->ac_flags & AMR_CMD_DATAIN) - flags |= BUS_DMASYNC_PREREAD; - if (ac->ac_flags & AMR_CMD_DATAOUT) - flags |= BUS_DMASYNC_PREWRITE; - - if (AC_IS_SG64(ac)) { - amr_setup_dma64map(arg, segs, nsegs, err); - bus_dmamap_sync(sc->amr_buffer64_dmat,ac->ac_dma64map, flags); - } else { - amr_setup_dmamap(arg, segs, nsegs, err); - bus_dmamap_sync(sc->amr_buffer_dmat,ac->ac_dmamap, flags); - } - ac->ac_flags |= AMR_CMD_MAPPED; - - if (sc->amr_submit_command(ac) == EBUSY) { - amr_freeslot(ac); - amr_requeue_ready(ac); - } -} - /******************************************************************************** * Take a command and give it to the controller, returns 0 if successful, or * EBUSY if the command should be retried later. @@ -2124,8 +1908,9 @@ ac->ac_flags = 0; ac->ac_bio = NULL; ac->ac_data = NULL; - ac->ac_ccb_data = NULL; ac->ac_complete = NULL; + ac->ac_tag = NULL; + ac->ac_datamap = NULL; return(ac); } @@ -2177,12 +1962,15 @@ ac->ac_sg.sg32 = sc->amr_sgtable + (ac->ac_slot * AMR_NSEG); } - if (bus_dmamap_create(sc->amr_buffer_dmat, 0, &ac->ac_dmamap) || - bus_dmamap_create(sc->amr_buffer_dmat, 0, &ac->ac_ccb_dmamap) || - (AMR_IS_SG64(sc) && - (bus_dmamap_create(sc->amr_buffer64_dmat, 0,&ac->ac_dma64map) || - bus_dmamap_create(sc->amr_buffer64_dmat, 0, &ac->ac_ccb_dma64map)))) - break; + ac->ac_ccb = sc->amr_ccb + ac->ac_slot; + ac->ac_ccb_busaddr = sc->amr_ccb_busaddr + + (ac->ac_slot * sizeof(union amr_ccb)); + + if (bus_dmamap_create(sc->amr_buffer_dmat, 0, &ac->ac_dmamap)) + break; + if (AMR_IS_SG64(sc) && + (bus_dmamap_create(sc->amr_buffer64_dmat, 0,&ac->ac_dma64map))) + break; amr_releasecmd(ac); if (++nextslot > sc->amr_maxio) break; @@ -2202,10 +1990,8 @@ for (i = 0; i < AMR_CMD_CLUSTERCOUNT; i++) { bus_dmamap_destroy(sc->amr_buffer_dmat, acc->acc_command[i].ac_dmamap); - bus_dmamap_destroy(sc->amr_buffer_dmat, acc->acc_command[i].ac_ccb_dmamap); if (AMR_IS_SG64(sc)) bus_dmamap_destroy(sc->amr_buffer64_dmat, acc->acc_command[i].ac_dma64map); - bus_dmamap_destroy(sc->amr_buffer64_dmat, acc->acc_command[i].ac_ccb_dma64map); } free(acc, M_AMR); } ==== //depot/projects/toehead/sys/dev/amr/amr_cam.c#2 (text+ko) ==== @@ -55,7 +55,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/amr/amr_cam.c,v 1.26 2007/12/02 19:54:45 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/amr/amr_cam.c,v 1.27 2007/12/12 05:55:03 scottl Exp $"); #include #include @@ -222,16 +222,16 @@ /* check the CDB length */ if (csio->cdb_len > AMR_MAX_EXTCDB_LEN) - ccbh->status = CAM_REQ_CMP_ERR; + ccbh->status = CAM_REQ_INVALID; if ((csio->cdb_len > AMR_MAX_CDB_LEN) && (sc->support_ext_cdb == 0)) - ccbh->status = CAM_REQ_CMP_ERR; + ccbh->status = CAM_REQ_INVALID; /* check that the CDB pointer is not to a physical address */ if ((ccbh->flags & CAM_CDB_POINTER) && (ccbh->flags & CAM_CDB_PHYS)) - ccbh->status = CAM_REQ_CMP_ERR; + ccbh->status = CAM_REQ_INVALID; /* * if there is data transfer, it must be to/from a virtual * address @@ -239,10 +239,10 @@ if ((ccbh->flags & CAM_DIR_MASK) != CAM_DIR_NONE) { if (ccbh->flags & CAM_DATA_PHYS) /* we can't map it */ - ccbh->status = CAM_REQ_CMP_ERR; + ccbh->status = CAM_REQ_INVALID; if (ccbh->flags & CAM_SCATTER_VALID) /* we want to do the s/g setup */ - ccbh->status = CAM_REQ_CMP_ERR; + ccbh->status = CAM_REQ_INVALID; } /* @@ -252,7 +252,7 @@ * devices appear echoed. */ if (csio->ccb_h.target_lun != 0) - ccbh->status = CAM_REQ_CMP_ERR; + ccbh->status = CAM_DEV_NOT_THERE; /* if we're happy with the request, queue it for attention */ if (ccbh->status == CAM_REQ_INPROG) { @@ -405,13 +405,15 @@ * Build a passthrough command. */ + /* construct command */ + if ((ac = amr_alloccmd(sc)) == NULL) { + error = ENOMEM; + goto out; + } + /* construct passthrough */ if (sc->support_ext_cdb ) { - if ((aep = malloc(sizeof(*aep), M_AMRCAM, M_NOWAIT | M_ZERO)) - == NULL) { - error = ENOMEM; - goto out; - } + aep = &ac->ac_ccb->ccb_epthru; aep->ap_timeout = 2; aep->ap_ars = 1; aep->ap_request_sense_length = 14; @@ -437,11 +439,7 @@ aep->ap_scsi_id, aep->ap_logical_drive_no); } else { - if ((ap = malloc(sizeof(*ap), M_AMRCAM, M_NOWAIT | M_ZERO)) - == NULL) { - error = ENOMEM; - goto out; - } + ap = &ac->ac_ccb->ccb_pthru; ap->ap_timeout = 0; ap->ap_ars = 1; ap->ap_request_sense_length = 14; @@ -467,30 +465,20 @@ ap->ap_scsi_id, ap->ap_logical_drive_no); } - /* construct command */ - if ((ac = amr_alloccmd(sc)) == NULL) { - error = ENOMEM; - goto out; - } + ac->ac_flags |= AMR_CMD_CCB; - ac->ac_flags |= AMR_CMD_DATAOUT | AMR_CMD_DATAIN; - - ac->ac_ccb_data = csio->data_ptr; - ac->ac_ccb_length = csio->dxfer_len; + ac->ac_data = csio->data_ptr; + ac->ac_length = csio->dxfer_len; if ((csio->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) - ac->ac_flags |= AMR_CMD_CCB_DATAIN; + ac->ac_flags |= AMR_CMD_DATAIN; if ((csio->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_OUT) - ac->ac_flags |= AMR_CMD_CCB_DATAOUT; + ac->ac_flags |= AMR_CMD_DATAOUT; ac->ac_private = csio; ac->ac_complete = amr_cam_complete; if ( sc->support_ext_cdb ) { - ac->ac_data = aep; - ac->ac_length = sizeof(*aep); ac->ac_mailbox.mb_command = AMR_CMD_EXTPASS; } else { - ac->ac_data = ap; - ac->ac_length = sizeof(*ap); ac->ac_mailbox.mb_command = AMR_CMD_PASS; } @@ -498,10 +486,6 @@ if (error != 0) { if (ac != NULL) amr_releasecmd(ac); - if (ap != NULL) - free(ap, M_AMRCAM); - if (aep != NULL) - free(aep, M_AMRCAM); if (csio != NULL) /* put it back and try again later */ amr_requeue_ccb(sc, (union ccb *)csio); @@ -532,19 +516,20 @@ struct scsi_inquiry_data *inq; int scsi_status, cdb0; - ap = (struct amr_passthrough *)ac->ac_data; - aep = (struct amr_ext_passthrough *)ac->ac_data; + ap = &ac->ac_ccb->ccb_pthru; + aep = &ac->ac_ccb->ccb_epthru; csio = (struct ccb_scsiio *)ac->ac_private; inq = (struct scsi_inquiry_data *)csio->data_ptr; - if (ac->ac_length == sizeof(*ap)) + if (ac->ac_mailbox.mb_command == AMR_CMD_EXTPASS) + scsi_status = aep->ap_scsi_status; + else scsi_status = ap->ap_scsi_status; - else - scsi_status = aep->ap_scsi_status; debug(1, "status 0x%x AP scsi_status 0x%x", ac->ac_status, scsi_status); - if (ac->ac_status != AMR_STATUS_SUCCESS) { + /* Make sure the status is sane */ + if ((ac->ac_status != AMR_STATUS_SUCCESS) && (scsi_status == 0)) { csio->ccb_h.status = CAM_REQ_CMP_ERR; goto out; } @@ -561,10 +546,10 @@ /* handle passthrough SCSI status */ switch(scsi_status) { case 0: /* completed OK */ - if (ac->ac_length == sizeof(*ap)) + if (ac->ac_mailbox.mb_command == AMR_CMD_EXTPASS) + cdb0 = aep->ap_cdb[0]; + else cdb0 = ap->ap_cdb[0]; - else - cdb0 = aep->ap_cdb[0]; if ((cdb0 == INQUIRY) && (SID_TYPE(inq) == T_DIRECT)) inq->device = (inq->device & 0xe0) | T_NODEVICE; csio->ccb_h.status = CAM_REQ_CMP; @@ -573,11 +558,11 @@ case 0x02: csio->ccb_h.status = CAM_SCSI_STATUS_ERROR; csio->scsi_status = SCSI_STATUS_CHECK_COND; - if (ac->ac_length == sizeof(*ap)) - bcopy(ap->ap_request_sense_area, &csio->sense_data, + if (ac->ac_mailbox.mb_command == AMR_CMD_EXTPASS) + bcopy(aep->ap_request_sense_area, &csio->sense_data, AMR_MAX_REQ_SENSE_LEN); else - bcopy(aep->ap_request_sense_area, &csio->sense_data, + bcopy(ap->ap_request_sense_area, &csio->sense_data, AMR_MAX_REQ_SENSE_LEN); csio->sense_len = AMR_MAX_REQ_SENSE_LEN; csio->ccb_h.status |= CAM_AUTOSNS_VALID; @@ -590,20 +575,20 @@ case 0xf0: case 0xf4: default: - csio->ccb_h.status = CAM_REQ_CMP_ERR; + /* + * Non-zero LUNs are already filtered, so there's no need + * to return CAM_DEV_NOT_THERE. + */ + csio->ccb_h.status = CAM_SEL_TIMEOUT; break; } out: - if (ac->ac_length == sizeof(*ap)) - free(ap, M_AMRCAM); - else - free(aep, M_AMRCAM); if ((csio->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) debug(2, "%*D\n", imin(csio->dxfer_len, 16), csio->data_ptr, " "); - mtx_unlock(&ac->ac_sc->amr_list_lock); + mtx_lock(&ac->ac_sc->amr_list_lock); xpt_done((union ccb *)csio); amr_releasecmd(ac); mtx_unlock(&ac->ac_sc->amr_list_lock); ==== //depot/projects/toehead/sys/dev/amr/amr_pci.c#2 (text+ko) ==== @@ -55,7 +55,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/amr/amr_pci.c,v 1.39 2007/12/02 18:47:31 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/amr/amr_pci.c,v 1.40 2007/12/12 05:55:03 scottl Exp $"); #include #include @@ -86,10 +86,10 @@ static int amr_pci_resume(device_t dev); static void amr_pci_intr(void *arg); static void amr_pci_free(struct amr_softc *sc); -static void amr_sglist_map_helper(void *arg, bus_dma_segment_t *segs, int nseg, int error); +static void amr_sglist_helper(void *arg, bus_dma_segment_t *segs, int nseg, int error); static int amr_sglist_map(struct amr_softc *sc); -static void amr_setup_mbox_helper(void *arg, bus_dma_segment_t *segs, int nseg, int error); static int amr_setup_mbox(struct amr_softc *sc); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Dec 12 06:39:43 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5928516A420; Wed, 12 Dec 2007 06:39:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E08EE16A41B for ; Wed, 12 Dec 2007 06:39:42 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CBB1C13C46E for ; Wed, 12 Dec 2007 06:39:42 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBC6dgMI030163 for ; Wed, 12 Dec 2007 06:39:42 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBC6dg8C030160 for perforce@freebsd.org; Wed, 12 Dec 2007 06:39:42 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 12 Dec 2007 06:39:42 GMT Message-Id: <200712120639.lBC6dg8C030160@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 130677 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 06:39:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=130677 Change 130677 by kmacy@kmacy:storage:toehead on 2007/12/12 06:38:52 add interface to syncache to release external resources for offloaded connections Affected files ... .. //depot/projects/toehead/sys/netinet/tcp_ofld.h#4 edit .. //depot/projects/toehead/sys/netinet/tcp_syncache.c#3 edit .. //depot/projects/toehead/sys/netinet/tcp_syncache.h#2 edit Differences ... ==== //depot/projects/toehead/sys/netinet/tcp_ofld.h#4 (text+ko) ==== @@ -1,6 +1,8 @@ #ifndef _NETINET_TCP_OFLD_H_ #define _NETINET_TCP_OFLD_H_ +#define SC_ENTRY_PRESENT 1 +#define SC_DROP 2 #define tp_offload(tp) ((tp)->t_flags & TF_TOE) #define SO_OFFLOADABLE(so) ((so->so_options & SO_NOOFFLOAD) == 0) @@ -13,7 +15,6 @@ int ofld_disconnect(struct tcpcb *tp); int ofld_abort(struct tcpcb *tp); void ofld_detach(struct tcpcb *tp); - void ofld_listen_open(struct tcpcb *tp); void ofld_listen_close(struct tcpcb *tp); ==== //depot/projects/toehead/sys/netinet/tcp_syncache.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/tcp_syncache.c,v 1.138 2007/12/12 06:11:50 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/tcp_syncache.c,v 1.137 2007/12/07 01:46:13 kmacy Exp $"); #include "opt_inet.h" #include "opt_inet6.h" @@ -78,6 +78,7 @@ #include #include #include +#include #ifdef INET6 #include #endif @@ -136,7 +137,8 @@ #define SCF_SIGNATURE 0x20 /* send MD5 digests */ #define SCF_SACK 0x80 /* send SACK option */ #ifndef DISABLE_TCP_OFFLOAD - void *sc_pspare[2]; /* toepcb / toe_usrreqs */ + struct toe_usrreqs *sc_tu; /* TOE operations */ + void *sc_toepcb; /* TOE protocol block */ #endif #ifdef MAC struct label *sc_label; /* MAC label reference */ @@ -356,6 +358,10 @@ TAILQ_REMOVE(&sch->sch_bucket, sc, sc_hash); sch->sch_length--; +#ifndef DISABLE_TCP_OFFLOAD + if (sc->sc_tu) + sc->sc_tu->tu_syncache_event(SC_DROP, sc->sc_toepcb); +#endif syncache_free(sc); tcp_syncache.cache_count--; } @@ -406,7 +412,6 @@ sch->sch_nextc = sc->sc_rxttime; continue; } - if (sc->sc_rxmits > tcp_syncache.rexmt_limit) { if ((s = tcp_log_addrs(&sc->sc_inc, NULL, NULL, NULL))) { log(LOG_DEBUG, "%s; %s: Retransmits exhausted, " @@ -873,7 +878,7 @@ * Segment validation: * ACK must match our initial sequence number + 1 (the SYN|ACK). */ - if (th->th_ack != sc->sc_iss + 1) { + if (th->th_ack != sc->sc_iss + 1 && sc->sc_toepcb == NULL) { if ((s = tcp_log_addrs(inc, th, NULL, NULL))) log(LOG_DEBUG, "%s; %s: ACK %u != ISS+1 %u, segment " "rejected\n", s, __func__, th->th_ack, sc->sc_iss); @@ -884,7 +889,7 @@ * number + 1 (the SYN) because we didn't ACK any data that * may have come with the SYN. */ - if (th->th_seq != sc->sc_irs + 1) { + if (th->th_seq != sc->sc_irs + 1 && sc->sc_toepcb == NULL) { if ((s = tcp_log_addrs(inc, th, NULL, NULL))) log(LOG_DEBUG, "%s; %s: SEQ %u != IRS+1 %u, segment " "rejected\n", s, __func__, th->th_seq, sc->sc_irs); @@ -901,7 +906,8 @@ * If timestamps were negotiated the reflected timestamp * must be equal to what we actually sent in the SYN|ACK. */ - if ((to->to_flags & TOF_TS) && to->to_tsecr != sc->sc_ts) { + if ((to->to_flags & TOF_TS) && to->to_tsecr != sc->sc_ts && + sc->sc_toepcb == NULL) { if ((s = tcp_log_addrs(inc, th, NULL, NULL))) log(LOG_DEBUG, "%s; %s: TSECR %u != TS %u, " "segment rejected\n", @@ -941,9 +947,10 @@ * consume all available buffer space if it were ACKed. By not ACKing * the data, we avoid this DoS scenario. */ -void -syncache_add(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, - struct inpcb *inp, struct socket **lsop, struct mbuf *m) +static void +_syncache_add(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, + struct inpcb *inp, struct socket **lsop, struct mbuf *m, + struct toe_usrreqs *tu, void *toepcb) { struct tcpcb *tp; struct socket *so; @@ -1021,6 +1028,11 @@ sc = syncache_lookup(inc, &sch); /* returns locked entry */ SCH_LOCK_ASSERT(sch); if (sc != NULL) { +#ifndef DISABLE_TCP_OFFLOAD + if (sc->sc_tu) + sc->sc_tu->tu_syncache_event(SC_ENTRY_PRESENT, + sc->sc_toepcb); +#endif tcpstat.tcps_sc_dupsyn++; if (ipopts) { /* @@ -1055,7 +1067,7 @@ s, __func__); free(s, M_TCPLOG); } - if (syncache_respond(sc) == 0) { + if ((sc->sc_toepcb == NULL) && syncache_respond(sc) == 0) { sc->sc_rxmits = 0; syncache_timeout(sc, sch, 1); tcpstat.tcps_sndacks++; @@ -1088,7 +1100,7 @@ } } } - + /* * Fill in the syncache values. */ @@ -1104,7 +1116,10 @@ sc->sc_ip_tos = ip_tos; sc->sc_ip_ttl = ip_ttl; } - +#ifndef DISABLE_TCP_OFFLOAD + sc->sc_tu = tu; + sc->sc_toepcb = toepcb; +#endif sc->sc_irs = th->th_seq; sc->sc_iss = arc4random(); sc->sc_flags = 0; @@ -1196,7 +1211,7 @@ /* * Do a standard 3-way handshake. */ - if (syncache_respond(sc) == 0) { + if (sc->sc_toepcb || syncache_respond(sc) == 0) { if (tcp_syncookies && tcp_syncookiesonly && sc != &scs) syncache_free(sc); else if (sc != &scs) @@ -1214,8 +1229,11 @@ if (sc == &scs) mac_syncache_destroy(&maclabel); #endif - *lsop = NULL; - m_freem(m); + if (m) { + + *lsop = NULL; + m_freem(m); + } return; } @@ -1374,6 +1392,21 @@ return (error); } +void +syncache_add(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, + struct inpcb *inp, struct socket **lsop, struct mbuf *m) +{ + _syncache_add(inc, to, th, inp, lsop, m, NULL, NULL); +} + +void +syncache_offload_add(struct in_conninfo *inc, struct tcpopt *to, + struct tcphdr *th, struct inpcb *inp, struct socket **lsop, + struct toe_usrreqs *tu, void *toepcb) +{ + _syncache_add(inc, to, th, inp, lsop, NULL, tu, toepcb); +} + /* * The purpose of SYN cookies is to avoid keeping track of all SYN's we * receive and to be able to handle SYN floods from bogus source addresses @@ -1699,4 +1732,3 @@ *pcbs_exported = count; return error; } - ==== //depot/projects/toehead/sys/netinet/tcp_syncache.h#2 (text+ko) ==== @@ -40,6 +40,9 @@ struct tcphdr *, struct socket **, struct mbuf *); void syncache_add(struct in_conninfo *, struct tcpopt *, struct tcphdr *, struct inpcb *, struct socket **, struct mbuf *); +void syncache_offload_add(struct in_conninfo *, struct tcpopt *, + struct tcphdr *, struct inpcb *, struct socket **, + struct toe_usrreqs *tu, void *toepcb); void syncache_chkrst(struct in_conninfo *, struct tcphdr *); void syncache_badack(struct in_conninfo *); int syncache_pcbcount(void); From owner-p4-projects@FreeBSD.ORG Wed Dec 12 06:40:44 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4507016A421; Wed, 12 Dec 2007 06:40:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0A30A16A419 for ; Wed, 12 Dec 2007 06:40:44 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EA67D13C447 for ; Wed, 12 Dec 2007 06:40:43 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBC6eh3t030489 for ; Wed, 12 Dec 2007 06:40:43 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBC6ehVh030486 for perforce@freebsd.org; Wed, 12 Dec 2007 06:40:43 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Dec 2007 06:40:43 GMT Message-Id: <200712120640.lBC6ehVh030486@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130678 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 06:40:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=130678 Change 130678 by jb@jb_freebsd1 on 2007/12/12 06:40:00 Manual update to fix the $FreeBSD$ strings for files that just got added to CVS. Affected files ... .. //depot/projects/dtrace/src/compat/opensolaris/include/alloca.h#3 edit .. //depot/projects/dtrace/src/compat/opensolaris/include/fcntl.h#3 edit .. //depot/projects/dtrace/src/compat/opensolaris/include/stdio.h#3 edit .. //depot/projects/dtrace/src/compat/opensolaris/include/stdlib.h#3 edit .. //depot/projects/dtrace/src/compat/opensolaris/include/strings.h#3 edit .. //depot/projects/dtrace/src/compat/opensolaris/include/unistd.h#3 edit Differences ... ==== //depot/projects/dtrace/src/compat/opensolaris/include/alloca.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/compat/opensolaris/include/alloca.h,v 1.1 2007/11/28 21:40:07 jb Exp $ * */ ==== //depot/projects/dtrace/src/compat/opensolaris/include/fcntl.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/compat/opensolaris/include/fcntl.h,v 1.1 2007/11/28 21:40:07 jb Exp $ * */ ==== //depot/projects/dtrace/src/compat/opensolaris/include/stdio.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/compat/opensolaris/include/stdio.h,v 1.1 2007/11/28 21:40:07 jb Exp $ * */ ==== //depot/projects/dtrace/src/compat/opensolaris/include/stdlib.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/compat/opensolaris/include/stdlib.h,v 1.1 2007/11/28 21:40:07 jb Exp $ * */ ==== //depot/projects/dtrace/src/compat/opensolaris/include/strings.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/compat/opensolaris/include/strings.h,v 1.1 2007/11/28 21:40:07 jb Exp $ * */ ==== //depot/projects/dtrace/src/compat/opensolaris/include/unistd.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/compat/opensolaris/include/unistd.h,v 1.1 2007/11/28 21:40:07 jb Exp $ * */ From owner-p4-projects@FreeBSD.ORG Wed Dec 12 06:42:47 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 23E7E16A420; Wed, 12 Dec 2007 06:42:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AF1D816A417 for ; Wed, 12 Dec 2007 06:42:46 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9AD2B13C465 for ; Wed, 12 Dec 2007 06:42:46 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBC6gkEl031084 for ; Wed, 12 Dec 2007 06:42:46 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBC6gkCR031079 for perforce@freebsd.org; Wed, 12 Dec 2007 06:42:46 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Dec 2007 06:42:46 GMT Message-Id: <200712120642.lBC6gkCR031079@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130680 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 06:42:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=130680 Change 130680 by jb@jb_freebsd1 on 2007/12/12 06:41:57 Manual update to fix the $FreeBSD$ strings for files that just got added to CVS. Affected files ... .. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/elf.h#3 edit .. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/mman.h#3 edit .. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/modctl.h#3 edit .. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/param.h#3 edit .. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/pcpu.h#3 edit .. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/stat.h#3 edit Differences ... ==== //depot/projects/dtrace/src/sys/compat/opensolaris/sys/elf.h#3 (text+ko) ==== @@ -18,7 +18,7 @@ * * CDDL HEADER END * - * $FreeBSD$ + * $FreeBSD: src/sys/compat/opensolaris/sys/elf.h,v 1.1 2007/11/28 21:50:40 jb Exp $ * * ELF compatibility definitions for OpenSolaris source. * ==== //depot/projects/dtrace/src/sys/compat/opensolaris/sys/mman.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/compat/opensolaris/sys/mman.h,v 1.1 2007/11/28 21:50:40 jb Exp $ * */ ==== //depot/projects/dtrace/src/sys/compat/opensolaris/sys/modctl.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/compat/opensolaris/sys/modctl.h,v 1.1 2007/11/28 21:50:40 jb Exp $ * */ ==== //depot/projects/dtrace/src/sys/compat/opensolaris/sys/param.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/compat/opensolaris/sys/param.h,v 1.1 2007/11/28 21:50:40 jb Exp $ * */ ==== //depot/projects/dtrace/src/sys/compat/opensolaris/sys/pcpu.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/compat/opensolaris/sys/pcpu.h,v 1.1 2007/11/28 21:50:40 jb Exp $ * */ ==== //depot/projects/dtrace/src/sys/compat/opensolaris/sys/stat.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/compat/opensolaris/sys/stat.h,v 1.1 2007/11/28 21:50:40 jb Exp $ * */ From owner-p4-projects@FreeBSD.ORG Wed Dec 12 07:08:17 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E3E4916A469; Wed, 12 Dec 2007 07:08:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 36A9016A420 for ; Wed, 12 Dec 2007 07:08:16 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0880613C4E7 for ; Wed, 12 Dec 2007 07:08:16 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBC78FHb035888 for ; Wed, 12 Dec 2007 07:08:15 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBC78FkP035885 for perforce@freebsd.org; Wed, 12 Dec 2007 07:08:15 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Dec 2007 07:08:15 GMT Message-Id: <200712120708.lBC78FkP035885@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130681 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 07:08:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=130681 Change 130681 by jb@jb_freebsd1 on 2007/12/12 07:07:35 Fix a $FreeBSD$ Affected files ... .. //depot/projects/dtrace/src/sys/net/if_enc.c#9 edit Differences ... ==== //depot/projects/dtrace/src/sys/net/if_enc.c#9 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/net/if_enc.c,v 1.6 2006/12/29 13:59:49 jhb Exp $ + * $FreeBSD: src/sys/net/if_enc.c,v 1.7 2007/11/28 22:33:52 bz Exp $ */ #include From owner-p4-projects@FreeBSD.ORG Wed Dec 12 07:08:17 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 44D9A16A505; Wed, 12 Dec 2007 07:08:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 59DEE16A421 for ; Wed, 12 Dec 2007 07:08:16 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2C10F13C4E8 for ; Wed, 12 Dec 2007 07:08:16 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBC78GnM035894 for ; Wed, 12 Dec 2007 07:08:16 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBC78Gdu035891 for perforce@freebsd.org; Wed, 12 Dec 2007 07:08:16 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Dec 2007 07:08:16 GMT Message-Id: <200712120708.lBC78Gdu035891@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130682 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 07:08:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=130682 Change 130682 by jb@jb_freebsd1 on 2007/12/12 07:08:10 Sync with current. Affected files ... .. //depot/projects/dtrace/src/sys/sys/fcntl.h#7 edit Differences ... ==== //depot/projects/dtrace/src/sys/sys/fcntl.h#7 (text+ko) ==== @@ -223,7 +223,6 @@ #if __BSD_VISIBLE int flock(int, int); #endif - __END_DECLS #endif From owner-p4-projects@FreeBSD.ORG Wed Dec 12 08:22:38 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6BFF616A421; Wed, 12 Dec 2007 08:22:38 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 04D2916A417 for ; Wed, 12 Dec 2007 08:22:38 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DF3A013C478 for ; Wed, 12 Dec 2007 08:22:37 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBC8Mbt2063668 for ; Wed, 12 Dec 2007 08:22:37 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBC8MbeW063664 for perforce@freebsd.org; Wed, 12 Dec 2007 08:22:37 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Wed, 12 Dec 2007 08:22:37 GMT Message-Id: <200712120822.lBC8MbeW063664@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 130686 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 08:22:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=130686 Change 130686 by zhouzhouyi@zhouzhouyi_mactest on 2007/12/12 08:22:29 settle memory leaks in Mandatory Access Control Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/bpf/00.t#4 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/uipc_sem.c#4 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/in_pcb.c#6 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet6/in6_pcb.c#4 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac/mac_posix_sem.c#4 edit Differences ... ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/bpf/00.t#4 (text+ko) ==== @@ -60,6 +60,7 @@ "mls/6(4-7),biba/5(4-7)" echo -n "pid = -2 bpfdesc_check_receive:" > ${mactest_conf} echo "biba/5,mls/5 biba/5(4-7),mls/6(4-7)" >> ${mactest_conf} + echo "pid = -2 inpcb_destroy_label" > ${mactest_conf} bizarretestexpect ${tcpconnect} "" \ "" -f ${mactest_conf} -t 2 -b "mls/5(4-7),biba/5(4-7)" \ ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/kern/uipc_sem.c#4 (text+ko) ==== @@ -814,6 +814,9 @@ } sem_rel(ks); error = 0; +#ifdef MAC + mac_posix_sem_destroy(ks); +#endif err: mtx_unlock(&sem_lock); return (error); ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet/in_pcb.c#6 (text+ko) ==== @@ -198,7 +198,7 @@ #ifdef IPSEC error = ipsec_init_policy(so, &inp->inp_sp); if (error != 0) - goto out; + goto out1; #endif /*IPSEC*/ #ifdef INET6 if (INP_SOCKAF(so) == AF_INET6) { @@ -218,8 +218,15 @@ inp->inp_gencnt = ++pcbinfo->ipi_gencnt; #if defined(IPSEC) || defined(MAC) +#ifdef IPSEC +out1: +#endif +#ifdef MAC + if (error != 0) + mac_inpcb_destroy(inp); +#endif out: - if (error != 0) + if (error != 0) uma_zfree(pcbinfo->ipi_zone, inp); #endif return (error); ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/netinet6/in6_pcb.c#4 (text+ko) ==== @@ -65,6 +65,7 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipsec.h" +#include "opt_mac.h" #include #include @@ -105,6 +106,8 @@ #include #endif /* IPSEC */ +#include + struct in6_addr zeroin6_addr; int @@ -433,6 +436,10 @@ if (inp->inp_moptions != NULL) inp_freemoptions(inp->inp_moptions); inp->inp_vflag = 0; + +#ifdef MAC + mac_inpcb_destroy(inp); +#endif INP_UNLOCK(inp); uma_zfree(ipi->ipi_zone, inp); } ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac/mac_posix_sem.c#4 (text+ko) ==== @@ -79,6 +79,7 @@ { mac_posixsem_label_free(ks->ks_label); + mac_labelzone_free(ks->ks_label); ks->ks_label = NULL; } From owner-p4-projects@FreeBSD.ORG Wed Dec 12 11:43:14 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 18BC016A4A0; Wed, 12 Dec 2007 11:43:14 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9A11616A4D8 for ; Wed, 12 Dec 2007 11:43:13 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 79C0713C45D for ; Wed, 12 Dec 2007 11:43:13 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBCBhDFX005845 for ; Wed, 12 Dec 2007 11:43:13 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBCBhD3P005842 for perforce@freebsd.org; Wed, 12 Dec 2007 11:43:13 GMT (envelope-from gcooper@FreeBSD.org) Date: Wed, 12 Dec 2007 11:43:13 GMT Message-Id: <200712121143.lBCBhD3P005842@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 130692 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 11:43:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=130692 Change 130692 by gcooper@shiina-ibook on 2007/12/12 11:42:31 Update comment. Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo_files.c#3 edit Differences ... ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo_files.c#3 (text+ko) ==== @@ -87,7 +87,11 @@ return NULL; /* Create the package */ - /* XXX auto detect package type */ + + /* + * Garrett: Package type gets automatically + * detected by libarchive(3). + */ pkg = pkg_new_freebsd_from_file(fd); if (pkg == NULL) { fclose(fd); From owner-p4-projects@FreeBSD.ORG Wed Dec 12 11:44:15 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B83A16A418; Wed, 12 Dec 2007 11:44:15 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D59E116A421 for ; Wed, 12 Dec 2007 11:44:14 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B5BE713C458 for ; Wed, 12 Dec 2007 11:44:14 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBCBiER5006143 for ; Wed, 12 Dec 2007 11:44:14 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBCBiEdO006140 for perforce@freebsd.org; Wed, 12 Dec 2007 11:44:14 GMT (envelope-from gcooper@FreeBSD.org) Date: Wed, 12 Dec 2007 11:44:14 GMT Message-Id: <200712121144.lBCBiEdO006140@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 130693 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 11:44:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=130693 Change 130693 by gcooper@shiina-ibook on 2007/12/12 11:44:00 -Finish off string checking @todo. -Style -Move common code to a goto / label instead of repeating it n times (to avoid errors). Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo_ftp.c#3 edit Differences ... ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo_ftp.c#3 (text+ko) ==== @@ -244,7 +244,7 @@ //} /* Get the extension */ - if (pkg_name_has_extension(pkg_name)) + if (pkg_name_has_extension(pkg_name) < 0) ext = ""; else ext = ".tbz"; @@ -278,7 +278,6 @@ /** * @brief Creates a ftp_repo object for repo->data - * @todo Free the object at all failure points * @return A ftp_repo object or NULL */ static struct ftp_repo * @@ -288,7 +287,7 @@ f_repo = malloc(sizeof(struct ftp_repo)); if (f_repo == NULL) - return NULL; + goto ftp_create_repo_fail; /* Figure out the site */ if (site == NULL) @@ -297,7 +296,7 @@ f_repo->site = strdup(site); if (f_repo->site == NULL) - return NULL; + goto ftp_create_repo_fail; /* Figure out the path */ f_repo->path = NULL; @@ -306,9 +305,10 @@ int i, reldate; reldate = getosreldate(); - if(reldate > MAX_VERSION) { /* bogus osreldate?? */ - return NULL; - } + + /* bogus osreldate?? */ + if (reldate > MAX_VERSION) + goto ftp_create_repo_fail; uname(&u); @@ -335,7 +335,7 @@ } if (f_repo->path == NULL) - return NULL; + goto ftp_create_repo_fail; f_repo->cache = 0; if (cache_dir != NULL) { @@ -344,12 +344,17 @@ } return f_repo; + +ftp_create_repo_fail: + ftp_free(f_repo); + return NULL; + } /** * @brief Find if a name has a known extension - * @todo Return 0 and -1 like other functions - * @return 1 if name ends with ".t[bg]z", otherwise 0 + * @return -1 on the extension not being found; 0 if + * name ends with ".t[bg]z". */ static int pkg_name_has_extension(const char *name) @@ -358,12 +363,12 @@ p = strrchr(name, '.'); if (p == NULL) - return (0); - if (strcmp(p, ".tbz")==0) - return (1); - if (strcmp(p, ".tgz")==0) - return (1); - return (0); + return -1; + if (strcmp(p, ".tbz") == 0) + return -1; + if (strcmp(p, ".tgz") == 0) + return -1; + return 0; } /** From owner-p4-projects@FreeBSD.ORG Wed Dec 12 11:47:19 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D2BFA16A46B; Wed, 12 Dec 2007 11:47:18 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5384F16A417 for ; Wed, 12 Dec 2007 11:47:18 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3471B13C455 for ; Wed, 12 Dec 2007 11:47:18 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBCBlI5a006586 for ; Wed, 12 Dec 2007 11:47:18 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBCBlIVG006582 for perforce@freebsd.org; Wed, 12 Dec 2007 11:47:18 GMT (envelope-from gcooper@FreeBSD.org) Date: Wed, 12 Dec 2007 11:47:18 GMT Message-Id: <200712121147.lBCBlIVG006582@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 130694 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 11:47:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=130694 Change 130694 by gcooper@shiina-ibook on 2007/12/12 11:46:26 - Make /usr/ports/packages a constant. - Prepare for $PKG_DIR support (add todo comment). Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo_local_freebsd.c#3 edit Differences ... ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_repo_local_freebsd.c#3 (text+ko) ==== @@ -36,6 +36,8 @@ #include "pkg_private.h" #include "pkg_repo_private.h" +#define DEFAULT_PKG_DIR "/usr/ports/packages" + static struct pkg *file_get_pkg(struct pkg_repo *, const char *); /** @@ -74,6 +76,7 @@ /** * @brief Retrieves a package from either . or /usr/ports/packages/All/ * @todo Check if the file we opened is a package. If not try the next file. + * @todo Make DEFAULT_PKG_DIR pluggable via the $PKG_DIR environment variable. * @return a package object or NULL */ static struct pkg * @@ -85,12 +88,15 @@ assert(repo != NULL); assert(pkg_name != NULL); - /* XXX Check the file is a package file after every attempt to open it */ + /* + * XXX Check the file is a package file after every + * attempt to open it. + */ snprintf(dir, MAXPATHLEN + 1,"%s.tbz", pkg_name); fd = fopen(dir, "r"); if (fd == NULL) { snprintf(dir, MAXPATHLEN + 1, - "/usr/ports/packages/All/%s.tbz", pkg_name); + DEFAULT_PKG_DIR "/All/%s.tbz", pkg_name); fd = fopen(dir, "r"); } if (fd == NULL) { @@ -98,7 +104,7 @@ } if (fd == NULL) { snprintf(dir, MAXPATHLEN + 1, - "/usr/ports/packages/All/%s", pkg_name); + DEFAULT_PKG_DIR "/All/%s", pkg_name); fd = fopen(dir, "r"); } if (fd == NULL) From owner-p4-projects@FreeBSD.ORG Wed Dec 12 11:47:19 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3CF6016A52C; Wed, 12 Dec 2007 11:47:19 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 90A2216A468 for ; Wed, 12 Dec 2007 11:47:18 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5862413C447 for ; Wed, 12 Dec 2007 11:47:18 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBCBlId4006592 for ; Wed, 12 Dec 2007 11:47:18 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBCBlIoV006589 for perforce@freebsd.org; Wed, 12 Dec 2007 11:47:18 GMT (envelope-from gcooper@FreeBSD.org) Date: Wed, 12 Dec 2007 11:47:18 GMT Message-Id: <200712121147.lBCBlIoV006589@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 130695 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 11:47:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=130695 Change 130695 by gcooper@shiina-ibook on 2007/12/12 11:47:10 Fix typo. Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkgfile.c#2 edit Differences ... ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkgfile.c#2 (text+ko) ==== @@ -59,7 +59,7 @@ */ /** - * @brief Creates an empry pkgfile object + * @brief Creates an empty pkgfile object * @return A new pkgfile object or NULL */ static struct pkgfile* From owner-p4-projects@FreeBSD.ORG Wed Dec 12 11:49:21 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 16A0716A46B; Wed, 12 Dec 2007 11:49:21 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C1B6116A41B for ; Wed, 12 Dec 2007 11:49:20 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A26A013C474 for ; Wed, 12 Dec 2007 11:49:20 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBCBnKlS006728 for ; Wed, 12 Dec 2007 11:49:20 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBCBnKEu006725 for perforce@freebsd.org; Wed, 12 Dec 2007 11:49:20 GMT (envelope-from gcooper@FreeBSD.org) Date: Wed, 12 Dec 2007 11:49:20 GMT Message-Id: <200712121149.lBCBnKEu006725@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 130696 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 11:49:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=130696 Change 130696 by gcooper@shiina-ibook on 2007/12/12 11:48:28 Use size_t instead of unsigned int (for platform portability?). I just find size_t more consistent with use of sizeof(..). Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db_freebsd.c#6 edit Differences ... ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db_freebsd.c#6 (text+ko) ==== @@ -326,9 +326,9 @@ struct dirent *de; char *dir; struct pkg **packages; - unsigned int packages_size; + size_t packages_size; unsigned int packages_pos; - + assert(db != NULL); assert(db->db_base != NULL); From owner-p4-projects@FreeBSD.ORG Wed Dec 12 11:55:25 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C9DF416A420; Wed, 12 Dec 2007 11:55:25 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 68F5316A417 for ; Wed, 12 Dec 2007 11:55:25 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4935A13C469 for ; Wed, 12 Dec 2007 11:55:25 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBCBtPwd008237 for ; Wed, 12 Dec 2007 11:55:25 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBCBtPki008234 for perforce@freebsd.org; Wed, 12 Dec 2007 11:55:25 GMT (envelope-from gcooper@FreeBSD.org) Date: Wed, 12 Dec 2007 11:55:25 GMT Message-Id: <200712121155.lBCBtPki008234@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 130697 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 11:55:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=130697 Change 130697 by gcooper@shiina-ibook on 2007/12/12 11:54:24 -Replace archive_read_support_compression_bzip2(..) and archive_read_support_compression_gzip(..) with archive_read_support_compression_all(..). -Missing semicolon. -Replace more redundant code with goto's / label's for consistency / error proofing sake. Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd.c#5 edit Differences ... ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd.c#5 (text+ko) ==== @@ -139,8 +139,7 @@ fpkg->fd = fd; fpkg->pkg_type = fpkg_from_file; fpkg->archive = archive_read_new(); - archive_read_support_compression_bzip2(fpkg->archive); - archive_read_support_compression_gzip(fpkg->archive); + archive_read_support_compression_all(fpkg->archive); archive_read_support_format_tar(fpkg->archive); archive_read_open_stream(fpkg->archive, fd, 10240); @@ -177,7 +176,7 @@ /* * Set the prefix to the first @cwd line. - * This should be line 3 otherwise we have a bad package + * This should be line 3; otherwise we have a bad package */ pkg->pkg_prefix = strdup(fpkg->contents->lines[3].data); @@ -215,7 +214,7 @@ freebsd_get_rdeps, pkg_freebsd_free); if (pkg == NULL) - return NULL; + goto pkg_new_freebsd_installed_fail; pkg_add_callbacks_data(pkg, freebsd_get_version, freebsd_get_origin, freebsd_set_origin); @@ -223,20 +222,25 @@ freebsd_get_next_file, freebsd_run_script); fpkg = freebsd_package_new(); - if (fpkg == NULL) { - pkg_free(pkg); - return NULL; - } + + if (fpkg == NULL) + goto pkg_new_freebsd_installed_fail; + pkg->data = fpkg; fpkg->pkg_type = fpkg_from_installed; fpkg->db_dir = strdup(pkg_db_dir); - if (fpkg->db_dir == NULL) { - pkg_free(pkg); - return NULL; - } + + if (fpkg->db_dir == NULL) + goto pkg_new_freebsd_installed_fail; + return pkg; + +pkg_new_freebsd_installed_fail: + pkg_free(pkg); + return NULL; + } /** @@ -411,8 +415,20 @@ static int freebsd_add_depend(struct pkg *pkg, struct pkg *depend) { - assert(0); + + /* + * Foreach pkg, look to see if the package + * is an existing dependency.. + * + * Using queue(3) would be excellent here, + * methinks, in particular LIST.. + */ + + + pkg->pkg_get_deps(pkg); + return -1; + } /** @@ -421,7 +437,7 @@ * @return -1 */ static int -freebsd_add_file(struct pkg *pkg __unused, struct pkgfile *file __unused) +freebsd_add_file(struct pkg *pkg, struct pkgfile *file) { assert(0); return -1; @@ -741,24 +757,21 @@ /* Get the control files from the package */ control = pkg_get_control_files(pkg); assert(control != NULL); - if (control == NULL) { + if (control == NULL) return -1; - } /* Find the +CONTENTS file in the control files */ contents_file = pkg_get_control_file(pkg, "+CONTENTS"); assert(contents_file != NULL); - if (contents_file == NULL) { + if (contents_file == NULL) return -1; - } file_data = pkgfile_get_data(contents_file); contents = pkg_freebsd_contents_new(file_data, pkgfile_get_size(contents_file)); assert(contents != NULL); - if (contents == NULL) { + if (contents == NULL) return -1; - } for (pos = 0; pos < contents->line_count; pos++) { switch (contents->lines[pos].line_type) { @@ -987,7 +1000,7 @@ } /* - * @Todo: what the heck does this do + * @todo: what the heck does this do * (in the big picture, that is..)? */ size = pkgfile_get_size(control[pos]); @@ -1266,18 +1279,18 @@ int freebsd_open_control_files(struct freebsd_package *fpkg) { - unsigned int control_size, control_count; + size_t control_size; + + unsigned int control_count; struct pkgfile *pkgfile; #define addFile(pkgfile) \ control_size += sizeof(struct pkgfile **); \ - size_t pkg_control_size = sizeof(fpkg->control); \ fpkg->control = realloc(fpkg->control, control_size); \ if (fpkg->control == NULL || \ - pkg_control_size == sizeof(fpkg->control)) \ + control_size != sizeof(fpkg->control)) \ return -1; \ - fpkg->control[control_count] = pkgfile; \ - control_count++; \ + fpkg->control[control_count++] = pkgfile; \ fpkg->control[control_count] = NULL; assert(fpkg != NULL); @@ -1337,7 +1350,7 @@ return -1; } - pkg_remove_extra_slashes(file) + pkg_remove_extra_slashes(file); pkgfile = pkgfile_new_from_disk(file, 1); addFile(pkgfile); free(file); From owner-p4-projects@FreeBSD.ORG Wed Dec 12 11:58:30 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2608016A418; Wed, 12 Dec 2007 11:58:30 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A9B0316A41A for ; Wed, 12 Dec 2007 11:58:29 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 898FA13C47E for ; Wed, 12 Dec 2007 11:58:29 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBCBwTeb008370 for ; Wed, 12 Dec 2007 11:58:29 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBCBwTV5008367 for perforce@freebsd.org; Wed, 12 Dec 2007 11:58:29 GMT (envelope-from gcooper@FreeBSD.org) Date: Wed, 12 Dec 2007 11:58:29 GMT Message-Id: <200712121158.lBCBwTV5008367@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 130698 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 11:58:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=130698 Change 130698 by gcooper@shiina-ibook on 2007/12/12 11:58:08 - Add more Doxygenated comments. - Replace while loops with slightly smarter for-loops. - Make some logic a bit more straightforward. Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd_contents.c#3 edit Differences ... ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_freebsd_contents.c#3 (text+ko) ==== @@ -74,7 +74,7 @@ unsigned int pos; cont = malloc(sizeof(struct pkg_freebsd_contents)); - if (!cont) + if (cont == NULL) return NULL; cont->cnts_file = NULL; @@ -87,7 +87,7 @@ cont->lines = NULL; } else { cont->file = malloc(length + 1); - if (!cont->file) { + if (cont->file == NULL) { free(cont); return NULL; } @@ -95,12 +95,11 @@ cont->file[length] = '\0'; cont->lines = NULL; - pos = 0; cont->line_count = 0; - while (pos != length) { + /* Scan through beforehand, counting newlines.. */ + for (pos = 0; pos != length; pos++) { if (cont->file[pos] == '\n') cont->line_count++; - pos++; } /* Check the last line contains data */ if (pos > 0 && cont->file[pos-1] != '\n') @@ -112,54 +111,66 @@ } cont->lines = malloc(sizeof(struct pkg_freebsd_contents_line) * cont->line_count); - if (!cont->lines) { + if (cont->lines == NULL) { pkg_freebsd_contents_free(cont); return NULL; } /* - * Make each line in cont->lines point to the start of it's line - * and be a valid string + * Make each line in cont->lines point to the start of its + * line and null terminate the last string. */ cont->lines[0].line = cont->file; cont->lines[0].data = NULL; - pos = 1; - while (pos < cont->line_count) { + for (pos = 1; pos < cont->line_count; pos++) { + cont->lines[pos].data = NULL; cont->lines[pos].line = strchr(cont->lines[pos-1].line, '\n'); - if (cont->lines[pos].line) { - /* Terminate the last line */ - cont->lines[pos].line[0] = '\0'; - cont->lines[pos].line++; - } else + + /* No more newlines? We're done then.. */ + if (cont->lines[pos].line == NULL) break; - pos++; + + /* Terminate the last line */ + cont->lines[pos].line[0] = '\0'; + cont->lines[pos].line++; + } - /* The last line may need to be terminated at the correct place */ + /* + * The last line needs to be NULL terminated if it's just a + * newline. + */ pos = strlen(cont->lines[cont->line_count-1].line); - if (cont->lines[cont->line_count-1].line[--pos] == '\n') { + if (cont->lines[cont->line_count-1].line[--pos] == '\n') cont->lines[cont->line_count-1].line[pos] = '\0'; - } /* - * Set the data part of the line. ie not the control word - * Set the line_type + * 1. Set the data part of the line, i.e. not the control word + * 2. Set the line_type for the pkg_freebsd_contents_line + * structure accordingly.. */ for(pos = 0; pos < cont->line_count; pos++) { char *space; + /* + * Lines to skip -- ones which don't start with '@' + * (control directives) or contain the @ignore + * directive. + */ if (cont->lines[pos].line[0] != '@') { cont->lines[pos].line_type = PKG_LINE_FILE; assert(cont->lines[pos].data == NULL); continue; - } else if (!strcmp(cont->lines[pos].line, "@ignore")) { + } else if (strcmp(cont->lines[pos].line, "@ignore") == + 0) { cont->lines[pos].line_type = PKG_LINE_IGNORE; assert(cont->lines[pos].data == NULL); continue; } + /* Skip ahead to the first space. */ space = strchr(cont->lines[pos].line, ' '); - if (space && space[0] != '\0') { + if (space != NULL && space[0] != '\0') { space[0] = '\0'; space++; if (space[0] != '\0') @@ -170,7 +181,7 @@ return NULL; } - /* Get the correct line type for the line */ + /* Parse in the line type properly.. */ if (strcmp(cont->lines[pos].line, "@comment") == 0) { cont->lines[pos].line_type = PKG_LINE_COMMENT; } else if (strcmp(cont->lines[pos].line, "@name") == @@ -225,9 +236,8 @@ if (contents == NULL || data == NULL) return -1; - if (!(type > 0 && type <= PKG_LINE_FILE)) { + if (type <= 0 || PKG_LINE_FILE < type) return -1; - } /* Add the lines to the +CONTENTS file */ contents->line_size += sizeof(struct pkg_freebsd_contents_line); @@ -320,10 +330,13 @@ } data = pkgfile_get_data(file); + if (data == NULL) return -1; + MD5Data(data, pkgfile_get_size(file), md5); snprintf(tmp, 37, "MD5:%s", md5); + if (pkg_freebsd_contents_add_line(contents, PKG_LINE_COMMENT, tmp) != 0) { return -1; @@ -336,22 +349,28 @@ return 0; } -/** - * Gets the given line from the contents file +/* + * @brief Get a given line from the contents file. + * @param contents The contents file to return the line from. + * @param line_num The line to return. + * @return NULL on error (index out of bounds, contents NULL); + * otherwise return the line. */ struct pkg_freebsd_contents_line* pkg_freebsd_contents_get_line(struct pkg_freebsd_contents *contents, - unsigned int line) + unsigned int line_num) { - if (contents == NULL) + if (contents == NULL || contents->line_count < line_num) return NULL; - if (line > contents->line_count) - return NULL; - - return &contents->lines[line]; + return &contents->lines[line_num]; } +/* + * @brief Update the prefix for +CONTENTS + * @param contents The pkg_freebsd_contents structure that will be updated. + * @param prefix The package prefix to update contents to. + */ int pkg_freebsd_contents_update_prefix(struct pkg_freebsd_contents *contents, const char *prefix) @@ -363,22 +382,33 @@ /* Find the package prefix and change it */ for (pos = 0; pos < contents->line_count; pos++) { + if (contents->lines[pos].line_type == PKG_LINE_CWD) { - if (contents->cnts_prefix != NULL) { + + if (contents->cnts_prefix != NULL) free(contents->cnts_prefix); - } + contents->cnts_prefix = strdup(prefix); contents->lines[pos].data = contents->cnts_prefix; break; + } + } + if (contents->cnts_file != NULL) { pkgfile_free(contents->cnts_file); contents->cnts_file = NULL; } return 0; + } +/** + * Get the +CONTENTS file associated with the pkg_freebsd_contents structure. + * + * @return NULL on error or the pkgfile associated with +CONTENTS on success. + */ struct pkgfile * pkg_freebsd_contents_get_file(struct pkg_freebsd_contents *contents) { @@ -389,9 +419,14 @@ if (contents->cnts_file == NULL) { contents->cnts_file = pkgfile_new_regular("+CONTENTS", "", 0); + if (contents->cnts_file == NULL) return NULL; + /* + * Iterate through the file line by line, appending all of the + * data from contents to contents->cnts_file. + */ for (pos = 0; pos < contents->line_count; pos++) { struct pkg_freebsd_contents_line *line; char *data; @@ -415,6 +450,7 @@ /** * Frees a contents struct + * @return -1 on failure, 0 on success. */ int pkg_freebsd_contents_free(struct pkg_freebsd_contents *contents) From owner-p4-projects@FreeBSD.ORG Wed Dec 12 19:18:36 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A14A16A46B; Wed, 12 Dec 2007 19:18:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A333016A417 for ; Wed, 12 Dec 2007 19:18:35 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9772313C4D9 for ; Wed, 12 Dec 2007 19:18:35 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBCJIZfa034734 for ; Wed, 12 Dec 2007 19:18:35 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBCJIYRG034731 for perforce@freebsd.org; Wed, 12 Dec 2007 19:18:34 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 12 Dec 2007 19:18:34 GMT Message-Id: <200712121918.lBCJIYRG034731@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 130725 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 19:18:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=130725 Change 130725 by kmacy@kmacy:storage:toehead on 2007/12/12 19:17:35 IFC 130720 Affected files ... .. //depot/projects/toehead/include/nsswitch.h#2 integrate .. //depot/projects/toehead/lib/Makefile#3 integrate .. //depot/projects/toehead/lib/libc/gen/getgrent.c#2 integrate .. //depot/projects/toehead/lib/libc/gen/getgrouplist.c#2 integrate .. //depot/projects/toehead/lib/libc/locale/localeconv.c#2 integrate .. //depot/projects/toehead/lib/libc/net/nsdispatch.c#2 integrate .. //depot/projects/toehead/lib/libc/string/strtok.3#2 integrate .. //depot/projects/toehead/lib/libc/string/strtok.c#2 integrate .. //depot/projects/toehead/lib/libc/string/wcstok.c#2 integrate .. //depot/projects/toehead/share/man/man5/src.conf.5#3 integrate .. //depot/projects/toehead/share/mk/bsd.own.mk#3 integrate .. //depot/projects/toehead/sys/dev/sound/pci/ich.c#2 integrate .. //depot/projects/toehead/sys/netgraph/ng_l2tp.c#2 integrate .. //depot/projects/toehead/tools/build/options/WITHOUT_BZIP2#2 integrate .. //depot/projects/toehead/tools/build/options/WITHOUT_GNU#2 integrate .. //depot/projects/toehead/tools/build/options/WITHOUT_GSSAPI#1 branch .. //depot/projects/toehead/tools/build/options/WITHOUT_KERBEROS#3 integrate .. //depot/projects/toehead/tools/build/options/WITHOUT_KVM#2 integrate .. //depot/projects/toehead/tools/build/options/WITHOUT_PAM#2 integrate .. //depot/projects/toehead/tools/build/options/WITHOUT_TOOLCHAIN#2 integrate .. //depot/projects/toehead/tools/build/options/WITH_GSSAPI#2 delete .. //depot/projects/toehead/tools/build/options/makeman#2 integrate Differences ... ==== //depot/projects/toehead/include/nsswitch.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: nsswitch.h,v 1.6 1999/01/26 01:04:07 lukem Exp $ */ -/* $FreeBSD: src/include/nsswitch.h,v 1.4 2006/04/28 12:03:34 ume Exp $ */ +/* $FreeBSD: src/include/nsswitch.h,v 1.5 2007/12/12 10:08:02 bushman Exp $ */ /*- * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc. @@ -68,7 +68,8 @@ #define NSSRC_DNS "dns" /* DNS; IN for hosts, HS for others */ #define NSSRC_NIS "nis" /* YP/NIS */ #define NSSRC_COMPAT "compat" /* passwd,group in YP compat mode */ -#define NSSRC_CACHE "cache" /* cache daemon */ +#define NSSRC_CACHE "cache" /* nscd daemon */ +#define NSSRC_FALLBACK "__fallback" /* internal fallback source */ /* * currently implemented databases @@ -132,6 +133,7 @@ */ #define NS_FILES_CB(F,C) { NSSRC_FILES, F, C }, #define NS_COMPAT_CB(F,C) { NSSRC_COMPAT, F, C }, +#define NS_FALLBACK_CB(F) { NSSRC_FALLBACK, F, NULL }, #ifdef HESIOD # define NS_DNS_CB(F,C) { NSSRC_DNS, F, C }, ==== //depot/projects/toehead/lib/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.227 2007/12/10 19:09:24 dougb Exp $ +# $FreeBSD: src/lib/Makefile,v 1.228 2007/12/12 16:39:31 ru Exp $ .include @@ -62,12 +62,8 @@ _libsdp= libsdp .endif -.if ${MK_KERBEROS} != "no" +.if ${MK_GSSAPI} != "no" _libgssapi= libgssapi -.else -.if ${MK_GSSAPI} == "yes" -_libgssapi= libgssapi -.endif .endif .if ${MK_IPX} != "no" ==== //depot/projects/toehead/lib/libc/gen/getgrent.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ * */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.36 2006/09/18 09:34:48 maxim Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.37 2007/12/12 10:08:02 bushman Exp $"); #include "namespace.h" #include @@ -40,6 +40,7 @@ #include #include #endif +#include #include #include #ifdef HESIOD @@ -143,6 +144,9 @@ static int compat_setgrent(void *, void *, va_list); static int compat_group(void *, void *, va_list); +static int gr_addgid(gid_t, gid_t *, int, int *); +static int getgroupmembership_fallback(void *, void *, va_list); + #ifdef NS_CACHING static int grp_id_func(char *, size_t *, va_list, void *); static int grp_marshal_func(char *, size_t *, void *, va_list, void *); @@ -361,89 +365,195 @@ NSS_MP_CACHE_HANDLING(group); #endif /* NS_CACHING */ - -/* XXX IEEE Std 1003.1, 2003 specifies `void setgrent(void)' */ -int -setgrent(void) -{ #ifdef NS_CACHING - static const nss_cache_info cache_info = NS_MP_CACHE_INFO_INITIALIZER( - group, (void *)nss_lt_all, - NULL, NULL); +static const nss_cache_info setgrent_cache_info = NS_MP_CACHE_INFO_INITIALIZER( + group, (void *)nss_lt_all, + NULL, NULL); #endif - static const ns_dtab dtab[] = { - { NSSRC_FILES, files_setgrent, (void *)SETGRENT }, +static const ns_dtab setgrent_dtab[] = { + { NSSRC_FILES, files_setgrent, (void *)SETGRENT }, #ifdef HESIOD - { NSSRC_DNS, dns_setgrent, (void *)SETGRENT }, + { NSSRC_DNS, dns_setgrent, (void *)SETGRENT }, #endif #ifdef YP - { NSSRC_NIS, nis_setgrent, (void *)SETGRENT }, + { NSSRC_NIS, nis_setgrent, (void *)SETGRENT }, #endif - { NSSRC_COMPAT, compat_setgrent, (void *)SETGRENT }, + { NSSRC_COMPAT, compat_setgrent, (void *)SETGRENT }, #ifdef NS_CACHING - NS_CACHE_CB(&cache_info) + NS_CACHE_CB(&setgrent_cache_info) #endif - { NULL, NULL, NULL } - }; - (void)_nsdispatch(NULL, dtab, NSDB_GROUP, "setgrent", defaultsrc, 0); - return (1); -} - + { NULL, NULL, NULL } +}; -int -setgroupent(int stayopen) -{ #ifdef NS_CACHING - static const nss_cache_info cache_info = NS_MP_CACHE_INFO_INITIALIZER( - group, (void *)nss_lt_all, - NULL, NULL); +static const nss_cache_info endgrent_cache_info = NS_MP_CACHE_INFO_INITIALIZER( + group, (void *)nss_lt_all, + NULL, NULL); #endif - static const ns_dtab dtab[] = { - { NSSRC_FILES, files_setgrent, (void *)SETGRENT }, +static const ns_dtab endgrent_dtab[] = { + { NSSRC_FILES, files_setgrent, (void *)ENDGRENT }, #ifdef HESIOD - { NSSRC_DNS, dns_setgrent, (void *)SETGRENT }, + { NSSRC_DNS, dns_setgrent, (void *)ENDGRENT }, #endif #ifdef YP - { NSSRC_NIS, nis_setgrent, (void *)SETGRENT }, + { NSSRC_NIS, nis_setgrent, (void *)ENDGRENT }, #endif - { NSSRC_COMPAT, compat_setgrent, (void *)SETGRENT }, + { NSSRC_COMPAT, compat_setgrent, (void *)ENDGRENT }, #ifdef NS_CACHING - NS_CACHE_CB(&cache_info) + NS_CACHE_CB(&endgrent_cache_info) #endif - { NULL, NULL, NULL } - }; - (void)_nsdispatch(NULL, dtab, NSDB_GROUP, "setgrent", defaultsrc, - stayopen); - return (1); -} - + { NULL, NULL, NULL } +}; -void -endgrent(void) -{ #ifdef NS_CACHING - static const nss_cache_info cache_info = NS_MP_CACHE_INFO_INITIALIZER( - group, (void *)nss_lt_all, - NULL, NULL); +static const nss_cache_info getgrent_r_cache_info = NS_MP_CACHE_INFO_INITIALIZER( + group, (void *)nss_lt_all, + grp_marshal_func, grp_unmarshal_func); #endif - static const ns_dtab dtab[] = { - { NSSRC_FILES, files_setgrent, (void *)ENDGRENT }, +static const ns_dtab getgrent_r_dtab[] = { + { NSSRC_FILES, files_group, (void *)nss_lt_all }, #ifdef HESIOD - { NSSRC_DNS, dns_setgrent, (void *)ENDGRENT }, + { NSSRC_DNS, dns_group, (void *)nss_lt_all }, #endif #ifdef YP - { NSSRC_NIS, nis_setgrent, (void *)ENDGRENT }, + { NSSRC_NIS, nis_group, (void *)nss_lt_all }, #endif - { NSSRC_COMPAT, compat_setgrent, (void *)ENDGRENT }, + { NSSRC_COMPAT, compat_group, (void *)nss_lt_all }, #ifdef NS_CACHING - NS_CACHE_CB(&cache_info) + NS_CACHE_CB(&getgrent_r_cache_info) #endif - { NULL, NULL, NULL } + { NULL, NULL, NULL } +}; + +static int +gr_addgid(gid_t gid, gid_t *groups, int maxgrp, int *grpcnt) +{ + int ret, dupc; + + for (dupc = 0; dupc < MIN(maxgrp, *grpcnt); dupc++) { + if (groups[dupc] == gid) + return 1; + } + + ret = 1; + if (*grpcnt < maxgrp) + groups[*grpcnt] = gid; + else + ret = 0; + + (*grpcnt)++; + + return ret; +} + +static int +getgroupmembership_fallback(void *retval, void *mdata, va_list ap) +{ + const ns_src src[] = { + { mdata, NS_SUCCESS }, + { NULL, 0} }; - (void)_nsdispatch(NULL, dtab, NSDB_GROUP, "endgrent", defaultsrc); + struct group grp; + struct group *grp_p; + char *buf; + size_t bufsize; + const char *uname; + gid_t *groups; + gid_t agroup; + int maxgrp, *grpcnt; + int i, rv, ret_errno; + + /* + * As this is a fallback method, only provided src + * list will be respected during methods search. + */ + assert(src[0].name != NULL); + + uname = va_arg(ap, const char *); + agroup = va_arg(ap, gid_t); + groups = va_arg(ap, gid_t *); + maxgrp = va_arg(ap, int); + grpcnt = va_arg(ap, int *); + + rv = NS_UNAVAIL; + + buf = malloc(GRP_STORAGE_INITIAL); + if (buf == NULL) + goto out; + + bufsize = GRP_STORAGE_INITIAL; + + gr_addgid(agroup, groups, maxgrp, grpcnt); + + _nsdispatch(NULL, setgrent_dtab, NSDB_GROUP, "setgrent", src, 0); + for (;;) { + do { + ret_errno = 0; + grp_p = NULL; + rv = _nsdispatch(&grp_p, getgrent_r_dtab, NSDB_GROUP, + "getgrent_r", src, &grp, buf, bufsize, &ret_errno); + + if (grp_p == NULL && ret_errno == ERANGE) { + free(buf); + if ((bufsize << 1) > GRP_STORAGE_MAX) { + buf = NULL; + errno = ERANGE; + goto out; + } + + bufsize <<= 1; + buf = malloc(bufsize); + if (buf == NULL) { + goto out; + } + } + } while (grp_p == NULL && ret_errno == ERANGE); + + if (ret_errno != 0) { + errno = ret_errno; + goto out; + } + + if (grp_p == NULL) + break; + + for (i = 0; grp.gr_mem[i]; i++) { + if (strcmp(grp.gr_mem[i], uname) == 0) + gr_addgid(grp.gr_gid, groups, maxgrp, grpcnt); + } + } + + _nsdispatch(NULL, endgrent_dtab, NSDB_GROUP, "endgrent", src); +out: + free(buf); + return (rv); +} + +/* XXX IEEE Std 1003.1, 2003 specifies `void setgrent(void)' */ +int +setgrent(void) +{ + (void)_nsdispatch(NULL, setgrent_dtab, NSDB_GROUP, "setgrent", defaultsrc, 0); + return (1); +} + + +int +setgroupent(int stayopen) +{ + (void)_nsdispatch(NULL, setgrent_dtab, NSDB_GROUP, "setgrent", defaultsrc, + stayopen); + return (1); +} + + +void +endgrent(void) +{ + (void)_nsdispatch(NULL, endgrent_dtab, NSDB_GROUP, "endgrent", defaultsrc); } @@ -451,31 +561,11 @@ getgrent_r(struct group *grp, char *buffer, size_t bufsize, struct group **result) { -#ifdef NS_CACHING - static const nss_cache_info cache_info = NS_MP_CACHE_INFO_INITIALIZER( - group, (void *)nss_lt_all, - grp_marshal_func, grp_unmarshal_func); -#endif - - static const ns_dtab dtab[] = { - { NSSRC_FILES, files_group, (void *)nss_lt_all }, -#ifdef HESIOD - { NSSRC_DNS, dns_group, (void *)nss_lt_all }, -#endif -#ifdef YP - { NSSRC_NIS, nis_group, (void *)nss_lt_all }, -#endif - { NSSRC_COMPAT, compat_group, (void *)nss_lt_all }, -#ifdef NS_CACHING - NS_CACHE_CB(&cache_info) -#endif - { NULL, NULL, NULL } - }; int rv, ret_errno; ret_errno = 0; *result = NULL; - rv = _nsdispatch(result, dtab, NSDB_GROUP, "getgrent_r", defaultsrc, + rv = _nsdispatch(result, getgrent_r_dtab, NSDB_GROUP, "getgrent_r", defaultsrc, grp, buffer, bufsize, &ret_errno); if (rv == NS_SUCCESS) return (0); @@ -560,6 +650,30 @@ } + +int +__getgroupmembership(const char *uname, gid_t agroup, gid_t *groups, + int maxgrp, int *grpcnt) +{ + static const ns_dtab dtab[] = { + NS_FALLBACK_CB(getgroupmembership_fallback) + { NULL, NULL, NULL } + }; + int rv; + + assert(uname != NULL); + /* groups may be NULL if just sizing when invoked with maxgrp = 0 */ + assert(grpcnt != NULL); + + *grpcnt = 0; + rv = _nsdispatch(NULL, dtab, NSDB_GROUP, "getgroupmembership", + defaultsrc, uname, agroup, groups, maxgrp, grpcnt); + + /* too many groups found? */ + return (*grpcnt > maxgrp ? -1 : 0); +} + + static struct group grp; static char *grp_storage; static size_t grp_storage_size; @@ -1436,3 +1550,5 @@ return (NS_RETURN); } } + + ==== //depot/projects/toehead/lib/libc/gen/getgrouplist.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ static char sccsid[] = "@(#)getgrouplist.c 8.2 (Berkeley) 12/8/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getgrouplist.c,v 1.15 2007/01/09 00:27:53 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getgrouplist.c,v 1.16 2007/12/12 10:08:02 bushman Exp $"); /* * get credential @@ -42,46 +42,11 @@ #include #include +extern int __getgroupmembership(const char *, gid_t, gid_t *, int, int *); + int getgrouplist(const char *uname, gid_t agroup, gid_t *groups, int *grpcnt) { - const struct group *grp; - int i, maxgroups, ngroups, ret; + return __getgroupmembership(uname, agroup, groups, *grpcnt, grpcnt); +} - ret = 0; - ngroups = 0; - maxgroups = *grpcnt; - /* - * When installing primary group, duplicate it; - * the first element of groups is the effective gid - * and will be overwritten when a setgid file is executed. - */ - groups[ngroups++] = agroup; - if (maxgroups > 1) - groups[ngroups++] = agroup; - /* - * Scan the group file to find additional groups. - */ - setgrent(); - while ((grp = getgrent()) != NULL) { - for (i = 0; i < ngroups; i++) { - if (grp->gr_gid == groups[i]) - goto skip; - } - for (i = 0; grp->gr_mem[i]; i++) { - if (!strcmp(grp->gr_mem[i], uname)) { - if (ngroups >= maxgroups) { - ret = -1; - break; - } - groups[ngroups++] = grp->gr_gid; - break; - } - } -skip: - ; - } - endgrent(); - *grpcnt = ngroups; - return (ret); -} ==== //depot/projects/toehead/lib/libc/locale/localeconv.c#2 (text+ko) ==== @@ -11,10 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -36,7 +32,7 @@ static char sccsid[] = "@(#)localeconv.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/localeconv.c,v 1.13 2003/06/26 10:46:16 phantom Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/localeconv.c,v 1.14 2007/12/12 07:43:23 phantom Exp $"); #include ==== //depot/projects/toehead/lib/libc/net/nsdispatch.c#2 (text+ko) ==== @@ -68,7 +68,7 @@ * */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/nsdispatch.c,v 1.14 2007/05/17 03:33:23 jon Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/nsdispatch.c,v 1.15 2007/12/12 10:08:03 bushman Exp $"); #include "namespace.h" #include @@ -136,6 +136,15 @@ #endif /* + * When this is set to 1, nsdispatch won't use nsswitch.conf + * but will consult the 'defaults' source list only. + * NOTE: nested fallbacks (when nsdispatch calls fallback functions, + * which in turn calls nsdispatch, which should call fallback + * function) are not supported + */ +static int fallback_dispatch = 0; + +/* * Attempt to spew relatively uniform messages to syslog. */ #define nss_log(level, fmt, ...) \ @@ -600,7 +609,7 @@ va_list ap; const ns_dbt *dbt; const ns_src *srclist; - nss_method method; + nss_method method, fb_method; void *mdata; int isthreaded, serrno, i, result, srclistsize; @@ -609,6 +618,9 @@ nss_cache_data *cache_data_p; int cache_flag; #endif + + dbt = NULL; + fb_method = NULL; isthreaded = __isthreaded; serrno = errno; @@ -624,8 +636,13 @@ result = NS_UNAVAIL; goto fin; } - dbt = vector_search(&database, _nsmap, _nsmapsize, sizeof(*_nsmap), - string_compare); + if (fallback_dispatch == 0) { + dbt = vector_search(&database, _nsmap, _nsmapsize, sizeof(*_nsmap), + string_compare); + fb_method = nss_method_lookup(NSSRC_FALLBACK, database, + method_name, disp_tab, &mdata); + } + if (dbt != NULL) { srclist = dbt->srclist; srclistsize = dbt->srclistsize; @@ -684,6 +701,12 @@ if (result & (srclist[i].flags)) break; + } else if (fb_method != NULL) { + fallback_dispatch = 1; + va_start(ap, defaults); + result = fb_method(retval, (void *)srclist[i].name, ap); + va_end(ap); + fallback_dispatch = 0; } } ==== //depot/projects/toehead/lib/libc/string/strtok.3#2 (text+ko) ==== @@ -22,12 +22,6 @@ .\" disclaimer in the documentation and/or other materials provided .\" with the distribution. .\" -.\" 3. All advertising materials mentioning features or use of this -.\" software must display the following acknowledgement: -.\" -.\" This product includes software developed by Softweyr LLC, the -.\" University of California, Berkeley, and its contributors. -.\" .\" 4. Neither the name of Softweyr LLC, the University nor the names .\" of its contributors may be used to endorse or promote products .\" derived from this software without specific prior written @@ -48,7 +42,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)strtok.3 8.2 (Berkeley) 2/3/94 -.\" $FreeBSD: src/lib/libc/string/strtok.3,v 1.25 2005/01/20 09:17:04 ru Exp $ +.\" $FreeBSD: src/lib/libc/string/strtok.3,v 1.26 2007/12/12 18:33:06 wes Exp $ .\" .Dd November 27, 1998 .Dt STRTOK 3 ==== //depot/projects/toehead/lib/libc/string/strtok.c#2 (text+ko) ==== @@ -15,10 +15,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notices, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Softweyr LLC, the - * University of California, Berkeley, and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -40,7 +36,7 @@ static char sccsid[] = "@(#)strtok.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/string/strtok.c,v 1.9 2002/09/07 02:53:19 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/string/strtok.c,v 1.10 2007/12/12 18:33:06 wes Exp $"); #include #ifdef DEBUG_STRTOK ==== //depot/projects/toehead/lib/libc/string/wcstok.c#2 (text+ko) ==== @@ -15,10 +15,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notices, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Softweyr LLC, the - * University of California, Berkeley, and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -37,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/string/wcstok.c,v 1.2 2003/03/12 06:41:49 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/string/wcstok.c,v 1.3 2007/12/12 18:33:06 wes Exp $"); #include ==== //depot/projects/toehead/share/man/man5/src.conf.5#3 (text) ==== @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. -.\" from FreeBSD: src/tools/build/options/makeman,v 1.7 2007/11/06 23:12:53 danger Exp -.\" $FreeBSD: src/share/man/man5/src.conf.5,v 1.22 2007/12/10 19:11:56 dougb Exp $ -.Dd December 10, 2007 +.\" from FreeBSD: src/tools/build/options/makeman,v 1.8 2007/12/12 16:39:31 ru Exp +.\" $FreeBSD: src/share/man/man5/src.conf.5,v 1.23 2007/12/12 16:45:01 ru Exp $ +.Dd December 12, 2007 .Dt SRC.CONF 5 .Os .Sh NAME @@ -175,9 +175,11 @@ .\" from FreeBSD: src/tools/build/options/WITHOUT_BOOT,v 1.1 2006/03/21 07:50:49 ru Exp Set to not build the boot blocks and loader. .It Va WITHOUT_BZIP2 -.\" from FreeBSD: src/tools/build/options/WITHOUT_BZIP2,v 1.1 2007/01/26 10:19:08 delphij Exp +.\" from FreeBSD: src/tools/build/options/WITHOUT_BZIP2,v 1.2 2007/12/12 16:43:17 ru Exp Set to not build contributed bzip2 software as a part of the base system. -.Sy "The option has no effect yet." +.Bf -symbolic +The option has no effect yet. +.Ef When set, it also enforces the following options: .Pp .Bl -item -compact @@ -211,6 +213,10 @@ .Pp .Bl -item -compact .It +.Va WITHOUT_GSSAPI +(can be overridden with +.Va WITH_GSSAPI ) +.It .Va WITHOUT_KERBEROS .It .Va WITHOUT_KERBEROS_SUPPORT @@ -267,11 +273,13 @@ Set to not build .Xr gdb 1 . .It Va WITHOUT_GNU -.\" from FreeBSD: src/tools/build/options/WITHOUT_GNU,v 1.2 2006/07/31 13:53:27 yar Exp +.\" from FreeBSD: src/tools/build/options/WITHOUT_GNU,v 1.3 2007/12/12 16:43:17 ru Exp Set to not build contributed GNU software as a part of the base system. This option can be useful if the system built must not contain any code covered by the GNU Public License due to legal reasons. -.Sy "The option has no effect yet." +.Bf -symbolic +The option has no effect yet. +.Ef When set, it also enforces the following options: .Pp .Bl -item -compact @@ -288,11 +296,9 @@ .\" from FreeBSD: src/tools/build/options/WITHOUT_GROFF,v 1.1 2006/03/21 07:50:49 ru Exp Set to not build .Xr groff 1 . -.It Va WITH_GSSAPI -.\" from FreeBSD: src/tools/build/options/WITH_GSSAPI,v 1.1 2007/12/10 19:09:24 dougb Exp -Set to build libgssapi when -.Va WITHOUT_KERBEROS -is set. +.It Va WITHOUT_GSSAPI +.\" from FreeBSD: src/tools/build/options/WITHOUT_GSSAPI,v 1.1 2007/12/12 16:39:31 ru Exp +Set to not build libgssapi. .It Va WITH_HESIOD .\" from FreeBSD: src/tools/build/options/WITH_HESIOD,v 1.1 2006/03/21 07:50:50 ru Exp Set to build Hesiod support. @@ -351,17 +357,16 @@ .\" from FreeBSD: src/tools/build/options/WITHOUT_IPX_SUPPORT,v 1.1 2006/03/21 07:50:50 ru Exp Set to build some programs without IPX support. .It Va WITHOUT_KERBEROS -.\" from FreeBSD: src/tools/build/options/WITHOUT_KERBEROS,v 1.2 2007/12/10 19:09:24 dougb Exp +.\" from FreeBSD: src/tools/build/options/WITHOUT_KERBEROS,v 1.3 2007/12/12 16:42:03 ru Exp Set this if you do not want to build Kerberos 5 (KTH Heimdal). -This option implies -.Va WITHOUT_GSSAPI . -Set -.Va WITH_GSSAPI -to override. When set, it also enforces the following options: .Pp .Bl -item -compact .It +.Va WITHOUT_GSSAPI +(can be overridden with +.Va WITH_GSSAPI ) +.It .Va WITHOUT_KERBEROS_SUPPORT .El .It Va WITHOUT_KERBEROS_SUPPORT @@ -374,11 +379,13 @@ and .Xr telnetd 8 . .It Va WITHOUT_KVM -.\" from FreeBSD: src/tools/build/options/WITHOUT_KVM,v 1.1 2007/06/13 02:08:04 sepotvin Exp +.\" from FreeBSD: src/tools/build/options/WITHOUT_KVM,v 1.2 2007/12/12 16:43:17 ru Exp Set to not build the .Nm libkvm library as a part of the base system. -.Sy "The option has no effect yet." +.Bf -symbolic +The option has no effect yet. +.Ef When set, it also enforces the following options: .Pp .Bl -item -compact @@ -502,6 +509,10 @@ .Pp .Bl -item -compact .It +.Va WITHOUT_GSSAPI +(can be overridden with +.Va WITH_GSSAPI ) +.It .Va WITHOUT_KERBEROS .It .Va WITHOUT_KERBEROS_SUPPORT @@ -509,9 +520,11 @@ .Va WITHOUT_OPENSSH .El .It Va WITHOUT_PAM -.\" from FreeBSD: src/tools/build/options/WITHOUT_PAM,v 1.2 2006/07/31 13:53:27 yar Exp +.\" from FreeBSD: src/tools/build/options/WITHOUT_PAM,v 1.3 2007/12/12 16:43:17 ru Exp Set to not build PAM library and modules. -.Sy "This option is deprecated and does nothing." +.Bf -symbolic +This option is deprecated and does nothing. +.Ef When set, it also enforces the following options: .Pp .Bl -item -compact @@ -587,11 +600,13 @@ (which is .Xr tcsh 1 ) . .It Va WITHOUT_TOOLCHAIN -.\" from FreeBSD: src/tools/build/options/WITHOUT_TOOLCHAIN,v 1.2 2007/07/19 08:14:28 bz Exp +.\" from FreeBSD: src/tools/build/options/WITHOUT_TOOLCHAIN,v 1.3 2007/12/12 16:43:17 ru Exp Set to not install programs used for program development, compilers, debuggers etc. -.Sy "The option does not work for build targets." +.Bf -symbolic +The option does not work for build targets. +.Ef When set, it also enforces the following options: .Pp .Bl -item -compact ==== //depot/projects/toehead/share/mk/bsd.own.mk#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.own.mk,v 1.70 2007/12/10 19:09:24 dougb Exp $ +# $FreeBSD: src/share/mk/bsd.own.mk,v 1.71 2007/12/12 16:39:32 ru Exp $ # # The include file set common variables for owner, # group, mode, and directories. Defaults are in brackets. @@ -381,7 +381,6 @@ # .for var in \ BIND_LIBS \ - GSSAPI \ HESIOD \ IDEA .if defined(WITH_${var}) && defined(WITHOUT_${var}) @@ -479,6 +478,27 @@ MK_${var}_SUPPORT:= yes .endif .endfor + +# +# MK_* options whose default value depends on another option. +# +.for vv in \ + GSSAPI/KERBEROS +.if defined(WITH_${vv:H}) && defined(WITHOUT_${vv:H}) +.error WITH_${vv:H} and WITHOUT_${vv:H} can't both be set. +.endif +.if defined(MK_${vv:H}) +.error MK_${vv:H} can't be set by a user. +.endif +.if defined(WITH_${vv:H}) +MK_${vv:H}:= yes +.elif defined(WITHOUT_${vv:H}) +MK_${vv:H}:= no +.else +MK_${vv:H}:= ${MK_${vv:T}} +.endif +.endfor + .endif # !_WITHOUT_SRCCONF .endif # !target(____) ==== //depot/projects/toehead/sys/dev/sound/pci/ich.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/ich.c,v 1.78 2007/07/11 14:27:45 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/ich.c,v 1.79 2007/12/12 18:21:05 ariff Exp $"); /* -------------------------------------------------------------------- */ @@ -980,6 +980,10 @@ device_get_unit(dev), "fixedrate", &i) == 0 && i != 0) sc->flags |= ICH_FIXED_RATE; + if (resource_int_value(device_get_name(dev), + device_get_unit(dev), "micchannel_enabled", &i) == 0 && i != 0) + sc->hasmic = 1; + sc->irqid = 0; sc->irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->irqid, RF_ACTIVE | RF_SHAREABLE); @@ -1026,7 +1030,8 @@ extcaps = ac97_getextcaps(sc->codec); sc->hasvra = extcaps & AC97_EXTCAP_VRA; sc->hasvrm = extcaps & AC97_EXTCAP_VRM; - sc->hasmic = ac97_getcaps(sc->codec) & AC97_CAP_MICCHANNEL; + sc->hasmic = (sc->hasmic != 0 && + (ac97_getcaps(sc->codec) & AC97_CAP_MICCHANNEL)) ? 1 : 0; ac97_setextmode(sc->codec, sc->hasvra | sc->hasvrm); sc->dtbl_size = sizeof(struct ich_desc) * ICH_DTBL_LENGTH * ==== //depot/projects/toehead/sys/netgraph/ng_l2tp.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ * * Author: Archie Cobbs * - * $FreeBSD: src/sys/netgraph/ng_l2tp.c,v 1.21 2007/10/12 04:56:26 mav Exp $ + * $FreeBSD: src/sys/netgraph/ng_l2tp.c,v 1.22 2007/12/12 19:04:30 mav Exp $ */ /* @@ -88,7 +88,7 @@ #define L2TP_DATA_HDR (L2TP_HDR_VERSION) /* optional: len, seq */ /* Some hard coded values */ -#define L2TP_MAX_XWIN 16 /* my max xmit window */ +#define L2TP_MAX_XWIN 128 /* my max xmit window */ #define L2TP_MAX_REXMIT 5 /* default max rexmit */ #define L2TP_MAX_REXMIT_TO 30 /* default rexmit to */ #define L2TP_DELAYED_ACK ((hz + 19) / 20) /* delayed ack: 50 ms */ ==== //depot/projects/toehead/tools/build/options/WITHOUT_BZIP2#2 (text+ko) ==== @@ -1,3 +1,5 @@ -.\" $FreeBSD: src/tools/build/options/WITHOUT_BZIP2,v 1.1 2007/01/26 10:19:08 delphij Exp $ +.\" $FreeBSD: src/tools/build/options/WITHOUT_BZIP2,v 1.2 2007/12/12 16:43:17 ru Exp $ Set to not build contributed bzip2 software as a part of the base system. -.Sy "The option has no effect yet." +.Bf -symbolic +The option has no effect yet. +.Ef ==== //depot/projects/toehead/tools/build/options/WITHOUT_GNU#2 (text+ko) ==== @@ -1,5 +1,7 @@ -.\" $FreeBSD: src/tools/build/options/WITHOUT_GNU,v 1.2 2006/07/31 13:53:27 yar Exp $ +.\" $FreeBSD: src/tools/build/options/WITHOUT_GNU,v 1.3 2007/12/12 16:43:17 ru Exp $ Set to not build contributed GNU software as a part of the base system. This option can be useful if the system built must not contain any code covered by the GNU Public License due to legal reasons. -.Sy "The option has no effect yet." +.Bf -symbolic +The option has no effect yet. +.Ef ==== //depot/projects/toehead/tools/build/options/WITHOUT_KERBEROS#3 (text) ==== @@ -1,7 +1,2 @@ -.\" $FreeBSD: src/tools/build/options/WITHOUT_KERBEROS,v 1.2 2007/12/10 19:09:24 dougb Exp $ +.\" $FreeBSD: src/tools/build/options/WITHOUT_KERBEROS,v 1.3 2007/12/12 16:42:03 ru Exp $ Set this if you do not want to build Kerberos 5 (KTH Heimdal). -This option implies -.Va WITHOUT_GSSAPI . -Set -.Va WITH_GSSAPI -to override. ==== //depot/projects/toehead/tools/build/options/WITHOUT_KVM#2 (text+ko) ==== @@ -1,5 +1,7 @@ -.\" $FreeBSD: src/tools/build/options/WITHOUT_KVM,v 1.1 2007/06/13 02:08:04 sepotvin Exp $ +.\" $FreeBSD: src/tools/build/options/WITHOUT_KVM,v 1.2 2007/12/12 16:43:17 ru Exp $ Set to not build the .Nm libkvm library as a part of the base system. -.Sy "The option has no effect yet." +.Bf -symbolic +The option has no effect yet. +.Ef ==== //depot/projects/toehead/tools/build/options/WITHOUT_PAM#2 (text+ko) ==== @@ -1,3 +1,5 @@ -.\" $FreeBSD: src/tools/build/options/WITHOUT_PAM,v 1.2 2006/07/31 13:53:27 yar Exp $ +.\" $FreeBSD: src/tools/build/options/WITHOUT_PAM,v 1.3 2007/12/12 16:43:17 ru Exp $ Set to not build PAM library and modules. -.Sy "This option is deprecated and does nothing." +.Bf -symbolic +This option is deprecated and does nothing. +.Ef ==== //depot/projects/toehead/tools/build/options/WITHOUT_TOOLCHAIN#2 (text) ==== @@ -1,5 +1,7 @@ -.\" $FreeBSD: src/tools/build/options/WITHOUT_TOOLCHAIN,v 1.2 2007/07/19 08:14:28 bz Exp $ +.\" $FreeBSD: src/tools/build/options/WITHOUT_TOOLCHAIN,v 1.3 2007/12/12 16:43:17 ru Exp $ Set to not install programs used for program development, compilers, debuggers etc. -.Sy "The option does not work for build targets." +.Bf -symbolic +The option does not work for build targets. +.Ef ==== //depot/projects/toehead/tools/build/options/makeman#2 (text) ==== @@ -2,7 +2,7 @@ # # This file is in the public domain. -ident='$FreeBSD: src/tools/build/options/makeman,v 1.7 2007/11/06 23:12:53 danger Exp $' +ident='$FreeBSD: src/tools/build/options/makeman,v 1.8 2007/12/12 16:39:31 ru Exp $' # # usage: show { settings | options } ... @@ -49,7 +49,7 @@ main() >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Dec 12 19:19:37 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 65AC016A468; Wed, 12 Dec 2007 19:19:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2AB8616A41A for ; Wed, 12 Dec 2007 19:19:37 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2015113C442 for ; Wed, 12 Dec 2007 19:19:37 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBCJJaKp034768 for ; Wed, 12 Dec 2007 19:19:36 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBCJJauC034765 for perforce@freebsd.org; Wed, 12 Dec 2007 19:19:36 GMT (envelope-from marcel@freebsd.org) Date: Wed, 12 Dec 2007 19:19:36 GMT Message-Id: <200712121919.lBCJJauC034765@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 130726 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 19:19:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=130726 Change 130726 by marcel@marcel_cluster on 2007/12/12 19:19:01 Add rudimentary support for IPIs. Since there are only 4 IPI "channels" and we typically have more than 4 IPI messages, we use a bitmap approach where each IPI message corresponds to a bit in pcpu->pc_ipimask and we always raise the IPI using a single channel (channel 0). This way we support up to 32 IPI messages and don't care that IPIs are not queued to the processor. This changes the OpenPIC driver to always use the private per-processor register bank instead of the global one. The PIC I/F also grows a new method, called ipi(). Affected files ... .. //depot/projects/powerpc/sys/powerpc/include/openpicreg.h#4 edit .. //depot/projects/powerpc/sys/powerpc/include/openpicvar.h#4 edit .. //depot/projects/powerpc/sys/powerpc/include/pcpu.h#8 edit .. //depot/projects/powerpc/sys/powerpc/powermac/openpic_macio.c#3 edit .. //depot/projects/powerpc/sys/powerpc/powerpc/mp_machdep.c#11 edit .. //depot/projects/powerpc/sys/powerpc/powerpc/openpic.c#4 edit .. //depot/projects/powerpc/sys/powerpc/powerpc/pic_if.m#4 edit .. //depot/projects/powerpc/sys/powerpc/psim/openpic_iobus.c#3 edit Differences ... ==== //depot/projects/powerpc/sys/powerpc/include/openpicreg.h#4 (text+ko) ==== @@ -33,16 +33,35 @@ #define OPENPIC_SIZE 0x40000 /* - * GLOBAL/TIMER register (IDU base + 0x1000) + * Per Processor Registers [private access] (0x00000 - 0x00fff) + */ + +/* IPI dispatch command reg */ +#define OPENPIC_IPI_DISPATCH(ipi) (0x40 + (ipi) * 0x10) + +/* current task priority reg */ +#define OPENPIC_PRIORITY 0x80 +#define OPENPIC_PRIORITY_MASK 0x0000000f + +#define OPENPIC_WHOAMI 0x90 + +/* interrupt acknowledge reg */ +#define OPENPIC_IACK 0xa0 + +/* end of interrupt reg */ +#define OPENPIC_EOI 0xb0 + +/* + * Global registers (0x01000-0x0ffff) */ /* feature reporting reg 0 */ #define OPENPIC_FEATURE 0x1000 -#define OPENPIC_FEATURE_VERSION_MASK 0x000000ff -#define OPENPIC_FEATURE_LAST_CPU_MASK 0x00001f00 -#define OPENPIC_FEATURE_LAST_CPU_SHIFT 8 -#define OPENPIC_FEATURE_LAST_IRQ_MASK 0x07ff0000 -#define OPENPIC_FEATURE_LAST_IRQ_SHIFT 16 +#define OPENPIC_FEATURE_VERSION_MASK 0x000000ff +#define OPENPIC_FEATURE_LAST_CPU_MASK 0x00001f00 +#define OPENPIC_FEATURE_LAST_CPU_SHIFT 8 +#define OPENPIC_FEATURE_LAST_IRQ_MASK 0x07ff0000 +#define OPENPIC_FEATURE_LAST_IRQ_SHIFT 16 /* global config reg 0 */ #define OPENPIC_CONFIG 0x1020 @@ -51,9 +70,9 @@ /* interrupt configuration mode (direct or serial) */ #define OPENPIC_ICR 0x1030 -#define OPENPIC_ICR_SERIAL_MODE (1 << 27) -#define OPENPIC_ICR_SERIAL_RATIO_MASK (0x7 << 28) -#define OPENPIC_ICR_SERIAL_RATIO_SHIFT 28 +#define OPENPIC_ICR_SERIAL_MODE (1 << 27) +#define OPENPIC_ICR_SERIAL_RATIO_MASK (0x7 << 28) +#define OPENPIC_ICR_SERIAL_RATIO_SHIFT 28 /* vendor ID */ #define OPENPIC_VENDOR_ID 0x1080 @@ -67,9 +86,16 @@ /* spurious intr. vector */ #define OPENPIC_SPURIOUS_VECTOR 0x10e0 +/* Timer registers */ +#define OPENPIC_TIMERS 4 +#define OPENPIC_TFREQ 0x10f0 +#define OPENPIC_TCNT(t) (0x1100 + (t) * 0x40) +#define OPENPIC_TBASE(t) (0x1110 + (t) * 0x40) +#define OPENPIC_TVEC(t) (0x1120 + (t) * 0x40) +#define OPENPIC_TDST(t) (0x1130 + (t) * 0x40) /* - * INTERRUPT SOURCE register (IDU base + 0x10000) + * Interrupt Source Configuration Registers (0x10000 - 0x1ffff) */ /* interrupt vector/priority reg */ @@ -92,18 +118,20 @@ #endif /* - * PROCESSOR register (IDU base + 0x20000) + * Per Processor Registers [global access] (0x20000 - 0x3ffff) */ -/* IPI command reg */ -#define OPENPIC_IPI(cpu, ipi) (0x20040 + (cpu) * 0x1000 + (ipi)) +#define OPENPIC_PCPU_BASE(cpu) (0x20000 + (cpu) * 0x1000) + +#define OPENPIC_PCPU_IPI_DISPATCH(cpu, ipi) \ + (OPENPIC_PCPU_BASE(cpu) + OPENPIC_IPI_DISPATCH(ipi)) + +#define OPENPIC_PCPU_PRIORITY(cpu) \ + (OPENPIC_PCPU_BASE(cpu) + OPENPIC_PRIORITY) -/* current task priority reg */ -#define OPENPIC_CPU_PRIORITY(cpu) (0x20080 + (cpu) * 0x1000) -#define OPENPIC_CPU_PRIORITY_MASK 0x0000000f +#define OPENPIC_PCPU_IACK(cpu) \ + (OPENPIC_PCPU_BASE(cpu) + OPENPIC_IACK) -/* interrupt acknowledge reg */ -#define OPENPIC_IACK(cpu) (0x200a0 + (cpu) * 0x1000) +#define OPENPIC_PCPU_EOI(cpu) \ + (OPENPIC_PCPU_BASE(cpu) + OPENPIC_EOI) -/* end of interrupt reg */ -#define OPENPIC_EOI(cpu) (0x200b0 + (cpu) * 0x1000) ==== //depot/projects/powerpc/sys/powerpc/include/openpicvar.h#4 (text+ko) ==== @@ -57,6 +57,7 @@ void openpic_dispatch(device_t, struct trapframe *); void openpic_enable(device_t, u_int, u_int); void openpic_eoi(device_t, u_int); +void openpic_ipi(device_t, u_int); void openpic_mask(device_t, u_int); void openpic_unmask(device_t, u_int); ==== //depot/projects/powerpc/sys/powerpc/include/pcpu.h#8 (text+ko) ==== @@ -42,6 +42,7 @@ struct thread *pc_fputhread; /* current fpu user */ \ int pc_bsp:1; \ int pc_awake:1; \ + uint32_t pc_ipimask; \ register_t pc_tempsave[CPUSAVE_LEN]; \ register_t pc_disisave[CPUSAVE_LEN]; \ register_t pc_dbsave[CPUSAVE_LEN]; ==== //depot/projects/powerpc/sys/powerpc/powermac/openpic_macio.c#3 (text+ko) ==== @@ -70,6 +70,7 @@ DEVMETHOD(pic_dispatch, openpic_dispatch), DEVMETHOD(pic_enable, openpic_enable), DEVMETHOD(pic_eoi, openpic_eoi), + DEVMETHOD(pic_ipi, openpic_ipi), DEVMETHOD(pic_mask, openpic_mask), DEVMETHOD(pic_unmask, openpic_unmask), ==== //depot/projects/powerpc/sys/powerpc/powerpc/mp_machdep.c#11 (text+ko) ==== @@ -34,11 +34,14 @@ #include #include +#include #include #include #include +#include "pic_if.h" + extern void __start_ap(void *); MALLOC_DEFINE(M_SMP, "smp", "SMP specific datastructures"); @@ -211,9 +214,9 @@ static void ipi_send(struct pcpu *pc, int ipi) { - /* - * - */ + + atomic_set_32(&pc->pc_ipimask, (1 << ipi)); + PIC_IPI(pic, pc->pc_cpuid); } /* Send an IPI to a set of cpus. */ ==== //depot/projects/powerpc/sys/powerpc/powerpc/openpic.c#4 (text+ko) ==== @@ -66,14 +66,14 @@ } static __inline void -openpic_set_priority(struct openpic_softc *sc, int cpu, int pri) +openpic_set_priority(struct openpic_softc *sc, int pri) { uint32_t x; - x = openpic_read(sc, OPENPIC_CPU_PRIORITY(cpu)); - x &= ~OPENPIC_CPU_PRIORITY_MASK; + x = openpic_read(sc, OPENPIC_PRIORITY); + x &= ~OPENPIC_PRIORITY_MASK; x |= pri; - openpic_write(sc, OPENPIC_CPU_PRIORITY(cpu), x); + openpic_write(sc, OPENPIC_PRIORITY, x); } int @@ -134,7 +134,7 @@ for (irq = 0; irq < sc->sc_nirq; irq++) openpic_write(sc, OPENPIC_SRC_VECTOR(irq), OPENPIC_IMASK); - openpic_set_priority(sc, 0, 15); + openpic_set_priority(sc, 15); /* we don't need 8259 passthrough mode */ x = openpic_read(sc, OPENPIC_CONFIG); @@ -157,12 +157,12 @@ /* XXX IPI */ /* XXX set spurious intr vector */ - openpic_set_priority(sc, 0, 0); + openpic_set_priority(sc, 0); /* clear all pending interrupts */ for (irq = 0; irq < sc->sc_nirq; irq++) { - (void)openpic_read(sc, OPENPIC_IACK(0)); - openpic_write(sc, OPENPIC_EOI(0), 0); + (void)openpic_read(sc, OPENPIC_IACK); + openpic_write(sc, OPENPIC_EOI, 0); } powerpc_register_pic(dev); @@ -182,7 +182,7 @@ sc = device_get_softc(dev); while (1) { - vector = openpic_read(sc, OPENPIC_IACK(0)); + vector = openpic_read(sc, OPENPIC_IACK); vector &= OPENPIC_VECTOR_MASK; if (vector == 255) break; @@ -209,7 +209,16 @@ struct openpic_softc *sc; sc = device_get_softc(dev); - openpic_write(sc, OPENPIC_EOI(0), 0); + openpic_write(sc, OPENPIC_EOI, 0); +} + +void +openpic_ipi(device_t dev, u_int cpu) +{ + struct openpic_softc *sc; + + sc = device_get_softc(dev); + openpic_write(sc, OPENPIC_IPI_DISPATCH(0), 1u << cpu); } void @@ -222,7 +231,7 @@ x = openpic_read(sc, OPENPIC_SRC_VECTOR(irq)); x |= OPENPIC_IMASK; openpic_write(sc, OPENPIC_SRC_VECTOR(irq), x); - openpic_write(sc, OPENPIC_EOI(0), 0); + openpic_write(sc, OPENPIC_EOI, 0); } void ==== //depot/projects/powerpc/sys/powerpc/powerpc/pic_if.m#4 (text+ko) ==== @@ -48,6 +48,11 @@ u_int irq; }; +METHOD void ipi { + device_t dev; + u_int cpu; +}; + METHOD void mask { device_t dev; u_int irq; ==== //depot/projects/powerpc/sys/powerpc/psim/openpic_iobus.c#3 (text+ko) ==== @@ -74,6 +74,7 @@ DEVMETHOD(pic_dispatch, openpic_dispatch), DEVMETHOD(pic_enable, openpic_enable), DEVMETHOD(pic_eoi, openpic_eoi), + DEVMETHOD(pic_ipi, openpic_ipi), DEVMETHOD(pic_mask, openpic_mask), DEVMETHOD(pic_unmask, openpic_unmask), From owner-p4-projects@FreeBSD.ORG Wed Dec 12 20:54:19 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B279F16A41A; Wed, 12 Dec 2007 20:54:19 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4278916A419 for ; Wed, 12 Dec 2007 20:54:19 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3C07513C442 for ; Wed, 12 Dec 2007 20:54:19 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBCKsJHV059802 for ; Wed, 12 Dec 2007 20:54:19 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBCKsIkO059799 for perforce@freebsd.org; Wed, 12 Dec 2007 20:54:18 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 12 Dec 2007 20:54:18 GMT Message-Id: <200712122054.lBCKsIkO059799@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 130731 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 20:54:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=130731 Change 130731 by hselasky@hselasky_laptop001 on 2007/12/12 20:53:32 This commit is related to USB device side support. This commit outlines the coming changes which will almost finalize the symmetry in the USB stack. That means there is very little difference between setting up a Device Side driver versus a Host Side driver - it's symmetric ! NOTE: The P4 project will not build during these updates. FYI: The comments below follow the diff. o Add to new USB error codes. o Add new callbacks that will set and clear endpoint stall in hardware. o The term "device_index" is used to address an USB device from userland, hence the device address can change! o Some new fields in "struct usbd_port". o We now store the number of ports in "struct usbd_hub" in the "nports" variable so that we can add software constraints to the number of ports later. o The USB explore system has been reworked and simplified. Define a set of USB explore commands. See "USB_BUS_EXPLORE_XXX". o USB BUS "need_xxx" variables moved into a separate structure. o The "driver_added_refcount" is not stored in "struct usbd_bus" and we no longer need the Global USB lock to read and write it. o "struct usbd_interface" now contains a pointer to its belonging subdevice if any. o "struct usbd_device_flags" contains all the USB device flags. o New predefined size: USB_MAX_INTERFACES (see "usb.h") which gives the maximum number of USB interfaces supported. o The parent device_t is not stored in "struct usbd_device" in the variable "parent_dev". o New field "global_dev" in "struct usbd_device" which points to the USB specific, that means non-interface probed USB device. o "USBD_PROBED_GENERIC_AND_FOUND" was merged with "USBD_PROBED_SPECIFIC_AND_FOUND". o New USB transfer flag "stall_pipe". (see README for a detailed description) o Updated and added some prototypes. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#73 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#73 (text+ko) ==== @@ -66,6 +66,8 @@ m(USBD_STALLED,)\ m(USBD_INTERRUPTED,)\ m(USBD_DMA_LOAD_FAILED,)\ +m(USBD_BAD_CONTEXT,)\ +m(USBD_NO_ROOT_HUB,)\ /**/ MAKE_ENUM(USBD_STATUS, @@ -165,17 +167,26 @@ }; struct usbd_pipe_methods { + + /* USB Device and Host mode: */ + void (*open) (struct usbd_xfer *xfer); void (*close) (struct usbd_xfer *xfer); void (*enter) (struct usbd_xfer *xfer); void (*start) (struct usbd_xfer *xfer); + + /* USB Device mode only: */ + + void (*set_stall) (struct usbd_device *udev, struct usbd_xfer *xfer, struct usbd_pipe *pipe); + void (*clear_stall) (struct usbd_device *udev, struct usbd_pipe *pipe); }; struct usbd_port { - usb_port_status_t status; uint8_t restartcnt; - uint8_t device_addr; /* zero means unused */ #define USBD_RESTART_MAX 5 + uint8_t device_index; /* zero means not valid */ + uint8_t usb_mode:1; /* current USB mode */ + uint8_t unused:7; }; struct usbd_fs_isoc_schedule { @@ -195,13 +206,13 @@ struct usbd_hub { struct usbd_fs_isoc_schedule fs_isoc_schedule[USB_ISOC_TIME_MAX]; - usb_hub_descriptor_t hubdesc; struct usbd_device *hubudev; /* the HUB device */ usbd_status_t (*explore) (struct usbd_device *hub); void *hubsoftc; uint32_t uframe_usage[USB_HS_MICRO_FRAMES_MAX]; uint16_t portpower; /* mA per USB port */ uint8_t isoc_last_time; + uint8_t nports; struct usbd_port ports[0]; }; @@ -268,8 +279,27 @@ uint32_t size; }; +/* USB BUS explore commands */ + +#define USB_BUS_EXPLORE_TREE 0 +#define USB_BUS_EXPLORE_PROBE 1 +#define USB_BUS_EXPLORE_STOP 2 +#define USB_BUS_EXPLORE_SYNC 3 + #define USB_BUS_DMA_TAG_MAX 8 +struct usbd_bus_needs { + uint8_t sync:1; /* Set if explore thread sync is + * needed. */ + uint8_t wakeup:1; /* Set if explore thread is sleeping. */ + uint8_t explore:1; /* Set if a HUB signalled a change. */ + uint8_t probe_attach:1; /* Set if a HUB signalled that a new + * USB driver was loaded. */ + uint8_t teardown:1; /* Set if we are tearing down the + * explore thread */ + uint8_t unused:3; +}; + struct usbd_bus { struct usb_device_stats stats; struct mtx mtx; @@ -288,14 +318,12 @@ uint32_t uframe_usage[USB_HS_MICRO_FRAMES_MAX]; - uint16_t isoc_time_last; /* ms */ + uint16_t isoc_time_last; /* in milliseconds */ + + struct usbd_bus_needs needs; /* write protected by "bus->mtx" */ uint8_t alloc_failed; /* Set if memory allocation failed. */ - uint8_t is_exploring; - uint8_t wait_explore; - uint8_t needs_explore; /* Set if a hub signalled a change. - * This variable is protected by - * "usb_global_lock" */ + uint8_t driver_added_refcount; /* Current driver generation count */ uint8_t usbrev; /* USB revision */ uint8_t usb_clone_count; #define USB_BUS_MAX_CLONES 128 @@ -312,6 +340,7 @@ struct usbd_interface { usb_interface_descriptor_t *idesc; + device_t subdev; uint8_t alt_index; }; @@ -324,18 +353,30 @@ uint16_t isoc_next; uint16_t refcount; - uint8_t toggle_next; + uint8_t toggle_next:1; /* next data toggle value */ + uint8_t is_stalled:1; /* set if pipe is stalled */ + uint8_t unused:6; uint8_t iface_index; /* not used by "default pipe" */ }; +struct usbd_device_flags { + uint8_t usb_mode:1; /* USB mode (see USB_MODE_XXX) */ + uint8_t self_powered:1; /* set if USB device is self powered */ + uint8_t suspended:1; /* set if USB device is suspended */ + uint8_t no_strings:1; /* set if USB device does not support + * strings */ + uint8_t detaching:1; /* set if USB device is detaching */ + uint8_t unused:3; +}; + struct usbd_device { struct sx default_sx[1]; struct mtx default_mtx[1]; - struct usbd_interface ifaces[USB_MAX_ENDPOINTS]; + struct usbd_interface ifaces[USB_MAX_INTERFACES]; struct usbd_interface ifaces_end[0]; - struct usbd_pipe default_pipe; /* pipe 0 */ + struct usbd_pipe default_pipe; /* Control Endpoint 0 */ struct usbd_pipe pipes[USB_MAX_ENDPOINTS]; struct usbd_pipe pipes_end[0]; @@ -344,12 +385,12 @@ #endif struct usbd_bus *bus; /* our controller */ + device_t parent_dev; /* parent device */ struct usbd_device *parent_hub; const struct usbd_quirks *quirks; /* device quirks, always set */ usb_config_descriptor_t *cdesc; /* full config descr */ struct usbd_hub *hub; /* only if this is a hub */ - device_t subdevs[USB_MAX_ENDPOINTS]; - device_t subdevs_end[0]; + device_t global_dev; struct usb_device *linux_dev; struct usbd_xfer *default_xfer[1]; void *usb_template_ptr; @@ -362,22 +403,23 @@ uint16_t langid; /* language for strings */ uint8_t address; /* device addess */ - uint8_t config; /* current configuration # */ + uint8_t curr_config_no; /* current configuration # */ uint8_t depth; /* distance from root HUB */ uint8_t speed; /* low/full/high speed */ - uint8_t self_powered; /* flag for self powered */ uint8_t port_index; /* parent HUB port index */ uint8_t port_no; /* parent HUB port number */ uint8_t hs_hub_addr; /* high-speed HUB address */ uint8_t hs_port_no; /* high-speed HUB port number */ - uint8_t driver_added_refcount; - uint8_t usb_mode:1; /* USB mode (see USB_MODE_XXX) */ - uint8_t unused:7; + uint8_t driver_added_refcount; /* our driver added generation count */ + + /* the "flags" field is write-protected by "bus->mtx" */ + + struct usbd_device_flags flags; usb_endpoint_descriptor_t default_ep_desc; /* for pipe 0 */ usb_device_descriptor_t ddesc; /* device descriptor */ - uint8_t ifaces_no_probe[(USB_MAX_ENDPOINTS + 7) / 8]; + uint8_t ifaces_no_probe[(USB_MAX_INTERFACES + 7) / 8]; #define USBD_SET_IFACE_NO_PROBE(udev, ii) \ { (udev)->ifaces_no_probe[(ii) >> 3] |= (1 << ((ii) & 7)); } #define USBD_CLR_IFACE_NO_PROBE(udev, ii) \ @@ -389,7 +431,6 @@ #define USBD_PROBED_NOTHING 0 /* default value */ #define USBD_PROBED_SPECIFIC_AND_FOUND 1 #define USBD_PROBED_IFACE_AND_FOUND 2 -#define USBD_PROBED_GENERIC_AND_FOUND 3 uint8_t serial[64]; /* serial number */ uint8_t manufacturer[64]; /* manufacturer string */ @@ -399,9 +440,6 @@ struct usbd_temp_setup temp_setup[1]; uint8_t data[128]; } scratch[1]; - - uint8_t detaching; - uint8_t no_strings; /* flag for no strings */ }; struct usbd_xfer_flags { @@ -418,6 +456,9 @@ * control transfers */ uint8_t no_pipe_ok:1; /* set if "USBD_NO_PIPE" error can be * ignored */ + uint8_t stall_pipe:1; /* set if the endpoint belonging to + * this USB transfer should be stalled + * before starting this transfer! */ }; struct usbd_xfer_flags_int { @@ -657,10 +698,9 @@ #define USB_PRODUCT_ANY 0xffff struct usb_attach_arg { + device_t temp_dev; /* for internal use */ struct usbd_device *device; /* current device */ struct usbd_interface *iface; /* current interface */ - struct usbd_interface *ifaces_start; /* all interfaces */ - struct usbd_interface *ifaces_end; /* exclusive */ uint16_t vendor; uint16_t product; @@ -727,10 +767,13 @@ usbd_status_t usbd_set_config_index(struct usbd_device *udev, uint8_t index, uint8_t msg); usbd_status_t usbd_set_alt_interface_index(struct usbd_device *udev, uint8_t iface_index, uint8_t alt_index); int usbd_fill_deviceinfo(struct usbd_device *udev, struct usb_device_info *di); +void usbd_detach_device(struct usbd_device *udev, uint8_t iface_index, uint8_t free_subdev); +usbd_status_t usbd_probe_and_attach(struct usbd_device *udev, uint8_t iface_index); +usbd_status_t usbd_suspend_resume(struct usbd_device *udev, uint8_t do_suspend); + +struct usbd_device *usbd_alloc_device(device_t parent_dev, struct usbd_bus *bus, struct usbd_device *parent_hub, uint8_t depth, uint8_t port_index, uint8_t port_no, uint8_t speed, uint8_t usb_mode); +void usbd_free_device(struct usbd_device *udev); usbd_status_t usbd_fill_iface_data(struct usbd_device *udev, uint8_t iface_index, uint8_t alt_index); -usbd_status_t usbd_probe_and_attach(device_t parent, struct usbd_device *udev); -usbd_status_t usbd_new_device(device_t parent, struct usbd_bus *bus, struct usbd_device *parent_hub, uint8_t depth, uint8_t speed, uint8_t port_index, uint8_t port_no); -void usbd_free_device(struct usbd_device *udev, uint8_t free_subdev); struct usbd_device *usbd_ref_device(struct usbd_bus *bus, uint8_t addr); void usbd_unref_device(struct usbd_device *udev); struct usbd_interface *usbd_get_iface(struct usbd_device *udev, uint8_t iface_index); @@ -770,6 +813,8 @@ uint8_t usbd_bus_mem_alloc_all(struct usbd_bus *bus, usbd_bus_mem_cb_t *cb); void usbd_bus_mem_free_all(struct usbd_bus *bus, usbd_bus_mem_cb_t *cb); uint8_t usbd_transfer_setup_sub_malloc(struct usbd_setup_params *parm, struct usbd_page_search *info, struct usbd_page_cache **ppc, uint32_t size, uint32_t align); +struct usbd_device *usbd_bus_port_get_device(struct usbd_bus *bus, struct usbd_port *up); +void usbd_bus_port_set_device(struct usbd_bus *bus, struct usbd_port *up, struct usbd_device *udev, uint8_t device_index); /* prototypes from usb.c */ @@ -781,9 +826,7 @@ #define usb_global_lock Giant #endif -extern uint8_t usb_driver_added_refcount; - -void usb_needs_explore(struct usbd_device *udev); +void usb_needs_explore(struct usbd_bus *bus, uint8_t what); void usb_needs_probe_and_attach(void); /* prototypes from usb_template.c */ @@ -805,6 +848,7 @@ #endif uint32_t usb_get_devid(device_t dev); +struct usbd_pipe *usbd_get_pipe_by_addr(struct usbd_device *udev, uint8_t ea_val); struct usbd_pipe *usbd_get_pipe(struct usbd_device *udev, uint8_t iface_index, const struct usbd_config *setup); usbd_status_t usbd_interface_count(struct usbd_device *udev, uint8_t *count); void usbd_transfer_setup_sub(struct usbd_setup_params *parm); @@ -836,7 +880,7 @@ /* prototypes from usb_requests.c */ -usbd_status_t usbreq_reset_port(struct usbd_device *udev, struct mtx *mtx, usb_port_status_t *ps, uint8_t port); +usbd_status_t usbreq_reset_port(struct usbd_device *udev, struct mtx *mtx, uint8_t port); usbd_status_t usbreq_get_desc(struct usbd_device *udev, struct mtx *mtx, void *desc, uint16_t min_len, uint16_t max_len, uint16_t id, uint8_t type, uint8_t index, uint8_t retries); usbd_status_t usbreq_get_string_any(struct usbd_device *udev, struct mtx *mtx, char *buf, uint16_t len, uint8_t string_index); usbd_status_t usbreq_get_string_desc(struct usbd_device *udev, struct mtx *mtx, void *sdesc, uint16_t max_len, uint16_t lang_id, uint8_t string_index); From owner-p4-projects@FreeBSD.ORG Wed Dec 12 20:55:21 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4485D16A41A; Wed, 12 Dec 2007 20:55:21 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0A8DC16A418 for ; Wed, 12 Dec 2007 20:55:21 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 04F1213C448 for ; Wed, 12 Dec 2007 20:55:21 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBCKtKBv059881 for ; Wed, 12 Dec 2007 20:55:20 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBCKtK8V059878 for perforce@freebsd.org; Wed, 12 Dec 2007 20:55:20 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 12 Dec 2007 20:55:20 GMT Message-Id: <200712122055.lBCKtK8V059878@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 130732 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 20:55:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=130732 Change 130732 by hselasky@hselasky_laptop001 on 2007/12/12 20:54:23 Update documentation. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/README#28 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/README#28 (text+ko) ==== @@ -370,6 +370,14 @@ Setting this flag causes the USBD_NO_PIPE error to be ignored. This flag can not be changed during operation. + stall_pipe + Setting this flag will cause STALL pids to be sent to the + endpoint belonging to this transfer before the transfer is + started. The transfer is started at the moment the host issues + a clear-stall command on the STALL'ed endpoint. This flag can + be changed during operation. This flag does only have effect + in USB device mode. + - The "bufsize" field sets the total buffer size in bytes. If this field is zero, "wMaxPacketSize" will be used, multiplied by the "frames" field if the transfer type is ISOCHRONOUS. This is useful for From owner-p4-projects@FreeBSD.ORG Wed Dec 12 21:08:36 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 09F1F16A505; Wed, 12 Dec 2007 21:08:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B6A8816A519 for ; Wed, 12 Dec 2007 21:08:35 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B1CED13C457 for ; Wed, 12 Dec 2007 21:08:35 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBCL8ZJI062610 for ; Wed, 12 Dec 2007 21:08:35 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBCL8ZKK062607 for perforce@freebsd.org; Wed, 12 Dec 2007 21:08:35 GMT (envelope-from marcel@freebsd.org) Date: Wed, 12 Dec 2007 21:08:35 GMT Message-Id: <200712122108.lBCL8ZKK062607@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 130734 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 21:08:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=130734 Change 130734 by marcel@marcel_jnpr on 2007/12/12 21:08:25 Sync with my current configuration file. Affected files ... .. //depot/projects/powerpc/sys/powerpc/conf/XSERVE#3 edit Differences ... ==== //depot/projects/powerpc/sys/powerpc/conf/XSERVE#3 (text+ko) ==== @@ -1,75 +1,75 @@ cpu OEA ident XSERVE -makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols +makeoptions DEBUG=-g makeoptions NO_MODULES=yes -options POWERMAC #NewWorld Apple PowerMacs - +options ALT_BREAK_TO_DEBUGGER +options CD9660 +options DDB +options FFS +options GDB +options GEOM_PART_GPT +options INET +options INET6 +#options INTR_FILTER +options INVARIANTS +options INVARIANT_SUPPORT +options KDB +options KTRACE +options MSDOSFS +options NFSCLIENT +options P1003_1B_SEMAPHORES +options POWERMAC +options PROCFS +options PSEUDOFS +options SCHED_4BSD +#options SCHED_ULE +options SCSI_DELAY=3000 options SMP -options SCHED_4BSD #4BSD scheduler -options INET #InterNETworking -options INET6 #IPv6 communications protocols -options FFS #Berkeley Fast Filesystem -options SOFTUPDATES #Enable FFS soft updates support -options UFS_ACL #Support for access control lists -options UFS_DIRHASH #Improve performance on big directories -options NFSCLIENT #Network Filesystem Client -options NFS_ROOT #NFS usable as root device -options MSDOSFS #MSDOS Filesystem -options CD9660 #ISO 9660 Filesystem -options PROCFS #Process filesystem (requires PSEUDOFS) -options PSEUDOFS #Pseudo-filesystem framework -options GEOM_PART_GPT #GUID Partition Tables. -options COMPAT_43TTY #BSD 4.3 TTY compat [KEEP THIS!] -options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI -options KTRACE #ktrace(1) syscall trace support -options SYSVSHM #SYSV-style shared memory -options SYSVMSG #SYSV-style message queues -options SYSVSEM #SYSV-style semaphores -options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions +options SOFTUPDATES +options SYSVMSG +options SYSVSEM +options SYSVSHM +options UFS_DIRHASH +options WITNESS +options WITNESS_KDB +options WITNESS_SKIPSPIN +options _KPOSIX_PRIORITY_SCHEDULING -options KDB #Enable the kernel debugger -options GDB #Support GDB -options DDB #Support DDB - +device ata +device atadisk +device atapicd +device bge +device bpf +device da +device ether +device firewire +device gem +device loop +device md +device miibus +device ohci +device pass device pci - -device ata -device atadisk # ATA disk drives -device atapicd # ATAPI CDROM drives +device powermac_nvram +device pty +device puc +device random +device sbp +device scbus +device scc +device tun +device uart +device ugen +device uhid +device ukbd +device umass +device ums +device usb device sc device kbdmux -options SC_OFWFB # OFW frame buffer -options SC_DFLT_FONT # compile font in +options SC_OFWFB # OFW frame buffer +options SC_DFLT_FONT makeoptions SC_DFLT_FONT=cp437 - -device scc -device uart - -device miibus # MII bus support -device gem # Sun GEM/Sun ERI/Apple GMAC -#device bge - -device loop # Network loopback -device random # Entropy device -device ether # Ethernet support -device tun # Packet tunnel. -device pty # Pseudo-ttys (telnet etc) -device md # Memory "disks" -device ofwd # Open Firmware disks - -device bpf #Berkeley packet filter - -device ohci # OHCI PCI->USB interface -device usb # USB Bus (required) -device ugen # Generic -device uhid # "Human Interface Devices" -device ukbd # Keyboard -options KBD_INSTALL_CDEV # install a CDEV entry in /dev -device ums # Mouse - -device firewire # FireWire bus code - -device powermac_nvram From owner-p4-projects@FreeBSD.ORG Wed Dec 12 21:10:38 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 55FFE16A469; Wed, 12 Dec 2007 21:10:38 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 028BA16A419 for ; Wed, 12 Dec 2007 21:10:38 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F06C613C4E8 for ; Wed, 12 Dec 2007 21:10:37 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBCLAb02062936 for ; Wed, 12 Dec 2007 21:10:37 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBCLAbv9062933 for perforce@freebsd.org; Wed, 12 Dec 2007 21:10:37 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 12 Dec 2007 21:10:37 GMT Message-Id: <200712122110.lBCLAbv9062933@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 130735 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 21:10:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=130735 Change 130735 by hselasky@hselasky_laptop001 on 2007/12/12 21:09:59 This commit is related to USB device side support. FYI: The comments below follow the diff. o New globel function "usbd_get_pipe_by_addr". o Skip setting up USB transfers with missing callback. o Added some extra state handling when "stall_pipe" is set. o A new set of functions "usbd_handle_xxx" where added that are directly related to handling of control endpoint messages in USB device mode. o "usbd_default_transfer_setup" needed to be reworked to handle some races that can happen when a new USB device address is set. o Else some small optimisations. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#68 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#68 (text+ko) ==== @@ -60,6 +60,7 @@ static void usbd_bdma_work_loop(struct usbd_memory_info *info); static void usbd_bdma_cancel_event(struct usbd_xfer *xfer); static void usbd_callback_wrapper(struct usbd_xfer *xfer, uint8_t context); +static usbd_status_t usbd_handle_request(struct usbd_xfer *xfer); #ifdef USB_DEBUG void @@ -85,8 +86,8 @@ " address=%d config=%d depth=%d speed=%d self_powered=%d\n" " power=%d langid=%d\n", udev->bus, - udev->address, udev->config, udev->depth, udev->speed, - udev->self_powered, udev->power, udev->langid); + udev->address, udev->curr_config_no, udev->depth, udev->speed, + udev->flags.self_powered, udev->power, udev->langid); return; } @@ -156,7 +157,46 @@ return ((uaa->vendor << 16) | (uaa->product)); } +/*------------------------------------------------------------------------* + * usbd_get_pipe_by_addr + * + * This function searches for an USB pipe by endpoint address. + *------------------------------------------------------------------------*/ struct usbd_pipe * +usbd_get_pipe_by_addr(struct usbd_device *udev, uint8_t ea_val) +{ + struct usbd_pipe *pipe = udev->pipes; + struct usbd_pipe *pipe_end = udev->pipes_end; + enum { + EA_MASK = (UE_DIR_IN | UE_DIR_OUT | UE_ADDR), + }; + + ea_val &= EA_MASK; + + for (; pipe != pipe_end; pipe++) { + + if (pipe->edesc == NULL) { + continue; + } + /* do the mask and check the value */ + if ((pipe->edesc->bEndpointAddress & EA_MASK) == ea_val) { + goto found; + } + } + + /* do the mask and check the value */ + if ((udev->default_pipe.edesc) && + ((udev->default_pipe.edesc->bEndpointAddress & EA_MASK) == ea_val)) { + pipe = &udev->default_pipe; + goto found; + } + return (NULL); + +found: + return (pipe); +} + +struct usbd_pipe * usbd_get_pipe(struct usbd_device *udev, uint8_t iface_index, const struct usbd_config *setup) { @@ -349,12 +389,12 @@ xfer->flags = setup->flags; xfer->nframes = setup->frames; xfer->timeout = setup->timeout; - xfer->callback = setup->cb[parm->udev->usb_mode]; + xfer->callback = setup->cb[parm->udev->flags.usb_mode]; xfer->interval = setup->interval; xfer->endpoint = edesc->bEndpointAddress; xfer->max_packet_size = UGETW(edesc->wMaxPacketSize); xfer->max_packet_count = 1; - xfer->flags_int.usb_mode = parm->udev->usb_mode; /* make a shadow copy */ + xfer->flags_int.usb_mode = parm->udev->flags.usb_mode; /* make a shadow copy */ parm->bufsize = setup->bufsize; @@ -745,7 +785,8 @@ parm.err = USBD_BAD_BUFSIZE; PRINTF(("invalid bufsize\n")); } - if (setup->cb[udev->usb_mode] == NULL) { + if ((setup->cb[USB_MODE_HOST] == NULL) && + (setup->cb[USB_MODE_DEVICE] == NULL)) { parm.err = USBD_NO_CALLBACK; PRINTF(("no callback\n")); } @@ -799,6 +840,13 @@ for (setup = setup_start, n = 0; setup != setup_end; setup++, n++) { + if (setup->cb[udev->flags.usb_mode] == NULL) { + /* + * Skip USB transfers without + * callbacks ! + */ + continue; + } /* see if there is a matching endpoint */ pipe = usbd_get_pipe(udev, iface_index, setup); if (!pipe) { @@ -1289,7 +1337,16 @@ uint32_t len; /* - * check if there is a control + * USB control endpoints are not just straight forward ... + * Check for STALL: + */ + if (xfer->flags.stall_pipe && + (xfer->flags_int.usb_mode == USB_MODE_DEVICE)) { + /* no longer active */ + xfer->flags_int.control_act = 0; + } + /* + * Check if there is a control * transfer in progress: */ if (xfer->flags_int.control_act) { @@ -2127,13 +2184,36 @@ mtx_assert(xfer->usb_mtx, MA_OWNED); /* - * if the transfer is not inserted, insert the transfer into the - * transfer queue + * If the transfer is not inserted, insert the transfer into the + * transfer queue: */ if (xfer->pipe_list.le_prev == NULL) { LIST_INSERT_HEAD(&xfer->pipe->list_head, xfer, pipe_list); } /* + * If the pipe is already stalled we do nothing except putting + * the transfer on the queue ! + */ + if (xfer->pipe->is_stalled) { + goto done; + } + /* + * Check if we are supposed to stall the pipe: + */ + if (xfer->flags.stall_pipe && + (xfer->flags_int.usb_mode == USB_MODE_DEVICE)) { + /* + * We can not stall ISOCHRONOUS endpoints ! + */ + type = (xfer->pipe->edesc->bmAttributes & UE_XFERTYPE); + if (type != UE_ISOCHRONOUS) { + xfer->pipe->is_stalled = 1; + (xfer->pipe->methods->set_stall) ( + xfer->udev, NULL, xfer->pipe); + goto done; + } + } + /* * Handled cases: * * 1) Start the first transfer queued. This transfer is always last on @@ -2279,13 +2359,12 @@ /* remove the transfer from pipe transfer list */ LIST_REMOVE(xfer, pipe_list); + xfer->pipe_list.le_prev = 0; /* start "next" transfer, if any */ - if (xfer_prev && - (xfer_prev->pipe_list.le_next == NULL)) { - (xfer_prev->pipe->methods->start) (xfer_prev); + if (xfer_prev) { + usbd_transfer_enqueue(xfer_prev); } - xfer->pipe_list.le_prev = 0; } done: return; @@ -2313,66 +2392,714 @@ } /*------------------------------------------------------------------------* - * usbd_serve_request_callback + * usbd_handle_request_callback *------------------------------------------------------------------------*/ static void -usbd_serve_request_callback(struct usbd_xfer *xfer) +usbd_handle_request_callback(struct usbd_xfer *xfer) { - ; /* workaround for a bug in "indent" */ + usbd_status_t err; + + /* check the current transfer state */ switch (USBD_GET_STATE(xfer)) { case USBD_ST_SETUP: case USBD_ST_TRANSFERRED: + + /* handle the request */ + err = usbd_handle_request(xfer); + + if (err == USBD_BAD_CONTEXT) { + /* + * Currently we get a "start" context by + * waking up the explore thread. + */ + usb_needs_explore(xfer->udev->bus, + USB_BUS_EXPLORE_TREE); + return; + } + if ((!xfer->flags_int.control_act) || err) { + /* + * If no control transfer is active, + * receive the next SETUP message: + */ + goto tr_start; + } + usbd_start_hardware(xfer); + return; + default: + if (xfer->error != USBD_CANCELLED) { + /* should not happen - try stalling */ + err = USBD_STALLED; + goto tr_start; + } break; } return; + +tr_start: + xfer->frlengths[0] = sizeof(usb_device_request_t); + xfer->nframes = 1; + xfer->flags.manual_status = 1; + xfer->flags.force_short_xfer = 0; + xfer->flags.short_xfer_ok = 0; + if (err) { + xfer->flags.stall_pipe = 1; + } else { + xfer->flags.stall_pipe = 0; + } + usbd_start_hardware(xfer); + return; +} + +/*------------------------------------------------------------------------* + * usbd_handle_set_config + *------------------------------------------------------------------------*/ +static usbd_status_t +usbd_handle_set_config(struct usbd_xfer *xfer, uint8_t conf_no) +{ + mtx_unlock(xfer->priv_mtx); + + usbd_detach_device(xfer->udev, USB_IFACE_INDEX_ANY, 1); + + if (conf_no == USB_UNCONFIG_NO) { + conf_no = USB_UNCONFIG_INDEX; + } else { + /* + * The relationship between config number and config index + * is very simple in our case: + */ + conf_no--; + } + + if (usbd_set_config_index(xfer->udev, conf_no, 0)) { + mtx_lock(xfer->priv_mtx); + return (USBD_STALLED); + } + if (usbd_probe_and_attach(xfer->udev, USB_IFACE_INDEX_ANY)) { + mtx_lock(xfer->priv_mtx); + return (USBD_STALLED); + } + mtx_lock(xfer->priv_mtx); + + return (0); +} + +/*------------------------------------------------------------------------* + * usbd_handle_set_alt_setting + *------------------------------------------------------------------------*/ +static usbd_status_t +usbd_handle_set_alt_setting(struct usbd_xfer *xfer, + uint8_t iface_index, uint8_t alt_index) +{ + if (iface_index >= USB_MAX_INTERFACES) { + return (USBD_STALLED); + } + mtx_unlock(xfer->priv_mtx); + + usbd_detach_device(xfer->udev, iface_index, 1); + + if (usbd_set_alt_interface_index(xfer->udev, + iface_index, alt_index)) { + mtx_lock(xfer->priv_mtx); + return (USBD_STALLED); + } + if (usbd_probe_and_attach(xfer->udev, iface_index)) { + mtx_lock(xfer->priv_mtx); + return (USBD_STALLED); + } + mtx_lock(xfer->priv_mtx); + + return (0); +} + +/*------------------------------------------------------------------------* + * usbd_handle_get_alt_setting + *------------------------------------------------------------------------*/ +static usbd_status_t +usbd_handle_get_alt_setting(struct usbd_xfer *xfer, + uint8_t iface_index, uint8_t *ptr) +{ + struct usbd_interface *iface; + + iface = usbd_get_iface(xfer->udev, iface_index); + if (iface) { + *ptr = iface->alt_index; + return (0); + } + return (USBD_STALLED); +} + +/*------------------------------------------------------------------------* + * usbd_handle_set_stall_sub + * + * This function is used to make a BULK or INTERRUPT endpoint + * send STALL tokens. + *------------------------------------------------------------------------*/ +static usbd_status_t +usbd_handle_set_stall_sub(struct usbd_device *udev, uint8_t ea_val, uint8_t do_stall) +{ + struct usbd_pipe *pipe; + struct usbd_xfer *xfer[2]; + struct thread *td = curthread; + uint8_t et; + + pipe = usbd_get_pipe_by_addr(udev, ea_val); + if (pipe == NULL) { + /* nothing to do */ + return (USBD_INVAL); + } + et = (pipe->edesc->bmAttributes & UE_XFERTYPE); + + if ((et != UE_BULK) && + (et != UE_INTERRUPT)) { + /* + * Should not stall control + * nor isochronous endpoints. + */ + return (0); + } + mtx_lock(&(udev->bus->mtx)); + + if (pipe->is_stalled == do_stall) { + /* if the pipe is already stalled do nothing */ + mtx_unlock(&(udev->bus->mtx)); + return (0); + } + /* update stalled state */ + pipe->is_stalled = do_stall; + + /* lookup the current USB transfer */ + xfer[0] = LIST_FIRST(&(pipe->list_head)); + if (xfer[0]) { + + /* search to the end of the LIST */ + while (LIST_NEXT(xfer[0], pipe_list)) { + xfer[0] = LIST_NEXT(xfer[0], pipe_list); + } + + if (do_stall) { + /* + * Set "usb_thread" so that no other + * thread will call this callback! + */ + xfer[0]->usb_thread = td; + } + } + if (do_stall) { + /* + * If "xfer[0]" is non-NULL the "set_stall" method will + * complete the USB transfer like in case of a timeout + * setting the error code "USBD_STALLED". The "set_stall" + * method should not call the USB transfer callback. + */ + (pipe->methods->set_stall) (udev, xfer[0], pipe); + } else { + pipe->toggle_next = 0; /* reset data toggle */ + + (pipe->methods->clear_stall) (udev, pipe); + + /* start up the first transfer, if any */ + if (xfer[0]) { + usbd_transfer_enqueue(xfer[0]); + } + } + + mtx_unlock(&(udev->bus->mtx)); + + if (xfer[0]) { + if (do_stall) { + xfer[1] = NULL; /* set endmark */ + usbd_do_callback(xfer, td); + } + } + return (0); +} + +/*------------------------------------------------------------------------* + * usbd_handle_stall + *------------------------------------------------------------------------*/ +static usbd_status_t +usbd_handle_set_stall(struct usbd_xfer *xfer, uint8_t ep, uint8_t do_stall) +{ + usbd_status_t err; + + mtx_unlock(xfer->priv_mtx); + err = usbd_handle_set_stall_sub(xfer->udev, ep, do_stall); + mtx_lock(xfer->priv_mtx); + return (err); +} + +/*------------------------------------------------------------------------* + * usbd_handle_get_stall + *------------------------------------------------------------------------*/ +static uint8_t +usbd_handle_get_stall(struct usbd_device *udev, uint8_t ea_val) +{ + struct usbd_pipe *pipe; + uint8_t halted; + + pipe = usbd_get_pipe_by_addr(udev, ea_val); + if (pipe == NULL) { + /* nothing to do */ + return (0); + } + mtx_lock(&(udev->bus->mtx)); + halted = pipe->is_stalled; + mtx_unlock(&(udev->bus->mtx)); + + return (halted); +} + +/*------------------------------------------------------------------------* + * usbd_handle_remote_wakeup + *------------------------------------------------------------------------*/ +static usbd_status_t +usbd_handle_remote_wakeup(struct usbd_xfer *xfer, uint8_t do_suspend) +{ + usbd_status_t err; + + mtx_unlock(xfer->priv_mtx); + err = usbd_suspend_resume(xfer->udev, do_suspend); + mtx_lock(xfer->priv_mtx); + return (err); +} + +/*------------------------------------------------------------------------* + * usbd_handle_request + *------------------------------------------------------------------------*/ +static usbd_status_t +usbd_handle_request(struct usbd_xfer *xfer) +{ + enum { + ST_DATA, + ST_CONTEXT_START, + ST_POST_STATUS, + }; + + /* + * State sequence: + * + * ST_DATA [ -> ST_CONTEXT_START ] -> ST_POST_STATUS + */ + usb_device_request_t req; + struct usbd_device *udev; + const void *ptr; + uint16_t off; /* data offset */ + uint16_t rem; /* data remainder */ + uint16_t max_len; /* max fragment length */ + uint16_t wValue; + uint16_t wIndex; + uint8_t state; + union { + uWord wStatus; + uint8_t buf[2]; + } temp; + + /* + * Filter the USB transfer state into + * something which we understand: + */ + + switch (USBD_GET_STATE(xfer)) { + case USBD_ST_SETUP: + if (!xfer->flags_int.control_act) { + /* nothing to do */ + return (0); + } + if (xfer->flags_int.context != USBD_CONTEXT_START) { + /* wrong context */ + goto tr_bad_context; + } + state = ST_CONTEXT_START; + break; + + default: /* USBD_ST_TRANSFERRED */ + if (!xfer->flags_int.control_act) { + state = ST_POST_STATUS; + } else { + state = ST_DATA; + } + break; + } + + /* reset frame stuff */ + + xfer->frlengths[0] = 0; + xfer->frlengths[1] = 0; + + usbd_set_frame_offset(xfer, 0, 0); + usbd_set_frame_offset(xfer, sizeof(req), 1); + + /* get the current request, if any */ + + usbd_copy_out(xfer->frbuffers + 0, 0, &req, sizeof(req)); + + /* get the remainder of the control transfer */ + + rem = (xfer->flags_int.control_rem == 0xFFFF) ? 0 : + xfer->flags_int.control_rem; + + /* compute the current offset */ + + off = UGETW(req.wLength) - rem; + + /* set some defaults */ + + max_len = 0; + ptr = &temp; + udev = xfer->udev; + + /* get some request fields decoded */ + + wValue = UGETW(req.wValue); + wIndex = UGETW(req.wIndex); + + /* demultiplex the control request */ + + switch (req.bmRequestType) { + case UT_READ_DEVICE: + if (state != ST_DATA) { + break; + } + switch (req.bRequest) { + case UR_GET_DESCRIPTOR: + goto tr_handle_get_descriptor; + case UR_GET_CONFIG: + goto tr_handle_get_config; + case UR_GET_STATUS: + goto tr_handle_get_status; + default: + goto tr_stalled; + } + break; + + case UT_WRITE_DEVICE: + switch (req.bRequest) { + case UR_SET_ADDRESS: + goto tr_handle_set_address; + case UR_SET_CONFIG: + goto tr_handle_set_config; + default: + goto tr_stalled; + } + break; + + case UT_WRITE_ENDPOINT: + switch (req.bRequest) { + case UR_CLEAR_FEATURE: + switch (UGETW(req.wValue)) { + case UF_ENDPOINT_HALT: + goto tr_handle_clear_halt; + case UF_DEVICE_REMOTE_WAKEUP: + goto tr_handle_clear_wakeup; + default: + goto tr_stalled; + } + break; + + case UR_SET_FEATURE: + switch (UGETW(req.wValue)) { + case UF_ENDPOINT_HALT: + goto tr_handle_set_halt; + case UF_DEVICE_REMOTE_WAKEUP: + goto tr_handle_set_wakeup; + default: + goto tr_stalled; + } + break; + default: + goto tr_stalled; + } + break; + + case UT_READ_ENDPOINT: + switch (req.bRequest) { + case UR_GET_STATUS: + goto tr_handle_get_ep_status; + default: + goto tr_stalled; + } + break; + + case UT_WRITE_INTERFACE: + switch (req.bRequest) { + case UR_SET_INTERFACE: + goto tr_handle_set_interface; + default: + goto tr_stalled; + } + break; + + case UT_READ_INTERFACE: + switch (req.bRequest) { + case UR_GET_INTERFACE: + goto tr_handle_get_interface; + default: + goto tr_stalled; + } + break; + + case UT_WRITE_CLASS_INTERFACE: + case UT_WRITE_VENDOR_INTERFACE: + /* XXX forward */ + break; + + case UT_READ_CLASS_INTERFACE: + case UT_READ_VENDOR_INTERFACE: + /* XXX forward */ + break; + default: + goto tr_stalled; + } + goto tr_valid; + +tr_handle_get_descriptor: + (udev->usb_temp_get_desc) ( + udev, xfer->priv_mtx, &req, &ptr, &max_len); + if (ptr == NULL) { + goto tr_stalled; + } + /* use zero copy */ + usbd_set_frame_data(xfer, USBD_ADD_BYTES(ptr, off), 1); + ptr = NULL; + /* adjust maximum length according to offset */ + max_len -= off; + goto tr_valid; + +tr_handle_get_config: + max_len = 1; + temp.buf[0] = udev->curr_config_no; + goto tr_valid; + +tr_handle_get_status: + max_len = sizeof(temp.wStatus); + /* XXX FIXME */ + USETW(temp.wStatus, UDS_SELF_POWERED); + goto tr_valid; + +tr_handle_set_address: + if (state == ST_DATA) { + if (wValue >= 0x80) { + /* invalid value */ + goto tr_stalled; + } else if (udev->curr_config_no != 0) { + /* we are configured ! */ + goto tr_stalled; + } + } else if (state == ST_POST_STATUS) { + udev->address = (wValue & 0x7F); + goto tr_bad_context; + } + goto tr_valid; + +tr_handle_set_config: + if (state == ST_DATA) { + goto tr_bad_context; + } else if (state == ST_CONTEXT_START) { + if (usbd_handle_set_config(xfer, wValue)) { + goto tr_stalled; + } + } + goto tr_valid; + +tr_handle_clear_halt: + if (state == ST_DATA) { + if (usbd_handle_set_stall(xfer, wIndex, 0)) { + goto tr_stalled; + } + } + goto tr_valid; + +tr_handle_clear_wakeup: + if (state == ST_DATA) { + goto tr_bad_context; + } else if (state == ST_CONTEXT_START) { + if (usbd_handle_remote_wakeup(xfer, 0)) { + goto tr_stalled; + } + } + goto tr_valid; + +tr_handle_set_halt: + if (state == ST_DATA) { + if (usbd_handle_set_stall(xfer, wIndex, 1)) { + goto tr_stalled; + } + } + goto tr_valid; + +tr_handle_set_wakeup: + if (state == ST_DATA) { + goto tr_bad_context; + } else if (state == ST_CONTEXT_START) { + if (usbd_handle_remote_wakeup(xfer, 1)) { + goto tr_stalled; + } + } + goto tr_valid; + +tr_handle_get_ep_status: + if (state == ST_DATA) { + max_len = sizeof(temp.wStatus); + temp.wStatus[0] = usbd_handle_get_stall(udev, req.wIndex[0]); + temp.wStatus[1] = 0; + } + goto tr_valid; + +tr_handle_set_interface: + if (state == ST_DATA) { + goto tr_bad_context; + } else if ((state == ST_CONTEXT_START) && + usbd_handle_set_alt_setting( + xfer, wValue, wIndex)) { + goto tr_stalled; + } + goto tr_valid; + +tr_handle_get_interface: + if (state == ST_DATA) { + if (usbd_handle_get_alt_setting(xfer, wIndex, temp.buf)) { + goto tr_stalled; + } + max_len = 1; + } + goto tr_valid; + +tr_valid: + + /* Compute the real maximum data length */ + + if (max_len > xfer->max_data_length) { + max_len = xfer->max_data_length; + } + if (max_len > rem) { + max_len = rem; + } + /* + * If the remainder is greater than the maximum data length, + * we need to truncate the value for the sake of the + * comparison below: + */ + if (rem > xfer->max_data_length) { + rem = xfer->max_data_length; + } + if (rem != max_len) { + /* + * If we don't transfer the data we can transfer, then + * the transfer is short ! + */ + xfer->flags.force_short_xfer = 1; + xfer->nframes = 2; + } else { + /* + * Default case + */ + xfer->flags.force_short_xfer = 0; + xfer->nframes = max_len ? 2 : 1; + } + if (max_len > 0) { + if (ptr) { + usbd_copy_in(xfer->frbuffers + 1, 0, ptr, max_len); + } + xfer->frlengths[1] = max_len; + } + return (0); /* success */ + +tr_stalled: + return (USBD_STALLED); + +tr_bad_context: + return (USBD_BAD_CONTEXT); } +static const struct usbd_config usbd_control_ep_cfg[1] = { + [0] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control endpoint */ + .direction = UE_DIR_ANY, + .bufsize = 1024, /* bytes */ + .flags = {.proxy_buffer = 1,.short_xfer_ok = 1,}, + .cb[USB_MODE_HOST] = &usbd_do_request_callback, + .cb[USB_MODE_DEVICE] = &usbd_handle_request_callback, + }, +}; + /*------------------------------------------------------------------------* * usbd_default_transfer_setup + * + * This function is used to setup the default USB control endpoint + * transfer. *------------------------------------------------------------------------*/ void usbd_default_transfer_setup(struct usbd_device *udev) { - struct usbd_config uc[1]; + struct usbd_xfer *xfer; + uint8_t no_resetup; - if ((udev->default_xfer[0] == NULL) || - (udev->default_xfer[0]->address != udev->address) || - (udev->default_ep_desc.wMaxPacketSize[0] != - udev->ddesc.bMaxPacketSize)) { +repeat: - udev->default_ep_desc.wMaxPacketSize[0] = - udev->ddesc.bMaxPacketSize; + xfer = udev->default_xfer[0]; + if (xfer) { + mtx_lock(xfer->priv_mtx); + no_resetup = + ((xfer->address == udev->address) && + (udev->default_ep_desc.wMaxPacketSize[0] == + udev->ddesc.bMaxPacketSize)); + if (udev->flags.usb_mode == USB_MODE_DEVICE) { + if (no_resetup) { + /* + * NOTE: checking "xfer->address" and + * starting the USB transfer must be + * atomic! + */ + usbd_transfer_start(xfer); + } + } + mtx_unlock(xfer->priv_mtx); + } else { + no_resetup = 0; + } - bzero(uc, sizeof(uc)); + if (no_resetup) { + /* + * All parameters are exactly the same like before. + * Just return. + */ + return; + } + /* + * Update wMaxPacketSize for the default control endpoint: + */ + udev->default_ep_desc.wMaxPacketSize[0] = + udev->ddesc.bMaxPacketSize; - uc[0].type = UE_CONTROL; - uc[0].endpoint = 0x00; /* Control pipe */ - uc[0].direction = UE_DIR_ANY; - uc[0].bufsize = 1024; /* bytes */ - uc[0].flags.proxy_buffer = 1; - uc[0].flags.short_xfer_ok = 1; - if (udev->usb_mode == USB_MODE_DEVICE) { - uc[0].flags.manual_status = 1; - } - uc[0].cb[USB_MODE_HOST] = &usbd_do_request_callback; - uc[0].cb[USB_MODE_DEVICE] = &usbd_serve_request_callback; + /* + * Unsetup any existing USB transfer: + */ + usbd_transfer_unsetup(udev->default_xfer, 1); - usbd_transfer_unsetup(udev->default_xfer, 1); - - if (usbd_transfer_setup - (udev, 0, udev->default_xfer, uc, 1, - NULL, udev->default_mtx)) { - PRINTFN(0, ("Could not setup default " - "USB transfer!\n")); - } + /* + * Try to setup a new USB transfer for the + * default control endpoint: + */ + if (usbd_transfer_setup + (udev, 0, udev->default_xfer, usbd_control_ep_cfg, 1, + NULL, udev->default_mtx)) { + PRINTFN(-1, ("could not setup default " + "USB transfer!\n")); + } else { + goto repeat; } return; } /*------------------------------------------------------------------------* * usbd_do_request_flags and usbd_do_request + * + * Returns: + * 0: Success + * Else: Failure *------------------------------------------------------------------------*/ usbd_status_t usbd_do_request_flags(struct usbd_device *udev, struct mtx *mtx, @@ -2409,11 +3136,18 @@ if (actlen) { *actlen = 0; } - if (udev->usb_mode == USB_MODE_DEVICE) { + if (udev->flags.usb_mode == USB_MODE_DEVICE) { PRINTFN(0, ("USB device mode\n")); - (udev->usb_temp_get_desc) (udev, mtx, req, &desc, &temp); - if (desc == NULL) { - return (USBD_INVAL); + if ((req->bmRequestType == UT_READ_DEVICE) && + (req->bRequest == UR_GET_DESCRIPTOR)) { + (udev->usb_temp_get_desc) ( + udev, mtx, req, &desc, &temp); + if (desc == NULL) { + return (USBD_INVAL); + } + } else { + /* the rest we don't care about */ + temp = 0; } if (length > temp) { if (!(flags & USBD_SHORT_XFER_OK)) { @@ -2424,7 +3158,9 @@ if (actlen) { *actlen = length; } - bcopy(desc, data, length); + if (length > 0) { + bcopy(desc, data, length); + } return (0); /* success */ } /* @@ -2666,15 +3402,15 @@ return (0); case USBD_ST_TRANSFERRED: -tr_transferred: - return (1); + break; default: /* Error */ if (xfer1->error == USBD_CANCELLED) { return (0); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Dec 12 21:12:40 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C755E16A41B; Wed, 12 Dec 2007 21:12:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6B62516A419 for ; Wed, 12 Dec 2007 21:12:40 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5B75F13C468 for ; Wed, 12 Dec 2007 21:12:40 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBCLCe1E063661 for ; Wed, 12 Dec 2007 21:12:40 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBCLCed5063658 for perforce@freebsd.org; Wed, 12 Dec 2007 21:12:40 GMT (envelope-from marcel@freebsd.org) Date: Wed, 12 Dec 2007 21:12:40 GMT Message-Id: <200712122112.lBCLCed5063658@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 130736 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 21:12:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=130736 Change 130736 by marcel@marcel_jnpr on 2007/12/12 21:11:44 Make this compile and run. Apparently the private per processor registers are not used/mapped by the PIC. Use the global per processor registers at the cost of dereferencing PCPU. Time to register an interrupt handler for the IPIs and see if the test IPI works... Affected files ... .. //depot/projects/powerpc/sys/powerpc/include/openpicreg.h#5 edit .. //depot/projects/powerpc/sys/powerpc/powerpc/mp_machdep.c#12 edit .. //depot/projects/powerpc/sys/powerpc/powerpc/openpic.c#5 edit Differences ... ==== //depot/projects/powerpc/sys/powerpc/include/openpicreg.h#5 (text+ko) ==== @@ -40,8 +40,8 @@ #define OPENPIC_IPI_DISPATCH(ipi) (0x40 + (ipi) * 0x10) /* current task priority reg */ -#define OPENPIC_PRIORITY 0x80 -#define OPENPIC_PRIORITY_MASK 0x0000000f +#define OPENPIC_TPR 0x80 +#define OPENPIC_TPR_MASK 0x0000000f #define OPENPIC_WHOAMI 0x90 @@ -126,8 +126,8 @@ #define OPENPIC_PCPU_IPI_DISPATCH(cpu, ipi) \ (OPENPIC_PCPU_BASE(cpu) + OPENPIC_IPI_DISPATCH(ipi)) -#define OPENPIC_PCPU_PRIORITY(cpu) \ - (OPENPIC_PCPU_BASE(cpu) + OPENPIC_PRIORITY) +#define OPENPIC_PCPU_TPR(cpu) \ + (OPENPIC_PCPU_BASE(cpu) + OPENPIC_TPR) #define OPENPIC_PCPU_IACK(cpu) \ (OPENPIC_PCPU_BASE(cpu) + OPENPIC_IACK) ==== //depot/projects/powerpc/sys/powerpc/powerpc/mp_machdep.c#12 (text+ko) ==== @@ -30,6 +30,7 @@ #include #include #include +#include #include #include ==== //depot/projects/powerpc/sys/powerpc/powerpc/openpic.c#5 (text+ko) ==== @@ -68,12 +68,14 @@ static __inline void openpic_set_priority(struct openpic_softc *sc, int pri) { + u_int tpr; uint32_t x; - x = openpic_read(sc, OPENPIC_PRIORITY); - x &= ~OPENPIC_PRIORITY_MASK; + tpr = OPENPIC_PCPU_TPR(PCPU_GET(cpuid)); + x = openpic_read(sc, tpr); + x &= ~OPENPIC_TPR_MASK; x |= pri; - openpic_write(sc, OPENPIC_PRIORITY, x); + openpic_write(sc, tpr, x); } int @@ -161,8 +163,8 @@ /* clear all pending interrupts */ for (irq = 0; irq < sc->sc_nirq; irq++) { - (void)openpic_read(sc, OPENPIC_IACK); - openpic_write(sc, OPENPIC_EOI, 0); + (void)openpic_read(sc, OPENPIC_PCPU_IACK(PCPU_GET(cpuid))); + openpic_write(sc, OPENPIC_PCPU_EOI(PCPU_GET(cpuid)), 0); } powerpc_register_pic(dev); @@ -182,7 +184,7 @@ sc = device_get_softc(dev); while (1) { - vector = openpic_read(sc, OPENPIC_IACK); + vector = openpic_read(sc, OPENPIC_PCPU_IACK(PCPU_GET(cpuid))); vector &= OPENPIC_VECTOR_MASK; if (vector == 255) break; @@ -209,7 +211,7 @@ struct openpic_softc *sc; sc = device_get_softc(dev); - openpic_write(sc, OPENPIC_EOI, 0); + openpic_write(sc, OPENPIC_PCPU_EOI(PCPU_GET(cpuid)), 0); } void @@ -231,7 +233,7 @@ x = openpic_read(sc, OPENPIC_SRC_VECTOR(irq)); x |= OPENPIC_IMASK; openpic_write(sc, OPENPIC_SRC_VECTOR(irq), x); - openpic_write(sc, OPENPIC_EOI, 0); + openpic_write(sc, OPENPIC_PCPU_EOI(PCPU_GET(cpuid)), 0); } void From owner-p4-projects@FreeBSD.ORG Wed Dec 12 21:40:09 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B92B16A419; Wed, 12 Dec 2007 21:40:09 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1C52416A417 for ; Wed, 12 Dec 2007 21:40:09 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 185B013C45B for ; Wed, 12 Dec 2007 21:40:09 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBCLe8hI067020 for ; Wed, 12 Dec 2007 21:40:08 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBCLe8xu067017 for perforce@freebsd.org; Wed, 12 Dec 2007 21:40:08 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 12 Dec 2007 21:40:08 GMT Message-Id: <200712122140.lBCLe8xu067017@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 130737 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 21:40:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=130737 Change 130737 by hselasky@hselasky_laptop001 on 2007/12/12 21:39:39 This commit is USB device side related. o This commit introduces a new port status bit, "UPS_PORT_MODE_DEVICE", which tells the mode of the HUB Port: Device or Host Mode. According the USB2.0 specification this bit should always read 0 which translates to USB_MODE_HOST. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb.h#24 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb.h#24 (text+ko) ==== @@ -56,6 +56,7 @@ #define USB_MAX_DEVICES 128 #define USB_START_ADDR 0 +#define USB_ROOT_HUB_ADDR 1 #define USB_ISOC_TIME_MAX 128 /* ms */ #define USB_FS_ISOC_UFRAME_MAX 4 /* exclusive unit */ @@ -68,6 +69,7 @@ #define USB_CONTROL_ENDPOINT 0 #define USB_MAX_ENDPOINTS (2*16) +#define USB_MAX_INTERFACES USB_MAX_ENDPOINTS #define USB_FRAMES_PER_SECOND_FS 1000 /* full speed */ #define USB_FRAMES_PER_SECOND_HS 8000 /* high speed */ @@ -395,6 +397,7 @@ #define UPS_SUSPEND 0x0004 #define UPS_OVERCURRENT_INDICATOR 0x0008 #define UPS_RESET 0x0010 +#define UPS_PORT_MODE_DEVICE 0x0020 /* currently FreeBSD specific */ #define UPS_PORT_POWER 0x0100 #define UPS_LOW_SPEED 0x0200 #define UPS_HIGH_SPEED 0x0400 @@ -550,6 +553,7 @@ #define USB_UNCONFIG_NO 0 #define USB_UNCONFIG_INDEX 0xFF +#define USB_IFACE_INDEX_ANY 0xFF /*------------------------------------------------------------------------* * ioctl() related stuff From owner-p4-projects@FreeBSD.ORG Wed Dec 12 21:41:10 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A3D8016A468; Wed, 12 Dec 2007 21:41:10 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6991216A418 for ; Wed, 12 Dec 2007 21:41:10 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 64F1313C442 for ; Wed, 12 Dec 2007 21:41:10 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBCLfAhT067360 for ; Wed, 12 Dec 2007 21:41:10 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBCLfAw0067357 for perforce@freebsd.org; Wed, 12 Dec 2007 21:41:10 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 12 Dec 2007 21:41:10 GMT Message-Id: <200712122141.lBCLfAw0067357@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 130738 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 21:41:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=130738 Change 130738 by hselasky@hselasky_laptop001 on 2007/12/12 21:40:31 Style change by "usb_style.sh". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb.h#25 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb.h#25 (text+ko) ==== @@ -397,7 +397,7 @@ #define UPS_SUSPEND 0x0004 #define UPS_OVERCURRENT_INDICATOR 0x0008 #define UPS_RESET 0x0010 -#define UPS_PORT_MODE_DEVICE 0x0020 /* currently FreeBSD specific */ +#define UPS_PORT_MODE_DEVICE 0x0020 /* currently FreeBSD specific */ #define UPS_PORT_POWER 0x0100 #define UPS_LOW_SPEED 0x0200 #define UPS_HIGH_SPEED 0x0400 From owner-p4-projects@FreeBSD.ORG Wed Dec 12 21:45:16 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D505616A41A; Wed, 12 Dec 2007 21:45:15 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4EAA016A418 for ; Wed, 12 Dec 2007 21:45:15 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4B0D113C457 for ; Wed, 12 Dec 2007 21:45:15 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBCLjFZR068374 for ; Wed, 12 Dec 2007 21:45:15 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBCLjErF068371 for perforce@freebsd.org; Wed, 12 Dec 2007 21:45:14 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 12 Dec 2007 21:45:14 GMT Message-Id: <200712122145.lBCLjErF068371@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 130739 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 21:45:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=130739 Change 130739 by hselasky@hselasky_laptop001 on 2007/12/12 21:44:36 Scan address zero aswell. The kernel will check if the address is valid or not. Affected files ... .. //depot/projects/usb/src/usr.sbin/usbdevs/usbdevs.c#2 edit Differences ... ==== //depot/projects/usb/src/usr.sbin/usbdevs/usbdevs.c#2 (text+ko) ==== @@ -146,10 +146,7 @@ printf("%*s", indent, ""); if (verbose) printf("port %d ", p+1); - if (s == 0) - printf("addr 0 should never happen!\n"); - else - usbdev(f, s, 1); + usbdev(f, s, 1); indent--; } } @@ -159,7 +156,7 @@ { int a; - for (a = 1; a < USB_MAX_DEVICES; a++) { + for (a = 0; a < USB_MAX_DEVICES; a++) { if (!done[a]) usbdev(f, a, 1); } From owner-p4-projects@FreeBSD.ORG Wed Dec 12 22:13:49 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE3A816A420; Wed, 12 Dec 2007 22:13:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5B7DE16A417 for ; Wed, 12 Dec 2007 22:13:49 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1379813C44B for ; Wed, 12 Dec 2007 22:13:47 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBCMDkH3073775 for ; Wed, 12 Dec 2007 22:13:46 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBCMDkVh073772 for perforce@freebsd.org; Wed, 12 Dec 2007 22:13:46 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Dec 2007 22:13:46 GMT Message-Id: <200712122213.lBCMDkVh073772@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130740 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 22:13:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=130740 Change 130740 by jb@jb_freebsd1 on 2007/12/12 22:13:35 Another day, another IFC. Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#52 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/Makefile#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/nanobsd/Makefile#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/nanobsd/article.sgml#1 branch .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/translators.ent#4 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/basics/chapter.sgml#12 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/install/chapter.sgml#17 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/mirrors/chapter.sgml#12 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/x11/chapter.sgml#13 integrate .. //depot/projects/dtrace/ports/LEGAL#26 integrate .. //depot/projects/dtrace/ports/MOVED#54 integrate .. //depot/projects/dtrace/src/include/nsswitch.h#5 integrate .. //depot/projects/dtrace/src/lib/Makefile#18 integrate .. //depot/projects/dtrace/src/lib/libc/gen/getgrent.c#7 integrate .. //depot/projects/dtrace/src/lib/libc/gen/getgrouplist.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/locale/localeconv.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/net/nsdispatch.c#6 integrate .. //depot/projects/dtrace/src/lib/libc/string/strtok.3#4 integrate .. //depot/projects/dtrace/src/lib/libc/string/strtok.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/string/wcstok.c#4 integrate .. //depot/projects/dtrace/src/share/man/man5/src.conf.5#12 integrate .. //depot/projects/dtrace/src/share/mk/bsd.own.mk#18 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/machdep.c#23 integrate .. //depot/projects/dtrace/src/sys/conf/files#57 integrate .. //depot/projects/dtrace/src/sys/dev/amr/amr.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/amr/amr_cam.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/amr/amr_pci.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/amr/amrvar.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pci/ich.c#9 integrate .. //depot/projects/dtrace/src/sys/i386/i386/machdep.c#22 integrate .. //depot/projects/dtrace/src/sys/net/route.c#10 integrate .. //depot/projects/dtrace/src/sys/net/route.h#4 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_l2tp.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet/if_ether.c#13 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_ofld.c#1 branch .. //depot/projects/dtrace/src/sys/netinet/tcp_ofld.h#1 branch .. //depot/projects/dtrace/src/sys/netinet/tcp_syncache.c#15 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_syncache.h#2 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_var.h#7 integrate .. //depot/projects/dtrace/src/sys/netinet/toedev.h#1 branch .. //depot/projects/dtrace/src/sys/sys/socket.h#8 integrate .. //depot/projects/dtrace/src/tools/build/options/WITHOUT_BZIP2#2 integrate .. //depot/projects/dtrace/src/tools/build/options/WITHOUT_GNU#3 integrate .. //depot/projects/dtrace/src/tools/build/options/WITHOUT_GSSAPI#1 branch .. //depot/projects/dtrace/src/tools/build/options/WITHOUT_KERBEROS#4 integrate .. //depot/projects/dtrace/src/tools/build/options/WITHOUT_KVM#2 integrate .. //depot/projects/dtrace/src/tools/build/options/WITHOUT_PAM#3 integrate .. //depot/projects/dtrace/src/tools/build/options/WITHOUT_TOOLCHAIN#4 integrate .. //depot/projects/dtrace/src/tools/build/options/WITH_GSSAPI#2 delete .. //depot/projects/dtrace/src/tools/build/options/makeman#9 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#52 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -42,6 +42,8 @@ blackend@FreeBSD.org"> cykl@mAdchAt.org"> +loic@vigilan.net"> @@ -80,4 +82,6 @@ "Version française de &a.fr.fonvieille;."> Version française de &a.fr.mathieu;."> +Version française de &a.fr.tignon;."> ==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/basics/chapter.sgml#12 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD Simplified Chinese Project - Original Revision: 1.149 - $FreeBSD: doc/zh_CN.GB2312/books/handbook/basics/chapter.sgml,v 1.15 2007/10/23 02:08:21 loader Exp $ + Original Revision: 1.150 + $FreeBSD: doc/zh_CN.GB2312/books/handbook/basics/chapter.sgml,v 1.16 2007/12/12 05:30:50 loader Exp $ --> @@ -264,6 +264,35 @@ ¾¡¹ÜÈÔÈ»ÄܽøÈëµ¥Óû§Ä£Ê½£¬ µ«Èç¹ûÄú²»ÊìϤËü¾Í»á·Ç³£ÁîÈËÍ·ÌÛ¡£ + + + ¸Ä±ä¿ØÖÆ̨µÄÏÔʾģʽ + + FreeBSD ¿ØÖÆ̨ĬÈϵÄÏÔʾģʽ¿ÉÒÔ±»µ÷ÕûΪ 1024x768£¬ 1280x1024£¬ + »òÕßÈκÎÄãµÄÏÔ¿¨Ð¾Æ¬ºÍÏÔʾÆ÷ËùÖ§³ÖµÄÆäËû³ß´ç¡£ + ҪʹÓÃÒ»¸ö²»Í¬µÄÏÔʾģʽ£¬ + Äã±ØÐëÊ×ÏÈÖØбàÒëÄں˲¢°üº¬ÒÔÏÂ2¸öÑ¡Ï + + OPTIONS VESA +OPTIONS SC_PIXEL_MODE + + ÔÚÄÚºËÓÃÕâ2¸öÑ¡Ïî±àÒëÍê³Éºó£¬Äã¾Í¿ÉÒÔʹÓà &man.vidcontrol.1; + ¹¤¾ßÀ´²â¶¨ÄãµÄÓ²¼þÖ§³ÖºÎÖÖÏÔʾģʽÁË¡£ ÒÔ root + Éí·ÝÔÚ¿ØÖÆ̨¼üÈëÒÔÏÂÃüÁîÀ´»ñµÃÒ»·ÝËùÖ§³ÖµÄÏÔʾģʽÁÐ±í¡£ + + &prompt.root; vidcontrol -i mode + + Õâ¸öÃüÁîµÄÊä³öÊÇÒ»·ÝÄãµÄÓ²¼þËùÖ§³ÖµÄÏÔʾģʽÁÐ±í¡£ + Äã¿ÉÒÔÔÚÒÔ root Éí·ÝÔÚ¿ØÖÆ̨ÉϼüÈëÒÔÏÂÃüÁîÀ´¸Ä±äÏÔʾģʽ£º + + &prompt.root; vidcontrol MODE_279 + + Èç¹ûÄã¶ÔÓÚеÄÏÔʾģʽÂúÒ⣬ÄÇô¿ÉÒÔ°ÑËü¼ÓÈëµ½ + /etc/rc.conf ʹ»úÆ÷ÔÚÿ´ÎÆô¶¯µÄʱºò¶¼ÄÜÉúЧ£¬ + ÎÒÃÇʹÓÃÁËÉÏÒ»¸öÀý×ÓÖеÄģʽ£º + + allscreens_flags="MODE_279" + ==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/install/chapter.sgml#17 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD Simplified Chinese Project - Original Revision: 1.384 - $FreeBSD: doc/zh_CN.GB2312/books/handbook/install/chapter.sgml,v 1.25 2007/11/20 14:10:29 loader Exp $ + Original Revision: 1.385 + $FreeBSD: doc/zh_CN.GB2312/books/handbook/install/chapter.sgml,v 1.26 2007/12/12 05:30:51 loader Exp $ --> @@ -191,11 +191,11 @@ µÄÓ²¼þÖÖÀàʵÔÚÌ«¹ý¸´ÔÓ£¬Õâ¸ö²½Öè²»Ò»¶¨×ÜÊÇÄܳɹ¦¡£ Õâʱ£¬Äú¾Í¿ÉÄÜÐèÒªÊÖ¶¯¸ü¸ÄÓÐÎÊÌâµÄÉ豸µÄÉ趨ֵ¡£ - Èç¹ûÄúÒѾ­°²×°ÁËÆäËüµÄ²Ù×÷ϵͳ£¬Èç &windows; »ò Linux£¬ÄÇôÄú¿ÉÒÔÏÈÓÉ - ÕâЩϵͳËùÌṩµÄ¹¤¾ßÀ´²é¿´ÄúµÄÉ豸É趨ֵÊÇÔõô·ÖÅäµÄ¡£Èç¹ûÄúÕæµÄû°ì·¨ - È·¶¨Ä³Ð©½Ó¿Ú¿¨ÓÃʲôÉ趨ֵ£¬ÄÇôÄú¿ÉÒÔ¼ì²é¿´¿´£¬Ëµ²»¶¨ËüµÄÉ趨ÒѾ­±êʾ - ÔÚ¿¨ÉÏ¡£³£ÓÃµÄ IRQ ºÅºÅÂëΪ 3¡¢5 ÒÔ¼° 7£»IO ¶Ë¿ÚµÄֵͨ³£ÒÔ 16 ½øÖÆλ±íʾ£¬ÀýÈç - Ox330¡£ + Èç¹ûÄúÒѾ­°²×°ÁËÆäËüµÄ²Ù×÷ϵͳ£¬Èç &windows; »ò Linux£¬ + ÄÇôÄú¿ÉÒÔÏÈÓÉÕâЩϵͳËùÌṩµÄ¹¤¾ßÀ´²é¿´ÄúµÄÉ豸É趨ֵÊÇÔõô·ÖÅäµÄ¡£ + Èç¹ûÄúÕæµÄû°ì·¨È·¶¨Ä³Ð©½Ó¿Ú¿¨ÓÃʲôÉ趨ֵ£¬ÄÇôÄú¿ÉÒÔ¼ì²é¿´¿´£¬ + ˵²»¶¨ËüµÄÉ趨ÒѾ­±êʾÔÚ¿¨ÉÏ¡£³£ÓÃµÄ IRQ ºÅÂëΪ 3¡¢5 ÒÔ¼° 7£» + IO ¶Ë¿ÚµÄֵͨ³£ÒÔ 16 ½øÖÆλ±íʾ£¬ÀýÈç Ox330¡£ ÎÒÃǽ¨ÒéÄúÔÚ°²×° FreeBSD ֮ǰ°ÑÕâЩÐÅÏ¢´òÓ¡»ò¼Ç¼ÏÂÀ´£¬×ö³É±í¸ñ µÄÑù×ÓÒ²Ðí»á±È½ÏÓаïÖú£¬ÀýÈ磺 @@ -333,12 +333,13 @@ FreeBSD ±ØÐë°²×°ÔÚÖ÷·ÖÇø¡£ FreeBSD ¿ÉÒÔÔÚÕâ¸ö·ÖÇøÉÏÃæ´æ·ÅϵͳÊý¾Ý »òÊÇÄú½¨Á¢µÄÈκÎÎļþ¡£È»¶ø£¬Èç¹ûÄúÓжà¸öÓ²ÅÌ£¬ÄúÒ²¿ÉÒÔÔÚÕâЩӲÅÌÉÏ(È«²¿ »ò²¿·Ö)½¨Á¢ FreeBSD ·ÖÇø¡£ÔÚÄú°²×° FreeBSD µÄʱºò£¬±ØÐëÒªÓÐÒ»¸ö·ÖÇø¿ÉÒÔ¸ø - FreeBSD ʹÓá£Õâ¸ö·ÖÇø¿ÉÒÔÊÇÉÐδ¹æ»®µÄ·ÖÇø»òÊÇÒѾ­»®ºÃ£¬µ«ÊÇÀïÃæµÄÊý¾Ý - Äú¶¼²»Ïë±£´æµÄ·ÖÇø¡£ + FreeBSD ʹÓá£Õâ¸ö·ÖÇø¿ÉÒÔÊÇÉÐδ¹æ»®µÄ·ÖÇø£¬ + »òÊÇÒѾ­´æÔÚÇÒ´æÓÐÊý¾Ýµ«Äú²»ÔÙÐèÒªµÄ·ÖÇø¡£ - Èç¹ûÄúÒѾ­ÓÃÍêÁËÄúÓ²ÅÌÉϵÄËùÓзÖÇø£¬ÄÇôÄú±ØÐëʹÓÃÆäËü²Ù×÷ϵͳËù - ÌṩµÄ¹¤¾ß(Èç DOS »ò &windows; Ï嵀 fdisk)À´ÌÚ³öÒ»¸ö·ÖÇø - ¸ø FreeBSD ʹÓᣠ+ Èç¹ûÄúÒѾ­ÓÃÍêÁËÄúÓ²ÅÌÉϵÄËùÓзÖÇø£¬ + ÄÇôÄú±ØÐëʹÓÃÆäËü²Ù×÷ϵͳËùÌṩµÄ¹¤¾ß + (Èç DOS »ò &windows; Ï嵀 fdisk) + À´ÌÚ³öÒ»¸ö·ÖÇø¸ø FreeBSD ʹÓᣠÈç¹ûÄúµÄij¸ö·ÖÇøÓжàÓàµÄ¿Õ¼ä£¬Äú¿ÉÒÔʹÓÃËü¡£µ«ÊÇʹÓÃÇ°ÄúÐèÒªÏÈÕûÀí Ò»ÏÂÕâЩ·ÖÇø¡£ @@ -355,7 +356,7 @@ PResizer£¬ËüÃǵÄÎĵµ¿ÉÒÔÔÚͬһĿ¼ÖÐÕÒµ½¡£FIPS¡¢ PResizer£¬ºÍ &partitionmagic; Äܹ»¸Ä±ä FAT16 ÒÔ¼° FAT32 ·ÖÇøµÄ´óС — - ËüÃÇ¿ÉÒÔÔÚ &ms-dos; ÒÔ¼° &windows; ME ϵͳÖÐʹÓᣠÕâЩ¹¤¾ßµÄ˵Ã÷Îļþ¿ÉÒÔÔÚͬһ¸öĿ¼ÏÂÃæÕÒµ½ + ËüÃÇ¿ÉÒÔÔÚ &ms-dos; ÒÔ¼° &windows; ME ϵͳÖÐʹÓᣠÕâЩ¹¤¾ßµÄ˵Ã÷Îļþ¿ÉÒÔÔÚͬһ¸öĿ¼ÏÂÃæÕÒµ½¡£ &partitionmagic; ºÍ GParted ¶¼Äܸıä NTFS ·ÖÇøµÄ³ß´ç¡£ GParted ÔÚÐí¶à Live CD Linux ·¢Ðа棬 Èç @@ -363,7 +364,7 @@ Ä¿Ç°ÒѾ­Óб¨¸æÏÔʾ¸Ä±ä µsoft; Vista ·ÖÇø³ß´çʱ»á³öÏÖÎÊÌâ¡£ ÔÚ½øÐдËÀà²Ù×÷ʱ£¬ ½¨ÒéÄú×¼±¸Ò»ÕÅ Vista °²×° CDROM¡£ - ´ËÍ⣬ ÓëÆäËû´ÅÅÌά»¤²Ù×÷ÀàÎÒÎÒ£¬ Ç¿ÁÒ½¨ÒéÄúÊÂÏȽøÐб¸·Ý¡£ + ÈçͬÆäËûµÄ´ÅÅÌά»¤²Ù×÷Ò»Ñù£¬ Ç¿ÁÒ½¨ÒéÄúÊÂÏȽøÐб¸·Ý¡£ ²»µ±µÄʹÓÃÕâЩ¹¤¾ß¿ÉÄÜ»áɾµôÄúÓ²ÅÌÉϵÄÊý¾Ý×ÊÁÏ£¡ÔÚʹÓÃÕâЩ¹¤¾ßÇ° @@ -399,8 +400,8 @@ - ʹÓÃÉÏÃæÌá¼°µÄ &partitionmagic; À´ÕûÀí - »òÇиîÄúµÄ·ÖÇø¡£ + ʹÓÃÉÏÃæÌá¼°µÄ &partitionmagic; + À´ÕûÀí»òÇиîÄúµÄ·ÖÇø¡£ @@ -412,9 +413,10 @@ Alpha - ÔÚ Alpha ÉÏ£¬Äú±ØÐëʹÓÃÒ»Õû¿ÅÓ²Å̸ø FreeBSD£¬Ã»Óа취ÔÚͬһ¸öÓ²ÅÌÉϸú - ÆäËü²Ù×÷ϵͳ¹²´æ¡£¸ù¾Ý²»Í¬µÄ Alpha »úÆ÷£¬ÄúµÄÓ²ÅÌ¿ÉÒÔÊÇ SCSI »ò IDE Ó²ÅÌ£¬Ö»Òª - ÄúµÄ»úÆ÷¿ÉÒÔ´ÓÕâЩӲÅÌ¿ª»ú¾Í¿ÉÒÔ¡£ + ÔÚ Alpha ÉÏ£¬Äú±ØÐëʹÓÃÒ»Õû¿ÅÓ²Å̸ø FreeBSD£¬ + ûÓа취ÔÚͬһ¸öÓ²ÅÌÉϸúÆäËü²Ù×÷ϵͳ¹²´æ¡£ + ¸ù¾Ý²»Í¬µÄ Alpha »úÆ÷£¬ÄúµÄÓ²ÅÌ¿ÉÒÔÊÇ SCSI »ò IDE Ó²ÅÌ£¬ + Ö»ÒªÄúµÄ»úÆ÷¿ÉÒÔ´ÓÕâЩӲÅÌ¿ª»ú¾Í¿ÉÒÔ¡£ °´ÕÕ Digital/Compaq ʹÓÃÊÖ²áÊéдµÄ¹ßÀý£¬ËùÓÐ SRM ÊäÈëµÄ²¿·Ö¶¼Óôóд ±íʾ¡£×¢Ò⣬SRM ´óСдÓб𡣠@@ -629,11 +631,13 @@ ×¼±¸ÈíÅÌ - Äú±ØÐëΪÄúÏÂÔصÄÿһ¸öÓ³ÏñÎļþ×¼±¸Ò»ÕÅÈíÅÌ¡£²¢ÇÒÇë±ÜÃâʹÓõ½»µµôµÄ - ÈíÅÌ¡£×î¼òµ¥µÄ·½Ê½¾ÍÊÇÄúÏȽ«ÕâЩÈíÅ̸ñʽ»¯£¬²»ÒªÏàÐÅËùνµÄÒѸñʽ»¯µÄÈí - ÅÌ¡£ÔÚ &windows; ϵĸñʽ»¯³ÌÐò²»»á¸æËßÄú³öÏÖ¶àÉÙ»µ¿é£¬ËüÖ»ÊǼòµ¥µÄ±ê¼ÇËü - ÃÇΪ bad ²¢ÇÒºöÂÔËüÃÇ¡£¸ù¾Ý½¨ÒéÄúÓ¦¸ÃʹÓÃȫеÄÈíÅÌÀ´´æ·Å - °²×°³ÌÐò¡£ + Äú±ØÐëΪÄúÏÂÔصÄÿһ¸öÓ³ÏñÎļþ×¼±¸Ò»ÕÅÈíÅÌ¡£ + ²¢ÇÒÇë±ÜÃâʹÓõ½»µµôµÄÈíÅÌ¡£ + ×î¼òµ¥µÄ·½Ê½¾ÍÊÇÄúÏȽ«ÕâЩÈíÅ̸ñʽ»¯£¬ + ²»ÒªÏàÐÅËùνµÄÒѸñʽ»¯µÄÈíÅÌ¡£ÔÚ &windows; + ϵĸñʽ»¯³ÌÐò²»»á¸æËßÄú³öÏÖ¶àÉÙ»µ¿é£¬ + ËüÖ»ÊǼòµ¥µÄ±ê¼ÇËüÃÇΪ bad ²¢ÇÒºöÂÔËüÃÇ¡£ + ¸ù¾Ý½¨ÒéÄúÓ¦¸ÃʹÓÃȫеÄÈíÅÌÀ´´æ·Å°²×°³ÌÐò¡£ Èç¹ûÄúÔÚ°²×° FreeBSD µÄ¹ý³ÌÖÐÔì³Éµ±»ú¡¢¶³½á»òÊÇÆäËü¹ÖÒìÏÖÏ󣬵ÚÒ»¸ö @@ -3560,8 +3564,22 @@ System Tools ²Ëµ¥µÄ Compression Agent À´Íê³É¡£ - &os;¿ÉÒÔÖ§³Ö»ùÓÚ &ms-dos; µÄÎļþϵͳ (FAT16 ºÍ FAT32)¡£ - ÕâÒªÇóÄúʹÓôø²ÎÊýµÄ &man.mount.8; ÃüÁî¡£ ×ʹÓõÄÊÇ£º + &os; ¿ÉÒÔÖ§³Ö»ùÓÚ &ms-dos; µÄÎļþϵͳ £¨ÓÐʱ±»³ÆΪ FAT + Îļþϵͳ£©¡£ &man.mount.msdosfs.8; + ÃüÁîÄܹ»°ÑÕâÑùµÄÎļþϵͳ¹Ò½Óµ½ÏÖÓеÄĿ¼½á¹¹ÖУ¬ + ²¢ÔÊÐí·ÃÎÊ FAT ÎļþϵͳÉϵÄÄÚÈÝ¡£ ͨ³£ÎÒÃDz¢²»Ö±½ÓʹÓà + &man.mount.msdosfs.8;£¬ËüÒ»°ã»áÔÚ /etc/fstab + ÖеÄijһÐб»µ÷ÓûòÕß±» &man.mount.8; ¹¤¾ß²¢ÅäºÏÊʵ±µÄ²ÎÊýÀ´µ÷Óᣠ+ + /etc/fstabÖÐÒ»¸öµäÐ͵ÄÀý×Ó£º + + /dev/ad0sN /dos msdosfs rw 0 0 + + /dos Ŀ¼±ØÐëÊÂÏÈ´æÔÚ¡£ + ¸ü¶à¹ØÓÚ /etc/fstab µÄϸ½Ú£¬ + Çë²ÎÔÄ &man.fstab.5;¡£ + + Ò»¸öʹÓà &man.mount.8; ¹ÒÔØ &ms-dos; ÎļþϵͳµÄÀý×Ó£º &prompt.root; mount -t msdosfs /dev/ad0s1 /mnt @@ -3569,11 +3587,11 @@ ²é¿´ÃüÁî dmesgºÍ mount µÄÊä³ö¡£ËüÃÇÓ¦¸Ã ¿ÉÒÔÈÃÄúµÃµ½×ã¹»µÄ·ÖÇøÐÅÏ¢¡£ - &ms-dos; µÄÀ©Õ¹·ÖÇø»á±»Ó³ÉäÔÚ &os;·ÖÇøµÄĩβ¡£»»¾ä»°Ëµ£¬·ÖÇøºÅÒª´óÓÚ - &os; ÕýÔÚʹÓõķÖÇøºÅ¡£ÀýÈ磬µÚÒ»¸ö &ms-dos; ·ÖÇø¿ÉÄÜλÓÚ - /dev/ad0s1£¬&os; ·ÖÇø¿ÉÄÜλÓÚ - /dev/ad0s2£¬¸ú×ÅÊÇ &ms-dos; µÄÀ©Õ¹·ÖÇøλÓÚ - /dev/ad0s3¡£Õâ¿ÉÄÜ»áʹÄú¸Ð¾õÃÔã¡£ + &os; ¿ÉÄÜʹÓúÍÆäËû²Ù×÷ϵͳ²»Í¬¼ÆÊý·½·¨À´±ê¼Ç´ÅÅÌ slices£¬ + ÌرðÐèÒªÖ¸³öµÄÊÇ£¬ &ms-dos; + µÄÀ©Õ¹·ÖÇøͨ³£»á±È &ms-dos; Ö÷·ÖÇø±»±ê¼ÇΪ¸ü¸ßµÄÊýÖµ¡£ + ¿ÉÒÔʹÓà &man.fdisk.8; ¹¤¾ßÀ´°ïÖú²â¶¨ÄÄЩ slices ÊôÓÚ &os; + ÄÄЩÊÇÊôÓÚÆäËûµÄ²Ù×÷ϵͳ¡£ NTFS ·ÖÇøÒ²¿ÉÒÔͨ¹ýÀàËÆ &man.mount.ntfs.8; ÃüÁî¹Ò½ÓÔÚFreeBSDÉÏ¡£ ==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/mirrors/chapter.sgml#12 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD Chinese Documentation Project - Original Revision: 1.441 - $FreeBSD: doc/zh_CN.GB2312/books/handbook/mirrors/chapter.sgml,v 1.18 2007/11/20 14:10:30 loader Exp $ + Original Revision: 1.442 + $FreeBSD: doc/zh_CN.GB2312/books/handbook/mirrors/chapter.sgml,v 1.19 2007/12/12 05:30:51 loader Exp $ --> @@ -1190,8 +1190,10 @@ doc/el_* doc/es_* doc/fr_* +doc/hu_* doc/it_* doc/ja_* +doc/mn_* doc/nl_* doc/no_* doc/pl_* ==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/x11/chapter.sgml#13 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Simplified Chinese Project Original Revision: 1.184 - $FreeBSD: doc/zh_CN.GB2312/books/handbook/x11/chapter.sgml,v 1.20 2007/08/09 15:40:40 loader Exp $ + $FreeBSD: doc/zh_CN.GB2312/books/handbook/x11/chapter.sgml,v 1.21 2007/12/12 05:30:51 loader Exp $ --> @@ -459,7 +459,7 @@ Xorg.8.log µÈµÈ¡£ - Èç¹ûÒ»ÇÐ×¼±¸Í£µ±£¬ ¾Í¿ÉÒÔ°ÑÅäÖÃÎļþ·Åµ½¹«¹²µÄĿ¼ÖÐÁË¡£ + Èç¹ûÒ»ÇÐ×¼±¸Í×µ±£¬ ¾Í¿ÉÒÔ°ÑÅäÖÃÎļþ·Åµ½¹«¹²µÄĿ¼ÖÐÁË¡£ Äú¿ÉÒÔÔÚ &man.Xorg.1; ÀïÃæÕÒµ½¾ßÌåλÖᣠÕâ¸öλÖÃͨ³£ÊÇ /etc/X11/xorg.conf »ò /usr/local/etc/X11/xorg.conf¡£ ==== //depot/projects/dtrace/ports/LEGAL#26 (text+ko) ==== @@ -1,5 +1,5 @@ # Creator: Jordan Hubbard -# $FreeBSD: ports/LEGAL,v 1.557 2007/10/26 21:07:02 jkim Exp $ +# $FreeBSD: ports/LEGAL,v 1.558 2007/12/12 11:34:22 garga Exp $ ********************************************************************** *** NOTE TO COMMITTERS *** @@ -477,8 +477,6 @@ distribution coming with the TV card qkmj95p5-freebsd games/qkmj Do not sell for profit -qmail* mail/qmail-* Restricted binary distribution - of modified versions qtools-* mail/qtools Possibly restricted binary distribution of modified versions ==== //depot/projects/dtrace/ports/MOVED#54 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1517 2007/12/11 21:47:57 lioux Exp $ +# $FreeBSD: ports/MOVED,v 1.1519 2007/12/12 17:42:10 linimon Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -3335,3 +3335,10 @@ x11-themes/kde-icons-gorilla_svg||2007-12-11|Unfetchable x11-themes/kde-icons-kids||2007-12-11|Unfetchable x11-themes/kde-icons-outline||2007-12-11|Unfetchable +java/jdk11|java/jdk16|2007-12-11|Obsolete version| +java/jdk12|java/jdk16|2007-12-11|Obsolete version| +java/jfc||2007-12-11|For obsolete version of jdk| +java/jre||2007-12-11|For obsolete version of jdk| +java/linux-blackdown-jdk12|java/linux-blackdown-jdk14|2007-12-11|Obsolete version| +java/linux-sun-jdk12|java/linux-sun-jdk16|2007-12-11|Obsolete version| +x11-wm/ion-3||2007-12-12|Removed by insistence of software author| ==== //depot/projects/dtrace/src/include/nsswitch.h#5 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: nsswitch.h,v 1.6 1999/01/26 01:04:07 lukem Exp $ */ -/* $FreeBSD: src/include/nsswitch.h,v 1.4 2006/04/28 12:03:34 ume Exp $ */ +/* $FreeBSD: src/include/nsswitch.h,v 1.5 2007/12/12 10:08:02 bushman Exp $ */ /*- * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc. @@ -68,7 +68,8 @@ #define NSSRC_DNS "dns" /* DNS; IN for hosts, HS for others */ #define NSSRC_NIS "nis" /* YP/NIS */ #define NSSRC_COMPAT "compat" /* passwd,group in YP compat mode */ -#define NSSRC_CACHE "cache" /* cache daemon */ +#define NSSRC_CACHE "cache" /* nscd daemon */ +#define NSSRC_FALLBACK "__fallback" /* internal fallback source */ /* * currently implemented databases @@ -132,6 +133,7 @@ */ #define NS_FILES_CB(F,C) { NSSRC_FILES, F, C }, #define NS_COMPAT_CB(F,C) { NSSRC_COMPAT, F, C }, +#define NS_FALLBACK_CB(F) { NSSRC_FALLBACK, F, NULL }, #ifdef HESIOD # define NS_DNS_CB(F,C) { NSSRC_DNS, F, C }, ==== //depot/projects/dtrace/src/lib/Makefile#18 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.227 2007/12/10 19:09:24 dougb Exp $ +# $FreeBSD: src/lib/Makefile,v 1.228 2007/12/12 16:39:31 ru Exp $ .include @@ -62,12 +62,8 @@ _libsdp= libsdp .endif -.if ${MK_KERBEROS} != "no" +.if ${MK_GSSAPI} != "no" _libgssapi= libgssapi -.else -.if ${MK_GSSAPI} == "yes" -_libgssapi= libgssapi -.endif .endif .if ${MK_IPX} != "no" ==== //depot/projects/dtrace/src/lib/libc/gen/getgrent.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ * */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.36 2006/09/18 09:34:48 maxim Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.37 2007/12/12 10:08:02 bushman Exp $"); #include "namespace.h" #include @@ -40,6 +40,7 @@ #include #include #endif +#include #include #include #ifdef HESIOD @@ -143,6 +144,9 @@ static int compat_setgrent(void *, void *, va_list); static int compat_group(void *, void *, va_list); +static int gr_addgid(gid_t, gid_t *, int, int *); +static int getgroupmembership_fallback(void *, void *, va_list); + #ifdef NS_CACHING static int grp_id_func(char *, size_t *, va_list, void *); static int grp_marshal_func(char *, size_t *, void *, va_list, void *); @@ -361,89 +365,195 @@ NSS_MP_CACHE_HANDLING(group); #endif /* NS_CACHING */ - -/* XXX IEEE Std 1003.1, 2003 specifies `void setgrent(void)' */ -int -setgrent(void) -{ #ifdef NS_CACHING - static const nss_cache_info cache_info = NS_MP_CACHE_INFO_INITIALIZER( - group, (void *)nss_lt_all, - NULL, NULL); +static const nss_cache_info setgrent_cache_info = NS_MP_CACHE_INFO_INITIALIZER( + group, (void *)nss_lt_all, + NULL, NULL); #endif - static const ns_dtab dtab[] = { - { NSSRC_FILES, files_setgrent, (void *)SETGRENT }, +static const ns_dtab setgrent_dtab[] = { + { NSSRC_FILES, files_setgrent, (void *)SETGRENT }, #ifdef HESIOD - { NSSRC_DNS, dns_setgrent, (void *)SETGRENT }, + { NSSRC_DNS, dns_setgrent, (void *)SETGRENT }, #endif #ifdef YP - { NSSRC_NIS, nis_setgrent, (void *)SETGRENT }, + { NSSRC_NIS, nis_setgrent, (void *)SETGRENT }, #endif - { NSSRC_COMPAT, compat_setgrent, (void *)SETGRENT }, + { NSSRC_COMPAT, compat_setgrent, (void *)SETGRENT }, #ifdef NS_CACHING - NS_CACHE_CB(&cache_info) + NS_CACHE_CB(&setgrent_cache_info) #endif - { NULL, NULL, NULL } - }; - (void)_nsdispatch(NULL, dtab, NSDB_GROUP, "setgrent", defaultsrc, 0); - return (1); -} - + { NULL, NULL, NULL } +}; -int -setgroupent(int stayopen) -{ #ifdef NS_CACHING - static const nss_cache_info cache_info = NS_MP_CACHE_INFO_INITIALIZER( - group, (void *)nss_lt_all, - NULL, NULL); +static const nss_cache_info endgrent_cache_info = NS_MP_CACHE_INFO_INITIALIZER( + group, (void *)nss_lt_all, + NULL, NULL); #endif - static const ns_dtab dtab[] = { - { NSSRC_FILES, files_setgrent, (void *)SETGRENT }, +static const ns_dtab endgrent_dtab[] = { + { NSSRC_FILES, files_setgrent, (void *)ENDGRENT }, #ifdef HESIOD - { NSSRC_DNS, dns_setgrent, (void *)SETGRENT }, + { NSSRC_DNS, dns_setgrent, (void *)ENDGRENT }, #endif #ifdef YP - { NSSRC_NIS, nis_setgrent, (void *)SETGRENT }, + { NSSRC_NIS, nis_setgrent, (void *)ENDGRENT }, #endif - { NSSRC_COMPAT, compat_setgrent, (void *)SETGRENT }, + { NSSRC_COMPAT, compat_setgrent, (void *)ENDGRENT }, #ifdef NS_CACHING - NS_CACHE_CB(&cache_info) + NS_CACHE_CB(&endgrent_cache_info) #endif - { NULL, NULL, NULL } - }; - (void)_nsdispatch(NULL, dtab, NSDB_GROUP, "setgrent", defaultsrc, - stayopen); - return (1); -} - + { NULL, NULL, NULL } +}; -void -endgrent(void) -{ #ifdef NS_CACHING - static const nss_cache_info cache_info = NS_MP_CACHE_INFO_INITIALIZER( - group, (void *)nss_lt_all, - NULL, NULL); +static const nss_cache_info getgrent_r_cache_info = NS_MP_CACHE_INFO_INITIALIZER( + group, (void *)nss_lt_all, + grp_marshal_func, grp_unmarshal_func); #endif - static const ns_dtab dtab[] = { - { NSSRC_FILES, files_setgrent, (void *)ENDGRENT }, +static const ns_dtab getgrent_r_dtab[] = { + { NSSRC_FILES, files_group, (void *)nss_lt_all }, #ifdef HESIOD - { NSSRC_DNS, dns_setgrent, (void *)ENDGRENT }, + { NSSRC_DNS, dns_group, (void *)nss_lt_all }, #endif #ifdef YP - { NSSRC_NIS, nis_setgrent, (void *)ENDGRENT }, + { NSSRC_NIS, nis_group, (void *)nss_lt_all }, #endif - { NSSRC_COMPAT, compat_setgrent, (void *)ENDGRENT }, + { NSSRC_COMPAT, compat_group, (void *)nss_lt_all }, #ifdef NS_CACHING - NS_CACHE_CB(&cache_info) + NS_CACHE_CB(&getgrent_r_cache_info) #endif - { NULL, NULL, NULL } + { NULL, NULL, NULL } +}; + +static int +gr_addgid(gid_t gid, gid_t *groups, int maxgrp, int *grpcnt) +{ + int ret, dupc; + + for (dupc = 0; dupc < MIN(maxgrp, *grpcnt); dupc++) { + if (groups[dupc] == gid) + return 1; + } + + ret = 1; + if (*grpcnt < maxgrp) + groups[*grpcnt] = gid; + else + ret = 0; + + (*grpcnt)++; + + return ret; +} + +static int +getgroupmembership_fallback(void *retval, void *mdata, va_list ap) +{ + const ns_src src[] = { + { mdata, NS_SUCCESS }, + { NULL, 0} }; - (void)_nsdispatch(NULL, dtab, NSDB_GROUP, "endgrent", defaultsrc); + struct group grp; + struct group *grp_p; + char *buf; + size_t bufsize; + const char *uname; + gid_t *groups; + gid_t agroup; + int maxgrp, *grpcnt; + int i, rv, ret_errno; + + /* + * As this is a fallback method, only provided src + * list will be respected during methods search. + */ + assert(src[0].name != NULL); + + uname = va_arg(ap, const char *); + agroup = va_arg(ap, gid_t); + groups = va_arg(ap, gid_t *); + maxgrp = va_arg(ap, int); + grpcnt = va_arg(ap, int *); + + rv = NS_UNAVAIL; + + buf = malloc(GRP_STORAGE_INITIAL); + if (buf == NULL) + goto out; + + bufsize = GRP_STORAGE_INITIAL; + + gr_addgid(agroup, groups, maxgrp, grpcnt); + + _nsdispatch(NULL, setgrent_dtab, NSDB_GROUP, "setgrent", src, 0); + for (;;) { + do { + ret_errno = 0; + grp_p = NULL; + rv = _nsdispatch(&grp_p, getgrent_r_dtab, NSDB_GROUP, + "getgrent_r", src, &grp, buf, bufsize, &ret_errno); + + if (grp_p == NULL && ret_errno == ERANGE) { + free(buf); + if ((bufsize << 1) > GRP_STORAGE_MAX) { + buf = NULL; + errno = ERANGE; + goto out; + } + + bufsize <<= 1; + buf = malloc(bufsize); + if (buf == NULL) { + goto out; + } + } + } while (grp_p == NULL && ret_errno == ERANGE); + + if (ret_errno != 0) { + errno = ret_errno; + goto out; + } + + if (grp_p == NULL) + break; + + for (i = 0; grp.gr_mem[i]; i++) { + if (strcmp(grp.gr_mem[i], uname) == 0) + gr_addgid(grp.gr_gid, groups, maxgrp, grpcnt); + } + } + + _nsdispatch(NULL, endgrent_dtab, NSDB_GROUP, "endgrent", src); +out: + free(buf); + return (rv); +} + +/* XXX IEEE Std 1003.1, 2003 specifies `void setgrent(void)' */ +int +setgrent(void) +{ + (void)_nsdispatch(NULL, setgrent_dtab, NSDB_GROUP, "setgrent", defaultsrc, 0); + return (1); +} + + +int +setgroupent(int stayopen) +{ + (void)_nsdispatch(NULL, setgrent_dtab, NSDB_GROUP, "setgrent", defaultsrc, + stayopen); + return (1); +} + + +void +endgrent(void) +{ + (void)_nsdispatch(NULL, endgrent_dtab, NSDB_GROUP, "endgrent", defaultsrc); } @@ -451,31 +561,11 @@ getgrent_r(struct group *grp, char *buffer, size_t bufsize, struct group **result) { -#ifdef NS_CACHING - static const nss_cache_info cache_info = NS_MP_CACHE_INFO_INITIALIZER( - group, (void *)nss_lt_all, - grp_marshal_func, grp_unmarshal_func); -#endif - - static const ns_dtab dtab[] = { - { NSSRC_FILES, files_group, (void *)nss_lt_all }, -#ifdef HESIOD - { NSSRC_DNS, dns_group, (void *)nss_lt_all }, -#endif -#ifdef YP - { NSSRC_NIS, nis_group, (void *)nss_lt_all }, -#endif - { NSSRC_COMPAT, compat_group, (void *)nss_lt_all }, -#ifdef NS_CACHING - NS_CACHE_CB(&cache_info) -#endif - { NULL, NULL, NULL } - }; int rv, ret_errno; ret_errno = 0; *result = NULL; - rv = _nsdispatch(result, dtab, NSDB_GROUP, "getgrent_r", defaultsrc, + rv = _nsdispatch(result, getgrent_r_dtab, NSDB_GROUP, "getgrent_r", defaultsrc, grp, buffer, bufsize, &ret_errno); if (rv == NS_SUCCESS) return (0); @@ -560,6 +650,30 @@ } + +int +__getgroupmembership(const char *uname, gid_t agroup, gid_t *groups, + int maxgrp, int *grpcnt) +{ + static const ns_dtab dtab[] = { + NS_FALLBACK_CB(getgroupmembership_fallback) + { NULL, NULL, NULL } + }; + int rv; + + assert(uname != NULL); + /* groups may be NULL if just sizing when invoked with maxgrp = 0 */ + assert(grpcnt != NULL); + + *grpcnt = 0; + rv = _nsdispatch(NULL, dtab, NSDB_GROUP, "getgroupmembership", + defaultsrc, uname, agroup, groups, maxgrp, grpcnt); + + /* too many groups found? */ + return (*grpcnt > maxgrp ? -1 : 0); +} + + static struct group grp; static char *grp_storage; static size_t grp_storage_size; @@ -1436,3 +1550,5 @@ return (NS_RETURN); } } + + ==== //depot/projects/dtrace/src/lib/libc/gen/getgrouplist.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ static char sccsid[] = "@(#)getgrouplist.c 8.2 (Berkeley) 12/8/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getgrouplist.c,v 1.15 2007/01/09 00:27:53 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getgrouplist.c,v 1.16 2007/12/12 10:08:02 bushman Exp $"); /* * get credential @@ -42,46 +42,11 @@ #include #include +extern int __getgroupmembership(const char *, gid_t, gid_t *, int, int *); + int getgrouplist(const char *uname, gid_t agroup, gid_t *groups, int *grpcnt) { - const struct group *grp; - int i, maxgroups, ngroups, ret; + return __getgroupmembership(uname, agroup, groups, *grpcnt, grpcnt); +} - ret = 0; - ngroups = 0; - maxgroups = *grpcnt; - /* - * When installing primary group, duplicate it; - * the first element of groups is the effective gid - * and will be overwritten when a setgid file is executed. - */ - groups[ngroups++] = agroup; - if (maxgroups > 1) - groups[ngroups++] = agroup; - /* - * Scan the group file to find additional groups. - */ - setgrent(); - while ((grp = getgrent()) != NULL) { - for (i = 0; i < ngroups; i++) { - if (grp->gr_gid == groups[i]) - goto skip; - } - for (i = 0; grp->gr_mem[i]; i++) { - if (!strcmp(grp->gr_mem[i], uname)) { - if (ngroups >= maxgroups) { - ret = -1; - break; - } - groups[ngroups++] = grp->gr_gid; - break; - } - } -skip: - ; - } - endgrent(); - *grpcnt = ngroups; - return (ret); -} ==== //depot/projects/dtrace/src/lib/libc/locale/localeconv.c#4 (text+ko) ==== @@ -11,10 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -36,7 +32,7 @@ static char sccsid[] = "@(#)localeconv.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/localeconv.c,v 1.13 2003/06/26 10:46:16 phantom Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/localeconv.c,v 1.14 2007/12/12 07:43:23 phantom Exp $"); #include ==== //depot/projects/dtrace/src/lib/libc/net/nsdispatch.c#6 (text+ko) ==== @@ -68,7 +68,7 @@ * */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/nsdispatch.c,v 1.14 2007/05/17 03:33:23 jon Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/nsdispatch.c,v 1.15 2007/12/12 10:08:03 bushman Exp $"); #include "namespace.h" #include @@ -136,6 +136,15 @@ #endif /* + * When this is set to 1, nsdispatch won't use nsswitch.conf + * but will consult the 'defaults' source list only. + * NOTE: nested fallbacks (when nsdispatch calls fallback functions, + * which in turn calls nsdispatch, which should call fallback + * function) are not supported + */ +static int fallback_dispatch = 0; + +/* * Attempt to spew relatively uniform messages to syslog. */ #define nss_log(level, fmt, ...) \ @@ -600,7 +609,7 @@ va_list ap; const ns_dbt *dbt; const ns_src *srclist; - nss_method method; + nss_method method, fb_method; void *mdata; int isthreaded, serrno, i, result, srclistsize; @@ -609,6 +618,9 @@ nss_cache_data *cache_data_p; int cache_flag; #endif + + dbt = NULL; + fb_method = NULL; isthreaded = __isthreaded; serrno = errno; @@ -624,8 +636,13 @@ result = NS_UNAVAIL; goto fin; } - dbt = vector_search(&database, _nsmap, _nsmapsize, sizeof(*_nsmap), - string_compare); + if (fallback_dispatch == 0) { + dbt = vector_search(&database, _nsmap, _nsmapsize, sizeof(*_nsmap), + string_compare); + fb_method = nss_method_lookup(NSSRC_FALLBACK, database, + method_name, disp_tab, &mdata); + } + if (dbt != NULL) { srclist = dbt->srclist; srclistsize = dbt->srclistsize; @@ -684,6 +701,12 @@ if (result & (srclist[i].flags)) break; + } else if (fb_method != NULL) { + fallback_dispatch = 1; + va_start(ap, defaults); + result = fb_method(retval, (void *)srclist[i].name, ap); + va_end(ap); + fallback_dispatch = 0; } } ==== //depot/projects/dtrace/src/lib/libc/string/strtok.3#4 (text+ko) ==== @@ -22,12 +22,6 @@ .\" disclaimer in the documentation and/or other materials provided .\" with the distribution. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Dec 12 22:14:48 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8DA9E16A420; Wed, 12 Dec 2007 22:14:48 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5142016A418 for ; Wed, 12 Dec 2007 22:14:48 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4D5E013C457 for ; Wed, 12 Dec 2007 22:14:48 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBCMEmGw073814 for ; Wed, 12 Dec 2007 22:14:48 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBCMEmFx073811 for perforce@freebsd.org; Wed, 12 Dec 2007 22:14:48 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 12 Dec 2007 22:14:48 GMT Message-Id: <200712122214.lBCMEmFx073811@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 130741 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 22:14:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=130741 Change 130741 by hselasky@hselasky_laptop001 on 2007/12/12 22:14:19 This commit is related to USB device side support. FYI: The comments below follow the diff. o In general: The code does the same like before only that some functions have been refactored. o Bug corrected: "usb_linux_free_usb_device" must be called every time you change the configuration. o Simplified "usbd_fill_deviceinfo" a little bit. o "usbd_reset_probed": In USB Device Mode it is always the peer that sets the configuration, and not the device itself. Setting "udev->probed" to "USBD_PROBED_IFACE_AND_FOUND" ensures that we never change the configuration value. o We now ignore any set-address errors due to buggy USB devices and rather try to see if reading the first descriptor fails at the new address. o Removed some comments that are no longer true. o New helper functions "usbd_bus_port_get_device" and "usbd_bus_port_set_device". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#69 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#69 (text+ko) ==== @@ -744,8 +744,8 @@ error: /* passed end, or bad desc */ - printf("%s: bad descriptor(s), addr=%d!\n", - __FUNCTION__, udev->address); + PRINTFN(-1, ("%s: bad descriptor(s), addr=%d!\n", + __FUNCTION__, udev->address)); /* free old pipes if any */ usbd_free_pipe_data(udev, iface_index, 0 - 1); @@ -760,21 +760,28 @@ /* mtx_assert() */ + /* free Linux compat device, if any */ + if (udev->linux_dev) { + usb_linux_free_usb_device(udev->linux_dev); + udev->linux_dev = NULL; + } /* free all pipes, if any */ usbd_free_pipe_data(udev, 0, 0); /* free all interfaces, if any */ while (iface != iface_end) { iface->idesc = NULL; + iface->alt_index = 0; iface++; } - if (udev->cdesc != NULL) { - /* free "cdesc" after "ifaces" */ + /* free "cdesc" after "ifaces", if any */ + if (udev->cdesc) { free(udev->cdesc, M_USB); + udev->cdesc = NULL; } - udev->cdesc = NULL; - udev->config = USB_UNCONFIG_NO; + /* set unconfigured state */ + udev->curr_config_no = USB_UNCONFIG_NO; return; } @@ -823,6 +830,9 @@ return (USBD_INVAL); } +/*------------------------------------------------------------------------* + * usbd_set_config_index + *------------------------------------------------------------------------*/ usbd_status_t usbd_set_config_index(struct usbd_device *udev, uint8_t index, uint8_t msg) { @@ -942,8 +952,8 @@ goto error; } udev->power = power; - udev->self_powered = selfpowered; - udev->config = cdp->bConfigurationValue; + udev->flags.self_powered = selfpowered; + udev->curr_config_no = cdp->bConfigurationValue; /* Set the actual configuration value. */ err = usbreq_set_config(udev, &usb_global_lock, @@ -994,10 +1004,14 @@ int usbd_fill_deviceinfo(struct usbd_device *udev, struct usb_device_info *di) { + enum { + MAX_PORT = (sizeof(di->udi_ports) / sizeof(di->udi_ports[0])), + }; struct usbd_port *p; - uint16_t s; + struct usbd_interface *iface; + struct usbd_device *child; uint8_t i; - uint8_t err; + uint8_t max; if ((udev == NULL) || (di == NULL)) { return (ENXIO); @@ -1020,111 +1034,241 @@ di->udi_class = udev->ddesc.bDeviceClass; di->udi_subclass = udev->ddesc.bDeviceSubClass; di->udi_protocol = udev->ddesc.bDeviceProtocol; - di->udi_config = udev->config; - di->udi_power = udev->self_powered ? 0 : udev->power; + di->udi_config = udev->curr_config_no; + di->udi_power = udev->flags.self_powered ? 0 : udev->power; di->udi_speed = udev->speed; - for (i = 0; - (i < (sizeof(udev->subdevs) / sizeof(udev->subdevs[0]))) && - (i < USB_MAX_DEVNAMES); - i++) { - if (udev->subdevs[i] && - device_is_attached(udev->subdevs[i])) { + for (i = 0; i != MIN(USB_MAX_DEVNAMES, USB_MAX_INTERFACES); i++) { + iface = usbd_get_iface(udev, i); + if (iface && iface->subdev && + device_is_attached(iface->subdev)) { strlcpy(di->udi_devnames[i], - device_get_nameunit(udev->subdevs[i]), + device_get_nameunit(iface->subdev), USB_MAX_DEVNAMELEN); } } if (udev->hub) { - for (i = 0; - (i < (sizeof(di->udi_ports) / sizeof(di->udi_ports[0]))) && - (i < udev->hub->hubdesc.bNbrPorts); - i++) { - p = &udev->hub->ports[i]; + + max = udev->hub->nports; + if (max > MAX_PORT) { + max = MAX_PORT; + } + di->udi_nports = max; + + p = udev->hub->ports; + for (i = 0; i != max; i++, p++) { + + child = usbd_bus_port_get_device(udev->bus, p); - if (p->device_addr != USB_START_ADDR) { - err = p->device_addr; + if (child) { + di->udi_ports[i] = p->device_index; } else { - s = UGETW(p->status.wPortStatus); - if (s & UPS_PORT_ENABLED) { - err = USB_PORT_ENABLED; - } else if (s & UPS_SUSPEND) { - err = USB_PORT_SUSPENDED; - } else if (s & UPS_PORT_POWER) { - err = USB_PORT_POWERED; - } else { - err = USB_PORT_DISABLED; - } + di->udi_ports[i] = USB_PORT_POWERED; } - di->udi_ports[i] = err; } - di->udi_nports = udev->hub->hubdesc.bNbrPorts; } mtx_unlock(&usb_global_lock); return (0); } -/* The following function will remove detached - * devices from the interface list. This can - * happen during USB device module unload. - */ +static void +usbd_reset_probed(struct usbd_device *udev) +{ + udev->probed = (udev->flags.usb_mode == USB_MODE_HOST) ? + USBD_PROBED_NOTHING : USBD_PROBED_IFACE_AND_FOUND; + return; +} + static void -usbd_remove_detached_devices(struct usbd_device *udev) +usbd_detach_device_sub(struct usbd_device *udev, device_t *ppdev, + uint8_t free_subdev) { - device_t *subdev = udev->subdevs; - device_t *subdev_end = udev->subdevs_end; - uint8_t detached_first = 0; + device_t dev; + int err; + + if (!free_subdev) { + + *ppdev = NULL; + + } else if (*ppdev) { + + /* + * NOTE: It is important to clear "*ppdev" before deleting + * the child due to some device methods being called late + * during the delete process ! + */ + dev = *ppdev; + *ppdev = NULL; - PRINTFN(3, ("udev=%p\n", udev)); + device_printf(dev, "at %s, port %d, addr %d " + "(disconnected)\n", + device_get_nameunit(udev->parent_dev), + udev->port_no, udev->address); - while (subdev != subdev_end) { - if (subdev[0]) { - if (device_is_attached(subdev[0]) == 0) { - if (device_delete_child(device_get_parent(subdev[0]), - subdev[0]) == 0) { - subdev[0] = NULL; - if (subdev == udev->subdevs) { - detached_first = 1; - } - } else { - /* - * Panic here, else one can get a - * double call to device_detach(). - * USB devices should never fail on - * detach! - */ - panic("device_delete_child() failed!\n"); + if (device_is_attached(dev)) { + if (udev->flags.suspended) { + err = DEVICE_RESUME(dev); + if (err) { + device_printf(dev, "Resume failed!\n"); } } + if (device_detach(dev)) { + goto error; + } + } + if (device_delete_child(udev->parent_dev, dev)) { + goto error; + } + } + return; + +error: + /* Detach is not allowed to fail in the USB world */ + panic("An USB driver would not detach!\n"); + return; +} + +/*------------------------------------------------------------------------* + * usbd_detach_device + * + * The following function will detach the matching interfaces. + * This function is NULL safe. + *------------------------------------------------------------------------*/ +void +usbd_detach_device(struct usbd_device *udev, uint8_t iface_index, + uint8_t free_subdev) +{ + struct usbd_interface *iface; + uint8_t i; + + if (udev == NULL) { + /* nothing to do */ + return; + } + PRINTFN(3, ("udev=%p\n", udev)); + + /* + * First detach the child to give the child's detach routine a + * chance to detach the sub-devices in the correct order. + * Then delete the child using "device_delete_child()" which + * will detach all sub-devices from the bottom and upwards! + */ + if (iface_index != USB_IFACE_INDEX_ANY) { + i = iface_index; + iface_index = i + 1; + } else { + usbd_detach_device_sub(udev, &(udev->global_dev), free_subdev); + i = 0; + iface_index = USB_MAX_INTERFACES; + } + + /* do the detach */ + + for (; i != iface_index; i++) { + + iface = usbd_get_iface(udev, i); + if (iface == NULL) { + /* looks like the end of the USB interfaces */ + break; } - subdev++; + usbd_detach_device_sub(udev, &(iface->subdev), free_subdev); + } + + if (iface_index == USB_IFACE_INDEX_ANY) { + /* + * All devices are gone. Reset the "probed" variable. + */ + usbd_reset_probed(udev); } + return; +} - if (detached_first) { - if ((udev->probed == USBD_PROBED_SPECIFIC_AND_FOUND) || - (udev->probed == USBD_PROBED_GENERIC_AND_FOUND)) { +/*------------------------------------------------------------------------* + * usbd_probe_and_attach_sub + * + * Returns: + * 0: Success + * Else: Failure + *------------------------------------------------------------------------*/ +static uint8_t +usbd_probe_and_attach_sub(struct usbd_device *udev, + struct usb_attach_arg *uaa, device_t *ppdev) +{ + device_t dev; + int err; + + dev = *ppdev; + + if (dev) { + + /* clean up after module unload */ + + if (device_is_attached(dev)) { + /* already a device there */ + return (0); + } + /* XXX clear "*ppdev" as early as possible */ + + *ppdev = NULL; + + if (device_delete_child(udev->parent_dev, dev)) { + /* - * The first and only device is gone. Reset the - * "probed" variable. + * Panic here, else one can get a double call + * to device_detach(). USB devices should + * never fail on detach! */ - udev->probed = USBD_PROBED_NOTHING; + panic("device_delete_child() failed!\n"); + } + } + if (uaa->temp_dev == NULL) { + + /* create a new child */ + uaa->temp_dev = device_add_child(udev->parent_dev, NULL, -1); + if (uaa->temp_dev == NULL) { + device_printf(udev->parent_dev, + "Device creation failed!\n"); + return (1); /* failure */ + } + device_set_ivars(uaa->temp_dev, uaa); + device_quiet(uaa->temp_dev); + } + if (device_probe_and_attach(uaa->temp_dev) == 0) { + /* + * The USB attach arguments are only available during probe + * and attach ! + */ + *ppdev = uaa->temp_dev; + uaa->temp_dev = NULL; + device_set_ivars(*ppdev, NULL); + + if (udev->flags.suspended) { + err = DEVICE_SUSPEND(*ppdev); + device_printf(*ppdev, "Suspend failed\n"); } + return (0); /* success */ } - return; + return (1); /* failure */ } /*------------------------------------------------------------------------* * usbd_probe_and_attach * - * This function is called from "uhub_explore_sub()" + * This function is called from "uhub_explore_sub()" and + * "usbd_serve_request_callback_sub()" + * + * Returns: + * 0: Success + * Else: A control transfer failed *------------------------------------------------------------------------*/ usbd_status_t -usbd_probe_and_attach(device_t parent, struct usbd_device *udev) +usbd_probe_and_attach(struct usbd_device *udev, uint8_t iface_index) { struct usb_attach_arg uaa; - device_t bdev = NULL; - usbd_status_t err = 0; + struct usbd_interface *iface; + usbd_status_t err; + uint8_t nconfig; uint8_t config; uint8_t i; @@ -1132,143 +1276,123 @@ PRINTF(("udev == NULL\n")); return (USBD_INVAL); } - usbd_remove_detached_devices(udev); + if (udev->flags.usb_mode == USB_MODE_DEVICE) { + if (udev->curr_config_no == USB_UNCONFIG_NO) { + /* do nothing - no configuration has been set */ + return (0); + } + } + if (udev->probed == USBD_PROBED_SPECIFIC_AND_FOUND) { + if ((udev->global_dev == NULL) || + (!device_is_attached(udev->global_dev))) { + /* reset */ + udev->probed = USBD_PROBED_NOTHING; + } + } + err = 0; + config = 0; bzero(&uaa, sizeof(uaa)); /* probe and attach */ uaa.device = udev; + uaa.usb_mode = udev->flags.usb_mode; uaa.port = udev->port_no; uaa.configno = -1; uaa.vendor = UGETW(udev->ddesc.idVendor); uaa.product = UGETW(udev->ddesc.idProduct); uaa.release = UGETW(udev->ddesc.bcdDevice); - if ((udev->probed == USBD_PROBED_SPECIFIC_AND_FOUND) || - (udev->probed == USBD_PROBED_GENERIC_AND_FOUND)) { - /* nothing more to probe */ - goto done; - } - bdev = device_add_child(parent, NULL, -1); - if (!bdev) { - device_printf(udev->bus->bdev, - "Device creation failed\n"); - err = USBD_INVAL; - goto done; - } - device_set_ivars(bdev, &uaa); - device_quiet(bdev); - + /* first try device specific drivers */ if (udev->probed == USBD_PROBED_NOTHING) { - /* first try device specific drivers */ PRINTF(("trying device specific drivers\n")); - if (device_probe_and_attach(bdev) == 0) { - device_set_ivars(bdev, NULL); /* no longer accessible */ - udev->subdevs[0] = bdev; + if (!usbd_probe_and_attach_sub( + udev, &uaa, &(udev->global_dev))) { udev->probed = USBD_PROBED_SPECIFIC_AND_FOUND; - bdev = 0; goto done; } PRINTF(("no device specific driver found; " "looping over %d configurations\n", udev->ddesc.bNumConfigurations)); } - /* next try interface drivers */ + /* next try the USB interface drivers */ + + nconfig = udev->ddesc.bNumConfigurations; + + for (config = 0; config != nconfig; config++) { - if ((udev->probed == USBD_PROBED_NOTHING) || - (udev->probed == USBD_PROBED_IFACE_AND_FOUND)) { - for (config = 0; config < udev->ddesc.bNumConfigurations; config++) { - struct usbd_interface *iface; + /* + * Only set the config index the first time the + * devices are probed ! + */ + if (udev->probed == USBD_PROBED_NOTHING) { - /* - * only set config index the first time the devices - * are probed - */ - if (udev->probed == USBD_PROBED_NOTHING) { - err = usbd_set_config_index(udev, config, 1); - if (err) { - device_printf(parent, - "port %d, set config at addr %d " - "failed, error=%s\n", - udev->port_no, udev->address, - usbd_errstr(err)); - goto done; - } - /* - * ``bNumInterface'' is checked by - * ``usbd_set_config_index()'' - * - * ``USBD_CLR_IFACE_NO_PROBE()'' is run by - * ``usbd_fill_iface_data()'', which is - * called by ``usbd_set_config_index()'' - */ + err = usbd_set_config_index(udev, config, 1); + if (err) { + goto done; } - /* - * else the configuration is already set - */ + } + /* + * else the configuration is already set + */ + + if ((udev->probed == USBD_PROBED_NOTHING) || + (udev->probed == USBD_PROBED_IFACE_AND_FOUND)) { uaa.configno = udev->cdesc->bConfigurationValue; - uaa.ifaces_start = udev->ifaces; - uaa.ifaces_end = udev->ifaces + udev->cdesc->bNumInterface; + + /* check if only one interface should be probed */ + + if (iface_index != USB_IFACE_INDEX_ANY) { + i = iface_index; + iface_index = i + 1; + } else { + i = 0; + iface_index = USB_MAX_INTERFACES; + } - for (iface = uaa.ifaces_start; - iface != uaa.ifaces_end; - iface++) { - uaa.iface = iface; - uaa.iface_index = (i = (iface - udev->ifaces)); + /* do the probe and attach */ - if (uaa.iface_index >= (sizeof(udev->subdevs) / - sizeof(udev->subdevs[0]))) { - device_printf(udev->bus->bdev, - "Too many subdevices\n"); - break; - } - if ((USBD_GET_IFACE_NO_PROBE(udev, i) == 0) && - (udev->subdevs[i] == NULL) && - (device_probe_and_attach(bdev) == 0)) { - /* "ivars" are no longer accessible: */ - device_set_ivars(bdev, NULL); - udev->subdevs[i] = bdev; - udev->probed = USBD_PROBED_IFACE_AND_FOUND; - bdev = 0; + for (; i != iface_index; i++) { + iface = usbd_get_iface(udev, i); + if (iface == NULL) { /* - * create another child for the next - * iface [if any] + * Looks like the end of the USB + * interfaces ! */ - bdev = device_add_child(parent, NULL, -1); - if (!bdev) { - device_printf(udev->bus->bdev, - "Device creation failed\n"); + PRINTFN(1, ("end of interfaces " + "at %u\n", i)); + break; + } + if (USBD_GET_IFACE_NO_PROBE(udev, i)) { + /* somebody grabbed the interface */ + PRINTFN(1, ("no probe %d\n", i)); + continue; + } + uaa.iface_index = i; + uaa.iface = iface; - /* - * need to update - * "IFACE_NO_PROBE": - */ - break; - } - device_set_ivars(bdev, &uaa); - device_quiet(bdev); + if (!usbd_probe_and_attach_sub( + udev, &uaa, &(iface->subdev))) { + udev->probed = USBD_PROBED_IFACE_AND_FOUND; } } - - if (udev->probed == USBD_PROBED_IFACE_AND_FOUND) { - break; - } + } + if (udev->probed != USBD_PROBED_NOTHING) { + /* nothing more to do */ + break; } } + if (udev->probed == USBD_PROBED_NOTHING) { /* set config index 0 */ + config = 0; err = usbd_set_config_index(udev, 0, 1); if (err) { - device_printf(parent, - "port %d, set config at addr %d " - "failed, error=%s\n", - udev->port_no, udev->address, - usbd_errstr(err)); goto done; } PRINTF(("no interface drivers found\n")); @@ -1276,16 +1400,12 @@ /* finally try the generic driver */ uaa.iface = NULL; uaa.iface_index = 0; - uaa.ifaces_start = NULL; - uaa.ifaces_end = NULL; uaa.usegeneric = 1; uaa.configno = -1; - if (device_probe_and_attach(bdev) == 0) { - device_set_ivars(bdev, NULL); /* no longer accessible */ - udev->subdevs[0] = bdev; - udev->probed = USBD_PROBED_GENERIC_AND_FOUND; - bdev = 0; + if (!usbd_probe_and_attach_sub( + udev, &uaa, &(udev->global_dev))) { + udev->probed = USBD_PROBED_SPECIFIC_AND_FOUND; goto done; } /* @@ -1296,13 +1416,90 @@ PRINTF(("generic attach failed\n")); } done: - if (bdev) { + if (err) { + device_printf(udev->parent_dev, + "port %d, set config %d at addr %d " + "failed, error=%s\n", + udev->port_no, config, udev->address, + usbd_errstr(err)); + } + if (uaa.temp_dev) { /* remove the last created child; it is unused */ - device_delete_child(parent, bdev); + + if (device_delete_child(udev->parent_dev, uaa.temp_dev)) { + PRINTFN(-1, ("device delete child failed!\n")); + } } return (err); } +/*------------------------------------------------------------------------* + * usbd_suspend_resume_sub + *------------------------------------------------------------------------*/ +static void +usbd_suspend_resume_sub(struct usbd_device *udev, device_t dev, uint8_t do_suspend) +{ + int err; + + if (dev == NULL) { + return; + } + if (do_suspend) { + err = DEVICE_SUSPEND(dev); + } else { + err = DEVICE_RESUME(dev); + } + if (err) { + device_printf(dev, "%s failed!\n", + do_suspend ? "Suspend" : "Resume"); + } + return; +} + +/*------------------------------------------------------------------------* + * usbd_suspend_resume_device + * + * The following function will suspend or resume the USB device. + *------------------------------------------------------------------------*/ +usbd_status_t +usbd_suspend_resume(struct usbd_device *udev, uint8_t do_suspend) +{ + struct usbd_interface *iface; + uint8_t i; + + if (udev == NULL) { + /* nothing to do */ + return (0); + } + PRINTFN(3, ("udev=%p\n", udev)); + + mtx_lock(&(udev->bus->mtx)); + if (udev->flags.suspended == do_suspend) { + mtx_unlock(&(udev->bus->mtx)); + /* nothing to do */ + return (0); + } + udev->flags.suspended = do_suspend; + mtx_unlock(&(udev->bus->mtx)); + + /* do the global_dev first, if any */ + + usbd_suspend_resume_sub(udev, udev->global_dev, do_suspend); + + /* do the suspend or resume */ + + for (i = 0; i != USB_MAX_INTERFACES; i++) { + + iface = usbd_get_iface(udev, i); + if (iface == NULL) { + /* looks like the end of the USB interfaces */ + break; + } + usbd_suspend_resume_sub(udev, iface->subdev, do_suspend); + } + return (0); +} + static const uint8_t usbd_hub_speed_combs[USB_SPEED_MAX][USB_SPEED_MAX] = { /* HUB *//* subdevice */ @@ -1315,48 +1512,53 @@ }; /*------------------------------------------------------------------------* - * usbd_new_device + * usbd_alloc_device + * + * This function allocates a new USB device. This function is called + * when a new device has been put in the powered state, but not yet in + * the addressed state. Get initial descriptor, set the address, get + * full descriptor and get strings. * - * Called when a new device has been put in the powered state, - * but not yet in the addressed state. - * Get initial descriptor, set the address, get full descriptor, - * and attach a driver. + * Return values: + * 0: Failure + * Else: Success *------------------------------------------------------------------------*/ -usbd_status_t -usbd_new_device(device_t parent, struct usbd_bus *bus, +struct usbd_device * +usbd_alloc_device(device_t parent_dev, struct usbd_bus *bus, struct usbd_device *parent_hub, uint8_t depth, - uint8_t speed, uint8_t port_index, uint8_t port_no) + uint8_t port_index, uint8_t port_no, uint8_t speed, uint8_t usb_mode) { + struct usbd_device *udev; struct usbd_device *adev; - struct usbd_device *udev; struct usbd_device *hub; - usbd_status_t err = 0; - uint8_t buf[4]; - uint8_t addr; + usbd_status_t err; + uint8_t device_index; - PRINTF(("bus=%p port=%d depth=%d speed=%d\n", - bus, port_no, depth, speed)); + PRINTFN(0, ("parent_dev=%p, bus=%p, parent_hub=%p, depth=%u, " + "port_index=%u, port_no=%u, speed=%u, usb_mode=%u\n", + parent_dev, bus, parent_hub, depth, port_index, port_no, + speed, usb_mode)); - /* find an unused and valid address */ - -#if (USB_MAX_DEVICES < USB_START_ADDR) -#error "USB_MAX_DEVICES < USB_START_ADDR" -#endif - for (addr = USB_START_ADDR + 1; addr < USB_MAX_DEVICES; addr++) { - if (bus->devices[addr] == NULL) + /* + * Find an unused device index. In USB Host mode this is the + * same as the device address. + * + * NOTE: Index 1 is reserved for the Root HUB. + */ + for (device_index = USB_ROOT_HUB_ADDR; device_index != + USB_MAX_DEVICES; device_index++) { + if (bus->devices[device_index] == NULL) break; } - if (addr == USB_MAX_DEVICES) { - + if (device_index == USB_MAX_DEVICES) { device_printf(bus->bdev, - "No free USB addresses, " - "new device ignored.\n"); - return (USBD_NO_ADDR); + "No free USB device index for new device!\n"); + return (NULL); } - udev = malloc(sizeof(udev[0]), M_USB, M_WAITOK | M_ZERO); + udev = malloc(sizeof(*udev), M_USB, M_WAITOK | M_ZERO); if (udev == NULL) { - return (USBD_NOMEM); + return (NULL); } /* initialize our SX-lock */ sx_init(udev->default_sx, "USB device SX lock"); @@ -1364,10 +1566,23 @@ /* initialize our mutex */ mtx_init(udev->default_mtx, "USB device mutex", NULL, MTX_DEF); - /* make a relationship between port and device address */ - if (parent_hub) { - parent_hub->hub->ports[port_index].device_addr = addr; - } + /* initialize some USB device fields */ + udev->parent_hub = parent_hub; + udev->parent_dev = parent_dev; + udev->port_index = port_index; + udev->port_no = port_no; + udev->depth = depth; + udev->bus = bus; + udev->address = USB_START_ADDR; /* default value */ + + /* we are not ready yet */ + udev->flags.detaching = 1; + udev->refcount = 1; + + /* register our device */ + usbd_bus_port_set_device(bus, parent_hub ? + parent_hub->hub->ports + port_index : NULL, udev, device_index); + /* set up default endpoint descriptor */ udev->default_ep_desc.bLength = USB_ENDPOINT_DESCRIPTOR_SIZE; udev->default_ep_desc.bDescriptorType = UDESC_ENDPOINT; @@ -1375,19 +1590,20 @@ udev->default_ep_desc.bmAttributes = UE_CONTROL; udev->default_ep_desc.wMaxPacketSize[0] = USB_MAX_IPACKET; udev->default_ep_desc.wMaxPacketSize[1] = 0; - udev->ddesc.bMaxPacketSize = 0; udev->default_ep_desc.bInterval = 0; + udev->ddesc.bMaxPacketSize = USB_MAX_IPACKET; - udev->parent_hub = parent_hub; - udev->port_index = port_index; - udev->port_no = port_no; - udev->bus = bus; udev->quirks = &usbd_no_quirk; - udev->address = USB_START_ADDR; - udev->depth = depth; + udev->speed = speed; + udev->flags.usb_mode = usb_mode; + + /* setup probed variable */ + + usbd_reset_probed(udev); - hub = parent_hub; + /* check speed combination */ + hub = udev->parent_hub; if (hub) { if (usbd_hub_speed_combs[hub->speed][speed] == 0) { #ifdef USB_DEBUG @@ -1400,8 +1616,10 @@ goto done; } } + /* search for our High Speed USB HUB, if any */ + adev = udev; - hub = parent_hub; + hub = udev->parent_hub; while (hub) { if (hub->speed == USB_SPEED_HIGH) { @@ -1413,38 +1631,50 @@ hub = hub->parent_hub; } - udev->speed = speed; - /* init the default pipe */ usbd_fill_pipe_data(udev, 0, &udev->default_ep_desc, &udev->default_pipe); - err = usbreq_set_address(udev, &usb_global_lock, addr); - if (err) { - PRINTF(("set address %d failed\n", addr)); - err = USBD_SET_ADDR_FAILED; - goto done; - } - /* allow device time to set new address */ - usbd_delay_ms(udev, USB_SET_ADDRESS_SETTLE); - udev->address = addr; /* new device address now */ + if (udev->flags.usb_mode == USB_MODE_HOST) { + + err = usbreq_set_address(udev, &usb_global_lock, device_index); + + /* This is the new USB device address from now on */ + + udev->address = device_index; - mtx_lock(&(bus->mtx)); - bus->devices[addr] = udev; - if (parent_hub == NULL) { - /* make a copy */ - bus->devices[USB_START_ADDR] = udev; + /* + * We ignore any set-address errors, hence there are + * buggy USB devices out there that actually receive + * the SETUP PID, but manage to set the address before + * the STATUS stage is ACK'ed. If the device responds + * to the subsequent get-descriptor at the new + * address, then we know that the set-address command + * was successful. + */ + if (err) { + PRINTFN(-1, ("set address %d failed " + "(ignored)\n", udev->address)); + } + /* allow device time to set new address */ + usbd_delay_ms(udev, USB_SET_ADDRESS_SETTLE); } - mtx_unlock(&(bus->mtx)); - - /* get the first 8 bytes of the device descriptor */ + /* + * Get the first 8 bytes of the device descriptor ! + * + * NOTE: "usbd_do_request" will check the device descriptor + * next time we do a request to see if the maximum packet size + * changed! The 8 first bytes of the device descriptor + * contains the maximum packet size to use on control endpoint + * 0. If this value is different from "USB_MAX_IPACKET" a new + * USB control request will be setup! + */ err = usbreq_get_desc(udev, &usb_global_lock, &udev->ddesc, - USB_MAX_IPACKET, USB_MAX_IPACKET, - 0, UDESC_DEVICE, 0, 0); + USB_MAX_IPACKET, USB_MAX_IPACKET, 0, UDESC_DEVICE, 0, 0); if (err) { - PRINTF(("addr=%d, getting first desc failed\n", - udev->address)); + PRINTFN(-1, ("getting device descriptor " + "at addr %d failed!\n", udev->address)); goto done; } PRINTF(("adding unit addr=%d, rev=%02x, class=%d, " @@ -1487,23 +1717,24 @@ if (udev->ddesc.iManufacturer || udev->ddesc.iProduct || udev->ddesc.iSerialNumber) { - /* setup language ID */ - err = usbreq_get_string_desc(udev, &usb_global_lock, buf, 4, - 0, USB_LANGUAGE_TABLE); + /* read out the language ID string */ + err = usbreq_get_string_desc(udev, &usb_global_lock, + udev->scratch[0].data, 4, sizeof(udev->scratch), + USB_LANGUAGE_TABLE); } else { err = USBD_INVAL; } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Dec 12 22:36:17 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B03816A419; Wed, 12 Dec 2007 22:36:17 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9E3FB16A418 for ; Wed, 12 Dec 2007 22:36:16 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9AD2D13C46B for ; Wed, 12 Dec 2007 22:36:16 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBCMaGkT077013 for ; Wed, 12 Dec 2007 22:36:16 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBCMaGgr077010 for perforce@freebsd.org; Wed, 12 Dec 2007 22:36:16 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 12 Dec 2007 22:36:16 GMT Message-Id: <200712122236.lBCMaGgr077010@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 130743 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 22:36:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=130743 Change 130743 by hselasky@hselasky_laptop001 on 2007/12/12 22:36:05 This commit is related to USB device side support. o In general: The code does the same like before only that some functions have been refactored. o Removed "usb_discover". It looked more and more like an "sx_xlock" implementation, and it was time to replace it by something simpler. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb.c#27 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb.c#27 (text+ko) ==== @@ -84,8 +84,6 @@ #define USB_UCRED #endif -uint8_t usb_driver_added_refcount = 1; - static uint8_t usb_post_init_called = 0; static device_probe_t usb_probe; @@ -93,7 +91,6 @@ static device_detach_t usb_detach; static int usb_dummy_open(struct cdev *dev, int oflags, int devtype, struct thread *td); -static void usb_discover(struct usbd_bus *bus); static void usb_event_thread(struct usbd_bus *bus); static void usb_create_event_thread(struct usbd_bus *bus); static void usb_attach_sub(device_t dev, struct usbd_bus *bus); @@ -142,84 +139,66 @@ } /*------------------------------------------------------------------------* - * usb_discover - explore the device tree from the root + * usb_event_thread - explore the device tree from the root *------------------------------------------------------------------------*/ static void -usb_discover(struct usbd_bus *bus) +usb_event_thread(struct usbd_bus *bus) { - int32_t error; + int error; PRINTFN(2, ("\n")); - mtx_assert(&usb_global_lock, MA_OWNED); + while (1) { - /* - * check that only one thread is exploring at a time - */ - while (bus->is_exploring) { - bus->wait_explore = 1; + mtx_lock(&(bus->mtx)); +retry: + if (bus->needs.teardown) { + wakeup(&(bus->bdev)); + mtx_unlock(&(bus->mtx)); + break; + } + if ((bus->devices[USB_ROOT_HUB_ADDR] == NULL) || + (bus->devices[USB_ROOT_HUB_ADDR]->hub == NULL) || + (bus->needs.explore == 0)) { - error = mtx_sleep(&bus->wait_explore, &usb_global_lock, 0, - "usb wait explore", 0); - } + if (bus->needs.sync) { + bus->needs.sync = 0; + wakeup(&(bus->needs)); + } + bus->needs.wakeup = 1; - bus->is_exploring = 1; + error = mtx_sleep(bus, &(bus->mtx), + 0, "usbevt", hz * 240); - while (bus->devices[USB_START_ADDR] && - bus->devices[USB_START_ADDR]->hub && - bus->needs_explore && - (bus->wait_explore == 0)) { - bus->needs_explore = 0; + PRINTFN(2, ("woken up\n")); - /* - * explore the hub (this call can sleep, exiting - * usb_global_lock, which is actually Giant) - */ - (bus->devices[USB_START_ADDR]->hub->explore) - (bus->devices[USB_START_ADDR]); - } + bus->needs.wakeup = 0; + goto retry; + } + bus->needs.explore = 0; - bus->is_exploring = 0; + if (bus->needs.probe_attach) { + bus->needs.probe_attach = 0; + bus->driver_added_refcount++; + } + if (bus->driver_added_refcount == 0) { + /* avoid zero, hence that is memory default */ + bus->driver_added_refcount = 1; + } + mtx_unlock(&(bus->mtx)); - if (bus->wait_explore) { - bus->wait_explore = 0; - wakeup(&bus->wait_explore); - } - return; -} - -static void -usb_event_thread(struct usbd_bus *bus) -{ - int32_t error; - - mtx_lock(&usb_global_lock); - - while (1) { - if (bus->devices[USB_START_ADDR] == 0) { - break; - } - usb_discover(bus); + mtx_lock(&usb_global_lock); /* - * Check if a detach happened during discover: + * Explore the Root USB HUB (this call can sleep, + * exiting usb_global_lock, which is actually Giant) */ - if (bus->devices[USB_START_ADDR] == 0) { - break; - } - error = mtx_sleep(&bus->needs_explore, &usb_global_lock, - 0, "usbevt", hz * 60); + (bus->devices[USB_ROOT_HUB_ADDR]->hub->explore) + (bus->devices[USB_ROOT_HUB_ADDR]); - PRINTFN(2, ("woke up\n")); + mtx_unlock(&usb_global_lock); } - bus->event_thread = NULL; - - /* in case parent is waiting for us to exit */ - wakeup(bus); - - mtx_unlock(&usb_global_lock); - PRINTF(("exit\n")); usb_thread_exit(0); @@ -227,54 +206,92 @@ return; } +/*------------------------------------------------------------------------* + * usb_needs_explore + * + * This functions is called when the USB event thread + * needs to be explored. + *------------------------------------------------------------------------*/ void -usb_needs_explore(struct usbd_device *udev) +usb_needs_explore(struct usbd_bus *bus, uint8_t what) { + int err; + PRINTFN(2, ("\n")); - mtx_lock(&usb_global_lock); - udev->bus->needs_explore = 1; - wakeup(&udev->bus->needs_explore); - mtx_unlock(&usb_global_lock); + mtx_lock(&(bus->mtx)); + if (bus->needs.wakeup) { + bus->needs.wakeup = 0; + wakeup(bus); + } + switch (what) { + case USB_BUS_EXPLORE_STOP: + bus->needs.teardown = 1; + err = mtx_sleep(&(bus->bdev), &(bus->mtx), + 0, "usbdrain", 0); + break; + + case USB_BUS_EXPLORE_PROBE: + bus->needs.explore = 1; + bus->needs.probe_attach = 1; + break; + + case USB_BUS_EXPLORE_SYNC: + bus->needs.sync = 1; + err = mtx_sleep(&(bus->needs), &(bus->mtx), + 0, "usbsync", 30 * hz); + break; + + default: + /* just explore */ + bus->needs.explore = 1; + break; + } + mtx_unlock(&(bus->mtx)); return; } +/*------------------------------------------------------------------------* + * usb_needs_probe_and_attach + * + * This function is called whenever a new driver is loaded and will + * cause that all USB busses are re-explored. + *------------------------------------------------------------------------*/ void usb_needs_probe_and_attach(void) { struct usbd_bus *bus; devclass_t dc; device_t dev; + uint8_t what; int max; PRINTFN(2, ("\n")); - mtx_lock(&usb_global_lock); + dc = devclass_find("usb"); + if (dc == NULL) { + return; + } + /* + * Explore all USB busses in parallell. + */ - usb_driver_added_refcount++; - if (usb_driver_added_refcount == 0) { - /* avoid zero, hence that is memory default */ - usb_driver_added_refcount = 1; + what = USB_BUS_EXPLORE_PROBE; +repeat: + max = devclass_get_maxunit(dc); + while (max >= 0) { + dev = devclass_get_device(dc, max); + if (dev) { + bus = device_get_softc(dev); + usb_needs_explore(bus, what); + } + max--; } - dc = devclass_find("usb"); - if (dc) { - max = devclass_get_maxunit(dc); - while (max >= 0) { - dev = devclass_get_device(dc, max); - if (dev) { - bus = device_get_softc(dev); - - bus->needs_explore = 1; - wakeup(&bus->needs_explore); - } - max--; - } - } else { - printf("%s: \"usb\" devclass not present!\n", - __FUNCTION__); + if (what == USB_BUS_EXPLORE_PROBE) { + what = USB_BUS_EXPLORE_SYNC; + goto repeat; } - mtx_unlock(&usb_global_lock); return; } @@ -295,13 +312,14 @@ usb_probe(device_t dev) { PRINTF(("\n")); - return (UMATCH_GENERIC); + return (0); } static void usb_attach_sub(device_t dev, struct usbd_bus *bus) { dev_clone_fn usb_clone_ptr = &usb_clone; + struct usbd_device *child; usbd_status_t err; uint8_t speed; @@ -335,33 +353,29 @@ return; } - err = usbd_new_device(bus->bdev, bus, NULL, 0, speed, 0, 0); + /* Allocate the Root USB device */ - if (!err) { - err = usbd_probe_and_attach(bus->bdev, bus->devices[USB_START_ADDR]); + child = usbd_alloc_device(bus->bdev, bus, NULL, 0, 0, 1, + speed, USB_MODE_HOST); + if (child) { + err = usbd_probe_and_attach(child, + USB_IFACE_INDEX_ANY); + if (!err) { + if (!bus->devices[USB_ROOT_HUB_ADDR]->hub) { + err = USBD_NO_ROOT_HUB; + } + } + } else { + err = USBD_NOMEM; } - if (!err) { - if (bus->devices[USB_START_ADDR]->hub == NULL) { - device_printf(bus->bdev, - "root device is not a hub\n"); - return; - } - /* - * the USB bus is explored here so that devices, - * for example the keyboard, can work during boot - */ - /* make sure that the bus is explored */ - bus->needs_explore = 1; - - usb_discover(bus); - } else { - device_printf(bus->bdev, "root hub problem, error=%s\n", + if (err) { + device_printf(bus->bdev, "Root HUB problem, error=%s\n", usbd_errstr(err)); } + /* Make sure that the USB BUS is explored */ + bus->needs.explore = 1; - usb_create_event_thread(bus); - snprintf(bus->usb_name, sizeof(bus->usb_name), "usb%u", device_get_unit(dev)); bus->usb_clone_tag = EVENTHANDLER_REGISTER(dev_clone, usb_clone_ptr, bus, 1000); @@ -376,6 +390,10 @@ if (bus->usb_cdev == NULL) { device_printf(dev, "Creating dummy device failed!\n"); } + /* create and start the event thread */ + + usb_create_event_thread(bus); + return; } @@ -408,22 +426,22 @@ dc = devclass_find("usb"); if (dc) { - max = devclass_get_maxunit(dc); - for (n = 0; n <= max; n++) { + max = devclass_get_maxunit(dc) + 1; + for (n = 0; n != max; n++) { dev = devclass_get_device(dc, n); if (dev) { bus = device_get_softc(dev); - usb_attach_sub(dev, bus); } } - } else { - printf("%s: \"usb\" devclass not present!\n", - __FUNCTION__); } usb_post_init_called = 1; + /* explore all USB busses in parallell */ + + usb_needs_probe_and_attach(); + mtx_unlock(&usb_global_lock); return; @@ -435,38 +453,25 @@ usb_detach(device_t dev) { struct usbd_bus *bus = device_get_softc(dev); - int32_t error; + struct usbd_device *udev = bus->devices[USB_ROOT_HUB_ADDR]; PRINTF(("start\n")); + /* get rid of explore thread */ + usb_needs_explore(bus, USB_BUS_EXPLORE_STOP); + mtx_lock(&usb_global_lock); - /* wait for any possible explore calls to finish */ - while (bus->is_exploring) { - bus->wait_explore = 1; - - error = mtx_sleep(&bus->wait_explore, &usb_global_lock, 0, - "usb wait explore", 0); - } - /* detach children first */ bus_generic_detach(dev); - if (bus->devices[USB_START_ADDR] != NULL) { - /* - * free device, but not sub-devices, hence they are freed by - * the caller of this function - */ - usbd_free_device(bus->devices[USB_START_ADDR], 0); - } - /* kill off event thread */ - if (bus->event_thread != NULL) { - wakeup(&bus->needs_explore); + /* + * Free USB Root device, but not any sub-devices, hence they + * are freed by the caller of this function + */ + usbd_detach_device(udev, USB_IFACE_INDEX_ANY, 0); + usbd_free_device(udev); - error = mtx_sleep(bus, &usb_global_lock, 0, "usbdet", 0); - - PRINTF(("event thread dead\n")); - } mtx_unlock(&usb_global_lock); mtx_lock(&bus->mtx); @@ -723,7 +728,6 @@ { struct usb_device_enumerate *ude = (void *)addr; struct usbd_device *parent_hub; - usb_port_status_t ps; uint8_t old_addr; uint8_t buf[8]; @@ -738,7 +742,7 @@ error = EINVAL; goto ret002; } - error = usbreq_reset_port(parent_hub, NULL, &ps, udev->port_no); + error = usbreq_reset_port(parent_hub, NULL, udev->port_no); if (error) { error = ENXIO; goto ret002; From owner-p4-projects@FreeBSD.ORG Wed Dec 12 22:40:21 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5846316A41B; Wed, 12 Dec 2007 22:40:21 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EF5D616A417 for ; Wed, 12 Dec 2007 22:40:20 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ECC6813C44B for ; Wed, 12 Dec 2007 22:40:20 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBCMeKZp077512 for ; Wed, 12 Dec 2007 22:40:20 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBCMeKGh077509 for perforce@freebsd.org; Wed, 12 Dec 2007 22:40:20 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 12 Dec 2007 22:40:20 GMT Message-Id: <200712122240.lBCMeKGh077509@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 130744 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 22:40:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=130744 Change 130744 by hselasky@hselasky_laptop001 on 2007/12/12 22:39:22 Refactor "usbreq_reset_port" a little bit. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_requests.c#12 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_requests.c#12 (text+ko) ==== @@ -54,62 +54,50 @@ * usbreq_reset_port *------------------------------------------------------------------------*/ usbd_status_t -usbreq_reset_port(struct usbd_device *udev, struct mtx *mtx, - usb_port_status_t *ps, uint8_t port) +usbreq_reset_port(struct usbd_device *udev, struct mtx *mtx, uint8_t port) { - usb_device_request_t req; + usb_port_status_t ps; usbd_status_t err; uint8_t n; - req.bmRequestType = UT_WRITE_CLASS_OTHER; - req.bRequest = UR_SET_FEATURE; - USETW(req.wValue, UHF_PORT_RESET); - req.wIndex[0] = port; - req.wIndex[1] = 0; - USETW(req.wLength, 0); - err = usbd_do_request(udev, mtx, &req, 0); - - PRINTFN(1, ("port %d reset done, error=%s\n", - port, usbd_errstr(err))); - + err = usbreq_set_port_feature(udev, mtx, port, UHF_PORT_RESET); if (err) { goto done; } - n = 12; - do { - /* wait for device to recover from reset */ + for (n = 12; n != 0; n--) { + + /* wait for the device to recover from reset */ usbd_pause_mtx(mtx, USB_PORT_RESET_DELAY); - err = usbreq_get_port_status(udev, mtx, ps, port); - + err = usbreq_get_port_status(udev, mtx, &ps, port); if (err) { - PRINTF(("get status failed %d\n", - err)); goto done; } /* if the device disappeared, just give up */ - if (!(UGETW(ps->wPortStatus) & UPS_CURRENT_CONNECT_STATUS)) { - err = USBD_NORMAL_COMPLETION; + if (!(UGETW(ps.wPortStatus) & UPS_CURRENT_CONNECT_STATUS)) { goto done; } - if (n == 0) { - err = USBD_TIMEOUT; - goto done; - } else { - n--; + /* check if reset is complete */ + if (UGETW(ps.wPortChange) & UPS_C_PORT_RESET) { + break; } - } while ((UGETW(ps->wPortChange) & UPS_C_PORT_RESET) == 0); + } - err = usbreq_clear_port_feature(udev, mtx, port, UHF_C_PORT_RESET); -#ifdef USB_DEBUG + /* clear port reset first */ + err = usbreq_clear_port_feature( + udev, mtx, port, UHF_C_PORT_RESET); if (err) { - PRINTF(("clear port feature failed %d\n", - err)); + goto done; + } + /* check for timeout */ + if (n == 0) { + err = USBD_TIMEOUT; + goto done; } -#endif - /* wait for the device to recover from reset */ usbd_pause_mtx(mtx, USB_PORT_RESET_RECOVERY); done: + PRINTFN(1, ("port %d reset returning error=%s\n", + port, usbd_errstr(err))); return (err); } @@ -217,7 +205,7 @@ /* this is the language table */ return (USBD_INVAL); } - if (udev->no_strings) { + if (udev->flags.no_strings) { return (USBD_STALLED); } swap = (udev->quirks->uq_flags & UQ_SWAP_UNICODE) ? 1 : 0; From owner-p4-projects@FreeBSD.ORG Wed Dec 12 22:45:27 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 700E416A46B; Wed, 12 Dec 2007 22:45:27 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D060816A419 for ; Wed, 12 Dec 2007 22:45:26 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CC78D13C459 for ; Wed, 12 Dec 2007 22:45:26 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBCMjQsd078792 for ; Wed, 12 Dec 2007 22:45:26 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBCMjQPL078789 for perforce@freebsd.org; Wed, 12 Dec 2007 22:45:26 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 12 Dec 2007 22:45:26 GMT Message-Id: <200712122245.lBCMjQPL078789@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 130745 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 22:45:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=130745 Change 130745 by hselasky@hselasky_laptop001 on 2007/12/12 22:45:07 This commit is related to USB device side support. o In general: The code does almost the same like before only that some functions have been refactored. o Some small changes to support USB Device Mode. See use of "USB_MODE_DEVICE" in the code. o Number of ports is now stored in "hub->nports". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uhub.c#25 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uhub.c#25 (text+ko) ==== @@ -69,12 +69,17 @@ #define DPRINTF(...) do { } while (0) #endif +struct uhub_current_state { + uint16_t port_change; + uint16_t port_status; +}; + struct uhub_softc { + struct uhub_current_state sc_st;/* current state */ device_t sc_dev; /* base device */ struct usbd_device *sc_udev; /* USB device */ struct usbd_xfer *sc_xfer[2]; /* interrupt xfer */ uint8_t sc_flags; -#define UHUB_FLAG_RUNNING 0x01 #define UHUB_FLAG_INTR_STALL 0x02 uint8_t sc_name[32]; }; @@ -179,7 +184,8 @@ * event handler thread that we need * to be explored again: */ - usb_needs_explore(sc->sc_udev); + usb_needs_explore(sc->sc_udev->bus, + USB_BUS_EXPLORE_TREE); case USBD_ST_SETUP: if (sc->sc_flags & UHUB_FLAG_INTR_STALL) { @@ -200,225 +206,306 @@ } } -static struct usbd_device * -uhub_port_to_sub_device(struct usbd_device *udev, struct usbd_port *up) -{ - if ((udev == NULL) || (up == NULL)) { - /* be NULL safe */ - return (NULL); - } - if (up->device_addr == USB_START_ADDR) { - /* nothing to do */ - return (NULL); - } - return (udev->bus->devices[up->device_addr]); -} - +/*------------------------------------------------------------------------* + * uhub_explore_sub - subroutine + * + * Return values: + * 0: Success + * Else: A control transaction failed + *------------------------------------------------------------------------*/ static usbd_status_t -uhub_explore_sub(device_t dev, struct usbd_device *udev, struct usbd_port *up) +uhub_explore_sub(struct uhub_softc *sc, struct usbd_port *up) { + struct usbd_bus *bus; struct usbd_device *child; - uint8_t refcount = usb_driver_added_refcount; - usbd_status_t err = 0; + uint8_t refcount; + usbd_status_t err; + + bus = sc->sc_udev->bus; + err = 0; - child = uhub_port_to_sub_device(udev, up); + /* get driver added refcount from USB bus */ + refcount = bus->driver_added_refcount; + /* get device assosiated with the given port */ + child = usbd_bus_port_get_device(bus, up); if (child == NULL) { /* nothing to do */ - return (0); + goto done; } /* check if probe and attach should be done */ if (child->driver_added_refcount != refcount) { child->driver_added_refcount = refcount; - err = usbd_probe_and_attach(dev, child); + err = usbd_probe_and_attach(child, + USB_IFACE_INDEX_ANY); + if (err) { + goto done; + } + } + /* start control transfer, if device mode */ + + if (child->flags.usb_mode == USB_MODE_DEVICE) { + usbd_default_transfer_setup(child); } /* if a HUB becomes present, do a recursive HUB explore */ if (child->hub) { - (child->hub->explore) (child); + err = (child->hub->explore) (child); } +done: + return (err); +} + +/*------------------------------------------------------------------------* + * uhub_read_port_status - factored out code + *------------------------------------------------------------------------*/ +static usbd_status_t +uhub_read_port_status(struct uhub_softc *sc, uint8_t portno) +{ + usb_port_status_t ps; + usbd_status_t err; + + err = usbreq_get_port_status( + sc->sc_udev, &usb_global_lock, &ps, portno); + + /* update status regardless of error */ + + sc->sc_st.port_status = UGETW(ps.wPortStatus); + sc->sc_st.port_change = UGETW(ps.wPortChange); + + /* debugging print */ + + DPRINTF(sc, 3, "port %d, wPortStatus=0x%04x, " + "wPortChange=0x%04x, err=%s\n", + portno, sc->sc_st.port_status, + sc->sc_st.port_change, usbd_errstr(err)); return (err); } +/*------------------------------------------------------------------------* + * uhub_reattach_port + * + * Returns: + * 0: Success + * Else: A control transaction failed + *------------------------------------------------------------------------*/ static usbd_status_t -uhub_explore(struct usbd_device *udev) +uhub_reattach_port(struct uhub_softc *sc, uint8_t portno) { - usb_hub_descriptor_t *hd = &udev->hub->hubdesc; - struct uhub_softc *sc = udev->hub->hubsoftc; struct usbd_device *child; - struct usbd_port *up; + struct usbd_device *udev; usbd_status_t err; - uint16_t change; - uint16_t status; - uint8_t portno; + uint8_t timeout; uint8_t speed; - uint8_t x; + uint8_t usb_mode; + + DPRINTF(sc, 0, "reattaching port %d\n", portno); + + err = 0; + timeout = 0; + udev = sc->sc_udev; + child = usbd_bus_port_get_device(udev->bus, + udev->hub->ports + portno - 1); + +repeat: + + /* first clear the port connection change bit */ + + err = usbreq_clear_port_feature + (udev, &usb_global_lock, portno, UHF_C_PORT_CONNECTION); + + if (err) { + goto error; + } + /* detach any existing devices */ + + if (child) { + usbd_detach_device(child, USB_IFACE_INDEX_ANY, 1); + usbd_free_device(child); + child = NULL; + } + /* get fresh status */ - DPRINTF(sc, 10, "udev=%p addr=%d\n", udev, udev->address); + err = uhub_read_port_status(sc, portno); + if (err) { + goto error; + } + /* check if nothing is connected to the port */ - if (!(sc->sc_flags & UHUB_FLAG_RUNNING)) { - return (USBD_NOT_STARTED); + if (!(sc->sc_st.port_status & UPS_CURRENT_CONNECT_STATUS)) { + goto error; } - /* ignore hubs that are too deep */ - if (udev->depth > USB_HUB_MAX_DEPTH) { - return (USBD_TOO_DEEP); + /* check if there is no power on the port and print a warning */ + + if (!(sc->sc_st.port_status & UPS_PORT_POWER)) { + DPRINTF(sc, 0, "WARNING: strange, connected port %d " + "has no power\n", portno); } - for (x = 0; x < hd->bNbrPorts; x++) { - up = udev->hub->ports + x; - portno = x + 1; - err = usbreq_get_port_status - (udev, &usb_global_lock, &up->status, portno); - if (err) { - DPRINTF(sc, 0, "get port status failed, " - "error=%s\n", usbd_errstr(err)); - continue; - } - status = UGETW(up->status.wPortStatus); - change = UGETW(up->status.wPortChange); - DPRINTF(sc, 3, "port %d status 0x%04x 0x%04x\n", - portno, status, change); - if (change & UPS_C_PORT_ENABLED) { - DPRINTF(sc, 0, "C_PORT_ENABLED 0x%x\n", change); - usbreq_clear_port_feature - (udev, &usb_global_lock, portno, UHF_C_PORT_ENABLE); - if (change & UPS_C_CONNECT_STATUS) { - /* - * ignore the port error if the device - * vanished - */ - } else if (status & UPS_PORT_ENABLED) { - DPRINTF(sc, -1, "illegal enable change, " - "port %d\n", portno); - } else { - /* port error condition */ - if (up->restartcnt) { /* no message first time */ - DPRINTF(sc, -1, "port error, restarting " - "port %d\n", portno); - } - if (up->restartcnt++ < USBD_RESTART_MAX) { - goto disconnect; - } else { - DPRINTF(sc, -1, "port error, giving up " - "port %d\n", portno); - } - } - } - if (!(change & UPS_C_CONNECT_STATUS)) { - DPRINTF(sc, 3, "port=%d !C_CONNECT_" - "STATUS\n", portno); + /* check if the device is in Host Mode */ + + if (!(sc->sc_st.port_status & UPS_PORT_MODE_DEVICE)) { - /* no status change, just do recursive explore */ - err = uhub_explore_sub(sc->sc_dev, udev, up); - continue; - } - /* we have a connect status change, handle it */ + DPRINTF(sc, 0, "Port %d is in Host Mode\n", portno); - DPRINTF(sc, 0, "status change hub=%d port=%d\n", - udev->address, portno); - usbreq_clear_port_feature - (udev, &usb_global_lock, portno, UHF_C_PORT_CONNECTION); - /* - * usbreq_clear_port_feature (udev, &usb_global_lock, - * portno, UHF_C_PORT_ENABLE); - */ - /* - * If there is already a device on the port the change status - * must mean that is has disconnected. Looking at the - * current connect status is not enough to figure this out - * since a new unit may have been connected before we handle - * the disconnect. - */ -disconnect: - child = uhub_port_to_sub_device(udev, up); - if (child) { - /* disconnected */ - DPRINTF(sc, 0, "device addr=%d disappeared " - "on port %d\n", child->address, - portno); - usbd_free_device(child, 1); - usbreq_clear_port_feature - (udev, &usb_global_lock, portno, UHF_C_PORT_CONNECTION); - } - if (!(status & UPS_CURRENT_CONNECT_STATUS)) { - /* nothing connected, just ignore it */ - DPRINTF(sc, 3, "port=%d !CURRENT_CONNECT_STATUS\n", - portno); - continue; - } - /* connected */ + /* USB Host Mode */ - if (!(status & UPS_PORT_POWER)) { - DPRINTF(sc, -1, "strange, connected port %d " - "has no power\n", portno); - } /* wait for maximum device power up time */ + usbd_delay_ms(udev, USB_PORT_POWERUP_DELAY); /* reset port, which implies enabling it */ + err = usbreq_reset_port - (udev, &usb_global_lock, &up->status, portno); + (udev, &usb_global_lock, portno); if (err) { DPRINTF(sc, -1, "port %d reset " "failed, error=%s\n", portno, usbd_errstr(err)); - continue; + goto error; } /* get port status again, it might have changed during reset */ - err = usbreq_get_port_status - (udev, &usb_global_lock, &up->status, portno); + err = uhub_read_port_status(sc, portno); if (err) { - DPRINTF(sc, 0, "get port status failed, " - "error=%s\n", usbd_errstr(err)); - continue; + goto error; + } + /* check if something changed during port reset */ + + if ((sc->sc_st.port_change & UPS_C_CONNECT_STATUS) || + (!(sc->sc_st.port_status & UPS_CURRENT_CONNECT_STATUS))) { + if (timeout) { + DPRINTF(sc, -1, "giving up port reset " + "- device vanished!\n"); + goto error; + } + timeout = 1; + goto repeat; } - status = UGETW(up->status.wPortStatus); - change = UGETW(up->status.wPortChange); - if (!(status & UPS_CURRENT_CONNECT_STATUS)) { - /* nothing connected, just ignore it */ - DPRINTF(sc, 1, "port %d, device disappeared " - "after reset\n", portno); - continue; + } else { + DPRINTF(sc, 0, "Port %d is in Device Mode\n", portno); + } + + /* + * Figure out the device speed + */ + speed = + (sc->sc_st.port_status & UPS_HIGH_SPEED) ? USB_SPEED_HIGH : + (sc->sc_st.port_status & UPS_LOW_SPEED) ? USB_SPEED_LOW : USB_SPEED_FULL; + + /* + * Figure out the device mode + * + * NOTE: This part is currently FreeBSD specific. + */ + usb_mode = + (sc->sc_st.port_status & UPS_PORT_MODE_DEVICE) ? + USB_MODE_DEVICE : USB_MODE_HOST; + + /* need to create a new child */ + + child = usbd_alloc_device(sc->sc_dev, udev->bus, udev, + udev->depth + 1, portno - 1, portno, speed, usb_mode); + if (child == NULL) { + DPRINTF(sc, -1, "could not allocate new device!\n"); + goto error; + } + return (0); /* success */ + +error: + if (child) { + usbd_detach_device(child, USB_IFACE_INDEX_ANY, 1); + usbd_free_device(child); + child = NULL; + } + if (err == 0) { + err = usbreq_clear_port_feature + (sc->sc_udev, &usb_global_lock, portno, UHF_PORT_ENABLE); + } + if (err) { + DPRINTF(sc, -1, "device problem (%s), " + "disabling port %d\n", usbd_errstr(err), portno); + } + return (err); +} + +/*------------------------------------------------------------------------* + * uhub_explore + * + * Returns: + * 0: Success + * Else: Failure + *------------------------------------------------------------------------*/ +static usbd_status_t +uhub_explore(struct usbd_device *udev) +{ + struct usbd_hub *hub; + struct uhub_softc *sc; + struct usbd_port *up; + usbd_status_t err; + uint8_t portno; + uint8_t x; + + hub = udev->hub; + sc = hub->hubsoftc; + + DPRINTF(sc, 10, "udev=%p addr=%d\n", udev, udev->address); + + /* ignore hubs that are too deep */ + if (udev->depth > USB_HUB_MAX_DEPTH) { + return (USBD_TOO_DEEP); + } + for (x = 0; x != hub->nports; x++) { + up = hub->ports + x; + portno = x + 1; + + err = uhub_read_port_status(sc, portno); + if (err) { + /* most likely the HUB is gone */ + break; } - /* figure out device speed */ - speed = - (status & UPS_HIGH_SPEED) ? USB_SPEED_HIGH : - (status & UPS_LOW_SPEED) ? USB_SPEED_LOW : USB_SPEED_FULL; + if (sc->sc_st.port_change & UPS_C_PORT_ENABLED) { + err = usbreq_clear_port_feature( + udev, &usb_global_lock, portno, UHF_C_PORT_ENABLE); + if (err) { + /* most likely the HUB is gone */ + break; + } + if (sc->sc_st.port_change & UPS_C_CONNECT_STATUS) { + /* + * Ignore the port error if the device + * has vanished ! + */ + } else if (sc->sc_st.port_status & UPS_PORT_ENABLED) { + DPRINTF(sc, -1, "illegal enable change, " + "port %d\n", portno); + } else { - /* get device info and set its address */ - err = usbd_new_device(sc->sc_dev, udev->bus, udev, - udev->depth + 1, speed, x, portno); - if (err == 0) { - err = uhub_explore_sub(sc->sc_dev, udev, up); + if (up->restartcnt == USBD_RESTART_MAX) { + /* XXX could try another speed ? */ + DPRINTF(sc, -1, "port error, giving up " + "port %d\n", portno); + } else { + sc->sc_st.port_change |= UPS_C_CONNECT_STATUS; + up->restartcnt++; + } + } + } + if (sc->sc_st.port_change & UPS_C_CONNECT_STATUS) { + err = uhub_reattach_port(sc, portno); + if (err) { + /* most likely the HUB is gone */ + break; + } } + err = uhub_explore_sub(sc, up); if (err) { - DPRINTF(sc, -1, "usb_new_device failed, " - "error=%s\n", usbd_errstr(err)); - /* Avoid addressing problems by disabling. */ - /* - * usbreq_reset_port (udev, &usb_global_lock, - * &up->status, portno); - */ - - /* - * The unit refused to accept a new address, or had - * some other serious problem. Since we cannot leave - * at 0 we have to disable the port instead. - */ - DPRINTF(sc, -1, "device problem (%s), " - "disabling port %d\n", usbd_errstr(err), portno); - usbreq_clear_port_feature - (udev, &usb_global_lock, portno, UHF_PORT_ENABLE); + /* no device(s) present */ continue; } - /* - * The port setup succeeded, reset error count and do - * recursive explore, if any: - */ + /* explore succeeded - reset restart counter */ up->restartcnt = 0; - } return (USBD_NORMAL_COMPLETION); } @@ -433,9 +520,8 @@ return (UMATCH_NONE); } /* - * the subclass for hubs, is ignored, - * because it is 0 for some - * and 1 for others + * The subclass for USB HUBs is ignored because it is 0 for some + * and 1 for others. */ if ((uaa->iface == NULL) && (dd->bDeviceClass == UDCLASS_HUB)) { @@ -484,18 +570,18 @@ DPRINTF(sc, 1, "depth=%d selfpowered=%d, parent=%p, " "parent->selfpowered=%d\n", udev->depth, - udev->self_powered, + udev->flags.self_powered, parent_hub, parent_hub ? - parent_hub->self_powered : 0); + parent_hub->flags.self_powered : 0); if (udev->depth > USB_HUB_MAX_DEPTH) { DPRINTF(sc, -1, "hub depth, %d, exceeded. HUB ignored!\n", USB_HUB_MAX_DEPTH); goto error; } - if (!udev->self_powered && parent_hub && - (!parent_hub->self_powered)) { + if (!udev->flags.self_powered && parent_hub && + (!parent_hub->flags.self_powered)) { DPRINTF(sc, -1, "bus powered hub connected to " "bus powered hub. HUB ignored!\n"); goto error; @@ -547,11 +633,11 @@ /* initialize HUB structure */ hub->hubsoftc = sc; hub->explore = &uhub_explore; - hub->hubdesc = hubdesc; + hub->nports = hubdesc.bNbrPorts; hub->hubudev = udev; /* if self powered hub, give ports maximum current */ - if (udev->self_powered) { + if (udev->flags.self_powered) { hub->portpower = USB_MAX_POWER; } else { hub->portpower = USB_MIN_POWER; @@ -599,11 +685,11 @@ pwrdly = ((hubdesc.bPwrOn2PwrGood * UHD_PWRON_FACTOR) + USB_EXTRA_POWER_UP_TIME); - for (x = 0; x < nports; x++) { + for (x = 0; x != nports; x++) { /* set up data structures */ struct usbd_port *up = hub->ports + x; - up->device_addr = USB_START_ADDR; + up->device_index = 0; up->restartcnt = 0; portno = x + 1; @@ -628,11 +714,7 @@ device_printf(dev, "%d port%s with %d " "removable, %s powered\n", nports, (nports != 1) ? "s" : "", - removable, udev->self_powered ? "self" : "bus"); - - /* the usual exploration will finish the setup */ - - sc->sc_flags |= UHUB_FLAG_RUNNING; + removable, udev->flags.self_powered ? "self" : "bus"); /* start the interrupt endpoint */ @@ -670,16 +752,17 @@ if (hub == NULL) { /* must be partially working */ return (0); } - for (x = 0; x < hub->hubdesc.bNbrPorts; x++) { + for (x = 0; x != hub->nports; x++) { - child = uhub_port_to_sub_device(sc->sc_udev, hub->ports + x); + child = usbd_bus_port_get_device(sc->sc_udev->bus, hub->ports + x); /* * Subdevices are not freed, because the caller of - * uhub_detach() will do that. The function we are calling - * is NULL safe. + * uhub_detach() will do that. The function we are + * calling is NULL safe. */ - usbd_free_device(child, 0); + usbd_detach_device(child, USB_IFACE_INDEX_ANY, 0); + usbd_free_device(child); } usbd_transfer_unsetup(sc->sc_xfer, 2); @@ -696,59 +779,77 @@ return; } +struct hub_result { + struct usbd_device *udev; + uint8_t portno; + uint8_t iface_index; +}; + +static void +uhub_find_iface_index(struct usbd_hub *hub, device_t child, + struct hub_result *res) +{ + struct usbd_interface *iface; + struct usbd_device *udev; + uint8_t nports; + uint8_t x; + uint8_t i; + + nports = hub->nports; + for (x = 0; x != nports; x++) { + udev = usbd_bus_port_get_device(hub->hubudev->bus, + hub->ports + x); + if (!udev) { + continue; + } + if (udev->global_dev == child) { + res->iface_index = 0; + res->udev = udev; + res->portno = x + 1; + return; + } + for (i = 0; i != USB_MAX_INTERFACES; i++) { + iface = usbd_get_iface(udev, i); + if (iface && + (iface->subdev == child)) { + res->iface_index = i; + res->udev = udev; + res->portno = x + 1; + return; + } + } + } + res->iface_index = 0; + res->udev = NULL; + res->portno = 0; + return; +} + static int uhub_child_location_string(device_t parent, device_t child, char *buf, size_t buflen) { struct uhub_softc *sc = device_get_softc(parent); struct usbd_hub *hub = sc->sc_udev->hub; - struct usbd_device *udev; - uint8_t x; - uint8_t nports; - uint8_t iface_index; + struct hub_result res; mtx_lock(&usb_global_lock); - - nports = hub->hubdesc.bNbrPorts; - for (x = 0; x < nports; x++) { - udev = uhub_port_to_sub_device(sc->sc_udev, hub->ports + x); - if (udev) { - device_t *subdev = - &udev->subdevs[0]; - device_t *subdev_end = - &udev->subdevs_end[0]; - - iface_index = 0; - - while (subdev < subdev_end) { - if (subdev[0] == child) { - goto found; - } - subdev++; - iface_index++; - } + uhub_find_iface_index(hub, child, &res); + if (!res.udev) { + DPRINTF(sc, 0, "device not on hub\n"); + if (buflen) { + buf[0] = '\0'; } + goto done; } - - mtx_unlock(&usb_global_lock); - - DPRINTF(sc, 0, "device not on hub\n"); - - if (buflen) { - buf[0] = '\0'; - } - return (0); - - -found: - - if (udev->probed == USBD_PROBED_IFACE_AND_FOUND) { + if (res.udev->probed == USBD_PROBED_IFACE_AND_FOUND) { snprintf(buf, buflen, "port=%i interface=%i", - x + 1, iface_index); + res.portno, res.iface_index); } else { - snprintf(buf, buflen, "port=%i", x + 1); + snprintf(buf, buflen, "port=%i", res.portno); } +done: mtx_unlock(&usb_global_lock); return (0); @@ -761,71 +862,44 @@ struct uhub_softc *sc = device_get_softc(parent); struct usbd_hub *hub = sc->sc_udev->hub; struct usbd_interface *iface; - struct usbd_device *udev; - uint8_t x; - uint8_t nports; - uint8_t iface_index; + struct hub_result res; mtx_lock(&usb_global_lock); - - nports = hub->hubdesc.bNbrPorts; - for (x = 0; x < nports; x++) { - udev = uhub_port_to_sub_device(sc->sc_udev, hub->ports + x); - if (udev) { - device_t *subdev = - &udev->subdevs[0]; - device_t *subdev_end = - &udev->subdevs_end[0]; - - iface_index = 0; - - while (subdev < subdev_end) { - if (subdev[0] == child) { - goto found; - } - subdev++; - iface_index++; - } + uhub_find_iface_index(hub, child, &res); + if (!res.udev) { + DPRINTF(sc, 0, "device not on hub\n"); + if (buflen) { + buf[0] = '\0'; } + goto done; } + iface = usbd_get_iface(res.udev, res.iface_index); - mtx_unlock(&usb_global_lock); - - DPRINTF(sc, 0, "device not on hub\n"); - - if (buflen) { - buf[0] = '\0'; - } - return (0); - -found: - - iface = usbd_get_iface(udev, iface_index); - - if ((udev->probed == USBD_PROBED_IFACE_AND_FOUND) && + if ((res.udev->probed == USBD_PROBED_IFACE_AND_FOUND) && iface && iface->idesc) { snprintf(buf, buflen, "vendor=0x%04x product=0x%04x " "devclass=0x%02x devsubclass=0x%02x " "sernum=\"%s\" " "intclass=0x%02x intsubclass=0x%02x", - UGETW(udev->ddesc.idVendor), - UGETW(udev->ddesc.idProduct), - udev->ddesc.bDeviceClass, - udev->ddesc.bDeviceSubClass, - &udev->serial[0], + UGETW(res.udev->ddesc.idVendor), + UGETW(res.udev->ddesc.idProduct), + res.udev->ddesc.bDeviceClass, + res.udev->ddesc.bDeviceSubClass, + res.udev->serial, iface->idesc->bInterfaceClass, iface->idesc->bInterfaceSubClass); } else { snprintf(buf, buflen, "vendor=0x%04x product=0x%04x " "devclass=0x%02x devsubclass=0x%02x " "sernum=\"%s\"", - UGETW(udev->ddesc.idVendor), - UGETW(udev->ddesc.idProduct), - udev->ddesc.bDeviceClass, - udev->ddesc.bDeviceSubClass, - &udev->serial[0]); + UGETW(res.udev->ddesc.idVendor), + UGETW(res.udev->ddesc.idProduct), + res.udev->ddesc.bDeviceClass, + res.udev->ddesc.bDeviceSubClass, + res.udev->serial); } +done: mtx_unlock(&usb_global_lock); return (0); From owner-p4-projects@FreeBSD.ORG Wed Dec 12 22:52:35 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 515B416A419; Wed, 12 Dec 2007 22:52:35 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 038AC16A418 for ; Wed, 12 Dec 2007 22:52:35 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 00EFB13C455 for ; Wed, 12 Dec 2007 22:52:35 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBCMqY5o079940 for ; Wed, 12 Dec 2007 22:52:34 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBCMqYNb079935 for perforce@freebsd.org; Wed, 12 Dec 2007 22:52:34 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 12 Dec 2007 22:52:34 GMT Message-Id: <200712122252.lBCMqYNb079935@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 130746 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 22:52:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=130746 Change 130746 by hselasky@hselasky_laptop001 on 2007/12/12 22:52:00 Neither of OHCI, UHCI or EHCI supports USB device mode. Check for that when setting up pipes. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ehci.c#61 edit .. //depot/projects/usb/src/sys/dev/usb/ohci.c#50 edit .. //depot/projects/usb/src/sys/dev/usb/uhci.c#51 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ehci.c#61 (text+ko) ==== @@ -3924,10 +3924,15 @@ { ehci_softc_t *sc = EHCI_BUS2SC(udev->bus); - DPRINTFN(1, ("pipe=%p, addr=%d, endpt=%d (%d)\n", + DPRINTFN(1, ("pipe=%p, addr=%d, endpt=%d, mode=%d (%d)\n", pipe, udev->address, - edesc->bEndpointAddress, sc->sc_addr)); + edesc->bEndpointAddress, udev->flags.usb_mode, + sc->sc_addr)); + if (udev->flags.usb_mode != USB_MODE_HOST) { + /* not supported */ + return; + } if (udev->address == sc->sc_addr) { switch (edesc->bEndpointAddress) { case USB_CONTROL_ENDPOINT: ==== //depot/projects/usb/src/sys/dev/usb/ohci.c#50 (text+ko) ==== @@ -2842,10 +2842,15 @@ { ohci_softc_t *sc = OHCI_BUS2SC(udev->bus); - DPRINTFN(1, ("pipe=%p, addr=%d, endpt=%d (%d)\n", + DPRINTFN(1, ("pipe=%p, addr=%d, endpt=%d, mode=%d (%d)\n", pipe, udev->address, - edesc->bEndpointAddress, sc->sc_addr)); + edesc->bEndpointAddress, udev->flags.usb_mode, + sc->sc_addr)); + if (udev->flags.usb_mode != USB_MODE_HOST) { + /* not supported */ + return; + } if (udev->address == sc->sc_addr) { switch (edesc->bEndpointAddress) { case USB_CONTROL_ENDPOINT: ==== //depot/projects/usb/src/sys/dev/usb/uhci.c#51 (text+ko) ==== @@ -3332,10 +3332,15 @@ { uhci_softc_t *sc = UHCI_BUS2SC(udev->bus); - DPRINTFN(1, ("pipe=%p, addr=%d, endpt=%d (%d)\n", + DPRINTFN(1, ("pipe=%p, addr=%d, endpt=%d, mode=%d (%d)\n", pipe, udev->address, - edesc->bEndpointAddress, sc->sc_addr)); + edesc->bEndpointAddress, udev->flags.usb_mode, + sc->sc_addr)); + if (udev->flags.usb_mode != USB_MODE_HOST) { + /* not supported */ + return; + } if (udev->address == sc->sc_addr) { switch (edesc->bEndpointAddress) { case USB_CONTROL_ENDPOINT: From owner-p4-projects@FreeBSD.ORG Wed Dec 12 23:04:48 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 87A1616A420; Wed, 12 Dec 2007 23:04:48 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2F59F16A418 for ; Wed, 12 Dec 2007 23:04:48 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2D7DC13C468 for ; Wed, 12 Dec 2007 23:04:48 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBCN4lrN083119 for ; Wed, 12 Dec 2007 23:04:47 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBCN4lRi083116 for perforce@freebsd.org; Wed, 12 Dec 2007 23:04:47 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 12 Dec 2007 23:04:47 GMT Message-Id: <200712122304.lBCN4lRi083116@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 130748 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 23:04:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=130748 Change 130748 by hselasky@hselasky_laptop001 on 2007/12/12 23:04:40 Faster recovery in case of failure. Setting the address should not take more than 1 second. Default timeout is 5 seconds. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_requests.c#13 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_requests.c#13 (text+ko) ==== @@ -430,7 +430,9 @@ USETW(req.wValue, addr); USETW(req.wIndex, 0); USETW(req.wLength, 0); - return (usbd_do_request(udev, mtx, &req, 0)); + + /* Setting the address should not take more than 1 second ! */ + return (usbd_do_request_flags(udev, mtx, &req, NULL, 0, NULL, 1000)); } /*------------------------------------------------------------------------* From owner-p4-projects@FreeBSD.ORG Wed Dec 12 23:08:53 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 99B0416A469; Wed, 12 Dec 2007 23:08:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4500D16A419 for ; Wed, 12 Dec 2007 23:08:53 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 40EA113C4EC for ; Wed, 12 Dec 2007 23:08:53 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBCN8rPs083356 for ; Wed, 12 Dec 2007 23:08:53 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBCN8rM2083353 for perforce@freebsd.org; Wed, 12 Dec 2007 23:08:53 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Dec 2007 23:08:53 GMT Message-Id: <200712122308.lBCN8rM2083353@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130750 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 23:08:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=130750 Change 130750 by jb@jb_freebsd1 on 2007/12/12 23:08:34 IFopensolaris. This integration adds the ZFS files already in CVS to the opensolaris project in p4 which will be used to maintain FreeBSD changes to OpenSolaris code. Note that Sun will accept back changes which are bugs in their code, but their development standards prohibit them from creating "dead code" via #ifdefs in their sources. So we have to maintain FreeBSD conditional code and p4 is a much better merge tool. The next submit to this project will contain the FreeBSD changes that are already in CVS from the OpenSolaris distribution code integrated here. Affected files ... .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/dtrace.c#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/Makefile#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/Makefile.subdirs#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/README#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/Makefile#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/Makefile#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/baddof.c#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/Makefile#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/badioctl.c#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/32/Makefile#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/64/Makefile#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/Makefile#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/Makefile.com#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/chkargs.c#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Getopt.java#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/JDTrace.java#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Makefile#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/jdtrace.c#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/manifest/jdtrace.jar-manifest#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/Makefile#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/Makefile#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/Makefile.com#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/Makefile#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_FUNC.bad.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_MDIM.bad.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_NULL.bad.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_REDEF.redef.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.avgtoofew.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.maxnoarg.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.mintoofew.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.quantizetoofew.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.sumtoofew.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_AGGARG.bad.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_PROTO.bad.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_IDENT.bad.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_UNDEF.badaggfunc.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badexpr.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badkey3.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.noeffect.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey2.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey4.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqbad1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqshort.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASEVAL.bad.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMTYPE.lqbad1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMVAL.bad.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.order.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.order.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHSTEP.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MISMATCH.lqbadarg.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPLARGE.lqtoofew.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPSMALL.bad.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPTYPE.lqbadinc.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPVAL.bad.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_AGGARG.bad.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_PROTO.bad.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_SCALAR.bad.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_ARG.lquantizetoofew.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgnoarg.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgtoomany.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.counttoomany.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizenoarg.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizetoomany.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxnoarg.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxtoomany.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.minnoarg.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.mintoomany.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizenoarg.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizetoomany.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumnoarg.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumtoomany.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_AGGARG.bad.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badmany.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badnone.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_SCALAR.bad.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count3.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.goodkey.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signature.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_2.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.modby0.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.addmin.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.divmin.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muladd.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muldiv.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.basics.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_ARR_BADREF.bad.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRBIG.toobig.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRNULL.bad.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRSUB.bad.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_PROTO_TYPE.badtuple.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_IDENT_UNDEF.badureg.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic2.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic3.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic4.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic5.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic6.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.uregsarray.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.this.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_ARG.badsig.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toofew.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toomany.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_SYNTAX.errassign.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.tupoflow.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.cpyarray.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.diffprofile.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.initialize.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.invalidref.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.misc.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.orthogonality.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.this.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.valassign.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.begin.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.tick.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_ADDROF_BITFIELD.BitfieldAddress.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.NegBitField.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.ZeroBitField.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.ExceedBaseType.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.GreaterThan64.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFTYPE.badtype.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_OFFSETOF_BITFIELD.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_SIZEOF_BITFIELD.SizeofBitfield.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.BitFieldPromotion.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.SizeofBitField.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.end.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize2.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize3.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.zerobuf.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.alignring.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.cputime.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.dynvarsize.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize2.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize3.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.smallring.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.cpuusage.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.nice.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.priority.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.prsize.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.rssize.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0clause.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8clause.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.execname.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.hpriority.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.timestamp.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.vtimestamp.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggfun.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggtup.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.arrtup.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.body.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.both.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.pred.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.nopred.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.pred.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predfirst.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predlast.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LOCASSC.NonLocalAssoc.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LONGINT.LongStruct.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PARMCLASS.BadStorageClass.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_NAME.VoidName.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_TYPE.Dyn.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VARARGS.VarLenArgs.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VOID.NonSoleVoid.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_SIGNINT.UnsignedStruct.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_VOIDATTR.ShortVoidDecl.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.arrays.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.basics.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.funcs.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.pointers.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.varargsfuncs.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/badptr.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/countdown.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/counter.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/errorpath.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/hello.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/kstat.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/ksyms.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/renormalize.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rtime.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rw.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwinfo.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwtime.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/specopen.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/truss.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/trussrw.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/userfunc.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_AGGREGATION.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DBLERROR.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DYNAMIC.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.end.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPEC.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPECUNAVAIL.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_STKSTROVERFLOW.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/err.D_PDESC_ZERO.InvalidDescription1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.APIVersion.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.AddSearchPath.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.CoalesceTrace.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ELFGeneration.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.IncludedFilePath.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithFunctions#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithIDs#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithModules#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithNames#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithProviders#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ShowCompilerCode.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceFunctions#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceIDs#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceModule#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceNames#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceProvider#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.VerboseStabilityReport.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.AddSearchPath.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeGiga.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeKilo.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeMega.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeTera.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel32.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel64.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithoutW.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationOut.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationWithO.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus1.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus2.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExtraneousProbeIds.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName1.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName2.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId1.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId2.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId3.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule1.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule2.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule3.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule4.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProbeIdentifier.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider1.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider2.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider3.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider4.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc1.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc2.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc3.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc4.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc5.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc6.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc7.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc8.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc9.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID1.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID2.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID3.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID4.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID5.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID6.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID7.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule1.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule2.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule3.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule4.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule5.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule6.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule7.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule8.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName1.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName2.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName3.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName4.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName5.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName6.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName7.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName8.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName9.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider1.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider2.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider3.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider4.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider5.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.MultipleInvalidProbeId.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.PreprocessorStatement.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.UnDefineNameWithCPP.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbeIdentfier.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbesWithoutZ.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/err.D_IDENT_UNDEF.timespent.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.end.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.endwithoutbegin.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multibeginend.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multiend.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_DECL_IDRED.EnumSameName.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_UNKNOWN.RepeatIdentifiers.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumEquality.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumSameValue.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumValAssign.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_BADADDR.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_DIVZERO.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_UNKNOWN.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.error.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.errorend.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.D_PROTO_LEN.noarg.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.exitarg1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/tst.basic1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/err.D_PDESC_ZERO.notreturn.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.basic.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionentry.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionreturnvalue.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.ioctlargs.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offset.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offsetzero.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return0.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.tailcall.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_FUNC_UNDEF.progenyofbad1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_OP_VFPTR.badop.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.chillbadarg.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.copyoutbadarg.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.mobadarg.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.raisebadarg.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.allocanoarg.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.badbreakpoint.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoofew.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoomany.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrbadarg.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrtoofew.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoofew.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoomany.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoofew.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoomany.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtabadarg.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.panicbadarg.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.progenyofbad2.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.stopbadarg.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_STRINGOF_TYPE.badstringof.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_VAR_UNDEF.badvar.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca2.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy2.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy3.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy4.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy5.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy6.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badchill.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.chillbadarg.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyout.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutbadaddr.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutstrbadaddr.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoa6badaddr.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoabadaddr.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadaddr.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadarg.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.badfreopen.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.bcopy.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.chill.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.copyin.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.copyinto.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ddi_pathname.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.default.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.freopen.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ftruncate.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ftruncate.ksh.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.hton.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.index.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.index.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa6.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa6.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostr.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostr.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owned.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owner.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_type_adaptive.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.progenyof.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.rand.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strchr.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strchr.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strstr.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strstr.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok_null.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/err.D_ADDROF_LVAL.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/err.D_EMPTY.empty.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/tst.clauses.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/tst.stmts.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_DECL_IDRED.redef1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_DECL_IDRED.redef2.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_IDENT_UNDEF.recur.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef2.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineDataAssign.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineExpression.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineKinds.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineKinds.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineTypedef.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineWritableAssign.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/Makefile#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/manifest/test.jar-manifest#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestAbort.java#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestBean.java#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestClose.java#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestDrop.java#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestEnable.java#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestFunctionLookup.java#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestMaxConsumers.java#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestMultiAggPrinta.java#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestProbeData.java#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestProbeDescription.java#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestStateMachine.java#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestStopLock.java#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Abort.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Abort.ksh.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Close.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Close.ksh.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Drop.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Drop.ksh.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Enable.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Enable.ksh.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.c#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.ksh.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MaxConsumers.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MaxConsumers.ksh.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MultiAggPrinta.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MultiAggPrinta.ksh.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.c#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.ksh.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeDescription.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeDescription.ksh.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StateMachine.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StateMachine.ksh.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StopLock.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StopLock.ksh.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.printa.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.printa.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NL.char.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NULL.char.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_INT_DIGIT.InvalidDigit.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_INT_OFLOW.BigInt.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_STR_NL.string.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brace1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brace2.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack2.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack3.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren2.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren3.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/tst.D_MACRO_OFLOW.ParIntOvflow.d.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/mdb/tst.dtracedcmd.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.icmp.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.tcp.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.udp.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/err.D_PRAGMA_OPTSET.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.badopt.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.boolopt.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.boolopt.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dynopt.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dynopt.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.enablerace.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.haslam.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.roch.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.schrock.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/err.D_PRINTA_AGGKEY.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/err.D_PRINTA_AGGPROTO.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.many.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.many.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.same.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.same.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sort.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sort.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sortpos.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sortpos.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.tuplecompat.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.tuplecompat.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero2.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero2.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero3.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero3.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_BITFIELD.bitfield.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_TYPE.badtype.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_TYPE.notsou.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.OffsetofNULL.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.badmemb.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofAlias.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofArith.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofUnion.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.struct.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.struct.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.union.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.union.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/operators/tst.ternary.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/operators/tst.ternary.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badproc1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_BADPID.badproc2.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_CREATEFAIL.many.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_CREATEFAIL.many.exe#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.exe#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.addprobes.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.exe#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.exe#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.float.c#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.float.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.c#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.c#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.main.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.manypids.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.probemod.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.c#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.c#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.c#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.c#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.exe#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.exe#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.BadAlign.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.ArrayVar.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.DynamicVar.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.agg.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_DEREF_NONPTR.noptr.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_DEREF_VOID.VoidPointerDeref.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_ARRFUN.ArrayAssignment.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_INCOMPAT.VoidPointerArith.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_LVAL.AddressChange.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_PTR.NonPointerAccess.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_PTR.badpointer.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_SOU.BadPointerAccess.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_SOU.badpointer.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress2.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress3.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress4.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress5.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer2.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer3.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.GlobalVar.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.IntegerArithmetic1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic2.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic3.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerAssignment.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ValidPointer1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ValidPointer2.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.VoidCast.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.basic1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.basic2.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGERR.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_INVAL.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_MALFORM.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_UNUSED.UnusedPragma.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.circlibdep.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.invalidlibdep.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdep.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdepfullyconnected.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_PRED_SCALAR.NonScalarPred.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_SYNTAX.invalid.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_SYNTAX.operr.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.argsnotcached.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.basics.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.basics.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.complex.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.complex.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.predcache.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_IDENT_UNDEF.afterprobe.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_PRAGCTL_INVAL.tabdefine.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_SYNTAX.withoutpound.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.defincomp.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefelsenotendif.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefincomp.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefnotendif.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.incompelse.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.mulelse.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifdef.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifdef.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifndef.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifndef.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifnotdef.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifnotdef.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicaland.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicaland.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalandor.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalandor.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalor.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalor.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.muland.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.muland.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.mulor.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.mulor.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.precondi.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.precondi.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.predicatedeclare.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexp.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexp.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpelse.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpelse.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpif.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpif.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpifelse.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpifelse.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.withinprobe.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badagg.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badfmt.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badval.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_PROTO.bad.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.jstack.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.stack.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.ustack.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.basics.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.basics.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.def.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.def.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.dynwidth.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.dynwidth.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.fmt.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.fmt.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.many.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.manyval.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.manyval.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.stack.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.tuple.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.tuple.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_AGG_CONV.aggfmt.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_EXTRA.toomany.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_EXTRA.widths.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_FMT.badfmt.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_PROTO.novalue.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_TYPE.aggarg.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_TYPE.recursive.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_PROTO.noprec.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_PROTO.nowidth.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_TYPE.badprec.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_TYPE.badwidth.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PROTO_LEN.toofew.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv2.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv3.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.flags.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.flags.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.hello.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.hello.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.ints.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.ints.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.precs.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.precs.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.print-f.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.print-f.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printT.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printT.ksh.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printY.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printY.ksh.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printcont.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printcont.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printeE.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printeE.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printgG.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printgG.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.rawfmt.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.rawfmt.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.uints.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.uints.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.wp.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.wp.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.func_access.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.op_access.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.unpriv_funcs.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.probeqtn.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.probestar.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.tickstar.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.assign.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.declare.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.declarein.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.lbraces.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.probespec.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.rbraces.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.recdec.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.basic1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.check.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.declare.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.declareafter.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.emptyprobe.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragma.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmaaftertab.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmainside.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmaoutside.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.probestar.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.create.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exec.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ENOENT.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitcore.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitexit.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.c#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.startexit.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZERO.profile.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROonens.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROonensec.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROoneus.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROoneusec.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.argtest.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.argtest.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.basic.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.basic.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.func.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.mod.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilehz.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilehz.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilems.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilems.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilemsec.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilemsec.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilenhz.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilenhz.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilens.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilens.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilensec.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilensec.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profiles.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profiles.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilesec.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilesec.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileus.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileus.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileusec.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileusec.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.sym.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.c#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.ksh.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_INVAL.wrongdec4.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.nonprofile.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.wrongdec1.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.wrongdec2.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.wrongdec3.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.basics.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.basics.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.beginexit.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.beginprof.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.beginprof.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probattrs.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probattrs.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probefunc.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probefunc.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probemod.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probemod.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probename.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probename.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probprov.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probprov.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.profend.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.profend.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.profexit.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.profexit.d.out#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.trace.d#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.trace.d.out#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Dec 12 23:20:11 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 726A516A480; Wed, 12 Dec 2007 23:20:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 121C316A41A for ; Wed, 12 Dec 2007 23:20:11 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C359B13C46A for ; Wed, 12 Dec 2007 23:20:08 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBCNK8HI085161 for ; Wed, 12 Dec 2007 23:20:08 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBCNK6cn085153 for perforce@freebsd.org; Wed, 12 Dec 2007 23:20:06 GMT (envelope-from peter@freebsd.org) Date: Wed, 12 Dec 2007 23:20:06 GMT Message-Id: <200712122320.lBCNK6cn085153@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 130754 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 23:20:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=130754 Change 130754 by peter@peter_daintree on 2007/12/12 23:19:34 IFC @130733 Affected files ... .. //depot/projects/hammer/Makefile#44 integrate .. //depot/projects/hammer/contrib/amd/FREEBSD-Xlist#4 integrate .. //depot/projects/hammer/contrib/amd/FREEBSD-upgrade#4 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/freebsd.h#10 integrate .. //depot/projects/hammer/contrib/gcc/fold-const.c#10 integrate .. //depot/projects/hammer/include/nsswitch.h#4 integrate .. //depot/projects/hammer/lib/Makefile#66 integrate .. //depot/projects/hammer/lib/libc/gdtoa/_ldtoa.c#5 integrate .. //depot/projects/hammer/lib/libc/gen/getgrent.c#13 integrate .. //depot/projects/hammer/lib/libc/gen/getgrouplist.c#6 integrate .. //depot/projects/hammer/lib/libc/locale/localeconv.c#4 integrate .. //depot/projects/hammer/lib/libc/net/nsdispatch.c#10 integrate .. //depot/projects/hammer/lib/libc/stdio/vfscanf.c#16 integrate .. //depot/projects/hammer/lib/libc/stdio/vfwscanf.c#13 integrate .. //depot/projects/hammer/lib/libc/stdlib/rand.c#4 integrate .. //depot/projects/hammer/lib/libc/string/strtok.3#5 integrate .. //depot/projects/hammer/lib/libc/string/strtok.c#3 integrate .. //depot/projects/hammer/lib/libc/string/wcstok.c#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_mutex.c#37 integrate .. //depot/projects/hammer/release/Makefile#98 integrate .. //depot/projects/hammer/release/doc/zh_CN.GB2312/Makefile#3 integrate .. //depot/projects/hammer/release/doc/zh_CN.GB2312/errata/Makefile#2 integrate .. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/Makefile#2 integrate .. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/Makefile.inc#2 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/amd64/Makefile#2 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/amd64/article.sgml#2 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/amd64/proc-amd64.sgml#4 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/article.sgml#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml#5 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#11 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/common/hw.ent#3 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/common/intro.sgml#3 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/i386/Makefile#2 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/i386/article.sgml#2 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/i386/proc-i386.sgml#4 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/Makefile#3 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/Makefile.inc#2 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/amd64/Makefile#2 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/amd64/article.sgml#2 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/common/abstract.sgml#2 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/common/artheader.sgml#5 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/common/install.ent#2 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/common/install.sgml#7 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/common/layout.sgml#4 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/common/trouble.sgml#5 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/common/upgrade.sgml#3 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/i386/Makefile#2 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/i386/article.sgml#2 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/ia64/Makefile#2 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/ia64/article.sgml#2 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/pc98/Makefile#2 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/pc98/article.sgml#2 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/sparc64/Makefile#2 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/sparc64/article.sgml#2 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/sparc64/install.sgml#3 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/readme/article.sgml#3 integrate .. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/Makefile#3 integrate .. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/Makefile.inc#2 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/amd64/Makefile#2 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/amd64/article.sgml#3 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/article.sgml#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#13 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/common/relnotes.ent#2 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/i386/Makefile#2 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/i386/article.sgml#2 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/ia64/Makefile#2 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/ia64/article.sgml#2 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/pc98/Makefile#2 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/pc98/article.sgml#2 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/powerpc/Makefile#2 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/powerpc/article.sgml#2 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/sparc64/Makefile#3 delete .. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/sparc64/article.sgml#3 delete .. //depot/projects/hammer/sbin/bsdlabel/bsdlabel.c#21 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.8#47 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.c#36 integrate .. //depot/projects/hammer/sbin/natd/natd.8#8 integrate .. //depot/projects/hammer/sbin/newfs_msdos/newfs_msdos.8#7 integrate .. //depot/projects/hammer/share/man/man4/nve.4#9 integrate .. //depot/projects/hammer/share/man/man5/src.conf.5#14 integrate .. //depot/projects/hammer/share/man/man7/build.7#17 integrate .. //depot/projects/hammer/share/mk/bsd.own.mk#21 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#163 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#169 integrate .. //depot/projects/hammer/sys/arm/arm/pmap.c#47 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_da.c#44 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#54 integrate .. //depot/projects/hammer/sys/conf/files#167 integrate .. //depot/projects/hammer/sys/conf/files.amd64#100 integrate .. //depot/projects/hammer/sys/conf/files.i386#86 integrate .. //depot/projects/hammer/sys/dev/amr/amr.c#37 integrate .. //depot/projects/hammer/sys/dev/amr/amr_cam.c#20 integrate .. //depot/projects/hammer/sys/dev/amr/amr_pci.c#26 integrate .. //depot/projects/hammer/sys/dev/amr/amrvar.h#21 integrate .. //depot/projects/hammer/sys/dev/arcmsr/arcmsr.c#15 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#58 integrate .. //depot/projects/hammer/sys/dev/sound/pci/ich.c#39 integrate .. //depot/projects/hammer/sys/dev/usb/umass.c#47 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#92 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vfsops.c#31 integrate .. //depot/projects/hammer/sys/geom/geom_bsd_enc.c#7 integrate .. //depot/projects/hammer/sys/geom/part/g_part.c#10 integrate .. //depot/projects/hammer/sys/i386/i386/machdep.c#82 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#104 integrate .. //depot/projects/hammer/sys/kern/kern_proc.c#63 integrate .. //depot/projects/hammer/sys/kern/kern_resource.c#37 integrate .. //depot/projects/hammer/sys/kern/sched_4bsd.c#55 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#87 integrate .. //depot/projects/hammer/sys/net/bridgestp.c#17 integrate .. //depot/projects/hammer/sys/net/bridgestp.h#4 integrate .. //depot/projects/hammer/sys/net/if.h#29 integrate .. //depot/projects/hammer/sys/net/route.c#29 integrate .. //depot/projects/hammer/sys/net/route.h#16 integrate .. //depot/projects/hammer/sys/netgraph/ng_l2tp.c#13 integrate .. //depot/projects/hammer/sys/netinet/if_ether.c#42 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#90 integrate .. //depot/projects/hammer/sys/netinet/tcp_ofld.c#1 branch .. //depot/projects/hammer/sys/netinet/tcp_ofld.h#1 branch .. //depot/projects/hammer/sys/netinet/tcp_syncache.c#56 integrate .. //depot/projects/hammer/sys/netinet/tcp_syncache.h#2 integrate .. //depot/projects/hammer/sys/netinet/tcp_var.h#50 integrate .. //depot/projects/hammer/sys/netinet/toedev.h#1 branch .. //depot/projects/hammer/sys/netinet6/dest6.c#6 integrate .. //depot/projects/hammer/sys/netinet6/frag6.c#12 integrate .. //depot/projects/hammer/sys/netinet6/icmp6.c#31 integrate .. //depot/projects/hammer/sys/netinet6/in6.c#29 integrate .. //depot/projects/hammer/sys/netinet6/in6.h#20 integrate .. //depot/projects/hammer/sys/netinet6/in6_cksum.c#14 integrate .. //depot/projects/hammer/sys/netinet6/in6_gif.c#15 integrate .. //depot/projects/hammer/sys/netinet6/in6_gif.h#5 integrate .. //depot/projects/hammer/sys/netinet6/in6_ifattach.c#21 integrate .. //depot/projects/hammer/sys/netinet6/in6_ifattach.h#6 integrate .. //depot/projects/hammer/sys/netinet6/in6_pcb.c#32 integrate .. //depot/projects/hammer/sys/netinet6/in6_pcb.h#12 integrate .. //depot/projects/hammer/sys/netinet6/in6_proto.c#20 integrate .. //depot/projects/hammer/sys/netinet6/in6_rmx.c#12 integrate .. //depot/projects/hammer/sys/netinet6/in6_src.c#24 integrate .. //depot/projects/hammer/sys/netinet6/in6_var.h#18 integrate .. //depot/projects/hammer/sys/netinet6/ip6_ecn.h#4 integrate .. //depot/projects/hammer/sys/netinet6/ip6_forward.c#20 integrate .. //depot/projects/hammer/sys/netinet6/ip6_id.c#5 integrate .. //depot/projects/hammer/sys/netinet6/ip6_input.c#33 integrate .. //depot/projects/hammer/sys/netinet6/ip6_ipsec.c#4 integrate .. //depot/projects/hammer/sys/netinet6/ip6_ipsec.h#3 integrate .. //depot/projects/hammer/sys/netinet6/ip6_mroute.c#22 integrate .. //depot/projects/hammer/sys/netinet6/ip6_mroute.h#7 integrate .. //depot/projects/hammer/sys/netinet6/ip6_output.c#46 integrate .. //depot/projects/hammer/sys/netinet6/ip6_var.h#20 integrate .. //depot/projects/hammer/sys/netinet6/ip6protosw.h#6 integrate .. //depot/projects/hammer/sys/netinet6/mld6.c#21 integrate .. //depot/projects/hammer/sys/netinet6/mld6_var.h#6 integrate .. //depot/projects/hammer/sys/netinet6/nd6.c#35 integrate .. //depot/projects/hammer/sys/netinet6/nd6.h#9 integrate .. //depot/projects/hammer/sys/netinet6/nd6_nbr.c#24 integrate .. //depot/projects/hammer/sys/netinet6/nd6_rtr.c#17 integrate .. //depot/projects/hammer/sys/netinet6/pim6.h#3 integrate .. //depot/projects/hammer/sys/netinet6/pim6_var.h#4 integrate .. //depot/projects/hammer/sys/netinet6/raw_ip6.c#32 integrate .. //depot/projects/hammer/sys/netinet6/raw_ip6.h#3 integrate .. //depot/projects/hammer/sys/netinet6/route6.c#9 integrate .. //depot/projects/hammer/sys/netinet6/scope6.c#10 integrate .. //depot/projects/hammer/sys/netinet6/scope6_var.h#6 integrate .. //depot/projects/hammer/sys/netinet6/sctp6_usrreq.c#15 integrate .. //depot/projects/hammer/sys/netinet6/sctp6_var.h#8 integrate .. //depot/projects/hammer/sys/netinet6/tcp6_var.h#4 integrate .. //depot/projects/hammer/sys/netinet6/udp6_usrreq.c#33 integrate .. //depot/projects/hammer/sys/netinet6/udp6_var.h#6 integrate .. //depot/projects/hammer/sys/sys/cdefs.h#25 integrate .. //depot/projects/hammer/sys/sys/socket.h#24 integrate .. //depot/projects/hammer/sys/vm/vm_page.c#66 integrate .. //depot/projects/hammer/tools/build/options/WITHOUT_BZIP2#2 integrate .. //depot/projects/hammer/tools/build/options/WITHOUT_GNU#2 integrate .. //depot/projects/hammer/tools/build/options/WITHOUT_GSSAPI#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_INSTALLLIB#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_KERBEROS#2 integrate .. //depot/projects/hammer/tools/build/options/WITHOUT_KVM#2 integrate .. //depot/projects/hammer/tools/build/options/WITHOUT_PAM#2 integrate .. //depot/projects/hammer/tools/build/options/WITHOUT_TOOLCHAIN#3 integrate .. //depot/projects/hammer/tools/build/options/makeman#5 integrate .. //depot/projects/hammer/tools/regression/lib/libc/stdio/test-scanfloat.c#7 integrate .. //depot/projects/hammer/tools/regression/lib/msun/test-lround.c#2 integrate .. //depot/projects/hammer/tools/regression/lib/msun/test-next.c#2 integrate .. //depot/projects/hammer/usr.bin/make/Makefile.dist#4 integrate .. //depot/projects/hammer/usr.bin/procstat/procstat_args.c#2 integrate .. //depot/projects/hammer/usr.bin/procstat/procstat_bin.c#2 integrate .. //depot/projects/hammer/usr.bin/procstat/procstat_cred.c#2 integrate .. //depot/projects/hammer/usr.bin/procstat/procstat_files.c#2 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/Makefile#9 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/add/pkg_add.1#17 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/create/pkg_create.1#14 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/delete/pkg_delete.1#5 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/info/pkg_info.1#13 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/search/Makefile#2 delete .. //depot/projects/hammer/usr.sbin/pkg_install/search/pkg_search.1#2 delete .. //depot/projects/hammer/usr.sbin/pkg_install/search/pkg_search.sh#2 delete .. //depot/projects/hammer/usr.sbin/pkg_install/updating/pkg_updating.1#3 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/version/pkg_version.1#14 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/media.c#6 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/system.c#10 integrate .. //depot/projects/hammer/usr.sbin/syslogd/syslogd.c#31 integrate Differences ... ==== //depot/projects/hammer/Makefile#44 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.342 2007/10/18 08:41:52 delphij Exp $ +# $FreeBSD: src/Makefile,v 1.343 2007/12/11 20:00:55 imp Exp $ # # The user-driven targets are: # @@ -234,17 +234,19 @@ PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \ PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \ then \ - (cd ${.CURDIR} && make make); \ + (cd ${.CURDIR} && ${BSDMAKE} make); \ fi # # Upgrade make(1) to the current version using the installed -# headers, libraries and tools. +# headers, libraries and tools. Also, allow the location of +# the system bsdmake-like utility to be overridden. # +BSDMAKE?=make MMAKEENV= MAKEOBJDIRPREFIX=${MAKEPATH} \ DESTDIR= \ INSTALL="sh ${.CURDIR}/tools/install.sh" -MMAKE= ${MMAKEENV} make \ +MMAKE= ${MMAKEENV} ${BSDMAKE} \ -D_UPGRADING \ -DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \ -DNO_CPU_CFLAGS -DNO_WERROR ==== //depot/projects/hammer/contrib/amd/FREEBSD-Xlist#4 (text+ko) ==== @@ -1,7 +1,8 @@ -$FreeBSD: src/contrib/amd/FREEBSD-Xlist,v 1.5 2004/07/06 12:52:27 mbr Exp $ +$FreeBSD: src/contrib/amd/FREEBSD-Xlist,v 1.6 2007/12/11 19:15:17 obrien Exp $ *LSM.am-utils *Makefile.* *README.autofs +*README.osx *ac*.m4 *.old *acconfig.h @@ -15,6 +16,7 @@ *missing *mkinstalldirs *stamp-h.in +*amd/test1.sh *amd/Makefile.* *amq/Makefile.* *commit @@ -38,10 +40,13 @@ *conf/fh_dref/fh_dref_sunos3.h *conf/fh_dref/fh_dref_sunos4.h *conf/fh_dref/fh_dref_svr4.h +*conf/hn_dref/hn_dref_default.h, *conf/hn_dref/hn_dref_isc3.h *conf/hn_dref/hn_dref_linux.h *conf/mount/mount_aix.c +*conf/mount/mount_aix3.c *conf/mount/mount_bsdi3.c +*conf/mount/mount_default.c *conf/mount/mount_freebsd3.c *conf/mount/mount_hpux.c *conf/mount/mount_irix5.c @@ -54,6 +59,7 @@ *conf/mtab/mtab_aix.c *conf/mtab/mtab_file.c *conf/mtab/mtab_isc3.c +*conf/mtab/mtab_linux.c *conf/mtab/mtab_mach3.c *conf/mtab/mtab_osf.c *conf/mtab/mtab_svr4.c @@ -63,6 +69,7 @@ *conf/nfs_prot/nfs_prot_aix4_2.h *conf/nfs_prot/nfs_prot_aix4_3.h *conf/nfs_prot/nfs_prot_aix5_1.h +*conf/nfs_prot/nfs_prot_aix5_2.h *conf/nfs_prot/nfs_prot_bsdi2.h *conf/nfs_prot/nfs_prot_bsdi3.h *conf/nfs_prot/nfs_prot_darwin.h @@ -92,6 +99,12 @@ *conf/nfs_prot/nfs_prot_sunos5_8.h *conf/nfs_prot/nfs_prot_svr4.h *conf/nfs_prot/nfs_prot_ultrix.h +*conf/autofs/autofs_linux.h +*conf/autofs/autofs_linux.c +*conf/autofs/autofs_solaris_v1.h +*conf/autofs/autofs_solaris_v1.c +*conf/autofs/autofs_solaris_v2_v3.h +*conf/autofs/autofs_solaris_v2_v3.c *conf/sa_dref/sa_dref_386bsd.h *conf/sa_dref/sa_dref_aix3.h *conf/sa_dref/sa_dref_aoi.h @@ -103,6 +116,7 @@ *conf/trap/trap_aix3.h *conf/trap/trap_aux.h *conf/trap/trap_dgux.h +*conf/trap/trap_freebsd3.h *conf/trap/trap_hcx.h *conf/trap/trap_hpux.h *conf/trap/trap_hpux11.h @@ -115,7 +129,9 @@ *conf/trap/trap_stellix.h *conf/trap/trap_svr4.h *conf/trap/trap_ultrix.h +*conf/umount/umount_aix.c *conf/umount/umount_default.c +*conf/umount/umount_linux.c *conf/umount/umount_osf.c *doc/Makefile.am *doc/Makefile.in @@ -135,11 +151,118 @@ *fsinfo/Makefile.* *hlfsd/Makefile.* *libamu/Makefile.* +*libamu/alloca.c *libamu/clnt_sperrno.c *libamu/memcmp.c *libamu/strcasecmp.c *libamu/strdup.c *libamu/strstr.c +*libamu/strlcat.c +*libamu/strlcpy.c *libamu/ualarm.c *mk-amd-map/Makefile.* *wire-test/Makefile.* +*m4/GNUmakefile +*m4/amdgrep* +*m4/amindent* +*m4/autopat* +*m4/chop-aclocal.pl* +*m4/copy-if-newbig* +*m4/mk-aclocal* +*m4/mkconf* +*m4/rmtspc* +*m4/update_build_version* +*m4/macros/HEADER +*m4/macros/TRAILER +*m4/macros/c_void_p.m4 +*m4/macros/cache_check_dynamic.m4 +*m4/macros/check_amu_fs.m4 +*m4/macros/check_checkmount_style.m4 +*m4/macros/check_extern.m4 +*m4/macros/check_fhandle.m4 +*m4/macros/check_field.m4 +*m4/macros/check_fs_headers.m4 +*m4/macros/check_fs_mntent.m4 +*m4/macros/check_gnu_getopt.m4 +*m4/macros/check_hide_mount_type.m4 +*m4/macros/check_lib2.m4 +*m4/macros/check_map_funcs.m4 +*m4/macros/check_mnt2_cdfs_opt.m4 +*m4/macros/check_mnt2_gen_opt.m4 +*m4/macros/check_mnt2_nfs_opt.m4 +*m4/macros/check_mnttab_file_name.m4 +*m4/macros/check_mnttab_location.m4 +*m4/macros/check_mnttab_opt.m4 +*m4/macros/check_mnttab_style.m4 +*m4/macros/check_mnttab_type.m4 +*m4/macros/check_mount_style.m4 +*m4/macros/check_mount_trap.m4 +*m4/macros/check_mount_type.m4 +*m4/macros/check_mtype_printf_type.m4 +*m4/macros/check_mtype_type.m4 +*m4/macros/check_network_transport_type.m4 +*m4/macros/check_nfs_fh_dref.m4 +*m4/macros/check_nfs_hn_dref.m4 +*m4/macros/check_nfs_prot_headers.m4 +*m4/macros/check_nfs_sa_dref.m4 +*m4/macros/check_nfs_socket_connection.m4 +*m4/macros/check_os_libs.m4 +*m4/macros/check_restartable_signal_handler.m4 +*m4/macros/check_umount_style.m4 +*m4/macros/check_unmount_args.m4 +*m4/macros/check_unmount_call.m4 +*m4/macros/expand_cpp_hex.m4 +*m4/macros/expand_cpp_int.m4 +*m4/macros/expand_cpp_string.m4 +*m4/macros/expand_run_string.m4 +*m4/macros/extern_optarg.m4 +*m4/macros/extern_sys_errlist.m4 +*m4/macros/field_mntent_t_mnt_time_string.m4 +*m4/macros/func_bad_memcmp.m4 +*m4/macros/func_bad_yp_all.m4 +*m4/macros/header_templates.m4 +*m4/macros/host_macros.m4 +*m4/macros/linux_headers.m4 +*m4/macros/localconfig.m4 +*m4/macros/mount_headers.m4 +*m4/macros/name_package.m4 +*m4/macros/name_version.m4 +*m4/macros/opt_amu_cflags.m4 +*m4/macros/opt_cppflags.m4 +*m4/macros/opt_debug.m4 +*m4/macros/opt_ldflags.m4 +*m4/macros/opt_libs.m4 +*m4/macros/os_cflags.m4 +*m4/macros/os_cppflags.m4 +*m4/macros/os_ldflags.m4 +*m4/macros/package_bugreport.m4 +*m4/macros/package_name.m4 +*m4/macros/package_version.m4 +*m4/macros/save_state.m4 +*m4/macros/struct_field_nfs_fh.m4 +*m4/macros/struct_mntent.m4 +*m4/macros/struct_mnttab.m4 +*m4/macros/struct_nfs_args.m4 +*m4/macros/struct_nfs_fh.m4 +*m4/macros/struct_nfs_fh3.m4 +*m4/macros/struct_nfs_gfs_mount.m4 +*m4/macros/try_compile_anyfs.m4 +*m4/macros/try_compile_nfs.m4 +*m4/macros/try_compile_rpc.m4 +*m4/macros/type_auth_create_gidlist.m4 +*m4/macros/type_cachefs_args.m4 +*m4/macros/type_cdfs_args.m4 +*m4/macros/type_efs_args.m4 +*m4/macros/type_lofs_args.m4 +*m4/macros/type_mfs_args.m4 +*m4/macros/type_pcfs_args.m4 +*m4/macros/type_recvfrom_fromlen.m4 +*m4/macros/type_rfs_args.m4 +*m4/macros/type_svc_in_arg.m4 +*m4/macros/type_time_t.m4 +*m4/macros/type_tmpfs_args.m4 +*m4/macros/type_ufs_args.m4 +*m4/macros/type_xdrproc_t.m4 +*m4/macros/type_xfs_args.m4 +*m4/macros/type_yp_order_outorder.m4 +*m4/macros/with_addon.m4 ==== //depot/projects/hammer/contrib/amd/FREEBSD-upgrade#4 (text+ko) ==== @@ -1,21 +1,19 @@ # ex:ts=8 -$FreeBSD: src/contrib/amd/FREEBSD-upgrade,v 1.15 2004/05/14 13:29:48 mbr Exp $ +$FreeBSD: src/contrib/amd/FREEBSD-upgrade,v 1.16 2007/12/11 19:16:51 obrien Exp $ -AMD (am-utils) 6.0.9 - originals can be found at: ftp://shekel.mcl.cs.columbia.edu/pub/am-utils/ - (http://www.cs.columbia.edu/~ezk/am-utils/index.html) - +AMD (am-utils) 6.1.5 + originals can be found at: ftp://ftp.am-utils.org/pub/am-utils/ For the import of AMD many files were pruned by: - tar -X FREEBSD-Xlist -xzf am-utils-6.0.9.tar.gz + tar -X FREEBSD-Xlist -xf am-utils-6.1.5.tar.gz and `find . -name '.cvsignore' -delete` Then imported by: - cvs import -m 'Virgin import of AMD (am-utils) v6.0.9' \ - src/contrib/amd COLUMBIA amd_6_0_9 + cvs import -m 'Virgin import of AMD (am-utils) v6.1.5' \ + src/contrib/amd COLUMBIA amd_6_1_5 After the import, a separate extraction of am-utils was GNU configured in the "normal" way. The resulting config.h file should be compared with @@ -25,8 +23,11 @@ To make local changes to amd, simply patch and commit to the main branch (aka HEAD). Never make local changes on the vendor (COLUMBIA) branch. -All local changes should be submitted to "amd-dev@majordomo.cs.columbia.edu" -for inclusion in the next vendor release. +Note, we don't trim anything in scripts/ as sysadmins may find the bits +as a useful reference. + +All local changes should be submitted to "am-utils@am-utils.org" or +https://bugzilla.am-utils.org for inclusion in the next vendor release. Local changes: ==== //depot/projects/hammer/contrib/gcc/config/sparc/freebsd.h#10 (text+ko) ==== @@ -19,24 +19,26 @@ the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* $FreeBSD: src/contrib/gcc/config/sparc/freebsd.h,v 1.10 2007/05/19 02:30:20 kan Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/sparc/freebsd.h,v 1.11 2007/12/09 17:41:47 marius Exp $ */ #undef SUBTARGET_EXTRA_SPECS #define SUBTARGET_EXTRA_SPECS \ { "fbsd_dynamic_linker", FBSD_DYNAMIC_LINKER } /* FreeBSD needs the platform name (sparc64) defined. - Emacs needs to know if the arch is 64 or 32-bits. */ - -#undef CPP_CPU64_DEFAULT_SPEC -#define CPP_CPU64_DEFAULT_SPEC \ - "-D__sparc64__ -D__sparc_v9__ -D__sparcv9 -D__sparc__ -D__arch64__" + Emacs needs to know if the arch is 64 or 32-bits. + This also selects which targets are available via -mcpu. */ #undef FBSD_TARGET_CPU_CPP_BUILTINS #define FBSD_TARGET_CPU_CPP_BUILTINS() \ do \ { \ builtin_define ("__LP64__"); \ + builtin_define ("__sparc64__"); \ + builtin_define ("__sparc_v9__"); \ + builtin_define ("__sparcv9"); \ + builtin_define ("__sparc__"); \ + builtin_define ("__arch64__"); \ } \ while (0) ==== //depot/projects/hammer/contrib/gcc/fold-const.c#10 (text+ko) ==== @@ -5661,6 +5661,9 @@ } break; } + /* If the constant is negative, we cannot simplify this. */ + if (tree_int_cst_sgn (c) == -1) + break; /* FALLTHROUGH */ case NEGATE_EXPR: if ((t1 = extract_muldiv (op0, c, code, wide_type, strict_overflow_p)) ==== //depot/projects/hammer/include/nsswitch.h#4 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: nsswitch.h,v 1.6 1999/01/26 01:04:07 lukem Exp $ */ -/* $FreeBSD: src/include/nsswitch.h,v 1.4 2006/04/28 12:03:34 ume Exp $ */ +/* $FreeBSD: src/include/nsswitch.h,v 1.5 2007/12/12 10:08:02 bushman Exp $ */ /*- * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc. @@ -68,7 +68,8 @@ #define NSSRC_DNS "dns" /* DNS; IN for hosts, HS for others */ #define NSSRC_NIS "nis" /* YP/NIS */ #define NSSRC_COMPAT "compat" /* passwd,group in YP compat mode */ -#define NSSRC_CACHE "cache" /* cache daemon */ +#define NSSRC_CACHE "cache" /* nscd daemon */ +#define NSSRC_FALLBACK "__fallback" /* internal fallback source */ /* * currently implemented databases @@ -132,6 +133,7 @@ */ #define NS_FILES_CB(F,C) { NSSRC_FILES, F, C }, #define NS_COMPAT_CB(F,C) { NSSRC_COMPAT, F, C }, +#define NS_FALLBACK_CB(F) { NSSRC_FALLBACK, F, NULL }, #ifdef HESIOD # define NS_DNS_CB(F,C) { NSSRC_DNS, F, C }, ==== //depot/projects/hammer/lib/Makefile#66 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.226 2007/11/17 21:29:02 cognet Exp $ +# $FreeBSD: src/lib/Makefile,v 1.228 2007/12/12 16:39:31 ru Exp $ .include @@ -62,6 +62,10 @@ _libsdp= libsdp .endif +.if ${MK_GSSAPI} != "no" +_libgssapi= libgssapi +.endif + .if ${MK_IPX} != "no" _libipx= libipx .endif ==== //depot/projects/hammer/lib/libc/gdtoa/_ldtoa.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gdtoa/_ldtoa.c,v 1.4 2007/12/03 07:17:32 das Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gdtoa/_ldtoa.c,v 1.5 2007/12/09 19:48:57 das Exp $"); #include #include @@ -88,9 +88,7 @@ break; case FP_SUBNORMAL: kind = STRTOG_Denormal; -#ifdef LDBL_IMPLICIT_NBIT be++; -#endif break; case FP_INFINITE: kind = STRTOG_Infinite; ==== //depot/projects/hammer/lib/libc/gen/getgrent.c#13 (text+ko) ==== @@ -31,7 +31,7 @@ * */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.36 2006/09/18 09:34:48 maxim Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.37 2007/12/12 10:08:02 bushman Exp $"); #include "namespace.h" #include @@ -40,6 +40,7 @@ #include #include #endif +#include #include #include #ifdef HESIOD @@ -143,6 +144,9 @@ static int compat_setgrent(void *, void *, va_list); static int compat_group(void *, void *, va_list); +static int gr_addgid(gid_t, gid_t *, int, int *); +static int getgroupmembership_fallback(void *, void *, va_list); + #ifdef NS_CACHING static int grp_id_func(char *, size_t *, va_list, void *); static int grp_marshal_func(char *, size_t *, void *, va_list, void *); @@ -361,89 +365,195 @@ NSS_MP_CACHE_HANDLING(group); #endif /* NS_CACHING */ - -/* XXX IEEE Std 1003.1, 2003 specifies `void setgrent(void)' */ -int -setgrent(void) -{ #ifdef NS_CACHING - static const nss_cache_info cache_info = NS_MP_CACHE_INFO_INITIALIZER( - group, (void *)nss_lt_all, - NULL, NULL); +static const nss_cache_info setgrent_cache_info = NS_MP_CACHE_INFO_INITIALIZER( + group, (void *)nss_lt_all, + NULL, NULL); #endif - static const ns_dtab dtab[] = { - { NSSRC_FILES, files_setgrent, (void *)SETGRENT }, +static const ns_dtab setgrent_dtab[] = { + { NSSRC_FILES, files_setgrent, (void *)SETGRENT }, #ifdef HESIOD - { NSSRC_DNS, dns_setgrent, (void *)SETGRENT }, + { NSSRC_DNS, dns_setgrent, (void *)SETGRENT }, #endif #ifdef YP - { NSSRC_NIS, nis_setgrent, (void *)SETGRENT }, + { NSSRC_NIS, nis_setgrent, (void *)SETGRENT }, #endif - { NSSRC_COMPAT, compat_setgrent, (void *)SETGRENT }, + { NSSRC_COMPAT, compat_setgrent, (void *)SETGRENT }, #ifdef NS_CACHING - NS_CACHE_CB(&cache_info) + NS_CACHE_CB(&setgrent_cache_info) #endif - { NULL, NULL, NULL } - }; - (void)_nsdispatch(NULL, dtab, NSDB_GROUP, "setgrent", defaultsrc, 0); - return (1); -} - + { NULL, NULL, NULL } +}; -int -setgroupent(int stayopen) -{ #ifdef NS_CACHING - static const nss_cache_info cache_info = NS_MP_CACHE_INFO_INITIALIZER( - group, (void *)nss_lt_all, - NULL, NULL); +static const nss_cache_info endgrent_cache_info = NS_MP_CACHE_INFO_INITIALIZER( + group, (void *)nss_lt_all, + NULL, NULL); #endif - static const ns_dtab dtab[] = { - { NSSRC_FILES, files_setgrent, (void *)SETGRENT }, +static const ns_dtab endgrent_dtab[] = { + { NSSRC_FILES, files_setgrent, (void *)ENDGRENT }, #ifdef HESIOD - { NSSRC_DNS, dns_setgrent, (void *)SETGRENT }, + { NSSRC_DNS, dns_setgrent, (void *)ENDGRENT }, #endif #ifdef YP - { NSSRC_NIS, nis_setgrent, (void *)SETGRENT }, + { NSSRC_NIS, nis_setgrent, (void *)ENDGRENT }, #endif - { NSSRC_COMPAT, compat_setgrent, (void *)SETGRENT }, + { NSSRC_COMPAT, compat_setgrent, (void *)ENDGRENT }, #ifdef NS_CACHING - NS_CACHE_CB(&cache_info) + NS_CACHE_CB(&endgrent_cache_info) #endif - { NULL, NULL, NULL } - }; - (void)_nsdispatch(NULL, dtab, NSDB_GROUP, "setgrent", defaultsrc, - stayopen); - return (1); -} - + { NULL, NULL, NULL } +}; -void -endgrent(void) -{ #ifdef NS_CACHING - static const nss_cache_info cache_info = NS_MP_CACHE_INFO_INITIALIZER( - group, (void *)nss_lt_all, - NULL, NULL); +static const nss_cache_info getgrent_r_cache_info = NS_MP_CACHE_INFO_INITIALIZER( + group, (void *)nss_lt_all, + grp_marshal_func, grp_unmarshal_func); #endif - static const ns_dtab dtab[] = { - { NSSRC_FILES, files_setgrent, (void *)ENDGRENT }, +static const ns_dtab getgrent_r_dtab[] = { + { NSSRC_FILES, files_group, (void *)nss_lt_all }, #ifdef HESIOD - { NSSRC_DNS, dns_setgrent, (void *)ENDGRENT }, + { NSSRC_DNS, dns_group, (void *)nss_lt_all }, #endif #ifdef YP - { NSSRC_NIS, nis_setgrent, (void *)ENDGRENT }, + { NSSRC_NIS, nis_group, (void *)nss_lt_all }, #endif - { NSSRC_COMPAT, compat_setgrent, (void *)ENDGRENT }, + { NSSRC_COMPAT, compat_group, (void *)nss_lt_all }, #ifdef NS_CACHING - NS_CACHE_CB(&cache_info) + NS_CACHE_CB(&getgrent_r_cache_info) #endif - { NULL, NULL, NULL } + { NULL, NULL, NULL } +}; + +static int +gr_addgid(gid_t gid, gid_t *groups, int maxgrp, int *grpcnt) +{ + int ret, dupc; + + for (dupc = 0; dupc < MIN(maxgrp, *grpcnt); dupc++) { + if (groups[dupc] == gid) + return 1; + } + + ret = 1; + if (*grpcnt < maxgrp) + groups[*grpcnt] = gid; + else + ret = 0; + + (*grpcnt)++; + + return ret; +} + +static int +getgroupmembership_fallback(void *retval, void *mdata, va_list ap) +{ + const ns_src src[] = { + { mdata, NS_SUCCESS }, + { NULL, 0} }; - (void)_nsdispatch(NULL, dtab, NSDB_GROUP, "endgrent", defaultsrc); + struct group grp; + struct group *grp_p; + char *buf; + size_t bufsize; + const char *uname; + gid_t *groups; + gid_t agroup; + int maxgrp, *grpcnt; + int i, rv, ret_errno; + + /* + * As this is a fallback method, only provided src + * list will be respected during methods search. + */ + assert(src[0].name != NULL); + + uname = va_arg(ap, const char *); + agroup = va_arg(ap, gid_t); + groups = va_arg(ap, gid_t *); + maxgrp = va_arg(ap, int); + grpcnt = va_arg(ap, int *); + + rv = NS_UNAVAIL; + + buf = malloc(GRP_STORAGE_INITIAL); + if (buf == NULL) + goto out; + + bufsize = GRP_STORAGE_INITIAL; + + gr_addgid(agroup, groups, maxgrp, grpcnt); + + _nsdispatch(NULL, setgrent_dtab, NSDB_GROUP, "setgrent", src, 0); + for (;;) { + do { + ret_errno = 0; + grp_p = NULL; + rv = _nsdispatch(&grp_p, getgrent_r_dtab, NSDB_GROUP, + "getgrent_r", src, &grp, buf, bufsize, &ret_errno); + + if (grp_p == NULL && ret_errno == ERANGE) { + free(buf); + if ((bufsize << 1) > GRP_STORAGE_MAX) { + buf = NULL; + errno = ERANGE; + goto out; + } + + bufsize <<= 1; + buf = malloc(bufsize); + if (buf == NULL) { + goto out; + } + } + } while (grp_p == NULL && ret_errno == ERANGE); + + if (ret_errno != 0) { + errno = ret_errno; + goto out; + } + + if (grp_p == NULL) + break; + + for (i = 0; grp.gr_mem[i]; i++) { + if (strcmp(grp.gr_mem[i], uname) == 0) + gr_addgid(grp.gr_gid, groups, maxgrp, grpcnt); + } + } + + _nsdispatch(NULL, endgrent_dtab, NSDB_GROUP, "endgrent", src); +out: + free(buf); + return (rv); +} + +/* XXX IEEE Std 1003.1, 2003 specifies `void setgrent(void)' */ +int +setgrent(void) +{ + (void)_nsdispatch(NULL, setgrent_dtab, NSDB_GROUP, "setgrent", defaultsrc, 0); + return (1); +} + + +int +setgroupent(int stayopen) +{ + (void)_nsdispatch(NULL, setgrent_dtab, NSDB_GROUP, "setgrent", defaultsrc, + stayopen); + return (1); +} + + +void +endgrent(void) +{ + (void)_nsdispatch(NULL, endgrent_dtab, NSDB_GROUP, "endgrent", defaultsrc); } @@ -451,31 +561,11 @@ getgrent_r(struct group *grp, char *buffer, size_t bufsize, struct group **result) { -#ifdef NS_CACHING - static const nss_cache_info cache_info = NS_MP_CACHE_INFO_INITIALIZER( - group, (void *)nss_lt_all, - grp_marshal_func, grp_unmarshal_func); -#endif - - static const ns_dtab dtab[] = { - { NSSRC_FILES, files_group, (void *)nss_lt_all }, -#ifdef HESIOD - { NSSRC_DNS, dns_group, (void *)nss_lt_all }, -#endif -#ifdef YP - { NSSRC_NIS, nis_group, (void *)nss_lt_all }, -#endif - { NSSRC_COMPAT, compat_group, (void *)nss_lt_all }, -#ifdef NS_CACHING - NS_CACHE_CB(&cache_info) -#endif - { NULL, NULL, NULL } - }; int rv, ret_errno; ret_errno = 0; *result = NULL; - rv = _nsdispatch(result, dtab, NSDB_GROUP, "getgrent_r", defaultsrc, + rv = _nsdispatch(result, getgrent_r_dtab, NSDB_GROUP, "getgrent_r", defaultsrc, grp, buffer, bufsize, &ret_errno); if (rv == NS_SUCCESS) return (0); @@ -560,6 +650,30 @@ } + +int +__getgroupmembership(const char *uname, gid_t agroup, gid_t *groups, + int maxgrp, int *grpcnt) +{ + static const ns_dtab dtab[] = { + NS_FALLBACK_CB(getgroupmembership_fallback) + { NULL, NULL, NULL } + }; + int rv; + + assert(uname != NULL); + /* groups may be NULL if just sizing when invoked with maxgrp = 0 */ + assert(grpcnt != NULL); + + *grpcnt = 0; + rv = _nsdispatch(NULL, dtab, NSDB_GROUP, "getgroupmembership", + defaultsrc, uname, agroup, groups, maxgrp, grpcnt); + + /* too many groups found? */ + return (*grpcnt > maxgrp ? -1 : 0); +} + + static struct group grp; static char *grp_storage; static size_t grp_storage_size; @@ -1436,3 +1550,5 @@ return (NS_RETURN); } } + + ==== //depot/projects/hammer/lib/libc/gen/getgrouplist.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ static char sccsid[] = "@(#)getgrouplist.c 8.2 (Berkeley) 12/8/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getgrouplist.c,v 1.15 2007/01/09 00:27:53 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getgrouplist.c,v 1.16 2007/12/12 10:08:02 bushman Exp $"); /* * get credential @@ -42,46 +42,11 @@ #include #include +extern int __getgroupmembership(const char *, gid_t, gid_t *, int, int *); + int getgrouplist(const char *uname, gid_t agroup, gid_t *groups, int *grpcnt) { - const struct group *grp; - int i, maxgroups, ngroups, ret; + return __getgroupmembership(uname, agroup, groups, *grpcnt, grpcnt); +} - ret = 0; - ngroups = 0; - maxgroups = *grpcnt; - /* - * When installing primary group, duplicate it; - * the first element of groups is the effective gid - * and will be overwritten when a setgid file is executed. - */ - groups[ngroups++] = agroup; - if (maxgroups > 1) - groups[ngroups++] = agroup; - /* - * Scan the group file to find additional groups. - */ - setgrent(); - while ((grp = getgrent()) != NULL) { - for (i = 0; i < ngroups; i++) { - if (grp->gr_gid == groups[i]) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Dec 12 23:20:12 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 076AD16A519; Wed, 12 Dec 2007 23:20:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1524016A41B for ; Wed, 12 Dec 2007 23:20:11 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EC5EB13C474 for ; Wed, 12 Dec 2007 23:20:08 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBCNK8h1085167 for ; Wed, 12 Dec 2007 23:20:08 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBCNK8kb085164 for perforce@freebsd.org; Wed, 12 Dec 2007 23:20:08 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Dec 2007 23:20:08 GMT Message-Id: <200712122320.lBCNK8kb085164@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130755 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 23:20:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=130755 Change 130755 by jb@jb_freebsd1 on 2007/12/12 23:19:53 Remove the old versions of the DTrace files. The new integration has the extra src directory in the path. This is perhaps gratuitious, but it gives me a clean start now that the layout in CVS has pretty much stabilized after ZFS was added. It's more a case of the DTrace import fitting in with that style from now on. Affected files ... .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/dtrace.c#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/Makefile#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/Makefile.subdirs#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/README#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/cmd/Makefile#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/Makefile#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/baddof.c#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/Makefile#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/badioctl.c#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/32/Makefile#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/64/Makefile#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/Makefile#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/Makefile.com#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/chkargs.c#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Getopt.java#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/JDTrace.java#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Makefile#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/jdtrace.c#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/manifest/jdtrace.jar-manifest#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/Makefile#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/Makefile#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/Makefile.com#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/Makefile#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_FUNC.bad.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_MDIM.bad.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_NULL.bad.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_REDEF.redef.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.avgtoofew.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.maxnoarg.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.mintoofew.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.quantizetoofew.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.sumtoofew.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_AGGARG.bad.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_PROTO.bad.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_IDENT.bad.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_UNDEF.badaggfunc.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badexpr.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badkey3.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.noeffect.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey2.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey4.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqbad1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqshort.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASEVAL.bad.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMTYPE.lqbad1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMVAL.bad.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.order.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.order.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHSTEP.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MISMATCH.lqbadarg.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPLARGE.lqtoofew.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPSMALL.bad.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPTYPE.lqbadinc.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPVAL.bad.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_AGGARG.bad.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_PROTO.bad.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_SCALAR.bad.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_ARG.lquantizetoofew.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgnoarg.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgtoomany.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.counttoomany.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizenoarg.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizetoomany.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxnoarg.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxtoomany.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.minnoarg.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.mintoomany.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizenoarg.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizetoomany.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumnoarg.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumtoomany.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_AGGARG.bad.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badmany.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badnone.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_SCALAR.bad.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d.out#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count3.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.goodkey.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signature.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_2.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.modby0.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.addmin.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.divmin.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muladd.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muldiv.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.basics.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_ARR_BADREF.bad.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRBIG.toobig.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRNULL.bad.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRSUB.bad.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_PROTO_TYPE.badtuple.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_IDENT_UNDEF.badureg.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic2.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic3.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic4.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic5.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic6.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.uregsarray.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.this.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_ARG.badsig.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toofew.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toomany.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_SYNTAX.errassign.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.tupoflow.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.cpyarray.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.diffprofile.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.initialize.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.invalidref.d#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.misc.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.orthogonality.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.this.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.valassign.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.begin.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.tick.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_ADDROF_BITFIELD.BitfieldAddress.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.NegBitField.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.ZeroBitField.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.ExceedBaseType.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.GreaterThan64.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFTYPE.badtype.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_OFFSETOF_BITFIELD.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_SIZEOF_BITFIELD.SizeofBitfield.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.BitFieldPromotion.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.SizeofBitField.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.end.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize2.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize3.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.zerobuf.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.alignring.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.cputime.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.dynvarsize.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize1.d#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize2.d#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize3.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.smallring.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.cpuusage.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.nice.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.priority.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.prsize.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.rssize.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0clause.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8clause.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.execname.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.hpriority.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.timestamp.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.vtimestamp.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggfun.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggtup.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.arrtup.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.body.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.both.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.pred.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.nopred.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.pred.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predfirst.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predlast.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LOCASSC.NonLocalAssoc.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LONGINT.LongStruct.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PARMCLASS.BadStorageClass.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_NAME.VoidName.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_TYPE.Dyn.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VARARGS.VarLenArgs.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VOID.NonSoleVoid.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_SIGNINT.UnsignedStruct.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_VOIDATTR.ShortVoidDecl.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.arrays.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.basics.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.funcs.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.pointers.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.varargsfuncs.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/badptr.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/countdown.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/counter.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/errorpath.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/hello.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/kstat.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/ksyms.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/renormalize.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rtime.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rw.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwinfo.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwtime.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/specopen.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/truss.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/trussrw.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/userfunc.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_AGGREGATION.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DBLERROR.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DYNAMIC.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.end.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPEC.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPECUNAVAIL.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_STKSTROVERFLOW.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/err.D_PDESC_ZERO.InvalidDescription1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.APIVersion.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.AddSearchPath.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.CoalesceTrace.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ELFGeneration.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.IncludedFilePath.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithFunctions#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithIDs#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithModules#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithNames#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithProviders#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ShowCompilerCode.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceFunctions#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceIDs#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceModule#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceNames#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceProvider#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.VerboseStabilityReport.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.AddSearchPath.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeGiga.d.ksh#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeKilo.d.ksh#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeMega.d.ksh#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeTera.d.ksh#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel32.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel64.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithoutW.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationOut.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationWithO.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus1.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus2.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExtraneousProbeIds.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName1.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName2.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId1.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId2.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId3.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule1.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule2.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule3.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule4.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProbeIdentifier.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider1.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider2.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider3.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider4.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc1.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc2.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc3.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc4.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc5.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc6.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc7.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc8.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc9.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID1.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID2.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID3.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID4.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID5.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID6.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID7.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule1.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule2.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule3.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule4.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule5.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule6.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule7.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule8.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName1.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName2.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName3.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName4.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName5.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName6.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName7.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName8.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName9.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider1.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider2.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider3.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider4.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider5.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.MultipleInvalidProbeId.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.PreprocessorStatement.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.UnDefineNameWithCPP.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbeIdentfier.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbesWithoutZ.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/end/err.D_IDENT_UNDEF.timespent.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.end.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.endwithoutbegin.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multibeginend.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multiend.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_DECL_IDRED.EnumSameName.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_UNKNOWN.RepeatIdentifiers.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumEquality.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumSameValue.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumValAssign.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_BADADDR.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_DIVZERO.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_UNKNOWN.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.error.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.errorend.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.D_PROTO_LEN.noarg.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.exitarg1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/tst.basic1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/err.D_PDESC_ZERO.notreturn.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.basic.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionentry.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionreturnvalue.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.ioctlargs.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offset.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offsetzero.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return0.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.tailcall.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_FUNC_UNDEF.progenyofbad1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_OP_VFPTR.badop.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.chillbadarg.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.copyoutbadarg.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.mobadarg.d#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.raisebadarg.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.allocanoarg.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.badbreakpoint.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoofew.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoomany.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrbadarg.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrtoofew.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoofew.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoomany.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoofew.d#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoomany.d#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtabadarg.d#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.panicbadarg.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.progenyofbad2.d#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.stopbadarg.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_STRINGOF_TYPE.badstringof.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_VAR_UNDEF.badvar.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca2.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy2.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy3.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy4.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy5.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy6.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badchill.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.chillbadarg.ksh#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyout.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutbadaddr.ksh#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutstrbadaddr.ksh#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoa6badaddr.d#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoabadaddr.d#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadaddr.d#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadarg.d#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.badfreopen.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.bcopy.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.chill.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.copyin.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.copyinto.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ddi_pathname.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.default.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.freopen.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ftruncate.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ftruncate.ksh.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.hton.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.index.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.index.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa.d#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa6.d#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa6.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostr.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostr.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owned.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owner.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_type_adaptive.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.progenyof.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.rand.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strchr.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strchr.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strstr.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strstr.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok_null.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/err.D_ADDROF_LVAL.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/err.D_EMPTY.empty.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/tst.clauses.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/tst.stmts.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_DECL_IDRED.redef1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_DECL_IDRED.redef2.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_IDENT_UNDEF.recur.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef2.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineDataAssign.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineExpression.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineKinds.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineKinds.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineTypedef.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineWritableAssign.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/Makefile#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/manifest/test.jar-manifest#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestAbort.java#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestBean.java#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestClose.java#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestDrop.java#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestEnable.java#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestFunctionLookup.java#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestMaxConsumers.java#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestMultiAggPrinta.java#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestProbeData.java#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestProbeDescription.java#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestStateMachine.java#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestStopLock.java#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Abort.ksh#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Abort.ksh.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh.out#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Close.ksh#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Close.ksh.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Drop.ksh#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Drop.ksh.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Enable.ksh#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Enable.ksh.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.c#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.ksh#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.ksh.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MaxConsumers.ksh#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MaxConsumers.ksh.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MultiAggPrinta.ksh#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MultiAggPrinta.ksh.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.c#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.ksh#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.ksh.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeDescription.ksh#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeDescription.ksh.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StateMachine.ksh#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StateMachine.ksh.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StopLock.ksh#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StopLock.ksh.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.printa.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.printa.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NL.char.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NULL.char.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_INT_DIGIT.InvalidDigit.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_INT_OFLOW.BigInt.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_STR_NL.string.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brace1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brace2.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack2.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack3.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren2.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren3.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/tst.D_MACRO_OFLOW.ParIntOvflow.d.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/mdb/tst.dtracedcmd.ksh#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.icmp.ksh#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.tcp.ksh#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.udp.ksh#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/err.D_PRAGMA_OPTSET.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.badopt.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.boolopt.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.boolopt.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dynopt.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dynopt.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.enablerace.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.haslam.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.roch.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.schrock.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/err.D_PRINTA_AGGKEY.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/err.D_PRINTA_AGGPROTO.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.many.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.many.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.same.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.same.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sort.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sort.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sortpos.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sortpos.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.tuplecompat.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.tuplecompat.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero2.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero2.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero3.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero3.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_BITFIELD.bitfield.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_TYPE.badtype.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_TYPE.notsou.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.OffsetofNULL.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.badmemb.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofAlias.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofArith.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofUnion.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.struct.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.struct.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.union.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.union.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/operators/tst.ternary.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/operators/tst.ternary.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badproc1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_BADPID.badproc2.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_CREATEFAIL.many.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_CREATEFAIL.many.exe#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.exe#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.exe#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.exe#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.float.c#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.float.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.c#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.d#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.c#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.main.ksh#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.manypids.ksh#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.probemod.ksh#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.c#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.c#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.c#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.c#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.exe#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.exe#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.BadAlign.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.ArrayVar.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.DynamicVar.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.agg.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_DEREF_NONPTR.noptr.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_DEREF_VOID.VoidPointerDeref.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_ARRFUN.ArrayAssignment.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_INCOMPAT.VoidPointerArith.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_LVAL.AddressChange.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_PTR.NonPointerAccess.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_PTR.badpointer.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_SOU.BadPointerAccess.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_SOU.badpointer.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress2.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress3.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress4.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress5.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer2.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer3.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.GlobalVar.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.IntegerArithmetic1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic2.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic3.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerAssignment.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ValidPointer1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ValidPointer2.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.VoidCast.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.basic1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.basic2.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGERR.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_INVAL.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_MALFORM.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_UNUSED.UnusedPragma.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_PRED_SCALAR.NonScalarPred.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_SYNTAX.invalid.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_SYNTAX.operr.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.argsnotcached.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.basics.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.basics.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.complex.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.complex.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.predcache.ksh#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_IDENT_UNDEF.afterprobe.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_PRAGCTL_INVAL.tabdefine.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_SYNTAX.withoutpound.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.defincomp.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefelsenotendif.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefincomp.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefnotendif.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.incompelse.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.mulelse.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifdef.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifdef.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifndef.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifndef.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifnotdef.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifnotdef.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicaland.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicaland.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalandor.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalandor.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalor.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalor.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.muland.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.muland.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.mulor.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.mulor.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.precondi.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.precondi.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.predicatedeclare.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexp.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexp.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpelse.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpelse.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpif.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpif.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpifelse.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpifelse.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.withinprobe.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badagg.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badfmt.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badval.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_PROTO.bad.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.jstack.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.stack.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.ustack.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.basics.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.basics.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.def.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.def.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.dynwidth.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.dynwidth.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.fmt.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.fmt.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.many.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.manyval.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.manyval.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.stack.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.tuple.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.tuple.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_AGG_CONV.aggfmt.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_EXTRA.toomany.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_EXTRA.widths.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_FMT.badfmt.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_PROTO.novalue.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_TYPE.aggarg.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_TYPE.recursive.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_PROTO.noprec.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_PROTO.nowidth.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_TYPE.badprec.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_TYPE.badwidth.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PROTO_LEN.toofew.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv2.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv3.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.flags.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.flags.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.hello.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.hello.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.ints.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.ints.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.precs.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.precs.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.print-f.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.print-f.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printT.ksh#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printT.ksh.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printY.ksh#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printY.ksh.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printcont.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printcont.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printeE.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printeE.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printgG.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printgG.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.rawfmt.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.rawfmt.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.uints.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.uints.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.wp.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.wp.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.func_access.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.op_access.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.unpriv_funcs.ksh#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.probeqtn.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.probestar.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.tickstar.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.assign.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.declare.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.declarein.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.lbraces.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.probespec.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.rbraces.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.recdec.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.basic1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.check.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.declare.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.declareafter.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.emptyprobe.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragma.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmaaftertab.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmainside.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmaoutside.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.probestar.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.create.ksh#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exec.ksh#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ENOENT.ksh#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ksh#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitcore.ksh#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitexit.ksh#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.c#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.startexit.ksh#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZERO.profile.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROonens.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROonensec.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROoneus.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROoneusec.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.argtest.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.argtest.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.basic.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.basic.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.func.ksh#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.mod.ksh#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilehz.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilehz.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilems.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilems.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilemsec.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilemsec.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilenhz.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilenhz.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilens.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilens.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilensec.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilensec.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profiles.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profiles.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilesec.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilesec.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileus.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileus.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileusec.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileusec.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.sym.ksh#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.c#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.ksh#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.ksh.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh#4 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_INVAL.wrongdec4.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.nonprofile.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.wrongdec1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.wrongdec2.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.wrongdec3.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.basics.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.basics.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.beginexit.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.beginprof.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.beginprof.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probattrs.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probattrs.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probefunc.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probefunc.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probemod.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probemod.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probename.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probename.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probprov.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probprov.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.profend.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.profend.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.profexit.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.profexit.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.trace.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.trace.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.twoprof.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.twoprof.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.c#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.c#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.c#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/rates/tst.aggrate.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/rates/tst.aggrate.d.out#2 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/rates/tst.statusrate.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/rates/tst.switchrate.d#3 delete .. //depot/projects/opensolaris/contrib/opensolaris/cmd/dtrace/test/tst/common/rates/tst.switchrate.d.out#2 delete >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Dec 12 23:35:26 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EDE9A16A421; Wed, 12 Dec 2007 23:35:25 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A189B16A418 for ; Wed, 12 Dec 2007 23:35:25 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A08DD13C448 for ; Wed, 12 Dec 2007 23:35:25 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBCNZPSe088372 for ; Wed, 12 Dec 2007 23:35:25 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBCNZPq1088369 for perforce@freebsd.org; Wed, 12 Dec 2007 23:35:25 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 12 Dec 2007 23:35:25 GMT Message-Id: <200712122335.lBCNZPq1088369@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 130758 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 23:35:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=130758 Change 130758 by hselasky@hselasky_laptop001 on 2007/12/12 23:35:04 It seems like there is a problem setting the MTU too high for the "if_ural" compatible chips. Try reducing the MTU size back to the original. Symptom: "real length" in the packet header was 0 while received packet length on the USB bus was non-zero. If this problem re-appears you can work it around by something like this: ifconfig ural0 mtu 1100 up Affected files ... .. //depot/projects/usb/src/sys/dev/usb/if_uralreg.h#16 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/if_uralreg.h#16 (text+ko) ==== @@ -22,7 +22,7 @@ #define RAL_RX_DESC_SIZE (sizeof (struct ural_rx_desc)) #define RAL_TX_DESC_SIZE (sizeof (struct ural_tx_desc)) -#define RAL_FRAME_SIZE 0x980 /* 0x780 (old value) */ +#define RAL_FRAME_SIZE 0x780 /* NOTE: using 0x980 does not work */ #if (RAL_FRAME_SIZE % 0x80) #error "Invalid RAL_FRAME_SIZE" #endif From owner-p4-projects@FreeBSD.ORG Wed Dec 12 23:42:41 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 250ED16A419; Wed, 12 Dec 2007 23:42:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AD99616A46B for ; Wed, 12 Dec 2007 23:42:40 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 93DCF13C455 for ; Wed, 12 Dec 2007 23:42:40 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBCNge4f089512 for ; Wed, 12 Dec 2007 23:42:40 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBCNgXPV089461 for perforce@freebsd.org; Wed, 12 Dec 2007 23:42:33 GMT (envelope-from jb@freebsd.org) Date: Wed, 12 Dec 2007 23:42:33 GMT Message-Id: <200712122342.lBCNgXPV089461@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130759 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 23:42:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=130759 Change 130759 by jb@jb_freebsd1 on 2007/12/12 23:41:43 This change contains all FreeBSD changes from the latest OpenSolaris import we have to the sources that are currently in CVS. Luckily we have p4 to merge new changes to OpenSolaris into our code base. If we only had CVS, this would be a nightmare. Affected files ... .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/common/acl/acl_common.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/common/acl/acl_common.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/common/avl/avl.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/common/nvpair/nvpair.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/common/zfs/zfs_namecheck.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/common/zfs/zfs_namecheck.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/common/zfs/zfs_prop.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/common/zfs/zfs_prop.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/Makefile.files#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/gfs.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/bplist.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/refcount.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/space_map.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/txg.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/unique.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/os/callb.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/os/list.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/os/taskq.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/rpc/xdr.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/rpc/xdr.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/byteorder.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/callb.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/cred.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/debug.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/dkio.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/feature_tests.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/fm/protocol.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/fm/util.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/gfs.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/nvpair.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/processor.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/procset.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/sdt.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/synch.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/vmem.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/zmod/zmod.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/zmod/zmod_subr.c#2 edit Differences ... ==== //depot/projects/opensolaris/src/sys/contrib/opensolaris/common/acl/acl_common.c#2 (text) ==== @@ -2,8 +2,9 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. + * Common Development and Distribution License, Version 1.0 only + * (the "License"). You may not use this file except in compliance + * with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -19,204 +20,78 @@ * CDDL HEADER END */ /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" #include +#include #include -#include #if defined(_KERNEL) #include -#include -#include +#include #else #include #include -#include #include -#include #include -#include -#include -#include #define ASSERT assert #endif -#define ACE_POSIX_SUPPORTED_BITS (ACE_READ_DATA | \ - ACE_WRITE_DATA | ACE_APPEND_DATA | ACE_EXECUTE | \ - ACE_READ_ATTRIBUTES | ACE_READ_ACL | ACE_WRITE_ACL) - - -#define ACL_SYNCHRONIZE_SET_DENY 0x0000001 -#define ACL_SYNCHRONIZE_SET_ALLOW 0x0000002 -#define ACL_SYNCHRONIZE_ERR_DENY 0x0000004 -#define ACL_SYNCHRONIZE_ERR_ALLOW 0x0000008 - -#define ACL_WRITE_OWNER_SET_DENY 0x0000010 -#define ACL_WRITE_OWNER_SET_ALLOW 0x0000020 -#define ACL_WRITE_OWNER_ERR_DENY 0x0000040 -#define ACL_WRITE_OWNER_ERR_ALLOW 0x0000080 - -#define ACL_DELETE_SET_DENY 0x0000100 -#define ACL_DELETE_SET_ALLOW 0x0000200 -#define ACL_DELETE_ERR_DENY 0x0000400 -#define ACL_DELETE_ERR_ALLOW 0x0000800 - -#define ACL_WRITE_ATTRS_OWNER_SET_DENY 0x0001000 -#define ACL_WRITE_ATTRS_OWNER_SET_ALLOW 0x0002000 -#define ACL_WRITE_ATTRS_OWNER_ERR_DENY 0x0004000 -#define ACL_WRITE_ATTRS_OWNER_ERR_ALLOW 0x0008000 - -#define ACL_WRITE_ATTRS_WRITER_SET_DENY 0x0010000 -#define ACL_WRITE_ATTRS_WRITER_SET_ALLOW 0x0020000 -#define ACL_WRITE_ATTRS_WRITER_ERR_DENY 0x0040000 -#define ACL_WRITE_ATTRS_WRITER_ERR_ALLOW 0x0080000 - -#define ACL_WRITE_NAMED_WRITER_SET_DENY 0x0100000 -#define ACL_WRITE_NAMED_WRITER_SET_ALLOW 0x0200000 -#define ACL_WRITE_NAMED_WRITER_ERR_DENY 0x0400000 -#define ACL_WRITE_NAMED_WRITER_ERR_ALLOW 0x0800000 - -#define ACL_READ_NAMED_READER_SET_DENY 0x1000000 -#define ACL_READ_NAMED_READER_SET_ALLOW 0x2000000 -#define ACL_READ_NAMED_READER_ERR_DENY 0x4000000 -#define ACL_READ_NAMED_READER_ERR_ALLOW 0x8000000 - -#define ACE_VALID_MASK_BITS (\ - ACE_READ_DATA | \ - ACE_LIST_DIRECTORY | \ - ACE_WRITE_DATA | \ - ACE_ADD_FILE | \ - ACE_APPEND_DATA | \ - ACE_ADD_SUBDIRECTORY | \ - ACE_READ_NAMED_ATTRS | \ - ACE_WRITE_NAMED_ATTRS | \ - ACE_EXECUTE | \ - ACE_DELETE_CHILD | \ - ACE_READ_ATTRIBUTES | \ - ACE_WRITE_ATTRIBUTES | \ - ACE_DELETE | \ - ACE_READ_ACL | \ - ACE_WRITE_ACL | \ - ACE_WRITE_OWNER | \ - ACE_SYNCHRONIZE) - -#define ACE_MASK_UNDEFINED 0x80000000 - -#define ACE_VALID_FLAG_BITS (ACE_FILE_INHERIT_ACE | \ - ACE_DIRECTORY_INHERIT_ACE | \ - ACE_NO_PROPAGATE_INHERIT_ACE | ACE_INHERIT_ONLY_ACE | \ - ACE_SUCCESSFUL_ACCESS_ACE_FLAG | ACE_FAILED_ACCESS_ACE_FLAG | \ - ACE_IDENTIFIER_GROUP | ACE_OWNER | ACE_GROUP | ACE_EVERYONE) - -/* - * ACL conversion helpers - */ - -typedef enum { - ace_unused, - ace_user_obj, - ace_user, - ace_group, /* includes GROUP and GROUP_OBJ */ - ace_other_obj -} ace_to_aent_state_t; - -typedef struct acevals { - uid_t key; - avl_node_t avl; - uint32_t mask; - uint32_t allowed; - uint32_t denied; - int aent_type; -} acevals_t; - -typedef struct ace_list { - acevals_t user_obj; - avl_tree_t user; - int numusers; - acevals_t group_obj; - avl_tree_t group; - int numgroups; - acevals_t other_obj; - uint32_t acl_mask; - int hasmask; - int dfacl_flag; - ace_to_aent_state_t state; - int seen; /* bitmask of all aclent_t a_type values seen */ -} ace_list_t; - ace_t trivial_acl[] = { - {(uid_t)-1, 0, ACE_OWNER, ACE_ACCESS_DENIED_ACE_TYPE}, - {(uid_t)-1, ACE_WRITE_ACL|ACE_WRITE_OWNER|ACE_WRITE_ATTRIBUTES| + {-1, 0, ACE_OWNER, ACE_ACCESS_DENIED_ACE_TYPE}, + {-1, ACE_WRITE_ACL|ACE_WRITE_OWNER|ACE_WRITE_ATTRIBUTES| ACE_WRITE_NAMED_ATTRS, ACE_OWNER, ACE_ACCESS_ALLOWED_ACE_TYPE}, - {(uid_t)-1, 0, ACE_GROUP|ACE_IDENTIFIER_GROUP, - ACE_ACCESS_DENIED_ACE_TYPE}, - {(uid_t)-1, 0, ACE_GROUP|ACE_IDENTIFIER_GROUP, - ACE_ACCESS_ALLOWED_ACE_TYPE}, - {(uid_t)-1, ACE_WRITE_ACL|ACE_WRITE_OWNER| ACE_WRITE_ATTRIBUTES| + {-1, 0, ACE_GROUP|ACE_IDENTIFIER_GROUP, ACE_ACCESS_DENIED_ACE_TYPE}, + {-1, 0, ACE_GROUP|ACE_IDENTIFIER_GROUP, ACE_ACCESS_ALLOWED_ACE_TYPE}, + {-1, ACE_WRITE_ACL|ACE_WRITE_OWNER| ACE_WRITE_ATTRIBUTES| ACE_WRITE_NAMED_ATTRS, ACE_EVERYONE, ACE_ACCESS_DENIED_ACE_TYPE}, - {(uid_t)-1, ACE_READ_ACL|ACE_READ_ATTRIBUTES|ACE_READ_NAMED_ATTRS| + {-1, ACE_READ_ACL|ACE_READ_ATTRIBUTES|ACE_READ_NAMED_ATTRS| ACE_SYNCHRONIZE, ACE_EVERYONE, ACE_ACCESS_ALLOWED_ACE_TYPE} }; void -adjust_ace_pair_common(void *pair, size_t access_off, - size_t pairsize, mode_t mode) +adjust_ace_pair(ace_t *pair, mode_t mode) { - char *datap = (char *)pair; - uint32_t *amask0 = (uint32_t *)(uintptr_t)(datap + access_off); - uint32_t *amask1 = (uint32_t *)(uintptr_t)(datap + pairsize + - access_off); if (mode & S_IROTH) - *amask1 |= ACE_READ_DATA; + pair[1].a_access_mask |= ACE_READ_DATA; else - *amask0 |= ACE_READ_DATA; + pair[0].a_access_mask |= ACE_READ_DATA; if (mode & S_IWOTH) - *amask1 |= ACE_WRITE_DATA|ACE_APPEND_DATA; + pair[1].a_access_mask |= + ACE_WRITE_DATA|ACE_APPEND_DATA; else - *amask0 |= ACE_WRITE_DATA|ACE_APPEND_DATA; + pair[0].a_access_mask |= + ACE_WRITE_DATA|ACE_APPEND_DATA; if (mode & S_IXOTH) - *amask1 |= ACE_EXECUTE; + pair[1].a_access_mask |= ACE_EXECUTE; else - *amask0 |= ACE_EXECUTE; -} - -void -adjust_ace_pair(ace_t *pair, mode_t mode) -{ - adjust_ace_pair_common(pair, offsetof(ace_t, a_access_mask), - sizeof (ace_t), mode); + pair[0].a_access_mask |= ACE_EXECUTE; } /* * ace_trivial: * determine whether an ace_t acl is trivial * - * Trivialness implies that the acl is composed of only + * Trivialness implys that the acl is composed of only * owner, group, everyone entries. ACL can't * have read_acl denied, and write_owner/write_acl/write_attributes * can only be owner@ entry. */ int -ace_trivial_common(void *acep, int aclcnt, - uint64_t (*walk)(void *, uint64_t, int aclcnt, - uint16_t *, uint16_t *, uint32_t *)) +ace_trivial(ace_t *acep, int aclcnt) { + int i; int owner_seen = 0; int group_seen = 0; int everyone_seen = 0; - uint16_t flags; - uint32_t mask; - uint16_t type; - uint64_t cookie = 0; - while (cookie = walk(acep, cookie, aclcnt, &flags, &type, &mask)) { - switch (flags & ACE_TYPE_FLAGS) { + for (i = 0; i != aclcnt; i++) { + switch (acep[i].a_flags & 0xf040) { case ACE_OWNER: if (group_seen || everyone_seen) return (1); @@ -238,7 +113,7 @@ } - if (flags & (ACE_FILE_INHERIT_ACE| + if (acep[i].a_flags & (ACE_FILE_INHERIT_ACE| ACE_DIRECTORY_INHERIT_ACE|ACE_NO_PROPAGATE_INHERIT_ACE| ACE_INHERIT_ONLY_ACE)) return (1); @@ -249,48 +124,27 @@ * Don't allow anybody to deny reading basic * attributes or a files ACL. */ - if ((mask & (ACE_READ_ACL|ACE_READ_ATTRIBUTES)) && - (type == ACE_ACCESS_DENIED_ACE_TYPE)) + if ((acep[i].a_access_mask & + (ACE_READ_ACL|ACE_READ_ATTRIBUTES)) && + (acep[i].a_type == ACE_ACCESS_DENIED_ACE_TYPE)) return (1); /* * Allow on owner@ to allow * write_acl/write_owner/write_attributes */ - if (type == ACE_ACCESS_ALLOWED_ACE_TYPE && - (!(flags & ACE_OWNER) && (mask & + if (acep[i].a_type == ACE_ACCESS_ALLOWED_ACE_TYPE && + (!(acep[i].a_flags & ACE_OWNER) && (acep[i].a_access_mask & (ACE_WRITE_OWNER|ACE_WRITE_ACL|ACE_WRITE_ATTRIBUTES)))) return (1); - } if ((owner_seen == 0) || (group_seen == 0) || (everyone_seen == 0)) - return (1); + return (1); return (0); } -uint64_t -ace_walk(void *datap, uint64_t cookie, int aclcnt, uint16_t *flags, - uint16_t *type, uint32_t *mask) -{ - ace_t *acep = datap; - - *flags = acep[cookie].a_flags; - *type = acep[cookie].a_type; - *mask = acep[cookie++].a_access_mask; - - if (cookie > aclcnt) - return (0); - else - return (cookie); -} - -int -ace_trivial(ace_t *acep, int aclcnt) -{ - return (ace_trivial_common(acep, aclcnt, ace_walk)); -} /* * Generic shellsort, from K&R (1st ed, p 58.), somewhat modified. @@ -317,8 +171,8 @@ for (g = n / 2; g > 0; g /= 2) { for (i = g; i < n; i++) { for (j = i - g; j >= 0 && - (*f)(v + j * s, v + (j + g) * s) == 1; - j -= g) { + (*f)(v + j * s, v + (j + g) * s) == 1; + j -= g) { p1 = (void *)(v + j * s); p2 = (void *)(v + (j + g) * s); for (ii = 0; ii < s / 4; ii++) { @@ -361,1347 +215,3 @@ /* Totally equal */ return (0); } - -/*ARGSUSED*/ -static void * -cacl_realloc(void *ptr, size_t size, size_t new_size) -{ -#if defined(_KERNEL) - void *tmp; - - tmp = kmem_alloc(new_size, KM_SLEEP); - (void) memcpy(tmp, ptr, (size < new_size) ? size : new_size); - kmem_free(ptr, size); - return (tmp); -#else - return (realloc(ptr, new_size)); -#endif -} - -static int -cacl_malloc(void **ptr, size_t size) -{ -#if defined(_KERNEL) - *ptr = kmem_zalloc(size, KM_SLEEP); - return (0); -#else - *ptr = calloc(1, size); - if (*ptr == NULL) - return (errno); - - return (0); -#endif -} - -/*ARGSUSED*/ -static void -cacl_free(void *ptr, size_t size) -{ -#if defined(_KERNEL) - kmem_free(ptr, size); -#else - free(ptr); -#endif -} - -acl_t * -acl_alloc(enum acl_type type) -{ - acl_t *aclp; - - if (cacl_malloc((void **)&aclp, sizeof (acl_t)) != 0) - return (NULL); - - aclp->acl_aclp = NULL; - aclp->acl_cnt = 0; - - switch (type) { - case ACE_T: - aclp->acl_type = ACE_T; - aclp->acl_entry_size = sizeof (ace_t); - break; - case ACLENT_T: - aclp->acl_type = ACLENT_T; - aclp->acl_entry_size = sizeof (aclent_t); - break; - default: - acl_free(aclp); - aclp = NULL; - } - return (aclp); -} - -/* - * Free acl_t structure - */ -void -acl_free(acl_t *aclp) -{ - int acl_size; - - if (aclp == NULL) - return; - - if (aclp->acl_aclp) { - acl_size = aclp->acl_cnt * aclp->acl_entry_size; - cacl_free(aclp->acl_aclp, acl_size); - } - - cacl_free(aclp, sizeof (acl_t)); -} - -static uint32_t -access_mask_set(int haswriteperm, int hasreadperm, int isowner, int isallow) -{ - uint32_t access_mask = 0; - int acl_produce; - int synchronize_set = 0, write_owner_set = 0; - int delete_set = 0, write_attrs_set = 0; - int read_named_set = 0, write_named_set = 0; - - acl_produce = (ACL_SYNCHRONIZE_SET_ALLOW | - ACL_WRITE_ATTRS_OWNER_SET_ALLOW | - ACL_WRITE_ATTRS_WRITER_SET_DENY); - - if (isallow) { - synchronize_set = ACL_SYNCHRONIZE_SET_ALLOW; - write_owner_set = ACL_WRITE_OWNER_SET_ALLOW; - delete_set = ACL_DELETE_SET_ALLOW; - if (hasreadperm) - read_named_set = ACL_READ_NAMED_READER_SET_ALLOW; - if (haswriteperm) - write_named_set = ACL_WRITE_NAMED_WRITER_SET_ALLOW; - if (isowner) - write_attrs_set = ACL_WRITE_ATTRS_OWNER_SET_ALLOW; - else if (haswriteperm) - write_attrs_set = ACL_WRITE_ATTRS_WRITER_SET_ALLOW; - } else { - - synchronize_set = ACL_SYNCHRONIZE_SET_DENY; - write_owner_set = ACL_WRITE_OWNER_SET_DENY; - delete_set = ACL_DELETE_SET_DENY; - if (hasreadperm) - read_named_set = ACL_READ_NAMED_READER_SET_DENY; - if (haswriteperm) - write_named_set = ACL_WRITE_NAMED_WRITER_SET_DENY; - if (isowner) - write_attrs_set = ACL_WRITE_ATTRS_OWNER_SET_DENY; - else if (haswriteperm) - write_attrs_set = ACL_WRITE_ATTRS_WRITER_SET_DENY; - else - /* - * If the entity is not the owner and does not - * have write permissions ACE_WRITE_ATTRIBUTES will - * always go in the DENY ACE. - */ - access_mask |= ACE_WRITE_ATTRIBUTES; - } - - if (acl_produce & synchronize_set) - access_mask |= ACE_SYNCHRONIZE; - if (acl_produce & write_owner_set) - access_mask |= ACE_WRITE_OWNER; - if (acl_produce & delete_set) - access_mask |= ACE_DELETE; - if (acl_produce & write_attrs_set) - access_mask |= ACE_WRITE_ATTRIBUTES; - if (acl_produce & read_named_set) - access_mask |= ACE_READ_NAMED_ATTRS; - if (acl_produce & write_named_set) - access_mask |= ACE_WRITE_NAMED_ATTRS; - - return (access_mask); -} - -/* - * Given an mode_t, convert it into an access_mask as used - * by nfsace, assuming aclent_t -> nfsace semantics. - */ -static uint32_t -mode_to_ace_access(mode_t mode, int isdir, int isowner, int isallow) -{ - uint32_t access = 0; - int haswriteperm = 0; - int hasreadperm = 0; - - if (isallow) { - haswriteperm = (mode & S_IWOTH); - hasreadperm = (mode & S_IROTH); - } else { - haswriteperm = !(mode & S_IWOTH); - hasreadperm = !(mode & S_IROTH); - } - - /* - * The following call takes care of correctly setting the following - * mask bits in the access_mask: - * ACE_SYNCHRONIZE, ACE_WRITE_OWNER, ACE_DELETE, - * ACE_WRITE_ATTRIBUTES, ACE_WRITE_NAMED_ATTRS, ACE_READ_NAMED_ATTRS - */ - access = access_mask_set(haswriteperm, hasreadperm, isowner, isallow); - - if (isallow) { - access |= ACE_READ_ACL | ACE_READ_ATTRIBUTES; - if (isowner) - access |= ACE_WRITE_ACL; - } else { - if (! isowner) - access |= ACE_WRITE_ACL; - } - - /* read */ - if (mode & S_IROTH) { - access |= ACE_READ_DATA; - } - /* write */ - if (mode & S_IWOTH) { - access |= ACE_WRITE_DATA | - ACE_APPEND_DATA; - if (isdir) - access |= ACE_DELETE_CHILD; - } - /* exec */ - if (mode & 01) { - access |= ACE_EXECUTE; - } - - return (access); -} - -/* - * Given an nfsace (presumably an ALLOW entry), make a - * corresponding DENY entry at the address given. - */ -static void -ace_make_deny(ace_t *allow, ace_t *deny, int isdir, int isowner) -{ - (void) memcpy(deny, allow, sizeof (ace_t)); - - deny->a_who = allow->a_who; - - deny->a_type = ACE_ACCESS_DENIED_ACE_TYPE; - deny->a_access_mask ^= ACE_POSIX_SUPPORTED_BITS; - if (isdir) - deny->a_access_mask ^= ACE_DELETE_CHILD; - - deny->a_access_mask &= ~(ACE_SYNCHRONIZE | ACE_WRITE_OWNER | - ACE_DELETE | ACE_WRITE_ATTRIBUTES | ACE_READ_NAMED_ATTRS | - ACE_WRITE_NAMED_ATTRS); - deny->a_access_mask |= access_mask_set((allow->a_access_mask & - ACE_WRITE_DATA), (allow->a_access_mask & ACE_READ_DATA), isowner, - B_FALSE); -} -/* - * Make an initial pass over an array of aclent_t's. Gather - * information such as an ACL_MASK (if any), number of users, - * number of groups, and whether the array needs to be sorted. - */ -static int -ln_aent_preprocess(aclent_t *aclent, int n, - int *hasmask, mode_t *mask, - int *numuser, int *numgroup, int *needsort) -{ - int error = 0; - int i; - int curtype = 0; - - *hasmask = 0; - *mask = 07; - *needsort = 0; - *numuser = 0; - *numgroup = 0; - - for (i = 0; i < n; i++) { - if (aclent[i].a_type < curtype) - *needsort = 1; - else if (aclent[i].a_type > curtype) - curtype = aclent[i].a_type; - if (aclent[i].a_type & USER) - (*numuser)++; - if (aclent[i].a_type & (GROUP | GROUP_OBJ)) - (*numgroup)++; - if (aclent[i].a_type & CLASS_OBJ) { - if (*hasmask) { - error = EINVAL; - goto out; - } else { - *hasmask = 1; - *mask = aclent[i].a_perm; - } - } - } - - if ((! *hasmask) && (*numuser + *numgroup > 1)) { - error = EINVAL; - goto out; - } - -out: - return (error); -} - -/* - * Convert an array of aclent_t into an array of nfsace entries, - * following POSIX draft -> nfsv4 conversion semantics as outlined in - * the IETF draft. - */ -static int -ln_aent_to_ace(aclent_t *aclent, int n, ace_t **acepp, int *rescount, int isdir) -{ - int error = 0; - mode_t mask; - int numuser, numgroup, needsort; - int resultsize = 0; - int i, groupi = 0, skip; - ace_t *acep, *result = NULL; - int hasmask; - - error = ln_aent_preprocess(aclent, n, &hasmask, &mask, - &numuser, &numgroup, &needsort); - if (error != 0) - goto out; - - /* allow + deny for each aclent */ - resultsize = n * 2; - if (hasmask) { - /* - * stick extra deny on the group_obj and on each - * user|group for the mask (the group_obj was added - * into the count for numgroup) - */ - resultsize += numuser + numgroup; - /* ... and don't count the mask itself */ - resultsize -= 2; - } - - /* sort the source if necessary */ - if (needsort) - ksort((caddr_t)aclent, n, sizeof (aclent_t), cmp2acls); - - if (cacl_malloc((void **)&result, resultsize * sizeof (ace_t)) != 0) - goto out; - - acep = result; - - for (i = 0; i < n; i++) { - /* - * don't process CLASS_OBJ (mask); mask was grabbed in - * ln_aent_preprocess() - */ - if (aclent[i].a_type & CLASS_OBJ) - continue; - - /* If we need an ACL_MASK emulator, prepend it now */ - if ((hasmask) && - (aclent[i].a_type & (USER | GROUP | GROUP_OBJ))) { - acep->a_type = ACE_ACCESS_DENIED_ACE_TYPE; - acep->a_flags = 0; - if (aclent[i].a_type & GROUP_OBJ) { - acep->a_who = (uid_t)-1; - acep->a_flags |= - (ACE_IDENTIFIER_GROUP|ACE_GROUP); - } else if (aclent[i].a_type & USER) { - acep->a_who = aclent[i].a_id; - } else { - acep->a_who = aclent[i].a_id; - acep->a_flags |= ACE_IDENTIFIER_GROUP; - } - if (aclent[i].a_type & ACL_DEFAULT) { - acep->a_flags |= ACE_INHERIT_ONLY_ACE | - ACE_FILE_INHERIT_ACE | - ACE_DIRECTORY_INHERIT_ACE; - } - /* - * Set the access mask for the prepended deny - * ace. To do this, we invert the mask (found - * in ln_aent_preprocess()) then convert it to an - * DENY ace access_mask. - */ - acep->a_access_mask = mode_to_ace_access((mask ^ 07), - isdir, 0, 0); - acep += 1; - } - - /* handle a_perm -> access_mask */ - acep->a_access_mask = mode_to_ace_access(aclent[i].a_perm, - isdir, aclent[i].a_type & USER_OBJ, 1); - - /* emulate a default aclent */ - if (aclent[i].a_type & ACL_DEFAULT) { - acep->a_flags |= ACE_INHERIT_ONLY_ACE | - ACE_FILE_INHERIT_ACE | - ACE_DIRECTORY_INHERIT_ACE; - } - - /* - * handle a_perm and a_id - * - * this must be done last, since it involves the - * corresponding deny aces, which are handled - * differently for each different a_type. - */ - if (aclent[i].a_type & USER_OBJ) { - acep->a_who = (uid_t)-1; - acep->a_flags |= ACE_OWNER; - ace_make_deny(acep, acep + 1, isdir, B_TRUE); - acep += 2; - } else if (aclent[i].a_type & USER) { - acep->a_who = aclent[i].a_id; - ace_make_deny(acep, acep + 1, isdir, B_FALSE); - acep += 2; - } else if (aclent[i].a_type & (GROUP_OBJ | GROUP)) { - if (aclent[i].a_type & GROUP_OBJ) { - acep->a_who = (uid_t)-1; - acep->a_flags |= ACE_GROUP; - } else { - acep->a_who = aclent[i].a_id; - } - acep->a_flags |= ACE_IDENTIFIER_GROUP; - /* - * Set the corresponding deny for the group ace. - * - * The deny aces go after all of the groups, unlike - * everything else, where they immediately follow - * the allow ace. - * - * We calculate "skip", the number of slots to - * skip ahead for the deny ace, here. - * - * The pattern is: - * MD1 A1 MD2 A2 MD3 A3 D1 D2 D3 - * thus, skip is - * (2 * numgroup) - 1 - groupi - * (2 * numgroup) to account for MD + A - * - 1 to account for the fact that we're on the - * access (A), not the mask (MD) - * - groupi to account for the fact that we have - * passed up groupi number of MD's. - */ - skip = (2 * numgroup) - 1 - groupi; - ace_make_deny(acep, acep + skip, isdir, B_FALSE); - /* - * If we just did the last group, skip acep past - * all of the denies; else, just move ahead one. - */ - if (++groupi >= numgroup) - acep += numgroup + 1; - else - acep += 1; - } else if (aclent[i].a_type & OTHER_OBJ) { - acep->a_who = (uid_t)-1; - acep->a_flags |= ACE_EVERYONE; - ace_make_deny(acep, acep + 1, isdir, B_FALSE); - acep += 2; - } else { - error = EINVAL; - goto out; - } - } - - *acepp = result; - *rescount = resultsize; - -out: - if (error != 0) { - if ((result != NULL) && (resultsize > 0)) { - cacl_free(result, resultsize * sizeof (ace_t)); - } - } - - return (error); -} - -static int -convert_aent_to_ace(aclent_t *aclentp, int aclcnt, int isdir, - ace_t **retacep, int *retacecnt) -{ - ace_t *acep; - ace_t *dfacep; - int acecnt = 0; - int dfacecnt = 0; - int dfaclstart = 0; - int dfaclcnt = 0; - aclent_t *aclp; - int i; - int error; - int acesz, dfacesz; - - ksort((caddr_t)aclentp, aclcnt, sizeof (aclent_t), cmp2acls); - - for (i = 0, aclp = aclentp; i < aclcnt; aclp++, i++) { - if (aclp->a_type & ACL_DEFAULT) - break; - } - - if (i < aclcnt) { - dfaclstart = i; - dfaclcnt = aclcnt - i; - } - - if (dfaclcnt && isdir == 0) { - return (EINVAL); - } - - error = ln_aent_to_ace(aclentp, i, &acep, &acecnt, isdir); - if (error) - return (error); - - if (dfaclcnt) { - error = ln_aent_to_ace(&aclentp[dfaclstart], dfaclcnt, - &dfacep, &dfacecnt, isdir); - if (error) { - if (acep) { - cacl_free(acep, acecnt * sizeof (ace_t)); - } - return (error); - } - } - - if (dfacecnt != 0) { - acesz = sizeof (ace_t) * acecnt; - dfacesz = sizeof (ace_t) * dfacecnt; - acep = cacl_realloc(acep, acesz, acesz + dfacesz); - if (acep == NULL) - return (ENOMEM); - if (dfaclcnt) { - (void) memcpy(acep + acecnt, dfacep, dfacesz); - } - } - if (dfaclcnt) - cacl_free(dfacep, dfacecnt * sizeof (ace_t)); - - *retacecnt = acecnt + dfacecnt; - *retacep = acep; - return (0); -} - -static int -ace_mask_to_mode(uint32_t mask, o_mode_t *modep, int isdir) -{ - int error = 0; - o_mode_t mode = 0; - uint32_t bits, wantbits; - - /* read */ - if (mask & ACE_READ_DATA) - mode |= S_IROTH; - - /* write */ - wantbits = (ACE_WRITE_DATA | ACE_APPEND_DATA); - if (isdir) - wantbits |= ACE_DELETE_CHILD; - bits = mask & wantbits; - if (bits != 0) { - if (bits != wantbits) { - error = ENOTSUP; - goto out; - } - mode |= S_IWOTH; - } - - /* exec */ - if (mask & ACE_EXECUTE) { - mode |= S_IXOTH; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Dec 13 00:20:23 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D98AF16A41B; Thu, 13 Dec 2007 00:20:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 855EA16A419 for ; Thu, 13 Dec 2007 00:20:22 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6C81313C45D for ; Thu, 13 Dec 2007 00:20:22 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBD0KMj6097163 for ; Thu, 13 Dec 2007 00:20:22 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBD0KMlV097160 for perforce@freebsd.org; Thu, 13 Dec 2007 00:20:22 GMT (envelope-from jb@freebsd.org) Date: Thu, 13 Dec 2007 00:20:22 GMT Message-Id: <200712130020.lBD0KMlV097160@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130765 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Dec 2007 00:20:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=130765 Change 130765 by jb@jb_freebsd1 on 2007/12/13 00:19:35 Integrate the ZFS man files from the OpenSolaris man file tree which is now in p4. Affected files ... .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/zdb/zdb.8#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/zfs/zfs.8#1 branch .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/zpool/zpool.8#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Thu Dec 13 00:44:48 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F65A16A468; Thu, 13 Dec 2007 00:44:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1A8D216A420 for ; Thu, 13 Dec 2007 00:44:48 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 02CB413C457 for ; Thu, 13 Dec 2007 00:44:48 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBD0iltB001652 for ; Thu, 13 Dec 2007 00:44:47 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBD0il4B001649 for perforce@freebsd.org; Thu, 13 Dec 2007 00:44:47 GMT (envelope-from jb@freebsd.org) Date: Thu, 13 Dec 2007 00:44:47 GMT Message-Id: <200712130044.lBD0il4B001649@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130766 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Dec 2007 00:44:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=130766 Change 130766 by jb@jb_freebsd1 on 2007/12/13 00:44:33 Branch the OpenSolaris versions of these with a name change to suit FreeBSD building. Affected files ... .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#1 branch .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/common/atomic/i386/atomic.S#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Thu Dec 13 00:46:52 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 30B1F16A46C; Thu, 13 Dec 2007 00:46:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D7FC916A420 for ; Thu, 13 Dec 2007 00:46:51 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C95B113C465 for ; Thu, 13 Dec 2007 00:46:51 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBD0kpiu001819 for ; Thu, 13 Dec 2007 00:46:51 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBD0kpTc001816 for perforce@freebsd.org; Thu, 13 Dec 2007 00:46:51 GMT (envelope-from jb@freebsd.org) Date: Thu, 13 Dec 2007 00:46:51 GMT Message-Id: <200712130046.lBD0kpTc001816@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130768 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Dec 2007 00:46:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=130768 Change 130768 by jb@jb_freebsd1 on 2007/12/13 00:46:42 Blindly update these files to match what is in CVS. Affected files ... .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/common/atomic/i386/atomic.S#2 edit Differences ... ==== //depot/projects/opensolaris/src/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#2 (text) ==== @@ -2,8 +2,9 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. + * Common Development and Distribution License, Version 1.0 only + * (the "License"). You may not use this file except in compliance + * with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -19,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -27,337 +28,10 @@ .file "%M%" +#define _ASM #include -#if defined(_KERNEL) - /* - * Legacy kernel interfaces; they will go away (eventually). - */ - ANSI_PRAGMA_WEAK2(cas8,atomic_cas_8,function) - ANSI_PRAGMA_WEAK2(cas32,atomic_cas_32,function) - ANSI_PRAGMA_WEAK2(cas64,atomic_cas_64,function) - ANSI_PRAGMA_WEAK2(caslong,atomic_cas_ulong,function) - ANSI_PRAGMA_WEAK2(casptr,atomic_cas_ptr,function) - ANSI_PRAGMA_WEAK2(atomic_and_long,atomic_and_ulong,function) - ANSI_PRAGMA_WEAK2(atomic_or_long,atomic_or_ulong,function) -#else - /* - * Include the definitions for the libc weak aliases. - */ -#include "../atomic_asm_weak.h" -#endif - - ENTRY(atomic_inc_8) - ALTENTRY(atomic_inc_uchar) - lock - incb (%rdi) - ret - SET_SIZE(atomic_inc_uchar) - SET_SIZE(atomic_inc_8) - - ENTRY(atomic_inc_16) - ALTENTRY(atomic_inc_ushort) - lock - incw (%rdi) - ret - SET_SIZE(atomic_inc_ushort) - SET_SIZE(atomic_inc_16) - - ENTRY(atomic_inc_32) - ALTENTRY(atomic_inc_uint) - lock - incl (%rdi) - ret - SET_SIZE(atomic_inc_uint) - SET_SIZE(atomic_inc_32) - - ENTRY(atomic_inc_64) - ALTENTRY(atomic_inc_ulong) - lock - incq (%rdi) - ret - SET_SIZE(atomic_inc_ulong) - SET_SIZE(atomic_inc_64) - - ENTRY(atomic_inc_8_nv) - ALTENTRY(atomic_inc_uchar_nv) - movb (%rdi), %al / %al = old value -1: - leaq 1(%rax), %rcx / %cl = new value - lock - cmpxchgb %cl, (%rdi) / try to stick it in - jne 1b - movzbl %cl, %eax / return new value - ret - SET_SIZE(atomic_inc_uchar_nv) - SET_SIZE(atomic_inc_8_nv) - - ENTRY(atomic_inc_16_nv) - ALTENTRY(atomic_inc_ushort_nv) - movw (%rdi), %ax / %ax = old value -1: - leaq 1(%rax), %rcx / %cx = new value - lock - cmpxchgw %cx, (%rdi) / try to stick it in - jne 1b - movzwl %cx, %eax / return new value - ret - SET_SIZE(atomic_inc_ushort_nv) - SET_SIZE(atomic_inc_16_nv) - - ENTRY(atomic_inc_32_nv) - ALTENTRY(atomic_inc_uint_nv) - movl (%rdi), %eax / %eax = old value -1: - leaq 1(%rax), %rcx / %ecx = new value - lock - cmpxchgl %ecx, (%rdi) / try to stick it in - jne 1b - movl %ecx, %eax / return new value - ret - SET_SIZE(atomic_inc_uint_nv) - SET_SIZE(atomic_inc_32_nv) - - ENTRY(atomic_inc_64_nv) - ALTENTRY(atomic_inc_ulong_nv) - movq (%rdi), %rax / %rax = old value -1: - leaq 1(%rax), %rcx / %rcx = new value - lock - cmpxchgq %rcx, (%rdi) / try to stick it in - jne 1b - movq %rcx, %rax / return new value - ret - SET_SIZE(atomic_inc_ulong_nv) - SET_SIZE(atomic_inc_64_nv) - - ENTRY(atomic_dec_8) - ALTENTRY(atomic_dec_uchar) - lock - decb (%rdi) - ret - SET_SIZE(atomic_dec_uchar) - SET_SIZE(atomic_dec_8) - - ENTRY(atomic_dec_16) - ALTENTRY(atomic_dec_ushort) - lock - decw (%rdi) - ret - SET_SIZE(atomic_dec_ushort) - SET_SIZE(atomic_dec_16) - - ENTRY(atomic_dec_32) - ALTENTRY(atomic_dec_uint) - lock - decl (%rdi) - ret - SET_SIZE(atomic_dec_uint) - SET_SIZE(atomic_dec_32) - - ENTRY(atomic_dec_64) - ALTENTRY(atomic_dec_ulong) - lock - decq (%rdi) - ret - SET_SIZE(atomic_dec_ulong) - SET_SIZE(atomic_dec_64) - - ENTRY(atomic_dec_8_nv) - ALTENTRY(atomic_dec_uchar_nv) - movb (%rdi), %al / %al = old value -1: - leaq -1(%rax), %rcx / %cl = new value - lock - cmpxchgb %cl, (%rdi) / try to stick it in - jne 1b - movzbl %cl, %eax / return new value - ret - SET_SIZE(atomic_dec_uchar_nv) - SET_SIZE(atomic_dec_8_nv) - - ENTRY(atomic_dec_16_nv) - ALTENTRY(atomic_dec_ushort_nv) - movw (%rdi), %ax / %ax = old value -1: - leaq -1(%rax), %rcx / %cx = new value - lock - cmpxchgw %cx, (%rdi) / try to stick it in - jne 1b - movzwl %cx, %eax / return new value - ret - SET_SIZE(atomic_dec_ushort_nv) - SET_SIZE(atomic_dec_16_nv) - - ENTRY(atomic_dec_32_nv) - ALTENTRY(atomic_dec_uint_nv) - movl (%rdi), %eax / %eax = old value -1: - leaq -1(%rax), %rcx / %ecx = new value - lock - cmpxchgl %ecx, (%rdi) / try to stick it in - jne 1b - movl %ecx, %eax / return new value - ret - SET_SIZE(atomic_dec_uint_nv) - SET_SIZE(atomic_dec_32_nv) - - ENTRY(atomic_dec_64_nv) - ALTENTRY(atomic_dec_ulong_nv) - movq (%rdi), %rax / %rax = old value -1: - leaq -1(%rax), %rcx / %rcx = new value - lock - cmpxchgq %rcx, (%rdi) / try to stick it in - jne 1b - movq %rcx, %rax / return new value - ret - SET_SIZE(atomic_dec_ulong_nv) - SET_SIZE(atomic_dec_64_nv) - - ENTRY(atomic_add_8) - ALTENTRY(atomic_add_char) - lock - addb %sil, (%rdi) - ret - SET_SIZE(atomic_add_char) - SET_SIZE(atomic_add_8) - - ENTRY(atomic_add_16) - ALTENTRY(atomic_add_short) - lock - addw %si, (%rdi) - ret - SET_SIZE(atomic_add_short) - SET_SIZE(atomic_add_16) - - ENTRY(atomic_add_32) - ALTENTRY(atomic_add_int) - lock - addl %esi, (%rdi) - ret - SET_SIZE(atomic_add_int) - SET_SIZE(atomic_add_32) - - ENTRY(atomic_add_64) - ALTENTRY(atomic_add_ptr) - ALTENTRY(atomic_add_long) - lock - addq %rsi, (%rdi) - ret - SET_SIZE(atomic_add_long) - SET_SIZE(atomic_add_ptr) - SET_SIZE(atomic_add_64) - - ENTRY(atomic_or_8) - ALTENTRY(atomic_or_uchar) - lock - orb %sil, (%rdi) - ret - SET_SIZE(atomic_or_uchar) - SET_SIZE(atomic_or_8) - - ENTRY(atomic_or_16) - ALTENTRY(atomic_or_ushort) - lock - orw %si, (%rdi) - ret - SET_SIZE(atomic_or_ushort) - SET_SIZE(atomic_or_16) - - ENTRY(atomic_or_32) - ALTENTRY(atomic_or_uint) - lock - orl %esi, (%rdi) - ret - SET_SIZE(atomic_or_uint) - SET_SIZE(atomic_or_32) - - ENTRY(atomic_or_64) - ALTENTRY(atomic_or_ulong) - lock - orq %rsi, (%rdi) - ret - SET_SIZE(atomic_or_ulong) - SET_SIZE(atomic_or_64) - - ENTRY(atomic_and_8) - ALTENTRY(atomic_and_uchar) - lock - andb %sil, (%rdi) - ret - SET_SIZE(atomic_and_uchar) - SET_SIZE(atomic_and_8) - - ENTRY(atomic_and_16) - ALTENTRY(atomic_and_ushort) - lock - andw %si, (%rdi) - ret - SET_SIZE(atomic_and_ushort) - SET_SIZE(atomic_and_16) - - ENTRY(atomic_and_32) - ALTENTRY(atomic_and_uint) - lock - andl %esi, (%rdi) - ret - SET_SIZE(atomic_and_uint) - SET_SIZE(atomic_and_32) - - ENTRY(atomic_and_64) - ALTENTRY(atomic_and_ulong) - lock - andq %rsi, (%rdi) - ret - SET_SIZE(atomic_and_ulong) - SET_SIZE(atomic_and_64) - - ENTRY(atomic_add_8_nv) - ALTENTRY(atomic_add_char_nv) - movb (%rdi), %al / %al = old value -1: - movb %sil, %cl - addb %al, %cl / %cl = new value - lock - cmpxchgb %cl, (%rdi) / try to stick it in - jne 1b - movzbl %cl, %eax / return new value - ret - SET_SIZE(atomic_add_char_nv) - SET_SIZE(atomic_add_8_nv) - - ENTRY(atomic_add_16_nv) - ALTENTRY(atomic_add_short_nv) - movw (%rdi), %ax / %ax = old value -1: - movw %si, %cx - addw %ax, %cx / %cx = new value - lock - cmpxchgw %cx, (%rdi) / try to stick it in - jne 1b - movzwl %cx, %eax / return new value - ret - SET_SIZE(atomic_add_short_nv) - SET_SIZE(atomic_add_16_nv) - - ENTRY(atomic_add_32_nv) - ALTENTRY(atomic_add_int_nv) - movl (%rdi), %eax -1: - movl %esi, %ecx - addl %eax, %ecx - lock - cmpxchgl %ecx, (%rdi) - jne 1b - movl %ecx, %eax - ret - SET_SIZE(atomic_add_int_nv) - SET_SIZE(atomic_add_32_nv) - ENTRY(atomic_add_64_nv) - ALTENTRY(atomic_add_ptr_nv) - ALTENTRY(atomic_add_long_nv) movq (%rdi), %rax 1: movq %rsi, %rcx @@ -367,246 +41,28 @@ jne 1b movq %rcx, %rax ret - SET_SIZE(atomic_add_long_nv) - SET_SIZE(atomic_add_ptr_nv) SET_SIZE(atomic_add_64_nv) - ENTRY(atomic_and_8_nv) - ALTENTRY(atomic_and_uchar_nv) - movb (%rdi), %al / %al = old value -1: - movb %sil, %cl - andb %al, %cl / %cl = new value - lock - cmpxchgb %cl, (%rdi) / try to stick it in - jne 1b - movzbl %cl, %eax / return new value - ret - SET_SIZE(atomic_and_uchar_nv) - SET_SIZE(atomic_and_8_nv) - - ENTRY(atomic_and_16_nv) - ALTENTRY(atomic_and_ushort_nv) - movw (%rdi), %ax / %ax = old value -1: - movw %si, %cx - andw %ax, %cx / %cx = new value - lock - cmpxchgw %cx, (%rdi) / try to stick it in - jne 1b - movzwl %cx, %eax / return new value - ret - SET_SIZE(atomic_and_ushort_nv) - SET_SIZE(atomic_and_16_nv) - - ENTRY(atomic_and_32_nv) - ALTENTRY(atomic_and_uint_nv) - movl (%rdi), %eax -1: - movl %esi, %ecx - andl %eax, %ecx - lock - cmpxchgl %ecx, (%rdi) - jne 1b - movl %ecx, %eax - ret - SET_SIZE(atomic_and_uint_nv) - SET_SIZE(atomic_and_32_nv) - - ENTRY(atomic_and_64_nv) - ALTENTRY(atomic_and_ulong_nv) - movq (%rdi), %rax -1: - movq %rsi, %rcx - andq %rax, %rcx - lock - cmpxchgq %rcx, (%rdi) - jne 1b - movq %rcx, %rax - ret - SET_SIZE(atomic_and_ulong_nv) - SET_SIZE(atomic_and_64_nv) - ENTRY(atomic_or_8_nv) - ALTENTRY(atomic_or_uchar_nv) - movb (%rdi), %al / %al = old value + movb (%rdi), %al // %al = old value 1: movb %sil, %cl - orb %al, %cl / %cl = new value + orb %al, %cl // %cl = new value lock - cmpxchgb %cl, (%rdi) / try to stick it in + cmpxchgb %cl, (%rdi) // try to stick it in jne 1b - movzbl %cl, %eax / return new value + movzbl %cl, %eax // return new value ret - SET_SIZE(atomic_and_uchar_nv) - SET_SIZE(atomic_and_8_nv) - - ENTRY(atomic_or_16_nv) - ALTENTRY(atomic_or_ushort_nv) - movw (%rdi), %ax / %ax = old value -1: - movw %si, %cx - orw %ax, %cx / %cx = new value - lock - cmpxchgw %cx, (%rdi) / try to stick it in - jne 1b - movzwl %cx, %eax / return new value - ret - SET_SIZE(atomic_or_ushort_nv) - SET_SIZE(atomic_or_16_nv) - - ENTRY(atomic_or_32_nv) - ALTENTRY(atomic_or_uint_nv) - movl (%rdi), %eax -1: - movl %esi, %ecx - orl %eax, %ecx - lock - cmpxchgl %ecx, (%rdi) - jne 1b - movl %ecx, %eax - ret - SET_SIZE(atomic_or_uint_nv) - SET_SIZE(atomic_or_32_nv) - - ENTRY(atomic_or_64_nv) - ALTENTRY(atomic_or_ulong_nv) - movq (%rdi), %rax -1: - movq %rsi, %rcx - orq %rax, %rcx - lock - cmpxchgq %rcx, (%rdi) - jne 1b - movq %rcx, %rax - ret - SET_SIZE(atomic_or_ulong_nv) - SET_SIZE(atomic_or_64_nv) - - ENTRY(atomic_cas_8) - ALTENTRY(atomic_cas_uchar) - movzbl %sil, %eax - lock - cmpxchgb %dl, (%rdi) - ret - SET_SIZE(atomic_cas_uchar) - SET_SIZE(atomic_cas_8) + SET_SIZE(atomic_or_8_nv) - ENTRY(atomic_cas_16) - ALTENTRY(atomic_cas_ushort) - movzwl %si, %eax - lock - cmpxchgw %dx, (%rdi) - ret - SET_SIZE(atomic_cas_ushort) - SET_SIZE(atomic_cas_16) - - ENTRY(atomic_cas_32) - ALTENTRY(atomic_cas_uint) - movl %esi, %eax - lock - cmpxchgl %edx, (%rdi) - ret - SET_SIZE(atomic_cas_uint) - SET_SIZE(atomic_cas_32) - ENTRY(atomic_cas_64) - ALTENTRY(atomic_cas_ulong) - ALTENTRY(atomic_cas_ptr) movq %rsi, %rax lock cmpxchgq %rdx, (%rdi) ret - SET_SIZE(atomic_cas_ptr) - SET_SIZE(atomic_cas_ulong) SET_SIZE(atomic_cas_64) - ENTRY(atomic_swap_8) - ALTENTRY(atomic_swap_uchar) - movzbl %sil, %eax - lock - xchgb %al, (%rdi) - ret - SET_SIZE(atomic_swap_uchar) - SET_SIZE(atomic_swap_8) - - ENTRY(atomic_swap_16) - ALTENTRY(atomic_swap_ushort) - movzwl %si, %eax - lock - xchgw %ax, (%rdi) - ret - SET_SIZE(atomic_swap_ushort) - SET_SIZE(atomic_swap_16) - - ENTRY(atomic_swap_32) - ALTENTRY(atomic_swap_uint) - movl %esi, %eax - lock - xchgl %eax, (%rdi) - ret - SET_SIZE(atomic_swap_uint) - SET_SIZE(atomic_swap_32) - - ENTRY(atomic_swap_64) - ALTENTRY(atomic_swap_ulong) - ALTENTRY(atomic_swap_ptr) - movq %rsi, %rax - lock - xchgq %rax, (%rdi) - ret - SET_SIZE(atomic_swap_ptr) - SET_SIZE(atomic_swap_ulong) - SET_SIZE(atomic_swap_64) - - ENTRY(atomic_set_long_excl) - xorl %eax, %eax - lock - btsq %rsi, (%rdi) - jnc 1f - decl %eax / return -1 -1: - ret - SET_SIZE(atomic_set_long_excl) - - ENTRY(atomic_clear_long_excl) - xorl %eax, %eax - lock - btrq %rsi, (%rdi) - jc 1f - decl %eax / return -1 -1: - ret - SET_SIZE(atomic_clear_long_excl) - -#if !defined(_KERNEL) - - /* - * NOTE: membar_enter, and membar_exit are identical routines. - * We define them separately, instead of using an ALTENTRY - * definitions to alias them together, so that DTrace and - * debuggers will see a unique address for them, allowing - * more accurate tracing. - */ - - ENTRY(membar_enter) - mfence - ret - SET_SIZE(membar_enter) - - ENTRY(membar_exit) - mfence - ret - SET_SIZE(membar_exit) - ENTRY(membar_producer) sfence ret SET_SIZE(membar_producer) - - ENTRY(membar_consumer) - lfence - ret - SET_SIZE(membar_consumer) - -#endif /* !_KERNEL */ ==== //depot/projects/opensolaris/src/sys/contrib/opensolaris/common/atomic/i386/atomic.S#2 (text) ==== @@ -2,8 +2,9 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. + * Common Development and Distribution License, Version 1.0 only + * (the "License"). You may not use this file except in compliance + * with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -19,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -27,403 +28,26 @@ .file "%M%" +#define _ASM #include -#if defined(_KERNEL) - /* - * Legacy kernel interfaces; they will go away (eventually). - */ - ANSI_PRAGMA_WEAK2(cas8,atomic_cas_8,function) - ANSI_PRAGMA_WEAK2(cas32,atomic_cas_32,function) - ANSI_PRAGMA_WEAK2(cas64,atomic_cas_64,function) - ANSI_PRAGMA_WEAK2(caslong,atomic_cas_ulong,function) - ANSI_PRAGMA_WEAK2(casptr,atomic_cas_ptr,function) - ANSI_PRAGMA_WEAK2(atomic_and_long,atomic_and_ulong,function) - ANSI_PRAGMA_WEAK2(atomic_or_long,atomic_or_ulong,function) -#else - /* - * Include the definitions for the libc weak aliases. - */ -#include "../atomic_asm_weak.h" -#endif - - ENTRY(atomic_inc_8) - ALTENTRY(atomic_inc_uchar) - movl 4(%esp), %eax - lock - incb (%eax) - ret - SET_SIZE(atomic_inc_uchar) - SET_SIZE(atomic_inc_8) - - ENTRY(atomic_inc_16) - ALTENTRY(atomic_inc_ushort) - movl 4(%esp), %eax - lock - incw (%eax) - ret - SET_SIZE(atomic_inc_ushort) - SET_SIZE(atomic_inc_16) - - ENTRY(atomic_inc_32) - ALTENTRY(atomic_inc_uint) - ALTENTRY(atomic_inc_ulong) - movl 4(%esp), %eax - lock - incl (%eax) - ret - SET_SIZE(atomic_inc_ulong) - SET_SIZE(atomic_inc_uint) - SET_SIZE(atomic_inc_32) - - ENTRY(atomic_inc_8_nv) - ALTENTRY(atomic_inc_uchar_nv) - movl 4(%esp), %edx / %edx = target address - movb (%edx), %al / %al = old value -1: - leal 1(%eax), %ecx / %cl = new value - lock - cmpxchgb %cl, (%edx) / try to stick it in - jne 1b - movzbl %cl, %eax / return new value - ret - SET_SIZE(atomic_inc_uchar_nv) - SET_SIZE(atomic_inc_8_nv) - - ENTRY(atomic_inc_16_nv) - ALTENTRY(atomic_inc_ushort_nv) - movl 4(%esp), %edx / %edx = target address - movw (%edx), %ax / %ax = old value -1: - leal 1(%eax), %ecx / %cx = new value - lock - cmpxchgw %cx, (%edx) / try to stick it in - jne 1b - movzwl %cx, %eax / return new value - ret - SET_SIZE(atomic_inc_ushort_nv) - SET_SIZE(atomic_inc_16_nv) - - ENTRY(atomic_inc_32_nv) - ALTENTRY(atomic_inc_uint_nv) - ALTENTRY(atomic_inc_ulong_nv) - movl 4(%esp), %edx / %edx = target address - movl (%edx), %eax / %eax = old value -1: - leal 1(%eax), %ecx / %ecx = new value - lock - cmpxchgl %ecx, (%edx) / try to stick it in - jne 1b - movl %ecx, %eax / return new value - ret - SET_SIZE(atomic_inc_ulong_nv) - SET_SIZE(atomic_inc_uint_nv) - SET_SIZE(atomic_inc_32_nv) - - /* - * NOTE: If atomic_inc_64 and atomic_inc_64_nv are ever - * separated, you need to also edit the libc i386 platform - * specific mapfile and remove the NODYNSORT attribute - * from atomic_inc_64_nv. - */ - ENTRY(atomic_inc_64) - ALTENTRY(atomic_inc_64_nv) - pushl %edi - pushl %ebx - movl 12(%esp), %edi / %edi = target address - movl (%edi), %eax - movl 4(%edi), %edx / %edx:%eax = old value -1: - xorl %ebx, %ebx - xorl %ecx, %ecx - incl %ebx / %ecx:%ebx = 1 - addl %eax, %ebx - adcl %edx, %ecx / add in the carry from inc - lock - cmpxchg8b (%edi) / try to stick it in - jne 1b - movl %ebx, %eax - movl %ecx, %edx / return new value - popl %ebx - popl %edi - ret - SET_SIZE(atomic_inc_64_nv) - SET_SIZE(atomic_inc_64) - - ENTRY(atomic_dec_8) - ALTENTRY(atomic_dec_uchar) - movl 4(%esp), %eax - lock - decb (%eax) - ret - SET_SIZE(atomic_dec_uchar) - SET_SIZE(atomic_dec_8) - - ENTRY(atomic_dec_16) - ALTENTRY(atomic_dec_ushort) - movl 4(%esp), %eax - lock - decw (%eax) - ret - SET_SIZE(atomic_dec_ushort) - SET_SIZE(atomic_dec_16) - - ENTRY(atomic_dec_32) - ALTENTRY(atomic_dec_uint) - ALTENTRY(atomic_dec_ulong) - movl 4(%esp), %eax - lock - decl (%eax) - ret - SET_SIZE(atomic_dec_ulong) - SET_SIZE(atomic_dec_uint) - SET_SIZE(atomic_dec_32) - - ENTRY(atomic_dec_8_nv) - ALTENTRY(atomic_dec_uchar_nv) - movl 4(%esp), %edx / %edx = target address - movb (%edx), %al / %al = old value -1: - leal -1(%eax), %ecx / %cl = new value - lock - cmpxchgb %cl, (%edx) / try to stick it in - jne 1b - movzbl %cl, %eax / return new value - ret - SET_SIZE(atomic_dec_uchar_nv) - SET_SIZE(atomic_dec_8_nv) - - ENTRY(atomic_dec_16_nv) - ALTENTRY(atomic_dec_ushort_nv) - movl 4(%esp), %edx / %edx = target address - movw (%edx), %ax / %ax = old value -1: - leal -1(%eax), %ecx / %cx = new value - lock - cmpxchgw %cx, (%edx) / try to stick it in - jne 1b - movzwl %cx, %eax / return new value - ret - SET_SIZE(atomic_dec_ushort_nv) - SET_SIZE(atomic_dec_16_nv) - - ENTRY(atomic_dec_32_nv) - ALTENTRY(atomic_dec_uint_nv) - ALTENTRY(atomic_dec_ulong_nv) - movl 4(%esp), %edx / %edx = target address - movl (%edx), %eax / %eax = old value -1: - leal -1(%eax), %ecx / %ecx = new value - lock - cmpxchgl %ecx, (%edx) / try to stick it in - jne 1b - movl %ecx, %eax / return new value - ret - SET_SIZE(atomic_dec_ulong_nv) - SET_SIZE(atomic_dec_uint_nv) - SET_SIZE(atomic_dec_32_nv) - - /* - * NOTE: If atomic_dec_64 and atomic_dec_64_nv are ever - * separated, it is important to edit the libc i386 platform - * specific mapfile and remove the NODYNSORT attribute - * from atomic_dec_64_nv. - */ - ENTRY(atomic_dec_64) - ALTENTRY(atomic_dec_64_nv) - pushl %edi - pushl %ebx - movl 12(%esp), %edi / %edi = target address - movl (%edi), %eax - movl 4(%edi), %edx / %edx:%eax = old value -1: - xorl %ebx, %ebx - xorl %ecx, %ecx - not %ecx - not %ebx / %ecx:%ebx = -1 - addl %eax, %ebx - adcl %edx, %ecx / add in the carry from inc - lock - cmpxchg8b (%edi) / try to stick it in - jne 1b - movl %ebx, %eax - movl %ecx, %edx / return new value - popl %ebx - popl %edi - ret - SET_SIZE(atomic_dec_64_nv) - SET_SIZE(atomic_dec_64) - - ENTRY(atomic_add_8) - ALTENTRY(atomic_add_char) - movl 4(%esp), %eax - movl 8(%esp), %ecx - lock - addb %cl, (%eax) - ret - SET_SIZE(atomic_add_char) - SET_SIZE(atomic_add_8) - - ENTRY(atomic_add_16) - ALTENTRY(atomic_add_short) - movl 4(%esp), %eax - movl 8(%esp), %ecx - lock - addw %cx, (%eax) - ret - SET_SIZE(atomic_add_short) - SET_SIZE(atomic_add_16) - - ENTRY(atomic_add_32) - ALTENTRY(atomic_add_int) - ALTENTRY(atomic_add_ptr) - ALTENTRY(atomic_add_long) - movl 4(%esp), %eax - movl 8(%esp), %ecx - lock - addl %ecx, (%eax) - ret - SET_SIZE(atomic_add_long) - SET_SIZE(atomic_add_ptr) - SET_SIZE(atomic_add_int) - SET_SIZE(atomic_add_32) - - ENTRY(atomic_or_8) - ALTENTRY(atomic_or_uchar) - movl 4(%esp), %eax - movb 8(%esp), %cl - lock - orb %cl, (%eax) - ret - SET_SIZE(atomic_or_uchar) - SET_SIZE(atomic_or_8) - - ENTRY(atomic_or_16) - ALTENTRY(atomic_or_ushort) - movl 4(%esp), %eax - movw 8(%esp), %cx - lock - orw %cx, (%eax) - ret - SET_SIZE(atomic_or_ushort) - SET_SIZE(atomic_or_16) - - ENTRY(atomic_or_32) - ALTENTRY(atomic_or_uint) - ALTENTRY(atomic_or_ulong) - movl 4(%esp), %eax - movl 8(%esp), %ecx - lock - orl %ecx, (%eax) - ret - SET_SIZE(atomic_or_ulong) - SET_SIZE(atomic_or_uint) - SET_SIZE(atomic_or_32) - - ENTRY(atomic_and_8) - ALTENTRY(atomic_and_uchar) - movl 4(%esp), %eax - movb 8(%esp), %cl - lock - andb %cl, (%eax) - ret - SET_SIZE(atomic_and_uchar) - SET_SIZE(atomic_and_8) - - ENTRY(atomic_and_16) - ALTENTRY(atomic_and_ushort) - movl 4(%esp), %eax - movw 8(%esp), %cx - lock - andw %cx, (%eax) - ret - SET_SIZE(atomic_and_ushort) - SET_SIZE(atomic_and_16) - - ENTRY(atomic_and_32) - ALTENTRY(atomic_and_uint) - ALTENTRY(atomic_and_ulong) - movl 4(%esp), %eax - movl 8(%esp), %ecx - lock - andl %ecx, (%eax) - ret - SET_SIZE(atomic_and_ulong) - SET_SIZE(atomic_and_uint) - SET_SIZE(atomic_and_32) - - ENTRY(atomic_add_8_nv) - ALTENTRY(atomic_add_char_nv) - movl 4(%esp), %edx / %edx = target address - movb (%edx), %al / %al = old value -1: - movl 8(%esp), %ecx / %ecx = delta - addb %al, %cl / %cl = new value - lock - cmpxchgb %cl, (%edx) / try to stick it in - jne 1b - movzbl %cl, %eax / return new value - ret - SET_SIZE(atomic_add_char_nv) - SET_SIZE(atomic_add_8_nv) - - ENTRY(atomic_add_16_nv) - ALTENTRY(atomic_add_short_nv) - movl 4(%esp), %edx / %edx = target address - movw (%edx), %ax / %ax = old value -1: - movl 8(%esp), %ecx / %ecx = delta >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Dec 13 00:48:54 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 91DA216A420; Thu, 13 Dec 2007 00:48:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 44FDA16A418 for ; Thu, 13 Dec 2007 00:48:54 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2D3F413C455 for ; Thu, 13 Dec 2007 00:48:54 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBD0mrpj010777 for ; Thu, 13 Dec 2007 00:48:53 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBD0mrsY010774 for perforce@freebsd.org; Thu, 13 Dec 2007 00:48:53 GMT (envelope-from jb@freebsd.org) Date: Thu, 13 Dec 2007 00:48:53 GMT Message-Id: <200712130048.lBD0mrsY010774@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130769 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Dec 2007 00:48:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=130769 Change 130769 by jb@jb_freebsd1 on 2007/12/13 00:48:10 Add Marcel's ia64 implementation where OpenSolaris doesn't support ia64. Affected files ... .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/common/atomic/ia64/atomic.S#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Dec 13 00:50:56 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C847416A468; Thu, 13 Dec 2007 00:50:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8D91316A418 for ; Thu, 13 Dec 2007 00:50:56 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 763B813C44B for ; Thu, 13 Dec 2007 00:50:56 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBD0ouZT011151 for ; Thu, 13 Dec 2007 00:50:56 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBD0ouNT011148 for perforce@freebsd.org; Thu, 13 Dec 2007 00:50:56 GMT (envelope-from jb@freebsd.org) Date: Thu, 13 Dec 2007 00:50:56 GMT Message-Id: <200712130050.lBD0ouNT011148@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130770 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Dec 2007 00:50:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=130770 Change 130770 by jb@jb_freebsd1 on 2007/12/13 00:50:00 Add a file that pjd has put under the CDDL but is new for FreeBSD. Affected files ... .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Dec 13 00:57:04 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2872316A46B; Thu, 13 Dec 2007 00:57:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CBF4516A468 for ; Thu, 13 Dec 2007 00:57:03 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CCC5013C448 for ; Thu, 13 Dec 2007 00:57:03 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBD0v39S012236 for ; Thu, 13 Dec 2007 00:57:03 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBD0v3H2012233 for perforce@freebsd.org; Thu, 13 Dec 2007 00:57:03 GMT (envelope-from jb@freebsd.org) Date: Thu, 13 Dec 2007 00:57:03 GMT Message-Id: <200712130057.lBD0v3H2012233@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130771 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Dec 2007 00:57:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=130771 Change 130771 by jb@jb_freebsd1 on 2007/12/13 00:56:23 Add this file to match the one in CVS. OpenSolaris has a bunch of headers named the same as this, but their arch/machine differentiation isn't as clean as FreeBSD's IMHO. A lot of what is in here is specific to the assembler rather than the arch/machine the assembler is targeted to. I guess that's why pjd decided to merge the stuff together. We'll try to use what is common and machine dependencies to handle differences. Affected files ... .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Dec 13 01:18:30 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2115616A418; Thu, 13 Dec 2007 01:18:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7A5FE16A41A for ; Thu, 13 Dec 2007 01:18:29 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7980413C461 for ; Thu, 13 Dec 2007 01:18:29 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBD1ITOp016526 for ; Thu, 13 Dec 2007 01:18:29 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBD1IPG3016523 for perforce@freebsd.org; Thu, 13 Dec 2007 01:18:25 GMT (envelope-from jb@freebsd.org) Date: Thu, 13 Dec 2007 01:18:25 GMT Message-Id: <200712130118.lBD1IPG3016523@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130772 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Dec 2007 01:18:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=130772 Change 130772 by jb@jb_freebsd1 on 2007/12/13 01:17:30 Merge the DTrace changes from //depot/projects/dtrace/... back into the new incoming distribution sources from //depot/vendor/sun/... This is representative of the number of lines of diffs we will have to manage going forward. Many are just to make the code compile cleanly so that we can be sure that it is doing the right thing. Without that cleanup we can get into a lot of trouble with different ioctl API design differences, for instance. Compiler noise hides real problems. I hope to be able to set a WARNS level on the OpenSolaris code built into FreeBSD for DTrace so that we can detect when things break at compile time. That was what all the -Werror cleanups were about in current recently for the gcc version we are using. 4.2.whatever. Affected files ... .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/dtrace.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/mdb/tools/common/die.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/mdb/tools/common/util.h#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/sgs/include/alist.h#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/sgs/include/sgs.h#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/sgs/tools/common/findprime.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/sgs/tools/common/sgsmsg.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/cmd/sgs/tools/common/string_table.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libctf/common/ctf_lib.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libctf/common/ctf_subr.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/drti.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_cc.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_cg.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_consume.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_dof.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_error.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_handle.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_ident.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_impl.h#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_lex.l#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_link.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_map.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_module.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_open.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_options.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_parser.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_pid.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_pragma.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_proc.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_proc.h#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_program.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_provider.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_subr.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_work.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dtrace.h#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/mkerrtags.sh#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/mknames.sh#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/lib/libgen/common/gmatch.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/tools/ctf/common/list.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/tools/ctf/common/memory.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/tools/ctf/cvt/alist.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/tools/ctf/cvt/alist.h#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/tools/ctf/cvt/barrier.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/tools/ctf/cvt/barrier.h#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/tools/ctf/cvt/ctf.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/tools/ctf/cvt/ctfconvert.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/tools/ctf/cvt/ctftools.h#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/tools/ctf/cvt/dwarf.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/tools/ctf/cvt/fixup_tdescs.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/tools/ctf/cvt/hash.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/tools/ctf/cvt/iidesc.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/tools/ctf/cvt/input.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/tools/ctf/cvt/merge.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/tools/ctf/cvt/output.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/tools/ctf/cvt/st_parse.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/tools/ctf/cvt/stabs.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/tools/ctf/cvt/strtab.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/tools/ctf/cvt/strtab.h#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/tools/ctf/cvt/tdata.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/tools/ctf/cvt/traverse.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/tools/ctf/cvt/traverse.h#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/tools/ctf/cvt/util.c#2 edit .. //depot/projects/opensolaris/src/contrib/opensolaris/tools/ctf/dump/dump.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/common/ctf/ctf_create.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/common/ctf/ctf_hash.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/common/ctf/ctf_impl.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/common/ctf/ctf_labels.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/common/ctf/ctf_lookup.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/common/ctf/ctf_open.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/common/ctf/ctf_types.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/ctf.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/ctf_api.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/cyclic.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/dtrace.h#2 edit .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/sys/dtrace_impl.h#2 edit Differences ... ==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/dtrace/dtrace.c#2 (text) ==== @@ -34,15 +34,20 @@ #include #include #include +#include #include #include #include #include #include #include +#if defined(sun) #include +#endif #include +#if defined(sun) #include +#endif typedef struct dtrace_cmd { void (*dc_func)(struct dtrace_cmd *); /* function to compile arg */ @@ -92,8 +97,9 @@ static int g_status = E_SUCCESS; static int g_grabanon = 0; static const char *g_ofile = NULL; -static FILE *g_ofp = stdout; +static FILE *g_ofp; static dtrace_hdl_t *g_dtp; +#if defined(sun) static char *g_etcfile = "/etc/system"; static const char *g_etcbegin = "* vvvv Added by DTrace"; static const char *g_etcend = "* ^^^^ Added by DTrace"; @@ -108,6 +114,7 @@ "* chapter of the Solaris Dynamic Tracing Guide for details.", "*", NULL }; +#endif static int usage(FILE *fp) @@ -195,6 +202,10 @@ static void dfatal(const char *fmt, ...) { +#if !defined(sun) + char *p_errfile = NULL; + int errline = 0; +#endif va_list ap; va_start(ap, fmt); @@ -212,6 +223,17 @@ (void) fprintf(stderr, "%s\n", dtrace_errmsg(g_dtp, dtrace_errno(g_dtp))); } +#if !defined(sun) + dt_get_errloc(g_dtp, &p_errfile, &errline); + if (p_errfile != NULL) + printf("File '%s', line %d\n", p_errfile, errline); +#endif + + /* + * Close the DTrace handle to ensure that any controlled processes are + * correctly restored and continued. + */ + dtrace_close(g_dtp); /* * Close the DTrace handle to ensure that any controlled processes are @@ -372,6 +394,7 @@ free(buf); } +#if defined(sun) static void etcsystem_prune(void) { @@ -482,6 +505,7 @@ error("added forceload directives to %s\n", g_ofile); } +#endif static void print_probe_info(const dtrace_probeinfo_t *p) @@ -611,12 +635,26 @@ p = (uchar_t *)dof; q = p + dof->dofh_loadsz; +#if defined(sun) oprintf("dof-data-%d=0x%x", n, *p++); while (p < q) oprintf(",0x%x", *p++); oprintf(";\n"); +#else + /* + * On FreeBSD, the DOF data is handled as a kernel environment (kenv) + * string. We use two hex characters per DOF byte. + */ + oprintf("dof-data-%d=%02x", n, *p++); + + while (p < q) + oprintf("%02x", *p++); + + oprintf("\n"); +#endif + dtrace_dof_destroy(g_dtp, dof); } @@ -741,6 +779,8 @@ static void prochandler(struct ps_prochandle *P, const char *msg, void *arg) { +fatal("DOODAD in function %s, file %s, line %d\n",__FUNCTION__,__FILE__,__LINE__); +#ifdef DOODAD const psinfo_t *prp = Ppsinfo(P); int pid = Pstatus(P)->pr_pid; char name[SIG2STR_MAX]; @@ -778,6 +818,7 @@ g_pslive--; break; } +#endif } /*ARGSUSED*/ @@ -1159,6 +1200,7 @@ dtrace_optval_t opt; dtrace_cmd_t *dcp; + g_ofp = stdout; int done = 0, mode = 0; int err, i; char c, *p, **v; @@ -1616,10 +1658,21 @@ case DMODE_ANON: if (g_ofile == NULL) +#if defined(sun) g_ofile = "/kernel/drv/dtrace.conf"; +#else + /* + * On FreeBSD, anonymous DOF data is written to + * the DTrace DOF file that the boot loader will + * read if booting with the DTrace option. + */ + g_ofile = "/boot/dtrace.dof"; +#endif dof_prune(g_ofile); /* strip out any old DOF directives */ +#if defined(sun) etcsystem_prune(); /* string out any forceload directives */ +#endif if (g_cmdc == 0) { dtrace_close(g_dtp); @@ -1650,8 +1703,10 @@ * that itself contains a #pragma D option quiet. */ error("saved anonymous enabling in %s\n", g_ofile); +#if defined(sun) etcsystem_add(); error("run update_drv(1M) or reboot to enable changes\n"); +#endif dtrace_close(g_dtp); return (g_status); ==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/mdb/tools/common/die.c#2 (text) ==== @@ -40,6 +40,9 @@ { va_list ap; int err = errno; +#if !defined(sun) + const char *progname = getprogname(); +#endif (void) fprintf(stderr, "%s: ", progname); @@ -51,13 +54,20 @@ if (format[strlen(format) - 1] != '\n') (void) fprintf(stderr, ": %s\n", strerror(err)); +#if defined(__FreeBSD__) + exit(0); +#else exit(1); +#endif } void elfdie(char *format, ...) { va_list ap; +#if !defined(sun) + const char *progname = getprogname(); +#endif (void) fprintf(stderr, "%s: ", progname); @@ -69,5 +79,9 @@ if (format[strlen(format) - 1] != '\n') (void) fprintf(stderr, ": %s\n", elf_errmsg(elf_errno())); +#if defined(__FreeBSD__) + exit(0); +#else exit(1); +#endif } ==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/mdb/tools/common/util.h#2 (text) ==== @@ -40,7 +40,9 @@ extern void die(char *, ...); extern void elfdie(char *, ...); +#if defined(sun) extern const char *progname; +#endif #ifdef __cplusplus } ==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/sgs/include/alist.h#2 (text) ==== @@ -39,7 +39,11 @@ #endif #include +#if defined(sun) #include +#else +#include +#endif #define ALO_DATA (sizeof (Alist) - sizeof (void *)) ==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/sgs/include/sgs.h#2 (text) ==== @@ -35,7 +35,6 @@ #pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif @@ -49,7 +48,11 @@ #ifndef _ASM #include +#if defined(sun) #include +#else +#include +#endif #include #include #include ==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/sgs/tools/common/findprime.c#2 (text) ==== @@ -27,6 +27,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" #include +#include /* * function that will find a prime'ish number. Usefull for ==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/sgs/tools/common/sgsmsg.c#2 (text) ==== @@ -67,6 +67,7 @@ * the data array being built in msg.c. The index into this array * becomes the `message' identifier created in the msg.h file. */ + #pragma ident "%Z%%M% %I% %E% SMI" #include @@ -318,21 +319,21 @@ * Dump contents of String Table to standard out */ static void -dump_stringtab(Str_tbl *stp) +dump_stringtab(Str_tbl *dump_stp) { uint_t i; - if ((stp->st_flags & FLG_STTAB_COMPRESS) == 0) { + if ((dump_stp->st_flags & FLG_STTAB_COMPRESS) == 0) { (void) printf("uncompressed strings: %d\n", - stp->st_fullstringsize); + dump_stp->st_fullstringsize); return; } - for (i = 0; i < stp->st_hbckcnt; i++) { + for (i = 0; i < dump_stp->st_hbckcnt; i++) { Str_hash *sthash; (void) printf("Bucket: [%3d]\n", i); - for (sthash = stp->st_hashbcks[i]; sthash; + for (sthash = dump_stp->st_hashbcks[i]; sthash; sthash = sthash->hi_next) { uint_t stroff; stroff = sthash->hi_mstr->sm_stlen - sthash->hi_stlen; @@ -350,7 +351,7 @@ } } (void) printf("fullstringsize: %d compressed: %d\n", - stp->st_fullstringsize, stp->st_stringsize); + dump_stp->st_fullstringsize, dump_stp->st_stringsize); } /* * Initialize the message definition header file stream. @@ -552,7 +553,7 @@ return (1); } if (fddefs && fprintf(fddefs, "#define\t%s_SIZE\t%d\n", - msg->ms_defn, strlen(msg->ms_message)) < 0) { + msg->ms_defn, (int) strlen(msg->ms_message)) < 0) { (void) fprintf(stderr, Errmsg_wrte, fldefs, strerror(errno)); return (1); @@ -630,7 +631,7 @@ } static int -file() +file(void) { char buffer[LINE_MAX], * token; uint_t bufsize; @@ -646,8 +647,9 @@ line = 1; while ((token = fgets(buffer, LINE_MAX, fddesc)) != NULL) { - char defn[PATH_MAX], * _defn, * str; - int len; + char defn[PATH_MAX], * _defn; + const char *str; + int len = 0; switch (*token) { case '#': @@ -940,7 +942,7 @@ return (1); } - if (len >= bufsize) { + if (len >= (int) bufsize) { bufsize += LINE_MAX; if ((token_buffer = realloc( token_buffer, bufsize)) == 0) { ==== //depot/projects/opensolaris/src/contrib/opensolaris/cmd/sgs/tools/common/string_table.c#2 (text) ==== @@ -28,6 +28,7 @@ #include #include +#include #include #include @@ -124,12 +125,12 @@ /* LINTLIBRARY */ -int +static int strlen_compare(const void *elem1, const void *elem2) { uint_t l1, l2; - l1 = ((Stringelem *)elem1)->se_stlen; - l2 = ((Stringelem *)elem2)->se_stlen; + l1 = ((const Stringelem *)elem1)->se_stlen; + l2 = ((const Stringelem *)elem2)->se_stlen; if (l1 == l2) return (0); ==== //depot/projects/opensolaris/src/contrib/opensolaris/lib/libctf/common/ctf_lib.c#2 (text) ==== @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -51,7 +52,11 @@ static size_t _PAGESIZE; static size_t _PAGEMASK; +#if defined(sun) #pragma init(_libctf_init) +#else +void _libctf_init(void) __attribute__ ((constructor)); +#endif void _libctf_init(void) { @@ -85,8 +90,8 @@ if ((zlib.z_dlp = dlopen(_libctf_zlib, RTLD_LAZY | RTLD_LOCAL)) == NULL) return (ctf_set_open_errno(errp, ECTF_ZINIT)); - zlib.z_uncompress = (int (*)()) dlsym(zlib.z_dlp, "uncompress"); - zlib.z_error = (const char *(*)()) dlsym(zlib.z_dlp, "zError"); + zlib.z_uncompress = (int (*)(uchar_t *, ulong_t *, const uchar_t *, ulong_t)) dlsym(zlib.z_dlp, "uncompress"); + zlib.z_error = (const char *(*)(int)) dlsym(zlib.z_dlp, "zError"); if (zlib.z_uncompress == NULL || zlib.z_error == NULL) { (void) dlclose(zlib.z_dlp); @@ -220,7 +225,7 @@ * If we have read enough bytes to form a CTF header and the magic * string matches, attempt to interpret the file as raw CTF. */ - if (nbytes >= sizeof (ctf_preamble_t) && + if (nbytes >= (ssize_t) sizeof (ctf_preamble_t) && hdr.ctf.ctp_magic == CTF_MAGIC) { if (hdr.ctf.ctp_version > CTF_VERSION) return (ctf_set_open_errno(errp, ECTF_CTFVERS)); @@ -250,7 +255,7 @@ * do our own largefile ELF processing, and convert everything to * GElf structures so that clients can operate on any data model. */ - if (nbytes >= sizeof (Elf32_Ehdr) && + if (nbytes >= (ssize_t) sizeof (Elf32_Ehdr) && bcmp(&hdr.e32.e_ident[EI_MAG0], ELFMAG, SELFMAG) == 0) { #ifdef _BIG_ENDIAN uchar_t order = ELFDATA2MSB; @@ -262,7 +267,7 @@ void *strs_map; size_t strs_mapsz; - const char *strs; + char *strs; if (hdr.e32.e_ident[EI_DATA] != order) return (ctf_set_open_errno(errp, ECTF_ENDIAN)); @@ -270,7 +275,7 @@ return (ctf_set_open_errno(errp, ECTF_ELFVERS)); if (hdr.e32.e_ident[EI_CLASS] == ELFCLASS64) { - if (nbytes < sizeof (GElf_Ehdr)) + if (nbytes < (ssize_t) sizeof (GElf_Ehdr)) return (ctf_set_open_errno(errp, ECTF_FMT)); } else { Elf32_Ehdr e32 = hdr.e32; @@ -321,7 +326,7 @@ strs_map = mmap64(NULL, strs_mapsz, PROT_READ, MAP_PRIVATE, fd, sp[hdr.e64.e_shstrndx].sh_offset & _PAGEMASK); - strs = (const char *)strs_map + + strs = (char *)strs_map + (sp[hdr.e64.e_shstrndx].sh_offset & ~_PAGEMASK); if (strs_map == MAP_FAILED) { ==== //depot/projects/opensolaris/src/contrib/opensolaris/lib/libctf/common/ctf_subr.c#2 (text) ==== @@ -27,7 +27,6 @@ #pragma ident "%Z%%M% %I% %E% SMI" #include -#include #include #include @@ -58,7 +57,7 @@ /*ARGSUSED*/ void -ctf_free(void *buf, size_t size) +ctf_free(void *buf, __unused size_t size) { free(buf); } @@ -66,7 +65,7 @@ const char * ctf_strerror(int err) { - return (strerror(err)); + return ((const char *) strerror(err)); } /*PRINTFLIKE1*/ ==== //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/drti.c#2 (text) ==== @@ -55,7 +55,7 @@ * DTRACE_DOF_INIT_DEVNAME set the path to the helper node */ -static const char *devname = "/dev/dtrace/helper"; +static const char *devnamep = "/dev/dtrace/helper"; static const char *olddevname = "/devices/pseudo/dtrace@0:helper"; static const char *modname; /* Name of this load object */ @@ -86,6 +86,7 @@ } #pragma init(dtrace_dof_init) + static void dtrace_dof_init(void) { @@ -141,10 +142,10 @@ } if ((p = getenv("DTRACE_DOF_INIT_DEVNAME")) != NULL) - devname = p; + devnamep = p; - if ((fd = open64(devname, O_RDWR)) < 0) { - dprintf(1, "failed to open helper device %s", devname); + if ((fd = open64(devnamep, O_RDWR)) < 0) { + dprintf(1, "failed to open helper device %s", devnamep); /* * If the device path wasn't explicitly set, try again with @@ -153,10 +154,10 @@ if (p != NULL) return; - devname = olddevname; + devnamep = olddevname; - if ((fd = open64(devname, O_RDWR)) < 0) { - dprintf(1, "failed to open helper device %s", devname); + if ((fd = open64(devnamep, O_RDWR)) < 0) { + dprintf(1, "failed to open helper device %s", devnamep); return; } } @@ -175,8 +176,8 @@ { int fd; - if ((fd = open64(devname, O_RDWR)) < 0) { - dprintf(1, "failed to open helper device %s", devname); + if ((fd = open64(devnamep, O_RDWR)) < 0) { + dprintf(1, "failed to open helper device %s", devnamep); return; } ==== //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c#2 (text) ==== @@ -32,7 +32,11 @@ #include #include #include +#if defined(sun) #include +#else +#include +#endif #include #define DTRACE_AHASHSIZE 32779 /* big 'ol prime */ @@ -54,7 +58,7 @@ static void dt_aggregate_count(int64_t *existing, int64_t *new, size_t size) { - int i; + uint_t i; for (i = 0; i < size / sizeof (int64_t); i++) existing[i] = existing[i] + new[i]; @@ -192,9 +196,10 @@ static int dt_aggregate_quantizedcmp(int64_t *lhs, int64_t *rhs) { - int nbuckets = DTRACE_QUANTIZE_NBUCKETS, i; + int nbuckets = DTRACE_QUANTIZE_NBUCKETS; long double ltotal = 0, rtotal = 0; int64_t lzero, rzero; + uint_t i; for (i = 0; i < nbuckets; i++) { int64_t bucketval = DTRACE_QUANTIZE_BUCKETVAL(i); @@ -231,6 +236,8 @@ static void dt_aggregate_usym(dtrace_hdl_t *dtp, uint64_t *data) { +printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); +#ifdef DOODAD uint64_t pid = data[0]; uint64_t *pc = &data[1]; struct ps_prochandle *P; @@ -249,11 +256,14 @@ dt_proc_unlock(dtp, P); dt_proc_release(dtp, P); +#endif } static void dt_aggregate_umod(dtrace_hdl_t *dtp, uint64_t *data) { +printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); +#ifdef DOODAD uint64_t pid = data[0]; uint64_t *pc = &data[1]; struct ps_prochandle *P; @@ -272,6 +282,7 @@ dt_proc_unlock(dtp, P); dt_proc_release(dtp, P); +#endif } static void @@ -352,7 +363,11 @@ buf->dtbd_cpu = cpu; +#if defined(sun) if (dt_ioctl(dtp, DTRACEIOC_AGGSNAP, buf) == -1) { +#else + if (dt_ioctl(dtp, DTRACEIOC_AGGSNAP, &buf) == -1) { +#endif if (errno == ENOENT) { /* * If that failed with ENOENT, it may be because the @@ -620,7 +635,7 @@ return (0); for (i = 0; i < agp->dtat_ncpus; i++) { - if (rval = dt_aggregate_snap_cpu(dtp, agp->dtat_cpus[i])) + if ((rval = dt_aggregate_snap_cpu(dtp, agp->dtat_cpus[i]))) return (rval); } @@ -1094,7 +1109,7 @@ case DTRACE_AGGWALK_REMOVE: { dtrace_aggdata_t *aggdata = &h->dtahe_data; - int i, max_cpus = agp->dtat_maxcpu; + int max_cpus = agp->dtat_maxcpu; /* * First, remove this hash entry from its hash chain. ==== //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_cc.c#2 (text) ==== @@ -87,6 +87,7 @@ #include #include +#include #include #include #include @@ -1589,7 +1590,9 @@ char **argv = malloc(sizeof (char *) * (argc + 5)); FILE *ofp = tmpfile(); +#if defined(sun) char ipath[20], opath[20]; /* big enough for /dev/fd/ + INT_MAX + \0 */ +#endif char verdef[32]; /* big enough for -D__SUNW_D_VERSION=0x%08x + \0 */ struct sigaction act, oact; @@ -1597,7 +1600,11 @@ int wstat, estat; pid_t pid; +#if defined(sun) off64_t off; +#else + off_t off = 0; +#endif int c; if (argv == NULL || ofp == NULL) { @@ -1624,8 +1631,10 @@ (void) fseeko64(ifp, off, SEEK_SET); } +#if defined(sun) (void) snprintf(ipath, sizeof (ipath), "/dev/fd/%d", fileno(ifp)); (void) snprintf(opath, sizeof (opath), "/dev/fd/%d", fileno(ofp)); +#endif bcopy(dtp->dt_cpp_argv, argv, sizeof (char *) * argc); @@ -1633,6 +1642,7 @@ "-D__SUNW_D_VERSION=0x%08x", dtp->dt_vmax); argv[argc++] = verdef; +#if defined(sun) switch (dtp->dt_stdcmode) { case DT_STDC_XA: case DT_STDC_XT: @@ -1645,6 +1655,9 @@ argv[argc++] = ipath; argv[argc++] = opath; +#else + argv[argc++] = "-P"; +#endif argv[argc] = NULL; /* @@ -1671,6 +1684,12 @@ } if (pid == 0) { +#if !defined(sun) + if (isatty(fileno(ifp)) == 0) + lseek(fileno(ifp), off, SEEK_SET); + dup2(fileno(ifp), 0); + dup2(fileno(ofp), 1); +#endif (void) execvp(dtp->dt_cpp_path, argv); _exit(errno == ENOENT ? 127 : 126); } ==== //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_cg.c#2 (text) ==== @@ -267,7 +267,7 @@ * properties are used to compute shift as USHIFT or SSHIFT, below. */ if (dnp->dn_flags & DT_NF_SIGNED) { -#ifdef _BIG_ENDIAN +#if BYTE_ORDER == _BIG_ENDIAN shift = clp2(P2ROUNDUP(e.cte_bits, NBBY) / NBBY) * NBBY - mp->ctm_offset % NBBY; #else @@ -281,7 +281,7 @@ instr = DIF_INSTR_FMT(DIF_OP_SRA, r1, r2, r1); dt_irlist_append(dlp, dt_cg_node_alloc(DT_LBL_NONE, instr)); } else { -#ifdef _BIG_ENDIAN +#if BYTE_ORDER == _BIG_ENDIAN shift = clp2(P2ROUNDUP(e.cte_bits, NBBY) / NBBY) * NBBY - (mp->ctm_offset % NBBY + e.cte_bits); #else ==== //depot/projects/opensolaris/src/contrib/opensolaris/lib/libdtrace/common/dt_consume.c#2 (text) ==== @@ -33,7 +33,9 @@ #include #include #include +#if defined(sun) #include +#endif #include /* @@ -521,7 +523,7 @@ return (dt_set_errno(dtp, EDT_BADSTACKPC)); } - if (pc == NULL) + if (pc == 0) break; addr += size; @@ -566,6 +568,8 @@ dt_print_ustack(dtrace_hdl_t *dtp, FILE *fp, const char *format, caddr_t addr, uint64_t arg) { +printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); +#ifdef DOODAD /* LINTED - alignment */ uint64_t *pc = (uint64_t *)addr; uint32_t depth = DTRACE_USTACK_NFRAMES(arg); @@ -609,8 +613,11 @@ if (P != NULL) dt_proc_lock(dtp, P); /* lock handle while we perform lookups */ - for (i = 0; i < depth && pc[i] != NULL; i++) { + for (i = 0; i < depth && pc[i] != 0; i++) { +printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); +#ifdef DOODAD const prmap_t *map; +#endif if ((err = dt_printf(dtp, fp, "%*s", indent, "")) < 0) break; @@ -627,6 +634,8 @@ (void) snprintf(c, sizeof (c), "%s`%s", dt_basename(objname), name); } +printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); +#ifdef DOODAD } else if (str != NULL && str[0] != '\0' && str[0] != '@' && (P != NULL && ((map = Paddr_to_map(P, pc[i])) == NULL || (map->pr_mflags & MA_WRITE)))) { @@ -644,9 +653,10 @@ * case and we refuse to use the string. */ (void) snprintf(c, sizeof (c), "%s", str); +#endif } else { if (P != NULL && Pobjname(P, pc[i], objname, - sizeof (objname)) != NULL) { + sizeof (objname)) != 0) { (void) snprintf(c, sizeof (c), "%s`0x%llx", dt_basename(objname), (u_longlong_t)pc[i]); } else { @@ -693,11 +703,16 @@ } return (err); +#else +return 0; +#endif } static int dt_print_usym(dtrace_hdl_t *dtp, FILE *fp, caddr_t addr, dtrace_actkind_t act) { +printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); +#ifdef DOODAD /* LINTED - alignment */ uint64_t pid = ((uint64_t *)addr)[0]; /* LINTED - alignment */ @@ -729,11 +744,16 @@ } while ((len = dtrace_uaddr2str(dtp, pid, pc, s, n)) >= n); return (dt_printf(dtp, fp, format, s)); +#else +return 0; +#endif } int dt_print_umod(dtrace_hdl_t *dtp, FILE *fp, const char *format, caddr_t addr) { +printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); +#ifdef DOODAD /* LINTED - alignment */ uint64_t pid = ((uint64_t *)addr)[0]; /* LINTED - alignment */ @@ -758,7 +778,7 @@ if (P != NULL) dt_proc_lock(dtp, P); /* lock handle while we perform lookups */ - if (P != NULL && Pobjname(P, pc, objname, sizeof (objname)) != NULL) { + if (P != NULL && Pobjname(P, pc, objname, sizeof (objname)) != 0) { (void) snprintf(c, sizeof (c), "%s", dt_basename(objname)); } else { (void) snprintf(c, sizeof (c), "0x%llx", (u_longlong_t)pc); @@ -772,6 +792,9 @@ } return (err); +#else +return 0; +#endif } static int @@ -1724,13 +1747,20 @@ dt_begin_t begin; processorid_t cpu = dtp->dt_beganon; dtrace_bufdesc_t nbuf; +#if !defined(sun) + dtrace_bufdesc_t *pbuf; +#endif int rval, i; static int max_ncpus; dtrace_optval_t size; dtp->dt_beganon = -1; +#if defined(sun) if (dt_ioctl(dtp, DTRACEIOC_BUFSNAP, buf) == -1) { +#else + if (dt_ioctl(dtp, DTRACEIOC_BUFSNAP, &buf) == -1) { +#endif /* * We really don't expect this to fail, but it is at least * technically possible for this to fail with ENOENT. In this @@ -1792,7 +1822,12 @@ if (i == cpu) continue; +#if defined(sun) if (dt_ioctl(dtp, DTRACEIOC_BUFSNAP, &nbuf) == -1) { +#else + pbuf = &nbuf; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Dec 13 01:21:33 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8C4DE16A469; Thu, 13 Dec 2007 01:21:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 12B2116A421 for ; Thu, 13 Dec 2007 01:21:33 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EF40913C469 for ; Thu, 13 Dec 2007 01:21:32 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBD1LWw3017189 for ; Thu, 13 Dec 2007 01:21:32 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBD1LWY4017186 for perforce@freebsd.org; Thu, 13 Dec 2007 01:21:32 GMT (envelope-from jb@freebsd.org) Date: Thu, 13 Dec 2007 01:21:32 GMT Message-Id: <200712130121.lBD1LWY4017186@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130773 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Dec 2007 01:21:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=130773 Change 130773 by jb@jb_freebsd1 on 2007/12/13 01:20:48 Remove old-style compatibility headers. Not used in ages. I hope. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/compat/assert.h#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/compat/fcntl.h#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/compat/stdio.h#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/compat/thread.h#5 delete .. //depot/projects/dtrace/src/contrib/opensolaris/compat/unistd.h#4 delete Differences ... From owner-p4-projects@FreeBSD.ORG Thu Dec 13 01:30:53 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 57DC716A41B; Thu, 13 Dec 2007 01:30:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E72F016A418 for ; Thu, 13 Dec 2007 01:30:52 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D068613C447 for ; Thu, 13 Dec 2007 01:30:52 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBD1Uq30018604 for ; Thu, 13 Dec 2007 01:30:52 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBD1Ug5p018590 for perforce@freebsd.org; Thu, 13 Dec 2007 01:30:42 GMT (envelope-from jb@freebsd.org) Date: Thu, 13 Dec 2007 01:30:42 GMT Message-Id: <200712130130.lBD1Ug5p018590@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130775 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Dec 2007 01:30:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=130775 Change 130775 by jb@jb_freebsd1 on 2007/12/13 01:30:03 Remove a couple of OpenSolaris headers that don't suit FreeBSD. Our ELF header files need to retain their own integrity. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/intel/sys/machelf.h#6 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/sparc/sys/machelf.h#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Thu Dec 13 01:34:57 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A878816A41B; Thu, 13 Dec 2007 01:34:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 59AEE16A418 for ; Thu, 13 Dec 2007 01:34:57 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 42BDC13C457 for ; Thu, 13 Dec 2007 01:34:57 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBD1Yvov019719 for ; Thu, 13 Dec 2007 01:34:57 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBD1YvHP019716 for perforce@freebsd.org; Thu, 13 Dec 2007 01:34:57 GMT (envelope-from jb@freebsd.org) Date: Thu, 13 Dec 2007 01:34:57 GMT Message-Id: <200712130134.lBD1YvHP019716@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130776 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Dec 2007 01:34:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=130776 Change 130776 by jb@jb_freebsd1 on 2007/12/13 01:34:41 Delete a stray header that doesn't belong in the OpenSolaris contrib tree. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/include/_libelf.h#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Thu Dec 13 01:44:12 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D190116A46C; Thu, 13 Dec 2007 01:44:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 64AAE16A420 for ; Thu, 13 Dec 2007 01:44:12 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 62F7213C465 for ; Thu, 13 Dec 2007 01:44:12 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBD1iCdI021229 for ; Thu, 13 Dec 2007 01:44:12 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBD1i7qe021225 for perforce@freebsd.org; Thu, 13 Dec 2007 01:44:07 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 13 Dec 2007 01:44:07 GMT Message-Id: <200712130144.lBD1i7qe021225@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 130777 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Dec 2007 01:44:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=130777 Change 130777 by kmacy@kmacy_home:ethng on 2007/12/13 01:43:22 IFC 130774 Affected files ... .. //depot/projects/ethng/src/Makefile#3 integrate .. //depot/projects/ethng/src/contrib/amd/FREEBSD-Xlist#2 integrate .. //depot/projects/ethng/src/contrib/amd/FREEBSD-upgrade#2 integrate .. //depot/projects/ethng/src/contrib/gcc/config/sparc/freebsd.h#2 integrate .. //depot/projects/ethng/src/contrib/gcc/fold-const.c#3 integrate .. //depot/projects/ethng/src/games/fortune/datfiles/fortunes#5 integrate .. //depot/projects/ethng/src/games/fortune/datfiles/fortunes-o.real#4 integrate .. //depot/projects/ethng/src/games/fortune/datfiles/fortunes-o.sp.ok#3 integrate .. //depot/projects/ethng/src/games/fortune/datfiles/fortunes.sp.ok#3 integrate .. //depot/projects/ethng/src/include/complex.h#2 integrate .. //depot/projects/ethng/src/include/nsswitch.h#2 integrate .. //depot/projects/ethng/src/lib/Makefile#5 integrate .. //depot/projects/ethng/src/lib/libc/gdtoa/_ldtoa.c#3 integrate .. //depot/projects/ethng/src/lib/libc/gen/getgrent.c#2 integrate .. //depot/projects/ethng/src/lib/libc/gen/getgrouplist.c#2 integrate .. //depot/projects/ethng/src/lib/libc/locale/localeconv.c#2 integrate .. //depot/projects/ethng/src/lib/libc/net/nsdispatch.c#2 integrate .. //depot/projects/ethng/src/lib/libc/stdio/vfscanf.c#2 integrate .. //depot/projects/ethng/src/lib/libc/stdio/vfwscanf.c#2 integrate .. //depot/projects/ethng/src/lib/libc/stdlib/grantpt.c#2 integrate .. //depot/projects/ethng/src/lib/libc/stdlib/rand.c#2 integrate .. //depot/projects/ethng/src/lib/libc/string/strtok.3#2 integrate .. //depot/projects/ethng/src/lib/libc/string/strtok.c#2 integrate .. //depot/projects/ethng/src/lib/libc/string/wcstok.c#2 integrate .. //depot/projects/ethng/src/lib/libthr/thread/thr_mutex.c#4 integrate .. //depot/projects/ethng/src/lib/msun/Makefile#2 integrate .. //depot/projects/ethng/src/lib/msun/man/atan2.3#2 integrate .. //depot/projects/ethng/src/lib/msun/man/hypot.3#2 integrate .. //depot/projects/ethng/src/lib/msun/src/s_carg.c#1 branch .. //depot/projects/ethng/src/lib/msun/src/s_cargf.c#1 branch .. //depot/projects/ethng/src/release/Makefile#8 integrate .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/Makefile#2 integrate .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/errata/Makefile#2 integrate .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/hardware/Makefile#2 integrate .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/hardware/Makefile.inc#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/hardware/amd64/Makefile#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/hardware/amd64/article.sgml#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/hardware/amd64/proc-amd64.sgml#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/hardware/article.sgml#1 branch .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/hardware/common/hw.ent#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/hardware/common/intro.sgml#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/hardware/i386/Makefile#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/hardware/i386/article.sgml#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/hardware/i386/proc-i386.sgml#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/installation/Makefile#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/installation/Makefile.inc#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/installation/amd64/Makefile#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/installation/amd64/article.sgml#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/installation/common/abstract.sgml#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/installation/common/artheader.sgml#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/installation/common/install.ent#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/installation/common/install.sgml#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/installation/common/layout.sgml#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/installation/common/trouble.sgml#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/installation/common/upgrade.sgml#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/installation/i386/Makefile#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/installation/i386/article.sgml#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/installation/ia64/Makefile#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/installation/ia64/article.sgml#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/installation/pc98/Makefile#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/installation/pc98/article.sgml#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/installation/sparc64/Makefile#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/installation/sparc64/article.sgml#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/installation/sparc64/install.sgml#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/readme/article.sgml#2 integrate .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/relnotes/Makefile#2 integrate .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/relnotes/Makefile.inc#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/relnotes/amd64/Makefile#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/relnotes/amd64/article.sgml#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/relnotes/article.sgml#1 branch .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/relnotes/common/relnotes.ent#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/relnotes/i386/Makefile#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/relnotes/i386/article.sgml#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/relnotes/ia64/Makefile#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/relnotes/ia64/article.sgml#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/relnotes/pc98/Makefile#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/relnotes/pc98/article.sgml#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/relnotes/powerpc/Makefile#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/relnotes/powerpc/article.sgml#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/relnotes/sparc64/Makefile#2 delete .. //depot/projects/ethng/src/release/doc/zh_CN.GB2312/relnotes/sparc64/article.sgml#2 delete .. //depot/projects/ethng/src/sbin/bsdlabel/bsdlabel.c#2 integrate .. //depot/projects/ethng/src/sbin/ifconfig/ifconfig.8#3 integrate .. //depot/projects/ethng/src/sbin/ifconfig/ifconfig.c#3 integrate .. //depot/projects/ethng/src/sbin/natd/natd.8#2 integrate .. //depot/projects/ethng/src/sbin/newfs_msdos/newfs_msdos.8#3 integrate .. //depot/projects/ethng/src/share/man/man4/nve.4#3 integrate .. //depot/projects/ethng/src/share/man/man5/src.conf.5#5 integrate .. //depot/projects/ethng/src/share/man/man7/build.7#2 integrate .. //depot/projects/ethng/src/share/mk/bsd.own.mk#4 integrate .. //depot/projects/ethng/src/sys/amd64/amd64/machdep.c#4 integrate .. //depot/projects/ethng/src/sys/amd64/amd64/pmap.c#8 integrate .. //depot/projects/ethng/src/sys/arm/arm/pmap.c#8 integrate .. //depot/projects/ethng/src/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/ethng/src/sys/compat/freebsd32/freebsd32_misc.c#5 integrate .. //depot/projects/ethng/src/sys/conf/files#13 integrate .. //depot/projects/ethng/src/sys/conf/files.amd64#11 integrate .. //depot/projects/ethng/src/sys/conf/files.i386#9 integrate .. //depot/projects/ethng/src/sys/dev/amr/amr.c#3 integrate .. //depot/projects/ethng/src/sys/dev/amr/amr_cam.c#3 integrate .. //depot/projects/ethng/src/sys/dev/amr/amr_pci.c#3 integrate .. //depot/projects/ethng/src/sys/dev/amr/amrvar.h#2 integrate .. //depot/projects/ethng/src/sys/dev/arcmsr/arcmsr.c#3 integrate .. //depot/projects/ethng/src/sys/dev/if_ndis/if_ndis.c#6 integrate .. //depot/projects/ethng/src/sys/dev/sound/pci/ich.c#2 integrate .. //depot/projects/ethng/src/sys/dev/usb/umass.c#2 integrate .. //depot/projects/ethng/src/sys/dev/usb/usbdevs#10 integrate .. //depot/projects/ethng/src/sys/fs/udf/udf_vfsops.c#3 integrate .. //depot/projects/ethng/src/sys/geom/geom_bsd_enc.c#2 integrate .. //depot/projects/ethng/src/sys/geom/part/g_part.c#5 integrate .. //depot/projects/ethng/src/sys/i386/i386/machdep.c#5 integrate .. //depot/projects/ethng/src/sys/i386/i386/pmap.c#8 integrate .. //depot/projects/ethng/src/sys/kern/kern_proc.c#6 integrate .. //depot/projects/ethng/src/sys/kern/kern_resource.c#2 integrate .. //depot/projects/ethng/src/sys/kern/sched_4bsd.c#7 integrate .. //depot/projects/ethng/src/sys/kern/sched_ule.c#9 integrate .. //depot/projects/ethng/src/sys/net/bridgestp.c#3 integrate .. //depot/projects/ethng/src/sys/net/bridgestp.h#2 integrate .. //depot/projects/ethng/src/sys/net/if.h#3 integrate .. //depot/projects/ethng/src/sys/net/route.c#10 integrate .. //depot/projects/ethng/src/sys/net/route.h#5 integrate .. //depot/projects/ethng/src/sys/net80211/ieee80211_radiotap.h#2 integrate .. //depot/projects/ethng/src/sys/netgraph/ng_l2tp.c#3 integrate .. //depot/projects/ethng/src/sys/netinet/if_ether.c#10 integrate .. //depot/projects/ethng/src/sys/netinet/ip_fw2.c#7 integrate .. //depot/projects/ethng/src/sys/netinet/tcp_ofld.c#1 branch .. //depot/projects/ethng/src/sys/netinet/tcp_ofld.h#1 branch .. //depot/projects/ethng/src/sys/netinet/tcp_syncache.c#8 integrate .. //depot/projects/ethng/src/sys/netinet/tcp_syncache.h#2 integrate .. //depot/projects/ethng/src/sys/netinet/tcp_var.h#5 integrate .. //depot/projects/ethng/src/sys/netinet/toedev.h#1 branch .. //depot/projects/ethng/src/sys/netinet6/dest6.c#2 integrate .. //depot/projects/ethng/src/sys/netinet6/frag6.c#2 integrate .. //depot/projects/ethng/src/sys/netinet6/icmp6.c#2 integrate .. //depot/projects/ethng/src/sys/netinet6/in6.c#3 integrate .. //depot/projects/ethng/src/sys/netinet6/in6.h#2 integrate .. //depot/projects/ethng/src/sys/netinet6/in6_cksum.c#2 integrate .. //depot/projects/ethng/src/sys/netinet6/in6_gif.c#2 integrate .. //depot/projects/ethng/src/sys/netinet6/in6_gif.h#2 integrate .. //depot/projects/ethng/src/sys/netinet6/in6_ifattach.c#2 integrate .. //depot/projects/ethng/src/sys/netinet6/in6_ifattach.h#2 integrate .. //depot/projects/ethng/src/sys/netinet6/in6_pcb.c#2 integrate .. //depot/projects/ethng/src/sys/netinet6/in6_pcb.h#2 integrate .. //depot/projects/ethng/src/sys/netinet6/in6_proto.c#2 integrate .. //depot/projects/ethng/src/sys/netinet6/in6_rmx.c#2 integrate .. //depot/projects/ethng/src/sys/netinet6/in6_src.c#2 integrate .. //depot/projects/ethng/src/sys/netinet6/in6_var.h#2 integrate .. //depot/projects/ethng/src/sys/netinet6/ip6_ecn.h#2 integrate .. //depot/projects/ethng/src/sys/netinet6/ip6_forward.c#2 integrate .. //depot/projects/ethng/src/sys/netinet6/ip6_id.c#2 integrate .. //depot/projects/ethng/src/sys/netinet6/ip6_input.c#2 integrate .. //depot/projects/ethng/src/sys/netinet6/ip6_ipsec.c#2 integrate .. //depot/projects/ethng/src/sys/netinet6/ip6_ipsec.h#2 integrate .. //depot/projects/ethng/src/sys/netinet6/ip6_mroute.c#2 integrate .. //depot/projects/ethng/src/sys/netinet6/ip6_mroute.h#2 integrate .. //depot/projects/ethng/src/sys/netinet6/ip6_output.c#3 integrate .. //depot/projects/ethng/src/sys/netinet6/ip6_var.h#2 integrate .. //depot/projects/ethng/src/sys/netinet6/ip6protosw.h#2 integrate .. //depot/projects/ethng/src/sys/netinet6/mld6.c#2 integrate .. //depot/projects/ethng/src/sys/netinet6/mld6_var.h#2 integrate .. //depot/projects/ethng/src/sys/netinet6/nd6.c#4 integrate .. //depot/projects/ethng/src/sys/netinet6/nd6.h#2 integrate .. //depot/projects/ethng/src/sys/netinet6/nd6_nbr.c#2 integrate .. //depot/projects/ethng/src/sys/netinet6/nd6_rtr.c#2 integrate .. //depot/projects/ethng/src/sys/netinet6/pim6.h#2 integrate .. //depot/projects/ethng/src/sys/netinet6/pim6_var.h#2 integrate .. //depot/projects/ethng/src/sys/netinet6/raw_ip6.c#2 integrate .. //depot/projects/ethng/src/sys/netinet6/raw_ip6.h#2 integrate .. //depot/projects/ethng/src/sys/netinet6/route6.c#2 integrate .. //depot/projects/ethng/src/sys/netinet6/scope6.c#2 integrate .. //depot/projects/ethng/src/sys/netinet6/scope6_var.h#2 integrate .. //depot/projects/ethng/src/sys/netinet6/sctp6_usrreq.c#6 integrate .. //depot/projects/ethng/src/sys/netinet6/sctp6_var.h#3 integrate .. //depot/projects/ethng/src/sys/netinet6/tcp6_var.h#2 integrate .. //depot/projects/ethng/src/sys/netinet6/udp6_usrreq.c#4 integrate .. //depot/projects/ethng/src/sys/netinet6/udp6_var.h#2 integrate .. //depot/projects/ethng/src/sys/sys/cdefs.h#2 integrate .. //depot/projects/ethng/src/sys/sys/socket.h#3 integrate .. //depot/projects/ethng/src/sys/vm/vm_page.c#8 integrate .. //depot/projects/ethng/src/tools/build/options/WITHOUT_BZIP2#2 integrate .. //depot/projects/ethng/src/tools/build/options/WITHOUT_GNU#2 integrate .. //depot/projects/ethng/src/tools/build/options/WITHOUT_GSSAPI#1 branch .. //depot/projects/ethng/src/tools/build/options/WITHOUT_INSTALLLIB#1 branch .. //depot/projects/ethng/src/tools/build/options/WITHOUT_KERBEROS#2 integrate .. //depot/projects/ethng/src/tools/build/options/WITHOUT_KVM#2 integrate .. //depot/projects/ethng/src/tools/build/options/WITHOUT_PAM#2 integrate .. //depot/projects/ethng/src/tools/build/options/WITHOUT_TOOLCHAIN#2 integrate .. //depot/projects/ethng/src/tools/build/options/makeman#3 integrate .. //depot/projects/ethng/src/tools/regression/lib/libc/stdio/test-scanfloat.c#3 integrate .. //depot/projects/ethng/src/tools/regression/lib/msun/test-lround.c#2 integrate .. //depot/projects/ethng/src/tools/regression/lib/msun/test-next.c#2 integrate .. //depot/projects/ethng/src/usr.bin/make/Makefile.dist#2 integrate .. //depot/projects/ethng/src/usr.bin/procstat/procstat_args.c#2 integrate .. //depot/projects/ethng/src/usr.bin/procstat/procstat_bin.c#2 integrate .. //depot/projects/ethng/src/usr.bin/procstat/procstat_cred.c#2 integrate .. //depot/projects/ethng/src/usr.bin/procstat/procstat_files.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/pkg_install/Makefile#3 integrate .. //depot/projects/ethng/src/usr.sbin/pkg_install/add/pkg_add.1#3 integrate .. //depot/projects/ethng/src/usr.sbin/pkg_install/create/pkg_create.1#2 integrate .. //depot/projects/ethng/src/usr.sbin/pkg_install/delete/pkg_delete.1#2 integrate .. //depot/projects/ethng/src/usr.sbin/pkg_install/info/pkg_info.1#2 integrate .. //depot/projects/ethng/src/usr.sbin/pkg_install/updating/pkg_updating.1#2 integrate .. //depot/projects/ethng/src/usr.sbin/pkg_install/version/pkg_version.1#2 integrate .. //depot/projects/ethng/src/usr.sbin/sysinstall/media.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/sysinstall/system.c#2 integrate .. //depot/projects/ethng/src/usr.sbin/syslogd/syslogd.c#3 integrate Differences ... ==== //depot/projects/ethng/src/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.342 2007/10/18 08:41:52 delphij Exp $ +# $FreeBSD: src/Makefile,v 1.344 2007/12/13 00:08:02 imp Exp $ # # The user-driven targets are: # @@ -234,17 +234,18 @@ PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \ PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \ then \ - (cd ${.CURDIR} && make make); \ + (cd ${.CURDIR} && ${MAKE} make); \ fi # # Upgrade make(1) to the current version using the installed -# headers, libraries and tools. +# headers, libraries and tools. Also, allow the location of +# the system bsdmake-like utility to be overridden. # MMAKEENV= MAKEOBJDIRPREFIX=${MAKEPATH} \ DESTDIR= \ INSTALL="sh ${.CURDIR}/tools/install.sh" -MMAKE= ${MMAKEENV} make \ +MMAKE= ${MMAKEENV} ${MAKE} \ -D_UPGRADING \ -DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \ -DNO_CPU_CFLAGS -DNO_WERROR ==== //depot/projects/ethng/src/contrib/amd/FREEBSD-Xlist#2 (text+ko) ==== @@ -1,7 +1,8 @@ -$FreeBSD: src/contrib/amd/FREEBSD-Xlist,v 1.5 2004/07/06 12:52:27 mbr Exp $ +$FreeBSD: src/contrib/amd/FREEBSD-Xlist,v 1.6 2007/12/11 19:15:17 obrien Exp $ *LSM.am-utils *Makefile.* *README.autofs +*README.osx *ac*.m4 *.old *acconfig.h @@ -15,6 +16,7 @@ *missing *mkinstalldirs *stamp-h.in +*amd/test1.sh *amd/Makefile.* *amq/Makefile.* *commit @@ -38,10 +40,13 @@ *conf/fh_dref/fh_dref_sunos3.h *conf/fh_dref/fh_dref_sunos4.h *conf/fh_dref/fh_dref_svr4.h +*conf/hn_dref/hn_dref_default.h, *conf/hn_dref/hn_dref_isc3.h *conf/hn_dref/hn_dref_linux.h *conf/mount/mount_aix.c +*conf/mount/mount_aix3.c *conf/mount/mount_bsdi3.c +*conf/mount/mount_default.c *conf/mount/mount_freebsd3.c *conf/mount/mount_hpux.c *conf/mount/mount_irix5.c @@ -54,6 +59,7 @@ *conf/mtab/mtab_aix.c *conf/mtab/mtab_file.c *conf/mtab/mtab_isc3.c +*conf/mtab/mtab_linux.c *conf/mtab/mtab_mach3.c *conf/mtab/mtab_osf.c *conf/mtab/mtab_svr4.c @@ -63,6 +69,7 @@ *conf/nfs_prot/nfs_prot_aix4_2.h *conf/nfs_prot/nfs_prot_aix4_3.h *conf/nfs_prot/nfs_prot_aix5_1.h +*conf/nfs_prot/nfs_prot_aix5_2.h *conf/nfs_prot/nfs_prot_bsdi2.h *conf/nfs_prot/nfs_prot_bsdi3.h *conf/nfs_prot/nfs_prot_darwin.h @@ -92,6 +99,12 @@ *conf/nfs_prot/nfs_prot_sunos5_8.h *conf/nfs_prot/nfs_prot_svr4.h *conf/nfs_prot/nfs_prot_ultrix.h +*conf/autofs/autofs_linux.h +*conf/autofs/autofs_linux.c +*conf/autofs/autofs_solaris_v1.h +*conf/autofs/autofs_solaris_v1.c +*conf/autofs/autofs_solaris_v2_v3.h +*conf/autofs/autofs_solaris_v2_v3.c *conf/sa_dref/sa_dref_386bsd.h *conf/sa_dref/sa_dref_aix3.h *conf/sa_dref/sa_dref_aoi.h @@ -103,6 +116,7 @@ *conf/trap/trap_aix3.h *conf/trap/trap_aux.h *conf/trap/trap_dgux.h +*conf/trap/trap_freebsd3.h *conf/trap/trap_hcx.h *conf/trap/trap_hpux.h *conf/trap/trap_hpux11.h @@ -115,7 +129,9 @@ *conf/trap/trap_stellix.h *conf/trap/trap_svr4.h *conf/trap/trap_ultrix.h +*conf/umount/umount_aix.c *conf/umount/umount_default.c +*conf/umount/umount_linux.c *conf/umount/umount_osf.c *doc/Makefile.am *doc/Makefile.in @@ -135,11 +151,118 @@ *fsinfo/Makefile.* *hlfsd/Makefile.* *libamu/Makefile.* +*libamu/alloca.c *libamu/clnt_sperrno.c *libamu/memcmp.c *libamu/strcasecmp.c *libamu/strdup.c *libamu/strstr.c +*libamu/strlcat.c +*libamu/strlcpy.c *libamu/ualarm.c *mk-amd-map/Makefile.* *wire-test/Makefile.* +*m4/GNUmakefile +*m4/amdgrep* +*m4/amindent* +*m4/autopat* +*m4/chop-aclocal.pl* +*m4/copy-if-newbig* +*m4/mk-aclocal* +*m4/mkconf* +*m4/rmtspc* +*m4/update_build_version* +*m4/macros/HEADER +*m4/macros/TRAILER +*m4/macros/c_void_p.m4 +*m4/macros/cache_check_dynamic.m4 +*m4/macros/check_amu_fs.m4 +*m4/macros/check_checkmount_style.m4 +*m4/macros/check_extern.m4 +*m4/macros/check_fhandle.m4 +*m4/macros/check_field.m4 +*m4/macros/check_fs_headers.m4 +*m4/macros/check_fs_mntent.m4 +*m4/macros/check_gnu_getopt.m4 +*m4/macros/check_hide_mount_type.m4 +*m4/macros/check_lib2.m4 +*m4/macros/check_map_funcs.m4 +*m4/macros/check_mnt2_cdfs_opt.m4 +*m4/macros/check_mnt2_gen_opt.m4 +*m4/macros/check_mnt2_nfs_opt.m4 +*m4/macros/check_mnttab_file_name.m4 +*m4/macros/check_mnttab_location.m4 +*m4/macros/check_mnttab_opt.m4 +*m4/macros/check_mnttab_style.m4 +*m4/macros/check_mnttab_type.m4 +*m4/macros/check_mount_style.m4 +*m4/macros/check_mount_trap.m4 +*m4/macros/check_mount_type.m4 +*m4/macros/check_mtype_printf_type.m4 +*m4/macros/check_mtype_type.m4 +*m4/macros/check_network_transport_type.m4 +*m4/macros/check_nfs_fh_dref.m4 +*m4/macros/check_nfs_hn_dref.m4 +*m4/macros/check_nfs_prot_headers.m4 +*m4/macros/check_nfs_sa_dref.m4 +*m4/macros/check_nfs_socket_connection.m4 +*m4/macros/check_os_libs.m4 +*m4/macros/check_restartable_signal_handler.m4 +*m4/macros/check_umount_style.m4 +*m4/macros/check_unmount_args.m4 +*m4/macros/check_unmount_call.m4 +*m4/macros/expand_cpp_hex.m4 +*m4/macros/expand_cpp_int.m4 +*m4/macros/expand_cpp_string.m4 +*m4/macros/expand_run_string.m4 +*m4/macros/extern_optarg.m4 +*m4/macros/extern_sys_errlist.m4 +*m4/macros/field_mntent_t_mnt_time_string.m4 +*m4/macros/func_bad_memcmp.m4 +*m4/macros/func_bad_yp_all.m4 +*m4/macros/header_templates.m4 +*m4/macros/host_macros.m4 +*m4/macros/linux_headers.m4 +*m4/macros/localconfig.m4 +*m4/macros/mount_headers.m4 +*m4/macros/name_package.m4 +*m4/macros/name_version.m4 +*m4/macros/opt_amu_cflags.m4 +*m4/macros/opt_cppflags.m4 +*m4/macros/opt_debug.m4 +*m4/macros/opt_ldflags.m4 +*m4/macros/opt_libs.m4 +*m4/macros/os_cflags.m4 +*m4/macros/os_cppflags.m4 +*m4/macros/os_ldflags.m4 +*m4/macros/package_bugreport.m4 +*m4/macros/package_name.m4 +*m4/macros/package_version.m4 +*m4/macros/save_state.m4 +*m4/macros/struct_field_nfs_fh.m4 +*m4/macros/struct_mntent.m4 +*m4/macros/struct_mnttab.m4 +*m4/macros/struct_nfs_args.m4 +*m4/macros/struct_nfs_fh.m4 +*m4/macros/struct_nfs_fh3.m4 +*m4/macros/struct_nfs_gfs_mount.m4 +*m4/macros/try_compile_anyfs.m4 +*m4/macros/try_compile_nfs.m4 +*m4/macros/try_compile_rpc.m4 +*m4/macros/type_auth_create_gidlist.m4 +*m4/macros/type_cachefs_args.m4 +*m4/macros/type_cdfs_args.m4 +*m4/macros/type_efs_args.m4 +*m4/macros/type_lofs_args.m4 +*m4/macros/type_mfs_args.m4 +*m4/macros/type_pcfs_args.m4 +*m4/macros/type_recvfrom_fromlen.m4 +*m4/macros/type_rfs_args.m4 +*m4/macros/type_svc_in_arg.m4 +*m4/macros/type_time_t.m4 +*m4/macros/type_tmpfs_args.m4 +*m4/macros/type_ufs_args.m4 +*m4/macros/type_xdrproc_t.m4 +*m4/macros/type_xfs_args.m4 +*m4/macros/type_yp_order_outorder.m4 +*m4/macros/with_addon.m4 ==== //depot/projects/ethng/src/contrib/amd/FREEBSD-upgrade#2 (text+ko) ==== @@ -1,21 +1,19 @@ # ex:ts=8 -$FreeBSD: src/contrib/amd/FREEBSD-upgrade,v 1.15 2004/05/14 13:29:48 mbr Exp $ +$FreeBSD: src/contrib/amd/FREEBSD-upgrade,v 1.16 2007/12/11 19:16:51 obrien Exp $ -AMD (am-utils) 6.0.9 - originals can be found at: ftp://shekel.mcl.cs.columbia.edu/pub/am-utils/ - (http://www.cs.columbia.edu/~ezk/am-utils/index.html) - +AMD (am-utils) 6.1.5 + originals can be found at: ftp://ftp.am-utils.org/pub/am-utils/ For the import of AMD many files were pruned by: - tar -X FREEBSD-Xlist -xzf am-utils-6.0.9.tar.gz + tar -X FREEBSD-Xlist -xf am-utils-6.1.5.tar.gz and `find . -name '.cvsignore' -delete` Then imported by: - cvs import -m 'Virgin import of AMD (am-utils) v6.0.9' \ - src/contrib/amd COLUMBIA amd_6_0_9 + cvs import -m 'Virgin import of AMD (am-utils) v6.1.5' \ + src/contrib/amd COLUMBIA amd_6_1_5 After the import, a separate extraction of am-utils was GNU configured in the "normal" way. The resulting config.h file should be compared with @@ -25,8 +23,11 @@ To make local changes to amd, simply patch and commit to the main branch (aka HEAD). Never make local changes on the vendor (COLUMBIA) branch. -All local changes should be submitted to "amd-dev@majordomo.cs.columbia.edu" -for inclusion in the next vendor release. +Note, we don't trim anything in scripts/ as sysadmins may find the bits +as a useful reference. + +All local changes should be submitted to "am-utils@am-utils.org" or +https://bugzilla.am-utils.org for inclusion in the next vendor release. Local changes: ==== //depot/projects/ethng/src/contrib/gcc/config/sparc/freebsd.h#2 (text+ko) ==== @@ -19,24 +19,26 @@ the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* $FreeBSD: src/contrib/gcc/config/sparc/freebsd.h,v 1.10 2007/05/19 02:30:20 kan Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/sparc/freebsd.h,v 1.11 2007/12/09 17:41:47 marius Exp $ */ #undef SUBTARGET_EXTRA_SPECS #define SUBTARGET_EXTRA_SPECS \ { "fbsd_dynamic_linker", FBSD_DYNAMIC_LINKER } /* FreeBSD needs the platform name (sparc64) defined. - Emacs needs to know if the arch is 64 or 32-bits. */ - -#undef CPP_CPU64_DEFAULT_SPEC -#define CPP_CPU64_DEFAULT_SPEC \ - "-D__sparc64__ -D__sparc_v9__ -D__sparcv9 -D__sparc__ -D__arch64__" + Emacs needs to know if the arch is 64 or 32-bits. + This also selects which targets are available via -mcpu. */ #undef FBSD_TARGET_CPU_CPP_BUILTINS #define FBSD_TARGET_CPU_CPP_BUILTINS() \ do \ { \ builtin_define ("__LP64__"); \ + builtin_define ("__sparc64__"); \ + builtin_define ("__sparc_v9__"); \ + builtin_define ("__sparcv9"); \ + builtin_define ("__sparc__"); \ + builtin_define ("__arch64__"); \ } \ while (0) ==== //depot/projects/ethng/src/contrib/gcc/fold-const.c#3 (text+ko) ==== @@ -5661,6 +5661,9 @@ } break; } + /* If the constant is negative, we cannot simplify this. */ + if (tree_int_cst_sgn (c) == -1) + break; /* FALLTHROUGH */ case NEGATE_EXPR: if ((t1 = extract_muldiv (op0, c, code, wide_type, strict_overflow_p)) ==== //depot/projects/ethng/src/games/fortune/datfiles/fortunes#5 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.248 2007/12/07 22:41:39 dougb Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.249 2007/12/09 01:00:11 dougb Exp $ % ======================================================================= || || @@ -12502,7 +12502,7 @@ % Bizoos, n.: The millions of tiny individual bumps that make up a -basketball. + basketball. -- Rich Hall, "Sniglets" % Black people have never rioted. A riot is what white people think blacks @@ -12575,10 +12575,10 @@ % BLISS is ignorance % -blithwapping: +Blithwapping, v: Using anything BUT a hammer to hammer a nail into the wall, such as shoes, lamp bases, doorstops, etc. - -- "Sniglets", Rich Hall & Friends + -- Rich Hall & Friends, "Sniglets" % Blood flows down one leg and up the other. % @@ -12948,10 +12948,10 @@ Bunker's Admonition: You cannot buy beer; you can only rent it. % -BURBULATION: +Burbulation, v: The obsessive act of opening and closing a refrigerator door in an attempt to catch it before the automatic light comes on. - -- "Sniglets", Rich Hall & Friends + -- Rich Hall & Friends, "Sniglets" % Bureau Termination, Law of: When a government bureau is scheduled to be phased out, @@ -13397,8 +13397,8 @@ % Carperpetuation (kar' pur pet u a shun), n.: The act, when vacuuming, of running over a string at least a -dozen times, reaching over and picking it up, examining it, then -putting it back down to give the vacuum one more chance. + dozen times, reaching over and picking it up, examining it, + then putting it back down to give the vacuum one more chance. -- Rich Hall, "Sniglets" % Carson's Consolation: @@ -14277,7 +14277,7 @@ -- Ambrose Bierce, "The Devil's Dictionary" % Confidence is simply that quiet, assured feeling you have before you -fall flag on your face. +fall flat on your face. -- Dr. L. Binder % Confidence is the feeling you have before you understand the situation. @@ -16549,10 +16549,10 @@ Either I'm dead or my watch has stopped. -- Groucho Marx' last words % -ELBONICS: +Elbonics, v: The actions of two people maneuvering for one armrest in a movie theatre. - -- "Sniglets", Rich Hall & Friends + -- Rich Hall & Friends, "Sniglets" % Eleanor Rigby Sits at the keyboard and waits for a line on the screen @@ -17736,10 +17736,10 @@ Female rabbits: The gift that just "keeps on giving." % -FENDERBERG: +Fenderberg, n.: The large glacial deposits that form on the insides of car fenders during snowstorms. - -- "Sniglets", Rich Hall & Friends + -- Rich Hall & Friends, "Sniglets" % Ferguson's Precept: A crisis is when you can't say "let's forget the whole thing." @@ -18007,9 +18007,9 @@ Flame on! -- Johnny Storm % -FLANNISTER: +Flannister, n.: The plastic yoke that holds a six-pack of beer together. - -- "Sniglets", Rich Hall & Friends + -- Rich Hall & Friends, "Sniglets" % Flappity, floppity, flip The mouse on the m"obius strip; @@ -19606,7 +19606,7 @@ % Fundamentally, there may be no basis for anything. % -Furbling, v.: +Furbling, v: Having to wander through a maze of ropes at an airport or bank even when you are the only person in line. -- Rich Hall, "Sniglets" @@ -19684,7 +19684,7 @@ and respect from those around you; everybody loves a sucker. A short trip is in the stars, possibly to the men's room. % -Genderplex, n: +Genderplex, n.: The predicament of a person in a restaurant who is unable to determine his or her designated restroom (e.g., turtles and tortoises). @@ -19977,9 +19977,9 @@ LISP programmers to abandon bra and fig-leaf. -- Epigrams in Programming, ACM SIGPLAN Sept. 1982 % -GLEEMITES: +Gleemites, n.: Petrified deposits of toothpaste found in sinks. - -- "Sniglets", Rich Hall & Friends + -- Rich Hall & Friends, "Sniglets" % Glib's Fourth Law of Unreliability: Investment in reliability will increase until it exceeds the @@ -20011,7 +20011,7 @@ % Gnagloot, n.: A person who leaves all his ski passes on his jacket just to -impress people. + impress people. -- Rich Hall, "Sniglets" % Go ahead, make my day. @@ -25345,7 +25345,7 @@ % Idiot Box, n.: The part of the envelope that tells a person where to place the -stamp when they can't quite figure it out for themselves. + stamp when they can't quite figure it out for themselves. -- Rich Hall, "Sniglets" % Idiot, n.: @@ -27202,7 +27202,7 @@ If you've seen one redwood, you've seen them all. -- Ronald Reagan % -ignisecond, n: +Ignisecond, n.: The overlapping moment of time when the hand is locking the car door even as the brain is saying, "my keys are in there!" -- Rich Hall, "Sniglets" @@ -31189,7 +31189,7 @@ Let me not to the marriage of true minds Admit impediments. Love is not love Which alters when it alteration finds, -Or bends with the remover to remove: +Or bends with the remover to remove. O, no! it is an ever-fixed mark, That looks on tempests and is never shaken; It is the star to every wandering bark, @@ -31198,8 +31198,9 @@ Within his bending sickle's compass come; Love alters not with his brief hours and weeks, But bears it out even to the edge of doom. -If this be error and upon me proved, -I never writ, nor no man ever loved. + If this be error and upon me proved, + I never writ, nor no man ever loved. + -- William Shakespeare, Sonnet CXVI % Let me put it this way: today is going to be a learning experience. % @@ -32404,7 +32405,7 @@ knowledge. -- Ambrose Bierce, "The Devil's Dictionary" % -Magnocartic, adj: +Magnocartic, adj.: Any automobile that, when left unattended, attracts shopping carts. -- Rich Hall, "Sniglets" @@ -33481,10 +33482,10 @@ Any simple problem can be made insoluble if enough meetings are held to discuss it. % -mittsquinter, adj: - A ballplayer who looks into his glove after missing the ball, as - if, somehow, the cause of the error lies there. - -- "Sniglets", Rich Hall & Friends +Mittsquinter, adj.: + A ballplayer who looks into his glove after missing the ball, + as if, somehow, the cause of the error lies there. + -- Rich Hall & Friends, "Sniglets" % Mix a little foolishness with your serious plans; it's lovely to be silly at the right moment. @@ -34033,7 +34034,7 @@ Mustgo, n.: Any item of food that has been sitting in the refrigerator so long it has become a science project. - -- Sniglets, "Rich Hall & Friends" + -- Rich Hall & Friends, "Sniglets" % My advice to you, my violent friend, is to seek out gold and sit on it. -- The Dragon to Grendel, in John Gardner's "Grendel" @@ -34401,10 +34402,10 @@ will be right. -- George Bernard Shaw, "The Man of Destiny" % -narcolepulacyi, n: +Narcolepulacyi, n.: The contagious action of yawning, causing everyone in sight to also yawn. - -- "Sniglets", Rich Hall & Friends + -- Rich Hall & Friends, "Sniglets" % Nasrudin called at a large house to collect for charity. The servant said "My master is out." Nasrudin replied, "Tell your master that next time he @@ -37796,12 +37797,12 @@ % Pedaeration, n.: The perfect body heat achieved by having one leg under the -sheet and one hanging off the edge of the bed. + sheet and one hanging off the edge of the bed. -- Rich Hall, "Sniglets" % -pediddel: +Pediddel, n.: A car with only one working headlight. - -- "Sniglets", Rich Hall & Friends + -- Rich Hall & Friends, "Sniglets" % Pedro Guerrero was playing third base for the Los Angeles Dodgers in 1984 when he made the comment that earns him a place in my Hall of Fame. Second @@ -38090,7 +38091,7 @@ (3) Things that tick are not always clocks. (4) Suicide only works when you're bluffing. % -petribar: +Petribar, n.: Any sun-bleached prehistoric candy that has been sitting in the window of a vending machine too long. -- Rich Hall, "Sniglets" @@ -38113,10 +38114,10 @@ % Phone call for chucky-pooh. % -phosflink: - To flick a bulb on and off when it burns out (as if, somehow, that - will bring it back to life). - -- "Sniglets", Rich Hall & Friends +Phosflink, v: + To flick a bulb on and off when it burns out (as if, somehow, + that will bring it back to life). + -- Rich Hall & Friends, "Sniglets" % Photographing a volcano is just about the most miserable thing you can do. @@ -38992,10 +38993,10 @@ Puritanism -- the haunting fear that someone, somewhere, may be happy. -- H. L. Mencken, "A Book of Burlesques" % -PURPITATION: +Purpitation, v: To take something off the grocery shelf, decide you don't want it, and then put it in another section. - -- "Sniglets", Rich Hall & Friends + -- Rich Hall & Friends, "Sniglets" % Pushing 30 is exercise enough. % @@ -41313,7 +41314,7 @@ % Schizophrenia beats being alone. % -schlattwhapper, n: +Schlattwhapper, n.: The window shade that allows itself to be pulled down, hesitates for a second, then snaps up in your face. -- Rich Hall, "Sniglets" @@ -41322,11 +41323,6 @@ All things being equal, a fat person uses more soap than a thin person. % -Schnuffel, n.: - A dog's practice of continuously nuzzling in your crotch in - mixed company. - -- Rich Hall, "Sniglets" -% Schwiggle, n.: The amusing rotation of one's bottom while sharpening a pencil. @@ -41464,9 +41460,10 @@ % Screw up your courage! You've screwed up everything else. % -SCRIBLINE: - The blank area on the back of credit cards where one's signature goes. - -- "Sniglets", Rich Hall & Friends +Scribline, n.: + The blank area on the back of credit cards where one's + signature goes. + -- Rich Hall & Friends, "Sniglets" % Scrubbing floors and emptying bedpans has as much dignity as the Presidency. @@ -42903,9 +42900,10 @@ and new civilizations; to boldly go where no man has gone before. -- Captain James T. Kirk % -SPAGMUMPS: - Any of the millions of Styrofoam wads that accompany mail-order items. - -- "Sniglets", Rich Hall & Friends +Spagmumps, n.: + Any of the millions of Styrofoam wads that accompany mail-order + items. + -- Rich Hall & Friends, "Sniglets" % Spare no expense to save money on this one. -- Samuel Goldwyn @@ -43037,7 +43035,7 @@ Spirtle, n.: The fine stream from a grapefruit that always lands right in your eye. - -- Sniglets, "Rich Hall & Friends" + -- Rich Hall & Friends, "Sniglets" % Spock: The odds of surviving another attack are 13562190123 to 1, Captain. @@ -43051,9 +43049,9 @@ Spring is here, spring is here, Life is skittles and life is beer. % -SQUATCHO: +Squatcho, n.: The button at the top of a baseball cap. - -- "Sniglets", Rich Hall & Friends + -- Rich Hall & Friends, "Sniglets" % Squirrels eating squirrels, my God, that's sick. % @@ -43848,11 +43846,11 @@ making a disagreeable person keep his distance. -- Ambrose Bierce, "The Devil's Dictionary" % -TELEPRESSION: - The deep-seated guilt which stems from knowing that you did not try - hard enough to look up the number on your own and instead put the - burden on the directory assistant. - -- "Sniglets", Rich Hall & Friends +Telepression, n.: + The deep-seated guilt which stems from knowing that you did not + try hard enough to look up the number on your own and instead + put the burden on the directory assistant. + -- Rich Hall & Friends, "Sniglets" % Television -- a medium. So called because it is neither rare nor well done. -- Ernie Kovacs @@ -52117,7 +52115,7 @@ % Toddlers are the stormtroopers of the Lord of Entropy. % -toilet toupee, n: +Toilet Toupee, n: Any shag carpet that causes the lid to become top-heavy, thus creating endless annoyance to male users. -- Rich Hall, "Sniglets" @@ -54204,7 +54202,7 @@ Or consider "The Brothers Karamazov", by the famous Russian alcoholic Fyodor Dostoevsky. It's about these two brothers who kill their father. Or maybe only one of them kills the father. It's impossible to tell because -what they mostly do is talk for nearly a thousand pages.If all Russians talk +what they mostly do is talk for nearly a thousand pages. If all Russians talk as much as the Karamazovs did, I don't see how they found time to become a major world power. I'm told that Dostoevsky wrote "The Brothers Karamazov" to raise @@ -57638,7 +57636,7 @@ % XIIdigitation, n.: The practice of trying to determine the year a movie was made -by deciphering the Roman numerals at the end of the credits. + by deciphering the Roman numerals at the end of the credits. -- Rich Hall, "Sniglets" % XLI: ==== //depot/projects/ethng/src/games/fortune/datfiles/fortunes-o.real#4 (text+ko) ==== @@ -1,4 +1,4 @@ -%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.27 2007/12/07 22:56:10 dougb Exp $ +%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.28 2007/12/09 01:00:11 dougb Exp $ % PLAYGIRL, Inc. Philadelphia, Pa. 19369 @@ -11810,9 +11810,9 @@ I'll take head on a flight, So the guy can have pie in the sky." % -schnuffel, n.: - A dog's practice of continuously nuzzling in your crotch in mixed - company. +Schnuffel, n.: + A dog's practice of continuously nuzzling in your crotch in + mixed company. -- Rich Hall, "Sniglets" % "Scott, baby," the sexually aggressive girl murmured as she guided @@ -12173,7 +12173,7 @@ % Snow White: "Gee guys, I've always dreamed of getting ten inches... - but not an inch-and-a-half at a time! + but not an inch-and-a-half at a time!" % "Snyder's got a stiff ticket," said Kay, "Come on, take it out, and let's play." @@ -13073,7 +13073,7 @@ % The new rooster caused a great stir in the barnyard. From resplendent comb to defiant spurs, he was the picture of young bantamhood. Almost immediately -upon arrival, he was greeted by and elderly rooster who took him behind the +upon arrival, he was greeted by an elderly rooster who took him behind the barn and whispered in his ear: "Young fellow, I'm long past my prime. All I want now is peace and solitude. So you take over right now as ruler of the roost with my blessings." @@ -13082,7 +13082,7 @@ took the young champion behind the barn. "Kid," he said, "the hens are after me for giving up my position so readily. So why don't we have a race, say, ten laps around the farmhouse? The winner becomes undisputed keeper of the -henhouse and the hens will stop nagging me. +henhouse and the hens will stop nagging me." The young rooster, with only contempt for his elder, agreed. Surprisingly, the older one jumped off to an early lead. His counterpart, weakened by the activities of the previous week, was never quite able to ==== //depot/projects/ethng/src/games/fortune/datfiles/fortunes-o.sp.ok#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/games/fortune/datfiles/fortunes-o.sp.ok,v 1.2 2007/12/07 22:27:04 dougb Exp $ +# $FreeBSD: src/games/fortune/datfiles/fortunes-o.sp.ok,v 1.3 2007/12/09 01:00:11 dougb Exp $ a'plucking AAAaaeeeeeeeeeiiiiiiiii Aaah @@ -1309,7 +1309,7 @@ Schlegel schlemiel schloshed >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Dec 13 01:52:32 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C011016A419; Thu, 13 Dec 2007 01:52:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1339E16A417 for ; Thu, 13 Dec 2007 01:52:31 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1294213C448 for ; Thu, 13 Dec 2007 01:52:31 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBD1qUJC022403 for ; Thu, 13 Dec 2007 01:52:30 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBD1qLrZ022373 for perforce@freebsd.org; Thu, 13 Dec 2007 01:52:21 GMT (envelope-from jb@freebsd.org) Date: Thu, 13 Dec 2007 01:52:21 GMT Message-Id: <200712130152.lBD1qLrZ022373@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130779 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Dec 2007 01:52:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=130779 Change 130779 by jb@jb_freebsd1 on 2007/12/13 01:51:21 This IFC includes a change in the branch definition to exclude src/contrib/opensolaris and src/sys/contrib/opensolaris from being integrated direct from //depot/vendor/freebsd/... Instead I'm integrating them from //depot/projects/opensolaris/... which is parented from the //depot/vendor/sun/... tree and contains all the changes the we have to make to OpenSolaris code to make it work on FreeBSD. The intention is that changes will be made to //depot/projects/opensolaris/... first and the result committed to CVS (where we don't currently use a vendor branch). Consider //depot/projects/opensolaris/... as the vendor branch for what goes into CVS. Affected files ... .. //depot/projects/dtrace/src/Makefile#16 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/dtrace.c#10 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/mdb/tools/common/die.c#5 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/mdb/tools/common/util.h#4 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/include/alist.h#6 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/include/sgs.h#5 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/tools/common/findprime.c#5 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/tools/common/sgsmsg.c#6 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/tools/common/string_table.c#5 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/zdb/zdb.8#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/zdb/zdb.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/zdb/zdb_il.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/zfs/zfs.8#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/zfs/zfs_iter.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/zfs/zfs_iter.h#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/zfs/zfs_main.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/zfs/zfs_util.h#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/zpool/zpool.8#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/zpool/zpool_iter.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/zpool/zpool_main.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/zpool/zpool_util.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/zpool/zpool_util.h#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/zpool/zpool_vdev.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/ztest/ztest.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/head/assert.h#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/head/atomic.h#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/head/libintl.h#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/head/stdio_ext.h#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/head/synch.h#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/head/thread.h#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libctf/common/ctf_lib.c#8 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libctf/common/ctf_subr.c#5 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/drti.c#6 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c#12 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_cc.c#6 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_cg.c#7 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_consume.c#8 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_dof.c#5 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_error.c#7 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_handle.c#6 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_ident.c#5 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_impl.h#16 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_lex.l#8 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_link.c#11 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_map.c#7 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_module.c#13 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_open.c#19 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_options.c#7 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_parser.c#6 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_pid.c#8 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_pragma.c#7 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#7 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_proc.c#6 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_proc.h#5 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_program.c#7 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_provider.c#7 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_subr.c#11 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_work.c#10 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dtrace.h#6 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/mkerrtags.sh#4 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/mknames.sh#4 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libgen/common/gmatch.c#5 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libnvpair/libnvpair.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libnvpair/libnvpair.h#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libuutil/common/libuutil.h#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libuutil/common/uu_avl.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libuutil/common/uu_ident.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libuutil/common/uu_list.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libuutil/common/uu_misc.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libuutil/common/uu_open.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libuutil/common/uu_pname.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libzfs/common/libzfs.h#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libzpool/common/kernel.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#5 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libzpool/common/taskq.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libzpool/common/util.c#2 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/common/list.c#4 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/common/memory.c#4 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/alist.c#6 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/alist.h#5 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/barrier.c#4 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/barrier.h#4 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/ctf.c#11 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/ctfconvert.c#7 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c#8 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/ctftools.h#7 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/dwarf.c#11 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/fixup_tdescs.c#4 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/hash.c#7 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/iidesc.c#5 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/input.c#8 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/merge.c#10 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/output.c#10 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/st_parse.c#6 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/stabs.c#7 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/strtab.c#8 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/strtab.h#6 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/tdata.c#5 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/traverse.c#5 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/traverse.h#4 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/util.c#10 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/dump/dump.c#8 integrate .. //depot/projects/dtrace/src/include/complex.h#4 integrate .. //depot/projects/dtrace/src/lib/libc/stdlib/grantpt.c#4 integrate .. //depot/projects/dtrace/src/lib/msun/Makefile#6 integrate .. //depot/projects/dtrace/src/lib/msun/man/atan2.3#5 integrate .. //depot/projects/dtrace/src/lib/msun/man/hypot.3#5 integrate .. //depot/projects/dtrace/src/lib/msun/src/s_carg.c#1 branch .. //depot/projects/dtrace/src/lib/msun/src/s_cargf.c#1 branch .. //depot/projects/dtrace/src/share/man/man7/build.7#9 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/OPENSOLARIS.LICENSE#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/acl/acl_common.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/acl/acl_common.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/atomic/i386/atomic.S#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/atomic/ia64/atomic.S#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/avl/avl.c#12 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_create.c#6 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_hash.c#4 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_impl.h#5 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_labels.c#4 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_lookup.c#5 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_open.c#4 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_types.c#4 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/nvpair/nvpair.c#4 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/zfs/zfs_namecheck.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/zfs/zfs_namecheck.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/zfs/zfs_prop.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/zfs/zfs_prop.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/Makefile.files#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#3 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/gfs.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#5 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/bplist.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/gzip.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/refcount.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sha256.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/space_map.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#4 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/txg.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/unique.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#3 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#4 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#4 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#3 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#3 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#4 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#4 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#4 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/os/callb.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/os/list.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/os/taskq.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/rpc/xdr.c#4 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/rpc/xdr.h#4 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/rpc/xdr_array.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/rpc/xdr_mem.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/bitmap.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/byteorder.h#4 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/callb.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/compress.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/cred.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/ctf.h#6 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/ctf_api.h#9 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/cyclic.h#4 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/debug.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dkio.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dklabel.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace.h#27 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace_impl.h#13 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/errorq.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/feature_tests.h#6 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/fm/protocol.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/fm/util.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/gfs.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#10 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/list.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/list_impl.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/nvpair.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/nvpair_impl.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/processor.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/procset.h#4 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/sdt.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/synch.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/sysevent.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#4 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/vmem.h#6 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/zmod/adler32.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/zmod/crc32.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/zmod/crc32.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/zmod/deflate.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/zmod/deflate.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/zmod/inffast.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/zmod/inffast.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/zmod/inffixed.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/zmod/inflate.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/zmod/inflate.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/zmod/inftrees.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/zmod/inftrees.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/zmod/trees.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/zmod/zconf.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/zmod/zlib.h#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/zmod/zmod.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/zmod/zmod_subr.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/zmod/zutil.c#2 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/zmod/zutil.h#2 integrate .. //depot/projects/dtrace/src/sys/net80211/ieee80211_radiotap.h#5 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_ofld.c#2 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_ofld.h#2 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_var.h#8 integrate .. //depot/projects/dtrace/src/sys/netinet/toedev.h#2 integrate .. //depot/projects/dtrace/src/sys/sys/socket.h#9 integrate Differences ... ==== //depot/projects/dtrace/src/Makefile#16 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.343 2007/12/11 20:00:55 imp Exp $ +# $FreeBSD: src/Makefile,v 1.344 2007/12/13 00:08:02 imp Exp $ # # The user-driven targets are: # @@ -234,7 +234,7 @@ PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \ PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \ then \ - (cd ${.CURDIR} && ${BSDMAKE} make); \ + (cd ${.CURDIR} && ${MAKE} make); \ fi # @@ -242,11 +242,10 @@ # headers, libraries and tools. Also, allow the location of # the system bsdmake-like utility to be overridden. # -BSDMAKE?=make MMAKEENV= MAKEOBJDIRPREFIX=${MAKEPATH} \ DESTDIR= \ INSTALL="sh ${.CURDIR}/tools/install.sh" -MMAKE= ${MMAKEENV} ${BSDMAKE} \ +MMAKE= ${MMAKEENV} ${MAKE} \ -D_UPGRADING \ -DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \ -DNO_CPU_CFLAGS -DNO_WERROR ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/dtrace.c#10 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/mdb/tools/common/die.c#5 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/mdb/tools/common/util.h#4 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/include/alist.h#6 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/include/sgs.h#5 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/tools/common/findprime.c#5 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/tools/common/sgsmsg.c#6 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/tools/common/string_table.c#5 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/zdb/zdb.8#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/zdb/zdb.c#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/zdb/zdb_il.c#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/zfs/zfs.8#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/zfs/zfs_iter.c#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/zfs/zfs_iter.h#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/zfs/zfs_main.c#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/zfs/zfs_util.h#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/zpool/zpool.8#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/zpool/zpool_iter.c#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/zpool/zpool_main.c#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/zpool/zpool_util.c#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/zpool/zpool_util.h#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/zpool/zpool_vdev.c#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/ztest/ztest.c#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/head/assert.h#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/head/atomic.h#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/head/libintl.h#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/head/stdio_ext.h#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/head/synch.h#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/head/thread.h#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libctf/common/ctf_lib.c#8 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libctf/common/ctf_subr.c#5 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/drti.c#6 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c#12 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_cc.c#6 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_cg.c#7 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_consume.c#8 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_dof.c#5 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_error.c#7 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_handle.c#6 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_ident.c#5 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_impl.h#16 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_lex.l#8 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_link.c#11 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_map.c#7 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_module.c#13 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_open.c#19 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_options.c#7 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_parser.c#6 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_pid.c#8 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_pragma.c#7 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#7 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_proc.c#6 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_proc.h#5 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_program.c#7 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_provider.c#7 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_subr.c#11 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_work.c#10 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dtrace.h#6 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/mkerrtags.sh#4 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/mknames.sh#4 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libgen/common/gmatch.c#5 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libnvpair/libnvpair.c#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libnvpair/libnvpair.h#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libuutil/common/libuutil.h#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libuutil/common/uu_avl.c#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libuutil/common/uu_ident.c#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libuutil/common/uu_list.c#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libuutil/common/uu_misc.c#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libuutil/common/uu_open.c#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libuutil/common/uu_pname.c#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libzfs/common/libzfs.h#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libzpool/common/kernel.c#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#5 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libzpool/common/taskq.c#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libzpool/common/util.c#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/common/list.c#4 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/common/memory.c#4 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/alist.c#6 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/alist.h#5 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/barrier.c#4 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/barrier.h#4 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/ctf.c#11 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/ctfconvert.c#7 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c#8 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/ctftools.h#7 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/dwarf.c#11 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/fixup_tdescs.c#4 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/hash.c#7 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/iidesc.c#5 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/input.c#8 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/merge.c#10 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/output.c#10 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/st_parse.c#6 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/stabs.c#7 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/strtab.c#8 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/strtab.h#6 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/tdata.c#5 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/traverse.c#5 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/traverse.h#4 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/util.c#10 (text) ==== ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/dump/dump.c#8 (text) ==== ==== //depot/projects/dtrace/src/include/complex.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/complex.h,v 1.6 2004/08/14 18:03:21 stefanf Exp $ + * $FreeBSD: src/include/complex.h,v 1.7 2007/12/12 23:43:51 das Exp $ */ #ifndef _COMPLEX_H @@ -45,6 +45,8 @@ double cabs(double complex); float cabsf(float complex); +double carg(double complex); +float cargf(float complex); double cimag(double complex); float cimagf(float complex); long double cimagl(long double complex); ==== //depot/projects/dtrace/src/lib/libc/stdlib/grantpt.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ #include #ifndef lint -__FBSDID("$FreeBSD: src/lib/libc/stdlib/grantpt.c,v 1.7 2006/02/13 00:04:04 kan Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/grantpt.c,v 1.8 2007/12/13 00:08:59 jhb Exp $"); #endif /* not lint */ #include "namespace.h" @@ -63,10 +63,10 @@ /* * The following are range values for pseudo TTY devices. Pseudo TTYs have a - * name of /dev/[pt]ty[p-sP-S][0-9a-v], yielding 256 combinations per major. + * name of /dev/[pt]ty[l-sL-S][0-9a-v], yielding 256 combinations per major. */ #define PT_MAX 256 -#define PT_DEV1 "pqrsPQRS" +#define PT_DEV1 "pqrsPQRSlmnoLMNO" #define PT_DEV2 "0123456789abcdefghijklmnopqrstuv" /* ==== //depot/projects/dtrace/src/lib/msun/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 5.1beta 93/09/24 -# $FreeBSD: src/lib/msun/Makefile,v 1.78 2007/05/21 02:49:08 deischen Exp $ +# $FreeBSD: src/lib/msun/Makefile,v 1.79 2007/12/12 23:43:50 das Exp $ # # ==================================================== # Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. @@ -38,8 +38,8 @@ e_sinh.c e_sinhf.c e_sqrt.c e_sqrtf.c fenv.c \ k_cos.c k_cosf.c k_rem_pio2.c k_sin.c k_sinf.c \ k_tan.c k_tanf.c \ - s_asinh.c s_asinhf.c s_atan.c s_atanf.c s_cbrt.c s_cbrtf.c \ - s_ceil.c s_ceilf.c s_ceill.c \ + s_asinh.c s_asinhf.c s_atan.c s_atanf.c s_carg.c s_cargf.c \ + s_cbrt.c s_cbrtf.c s_ceil.c s_ceilf.c s_ceill.c \ s_copysign.c s_copysignf.c s_cos.c s_cosf.c s_erf.c s_erff.c \ s_exp2.c s_exp2f.c s_expm1.c s_expm1f.c s_fabsf.c s_fdim.c \ s_finite.c s_finitef.c \ @@ -106,7 +106,7 @@ MLINKS+=asinh.3 asinhf.3 MLINKS+=atan.3 atanf.3 MLINKS+=atanh.3 atanhf.3 -MLINKS+=atan2.3 atan2f.3 +MLINKS+=atan2.3 atan2f.3 atan2.3 carg.3 atan2.3 cargf.3 MLINKS+=ceil.3 ceilf.3 ceil.3 ceill.3 MLINKS+=cimag.3 cimagf.3 cimag.3 cimagl.3 \ cimag.3 conj.3 cimag.3 conjf.3 cimag.3 conjl.3 \ ==== //depot/projects/dtrace/src/lib/msun/man/atan2.3#5 (text+ko) ==== @@ -26,15 +26,17 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)atan2.3 5.1 (Berkeley) 5/2/91 -.\" $FreeBSD: src/lib/msun/man/atan2.3,v 1.15 2007/01/09 01:02:05 imp Exp $ +.\" $FreeBSD: src/lib/msun/man/atan2.3,v 1.17 2007/12/12 23:50:00 das Exp $ .\" -.Dd January 14, 2005 +.Dd December 12, 2007 .Dt ATAN2 3 .Os .Sh NAME .Nm atan2 , -.Nm atan2f -.Nd arc tangent functions of two variables +.Nm atan2f , +.Nm carg , +.Nm cargf +.Nd arc tangent and complex phase angle functions .Sh LIBRARY .Lb libm .Sh SYNOPSIS @@ -43,6 +45,10 @@ .Fn atan2 "double y" "double x" .Ft float .Fn atan2f "float y" "float x" +.Ft double +.Fn carg "double complex z" +.Ft float +.Fn cargf "float complex z" .Sh DESCRIPTION The .Fn atan2 @@ -52,6 +58,29 @@ .Fa y/ Ns Ar x , using the signs of both arguments to determine the quadrant of the return value. +.ie '\*[.T]'utf8' \{\ +. ds Th \[*h] +.\} +.el \{\ +. ds Th theta +.\} +.Pp +The +.Fn carg +and +.Fn cargf +functions compute the complex argument (or phase angle) of +.Fa z . +The complex argument is the number \*(Th such that +.Li z = r * e^(I * \*(Th) , +where +.Li r = cabs(z) . +The call +.Li carg(z) +is equivalent to +.Li atan2(cimag(z), creal(z)) , +and similarly for +.Fn cargf . .Sh RETURN VALUES The .Fn atan2 @@ -169,6 +198,7 @@ .Xr acos 3 , .Xr asin 3 , .Xr atan 3 , +.Xr cabs 3 , .Xr cos 3 , .Xr cosh 3 , .Xr math 3 , @@ -178,6 +208,10 @@ .Xr tanh 3 .Sh STANDARDS The -.Fn atan2 -function conforms to -.St -isoC . +.Fn atan2 , +.Fn atan2f , +.Fn carg , +and +.Fn cargf +functions conform to +.St -isoC-99 . ==== //depot/projects/dtrace/src/lib/msun/man/hypot.3#5 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)hypot.3 6.7 (Berkeley) 5/6/91 -.\" $FreeBSD: src/lib/msun/man/hypot.3,v 1.14 2007/01/09 01:02:06 imp Exp $ +.\" $FreeBSD: src/lib/msun/man/hypot.3,v 1.16 2007/12/12 23:49:40 das Exp $ .\" -.Dd January 14, 2005 +.Dd December 12, 2007 .Dt HYPOT 3 .Os .Sh NAME @@ -118,6 +118,7 @@ disappear when it turns out to be irrelevant, as it does in .Fn hypot "\*(If" "\*(Na" . .Sh SEE ALSO +.Xr carg 3 , .Xr math 3 , .Xr sqrt 3 .Sh HISTORY @@ -128,3 +129,12 @@ function appeared in .At v7 . +.Sh STANDARDS +The +.Fn hypot , +.Fn hypotf , +.Fn cabs , +and +.Fn cabsf +functions conform to +.St -isoC-99 . ==== //depot/projects/dtrace/src/share/man/man7/build.7#9 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man7/build.7,v 1.47 2007/12/11 21:14:10 imp Exp $ +.\" $FreeBSD: src/share/man/man7/build.7,v 1.48 2007/12/13 00:09:43 imp Exp $ .\" .Dd October 1, 2006 .Dt BUILD 7 @@ -335,16 +335,6 @@ .Xr make 1 variables: .Bl -tag -width ".Va SUBDIR_OVERRIDE" -.It Va BSDMAKE -If set, this variable supplies the name of the -program to use in early boot strapping that is compatible with the -default -.Fx -.Xr make 1 -program. -This program is subjected to the normal make regression tests at the -start of the build, and is used to build a more compatible make, if -necessary, which is used to build the rest of the system. .It Va LOCAL_DIRS If set, this variable supplies a list of additional directories to build, relative to the root of the source tree. ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/OPENSOLARIS.LICENSE#2 (text+ko) ==== ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/common/acl/acl_common.c#2 (text+ko) ==== ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/common/acl/acl_common.h#2 (text+ko) ==== ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#2 (text+ko) ==== ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/common/atomic/i386/atomic.S#2 (text+ko) ==== ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/common/atomic/ia64/atomic.S#2 (text+ko) ==== ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/common/avl/avl.c#12 (text) ==== ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_create.c#6 (text) ==== ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_hash.c#4 (text) ==== ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_impl.h#5 (text) ==== ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_labels.c#4 (text) ==== ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_lookup.c#5 (text) ==== ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_open.c#4 (text) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Dec 13 02:01:41 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BDD0116A41B; Thu, 13 Dec 2007 02:01:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4762A16A417 for ; Thu, 13 Dec 2007 02:01:41 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3CE9713C4E1 for ; Thu, 13 Dec 2007 02:01:41 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBD21e6l023679 for ; Thu, 13 Dec 2007 02:01:41 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBD21eun023676 for perforce@freebsd.org; Thu, 13 Dec 2007 02:01:40 GMT (envelope-from marcel@freebsd.org) Date: Thu, 13 Dec 2007 02:01:40 GMT Message-Id: <200712130201.lBD21eun023676@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 130780 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Dec 2007 02:01:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=130780 Change 130780 by marcel@marcel_jnpr on 2007/12/13 02:00:45 o Have the PIC tell MD code which IRQ to use for setting up an IPI handler. o Setup a fast handler for the IPI IRQ just prior to enabling all interrupts. o Send a test IPI to the BSP after all interrupts (including the IPI) are enabled. o Implement the IPI handler as a regular interrupt filter. The upshot is that an IPI is no different from any other HW interrupt and as such, vmstat -i will list it: # vmstat -i interrupt total rate irq22: scc0 442 26 irq19: ata0 60 3 irq27: ohci0 1 0 irq28: ohci1 1 0 irq58: atapci0 136 8 irq63: atapci1 27 1 irq40: fwohci0 2 0 irq64: IPI 1 0 Total 670 39 Affected files ... .. //depot/projects/powerpc/sys/powerpc/include/intr_machdep.h#4 edit .. //depot/projects/powerpc/sys/powerpc/include/openpicreg.h#6 edit .. //depot/projects/powerpc/sys/powerpc/include/smp.h#4 edit .. //depot/projects/powerpc/sys/powerpc/powermac/hrowpic.c#4 edit .. //depot/projects/powerpc/sys/powerpc/powerpc/intr_machdep.c#6 edit .. //depot/projects/powerpc/sys/powerpc/powerpc/mp_machdep.c#13 edit .. //depot/projects/powerpc/sys/powerpc/powerpc/openpic.c#6 edit Differences ... ==== //depot/projects/powerpc/sys/powerpc/include/intr_machdep.h#4 (text+ko) ==== @@ -34,7 +34,9 @@ struct trapframe; -void powerpc_register_pic(device_t); +driver_filter_t powerpc_ipi_handler; + +void powerpc_register_pic(device_t, u_int); void powerpc_dispatch_intr(u_int, struct trapframe *); int powerpc_enable_intr(void); ==== //depot/projects/powerpc/sys/powerpc/include/openpicreg.h#6 (text+ko) ==== @@ -40,7 +40,7 @@ #define OPENPIC_IPI_DISPATCH(ipi) (0x40 + (ipi) * 0x10) /* current task priority reg */ -#define OPENPIC_TPR 0x80 +#define OPENPIC_TPR 0x80 #define OPENPIC_TPR_MASK 0x0000000f #define OPENPIC_WHOAMI 0x90 @@ -129,6 +129,9 @@ #define OPENPIC_PCPU_TPR(cpu) \ (OPENPIC_PCPU_BASE(cpu) + OPENPIC_TPR) +#define OPENPIC_PCPU_WHOAMI(cpu) \ + (OPENPIC_PCPU_BASE(cpu) + OPENPIC_WHOAMI) + #define OPENPIC_PCPU_IACK(cpu) \ (OPENPIC_PCPU_BASE(cpu) + OPENPIC_IACK) ==== //depot/projects/powerpc/sys/powerpc/include/smp.h#4 (text+ko) ==== @@ -32,9 +32,11 @@ #ifdef _KERNEL #define IPI_AST 0 -#define IPI_RENDEZVOUS 1 -#define IPI_STOP 2 -#define IPI_PREEMPT 3 +#define IPI_PREEMPT 1 +#define IPI_RENDEZVOUS 2 +#define IPI_STOP 3 + +#define IPI_PPC_TEST 4 #ifndef LOCORE ==== //depot/projects/powerpc/sys/powerpc/powermac/hrowpic.c#4 (text+ko) ==== @@ -68,6 +68,7 @@ static void hrowpic_dispatch(device_t, struct trapframe *); static void hrowpic_enable(device_t, u_int, u_int); static void hrowpic_eoi(device_t, u_int); +static void hrowpic_ipi(device_t, u_int); static void hrowpic_mask(device_t, u_int); static void hrowpic_unmask(device_t, u_int); @@ -80,6 +81,7 @@ DEVMETHOD(pic_dispatch, hrowpic_dispatch), DEVMETHOD(pic_enable, hrowpic_enable), DEVMETHOD(pic_eoi, hrowpic_eoi), + DEVMETHOD(pic_ipi, hrowpic_ipi), DEVMETHOD(pic_mask, hrowpic_mask), DEVMETHOD(pic_unmask, hrowpic_unmask), @@ -167,7 +169,7 @@ hrowpic_write_reg(sc, HPIC_ENABLE, HPIC_SECONDARY, 0); hrowpic_write_reg(sc, HPIC_CLEAR, HPIC_SECONDARY, 0xffffffff); - powerpc_register_pic(dev); + powerpc_register_pic(dev, 64); return (0); } @@ -250,6 +252,12 @@ } static void +hrowpic_ipi(device_t dev, u_int irq) +{ + /* No SMP support. */ +} + +static void hrowpic_mask(device_t dev, u_int irq) { struct hrowpic_softc *sc; ==== //depot/projects/powerpc/sys/powerpc/powerpc/intr_machdep.c#6 (text+ko) ==== @@ -78,6 +78,7 @@ #include #include #include +#include #include #include "pic_if.h" @@ -96,6 +97,9 @@ static u_int nvectors; /* Allocated vectors */ static u_int stray_count; +static void *ipi_cookie; +static u_int ipi_irq; + device_t pic; static void @@ -132,17 +136,31 @@ } void -powerpc_register_pic(device_t dev) +powerpc_register_pic(device_t dev, u_int ipi) { pic = dev; + ipi_irq = ipi; } int powerpc_enable_intr(void) { struct powerpc_intr *i; - int vector; + int error, vector; + + if (pic == NULL) + panic("no PIC detected\n"); + +#ifdef SMP + /* Install an IPI handler. */ + error = powerpc_setup_intr("IPI", ipi_irq, powerpc_ipi_handler, + NULL, NULL, INTR_TYPE_MISC | INTR_EXCL | INTR_FAST, &ipi_cookie); + if (error) { + printf("unable to setup IPI handler\n"); + return (error); + } +#endif for (vector = 0; vector < nvectors; vector++) { i = powerpc_intrs[vector]; @@ -152,6 +170,11 @@ PIC_ENABLE(pic, i->irq, vector); } +#ifdef SMP + /* Send ourself a test IPI message. */ + ipi_self(IPI_PPC_TEST); +#endif + return (0); } ==== //depot/projects/powerpc/sys/powerpc/powerpc/mp_machdep.c#13 (text+ko) ==== @@ -35,6 +35,7 @@ #include #include +#include #include #include @@ -212,6 +213,50 @@ SYSINIT(start_aps, SI_SUB_SMP, SI_ORDER_FIRST, cpu_mp_unleash, NULL); +static u_int ipi_msg_cnt[32]; + +int +powerpc_ipi_handler(void *arg) +{ + cpumask_t self; + uint32_t ipimask; + int msg; + + ipimask = atomic_readandclear_32(&(pcpup->pc_ipimask)); + if (ipimask == 0) + return (FILTER_STRAY); + while ((msg = ffs(ipimask) - 1) != -1) { + ipimask &= ~(1u << msg); + ipi_msg_cnt[msg]++; + switch (msg) { + case IPI_AST: + break; + case IPI_PREEMPT: + /* TBD */ + break; + case IPI_RENDEZVOUS: + smp_rendezvous_action(); + break; + case IPI_STOP: + self = PCPU_GET(cpumask); +#if 0 + savectx(PCPU_PTR(pcb)); +#endif + atomic_set_int(&stopped_cpus, self); + while ((started_cpus & self) == 0) + cpu_spinwait(); + atomic_clear_int(&started_cpus, self); + atomic_clear_int(&stopped_cpus, self); + break; + case IPI_PPC_TEST: + mp_ipi_test++; + break; + } + } + + return (FILTER_HANDLED); +} + static void ipi_send(struct pcpu *pc, int ipi) { ==== //depot/projects/powerpc/sys/powerpc/powerpc/openpic.c#6 (text+ko) ==== @@ -82,7 +82,7 @@ openpic_attach(device_t dev) { struct openpic_softc *sc; - u_int irq; + u_int ipi, irq; u_int32_t x; sc = device_get_softc(dev); @@ -132,9 +132,23 @@ "Version %s, supports %d CPUs and %d irqs\n", sc->sc_version, sc->sc_ncpu, sc->sc_nirq); - /* disable all interrupts */ - for (irq = 0; irq < sc->sc_nirq; irq++) - openpic_write(sc, OPENPIC_SRC_VECTOR(irq), OPENPIC_IMASK); + /* Reset and disable all interrupts. */ + for (irq = 0; irq < sc->sc_nirq; irq++) { + x = irq; /* irq == vector. */ + x |= OPENPIC_IMASK; + x |= OPENPIC_POLARITY_POSITIVE; + x |= OPENPIC_SENSE_LEVEL; + x |= 8 << OPENPIC_PRIORITY_SHIFT; + openpic_write(sc, OPENPIC_SRC_VECTOR(irq), x); + } + + /* Reset and disable all IPIs. */ + for (ipi = 0; ipi < 4; ipi++) { + x = sc->sc_nirq + ipi; + x |= OPENPIC_IMASK; + x |= 15 << OPENPIC_PRIORITY_SHIFT; + openpic_write(sc, OPENPIC_IPI_VECTOR(ipi), x); + } openpic_set_priority(sc, 15); @@ -147,16 +161,6 @@ for (irq = 0; irq < sc->sc_nirq; irq++) openpic_write(sc, OPENPIC_IDEST(irq), 1 << 0); - for (irq = 0; irq < sc->sc_nirq; irq++) { - x = irq; /* irq == vector. */ - x |= OPENPIC_IMASK; - x |= OPENPIC_POLARITY_POSITIVE; - x |= OPENPIC_SENSE_LEVEL; - x |= 8 << OPENPIC_PRIORITY_SHIFT; - openpic_write(sc, OPENPIC_SRC_VECTOR(irq), x); - } - - /* XXX IPI */ /* XXX set spurious intr vector */ openpic_set_priority(sc, 0); @@ -167,7 +171,7 @@ openpic_write(sc, OPENPIC_PCPU_EOI(PCPU_GET(cpuid)), 0); } - powerpc_register_pic(dev); + powerpc_register_pic(dev, sc->sc_nirq); return (0); } @@ -199,10 +203,17 @@ uint32_t x; sc = device_get_softc(dev); - x = openpic_read(sc, OPENPIC_SRC_VECTOR(irq)); - x &= ~(OPENPIC_IMASK | OPENPIC_VECTOR_MASK); - x |= vector; - openpic_write(sc, OPENPIC_SRC_VECTOR(irq), x); + if (irq < sc->sc_nirq) { + x = openpic_read(sc, OPENPIC_SRC_VECTOR(irq)); + x &= ~(OPENPIC_IMASK | OPENPIC_VECTOR_MASK); + x |= vector; + openpic_write(sc, OPENPIC_SRC_VECTOR(irq), x); + } else { + x = openpic_read(sc, OPENPIC_IPI_VECTOR(0)); + x &= ~(OPENPIC_IMASK | OPENPIC_VECTOR_MASK); + x |= vector; + openpic_write(sc, OPENPIC_IPI_VECTOR(0), x); + } } void @@ -220,7 +231,8 @@ struct openpic_softc *sc; sc = device_get_softc(dev); - openpic_write(sc, OPENPIC_IPI_DISPATCH(0), 1u << cpu); + openpic_write(sc, OPENPIC_PCPU_IPI_DISPATCH(PCPU_GET(cpuid), 0), + 1u << cpu); } void @@ -230,9 +242,15 @@ uint32_t x; sc = device_get_softc(dev); - x = openpic_read(sc, OPENPIC_SRC_VECTOR(irq)); - x |= OPENPIC_IMASK; - openpic_write(sc, OPENPIC_SRC_VECTOR(irq), x); + if (irq < sc->sc_nirq) { + x = openpic_read(sc, OPENPIC_SRC_VECTOR(irq)); + x |= OPENPIC_IMASK; + openpic_write(sc, OPENPIC_SRC_VECTOR(irq), x); + } else { + x = openpic_read(sc, OPENPIC_IPI_VECTOR(0)); + x |= OPENPIC_IMASK; + openpic_write(sc, OPENPIC_IPI_VECTOR(0), x); + } openpic_write(sc, OPENPIC_PCPU_EOI(PCPU_GET(cpuid)), 0); } @@ -243,7 +261,13 @@ uint32_t x; sc = device_get_softc(dev); - x = openpic_read(sc, OPENPIC_SRC_VECTOR(irq)); - x &= ~OPENPIC_IMASK; - openpic_write(sc, OPENPIC_SRC_VECTOR(irq), x); + if (irq < sc->sc_nirq) { + x = openpic_read(sc, OPENPIC_SRC_VECTOR(irq)); + x &= ~OPENPIC_IMASK; + openpic_write(sc, OPENPIC_SRC_VECTOR(irq), x); + } else { + x = openpic_read(sc, OPENPIC_IPI_VECTOR(0)); + x &= ~OPENPIC_IMASK; + openpic_write(sc, OPENPIC_IPI_VECTOR(0), x); + } } From owner-p4-projects@FreeBSD.ORG Thu Dec 13 02:39:24 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 46A1216A46E; Thu, 13 Dec 2007 02:39:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E03D816A417 for ; Thu, 13 Dec 2007 02:39:23 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DFF9A13C457 for ; Thu, 13 Dec 2007 02:39:23 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBD2dNPU030012 for ; Thu, 13 Dec 2007 02:39:23 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBD2dLMq030009 for perforce@freebsd.org; Thu, 13 Dec 2007 02:39:21 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 13 Dec 2007 02:39:21 GMT Message-Id: <200712130239.lBD2dLMq030009@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 130782 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Dec 2007 02:39:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=130782 Change 130782 by kmacy@kmacy:storage:toestack on 2007/12/13 02:38:55 IFethng 130777 Affected files ... .. //depot/projects/toestack/Makefile#3 integrate .. //depot/projects/toestack/contrib/amd/FREEBSD-Xlist#2 integrate .. //depot/projects/toestack/contrib/amd/FREEBSD-upgrade#2 integrate .. //depot/projects/toestack/contrib/gcc/config/sparc/freebsd.h#2 integrate .. //depot/projects/toestack/contrib/gcc/fold-const.c#2 integrate .. //depot/projects/toestack/games/fortune/datfiles/fortunes#5 integrate .. //depot/projects/toestack/games/fortune/datfiles/fortunes-o.real#4 integrate .. //depot/projects/toestack/games/fortune/datfiles/fortunes-o.sp.ok#3 integrate .. //depot/projects/toestack/games/fortune/datfiles/fortunes.sp.ok#3 integrate .. //depot/projects/toestack/include/complex.h#2 integrate .. //depot/projects/toestack/include/nsswitch.h#2 integrate .. //depot/projects/toestack/lib/Makefile#5 integrate .. //depot/projects/toestack/lib/libc/gdtoa/_ldtoa.c#3 integrate .. //depot/projects/toestack/lib/libc/gen/getgrent.c#2 integrate .. //depot/projects/toestack/lib/libc/gen/getgrouplist.c#2 integrate .. //depot/projects/toestack/lib/libc/locale/localeconv.c#2 integrate .. //depot/projects/toestack/lib/libc/net/nsdispatch.c#2 integrate .. //depot/projects/toestack/lib/libc/stdio/vfscanf.c#2 integrate .. //depot/projects/toestack/lib/libc/stdio/vfwscanf.c#2 integrate .. //depot/projects/toestack/lib/libc/stdlib/grantpt.c#2 integrate .. //depot/projects/toestack/lib/libc/stdlib/rand.c#2 integrate .. //depot/projects/toestack/lib/libc/string/strtok.3#2 integrate .. //depot/projects/toestack/lib/libc/string/strtok.c#2 integrate .. //depot/projects/toestack/lib/libc/string/wcstok.c#2 integrate .. //depot/projects/toestack/lib/libthr/thread/thr_mutex.c#4 integrate .. //depot/projects/toestack/lib/msun/Makefile#2 integrate .. //depot/projects/toestack/lib/msun/man/atan2.3#2 integrate .. //depot/projects/toestack/lib/msun/man/hypot.3#2 integrate .. //depot/projects/toestack/lib/msun/src/s_carg.c#1 branch .. //depot/projects/toestack/lib/msun/src/s_cargf.c#1 branch .. //depot/projects/toestack/release/Makefile#7 integrate .. //depot/projects/toestack/release/doc/zh_CN.GB2312/Makefile#2 integrate .. //depot/projects/toestack/release/doc/zh_CN.GB2312/errata/Makefile#2 integrate .. //depot/projects/toestack/release/doc/zh_CN.GB2312/hardware/Makefile#2 integrate .. //depot/projects/toestack/release/doc/zh_CN.GB2312/hardware/Makefile.inc#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/hardware/amd64/Makefile#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/hardware/amd64/article.sgml#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/hardware/amd64/proc-amd64.sgml#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/hardware/article.sgml#1 branch .. //depot/projects/toestack/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/hardware/common/hw.ent#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/hardware/common/intro.sgml#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/hardware/i386/Makefile#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/hardware/i386/article.sgml#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/hardware/i386/proc-i386.sgml#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/installation/Makefile#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/installation/Makefile.inc#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/installation/amd64/Makefile#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/installation/amd64/article.sgml#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/installation/common/abstract.sgml#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/installation/common/artheader.sgml#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/installation/common/install.ent#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/installation/common/install.sgml#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/installation/common/layout.sgml#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/installation/common/trouble.sgml#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/installation/common/upgrade.sgml#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/installation/i386/Makefile#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/installation/i386/article.sgml#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/installation/ia64/Makefile#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/installation/ia64/article.sgml#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/installation/pc98/Makefile#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/installation/pc98/article.sgml#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/installation/sparc64/Makefile#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/installation/sparc64/article.sgml#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/installation/sparc64/install.sgml#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/readme/article.sgml#2 integrate .. //depot/projects/toestack/release/doc/zh_CN.GB2312/relnotes/Makefile#2 integrate .. //depot/projects/toestack/release/doc/zh_CN.GB2312/relnotes/Makefile.inc#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/relnotes/amd64/Makefile#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/relnotes/amd64/article.sgml#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/relnotes/article.sgml#1 branch .. //depot/projects/toestack/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/relnotes/common/relnotes.ent#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/relnotes/i386/Makefile#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/relnotes/i386/article.sgml#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/relnotes/ia64/Makefile#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/relnotes/ia64/article.sgml#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/relnotes/pc98/Makefile#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/relnotes/pc98/article.sgml#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/relnotes/powerpc/Makefile#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/relnotes/powerpc/article.sgml#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/relnotes/sparc64/Makefile#2 delete .. //depot/projects/toestack/release/doc/zh_CN.GB2312/relnotes/sparc64/article.sgml#2 delete .. //depot/projects/toestack/sbin/bsdlabel/bsdlabel.c#2 integrate .. //depot/projects/toestack/sbin/ifconfig/ifconfig.8#3 integrate .. //depot/projects/toestack/sbin/ifconfig/ifconfig.c#3 integrate .. //depot/projects/toestack/sbin/natd/natd.8#2 integrate .. //depot/projects/toestack/sbin/newfs_msdos/newfs_msdos.8#3 integrate .. //depot/projects/toestack/share/man/man4/nve.4#3 integrate .. //depot/projects/toestack/share/man/man5/src.conf.5#4 integrate .. //depot/projects/toestack/share/man/man7/build.7#2 integrate .. //depot/projects/toestack/share/mk/bsd.own.mk#4 integrate .. //depot/projects/toestack/sys/amd64/amd64/machdep.c#4 integrate .. //depot/projects/toestack/sys/amd64/amd64/pmap.c#7 integrate .. //depot/projects/toestack/sys/arm/arm/pmap.c#8 integrate .. //depot/projects/toestack/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/toestack/sys/compat/freebsd32/freebsd32_misc.c#4 integrate .. //depot/projects/toestack/sys/conf/files.amd64#9 integrate .. //depot/projects/toestack/sys/conf/files.i386#8 integrate .. //depot/projects/toestack/sys/dev/amr/amr.c#3 integrate .. //depot/projects/toestack/sys/dev/amr/amr_cam.c#3 integrate .. //depot/projects/toestack/sys/dev/amr/amr_pci.c#3 integrate .. //depot/projects/toestack/sys/dev/amr/amrvar.h#2 integrate .. //depot/projects/toestack/sys/dev/arcmsr/arcmsr.c#3 integrate .. //depot/projects/toestack/sys/dev/if_ndis/if_ndis.c#6 integrate .. //depot/projects/toestack/sys/dev/sound/pci/ich.c#2 integrate .. //depot/projects/toestack/sys/dev/usb/umass.c#2 integrate .. //depot/projects/toestack/sys/dev/usb/usbdevs#8 integrate .. //depot/projects/toestack/sys/fs/udf/udf_vfsops.c#3 integrate .. //depot/projects/toestack/sys/geom/geom_bsd_enc.c#2 integrate .. //depot/projects/toestack/sys/geom/part/g_part.c#5 integrate .. //depot/projects/toestack/sys/i386/i386/machdep.c#4 integrate .. //depot/projects/toestack/sys/i386/i386/pmap.c#7 integrate .. //depot/projects/toestack/sys/kern/kern_proc.c#6 integrate .. //depot/projects/toestack/sys/kern/kern_resource.c#2 integrate .. //depot/projects/toestack/sys/kern/sched_4bsd.c#7 integrate .. //depot/projects/toestack/sys/kern/sched_ule.c#8 integrate .. //depot/projects/toestack/sys/net/bridgestp.c#2 integrate .. //depot/projects/toestack/sys/net/bridgestp.h#2 integrate .. //depot/projects/toestack/sys/net/if.h#3 integrate .. //depot/projects/toestack/sys/net/route.c#10 integrate .. //depot/projects/toestack/sys/net/route.h#8 integrate .. //depot/projects/toestack/sys/net80211/ieee80211_radiotap.h#2 integrate .. //depot/projects/toestack/sys/netgraph/ng_l2tp.c#3 integrate .. //depot/projects/toestack/sys/netinet/ip_fw2.c#6 integrate .. //depot/projects/toestack/sys/netinet/tcp_syncache.c#12 integrate .. //depot/projects/toestack/sys/netinet/tcp_syncache.h#3 integrate .. //depot/projects/toestack/sys/netinet/tcp_var.h#9 integrate .. //depot/projects/toestack/sys/netinet6/dest6.c#2 integrate .. //depot/projects/toestack/sys/netinet6/frag6.c#2 integrate .. //depot/projects/toestack/sys/netinet6/icmp6.c#2 integrate .. //depot/projects/toestack/sys/netinet6/in6.c#3 integrate .. //depot/projects/toestack/sys/netinet6/in6.h#2 integrate .. //depot/projects/toestack/sys/netinet6/in6_cksum.c#2 integrate .. //depot/projects/toestack/sys/netinet6/in6_gif.c#2 integrate .. //depot/projects/toestack/sys/netinet6/in6_gif.h#2 integrate .. //depot/projects/toestack/sys/netinet6/in6_ifattach.c#2 integrate .. //depot/projects/toestack/sys/netinet6/in6_ifattach.h#2 integrate .. //depot/projects/toestack/sys/netinet6/in6_pcb.c#2 integrate .. //depot/projects/toestack/sys/netinet6/in6_pcb.h#2 integrate .. //depot/projects/toestack/sys/netinet6/in6_proto.c#2 integrate .. //depot/projects/toestack/sys/netinet6/in6_rmx.c#2 integrate .. //depot/projects/toestack/sys/netinet6/in6_src.c#2 integrate .. //depot/projects/toestack/sys/netinet6/in6_var.h#2 integrate .. //depot/projects/toestack/sys/netinet6/ip6_ecn.h#2 integrate .. //depot/projects/toestack/sys/netinet6/ip6_forward.c#2 integrate .. //depot/projects/toestack/sys/netinet6/ip6_id.c#2 integrate .. //depot/projects/toestack/sys/netinet6/ip6_input.c#2 integrate .. //depot/projects/toestack/sys/netinet6/ip6_ipsec.c#2 integrate .. //depot/projects/toestack/sys/netinet6/ip6_ipsec.h#2 integrate .. //depot/projects/toestack/sys/netinet6/ip6_mroute.c#2 integrate .. //depot/projects/toestack/sys/netinet6/ip6_mroute.h#2 integrate .. //depot/projects/toestack/sys/netinet6/ip6_output.c#3 integrate .. //depot/projects/toestack/sys/netinet6/ip6_var.h#2 integrate .. //depot/projects/toestack/sys/netinet6/ip6protosw.h#2 integrate .. //depot/projects/toestack/sys/netinet6/mld6.c#2 integrate .. //depot/projects/toestack/sys/netinet6/mld6_var.h#2 integrate .. //depot/projects/toestack/sys/netinet6/nd6.c#4 integrate .. //depot/projects/toestack/sys/netinet6/nd6.h#2 integrate .. //depot/projects/toestack/sys/netinet6/nd6_nbr.c#2 integrate .. //depot/projects/toestack/sys/netinet6/nd6_rtr.c#2 integrate .. //depot/projects/toestack/sys/netinet6/pim6.h#2 integrate .. //depot/projects/toestack/sys/netinet6/pim6_var.h#2 integrate .. //depot/projects/toestack/sys/netinet6/raw_ip6.c#2 integrate .. //depot/projects/toestack/sys/netinet6/raw_ip6.h#2 integrate .. //depot/projects/toestack/sys/netinet6/route6.c#2 integrate .. //depot/projects/toestack/sys/netinet6/scope6.c#2 integrate .. //depot/projects/toestack/sys/netinet6/scope6_var.h#2 integrate .. //depot/projects/toestack/sys/netinet6/sctp6_usrreq.c#4 integrate .. //depot/projects/toestack/sys/netinet6/sctp6_var.h#3 integrate .. //depot/projects/toestack/sys/netinet6/tcp6_var.h#2 integrate .. //depot/projects/toestack/sys/netinet6/udp6_usrreq.c#4 integrate .. //depot/projects/toestack/sys/netinet6/udp6_var.h#2 integrate .. //depot/projects/toestack/sys/sys/cdefs.h#2 integrate .. //depot/projects/toestack/sys/sys/socket.h#5 edit .. //depot/projects/toestack/sys/vm/vm_page.c#7 integrate .. //depot/projects/toestack/tools/build/options/WITHOUT_BZIP2#2 integrate .. //depot/projects/toestack/tools/build/options/WITHOUT_GNU#2 integrate .. //depot/projects/toestack/tools/build/options/WITHOUT_GSSAPI#1 branch .. //depot/projects/toestack/tools/build/options/WITHOUT_INSTALLLIB#1 branch .. //depot/projects/toestack/tools/build/options/WITHOUT_KERBEROS#2 integrate .. //depot/projects/toestack/tools/build/options/WITHOUT_KVM#2 integrate .. //depot/projects/toestack/tools/build/options/WITHOUT_PAM#2 integrate .. //depot/projects/toestack/tools/build/options/WITHOUT_TOOLCHAIN#2 integrate .. //depot/projects/toestack/tools/build/options/makeman#3 integrate .. //depot/projects/toestack/tools/regression/lib/libc/stdio/test-scanfloat.c#3 integrate .. //depot/projects/toestack/tools/regression/lib/msun/test-lround.c#2 integrate .. //depot/projects/toestack/tools/regression/lib/msun/test-next.c#2 integrate .. //depot/projects/toestack/usr.bin/make/Makefile.dist#2 integrate .. //depot/projects/toestack/usr.bin/procstat/procstat_args.c#2 integrate .. //depot/projects/toestack/usr.bin/procstat/procstat_bin.c#2 integrate .. //depot/projects/toestack/usr.bin/procstat/procstat_cred.c#2 integrate .. //depot/projects/toestack/usr.bin/procstat/procstat_files.c#2 integrate .. //depot/projects/toestack/usr.sbin/pkg_install/Makefile#3 integrate .. //depot/projects/toestack/usr.sbin/pkg_install/add/pkg_add.1#3 integrate .. //depot/projects/toestack/usr.sbin/pkg_install/create/pkg_create.1#2 integrate .. //depot/projects/toestack/usr.sbin/pkg_install/delete/pkg_delete.1#2 integrate .. //depot/projects/toestack/usr.sbin/pkg_install/info/pkg_info.1#2 integrate .. //depot/projects/toestack/usr.sbin/pkg_install/updating/pkg_updating.1#2 integrate .. //depot/projects/toestack/usr.sbin/pkg_install/version/pkg_version.1#2 integrate .. //depot/projects/toestack/usr.sbin/sysinstall/media.c#2 integrate .. //depot/projects/toestack/usr.sbin/sysinstall/system.c#2 integrate .. //depot/projects/toestack/usr.sbin/syslogd/syslogd.c#3 integrate Differences ... ==== //depot/projects/toestack/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.342 2007/10/18 08:41:52 delphij Exp $ +# $FreeBSD: src/Makefile,v 1.344 2007/12/13 00:08:02 imp Exp $ # # The user-driven targets are: # @@ -234,17 +234,18 @@ PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \ PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \ then \ - (cd ${.CURDIR} && make make); \ + (cd ${.CURDIR} && ${MAKE} make); \ fi # # Upgrade make(1) to the current version using the installed -# headers, libraries and tools. +# headers, libraries and tools. Also, allow the location of +# the system bsdmake-like utility to be overridden. # MMAKEENV= MAKEOBJDIRPREFIX=${MAKEPATH} \ DESTDIR= \ INSTALL="sh ${.CURDIR}/tools/install.sh" -MMAKE= ${MMAKEENV} make \ +MMAKE= ${MMAKEENV} ${MAKE} \ -D_UPGRADING \ -DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \ -DNO_CPU_CFLAGS -DNO_WERROR ==== //depot/projects/toestack/contrib/amd/FREEBSD-Xlist#2 (text+ko) ==== @@ -1,7 +1,8 @@ -$FreeBSD: src/contrib/amd/FREEBSD-Xlist,v 1.5 2004/07/06 12:52:27 mbr Exp $ +$FreeBSD: src/contrib/amd/FREEBSD-Xlist,v 1.6 2007/12/11 19:15:17 obrien Exp $ *LSM.am-utils *Makefile.* *README.autofs +*README.osx *ac*.m4 *.old *acconfig.h @@ -15,6 +16,7 @@ *missing *mkinstalldirs *stamp-h.in +*amd/test1.sh *amd/Makefile.* *amq/Makefile.* *commit @@ -38,10 +40,13 @@ *conf/fh_dref/fh_dref_sunos3.h *conf/fh_dref/fh_dref_sunos4.h *conf/fh_dref/fh_dref_svr4.h +*conf/hn_dref/hn_dref_default.h, *conf/hn_dref/hn_dref_isc3.h *conf/hn_dref/hn_dref_linux.h *conf/mount/mount_aix.c +*conf/mount/mount_aix3.c *conf/mount/mount_bsdi3.c +*conf/mount/mount_default.c *conf/mount/mount_freebsd3.c *conf/mount/mount_hpux.c *conf/mount/mount_irix5.c @@ -54,6 +59,7 @@ *conf/mtab/mtab_aix.c *conf/mtab/mtab_file.c *conf/mtab/mtab_isc3.c +*conf/mtab/mtab_linux.c *conf/mtab/mtab_mach3.c *conf/mtab/mtab_osf.c *conf/mtab/mtab_svr4.c @@ -63,6 +69,7 @@ *conf/nfs_prot/nfs_prot_aix4_2.h *conf/nfs_prot/nfs_prot_aix4_3.h *conf/nfs_prot/nfs_prot_aix5_1.h +*conf/nfs_prot/nfs_prot_aix5_2.h *conf/nfs_prot/nfs_prot_bsdi2.h *conf/nfs_prot/nfs_prot_bsdi3.h *conf/nfs_prot/nfs_prot_darwin.h @@ -92,6 +99,12 @@ *conf/nfs_prot/nfs_prot_sunos5_8.h *conf/nfs_prot/nfs_prot_svr4.h *conf/nfs_prot/nfs_prot_ultrix.h +*conf/autofs/autofs_linux.h +*conf/autofs/autofs_linux.c +*conf/autofs/autofs_solaris_v1.h +*conf/autofs/autofs_solaris_v1.c +*conf/autofs/autofs_solaris_v2_v3.h +*conf/autofs/autofs_solaris_v2_v3.c *conf/sa_dref/sa_dref_386bsd.h *conf/sa_dref/sa_dref_aix3.h *conf/sa_dref/sa_dref_aoi.h @@ -103,6 +116,7 @@ *conf/trap/trap_aix3.h *conf/trap/trap_aux.h *conf/trap/trap_dgux.h +*conf/trap/trap_freebsd3.h *conf/trap/trap_hcx.h *conf/trap/trap_hpux.h *conf/trap/trap_hpux11.h @@ -115,7 +129,9 @@ *conf/trap/trap_stellix.h *conf/trap/trap_svr4.h *conf/trap/trap_ultrix.h +*conf/umount/umount_aix.c *conf/umount/umount_default.c +*conf/umount/umount_linux.c *conf/umount/umount_osf.c *doc/Makefile.am *doc/Makefile.in @@ -135,11 +151,118 @@ *fsinfo/Makefile.* *hlfsd/Makefile.* *libamu/Makefile.* +*libamu/alloca.c *libamu/clnt_sperrno.c *libamu/memcmp.c *libamu/strcasecmp.c *libamu/strdup.c *libamu/strstr.c +*libamu/strlcat.c +*libamu/strlcpy.c *libamu/ualarm.c *mk-amd-map/Makefile.* *wire-test/Makefile.* +*m4/GNUmakefile +*m4/amdgrep* +*m4/amindent* +*m4/autopat* +*m4/chop-aclocal.pl* +*m4/copy-if-newbig* +*m4/mk-aclocal* +*m4/mkconf* +*m4/rmtspc* +*m4/update_build_version* +*m4/macros/HEADER +*m4/macros/TRAILER +*m4/macros/c_void_p.m4 +*m4/macros/cache_check_dynamic.m4 +*m4/macros/check_amu_fs.m4 +*m4/macros/check_checkmount_style.m4 +*m4/macros/check_extern.m4 +*m4/macros/check_fhandle.m4 +*m4/macros/check_field.m4 +*m4/macros/check_fs_headers.m4 +*m4/macros/check_fs_mntent.m4 +*m4/macros/check_gnu_getopt.m4 +*m4/macros/check_hide_mount_type.m4 +*m4/macros/check_lib2.m4 +*m4/macros/check_map_funcs.m4 +*m4/macros/check_mnt2_cdfs_opt.m4 +*m4/macros/check_mnt2_gen_opt.m4 +*m4/macros/check_mnt2_nfs_opt.m4 +*m4/macros/check_mnttab_file_name.m4 +*m4/macros/check_mnttab_location.m4 +*m4/macros/check_mnttab_opt.m4 +*m4/macros/check_mnttab_style.m4 +*m4/macros/check_mnttab_type.m4 +*m4/macros/check_mount_style.m4 +*m4/macros/check_mount_trap.m4 +*m4/macros/check_mount_type.m4 +*m4/macros/check_mtype_printf_type.m4 +*m4/macros/check_mtype_type.m4 +*m4/macros/check_network_transport_type.m4 +*m4/macros/check_nfs_fh_dref.m4 +*m4/macros/check_nfs_hn_dref.m4 +*m4/macros/check_nfs_prot_headers.m4 +*m4/macros/check_nfs_sa_dref.m4 +*m4/macros/check_nfs_socket_connection.m4 +*m4/macros/check_os_libs.m4 +*m4/macros/check_restartable_signal_handler.m4 +*m4/macros/check_umount_style.m4 +*m4/macros/check_unmount_args.m4 +*m4/macros/check_unmount_call.m4 +*m4/macros/expand_cpp_hex.m4 +*m4/macros/expand_cpp_int.m4 +*m4/macros/expand_cpp_string.m4 +*m4/macros/expand_run_string.m4 +*m4/macros/extern_optarg.m4 +*m4/macros/extern_sys_errlist.m4 +*m4/macros/field_mntent_t_mnt_time_string.m4 +*m4/macros/func_bad_memcmp.m4 +*m4/macros/func_bad_yp_all.m4 +*m4/macros/header_templates.m4 +*m4/macros/host_macros.m4 +*m4/macros/linux_headers.m4 +*m4/macros/localconfig.m4 +*m4/macros/mount_headers.m4 +*m4/macros/name_package.m4 +*m4/macros/name_version.m4 +*m4/macros/opt_amu_cflags.m4 +*m4/macros/opt_cppflags.m4 +*m4/macros/opt_debug.m4 +*m4/macros/opt_ldflags.m4 +*m4/macros/opt_libs.m4 +*m4/macros/os_cflags.m4 +*m4/macros/os_cppflags.m4 +*m4/macros/os_ldflags.m4 +*m4/macros/package_bugreport.m4 +*m4/macros/package_name.m4 +*m4/macros/package_version.m4 +*m4/macros/save_state.m4 +*m4/macros/struct_field_nfs_fh.m4 +*m4/macros/struct_mntent.m4 +*m4/macros/struct_mnttab.m4 +*m4/macros/struct_nfs_args.m4 +*m4/macros/struct_nfs_fh.m4 +*m4/macros/struct_nfs_fh3.m4 +*m4/macros/struct_nfs_gfs_mount.m4 +*m4/macros/try_compile_anyfs.m4 +*m4/macros/try_compile_nfs.m4 +*m4/macros/try_compile_rpc.m4 +*m4/macros/type_auth_create_gidlist.m4 +*m4/macros/type_cachefs_args.m4 +*m4/macros/type_cdfs_args.m4 +*m4/macros/type_efs_args.m4 +*m4/macros/type_lofs_args.m4 +*m4/macros/type_mfs_args.m4 +*m4/macros/type_pcfs_args.m4 +*m4/macros/type_recvfrom_fromlen.m4 +*m4/macros/type_rfs_args.m4 +*m4/macros/type_svc_in_arg.m4 +*m4/macros/type_time_t.m4 +*m4/macros/type_tmpfs_args.m4 +*m4/macros/type_ufs_args.m4 +*m4/macros/type_xdrproc_t.m4 +*m4/macros/type_xfs_args.m4 +*m4/macros/type_yp_order_outorder.m4 +*m4/macros/with_addon.m4 ==== //depot/projects/toestack/contrib/amd/FREEBSD-upgrade#2 (text+ko) ==== @@ -1,21 +1,19 @@ # ex:ts=8 -$FreeBSD: src/contrib/amd/FREEBSD-upgrade,v 1.15 2004/05/14 13:29:48 mbr Exp $ +$FreeBSD: src/contrib/amd/FREEBSD-upgrade,v 1.16 2007/12/11 19:16:51 obrien Exp $ -AMD (am-utils) 6.0.9 - originals can be found at: ftp://shekel.mcl.cs.columbia.edu/pub/am-utils/ - (http://www.cs.columbia.edu/~ezk/am-utils/index.html) - +AMD (am-utils) 6.1.5 + originals can be found at: ftp://ftp.am-utils.org/pub/am-utils/ For the import of AMD many files were pruned by: - tar -X FREEBSD-Xlist -xzf am-utils-6.0.9.tar.gz + tar -X FREEBSD-Xlist -xf am-utils-6.1.5.tar.gz and `find . -name '.cvsignore' -delete` Then imported by: - cvs import -m 'Virgin import of AMD (am-utils) v6.0.9' \ - src/contrib/amd COLUMBIA amd_6_0_9 + cvs import -m 'Virgin import of AMD (am-utils) v6.1.5' \ + src/contrib/amd COLUMBIA amd_6_1_5 After the import, a separate extraction of am-utils was GNU configured in the "normal" way. The resulting config.h file should be compared with @@ -25,8 +23,11 @@ To make local changes to amd, simply patch and commit to the main branch (aka HEAD). Never make local changes on the vendor (COLUMBIA) branch. -All local changes should be submitted to "amd-dev@majordomo.cs.columbia.edu" -for inclusion in the next vendor release. +Note, we don't trim anything in scripts/ as sysadmins may find the bits +as a useful reference. + +All local changes should be submitted to "am-utils@am-utils.org" or +https://bugzilla.am-utils.org for inclusion in the next vendor release. Local changes: ==== //depot/projects/toestack/contrib/gcc/config/sparc/freebsd.h#2 (text+ko) ==== @@ -19,24 +19,26 @@ the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* $FreeBSD: src/contrib/gcc/config/sparc/freebsd.h,v 1.10 2007/05/19 02:30:20 kan Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/sparc/freebsd.h,v 1.11 2007/12/09 17:41:47 marius Exp $ */ #undef SUBTARGET_EXTRA_SPECS #define SUBTARGET_EXTRA_SPECS \ { "fbsd_dynamic_linker", FBSD_DYNAMIC_LINKER } /* FreeBSD needs the platform name (sparc64) defined. - Emacs needs to know if the arch is 64 or 32-bits. */ - -#undef CPP_CPU64_DEFAULT_SPEC -#define CPP_CPU64_DEFAULT_SPEC \ - "-D__sparc64__ -D__sparc_v9__ -D__sparcv9 -D__sparc__ -D__arch64__" + Emacs needs to know if the arch is 64 or 32-bits. + This also selects which targets are available via -mcpu. */ #undef FBSD_TARGET_CPU_CPP_BUILTINS #define FBSD_TARGET_CPU_CPP_BUILTINS() \ do \ { \ builtin_define ("__LP64__"); \ + builtin_define ("__sparc64__"); \ + builtin_define ("__sparc_v9__"); \ + builtin_define ("__sparcv9"); \ + builtin_define ("__sparc__"); \ + builtin_define ("__arch64__"); \ } \ while (0) ==== //depot/projects/toestack/contrib/gcc/fold-const.c#2 (text+ko) ==== @@ -5661,6 +5661,9 @@ } break; } + /* If the constant is negative, we cannot simplify this. */ + if (tree_int_cst_sgn (c) == -1) + break; /* FALLTHROUGH */ case NEGATE_EXPR: if ((t1 = extract_muldiv (op0, c, code, wide_type, strict_overflow_p)) ==== //depot/projects/toestack/games/fortune/datfiles/fortunes#5 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.248 2007/12/07 22:41:39 dougb Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.249 2007/12/09 01:00:11 dougb Exp $ % ======================================================================= || || @@ -12502,7 +12502,7 @@ % Bizoos, n.: The millions of tiny individual bumps that make up a -basketball. + basketball. -- Rich Hall, "Sniglets" % Black people have never rioted. A riot is what white people think blacks @@ -12575,10 +12575,10 @@ % BLISS is ignorance % -blithwapping: +Blithwapping, v: Using anything BUT a hammer to hammer a nail into the wall, such as shoes, lamp bases, doorstops, etc. - -- "Sniglets", Rich Hall & Friends + -- Rich Hall & Friends, "Sniglets" % Blood flows down one leg and up the other. % @@ -12948,10 +12948,10 @@ Bunker's Admonition: You cannot buy beer; you can only rent it. % -BURBULATION: +Burbulation, v: The obsessive act of opening and closing a refrigerator door in an attempt to catch it before the automatic light comes on. - -- "Sniglets", Rich Hall & Friends + -- Rich Hall & Friends, "Sniglets" % Bureau Termination, Law of: When a government bureau is scheduled to be phased out, @@ -13397,8 +13397,8 @@ % Carperpetuation (kar' pur pet u a shun), n.: The act, when vacuuming, of running over a string at least a -dozen times, reaching over and picking it up, examining it, then -putting it back down to give the vacuum one more chance. + dozen times, reaching over and picking it up, examining it, + then putting it back down to give the vacuum one more chance. -- Rich Hall, "Sniglets" % Carson's Consolation: @@ -14277,7 +14277,7 @@ -- Ambrose Bierce, "The Devil's Dictionary" % Confidence is simply that quiet, assured feeling you have before you -fall flag on your face. +fall flat on your face. -- Dr. L. Binder % Confidence is the feeling you have before you understand the situation. @@ -16549,10 +16549,10 @@ Either I'm dead or my watch has stopped. -- Groucho Marx' last words % -ELBONICS: +Elbonics, v: The actions of two people maneuvering for one armrest in a movie theatre. - -- "Sniglets", Rich Hall & Friends + -- Rich Hall & Friends, "Sniglets" % Eleanor Rigby Sits at the keyboard and waits for a line on the screen @@ -17736,10 +17736,10 @@ Female rabbits: The gift that just "keeps on giving." % -FENDERBERG: +Fenderberg, n.: The large glacial deposits that form on the insides of car fenders during snowstorms. - -- "Sniglets", Rich Hall & Friends + -- Rich Hall & Friends, "Sniglets" % Ferguson's Precept: A crisis is when you can't say "let's forget the whole thing." @@ -18007,9 +18007,9 @@ Flame on! -- Johnny Storm % -FLANNISTER: +Flannister, n.: The plastic yoke that holds a six-pack of beer together. - -- "Sniglets", Rich Hall & Friends + -- Rich Hall & Friends, "Sniglets" % Flappity, floppity, flip The mouse on the m"obius strip; @@ -19606,7 +19606,7 @@ % Fundamentally, there may be no basis for anything. % -Furbling, v.: +Furbling, v: Having to wander through a maze of ropes at an airport or bank even when you are the only person in line. -- Rich Hall, "Sniglets" @@ -19684,7 +19684,7 @@ and respect from those around you; everybody loves a sucker. A short trip is in the stars, possibly to the men's room. % -Genderplex, n: +Genderplex, n.: The predicament of a person in a restaurant who is unable to determine his or her designated restroom (e.g., turtles and tortoises). @@ -19977,9 +19977,9 @@ LISP programmers to abandon bra and fig-leaf. -- Epigrams in Programming, ACM SIGPLAN Sept. 1982 % -GLEEMITES: +Gleemites, n.: Petrified deposits of toothpaste found in sinks. - -- "Sniglets", Rich Hall & Friends + -- Rich Hall & Friends, "Sniglets" % Glib's Fourth Law of Unreliability: Investment in reliability will increase until it exceeds the @@ -20011,7 +20011,7 @@ % Gnagloot, n.: A person who leaves all his ski passes on his jacket just to -impress people. + impress people. -- Rich Hall, "Sniglets" % Go ahead, make my day. @@ -25345,7 +25345,7 @@ % Idiot Box, n.: The part of the envelope that tells a person where to place the -stamp when they can't quite figure it out for themselves. + stamp when they can't quite figure it out for themselves. -- Rich Hall, "Sniglets" % Idiot, n.: @@ -27202,7 +27202,7 @@ If you've seen one redwood, you've seen them all. -- Ronald Reagan % -ignisecond, n: +Ignisecond, n.: The overlapping moment of time when the hand is locking the car door even as the brain is saying, "my keys are in there!" -- Rich Hall, "Sniglets" @@ -31189,7 +31189,7 @@ Let me not to the marriage of true minds Admit impediments. Love is not love Which alters when it alteration finds, -Or bends with the remover to remove: +Or bends with the remover to remove. O, no! it is an ever-fixed mark, That looks on tempests and is never shaken; It is the star to every wandering bark, @@ -31198,8 +31198,9 @@ Within his bending sickle's compass come; Love alters not with his brief hours and weeks, But bears it out even to the edge of doom. -If this be error and upon me proved, -I never writ, nor no man ever loved. + If this be error and upon me proved, + I never writ, nor no man ever loved. + -- William Shakespeare, Sonnet CXVI % Let me put it this way: today is going to be a learning experience. % @@ -32404,7 +32405,7 @@ knowledge. -- Ambrose Bierce, "The Devil's Dictionary" % -Magnocartic, adj: +Magnocartic, adj.: Any automobile that, when left unattended, attracts shopping carts. -- Rich Hall, "Sniglets" @@ -33481,10 +33482,10 @@ Any simple problem can be made insoluble if enough meetings are held to discuss it. % -mittsquinter, adj: - A ballplayer who looks into his glove after missing the ball, as - if, somehow, the cause of the error lies there. - -- "Sniglets", Rich Hall & Friends +Mittsquinter, adj.: + A ballplayer who looks into his glove after missing the ball, + as if, somehow, the cause of the error lies there. + -- Rich Hall & Friends, "Sniglets" % Mix a little foolishness with your serious plans; it's lovely to be silly at the right moment. @@ -34033,7 +34034,7 @@ Mustgo, n.: Any item of food that has been sitting in the refrigerator so long it has become a science project. - -- Sniglets, "Rich Hall & Friends" + -- Rich Hall & Friends, "Sniglets" % My advice to you, my violent friend, is to seek out gold and sit on it. -- The Dragon to Grendel, in John Gardner's "Grendel" @@ -34401,10 +34402,10 @@ will be right. -- George Bernard Shaw, "The Man of Destiny" % -narcolepulacyi, n: +Narcolepulacyi, n.: The contagious action of yawning, causing everyone in sight to also yawn. - -- "Sniglets", Rich Hall & Friends + -- Rich Hall & Friends, "Sniglets" % Nasrudin called at a large house to collect for charity. The servant said "My master is out." Nasrudin replied, "Tell your master that next time he @@ -37796,12 +37797,12 @@ % Pedaeration, n.: The perfect body heat achieved by having one leg under the -sheet and one hanging off the edge of the bed. + sheet and one hanging off the edge of the bed. -- Rich Hall, "Sniglets" % -pediddel: +Pediddel, n.: A car with only one working headlight. - -- "Sniglets", Rich Hall & Friends + -- Rich Hall & Friends, "Sniglets" % Pedro Guerrero was playing third base for the Los Angeles Dodgers in 1984 when he made the comment that earns him a place in my Hall of Fame. Second @@ -38090,7 +38091,7 @@ (3) Things that tick are not always clocks. (4) Suicide only works when you're bluffing. % -petribar: +Petribar, n.: Any sun-bleached prehistoric candy that has been sitting in the window of a vending machine too long. -- Rich Hall, "Sniglets" @@ -38113,10 +38114,10 @@ % Phone call for chucky-pooh. % -phosflink: - To flick a bulb on and off when it burns out (as if, somehow, that - will bring it back to life). - -- "Sniglets", Rich Hall & Friends +Phosflink, v: + To flick a bulb on and off when it burns out (as if, somehow, + that will bring it back to life). + -- Rich Hall & Friends, "Sniglets" % Photographing a volcano is just about the most miserable thing you can do. @@ -38992,10 +38993,10 @@ Puritanism -- the haunting fear that someone, somewhere, may be happy. -- H. L. Mencken, "A Book of Burlesques" % -PURPITATION: +Purpitation, v: To take something off the grocery shelf, decide you don't want it, and then put it in another section. - -- "Sniglets", Rich Hall & Friends + -- Rich Hall & Friends, "Sniglets" % Pushing 30 is exercise enough. % @@ -41313,7 +41314,7 @@ % Schizophrenia beats being alone. % -schlattwhapper, n: +Schlattwhapper, n.: The window shade that allows itself to be pulled down, hesitates for a second, then snaps up in your face. -- Rich Hall, "Sniglets" @@ -41322,11 +41323,6 @@ All things being equal, a fat person uses more soap than a thin person. % -Schnuffel, n.: - A dog's practice of continuously nuzzling in your crotch in - mixed company. - -- Rich Hall, "Sniglets" -% Schwiggle, n.: The amusing rotation of one's bottom while sharpening a pencil. @@ -41464,9 +41460,10 @@ % Screw up your courage! You've screwed up everything else. % -SCRIBLINE: - The blank area on the back of credit cards where one's signature goes. - -- "Sniglets", Rich Hall & Friends +Scribline, n.: + The blank area on the back of credit cards where one's + signature goes. + -- Rich Hall & Friends, "Sniglets" % Scrubbing floors and emptying bedpans has as much dignity as the Presidency. @@ -42903,9 +42900,10 @@ and new civilizations; to boldly go where no man has gone before. -- Captain James T. Kirk % -SPAGMUMPS: - Any of the millions of Styrofoam wads that accompany mail-order items. - -- "Sniglets", Rich Hall & Friends +Spagmumps, n.: + Any of the millions of Styrofoam wads that accompany mail-order + items. + -- Rich Hall & Friends, "Sniglets" % Spare no expense to save money on this one. -- Samuel Goldwyn @@ -43037,7 +43035,7 @@ Spirtle, n.: The fine stream from a grapefruit that always lands right in your eye. - -- Sniglets, "Rich Hall & Friends" + -- Rich Hall & Friends, "Sniglets" % Spock: The odds of surviving another attack are 13562190123 to 1, Captain. @@ -43051,9 +43049,9 @@ Spring is here, spring is here, Life is skittles and life is beer. % -SQUATCHO: +Squatcho, n.: The button at the top of a baseball cap. - -- "Sniglets", Rich Hall & Friends + -- Rich Hall & Friends, "Sniglets" % Squirrels eating squirrels, my God, that's sick. % @@ -43848,11 +43846,11 @@ making a disagreeable person keep his distance. -- Ambrose Bierce, "The Devil's Dictionary" % -TELEPRESSION: - The deep-seated guilt which stems from knowing that you did not try - hard enough to look up the number on your own and instead put the - burden on the directory assistant. - -- "Sniglets", Rich Hall & Friends +Telepression, n.: + The deep-seated guilt which stems from knowing that you did not + try hard enough to look up the number on your own and instead + put the burden on the directory assistant. + -- Rich Hall & Friends, "Sniglets" % Television -- a medium. So called because it is neither rare nor well done. -- Ernie Kovacs @@ -52117,7 +52115,7 @@ % Toddlers are the stormtroopers of the Lord of Entropy. % -toilet toupee, n: +Toilet Toupee, n: Any shag carpet that causes the lid to become top-heavy, thus creating endless annoyance to male users. -- Rich Hall, "Sniglets" @@ -54204,7 +54202,7 @@ Or consider "The Brothers Karamazov", by the famous Russian alcoholic Fyodor Dostoevsky. It's about these two brothers who kill their father. Or maybe only one of them kills the father. It's impossible to tell because -what they mostly do is talk for nearly a thousand pages.If all Russians talk +what they mostly do is talk for nearly a thousand pages. If all Russians talk as much as the Karamazovs did, I don't see how they found time to become a major world power. I'm told that Dostoevsky wrote "The Brothers Karamazov" to raise @@ -57638,7 +57636,7 @@ % XIIdigitation, n.: The practice of trying to determine the year a movie was made -by deciphering the Roman numerals at the end of the credits. + by deciphering the Roman numerals at the end of the credits. -- Rich Hall, "Sniglets" % XLI: ==== //depot/projects/toestack/games/fortune/datfiles/fortunes-o.real#4 (text+ko) ==== @@ -1,4 +1,4 @@ -%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.27 2007/12/07 22:56:10 dougb Exp $ +%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.28 2007/12/09 01:00:11 dougb Exp $ % PLAYGIRL, Inc. Philadelphia, Pa. 19369 @@ -11810,9 +11810,9 @@ I'll take head on a flight, So the guy can have pie in the sky." % -schnuffel, n.: - A dog's practice of continuously nuzzling in your crotch in mixed - company. +Schnuffel, n.: + A dog's practice of continuously nuzzling in your crotch in + mixed company. -- Rich Hall, "Sniglets" % "Scott, baby," the sexually aggressive girl murmured as she guided @@ -12173,7 +12173,7 @@ % Snow White: "Gee guys, I've always dreamed of getting ten inches... - but not an inch-and-a-half at a time! + but not an inch-and-a-half at a time!" % "Snyder's got a stiff ticket," said Kay, "Come on, take it out, and let's play." @@ -13073,7 +13073,7 @@ % The new rooster caused a great stir in the barnyard. From resplendent comb to defiant spurs, he was the picture of young bantamhood. Almost immediately -upon arrival, he was greeted by and elderly rooster who took him behind the +upon arrival, he was greeted by an elderly rooster who took him behind the barn and whispered in his ear: "Young fellow, I'm long past my prime. All I want now is peace and solitude. So you take over right now as ruler of the roost with my blessings." @@ -13082,7 +13082,7 @@ took the young champion behind the barn. "Kid," he said, "the hens are after me for giving up my position so readily. So why don't we have a race, say, ten laps around the farmhouse? The winner becomes undisputed keeper of the -henhouse and the hens will stop nagging me. +henhouse and the hens will stop nagging me." The young rooster, with only contempt for his elder, agreed. Surprisingly, the older one jumped off to an early lead. His counterpart, weakened by the activities of the previous week, was never quite able to ==== //depot/projects/toestack/games/fortune/datfiles/fortunes-o.sp.ok#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/games/fortune/datfiles/fortunes-o.sp.ok,v 1.2 2007/12/07 22:27:04 dougb Exp $ +# $FreeBSD: src/games/fortune/datfiles/fortunes-o.sp.ok,v 1.3 2007/12/09 01:00:11 dougb Exp $ a'plucking AAAaaeeeeeeeeeiiiiiiiii Aaah @@ -1309,7 +1309,7 @@ Schlegel schlemiel schloshed -schnuffel +Schnuffel scones Scot's scotches >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Dec 13 02:48:34 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C250016A469; Thu, 13 Dec 2007 02:48:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 45FD416A418 for ; Thu, 13 Dec 2007 02:48:34 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4488013C4EA for ; Thu, 13 Dec 2007 02:48:34 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBD2mYxP031500 for ; Thu, 13 Dec 2007 02:48:34 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBD2mYwd031497 for perforce@freebsd.org; Thu, 13 Dec 2007 02:48:34 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 13 Dec 2007 02:48:34 GMT Message-Id: <200712130248.lBD2mYwd031497@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 130784 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Dec 2007 02:48:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=130784 Change 130784 by kmacy@kmacy:storage:toestack on 2007/12/13 02:48:05 fix compile breakage from IFC Affected files ... .. //depot/projects/toestack/sys/netinet/tcp_ofld.h#9 edit .. //depot/projects/toestack/sys/netinet/tcp_var.h#10 edit Differences ... ==== //depot/projects/toestack/sys/netinet/tcp_ofld.h#9 (text+ko) ==== @@ -3,7 +3,7 @@ #define tp_offload(tp) ((tp)->t_flags & TF_TOE) -#define SO_OFFLOADABLE(so) ((so->so_options & SO_NOOFFLOAD) == 0) +#define SO_OFFLOADABLE(so) ((so->so_options & SO_NO_OFFLOAD) == 0) int ofld_connect(struct socket *so, struct sockaddr *nam); int ofld_can_offload(struct tcpcb *tp, struct sockaddr *nam); ==== //depot/projects/toestack/sys/netinet/tcp_var.h#10 (text+ko) ==== @@ -207,7 +207,6 @@ int t_rttlow; /* smallest observerved RTT */ u_int32_t rfbuf_ts; /* recv buffer autoscaling timestamp */ int rfbuf_cnt; /* recv buffer autoscaling byte count */ - void *t_pspare[3]; /* toe usrreqs / toepcb * / congestion algo / vimage / 1 general use */ struct toe_usrreqs *t_tu; /* offload operations vector */ void *t_toe; /* TOE pcb pointer */ char *t_cong_control; /* congestion control algorithm name*/ From owner-p4-projects@FreeBSD.ORG Thu Dec 13 06:11:13 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E75E16A41A; Thu, 13 Dec 2007 06:11:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EFE6016A417 for ; Thu, 13 Dec 2007 06:11:12 +0000 (UTC) (envelope-from qingli@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DA14313C448 for ; Thu, 13 Dec 2007 06:11:12 +0000 (UTC) (envelope-from qingli@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBD6BCHU079449 for ; Thu, 13 Dec 2007 06:11:12 GMT (envelope-from qingli@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBD6BCCN079446 for perforce@freebsd.org; Thu, 13 Dec 2007 06:11:12 GMT (envelope-from qingli@freebsd.org) Date: Thu, 13 Dec 2007 06:11:12 GMT Message-Id: <200712130611.lBD6BCCN079446@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to qingli@freebsd.org using -f From: Qing Li To: Perforce Change Reviews Cc: Subject: PERFORCE change 130786 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Dec 2007 06:11:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=130786 Change 130786 by qingli@FreeBSD-newarp on 2007/12/13 06:11:03 generic L2 maintenance routines Affected files ... .. //depot/projects/arp-v2/src/sys/net/if_llatbl.c#1 add .. //depot/projects/arp-v2/src/sys/net/if_llatbl.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Dec 13 06:18:22 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E863616A41B; Thu, 13 Dec 2007 06:18:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2B0EB16A419 for ; Thu, 13 Dec 2007 06:18:21 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2C28B13C467 for ; Thu, 13 Dec 2007 06:18:21 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBD6ILmD080696 for ; Thu, 13 Dec 2007 06:18:21 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBD6IKvj080693 for perforce@freebsd.org; Thu, 13 Dec 2007 06:18:20 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 13 Dec 2007 06:18:20 GMT Message-Id: <200712130618.lBD6IKvj080693@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 130787 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Dec 2007 06:18:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=130787 Change 130787 by kmacy@kmacy:storage:toestack on 2007/12/13 06:17:46 revamp driver to work with updated MI interface names fix TIME_WAIT1 handling for closed socket and linger case Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/ulp/toecore/toedev.c#4 edit .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#33 edit .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_defs.h#12 edit .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom.c#15 edit .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom.h#15 edit .. //depot/projects/toestack/sys/netinet/tcp_ofld.c#8 edit .. //depot/projects/toestack/sys/netinet/tcp_ofld.h#10 edit .. //depot/projects/toestack/sys/netinet/tcp_var.h#11 edit .. //depot/projects/toestack/sys/netinet/toedev.h#4 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/ulp/toecore/toedev.c#4 (text+ko) ==== @@ -83,7 +83,7 @@ static inline int is_attached(const struct toedev *dev) { - return dev->offload_mod != NULL; + return dev->tod_offload_mod != NULL; } /* @@ -100,9 +100,9 @@ TAILQ_FOREACH(t, &offload_module_list, entry) { const struct offload_id *entry; - entry = id_find(dev->ttid, t->id_table); - if (entry && t->attach(dev, entry) == 0) { - dev->offload_mod = t; + entry = id_find(dev->tod_ttid, t->ti_id_table); + if (entry && t->ti_attach(dev, entry) == 0) { + dev->tod_offload_mod = t; return 0; } } @@ -149,7 +149,7 @@ struct toedev *dev; TAILQ_FOREACH(dev, &offload_dev_list, entry) { - if (!strncmp(dev->name, name, TOENAMSIZ)) + if (!strncmp(dev->tod_name, name, TOENAMSIZ)) return dev; } return NULL; @@ -186,7 +186,7 @@ if (snprintf(s, sizeof(s), name, i) >= sizeof(s)) return -1; /* name too long */ if (!__find_offload_dev_by_name(s)) { - strcpy(dev->name, s); + strcpy(dev->tod_name, s); return 0; } } @@ -229,7 +229,7 @@ if ((ret = assign_name(dev, name, 32)) != 0) goto out; - dev->offload_mod = NULL; + dev->tod_offload_mod = NULL; TAILQ_INSERT_TAIL(&offload_dev_list, dev, entry); out: mtx_unlock(&offload_db_lock); @@ -298,10 +298,10 @@ int r; critical_enter(); /* XXX neccessary? */ - r = dev->send(dev, m); + r = dev->tod_send(dev, m); critical_exit(); if (r) - BPF_MTAP(dev->lldev, m); + BPF_MTAP(dev->tod_lldev, m); return r; } @@ -319,13 +319,13 @@ int toe_receive_mbuf(struct toedev *dev, struct mbuf **m, int n) { - if (__predict_true(!bpf_peers_present(dev->lldev->if_bpf))) - return dev->recv(dev, m, n); + if (__predict_true(!bpf_peers_present(dev->tod_lldev->if_bpf))) + return dev->tod_recv(dev, m, n); for ( ; n; n--, m++) { - m[0]->m_pkthdr.rcvif = dev->lldev; - BPF_MTAP(dev->lldev, m[0]); - dev->recv(dev, m, 1); + m[0]->m_pkthdr.rcvif = dev->tod_lldev; + BPF_MTAP(dev->tod_lldev, m[0]); + dev->tod_recv(dev, m, 1); } return 0; } @@ -344,8 +344,8 @@ if (ifp && ifnet_is_offload(ifp)) { struct toedev *tdev = TOEDEV(ifp); - if (tdev && tdev->arp_update) - tdev->arp_update(tdev, rt); + if (tdev && tdev->tod_arp_update) + tdev->tod_arp_update(tdev, rt); } } @@ -368,9 +368,9 @@ #if 0 while (root_dev && ifnet_is_offload(root_dev)) { - if (root_dev->priv_flags & IFF_802_1Q_VLAN) + if (root_dev->tod_priv_flags & IFF_802_1Q_VLAN) root_dev = VLAN_DEV_INFO(root_dev)->real_dev; - else if (root_dev->flags & IFF_MASTER) + else if (root_dev->tod_flags & IFF_MASTER) root_dev = toe_bond_get_slave(root_dev, sk, context); else break; ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#33 (text+ko) ==== @@ -149,7 +149,7 @@ static inline int is_t3a(const struct toedev *dev) { - return (dev->ttid == TOE_ID_CHELSIO_T3); + return (dev->tod_ttid == TOE_ID_CHELSIO_T3); } static void @@ -981,7 +981,7 @@ wnd = MIN_RCV_WND; /* PR 5138 */ - max_rcv_wnd = (dev->ttid == TOE_ID_CHELSIO_T3B ? + max_rcv_wnd = (dev->tod_ttid == TOE_ID_CHELSIO_T3B ? (uint32_t)d->rx_page_size * 23 : MAX_RCV_WND); @@ -1234,14 +1234,13 @@ */ int t3_connect(struct toedev *tdev, struct socket *so, - struct ifnet *egress_ifp) + struct rtentry *rt, struct sockaddr *nam) { struct mbuf *m; struct l2t_entry *e; struct tom_data *d = TOM_DATA(tdev); struct inpcb *inp = sotoinpcb(so); struct tcpcb *tp = intotcpcb(inp); - struct rtentry *dst = inp->inp_route.ro_rt; struct toepcb *toep; /* allocated by init_offload_socket */ int atid; @@ -1253,7 +1252,7 @@ if ((atid = cxgb_alloc_atid(d->cdev, d->client, toep)) < 0) goto out_err; - e = t3_l2t_get(d->cdev, dst, egress_ifp, &inp->inp_route.ro_dst); + e = t3_l2t_get(d->cdev, rt, rt->rt_ifp, nam); if (!e) goto free_tid; @@ -1266,7 +1265,7 @@ #endif SOCK_LOCK(so); - init_offload_socket(so, tdev, atid, e, dst, toep); + init_offload_socket(so, tdev, atid, e, rt, toep); install_offload_ops(so); @@ -1841,7 +1840,7 @@ default: log(LOG_ERR, "%s: TID %u received PEER_CLOSE in bad state %d\n", - TOE_DEV(so)->name, toep->tp_tid, tp->t_state); + TOE_DEV(so)->tod_name, toep->tp_tid, tp->t_state); } INP_INFO_WUNLOCK(&tcbinfo); if (tp) @@ -1922,6 +1921,8 @@ #ifdef notyet dst_confirm(sk->sk_dst_cache); #endif + soisdisconnecting(so); + if ((so->so_state & SS_NOFDREF) == 0) { /* * Wake up lingering close @@ -1929,19 +1930,16 @@ sowwakeup(so); sorwakeup(so); wakeup(&so->so_timeo); - } else - printf("FIN_WAIT1 shutdown handling incomplete\n"); - -#if 0 - else if (tcp_sk(sk)->linger2 < 0 && - !sock_flag(so, ABORT_SHUTDOWN)) - abort_conn(so, skb, LINUX_MIB_TCPABORTONLINGER); -#endif + } else if ((so->so_options & SO_LINGER) && so->so_linger == 0 && + (toep->tp_flags & TP_ABORT_SHUTDOWN) == 0) { + tp = tcp_drop(tp, 0); + } + break; default: log(LOG_ERR, "%s: TID %u received CLOSE_CON_RPL in bad state %d\n", - TOE_DEV(so)->name, toep->tp_tid, + TOE_DEV(so)->tod_name, toep->tp_tid, tp->t_state); } INP_INFO_WUNLOCK(&tcbinfo); @@ -2356,7 +2354,7 @@ struct toedev *tdev = TOE_DEV(parent); do_abort_syn_rcv(child, parent); - if (tdev->ttid == TOE_ID_CHELSIO_T3) { + if (tdev->tod_ttid == TOE_ID_CHELSIO_T3) { struct cpl_pass_accept_rpl *rpl = cplhdr(m); rpl->opt0h = htonl(F_TCAM_BYPASS); @@ -2554,7 +2552,7 @@ reply_mbuf = m_gethdr(M_NOWAIT, MT_DATA); if (__predict_false(reply_mbuf == NULL)) { - if (tdev->ttid == TOE_ID_CHELSIO_T3) + if (tdev->tod_ttid == TOE_ID_CHELSIO_T3) t3_defer_reply(m, tdev, reject_pass_request); else { cxgb_queue_tid_release(cdev, tid); @@ -2617,16 +2615,13 @@ dst = rtalloc2((struct sockaddr *)&nam, 1, 0); if (dst == NULL) { - - DPRINTF("failed to find route\n"); - + printf("failed to find route\n"); + goto reject; } e = newtoep->tp_l2t = t3_l2t_get(d->cdev, dst, tim.dev, (struct sockaddr *)&nam); if (e == NULL) { - DPRINTF("failed to get l2t\n"); - } /* * Point to our listen socket until accept @@ -2707,7 +2702,7 @@ #endif return; reject: - if (tdev->ttid == TOE_ID_CHELSIO_T3) + if (tdev->tod_ttid == TOE_ID_CHELSIO_T3) mk_pass_accept_rpl(reply_mbuf, m); else mk_tid_release(reply_mbuf, NULL, tid); ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_defs.h#12 (text+ko) ==== @@ -46,7 +46,8 @@ void t3_listen_start(struct toedev *dev, struct socket *so, struct t3cdev *cdev); void t3_listen_stop(struct toedev *dev, struct socket *so, struct t3cdev *cdev); int t3_push_frames(struct socket *so, int req_completion); -int t3_connect(struct toedev *tdev, struct socket *so, struct ifnet *egress_ifp); +int t3_connect(struct toedev *tdev, struct socket *so, struct rtentry *rt, + struct sockaddr *nam); void t3_init_listen_cpl_handlers(void); int t3_init_cpl_io(void); void t3_init_wr_tab(unsigned int wr_len); ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom.c#15 (text+ko) ==== @@ -103,9 +103,9 @@ }; static struct tom_info t3_tom_info = { - .attach = t3_toe_attach, - .id_table = t3_toe_id_tab, - .name = "Chelsio-T3" + .ti_attach = t3_toe_attach, + .ti_id_table = t3_toe_id_tab, + .ti_name = "Chelsio-T3" }; struct cxgb_client t3c_tom_client = { @@ -115,7 +115,6 @@ .redirect = NULL }; - /* * Add an skb to the deferred skb queue for processing from process context. */ @@ -218,9 +217,9 @@ /* Register TCP offload device */ tdev = &t->tdev; - tdev->ttid = (cdev->type == T3A ? + tdev->tod_ttid = (cdev->type == T3A ? TOE_ID_CHELSIO_T3 : TOE_ID_CHELSIO_T3B); - tdev->lldev = cdev->lldev; + tdev->tod_lldev = cdev->lldev; if (register_toedev(tdev, "toe%d")) { printf("unable to register offload device"); @@ -286,7 +285,7 @@ can_offload(struct toedev *dev, struct socket *so) { struct tom_data *tomd = TOM_DATA(dev); - struct t3cdev *cdev = T3CDEV(dev->lldev); + struct t3cdev *cdev = T3CDEV(dev->tod_lldev); struct tid_info *t = &(T3C_DATA(cdev))->tid_maps; return sotoinpcb(so)->inp_depend4.inp4_options == NULL && @@ -341,14 +340,14 @@ /* Adjust TOE activation for this module */ t->conf.activated = activated; - dev->can_offload = can_offload; - dev->connect = t3_connect; - dev->ctl = tom_ctl; + dev->tod_can_offload = can_offload; + dev->tod_connect = t3_connect; + dev->tod_ctl = tom_ctl; #if 0 #ifndef NETEVENT - dev->neigh_update = tom_neigh_update; + dev->tod_neigh_update = tom_neigh_update; #endif - dev->failover = t3_failover; + dev->tod_failover = t3_failover; #endif err = cdev->ctl(cdev, GET_DDP_PARAMS, &ddp); if (err) ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom.h#15 (text+ko) ==== @@ -120,7 +120,7 @@ int ulp_mode; }; -#define TOM_DATA(dev) (*(struct tom_data **)&(dev)->l4opt) +#define TOM_DATA(dev) (*(struct tom_data **)&(dev)->tod_l4opt) #define T3C_DEV(sk) ((TOM_DATA(TOE_DEV(sk)))->cdev) #define TOEP_T3C_DEV(toep) (TOM_DATA(toep->tp_toedev)->cdev) #define TOM_TUNABLE(dev, param) (TOM_DATA(dev)->conf.param) ==== //depot/projects/toestack/sys/netinet/tcp_ofld.c#8 (text+ko) ==== @@ -1,3 +1,33 @@ +/*- + * Copyright (c) 2007, Chelsio Inc. + * 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. Neither the name of the Chelsio Corporation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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/sys/netinet/tcp_ofld.c,v 1.2 2007/12/12 23:31:49 kmacy Exp $"); + #include #include #include @@ -5,7 +35,6 @@ #include #include #include - #include #include @@ -13,8 +42,6 @@ #include #include - - #include #include #include @@ -26,83 +53,74 @@ int ofld_connect(struct socket *so, struct sockaddr *nam) { - struct inpcb *inp = sotoinpcb(so); struct ifnet *ifp; struct toedev *tdev; - int err; + struct rtentry *rt; + int error; - if (inp->inp_route.ro_rt == NULL) { - inp->inp_route.ro_rt = rtalloc2(nam, 1, 0); - if (inp->inp_route.ro_rt) - memcpy(&inp->inp_route.ro_dst, nam, sizeof(struct sockaddr)); - } + rt = rtalloc2(nam, 1, 0); + if (rt == NULL) + return (EHOSTUNREACH); - if (inp->inp_route.ro_rt == NULL) { - printf("no route found for offload\n"); - - return (EHOSTUNREACH); - } - - ifp = inp->inp_route.ro_rt->rt_ifp; + ifp = rt->rt_ifp; tdev = TOEDEV(ifp); - if (tdev == NULL) + if (tdev == NULL) return (EINVAL); - - if (tdev->can_offload(tdev, so) == 0) { - printf("can't offload\n"); - + + if (tdev->tod_can_offload(tdev, so) == 0) return (EINVAL); - } - - if ((err = tdev->connect(tdev, so, ifp))) - return (err); - - printf("connected!!!\n"); - + + if ((error = tdev->tod_connect(tdev, so, rt, nam))) + return (error); + return (0); } int ofld_send(struct tcpcb *tp) { - return tp->t_tu->tu_send(tp); + + return (tp->t_tu->tu_send(tp)); } int ofld_rcvd(struct tcpcb *tp) { - return tp->t_tu->tu_rcvd(tp); + return (tp->t_tu->tu_rcvd(tp)); } int ofld_disconnect(struct tcpcb *tp) { - return tp->t_tu->tu_disconnect(tp); + + return (tp->t_tu->tu_disconnect(tp)); } int ofld_abort(struct tcpcb *tp) { - return tp->t_tu->tu_abort(tp); + + return (tp->t_tu->tu_abort(tp)); } void ofld_detach(struct tcpcb *tp) -{ +{ + tp->t_tu->tu_detach(tp); } void ofld_listen_open(struct tcpcb *tp) { + EVENTHANDLER_INVOKE(ofld_listen, OFLD_LISTEN_OPEN, tp); } void ofld_listen_close(struct tcpcb *tp) { + EVENTHANDLER_INVOKE(ofld_listen, OFLD_LISTEN_CLOSE, tp); } - - ==== //depot/projects/toestack/sys/netinet/tcp_ofld.h#10 (text+ko) ==== @@ -1,35 +1,65 @@ +/*- + * Copyright (c) 2007, Chelsio Inc. + * 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. Neither the name of the Chelsio Corporation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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/sys/netinet/tcp_ofld.h,v 1.3 2007/12/13 01:24:20 kmacy Exp $ + */ + #ifndef _NETINET_TCP_OFLD_H_ -#define _NETINET_TCP_OFLD_H_ +#define _NETINET_TCP_OFLD_H_ +#ifndef _KERNEL +#error "no user-serviceable parts inside" +#endif -#define tp_offload(tp) ((tp)->t_flags & TF_TOE) -#define SO_OFFLOADABLE(so) ((so->so_options & SO_NO_OFFLOAD) == 0) +#define SC_ENTRY_PRESENT 1 +#define SC_DROP 2 -int ofld_connect(struct socket *so, struct sockaddr *nam); -int ofld_can_offload(struct tcpcb *tp, struct sockaddr *nam); +#define tp_offload(tp) ((tp)->t_flags & TF_TOE) +#define SO_OFFLOADABLE(so) ((so->so_options & SO_NO_OFFLOAD) == 0) -int ofld_send(struct tcpcb *tp); -int ofld_rcvd(struct tcpcb *tp); -int ofld_disconnect(struct tcpcb *tp); -int ofld_abort(struct tcpcb *tp); -void ofld_detach(struct tcpcb *tp); +int ofld_connect(struct socket *so, struct sockaddr *nam); +int ofld_can_offload(struct tcpcb *tp, struct sockaddr *nam); -void ofld_listen_open(struct tcpcb *tp); -void ofld_listen_close(struct tcpcb *tp); +int ofld_abort(struct tcpcb *tp); +int ofld_disconnect(struct tcpcb *tp); +int ofld_send(struct tcpcb *tp); +int ofld_rcvd(struct tcpcb *tp); +void ofld_detach(struct tcpcb *tp); +void ofld_listen_close(struct tcpcb *tp); +void ofld_listen_open(struct tcpcb *tp); #ifndef DISABLE_TCP_OFFLOAD static __inline int tcp_gen_connect(struct socket *so, struct sockaddr *nam) { + struct tcpcb *tp = sototcpcb(so); int error; - struct tcpcb *tp = sototcpcb(so); - + if (!SO_OFFLOADABLE(so) || (error = ofld_connect(so, nam)) != 0) error = tcp_output(tp); - else - printf("connection offloaded\n"); - - return (error); } @@ -42,7 +72,6 @@ error = ofld_disconnect(tp); else error = tcp_output(tp); - return (error); } @@ -55,7 +84,6 @@ error = ofld_abort(tp); else error = tcp_output(tp); - return (error); } @@ -68,7 +96,6 @@ error = ofld_send(tp); else error = tcp_output(tp); - return (error); } @@ -81,13 +108,13 @@ error = ofld_rcvd(tp); else error = tcp_output(tp); - return (error); } static __inline void tcp_gen_listen_open(struct tcpcb *tp) { + if (SO_OFFLOADABLE(tp->t_inpcb->inp_socket)) ofld_listen_open(tp); } @@ -101,7 +128,8 @@ static __inline void tcp_gen_detach(struct tcpcb *tp) { - ofld_detach(tp); + if (tp_offload(tp)) + ofld_detach(tp); } #else @@ -109,45 +137,53 @@ static __inline int tcp_gen_connect(struct socket *so, struct sockaddr *nam) { - return tcp_output(tp); + + return (tcp_output(tp)); } static __inline int tcp_gen_disconnect(struct tcpcb *tp) { - return tcp_output(tp); + + return (tcp_output(tp)); } static __inline int tcp_gen_abort(struct tcpcb *tp) { - return tcp_output(tp); + + return (tcp_output(tp)); } static __inline int tcp_gen_send(struct tcpcb *tp) { - return tcp_output(tp); + + return (tcp_output(tp)); } static __inline int tcp_gen_rcvd(struct tcpcb *tp) { - return tcp_output(tp); + + return (tcp_output(tp)); } static __inline void -tcp_gen_listen_open(struct tcpcb *tp) {} +tcp_gen_listen_open(struct tcpcb *tp) +{ +} static __inline void -tcp_gen_listen_close(struct tcpcb *tp) {} +tcp_gen_listen_close(struct tcpcb *tp) +{ +} static __inline void -tcp_gen_detach(struct tcpcb *tp) {} +tcp_gen_detach(struct tcpcb *tp) +{ +} - - - #endif struct toe_usrreqs { @@ -157,12 +193,11 @@ int (*tu_abort)(struct tcpcb *tp); void (*tu_detach)(struct tcpcb *tp); void (*tu_syncache_event)(int event, void *toep); - }; -#define OFLD_LISTEN_OPEN 1 -#define OFLD_LISTEN_CLOSE 2 -typedef void (*ofld_listen_fn)(void *, int, struct tcpcb *); +#define OFLD_LISTEN_OPEN 1 +#define OFLD_LISTEN_CLOSE 2 +typedef void (*ofld_listen_fn)(void *, int, struct tcpcb *); EVENTHANDLER_DECLARE(ofld_listen, ofld_listen_fn); #endif ==== //depot/projects/toestack/sys/netinet/tcp_var.h#11 (text+ko) ==== @@ -207,10 +207,10 @@ int t_rttlow; /* smallest observerved RTT */ u_int32_t rfbuf_ts; /* recv buffer autoscaling timestamp */ int rfbuf_cnt; /* recv buffer autoscaling byte count */ + void *t_pspare[2]; /* toe usrreqs / toepcb * / congestion algo / vimage / 1 general use */ struct toe_usrreqs *t_tu; /* offload operations vector */ void *t_toe; /* TOE pcb pointer */ - char *t_cong_control; /* congestion control algorithm name*/ - void *t_pspare[2]; /* vimage / 1 general use */ + void *t_cong_control; }; #define IN_FASTRECOVERY(tp) (tp->t_flags & TF_FASTRECOVERY) ==== //depot/projects/toestack/sys/netinet/toedev.h#4 (text+ko) ==== @@ -1,46 +1,46 @@ +/*- + * Copyright (c) 2007, Chelsio Inc. + * 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. Neither the name of the Chelsio Corporation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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/sys/netinet/toedev.h,v 1.2 2007/12/12 23:31:49 kmacy Exp $ + */ -/************************************************************************** +#ifndef _NETINET_TOEDEV_H_ +#define _NETINET_TOEDEV_H_ -Copyright (c) 2007, Chelsio Inc. -All rights reserved. +#ifndef _KERNEL +#error "no user-serviceable parts inside" +#endif -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. Neither the name of the Chelsio Corporation nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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/sys/dev/cxgb/ulp/toecore/toedev.h,v 1.1 2007/05/25 16:17:59 kmacy Exp $ - -***************************************************************************/ - -#ifndef _OFFLOAD_DEV_H_ -#define _OFFLOAD_DEV_H_ - - -/* Parameter values for offload_get_phys_egress() */ +/* Parameter values for offload_get_phys_egress(). */ enum { TOE_OPEN, TOE_FAILOVER, }; -/* Parameter values for toe_failover() */ +/* Parameter values for toe_failover(). */ enum { TOE_ACTIVE_SLAVE, TOE_LINK_DOWN, @@ -49,16 +49,14 @@ TOE_RELEASE_ALL, }; -#define TOENAMSIZ 16 +#define TOENAMSIZ 16 -/* belongs in linux/netdevice.h */ -#define NETIF_F_TCPIP_OFFLOAD (1 << 15) +/* Get the toedev associated with a ifnet. */ +#define TOEDEV(ifp) ((ifp)->if_llsoftc) -/* Get the toedev associated with a ifnet */ -#define TOEDEV(ifp) ((ifp)->if_llsoftc) struct offload_id { - unsigned int id; - unsigned long data; + unsigned int id; + unsigned long data; }; struct ifnet; @@ -70,87 +68,73 @@ struct toedev { TAILQ_ENTRY(toedev) entry; - char name[TOENAMSIZ]; /* TOE device name */ - unsigned int ttid; /* TOE type id */ - unsigned long flags; /* device flags */ - unsigned int mtu; /* max size of TX offloaded data */ - unsigned int nconn; /* max # of offloaded connections */ - struct ifnet *lldev; /* LL device associated with TOE messages */ - const struct tom_info *offload_mod; /* attached TCP offload module */ - struct sysctl_oid *sysctl_root; /* root of proc dir for this TOE */ - int (*open)(struct toedev *dev); - int (*close)(struct toedev *dev); - int (*can_offload)(struct toedev *dev, struct socket *so); - int (*connect)(struct toedev *dev, struct socket *so, - struct ifnet *egress_ifp); - int (*send)(struct toedev *dev, struct mbuf *m); - int (*recv)(struct toedev *dev, struct mbuf **m, int n); - int (*ctl)(struct toedev *dev, unsigned int req, void *data); - void (*arp_update)(struct toedev *dev, struct rtentry *neigh); - void (*failover)(struct toedev *dev, struct ifnet *bond_ifp, + char tod_name[TOENAMSIZ]; /* TOE device name */ + unsigned int tod_ttid; /* TOE type id */ + unsigned long tod_flags; /* device flags */ + unsigned int tod_mtu; /* max TX offloaded data */ + unsigned int tod_nconn; /* max # of offloaded + * connections + */ + struct ifnet *tod_lldev; /* first interface */ + const struct tom_info *tod_offload_mod; /* TCP offload module */ + + int (*tod_open)(struct toedev *dev); + int (*tod_close)(struct toedev *dev); + int (*tod_can_offload)(struct toedev *dev, struct socket *so); + int (*tod_connect)(struct toedev *dev, struct socket *so, + struct rtentry *rt, struct sockaddr *nam); + int (*tod_send)(struct toedev *dev, struct mbuf *m); + int (*tod_recv)(struct toedev *dev, struct mbuf **m, int n); + int (*tod_ctl)(struct toedev *dev, unsigned int req, void *data); + void (*tod_arp_update)(struct toedev *dev, struct rtentry *neigh); + void (*tod_failover)(struct toedev *dev, struct ifnet *bond_ifp, struct ifnet *ndev, int event); - void *priv; /* driver private data */ - void *l2opt; /* optional layer 2 data */ - void *l3opt; /* optional layer 3 data */ - void *l4opt; /* optional layer 4 data */ - void *ulp; /* ulp stuff */ + void *tod_priv; /* driver private data */ + void *tod_l2opt; /* optional layer 2 data */ + void *tod_l3opt; /* optional layer 3 data */ + void *tod_l4opt; /* optional layer 4 data */ + void *tod_ulp; /* upper lever protocol */ }; struct tom_info { - TAILQ_ENTRY(tom_info) entry; - int (*attach)(struct toedev *dev, const struct offload_id *entry); - int (*detach)(struct toedev *dev); - const char *name; - const struct offload_id *id_table; + TAILQ_ENTRY(tom_info) entry; + int (*ti_attach)(struct toedev *dev, + const struct offload_id *entry); + int (*ti_detach)(struct toedev *dev); + const char *ti_name; + const struct offload_id *ti_id_table; }; -static inline void init_offload_dev(struct toedev *dev) +static __inline void +init_offload_dev(struct toedev *dev) { +} + +int register_tom(struct tom_info *t); +int unregister_tom(struct tom_info *t); +int register_toedev(struct toedev *dev, const char *name); +int unregister_toedev(struct toedev *dev); +int activate_offload(struct toedev *dev); +int toe_send(struct toedev *dev, struct mbuf *m); +void toe_arp_update(struct rtentry *rt); +struct ifnet *offload_get_phys_egress(struct ifnet *ifp, + struct socket *so, int context); +int toe_receive_mbuf(struct toedev *dev, struct mbuf **m, int n); +static __inline void +toe_neigh_update(struct ifnet *ifp) +{ } -extern int register_tom(struct tom_info *t); -extern int unregister_tom(struct tom_info *t); -extern int register_toedev(struct toedev *dev, const char *name); -extern int unregister_toedev(struct toedev *dev); -extern int activate_offload(struct toedev *dev); -extern int toe_send(struct toedev *dev, struct mbuf *m); -extern void toe_arp_update(struct rtentry *rt); -extern struct ifnet *offload_get_phys_egress(struct ifnet *dev, - struct socket *so, - int context); -extern int toe_receive_mbuf(struct toedev *dev, struct mbuf **m, int n); - -#if defined(CONFIG_TCP_OFFLOAD_MODULE) -static inline int toe_receive_mbuf(struct toedev *dev, struct mbuf **m, - int n) +static __inline void +toe_failover(struct ifnet *bond_ifp, struct ifnet *fail_ifp, int event) { - return dev->recv(dev, m, n); } -extern int prepare_tcp_for_offload(void); -extern void restore_tcp_to_nonoffload(void); -#elif defined(CONFIG_TCP_OFFLOAD) -extern int toe_receive_mbuf(struct toedev *dev, struct mbuf **m, int n); -#endif - -#if defined(CONFIG_TCP_OFFLOAD) || \ - (defined(CONFIG_TCP_OFFLOAD_MODULE) && defined(MODULE)) -extern void toe_neigh_update(struct rtentry *neigh); -extern void toe_failover(struct ifnet *bond_ifp, - struct ifnet *fail_ifp, int event); -extern int toe_enslave(struct ifnet *bond_ifp, - struct ifnet *slave_ifp); -#else -static inline void toe_neigh_update(struct ifnet *neigh) {} -static inline void toe_failover(struct ifnet *bond_ifp, - struct ifnet *fail_ifp, int event) -{} -static inline int toe_enslave(struct ifnet *bond_ifp, - struct ifnet *slave_ifp) +static __inline int +toe_enslave(struct ifnet *bond_ifp, struct ifnet *slave_ifp) { - return 0; + return (0); } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Dec 13 19:18:38 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 01C0316A46E; Thu, 13 Dec 2007 19:18:38 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A185D16A417 for ; Thu, 13 Dec 2007 19:18:37 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7DC5F13C461 for ; Thu, 13 Dec 2007 19:18:37 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBDJIbtD062979 for ; Thu, 13 Dec 2007 19:18:37 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBDJIboe062976 for perforce@freebsd.org; Thu, 13 Dec 2007 19:18:37 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 13 Dec 2007 19:18:37 GMT Message-Id: <200712131918.lBDJIboe062976@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 130807 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Dec 2007 19:18:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=130807 Change 130807 by hselasky@hselasky_laptop001 on 2007/12/13 19:17:39 Only clear the PORT_ENABLE feature on the HUB if the port is enabled. Else it has been observed that some HUBs will generate another port connection change and we start going into an infinite loop. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uhub.c#26 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uhub.c#26 (text+ko) ==== @@ -420,8 +420,10 @@ child = NULL; } if (err == 0) { + if (sc->sc_st.port_status & UPS_PORT_ENABLED) { err = usbreq_clear_port_feature (sc->sc_udev, &usb_global_lock, portno, UHF_PORT_ENABLE); + } } if (err) { DPRINTF(sc, -1, "device problem (%s), " From owner-p4-projects@FreeBSD.ORG Thu Dec 13 19:19:39 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 123D116A41B; Thu, 13 Dec 2007 19:19:39 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CC4DC16A417 for ; Thu, 13 Dec 2007 19:19:38 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 909A613C45D for ; Thu, 13 Dec 2007 19:19:38 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBDJJc67063001 for ; Thu, 13 Dec 2007 19:19:38 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBDJJcTD062998 for perforce@freebsd.org; Thu, 13 Dec 2007 19:19:38 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 13 Dec 2007 19:19:38 GMT Message-Id: <200712131919.lBDJJcTD062998@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 130808 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Dec 2007 19:19:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=130808 Change 130808 by hselasky@hselasky_laptop001 on 2007/12/13 19:18:54 Style change. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uhub.c#27 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uhub.c#27 (text+ko) ==== @@ -421,8 +421,9 @@ } if (err == 0) { if (sc->sc_st.port_status & UPS_PORT_ENABLED) { - err = usbreq_clear_port_feature - (sc->sc_udev, &usb_global_lock, portno, UHF_PORT_ENABLE); + err = usbreq_clear_port_feature + (sc->sc_udev, &usb_global_lock, + portno, UHF_PORT_ENABLE); } } if (err) { From owner-p4-projects@FreeBSD.ORG Thu Dec 13 19:48:12 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D66016A469; Thu, 13 Dec 2007 19:48:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 897ED16A418 for ; Thu, 13 Dec 2007 19:48:11 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6633C13C468 for ; Thu, 13 Dec 2007 19:48:11 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBDJmBnX067393 for ; Thu, 13 Dec 2007 19:48:11 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBDJkxbH067366 for perforce@freebsd.org; Thu, 13 Dec 2007 19:46:59 GMT (envelope-from marcel@freebsd.org) Date: Thu, 13 Dec 2007 19:46:59 GMT Message-Id: <200712131946.lBDJkxbH067366@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 130810 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Dec 2007 19:48:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=130810 Change 130810 by marcel@marcel_cluster on 2007/12/13 19:46:58 IFC @130805 Affected files ... .. //depot/projects/e500/Makefile#4 integrate .. //depot/projects/e500/Makefile.inc1#6 integrate .. //depot/projects/e500/ObsoleteFiles.inc#6 integrate .. //depot/projects/e500/UPDATING#6 integrate .. //depot/projects/e500/bin/ed/Makefile#3 integrate .. //depot/projects/e500/bin/ln/ln.1#2 integrate .. //depot/projects/e500/bin/ln/ln.c#2 integrate .. //depot/projects/e500/bin/mv/mv.1#3 integrate .. //depot/projects/e500/bin/ps/extern.h#2 integrate .. //depot/projects/e500/bin/ps/keyword.c#2 integrate .. //depot/projects/e500/bin/ps/print.c#3 integrate .. //depot/projects/e500/bin/ps/ps.c#3 integrate .. //depot/projects/e500/bin/sh/Makefile#2 integrate .. //depot/projects/e500/bin/sh/sh.1#3 integrate .. //depot/projects/e500/cddl/Makefile.inc#2 integrate .. //depot/projects/e500/cddl/lib/libnvpair/Makefile#2 integrate .. //depot/projects/e500/compat/opensolaris/include/alloca.h#1 branch .. //depot/projects/e500/compat/opensolaris/include/fcntl.h#1 branch .. //depot/projects/e500/compat/opensolaris/include/stdio.h#1 branch .. //depot/projects/e500/compat/opensolaris/include/stdlib.h#1 branch .. //depot/projects/e500/compat/opensolaris/include/strings.h#1 branch .. //depot/projects/e500/compat/opensolaris/include/unistd.h#1 branch .. //depot/projects/e500/contrib/amd/AUTHORS#2 integrate .. //depot/projects/e500/contrib/amd/BUGS#2 integrate .. //depot/projects/e500/contrib/amd/COPYING#2 integrate .. //depot/projects/e500/contrib/amd/ChangeLog#2 integrate .. //depot/projects/e500/contrib/amd/FAQ#1 branch .. //depot/projects/e500/contrib/amd/FREEBSD-Xlist#2 integrate .. //depot/projects/e500/contrib/amd/FREEBSD-upgrade#2 integrate .. //depot/projects/e500/contrib/amd/INSTALL#2 integrate .. //depot/projects/e500/contrib/amd/NEWS#2 integrate .. //depot/projects/e500/contrib/amd/README.attrcache#1 branch .. //depot/projects/e500/contrib/amd/README.ldap#2 integrate .. //depot/projects/e500/contrib/amd/amd/am_ops.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/amd.8#2 integrate .. //depot/projects/e500/contrib/amd/amd/amd.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/amd.h#2 integrate .. //depot/projects/e500/contrib/amd/amd/amfs_auto.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/amfs_direct.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/amfs_error.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/amfs_generic.c#1 branch .. //depot/projects/e500/contrib/amd/amd/amfs_host.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/amfs_inherit.c#2 delete .. //depot/projects/e500/contrib/amd/amd/amfs_link.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/amfs_linkx.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/amfs_nfsl.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/amfs_nfsx.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/amfs_program.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/amfs_root.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/amfs_toplvl.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/amfs_union.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/amq_subr.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/amq_svc.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/autil.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/clock.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/conf.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/conf_parse.y#2 integrate .. //depot/projects/e500/contrib/amd/amd/conf_tok.l#2 integrate .. //depot/projects/e500/contrib/amd/amd/get_args.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/info_exec.c#1 branch .. //depot/projects/e500/contrib/amd/amd/info_file.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/info_hesiod.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/info_ldap.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/info_ndbm.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/info_nis.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/info_nisplus.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/info_passwd.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/info_union.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/map.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/mapc.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/mntfs.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/nfs_prot_svc.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/nfs_start.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/nfs_subr.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/ops_TEMPLATE.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/ops_cachefs.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/ops_cdfs.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/ops_efs.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/ops_lofs.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/ops_mfs.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/ops_nfs.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/ops_nfs3.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/ops_nullfs.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/ops_pcfs.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/ops_tfs.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/ops_tmpfs.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/ops_ufs.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/ops_umapfs.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/ops_unionfs.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/ops_xfs.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/opts.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/readdir.c#1 branch .. //depot/projects/e500/contrib/amd/amd/restart.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/rpc_fwd.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/sched.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/srvr_amfs_auto.c#2 integrate .. //depot/projects/e500/contrib/amd/amd/srvr_nfs.c#2 integrate .. //depot/projects/e500/contrib/amd/amq/amq.8#3 integrate .. //depot/projects/e500/contrib/amd/amq/amq.c#2 integrate .. //depot/projects/e500/contrib/amd/amq/amq.h#2 integrate .. //depot/projects/e500/contrib/amd/amq/amq_clnt.c#2 integrate .. //depot/projects/e500/contrib/amd/amq/amq_xdr.c#2 integrate .. //depot/projects/e500/contrib/amd/amq/pawd.1#2 integrate .. //depot/projects/e500/contrib/amd/amq/pawd.c#2 integrate .. //depot/projects/e500/contrib/amd/aux_conf.h.in#2 integrate .. //depot/projects/e500/contrib/amd/bootstrap#2 integrate .. //depot/projects/e500/contrib/amd/conf/checkmount/checkmount_bsd44.c#2 integrate .. //depot/projects/e500/contrib/amd/conf/mtab/mtab_bsd.c#2 integrate .. //depot/projects/e500/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#2 integrate .. //depot/projects/e500/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#2 integrate .. //depot/projects/e500/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#2 integrate .. //depot/projects/e500/contrib/amd/conf/transp/transp_sockets.c#2 integrate .. //depot/projects/e500/contrib/amd/conf/trap/trap_default.h#2 integrate .. //depot/projects/e500/contrib/amd/conf/umount/umount_bsd44.c#2 integrate .. //depot/projects/e500/contrib/amd/doc/am-utils.texi#2 integrate .. //depot/projects/e500/contrib/amd/doc/stamp-vti#1 branch .. //depot/projects/e500/contrib/amd/doc/texinfo.tex#2 integrate .. //depot/projects/e500/contrib/amd/doc/version.texi#2 integrate .. //depot/projects/e500/contrib/amd/fixmount/fixmount.8#2 integrate .. //depot/projects/e500/contrib/amd/fixmount/fixmount.c#2 integrate .. //depot/projects/e500/contrib/amd/fsinfo/fsi_analyze.c#2 integrate .. //depot/projects/e500/contrib/amd/fsinfo/fsi_data.h#2 integrate .. //depot/projects/e500/contrib/amd/fsinfo/fsi_dict.c#2 integrate .. //depot/projects/e500/contrib/amd/fsinfo/fsi_gram.y#2 integrate .. //depot/projects/e500/contrib/amd/fsinfo/fsi_lex.l#2 integrate .. //depot/projects/e500/contrib/amd/fsinfo/fsi_util.c#2 integrate .. //depot/projects/e500/contrib/amd/fsinfo/fsinfo.8#2 integrate .. //depot/projects/e500/contrib/amd/fsinfo/fsinfo.c#2 integrate .. //depot/projects/e500/contrib/amd/fsinfo/fsinfo.h#2 integrate .. //depot/projects/e500/contrib/amd/fsinfo/wr_atab.c#2 integrate .. //depot/projects/e500/contrib/amd/fsinfo/wr_bparam.c#2 integrate .. //depot/projects/e500/contrib/amd/fsinfo/wr_dumpset.c#2 integrate .. //depot/projects/e500/contrib/amd/fsinfo/wr_exportfs.c#2 integrate .. //depot/projects/e500/contrib/amd/fsinfo/wr_fstab.c#2 integrate .. //depot/projects/e500/contrib/amd/hlfsd/hlfsd.8#2 integrate .. //depot/projects/e500/contrib/amd/hlfsd/hlfsd.c#2 integrate .. //depot/projects/e500/contrib/amd/hlfsd/hlfsd.h#2 integrate .. //depot/projects/e500/contrib/amd/hlfsd/homedir.c#2 integrate .. //depot/projects/e500/contrib/amd/hlfsd/nfs_prot_svc.c#2 integrate .. //depot/projects/e500/contrib/amd/hlfsd/stubs.c#2 integrate .. //depot/projects/e500/contrib/amd/include/am_compat.h#2 integrate .. //depot/projects/e500/contrib/amd/include/am_defs.h#2 integrate .. //depot/projects/e500/contrib/amd/include/am_utils.h#2 integrate .. //depot/projects/e500/contrib/amd/include/am_xdr_func.h#2 integrate .. //depot/projects/e500/contrib/amd/include/amq_defs.h#2 integrate .. //depot/projects/e500/contrib/amd/include/mount_headers1.h#2 integrate .. //depot/projects/e500/contrib/amd/include/mount_headers2.h#2 integrate .. //depot/projects/e500/contrib/amd/ldap-id.ms#2 integrate .. //depot/projects/e500/contrib/amd/ldap.schema#1 branch .. //depot/projects/e500/contrib/amd/libamu/alloca.c#2 delete .. //depot/projects/e500/contrib/amd/libamu/amu.h#2 integrate .. //depot/projects/e500/contrib/amd/libamu/hasmntopt.c#2 integrate .. //depot/projects/e500/contrib/amd/libamu/misc_rpc.c#2 integrate .. //depot/projects/e500/contrib/amd/libamu/mount_fs.c#2 integrate .. //depot/projects/e500/contrib/amd/libamu/mtab.c#2 integrate .. //depot/projects/e500/contrib/amd/libamu/nfs_prot_xdr.c#2 integrate .. //depot/projects/e500/contrib/amd/libamu/strerror.c#2 integrate .. //depot/projects/e500/contrib/amd/libamu/strutil.c#1 branch .. //depot/projects/e500/contrib/amd/libamu/util.c#2 delete .. //depot/projects/e500/contrib/amd/libamu/wire.c#2 integrate .. //depot/projects/e500/contrib/amd/libamu/xdr_func.c#2 integrate .. //depot/projects/e500/contrib/amd/libamu/xutil.c#2 integrate .. //depot/projects/e500/contrib/amd/m4/GNUmakefile#2 delete .. //depot/projects/e500/contrib/amd/m4/amdgrep#2 delete .. //depot/projects/e500/contrib/amd/m4/amindent#2 delete .. //depot/projects/e500/contrib/amd/m4/autopat#2 delete .. //depot/projects/e500/contrib/amd/m4/chop-aclocal.pl#2 delete .. //depot/projects/e500/contrib/amd/m4/copy-if-newbig#2 delete .. //depot/projects/e500/contrib/amd/m4/macros/HEADER#2 delete .. //depot/projects/e500/contrib/amd/m4/macros/TRAILER#2 delete .. //depot/projects/e500/contrib/amd/m4/mk-aclocal#2 delete .. //depot/projects/e500/contrib/amd/m4/mkconf#2 delete .. //depot/projects/e500/contrib/amd/m4/rmtspc#2 delete .. //depot/projects/e500/contrib/amd/m4/update_build_version#2 delete .. //depot/projects/e500/contrib/amd/mk-amd-map/mk-amd-map.8#2 integrate .. //depot/projects/e500/contrib/amd/mk-amd-map/mk-amd-map.c#2 integrate .. //depot/projects/e500/contrib/amd/scripts/am-eject.in#2 integrate .. //depot/projects/e500/contrib/amd/scripts/amd.conf-sample#2 integrate .. //depot/projects/e500/contrib/amd/scripts/amd.conf.5#2 integrate .. //depot/projects/e500/contrib/amd/scripts/amd2ldif.in#2 integrate .. //depot/projects/e500/contrib/amd/scripts/amd2sun.in#2 integrate .. //depot/projects/e500/contrib/amd/scripts/automount2amd.8#2 integrate .. //depot/projects/e500/contrib/amd/scripts/automount2amd.in#2 integrate .. //depot/projects/e500/contrib/amd/scripts/ctl-amd.in#2 integrate .. //depot/projects/e500/contrib/amd/scripts/ctl-hlfsd.in#2 integrate .. //depot/projects/e500/contrib/amd/scripts/expn.1#2 integrate .. //depot/projects/e500/contrib/amd/scripts/expn.in#2 integrate .. //depot/projects/e500/contrib/amd/scripts/fix-amd-map.in#2 integrate .. //depot/projects/e500/contrib/amd/scripts/fixrmtab.in#2 integrate .. //depot/projects/e500/contrib/amd/scripts/redhat-ctl-amd.in#2 integrate .. //depot/projects/e500/contrib/amd/scripts/test-attrcache.in#1 branch .. //depot/projects/e500/contrib/amd/scripts/wait4amd.in#2 integrate .. //depot/projects/e500/contrib/amd/scripts/wait4amd2die.in#2 integrate .. //depot/projects/e500/contrib/amd/tasks#2 integrate .. //depot/projects/e500/contrib/amd/vers.m4#1 branch .. //depot/projects/e500/contrib/amd/wire-test/wire-test.8#2 integrate .. //depot/projects/e500/contrib/amd/wire-test/wire-test.c#2 integrate .. //depot/projects/e500/contrib/bind9/CHANGES#4 integrate .. //depot/projects/e500/contrib/bind9/COPYRIGHT#3 integrate .. //depot/projects/e500/contrib/bind9/FAQ#3 integrate .. //depot/projects/e500/contrib/bind9/FAQ.xml#3 integrate .. //depot/projects/e500/contrib/bind9/Makefile.in#3 integrate .. //depot/projects/e500/contrib/bind9/README#4 integrate .. //depot/projects/e500/contrib/bind9/bin/check/check-tool.c#3 integrate .. //depot/projects/e500/contrib/bind9/bin/check/named-checkconf.8#3 integrate .. //depot/projects/e500/contrib/bind9/bin/check/named-checkconf.docbook#3 integrate .. //depot/projects/e500/contrib/bind9/bin/check/named-checkconf.html#3 integrate .. //depot/projects/e500/contrib/bind9/bin/check/named-checkzone.8#3 integrate .. //depot/projects/e500/contrib/bind9/bin/check/named-checkzone.c#3 integrate .. //depot/projects/e500/contrib/bind9/bin/check/named-checkzone.docbook#3 integrate .. //depot/projects/e500/contrib/bind9/bin/check/named-checkzone.html#3 integrate .. //depot/projects/e500/contrib/bind9/bin/dig/dig.1#3 integrate .. //depot/projects/e500/contrib/bind9/bin/dig/dig.c#3 integrate .. //depot/projects/e500/contrib/bind9/bin/dig/dig.docbook#3 integrate .. //depot/projects/e500/contrib/bind9/bin/dig/dig.html#3 integrate .. //depot/projects/e500/contrib/bind9/bin/dig/dighost.c#3 integrate .. //depot/projects/e500/contrib/bind9/bin/dig/host.1#3 integrate .. //depot/projects/e500/contrib/bind9/bin/dig/host.c#3 integrate .. //depot/projects/e500/contrib/bind9/bin/dig/host.docbook#3 integrate .. //depot/projects/e500/contrib/bind9/bin/dig/host.html#3 integrate .. //depot/projects/e500/contrib/bind9/bin/dig/include/dig/dig.h#3 integrate .. //depot/projects/e500/contrib/bind9/bin/dig/nslookup.1#3 integrate .. //depot/projects/e500/contrib/bind9/bin/dig/nslookup.c#3 integrate .. //depot/projects/e500/contrib/bind9/bin/dig/nslookup.docbook#3 integrate .. //depot/projects/e500/contrib/bind9/bin/dig/nslookup.html#3 integrate .. //depot/projects/e500/contrib/bind9/bin/dnssec/dnssec-keygen.8#3 integrate .. //depot/projects/e500/contrib/bind9/bin/dnssec/dnssec-keygen.c#3 integrate .. //depot/projects/e500/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#3 integrate .. //depot/projects/e500/contrib/bind9/bin/dnssec/dnssec-keygen.html#3 integrate .. //depot/projects/e500/contrib/bind9/bin/dnssec/dnssec-signzone.8#3 integrate .. //depot/projects/e500/contrib/bind9/bin/dnssec/dnssec-signzone.c#3 integrate .. //depot/projects/e500/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#3 integrate .. //depot/projects/e500/contrib/bind9/bin/dnssec/dnssec-signzone.html#3 integrate .. //depot/projects/e500/contrib/bind9/bin/named/client.c#4 integrate .. //depot/projects/e500/contrib/bind9/bin/named/config.c#3 integrate .. //depot/projects/e500/contrib/bind9/bin/named/control.c#3 integrate .. //depot/projects/e500/contrib/bind9/bin/named/lwresd.8#3 integrate .. //depot/projects/e500/contrib/bind9/bin/named/lwresd.docbook#3 integrate .. //depot/projects/e500/contrib/bind9/bin/named/lwresd.html#3 integrate .. //depot/projects/e500/contrib/bind9/bin/named/named.8#3 integrate .. //depot/projects/e500/contrib/bind9/bin/named/named.conf.5#3 integrate .. //depot/projects/e500/contrib/bind9/bin/named/named.conf.docbook#3 integrate .. //depot/projects/e500/contrib/bind9/bin/named/named.conf.html#3 integrate .. //depot/projects/e500/contrib/bind9/bin/named/named.docbook#3 integrate .. //depot/projects/e500/contrib/bind9/bin/named/named.html#3 integrate .. //depot/projects/e500/contrib/bind9/bin/named/query.c#3 integrate .. //depot/projects/e500/contrib/bind9/bin/named/server.c#4 integrate .. //depot/projects/e500/contrib/bind9/bin/named/update.c#3 integrate .. //depot/projects/e500/contrib/bind9/bin/nsupdate/nsupdate.8#3 integrate .. //depot/projects/e500/contrib/bind9/bin/nsupdate/nsupdate.c#3 integrate .. //depot/projects/e500/contrib/bind9/bin/nsupdate/nsupdate.docbook#3 integrate .. //depot/projects/e500/contrib/bind9/bin/nsupdate/nsupdate.html#3 integrate .. //depot/projects/e500/contrib/bind9/bin/rndc/Makefile.in#3 integrate .. //depot/projects/e500/contrib/bind9/bin/rndc/rndc-confgen.docbook#3 integrate .. //depot/projects/e500/contrib/bind9/bin/rndc/rndc.8#3 integrate .. //depot/projects/e500/contrib/bind9/bin/rndc/rndc.conf.5#3 integrate .. //depot/projects/e500/contrib/bind9/bin/rndc/rndc.conf.docbook#3 integrate .. //depot/projects/e500/contrib/bind9/bin/rndc/rndc.conf.html#3 integrate .. //depot/projects/e500/contrib/bind9/bin/rndc/rndc.docbook#3 integrate .. //depot/projects/e500/contrib/bind9/bin/rndc/rndc.html#3 integrate .. //depot/projects/e500/contrib/bind9/configure.in#3 integrate .. //depot/projects/e500/contrib/bind9/doc/arm/Bv9ARM-book.xml#4 integrate .. //depot/projects/e500/contrib/bind9/doc/arm/Bv9ARM.ch01.html#4 integrate .. //depot/projects/e500/contrib/bind9/doc/arm/Bv9ARM.ch02.html#4 integrate .. //depot/projects/e500/contrib/bind9/doc/arm/Bv9ARM.ch03.html#4 integrate .. //depot/projects/e500/contrib/bind9/doc/arm/Bv9ARM.ch04.html#4 integrate .. //depot/projects/e500/contrib/bind9/doc/arm/Bv9ARM.ch05.html#4 integrate .. //depot/projects/e500/contrib/bind9/doc/arm/Bv9ARM.ch06.html#4 integrate .. //depot/projects/e500/contrib/bind9/doc/arm/Bv9ARM.ch07.html#4 integrate .. //depot/projects/e500/contrib/bind9/doc/arm/Bv9ARM.ch08.html#4 integrate .. //depot/projects/e500/contrib/bind9/doc/arm/Bv9ARM.ch09.html#4 integrate .. //depot/projects/e500/contrib/bind9/doc/arm/Bv9ARM.ch10.html#3 integrate .. //depot/projects/e500/contrib/bind9/doc/arm/Bv9ARM.html#4 integrate .. //depot/projects/e500/contrib/bind9/doc/arm/Bv9ARM.pdf#4 integrate .. //depot/projects/e500/contrib/bind9/doc/arm/Makefile.in#3 integrate .. //depot/projects/e500/contrib/bind9/doc/arm/man.dig.html#3 integrate .. //depot/projects/e500/contrib/bind9/doc/arm/man.dnssec-keygen.html#3 integrate .. //depot/projects/e500/contrib/bind9/doc/arm/man.dnssec-signzone.html#3 integrate .. //depot/projects/e500/contrib/bind9/doc/arm/man.host.html#3 integrate .. //depot/projects/e500/contrib/bind9/doc/arm/man.named-checkconf.html#3 integrate .. //depot/projects/e500/contrib/bind9/doc/arm/man.named-checkzone.html#3 integrate .. //depot/projects/e500/contrib/bind9/doc/arm/man.named.html#3 integrate .. //depot/projects/e500/contrib/bind9/doc/arm/man.rndc-confgen.html#3 integrate .. //depot/projects/e500/contrib/bind9/doc/arm/man.rndc.conf.html#3 integrate .. //depot/projects/e500/contrib/bind9/doc/arm/man.rndc.html#3 integrate .. //depot/projects/e500/contrib/bind9/doc/draft/draft-schlitt-spf-classic-02.txt#2 delete .. //depot/projects/e500/contrib/bind9/doc/misc/Makefile.in#3 integrate .. //depot/projects/e500/contrib/bind9/doc/misc/migration#3 integrate .. //depot/projects/e500/contrib/bind9/doc/rfc/index#3 integrate .. //depot/projects/e500/contrib/bind9/doc/rfc/rfc4398.txt#1 branch .. //depot/projects/e500/contrib/bind9/doc/rfc/rfc4408.txt#1 branch .. //depot/projects/e500/contrib/bind9/doc/rfc/rfc4470.txt#1 branch .. //depot/projects/e500/contrib/bind9/doc/rfc/rfc4634.txt#1 branch .. //depot/projects/e500/contrib/bind9/doc/rfc/rfc4641.txt#1 branch .. //depot/projects/e500/contrib/bind9/lib/bind/api#3 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/config.h.in#2 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/configure#3 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/configure.in#3 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/dst/dst_api.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/dst/hmac_link.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/gai_strerror.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/irs/irs_data.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/isc/ctl_clnt.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/make/rules.in#3 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/nameser/ns_parse.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/port_before.h.in#3 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/resolv/res_data.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/resolv/res_init.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/bind9/api#3 integrate .. //depot/projects/e500/contrib/bind9/lib/bind9/check.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/adb.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/api#3 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/dispatch.c#4 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/dnssec.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/db.h#3 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/dispatch.h#4 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/validator.h#3 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/journal.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/lookup.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/master.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/message.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/openssl_link.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/openssldh_link.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/openssldsa_link.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rbtdb.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdata/generic/ds_43.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rdataslab.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/resolver.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/rootns.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/sdb.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/sdlz.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/tsig.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/validator.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/view.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/xfrin.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/zone.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/Makefile.in#3 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/alpha/Makefile.in#1 branch .. //depot/projects/e500/contrib/bind9/lib/isc/alpha/include/Makefile.in#1 branch .. //depot/projects/e500/contrib/bind9/lib/isc/alpha/include/isc/Makefile.in#1 branch .. //depot/projects/e500/contrib/bind9/lib/isc/api#3 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/arm/include/isc/atomic.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/hmacsha.c#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/ia64/Makefile.in#1 branch .. //depot/projects/e500/contrib/bind9/lib/isc/ia64/include/Makefile.in#1 branch .. //depot/projects/e500/contrib/bind9/lib/isc/ia64/include/isc/Makefile.in#1 branch .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/platform.h.in#3 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/string.h#3 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/mem.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/mips/Makefile.in#1 branch .. //depot/projects/e500/contrib/bind9/lib/isc/mips/include/Makefile.in#1 branch .. //depot/projects/e500/contrib/bind9/lib/isc/mips/include/isc/Makefile.in#1 branch .. //depot/projects/e500/contrib/bind9/lib/isc/noatomic/Makefile.in#1 branch .. //depot/projects/e500/contrib/bind9/lib/isc/noatomic/include/Makefile.in#1 branch .. //depot/projects/e500/contrib/bind9/lib/isc/noatomic/include/isc/Makefile.in#1 branch .. //depot/projects/e500/contrib/bind9/lib/isc/powerpc/Makefile.in#1 branch .. //depot/projects/e500/contrib/bind9/lib/isc/powerpc/include/Makefile.in#1 branch .. //depot/projects/e500/contrib/bind9/lib/isc/powerpc/include/isc/Makefile.in#1 branch .. //depot/projects/e500/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h#2 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/sparc64/Makefile.in#1 branch .. //depot/projects/e500/contrib/bind9/lib/isc/sparc64/include/Makefile.in#1 branch .. //depot/projects/e500/contrib/bind9/lib/isc/sparc64/include/isc/Makefile.in#1 branch .. //depot/projects/e500/contrib/bind9/lib/isc/timer.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/net.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/socket.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/syslog.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/x86_32/Makefile.in#1 branch .. //depot/projects/e500/contrib/bind9/lib/isc/x86_32/include/Makefile.in#1 branch .. //depot/projects/e500/contrib/bind9/lib/isc/x86_32/include/isc/Makefile.in#1 branch .. //depot/projects/e500/contrib/bind9/lib/isc/x86_64/Makefile.in#1 branch .. //depot/projects/e500/contrib/bind9/lib/isc/x86_64/include/Makefile.in#1 branch .. //depot/projects/e500/contrib/bind9/lib/isc/x86_64/include/isc/Makefile.in#1 branch .. //depot/projects/e500/contrib/bind9/lib/isccc/symtab.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/isccfg/api#3 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/api#3 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/context.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/getaddrinfo.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/getipnode.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/lwres_gnba.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres.docbook#3 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#3 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_config.docbook#3 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_context.docbook#3 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#3 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#3 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#3 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#3 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#3 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#3 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#3 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#3 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#3 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#3 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_noop.docbook#3 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_packet.docbook#3 integrate .. //depot/projects/e500/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#3 integrate .. //depot/projects/e500/contrib/bind9/make/rules.in#3 integrate .. //depot/projects/e500/contrib/bind9/version#4 integrate .. //depot/projects/e500/contrib/binutils/opcodes/ppc-dis.c#2 integrate .. //depot/projects/e500/contrib/csup/mux.c#2 integrate .. //depot/projects/e500/contrib/gcc/config/sparc/freebsd.h#3 integrate .. //depot/projects/e500/contrib/gcc/fold-const.c#4 integrate .. //depot/projects/e500/contrib/gdb/gdb/i386fbsd-nat.c#2 integrate .. //depot/projects/e500/contrib/less/FREEBSD-upgrade#1 branch .. //depot/projects/e500/contrib/less/LICENSE#2 integrate .. //depot/projects/e500/contrib/less/Makefile.dsm#2 delete .. //depot/projects/e500/contrib/less/NEWS#5 integrate .. //depot/projects/e500/contrib/less/README#5 integrate .. //depot/projects/e500/contrib/less/ch.c#4 integrate .. //depot/projects/e500/contrib/less/command.c#4 integrate .. //depot/projects/e500/contrib/less/configure#4 integrate .. //depot/projects/e500/contrib/less/configure.ac#4 integrate .. //depot/projects/e500/contrib/less/decode.c#3 integrate .. //depot/projects/e500/contrib/less/defines.ds#3 integrate .. //depot/projects/e500/contrib/less/defines.h.in#3 integrate .. //depot/projects/e500/contrib/less/defines.o2#3 integrate .. //depot/projects/e500/contrib/less/defines.o9#3 integrate .. //depot/projects/e500/contrib/less/defines.wn#3 integrate .. //depot/projects/e500/contrib/less/edit.c#3 integrate .. //depot/projects/e500/contrib/less/filename.c#4 integrate .. //depot/projects/e500/contrib/less/funcs.h#4 integrate .. //depot/projects/e500/contrib/less/less.h#4 integrate .. //depot/projects/e500/contrib/less/less.man#5 integrate .. //depot/projects/e500/contrib/less/less.nro#5 integrate .. //depot/projects/e500/contrib/less/lessecho.man#5 integrate .. //depot/projects/e500/contrib/less/lessecho.nro#5 integrate .. //depot/projects/e500/contrib/less/lesskey.man#5 integrate .. //depot/projects/e500/contrib/less/lesskey.nro#5 integrate .. //depot/projects/e500/contrib/less/line.c#4 integrate .. //depot/projects/e500/contrib/less/optfunc.c#4 integrate .. //depot/projects/e500/contrib/less/opttbl.c#3 integrate .. //depot/projects/e500/contrib/less/screen.c#4 integrate .. //depot/projects/e500/contrib/less/search.c#5 integrate .. //depot/projects/e500/contrib/less/tags.c#3 integrate .. //depot/projects/e500/contrib/less/version.c#5 integrate .. //depot/projects/e500/contrib/libreadline/FREEBSD-upgrade#2 integrate .. //depot/projects/e500/contrib/libreadline/complete.c#2 integrate .. //depot/projects/e500/contrib/libreadline/display.c#2 integrate .. //depot/projects/e500/contrib/libreadline/input.c#2 integrate .. //depot/projects/e500/contrib/libreadline/isearch.c#2 integrate .. //depot/projects/e500/contrib/libreadline/misc.c#2 integrate .. //depot/projects/e500/contrib/libreadline/readline.c#2 integrate .. //depot/projects/e500/contrib/libreadline/text.c#2 integrate .. //depot/projects/e500/contrib/libreadline/vi_mode.c#2 integrate .. //depot/projects/e500/contrib/one-true-awk/FIXES#3 integrate .. //depot/projects/e500/contrib/one-true-awk/FREEBSD-upgrade#3 integrate .. //depot/projects/e500/contrib/one-true-awk/lib.c#3 integrate .. //depot/projects/e500/contrib/one-true-awk/tran.c#2 integrate .. //depot/projects/e500/contrib/openbsm/HISTORY#3 integrate .. //depot/projects/e500/contrib/openbsm/Makefile.in#2 integrate .. //depot/projects/e500/contrib/openbsm/VERSION#3 integrate .. //depot/projects/e500/contrib/openbsm/aclocal.m4#2 integrate .. //depot/projects/e500/contrib/openbsm/bin/Makefile.in#2 integrate .. //depot/projects/e500/contrib/openbsm/bin/audit/Makefile.in#2 integrate .. //depot/projects/e500/contrib/openbsm/bin/auditd/Makefile.in#2 integrate .. //depot/projects/e500/contrib/openbsm/bin/auditfilterd/Makefile.in#2 integrate .. //depot/projects/e500/contrib/openbsm/bin/auditreduce/Makefile.in#2 integrate .. //depot/projects/e500/contrib/openbsm/bin/auditreduce/auditreduce.c#3 integrate .. //depot/projects/e500/contrib/openbsm/bin/praudit/Makefile.in#2 integrate .. //depot/projects/e500/contrib/openbsm/bin/praudit/praudit.c#2 integrate .. //depot/projects/e500/contrib/openbsm/bsm/Makefile.in#2 integrate .. //depot/projects/e500/contrib/openbsm/config/config.h#3 integrate .. //depot/projects/e500/contrib/openbsm/config/config.h.in#2 integrate .. //depot/projects/e500/contrib/openbsm/config/ltmain.sh#2 integrate .. //depot/projects/e500/contrib/openbsm/configure#3 integrate .. //depot/projects/e500/contrib/openbsm/configure.ac#3 integrate .. //depot/projects/e500/contrib/openbsm/etc/audit_class#2 integrate .. //depot/projects/e500/contrib/openbsm/etc/audit_event#3 integrate .. //depot/projects/e500/contrib/openbsm/libbsm/Makefile.in#2 integrate .. //depot/projects/e500/contrib/openbsm/libbsm/bsm_event.c#2 integrate .. //depot/projects/e500/contrib/openbsm/libbsm/bsm_io.c#3 integrate .. //depot/projects/e500/contrib/openbsm/man/Makefile.in#2 integrate .. //depot/projects/e500/contrib/openbsm/modules/Makefile.in#2 integrate .. //depot/projects/e500/contrib/openbsm/modules/auditfilter_noop/Makefile.in#2 integrate .. //depot/projects/e500/contrib/openbsm/test/Makefile.in#2 integrate .. //depot/projects/e500/contrib/openbsm/test/bsm/Makefile.in#2 integrate .. //depot/projects/e500/contrib/openbsm/tools/Makefile.in#2 integrate .. //depot/projects/e500/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 integrate .. //depot/projects/e500/contrib/sendmail/CACerts#2 integrate .. //depot/projects/e500/contrib/sendmail/FREEBSD-upgrade#2 integrate .. //depot/projects/e500/contrib/sendmail/INSTALL#2 integrate .. //depot/projects/e500/contrib/sendmail/RELEASE_NOTES#2 integrate .. //depot/projects/e500/contrib/sendmail/cf/cf/submit.cf#2 integrate .. //depot/projects/e500/contrib/sendmail/cf/feature/ldap_routing.m4#2 integrate .. //depot/projects/e500/contrib/sendmail/cf/m4/proto.m4#2 integrate .. //depot/projects/e500/contrib/sendmail/cf/m4/version.m4#2 integrate .. //depot/projects/e500/contrib/sendmail/contrib/buildvirtuser#2 integrate .. //depot/projects/e500/contrib/sendmail/doc/op/op.me#2 integrate .. //depot/projects/e500/contrib/sendmail/editmap/editmap.c#2 integrate .. //depot/projects/e500/contrib/sendmail/include/sm/conf.h#2 integrate .. //depot/projects/e500/contrib/sendmail/include/sm/ldap.h#2 integrate .. //depot/projects/e500/contrib/sendmail/include/sm/tailq.h#2 integrate .. //depot/projects/e500/contrib/sendmail/libmilter/docs/xxfi_unknown.html#2 integrate .. //depot/projects/e500/contrib/sendmail/libmilter/engine.c#2 integrate .. //depot/projects/e500/contrib/sendmail/libmilter/listener.c#2 integrate .. //depot/projects/e500/contrib/sendmail/libmilter/main.c#2 integrate .. //depot/projects/e500/contrib/sendmail/libmilter/monitor.c#2 integrate .. //depot/projects/e500/contrib/sendmail/libmilter/smfi.c#2 integrate .. //depot/projects/e500/contrib/sendmail/libsm/ldap.c#2 integrate .. //depot/projects/e500/contrib/sendmail/libsm/mpeix.c#2 integrate .. //depot/projects/e500/contrib/sendmail/makemap/makemap.c#2 integrate .. //depot/projects/e500/contrib/sendmail/praliases/praliases.c#2 integrate .. //depot/projects/e500/contrib/sendmail/src/Makefile.m4#2 integrate .. //depot/projects/e500/contrib/sendmail/src/conf.c#2 integrate .. //depot/projects/e500/contrib/sendmail/src/deliver.c#2 integrate .. //depot/projects/e500/contrib/sendmail/src/envelope.c#2 integrate .. //depot/projects/e500/contrib/sendmail/src/headers.c#2 integrate .. //depot/projects/e500/contrib/sendmail/src/macro.c#2 integrate .. //depot/projects/e500/contrib/sendmail/src/main.c#2 integrate .. //depot/projects/e500/contrib/sendmail/src/map.c#2 integrate .. //depot/projects/e500/contrib/sendmail/src/milter.c#2 integrate .. //depot/projects/e500/contrib/sendmail/src/mime.c#2 integrate .. //depot/projects/e500/contrib/sendmail/src/parseaddr.c#2 integrate .. //depot/projects/e500/contrib/sendmail/src/queue.c#2 integrate .. //depot/projects/e500/contrib/sendmail/src/readcf.c#2 integrate .. //depot/projects/e500/contrib/sendmail/src/recipient.c#2 integrate .. //depot/projects/e500/contrib/sendmail/src/sendmail.8#2 integrate .. //depot/projects/e500/contrib/sendmail/src/sendmail.h#2 integrate .. //depot/projects/e500/contrib/sendmail/src/sm_resolve.c#2 integrate .. //depot/projects/e500/contrib/sendmail/src/srvrsmtp.c#2 integrate .. //depot/projects/e500/contrib/sendmail/src/usersmtp.c#2 integrate .. //depot/projects/e500/contrib/sendmail/src/util.c#2 integrate .. //depot/projects/e500/contrib/sendmail/src/version.c#2 integrate .. //depot/projects/e500/contrib/sendmail/vacation/vacation.c#2 integrate .. //depot/projects/e500/contrib/tcpdump/tcpdump.c#3 integrate .. //depot/projects/e500/etc/Makefile#4 integrate .. //depot/projects/e500/etc/defaults/Makefile#2 integrate .. //depot/projects/e500/etc/defaults/pccard.conf#2 delete .. //depot/projects/e500/etc/defaults/periodic.conf#4 integrate .. //depot/projects/e500/etc/etc.amd64/ttys#3 integrate .. //depot/projects/e500/etc/etc.arm/ttys#4 integrate .. //depot/projects/e500/etc/etc.i386/ttys#3 integrate .. //depot/projects/e500/etc/etc.ia64/ttys#3 integrate .. //depot/projects/e500/etc/etc.powerpc/ttys#3 integrate .. //depot/projects/e500/etc/etc.sparc64/ttys#3 integrate .. //depot/projects/e500/etc/freebsd-update.conf#2 integrate .. //depot/projects/e500/etc/gss/mech#2 integrate .. //depot/projects/e500/etc/mtree/BSD.usr.dist#3 integrate .. //depot/projects/e500/etc/namedb/named.root#2 integrate .. //depot/projects/e500/etc/network.subr#3 integrate .. //depot/projects/e500/etc/periodic/security/100.chksetuid#2 integrate .. //depot/projects/e500/etc/pf.conf#2 delete .. //depot/projects/e500/etc/rc.d/DAEMON#2 integrate .. //depot/projects/e500/etc/rc.d/LOGIN#2 integrate .. //depot/projects/e500/etc/rc.d/Makefile#4 integrate .. //depot/projects/e500/etc/rc.d/NETWORKING#3 integrate .. //depot/projects/e500/etc/rc.d/SERVERS#2 integrate .. //depot/projects/e500/etc/rc.d/accounting#2 integrate .. //depot/projects/e500/etc/rc.d/amd#3 integrate .. //depot/projects/e500/etc/rc.d/apmd#2 integrate .. //depot/projects/e500/etc/rc.d/bootconf.sh#2 delete .. //depot/projects/e500/etc/rc.d/bootparams#2 integrate .. //depot/projects/e500/etc/rc.d/ccd#2 integrate .. //depot/projects/e500/etc/rc.d/cron#2 integrate .. //depot/projects/e500/etc/rc.d/dhclient#2 integrate .. //depot/projects/e500/etc/rc.d/dmesg#2 integrate .. //depot/projects/e500/etc/rc.d/fsck#3 integrate .. //depot/projects/e500/etc/rc.d/ftp-proxy#2 integrate .. //depot/projects/e500/etc/rc.d/hostapd#2 integrate .. //depot/projects/e500/etc/rc.d/inetd#2 integrate .. //depot/projects/e500/etc/rc.d/ipfilter#2 integrate .. //depot/projects/e500/etc/rc.d/ipfs#2 integrate .. //depot/projects/e500/etc/rc.d/ipmon#2 integrate .. //depot/projects/e500/etc/rc.d/ipnat#2 integrate .. //depot/projects/e500/etc/rc.d/ipsec#3 integrate .. //depot/projects/e500/etc/rc.d/isdnd#2 integrate .. //depot/projects/e500/etc/rc.d/keyserv#2 integrate .. //depot/projects/e500/etc/rc.d/ldconfig#2 integrate .. //depot/projects/e500/etc/rc.d/local#2 integrate .. //depot/projects/e500/etc/rc.d/lockd#4 integrate .. //depot/projects/e500/etc/rc.d/lpd#2 integrate .. //depot/projects/e500/etc/rc.d/motd#2 integrate .. //depot/projects/e500/etc/rc.d/mountcritlocal#3 integrate .. //depot/projects/e500/etc/rc.d/mountcritremote#2 integrate .. //depot/projects/e500/etc/rc.d/mountd#2 integrate .. //depot/projects/e500/etc/rc.d/moused#2 integrate .. //depot/projects/e500/etc/rc.d/mrouted#2 integrate .. //depot/projects/e500/etc/rc.d/newsyslog#2 integrate .. //depot/projects/e500/etc/rc.d/nfsd#2 integrate .. //depot/projects/e500/etc/rc.d/nfslocking#4 delete .. //depot/projects/e500/etc/rc.d/power_profile#2 integrate .. //depot/projects/e500/etc/rc.d/pwcheck#2 integrate .. //depot/projects/e500/etc/rc.d/quota#2 integrate .. //depot/projects/e500/etc/rc.d/rarpd#2 integrate .. //depot/projects/e500/etc/rc.d/resolv#3 integrate .. //depot/projects/e500/etc/rc.d/root#3 integrate .. //depot/projects/e500/etc/rc.d/route6d#2 integrate .. //depot/projects/e500/etc/rc.d/routed#2 integrate .. //depot/projects/e500/etc/rc.d/rpcbind#2 integrate .. //depot/projects/e500/etc/rc.d/rtadvd#2 integrate .. //depot/projects/e500/etc/rc.d/rwho#2 integrate .. //depot/projects/e500/etc/rc.d/savecore#2 integrate .. //depot/projects/e500/etc/rc.d/securelevel#2 integrate .. //depot/projects/e500/etc/rc.d/sendmail#3 integrate .. //depot/projects/e500/etc/rc.d/sshd#2 integrate .. //depot/projects/e500/etc/rc.d/statd#3 integrate .. //depot/projects/e500/etc/rc.d/swap1#2 integrate .. //depot/projects/e500/etc/rc.d/sysctl#2 integrate .. //depot/projects/e500/etc/rc.d/syslogd#2 integrate .. //depot/projects/e500/etc/rc.d/timed#2 integrate .. //depot/projects/e500/etc/rc.d/tmp#3 integrate .. //depot/projects/e500/etc/rc.d/ugidfw#2 integrate .. //depot/projects/e500/etc/rc.d/var#3 integrate .. //depot/projects/e500/etc/rc.d/virecover#2 integrate .. //depot/projects/e500/etc/rc.d/ypbind#2 integrate .. //depot/projects/e500/etc/rc.d/yppasswdd#2 integrate .. //depot/projects/e500/etc/rc.d/ypserv#2 integrate .. //depot/projects/e500/etc/sendmail/freebsd.mc#2 integrate .. //depot/projects/e500/etc/sendmail/freebsd.submit.mc#2 integrate .. //depot/projects/e500/games/fortune/datfiles/Makefile#2 integrate .. //depot/projects/e500/games/fortune/datfiles/fortunes#6 integrate .. //depot/projects/e500/games/fortune/datfiles/fortunes-o.real#3 integrate .. //depot/projects/e500/games/fortune/datfiles/fortunes-o.sp.ok#2 integrate .. //depot/projects/e500/games/fortune/datfiles/fortunes.sp.ok#2 integrate .. //depot/projects/e500/games/fortune/datfiles/fortunes2-o#2 delete .. //depot/projects/e500/games/fortune/datfiles/freebsd-tips#2 integrate .. //depot/projects/e500/games/fortune/datfiles/freebsd-tips.sp.ok#1 branch .. //depot/projects/e500/games/fortune/datfiles/limerick#3 integrate .. //depot/projects/e500/games/fortune/datfiles/limerick.sp.ok#1 branch .. //depot/projects/e500/games/fortune/datfiles/murphy#2 integrate .. //depot/projects/e500/games/fortune/datfiles/murphy-o#2 integrate .. //depot/projects/e500/games/fortune/datfiles/murphy.sp.ok#1 branch .. //depot/projects/e500/games/fortune/datfiles/startrek#2 integrate .. //depot/projects/e500/games/fortune/datfiles/zippy#2 integrate .. //depot/projects/e500/games/fortune/datfiles/zippy.sp.ok#2 integrate .. //depot/projects/e500/games/fortune/fortune/fortune.6#2 integrate .. //depot/projects/e500/games/fortune/fortune/fortune.c#2 integrate .. //depot/projects/e500/gnu/lib/libobjc/Makefile#4 integrate .. //depot/projects/e500/gnu/usr.bin/cc/cc_tools/Makefile#4 integrate .. //depot/projects/e500/gnu/usr.bin/gdb/arch/arm/Makefile#2 integrate .. //depot/projects/e500/gnu/usr.bin/gdb/arch/arm/armfbsd-nat.c#2 integrate .. //depot/projects/e500/gnu/usr.bin/gdb/arch/arm/armfbsd-tdep.c#2 integrate .. //depot/projects/e500/gnu/usr.bin/gdb/arch/arm/init.c#2 integrate .. //depot/projects/e500/gnu/usr.bin/gdb/arch/arm/nm-fbsd.h#2 integrate .. //depot/projects/e500/gnu/usr.bin/gdb/kgdb/kgdb.h#3 integrate .. //depot/projects/e500/gnu/usr.bin/gdb/kgdb/kthr.c#2 integrate .. //depot/projects/e500/gnu/usr.bin/gdb/kgdb/trgt_i386.c#2 integrate .. //depot/projects/e500/gnu/usr.bin/groff/tmac/mdoc.local#3 integrate .. //depot/projects/e500/include/_ctype.h#3 integrate .. //depot/projects/e500/include/assert.h#2 integrate .. //depot/projects/e500/include/complex.h#2 integrate .. //depot/projects/e500/include/dirent.h#2 integrate .. //depot/projects/e500/include/elf.h#2 integrate .. //depot/projects/e500/include/nsswitch.h#2 integrate .. //depot/projects/e500/include/pthread.h#2 integrate .. //depot/projects/e500/include/pthread_np.h#2 integrate .. //depot/projects/e500/kerberos5/lib/Makefile.inc#2 integrate .. //depot/projects/e500/lib/Makefile#5 integrate .. //depot/projects/e500/lib/bind/bind/Makefile#3 integrate .. //depot/projects/e500/lib/bind/bind/config.h#2 integrate .. //depot/projects/e500/lib/bind/bind/port_before.h#3 integrate .. //depot/projects/e500/lib/bind/config.h#3 integrate .. //depot/projects/e500/lib/bind/config.mk#3 integrate .. //depot/projects/e500/lib/bind/isc/isc/platform.h#3 integrate .. //depot/projects/e500/lib/bind/lwres/Makefile#3 integrate .. //depot/projects/e500/lib/csu/common/crtbrand.c#2 integrate .. //depot/projects/e500/lib/libarchive/archive_read_support_compression_none.c#3 integrate .. //depot/projects/e500/lib/libarchive/archive_read_support_format_tar.c#5 integrate .. //depot/projects/e500/lib/libarchive/archive_read_support_format_zip.c#5 integrate .. //depot/projects/e500/lib/libc/amd64/Makefile.inc#2 integrate .. //depot/projects/e500/lib/libc/gdtoa/_ldtoa.c#2 integrate .. //depot/projects/e500/lib/libc/gdtoa/machdep_ldisQ.c#2 integrate .. //depot/projects/e500/lib/libc/gdtoa/machdep_ldisx.c#2 integrate .. //depot/projects/e500/lib/libc/gen/Symbol.map#3 integrate .. //depot/projects/e500/lib/libc/gen/closedir.c#2 integrate .. //depot/projects/e500/lib/libc/gen/getgrent.c#2 integrate .. //depot/projects/e500/lib/libc/gen/getgrouplist.c#2 integrate .. //depot/projects/e500/lib/libc/gen/readdir.c#2 integrate .. //depot/projects/e500/lib/libc/gen/seekdir.c#2 integrate .. //depot/projects/e500/lib/libc/gen/telldir.c#2 integrate .. //depot/projects/e500/lib/libc/gen/valloc.3#2 integrate .. //depot/projects/e500/lib/libc/i386/Makefile.inc#2 integrate .. //depot/projects/e500/lib/libc/ia64/Makefile.inc#2 integrate .. //depot/projects/e500/lib/libc/locale/localeconv.c#2 integrate .. //depot/projects/e500/lib/libc/locale/mblocal.h#2 integrate .. //depot/projects/e500/lib/libc/nameser/ns_parse.c#3 integrate .. //depot/projects/e500/lib/libc/net/Makefile.inc#3 integrate .. //depot/projects/e500/lib/libc/net/ethers.3#3 integrate .. //depot/projects/e500/lib/libc/net/nsdispatch.c#3 integrate .. //depot/projects/e500/lib/libc/resolv/res_data.c#3 integrate .. //depot/projects/e500/lib/libc/resolv/res_init.c#3 integrate .. //depot/projects/e500/lib/libc/rpc/authdes_prot.c#2 integrate .. //depot/projects/e500/lib/libc/rpc/authunix_prot.c#2 integrate .. //depot/projects/e500/lib/libc/rpc/key_prot_xdr.c#2 integrate .. //depot/projects/e500/lib/libc/rpc/rpc_callmsg.c#2 integrate .. //depot/projects/e500/lib/libc/rpc/rpc_prot.c#2 integrate .. //depot/projects/e500/lib/libc/rpc/rpcb_prot.c#2 integrate .. //depot/projects/e500/lib/libc/rpc/rpcb_st_xdr.c#2 integrate .. //depot/projects/e500/lib/libc/sparc64/Makefile.inc#2 integrate .. //depot/projects/e500/lib/libc/sparc64/fpu/fpu_explode.c#2 integrate .. //depot/projects/e500/lib/libc/stdio/vfscanf.c#2 integrate .. //depot/projects/e500/lib/libc/stdio/vfwscanf.c#2 integrate .. //depot/projects/e500/lib/libc/stdlib/grantpt.c#2 integrate .. //depot/projects/e500/lib/libc/stdlib/malloc.3#3 integrate .. //depot/projects/e500/lib/libc/stdlib/malloc.c#3 integrate .. //depot/projects/e500/lib/libc/stdlib/rand.c#2 integrate .. //depot/projects/e500/lib/libc/string/strtok.3#2 integrate .. //depot/projects/e500/lib/libc/string/strtok.c#2 integrate .. //depot/projects/e500/lib/libc/string/wcstok.c#2 integrate .. //depot/projects/e500/lib/libc/sys/access.2#2 integrate .. //depot/projects/e500/lib/libc/sys/minherit.2#3 integrate .. //depot/projects/e500/lib/libc/sys/sctp_generic_recvmsg.2#2 integrate .. //depot/projects/e500/lib/libc/sys/sctp_generic_sendmsg.2#2 integrate .. //depot/projects/e500/lib/libc/sys/sctp_peeloff.2#2 integrate .. //depot/projects/e500/lib/libdisk/libdisk.3#2 integrate .. //depot/projects/e500/lib/libdisk/libdisk.h#2 integrate .. //depot/projects/e500/lib/libelf/elf.3#3 integrate .. //depot/projects/e500/lib/libelf/gelf_xlatetof.3#2 integrate .. //depot/projects/e500/lib/libelf/libelf_data.c#2 integrate .. //depot/projects/e500/lib/libelf/libelf_xlate.c#2 integrate .. //depot/projects/e500/lib/libgssapi/Makefile#2 integrate .. //depot/projects/e500/lib/libgssapi/gss_accept_sec_context.3#2 integrate .. //depot/projects/e500/lib/libgssapi/gss_acquire_cred.3#2 integrate .. //depot/projects/e500/lib/libgssapi/gss_acquire_cred.c#2 integrate .. //depot/projects/e500/lib/libgssapi/gss_add_cred.3#2 integrate .. //depot/projects/e500/lib/libgssapi/gss_add_oid_set_member.3#2 integrate .. //depot/projects/e500/lib/libgssapi/gss_canonicalize_name.3#2 integrate .. //depot/projects/e500/lib/libgssapi/gss_compare_name.3#2 integrate .. //depot/projects/e500/lib/libgssapi/gss_context_time.3#2 integrate .. //depot/projects/e500/lib/libgssapi/gss_create_empty_oid_set.3#2 integrate .. //depot/projects/e500/lib/libgssapi/gss_delete_sec_context.3#2 integrate .. //depot/projects/e500/lib/libgssapi/gss_display_name.3#2 integrate .. //depot/projects/e500/lib/libgssapi/gss_display_status.3#2 integrate .. //depot/projects/e500/lib/libgssapi/gss_duplicate_name.3#2 integrate .. //depot/projects/e500/lib/libgssapi/gss_export_name.3#2 integrate .. //depot/projects/e500/lib/libgssapi/gss_export_sec_context.3#2 integrate .. //depot/projects/e500/lib/libgssapi/gss_get_mic.3#2 integrate .. //depot/projects/e500/lib/libgssapi/gss_import_name.3#2 integrate .. //depot/projects/e500/lib/libgssapi/gss_import_sec_context.3#2 integrate .. //depot/projects/e500/lib/libgssapi/gss_indicate_mechs.3#2 integrate .. //depot/projects/e500/lib/libgssapi/gss_init_sec_context.3#2 integrate .. //depot/projects/e500/lib/libgssapi/gss_inquire_context.3#2 integrate .. //depot/projects/e500/lib/libgssapi/gss_inquire_cred.3#2 integrate .. //depot/projects/e500/lib/libgssapi/gss_inquire_cred_by_mech.3#2 integrate .. //depot/projects/e500/lib/libgssapi/gss_inquire_mechs_for_name.3#2 integrate .. //depot/projects/e500/lib/libgssapi/gss_inquire_names_for_mech.3#2 integrate .. //depot/projects/e500/lib/libgssapi/gss_process_context_token.3#2 integrate .. //depot/projects/e500/lib/libgssapi/gss_release_buffer.3#2 integrate .. //depot/projects/e500/lib/libgssapi/gss_release_cred.3#2 integrate .. //depot/projects/e500/lib/libgssapi/gss_release_name.3#2 integrate .. //depot/projects/e500/lib/libgssapi/gss_release_oid_set.3#2 integrate .. //depot/projects/e500/lib/libgssapi/gss_test_oid_set_member.3#2 integrate .. //depot/projects/e500/lib/libgssapi/gss_unwrap.3#2 integrate .. //depot/projects/e500/lib/libgssapi/gss_verify_mic.3#2 integrate .. //depot/projects/e500/lib/libgssapi/gss_wrap.3#2 integrate .. //depot/projects/e500/lib/libgssapi/gss_wrap_size_limit.3#2 integrate .. //depot/projects/e500/lib/libkse/Makefile#2 integrate .. //depot/projects/e500/lib/libkse/arch/amd64/include/atomic_ops.h#2 integrate .. //depot/projects/e500/lib/libkse/arch/amd64/include/pthread_md.h#2 integrate .. //depot/projects/e500/lib/libkse/arch/arm/include/atomic_ops.h#2 integrate .. //depot/projects/e500/lib/libkse/arch/i386/include/atomic_ops.h#2 integrate .. //depot/projects/e500/lib/libkse/arch/i386/include/pthread_md.h#2 integrate .. //depot/projects/e500/lib/libkse/arch/ia64/include/atomic_ops.h#2 integrate .. //depot/projects/e500/lib/libkse/arch/ia64/include/pthread_md.h#2 integrate .. //depot/projects/e500/lib/libkse/arch/powerpc/include/atomic_ops.h#2 integrate .. //depot/projects/e500/lib/libkse/arch/powerpc/include/pthread_md.h#2 integrate .. //depot/projects/e500/lib/libkse/arch/sparc64/include/atomic_ops.h#2 integrate .. //depot/projects/e500/lib/libkse/arch/sparc64/include/pthread_md.h#2 integrate .. //depot/projects/e500/lib/libkse/kse.map#2 integrate .. //depot/projects/e500/lib/libkse/sys/lock.c#2 integrate .. //depot/projects/e500/lib/libkse/sys/lock.h#2 integrate .. //depot/projects/e500/lib/libkse/sys/thr_error.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_accept.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_aio_suspend.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_atfork.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_attr_destroy.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_attr_get_np.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_attr_getdetachstate.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_attr_getguardsize.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_attr_getinheritsched.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_attr_getschedparam.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_attr_getschedpolicy.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_attr_getscope.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_attr_getstack.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_attr_getstackaddr.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_attr_getstacksize.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_attr_init.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_attr_setcreatesuspend_np.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_attr_setdetachstate.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_attr_setguardsize.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_attr_setinheritsched.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_attr_setschedparam.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_attr_setschedpolicy.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_attr_setscope.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_attr_setstack.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_attr_setstackaddr.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_attr_setstacksize.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_barrier.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_barrierattr.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_cancel.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_clean.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_close.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_concurrency.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_cond.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_condattr_destroy.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_condattr_init.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_condattr_pshared.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_connect.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_creat.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_create.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_detach.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_equal.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_execve.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_exit.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_fcntl.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_find_thread.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_fork.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_fsync.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_getschedparam.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_info.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_init.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_join.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_kern.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_kill.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_main_np.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_mattr_init.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_mattr_kind_np.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_mattr_pshared.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_msync.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_multi_np.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_mutex.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_mutex_prioceiling.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_mutex_protocol.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_mutexattr_destroy.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_nanosleep.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_once.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_open.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_pause.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_poll.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_priority_queue.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_private.h#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_pselect.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_pspinlock.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_raise.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_read.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_readv.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_resume_np.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_rtld.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_rwlock.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_rwlockattr.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_select.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_self.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_seterrno.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_setprio.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_setschedparam.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_sig.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_sigaction.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_sigaltstack.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_sigmask.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_sigpending.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_sigprocmask.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_sigsuspend.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_sigwait.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_single_np.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_sleep.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_spec.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_spinlock.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_stack.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_suspend_np.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_switch_np.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_symbols.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_system.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_tcdrain.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_vfork.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_wait.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_wait4.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_waitpid.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_write.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_writev.c#2 integrate .. //depot/projects/e500/lib/libkse/thread/thr_yield.c#2 integrate .. //depot/projects/e500/lib/libkvm/kvm_proc.c#4 integrate .. //depot/projects/e500/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8#2 integrate .. //depot/projects/e500/lib/libpmc/Makefile#2 integrate .. //depot/projects/e500/lib/libpmc/libpmc.c#2 integrate .. //depot/projects/e500/lib/libpmc/pmc.3#2 integrate .. //depot/projects/e500/lib/libpmc/pmc_allocate.3#1 branch .. //depot/projects/e500/lib/libpmc/pmc_attach.3#1 branch .. //depot/projects/e500/lib/libpmc/pmc_capabilities.3#1 branch .. //depot/projects/e500/lib/libpmc/pmc_configure_logfile.3#1 branch .. //depot/projects/e500/lib/libpmc/pmc_disable.3#1 branch .. //depot/projects/e500/lib/libpmc/pmc_event_names_of_class.3#1 branch .. //depot/projects/e500/lib/libpmc/pmc_get_driver_stats.3#1 branch .. //depot/projects/e500/lib/libpmc/pmc_get_msr.3#1 branch .. //depot/projects/e500/lib/libpmc/pmc_init.3#1 branch .. //depot/projects/e500/lib/libpmc/pmc_name_of_capability.3#1 branch .. //depot/projects/e500/lib/libpmc/pmc_read.3#1 branch .. //depot/projects/e500/lib/libpmc/pmc_set.3#1 branch .. //depot/projects/e500/lib/libpmc/pmc_start.3#1 branch .. //depot/projects/e500/lib/libpmc/pmclog.c#2 integrate .. //depot/projects/e500/lib/libpmc/pmclog.h#2 integrate .. //depot/projects/e500/lib/libsdp/search.c#2 integrate .. //depot/projects/e500/lib/libstand/Makefile#6 integrate .. //depot/projects/e500/lib/libthr/Makefile#5 integrate .. //depot/projects/e500/lib/libthr/pthread.map#3 integrate .. //depot/projects/e500/lib/libthr/thread/thr_init.c#3 integrate .. //depot/projects/e500/lib/libthr/thread/thr_mutex.c#3 integrate .. //depot/projects/e500/lib/libthr/thread/thr_private.h#3 integrate .. //depot/projects/e500/lib/libthr/thread/thr_rtld.c#2 integrate .. //depot/projects/e500/lib/libthr/thread/thr_sem.c#2 integrate .. //depot/projects/e500/lib/libthr/thread/thr_sig.c#2 integrate .. //depot/projects/e500/lib/libthr/thread/thr_spec.c#2 integrate .. //depot/projects/e500/lib/libthr/thread/thr_suspend_np.c#2 integrate .. //depot/projects/e500/lib/libthr/thread/thr_umtx.c#3 integrate .. //depot/projects/e500/lib/libthr/thread/thr_umtx.h#2 integrate .. //depot/projects/e500/lib/libthread_db/arch/arm/libpthread_md.c#1 branch .. //depot/projects/e500/lib/libutil/expand_number.3#2 integrate .. //depot/projects/e500/lib/libutil/expand_number.c#2 integrate .. //depot/projects/e500/lib/libutil/libutil.h#4 integrate .. //depot/projects/e500/lib/libutil/pty.c#2 integrate .. //depot/projects/e500/lib/msun/Makefile#3 integrate .. //depot/projects/e500/lib/msun/man/atan2.3#2 integrate .. //depot/projects/e500/lib/msun/man/hypot.3#2 integrate .. //depot/projects/e500/lib/msun/src/s_carg.c#1 branch .. //depot/projects/e500/lib/msun/src/s_cargf.c#1 branch .. //depot/projects/e500/libexec/Makefile#3 integrate .. //depot/projects/e500/libexec/rtld-elf/powerpc/reloc.c#3 integrate .. //depot/projects/e500/libexec/rtld-elf/sparc64/rtld_machdep.h#2 integrate .. //depot/projects/e500/libexec/tftpd/Makefile#2 integrate .. //depot/projects/e500/libexec/tftpd/tftpd.8#3 integrate .. //depot/projects/e500/libexec/tftpd/tftpd.c#2 integrate .. //depot/projects/e500/release/Makefile#5 integrate .. //depot/projects/e500/release/doc/en_US.ISO8859-1/hardware/article.sgml#5 integrate .. //depot/projects/e500/release/doc/en_US.ISO8859-1/relnotes/article.sgml#7 integrate .. //depot/projects/e500/release/doc/share/sgml/release.ent#5 integrate .. //depot/projects/e500/release/doc/zh_CN.GB2312/Makefile#2 integrate .. //depot/projects/e500/release/doc/zh_CN.GB2312/errata/Makefile#2 integrate .. //depot/projects/e500/release/doc/zh_CN.GB2312/hardware/Makefile#2 integrate .. //depot/projects/e500/release/doc/zh_CN.GB2312/hardware/Makefile.inc#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/hardware/amd64/Makefile#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/hardware/amd64/article.sgml#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/hardware/amd64/proc-amd64.sgml#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/hardware/article.sgml#1 branch .. //depot/projects/e500/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/hardware/common/hw.ent#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/hardware/common/intro.sgml#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/hardware/i386/Makefile#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/hardware/i386/article.sgml#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/hardware/i386/proc-i386.sgml#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/installation/Makefile#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/installation/Makefile.inc#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/installation/amd64/Makefile#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/installation/amd64/article.sgml#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/installation/common/abstract.sgml#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/installation/common/artheader.sgml#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/installation/common/install.ent#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/installation/common/install.sgml#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/installation/common/layout.sgml#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/installation/common/trouble.sgml#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/installation/common/upgrade.sgml#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/installation/i386/Makefile#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/installation/i386/article.sgml#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/installation/ia64/Makefile#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/installation/ia64/article.sgml#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/installation/pc98/Makefile#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/installation/pc98/article.sgml#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/installation/sparc64/Makefile#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/installation/sparc64/article.sgml#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/installation/sparc64/install.sgml#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/readme/article.sgml#2 integrate .. //depot/projects/e500/release/doc/zh_CN.GB2312/relnotes/Makefile#2 integrate .. //depot/projects/e500/release/doc/zh_CN.GB2312/relnotes/Makefile.inc#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/relnotes/amd64/Makefile#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/relnotes/amd64/article.sgml#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/relnotes/article.sgml#1 branch .. //depot/projects/e500/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/relnotes/common/relnotes.ent#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/relnotes/i386/Makefile#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/relnotes/i386/article.sgml#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/relnotes/ia64/Makefile#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/relnotes/ia64/article.sgml#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/relnotes/pc98/Makefile#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/relnotes/pc98/article.sgml#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/relnotes/powerpc/Makefile#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/relnotes/powerpc/article.sgml#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/relnotes/sparc64/Makefile#2 delete .. //depot/projects/e500/release/doc/zh_CN.GB2312/relnotes/sparc64/article.sgml#2 delete .. //depot/projects/e500/release/fixit.profile#2 integrate .. //depot/projects/e500/release/picobsd/bridge/PICOBSD#2 integrate .. //depot/projects/e500/release/picobsd/bridge/crunch.conf#2 integrate .. //depot/projects/e500/release/picobsd/build/Makefile.conf#2 integrate .. //depot/projects/e500/release/picobsd/build/picobsd#2 integrate .. //depot/projects/e500/release/picobsd/tinyware/login/Makefile#2 integrate .. //depot/projects/e500/release/picobsd/tinyware/msg/msg.c#2 integrate .. //depot/projects/e500/release/scripts/package-split.py#2 integrate .. //depot/projects/e500/release/scripts/src-install.sh#3 integrate .. //depot/projects/e500/rescue/rescue/Makefile#3 integrate .. //depot/projects/e500/sbin/atacontrol/atacontrol.8#2 integrate .. //depot/projects/e500/sbin/bsdlabel/bsdlabel.8#2 integrate .. //depot/projects/e500/sbin/bsdlabel/bsdlabel.c#2 integrate .. //depot/projects/e500/sbin/clri/clri.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Dec 13 21:30:00 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7E21516A469; Thu, 13 Dec 2007 21:30:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D179916A421 for ; Thu, 13 Dec 2007 21:29:59 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B622513C468 for ; Thu, 13 Dec 2007 21:29:59 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBDLTxvv093426 for ; Thu, 13 Dec 2007 21:29:59 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBDLTxkd093423 for perforce@freebsd.org; Thu, 13 Dec 2007 21:29:59 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 13 Dec 2007 21:29:59 GMT Message-Id: <200712132129.lBDLTxkd093423@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 130813 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Dec 2007 21:30:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=130813 Change 130813 by kmacy@kmacy:storage:toestack on 2007/12/13 21:29:52 don't leak rtentry reference in case of failure Affected files ... .. //depot/projects/toestack/sys/netinet/tcp_ofld.c#9 edit Differences ... ==== //depot/projects/toestack/sys/netinet/tcp_ofld.c#9 (text+ko) ==== @@ -56,7 +56,7 @@ struct ifnet *ifp; struct toedev *tdev; struct rtentry *rt; - int error; + int error = 0; rt = rtalloc2(nam, 1, 0); if (rt == NULL) @@ -64,16 +64,23 @@ ifp = rt->rt_ifp; tdev = TOEDEV(ifp); - if (tdev == NULL) - return (EINVAL); - - if (tdev->tod_can_offload(tdev, so) == 0) - return (EINVAL); - + if (tdev == NULL) { + error = EINVAL; + goto fail; + } + + if (tdev->tod_can_offload(tdev, so) == 0) { + error = EINVAL; + goto fail; + } + if ((error = tdev->tod_connect(tdev, so, rt, nam))) - return (error); - + goto fail; + return (0); +fail: + RTFREE(rt); + return (error); } int From owner-p4-projects@FreeBSD.ORG Thu Dec 13 22:13:48 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 93F2016A473; Thu, 13 Dec 2007 22:13:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4580B16A418 for ; Thu, 13 Dec 2007 22:13:47 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 283E713C468 for ; Thu, 13 Dec 2007 22:13:47 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBDMDllu001601 for ; Thu, 13 Dec 2007 22:13:47 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBDMDkjv001598 for perforce@freebsd.org; Thu, 13 Dec 2007 22:13:46 GMT (envelope-from jb@freebsd.org) Date: Thu, 13 Dec 2007 22:13:46 GMT Message-Id: <200712132213.lBDMDkjv001598@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130814 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Dec 2007 22:13:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=130814 Change 130814 by jb@jb_freebsd1 on 2007/12/13 22:13:45 Another day, another IFC. Affected files ... .. //depot/projects/dtrace/ports/Mk/bsd.emacs.mk#8 integrate .. //depot/projects/dtrace/src/etc/rc.d/ldconfig#6 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-all.h#8 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-chipset.c#23 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-dma.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-lowlevel.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pci/hda/hdac.c#16 integrate .. //depot/projects/dtrace/src/tools/tools/ath/athdebug/athdebug.c#5 integrate .. //depot/projects/dtrace/src/tools/tools/ath/athstats/Makefile#6 integrate .. //depot/projects/dtrace/src/tools/tools/ath/athstats/athstats.c#7 integrate .. //depot/projects/dtrace/src/tools/tools/ath/athstats/main.c#4 integrate .. //depot/projects/dtrace/src/tools/tools/ath/athstats/statfoo.c#4 integrate .. //depot/projects/dtrace/src/usr.bin/vmstat/Makefile#4 integrate .. //depot/projects/dtrace/src/usr.bin/vmstat/vmstat.8#7 integrate .. //depot/projects/dtrace/src/usr.bin/vmstat/vmstat.c#7 integrate Differences ... ==== //depot/projects/dtrace/ports/Mk/bsd.emacs.mk#8 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: ports/Mk/bsd.emacs.mk,v 1.69 2007/10/14 10:09:47 vd Exp $ +# $FreeBSD: ports/Mk/bsd.emacs.mk,v 1.70 2007/12/13 19:25:09 anray Exp $ # # bsd.emacs.mk - 19990829 Shigeyuki Fukushima. # @@ -117,7 +117,7 @@ # XEmacs-21.x .elif (${EMACS_PORT_NAME} == "xemacs21") EMACS_NAME= xemacs -EMACS_VER= 21.4.20 +EMACS_VER= 21.4.21 EMACS_MAJOR_VER= 21 EMACS_LIBDIR?= lib/${EMACS_NAME} EMACS_LIBDIR_WITH_VER?= lib/${EMACS_NAME}-${EMACS_VER} @@ -134,7 +134,7 @@ # XEmacs-21.x with Mule .elif (${EMACS_PORT_NAME} == "xemacs21-mule") EMACS_NAME= xemacs -EMACS_VER= 21.4.20 +EMACS_VER= 21.4.21 EMACS_MAJOR_VER= 21 EMACS_LIBDIR?= lib/${EMACS_NAME} EMACS_LIBDIR_WITH_VER?= lib/${EMACS_NAME}-${EMACS_VER} ==== //depot/projects/dtrace/src/etc/rc.d/ldconfig#6 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ldconfig,v 1.18 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/ldconfig,v 1.19 2007/12/13 00:51:01 jhb Exp $ # # PROVIDE: ldconfig @@ -49,8 +49,14 @@ fi fi done - echo '32-bit compatibility ldconfig path:' ${ldconfig32_paths} - ${ldconfig} -32 -m ${_ins} ${ldconfig32_paths} + _LDC="" + for i in ${ldconfig32_paths}; do + if [ -r "${i}" ]; then + _LDC="${_LDC} ${i}" + fi + done + echo '32-bit compatibility ldconfig path:' ${_LDC} + ${ldconfig} -32 -m ${_ins} ${_LDC} ;; esac ==== //depot/projects/dtrace/src/sys/dev/ata/ata-all.h#8 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.125 2007/11/18 14:44:52 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.126 2007/12/13 11:47:36 sos Exp $ */ /* ATA register defines */ @@ -464,6 +464,8 @@ int (*begin_transaction)(struct ata_request *request); int (*end_transaction)(struct ata_request *request); int (*command)(struct ata_request *request); + void (*tf_read)(struct ata_request *request); + void (*tf_write)(struct ata_request *request); }; /* structure holding resources for an ATA channel */ ==== //depot/projects/dtrace/src/sys/dev/ata/ata-chipset.c#23 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.210 2007/12/07 13:14:31 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.211 2007/12/13 11:47:36 sos Exp $"); #include "opt_ata.h" #include @@ -99,7 +99,7 @@ static void ata_intel_sata_setmode(device_t dev, int mode); static int ata_intel_31244_allocate(device_t dev); static int ata_intel_31244_status(device_t dev); -static int ata_intel_31244_command(struct ata_request *request); +static void ata_intel_31244_tf_write(struct ata_request *request); static void ata_intel_31244_reset(device_t dev); static int ata_ite_chipinit(device_t dev); static void ata_ite_setmode(device_t dev, int mode); @@ -152,6 +152,8 @@ static void ata_promise_next_hpkt(struct ata_pci_controller *ctlr); static int ata_serverworks_chipinit(device_t dev); static int ata_serverworks_allocate(device_t dev); +static void ata_serverworks_tf_read(struct ata_request *request); +static void ata_serverworks_tf_write(struct ata_request *request); static void ata_serverworks_setmode(device_t dev, int mode); static int ata_sii_chipinit(device_t dev); static int ata_cmd_allocate(device_t dev); @@ -2093,7 +2095,7 @@ ch->flags |= ATA_NO_SLAVE; ata_pci_hw(dev); ch->hw.status = ata_intel_31244_status; - ch->hw.command = ata_intel_31244_command; + ch->hw.tf_write = ata_intel_31244_tf_write; /* enable PHY state change interrupt */ ATA_OUTL(ctlr->r_res2, 0x4, @@ -2111,32 +2113,55 @@ return ata_pci_status(dev); } -static int -ata_intel_31244_command(struct ata_request *request) +static void +ata_intel_31244_tf_write(struct ata_request *request) { struct ata_channel *ch = device_get_softc(device_get_parent(request->dev)); struct ata_device *atadev = device_get_softc(request->dev); - u_int64_t lba; - if (!(atadev->flags & ATA_D_48BIT_ACTIVE)) - return (ata_generic_command(request)); - - lba = request->u.ata.lba; - ATA_IDX_OUTB(ch, ATA_DRIVE, ATA_D_IBM | ATA_D_LBA | atadev->unit); - /* enable interrupt */ - ATA_IDX_OUTB(ch, ATA_CONTROL, ATA_A_4BIT); - ATA_IDX_OUTW(ch, ATA_FEATURE, request->u.ata.feature); - ATA_IDX_OUTW(ch, ATA_COUNT, request->u.ata.count); - ATA_IDX_OUTW(ch, ATA_SECTOR, ((lba >> 16) & 0xff00) | (lba & 0x00ff)); - ATA_IDX_OUTW(ch, ATA_CYL_LSB, ((lba >> 24) & 0xff00) | - ((lba >> 8) & 0x00ff)); - ATA_IDX_OUTW(ch, ATA_CYL_MSB, ((lba >> 32) & 0xff00) | - ((lba >> 16) & 0x00ff)); - - /* issue command to controller */ - ATA_IDX_OUTB(ch, ATA_COMMAND, request->u.ata.command); - - return 0; + if (atadev->flags & ATA_D_48BIT_ACTIVE) { + ATA_IDX_OUTW(ch, ATA_FEATURE, request->u.ata.feature); + ATA_IDX_OUTW(ch, ATA_COUNT, request->u.ata.count); + ATA_IDX_OUTW(ch, ATA_SECTOR, ((request->u.ata.lba >> 16) & 0xff00) | + (request->u.ata.lba & 0x00ff)); + ATA_IDX_OUTW(ch, ATA_CYL_LSB, ((request->u.ata.lba >> 24) & 0xff00) | + ((request->u.ata.lba >> 8) & 0x00ff)); + ATA_IDX_OUTW(ch, ATA_CYL_MSB, ((request->u.ata.lba >> 32) & 0xff00) | + ((request->u.ata.lba >> 16) & 0x00ff)); + ATA_IDX_OUTW(ch, ATA_DRIVE, ATA_D_LBA | atadev->unit); + } + else { + ATA_IDX_OUTB(ch, ATA_FEATURE, request->u.ata.feature); + ATA_IDX_OUTB(ch, ATA_COUNT, request->u.ata.count); + if (atadev->flags & ATA_D_USE_CHS) { + int heads, sectors; + + if (atadev->param.atavalid & ATA_FLAG_54_58) { + heads = atadev->param.current_heads; + sectors = atadev->param.current_sectors; + } + else { + heads = atadev->param.heads; + sectors = atadev->param.sectors; + } + ATA_IDX_OUTB(ch, ATA_SECTOR, (request->u.ata.lba % sectors)+1); + ATA_IDX_OUTB(ch, ATA_CYL_LSB, + (request->u.ata.lba / (sectors * heads))); + ATA_IDX_OUTB(ch, ATA_CYL_MSB, + (request->u.ata.lba / (sectors * heads)) >> 8); + ATA_IDX_OUTB(ch, ATA_DRIVE, ATA_D_IBM | atadev->unit | + (((request->u.ata.lba% (sectors * heads)) / + sectors) & 0xf)); + } + else { + ATA_IDX_OUTB(ch, ATA_SECTOR, request->u.ata.lba); + ATA_IDX_OUTB(ch, ATA_CYL_LSB, request->u.ata.lba >> 8); + ATA_IDX_OUTB(ch, ATA_CYL_MSB, request->u.ata.lba >> 16); + ATA_IDX_OUTB(ch, ATA_DRIVE, + ATA_D_IBM | ATA_D_LBA | atadev->unit | + ((request->u.ata.lba >> 24) & 0x0f)); + } + } } static void @@ -2849,8 +2874,12 @@ /* note start and stop are not used here */ ch->dma->setprd = ata_marvell_edma_dmasetprd; + /* if 64bit support present adjust max address used */ if (ATA_INL(ctlr->r_res1, 0x00d00) & 0x00000004) ch->dma->max_address = BUS_SPACE_MAXADDR; + + /* chip does not reliably do 64K DMA transfers */ + ch->dma->max_iosize = 126 * DEV_BSIZE; } } @@ -4248,10 +4277,97 @@ ch->flags |= ATA_NO_SLAVE; ata_pci_hw(dev); + ch->hw.tf_read = ata_serverworks_tf_read; + ch->hw.tf_write = ata_serverworks_tf_write; + + /* chip does not reliably do 64K DMA transfers */ + if (ch->dma) + ch->dma->max_iosize = 126 * DEV_BSIZE; + return 0; } static void +ata_serverworks_tf_read(struct ata_request *request) +{ + struct ata_channel *ch = device_get_softc(device_get_parent(request->dev)); + struct ata_device *atadev = device_get_softc(request->dev); + + if (atadev->flags & ATA_D_48BIT_ACTIVE) { + u_int16_t temp; + + request->u.ata.count = ATA_IDX_INW(ch, ATA_COUNT); + temp = ATA_IDX_INW(ch, ATA_SECTOR); + request->u.ata.lba = (u_int64_t)(temp & 0x00ff) | + ((u_int64_t)(temp & 0xff00) << 24); + temp = ATA_IDX_INW(ch, ATA_CYL_LSB); + request->u.ata.lba |= ((u_int64_t)(temp & 0x00ff) << 8) | + ((u_int64_t)(temp & 0xff00) << 32); + temp = ATA_IDX_INW(ch, ATA_CYL_MSB); + request->u.ata.lba |= ((u_int64_t)(temp & 0x00ff) << 16) | + ((u_int64_t)(temp & 0xff00) << 40); + } + else { + request->u.ata.count = ATA_IDX_INW(ch, ATA_COUNT) & 0x00ff; + request->u.ata.lba = (ATA_IDX_INW(ch, ATA_SECTOR) & 0x00ff) | + ((ATA_IDX_INW(ch, ATA_CYL_LSB) & 0x00ff) << 8) | + ((ATA_IDX_INW(ch, ATA_CYL_MSB) & 0x00ff) << 16) | + ((ATA_IDX_INW(ch, ATA_DRIVE) & 0xf) << 24); + } +} + +static void +ata_serverworks_tf_write(struct ata_request *request) +{ + struct ata_channel *ch = device_get_softc(device_get_parent(request->dev)); + struct ata_device *atadev = device_get_softc(request->dev); + + if (atadev->flags & ATA_D_48BIT_ACTIVE) { + ATA_IDX_OUTW(ch, ATA_FEATURE, request->u.ata.feature); + ATA_IDX_OUTW(ch, ATA_COUNT, request->u.ata.count); + ATA_IDX_OUTW(ch, ATA_SECTOR, ((request->u.ata.lba >> 16) & 0xff00) | + (request->u.ata.lba & 0x00ff)); + ATA_IDX_OUTW(ch, ATA_CYL_LSB, ((request->u.ata.lba >> 24) & 0xff00) | + ((request->u.ata.lba >> 8) & 0x00ff)); + ATA_IDX_OUTW(ch, ATA_CYL_MSB, ((request->u.ata.lba >> 32) & 0xff00) | + ((request->u.ata.lba >> 16) & 0x00ff)); + ATA_IDX_OUTW(ch, ATA_DRIVE, ATA_D_LBA | atadev->unit); + } + else { + ATA_IDX_OUTW(ch, ATA_FEATURE, request->u.ata.feature); + ATA_IDX_OUTW(ch, ATA_COUNT, request->u.ata.count); + if (atadev->flags & ATA_D_USE_CHS) { + int heads, sectors; + + if (atadev->param.atavalid & ATA_FLAG_54_58) { + heads = atadev->param.current_heads; + sectors = atadev->param.current_sectors; + } + else { + heads = atadev->param.heads; + sectors = atadev->param.sectors; + } + ATA_IDX_OUTW(ch, ATA_SECTOR, (request->u.ata.lba % sectors)+1); + ATA_IDX_OUTW(ch, ATA_CYL_LSB, + (request->u.ata.lba / (sectors * heads))); + ATA_IDX_OUTW(ch, ATA_CYL_MSB, + (request->u.ata.lba / (sectors * heads)) >> 8); + ATA_IDX_OUTW(ch, ATA_DRIVE, ATA_D_IBM | atadev->unit | + (((request->u.ata.lba% (sectors * heads)) / + sectors) & 0xf)); + } + else { + ATA_IDX_OUTW(ch, ATA_SECTOR, request->u.ata.lba); + ATA_IDX_OUTW(ch, ATA_CYL_LSB, request->u.ata.lba >> 8); + ATA_IDX_OUTW(ch, ATA_CYL_MSB, request->u.ata.lba >> 16); + ATA_IDX_OUTW(ch, ATA_DRIVE, + ATA_D_IBM | ATA_D_LBA | atadev->unit | + ((request->u.ata.lba >> 24) & 0x0f)); + } + } +} + +static void ata_serverworks_setmode(device_t dev, int mode) { device_t gparent = GRANDPARENT(dev); @@ -4562,7 +4678,7 @@ if ((ctlr->chip->cfg2 & SIIBUG) && ch->dma) { /* work around errata in early chips */ - ch->dma->boundary = 16 * DEV_BSIZE; + ch->dma->boundary = 8192; ch->dma->segsize = 15 * DEV_BSIZE; } ==== //depot/projects/dtrace/src/sys/dev/ata/ata-dma.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.149 2007/11/20 04:52:19 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.150 2007/12/13 11:47:36 sos Exp $"); #include #include @@ -75,7 +75,7 @@ ch->dma->load = ata_dmaload; ch->dma->unload = ata_dmaunload; ch->dma->alignment = 2; - ch->dma->boundary = 128 * DEV_BSIZE; + ch->dma->boundary = 65536; ch->dma->segsize = 128 * DEV_BSIZE; ch->dma->max_iosize = 128 * DEV_BSIZE; ch->dma->max_address = BUS_SPACE_MAXADDR_32BIT; ==== //depot/projects/dtrace/src/sys/dev/ata/ata-lowlevel.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.79 2007/04/06 16:18:59 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.80 2007/12/13 11:47:36 sos Exp $"); #include "opt_ata.h" #include @@ -50,6 +50,8 @@ static int ata_wait(struct ata_channel *ch, struct ata_device *, u_int8_t); static void ata_pio_read(struct ata_request *, int); static void ata_pio_write(struct ata_request *, int); +static void ata_tf_read(struct ata_request *); +static void ata_tf_write(struct ata_request *); /* * low level ATA functions @@ -63,6 +65,8 @@ ch->hw.end_transaction = ata_end_transaction; ch->hw.status = ata_generic_status; ch->hw.command = ata_generic_command; + ch->hw.tf_read = ata_tf_read; + ch->hw.tf_write = ata_tf_write; } /* must be called with ATA channel locked and state_mtx held */ @@ -244,28 +248,7 @@ /* on control commands read back registers to the request struct */ if (request->flags & ATA_R_CONTROL) { - if (atadev->flags & ATA_D_48BIT_ACTIVE) { - ATA_IDX_OUTB(ch, ATA_CONTROL, ATA_A_4BIT | ATA_A_HOB); - request->u.ata.count = (ATA_IDX_INB(ch, ATA_COUNT) << 8); - request->u.ata.lba = - ((u_int64_t)(ATA_IDX_INB(ch, ATA_SECTOR)) << 24) | - ((u_int64_t)(ATA_IDX_INB(ch, ATA_CYL_LSB)) << 32) | - ((u_int64_t)(ATA_IDX_INB(ch, ATA_CYL_MSB)) << 40); - - ATA_IDX_OUTB(ch, ATA_CONTROL, ATA_A_4BIT); - request->u.ata.count |= ATA_IDX_INB(ch, ATA_COUNT); - request->u.ata.lba |= - (ATA_IDX_INB(ch, ATA_SECTOR) | - (ATA_IDX_INB(ch, ATA_CYL_LSB) << 8) | - (ATA_IDX_INB(ch, ATA_CYL_MSB) << 16)); - } - else { - request->u.ata.count = ATA_IDX_INB(ch, ATA_COUNT); - request->u.ata.lba = ATA_IDX_INB(ch, ATA_SECTOR) | - (ATA_IDX_INB(ch, ATA_CYL_LSB) << 8) | - (ATA_IDX_INB(ch, ATA_CYL_MSB) << 16) | - ((ATA_IDX_INB(ch, ATA_DRIVE) & 0xf) << 24); - } + ch->hw.tf_read(request); } /* if we got an error we are done with the HW */ @@ -734,57 +717,96 @@ ATA_PROTO_ATAPI_12 ? 6 : 8); } else { - if (atadev->flags & ATA_D_48BIT_ACTIVE) { - ATA_IDX_OUTB(ch, ATA_FEATURE, request->u.ata.feature >> 8); - ATA_IDX_OUTB(ch, ATA_FEATURE, request->u.ata.feature); - ATA_IDX_OUTB(ch, ATA_COUNT, request->u.ata.count >> 8); - ATA_IDX_OUTB(ch, ATA_COUNT, request->u.ata.count); - ATA_IDX_OUTB(ch, ATA_SECTOR, request->u.ata.lba >> 24); - ATA_IDX_OUTB(ch, ATA_SECTOR, request->u.ata.lba); - ATA_IDX_OUTB(ch, ATA_CYL_LSB, request->u.ata.lba >> 32); - ATA_IDX_OUTB(ch, ATA_CYL_LSB, request->u.ata.lba >> 8); - ATA_IDX_OUTB(ch, ATA_CYL_MSB, request->u.ata.lba >> 40); - ATA_IDX_OUTB(ch, ATA_CYL_MSB, request->u.ata.lba >> 16); - ATA_IDX_OUTB(ch, ATA_DRIVE, ATA_D_LBA | atadev->unit); - } - else { - ATA_IDX_OUTB(ch, ATA_FEATURE, request->u.ata.feature); - ATA_IDX_OUTB(ch, ATA_COUNT, request->u.ata.count); - if (atadev->flags & ATA_D_USE_CHS) { - int heads, sectors; + ch->hw.tf_write(request); + + /* issue command to controller */ + ATA_IDX_OUTB(ch, ATA_COMMAND, request->u.ata.command); + } + return 0; +} + +static void +ata_tf_read(struct ata_request *request) +{ + struct ata_channel *ch = device_get_softc(device_get_parent(request->dev)); + struct ata_device *atadev = device_get_softc(request->dev); + + if (atadev->flags & ATA_D_48BIT_ACTIVE) { + ATA_IDX_OUTB(ch, ATA_CONTROL, ATA_A_4BIT | ATA_A_HOB); + request->u.ata.count = (ATA_IDX_INB(ch, ATA_COUNT) << 8); + request->u.ata.lba = + ((u_int64_t)(ATA_IDX_INB(ch, ATA_SECTOR)) << 24) | + ((u_int64_t)(ATA_IDX_INB(ch, ATA_CYL_LSB)) << 32) | + ((u_int64_t)(ATA_IDX_INB(ch, ATA_CYL_MSB)) << 40); + + ATA_IDX_OUTB(ch, ATA_CONTROL, ATA_A_4BIT); + request->u.ata.count |= ATA_IDX_INB(ch, ATA_COUNT); + request->u.ata.lba |= + (ATA_IDX_INB(ch, ATA_SECTOR) | + (ATA_IDX_INB(ch, ATA_CYL_LSB) << 8) | + (ATA_IDX_INB(ch, ATA_CYL_MSB) << 16)); + } + else { + request->u.ata.count = ATA_IDX_INB(ch, ATA_COUNT); + request->u.ata.lba = ATA_IDX_INB(ch, ATA_SECTOR) | + (ATA_IDX_INB(ch, ATA_CYL_LSB) << 8) | + (ATA_IDX_INB(ch, ATA_CYL_MSB) << 16) | + ((ATA_IDX_INB(ch, ATA_DRIVE) & 0xf) << 24); + } +} + +static void +ata_tf_write(struct ata_request *request) +{ + struct ata_channel *ch = device_get_softc(device_get_parent(request->dev)); + struct ata_device *atadev = device_get_softc(request->dev); + + if (atadev->flags & ATA_D_48BIT_ACTIVE) { + ATA_IDX_OUTB(ch, ATA_FEATURE, request->u.ata.feature >> 8); + ATA_IDX_OUTB(ch, ATA_FEATURE, request->u.ata.feature); + ATA_IDX_OUTB(ch, ATA_COUNT, request->u.ata.count >> 8); + ATA_IDX_OUTB(ch, ATA_COUNT, request->u.ata.count); + ATA_IDX_OUTB(ch, ATA_SECTOR, request->u.ata.lba >> 24); + ATA_IDX_OUTB(ch, ATA_SECTOR, request->u.ata.lba); + ATA_IDX_OUTB(ch, ATA_CYL_LSB, request->u.ata.lba >> 32); + ATA_IDX_OUTB(ch, ATA_CYL_LSB, request->u.ata.lba >> 8); + ATA_IDX_OUTB(ch, ATA_CYL_MSB, request->u.ata.lba >> 40); + ATA_IDX_OUTB(ch, ATA_CYL_MSB, request->u.ata.lba >> 16); + ATA_IDX_OUTB(ch, ATA_DRIVE, ATA_D_LBA | atadev->unit); + } + else { + ATA_IDX_OUTB(ch, ATA_FEATURE, request->u.ata.feature); + ATA_IDX_OUTB(ch, ATA_COUNT, request->u.ata.count); + if (atadev->flags & ATA_D_USE_CHS) { + int heads, sectors; - if (atadev->param.atavalid & ATA_FLAG_54_58) { - heads = atadev->param.current_heads; - sectors = atadev->param.current_sectors; - } - else { - heads = atadev->param.heads; - sectors = atadev->param.sectors; - } - ATA_IDX_OUTB(ch, ATA_SECTOR, (request->u.ata.lba % sectors)+1); - ATA_IDX_OUTB(ch, ATA_CYL_LSB, - (request->u.ata.lba / (sectors * heads))); - ATA_IDX_OUTB(ch, ATA_CYL_MSB, - (request->u.ata.lba / (sectors * heads)) >> 8); - ATA_IDX_OUTB(ch, ATA_DRIVE, ATA_D_IBM | atadev->unit | - (((request->u.ata.lba% (sectors * heads)) / - sectors) & 0xf)); + if (atadev->param.atavalid & ATA_FLAG_54_58) { + heads = atadev->param.current_heads; + sectors = atadev->param.current_sectors; } else { - ATA_IDX_OUTB(ch, ATA_SECTOR, request->u.ata.lba); - ATA_IDX_OUTB(ch, ATA_CYL_LSB, request->u.ata.lba >> 8); - ATA_IDX_OUTB(ch, ATA_CYL_MSB, request->u.ata.lba >> 16); - ATA_IDX_OUTB(ch, ATA_DRIVE, - ATA_D_IBM | ATA_D_LBA | atadev->unit | - ((request->u.ata.lba >> 24) & 0x0f)); + heads = atadev->param.heads; + sectors = atadev->param.sectors; } + + ATA_IDX_OUTB(ch, ATA_SECTOR, (request->u.ata.lba % sectors)+1); + ATA_IDX_OUTB(ch, ATA_CYL_LSB, + (request->u.ata.lba / (sectors * heads))); + ATA_IDX_OUTB(ch, ATA_CYL_MSB, + (request->u.ata.lba / (sectors * heads)) >> 8); + ATA_IDX_OUTB(ch, ATA_DRIVE, ATA_D_IBM | atadev->unit | + (((request->u.ata.lba% (sectors * heads)) / + sectors) & 0xf)); } - - /* issue command to controller */ - ATA_IDX_OUTB(ch, ATA_COMMAND, request->u.ata.command); + else { + ATA_IDX_OUTB(ch, ATA_SECTOR, request->u.ata.lba); + ATA_IDX_OUTB(ch, ATA_CYL_LSB, request->u.ata.lba >> 8); + ATA_IDX_OUTB(ch, ATA_CYL_MSB, request->u.ata.lba >> 16); + ATA_IDX_OUTB(ch, ATA_DRIVE, + ATA_D_IBM | ATA_D_LBA | atadev->unit | + ((request->u.ata.lba >> 24) & 0x0f)); + } } - - return 0; } static void ==== //depot/projects/dtrace/src/sys/dev/sound/pci/hda/hdac.c#16 (text+ko) ==== @@ -84,7 +84,7 @@ #define HDA_DRV_TEST_REV "20071129_0050" #define HDA_WIDGET_PARSER_REV 1 -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/hda/hdac.c,v 1.49 2007/12/02 16:38:28 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/hda/hdac.c,v 1.51 2007/12/13 15:48:45 ariff Exp $"); #define HDA_BOOTVERBOSE(stmt) do { \ if (bootverbose != 0 || snd_verbose > 3) { \ @@ -179,6 +179,7 @@ #define HP_XW4300_SUBVENDOR HDA_MODEL_CONSTRUCT(HP, 0x3013) #define HP_3010_SUBVENDOR HDA_MODEL_CONSTRUCT(HP, 0x3010) #define HP_DV5000_SUBVENDOR HDA_MODEL_CONSTRUCT(HP, 0x30a5) +#define HP_DC7700S_SUBVENDOR HDA_MODEL_CONSTRUCT(HP, 0x2801) #define HP_DC7700_SUBVENDOR HDA_MODEL_CONSTRUCT(HP, 0x2802) #define HP_ALL_SUBVENDOR HDA_MODEL_CONSTRUCT(HP, 0xffff) /* What is wrong with XN 2563 anyway? (Got the picture ?) */ @@ -2168,6 +2169,18 @@ default: break; } + } else if (id == HDA_CODEC_ALC268 && + HDA_DEV_MATCH(ACER_ALL_SUBVENDOR, sc->pci_subvendor)) { + switch (nid) { + case 28: + config &= ~(HDA_CONFIG_DEFAULTCONF_DEVICE_MASK | + HDA_CONFIG_DEFAULTCONF_CONNECTIVITY_MASK); + config |= (HDA_CONFIG_DEFAULTCONF_DEVICE_CD | + HDA_CONFIG_DEFAULTCONF_CONNECTIVITY_FIXED); + break; + default: + break; + } } HDA_BOOTVERBOSE( @@ -4292,7 +4305,18 @@ } break; case HDA_CODEC_ALC262: - if (subvendor == HP_DC7700_SUBVENDOR) { + if (subvendor == HP_DC7700S_SUBVENDOR) { + ctl = hdac_audio_ctl_amp_get(devinfo, 21, 0, 1); + if (ctl != NULL && ctl->widget != NULL) { + ctl->ossmask = SOUND_MASK_PHONEOUT; + ctl->widget->ctlflags |= SOUND_MASK_PHONEOUT; + } + ctl = hdac_audio_ctl_amp_get(devinfo, 22, 0, 1); + if (ctl != NULL && ctl->widget != NULL) { + ctl->ossmask = SOUND_MASK_SPEAKER; + ctl->widget->ctlflags |= SOUND_MASK_SPEAKER; + } + } else if (subvendor == HP_DC7700_SUBVENDOR) { ctl = hdac_audio_ctl_amp_get(devinfo, 22, 0, 1); if (ctl != NULL && ctl->widget != NULL) { ctl->ossmask = SOUND_MASK_SPEAKER; ==== //depot/projects/dtrace/src/tools/tools/ath/athdebug/athdebug.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/tools/tools/ath/athdebug/athdebug.c,v 1.3 2007/12/04 05:52:58 sam Exp $ + * $FreeBSD: src/tools/tools/ath/athdebug/athdebug.c,v 1.4 2007/12/13 02:01:01 sam Exp $ */ /* @@ -67,6 +67,7 @@ ATH_DEBUG_LED = 0x00100000, /* led management */ ATH_DEBUG_FF = 0x00200000, /* fast frames */ ATH_DEBUG_DFS = 0x00400000, /* DFS processing */ + ATH_DEBUG_TDMA = 0x00800000, /* TDMA processing */ ATH_DEBUG_FATAL = 0x80000000, /* fatal errors */ ATH_DEBUG_ANY = 0xffffffff }; @@ -95,6 +96,7 @@ { "led", ATH_DEBUG_LED }, { "ff", ATH_DEBUG_FF }, { "dfs", ATH_DEBUG_DFS }, + { "tdma", ATH_DEBUG_TDMA }, { "fatal", ATH_DEBUG_FATAL }, }; @@ -135,7 +137,7 @@ int main(int argc, char *argv[]) { - const char *ifname = "ath0"; + const char *ifname; const char *cp, *tp; const char *sep; int c, op, i; @@ -143,6 +145,9 @@ size_t debuglen; char oid[256]; + ifname = getenv("ATH"); + if (ifname == NULL) + ifname = "ath0"; progname = argv[0]; if (argc > 1) { if (strcmp(argv[1], "-i") == 0) { ==== //depot/projects/dtrace/src/tools/tools/ath/athstats/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/tools/tools/ath/athstats/Makefile,v 1.4 2007/02/02 02:39:56 sam Exp $ +# $FreeBSD: src/tools/tools/ath/athstats/Makefile,v 1.5 2007/12/13 01:39:30 sam Exp $ PROG= athstats BINDIR= /usr/local/bin @@ -9,9 +9,15 @@ .include CFLAGS+= -I. -CLEANFILES+= opt_ah.h +CLEANFILES+= opt_ah.h ah_osdep.h + +CFLAGS+=-I../../../../sys/contrib/dev/ath +CFLAGS+=-I../../../../sys/net80211 +CFLAGS+=-I../../../../sys/dev/ath -athstats.o: opt_ah.h +athstats.o: opt_ah.h ah_osdep.h opt_ah.h: touch opt_ah.h +ah_osdep.h: + touch ah_osdep.h ==== //depot/projects/dtrace/src/tools/tools/ath/athstats/athstats.c#7 (text+ko) ==== @@ -26,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/tools/tools/ath/athstats/athstats.c,v 1.6 2007/12/04 05:52:58 sam Exp $ + * $FreeBSD: src/tools/tools/ath/athstats/athstats.c,v 1.7 2007/12/13 01:39:30 sam Exp $ */ /* @@ -41,256 +41,258 @@ #include #include +#include #include #include #include #include -#include "../../../../sys/contrib/dev/ath/ah_desc.h" -#include "../../../../sys/net80211/ieee80211_ioctl.h" -#include "../../../../sys/net80211/ieee80211_radiotap.h" -#include "../../../../sys/dev/ath/if_athioctl.h" +#include "ah.h" +#include "ah_desc.h" +#include "ieee80211_ioctl.h" +#include "ieee80211_radiotap.h" +#include "if_athioctl.h" #include "athstats.h" #define NOTPRESENT { 0, "", "" } +#define AFTER(prev) ((prev)+1) + static const struct fmt athstats[] = { #define S_INPUT 0 { 8, "input", "input", "data frames received" }, -#define S_OUTPUT 1 +#define S_OUTPUT AFTER(S_INPUT) { 8, "output", "output", "data frames transmit" }, -#define S_TX_ALTRATE 2 +#define S_TX_ALTRATE AFTER(S_OUTPUT) { 7, "altrate", "altrate", "tx frames with an alternate rate" }, -#define S_TX_SHORTRETRY 3 +#define S_TX_SHORTRETRY AFTER(S_TX_ALTRATE) { 7, "short", "short", "short on-chip tx retries" }, -#define S_TX_LONGRETRY 4 +#define S_TX_LONGRETRY AFTER(S_TX_SHORTRETRY) { 7, "long", "long", "long on-chip tx retries" }, -#define S_TX_XRETRIES 5 +#define S_TX_XRETRIES AFTER(S_TX_LONGRETRY) { 6, "xretry", "xretry", "tx failed 'cuz too many retries" }, -#define S_MIB 6 +#define S_MIB AFTER(S_TX_XRETRIES) { 5, "mib", "mib", "mib overflow interrupts" }, #ifndef __linux__ -#define S_TX_LINEAR 7 +#define S_TX_LINEAR AFTER(S_MIB) { 5, "txlinear", "txlinear", "tx linearized to cluster" }, -#define S_BSTUCK 8 +#define S_BSTUCK AFTER(S_TX_LINEAR) { 5, "bstuck", "bstuck", "stuck beacon conditions" }, -#define S_INTRCOAL 9 +#define S_INTRCOAL AFTER(S_BSTUCK) { 5, "intrcoal", "intrcoal", "interrupts coalesced" }, +#define S_RATE AFTER(S_INTRCOAL) #else - NOTPRESENT, NOTPRESENT, NOTPRESENT, +#define S_RATE AFTER(S_MIB) #endif -#define S_RATE 10 { 4, "rate", "rate", "current transmit rate" }, -#define S_WATCHDOG 11 +#define S_WATCHDOG AFTER(S_RATE) { 5, "wdog", "wdog", "watchdog timeouts" }, -#define S_FATAL 12 +#define S_FATAL AFTER(S_WATCHDOG) { 5, "fatal", "fatal", "hardware error interrupts" }, -#define S_BMISS 13 +#define S_BMISS AFTER(S_FATAL) { 5, "bmiss", "bmiss", "beacon miss interrupts" }, -#define S_RXORN 14 +#define S_RXORN AFTER(S_BMISS) { 5, "rxorn", "rxorn", "recv overrun interrupts" }, -#define S_RXEOL 15 +#define S_RXEOL AFTER(S_RXORN) { 5, "rxeol", "rxeol", "recv eol interrupts" }, -#define S_TXURN 16 +#define S_TXURN AFTER(S_RXEOL) { 5, "txurn", "txurn", "txmit underrun interrupts" }, -#define S_TX_MGMT 17 +#define S_TX_MGMT AFTER(S_TXURN) { 5, "txmgt", "txmgt", "tx management frames" }, -#define S_TX_DISCARD 18 +#define S_TX_DISCARD AFTER(S_TX_MGMT) { 5, "txdisc", "txdisc", "tx frames discarded prior to association" }, -#define S_TX_INVALID 19 +#define S_TX_INVALID AFTER(S_TX_DISCARD) { 5, "txinv", "txinv", "tx invalid (19)" }, -#define S_TX_QSTOP 20 +#define S_TX_QSTOP AFTER(S_TX_INVALID) { 5, "qstop", "qstop", "tx stopped 'cuz no xmit buffer" }, -#define S_TX_ENCAP 21 +#define S_TX_ENCAP AFTER(S_TX_QSTOP) { 5, "txencode", "txencode", "tx encapsulation failed" }, -#define S_TX_NONODE 22 +#define S_TX_NONODE AFTER(S_TX_ENCAP) { 5, "txnonode", "txnonode", "tx failed 'cuz no node" }, -#define S_TX_NOMBUF 23 +#define S_TX_NOMBUF AFTER(S_TX_NONODE) { 5, "txnombuf", "txnombuf", "tx failed 'cuz mbuf allocation failed" }, #ifndef __linux__ -#define S_TX_NOMCL 24 +#define S_TX_NOMCL AFTER(S_TX_NOMBUF) { 5, "txnomcl", "txnomcl", "tx failed 'cuz cluster allocation failed" }, +#define S_TX_FIFOERR AFTER(S_TX_NOMCL) #else - NOTPRESENT, +#define S_TX_FIFOERR AFTER(S_TX_NOMBUF) #endif -#define S_TX_FIFOERR 25 { 5, "efifo", "efifo", "tx failed 'cuz FIFO underrun" }, -#define S_TX_FILTERED 26 +#define S_TX_FILTERED AFTER(S_TX_FIFOERR) { 5, "efilt", "efilt", "tx failed 'cuz destination filtered" }, -#define S_TX_BADRATE 27 +#define S_TX_BADRATE AFTER(S_TX_FILTERED) { 5, "txbadrate", "txbadrate", "tx failed 'cuz bogus xmit rate" }, -#define S_TX_NOACK 28 +#define S_TX_NOACK AFTER(S_TX_BADRATE) { 5, "noack", "noack", "tx frames with no ack marked" }, -#define S_TX_RTS 29 +#define S_TX_RTS AFTER(S_TX_NOACK) { 5, "rts", "rts", "tx frames with rts enabled" }, -#define S_TX_CTS 30 +#define S_TX_CTS AFTER(S_TX_RTS) { 5, "cts", "cts", "tx frames with cts enabled" }, -#define S_TX_SHORTPRE 31 +#define S_TX_SHORTPRE AFTER(S_TX_CTS) { 5, "shpre", "shpre", "tx frames with short preamble" }, -#define S_TX_PROTECT 32 +#define S_TX_PROTECT AFTER(S_TX_SHORTPRE) { 5, "protect", "protect", "tx frames with 11g protection" }, -#define S_RX_ORN 33 +#define S_RX_ORN AFTER(S_TX_PROTECT) { 5, "rxorn", "rxorn", "rx failed 'cuz of desc overrun" }, -#define S_RX_CRC_ERR 34 +#define S_RX_CRC_ERR AFTER(S_RX_ORN) { 6, "crcerr", "crcerr", "rx failed 'cuz of bad CRC" }, -#define S_RX_FIFO_ERR 35 +#define S_RX_FIFO_ERR AFTER(S_RX_CRC_ERR) { 5, "rxfifo", "rxfifo", "rx failed 'cuz of FIFO overrun" }, -#define S_RX_CRYPTO_ERR 36 +#define S_RX_CRYPTO_ERR AFTER(S_RX_FIFO_ERR) { 5, "crypt", "crypt", "rx failed 'cuz decryption" }, -#define S_RX_MIC_ERR 37 +#define S_RX_MIC_ERR AFTER(S_RX_CRYPTO_ERR) { 4, "mic", "mic", "rx failed 'cuz MIC failure" }, -#define S_RX_TOOSHORT 38 +#define S_RX_TOOSHORT AFTER(S_RX_MIC_ERR) { 5, "rxshort", "rxshort", "rx failed 'cuz frame too short" }, -#define S_RX_NOMBUF 39 +#define S_RX_NOMBUF AFTER(S_RX_TOOSHORT) { 5, "rxnombuf", "rxnombuf", "rx setup failed 'cuz no mbuf" }, -#define S_RX_MGT 40 +#define S_RX_MGT AFTER(S_RX_NOMBUF) { 5, "rxmgt", "rxmgt", "rx management frames" }, -#define S_RX_CTL 41 +#define S_RX_CTL AFTER(S_RX_MGT) { 5, "rxctl", "rxctl", "rx control frames" }, -#define S_RX_PHY_ERR 42 +#define S_RX_PHY_ERR AFTER(S_RX_CTL) { 7, "phyerr", "phyerr", "rx failed 'cuz of PHY err" }, -#define S_RX_PHY_UNDERRUN 43 +#define S_RX_PHY_UNDERRUN AFTER(S_RX_PHY_ERR) { 6, "phyund", "phyund", "transmit underrun" }, -#define S_RX_PHY_TIMING 44 +#define S_RX_PHY_TIMING AFTER(S_RX_PHY_UNDERRUN) { 6, "phytim", "phytim", "timing error" }, -#define S_RX_PHY_PARITY 45 +#define S_RX_PHY_PARITY AFTER(S_RX_PHY_TIMING) { 6, "phypar", "phypar", "illegal parity" }, -#define S_RX_PHY_RATE 46 +#define S_RX_PHY_RATE AFTER(S_RX_PHY_PARITY) { 6, "phyrate", "phyrate", "illegal rate" }, -#define S_RX_PHY_LENGTH 47 +#define S_RX_PHY_LENGTH AFTER(S_RX_PHY_RATE) { 6, "phylen", "phylen", "illegal length" }, -#define S_RX_PHY_RADAR 48 +#define S_RX_PHY_RADAR AFTER(S_RX_PHY_LENGTH) { 6, "phyradar", "phyradar", "radar detect" }, -#define S_RX_PHY_SERVICE 49 +#define S_RX_PHY_SERVICE AFTER(S_RX_PHY_RADAR) { 6, "physervice", "physervice", "illegal service" }, -#define S_RX_PHY_TOR 50 +#define S_RX_PHY_TOR AFTER(S_RX_PHY_SERVICE) { 6, "phytor", "phytor", "transmit override receive" }, -#define S_RX_PHY_OFDM_TIMING 51 +#define S_RX_PHY_OFDM_TIMING AFTER(S_RX_PHY_TOR) { 6, "ofdmtim", "ofdmtim", "OFDM timing" }, -#define S_RX_PHY_OFDM_SIGNAL_PARITY 52 +#define S_RX_PHY_OFDM_SIGNAL_PARITY AFTER(S_RX_PHY_OFDM_TIMING) { 6, "ofdmsig", "ofdmsig", "OFDM illegal parity" }, -#define S_RX_PHY_OFDM_RATE_ILLEGAL 53 +#define S_RX_PHY_OFDM_RATE_ILLEGAL AFTER(S_RX_PHY_OFDM_SIGNAL_PARITY) { 6, "ofdmrate", "ofdmrate", "OFDM illegal rate" }, -#define S_RX_PHY_OFDM_POWER_DROP 54 +#define S_RX_PHY_OFDM_POWER_DROP AFTER(S_RX_PHY_OFDM_RATE_ILLEGAL) { 6, "ofdmpow", "ofdmpow", "OFDM power drop" }, -#define S_RX_PHY_OFDM_SERVICE 55 +#define S_RX_PHY_OFDM_SERVICE AFTER(S_RX_PHY_OFDM_POWER_DROP) { 6, "ofdmservice", "ofdmservice", "OFDM illegal service" }, -#define S_RX_PHY_OFDM_RESTART 56 +#define S_RX_PHY_OFDM_RESTART AFTER(S_RX_PHY_OFDM_SERVICE) { 6, "ofdmrestart", "ofdmrestart", "OFDM restart" }, -#define S_RX_PHY_CCK_TIMING 57 +#define S_RX_PHY_CCK_TIMING AFTER(S_RX_PHY_OFDM_RESTART) { 6, "ccktim", "ccktim", "CCK timing" }, -#define S_RX_PHY_CCK_HEADER_CRC 58 +#define S_RX_PHY_CCK_HEADER_CRC AFTER(S_RX_PHY_CCK_TIMING) { 6, "cckhead", "cckhead", "CCK header crc" }, -#define S_RX_PHY_CCK_RATE_ILLEGAL 59 +#define S_RX_PHY_CCK_RATE_ILLEGAL AFTER(S_RX_PHY_CCK_HEADER_CRC) { 6, "cckrate", "cckrate", "CCK illegal rate" }, -#define S_RX_PHY_CCK_SERVICE 60 +#define S_RX_PHY_CCK_SERVICE AFTER(S_RX_PHY_CCK_RATE_ILLEGAL) { 6, "cckservice", "cckservice", "CCK illegal service" }, -#define S_RX_PHY_CCK_RESTART 61 +#define S_RX_PHY_CCK_RESTART AFTER(S_RX_PHY_CCK_SERVICE) { 6, "cckrestar", "cckrestar", "CCK restart" }, -#define S_BE_NOMBUF 62 +#define S_BE_NOMBUF AFTER(S_RX_PHY_CCK_RESTART) { 4, "benombuf", "benombuf", "beacon setup failed 'cuz no mbuf" }, -#define S_BE_XMIT 63 +#define S_BE_XMIT AFTER(S_BE_NOMBUF) { 7, "bexmit", "bexmit", "beacons transmitted" }, -#define S_PER_CAL 64 +#define S_PER_CAL AFTER(S_BE_XMIT) { 4, "pcal", "pcal", "periodic calibrations" }, -#define S_PER_CALFAIL 65 +#define S_PER_CALFAIL AFTER(S_PER_CAL) { 4, "pcalf", "pcalf", "periodic calibration failures" }, -#define S_PER_RFGAIN 66 +#define S_PER_RFGAIN AFTER(S_PER_CALFAIL) { 4, "prfga", "prfga", "rfgain value change" }, -#if 0 -#define S_TDMA_UPDATE 67 +#if ATH_SUPPORT_TDMA +#define S_TDMA_UPDATE AFTER(S_PER_RFGAIN) { 5, "tdmau", "tdmau", "TDMA slot timing updates" }, -#define S_TDMA_TIMERS 68 +#define S_TDMA_TIMERS AFTER(S_TDMA_UPDATE) { 5, "tdmab", "tdmab", "TDMA slot update set beacon timers" }, -#define S_TDMA_TSF 69 +#define S_TDMA_TSF AFTER(S_TDMA_TIMERS) { 5, "tdmat", "tdmat", "TDMA slot update set TSF" }, +#define S_RATE_CALLS AFTER(S_TDMA_TSF) #else - NOTPRESENT, NOTPRESENT, NOTPRESENT, +#define S_RATE_CALLS AFTER(S_PER_RFGAIN) #endif -#define S_RATE_CALLS 70 { 5, "ratec", "ratec", "rate control checks" }, -#define S_RATE_RAISE 71 +#define S_RATE_RAISE AFTER(S_RATE_CALLS) { 5, "rate+", "rate+", "rate control raised xmit rate" }, -#define S_RATE_DROP 72 +#define S_RATE_DROP AFTER(S_RATE_RAISE) { 5, "rate-", "rate-", "rate control dropped xmit rate" }, -#define S_TX_RSSI 73 +#define S_TX_RSSI AFTER(S_RATE_DROP) { 4, "arssi", "arssi", "rssi of last ack" }, -#define S_RX_RSSI 74 +#define S_RX_RSSI AFTER(S_TX_RSSI) { 4, "rssi", "rssi", "avg recv rssi" }, -#define S_RX_NOISE 75 +#define S_RX_NOISE AFTER(S_RX_RSSI) { 5, "noise", "noise", "rx noise floor" }, -#define S_BMISS_PHANTOM 76 +#define S_BMISS_PHANTOM AFTER(S_RX_NOISE) { 5, "bmissphantom", "bmissphantom", "phantom beacon misses" }, -#define S_TX_RAW 77 +#define S_TX_RAW AFTER(S_BMISS_PHANTOM) { 5, "txraw", "txraw", "tx frames through raw api" }, -#define S_RX_TOOBIG 78 +#define S_RX_TOOBIG AFTER(S_TX_RAW) { 5, "rx2big", "rx2big", "rx failed 'cuz frame too large" }, #ifndef __linux__ -#define S_CABQ_XMIT 79 +#define S_CABQ_XMIT AFTER(S_RX_TOOBIG) { 5, "cabxmit", "cabxmit", "cabq frames transmitted" }, -#define S_CABQ_BUSY 80 +#define S_CABQ_BUSY AFTER(S_CABQ_XMIT) { 5, "cabqbusy", "cabqbusy", "cabq xmit overflowed beacon interval" }, -#define S_TX_NODATA 81 +#define S_TX_NODATA AFTER(S_CABQ_BUSY) { 5, "txnodata", "txnodata", "tx discarded empty frame" }, -#define S_TX_BUSDMA 82 +#define S_TX_BUSDMA AFTER(S_TX_NODATA) { 5, "txbusdma", "txbusdma", "tx failed for dma resrcs" }, -#define S_RX_BUSDMA 83 +#define S_RX_BUSDMA AFTER(S_TX_BUSDMA) { 5, "rxbusdma", "rxbusdma", "rx setup failed for dma resrcs" }, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Dec 13 22:28:04 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED94D16A420; Thu, 13 Dec 2007 22:28:03 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 654E416A419 for ; Thu, 13 Dec 2007 22:28:03 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 35C8413C458 for ; Thu, 13 Dec 2007 22:28:03 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBDMS3ut003201 for ; Thu, 13 Dec 2007 22:28:03 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBDMS2xA003198 for perforce@freebsd.org; Thu, 13 Dec 2007 22:28:02 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 13 Dec 2007 22:28:02 GMT Message-Id: <200712132228.lBDMS2xA003198@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 130815 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Dec 2007 22:28:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=130815 Change 130815 by hselasky@hselasky_laptop001 on 2007/12/13 22:27:13 This commit is related to USB device side support. This is the first Device Controller Interface driver I'm writing support for. The hardware might not be the fastest around, but at least it can serve as an example on how to write USB DCI drivers in the future. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/at9100_dci.c#1 add .. //depot/projects/usb/src/sys/dev/usb/at9100_dci.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Dec 13 22:37:26 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 20B6116A419; Thu, 13 Dec 2007 22:37:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C93B516A417 for ; Thu, 13 Dec 2007 22:37:25 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B00D013C45D for ; Thu, 13 Dec 2007 22:37:25 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBDMbP2o004645 for ; Thu, 13 Dec 2007 22:37:25 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBDMbCiZ004642 for perforce@freebsd.org; Thu, 13 Dec 2007 22:37:12 GMT (envelope-from jb@freebsd.org) Date: Thu, 13 Dec 2007 22:37:12 GMT Message-Id: <200712132237.lBDMbCiZ004642@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130817 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Dec 2007 22:37:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=130817 Change 130817 by jb@jb_freebsd1 on 2007/12/13 22:36:35 IF7 This integration excludes //depot/vendor/freebsd_7/src/contrib/opensolaris and //depot/vendor/freebsd_7/src/src/contrib/opensolaris and includes //depot/projects/opensolaris instead. The theory is that it should be possible to have one ported tree of OpenSolaris code (at least for DTrace) that should work across FreeBSD 6/7/8. The differences between those releases can probably be handled in the compatibility headers. ZFS just won't be built on FreeBSD 6. Whether one tree of ZFS code will work for both 7 and 8 remains to be seen. Affected files ... .. //depot/projects/dtrace7/src/ObsoleteFiles.inc#4 integrate .. //depot/projects/dtrace7/src/bin/sh/sh.1#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/CHANGES#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/COPYRIGHT#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/FAQ#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/FAQ.xml#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/Makefile.in#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/README#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/check/check-tool.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/check/named-checkconf.8#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/check/named-checkconf.html#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/check/named-checkzone.8#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/check/named-checkzone.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/check/named-checkzone.html#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/dig/dig.1#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/dig/dig.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/dig/dig.docbook#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/dig/dig.html#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/dig/dighost.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/dig/host.1#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/dig/host.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/dig/host.docbook#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/dig/host.html#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/dig/include/dig/dig.h#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/dig/nslookup.1#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/dig/nslookup.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/dig/nslookup.docbook#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/dig/nslookup.html#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/dnssec/dnssec-keygen.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/dnssec/dnssec-signzone.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/client.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/config.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/control.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/lwresd.8#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/lwresd.docbook#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/lwresd.html#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/named.8#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/named.conf.5#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/named.conf.docbook#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/named.conf.html#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/named.docbook#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/named.html#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/query.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/server.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/named/update.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/nsupdate/nsupdate.8#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/nsupdate/nsupdate.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/rndc/Makefile.in#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/rndc/rndc.8#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/rndc/rndc.docbook#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/bin/rndc/rndc.html#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/configure.in#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/Bv9ARM-book.xml#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/Bv9ARM.ch03.html#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/Bv9ARM.ch04.html#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/Bv9ARM.ch05.html#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/Bv9ARM.ch06.html#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/Bv9ARM.ch07.html#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/Bv9ARM.ch08.html#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/Bv9ARM.ch09.html#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/Bv9ARM.ch10.html#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/Bv9ARM.html#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/Bv9ARM.pdf#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/Makefile.in#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/man.dig.html#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/man.dnssec-keygen.html#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/man.dnssec-signzone.html#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/man.host.html#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/man.named-checkconf.html#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/man.named-checkzone.html#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/man.named.html#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/man.rndc-confgen.html#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/man.rndc.conf.html#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/doc/arm/man.rndc.html#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/doc/draft/draft-schlitt-spf-classic-02.txt#2 delete .. //depot/projects/dtrace7/src/contrib/bind9/doc/misc/Makefile.in#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/doc/misc/migration#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/doc/rfc/index#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/doc/rfc/rfc4398.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/rfc/rfc4408.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/rfc/rfc4470.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/rfc/rfc4634.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/doc/rfc/rfc4641.txt#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/lib/bind/api#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/bind/config.h.in#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/bind/configure#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/bind/configure.in#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/bind/dst/dst_api.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/bind/irs/gai_strerror.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/bind/irs/irs_data.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/bind/isc/ctl_clnt.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/bind/make/rules.in#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/bind/nameser/ns_parse.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/bind/port_before.h.in#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/bind/resolv/res_data.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/bind/resolv/res_init.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/bind9/api#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/bind9/check.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/dns/adb.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/dns/api#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/dns/dispatch.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/dns/dnssec.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/dns/include/dns/db.h#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/dns/include/dns/dispatch.h#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/dns/journal.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/dns/lookup.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/dns/master.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/dns/message.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/dns/openssl_link.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/dns/openssldh_link.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/dns/openssldsa_link.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/dns/rbtdb.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/dns/rdataslab.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/dns/resolver.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/dns/rootns.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/dns/sdb.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/dns/sdlz.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/dns/tsig.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/dns/validator.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/dns/view.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/dns/xfrin.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/dns/zone.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/isc/Makefile.in#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/isc/alpha/Makefile.in#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/lib/isc/alpha/include/Makefile.in#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/lib/isc/alpha/include/isc/Makefile.in#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/lib/isc/api#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/isc/arm/include/isc/atomic.h#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/isc/hmacsha.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/isc/ia64/Makefile.in#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/lib/isc/ia64/include/Makefile.in#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/lib/isc/ia64/include/isc/Makefile.in#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/lib/isc/include/isc/platform.h.in#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/isc/include/isc/string.h#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/isc/mem.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/isc/mips/Makefile.in#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/lib/isc/mips/include/Makefile.in#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/lib/isc/mips/include/isc/Makefile.in#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/lib/isc/noatomic/Makefile.in#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/lib/isc/noatomic/include/Makefile.in#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/lib/isc/noatomic/include/isc/Makefile.in#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/lib/isc/powerpc/Makefile.in#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/lib/isc/powerpc/include/Makefile.in#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/lib/isc/powerpc/include/isc/Makefile.in#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/isc/sparc64/Makefile.in#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/lib/isc/sparc64/include/Makefile.in#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/lib/isc/sparc64/include/isc/Makefile.in#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/lib/isc/timer.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/isc/unix/ifiter_getifaddrs.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/isc/unix/net.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/isc/unix/socket.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/isc/unix/syslog.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/isc/x86_32/Makefile.in#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/lib/isc/x86_32/include/Makefile.in#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/lib/isc/x86_32/include/isc/Makefile.in#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/lib/isc/x86_64/Makefile.in#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/lib/isc/x86_64/include/Makefile.in#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/lib/isc/x86_64/include/isc/Makefile.in#1 branch .. //depot/projects/dtrace7/src/contrib/bind9/lib/isccc/symtab.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/isccfg/api#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/lwres/api#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/lwres/context.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/lwres/getaddrinfo.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/lwres/getipnode.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/lwres/lwres_gnba.c#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/lwres/man/lwres.docbook#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/lwres/man/lwres_config.docbook#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/lwres/man/lwres_context.docbook#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/lwres/man/lwres_noop.docbook#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/lwres/man/lwres_packet.docbook#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/make/rules.in#2 integrate .. //depot/projects/dtrace7/src/contrib/bind9/version#2 integrate .. //depot/projects/dtrace7/src/contrib/less/LICENSE#2 integrate .. //depot/projects/dtrace7/src/contrib/less/Makefile.dsm#2 delete .. //depot/projects/dtrace7/src/contrib/less/NEWS#2 integrate .. //depot/projects/dtrace7/src/contrib/less/README#2 integrate .. //depot/projects/dtrace7/src/contrib/less/ch.c#2 integrate .. //depot/projects/dtrace7/src/contrib/less/command.c#2 integrate .. //depot/projects/dtrace7/src/contrib/less/configure#2 integrate .. //depot/projects/dtrace7/src/contrib/less/configure.ac#2 integrate .. //depot/projects/dtrace7/src/contrib/less/decode.c#2 integrate .. //depot/projects/dtrace7/src/contrib/less/defines.ds#2 integrate .. //depot/projects/dtrace7/src/contrib/less/defines.h.in#2 integrate .. //depot/projects/dtrace7/src/contrib/less/defines.o2#2 integrate .. //depot/projects/dtrace7/src/contrib/less/defines.o9#2 integrate .. //depot/projects/dtrace7/src/contrib/less/defines.wn#2 integrate .. //depot/projects/dtrace7/src/contrib/less/edit.c#2 integrate .. //depot/projects/dtrace7/src/contrib/less/filename.c#2 integrate .. //depot/projects/dtrace7/src/contrib/less/funcs.h#2 integrate .. //depot/projects/dtrace7/src/contrib/less/less.h#2 integrate .. //depot/projects/dtrace7/src/contrib/less/less.man#2 integrate .. //depot/projects/dtrace7/src/contrib/less/less.nro#2 integrate .. //depot/projects/dtrace7/src/contrib/less/lessecho.man#2 integrate .. //depot/projects/dtrace7/src/contrib/less/lessecho.nro#2 integrate .. //depot/projects/dtrace7/src/contrib/less/lesskey.man#2 integrate .. //depot/projects/dtrace7/src/contrib/less/lesskey.nro#2 integrate .. //depot/projects/dtrace7/src/contrib/less/line.c#2 integrate .. //depot/projects/dtrace7/src/contrib/less/optfunc.c#2 integrate .. //depot/projects/dtrace7/src/contrib/less/opttbl.c#2 integrate .. //depot/projects/dtrace7/src/contrib/less/screen.c#2 integrate .. //depot/projects/dtrace7/src/contrib/less/search.c#2 integrate .. //depot/projects/dtrace7/src/contrib/less/tags.c#2 integrate .. //depot/projects/dtrace7/src/contrib/less/version.c#2 integrate .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/dtrace.c#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/Makefile#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/Makefile.subdirs#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/README#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/Makefile#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/Makefile#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/baddof.c#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/Makefile#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/badioctl.c#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/32/Makefile#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/64/Makefile#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/Makefile#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/Makefile.com#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/chkargs.c#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Getopt.java#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/JDTrace.java#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Makefile#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/jdtrace.c#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/manifest/jdtrace.jar-manifest#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/Makefile#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/Makefile#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/Makefile.com#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/Makefile#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_FUNC.bad.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_MDIM.bad.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_NULL.bad.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_REDEF.redef.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.avgtoofew.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.maxnoarg.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.mintoofew.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.quantizetoofew.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.sumtoofew.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_AGGARG.bad.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_PROTO.bad.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_IDENT.bad.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_UNDEF.badaggfunc.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badexpr.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badkey3.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.noeffect.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey1.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey2.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey4.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqbad1.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqshort.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASEVAL.bad.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMTYPE.lqbad1.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMVAL.bad.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.order.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.order.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHSTEP.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MISMATCH.lqbadarg.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPLARGE.lqtoofew.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPSMALL.bad.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPTYPE.lqbadinc.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPVAL.bad.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_AGGARG.bad.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_PROTO.bad.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_SCALAR.bad.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_ARG.lquantizetoofew.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgnoarg.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgtoomany.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.counttoomany.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizenoarg.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizetoomany.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxnoarg.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxtoomany.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.minnoarg.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.mintoomany.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizenoarg.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizetoomany.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumnoarg.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumtoomany.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_AGGARG.bad.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badmany.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badnone.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_SCALAR.bad.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count3.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.goodkey.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs1.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signature.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_1.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_2.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.modby0.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.addmin.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.divmin.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muladd.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muldiv.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.basics.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_ARR_BADREF.bad.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRBIG.toobig.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRNULL.bad.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRSUB.bad.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_PROTO_TYPE.badtuple.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_IDENT_UNDEF.badureg.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic1.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic2.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic3.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic4.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic5.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic6.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.uregsarray.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.this.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_ARG.badsig.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toofew.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toomany.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_SYNTAX.errassign.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.tupoflow.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.cpyarray.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.diffprofile.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.initialize.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.invalidref.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.misc.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.orthogonality.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.this.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.valassign.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.begin.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.tick.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_ADDROF_BITFIELD.BitfieldAddress.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.NegBitField.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.ZeroBitField.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.ExceedBaseType.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.GreaterThan64.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFTYPE.badtype.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_OFFSETOF_BITFIELD.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_SIZEOF_BITFIELD.SizeofBitfield.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.BitFieldPromotion.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.SizeofBitField.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.end.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize1.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize2.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize3.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.zerobuf.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.alignring.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.cputime.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.dynvarsize.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize1.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize2.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize3.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring1.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.smallring.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.cpuusage.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.nice.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.priority.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.prsize.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.rssize.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0clause.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8clause.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller1.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid1.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno1.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.execname.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.hpriority.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id1.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl1.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo1.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid1.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo1.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid1.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.timestamp.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.vtimestamp.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggfun.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggtup.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.arrtup.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.body.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.both.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.pred.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.nopred.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.pred.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predfirst.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predlast.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LOCASSC.NonLocalAssoc.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LONGINT.LongStruct.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PARMCLASS.BadStorageClass.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_NAME.VoidName.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_TYPE.Dyn.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VARARGS.VarLenArgs.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VOID.NonSoleVoid.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_SIGNINT.UnsignedStruct.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_VOIDATTR.ShortVoidDecl.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.arrays.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.basics.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.funcs.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.pointers.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.varargsfuncs.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/badptr.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/countdown.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/counter.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/errorpath.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/hello.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/kstat.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/ksyms.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/renormalize.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rtime.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rw.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwinfo.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwtime.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/specopen.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/truss.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/trussrw.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/userfunc.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_AGGREGATION.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DBLERROR.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DYNAMIC.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.end.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPEC.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPECUNAVAIL.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_STKSTROVERFLOW.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/err.D_PDESC_ZERO.InvalidDescription1.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.APIVersion.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.AddSearchPath.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.CoalesceTrace.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ELFGeneration.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.IncludedFilePath.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithFunctions#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithIDs#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithModules#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithNames#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithProviders#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ShowCompilerCode.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceFunctions#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceIDs#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceModule#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceNames#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceProvider#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.VerboseStabilityReport.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.AddSearchPath.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeGiga.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeKilo.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeMega.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeTera.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel32.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel64.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithoutW.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationOut.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationWithO.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus1.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus2.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExtraneousProbeIds.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName1.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName2.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId1.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId2.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId3.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule1.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule2.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule3.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule4.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProbeIdentifier.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider1.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider2.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider3.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider4.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc1.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc2.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc3.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc4.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc5.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc6.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc7.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc8.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc9.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID1.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID2.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID3.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID4.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID5.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID6.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID7.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule1.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule2.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule3.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule4.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule5.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule6.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule7.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule8.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName1.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName2.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName3.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName4.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName5.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName6.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName7.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName8.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName9.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider1.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider2.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider3.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider4.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider5.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.MultipleInvalidProbeId.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.PreprocessorStatement.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.UnDefineNameWithCPP.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbeIdentfier.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbesWithoutZ.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/err.D_IDENT_UNDEF.timespent.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.end.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.endwithoutbegin.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multibeginend.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multiend.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_DECL_IDRED.EnumSameName.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_UNKNOWN.RepeatIdentifiers.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumEquality.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumSameValue.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumValAssign.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_BADADDR.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_DIVZERO.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_UNKNOWN.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.error.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.errorend.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.D_PROTO_LEN.noarg.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.exitarg1.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/tst.basic1.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/err.D_PDESC_ZERO.notreturn.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.basic.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionentry.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionreturnvalue.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.ioctlargs.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offset.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offsetzero.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return0.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.tailcall.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_FUNC_UNDEF.progenyofbad1.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_OP_VFPTR.badop.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.chillbadarg.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.copyoutbadarg.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.mobadarg.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.raisebadarg.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.allocanoarg.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.badbreakpoint.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoofew.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoomany.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrbadarg.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrtoofew.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoofew.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoomany.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoofew.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoomany.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtabadarg.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.panicbadarg.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.progenyofbad2.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.stopbadarg.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_STRINGOF_TYPE.badstringof.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_VAR_UNDEF.badvar.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca2.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy1.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy2.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy3.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy4.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy5.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy6.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badchill.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.chillbadarg.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyout.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutbadaddr.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutstrbadaddr.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoa6badaddr.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoabadaddr.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadaddr.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadarg.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.badfreopen.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.bcopy.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.chill.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.copyin.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.copyinto.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ddi_pathname.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.default.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.freopen.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ftruncate.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ftruncate.ksh.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.hton.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.index.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.index.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa6.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa6.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostr.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostr.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owned.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owner.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_type_adaptive.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.progenyof.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.rand.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strchr.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strchr.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strstr.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strstr.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok_null.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/err.D_ADDROF_LVAL.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/err.D_EMPTY.empty.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/tst.clauses.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/tst.stmts.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_DECL_IDRED.redef1.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_DECL_IDRED.redef2.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_IDENT_UNDEF.recur.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef1.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef2.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineDataAssign.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineExpression.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineKinds.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineKinds.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineTypedef.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineWritableAssign.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/Makefile#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/manifest/test.jar-manifest#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestAbort.java#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestBean.java#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestClose.java#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestDrop.java#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestEnable.java#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestFunctionLookup.java#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestMaxConsumers.java#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestMultiAggPrinta.java#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestProbeData.java#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestProbeDescription.java#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestStateMachine.java#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestStopLock.java#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Abort.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Abort.ksh.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Close.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Close.ksh.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Drop.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Drop.ksh.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Enable.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Enable.ksh.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.c#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.ksh.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MaxConsumers.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MaxConsumers.ksh.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MultiAggPrinta.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MultiAggPrinta.ksh.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.c#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.ksh.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeDescription.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeDescription.ksh.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StateMachine.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StateMachine.ksh.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StopLock.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StopLock.ksh.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.printa.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.printa.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NL.char.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NULL.char.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_INT_DIGIT.InvalidDigit.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_INT_OFLOW.BigInt.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_STR_NL.string.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brace1.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brace2.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack1.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack2.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack3.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren1.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren2.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren3.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/tst.D_MACRO_OFLOW.ParIntOvflow.d.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/mdb/tst.dtracedcmd.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.icmp.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.tcp.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.udp.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/err.D_PRAGMA_OPTSET.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.badopt.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.boolopt.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.boolopt.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dynopt.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dynopt.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.enablerace.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.haslam.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.roch.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.schrock.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/err.D_PRINTA_AGGKEY.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/err.D_PRINTA_AGGPROTO.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.many.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.many.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.same.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.same.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sort.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sort.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sortpos.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sortpos.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.tuplecompat.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.tuplecompat.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero2.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero2.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero3.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero3.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_BITFIELD.bitfield.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_TYPE.badtype.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_TYPE.notsou.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.OffsetofNULL.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.badmemb.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofAlias.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofArith.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofUnion.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.struct.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.struct.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.union.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.union.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/operators/tst.ternary.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/operators/tst.ternary.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badproc1.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_BADPID.badproc2.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_CREATEFAIL.many.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_CREATEFAIL.many.exe#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.exe#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.addprobes.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.exe#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.d.out#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.exe#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.float.c#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.float.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.c#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.c#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.main.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.manypids.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.probemod.ksh#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.c#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.c#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.c#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.c#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.exe#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.exe#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.BadAlign.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.ArrayVar.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.DynamicVar.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.agg.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_DEREF_NONPTR.noptr.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_DEREF_VOID.VoidPointerDeref.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_ARRFUN.ArrayAssignment.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_INCOMPAT.VoidPointerArith.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_LVAL.AddressChange.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_PTR.NonPointerAccess.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_PTR.badpointer.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_SOU.BadPointerAccess.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_SOU.badpointer.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress1.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress2.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress3.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress4.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress5.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer1.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer2.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer3.d#1 branch .. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.GlobalVar.d#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Dec 13 23:17:43 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0AAB716A421; Thu, 13 Dec 2007 23:17:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9A51A16A417 for ; Thu, 13 Dec 2007 23:17:42 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 83B2F13C45D for ; Thu, 13 Dec 2007 23:17:42 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBDNHgCA012146 for ; Thu, 13 Dec 2007 23:17:42 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBDNH7aO012137 for perforce@freebsd.org; Thu, 13 Dec 2007 23:17:07 GMT (envelope-from jb@freebsd.org) Date: Thu, 13 Dec 2007 23:17:07 GMT Message-Id: <200712132317.lBDNH7aO012137@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130818 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Dec 2007 23:17:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=130818 Change 130818 by jb@jb_freebsd1 on 2007/12/13 23:17:05 IF6 This integration incorporates the OpenSolaris tree from //depot/projects/opensolaris on the basis that it is likely that one tree can apply to FreeBSD 6/7/8. There will be some additional compatibility cruft required for 6 at least in the syscall provider for DTrace because the sysent structure can't be expanded like it was prior to 7 being branched. Other than that, the interaction between DTrace an the running FreeBSD kernel and apps is pretty much the same AFAIK for 6/7/8. This integration sucks in ZFS sources too. Just ignore that. The Makefiles won't build ZFS on 6. I just want to reduce the work maintaining a port of OpenSolaris code. I think that the p4 functionality lets me do that. Time will tell. :-) Affected files ... .. //depot/projects/dtrace6/src/contrib/less/LICENSE#2 integrate .. //depot/projects/dtrace6/src/contrib/less/Makefile.dsm#2 delete .. //depot/projects/dtrace6/src/contrib/less/NEWS#3 integrate .. //depot/projects/dtrace6/src/contrib/less/README#3 integrate .. //depot/projects/dtrace6/src/contrib/less/ch.c#3 integrate .. //depot/projects/dtrace6/src/contrib/less/command.c#2 integrate .. //depot/projects/dtrace6/src/contrib/less/configure#3 integrate .. //depot/projects/dtrace6/src/contrib/less/configure.ac#3 integrate .. //depot/projects/dtrace6/src/contrib/less/decode.c#2 integrate .. //depot/projects/dtrace6/src/contrib/less/defines.ds#2 integrate .. //depot/projects/dtrace6/src/contrib/less/defines.h.in#2 integrate .. //depot/projects/dtrace6/src/contrib/less/defines.o2#2 integrate .. //depot/projects/dtrace6/src/contrib/less/defines.o9#2 integrate .. //depot/projects/dtrace6/src/contrib/less/defines.wn#2 integrate .. //depot/projects/dtrace6/src/contrib/less/edit.c#2 integrate .. //depot/projects/dtrace6/src/contrib/less/filename.c#3 integrate .. //depot/projects/dtrace6/src/contrib/less/funcs.h#3 integrate .. //depot/projects/dtrace6/src/contrib/less/less.h#3 integrate .. //depot/projects/dtrace6/src/contrib/less/less.man#3 integrate .. //depot/projects/dtrace6/src/contrib/less/less.nro#3 integrate .. //depot/projects/dtrace6/src/contrib/less/lessecho.man#3 integrate .. //depot/projects/dtrace6/src/contrib/less/lessecho.nro#3 integrate .. //depot/projects/dtrace6/src/contrib/less/lesskey.man#3 integrate .. //depot/projects/dtrace6/src/contrib/less/lesskey.nro#3 integrate .. //depot/projects/dtrace6/src/contrib/less/line.c#3 integrate .. //depot/projects/dtrace6/src/contrib/less/optfunc.c#2 integrate .. //depot/projects/dtrace6/src/contrib/less/opttbl.c#2 integrate .. //depot/projects/dtrace6/src/contrib/less/screen.c#2 integrate .. //depot/projects/dtrace6/src/contrib/less/search.c#3 integrate .. //depot/projects/dtrace6/src/contrib/less/tags.c#2 integrate .. //depot/projects/dtrace6/src/contrib/less/version.c#3 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/dtrace.c#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/Makefile#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/Makefile.subdirs#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/README#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/cmd/Makefile#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/Makefile#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/baddof.c#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/Makefile#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/badioctl.c#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/32/Makefile#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/64/Makefile#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/Makefile#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/Makefile.com#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/chkargs.c#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Getopt.java#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/JDTrace.java#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Makefile#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/jdtrace.c#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/manifest/jdtrace.jar-manifest#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/Makefile#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/Makefile#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/Makefile.com#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/Makefile#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_FUNC.bad.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_MDIM.bad.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_NULL.bad.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_REDEF.redef.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.avgtoofew.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.maxnoarg.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.mintoofew.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.quantizetoofew.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.sumtoofew.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_AGGARG.bad.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_PROTO.bad.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_IDENT.bad.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_UNDEF.badaggfunc.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badexpr.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badkey3.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.noeffect.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey1.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey2.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey4.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqbad1.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqshort.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASEVAL.bad.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMTYPE.lqbad1.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMVAL.bad.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.order.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.order.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHSTEP.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MISMATCH.lqbadarg.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPLARGE.lqtoofew.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPSMALL.bad.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPTYPE.lqbadinc.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPVAL.bad.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_AGGARG.bad.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_PROTO.bad.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_SCALAR.bad.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_ARG.lquantizetoofew.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgnoarg.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgtoomany.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.counttoomany.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizenoarg.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizetoomany.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxnoarg.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxtoomany.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.minnoarg.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.mintoomany.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizenoarg.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizetoomany.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumnoarg.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumtoomany.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_AGGARG.bad.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badmany.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badnone.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_SCALAR.bad.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count3.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.goodkey.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs1.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signature.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_1.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_2.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.modby0.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.addmin.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.divmin.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muladd.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muldiv.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.basics.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_ARR_BADREF.bad.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRBIG.toobig.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRNULL.bad.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRSUB.bad.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_PROTO_TYPE.badtuple.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_IDENT_UNDEF.badureg.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic1.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic2.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic3.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic4.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic5.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic6.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.uregsarray.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.this.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_ARG.badsig.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toofew.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toomany.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_SYNTAX.errassign.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.tupoflow.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.cpyarray.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.diffprofile.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.initialize.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.invalidref.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.misc.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.orthogonality.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.this.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.valassign.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.begin.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.tick.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_ADDROF_BITFIELD.BitfieldAddress.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.NegBitField.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.ZeroBitField.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.ExceedBaseType.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.GreaterThan64.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFTYPE.badtype.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_OFFSETOF_BITFIELD.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_SIZEOF_BITFIELD.SizeofBitfield.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.BitFieldPromotion.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.SizeofBitField.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.end.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize1.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize2.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize3.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.zerobuf.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.alignring.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.cputime.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.dynvarsize.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize1.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize2.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize3.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring1.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.smallring.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.cpuusage.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.nice.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.priority.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.prsize.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.rssize.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0clause.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8clause.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller1.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid1.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno1.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.execname.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.hpriority.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id1.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl1.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo1.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid1.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo1.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid1.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.timestamp.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.vtimestamp.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggfun.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggtup.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.arrtup.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.body.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.both.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.pred.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.nopred.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.pred.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predfirst.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predlast.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LOCASSC.NonLocalAssoc.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LONGINT.LongStruct.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PARMCLASS.BadStorageClass.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_NAME.VoidName.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_TYPE.Dyn.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VARARGS.VarLenArgs.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VOID.NonSoleVoid.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_SIGNINT.UnsignedStruct.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_VOIDATTR.ShortVoidDecl.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.arrays.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.basics.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.funcs.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.pointers.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.varargsfuncs.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/badptr.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/countdown.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/counter.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/errorpath.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/hello.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/kstat.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/ksyms.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/renormalize.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rtime.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rw.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwinfo.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwtime.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/specopen.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/truss.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/trussrw.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/userfunc.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_AGGREGATION.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DBLERROR.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DYNAMIC.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.end.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPEC.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPECUNAVAIL.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_STKSTROVERFLOW.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/err.D_PDESC_ZERO.InvalidDescription1.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.APIVersion.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.AddSearchPath.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.CoalesceTrace.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ELFGeneration.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.IncludedFilePath.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithFunctions#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithIDs#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithModules#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithNames#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithProviders#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ShowCompilerCode.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceFunctions#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceIDs#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceModule#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceNames#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceProvider#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.VerboseStabilityReport.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.AddSearchPath.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeGiga.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeKilo.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeMega.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeTera.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel32.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel64.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithoutW.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationOut.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationWithO.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus1.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus2.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExtraneousProbeIds.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName1.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName2.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId1.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId2.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId3.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule1.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule2.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule3.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule4.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProbeIdentifier.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider1.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider2.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider3.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider4.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc1.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc2.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc3.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc4.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc5.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc6.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc7.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc8.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc9.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID1.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID2.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID3.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID4.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID5.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID6.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID7.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule1.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule2.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule3.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule4.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule5.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule6.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule7.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule8.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName1.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName2.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName3.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName4.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName5.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName6.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName7.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName8.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName9.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider1.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider2.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider3.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider4.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider5.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.MultipleInvalidProbeId.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.PreprocessorStatement.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.UnDefineNameWithCPP.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbeIdentfier.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbesWithoutZ.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/err.D_IDENT_UNDEF.timespent.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.end.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.endwithoutbegin.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multibeginend.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multiend.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_DECL_IDRED.EnumSameName.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_UNKNOWN.RepeatIdentifiers.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumEquality.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumSameValue.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumValAssign.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_BADADDR.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_DIVZERO.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_UNKNOWN.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.error.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.errorend.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.D_PROTO_LEN.noarg.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.exitarg1.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/tst.basic1.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/err.D_PDESC_ZERO.notreturn.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.basic.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionentry.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionreturnvalue.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.ioctlargs.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offset.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offsetzero.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return0.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.tailcall.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_FUNC_UNDEF.progenyofbad1.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_OP_VFPTR.badop.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.chillbadarg.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.copyoutbadarg.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.mobadarg.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.raisebadarg.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.allocanoarg.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.badbreakpoint.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoofew.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoomany.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrbadarg.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrtoofew.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoofew.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoomany.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoofew.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoomany.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtabadarg.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.panicbadarg.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.progenyofbad2.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.stopbadarg.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_STRINGOF_TYPE.badstringof.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_VAR_UNDEF.badvar.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca2.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy1.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy2.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy3.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy4.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy5.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy6.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badchill.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.chillbadarg.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyout.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutbadaddr.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutstrbadaddr.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoa6badaddr.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoabadaddr.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadaddr.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadarg.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.badfreopen.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.bcopy.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.chill.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.copyin.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.copyinto.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ddi_pathname.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.default.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.freopen.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ftruncate.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ftruncate.ksh.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.hton.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.index.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.index.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa6.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa6.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostr.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostr.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owned.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owner.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_type_adaptive.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.progenyof.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.rand.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strchr.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strchr.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strstr.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strstr.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok_null.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/err.D_ADDROF_LVAL.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/err.D_EMPTY.empty.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/tst.clauses.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/tst.stmts.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_DECL_IDRED.redef1.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_DECL_IDRED.redef2.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_IDENT_UNDEF.recur.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef1.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef2.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineDataAssign.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineExpression.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineKinds.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineKinds.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineTypedef.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineWritableAssign.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/Makefile#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/manifest/test.jar-manifest#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestAbort.java#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestBean.java#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestClose.java#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestDrop.java#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestEnable.java#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestFunctionLookup.java#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestMaxConsumers.java#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestMultiAggPrinta.java#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestProbeData.java#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestProbeDescription.java#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestStateMachine.java#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestStopLock.java#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Abort.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Abort.ksh.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Close.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Close.ksh.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Drop.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Drop.ksh.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Enable.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Enable.ksh.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.c#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.ksh.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MaxConsumers.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MaxConsumers.ksh.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MultiAggPrinta.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MultiAggPrinta.ksh.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.c#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.ksh.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeDescription.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeDescription.ksh.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StateMachine.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StateMachine.ksh.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StopLock.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StopLock.ksh.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.printa.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.printa.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NL.char.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NULL.char.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_INT_DIGIT.InvalidDigit.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_INT_OFLOW.BigInt.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_STR_NL.string.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brace1.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brace2.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack1.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack2.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack3.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren1.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren2.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren3.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/tst.D_MACRO_OFLOW.ParIntOvflow.d.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/mdb/tst.dtracedcmd.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.icmp.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.tcp.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.udp.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/err.D_PRAGMA_OPTSET.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.badopt.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.boolopt.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.boolopt.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dynopt.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dynopt.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.enablerace.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.haslam.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.roch.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.schrock.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/err.D_PRINTA_AGGKEY.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/err.D_PRINTA_AGGPROTO.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.many.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.many.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.same.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.same.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sort.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sort.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sortpos.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sortpos.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.tuplecompat.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.tuplecompat.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero2.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero2.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero3.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero3.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_BITFIELD.bitfield.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_TYPE.badtype.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_TYPE.notsou.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.OffsetofNULL.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.badmemb.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofAlias.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofArith.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofUnion.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.struct.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.struct.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.union.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.union.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/operators/tst.ternary.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/operators/tst.ternary.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badproc1.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_BADPID.badproc2.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_CREATEFAIL.many.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_CREATEFAIL.many.exe#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.exe#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.addprobes.ksh#1 branch .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.exe#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.exe#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.float.c#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.float.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.c#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.c#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.main.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.manypids.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.probemod.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.c#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.c#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.c#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.c#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.exe#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.exe#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.BadAlign.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.ArrayVar.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.DynamicVar.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.agg.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_DEREF_NONPTR.noptr.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_DEREF_VOID.VoidPointerDeref.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_ARRFUN.ArrayAssignment.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_INCOMPAT.VoidPointerArith.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_LVAL.AddressChange.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_PTR.NonPointerAccess.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_PTR.badpointer.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_SOU.BadPointerAccess.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_SOU.badpointer.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress1.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress2.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress3.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress4.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress5.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer1.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer2.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer3.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.GlobalVar.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.IntegerArithmetic1.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic1.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic2.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic3.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerAssignment.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ValidPointer1.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ValidPointer2.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.VoidCast.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.basic1.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.basic2.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGERR.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_INVAL.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_MALFORM.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_UNUSED.UnusedPragma.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.circlibdep.ksh#1 branch .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.invalidlibdep.ksh#1 branch .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdep.ksh#1 branch .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdepfullyconnected.ksh#1 branch .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_PRED_SCALAR.NonScalarPred.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_SYNTAX.invalid.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_SYNTAX.operr.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.argsnotcached.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.basics.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.basics.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.complex.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.complex.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.predcache.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_IDENT_UNDEF.afterprobe.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_PRAGCTL_INVAL.tabdefine.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_SYNTAX.withoutpound.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.defincomp.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefelsenotendif.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefincomp.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefnotendif.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.incompelse.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.mulelse.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifdef.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifdef.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifndef.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifndef.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifnotdef.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifnotdef.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicaland.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicaland.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalandor.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalandor.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalor.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalor.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.muland.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.muland.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.mulor.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.mulor.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.precondi.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.precondi.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.predicatedeclare.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexp.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexp.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpelse.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpelse.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpif.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpif.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpifelse.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpifelse.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.withinprobe.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badagg.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badfmt.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badval.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_PROTO.bad.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.jstack.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.stack.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.ustack.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.basics.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.basics.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.def.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.def.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.dynwidth.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.dynwidth.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.fmt.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.fmt.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.many.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.manyval.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.manyval.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.stack.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.tuple.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.tuple.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_AGG_CONV.aggfmt.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_EXTRA.toomany.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_EXTRA.widths.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_FMT.badfmt.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_PROTO.novalue.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_TYPE.aggarg.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_TYPE.recursive.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_PROTO.noprec.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_PROTO.nowidth.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_TYPE.badprec.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_TYPE.badwidth.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PROTO_LEN.toofew.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv1.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv2.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv3.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.flags.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.flags.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.hello.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.hello.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.ints.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.ints.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.precs.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.precs.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.print-f.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.print-f.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printT.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printT.ksh.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printY.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printY.ksh.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printcont.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printcont.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printeE.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printeE.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printgG.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printgG.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.rawfmt.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.rawfmt.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.uints.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.uints.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths1.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.wp.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.wp.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.func_access.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.op_access.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.unpriv_funcs.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.probeqtn.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.probestar.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.tickstar.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.assign.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.declare.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.declarein.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.lbraces.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.probespec.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.rbraces.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.recdec.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.basic1.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.check.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.declare.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.declareafter.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.emptyprobe.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragma.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmaaftertab.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmainside.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmaoutside.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.probestar.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.create.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exec.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ENOENT.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitcore.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitexit.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.c#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.startexit.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZERO.profile.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROonens.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROonensec.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROoneus.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROoneusec.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.argtest.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.argtest.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.basic.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.basic.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.func.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.mod.ksh#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilehz.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilehz.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilems.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilems.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilemsec.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilemsec.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilenhz.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilenhz.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilens.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilens.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilensec.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilensec.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profiles.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profiles.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilesec.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilesec.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileus.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileus.d.out#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileusec.d#2 integrate .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileusec.d.out#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Dec 13 23:29:56 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8718C16A421; Thu, 13 Dec 2007 23:29:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 32F9F16A41B for ; Thu, 13 Dec 2007 23:29:56 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 077A613C44B for ; Thu, 13 Dec 2007 23:29:56 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBDNTtgH013795 for ; Thu, 13 Dec 2007 23:29:55 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBDNTt5G013792 for perforce@freebsd.org; Thu, 13 Dec 2007 23:29:55 GMT (envelope-from marcel@freebsd.org) Date: Thu, 13 Dec 2007 23:29:55 GMT Message-Id: <200712132329.lBDNTt5G013792@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 130821 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Dec 2007 23:29:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=130821 Change 130821 by marcel@marcel_jnpr on 2007/12/13 23:29:51 Fix merge botch... Affected files ... .. //depot/projects/e500/contrib/pf/pflogd/pidfile.c#5 add .. //depot/projects/e500/contrib/pf/pflogd/pidfile.h#5 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Dec 13 23:35:02 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C858516A41B; Thu, 13 Dec 2007 23:35:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 81A1D16A417 for ; Thu, 13 Dec 2007 23:35:02 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6DEBB13C457 for ; Thu, 13 Dec 2007 23:35:02 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBDNZ2IQ015247 for ; Thu, 13 Dec 2007 23:35:02 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBDNZ0JC015240 for perforce@freebsd.org; Thu, 13 Dec 2007 23:35:00 GMT (envelope-from jb@freebsd.org) Date: Thu, 13 Dec 2007 23:35:00 GMT Message-Id: <200712132335.lBDNZ0JC015240@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130822 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Dec 2007 23:35:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=130822 Change 130822 by jb@jb_freebsd1 on 2007/12/13 23:34:55 Update to match the code in the opensolaris project which matches what is in current. This has the effect of undoing changes that came in with the latest OpenSolaris import but which haven't been merged into current yet. Affected files ... .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/syscall/tst.args.c#3 edit .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/syscall/tst.args.d#3 edit .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/sgs/include/_libelf.h#2 delete .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/sgs/messages/sgs.ident#3 edit .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/zdb/zdb.c#2 edit .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/zdb/zdb_il.c#2 edit .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/zfs/zfs_iter.c#2 edit .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/zfs/zfs_iter.h#2 edit .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/zfs/zfs_main.c#2 edit .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/zpool/zpool_iter.c#2 edit .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/zpool/zpool_main.c#2 edit .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/zpool/zpool_util.c#2 edit .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/zpool/zpool_util.h#2 edit .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/zpool/zpool_vdev.c#2 edit .. //depot/projects/dtrace6/src/contrib/opensolaris/cmd/ztest/ztest.c#2 edit .. //depot/projects/dtrace6/src/contrib/opensolaris/compat/assert.h#2 delete .. //depot/projects/dtrace6/src/contrib/opensolaris/compat/fcntl.h#2 delete .. //depot/projects/dtrace6/src/contrib/opensolaris/compat/stdio.h#2 delete .. //depot/projects/dtrace6/src/contrib/opensolaris/compat/thread.h#2 delete .. //depot/projects/dtrace6/src/contrib/opensolaris/compat/unistd.h#2 delete .. //depot/projects/dtrace6/src/contrib/opensolaris/lib/libctf/common/ctf_lib.c#3 edit .. //depot/projects/dtrace6/src/contrib/opensolaris/lib/libdtrace/common/dt_cc.c#3 edit .. //depot/projects/dtrace6/src/contrib/opensolaris/lib/libdtrace/common/dt_parser.h#3 edit .. //depot/projects/dtrace6/src/contrib/opensolaris/lib/libdtrace/common/dt_pragma.c#3 edit .. //depot/projects/dtrace6/src/contrib/opensolaris/lib/libdtrace/common/dt_regset.c#3 edit .. //depot/projects/dtrace6/src/contrib/opensolaris/lib/libdtrace/common/dtrace.h#3 edit .. //depot/projects/dtrace6/src/contrib/opensolaris/lib/libuutil/common/libuutil.h#2 edit .. //depot/projects/dtrace6/src/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#2 edit .. //depot/projects/dtrace6/src/contrib/opensolaris/lib/libuutil/common/uu_misc.c#2 edit .. //depot/projects/dtrace6/src/contrib/opensolaris/lib/libuutil/common/uu_pname.c#2 edit .. //depot/projects/dtrace6/src/contrib/opensolaris/lib/libzfs/common/libzfs.h#2 edit .. //depot/projects/dtrace6/src/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#2 edit .. //depot/projects/dtrace6/src/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 edit .. //depot/projects/dtrace6/src/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#2 edit .. //depot/projects/dtrace6/src/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#2 edit .. //depot/projects/dtrace6/src/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#2 edit .. //depot/projects/dtrace6/src/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#2 edit .. //depot/projects/dtrace6/src/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#2 edit .. //depot/projects/dtrace6/src/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#2 edit .. //depot/projects/dtrace6/src/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#2 edit .. //depot/projects/dtrace6/src/contrib/opensolaris/lib/libzpool/common/kernel.c#2 edit .. //depot/projects/dtrace6/src/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 edit .. //depot/projects/dtrace6/src/contrib/opensolaris/lib/libzpool/common/taskq.c#2 edit .. //depot/projects/dtrace6/src/contrib/opensolaris/lib/libzpool/common/util.c#2 edit .. //depot/projects/dtrace6/src/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c#3 edit .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/compat/sys/bitmap.h#2 delete .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/compat/sys/kmem.h#2 delete .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/compat/sys/mman.h#2 delete .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/compat/sys/objfs.h#2 delete .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/compat/sys/processor.h#2 delete .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/compat/sys/synch.h#2 delete .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/compat/sys/vmem.h#2 delete .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/cpuvar.h#3 edit .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/common/sys/vfs.h#2 delete .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/intel/sys/machelf.h#2 delete .. //depot/projects/dtrace6/src/sys/contrib/opensolaris/uts/sparc/sys/machelf.h#2 delete Differences ... ==== //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/syscall/tst.args.c#3 (text+ko) ==== @@ -20,20 +20,21 @@ */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" -#include +#include +#include /*ARGSUSED*/ int main(int argc, char **argv) { for (;;) { - (void) mmap(NULL, 1, 2, 3, -1, 0x12345678); + (void) syscall(SYS_mmap, NULL, 1, 2, 3, -1, 0x12345678); } return (0); ==== //depot/projects/dtrace6/src/contrib/opensolaris/cmd/dtrace/test/tst/common/syscall/tst.args.d#3 (text+ko) ==== @@ -20,7 +20,7 @@ */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -42,5 +42,5 @@ tick-1s /i++ == 3/ { - exit(0); + exit(1); } ==== //depot/projects/dtrace6/src/contrib/opensolaris/cmd/sgs/messages/sgs.ident#3 (text+ko) ==== @@ -57,5 +57,6 @@ MSG_ID_ELFEDIT_EHDR 27 SUNW_OST_SGS /* ehdr: */ MSG_ID_ELFEDIT_PHDR 27 SUNW_OST_SGS /* phdr: */ MSG_ID_ELFEDIT_SHDR 27 SUNW_OST_SGS /* shdr: */ +MSG_ID_ELFEDIT_STR 27 SUNW_OST_SGS /* str: */ MSG_ID_ELFEDIT_SYM 27 SUNW_OST_SGS /* sym: */ MSG_ID_ELFEDIT_SYMINFO 27 SUNW_OST_SGS /* syminfo: */ ==== //depot/projects/dtrace6/src/contrib/opensolaris/cmd/zdb/zdb.c#2 (text) ==== @@ -51,9 +51,6 @@ #include #include #include -#undef ZFS_MAXNAMELEN -#undef verify -#include const char cmdname[] = "zdb"; uint8_t dump_opt[256]; @@ -65,7 +62,6 @@ int zopt_objects = 0; int zdb_advance = ADVANCE_PRE; zbookmark_t zdb_noread = { 0, 0, ZB_NO_LEVEL, 0 }; -libzfs_handle_t *g_zfs; /* * These libumem hooks provide a reasonable set of defaults for the allocator's @@ -87,13 +83,12 @@ usage(void) { (void) fprintf(stderr, - "Usage: %s [-udibcsvLUe] [-O order] [-B os:obj:level:blkid] " + "Usage: %s [-udibcsvLU] [-O order] [-B os:obj:level:blkid] " "dataset [object...]\n" " %s -C [pool]\n" " %s -l dev\n" - " %s -R vdev:offset:size:flags\n" - " %s [-p path_to_vdev_dir]\n", - cmdname, cmdname, cmdname, cmdname, cmdname); + " %s -R vdev:offset:size:flags\n", + cmdname, cmdname, cmdname, cmdname); (void) fprintf(stderr, " -u uberblock\n"); (void) fprintf(stderr, " -d datasets\n"); @@ -112,8 +107,6 @@ "simulate bad block\n"); (void) fprintf(stderr, " -R read and display block from a" "device\n"); - (void) fprintf(stderr, " -e Pool is exported/destroyed\n"); - (void) fprintf(stderr, " -p (use with -e)\n"); (void) fprintf(stderr, "Specify an option more than once (e.g. -bb) " "to make only that option verbose\n"); (void) fprintf(stderr, "Default is to dump everything non-verbosely\n"); @@ -374,45 +367,7 @@ zap_cursor_fini(&zc); } -/*ARGSUSED*/ static void -dump_zpldir(objset_t *os, uint64_t object, void *data, size_t size) -{ - zap_cursor_t zc; - zap_attribute_t attr; - const char *typenames[] = { - /* 0 */ "not specified", - /* 1 */ "FIFO", - /* 2 */ "Character Device", - /* 3 */ "3 (invalid)", - /* 4 */ "Directory", - /* 5 */ "5 (invalid)", - /* 6 */ "Block Device", - /* 7 */ "7 (invalid)", - /* 8 */ "Regular File", - /* 9 */ "9 (invalid)", - /* 10 */ "Symbolic Link", - /* 11 */ "11 (invalid)", - /* 12 */ "Socket", - /* 13 */ "Door", - /* 14 */ "Event Port", - /* 15 */ "15 (invalid)", - }; - - dump_zap_stats(os, object); - (void) printf("\n"); - - for (zap_cursor_init(&zc, os, object); - zap_cursor_retrieve(&zc, &attr) == 0; - zap_cursor_advance(&zc)) { - (void) printf("\t\t%s = %lld (type: %s)\n", - attr.za_name, ZFS_DIRENT_OBJ(attr.za_first_integer), - typenames[ZFS_DIRENT_TYPE(attr.za_first_integer)]); - } - zap_cursor_fini(&zc); -} - -static void dump_spacemap(objset_t *os, space_map_obj_t *smo, space_map_t *sm) { uint64_t alloc, offset, entry; @@ -720,7 +675,7 @@ if (dd == NULL) return; - ASSERT3U(size, >=, sizeof (dsl_dir_phys_t)); + ASSERT(size == sizeof (*dd)); crtime = dd->dd_creation_time; nicenum(dd->dd_used_bytes, used); @@ -734,8 +689,8 @@ (u_longlong_t)dd->dd_head_dataset_obj); (void) printf("\t\tparent_dir_obj = %llu\n", (u_longlong_t)dd->dd_parent_obj); - (void) printf("\t\torigin_obj = %llu\n", - (u_longlong_t)dd->dd_origin_obj); + (void) printf("\t\tclone_parent_obj = %llu\n", + (u_longlong_t)dd->dd_clone_parent_obj); (void) printf("\t\tchild_dir_zapobj = %llu\n", (u_longlong_t)dd->dd_child_dir_zapobj); (void) printf("\t\tused_bytes = %s\n", used); @@ -745,8 +700,6 @@ (void) printf("\t\treserved = %s\n", resv); (void) printf("\t\tprops_zapobj = %llu\n", (u_longlong_t)dd->dd_props_zapobj); - (void) printf("\t\tdeleg_zapobj = %llu\n", - (u_longlong_t)dd->dd_deleg_zapobj); } /*ARGSUSED*/ @@ -812,11 +765,9 @@ if (dump_opt['d'] < 3) return; - mutex_init(&bpl.bpl_lock, NULL, MUTEX_DEFAULT, NULL); VERIFY(0 == bplist_open(&bpl, mos, object)); if (bplist_empty(&bpl)) { bplist_close(&bpl); - mutex_destroy(&bpl.bpl_lock); return; } @@ -834,7 +785,6 @@ if (dump_opt['d'] < 5) { bplist_close(&bpl); - mutex_destroy(&bpl.bpl_lock); return; } @@ -850,7 +800,6 @@ } bplist_close(&bpl); - mutex_destroy(&bpl.bpl_lock); } /*ARGSUSED*/ @@ -925,9 +874,9 @@ dump_zap, /* DSL props */ dump_dsl_dataset, /* DSL dataset */ dump_znode, /* ZFS znode */ - dump_acl, /* ZFS V0 ACL */ + dump_acl, /* ZFS ACL */ dump_uint8, /* ZFS plain file */ - dump_zpldir, /* ZFS directory */ + dump_zap, /* ZFS directory */ dump_zap, /* ZFS master node */ dump_zap, /* ZFS delete queue */ dump_uint8, /* zvol object */ @@ -939,11 +888,6 @@ dump_uint8, /* SPA history */ dump_uint64, /* SPA history offsets */ dump_zap, /* Pool properties */ - dump_zap, /* DSL permissions */ - dump_acl, /* ZFS ACL */ - dump_uint8, /* ZFS SYSACL */ - dump_none, /* FUID nvlist */ - dump_packed_nvlist, /* FUID nvlist size */ }; static void @@ -986,15 +930,13 @@ aux[0] = '\0'; - if (doi.doi_checksum != ZIO_CHECKSUM_INHERIT || verbosity >= 6) { + if (doi.doi_checksum != ZIO_CHECKSUM_INHERIT || verbosity >= 6) (void) snprintf(aux + strlen(aux), sizeof (aux), " (K=%s)", - zio_checksum_table[doi.doi_checksum].ci_name); - } + zio_checksum_table[doi.doi_checksum].ci_name); - if (doi.doi_compress != ZIO_COMPRESS_INHERIT || verbosity >= 6) { + if (doi.doi_compress != ZIO_COMPRESS_INHERIT || verbosity >= 6) (void) snprintf(aux + strlen(aux), sizeof (aux), " (Z=%s)", - zio_compress_table[doi.doi_compress].ci_name); - } + zio_compress_table[doi.doi_compress].ci_name); (void) printf("%10lld %3u %5s %5s %5s %5s %s%s\n", (u_longlong_t)object, doi.doi_indirection, iblk, dblk, lsize, @@ -1194,7 +1136,15 @@ exit(1); } - psize = statbuf.st_size; + if (S_ISCHR(statbuf.st_mode)) { + if (ioctl(fd, DIOCGMEDIASIZE, &psize) != 0) { + (void) printf("failed to get size '%s': %s\n", dev, + strerror(errno)); + exit(1); + } + } else + psize = statbuf.st_size; + psize = P2ALIGN(psize, (uint64_t)sizeof (vdev_label_t)); for (l = 0; l < VDEV_LABELS; l++) { @@ -1499,7 +1449,8 @@ (u_longlong_t)zb->zb_objset, (u_longlong_t)zb->zb_object, (u_longlong_t)blkid2offset(bc->bc_dnode, - zb->zb_level, zb->zb_blkid), blkbuf); + zb->zb_level, zb->zb_blkid), + blkbuf); } zdb_count_block(spa, zcb, bp, type); @@ -1514,11 +1465,11 @@ zdb_cb_t zcb = { 0 }; traverse_blk_cache_t dummy_cache = { 0 }; zdb_blkstats_t *zb, *tzb; - uint64_t alloc, space, logalloc; - vdev_t *rvd = spa->spa_root_vdev; + uint64_t alloc, space; int leaks = 0; int advance = zdb_advance; - int c, e, flags; + int flags; + int e; zcb.zcb_cache = &dummy_cache; @@ -1606,27 +1557,17 @@ alloc = spa_get_alloc(spa); space = spa_get_space(spa); - /* - * Log blocks allocated from a separate log device don't count - * as part of the normal pool space; factor them in here. - */ - logalloc = 0; - - for (c = 0; c < rvd->vdev_children; c++) - if (rvd->vdev_child[c]->vdev_islog) - logalloc += rvd->vdev_child[c]->vdev_stat.vs_alloc; - tzb = &zcb.zcb_type[ZB_TOTAL][DMU_OT_TOTAL]; - if (tzb->zb_asize == alloc + logalloc) { + if (tzb->zb_asize == alloc) { (void) printf("\n\tNo leaks (block sum matches space" " maps exactly)\n"); } else { (void) printf("block traversal size %llu != alloc %llu " "(leaked %lld)\n", (u_longlong_t)tzb->zb_asize, - (u_longlong_t)alloc + logalloc, - (u_longlong_t)(alloc + logalloc - tzb->zb_asize)); + (u_longlong_t)alloc, + (u_longlong_t)(alloc - tzb->zb_asize)); leaks = 1; } @@ -2073,128 +2014,6 @@ free(dup); } -static boolean_t -nvlist_string_match(nvlist_t *config, char *name, char *tgt) -{ - char *s; - - verify(nvlist_lookup_string(config, name, &s) == 0); - return (strcmp(s, tgt) == 0); -} - -static boolean_t -nvlist_uint64_match(nvlist_t *config, char *name, uint64_t tgt) -{ - uint64_t val; - - verify(nvlist_lookup_uint64(config, name, &val) == 0); - return (val == tgt); -} - -static boolean_t -vdev_child_guid_match(nvlist_t *vdev, uint64_t guid) -{ - nvlist_t **child; - uint_t c, children; - - verify(nvlist_lookup_nvlist_array(vdev, ZPOOL_CONFIG_CHILDREN, - &child, &children) == 0); - for (c = 0; c < children; ++c) - if (nvlist_uint64_match(child[c], ZPOOL_CONFIG_GUID, guid)) - return (B_TRUE); - return (B_FALSE); -} - -static boolean_t -vdev_child_string_match(nvlist_t *vdev, char *tgt) -{ - nvlist_t **child; - uint_t c, children; - - verify(nvlist_lookup_nvlist_array(vdev, ZPOOL_CONFIG_CHILDREN, - &child, &children) == 0); - for (c = 0; c < children; ++c) { - if (nvlist_string_match(child[c], ZPOOL_CONFIG_PATH, tgt) || - nvlist_string_match(child[c], ZPOOL_CONFIG_DEVID, tgt)) - return (B_TRUE); - } - return (B_FALSE); -} - -static boolean_t -vdev_guid_match(nvlist_t *config, uint64_t guid) -{ - nvlist_t *nvroot; - - verify(nvlist_lookup_nvlist(config, ZPOOL_CONFIG_VDEV_TREE, - &nvroot) == 0); - - return (nvlist_uint64_match(nvroot, ZPOOL_CONFIG_GUID, guid) || - vdev_child_guid_match(nvroot, guid)); -} - -static boolean_t -vdev_string_match(nvlist_t *config, char *tgt) -{ - nvlist_t *nvroot; - - verify(nvlist_lookup_nvlist(config, ZPOOL_CONFIG_VDEV_TREE, - &nvroot) == 0); - - return (vdev_child_string_match(nvroot, tgt)); -} - -static boolean_t -pool_match(nvlist_t *config, char *tgt) -{ - uint64_t guid = strtoull(tgt, NULL, 0); - - if (guid != 0) { - return ( - nvlist_uint64_match(config, ZPOOL_CONFIG_POOL_GUID, guid) || - vdev_guid_match(config, guid)); - } else { - return ( - nvlist_string_match(config, ZPOOL_CONFIG_POOL_NAME, tgt) || - vdev_string_match(config, tgt)); - } -} - -static int -find_exported_zpool(char *pool_id, nvlist_t **configp, char *vdev_dir) -{ - nvlist_t *pools; - int error = ENOENT; - nvlist_t *match = NULL; - - if (vdev_dir != NULL) - pools = zpool_find_import(g_zfs, 1, &vdev_dir); - else - pools = zpool_find_import(g_zfs, 0, NULL); - - if (pools != NULL) { - nvpair_t *elem = NULL; - - while ((elem = nvlist_next_nvpair(pools, elem)) != NULL) { - verify(nvpair_value_nvlist(elem, configp) == 0); - if (pool_match(*configp, pool_id)) { - if (match != NULL) { - (void) fatal( - "More than one matching pool - " - "specify guid/devid/device path."); - } else { - match = *configp; - error = 0; - } - } - } - } - - *configp = error ? NULL : match; - - return (error); -} - int main(int argc, char **argv) { @@ -2207,15 +2026,13 @@ int verbose = 0; int error; int flag, set; - int exported = 0; - char *vdev_dir = NULL; (void) setrlimit(RLIMIT_NOFILE, &rl); (void) enable_extended_FILE_stdio(-1, -1); dprintf_setup(&argc, argv); - while ((c = getopt(argc, argv, "udibcsvCLO:B:UlRep:")) != -1) { + while ((c = getopt(argc, argv, "udibcsvCLO:B:UlR")) != -1) { switch (c) { case 'u': case 'd': @@ -2278,24 +2095,13 @@ case 'U': spa_config_dir = "/tmp"; break; - case 'e': - exported = 1; - break; - case 'p': - vdev_dir = optarg; - break; default: usage(); break; } } - if (vdev_dir != NULL && exported == 0) - (void) fatal("-p option requires use of -e\n"); - kernel_init(FREAD); - g_zfs = libzfs_init(); - ASSERT(g_zfs != NULL); /* * Disable vdev caching. If we don't do this, live pool traversal @@ -2350,39 +2156,11 @@ if (dump_opt['C']) dump_config(argv[0]); - if (exported == 0) { - if (strchr(argv[0], '/') != NULL) { - error = dmu_objset_open(argv[0], DMU_OST_ANY, - DS_MODE_STANDARD | DS_MODE_READONLY, &os); - } else { - error = spa_open(argv[0], &spa, FTAG); - } + if (strchr(argv[0], '/') != NULL) { + error = dmu_objset_open(argv[0], DMU_OST_ANY, + DS_MODE_STANDARD | DS_MODE_READONLY, &os); } else { - /* - * Check to see if the name refers to an exported zpool - */ - nvlist_t *exported_conf = NULL; - - error = find_exported_zpool(argv[0], &exported_conf, vdev_dir); - if (error == 0) { - nvlist_t *nvl = NULL; - - if (vdev_dir != NULL) { - if (nvlist_alloc(&nvl, NV_UNIQUE_NAME, 0) != 0) - error = ENOMEM; - else if (nvlist_add_string(nvl, - zpool_prop_to_name(ZPOOL_PROP_ALTROOT), - vdev_dir) != 0) - error = ENOMEM; - } - - if (error == 0) - error = spa_import(argv[0], exported_conf, nvl); - if (error == 0) - error = spa_open(argv[0], &spa, FTAG); - - nvlist_free(nvl); - } + error = spa_open(argv[0], &spa, FTAG); } if (error) @@ -2409,7 +2187,6 @@ spa_close(spa, FTAG); } - libzfs_fini(g_zfs); kernel_fini(); return (0); ==== //depot/projects/dtrace6/src/contrib/opensolaris/cmd/zdb/zdb_il.c#2 (text) ==== @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -233,26 +233,19 @@ } zil_rec_info_t; static zil_rec_info_t zil_rec_info[TX_MAX_TYPE] = { - { NULL, "Total " }, - { zil_prt_rec_create, "TX_CREATE " }, - { zil_prt_rec_create, "TX_MKDIR " }, - { zil_prt_rec_create, "TX_MKXATTR " }, - { zil_prt_rec_create, "TX_SYMLINK " }, - { zil_prt_rec_remove, "TX_REMOVE " }, - { zil_prt_rec_remove, "TX_RMDIR " }, - { zil_prt_rec_link, "TX_LINK " }, - { zil_prt_rec_rename, "TX_RENAME " }, - { zil_prt_rec_write, "TX_WRITE " }, - { zil_prt_rec_truncate, "TX_TRUNCATE " }, - { zil_prt_rec_setattr, "TX_SETATTR " }, - { zil_prt_rec_acl, "TX_ACL_V0 " }, - { zil_prt_rec_acl, "TX_ACL_ACL " }, - { zil_prt_rec_create, "TX_CREATE_ACL " }, - { zil_prt_rec_create, "TX_CREATE_ATTR " }, - { zil_prt_rec_create, "TX_CREATE_ACL_ATTR " }, - { zil_prt_rec_create, "TX_MKDIR_ACL " }, - { zil_prt_rec_create, "TX_MKDIR_ATTR " }, - { zil_prt_rec_create, "TX_MKDIR_ACL_ATTR " }, + { NULL, "Total " }, + { zil_prt_rec_create, "TX_CREATE " }, + { zil_prt_rec_create, "TX_MKDIR " }, + { zil_prt_rec_create, "TX_MKXATTR " }, + { zil_prt_rec_create, "TX_SYMLINK " }, + { zil_prt_rec_remove, "TX_REMOVE " }, + { zil_prt_rec_remove, "TX_RMDIR " }, + { zil_prt_rec_link, "TX_LINK " }, + { zil_prt_rec_rename, "TX_RENAME " }, + { zil_prt_rec_write, "TX_WRITE " }, + { zil_prt_rec_truncate, "TX_TRUNCATE" }, + { zil_prt_rec_setattr, "TX_SETATTR " }, + { zil_prt_rec_acl, "TX_ACL " }, }; /* ARGSUSED */ @@ -262,14 +255,12 @@ int txtype; int verbose = MAX(dump_opt['d'], dump_opt['i']); - /* reduce size of txtype to strip off TX_CI bit */ txtype = lr->lrc_txtype; ASSERT(txtype != 0 && (uint_t)txtype < TX_MAX_TYPE); ASSERT(lr->lrc_txg); - (void) printf("\t\t%s%s len %6llu, txg %llu, seq %llu\n", - (lr->lrc_txtype & TX_CI) ? "CI-" : "", + (void) printf("\t\t%s len %6llu, txg %llu, seq %llu\n", zil_rec_info[txtype].zri_name, (u_longlong_t)lr->lrc_reclen, (u_longlong_t)lr->lrc_txg, ==== //depot/projects/dtrace6/src/contrib/opensolaris/cmd/zfs/zfs_iter.c#2 (text) ==== @@ -59,7 +59,7 @@ int cb_recurse; zfs_type_t cb_types; zfs_sort_column_t *cb_sortcol; - zprop_list_t **cb_proplist; + zfs_proplist_t **cb_proplist; } callback_data_t; uu_avl_pool_t *avl_pool; @@ -68,7 +68,7 @@ * Called for each dataset. If the object the object is of an appropriate type, * add it to the avl tree and recurse over any children as necessary. */ -static int +int zfs_callback(zfs_handle_t *zhp, void *data) { callback_data_t *cb = data; @@ -100,13 +100,10 @@ /* * Recurse if necessary. */ - if (cb->cb_recurse) { - if (zfs_get_type(zhp) == ZFS_TYPE_FILESYSTEM) - (void) zfs_iter_filesystems(zhp, zfs_callback, data); - if (zfs_get_type(zhp) != ZFS_TYPE_SNAPSHOT && - (cb->cb_types & ZFS_TYPE_SNAPSHOT)) - (void) zfs_iter_snapshots(zhp, zfs_callback, data); - } + if (cb->cb_recurse && (zfs_get_type(zhp) == ZFS_TYPE_FILESYSTEM || + (zfs_get_type(zhp) == ZFS_TYPE_VOLUME && (cb->cb_types & + ZFS_TYPE_SNAPSHOT)))) + (void) zfs_iter_children(zhp, zfs_callback, data); if (!dontclose) zfs_close(zhp); @@ -121,7 +118,7 @@ zfs_sort_column_t *col; zfs_prop_t prop; - if ((prop = zfs_name_to_prop(name)) == ZPROP_INVAL && + if ((prop = zfs_name_to_prop(name)) == ZFS_PROP_INVAL && !zfs_prop_user(name)) return (-1); @@ -129,7 +126,7 @@ col->sc_prop = prop; col->sc_reverse = reverse; - if (prop == ZPROP_INVAL) { + if (prop == ZFS_PROP_INVAL) { col->sc_user_prop = safe_malloc(strlen(name) + 1); (void) strcpy(col->sc_user_prop, name); } @@ -246,7 +243,7 @@ * Otherwise, we compare 'lnum' and 'rnum'. */ lstr = rstr = NULL; - if (psc->sc_prop == ZPROP_INVAL) { + if (psc->sc_prop == ZFS_PROP_INVAL) { nvlist_t *luser, *ruser; nvlist_t *lval, *rval; @@ -260,10 +257,10 @@ if (lvalid) verify(nvlist_lookup_string(lval, - ZPROP_VALUE, &lstr) == 0); + ZFS_PROP_VALUE, &lstr) == 0); if (rvalid) verify(nvlist_lookup_string(rval, - ZPROP_VALUE, &rstr) == 0); + ZFS_PROP_VALUE, &rstr) == 0); } else if (zfs_prop_is_string(psc->sc_prop)) { lvalid = (zfs_prop_get(l, psc->sc_prop, lbuf, @@ -313,7 +310,7 @@ int zfs_for_each(int argc, char **argv, boolean_t recurse, zfs_type_t types, - zfs_sort_column_t *sortcol, zprop_list_t **proplist, zfs_iter_f callback, + zfs_sort_column_t *sortcol, zfs_proplist_t **proplist, zfs_iter_f callback, void *data, boolean_t args_can_be_paths) { callback_data_t cb; ==== //depot/projects/dtrace6/src/contrib/opensolaris/cmd/zfs/zfs_iter.h#2 (text) ==== @@ -41,7 +41,7 @@ } zfs_sort_column_t; int zfs_for_each(int, char **, boolean_t, zfs_type_t, zfs_sort_column_t *, - zprop_list_t **, zfs_iter_f, void *, boolean_t); + zfs_proplist_t **, zfs_iter_f, void *, boolean_t); int zfs_add_sort_column(zfs_sort_column_t **, const char *, boolean_t); void zfs_free_sort_columns(zfs_sort_column_t *); ==== //depot/projects/dtrace6/src/contrib/opensolaris/cmd/zfs/zfs_main.c#2 (text) ==== @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include @@ -41,15 +40,12 @@ #include #include #include -#include #include #include #include #include -#include #include -#include #include "zfs_iter.h" #include "zfs_util.h" @@ -57,7 +53,6 @@ libzfs_handle_t *g_zfs; static FILE *mnttab_file; -static char history_str[HIS_MAX_RECORD_LEN]; static int zfs_do_clone(int argc, char **argv); static int zfs_do_create(int argc, char **argv); @@ -69,7 +64,6 @@ static int zfs_do_rename(int argc, char **argv); static int zfs_do_rollback(int argc, char **argv); static int zfs_do_set(int argc, char **argv); -static int zfs_do_upgrade(int argc, char **argv); static int zfs_do_snapshot(int argc, char **argv); static int zfs_do_unmount(int argc, char **argv); static int zfs_do_share(int argc, char **argv); @@ -77,8 +71,8 @@ static int zfs_do_send(int argc, char **argv); static int zfs_do_receive(int argc, char **argv); static int zfs_do_promote(int argc, char **argv); -static int zfs_do_allow(int argc, char **argv); -static int zfs_do_unallow(int argc, char **argv); +static int zfs_do_jail(int argc, char **argv); +static int zfs_do_unjail(int argc, char **argv); /* * These libumem hooks provide a reasonable set of defaults for the allocator's @@ -102,7 +96,8 @@ HELP_DESTROY, HELP_GET, HELP_INHERIT, - HELP_UPGRADE, + HELP_JAIL, + HELP_UNJAIL, HELP_LIST, HELP_MOUNT, HELP_PROMOTE, @@ -114,9 +109,7 @@ HELP_SHARE, HELP_SNAPSHOT, HELP_UNMOUNT, - HELP_UNSHARE, - HELP_ALLOW, - HELP_UNALLOW + HELP_UNSHARE } zfs_help_t; typedef struct zfs_command { @@ -149,19 +142,20 @@ { "set", zfs_do_set, HELP_SET }, { "get", zfs_do_get, HELP_GET }, { "inherit", zfs_do_inherit, HELP_INHERIT }, - { "upgrade", zfs_do_upgrade, HELP_UPGRADE }, { NULL }, { "mount", zfs_do_mount, HELP_MOUNT }, + { NULL }, { "unmount", zfs_do_unmount, HELP_UNMOUNT }, + { NULL }, { "share", zfs_do_share, HELP_SHARE }, + { NULL }, { "unshare", zfs_do_unshare, HELP_UNSHARE }, { NULL }, { "send", zfs_do_send, HELP_SEND }, { "receive", zfs_do_receive, HELP_RECEIVE }, { NULL }, - { "allow", zfs_do_allow, HELP_ALLOW }, - { NULL }, - { "unallow", zfs_do_unallow, HELP_UNALLOW }, + { "jail", zfs_do_jail, HELP_JAIL }, + { "unjail", zfs_do_unjail, HELP_UNJAIL }, }; #define NCOMMAND (sizeof (command_table) / sizeof (command_table[0])) @@ -173,37 +167,39 @@ { switch (idx) { case HELP_CLONE: - return (gettext("\tclone [-p] " - "\n")); + return (gettext("\tclone \n")); case HELP_CREATE: - return (gettext("\tcreate [-p] [-o property=value] ... " + return (gettext("\tcreate [[-o property=value] ... ] " "\n" - "\tcreate [-ps] [-b blocksize] [-o property=value] ... " - "-V \n")); + "\tcreate [-s] [-b blocksize] [[-o property=value] ...]\n" + "\t -V \n")); case HELP_DESTROY: return (gettext("\tdestroy [-rRf] " "\n")); case HELP_GET: - return (gettext("\tget [-rHp] [-o field[,...]] " - "[-s source[,...]]\n" - "\t <\"all\" | property[,...]> " + return (gettext("\tget [-rHp] [-o field[,field]...] " + "[-s source[,source]...]\n" + "\t " "[filesystem|volume|snapshot] ...\n")); case HELP_INHERIT: return (gettext("\tinherit [-r] " " ...\n")); - case HELP_UPGRADE: - return (gettext("\tupgrade [-v]\n" - "\tupgrade [-r] [-V version] <-a | filesystem ...>\n")); + case HELP_JAIL: + return (gettext("\tjail \n")); + case HELP_UNJAIL: + return (gettext("\tunjail \n")); case HELP_LIST: - return (gettext("\tlist [-rH] [-o property[,...]] " - "[-t type[,...]] [-s property] ...\n" - "\t [-S property] ... " - "[filesystem|volume|snapshot] ...\n")); + return (gettext("\tlist [-rH] [-o property[,property]...] " + "[-t type[,type]...]\n" + "\t [-s property [-s property]...]" + " [-S property [-S property]...]\n" + "\t [filesystem|volume|snapshot] ...\n")); case HELP_MOUNT: return (gettext("\tmount\n" - "\tmount [-vO] [-o opts] <-a | filesystem>\n")); + "\tmount [-o opts] [-O] -a\n" + "\tmount [-o opts] [-O] \n")); case HELP_PROMOTE: - return (gettext("\tpromote \n")); + return (gettext("\tpromote \n")); case HELP_RECEIVE: return (gettext("\treceive [-vnF] \n" @@ -211,45 +207,26 @@ case HELP_RENAME: return (gettext("\trename " "\n" - "\trename -p \n" "\trename -r ")); case HELP_ROLLBACK: - return (gettext("\trollback [-rR] \n")); + return (gettext("\trollback [-rRf] \n")); case HELP_SEND: - return (gettext("\tsend [-R] [-[iI] snapshot] \n")); + return (gettext("\tsend [-i ] \n")); case HELP_SET: return (gettext("\tset " " ...\n")); case HELP_SHARE: - return (gettext("\tshare <-a | filesystem>\n")); + return (gettext("\tshare -a\n" + "\tshare \n")); case HELP_SNAPSHOT: return (gettext("\tsnapshot [-r] " - "\n")); + "\n")); case HELP_UNMOUNT: - return (gettext("\tunmount [-f] " - "<-a | filesystem|mountpoint>\n")); + return (gettext("\tunmount [-f] -a\n" + "\tunmount [-f] \n")); case HELP_UNSHARE: - return (gettext("\tunshare [-f] " - "<-a | filesystem|mountpoint>\n")); - case HELP_ALLOW: - return (gettext("\tallow [-ldug] " - "<\"everyone\"|user|group>[,...] [,...]\n" - "\t \n" - "\tallow [-ld] -e [,...] " - "\n" - "\tallow -c [,...] \n" - "\tallow -s @setname [,...] " - "\n")); - case HELP_UNALLOW: - return (gettext("\tunallow [-rldug] " - "<\"everyone\"|user|group>[,...]\n" - "\t [[,...]] \n" - "\tunallow [-rld] -e [[,...]] " - "\n" - "\tunallow [-r] -c [[,...]] " - "\n" - "\tunallow [-r] -s @setname [[,...]] " - "\n")); + return (gettext("\tunshare [-f] -a\n" + "\tunshare [-f] \n")); } abort(); @@ -273,19 +250,17 @@ } /* - * Callback routine that will print out information for each of + * Callback routinue that will print out information for each of the >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Dec 13 23:39:08 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B2E8B16A59B; Thu, 13 Dec 2007 23:39:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6842916A560 for ; Thu, 13 Dec 2007 23:39:07 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BA87113C43E for ; Thu, 13 Dec 2007 23:39:06 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBDNd6Uu015417 for ; Thu, 13 Dec 2007 23:39:06 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBDNd6l3015414 for perforce@freebsd.org; Thu, 13 Dec 2007 23:39:06 GMT (envelope-from jb@freebsd.org) Date: Thu, 13 Dec 2007 23:39:06 GMT Message-Id: <200712132339.lBDNd6l3015414@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130823 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Dec 2007 23:39:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=130823 Change 130823 by jb@jb_freebsd1 on 2007/12/13 23:38:12 Fix a couple of mismerges. Affected files ... .. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#3 edit .. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#3 edit Differences ... ==== //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#3 (text+ko) ==== @@ -470,8 +470,6 @@ #define gethrestime_sec() time(NULL) -#define open64(...) open(__VA_ARGS__) -#define pread64(d, p, n, o) pread(d, p, n, o) #define pwrite64(d, p, n, o) pwrite(d, p, n, o) #define readdir64(d) readdir(d) #define SIGPENDING(td) (0) ==== //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#3 (text+ko) ==== @@ -1846,7 +1846,17 @@ vd->vdev_state = state; vd->vdev_stat.vs_aux = aux; + /* + * If we are setting the vdev state to anything but an open state, then + * always close the underlying device. Otherwise, we keep accessible + * but invalid devices open forever. We don't call vdev_close() itself, + * because that implies some extra checks (offline, etc) that we don't + * want here. This is limited to leaf devices, because otherwise + * closing the device will affect other children. + */ if (vdev_is_dead(vd) && vd->vdev_ops->vdev_op_leaf) + vd->vdev_ops->vdev_op_close(vd); + if (state == VDEV_STATE_CANT_OPEN) { /* * If we fail to open a vdev during an import, we mark it as From owner-p4-projects@FreeBSD.ORG Fri Dec 14 00:43:16 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0CB6016A41A; Fri, 14 Dec 2007 00:43:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9AE7416A418 for ; Fri, 14 Dec 2007 00:43:15 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8BA5E13C442 for ; Fri, 14 Dec 2007 00:43:15 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBE0hFSu026790 for ; Fri, 14 Dec 2007 00:43:15 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBE0hF0q026772 for perforce@freebsd.org; Fri, 14 Dec 2007 00:43:15 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Dec 2007 00:43:15 GMT Message-Id: <200712140043.lBE0hF0q026772@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130825 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Dec 2007 00:43:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=130825 Change 130825 by jb@jb_freebsd1 on 2007/12/14 00:43:09 MFC Affected files ... .. //depot/projects/dtrace7/src/compat/opensolaris/include/alloca.h#1 add .. //depot/projects/dtrace7/src/compat/opensolaris/include/fcntl.h#1 add .. //depot/projects/dtrace7/src/compat/opensolaris/include/stdio.h#1 add .. //depot/projects/dtrace7/src/compat/opensolaris/include/stdlib.h#1 add .. //depot/projects/dtrace7/src/compat/opensolaris/include/strings.h#1 add .. //depot/projects/dtrace7/src/compat/opensolaris/include/unistd.h#1 add .. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#2 edit .. //depot/projects/dtrace7/src/sys/compat/opensolaris/rpc/xdr.h#2 edit .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/atomic.h#2 edit .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/kcondvar.h#2 edit .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/kmem.h#2 edit .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/mutex.h#2 edit .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/proc.h#2 edit .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/rwlock.h#2 edit .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/time.h#2 edit .. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/types.h#2 edit Differences ... ==== //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_vfs.c,v 1.6 2007/06/04 11:31:45 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/opensolaris/kern/opensolaris_vfs.c,v 1.7 2007/11/01 08:58:29 pjd Exp $"); #include #include @@ -163,6 +163,7 @@ { struct mount *mp; struct vfsconf *vfsp; + struct ucred *newcr, *oldcr; int error; /* @@ -202,7 +203,9 @@ /* * Set the mount level flags. + * crdup() can sleep, so do it before acquiring a mutex. */ + newcr = crdup(kcred); MNT_ILOCK(mp); if (fsflags & MNT_RDONLY) mp->mnt_flag |= MNT_RDONLY; @@ -212,10 +215,11 @@ * Unprivileged user can trigger mounting a snapshot, but we don't want * him to unmount it, so we switch to privileged credentials. */ - crfree(mp->mnt_cred); - mp->mnt_cred = crdup(kcred); + oldcr = mp->mnt_cred; + mp->mnt_cred = newcr; mp->mnt_stat.f_owner = mp->mnt_cred->cr_uid; MNT_IUNLOCK(mp); + crfree(oldcr); /* * Mount the filesystem. * XXX The final recipients of VFS_MOUNT just overwrite the ndp they ==== //depot/projects/dtrace7/src/sys/compat/opensolaris/rpc/xdr.h#2 (text+ko) ==== @@ -50,19 +50,6 @@ #define xdr_control(a,b,c) xdrmem_control(a,b,c) /* - * These are XDR control operators - */ - -#define XDR_GET_BYTES_AVAIL 1 - -struct xdr_bytesrec { - bool_t xc_is_last_record; - size_t xc_num_avail; -}; - -typedef struct xdr_bytesrec xdr_bytesrec; - -/* * These are the request arguments to XDR_CONTROL. * * XDR_PEEK - returns the contents of the next XDR unit on the XDR stream. ==== //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/atomic.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/compat/opensolaris/sys/atomic.h,v 1.1 2007/06/08 12:35:46 pjd Exp $ + * $FreeBSD: src/sys/compat/opensolaris/sys/atomic.h,v 1.2 2007/11/28 21:47:09 jb Exp $ */ #ifndef _OPENSOLARIS_SYS_ATOMIC_H_ @@ -106,7 +106,7 @@ static __inline void * atomic_cas_ptr(volatile void *target, void *cmp, void *newval) { - return ((void *)atomic_cas_64((uint64_t *)target, (uint64_t)cmp, + return ((void *)atomic_cas_64((volatile uint64_t *)target, (uint64_t)cmp, (uint64_t)newval)); } #endif ==== //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/kcondvar.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/compat/opensolaris/sys/kcondvar.h,v 1.1 2007/04/06 01:09:06 pjd Exp $ + * $FreeBSD: src/sys/compat/opensolaris/sys/kcondvar.h,v 1.2 2007/11/05 18:40:55 pjd Exp $ */ #ifndef _OPENSOLARIS_SYS_CONDVAR_H_ @@ -45,8 +45,15 @@ } kcv_type_t; #define zfs_cv_init(cv, name, type, arg) do { \ + const char *_name; \ ASSERT((type) == CV_DEFAULT); \ - cv_init((cv), "zfs:" #cv); \ + for (_name = #cv; *_name != '\0'; _name++) { \ + if (*_name >= 'a' && *_name <= 'z') \ + break; \ + } \ + if (*_name == '\0') \ + _name = #cv; \ + cv_init((cv), _name); \ } while (0) #define cv_init(cv, name, type, arg) zfs_cv_init((cv), (name), (type), (arg)) ==== //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/kmem.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/compat/opensolaris/sys/kmem.h,v 1.2 2007/04/10 02:35:56 pjd Exp $ + * $FreeBSD: src/sys/compat/opensolaris/sys/kmem.h,v 1.3 2007/11/28 21:48:25 jb Exp $ */ #ifndef _OPENSOLARIS_SYS_KMEM_H_ @@ -32,6 +32,7 @@ #include #include #include +#include #include #include @@ -41,8 +42,6 @@ #define KM_NOSLEEP M_NOWAIT #define KMC_NODEBUG 0 -typedef void vmem_t; - typedef struct kmem_cache { char kc_name[32]; #ifdef _KERNEL ==== //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/mutex.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/compat/opensolaris/sys/mutex.h,v 1.3 2007/05/26 21:37:14 pjd Exp $ + * $FreeBSD: src/sys/compat/opensolaris/sys/mutex.h,v 1.4 2007/11/05 18:40:55 pjd Exp $ */ #ifndef _OPENSOLARIS_SYS_MUTEX_H_ @@ -53,11 +53,18 @@ #endif #define mutex_init(lock, desc, type, arg) do { \ + const char *_name; \ ASSERT((type) == MUTEX_DEFAULT); \ KASSERT(((lock)->lock_object.lo_flags & LO_ALLMASK) != \ LO_EXPECTED, ("lock %s already initialized", #lock)); \ bzero((lock), sizeof(struct sx)); \ - sx_init_flags((lock), "zfs:" #lock, MUTEX_FLAGS); \ + for (_name = #lock; *_name != '\0'; _name++) { \ + if (*_name >= 'a' && *_name <= 'z') \ + break; \ + } \ + if (*_name == '\0') \ + _name = #lock; \ + sx_init_flags((lock), _name, MUTEX_FLAGS); \ } while (0) #define mutex_destroy(lock) sx_destroy(lock) #define mutex_enter(lock) sx_xlock(lock) ==== //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/proc.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/compat/opensolaris/sys/proc.h,v 1.2 2007/08/16 20:33:20 pjd Exp $ + * $FreeBSD: src/sys/compat/opensolaris/sys/proc.h,v 1.4 2007/11/28 21:50:05 jb Exp $ */ #ifndef _OPENSOLARIS_SYS_PROC_H_ @@ -44,8 +44,6 @@ #define max_ncpus mp_ncpus #define boot_max_ncpus mp_ncpus -extern int hz; /* system clock's frequency */ - #define TS_RUN 0 #define p0 proc0 @@ -77,12 +75,12 @@ ASSERT(len == 0); ASSERT(state == TS_RUN); - error = kthread_create(proc, arg, &p, 0, ZFS_KSTACK_PAGES, + error = kproc_create(proc, arg, &p, 0, ZFS_KSTACK_PAGES, "solthread %p", proc); return (error == 0 ? FIRST_THREAD_IN_PROC(p) : NULL); } -#define thread_exit() kthread_exit(0) +#define thread_exit() kproc_exit(0) #endif /* _KERNEL */ ==== //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/rwlock.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/compat/opensolaris/sys/rwlock.h,v 1.3 2007/05/26 21:37:14 pjd Exp $ + * $FreeBSD: src/sys/compat/opensolaris/sys/rwlock.h,v 1.4 2007/11/05 18:40:55 pjd Exp $ */ #ifndef _OPENSOLARIS_SYS_RWLOCK_H_ @@ -60,10 +60,17 @@ #define RW_ISWRITER(x) (rw_iswriter(x)) #define rw_init(lock, desc, type, arg) do { \ + const char *_name; \ KASSERT(((lock)->lock_object.lo_flags & LO_ALLMASK) != \ LO_EXPECTED, ("lock %s already initialized", #lock)); \ bzero((lock), sizeof(struct sx)); \ - sx_init_flags((lock), "zfs:" #lock, RW_FLAGS); \ + for (_name = #lock; *_name != '\0'; _name++) { \ + if (*_name >= 'a' && *_name <= 'z') \ + break; \ + } \ + if (*_name == '\0') \ + _name = #lock; \ + sx_init_flags((lock), _name, RW_FLAGS); \ } while (0) #define rw_destroy(lock) sx_destroy(lock) #define rw_enter(lock, how) do { \ ==== //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/time.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/compat/opensolaris/sys/time.h,v 1.1 2007/04/06 01:09:06 pjd Exp $ + * $FreeBSD: src/sys/compat/opensolaris/sys/time.h,v 1.2 2007/11/28 21:44:17 jb Exp $ */ #ifndef _OPENSOLARIS_SYS_TIME_H_ @@ -31,9 +31,17 @@ #include_next +#define SEC 1 +#define MILLISEC 1000 +#define MICROSEC 1000000 +#define NANOSEC 1000000000 + +typedef longlong_t hrtime_t; + +#define LBOLT ((gethrtime() * hz) / NANOSEC) + #ifdef _KERNEL -#define lbolt ((gethrtime() * hz) / NANOSEC) -#define lbolt64 (int64_t)(lbolt) +#define lbolt64 (int64_t)(LBOLT) static __inline hrtime_t gethrtime(void) { @@ -53,6 +61,15 @@ #define gethrestime_sec() (time_second) #define gethrestime(ts) getnanotime(ts) +#else + +static __inline hrtime_t gethrtime(void) { + struct timespec ts; + clock_gettime(CLOCK_UPTIME,&ts); + return (((u_int64_t) ts.tv_sec) * NANOSEC + ts.tv_nsec); +} + + #endif /* _KERNEL */ #endif /* !_OPENSOLARIS_SYS_TIME_H_ */ ==== //depot/projects/dtrace7/src/sys/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/compat/opensolaris/sys/types.h,v 1.2 2007/04/23 00:52:06 pjd Exp $ + * $FreeBSD: src/sys/compat/opensolaris/sys/types.h,v 1.3 2007/11/28 21:49:16 jb Exp $ */ #ifndef _OPENSOLARIS_SYS_TYPES_H_ @@ -39,6 +39,18 @@ #define MAXNAMELEN 256 typedef struct timespec timestruc_t; +typedef u_int uint_t; +typedef u_char uchar_t; +typedef u_short ushort_t; +typedef u_long ulong_t; +typedef long long longlong_t; +typedef unsigned long long u_longlong_t; +typedef off_t off64_t; +typedef id_t taskid_t; +typedef id_t projid_t; +typedef id_t poolid_t; +typedef id_t zoneid_t; +typedef id_t ctid_t; #ifdef _KERNEL @@ -53,6 +65,12 @@ #else +#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) */ + typedef longlong_t offset_t; typedef u_longlong_t u_offset_t; typedef uint64_t upad64_t; From owner-p4-projects@FreeBSD.ORG Fri Dec 14 00:54:30 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B062616A41A; Fri, 14 Dec 2007 00:54:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2328216A417 for ; Fri, 14 Dec 2007 00:54:30 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 15AC313C458 for ; Fri, 14 Dec 2007 00:54:30 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBE0sTBh037361 for ; Fri, 14 Dec 2007 00:54:29 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBE0sThs037358 for perforce@freebsd.org; Fri, 14 Dec 2007 00:54:29 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Dec 2007 00:54:29 GMT Message-Id: <200712140054.lBE0sThs037358@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130826 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Dec 2007 00:54:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=130826 Change 130826 by jb@jb_freebsd1 on 2007/12/14 00:54:17 Remove _SOLARIS_C_SOURCE now that we aren't doing the compatibility that way. Affected files ... .. //depot/projects/dtrace7/src/cddl/Makefile.inc#2 edit .. //depot/projects/dtrace7/src/include/elf.h#2 edit .. //depot/projects/dtrace7/src/sys/modules/zfs/Makefile#2 edit .. //depot/projects/dtrace7/src/sys/sys/elf.h#2 edit .. //depot/projects/dtrace7/src/sys/sys/kernel.h#3 edit .. //depot/projects/dtrace7/src/sys/sys/param.h#3 edit .. //depot/projects/dtrace7/src/sys/sys/stat.h#2 edit .. //depot/projects/dtrace7/src/sys/sys/time.h#2 edit .. //depot/projects/dtrace7/src/sys/sys/types.h#2 edit Differences ... ==== //depot/projects/dtrace7/src/cddl/Makefile.inc#2 (text+ko) ==== @@ -1,3 +1,2 @@ # $FreeBSD: src/cddl/Makefile.inc,v 1.2 2007/04/16 21:20:24 ru Exp $ -CFLAGS+= -D_SOLARIS_C_SOURCE ==== //depot/projects/dtrace7/src/include/elf.h#2 (text+ko) ==== @@ -38,8 +38,4 @@ #include #include -#ifdef _SOLARIS_C_SOURCE -#include -#endif - #endif /* !_ELF_H_ */ ==== //depot/projects/dtrace7/src/sys/modules/zfs/Makefile#2 (text+ko) ==== @@ -76,8 +76,6 @@ CWARNFLAGS+=-Wno-unused CWARNFLAGS+=-Wno-switch -CFLAGS+=-D_SOLARIS_C_SOURCE - CFLAGS+=-I${.CURDIR}/../../compat/opensolaris CFLAGS+=-I${.CURDIR}/../../contrib/opensolaris/uts/common/fs/zfs CFLAGS+=-I${.CURDIR}/../../contrib/opensolaris/uts/common/zmod ==== //depot/projects/dtrace7/src/sys/sys/elf.h#2 (text+ko) ==== @@ -38,8 +38,4 @@ #include #include -#ifdef _SOLARIS_C_SOURCE -#include -#endif - #endif /* !_SYS_ELF_H_ */ ==== //depot/projects/dtrace7/src/sys/sys/kernel.h#3 (text+ko) ==== @@ -68,9 +68,7 @@ extern int profhz; /* profiling clock's frequency */ extern int profprocs; /* number of process's profiling */ extern int ticks; -#ifndef _SOLARIS_C_SOURCE extern int lbolt; /* once a second sleep address */ -#endif #endif /* _KERNEL */ ==== //depot/projects/dtrace7/src/sys/sys/param.h#3 (text+ko) ==== @@ -305,20 +305,4 @@ #define ctodb(db) /* calculates pages to devblks */ \ ((db) << (PAGE_SHIFT - DEV_BSHIFT)) -/* - * Solaris compatibility definitions. - */ -#ifdef _SOLARIS_C_SOURCE -#define PAGESIZE PAGE_SIZE - -/* - * The OpenSolaris version is set according to the version last imported - * from http://dlc.sun.com/osol/on/downloads/current/. In FreeBSD header - * files it can be used to determine the level of compatibility that the - * FreeBSD headers provide to OpenSolaris code. Perhaps one day there - * will be a really, really Single Unix Specification. - */ -#define __OpenSolaris_version 20060731 -#endif - #endif /* _SYS_PARAM_H_ */ ==== //depot/projects/dtrace7/src/sys/sys/stat.h#2 (text+ko) ==== @@ -304,14 +304,6 @@ #endif /* __BSD_VISIBLE */ -/* - * Solaris compatibility definitions. - */ -#ifdef _SOLARIS_C_SOURCE -#define stat64 stat -#define fstat64 fstat -#endif - #ifndef _KERNEL __BEGIN_DECLS #if __BSD_VISIBLE ==== //depot/projects/dtrace7/src/sys/sys/time.h#2 (text+ko) ==== @@ -324,27 +324,4 @@ #endif /* !_KERNEL */ -/* - * Solaris compatibility definitions. - */ -#ifdef _SOLARIS_C_SOURCE -/* - * Definitions for commonly used resolutions. - */ -#define SEC 1 -#define MILLISEC 1000 -#define MICROSEC 1000000 -#define NANOSEC 1000000000 - -typedef longlong_t hrtime_t; - -#ifndef _KERNEL -static __inline hrtime_t gethrtime(void) { - struct timespec ts; - clock_gettime(CLOCK_UPTIME,&ts); - return (((u_int64_t) ts.tv_sec) * NANOSEC + ts.tv_nsec); -} -#endif -#endif /* _SOLARIS_C_SOURCE */ - #endif /* !_SYS_TIME_H_ */ ==== //depot/projects/dtrace7/src/sys/sys/types.h#2 (text+ko) ==== @@ -297,36 +297,6 @@ #endif /* !_KERNEL */ /* - * Solaris compatibility definitions. - */ -#ifdef _SOLARIS_C_SOURCE -typedef u_int uint_t; -typedef u_char uchar_t; -typedef u_short ushort_t; -typedef u_long ulong_t; - -typedef long long longlong_t; -typedef unsigned long long u_longlong_t; - -typedef off_t off64_t; - -typedef id_t taskid_t; -typedef id_t projid_t; -typedef id_t poolid_t; -typedef id_t zoneid_t; -typedef id_t ctid_t; - -#ifndef _KERNEL -#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 - -#endif /* _SOLARIS_C_SOURCE */ - -/* * The following are all things that really shouldn't exist in this header, * since its purpose is to provide typedefs, not miscellaneous doodads. */ From owner-p4-projects@FreeBSD.ORG Fri Dec 14 02:07:51 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4A4C416A46B; Fri, 14 Dec 2007 02:07:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E9DD416A419 for ; Fri, 14 Dec 2007 02:07:50 +0000 (UTC) (envelope-from qingli@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DEB4813C501 for ; Fri, 14 Dec 2007 02:07:50 +0000 (UTC) (envelope-from qingli@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBE27oNU050641 for ; Fri, 14 Dec 2007 02:07:50 GMT (envelope-from qingli@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBE27nJ1050638 for perforce@freebsd.org; Fri, 14 Dec 2007 02:07:49 GMT (envelope-from qingli@freebsd.org) Date: Fri, 14 Dec 2007 02:07:49 GMT Message-Id: <200712140207.lBE27nJ1050638@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to qingli@freebsd.org using -f From: Qing Li To: Perforce Change Reviews Cc: Subject: PERFORCE change 130830 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Dec 2007 02:07:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=130830 Change 130830 by qingli@FreeBSD-newarp on 2007/12/14 02:07:22 These files have been modified to work with the new ARP code. The immediate To-Do list: 1. cleanup the locking code 2. work in comments from Gleb Performed buildworld, installworld, buildkernel, installkernel, and simple testing involved running "arp", "ndp", "ping" and "ping6". cxgb_l2t.c compiles and links, but I doubt the actual code works due to internal "struct llinfo_arp{}" definition. I will clean it up soon. Affected files ... .. //depot/projects/arp-v2/src/lib/libstand/if_ether.h#2 edit .. //depot/projects/arp-v2/src/sys/conf/files#2 edit .. //depot/projects/arp-v2/src/sys/dev/cxgb/cxgb_l2t.c#2 edit .. //depot/projects/arp-v2/src/sys/net/if.c#2 edit .. //depot/projects/arp-v2/src/sys/net/if_arcsubr.c#2 edit .. //depot/projects/arp-v2/src/sys/net/if_ethersubr.c#2 edit .. //depot/projects/arp-v2/src/sys/net/if_fddisubr.c#2 edit .. //depot/projects/arp-v2/src/sys/net/if_fwsubr.c#2 edit .. //depot/projects/arp-v2/src/sys/net/if_iso88025subr.c#2 edit .. //depot/projects/arp-v2/src/sys/net/if_var.h#2 edit .. //depot/projects/arp-v2/src/sys/net/route.c#2 edit .. //depot/projects/arp-v2/src/sys/net/rtsock.c#2 edit .. //depot/projects/arp-v2/src/sys/netinet/if_ether.c#2 edit .. //depot/projects/arp-v2/src/sys/netinet/if_ether.h#2 edit .. //depot/projects/arp-v2/src/sys/netinet/in.c#2 edit .. //depot/projects/arp-v2/src/sys/netinet/ip_output.c#2 edit .. //depot/projects/arp-v2/src/sys/netinet6/icmp6.c#2 edit .. //depot/projects/arp-v2/src/sys/netinet6/in6.c#2 edit .. //depot/projects/arp-v2/src/sys/netinet6/ip6_forward.c#2 edit .. //depot/projects/arp-v2/src/sys/netinet6/ip6_input.c#2 edit .. //depot/projects/arp-v2/src/sys/netinet6/ip6_mroute.c#2 edit .. //depot/projects/arp-v2/src/sys/netinet6/ip6_output.c#2 edit .. //depot/projects/arp-v2/src/sys/netinet6/nd6.c#2 edit .. //depot/projects/arp-v2/src/sys/netinet6/nd6.h#2 edit .. //depot/projects/arp-v2/src/sys/netinet6/nd6_nbr.c#2 edit .. //depot/projects/arp-v2/src/sys/netinet6/nd6_rtr.c#2 edit .. //depot/projects/arp-v2/src/usr.sbin/arp/arp.c#2 edit .. //depot/projects/arp-v2/src/usr.sbin/ndp/ndp.c#2 edit Differences ... ==== //depot/projects/arp-v2/src/lib/libstand/if_ether.h#2 (text+ko) ==== @@ -156,7 +156,7 @@ void arpwhohas(struct arpcom *, struct in_addr *); void arpintr(void); int arpresolve(struct arpcom *, - struct rtentry *, struct mbuf *, struct sockaddr *, u_char *); + struct rtentry *, struct mbuf *, struct sockaddr *, u_char *, struct llentry **); void arp_ifinit(struct arpcom *, struct ifaddr *); void arp_rtrequest(int, struct rtentry *, struct sockaddr *); @@ -233,7 +233,7 @@ #ifdef _KERNEL void arp_rtrequest(int, struct rtentry *, struct sockaddr *); int arpresolve(struct arpcom *, struct rtentry *, struct mbuf *, - struct sockaddr *, u_char *); + struct sockaddr *, u_char *, struct llentry **); void arpintr(void); int arpioctl(u_long, caddr_t); void arp_ifinit(struct arpcom *, struct ifaddr *); ==== //depot/projects/arp-v2/src/sys/conf/files#2 (text+ko) ==== @@ -1624,6 +1624,7 @@ net/if_iso88025subr.c optional token net/if_lagg.c optional lagg net/if_loop.c optional loop +net/if_llatbl.c standard net/if_media.c standard net/if_mib.c standard net/if_ppp.c optional ppp ==== //depot/projects/arp-v2/src/sys/dev/cxgb/cxgb_l2t.c#2 (text+ko) ==== @@ -173,6 +173,7 @@ { struct rtentry *rt; struct mbuf *m0; + struct llentry *lle=NULL; if ((m0 = m_gethdr(M_NOWAIT, MT_DATA)) == NULL) return (ENOMEM); @@ -182,7 +183,7 @@ again: switch (e->state) { case L2T_STATE_STALE: /* entry is stale, kick off revalidation */ - arpresolve(rt->rt_ifp, rt, m0, rt->rt_gateway, RT_ENADDR(rt)); + arpresolve(rt->rt_ifp, rt, m0, rt->rt_gateway, RT_ENADDR(rt), &lle); mtx_lock(&e->lock); if (e->state == L2T_STATE_STALE) e->state = L2T_STATE_VALID; @@ -208,7 +209,7 @@ * A better way would be to use a work request to retry L2T * entries when there's no memory. */ - if (arpresolve(rt->rt_ifp, rt, m0, rt->rt_gateway, RT_ENADDR(rt)) == 0) { + if (arpresolve(rt->rt_ifp, rt, m0, rt->rt_gateway, RT_ENADDR(rt), &lle) == 0) { mtx_lock(&e->lock); if (e->arpq_head) @@ -226,6 +227,7 @@ { struct rtentry *rt; struct mbuf *m0; + struct llentry *lle=NULL; if ((m0 = m_gethdr(M_NOWAIT, MT_DATA)) == NULL) return; @@ -234,7 +236,7 @@ again: switch (e->state) { case L2T_STATE_STALE: /* entry is stale, kick off revalidation */ - arpresolve(rt->rt_ifp, rt, m0, rt->rt_gateway, RT_ENADDR(rt)); + arpresolve(rt->rt_ifp, rt, m0, rt->rt_gateway, RT_ENADDR(rt), &lle); mtx_lock(&e->lock); if (e->state == L2T_STATE_STALE) { e->state = L2T_STATE_VALID; @@ -261,7 +263,7 @@ * A better way would be to use a work request to retry L2T * entries when there's no memory. */ - arpresolve(rt->rt_ifp, rt, m0, rt->rt_gateway, RT_ENADDR(rt)); + arpresolve(rt->rt_ifp, rt, m0, rt->rt_gateway, RT_ENADDR(rt), &lle); } return; ==== //depot/projects/arp-v2/src/sys/net/if.c#2 (text+ko) ==== @@ -57,6 +57,7 @@ #include #include #include +#include #include #include @@ -65,6 +66,7 @@ #include #include #include +#include #if defined(INET) || defined(INET6) /*XXX*/ @@ -134,6 +136,9 @@ extern void nd6_setmtu(struct ifnet *); #endif +extern uma_zone_t llezone; +extern uma_zone_t lltzone; + int if_index = 0; struct ifindex_entry *ifindex_table = NULL; int ifqmaxlen = IFQ_MAXLEN; @@ -294,7 +299,6 @@ static void if_init(void *dummy __unused) { - IFNET_LOCK_INIT(); TAILQ_INIT(&ifnet); TAILQ_INIT(&ifg_head); @@ -303,6 +307,13 @@ ifdev_byindex(0) = make_dev(&net_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "network"); if_clone_init(); + /* + * create uma zone for L2/L3 cache + */ + llezone = uma_zcreate("llentry", sizeof(struct llentry), NULL, NULL, + NULL, NULL, UMA_ALIGN_PTR, 0); + lltzone = uma_zcreate("lltable", sizeof(struct lltable), NULL, NULL, + NULL, NULL, UMA_ALIGN_PTR, 0); } static void @@ -463,11 +474,13 @@ TASK_INIT(&ifp->if_starttask, 0, if_start_deferred, ifp); TASK_INIT(&ifp->if_linktask, 0, do_link_state_change, ifp); IF_AFDATA_LOCK_INIT(ifp); + IF_LLTBLS_LOCK_INIT(ifp); ifp->if_afdata_initialized = 0; TAILQ_INIT(&ifp->if_addrhead); TAILQ_INIT(&ifp->if_prefixhead); TAILQ_INIT(&ifp->if_multiaddrs); + TAILQ_INIT(&ifp->if_lltables); TAILQ_INIT(&ifp->if_groups); if_addgroup(ifp, IFG_ALL); ==== //depot/projects/arp-v2/src/sys/net/if_arcsubr.c#2 (text+ko) ==== @@ -64,6 +64,7 @@ #include #include #include +#include #if defined(INET) || defined(INET6) #include @@ -108,6 +109,7 @@ u_int8_t atype, adst; int loop_copy = 0; int isphds; + struct llentry *lle; if (!((ifp->if_flags & IFF_UP) && (ifp->if_drv_flags & IFF_DRV_RUNNING))) @@ -127,7 +129,7 @@ else if (ifp->if_flags & IFF_NOARP) adst = ntohl(SIN(dst)->sin_addr.s_addr) & 0xFF; else { - error = arpresolve(ifp, rt0, m, dst, &adst); + error = arpresolve(ifp, rt0, m, dst, &adst, &lle); if (error) return (error == EWOULDBLOCK ? 0 : error); } @@ -165,7 +167,7 @@ #endif #ifdef INET6 case AF_INET6: - error = nd6_storelladdr(ifp, rt0, m, dst, (u_char *)&adst); + error = nd6_storelladdr(ifp, rt0, m, dst, (u_char *)&adst, &lle); if (error) return (error); atype = ARCTYPE_INET6; ==== //depot/projects/arp-v2/src/sys/net/if_ethersubr.c#2 (text+ko) ==== @@ -60,6 +60,7 @@ #include #include #include +#include #include #if defined(INET) || defined(INET6) @@ -138,6 +139,8 @@ static int ether_ipfw; #endif +extern int useloopback; + /* * Ethernet output routine. * Encapsulate a packet of type family for the local net. @@ -151,6 +154,7 @@ short type; int error, hdrcmplt = 0; u_char esrc[ETHER_ADDR_LEN], edst[ETHER_ADDR_LEN]; + struct llentry *lle = NULL; struct ether_header *eh; struct pf_mtag *t; int loop_copy = 1; @@ -172,7 +176,7 @@ switch (dst->sa_family) { #ifdef INET case AF_INET: - error = arpresolve(ifp, rt0, m, dst, edst); + error = arpresolve(ifp, rt0, m, dst, edst, &lle); if (error) return (error == EWOULDBLOCK ? 0 : error); type = htons(ETHERTYPE_IP); @@ -207,7 +211,7 @@ #endif #ifdef INET6 case AF_INET6: - error = nd6_storelladdr(ifp, rt0, m, dst, (u_char *)edst); + error = nd6_storelladdr(ifp, rt0, m, dst, (u_char *)edst, &lle); if (error) return error; type = htons(ETHERTYPE_IPV6); @@ -275,6 +279,9 @@ senderr(EAFNOSUPPORT); } + if (lle && (lle->la_flags & LLE_IFADDR) && useloopback) + return (if_simloop(ifp, m, dst->sa_family, 0)); + /* * Add local net header. If no space in first mbuf, * allocate another. ==== //depot/projects/arp-v2/src/sys/net/if_fddisubr.c#2 (text+ko) ==== @@ -55,6 +55,7 @@ #include #include #include +#include #include #include @@ -119,6 +120,7 @@ int loop_copy = 0, error = 0, hdrcmplt = 0; u_char esrc[FDDI_ADDR_LEN], edst[FDDI_ADDR_LEN]; struct fddi_header *fh; + struct llentry *lle; #ifdef MAC error = mac_ifnet_check_transmit(ifp, m); @@ -136,7 +138,7 @@ switch (dst->sa_family) { #ifdef INET case AF_INET: { - error = arpresolve(ifp, rt0, m, dst, edst); + error = arpresolve(ifp, rt0, m, dst, edst, &lle); if (error) return (error == EWOULDBLOCK ? 0 : error); type = htons(ETHERTYPE_IP); @@ -172,7 +174,7 @@ #endif /* INET */ #ifdef INET6 case AF_INET6: - error = nd6_storelladdr(ifp, rt0, m, dst, (u_char *)edst); + error = nd6_storelladdr(ifp, rt0, m, dst, (u_char *)edst, &lle); if (error) return (error); /* Something bad happened */ type = htons(ETHERTYPE_IPV6); ==== //depot/projects/arp-v2/src/sys/net/if_fwsubr.c#2 (text+ko) ==== @@ -51,6 +51,7 @@ #include #include #include +#include #if defined(INET) || defined(INET6) #include @@ -89,6 +90,7 @@ struct mbuf *mtail; int unicast, dgl, foff; static int next_dgl; + struct llentry *lle; #ifdef MAC error = mac_ifnet_check_transmit(ifp, m); @@ -144,7 +146,7 @@ * doesn't fit into the arp model. */ if (unicast) { - error = arpresolve(ifp, rt, m, dst, (u_char *) destfw); + error = arpresolve(ifp, rt, m, dst, (u_char *) destfw, &lle); if (error) return (error == EWOULDBLOCK ? 0 : error); } @@ -174,7 +176,7 @@ case AF_INET6: if (unicast) { error = nd6_storelladdr(fc->fc_ifp, rt, m, dst, - (u_char *) destfw); + (u_char *) destfw, &lle); if (error) return (error); } ==== //depot/projects/arp-v2/src/sys/net/if_iso88025subr.c#2 (text+ko) ==== @@ -58,6 +58,7 @@ #include #include #include +#include #include #include @@ -242,6 +243,7 @@ struct iso88025_header gen_th; struct sockaddr_dl *sdl = NULL; struct rtentry *rt = NULL; + struct llentry *lle; #ifdef MAC error = mac_ifnet_check_transmit(ifp, m); @@ -287,7 +289,7 @@ switch (dst->sa_family) { #ifdef INET case AF_INET: - error = arpresolve(ifp, rt0, m, dst, edst); + error = arpresolve(ifp, rt0, m, dst, edst, &lle); if (error) return (error == EWOULDBLOCK ? 0 : error); snap_type = ETHERTYPE_IP; @@ -322,7 +324,7 @@ #endif /* INET */ #ifdef INET6 case AF_INET6: - error = nd6_storelladdr(ifp, rt0, m, dst, (u_char *)edst); + error = nd6_storelladdr(ifp, rt0, m, dst, (u_char *)edst, &lle); if (error) return (error); snap_type = ETHERTYPE_IPV6; ==== //depot/projects/arp-v2/src/sys/net/if_var.h#2 (text+ko) ==== @@ -68,6 +68,7 @@ struct rt_addrinfo; struct socket; struct ether_header; +struct lltable; struct carp_if; struct ifvlantrunk; #endif @@ -92,6 +93,7 @@ TAILQ_HEAD(ifprefixhead, ifprefix); TAILQ_HEAD(ifmultihead, ifmultiaddr); TAILQ_HEAD(ifgrouphead, ifg_group); +TAILQ_HEAD(lltables, lltable); /* L2/L3 address resolution table */ /* * Structure defining a queue for a network interface. @@ -169,7 +171,7 @@ void *if_bridge; /* bridge glue */ - struct lltable *lltables; /* list of L3-L2 resolution tables */ + struct lltables if_lltables; /* list of L3-L2 resolution tables */ struct label *if_label; /* interface MAC label */ @@ -181,6 +183,8 @@ struct task if_starttask; /* task for IFF_NEEDSGIANT */ struct task if_linktask; /* task for link change events */ struct mtx if_addr_mtx; /* mutex to protect address lists */ + struct mtx if_lltbls_mtx; /* mutex to protect link-layer + address tables */ LIST_ENTRY(ifnet) if_clones; /* interfaces of a cloner */ TAILQ_HEAD(, ifg_list) if_groups; /* linked list of groups per if */ /* protected by if_addr_mtx */ @@ -235,6 +239,22 @@ #define IF_ADDR_LOCK_ASSERT(if) mtx_assert(&(if)->if_addr_mtx, MA_OWNED) /* + * Locks for link-layer address tables on the network interface. + */ +#define IF_LLTBLS_LOCK_INIT(if) mtx_init(&(if)->if_lltbls_mtx, \ + "if_lltbls_mtx", NULL, MTX_DEF | MTX_RECURSE) +#define IF_LLTBLS_LOCK_DESTROY(if) mtx_destroy(&(if)->if_lltbls_mtx) +#if 0 +#define IF_LLTBLS_LOCK(if) mtx_lock(&(if)->if_lltbls_mtx) +#define IF_LLTBLS_UNLOCK(if) mtx_unlock(&(if)->if_lltbls_mtx) +#else +#define IF_LLTBLS_LOCK(if) +#define IF_LLTBLS_UNLOCK(if) +#endif +#define IF_LLTBLS_LOCK_ASSERT(if) mtx_assert(&(if)->if_lltbls_mtx, MA_OWNED) + + +/* * Output queues (ifp->if_snd) and slow device input queues (*ifp->if_slowq) * are queues of messages stored on ifqueue structures * (defined above). Entries are added to and deleted from these structures ==== //depot/projects/arp-v2/src/sys/net/route.c#2 (text+ko) ==== @@ -42,6 +42,7 @@ #include #include +#include #include #include @@ -1149,6 +1150,7 @@ struct rtentry *rt = NULL; struct rt_addrinfo info; int error; + static struct sockaddr_dl null_sdl = {sizeof(null_sdl), AF_LINK}; if (flags & RTF_HOST) { dst = ifa->ifa_dstaddr; @@ -1209,7 +1211,13 @@ info.rti_ifa = ifa; info.rti_flags = flags | ifa->ifa_flags; info.rti_info[RTAX_DST] = dst; - info.rti_info[RTAX_GATEWAY] = ifa->ifa_addr; + /* + * doing this for compatibility reasons + */ + if (cmd == RTM_ADD) + info.rti_info[RTAX_GATEWAY] = (struct sockaddr *)&null_sdl; + else + info.rti_info[RTAX_GATEWAY] = ifa->ifa_addr; info.rti_info[RTAX_NETMASK] = netmask; error = rtrequest1(cmd, &info, &rt); if (error == 0 && rt != NULL) { @@ -1217,6 +1225,13 @@ * notify any listening routing agents of the change */ RT_LOCK(rt); + /* + * doing this for compatibility reasons + */ + if (cmd == RTM_ADD) { + ((struct sockaddr_dl *)rt->rt_gateway)->sdl_type = rt->rt_ifp->if_type; + ((struct sockaddr_dl *)rt->rt_gateway)->sdl_index = rt->rt_ifp->if_index; + } rt_newaddrmsg(cmd, ifa, error, rt); if (cmd == RTM_DELETE) { /* ==== //depot/projects/arp-v2/src/sys/net/rtsock.c#2 (text+ko) ==== @@ -44,8 +44,10 @@ #include #include #include +#include #include +#include #include #include #include @@ -106,6 +108,8 @@ struct rt_metrics *out); static void rt_dispatch(struct mbuf *, const struct sockaddr *); +extern int sysctl_dumparp(int af, struct sysctl_req *wr); + static void rts_init(void) { @@ -385,6 +389,11 @@ if (info.rti_info[RTAX_GATEWAY] == NULL) senderr(EINVAL); saved_nrt = NULL; + /* support for new ARP code */ + if (info.rti_info[RTAX_GATEWAY]->sa_family == AF_LINK) { + error = lla_rt_output(rtm, &info); + break; + } error = rtrequest1(RTM_ADD, &info, &saved_nrt); if (error == 0 && saved_nrt) { RT_LOCK(saved_nrt); @@ -399,6 +408,12 @@ case RTM_DELETE: saved_nrt = NULL; + /* support for new ARP code */ + if (info.rti_info[RTAX_GATEWAY] && + (info.rti_info[RTAX_GATEWAY]->sa_family == AF_LINK)) { + error = lla_rt_output(rtm, &info); + break; + } error = rtrequest1(RTM_DELETE, &info, &saved_nrt); if (error == 0) { RT_LOCK(saved_nrt); @@ -1265,6 +1280,11 @@ RADIX_NODE_HEAD_UNLOCK(rnh); } else if (af != 0) error = EAFNOSUPPORT; + /* + * take care of llinfo entries + */ + if (w.w_op == NET_RT_FLAGS && (RTF_LLINFO & w.w_arg)) + error = sysctl_dumparp(af, w.w_req); break; case NET_RT_IFLIST: ==== //depot/projects/arp-v2/src/sys/netinet/if_ether.c#2 (text+ko) ==== @@ -62,6 +62,7 @@ #include #include +#include #include #include @@ -85,21 +86,10 @@ SYSCTL_INT(_net_link_ether_inet, OID_AUTO, max_age, CTLFLAG_RW, &arpt_keep, 0, "ARP entry lifetime in seconds"); -#define rt_expire rt_rmx.rmx_expire - -struct llinfo_arp { - struct callout la_timer; - struct rtentry *la_rt; - struct mbuf *la_hold; /* last packet until resolved/timeout */ - u_short la_preempt; /* countdown for pre-expiry arps */ - u_short la_asked; /* # requests sent */ -}; - static struct ifqueue arpintrq; -static int arp_allocated; static int arp_maxtries = 5; -static int useloopback = 1; /* use loopback interface for local traffic */ +int useloopback = 1; /* use loopback interface for local traffic */ static int arp_proxyall = 0; SYSCTL_INT(_net_link_ether_inet, OID_AUTO, maxtries, CTLFLAG_RW, @@ -110,210 +100,97 @@ &arp_proxyall, 0, "Enable proxy ARP for all suitable requests"); static void arp_init(void); -static void arp_rtrequest(int, struct rtentry *, struct rt_addrinfo *); -static void arprequest(struct ifnet *, +void arprequest(struct ifnet *, struct in_addr *, struct in_addr *, u_char *); static void arpintr(struct mbuf *); static void arptimer(void *); -static struct rtentry - *arplookup(u_long, int, int); #ifdef INET static void in_arpinput(struct mbuf *); #endif +#ifdef AF_INET +void arp_ifscrub(struct ifnet *ifp, uint32_t addr); + /* - * Timeout routine. + * called by in_ifscrub to remove entry from the table when + * the interface goes away */ -static void -arptimer(void *arg) +void +arp_ifscrub(struct ifnet *ifp, uint32_t addr) { - struct rtentry *rt = (struct rtentry *)arg; + struct sockaddr_in addr4; + struct llentry *lle; - RT_LOCK_ASSERT(rt); - /* - * The lock is needed to close a theoretical race - * between spontaneous expiry and intentional removal. - * We still got an extra reference on rtentry, so can - * safely pass pointers to its contents. - */ - RT_UNLOCK(rt); - - rtrequest(RTM_DELETE, rt_key(rt), NULL, rt_mask(rt), 0, NULL); + bzero((void *)&addr4, sizeof(addr4)); + addr4.sin_len = sizeof(addr4); + addr4.sin_family = AF_INET; + addr4.sin_addr.s_addr = addr; + IF_LLTBLS_LOCK(ifp); + lle = lla_lookup(ifp, (LLE_DELETE | LLE_IFADDR), (struct sockaddr *)&addr4); + IF_LLTBLS_UNLOCK(ifp); +#if 0 + if (lle == NULL) + log(LOG_INFO, "arp_ifscrub: interface address is missing from cache\n"); +#endif } +#endif /* - * Parallel to llc_rtrequest. + * Timeout routine. Age arp_tab entries periodically. */ static void -arp_rtrequest(int req, struct rtentry *rt, struct rt_addrinfo *info) +arptimer(void *arg) { - struct sockaddr *gate; - struct llinfo_arp *la; - static struct sockaddr_dl null_sdl = {sizeof(null_sdl), AF_LINK}; - struct in_ifaddr *ia; - struct ifaddr *ifa; + struct ifnet *ifp; + struct llentry *lle = (struct llentry *)arg; - RT_LOCK_ASSERT(rt); - - if (rt->rt_flags & RTF_GATEWAY) - return; - gate = rt->rt_gateway; - la = (struct llinfo_arp *)rt->rt_llinfo; - switch (req) { - - case RTM_ADD: - /* - * XXX: If this is a manually added route to interface - * such as older version of routed or gated might provide, - * restore cloning bit. - */ - if ((rt->rt_flags & RTF_HOST) == 0 && - rt_mask(rt) != NULL && - SIN(rt_mask(rt))->sin_addr.s_addr != 0xffffffff) - rt->rt_flags |= RTF_CLONING; - if (rt->rt_flags & RTF_CLONING) { - /* - * Case 1: This route should come from a route to iface. - */ - rt_setgate(rt, rt_key(rt), - (struct sockaddr *)&null_sdl); - gate = rt->rt_gateway; - SDL(gate)->sdl_type = rt->rt_ifp->if_type; - SDL(gate)->sdl_index = rt->rt_ifp->if_index; - rt->rt_expire = time_uptime; - break; - } - /* Announce a new entry if requested. */ - if (rt->rt_flags & RTF_ANNOUNCE) - arprequest(rt->rt_ifp, - &SIN(rt_key(rt))->sin_addr, - &SIN(rt_key(rt))->sin_addr, - (u_char *)LLADDR(SDL(gate))); - /*FALLTHROUGH*/ - case RTM_RESOLVE: - if (gate->sa_family != AF_LINK || - gate->sa_len < sizeof(null_sdl)) { - log(LOG_DEBUG, "%s: bad gateway %s%s\n", __func__, - inet_ntoa(SIN(rt_key(rt))->sin_addr), - (gate->sa_family != AF_LINK) ? - " (!AF_LINK)": ""); - break; - } - SDL(gate)->sdl_type = rt->rt_ifp->if_type; - SDL(gate)->sdl_index = rt->rt_ifp->if_index; - if (la != 0) - break; /* This happens on a route change */ - /* - * Case 2: This route may come from cloning, or a manual route - * add with a LL address. - */ - R_Zalloc(la, struct llinfo_arp *, sizeof(*la)); - rt->rt_llinfo = (caddr_t)la; - if (la == 0) { - log(LOG_DEBUG, "%s: malloc failed\n", __func__); - break; - } - arp_allocated++; - /* - * We are storing a route entry outside of radix tree. So, - * it can be found and accessed by other means than radix - * lookup. The routing code assumes that any rtentry detached - * from radix can be destroyed safely. To prevent this, we - * add an additional reference. - */ - RT_ADDREF(rt); - la->la_rt = rt; - rt->rt_flags |= RTF_LLINFO; - callout_init_mtx(&la->la_timer, &rt->rt_mtx, - CALLOUT_RETURNUNLOCKED); - -#ifdef INET - /* - * This keeps the multicast addresses from showing up - * in `arp -a' listings as unresolved. It's not actually - * functional. Then the same for broadcast. - */ - if (IN_MULTICAST(ntohl(SIN(rt_key(rt))->sin_addr.s_addr)) && - rt->rt_ifp->if_type != IFT_ARCNET) { - ETHER_MAP_IP_MULTICAST(&SIN(rt_key(rt))->sin_addr, - LLADDR(SDL(gate))); - SDL(gate)->sdl_alen = 6; - rt->rt_expire = 0; - } - if (in_broadcast(SIN(rt_key(rt))->sin_addr, rt->rt_ifp)) { - memcpy(LLADDR(SDL(gate)), rt->rt_ifp->if_broadcastaddr, - rt->rt_ifp->if_addrlen); - SDL(gate)->sdl_alen = rt->rt_ifp->if_addrlen; - rt->rt_expire = 0; - } -#endif - - TAILQ_FOREACH(ia, &in_ifaddrhead, ia_link) { - if (ia->ia_ifp == rt->rt_ifp && - SIN(rt_key(rt))->sin_addr.s_addr == - (IA_SIN(ia))->sin_addr.s_addr) - break; - } - if (ia) { - /* - * This test used to be - * if (loif.if_flags & IFF_UP) - * It allowed local traffic to be forced - * through the hardware by configuring the loopback down. - * However, it causes problems during network configuration - * for boards that can't receive packets they send. - * It is now necessary to clear "useloopback" and remove - * the route to force traffic out to the hardware. - */ - rt->rt_expire = 0; - bcopy(IF_LLADDR(rt->rt_ifp), LLADDR(SDL(gate)), - SDL(gate)->sdl_alen = rt->rt_ifp->if_addrlen); - if (useloopback) { - rt->rt_ifp = loif; - rt->rt_rmx.rmx_mtu = loif->if_mtu; - } - - /* - * make sure to set rt->rt_ifa to the interface - * address we are using, otherwise we will have trouble - * with source address selection. - */ - ifa = &ia->ia_ifa; - if (ifa != rt->rt_ifa) { - IFAFREE(rt->rt_ifa); - IFAREF(ifa); - rt->rt_ifa = ifa; - } - } - break; - - case RTM_DELETE: - if (la == NULL) /* XXX: at least CARP does this. */ - break; - callout_stop(&la->la_timer); - rt->rt_llinfo = NULL; - rt->rt_flags &= ~RTF_LLINFO; - RT_REMREF(rt); - if (la->la_hold) - m_freem(la->la_hold); - Free((caddr_t)la); + ifp = lle->lle_tbl->llt_ifp; + IF_LLTBLS_LOCK(ifp); + if ((lle->la_flags & LLE_DELETED) && + !(lle->la_flags & LLE_STATIC)) { + callout_stop(&lle->la_timer); + (void)llentry_free(lle); } + IF_LLTBLS_UNLOCK(ifp); } + /* * Broadcast an ARP request. Caller specifies: * - arp header source ip address * - arp header target ip address * - arp header source ethernet address */ -static void -arprequest(struct ifnet *ifp, struct in_addr *sip, struct in_addr *tip, +void +arprequest(struct ifnet *ifp, struct in_addr *sip, struct in_addr *tip, u_char *enaddr) { struct mbuf *m; struct arphdr *ah; struct sockaddr sa; + if (sip == NULL) { + /* + * The caller did not supply a source address, try to find + * a compatible one among those assigned to this interface. + */ + struct ifaddr *ifa; + + TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) { + if (!ifa->ifa_addr || + ifa->ifa_addr->sa_family != AF_INET) + continue; + sip = &SIN(ifa->ifa_addr)->sin_addr; + if (0 == ((sip->s_addr ^ tip->s_addr) & + SIN(ifa->ifa_netmask)->sin_addr.s_addr) ) + break; /* found it. */ + } + } + if (sip == NULL) { + printf(" cannot find matching address, no arprequest\n"); + return; + } + if ((m = m_gethdr(M_DONTWAIT, MT_DATA)) == NULL) return; m->m_len = sizeof(*ah) + 2*sizeof(struct in_addr) + @@ -355,13 +232,14 @@ */ int arpresolve(struct ifnet *ifp, struct rtentry *rt0, struct mbuf *m, - struct sockaddr *dst, u_char *desten) + struct sockaddr *dst, u_char *desten, struct llentry **lle) { - struct llinfo_arp *la = NULL; - struct rtentry *rt = NULL; - struct sockaddr_dl *sdl; + struct llentry *la = 0; + u_int flags; int error; + *lle = NULL; + if (m->m_flags & M_BCAST) { /* broadcast */ (void)memcpy(desten, ifp->if_broadcastaddr, ifp->if_addrlen); return (0); @@ -370,77 +248,49 @@ ETHER_MAP_IP_MULTICAST(&SIN(dst)->sin_addr, desten); return (0); } + if (!ifp) + panic("%s: invalid interface pointer", __func__); - if (rt0 != NULL) { - error = rt_check(&rt, &rt0, dst); - if (error) { - m_freem(m); - return error; - } - la = (struct llinfo_arp *)rt->rt_llinfo; - if (la == NULL) - RT_UNLOCK(rt); - } + flags = (ifp->if_flags & (IFF_NOARP | IFF_STATICARP)) ? 0 : LLE_CREATE; + + /* Qing + * because this function returns an llentry, + * the IF LLTBLS lock is held by the caller + */ + la = lla_lookup(ifp, flags, dst); if (la == NULL) { - /* - * We enter this block in case if rt0 was NULL, - * or if rt found by rt_check() didn't have llinfo. - */ - rt = arplookup(SIN(dst)->sin_addr.s_addr, 1, 0); - if (rt == NULL) { - log(LOG_DEBUG, - "arpresolve: can't allocate route for %s\n", - inet_ntoa(SIN(dst)->sin_addr)); - m_freem(m); - return (EINVAL); /* XXX */ - } - la = (struct llinfo_arp *)rt->rt_llinfo; - if (la == NULL) { - RT_UNLOCK(rt); + if (flags & LLE_CREATE) log(LOG_DEBUG, "arpresolve: can't allocate llinfo for %s\n", inet_ntoa(SIN(dst)->sin_addr)); - m_freem(m); - return (EINVAL); /* XXX */ - } - } - sdl = SDL(rt->rt_gateway); - /* - * Check the address family and length is valid, the address - * is resolved; otherwise, try to resolve. - */ - if ((rt->rt_expire == 0 || rt->rt_expire > time_uptime) && - sdl->sdl_family == AF_LINK && sdl->sdl_alen != 0) { + m_freem(m); + return (EINVAL); + } + if (flags & LLE_CREATE) + callout_init(&la->la_timer, 0); - bcopy(LLADDR(sdl), desten, sdl->sdl_alen); - + if (la->la_flags & LLE_VALID && + (la->la_flags & LLE_STATIC || la->la_expire > time_uptime)) { + bcopy(&la->ll_addr, desten, ifp->if_addrlen); /* * If entry has an expiry time and it is approaching, - * send an ARP request. + * see if we need to send an ARP request within this + * arpt_down interval. */ - if ((rt->rt_expire != 0) && - (time_uptime + la->la_preempt > rt->rt_expire)) { - struct in_addr sin = - SIN(rt->rt_ifa->ifa_addr)->sin_addr; + if (!(la->la_flags & LLE_STATIC) && + time_uptime + la->la_preempt > la->la_expire) { + arprequest(ifp, NULL, + &SIN(dst)->sin_addr, IF_LLADDR(ifp)); la->la_preempt--; - RT_UNLOCK(rt); - arprequest(ifp, &sin, &SIN(dst)->sin_addr, - IF_LLADDR(ifp)); - return (0); } - - RT_UNLOCK(rt); + *lle = la; return (0); } - /* - * If ARP is disabled or static on this interface, stop. - * XXX - * Probably should not allocate empty llinfo struct if we are - * not going to be sending out an arp request. - */ - if (ifp->if_flags & (IFF_NOARP | IFF_STATICARP)) { - RT_UNLOCK(rt); + + if (la->la_flags & LLE_STATIC) { /* should not happen! */ + log(LOG_DEBUG, "arpresolve: ouch, empty static llinfo for %s\n", + inet_ntoa(SIN(dst)->sin_addr)); m_freem(m); return (EINVAL); } @@ -453,8 +303,6 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Dec 14 06:06:12 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 131FC16A46B; Fri, 14 Dec 2007 06:06:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C3FCF16A421 for ; Fri, 14 Dec 2007 06:06:11 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BD45F13C459 for ; Fri, 14 Dec 2007 06:06:11 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBE66BCf099570 for ; Fri, 14 Dec 2007 06:06:11 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBE66Bnc099567 for perforce@freebsd.org; Fri, 14 Dec 2007 06:06:11 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Dec 2007 06:06:11 GMT Message-Id: <200712140606.lBE66Bnc099567@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130842 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Dec 2007 06:06:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=130842 Change 130842 by jb@jb_freebsd1 on 2007/12/14 06:05:10 MFC Affected files ... .. //depot/projects/dtrace7/src/cddl/Makefile.inc#3 edit .. //depot/projects/dtrace7/src/cddl/lib/libnvpair/Makefile#2 edit Differences ... ==== //depot/projects/dtrace7/src/cddl/Makefile.inc#3 (text+ko) ==== @@ -1,2 +1,6 @@ -# $FreeBSD: src/cddl/Makefile.inc,v 1.2 2007/04/16 21:20:24 ru Exp $ +# $FreeBSD: src/cddl/Makefile.inc,v 1.3 2007/11/28 22:58:09 jb Exp $ + +OPENSOLARIS_USR_DISTDIR= ${.CURDIR}/../../../contrib/opensolaris +OPENSOLARIS_SYS_DISTDIR= ${.CURDIR}/../../../sys/contrib/opensolaris +IGNORE_PRAGMA= YES ==== //depot/projects/dtrace7/src/cddl/lib/libnvpair/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $ +# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.3 2007/11/28 22:58:09 jb Exp $ .PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair .PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/nvpair @@ -10,8 +10,8 @@ nvpair_alloc_fixed.c \ nvpair.c +CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris -CFLAGS+= -I${.CURDIR}/../../../include # XXX CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common .include From owner-p4-projects@FreeBSD.ORG Fri Dec 14 18:34:52 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CC0CA16A41B; Fri, 14 Dec 2007 18:34:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8C26916A41A for ; Fri, 14 Dec 2007 18:34:52 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5B00D13C455 for ; Fri, 14 Dec 2007 18:34:52 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBEIYq4A083217 for ; Fri, 14 Dec 2007 18:34:52 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBEIYqNU083214 for perforce@freebsd.org; Fri, 14 Dec 2007 18:34:52 GMT (envelope-from marcel@freebsd.org) Date: Fri, 14 Dec 2007 18:34:52 GMT Message-Id: <200712141834.lBEIYqNU083214@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 130879 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Dec 2007 18:34:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=130879 Change 130879 by marcel@marcel_jnpr on 2007/12/14 18:34:12 Catch up with thread changes. Affected files ... .. //depot/projects/e500/sys/powerpc/booke/vm_machdep.c#3 edit Differences ... ==== //depot/projects/e500/sys/powerpc/booke/vm_machdep.c#3 (text+ko) ==== @@ -418,7 +418,7 @@ } void -cpu_thread_setup(struct thread *td) +cpu_thread_alloc(struct thread *td) { struct pcb *pcb; @@ -429,6 +429,11 @@ } void +cpu_thread_free(struct thread *td) +{ +} + +void cpu_thread_swapin(struct thread *td) { } From owner-p4-projects@FreeBSD.ORG Fri Dec 14 20:36:04 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 67C4E16A469; Fri, 14 Dec 2007 20:36:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0A64D16A421 for ; Fri, 14 Dec 2007 20:36:04 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C866013C4D3 for ; Fri, 14 Dec 2007 20:36:03 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBEKa3xF005482 for ; Fri, 14 Dec 2007 20:36:03 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBEKa3Mk005479 for perforce@freebsd.org; Fri, 14 Dec 2007 20:36:03 GMT (envelope-from marcel@freebsd.org) Date: Fri, 14 Dec 2007 20:36:03 GMT Message-Id: <200712142036.lBEKa3Mk005479@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 130888 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Dec 2007 20:36:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=130888 Change 130888 by marcel@marcel_jnpr on 2007/12/14 20:35:50 Move mmu_oea.c from powerpc to aim. We're going to have a booke specific one under booke. Affected files ... .. //depot/projects/e500/sys/powerpc/aim/mmu_oea.c#1 add .. //depot/projects/e500/sys/powerpc/powerpc/mmu_oea.c#4 delete Differences ... From owner-p4-projects@FreeBSD.ORG Fri Dec 14 20:41:09 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B815216A469; Fri, 14 Dec 2007 20:41:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5150316A46C for ; Fri, 14 Dec 2007 20:41:09 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 332EE13C458 for ; Fri, 14 Dec 2007 20:41:09 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBEKf91v006938 for ; Fri, 14 Dec 2007 20:41:09 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBEKf98t006935 for perforce@freebsd.org; Fri, 14 Dec 2007 20:41:09 GMT (envelope-from marcel@freebsd.org) Date: Fri, 14 Dec 2007 20:41:09 GMT Message-Id: <200712142041.lBEKf98t006935@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 130889 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Dec 2007 20:41:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=130889 Change 130889 by marcel@marcel_jnpr on 2007/12/14 20:40:46 o mmu_oea.c was moved from powerpc to aim. It's condirtional upon options AIM. o mmu_if.m and pmap_dispatch.c are standard. Affected files ... .. //depot/projects/e500/sys/conf/files.powerpc#7 edit Differences ... ==== //depot/projects/e500/sys/conf/files.powerpc#7 (text+ko) ==== @@ -65,6 +65,7 @@ powerpc/aim/interrupt.c optional aim powerpc/aim/locore.S optional aim no-obj powerpc/aim/machdep.c optional aim +powerpc/aim/mmu_oea.c optional aim powerpc/aim/nexus.c optional aim powerpc/aim/ofw_machdep.c optional aim powerpc/aim/ofwmagic.S optional aim @@ -117,12 +118,11 @@ powerpc/powerpc/in_cksum.c optional inet powerpc/powerpc/intr_machdep.c standard powerpc/powerpc/mem.c optional mem -powerpc/powerpc/mmu_if.m optional aim -powerpc/powerpc/mmu_oea.c optional aim +powerpc/powerpc/mmu_if.m standard powerpc/powerpc/mp_machdep.c optional smp aim powerpc/powerpc/openpic.c standard powerpc/powerpc/pic_if.m standard -powerpc/powerpc/pmap_dispatch.c optional aim +powerpc/powerpc/pmap_dispatch.c standard powerpc/powerpc/sc_machdep.c optional sc powerpc/powerpc/setjmp.S standard powerpc/powerpc/sigcode.S standard From owner-p4-projects@FreeBSD.ORG Fri Dec 14 21:37:11 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E67B16A421; Fri, 14 Dec 2007 21:37:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9EBF716A41A for ; Fri, 14 Dec 2007 21:37:10 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7EB8A13C459 for ; Fri, 14 Dec 2007 21:37:10 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBELbA90028222 for ; Fri, 14 Dec 2007 21:37:10 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBELbAkA028219 for perforce@freebsd.org; Fri, 14 Dec 2007 21:37:10 GMT (envelope-from marcel@freebsd.org) Date: Fri, 14 Dec 2007 21:37:10 GMT Message-Id: <200712142137.lBELbAkA028219@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 130893 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Dec 2007 21:37:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=130893 Change 130893 by marcel@marcel_jnpr on 2007/12/14 21:36:13 Set MACHINE_CPU to aim by default on PowerPC. When CPUTYPE is e500, set MACHINE_CPU to booke and set _CPUCFLAGS accordingly. Affected files ... .. //depot/projects/e500/share/mk/bsd.cpu.mk#6 edit Differences ... ==== //depot/projects/e500/share/mk/bsd.cpu.mk#6 (text+ko) ==== @@ -12,6 +12,8 @@ MACHINE_CPU = amd64 sse2 sse . elif ${MACHINE_ARCH} == "ia64" MACHINE_CPU = itanium +. elif ${MACHINE_ARCH} == "powerpc" +MACHINE_CPU = aim . elif ${MACHINE_ARCH} == "sparc64" . elif ${MACHINE_ARCH} == "arm" MACHINE_CPU = arm @@ -110,8 +112,10 @@ _CPUCFLAGS = -mcpu=${CPUTYPE} . endif . elif ${MACHINE_ARCH} == "powerpc" -# XXX: This needs to be configurable. Use TARGET_USE_SOFTFLOAT? -_CPUCFLAGS += -msoft-float +. if ${CPUTYPE} == "e500" +MACHINE_CPU = booke +_CPUCFLAGS = -Wa,-me500 -msoft-float +. endif . endif # Set up the list of CPU features based on the CPU type. This is an @@ -175,13 +179,6 @@ LD += -EB .endif -.if ${MACHINE_ARCH} == "powerpc" -. if ${CPUTYPE} == "e500" -MACHINE_CPU = e500 -_CPUCFLAGS+= -Wa,-me500 -. endif -.endif - # NB: COPTFLAGS is handled in /usr/src/sys/conf/kern.pre.mk .if !defined(NO_CPU_CFLAGS) From owner-p4-projects@FreeBSD.ORG Fri Dec 14 22:14:52 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6307116A476; Fri, 14 Dec 2007 22:14:52 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 081BA16A419 for ; Fri, 14 Dec 2007 22:14:52 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D8F2813C45A for ; Fri, 14 Dec 2007 22:14:51 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBEMEpbY035361 for ; Fri, 14 Dec 2007 22:14:51 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBEMEpTL035358 for perforce@freebsd.org; Fri, 14 Dec 2007 22:14:51 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 14 Dec 2007 22:14:51 GMT Message-Id: <200712142214.lBEMEpTL035358@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 130895 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Dec 2007 22:14:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=130895 Change 130895 by hselasky@hselasky_laptop001 on 2007/12/14 22:13:56 This commit is device side related, but also affects the host side. Create one interrupt thread per "struct usbd_memory_info" that will handle USB callbacks outside the main interrupt thread. This should also increase parallellism. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#74 edit .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#69 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#74 (text+ko) ==== @@ -68,6 +68,7 @@ m(USBD_DMA_LOAD_FAILED,)\ m(USBD_BAD_CONTEXT,)\ m(USBD_NO_ROOT_HUB,)\ +m(USBD_NO_INTR_THREAD,)\ /**/ MAKE_ENUM(USBD_STATUS, @@ -565,7 +566,10 @@ struct usbd_memory_info { LIST_HEAD(, usbd_xfer) dma_head; + LIST_HEAD(, usbd_xfer) done_head; + struct mtx done_mtx; /* mutex protecting "done_head" */ + void *done_cookie; /* software interrupt thread cookie */ void *memory_base; struct mtx *priv_mtx; struct mtx *usb_mtx; ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#69 (text+ko) ==== @@ -43,6 +43,8 @@ #include #include #include +#include +#include #include #include @@ -61,6 +63,8 @@ static void usbd_bdma_cancel_event(struct usbd_xfer *xfer); static void usbd_callback_wrapper(struct usbd_xfer *xfer, uint8_t context); static usbd_status_t usbd_handle_request(struct usbd_xfer *xfer); +static driver_intr_t usbd_callback_intr_td; +static void usbd_transfer_unsetup_sub(struct usbd_memory_info *info); #ifdef USB_DEBUG void @@ -763,8 +767,10 @@ struct usbd_xfer *xfer; void *buf = NULL; uint16_t n; + uint16_t refcount; parm.err = 0; + refcount = 0; WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "usbd_transfer_setup can sleep!"); @@ -827,6 +833,19 @@ info->dma_tag_p = parm.dma_tag_p; info->dma_tag_max = parm.dma_tag_max; + LIST_INIT(&(info->done_head)); + + /* initialize mutex */ + mtx_init(&(info->done_mtx), "USB done queue lock", + NULL, MTX_DEF); + + /* create our interrupt thread */ + if (swi_add(NULL, "usbcb", &usbd_callback_intr_td, + info, SWI_CAMBIO, INTR_MPSAFE, &(info->done_cookie))) { + info->done_cookie = NULL; + parm.err = USBD_NO_INTR_THREAD; + goto done; + } } else { info = NULL; } @@ -882,6 +901,7 @@ /* dummy xfer */ xfer = &dummy; bzero(&dummy, sizeof(dummy)); + refcount++; } parm.size[0] += sizeof(xfer[0]); @@ -904,6 +924,10 @@ if (buf || parm.err) { goto done; } + if (refcount == 0) { + /* no transfers - nothing to do ! */ + goto done; + } /* align data to 8 byte boundary */ parm.size[0] += ((-parm.size[0]) & (USB_HOST_ALIGN - 1)); @@ -983,6 +1007,12 @@ } done: + if (buf) { + if (info->setup_refcount == 0) { + /* something went wrong */ + usbd_transfer_unsetup_sub(info); + } + } if (parm.err) { usbd_transfer_unsetup(ppxfer, n_setup); } @@ -1011,6 +1041,62 @@ return; } +static void +usbd_transfer_unsetup_sub(struct usbd_memory_info *info) +{ + struct usbd_page_cache *pc; + int error; + + /* + * wait for any USB callbacks to + * return + */ + + while (info->memory_refcount > 0) { + error = mtx_sleep(info, info->usb_mtx, 0, + "usb_mem_wait", 0); + } + + mtx_unlock(info->usb_mtx); + + /* free DMA'able memory, if any */ + pc = info->dma_page_cache_start; + while (pc != info->dma_page_cache_end) { + usbd_pc_free_mem(pc); + pc++; + } + + /* + * free DMA maps in all + * "xfer->frbuffers" + */ + pc = info->xfer_page_cache_start; + while (pc != info->xfer_page_cache_end) { + usbd_pc_dmamap_destroy(pc); + pc++; + } + + /* free all DMA tags */ + usbd_dma_tag_unsetup(info->dma_tag_p, + info->dma_tag_max); + + /* teardown the interrupt thread, if any */ + if (info->done_cookie) { + swi_remove(info->done_cookie); + } + /* destroy done queue mutex */ + mtx_destroy(&(info->done_mtx)); + + /* + * free the "memory_base" last, + * hence the "info" structure is + * contained within the + * "memory_base"! + */ + free(info->memory_base, M_USB); + return; +} + /*------------------------------------------------------------------------* * usbd_transfer_unsetup - unsetup/free an array of USB transfers * @@ -1023,8 +1109,6 @@ { struct usbd_xfer *xfer; struct usbd_memory_info *info; - struct usbd_page_cache *pc; - int error; WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "usbd_transfer_unsetup can sleep!"); @@ -1092,48 +1176,7 @@ info->setup_refcount--; if (info->setup_refcount == 0) { - - /* - * wait for any USB callbacks to - * return - */ - - while (info->memory_refcount > 0) { - error = mtx_sleep(info, info->usb_mtx, 0, - "usb_mem_wait", 0); - } - - mtx_unlock(info->usb_mtx); - - /* free DMA'able memory, if any */ - pc = info->dma_page_cache_start; - while (pc != info->dma_page_cache_end) { - usbd_pc_free_mem(pc); - pc++; - } - - /* - * free DMA maps in all - * "xfer->frbuffers" - */ - pc = info->xfer_page_cache_start; - while (pc != info->xfer_page_cache_end) { - usbd_pc_dmamap_destroy(pc); - pc++; - } - - /* free all DMA tags */ - usbd_dma_tag_unsetup(info->dma_tag_p, - info->dma_tag_max); - - /* - * free the "memory_base" last, - * hence the "info" structure is - * contained within the - * "memory_base"! - */ - free(info->memory_base, M_USB); - + usbd_transfer_unsetup_sub(info); } else { mtx_unlock(info->usb_mtx); } @@ -1443,6 +1486,23 @@ return (1); } +/*------------------------------------------------------------------------* + * usbd_callback_intr_td + * + * This is the USB callback interrupt thread. Every time a callback + * cannot be called directly we go through the callback interrupt + * thread. + *------------------------------------------------------------------------*/ +static void +usbd_callback_intr_td(void *arg) +{ +#if 0 + struct usbd_memory_info *info = arg; + +#endif + return; +} + static void usbd_premature_callback(struct usbd_xfer *xfer, usbd_status_t error) { From owner-p4-projects@FreeBSD.ORG Fri Dec 14 22:21:00 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 07AA616A473; Fri, 14 Dec 2007 22:21:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8F8BB16A46C for ; Fri, 14 Dec 2007 22:20:59 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6DA6F13C4CC for ; Fri, 14 Dec 2007 22:20:59 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBEMKxGY035952 for ; Fri, 14 Dec 2007 22:20:59 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBEMKw0c035949 for perforce@freebsd.org; Fri, 14 Dec 2007 22:20:58 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Dec 2007 22:20:58 GMT Message-Id: <200712142220.lBEMKw0c035949@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130896 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Dec 2007 22:21:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=130896 Change 130896 by jb@jb_freebsd1 on 2007/12/14 22:20:06 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#53 integrate .. //depot/projects/dtrace/ports/LEGAL#27 integrate .. //depot/projects/dtrace/ports/MOVED#55 integrate .. //depot/projects/dtrace/src/games/fortune/datfiles/fortunes#25 integrate .. //depot/projects/dtrace/src/include/pthread_np.h#7 integrate .. //depot/projects/dtrace/src/lib/libc/Versions.def#4 integrate .. //depot/projects/dtrace/src/lib/libfetch/Makefile#6 integrate .. //depot/projects/dtrace/src/lib/libfetch/common.c#4 integrate .. //depot/projects/dtrace/src/lib/libfetch/common.h#4 integrate .. //depot/projects/dtrace/src/lib/libfetch/fetch.c#4 integrate .. //depot/projects/dtrace/src/lib/libfetch/file.c#4 integrate .. //depot/projects/dtrace/src/lib/libfetch/ftp.c#5 integrate .. //depot/projects/dtrace/src/lib/libfetch/http.c#5 integrate .. //depot/projects/dtrace/src/lib/libthr/pthread.map#8 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_mutex.c#15 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_private.h#17 integrate .. //depot/projects/dtrace/src/lib/msun/Symbol.map#5 integrate .. //depot/projects/dtrace/src/lib/msun/man/sqrt.3#5 integrate .. //depot/projects/dtrace/src/sbin/natd/natd.8#5 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pci/maestro.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/Makefile#7 integrate .. //depot/projects/dtrace/src/sys/powerpc/aim/clock.c#1 branch .. //depot/projects/dtrace/src/sys/powerpc/aim/copyinout.c#1 branch .. //depot/projects/dtrace/src/sys/powerpc/aim/interrupt.c#1 branch .. //depot/projects/dtrace/src/sys/powerpc/aim/locore.S#1 branch .. //depot/projects/dtrace/src/sys/powerpc/aim/machdep.c#1 branch .. //depot/projects/dtrace/src/sys/powerpc/aim/mmu_oea.c#1 branch .. //depot/projects/dtrace/src/sys/powerpc/aim/nexus.c#1 branch .. //depot/projects/dtrace/src/sys/powerpc/aim/ofw_machdep.c#1 branch .. //depot/projects/dtrace/src/sys/powerpc/aim/ofwmagic.S#1 branch .. //depot/projects/dtrace/src/sys/powerpc/aim/swtch.S#1 branch .. //depot/projects/dtrace/src/sys/powerpc/aim/trap.c#1 branch .. //depot/projects/dtrace/src/sys/powerpc/aim/trap_subr.S#1 branch .. //depot/projects/dtrace/src/sys/powerpc/aim/uio_machdep.c#1 branch .. //depot/projects/dtrace/src/sys/powerpc/aim/uma_machdep.c#1 branch .. //depot/projects/dtrace/src/sys/powerpc/aim/vm_machdep.c#1 branch .. //depot/projects/dtrace/src/sys/powerpc/powerpc/db_memrw.c#4 delete .. //depot/projects/dtrace/src/sys/sys/kerneldump.h#4 integrate .. //depot/projects/dtrace/src/usr.bin/xinstall/xinstall.c#4 integrate .. //depot/projects/dtrace/www/share/sgml/news.xml#28 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#53 (text+ko) ==== @@ -1,4 +1,4 @@ - + %s:%d\n", host, port)); if (verbose) - _fetch_info("looking up %s", host); + fetch_info("looking up %s", host); /* look up host name and set up socket address structure */ snprintf(pbuf, sizeof(pbuf), "%d", port); @@ -274,13 +274,13 @@ hints.ai_socktype = SOCK_STREAM; hints.ai_protocol = 0; if ((err = getaddrinfo(host, pbuf, &hints, &res0)) != 0) { - _netdb_seterr(err); + netdb_seterr(err); return (NULL); } bindaddr = getenv("FETCH_BIND_ADDRESS"); if (verbose) - _fetch_info("connecting to %s:%d", host, port); + fetch_info("connecting to %s:%d", host, port); /* try to connect */ for (sd = -1, res = res0; res; sd = -1, res = res->ai_next) { @@ -288,8 +288,8 @@ res->ai_protocol)) == -1) continue; if (bindaddr != NULL && *bindaddr != '\0' && - _fetch_bind(sd, res->ai_family, bindaddr) != 0) { - _fetch_info("failed to bind to '%s'", bindaddr); + fetch_bind(sd, res->ai_family, bindaddr) != 0) { + fetch_info("failed to bind to '%s'", bindaddr); close(sd); continue; } @@ -299,12 +299,12 @@ } freeaddrinfo(res0); if (sd == -1) { - _fetch_syserr(); + fetch_syserr(); return (NULL); } - if ((conn = _fetch_reopen(sd)) == NULL) { - _fetch_syserr(); + if ((conn = fetch_reopen(sd)) == NULL) { + fetch_syserr(); close(sd); } return (conn); @@ -315,7 +315,7 @@ * Enable SSL on a connection. */ int -_fetch_ssl(conn_t *conn, int verbose) +fetch_ssl(conn_t *conn, int verbose) { #ifdef WITH_SSL @@ -373,7 +373,7 @@ * Read a character from a connection w/ timeout */ ssize_t -_fetch_read(conn_t *conn, char *buf, size_t len) +fetch_read(conn_t *conn, char *buf, size_t len) { struct timeval now, timeout, wait; fd_set readfds; @@ -399,7 +399,7 @@ } if (wait.tv_sec < 0) { errno = ETIMEDOUT; - _fetch_syserr(); + fetch_syserr(); return (-1); } errno = 0; @@ -407,7 +407,7 @@ if (r == -1) { if (errno == EINTR && fetchRestartCalls) continue; - _fetch_syserr(); + fetch_syserr(); return (-1); } } @@ -438,7 +438,7 @@ #define MIN_BUF_SIZE 1024 int -_fetch_getln(conn_t *conn) +fetch_getln(conn_t *conn) { char *tmp; size_t tmpsize; @@ -457,7 +457,7 @@ conn->buflen = 0; do { - len = _fetch_read(conn, &c, 1); + len = fetch_read(conn, &c, 1); if (len == -1) return (-1); if (len == 0) @@ -485,13 +485,13 @@ * Write to a connection w/ timeout */ ssize_t -_fetch_write(conn_t *conn, const char *buf, size_t len) +fetch_write(conn_t *conn, const char *buf, size_t len) { struct iovec iov; iov.iov_base = __DECONST(char *, buf); iov.iov_len = len; - return _fetch_writev(conn, &iov, 1); + return fetch_writev(conn, &iov, 1); } /* @@ -499,7 +499,7 @@ * Note: can modify the iovec. */ ssize_t -_fetch_writev(conn_t *conn, struct iovec *iov, int iovcnt) +fetch_writev(conn_t *conn, struct iovec *iov, int iovcnt) { struct timeval now, timeout, wait; fd_set writefds; @@ -525,7 +525,7 @@ } if (wait.tv_sec < 0) { errno = ETIMEDOUT; - _fetch_syserr(); + fetch_syserr(); return (-1); } errno = 0; @@ -547,7 +547,7 @@ if (wlen == 0) { /* we consider a short write a failure */ errno = EPIPE; - _fetch_syserr(); + fetch_syserr(); return (-1); } if (wlen < 0) { @@ -574,7 +574,7 @@ * Write a line of text to a connection w/ timeout */ int -_fetch_putln(conn_t *conn, const char *str, size_t len) +fetch_putln(conn_t *conn, const char *str, size_t len) { struct iovec iov[2]; int ret; @@ -585,9 +585,9 @@ iov[1].iov_base = __DECONST(char *, ENDL); iov[1].iov_len = sizeof(ENDL); if (len == 0) - ret = _fetch_writev(conn, &iov[1], 1); + ret = fetch_writev(conn, &iov[1], 1); else - ret = _fetch_writev(conn, iov, 2); + ret = fetch_writev(conn, iov, 2); if (ret == -1) return (-1); return (0); @@ -598,7 +598,7 @@ * Close connection */ int -_fetch_close(conn_t *conn) +fetch_close(conn_t *conn) { int ret; @@ -614,7 +614,7 @@ /*** Directory-related utility functions *************************************/ int -_fetch_add_entry(struct url_ent **p, int *size, int *len, +fetch_add_entry(struct url_ent **p, int *size, int *len, const char *name, struct url_stat *us) { struct url_ent *tmp; @@ -628,7 +628,7 @@ tmp = realloc(*p, (*size * 2 + 1) * sizeof(**p)); if (tmp == NULL) { errno = ENOMEM; - _fetch_syserr(); + fetch_syserr(); return (-1); } *size = (*size * 2 + 1); @@ -649,7 +649,7 @@ /*** Authentication-related utility functions ********************************/ static const char * -_fetch_read_word(FILE *f) +fetch_read_word(FILE *f) { static char word[1024]; @@ -662,7 +662,7 @@ * Get authentication data for a URL from .netrc */ int -_fetch_netrc_auth(struct url *url) +fetch_netrc_auth(struct url *url) { char fn[PATH_MAX]; const char *word; @@ -671,7 +671,7 @@ if ((p = getenv("NETRC")) != NULL) { if (snprintf(fn, sizeof(fn), "%s", p) >= (int)sizeof(fn)) { - _fetch_info("$NETRC specifies a file name " + fetch_info("$NETRC specifies a file name " "longer than PATH_MAX"); return (-1); } @@ -689,39 +689,39 @@ if ((f = fopen(fn, "r")) == NULL) return (-1); - while ((word = _fetch_read_word(f)) != NULL) { + while ((word = fetch_read_word(f)) != NULL) { if (strcmp(word, "default") == 0) { - DEBUG(_fetch_info("Using default .netrc settings")); + DEBUG(fetch_info("Using default .netrc settings")); break; } if (strcmp(word, "machine") == 0 && - (word = _fetch_read_word(f)) != NULL && + (word = fetch_read_word(f)) != NULL && strcasecmp(word, url->host) == 0) { - DEBUG(_fetch_info("Using .netrc settings for %s", word)); + DEBUG(fetch_info("Using .netrc settings for %s", word)); break; } } if (word == NULL) goto ferr; - while ((word = _fetch_read_word(f)) != NULL) { + while ((word = fetch_read_word(f)) != NULL) { if (strcmp(word, "login") == 0) { - if ((word = _fetch_read_word(f)) == NULL) + if ((word = fetch_read_word(f)) == NULL) goto ferr; if (snprintf(url->user, sizeof(url->user), "%s", word) > (int)sizeof(url->user)) { - _fetch_info("login name in .netrc is too long"); + fetch_info("login name in .netrc is too long"); url->user[0] = '\0'; } } else if (strcmp(word, "password") == 0) { - if ((word = _fetch_read_word(f)) == NULL) + if ((word = fetch_read_word(f)) == NULL) goto ferr; if (snprintf(url->pwd, sizeof(url->pwd), "%s", word) > (int)sizeof(url->pwd)) { - _fetch_info("password in .netrc is too long"); + fetch_info("password in .netrc is too long"); url->pwd[0] = '\0'; } } else if (strcmp(word, "account") == 0) { - if ((word = _fetch_read_word(f)) == NULL) + if ((word = fetch_read_word(f)) == NULL) goto ferr; /* XXX not supported! */ } else { ==== //depot/projects/dtrace/src/lib/libfetch/common.h#4 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libfetch/common.h,v 1.28 2004/09/21 18:35:20 des Exp $ + * $FreeBSD: src/lib/libfetch/common.h,v 1.29 2007/12/14 10:26:58 des Exp $ */ #ifndef _COMMON_H_INCLUDED @@ -68,33 +68,33 @@ const char *string; }; -/* for _fetch_writev */ +/* for fetch_writev */ struct iovec; -void _fetch_seterr(struct fetcherr *, int); -void _fetch_syserr(void); -void _fetch_info(const char *, ...); -int _fetch_default_port(const char *); -int _fetch_default_proxy_port(const char *); -int _fetch_bind(int, int, const char *); -conn_t *_fetch_connect(const char *, int, int, int); -conn_t *_fetch_reopen(int); -conn_t *_fetch_ref(conn_t *); -int _fetch_ssl(conn_t *, int); -ssize_t _fetch_read(conn_t *, char *, size_t); -int _fetch_getln(conn_t *); -ssize_t _fetch_write(conn_t *, const char *, size_t); -ssize_t _fetch_writev(conn_t *, struct iovec *, int); -int _fetch_putln(conn_t *, const char *, size_t); -int _fetch_close(conn_t *); -int _fetch_add_entry(struct url_ent **, int *, int *, +void fetch_seterr(struct fetcherr *, int); +void fetch_syserr(void); +void fetch_info(const char *, ...); +int fetch_default_port(const char *); +int fetch_default_proxy_port(const char *); +int fetch_bind(int, int, const char *); +conn_t *fetch_connect(const char *, int, int, int); +conn_t *fetch_reopen(int); +conn_t *fetch_ref(conn_t *); +int fetch_ssl(conn_t *, int); +ssize_t fetch_read(conn_t *, char *, size_t); +int fetch_getln(conn_t *); +ssize_t fetch_write(conn_t *, const char *, size_t); +ssize_t fetch_writev(conn_t *, struct iovec *, int); +int fetch_putln(conn_t *, const char *, size_t); +int fetch_close(conn_t *); +int fetch_add_entry(struct url_ent **, int *, int *, const char *, struct url_stat *); -int _fetch_netrc_auth(struct url *url); +int fetch_netrc_auth(struct url *url); -#define _ftp_seterr(n) _fetch_seterr(_ftp_errlist, n) -#define _http_seterr(n) _fetch_seterr(_http_errlist, n) -#define _netdb_seterr(n) _fetch_seterr(_netdb_errlist, n) -#define _url_seterr(n) _fetch_seterr(_url_errlist, n) +#define ftp_seterr(n) fetch_seterr(ftp_errlist, n) +#define http_seterr(n) fetch_seterr(http_errlist, n) +#define netdb_seterr(n) fetch_seterr(netdb_errlist, n) +#define url_seterr(n) fetch_seterr(url_errlist, n) #ifndef NDEBUG #define DEBUG(x) do { if (fetchDebug) { x; } } while (0) @@ -103,7 +103,7 @@ #endif /* - * I don't really like exporting _http_request() and _ftp_request(), + * I don't really like exporting http_request() and ftp_request(), * but the HTTP and FTP code occasionally needs to cross-call * eachother, and this saves me from adding a lot of special-case code * to handle those cases. @@ -111,9 +111,9 @@ * Note that _*_request() free purl, which is way ugly but saves us a * whole lot of trouble. */ -FILE *_http_request(struct url *, const char *, +FILE *http_request(struct url *, const char *, struct url_stat *, struct url *, const char *); -FILE *_ftp_request(struct url *, const char *, +FILE *ftp_request(struct url *, const char *, struct url_stat *, struct url *, const char *); /* ==== //depot/projects/dtrace/src/lib/libfetch/fetch.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libfetch/fetch.c,v 1.38 2004/09/21 18:35:20 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libfetch/fetch.c,v 1.39 2007/12/14 10:26:58 des Exp $"); #include #include @@ -56,7 +56,7 @@ #define URL_MALFORMED 1 #define URL_BAD_SCHEME 2 #define URL_BAD_PORT 3 -static struct fetcherr _url_errlist[] = { +static struct fetcherr url_errlist[] = { { URL_MALFORMED, FETCH_URL, "Malformed URL" }, { URL_BAD_SCHEME, FETCH_URL, "Invalid URL scheme" }, { URL_BAD_PORT, FETCH_URL, "Invalid server port" }, @@ -89,7 +89,7 @@ return (fetchXGetHTTP(URL, us, flags)); else if (strcasecmp(URL->scheme, SCHEME_HTTPS) == 0) return (fetchXGetHTTP(URL, us, flags)); - _url_seterr(URL_BAD_SCHEME); + url_seterr(URL_BAD_SCHEME); return (NULL); } @@ -121,7 +121,7 @@ return (fetchPutHTTP(URL, flags)); else if (strcasecmp(URL->scheme, SCHEME_HTTPS) == 0) return (fetchPutHTTP(URL, flags)); - _url_seterr(URL_BAD_SCHEME); + url_seterr(URL_BAD_SCHEME); return (NULL); } @@ -147,7 +147,7 @@ return (fetchStatHTTP(URL, us, flags)); else if (strcasecmp(URL->scheme, SCHEME_HTTPS) == 0) return (fetchStatHTTP(URL, us, flags)); - _url_seterr(URL_BAD_SCHEME); + url_seterr(URL_BAD_SCHEME); return (-1); } @@ -169,7 +169,7 @@ return (fetchListHTTP(URL, flags)); else if (strcasecmp(URL->scheme, SCHEME_HTTPS) == 0) return (fetchListHTTP(URL, flags)); - _url_seterr(URL_BAD_SCHEME); + url_seterr(URL_BAD_SCHEME); return (NULL); } @@ -264,23 +264,23 @@ struct url *u; if (!scheme || (!host && !doc)) { - _url_seterr(URL_MALFORMED); + url_seterr(URL_MALFORMED); return (NULL); } if (port < 0 || port > 65535) { - _url_seterr(URL_BAD_PORT); + url_seterr(URL_BAD_PORT); return (NULL); } /* allocate struct url */ if ((u = calloc(1, sizeof(*u))) == NULL) { - _fetch_syserr(); + fetch_syserr(); return (NULL); } if ((u->doc = strdup(doc ? doc : "/")) == NULL) { - _fetch_syserr(); + fetch_syserr(); free(u); return (NULL); } @@ -311,7 +311,7 @@ /* allocate struct url */ if ((u = calloc(1, sizeof(*u))) == NULL) { - _fetch_syserr(); + fetch_syserr(); return (NULL); } @@ -373,7 +373,7 @@ u->port = u->port * 10 + (*q - '0'); else { /* invalid port */ - _url_seterr(URL_BAD_PORT); + url_seterr(URL_BAD_PORT); goto ouch; } p = q; @@ -390,7 +390,7 @@ /* percent-escape whitespace. */ if ((doc = malloc(strlen(p) * 3 + 1)) == NULL) { - _fetch_syserr(); + fetch_syserr(); goto ouch; } u->doc = doc; @@ -406,7 +406,7 @@ } *doc = '\0'; } else if ((u->doc = strdup(p)) == NULL) { - _fetch_syserr(); + fetch_syserr(); goto ouch; } ==== //depot/projects/dtrace/src/lib/libfetch/file.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libfetch/file.c,v 1.17 2004/09/21 18:35:20 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libfetch/file.c,v 1.18 2007/12/14 10:26:58 des Exp $"); #include #include @@ -50,11 +50,11 @@ f = fopen(u->doc, "r"); if (f == NULL) - _fetch_syserr(); + fetch_syserr(); if (u->offset && fseeko(f, u->offset, SEEK_SET) == -1) { fclose(f); - _fetch_syserr(); + fetch_syserr(); } return (f); @@ -77,25 +77,25 @@ f = fopen(u->doc, "w+"); if (f == NULL) - _fetch_syserr(); + fetch_syserr(); if (u->offset && fseeko(f, u->offset, SEEK_SET) == -1) { fclose(f); - _fetch_syserr(); + fetch_syserr(); } return (f); } static int -_fetch_stat_file(const char *fn, struct url_stat *us) +fetch_stat_file(const char *fn, struct url_stat *us) { struct stat sb; us->size = -1; us->atime = us->mtime = 0; if (stat(fn, &sb) == -1) { - _fetch_syserr(); + fetch_syserr(); return (-1); } us->size = sb.st_size; @@ -107,7 +107,7 @@ int fetchStatFile(struct url *u, struct url_stat *us, const char *flags __unused) { - return (_fetch_stat_file(u->doc, us)); + return (fetch_stat_file(u->doc, us)); } struct url_ent * @@ -122,7 +122,7 @@ int l; if ((dir = opendir(u->doc)) == NULL) { - _fetch_syserr(); + fetch_syserr(); return (NULL); } @@ -136,10 +136,10 @@ while ((de = readdir(dir)) != NULL) { strncpy(p, de->d_name, l - 1); p[l - 1] = 0; - if (_fetch_stat_file(fn, &us) == -1) + if (fetch_stat_file(fn, &us) == -1) /* should I return a partial result, or abort? */ break; - _fetch_add_entry(&ue, &size, &len, de->d_name, &us); + fetch_add_entry(&ue, &size, &len, de->d_name, &us); } return (ue); ==== //depot/projects/dtrace/src/lib/libfetch/ftp.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libfetch/ftp.c,v 1.96 2007/04/22 22:33:29 njl Exp $"); +__FBSDID("$FreeBSD: src/lib/libfetch/ftp.c,v 1.97 2007/12/14 10:26:58 des Exp $"); /* * Portions of this code were taken from or based on ftpio.c: @@ -135,16 +135,16 @@ * Get server response */ static int -_ftp_chkerr(conn_t *conn) +ftp_chkerr(conn_t *conn) { - if (_fetch_getln(conn) == -1) { - _fetch_syserr(); + if (fetch_getln(conn) == -1) { + fetch_syserr(); return (-1); } if (isftpinfo(conn->buf)) { while (conn->buflen && !isftpreply(conn->buf)) { - if (_fetch_getln(conn) == -1) { - _fetch_syserr(); + if (fetch_getln(conn) == -1) { + fetch_syserr(); return (-1); } } @@ -155,7 +155,7 @@ conn->buf[conn->buflen] = '\0'; if (!isftpreply(conn->buf)) { - _ftp_seterr(FTP_PROTOCOL_ERROR); + ftp_seterr(FTP_PROTOCOL_ERROR); return (-1); } @@ -170,7 +170,7 @@ * Send a command and check reply */ static int -_ftp_cmd(conn_t *conn, const char *fmt, ...) +ftp_cmd(conn_t *conn, const char *fmt, ...) { va_list ap; size_t len; @@ -183,26 +183,26 @@ if (msg == NULL) { errno = ENOMEM; - _fetch_syserr(); + fetch_syserr(); return (-1); } - r = _fetch_putln(conn, msg, len); + r = fetch_putln(conn, msg, len); free(msg); if (r == -1) { - _fetch_syserr(); + fetch_syserr(); return (-1); } - return (_ftp_chkerr(conn)); + return (ftp_chkerr(conn)); } /* * Return a pointer to the filename part of a path */ static const char * -_ftp_filename(const char *file, int *len, int *type) +ftp_filename(const char *file, int *len, int *type) { const char *s; @@ -225,7 +225,7 @@ * command. */ static int -_ftp_pwd(conn_t *conn, char *pwd, size_t pwdlen) +ftp_pwd(conn_t *conn, char *pwd, size_t pwdlen) { char *src, *dst, *end; int q; @@ -261,7 +261,7 @@ * file. */ static int -_ftp_cwd(conn_t *conn, const char *file) +ftp_cwd(conn_t *conn, const char *file) { const char *beg, *end; char pwd[PATH_MAX]; @@ -270,9 +270,9 @@ /* If no slashes in name, no need to change dirs. */ if ((end = strrchr(file, '/')) == NULL) return (0); - if ((e = _ftp_cmd(conn, "PWD")) != FTP_WORKING_DIRECTORY || >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Dec 14 22:25:04 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B671116A46C; Fri, 14 Dec 2007 22:25:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7A76316A420 for ; Fri, 14 Dec 2007 22:25:04 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 58B7613C4E7 for ; Fri, 14 Dec 2007 22:25:04 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBEMP4SD037036 for ; Fri, 14 Dec 2007 22:25:04 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBEMP4pf037033 for perforce@freebsd.org; Fri, 14 Dec 2007 22:25:04 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Dec 2007 22:25:04 GMT Message-Id: <200712142225.lBEMP4pf037033@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130898 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Dec 2007 22:25:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=130898 Change 130898 by jb@jb_freebsd1 on 2007/12/14 22:24:24 IF7 Affected files ... .. //depot/projects/dtrace7/src/lib/libc/nameser/ns_parse.c#2 integrate .. //depot/projects/dtrace7/src/lib/libc/resolv/res_data.c#2 integrate .. //depot/projects/dtrace7/src/lib/libc/resolv/res_init.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/init_main.c#4 edit .. //depot/projects/dtrace7/src/sys/kern/kern_proc.c#4 integrate .. //depot/projects/dtrace7/src/sys/kern/kern_thread.c#3 integrate .. //depot/projects/dtrace7/src/sys/sys/eventhandler.h#3 integrate Differences ... ==== //depot/projects/dtrace7/src/lib/libc/nameser/ns_parse.c#2 (text+ko) ==== @@ -16,8 +16,10 @@ */ #ifndef lint -static const char rcsid[] = "$Id: ns_parse.c,v 1.5.18.3 2005/10/11 00:25:10 marka Exp $"; +static const char rcsid[] = "$Id: ns_parse.c,v 1.5.18.4 2007/08/27 03:34:24 marka Exp $"; #endif +#include +__FBSDID("$FreeBSD: src/lib/libc/nameser/ns_parse.c,v 1.1.1.2.2.1 2007/12/14 20:32:13 ume Exp $"); /* Import. */ @@ -40,7 +42,7 @@ /* Macros. */ -#ifndef SOLARIS2 +#if !defined(SOLARIS2) || defined(__COVERITY__) #define RETERR(err) do { errno = (err); return (-1); } while (0) #else #define RETERR(err) \ ==== //depot/projects/dtrace7/src/lib/libc/resolv/res_data.c#2 (text+ko) ==== @@ -16,10 +16,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id: res_data.c,v 1.3.18.1 2005/04/27 05:01:10 sra Exp $"; +static const char rcsid[] = "$Id: res_data.c,v 1.3.18.2 2007/09/14 05:35:47 marka Exp $"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/resolv/res_data.c,v 1.4 2007/06/03 17:20:27 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/resolv/res_data.c,v 1.4.2.1 2007/12/14 20:32:13 ume Exp $"); #include "port_before.h" ==== //depot/projects/dtrace7/src/lib/libc/resolv/res_init.c#2 (text+ko) ==== @@ -66,10 +66,10 @@ #if defined(LIBC_SCCS) && !defined(lint) static const char sccsid[] = "@(#)res_init.c 8.1 (Berkeley) 6/7/93"; -static const char rcsid[] = "$Id: res_init.c,v 1.16.18.5 2006/08/30 23:23:13 marka Exp $"; +static const char rcsid[] = "$Id: res_init.c,v 1.16.18.7 2007/07/09 01:52:58 marka Exp $"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/resolv/res_init.c,v 1.6 2007/06/03 17:20:27 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/resolv/res_init.c,v 1.6.2.1 2007/12/14 20:32:13 ume Exp $"); #include "port_before.h" @@ -168,7 +168,9 @@ #endif int dots; union res_sockaddr_union u[2]; + int maxns = MAXNS; + RES_SET_H_ERRNO(statp, 0); if (statp->_u._ext.ext != NULL) res_ndestroy(statp); @@ -218,8 +220,22 @@ statp->_u._ext.ext->nsaddrs[0].sin = statp->nsaddr; strcpy(statp->_u._ext.ext->nsuffix, "ip6.arpa"); strcpy(statp->_u._ext.ext->nsuffix2, "ip6.int"); - } else - return (-1); + } else { + /* + * Historically res_init() rarely, if at all, failed. + * Examples and applications exist which do not check + * our return code. Furthermore several applications + * simply call us to get the systems domainname. So + * rather then immediately fail here we store the + * failure, which is returned later, in h_errno. And + * prevent the collection of 'nameserver' information + * by setting maxns to 0. Thus applications that fail + * to check our return code wont be able to make + * queries anyhow. + */ + RES_SET_H_ERRNO(statp, NETDB_INTERNAL); + maxns = 0; + } #ifdef RESOLVSORT statp->nsort = 0; #endif @@ -240,9 +256,9 @@ buf[0] = '.'; cp = strchr(buf, '.'); cp = (cp == NULL) ? buf : (cp + 1); - if (strlen(cp) >= sizeof(statp->defdname)) - goto freedata; - strcpy(statp->defdname, cp); + strncpy(statp->defdname, cp, + sizeof(statp->defdname) - 1); + statp->defdname[sizeof(statp->defdname) - 1] = '\0'; } } #endif /* SOLARIS2 */ @@ -348,7 +364,7 @@ continue; } /* read nameservers to query */ - if (MATCH(buf, "nameserver") && nserv < MAXNS) { + if (MATCH(buf, "nameserver") && nserv < maxns) { struct addrinfo hints, *ai; char sbuf[NI_MAXSERV]; const size_t minsiz = @@ -541,16 +557,7 @@ else if ((cp = getenv("RES_OPTIONS")) != NULL) res_setoptions(statp, cp, "env"); statp->options |= RES_INIT; - return (0); - -#ifdef SOLARIS2 - freedata: - if (statp->_u._ext.ext != NULL) { - free(statp->_u._ext.ext); - statp->_u._ext.ext = NULL; - } - return (-1); -#endif + return (statp->res_h_errno); } static void ==== //depot/projects/dtrace7/src/sys/kern/init_main.c#4 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/init_main.c,v 1.283.2.1 2007/12/06 14:19:42 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/init_main.c,v 1.283.2.2 2007/12/14 13:41:08 rrs Exp $"); #include "opt_ddb.h" #include "opt_init_path.h" @@ -488,10 +488,15 @@ p->p_sysent->sv_maxuser); vmspace0.vm_map.pmap = vmspace_pmap(&vmspace0); + /*- + * call the init and ctor for the new thread and proc + * we wait to do this until all other structures + * are fairly sane. + */ + EVENTHANDLER_INVOKE(process_init, p); + EVENTHANDLER_INVOKE(thread_init, td); EVENTHANDLER_INVOKE(process_ctor, p); - EVENTHANDLER_INVOKE(process_init, p); EVENTHANDLER_INVOKE(thread_ctor, td); - EVENTHANDLER_INVOKE(thread_init, td); /* * Charge root for one process. ==== //depot/projects/dtrace7/src/sys/kern/kern_proc.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_proc.c,v 1.252.2.1 2007/11/24 18:27:29 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_proc.c,v 1.252.2.2 2007/12/14 13:41:08 rrs Exp $"); #include "opt_ktrace.h" #include "opt_kstack_pages.h" @@ -160,7 +160,7 @@ * freed, so you gotta do this here. */ if (((p->p_flag & P_KTHREAD) != 0) && (td->td_altkstack != 0)) - vm_thread_dispose_altkstack(td); + vm_thread_dispose_altkstack(td); EVENTHANDLER_INVOKE(process_dtor, p); if (p->p_ksi != NULL) KASSERT(! KSI_ONQ(p->p_ksi), ("SIGCHLD queue")); ==== //depot/projects/dtrace7/src/sys/kern/kern_thread.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.255 2007/09/21 04:04:22 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.255.2.1 2007/12/14 13:41:09 rrs Exp $"); #include #include @@ -128,7 +128,6 @@ */ td->td_critnest = 1; EVENTHANDLER_INVOKE(thread_ctor, td); - #ifdef AUDIT audit_thread_alloc(td); #endif ==== //depot/projects/dtrace7/src/sys/sys/eventhandler.h#3 (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/sys/eventhandler.h,v 1.37 2007/04/13 08:38:48 pjd Exp $ + * $FreeBSD: src/sys/sys/eventhandler.h,v 1.37.2.1 2007/12/14 13:41:09 rrs Exp $ */ #ifndef SYS_EVENTHANDLER_H From owner-p4-projects@FreeBSD.ORG Fri Dec 14 22:26:06 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2042616A478; Fri, 14 Dec 2007 22:26:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A5A4B16A419 for ; Fri, 14 Dec 2007 22:26:05 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 84F2913C45A for ; Fri, 14 Dec 2007 22:26:05 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBEMQ58K037079 for ; Fri, 14 Dec 2007 22:26:05 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBEMQ5mh037076 for perforce@freebsd.org; Fri, 14 Dec 2007 22:26:05 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Dec 2007 22:26:05 GMT Message-Id: <200712142226.lBEMQ5mh037076@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130899 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Dec 2007 22:26:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=130899 Change 130899 by jb@jb_freebsd1 on 2007/12/14 22:25:04 IF6 Affected files ... .. //depot/projects/dtrace6/src/sys/netinet/tcp_subr.c#2 integrate Differences ... ==== //depot/projects/dtrace6/src/sys/netinet/tcp_subr.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)tcp_subr.c 8.2 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_subr.c,v 1.228.2.14 2006/12/30 17:58:46 jhb Exp $ + * $FreeBSD: src/sys/netinet/tcp_subr.c,v 1.228.2.15 2007/12/14 19:23:31 qingli Exp $ */ #include "opt_compat.h" @@ -1470,7 +1470,7 @@ } /* - * Increment the offset to the next ISN_BYTES_PER_SECOND / hz boundary + * Increment the offset to the next ISN_BYTES_PER_SECOND / 100 boundary * to keep time flowing at a relatively constant rate. If the random * increments have already pushed us past the projected offset, do nothing. */ @@ -1483,7 +1483,7 @@ INP_INFO_WLOCK(&tcbinfo); projected_offset = isn_offset_old + ISN_BYTES_PER_SECOND / 100; - if (projected_offset > isn_offset) + if (SEQ_GT(projected_offset, isn_offset)) isn_offset = projected_offset; isn_offset_old = isn_offset; From owner-p4-projects@FreeBSD.ORG Fri Dec 14 22:52:34 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5994516A468; Fri, 14 Dec 2007 22:52:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 06E7F16A420 for ; Fri, 14 Dec 2007 22:52:34 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D8C0513C455 for ; Fri, 14 Dec 2007 22:52:33 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBEMqX1k043283 for ; Fri, 14 Dec 2007 22:52:33 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBEMqXP8043276 for perforce@freebsd.org; Fri, 14 Dec 2007 22:52:33 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Dec 2007 22:52:33 GMT Message-Id: <200712142252.lBEMqXP8043276@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130901 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Dec 2007 22:52:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=130901 Change 130901 by jb@jb_freebsd1 on 2007/12/14 22:52:06 MFdtrace Affected files ... .. //depot/projects/dtrace7/src/share/mk/bsd.lib.mk#2 edit .. //depot/projects/dtrace7/src/share/mk/bsd.prog.mk#2 edit .. //depot/projects/dtrace7/src/share/mk/sys.mk#3 edit Differences ... ==== //depot/projects/dtrace7/src/share/mk/bsd.lib.mk#2 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91 -# $FreeBSD: src/share/mk/bsd.lib.mk,v 1.182.2.1 2007/10/23 15:41:34 ru Exp $ +# $FreeBSD: src/share/mk/bsd.lib.mk,v 1.183 2007/10/20 19:01:49 ru Exp $ # .include @@ -64,43 +64,82 @@ .c.po: ${CC} ${PO_FLAG} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .c.So: ${CC} ${PICFLAG} -DPIC ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .cc.po .C.po .cpp.po .cxx.po: ${CXX} ${PO_FLAG} ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .cc.So .C.So .cpp.So .cxx.So: ${CXX} ${PICFLAG} -DPIC ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .f.po: ${FC} -pg ${FFLAGS} -o ${.TARGET} -c ${.IMPSRC} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .f.So: ${FC} ${PICFLAG} -DPIC ${FFLAGS} -o ${.TARGET} -c ${.IMPSRC} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .m.po: ${OBJC} ${OBJCFLAGS} -pg -c ${.IMPSRC} -o ${.TARGET} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .m.So: ${OBJC} ${PICFLAG} -DPIC ${OBJCFLAGS} -c ${.IMPSRC} -o ${.TARGET} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .s.po .s.So: ${AS} ${AFLAGS} -o ${.TARGET} ${.IMPSRC} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .asm.po: ${CC} -x assembler-with-cpp -DPROF ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .asm.So: ${CC} -x assembler-with-cpp ${PICFLAG} -DPIC ${CFLAGS} \ -c ${.IMPSRC} -o ${.TARGET} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .S.po: ${CC} -DPROF ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .S.So: ${CC} ${PICFLAG} -DPIC ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif all: objwarn @@ -171,6 +210,9 @@ -o ${.TARGET} -Wl,-soname,${SONAME} \ `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD} .endif +.if defined(CTFMERGE) + ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} +.endif .endif .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no" ==== //depot/projects/dtrace7/src/share/mk/bsd.prog.mk#2 (text+ko) ==== @@ -56,6 +56,9 @@ .else ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD} .endif +.if defined(CTFMERGE) + ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${OBJS} +.endif .else # !defined(SRCS) @@ -79,6 +82,9 @@ .else ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD} .endif +.if defined(CTFMERGE) + ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${OBJS} +.endif .endif .endif ==== //depot/projects/dtrace7/src/share/mk/sys.mk#3 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)sys.mk 8.2 (Berkeley) 3/21/94 -# $FreeBSD: src/share/mk/sys.mk,v 1.92.2.1 2007/12/02 13:24:43 cognet Exp $ +# $FreeBSD: src/share/mk/sys.mk,v 1.97 2007/11/26 21:46:21 jb Exp $ unix ?= We run FreeBSD, not UNIX. .FreeBSD ?= true @@ -40,10 +40,30 @@ .else CFLAGS ?= -O2 -fno-strict-aliasing -pipe .endif +.if defined(NO_STRICT_ALIASING) +CFLAGS += -fno-strict-aliasing +.endif +.endif + +.if ${MACHINE_ARCH} != "amd64" && ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "sparc64" +NO_CTF= 1 .endif +# C Type Format data is required for DTrace +CTFFLAGS ?= -L VERSION + +.if !defined(NO_CTF) +CTFCONVERT ?= ctfconvert +CTFMERGE ?= ctfmerge +.if defined(DEBUG_FLAGS) +CTFFLAGS += -g +.else +DEBUG_FLAGS = -g +.endif +.endif + CXX ?= c++ -CXXFLAGS ?= ${CFLAGS:N-std=*:N-Wnested-externs:N-W*-prototypes} +CXXFLAGS ?= ${CFLAGS:N-std=*:N-Wnested-externs:N-W*-prototypes:N-Wno-pointer-sign} CPP ?= cpp @@ -120,9 +140,15 @@ # SINGLE SUFFIX RULES .c: ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.IMPSRC} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .f: ${FC} ${FFLAGS} ${LDFLAGS} -o ${.TARGET} ${.IMPSRC} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .sh: cp ${.IMPSRC} ${.TARGET} @@ -132,21 +158,33 @@ .c.o: ${CC} ${CFLAGS} -c ${.IMPSRC} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .f.o: ${FC} ${FFLAGS} -c ${.IMPSRC} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .y.o: ${YACC} ${YFLAGS} ${.IMPSRC} ${CC} ${CFLAGS} -c y.tab.c rm -f y.tab.c mv y.tab.o ${.TARGET} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .l.o: ${LEX} ${LFLAGS} ${.IMPSRC} ${CC} ${CFLAGS} -c lex.yy.c rm -f lex.yy.c mv lex.yy.o ${.TARGET} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .y.c: ${YACC} ${YFLAGS} ${.IMPSRC} @@ -184,21 +222,39 @@ .c: ${CC} ${CFLAGS} ${LDFLAGS} ${.IMPSRC} ${LDLIBS} -o ${.TARGET} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .c.o: ${CC} ${CFLAGS} -c ${.IMPSRC} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .cc .cpp .cxx .C: ${CXX} ${CXXFLAGS} ${LDFLAGS} ${.IMPSRC} ${LDLIBS} -o ${.TARGET} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .cc.o .cpp.o .cxx.o .C.o: ${CXX} ${CXXFLAGS} -c ${.IMPSRC} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .m.o: ${OBJC} ${OBJCFLAGS} -c ${.IMPSRC} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .p.o: ${PC} ${PFLAGS} -c ${.IMPSRC} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .e .r .F .f: ${FC} ${RFLAGS} ${EFLAGS} ${FFLAGS} ${LDFLAGS} ${.IMPSRC} ${LDLIBS} \ @@ -209,23 +265,38 @@ .S.o: ${CC} ${CFLAGS} -c ${.IMPSRC} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .asm.o: ${CC} -x assembler-with-cpp ${CFLAGS} -c ${.IMPSRC} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .s.o: ${AS} ${AFLAGS} -o ${.TARGET} ${.IMPSRC} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif # XXX not -j safe .y.o: ${YACC} ${YFLAGS} ${.IMPSRC} ${CC} ${CFLAGS} -c y.tab.c -o ${.TARGET} rm -f y.tab.c +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .l.o: ${LEX} -t ${LFLAGS} ${.IMPSRC} > ${.PREFIX}.tmp.c ${CC} ${CFLAGS} -c ${.PREFIX}.tmp.c -o ${.TARGET} rm -f ${.PREFIX}.tmp.c +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif # XXX not -j safe .y.c: @@ -237,22 +308,34 @@ .s.out .c.out .o.out: ${CC} ${CFLAGS} ${LDFLAGS} ${.IMPSRC} ${LDLIBS} -o ${.TARGET} +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .f.out .F.out .r.out .e.out: ${FC} ${EFLAGS} ${RFLAGS} ${FFLAGS} ${LDFLAGS} ${.IMPSRC} \ ${LDLIBS} -o ${.TARGET} rm -f ${.PREFIX}.o +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif # XXX not -j safe .y.out: ${YACC} ${YFLAGS} ${.IMPSRC} ${CC} ${CFLAGS} ${LDFLAGS} y.tab.c ${LDLIBS} -ly -o ${.TARGET} rm -f y.tab.c +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif .l.out: ${LEX} -t ${LFLAGS} ${.IMPSRC} > ${.PREFIX}.tmp.c ${CC} ${CFLAGS} ${LDFLAGS} ${.PREFIX}.tmp.c ${LDLIBS} -ll -o ${.TARGET} rm -f ${.PREFIX}.tmp.c +.if defined(CTFCONVERT) + ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.endif # FreeBSD build pollution. Hide it in the non-POSIX part of the ifdef. __MAKE_CONF?=/etc/make.conf @@ -260,6 +343,11 @@ .include "${__MAKE_CONF}" .endif +.if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL) +SHELL= ${__MAKE_SHELL} +.SHELL: path=${__MAKE_SHELL} +.endif + # Default executable format # XXX hint for bsd.port.mk OBJFORMAT?= elf From owner-p4-projects@FreeBSD.ORG Fri Dec 14 23:03:46 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5631016A41A; Fri, 14 Dec 2007 23:03:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1C1AA16A417 for ; Fri, 14 Dec 2007 23:03:46 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EF00D13C468 for ; Fri, 14 Dec 2007 23:03:45 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBEN3jCn046312 for ; Fri, 14 Dec 2007 23:03:45 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBEN3jJL046309 for perforce@freebsd.org; Fri, 14 Dec 2007 23:03:45 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Dec 2007 23:03:45 GMT Message-Id: <200712142303.lBEN3jJL046309@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130903 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Dec 2007 23:03:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=130903 Change 130903 by jb@jb_freebsd1 on 2007/12/14 23:03:39 Add the DTrace buildworld hooks. This will need a BOOTSTRAPPING thing around the _dtrace_tools if and when it goes into RELENG_7. Affected files ... .. //depot/projects/dtrace7/src/Makefile.inc1#2 edit Differences ... ==== //depot/projects/dtrace7/src/Makefile.inc1#2 (text+ko) ==== @@ -10,6 +10,7 @@ # -DNO_KERNELDEPEND do not run ${MAKE} depend in ${MAKE} buildkernel # -DNO_PORTSUPDATE do not update ports in ${MAKE} update # -DNO_DOCUPDATE do not update doc in ${MAKE} update +# -DNO_CTF do not run the DTrace CTF conversion tools on built objects # LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list # TARGET="machine" to crossbuild world for a different machine type @@ -42,6 +43,8 @@ .endif .if ${MK_CDDL} != "no" SUBDIR+=cddl +.else +NO_CTF=1 .endif SUBDIR+=gnu include .if ${MK_KERBEROS} != "no" @@ -102,6 +105,11 @@ .endif .endif +.if !defined(VERSION) +VERSION!= uname -srp +VERSION+= ${OSRELDATE} +.endif + # Guess machine architecture from machine type, and vice versa. .if !defined(TARGET_ARCH) && defined(TARGET) TARGET_ARCH= ${TARGET:S/pc98/i386/:S/sun4v/sparc64/} @@ -208,14 +216,15 @@ BOOTSTRAPPING=${OSRELDATE} \ -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \ -DWITHOUT_NLS -DNO_PIC -DWITHOUT_PROFILE -DNO_SHARED \ - -DNO_CPU_CFLAGS -DNO_WARNS + -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF # build-tools stage TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \ ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ DESTDIR= \ - BOOTSTRAPPING=${OSRELDATE} -DNO_LINT -DNO_CPU_CFLAGS -DNO_WARNS + BOOTSTRAPPING=${OSRELDATE} -DNO_LINT -DNO_CPU_CFLAGS \ + -DNO_WARNS -DNO_CTF # cross-tools stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \ @@ -227,6 +236,9 @@ _SHLIBDIRPREFIX=${WORLDTMP} \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${TMPPATH} +.if ${MK_CDDL} == "no" || defined(NO_CTF) +WMAKEENV+= NO_CTF=1 +.endif WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP} .if ${TARGET_ARCH} == "amd64" @@ -873,8 +885,14 @@ _pwd_mkdb= usr.sbin/pwd_mkdb .endif +.if ${MK_CDDL} != "no" +_dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \ + lib/libdwarf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge +.endif + bootstrap-tools: .for _tool in \ + ${_dtrace_tools} \ ${_strfile} \ ${_gperf} \ ${_groff} \ From owner-p4-projects@FreeBSD.ORG Fri Dec 14 23:14:59 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0465316A6B9; Fri, 14 Dec 2007 23:14:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9DFBC16A68F for ; Fri, 14 Dec 2007 23:14:58 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7869A13C478 for ; Fri, 14 Dec 2007 23:14:58 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBENEwxi049111 for ; Fri, 14 Dec 2007 23:14:58 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBENEwef049108 for perforce@freebsd.org; Fri, 14 Dec 2007 23:14:58 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Dec 2007 23:14:58 GMT Message-Id: <200712142314.lBENEwef049108@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130906 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Dec 2007 23:14:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=130906 Change 130906 by jb@jb_freebsd1 on 2007/12/14 23:14:22 MFdtrace Note that the libproc stuff will be replaced with a non-CDDL version when I get around to it. For now it is just there so that dtrace(8) builds. Affected files ... .. //depot/projects/dtrace7/src/cddl/lib/Makefile#2 edit .. //depot/projects/dtrace7/src/cddl/lib/libctf/Makefile#1 add .. //depot/projects/dtrace7/src/cddl/lib/libdtrace/Makefile#1 add .. //depot/projects/dtrace7/src/cddl/lib/libdtrace/errno.d#1 add .. //depot/projects/dtrace7/src/cddl/lib/libdtrace/psinfo.d#1 add .. //depot/projects/dtrace7/src/cddl/lib/libproc/Makefile#1 add .. //depot/projects/dtrace7/src/cddl/lib/libproc/Pcontrol.c#1 add .. //depot/projects/dtrace7/src/cddl/lib/libproc/Pcontrol.h#1 add .. //depot/projects/dtrace7/src/cddl/lib/libproc/Psymtab.c#1 add .. //depot/projects/dtrace7/src/cddl/lib/libproc/Putil.c#1 add .. //depot/projects/dtrace7/src/cddl/lib/libproc/Putil.h#1 add .. //depot/projects/dtrace7/src/cddl/lib/libproc/libproc.h#1 add .. //depot/projects/dtrace7/src/cddl/test/dtrace/Makefile#1 add .. //depot/projects/dtrace7/src/cddl/usr.bin/Makefile#2 edit .. //depot/projects/dtrace7/src/cddl/usr.bin/ctfconvert/Makefile#1 add .. //depot/projects/dtrace7/src/cddl/usr.bin/ctfdump/Makefile#1 add .. //depot/projects/dtrace7/src/cddl/usr.bin/ctfmerge/Makefile#1 add .. //depot/projects/dtrace7/src/cddl/usr.bin/sgsmsg/Makefile#1 add .. //depot/projects/dtrace7/src/cddl/usr.sbin/Makefile#2 edit .. //depot/projects/dtrace7/src/cddl/usr.sbin/dtrace/Makefile#1 add Differences ... ==== //depot/projects/dtrace7/src/cddl/lib/Makefile#2 (text+ko) ==== @@ -3,7 +3,10 @@ .include SUBDIR= libavl \ + libctf \ + libdtrace \ libnvpair \ + libproc \ libumem \ libuutil \ ${_libzfs} \ ==== //depot/projects/dtrace7/src/cddl/usr.bin/Makefile#2 (text+ko) ==== @@ -2,7 +2,12 @@ .include -SUBDIR= ${_ztest} +SUBDIR= \ + ctfconvert \ + ctfdump \ + ctfmerge \ + sgsmsg \ + ${_ztest} .if ${MK_ZFS} != "no" .if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no" ==== //depot/projects/dtrace7/src/cddl/usr.sbin/Makefile#2 (text+ko) ==== @@ -2,7 +2,8 @@ .include -SUBDIR= ${_zdb} +SUBDIR= dtrace \ + ${_zdb} .if ${MK_ZFS} != "no" .if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no" From owner-p4-projects@FreeBSD.ORG Fri Dec 14 23:20:05 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8C2DF16A475; Fri, 14 Dec 2007 23:20:05 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2EEB516A417 for ; Fri, 14 Dec 2007 23:20:05 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0A1D113C442 for ; Fri, 14 Dec 2007 23:20:05 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBENK4dU049634 for ; Fri, 14 Dec 2007 23:20:04 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBENK3th049630 for perforce@freebsd.org; Fri, 14 Dec 2007 23:20:03 GMT (envelope-from marcel@freebsd.org) Date: Fri, 14 Dec 2007 23:20:03 GMT Message-Id: <200712142320.lBENK3th049630@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 130907 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Dec 2007 23:20:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=130907 Change 130907 by marcel@marcel_cluster on 2007/12/14 23:19:29 IFC @130905 Affected files ... .. //depot/projects/e500/games/fortune/datfiles/fortunes#7 integrate .. //depot/projects/e500/games/fortune/datfiles/fortunes-o.real#4 integrate .. //depot/projects/e500/include/pthread_np.h#3 integrate .. //depot/projects/e500/lib/libc/Versions.def#2 integrate .. //depot/projects/e500/lib/libfetch/Makefile#4 integrate .. //depot/projects/e500/lib/libfetch/common.c#2 integrate .. //depot/projects/e500/lib/libfetch/common.h#2 integrate .. //depot/projects/e500/lib/libfetch/fetch.c#2 integrate .. //depot/projects/e500/lib/libfetch/file.c#2 integrate .. //depot/projects/e500/lib/libfetch/ftp.c#2 integrate .. //depot/projects/e500/lib/libfetch/http.c#3 integrate .. //depot/projects/e500/lib/libthr/pthread.map#4 integrate .. //depot/projects/e500/lib/libthr/thread/thr_mutex.c#4 integrate .. //depot/projects/e500/lib/libthr/thread/thr_private.h#4 integrate .. //depot/projects/e500/lib/msun/Symbol.map#2 integrate .. //depot/projects/e500/lib/msun/man/sqrt.3#2 integrate .. //depot/projects/e500/sbin/natd/natd.8#3 integrate .. //depot/projects/e500/sys/conf/files.powerpc#8 integrate .. //depot/projects/e500/sys/dev/sound/pci/maestro.c#3 integrate .. //depot/projects/e500/sys/kern/Makefile#3 integrate .. //depot/projects/e500/sys/powerpc/aim/clock.c#5 integrate .. //depot/projects/e500/sys/powerpc/aim/copyinout.c#3 integrate .. //depot/projects/e500/sys/powerpc/aim/interrupt.c#4 integrate .. //depot/projects/e500/sys/powerpc/aim/locore.S#3 integrate .. //depot/projects/e500/sys/powerpc/aim/machdep.c#5 integrate .. //depot/projects/e500/sys/powerpc/aim/mmu_oea.c#2 integrate .. //depot/projects/e500/sys/powerpc/aim/nexus.c#4 integrate .. //depot/projects/e500/sys/powerpc/aim/ofw_machdep.c#4 integrate .. //depot/projects/e500/sys/powerpc/aim/ofwmagic.S#2 integrate .. //depot/projects/e500/sys/powerpc/aim/swtch.S#3 integrate .. //depot/projects/e500/sys/powerpc/aim/trap.c#6 integrate .. //depot/projects/e500/sys/powerpc/aim/trap_subr.S#3 integrate .. //depot/projects/e500/sys/powerpc/aim/uio_machdep.c#4 integrate .. //depot/projects/e500/sys/powerpc/aim/uma_machdep.c#3 integrate .. //depot/projects/e500/sys/powerpc/aim/vm_machdep.c#7 integrate .. //depot/projects/e500/sys/sys/kerneldump.h#2 integrate .. //depot/projects/e500/sys/sys/pcpu.h#4 integrate .. //depot/projects/e500/usr.bin/xinstall/xinstall.c#2 integrate Differences ... ==== //depot/projects/e500/games/fortune/datfiles/fortunes#7 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.249 2007/12/09 01:00:11 dougb Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.250 2007/12/14 01:47:11 wes Exp $ % ======================================================================= || || @@ -56259,6 +56259,9 @@ % Where am I? Who am I? Am I? I % +Where am I, and what am I doing in this handbasket? + -- Mark A. Matthews, to Wes Peters, circa 1996 +% Where are the calculations that go with a calculated risk? % WHERE CAN THE MATTER BE ==== //depot/projects/e500/games/fortune/datfiles/fortunes-o.real#4 (text+ko) ==== @@ -1,4 +1,4 @@ -%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.28 2007/12/09 01:00:11 dougb Exp $ +%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.29 2007/12/14 21:58:58 des Exp $ % PLAYGIRL, Inc. Philadelphia, Pa. 19369 @@ -755,7 +755,7 @@ "What is amiss, my friend?" asked the king. "My lord," gasped Lancelot, "you have given me the wrong key!" % - "Before we get married," said the young woman to her fiancee, + "Before we get married," said the young woman to her fiance, "I want to confess some affairs that I've had in the past." "But you told me all about those a few weeks ago," her young man replied. ==== //depot/projects/e500/include/pthread_np.h#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/pthread_np.h,v 1.17 2007/10/29 00:31:54 imp Exp $ + * $FreeBSD: src/include/pthread_np.h,v 1.18 2007/12/14 06:25:56 davidxu Exp $ */ #ifndef _PTHREAD_NP_H_ #define _PTHREAD_NP_H_ @@ -49,6 +49,10 @@ void pthread_resume_all_np(void); int pthread_resume_np(pthread_t); void pthread_set_name_np(pthread_t, const char *); +int pthread_mutex_getspinloops_np(pthread_mutex_t *mutex, int *count); +int pthread_mutex_setspinloops_np(pthread_mutex_t *mutex, int count); +int pthread_mutex_getyieldloops_np(pthread_mutex_t *mutex, int *count); +int pthread_mutex_setyieldloops_np(pthread_mutex_t *mutex, int count); int pthread_single_np(void); void pthread_suspend_all_np(void); int pthread_suspend_np(pthread_t); ==== //depot/projects/e500/lib/libc/Versions.def#2 (text) ==== @@ -1,9 +1,14 @@ -# $FreeBSD: src/lib/libc/Versions.def,v 1.3 2007/04/29 16:14:17 kan Exp $ +# $FreeBSD: src/lib/libc/Versions.def,v 1.4 2007/12/14 20:49:06 deischen Exp $ # This is our first version; it depends on no other. +# This version was first added to 7.0-current. FBSD_1.0 { }; +# This version was first added to 8.0-current. +FBSD_1.1 { +} FBSD_1.0; + # This is our private namespace. Any global interfaces that are # strictly for use only by other FreeBSD applications and libraries # are listed here. We use a separate namespace so we can write ==== //depot/projects/e500/lib/libfetch/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libfetch/Makefile,v 1.49 2007/05/24 20:28:14 des Exp $ +# $FreeBSD: src/lib/libfetch/Makefile,v 1.50 2007/12/14 10:26:58 des Exp $ .include @@ -28,7 +28,7 @@ SHLIB_MAJOR= 5 ftperr.h: ftp.errors - @echo "static struct fetcherr _ftp_errlist[] = {" > ${.TARGET} + @echo "static struct fetcherr ftp_errlist[] = {" > ${.TARGET} @cat ${.ALLSRC} \ | grep -v ^# \ | sort \ @@ -39,7 +39,7 @@ @echo "};" >> ${.TARGET} httperr.h: http.errors - @echo "static struct fetcherr _http_errlist[] = {" > ${.TARGET} + @echo "static struct fetcherr http_errlist[] = {" > ${.TARGET} @cat ${.ALLSRC} \ | grep -v ^# \ | sort \ ==== //depot/projects/e500/lib/libfetch/common.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libfetch/common.c,v 1.50 2005/02/16 12:46:46 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libfetch/common.c,v 1.51 2007/12/14 10:26:58 des Exp $"); #include #include @@ -53,7 +53,7 @@ /* * Error messages for resolver errors */ -static struct fetcherr _netdb_errlist[] = { +static struct fetcherr netdb_errlist[] = { #ifdef EAI_NODATA { EAI_NODATA, FETCH_RESOLV, "Host not found" }, #endif @@ -73,7 +73,7 @@ * Map error code to string */ static struct fetcherr * -_fetch_finderr(struct fetcherr *p, int e) +fetch_finderr(struct fetcherr *p, int e) { while (p->num != -1 && p->num != e) p++; @@ -84,9 +84,9 @@ * Set error code */ void -_fetch_seterr(struct fetcherr *p, int e) +fetch_seterr(struct fetcherr *p, int e) { - p = _fetch_finderr(p, e); + p = fetch_finderr(p, e); fetchLastErrCode = p->cat; snprintf(fetchLastErrString, MAXERRSTRING, "%s", p->string); } @@ -95,7 +95,7 @@ * Set error code according to errno */ void -_fetch_syserr(void) +fetch_syserr(void) { switch (errno) { case 0: @@ -155,7 +155,7 @@ * Emit status message */ void -_fetch_info(const char *fmt, ...) +fetch_info(const char *fmt, ...) { va_list ap; @@ -172,7 +172,7 @@ * Return the default port for a scheme */ int -_fetch_default_port(const char *scheme) +fetch_default_port(const char *scheme) { struct servent *se; @@ -189,7 +189,7 @@ * Return the default proxy port for a scheme */ int -_fetch_default_proxy_port(const char *scheme) +fetch_default_proxy_port(const char *scheme) { if (strcasecmp(scheme, SCHEME_FTP) == 0) return (FTP_DEFAULT_PROXY_PORT); @@ -203,7 +203,7 @@ * Create a connection for an existing descriptor. */ conn_t * -_fetch_reopen(int sd) +fetch_reopen(int sd) { conn_t *conn; @@ -220,7 +220,7 @@ * Bump a connection's reference count. */ conn_t * -_fetch_ref(conn_t *conn) +fetch_ref(conn_t *conn) { ++conn->ref; @@ -232,7 +232,7 @@ * Bind a socket to a specific local address */ int -_fetch_bind(int sd, int af, const char *addr) +fetch_bind(int sd, int af, const char *addr) { struct addrinfo hints, *res, *res0; int err; @@ -254,7 +254,7 @@ * Establish a TCP connection to the specified port on the specified host. */ conn_t * -_fetch_connect(const char *host, int port, int af, int verbose) +fetch_connect(const char *host, int port, int af, int verbose) { conn_t *conn; char pbuf[10]; @@ -265,7 +265,7 @@ DEBUG(fprintf(stderr, "---> %s:%d\n", host, port)); if (verbose) - _fetch_info("looking up %s", host); + fetch_info("looking up %s", host); /* look up host name and set up socket address structure */ snprintf(pbuf, sizeof(pbuf), "%d", port); @@ -274,13 +274,13 @@ hints.ai_socktype = SOCK_STREAM; hints.ai_protocol = 0; if ((err = getaddrinfo(host, pbuf, &hints, &res0)) != 0) { - _netdb_seterr(err); + netdb_seterr(err); return (NULL); } bindaddr = getenv("FETCH_BIND_ADDRESS"); if (verbose) - _fetch_info("connecting to %s:%d", host, port); + fetch_info("connecting to %s:%d", host, port); /* try to connect */ for (sd = -1, res = res0; res; sd = -1, res = res->ai_next) { @@ -288,8 +288,8 @@ res->ai_protocol)) == -1) continue; if (bindaddr != NULL && *bindaddr != '\0' && - _fetch_bind(sd, res->ai_family, bindaddr) != 0) { - _fetch_info("failed to bind to '%s'", bindaddr); + fetch_bind(sd, res->ai_family, bindaddr) != 0) { + fetch_info("failed to bind to '%s'", bindaddr); close(sd); continue; } @@ -299,12 +299,12 @@ } freeaddrinfo(res0); if (sd == -1) { - _fetch_syserr(); + fetch_syserr(); return (NULL); } - if ((conn = _fetch_reopen(sd)) == NULL) { - _fetch_syserr(); + if ((conn = fetch_reopen(sd)) == NULL) { + fetch_syserr(); close(sd); } return (conn); @@ -315,7 +315,7 @@ * Enable SSL on a connection. */ int -_fetch_ssl(conn_t *conn, int verbose) +fetch_ssl(conn_t *conn, int verbose) { #ifdef WITH_SSL @@ -373,7 +373,7 @@ * Read a character from a connection w/ timeout */ ssize_t -_fetch_read(conn_t *conn, char *buf, size_t len) +fetch_read(conn_t *conn, char *buf, size_t len) { struct timeval now, timeout, wait; fd_set readfds; @@ -399,7 +399,7 @@ } if (wait.tv_sec < 0) { errno = ETIMEDOUT; - _fetch_syserr(); + fetch_syserr(); return (-1); } errno = 0; @@ -407,7 +407,7 @@ if (r == -1) { if (errno == EINTR && fetchRestartCalls) continue; - _fetch_syserr(); + fetch_syserr(); return (-1); } } @@ -438,7 +438,7 @@ #define MIN_BUF_SIZE 1024 int -_fetch_getln(conn_t *conn) +fetch_getln(conn_t *conn) { char *tmp; size_t tmpsize; @@ -457,7 +457,7 @@ conn->buflen = 0; do { - len = _fetch_read(conn, &c, 1); + len = fetch_read(conn, &c, 1); if (len == -1) return (-1); if (len == 0) @@ -485,13 +485,13 @@ * Write to a connection w/ timeout */ ssize_t -_fetch_write(conn_t *conn, const char *buf, size_t len) +fetch_write(conn_t *conn, const char *buf, size_t len) { struct iovec iov; iov.iov_base = __DECONST(char *, buf); iov.iov_len = len; - return _fetch_writev(conn, &iov, 1); + return fetch_writev(conn, &iov, 1); } /* @@ -499,7 +499,7 @@ * Note: can modify the iovec. */ ssize_t -_fetch_writev(conn_t *conn, struct iovec *iov, int iovcnt) +fetch_writev(conn_t *conn, struct iovec *iov, int iovcnt) { struct timeval now, timeout, wait; fd_set writefds; @@ -525,7 +525,7 @@ } if (wait.tv_sec < 0) { errno = ETIMEDOUT; - _fetch_syserr(); + fetch_syserr(); return (-1); } errno = 0; @@ -547,7 +547,7 @@ if (wlen == 0) { /* we consider a short write a failure */ errno = EPIPE; - _fetch_syserr(); + fetch_syserr(); return (-1); } if (wlen < 0) { @@ -574,7 +574,7 @@ * Write a line of text to a connection w/ timeout */ int -_fetch_putln(conn_t *conn, const char *str, size_t len) +fetch_putln(conn_t *conn, const char *str, size_t len) { struct iovec iov[2]; int ret; @@ -585,9 +585,9 @@ iov[1].iov_base = __DECONST(char *, ENDL); iov[1].iov_len = sizeof(ENDL); if (len == 0) - ret = _fetch_writev(conn, &iov[1], 1); + ret = fetch_writev(conn, &iov[1], 1); else - ret = _fetch_writev(conn, iov, 2); + ret = fetch_writev(conn, iov, 2); if (ret == -1) return (-1); return (0); @@ -598,7 +598,7 @@ * Close connection */ int -_fetch_close(conn_t *conn) +fetch_close(conn_t *conn) { int ret; @@ -614,7 +614,7 @@ /*** Directory-related utility functions *************************************/ int -_fetch_add_entry(struct url_ent **p, int *size, int *len, +fetch_add_entry(struct url_ent **p, int *size, int *len, const char *name, struct url_stat *us) { struct url_ent *tmp; @@ -628,7 +628,7 @@ tmp = realloc(*p, (*size * 2 + 1) * sizeof(**p)); if (tmp == NULL) { errno = ENOMEM; - _fetch_syserr(); + fetch_syserr(); return (-1); } *size = (*size * 2 + 1); @@ -649,7 +649,7 @@ /*** Authentication-related utility functions ********************************/ static const char * -_fetch_read_word(FILE *f) +fetch_read_word(FILE *f) { static char word[1024]; @@ -662,7 +662,7 @@ * Get authentication data for a URL from .netrc */ int -_fetch_netrc_auth(struct url *url) +fetch_netrc_auth(struct url *url) { char fn[PATH_MAX]; const char *word; @@ -671,7 +671,7 @@ if ((p = getenv("NETRC")) != NULL) { if (snprintf(fn, sizeof(fn), "%s", p) >= (int)sizeof(fn)) { - _fetch_info("$NETRC specifies a file name " + fetch_info("$NETRC specifies a file name " "longer than PATH_MAX"); return (-1); } @@ -689,39 +689,39 @@ if ((f = fopen(fn, "r")) == NULL) return (-1); - while ((word = _fetch_read_word(f)) != NULL) { + while ((word = fetch_read_word(f)) != NULL) { if (strcmp(word, "default") == 0) { - DEBUG(_fetch_info("Using default .netrc settings")); + DEBUG(fetch_info("Using default .netrc settings")); break; } if (strcmp(word, "machine") == 0 && - (word = _fetch_read_word(f)) != NULL && + (word = fetch_read_word(f)) != NULL && strcasecmp(word, url->host) == 0) { - DEBUG(_fetch_info("Using .netrc settings for %s", word)); + DEBUG(fetch_info("Using .netrc settings for %s", word)); break; } } if (word == NULL) goto ferr; - while ((word = _fetch_read_word(f)) != NULL) { + while ((word = fetch_read_word(f)) != NULL) { if (strcmp(word, "login") == 0) { - if ((word = _fetch_read_word(f)) == NULL) + if ((word = fetch_read_word(f)) == NULL) goto ferr; if (snprintf(url->user, sizeof(url->user), "%s", word) > (int)sizeof(url->user)) { - _fetch_info("login name in .netrc is too long"); + fetch_info("login name in .netrc is too long"); url->user[0] = '\0'; } } else if (strcmp(word, "password") == 0) { - if ((word = _fetch_read_word(f)) == NULL) + if ((word = fetch_read_word(f)) == NULL) goto ferr; if (snprintf(url->pwd, sizeof(url->pwd), "%s", word) > (int)sizeof(url->pwd)) { - _fetch_info("password in .netrc is too long"); + fetch_info("password in .netrc is too long"); url->pwd[0] = '\0'; } } else if (strcmp(word, "account") == 0) { - if ((word = _fetch_read_word(f)) == NULL) + if ((word = fetch_read_word(f)) == NULL) goto ferr; /* XXX not supported! */ } else { ==== //depot/projects/e500/lib/libfetch/common.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libfetch/common.h,v 1.28 2004/09/21 18:35:20 des Exp $ + * $FreeBSD: src/lib/libfetch/common.h,v 1.29 2007/12/14 10:26:58 des Exp $ */ #ifndef _COMMON_H_INCLUDED @@ -68,33 +68,33 @@ const char *string; }; -/* for _fetch_writev */ +/* for fetch_writev */ struct iovec; -void _fetch_seterr(struct fetcherr *, int); -void _fetch_syserr(void); -void _fetch_info(const char *, ...); -int _fetch_default_port(const char *); -int _fetch_default_proxy_port(const char *); -int _fetch_bind(int, int, const char *); -conn_t *_fetch_connect(const char *, int, int, int); -conn_t *_fetch_reopen(int); -conn_t *_fetch_ref(conn_t *); -int _fetch_ssl(conn_t *, int); -ssize_t _fetch_read(conn_t *, char *, size_t); -int _fetch_getln(conn_t *); -ssize_t _fetch_write(conn_t *, const char *, size_t); -ssize_t _fetch_writev(conn_t *, struct iovec *, int); -int _fetch_putln(conn_t *, const char *, size_t); -int _fetch_close(conn_t *); -int _fetch_add_entry(struct url_ent **, int *, int *, +void fetch_seterr(struct fetcherr *, int); +void fetch_syserr(void); +void fetch_info(const char *, ...); +int fetch_default_port(const char *); +int fetch_default_proxy_port(const char *); +int fetch_bind(int, int, const char *); +conn_t *fetch_connect(const char *, int, int, int); +conn_t *fetch_reopen(int); +conn_t *fetch_ref(conn_t *); +int fetch_ssl(conn_t *, int); +ssize_t fetch_read(conn_t *, char *, size_t); +int fetch_getln(conn_t *); +ssize_t fetch_write(conn_t *, const char *, size_t); +ssize_t fetch_writev(conn_t *, struct iovec *, int); +int fetch_putln(conn_t *, const char *, size_t); +int fetch_close(conn_t *); +int fetch_add_entry(struct url_ent **, int *, int *, const char *, struct url_stat *); -int _fetch_netrc_auth(struct url *url); +int fetch_netrc_auth(struct url *url); -#define _ftp_seterr(n) _fetch_seterr(_ftp_errlist, n) -#define _http_seterr(n) _fetch_seterr(_http_errlist, n) -#define _netdb_seterr(n) _fetch_seterr(_netdb_errlist, n) -#define _url_seterr(n) _fetch_seterr(_url_errlist, n) +#define ftp_seterr(n) fetch_seterr(ftp_errlist, n) +#define http_seterr(n) fetch_seterr(http_errlist, n) +#define netdb_seterr(n) fetch_seterr(netdb_errlist, n) +#define url_seterr(n) fetch_seterr(url_errlist, n) #ifndef NDEBUG #define DEBUG(x) do { if (fetchDebug) { x; } } while (0) @@ -103,7 +103,7 @@ #endif /* - * I don't really like exporting _http_request() and _ftp_request(), + * I don't really like exporting http_request() and ftp_request(), * but the HTTP and FTP code occasionally needs to cross-call * eachother, and this saves me from adding a lot of special-case code * to handle those cases. @@ -111,9 +111,9 @@ * Note that _*_request() free purl, which is way ugly but saves us a * whole lot of trouble. */ -FILE *_http_request(struct url *, const char *, +FILE *http_request(struct url *, const char *, struct url_stat *, struct url *, const char *); -FILE *_ftp_request(struct url *, const char *, +FILE *ftp_request(struct url *, const char *, struct url_stat *, struct url *, const char *); /* ==== //depot/projects/e500/lib/libfetch/fetch.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libfetch/fetch.c,v 1.38 2004/09/21 18:35:20 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libfetch/fetch.c,v 1.39 2007/12/14 10:26:58 des Exp $"); #include #include @@ -56,7 +56,7 @@ #define URL_MALFORMED 1 #define URL_BAD_SCHEME 2 #define URL_BAD_PORT 3 -static struct fetcherr _url_errlist[] = { +static struct fetcherr url_errlist[] = { { URL_MALFORMED, FETCH_URL, "Malformed URL" }, { URL_BAD_SCHEME, FETCH_URL, "Invalid URL scheme" }, { URL_BAD_PORT, FETCH_URL, "Invalid server port" }, @@ -89,7 +89,7 @@ return (fetchXGetHTTP(URL, us, flags)); else if (strcasecmp(URL->scheme, SCHEME_HTTPS) == 0) return (fetchXGetHTTP(URL, us, flags)); - _url_seterr(URL_BAD_SCHEME); + url_seterr(URL_BAD_SCHEME); return (NULL); } @@ -121,7 +121,7 @@ return (fetchPutHTTP(URL, flags)); else if (strcasecmp(URL->scheme, SCHEME_HTTPS) == 0) return (fetchPutHTTP(URL, flags)); - _url_seterr(URL_BAD_SCHEME); + url_seterr(URL_BAD_SCHEME); return (NULL); } @@ -147,7 +147,7 @@ return (fetchStatHTTP(URL, us, flags)); else if (strcasecmp(URL->scheme, SCHEME_HTTPS) == 0) return (fetchStatHTTP(URL, us, flags)); - _url_seterr(URL_BAD_SCHEME); + url_seterr(URL_BAD_SCHEME); return (-1); } @@ -169,7 +169,7 @@ return (fetchListHTTP(URL, flags)); else if (strcasecmp(URL->scheme, SCHEME_HTTPS) == 0) return (fetchListHTTP(URL, flags)); - _url_seterr(URL_BAD_SCHEME); + url_seterr(URL_BAD_SCHEME); return (NULL); } @@ -264,23 +264,23 @@ struct url *u; if (!scheme || (!host && !doc)) { - _url_seterr(URL_MALFORMED); + url_seterr(URL_MALFORMED); return (NULL); } if (port < 0 || port > 65535) { - _url_seterr(URL_BAD_PORT); + url_seterr(URL_BAD_PORT); return (NULL); } /* allocate struct url */ if ((u = calloc(1, sizeof(*u))) == NULL) { - _fetch_syserr(); + fetch_syserr(); return (NULL); } if ((u->doc = strdup(doc ? doc : "/")) == NULL) { - _fetch_syserr(); + fetch_syserr(); free(u); return (NULL); } @@ -311,7 +311,7 @@ /* allocate struct url */ if ((u = calloc(1, sizeof(*u))) == NULL) { - _fetch_syserr(); + fetch_syserr(); return (NULL); } @@ -373,7 +373,7 @@ u->port = u->port * 10 + (*q - '0'); else { /* invalid port */ - _url_seterr(URL_BAD_PORT); + url_seterr(URL_BAD_PORT); goto ouch; } p = q; @@ -390,7 +390,7 @@ /* percent-escape whitespace. */ if ((doc = malloc(strlen(p) * 3 + 1)) == NULL) { - _fetch_syserr(); + fetch_syserr(); goto ouch; } u->doc = doc; @@ -406,7 +406,7 @@ } *doc = '\0'; } else if ((u->doc = strdup(p)) == NULL) { - _fetch_syserr(); + fetch_syserr(); goto ouch; } ==== //depot/projects/e500/lib/libfetch/file.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libfetch/file.c,v 1.17 2004/09/21 18:35:20 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libfetch/file.c,v 1.18 2007/12/14 10:26:58 des Exp $"); #include #include @@ -50,11 +50,11 @@ f = fopen(u->doc, "r"); if (f == NULL) - _fetch_syserr(); + fetch_syserr(); if (u->offset && fseeko(f, u->offset, SEEK_SET) == -1) { fclose(f); - _fetch_syserr(); + fetch_syserr(); } return (f); @@ -77,25 +77,25 @@ f = fopen(u->doc, "w+"); if (f == NULL) - _fetch_syserr(); + fetch_syserr(); if (u->offset && fseeko(f, u->offset, SEEK_SET) == -1) { fclose(f); - _fetch_syserr(); + fetch_syserr(); } return (f); } static int -_fetch_stat_file(const char *fn, struct url_stat *us) +fetch_stat_file(const char *fn, struct url_stat *us) { struct stat sb; us->size = -1; us->atime = us->mtime = 0; if (stat(fn, &sb) == -1) { - _fetch_syserr(); + fetch_syserr(); return (-1); } us->size = sb.st_size; @@ -107,7 +107,7 @@ int fetchStatFile(struct url *u, struct url_stat *us, const char *flags __unused) { - return (_fetch_stat_file(u->doc, us)); + return (fetch_stat_file(u->doc, us)); } struct url_ent * @@ -122,7 +122,7 @@ int l; if ((dir = opendir(u->doc)) == NULL) { - _fetch_syserr(); + fetch_syserr(); return (NULL); } @@ -136,10 +136,10 @@ while ((de = readdir(dir)) != NULL) { strncpy(p, de->d_name, l - 1); p[l - 1] = 0; - if (_fetch_stat_file(fn, &us) == -1) + if (fetch_stat_file(fn, &us) == -1) /* should I return a partial result, or abort? */ break; - _fetch_add_entry(&ue, &size, &len, de->d_name, &us); + fetch_add_entry(&ue, &size, &len, de->d_name, &us); } return (ue); ==== //depot/projects/e500/lib/libfetch/ftp.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libfetch/ftp.c,v 1.96 2007/04/22 22:33:29 njl Exp $"); +__FBSDID("$FreeBSD: src/lib/libfetch/ftp.c,v 1.97 2007/12/14 10:26:58 des Exp $"); /* * Portions of this code were taken from or based on ftpio.c: @@ -135,16 +135,16 @@ * Get server response */ static int -_ftp_chkerr(conn_t *conn) +ftp_chkerr(conn_t *conn) { - if (_fetch_getln(conn) == -1) { - _fetch_syserr(); + if (fetch_getln(conn) == -1) { + fetch_syserr(); return (-1); } if (isftpinfo(conn->buf)) { while (conn->buflen && !isftpreply(conn->buf)) { - if (_fetch_getln(conn) == -1) { - _fetch_syserr(); + if (fetch_getln(conn) == -1) { + fetch_syserr(); return (-1); } } @@ -155,7 +155,7 @@ conn->buf[conn->buflen] = '\0'; if (!isftpreply(conn->buf)) { - _ftp_seterr(FTP_PROTOCOL_ERROR); + ftp_seterr(FTP_PROTOCOL_ERROR); return (-1); } @@ -170,7 +170,7 @@ * Send a command and check reply */ static int -_ftp_cmd(conn_t *conn, const char *fmt, ...) +ftp_cmd(conn_t *conn, const char *fmt, ...) { va_list ap; size_t len; @@ -183,26 +183,26 @@ if (msg == NULL) { errno = ENOMEM; - _fetch_syserr(); + fetch_syserr(); return (-1); } - r = _fetch_putln(conn, msg, len); + r = fetch_putln(conn, msg, len); free(msg); if (r == -1) { - _fetch_syserr(); + fetch_syserr(); return (-1); } - return (_ftp_chkerr(conn)); + return (ftp_chkerr(conn)); } /* * Return a pointer to the filename part of a path */ static const char * -_ftp_filename(const char *file, int *len, int *type) +ftp_filename(const char *file, int *len, int *type) { const char *s; @@ -225,7 +225,7 @@ * command. */ static int -_ftp_pwd(conn_t *conn, char *pwd, size_t pwdlen) +ftp_pwd(conn_t *conn, char *pwd, size_t pwdlen) { char *src, *dst, *end; int q; @@ -261,7 +261,7 @@ * file. */ static int -_ftp_cwd(conn_t *conn, const char *file) +ftp_cwd(conn_t *conn, const char *file) { const char *beg, *end; char pwd[PATH_MAX]; @@ -270,9 +270,9 @@ /* If no slashes in name, no need to change dirs. */ if ((end = strrchr(file, '/')) == NULL) return (0); - if ((e = _ftp_cmd(conn, "PWD")) != FTP_WORKING_DIRECTORY || - (e = _ftp_pwd(conn, pwd, sizeof(pwd))) != FTP_OK) { - _ftp_seterr(e); + if ((e = ftp_cmd(conn, "PWD")) != FTP_WORKING_DIRECTORY || + (e = ftp_pwd(conn, pwd, sizeof(pwd))) != FTP_OK) { + ftp_seterr(e); return (-1); } for (;;) { @@ -289,10 +289,10 @@ /* Keep going up a dir until we have a matching prefix. */ if (pwd[i] == '\0' && (file[i - 1] == '/' || file[i] == '/')) break; - if ((e = _ftp_cmd(conn, "CDUP")) != FTP_FILE_ACTION_OK || - (e = _ftp_cmd(conn, "PWD")) != FTP_WORKING_DIRECTORY || - (e = _ftp_pwd(conn, pwd, sizeof(pwd))) != FTP_OK) { - _ftp_seterr(e); + if ((e = ftp_cmd(conn, "CDUP")) != FTP_FILE_ACTION_OK || + (e = ftp_cmd(conn, "PWD")) != FTP_WORKING_DIRECTORY || + (e = ftp_pwd(conn, pwd, sizeof(pwd))) != FTP_OK) { + ftp_seterr(e); return (-1); } } @@ -307,7 +307,7 @@ return (0); /* Change to the directory all in one chunk (e.g., foo/bar/baz). */ - e = _ftp_cmd(conn, "CWD %.*s", (int)(end - beg), beg); + e = ftp_cmd(conn, "CWD %.*s", (int)(end - beg), beg); if (e == FTP_FILE_ACTION_OK) return (0); #endif /* FTP_COMBINE_CWDS */ @@ -318,9 +318,9 @@ ++beg, ++i; for (++i; file + i < end && file[i] != '/'; ++i) /* nothing */ ; - e = _ftp_cmd(conn, "CWD %.*s", file + i - beg, beg); + e = ftp_cmd(conn, "CWD %.*s", file + i - beg, beg); if (e != FTP_FILE_ACTION_OK) { - _ftp_seterr(e); + ftp_seterr(e); return (-1); } } @@ -331,7 +331,7 @@ * Set transfer mode and data type */ static int -_ftp_mode_type(conn_t *conn, int mode, int type) +ftp_mode_type(conn_t *conn, int mode, int type) { int e; @@ -344,7 +344,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Dec 14 23:22:08 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 163E916A469; Fri, 14 Dec 2007 23:22:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AD5C416A41A for ; Fri, 14 Dec 2007 23:22:07 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8BD6D13C448 for ; Fri, 14 Dec 2007 23:22:07 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBENM71h050461 for ; Fri, 14 Dec 2007 23:22:07 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBENM7Fn050454 for perforce@freebsd.org; Fri, 14 Dec 2007 23:22:07 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Dec 2007 23:22:07 GMT Message-Id: <200712142322.lBENM7Fn050454@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130908 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Dec 2007 23:22:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=130908 Change 130908 by jb@jb_freebsd1 on 2007/12/14 23:22:03 Branch the prototype BSD licensed libdwarf from the dtrace project (which tracks current) into the dtrace7 project which tracks RELENG_7. It's a tangled web we weave. :-) Affected files ... .. //depot/projects/dtrace7/src/lib/libdwarf/Makefile#1 branch .. //depot/projects/dtrace7/src/lib/libdwarf/_libdwarf.h#1 branch .. //depot/projects/dtrace7/src/lib/libdwarf/dwarf.h#1 branch .. //depot/projects/dtrace7/src/lib/libdwarf/dwarf_abbrev.c#1 branch .. //depot/projects/dtrace7/src/lib/libdwarf/dwarf_attr.c#1 branch .. //depot/projects/dtrace7/src/lib/libdwarf/dwarf_attrval.c#1 branch .. //depot/projects/dtrace7/src/lib/libdwarf/dwarf_cu.c#1 branch .. //depot/projects/dtrace7/src/lib/libdwarf/dwarf_dealloc.c#1 branch .. //depot/projects/dtrace7/src/lib/libdwarf/dwarf_die.c#1 branch .. //depot/projects/dtrace7/src/lib/libdwarf/dwarf_dump.c#1 branch .. //depot/projects/dtrace7/src/lib/libdwarf/dwarf_errmsg.c#1 branch .. //depot/projects/dtrace7/src/lib/libdwarf/dwarf_errno.c#1 branch .. //depot/projects/dtrace7/src/lib/libdwarf/dwarf_finish.c#1 branch .. //depot/projects/dtrace7/src/lib/libdwarf/dwarf_form.c#1 branch .. //depot/projects/dtrace7/src/lib/libdwarf/dwarf_init.c#1 branch .. //depot/projects/dtrace7/src/lib/libdwarf/dwarf_loc.c#1 branch .. //depot/projects/dtrace7/src/lib/libdwarf/libdwarf.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Fri Dec 14 23:24:10 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5FB5C16A41B; Fri, 14 Dec 2007 23:24:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F114B16A419 for ; Fri, 14 Dec 2007 23:24:09 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CFC1913C44B for ; Fri, 14 Dec 2007 23:24:09 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBENO9tX050969 for ; Fri, 14 Dec 2007 23:24:09 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBENO943050966 for perforce@freebsd.org; Fri, 14 Dec 2007 23:24:09 GMT (envelope-from jb@freebsd.org) Date: Fri, 14 Dec 2007 23:24:09 GMT Message-Id: <200712142324.lBENO943050966@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130909 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Dec 2007 23:24:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=130909 Change 130909 by jb@jb_freebsd1 on 2007/12/14 23:23:27 Build the BSD licensed libdwarf on RELENG_7 too. Affected files ... .. //depot/projects/dtrace7/src/lib/Makefile#3 edit Differences ... ==== //depot/projects/dtrace7/src/lib/Makefile#3 (text+ko) ==== @@ -30,7 +30,7 @@ ${_libypclnt} libalias libarchive ${_libatm} \ libbegemot ${_libbluetooth} libbsnmp libbz2 \ libcalendar libcam libcompat libdevinfo libdevstat libdisk \ - libedit libexpat libfetch libftpio libgeom ${_libgpib} \ + libdwarf libedit libexpat libfetch libftpio libgeom ${_libgpib} \ libgssapi libipsec \ ${_libipx} libkiconv libmagic libmemstat ${_libmilter} ${_libmp} \ ${_libncp} ${_libngatm} libopie libpam libpcap \ From owner-p4-projects@FreeBSD.ORG Fri Dec 14 23:59:49 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A698016A469; Fri, 14 Dec 2007 23:59:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 57B6416A418 for ; Fri, 14 Dec 2007 23:59:49 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3529D13C461 for ; Fri, 14 Dec 2007 23:59:49 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBENxn6o056601 for ; Fri, 14 Dec 2007 23:59:49 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBENxnfN056598 for perforce@freebsd.org; Fri, 14 Dec 2007 23:59:49 GMT (envelope-from marcel@freebsd.org) Date: Fri, 14 Dec 2007 23:59:49 GMT Message-Id: <200712142359.lBENxnfN056598@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 130912 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Dec 2007 23:59:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=130912 Change 130912 by marcel@marcel_cluster on 2007/12/14 23:59:48 IFC @130911 Affected files ... .. //depot/projects/e500/sys/conf/files.powerpc#9 integrate Differences ... ==== //depot/projects/e500/sys/conf/files.powerpc#9 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.powerpc,v 1.68 2007/12/14 23:00:15 marcel Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.69 2007/12/14 23:47:39 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -10,7 +10,7 @@ # font.h optional sc \ - compile-with "uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'u_char dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'u_char dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'u_char dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h" \ + compile-with "uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'u_char dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'u_char dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'u_char dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h" \ no-obj no-implicit-rule before-depend \ clean "font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8" # @@ -25,8 +25,8 @@ clean "opt_ah.h" # -crypto/blowfish/bf_enc.c optional crypto ipsec -crypto/des/des_enc.c optional crypto ipsec | netsmb +crypto/blowfish/bf_enc.c optional crypto | ipsec +crypto/des/des_enc.c optional crypto | ipsec | netsmb dev/fb/fb.c optional sc dev/hwpmc/hwpmc_powerpc.c optional hwpmc dev/kbd/kbd.c optional sc From owner-p4-projects@FreeBSD.ORG Sat Dec 15 00:02:54 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A2C616A419; Sat, 15 Dec 2007 00:02:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2CFE716A417 for ; Sat, 15 Dec 2007 00:02:54 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 07B3A13C43E for ; Sat, 15 Dec 2007 00:02:54 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBF02qd8057864 for ; Sat, 15 Dec 2007 00:02:52 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBF02qBe057859 for perforce@freebsd.org; Sat, 15 Dec 2007 00:02:52 GMT (envelope-from marcel@freebsd.org) Date: Sat, 15 Dec 2007 00:02:52 GMT Message-Id: <200712150002.lBF02qBe057859@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 130913 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Dec 2007 00:02:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=130913 Change 130913 by marcel@marcel_cluster on 2007/12/15 00:02:10 Diff reduction. Affected files ... .. //depot/projects/e500/sys/conf/files.powerpc#10 edit Differences ... ==== //depot/projects/e500/sys/conf/files.powerpc#10 (text+ko) ==== @@ -108,8 +108,8 @@ powerpc/powerpc/copystr.c standard powerpc/powerpc/cpu.c standard powerpc/powerpc/db_disasm.c optional ddb +powerpc/powerpc/db_hwwatch.c optional ddb powerpc/powerpc/db_interface.c optional ddb -powerpc/powerpc/db_hwwatch.c optional ddb powerpc/powerpc/db_trace.c optional ddb powerpc/powerpc/elf_machdep.c standard powerpc/powerpc/fpu.c optional aim From owner-p4-projects@FreeBSD.ORG Sat Dec 15 01:10:07 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7E2E816A476; Sat, 15 Dec 2007 01:10:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F0A0716A46B for ; Sat, 15 Dec 2007 01:10:06 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0431113C458 for ; Sat, 15 Dec 2007 01:10:06 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBF1A5l7081925 for ; Sat, 15 Dec 2007 01:10:05 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBF1A5ft081922 for perforce@freebsd.org; Sat, 15 Dec 2007 01:10:05 GMT (envelope-from jb@freebsd.org) Date: Sat, 15 Dec 2007 01:10:05 GMT Message-Id: <200712150110.lBF1A5ft081922@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130919 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Dec 2007 01:10:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=130919 Change 130919 by jb@jb_freebsd1 on 2007/12/15 01:09:46 Add a couple of definitions. Add code to libc's sysconf.c later. Affected files ... .. //depot/projects/dtrace7/src/include/unistd.h#2 edit Differences ... ==== //depot/projects/dtrace7/src/include/unistd.h#2 (text+ko) ==== @@ -296,6 +296,8 @@ /* Extensions found in Solaris and Linux. */ #define _SC_PHYS_PAGES 121 +#define _SC_NPROCESSORS_MAX 122 +#define _SC_CPUID_MAX 123 /* Keys for the confstr(3) function. */ #if __POSIX_VISIBLE >= 199209 From owner-p4-projects@FreeBSD.ORG Sat Dec 15 01:17:15 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C6E6816A473; Sat, 15 Dec 2007 01:17:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 480E116A469 for ; Sat, 15 Dec 2007 01:17:14 +0000 (UTC) (envelope-from qingli@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 24FC513C448 for ; Sat, 15 Dec 2007 01:17:14 +0000 (UTC) (envelope-from qingli@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBF1HEWl083245 for ; Sat, 15 Dec 2007 01:17:14 GMT (envelope-from qingli@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBF1HEWt083242 for perforce@freebsd.org; Sat, 15 Dec 2007 01:17:14 GMT (envelope-from qingli@freebsd.org) Date: Sat, 15 Dec 2007 01:17:14 GMT Message-Id: <200712150117.lBF1HEWt083242@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to qingli@freebsd.org using -f From: Qing Li To: Perforce Change Reviews Cc: Subject: PERFORCE change 130920 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Dec 2007 01:17:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=130920 Change 130920 by qingli@FreeBSD-newarp on 2007/12/15 01:17:05 Forgot to initialize the callout in a newly created nd6 entry, causing the kernel to crash when callout_reset() is called on that entry for transition to the STALE state. Affected files ... .. //depot/projects/arp-v2/src/sys/netinet6/nd6.c#3 edit Differences ... ==== //depot/projects/arp-v2/src/sys/netinet6/nd6.c#3 (text+ko) ==== @@ -804,8 +804,10 @@ if (create) flags |= LLE_CREATE; ln = lla_lookup(ifp, flags, (struct sockaddr *)&sin6); - if ((ln != NULL) && (flags & LLE_CREATE)) + if ((ln != NULL) && (flags & LLE_CREATE)) { ln->ln_state = ND6_LLINFO_NOSTATE; + callout_init(&ln->ln_timer_ch, 0); + } return (ln); } From owner-p4-projects@FreeBSD.ORG Sat Dec 15 01:37:37 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 43E1216A420; Sat, 15 Dec 2007 01:37:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D440116A417 for ; Sat, 15 Dec 2007 01:37:36 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B183A13C448 for ; Sat, 15 Dec 2007 01:37:36 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBF1badm086203 for ; Sat, 15 Dec 2007 01:37:36 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBF1baU6086200 for perforce@freebsd.org; Sat, 15 Dec 2007 01:37:36 GMT (envelope-from jb@freebsd.org) Date: Sat, 15 Dec 2007 01:37:36 GMT Message-Id: <200712150137.lBF1baU6086200@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130924 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Dec 2007 01:37:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=130924 Change 130924 by jb@jb_freebsd1 on 2007/12/15 01:37:24 Add the extra visibility definitions. Affected files ... .. //depot/projects/dtrace7/src/sys/sys/elf_common.h#2 edit Differences ... ==== //depot/projects/dtrace7/src/sys/sys/elf_common.h#2 (text+ko) ==== @@ -431,6 +431,9 @@ #define STV_INTERNAL 0x1 /* Special meaning in relocatable objects. */ #define STV_HIDDEN 0x2 /* Not visible. */ #define STV_PROTECTED 0x3 /* Visible but not preemptible. */ +#define STV_EXPORTED 0x4 +#define STV_SINGLETON 0x5 +#define STV_ELIMINATE 0x6 /* Special symbol table indexes. */ #define STN_UNDEF 0 /* Undefined symbol index. */ From owner-p4-projects@FreeBSD.ORG Sat Dec 15 02:30:33 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C30016A421; Sat, 15 Dec 2007 02:30:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0F84816A418 for ; Sat, 15 Dec 2007 02:30:33 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E352413C4F2 for ; Sat, 15 Dec 2007 02:30:32 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBF2UWFp094819 for ; Sat, 15 Dec 2007 02:30:32 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBF2UWc2094816 for perforce@freebsd.org; Sat, 15 Dec 2007 02:30:32 GMT (envelope-from jb@freebsd.org) Date: Sat, 15 Dec 2007 02:30:32 GMT Message-Id: <200712150230.lBF2UWc2094816@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130927 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Dec 2007 02:30:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=130927 Change 130927 by jb@jb_freebsd1 on 2007/12/15 02:29:50 MFdtrace Affected files ... .. //depot/projects/dtrace7/src/sys/kern/kern_linker.c#2 edit .. //depot/projects/dtrace7/src/sys/kern/linker_if.m#2 edit .. //depot/projects/dtrace7/src/sys/sys/linker.h#2 edit Differences ... ==== //depot/projects/dtrace7/src/sys/kern/kern_linker.c#2 (text+ko) ==== @@ -97,6 +97,12 @@ static struct sx kld_sx; /* kernel linker lock */ +/* + * Load counter used by clients to determine if a linker file has been + * re-loaded. This counter is incremented for each file load. + */ +static int loadcnt; + static linker_class_list_t classes; static linker_file_list_t linker_files; static int next_file_id = 1; @@ -534,7 +540,7 @@ KLD_LOCK_ASSERT(); filename = linker_basename(pathname); - KLD_DPF(FILE, ("linker_make_file: new file, filename=%s\n", filename)); + KLD_DPF(FILE, ("linker_make_file: new file, filename='%s' for pathname='%s'\n", filename, pathname)); lf = (linker_file_t)kobj_create((kobj_class_t)lc, M_LINKER, M_WAITOK); if (lf == NULL) return (NULL); @@ -542,9 +548,13 @@ lf->userrefs = 0; lf->flags = 0; lf->filename = linker_strdup(filename); + lf->pathname = linker_strdup(pathname); LINKER_GET_NEXT_FILE_ID(lf->id); lf->ndeps = 0; lf->deps = NULL; + lf->loadcnt = ++loadcnt; + lf->sdt_probes = NULL; + lf->sdt_nprobes = 0; STAILQ_INIT(&lf->common); TAILQ_INIT(&lf->modules); TAILQ_INSERT_TAIL(&linker_files, lf, link); @@ -629,6 +639,10 @@ free(file->filename, M_LINKER); file->filename = NULL; } + if (file->pathname) { + free(file->pathname, M_LINKER); + file->pathname = NULL; + } kobj_delete((kobj_t) file, M_LINKER); return (0); } @@ -676,6 +690,16 @@ return (error); } +/* + * List all functions in a file. + */ +int +linker_file_function_listall(linker_file_t lf, + int (*callback_func)(linker_file_t, linker_symval_t *, void *), void *arg) +{ + return (LINKER_EACH_FUNCTION_NAMEVAL(lf, callback_func, arg)); +} + caddr_t linker_file_lookup_symbol(linker_file_t file, const char *name, int deps) { @@ -920,7 +944,13 @@ lf = linker_find_file_by_id(fileid); if (lf) { KLD_DPF(FILE, ("kldunload: lf->userrefs=%d\n", lf->userrefs)); - if (lf->userrefs == 0) { + + /* Check if there are DTrace probes enabled on this file. */ + if (lf->nenabled > 0) { + printf("kldunload: attempt to unload file that has" + " DTrace probes enabled\n"); + error = EBUSY; + } else if (lf->userrefs == 0) { /* * XXX: maybe LINKER_UNLOAD_FORCE should override ? */ @@ -1041,15 +1071,18 @@ { struct kld_file_stat stat; linker_file_t lf; - int error, namelen; + int error, namelen, version, version_num; /* * Check the version of the user's structure. */ - error = copyin(uap->stat, &stat, sizeof(struct kld_file_stat)); - if (error) + if ((error = copyin(&uap->stat->version, &version, sizeof(version))) != 0) return (error); - if (stat.version != sizeof(struct kld_file_stat)) + if (version == sizeof(struct kld_file_stat_1)) + version_num = 1; + else if (version == sizeof(struct kld_file_stat)) + version_num = 2; + else return (EINVAL); #ifdef MAC @@ -1065,6 +1098,7 @@ return (ENOENT); } + /* Version 1 fields: */ namelen = strlen(lf->filename) + 1; if (namelen > MAXPATHLEN) namelen = MAXPATHLEN; @@ -1073,6 +1107,13 @@ stat.id = lf->id; stat.address = lf->address; stat.size = lf->size; + if (version_num > 1) { + /* Version 2 fields: */ + namelen = strlen(lf->pathname) + 1; + if (namelen > MAXPATHLEN) + namelen = MAXPATHLEN; + bcopy(lf->pathname, &stat.pathname[0], namelen); + } KLD_UNLOCK(); td->td_retval[0] = 0; ==== //depot/projects/dtrace7/src/sys/kern/linker_if.m#2 (text+ko) ==== @@ -64,6 +64,17 @@ }; # +# Call the callback with each specified function and it's value +# defined in the file. +# Stop and return the error if the callback returns an error. +# +METHOD int each_function_nameval { + linker_file_t file; + linker_function_nameval_callback_t callback; + void* opaque; +}; + +# # Search for a linker set in a file. Return a pointer to the first # entry (which is itself a pointer), and the number of entries. # "stop" points to the entry beyond the last valid entry. ==== //depot/projects/dtrace7/src/sys/sys/linker.h#2 (text+ko) ==== @@ -59,6 +59,8 @@ size_t size; } linker_symval_t; +typedef int (*linker_function_nameval_callback_t)(linker_file_t, linker_symval_t *, void *); + struct common_symbol { STAILQ_ENTRY(common_symbol) link; char* name; @@ -73,6 +75,7 @@ #define LINKER_FILE_LINKED 0x1 /* file has been fully linked */ TAILQ_ENTRY(linker_file) link; /* list of all loaded files */ char* filename; /* file which was loaded */ + char* pathname; /* file name with full path */ int id; /* unique id */ caddr_t address; /* load address */ size_t size; /* size of file */ @@ -81,6 +84,18 @@ STAILQ_HEAD(, common_symbol) common; /* list of common symbols */ TAILQ_HEAD(, module) modules; /* modules in this file */ TAILQ_ENTRY(linker_file) loaded; /* preload dependency support */ + int loadcnt; /* load counter value */ + + /* + * Function Boundary Tracing (FBT) or Statically Defined Tracing (SDT) + * fields. + */ + int nenabled; /* number of enabled probes. */ + int fbt_nentries; /* number of fbt entries created. */ + void *sdt_probes; + int sdt_nentries; + size_t sdt_nprobes; + size_t sdt_size; }; /* @@ -141,6 +156,12 @@ void *_start, void *_stop, int *_count); /* + * List all functions in a file. + */ +int linker_file_function_listall(linker_file_t, int (*)(linker_file_t, + linker_symval_t *, void *), void *); + +/* * Functions soley for use by the linker class handlers. */ int linker_add_class(linker_class_t _cls); @@ -245,15 +266,28 @@ #define ELF_RELOC_REL 1 #define ELF_RELOC_RELA 2 +/* + * This is version 1 of the KLD file status structure. It is identified + * by its _size_ in the version field. + */ +struct kld_file_stat_1 { + int version; /* set to sizeof(struct kld_file_stat_1) */ + char name[MAXPATHLEN]; + int refs; + int id; + caddr_t address; /* load address */ + size_t size; /* size in bytes */ +}; #endif /* _KERNEL */ struct kld_file_stat { - int version; /* set to sizeof(linker_file_stat) */ + int version; /* set to sizeof(struct kld_file_stat) */ char name[MAXPATHLEN]; int refs; int id; caddr_t address; /* load address */ size_t size; /* size in bytes */ + char pathname[MAXPATHLEN]; }; struct kld_sym_lookup { From owner-p4-projects@FreeBSD.ORG Sat Dec 15 02:49:54 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E2EEB16A469; Sat, 15 Dec 2007 02:49:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 92A6016A41B for ; Sat, 15 Dec 2007 02:49:53 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 74B4A13C468 for ; Sat, 15 Dec 2007 02:49:53 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBF2nrxN097478 for ; Sat, 15 Dec 2007 02:49:53 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBF2nrjD097475 for perforce@freebsd.org; Sat, 15 Dec 2007 02:49:53 GMT (envelope-from jb@freebsd.org) Date: Sat, 15 Dec 2007 02:49:53 GMT Message-Id: <200712150249.lBF2nrjD097475@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130928 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Dec 2007 02:49:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=130928 Change 130928 by jb@jb_freebsd1 on 2007/12/15 02:48:57 MFdtrace Affected files ... .. //depot/projects/dtrace7/src/lib/libelf/elf_strptr.c#2 edit .. //depot/projects/dtrace7/src/lib/libelf/libelf_align.c#2 edit .. //depot/projects/dtrace7/src/lib/libelf/libelf_data.c#2 edit .. //depot/projects/dtrace7/src/lib/libelf/libelf_xlate.c#2 edit Differences ... ==== //depot/projects/dtrace7/src/lib/libelf/elf_strptr.c#2 (text+ko) ==== @@ -55,7 +55,7 @@ gelf_getshdr(s, &shdr) == NULL) return (NULL); - if (shdr.sh_type != SHT_STRTAB || + if (/*shdr.sh_type != SHT_STRTAB || */ offset >= shdr.sh_size) { LIBELF_SET_ERROR(ARGUMENT, 0); return (NULL); ==== //depot/projects/dtrace7/src/lib/libelf/libelf_align.c#2 (text+ko) ==== @@ -122,7 +122,7 @@ #endif [ELF_T_MOVEP] = UNSUPPORTED(), #if __FreeBSD_version >= 700025 - [ELF_T_NOTE] = FALIGN(4,4), + [ELF_T_NOTE] = FALIGN(1,1), #endif [ELF_T_OFF] = FALIGN(4,8), [ELF_T_PHDR] = FALIGN(4,8), ==== //depot/projects/dtrace7/src/lib/libelf/libelf_data.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libelf/libelf_data.c,v 1.2 2006/12/18 05:36:23 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/lib/libelf/libelf_data.c,v 1.3 2007/11/23 11:29:36 jkoshy Exp $"); #include #include @@ -72,7 +72,7 @@ case SHT_GNU_verneed: /* == SHT_SUNW_verneed */ return (ELF_T_VNEED); case SHT_GNU_versym: /* == SHT_SUNW_versym */ - return (-1); /* XXX */ + return (ELF_T_HALF); case SHT_SUNW_move: return (ELF_T_MOVE); case SHT_SUNW_syminfo: ==== //depot/projects/dtrace7/src/lib/libelf/libelf_xlate.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libelf/libelf_xlate.c,v 1.2 2006/12/24 09:45:10 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/lib/libelf/libelf_xlate.c,v 1.3 2007/11/26 03:09:33 jkoshy Exp $"); #include #include @@ -68,8 +68,7 @@ return (NULL); } - if (src->d_buf == NULL || dst->d_buf == NULL || - src->d_size == 0) { + if (src->d_buf == NULL || dst->d_buf == NULL) { LIBELF_SET_ERROR(DATA, 0); return (NULL); } @@ -79,8 +78,8 @@ return (NULL); } - if ((fsz = (elfclass == ELFCLASS32 ? elf32_fsize : elf64_fsize)(src->d_type, - (size_t) 1, src->d_version)) == 0) + if ((fsz = (elfclass == ELFCLASS32 ? elf32_fsize : elf64_fsize) + (src->d_type, (size_t) 1, src->d_version)) == 0) return (NULL); msz = _libelf_msize(src->d_type, elfclass, src->d_version); @@ -133,8 +132,8 @@ dst->d_type = src->d_type; dst->d_size = dsz; - if (db == sb && encoding == LIBELF_PRIVATE(byteorder) && - fsz == msz) + if (src->d_size == 0 || + (db == sb && encoding == LIBELF_PRIVATE(byteorder) && fsz == msz)) return (dst); /* nothing more to do */ (_libelf_get_translator(src->d_type, direction, elfclass))(dst->d_buf, From owner-p4-projects@FreeBSD.ORG Sat Dec 15 03:20:29 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 99C0A16A41B; Sat, 15 Dec 2007 03:20:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 278B916A419 for ; Sat, 15 Dec 2007 03:20:29 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0AF1713C448 for ; Sat, 15 Dec 2007 03:20:29 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBF3KSEx003669 for ; Sat, 15 Dec 2007 03:20:28 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBF3KPq5003659 for perforce@freebsd.org; Sat, 15 Dec 2007 03:20:25 GMT (envelope-from marcel@freebsd.org) Date: Sat, 15 Dec 2007 03:20:25 GMT Message-Id: <200712150320.lBF3KPq5003659@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 130929 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Dec 2007 03:20:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=130929 Change 130929 by marcel@marcel_cluster on 2007/12/15 03:20:09 IFC @130911 Affected files ... .. //depot/projects/powerpc/Makefile#5 integrate .. //depot/projects/powerpc/contrib/amd/FREEBSD-Xlist#2 integrate .. //depot/projects/powerpc/contrib/amd/FREEBSD-upgrade#2 integrate .. //depot/projects/powerpc/contrib/gcc/fold-const.c#4 integrate .. //depot/projects/powerpc/contrib/pf/pflogd/pidfile.c#4 delete .. //depot/projects/powerpc/contrib/pf/pflogd/pidfile.h#4 delete .. //depot/projects/powerpc/etc/rc.d/ldconfig#4 integrate .. //depot/projects/powerpc/games/fortune/datfiles/fortunes#9 integrate .. //depot/projects/powerpc/games/fortune/datfiles/fortunes-o.real#6 integrate .. //depot/projects/powerpc/include/complex.h#2 integrate .. //depot/projects/powerpc/include/nsswitch.h#2 integrate .. //depot/projects/powerpc/include/pthread_np.h#3 integrate .. //depot/projects/powerpc/lib/Makefile#7 integrate .. //depot/projects/powerpc/lib/libc/Versions.def#3 integrate .. //depot/projects/powerpc/lib/libc/gen/getgrent.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/getgrouplist.c#3 integrate .. //depot/projects/powerpc/lib/libc/locale/localeconv.c#2 integrate .. //depot/projects/powerpc/lib/libc/net/nsdispatch.c#3 integrate .. //depot/projects/powerpc/lib/libc/stdlib/grantpt.c#2 integrate .. //depot/projects/powerpc/lib/libc/stdlib/rand.c#3 integrate .. //depot/projects/powerpc/lib/libc/string/strtok.3#2 integrate .. //depot/projects/powerpc/lib/libc/string/strtok.c#2 integrate .. //depot/projects/powerpc/lib/libc/string/wcstok.c#2 integrate .. //depot/projects/powerpc/lib/libfetch/Makefile#3 integrate .. //depot/projects/powerpc/lib/libfetch/common.c#2 integrate .. //depot/projects/powerpc/lib/libfetch/common.h#2 integrate .. //depot/projects/powerpc/lib/libfetch/fetch.c#2 integrate .. //depot/projects/powerpc/lib/libfetch/file.c#2 integrate .. //depot/projects/powerpc/lib/libfetch/ftp.c#3 integrate .. //depot/projects/powerpc/lib/libfetch/http.c#3 integrate .. //depot/projects/powerpc/lib/libthr/pthread.map#4 integrate .. //depot/projects/powerpc/lib/libthr/thread/thr_mutex.c#7 integrate .. //depot/projects/powerpc/lib/libthr/thread/thr_private.h#6 integrate .. //depot/projects/powerpc/lib/msun/Makefile#5 integrate .. //depot/projects/powerpc/lib/msun/Symbol.map#4 integrate .. //depot/projects/powerpc/lib/msun/man/atan2.3#3 integrate .. //depot/projects/powerpc/lib/msun/man/hypot.3#3 integrate .. //depot/projects/powerpc/lib/msun/man/sqrt.3#3 integrate .. //depot/projects/powerpc/lib/msun/src/s_carg.c#1 branch .. //depot/projects/powerpc/lib/msun/src/s_cargf.c#1 branch .. //depot/projects/powerpc/sbin/ifconfig/ifconfig.8#12 integrate .. //depot/projects/powerpc/sbin/ifconfig/ifconfig.c#7 integrate .. //depot/projects/powerpc/sbin/natd/natd.8#2 integrate .. //depot/projects/powerpc/share/man/man4/nve.4#4 integrate .. //depot/projects/powerpc/share/man/man5/src.conf.5#9 integrate .. //depot/projects/powerpc/share/man/man7/build.7#3 integrate .. //depot/projects/powerpc/share/mk/bsd.own.mk#8 integrate .. //depot/projects/powerpc/sys/amd64/amd64/machdep.c#10 integrate .. //depot/projects/powerpc/sys/arm/arm/pmap.c#9 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_da.c#10 integrate .. //depot/projects/powerpc/sys/compat/freebsd32/freebsd32_misc.c#8 integrate .. //depot/projects/powerpc/sys/conf/files#18 integrate .. //depot/projects/powerpc/sys/conf/files.powerpc#11 integrate .. //depot/projects/powerpc/sys/dev/amr/amr.c#6 integrate .. //depot/projects/powerpc/sys/dev/amr/amr_cam.c#7 integrate .. //depot/projects/powerpc/sys/dev/amr/amr_pci.c#7 integrate .. //depot/projects/powerpc/sys/dev/amr/amrvar.h#4 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-all.h#10 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-chipset.c#9 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-dma.c#8 integrate .. //depot/projects/powerpc/sys/dev/ata/ata-lowlevel.c#4 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/hda/hdac.c#14 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/ich.c#11 integrate .. //depot/projects/powerpc/sys/dev/sound/pci/maestro.c#8 integrate .. //depot/projects/powerpc/sys/dev/usb/umass.c#8 integrate .. //depot/projects/powerpc/sys/dev/usb/usbdevs#14 integrate .. //depot/projects/powerpc/sys/fs/udf/udf_vfsops.c#7 integrate .. //depot/projects/powerpc/sys/i386/i386/machdep.c#14 integrate .. //depot/projects/powerpc/sys/kern/Makefile#6 integrate .. //depot/projects/powerpc/sys/kern/kern_resource.c#12 integrate .. //depot/projects/powerpc/sys/kern/sched_4bsd.c#9 integrate .. //depot/projects/powerpc/sys/kern/sched_ule.c#10 integrate .. //depot/projects/powerpc/sys/net/if.h#7 integrate .. //depot/projects/powerpc/sys/net/route.c#8 integrate .. //depot/projects/powerpc/sys/net/route.h#5 integrate .. //depot/projects/powerpc/sys/net80211/ieee80211_radiotap.h#4 integrate .. //depot/projects/powerpc/sys/netgraph/ng_l2tp.c#4 integrate .. //depot/projects/powerpc/sys/netinet/if_ether.c#11 integrate .. //depot/projects/powerpc/sys/netinet/tcp_ofld.c#1 branch .. //depot/projects/powerpc/sys/netinet/tcp_ofld.h#1 branch .. //depot/projects/powerpc/sys/netinet/tcp_syncache.c#14 integrate .. //depot/projects/powerpc/sys/netinet/tcp_syncache.h#2 integrate .. //depot/projects/powerpc/sys/netinet/tcp_var.h#15 integrate .. //depot/projects/powerpc/sys/netinet/toedev.h#1 branch .. //depot/projects/powerpc/sys/netinet6/dest6.c#5 integrate .. //depot/projects/powerpc/sys/netinet6/frag6.c#6 integrate .. //depot/projects/powerpc/sys/netinet6/icmp6.c#10 integrate .. //depot/projects/powerpc/sys/netinet6/in6.c#11 integrate .. //depot/projects/powerpc/sys/netinet6/in6.h#7 integrate .. //depot/projects/powerpc/sys/netinet6/in6_cksum.c#6 integrate .. //depot/projects/powerpc/sys/netinet6/in6_gif.c#6 integrate .. //depot/projects/powerpc/sys/netinet6/in6_gif.h#4 integrate .. //depot/projects/powerpc/sys/netinet6/in6_ifattach.c#5 integrate .. //depot/projects/powerpc/sys/netinet6/in6_ifattach.h#4 integrate .. //depot/projects/powerpc/sys/netinet6/in6_pcb.c#7 integrate .. //depot/projects/powerpc/sys/netinet6/in6_pcb.h#6 integrate .. //depot/projects/powerpc/sys/netinet6/in6_proto.c#7 integrate .. //depot/projects/powerpc/sys/netinet6/in6_rmx.c#5 integrate .. //depot/projects/powerpc/sys/netinet6/in6_src.c#9 integrate .. //depot/projects/powerpc/sys/netinet6/in6_var.h#7 integrate .. //depot/projects/powerpc/sys/netinet6/ip6_ecn.h#4 integrate .. //depot/projects/powerpc/sys/netinet6/ip6_forward.c#6 integrate .. //depot/projects/powerpc/sys/netinet6/ip6_id.c#3 integrate .. //depot/projects/powerpc/sys/netinet6/ip6_input.c#9 integrate .. //depot/projects/powerpc/sys/netinet6/ip6_ipsec.c#3 integrate .. //depot/projects/powerpc/sys/netinet6/ip6_ipsec.h#3 integrate .. //depot/projects/powerpc/sys/netinet6/ip6_mroute.c#8 integrate .. //depot/projects/powerpc/sys/netinet6/ip6_mroute.h#6 integrate .. //depot/projects/powerpc/sys/netinet6/ip6_output.c#7 integrate .. //depot/projects/powerpc/sys/netinet6/ip6_var.h#7 integrate .. //depot/projects/powerpc/sys/netinet6/ip6protosw.h#5 integrate .. //depot/projects/powerpc/sys/netinet6/mld6.c#7 integrate .. //depot/projects/powerpc/sys/netinet6/mld6_var.h#4 integrate .. //depot/projects/powerpc/sys/netinet6/nd6.c#10 integrate .. //depot/projects/powerpc/sys/netinet6/nd6.h#4 integrate .. //depot/projects/powerpc/sys/netinet6/nd6_nbr.c#7 integrate .. //depot/projects/powerpc/sys/netinet6/nd6_rtr.c#7 integrate .. //depot/projects/powerpc/sys/netinet6/pim6.h#4 integrate .. //depot/projects/powerpc/sys/netinet6/pim6_var.h#4 integrate .. //depot/projects/powerpc/sys/netinet6/raw_ip6.c#8 integrate .. //depot/projects/powerpc/sys/netinet6/raw_ip6.h#4 integrate .. //depot/projects/powerpc/sys/netinet6/route6.c#6 integrate .. //depot/projects/powerpc/sys/netinet6/scope6.c#6 integrate .. //depot/projects/powerpc/sys/netinet6/scope6_var.h#4 integrate .. //depot/projects/powerpc/sys/netinet6/sctp6_usrreq.c#14 integrate .. //depot/projects/powerpc/sys/netinet6/sctp6_var.h#7 integrate .. //depot/projects/powerpc/sys/netinet6/tcp6_var.h#4 integrate .. //depot/projects/powerpc/sys/netinet6/udp6_usrreq.c#10 integrate .. //depot/projects/powerpc/sys/netinet6/udp6_var.h#6 integrate .. //depot/projects/powerpc/sys/powerpc/aim/clock.c#1 branch .. //depot/projects/powerpc/sys/powerpc/aim/copyinout.c#1 branch .. //depot/projects/powerpc/sys/powerpc/aim/interrupt.c#1 branch .. //depot/projects/powerpc/sys/powerpc/aim/locore.S#1 branch .. //depot/projects/powerpc/sys/powerpc/aim/machdep.c#1 branch .. //depot/projects/powerpc/sys/powerpc/aim/mmu_oea.c#1 branch .. //depot/projects/powerpc/sys/powerpc/aim/nexus.c#1 branch .. //depot/projects/powerpc/sys/powerpc/aim/ofw_machdep.c#1 branch .. //depot/projects/powerpc/sys/powerpc/aim/ofwmagic.S#1 branch .. //depot/projects/powerpc/sys/powerpc/aim/swtch.S#1 branch .. //depot/projects/powerpc/sys/powerpc/aim/trap.c#1 branch .. //depot/projects/powerpc/sys/powerpc/aim/trap_subr.S#1 branch .. //depot/projects/powerpc/sys/powerpc/aim/uio_machdep.c#1 branch .. //depot/projects/powerpc/sys/powerpc/aim/uma_machdep.c#1 branch .. //depot/projects/powerpc/sys/powerpc/aim/vm_machdep.c#1 branch .. //depot/projects/powerpc/sys/powerpc/powerpc/clock.c#7 delete .. //depot/projects/powerpc/sys/powerpc/powerpc/copyinout.c#3 delete .. //depot/projects/powerpc/sys/powerpc/powerpc/db_memrw.c#2 delete .. //depot/projects/powerpc/sys/powerpc/powerpc/interrupt.c#3 delete .. //depot/projects/powerpc/sys/powerpc/powerpc/locore.S#3 delete .. //depot/projects/powerpc/sys/powerpc/powerpc/machdep.c#13 delete .. //depot/projects/powerpc/sys/powerpc/powerpc/mmu_oea.c#4 delete .. //depot/projects/powerpc/sys/powerpc/powerpc/nexus.c#6 delete .. //depot/projects/powerpc/sys/powerpc/powerpc/ofw_machdep.c#9 delete .. //depot/projects/powerpc/sys/powerpc/powerpc/ofwmagic.S#2 delete .. //depot/projects/powerpc/sys/powerpc/powerpc/swtch.S#4 delete .. //depot/projects/powerpc/sys/powerpc/powerpc/trap.c#10 delete .. //depot/projects/powerpc/sys/powerpc/powerpc/trap_subr.S#3 delete .. //depot/projects/powerpc/sys/powerpc/powerpc/uio_machdep.c#3 delete .. //depot/projects/powerpc/sys/powerpc/powerpc/uma_machdep.c#3 delete .. //depot/projects/powerpc/sys/powerpc/powerpc/vm_machdep.c#10 delete .. //depot/projects/powerpc/sys/sys/kerneldump.h#3 integrate .. //depot/projects/powerpc/sys/sys/pcpu.h#9 integrate .. //depot/projects/powerpc/sys/sys/socket.h#8 integrate .. //depot/projects/powerpc/sys/vm/vm_page.c#13 integrate .. //depot/projects/powerpc/tools/build/options/WITHOUT_BZIP2#2 integrate .. //depot/projects/powerpc/tools/build/options/WITHOUT_GNU#2 integrate .. //depot/projects/powerpc/tools/build/options/WITHOUT_GSSAPI#1 branch .. //depot/projects/powerpc/tools/build/options/WITHOUT_KERBEROS#2 integrate .. //depot/projects/powerpc/tools/build/options/WITHOUT_KVM#2 integrate .. //depot/projects/powerpc/tools/build/options/WITHOUT_PAM#2 integrate .. //depot/projects/powerpc/tools/build/options/WITHOUT_TOOLCHAIN#3 integrate .. //depot/projects/powerpc/tools/build/options/makeman#3 integrate .. //depot/projects/powerpc/tools/tools/ath/athdebug/athdebug.c#3 integrate .. //depot/projects/powerpc/tools/tools/ath/athstats/Makefile#3 integrate .. //depot/projects/powerpc/tools/tools/ath/athstats/athstats.c#3 integrate .. //depot/projects/powerpc/tools/tools/ath/athstats/main.c#3 integrate .. //depot/projects/powerpc/tools/tools/ath/athstats/statfoo.c#3 integrate .. //depot/projects/powerpc/usr.bin/procstat/procstat_args.c#2 integrate .. //depot/projects/powerpc/usr.bin/procstat/procstat_bin.c#2 integrate .. //depot/projects/powerpc/usr.bin/procstat/procstat_cred.c#2 integrate .. //depot/projects/powerpc/usr.bin/procstat/procstat_files.c#2 integrate .. //depot/projects/powerpc/usr.bin/vmstat/Makefile#2 integrate .. //depot/projects/powerpc/usr.bin/vmstat/vmstat.8#2 integrate .. //depot/projects/powerpc/usr.bin/vmstat/vmstat.c#3 integrate .. //depot/projects/powerpc/usr.bin/xinstall/xinstall.c#2 integrate .. //depot/projects/powerpc/usr.sbin/syslogd/syslogd.c#3 integrate Differences ... ==== //depot/projects/powerpc/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.342 2007/10/18 08:41:52 delphij Exp $ +# $FreeBSD: src/Makefile,v 1.344 2007/12/13 00:08:02 imp Exp $ # # The user-driven targets are: # @@ -234,17 +234,18 @@ PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \ PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \ then \ - (cd ${.CURDIR} && make make); \ + (cd ${.CURDIR} && ${MAKE} make); \ fi # # Upgrade make(1) to the current version using the installed -# headers, libraries and tools. +# headers, libraries and tools. Also, allow the location of +# the system bsdmake-like utility to be overridden. # MMAKEENV= MAKEOBJDIRPREFIX=${MAKEPATH} \ DESTDIR= \ INSTALL="sh ${.CURDIR}/tools/install.sh" -MMAKE= ${MMAKEENV} make \ +MMAKE= ${MMAKEENV} ${MAKE} \ -D_UPGRADING \ -DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \ -DNO_CPU_CFLAGS -DNO_WERROR ==== //depot/projects/powerpc/contrib/amd/FREEBSD-Xlist#2 (text+ko) ==== @@ -1,7 +1,8 @@ -$FreeBSD: src/contrib/amd/FREEBSD-Xlist,v 1.5 2004/07/06 12:52:27 mbr Exp $ +$FreeBSD: src/contrib/amd/FREEBSD-Xlist,v 1.6 2007/12/11 19:15:17 obrien Exp $ *LSM.am-utils *Makefile.* *README.autofs +*README.osx *ac*.m4 *.old *acconfig.h @@ -15,6 +16,7 @@ *missing *mkinstalldirs *stamp-h.in +*amd/test1.sh *amd/Makefile.* *amq/Makefile.* *commit @@ -38,10 +40,13 @@ *conf/fh_dref/fh_dref_sunos3.h *conf/fh_dref/fh_dref_sunos4.h *conf/fh_dref/fh_dref_svr4.h +*conf/hn_dref/hn_dref_default.h, *conf/hn_dref/hn_dref_isc3.h *conf/hn_dref/hn_dref_linux.h *conf/mount/mount_aix.c +*conf/mount/mount_aix3.c *conf/mount/mount_bsdi3.c +*conf/mount/mount_default.c *conf/mount/mount_freebsd3.c *conf/mount/mount_hpux.c *conf/mount/mount_irix5.c @@ -54,6 +59,7 @@ *conf/mtab/mtab_aix.c *conf/mtab/mtab_file.c *conf/mtab/mtab_isc3.c +*conf/mtab/mtab_linux.c *conf/mtab/mtab_mach3.c *conf/mtab/mtab_osf.c *conf/mtab/mtab_svr4.c @@ -63,6 +69,7 @@ *conf/nfs_prot/nfs_prot_aix4_2.h *conf/nfs_prot/nfs_prot_aix4_3.h *conf/nfs_prot/nfs_prot_aix5_1.h +*conf/nfs_prot/nfs_prot_aix5_2.h *conf/nfs_prot/nfs_prot_bsdi2.h *conf/nfs_prot/nfs_prot_bsdi3.h *conf/nfs_prot/nfs_prot_darwin.h @@ -92,6 +99,12 @@ *conf/nfs_prot/nfs_prot_sunos5_8.h *conf/nfs_prot/nfs_prot_svr4.h *conf/nfs_prot/nfs_prot_ultrix.h +*conf/autofs/autofs_linux.h +*conf/autofs/autofs_linux.c +*conf/autofs/autofs_solaris_v1.h +*conf/autofs/autofs_solaris_v1.c +*conf/autofs/autofs_solaris_v2_v3.h +*conf/autofs/autofs_solaris_v2_v3.c *conf/sa_dref/sa_dref_386bsd.h *conf/sa_dref/sa_dref_aix3.h *conf/sa_dref/sa_dref_aoi.h @@ -103,6 +116,7 @@ *conf/trap/trap_aix3.h *conf/trap/trap_aux.h *conf/trap/trap_dgux.h +*conf/trap/trap_freebsd3.h *conf/trap/trap_hcx.h *conf/trap/trap_hpux.h *conf/trap/trap_hpux11.h @@ -115,7 +129,9 @@ *conf/trap/trap_stellix.h *conf/trap/trap_svr4.h *conf/trap/trap_ultrix.h +*conf/umount/umount_aix.c *conf/umount/umount_default.c +*conf/umount/umount_linux.c *conf/umount/umount_osf.c *doc/Makefile.am *doc/Makefile.in @@ -135,11 +151,118 @@ *fsinfo/Makefile.* *hlfsd/Makefile.* *libamu/Makefile.* +*libamu/alloca.c *libamu/clnt_sperrno.c *libamu/memcmp.c *libamu/strcasecmp.c *libamu/strdup.c *libamu/strstr.c +*libamu/strlcat.c +*libamu/strlcpy.c *libamu/ualarm.c *mk-amd-map/Makefile.* *wire-test/Makefile.* +*m4/GNUmakefile +*m4/amdgrep* +*m4/amindent* +*m4/autopat* +*m4/chop-aclocal.pl* +*m4/copy-if-newbig* +*m4/mk-aclocal* +*m4/mkconf* +*m4/rmtspc* +*m4/update_build_version* +*m4/macros/HEADER +*m4/macros/TRAILER +*m4/macros/c_void_p.m4 +*m4/macros/cache_check_dynamic.m4 +*m4/macros/check_amu_fs.m4 +*m4/macros/check_checkmount_style.m4 +*m4/macros/check_extern.m4 +*m4/macros/check_fhandle.m4 +*m4/macros/check_field.m4 +*m4/macros/check_fs_headers.m4 +*m4/macros/check_fs_mntent.m4 +*m4/macros/check_gnu_getopt.m4 +*m4/macros/check_hide_mount_type.m4 +*m4/macros/check_lib2.m4 +*m4/macros/check_map_funcs.m4 +*m4/macros/check_mnt2_cdfs_opt.m4 +*m4/macros/check_mnt2_gen_opt.m4 +*m4/macros/check_mnt2_nfs_opt.m4 +*m4/macros/check_mnttab_file_name.m4 +*m4/macros/check_mnttab_location.m4 +*m4/macros/check_mnttab_opt.m4 +*m4/macros/check_mnttab_style.m4 +*m4/macros/check_mnttab_type.m4 +*m4/macros/check_mount_style.m4 +*m4/macros/check_mount_trap.m4 +*m4/macros/check_mount_type.m4 +*m4/macros/check_mtype_printf_type.m4 +*m4/macros/check_mtype_type.m4 +*m4/macros/check_network_transport_type.m4 +*m4/macros/check_nfs_fh_dref.m4 +*m4/macros/check_nfs_hn_dref.m4 +*m4/macros/check_nfs_prot_headers.m4 +*m4/macros/check_nfs_sa_dref.m4 +*m4/macros/check_nfs_socket_connection.m4 +*m4/macros/check_os_libs.m4 +*m4/macros/check_restartable_signal_handler.m4 +*m4/macros/check_umount_style.m4 +*m4/macros/check_unmount_args.m4 +*m4/macros/check_unmount_call.m4 +*m4/macros/expand_cpp_hex.m4 +*m4/macros/expand_cpp_int.m4 +*m4/macros/expand_cpp_string.m4 +*m4/macros/expand_run_string.m4 +*m4/macros/extern_optarg.m4 +*m4/macros/extern_sys_errlist.m4 +*m4/macros/field_mntent_t_mnt_time_string.m4 +*m4/macros/func_bad_memcmp.m4 +*m4/macros/func_bad_yp_all.m4 +*m4/macros/header_templates.m4 +*m4/macros/host_macros.m4 +*m4/macros/linux_headers.m4 +*m4/macros/localconfig.m4 +*m4/macros/mount_headers.m4 +*m4/macros/name_package.m4 +*m4/macros/name_version.m4 +*m4/macros/opt_amu_cflags.m4 +*m4/macros/opt_cppflags.m4 +*m4/macros/opt_debug.m4 +*m4/macros/opt_ldflags.m4 +*m4/macros/opt_libs.m4 +*m4/macros/os_cflags.m4 +*m4/macros/os_cppflags.m4 +*m4/macros/os_ldflags.m4 +*m4/macros/package_bugreport.m4 +*m4/macros/package_name.m4 +*m4/macros/package_version.m4 +*m4/macros/save_state.m4 +*m4/macros/struct_field_nfs_fh.m4 +*m4/macros/struct_mntent.m4 +*m4/macros/struct_mnttab.m4 +*m4/macros/struct_nfs_args.m4 +*m4/macros/struct_nfs_fh.m4 +*m4/macros/struct_nfs_fh3.m4 +*m4/macros/struct_nfs_gfs_mount.m4 +*m4/macros/try_compile_anyfs.m4 +*m4/macros/try_compile_nfs.m4 +*m4/macros/try_compile_rpc.m4 +*m4/macros/type_auth_create_gidlist.m4 +*m4/macros/type_cachefs_args.m4 +*m4/macros/type_cdfs_args.m4 +*m4/macros/type_efs_args.m4 +*m4/macros/type_lofs_args.m4 +*m4/macros/type_mfs_args.m4 +*m4/macros/type_pcfs_args.m4 +*m4/macros/type_recvfrom_fromlen.m4 +*m4/macros/type_rfs_args.m4 +*m4/macros/type_svc_in_arg.m4 +*m4/macros/type_time_t.m4 +*m4/macros/type_tmpfs_args.m4 +*m4/macros/type_ufs_args.m4 +*m4/macros/type_xdrproc_t.m4 +*m4/macros/type_xfs_args.m4 +*m4/macros/type_yp_order_outorder.m4 +*m4/macros/with_addon.m4 ==== //depot/projects/powerpc/contrib/amd/FREEBSD-upgrade#2 (text+ko) ==== @@ -1,21 +1,19 @@ # ex:ts=8 -$FreeBSD: src/contrib/amd/FREEBSD-upgrade,v 1.15 2004/05/14 13:29:48 mbr Exp $ +$FreeBSD: src/contrib/amd/FREEBSD-upgrade,v 1.16 2007/12/11 19:16:51 obrien Exp $ -AMD (am-utils) 6.0.9 - originals can be found at: ftp://shekel.mcl.cs.columbia.edu/pub/am-utils/ - (http://www.cs.columbia.edu/~ezk/am-utils/index.html) - +AMD (am-utils) 6.1.5 + originals can be found at: ftp://ftp.am-utils.org/pub/am-utils/ For the import of AMD many files were pruned by: - tar -X FREEBSD-Xlist -xzf am-utils-6.0.9.tar.gz + tar -X FREEBSD-Xlist -xf am-utils-6.1.5.tar.gz and `find . -name '.cvsignore' -delete` Then imported by: - cvs import -m 'Virgin import of AMD (am-utils) v6.0.9' \ - src/contrib/amd COLUMBIA amd_6_0_9 + cvs import -m 'Virgin import of AMD (am-utils) v6.1.5' \ + src/contrib/amd COLUMBIA amd_6_1_5 After the import, a separate extraction of am-utils was GNU configured in the "normal" way. The resulting config.h file should be compared with @@ -25,8 +23,11 @@ To make local changes to amd, simply patch and commit to the main branch (aka HEAD). Never make local changes on the vendor (COLUMBIA) branch. -All local changes should be submitted to "amd-dev@majordomo.cs.columbia.edu" -for inclusion in the next vendor release. +Note, we don't trim anything in scripts/ as sysadmins may find the bits +as a useful reference. + +All local changes should be submitted to "am-utils@am-utils.org" or +https://bugzilla.am-utils.org for inclusion in the next vendor release. Local changes: ==== //depot/projects/powerpc/contrib/gcc/fold-const.c#4 (text+ko) ==== @@ -5661,6 +5661,9 @@ } break; } + /* If the constant is negative, we cannot simplify this. */ + if (tree_int_cst_sgn (c) == -1) + break; /* FALLTHROUGH */ case NEGATE_EXPR: if ((t1 = extract_muldiv (op0, c, code, wide_type, strict_overflow_p)) ==== //depot/projects/powerpc/etc/rc.d/ldconfig#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ldconfig,v 1.18 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/ldconfig,v 1.19 2007/12/13 00:51:01 jhb Exp $ # # PROVIDE: ldconfig @@ -49,8 +49,14 @@ fi fi done - echo '32-bit compatibility ldconfig path:' ${ldconfig32_paths} - ${ldconfig} -32 -m ${_ins} ${ldconfig32_paths} + _LDC="" + for i in ${ldconfig32_paths}; do + if [ -r "${i}" ]; then + _LDC="${_LDC} ${i}" + fi + done + echo '32-bit compatibility ldconfig path:' ${_LDC} + ${ldconfig} -32 -m ${_ins} ${_LDC} ;; esac ==== //depot/projects/powerpc/games/fortune/datfiles/fortunes#9 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.249 2007/12/09 01:00:11 dougb Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.250 2007/12/14 01:47:11 wes Exp $ % ======================================================================= || || @@ -56259,6 +56259,9 @@ % Where am I? Who am I? Am I? I % +Where am I, and what am I doing in this handbasket? + -- Mark A. Matthews, to Wes Peters, circa 1996 +% Where are the calculations that go with a calculated risk? % WHERE CAN THE MATTER BE ==== //depot/projects/powerpc/games/fortune/datfiles/fortunes-o.real#6 (text+ko) ==== @@ -1,4 +1,4 @@ -%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.28 2007/12/09 01:00:11 dougb Exp $ +%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.29 2007/12/14 21:58:58 des Exp $ % PLAYGIRL, Inc. Philadelphia, Pa. 19369 @@ -755,7 +755,7 @@ "What is amiss, my friend?" asked the king. "My lord," gasped Lancelot, "you have given me the wrong key!" % - "Before we get married," said the young woman to her fiancee, + "Before we get married," said the young woman to her fiance, "I want to confess some affairs that I've had in the past." "But you told me all about those a few weeks ago," her young man replied. ==== //depot/projects/powerpc/include/complex.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/complex.h,v 1.6 2004/08/14 18:03:21 stefanf Exp $ + * $FreeBSD: src/include/complex.h,v 1.7 2007/12/12 23:43:51 das Exp $ */ #ifndef _COMPLEX_H @@ -45,6 +45,8 @@ double cabs(double complex); float cabsf(float complex); +double carg(double complex); +float cargf(float complex); double cimag(double complex); float cimagf(float complex); long double cimagl(long double complex); ==== //depot/projects/powerpc/include/nsswitch.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: nsswitch.h,v 1.6 1999/01/26 01:04:07 lukem Exp $ */ -/* $FreeBSD: src/include/nsswitch.h,v 1.4 2006/04/28 12:03:34 ume Exp $ */ +/* $FreeBSD: src/include/nsswitch.h,v 1.5 2007/12/12 10:08:02 bushman Exp $ */ /*- * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc. @@ -68,7 +68,8 @@ #define NSSRC_DNS "dns" /* DNS; IN for hosts, HS for others */ #define NSSRC_NIS "nis" /* YP/NIS */ #define NSSRC_COMPAT "compat" /* passwd,group in YP compat mode */ -#define NSSRC_CACHE "cache" /* cache daemon */ +#define NSSRC_CACHE "cache" /* nscd daemon */ +#define NSSRC_FALLBACK "__fallback" /* internal fallback source */ /* * currently implemented databases @@ -132,6 +133,7 @@ */ #define NS_FILES_CB(F,C) { NSSRC_FILES, F, C }, #define NS_COMPAT_CB(F,C) { NSSRC_COMPAT, F, C }, +#define NS_FALLBACK_CB(F) { NSSRC_FALLBACK, F, NULL }, #ifdef HESIOD # define NS_DNS_CB(F,C) { NSSRC_DNS, F, C }, ==== //depot/projects/powerpc/include/pthread_np.h#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/pthread_np.h,v 1.17 2007/10/29 00:31:54 imp Exp $ + * $FreeBSD: src/include/pthread_np.h,v 1.18 2007/12/14 06:25:56 davidxu Exp $ */ #ifndef _PTHREAD_NP_H_ #define _PTHREAD_NP_H_ @@ -49,6 +49,10 @@ void pthread_resume_all_np(void); int pthread_resume_np(pthread_t); void pthread_set_name_np(pthread_t, const char *); +int pthread_mutex_getspinloops_np(pthread_mutex_t *mutex, int *count); +int pthread_mutex_setspinloops_np(pthread_mutex_t *mutex, int count); +int pthread_mutex_getyieldloops_np(pthread_mutex_t *mutex, int *count); +int pthread_mutex_setyieldloops_np(pthread_mutex_t *mutex, int count); int pthread_single_np(void); void pthread_suspend_all_np(void); int pthread_suspend_np(pthread_t); ==== //depot/projects/powerpc/lib/Makefile#7 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.226 2007/11/17 21:29:02 cognet Exp $ +# $FreeBSD: src/lib/Makefile,v 1.228 2007/12/12 16:39:31 ru Exp $ .include @@ -31,7 +31,7 @@ libbegemot ${_libbluetooth} libbsnmp libbz2 \ libcalendar libcam libcompat libdevinfo libdevstat libdisk \ libedit libexpat libfetch libftpio libgeom ${_libgpib} \ - libgssapi libipsec \ + ${_libgssapi} libipsec \ ${_libipx} libkiconv libmagic libmemstat ${_libmilter} ${_libmp} \ ${_libncp} ${_libngatm} libopie libpam libpcap \ libpmc ${_libkse} librt ${_libsdp} ${_libsm} ${_libsmb} \ @@ -62,6 +62,10 @@ _libsdp= libsdp .endif +.if ${MK_GSSAPI} != "no" +_libgssapi= libgssapi +.endif + .if ${MK_IPX} != "no" _libipx= libipx .endif ==== //depot/projects/powerpc/lib/libc/Versions.def#3 (text) ==== @@ -1,9 +1,14 @@ -# $FreeBSD: src/lib/libc/Versions.def,v 1.3 2007/04/29 16:14:17 kan Exp $ +# $FreeBSD: src/lib/libc/Versions.def,v 1.4 2007/12/14 20:49:06 deischen Exp $ # This is our first version; it depends on no other. +# This version was first added to 7.0-current. FBSD_1.0 { }; +# This version was first added to 8.0-current. +FBSD_1.1 { +} FBSD_1.0; + # This is our private namespace. Any global interfaces that are # strictly for use only by other FreeBSD applications and libraries # are listed here. We use a separate namespace so we can write ==== //depot/projects/powerpc/lib/libc/gen/getgrent.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ * */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.36 2006/09/18 09:34:48 maxim Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.37 2007/12/12 10:08:02 bushman Exp $"); #include "namespace.h" #include @@ -40,6 +40,7 @@ #include #include #endif +#include #include #include #ifdef HESIOD @@ -143,6 +144,9 @@ static int compat_setgrent(void *, void *, va_list); static int compat_group(void *, void *, va_list); +static int gr_addgid(gid_t, gid_t *, int, int *); +static int getgroupmembership_fallback(void *, void *, va_list); + #ifdef NS_CACHING static int grp_id_func(char *, size_t *, va_list, void *); static int grp_marshal_func(char *, size_t *, void *, va_list, void *); @@ -361,89 +365,195 @@ NSS_MP_CACHE_HANDLING(group); #endif /* NS_CACHING */ - -/* XXX IEEE Std 1003.1, 2003 specifies `void setgrent(void)' */ -int -setgrent(void) -{ #ifdef NS_CACHING - static const nss_cache_info cache_info = NS_MP_CACHE_INFO_INITIALIZER( - group, (void *)nss_lt_all, - NULL, NULL); +static const nss_cache_info setgrent_cache_info = NS_MP_CACHE_INFO_INITIALIZER( + group, (void *)nss_lt_all, + NULL, NULL); #endif - static const ns_dtab dtab[] = { - { NSSRC_FILES, files_setgrent, (void *)SETGRENT }, +static const ns_dtab setgrent_dtab[] = { + { NSSRC_FILES, files_setgrent, (void *)SETGRENT }, #ifdef HESIOD - { NSSRC_DNS, dns_setgrent, (void *)SETGRENT }, + { NSSRC_DNS, dns_setgrent, (void *)SETGRENT }, #endif #ifdef YP - { NSSRC_NIS, nis_setgrent, (void *)SETGRENT }, + { NSSRC_NIS, nis_setgrent, (void *)SETGRENT }, #endif - { NSSRC_COMPAT, compat_setgrent, (void *)SETGRENT }, + { NSSRC_COMPAT, compat_setgrent, (void *)SETGRENT }, #ifdef NS_CACHING - NS_CACHE_CB(&cache_info) + NS_CACHE_CB(&setgrent_cache_info) #endif - { NULL, NULL, NULL } - }; - (void)_nsdispatch(NULL, dtab, NSDB_GROUP, "setgrent", defaultsrc, 0); - return (1); -} - + { NULL, NULL, NULL } +}; -int -setgroupent(int stayopen) -{ #ifdef NS_CACHING - static const nss_cache_info cache_info = NS_MP_CACHE_INFO_INITIALIZER( - group, (void *)nss_lt_all, - NULL, NULL); +static const nss_cache_info endgrent_cache_info = NS_MP_CACHE_INFO_INITIALIZER( + group, (void *)nss_lt_all, + NULL, NULL); #endif - static const ns_dtab dtab[] = { - { NSSRC_FILES, files_setgrent, (void *)SETGRENT }, +static const ns_dtab endgrent_dtab[] = { + { NSSRC_FILES, files_setgrent, (void *)ENDGRENT }, #ifdef HESIOD - { NSSRC_DNS, dns_setgrent, (void *)SETGRENT }, + { NSSRC_DNS, dns_setgrent, (void *)ENDGRENT }, #endif #ifdef YP - { NSSRC_NIS, nis_setgrent, (void *)SETGRENT }, + { NSSRC_NIS, nis_setgrent, (void *)ENDGRENT }, #endif - { NSSRC_COMPAT, compat_setgrent, (void *)SETGRENT }, + { NSSRC_COMPAT, compat_setgrent, (void *)ENDGRENT }, #ifdef NS_CACHING - NS_CACHE_CB(&cache_info) + NS_CACHE_CB(&endgrent_cache_info) #endif - { NULL, NULL, NULL } - }; - (void)_nsdispatch(NULL, dtab, NSDB_GROUP, "setgrent", defaultsrc, - stayopen); - return (1); -} - + { NULL, NULL, NULL } +}; -void -endgrent(void) -{ #ifdef NS_CACHING - static const nss_cache_info cache_info = NS_MP_CACHE_INFO_INITIALIZER( - group, (void *)nss_lt_all, - NULL, NULL); +static const nss_cache_info getgrent_r_cache_info = NS_MP_CACHE_INFO_INITIALIZER( + group, (void *)nss_lt_all, + grp_marshal_func, grp_unmarshal_func); #endif - static const ns_dtab dtab[] = { - { NSSRC_FILES, files_setgrent, (void *)ENDGRENT }, +static const ns_dtab getgrent_r_dtab[] = { + { NSSRC_FILES, files_group, (void *)nss_lt_all }, #ifdef HESIOD - { NSSRC_DNS, dns_setgrent, (void *)ENDGRENT }, + { NSSRC_DNS, dns_group, (void *)nss_lt_all }, #endif #ifdef YP - { NSSRC_NIS, nis_setgrent, (void *)ENDGRENT }, + { NSSRC_NIS, nis_group, (void *)nss_lt_all }, #endif - { NSSRC_COMPAT, compat_setgrent, (void *)ENDGRENT }, + { NSSRC_COMPAT, compat_group, (void *)nss_lt_all }, #ifdef NS_CACHING - NS_CACHE_CB(&cache_info) + NS_CACHE_CB(&getgrent_r_cache_info) #endif - { NULL, NULL, NULL } + { NULL, NULL, NULL } +}; + +static int +gr_addgid(gid_t gid, gid_t *groups, int maxgrp, int *grpcnt) +{ + int ret, dupc; + + for (dupc = 0; dupc < MIN(maxgrp, *grpcnt); dupc++) { + if (groups[dupc] == gid) + return 1; + } + + ret = 1; + if (*grpcnt < maxgrp) + groups[*grpcnt] = gid; + else + ret = 0; + + (*grpcnt)++; + + return ret; +} + +static int +getgroupmembership_fallback(void *retval, void *mdata, va_list ap) +{ + const ns_src src[] = { + { mdata, NS_SUCCESS }, + { NULL, 0} }; - (void)_nsdispatch(NULL, dtab, NSDB_GROUP, "endgrent", defaultsrc); + struct group grp; + struct group *grp_p; + char *buf; + size_t bufsize; + const char *uname; + gid_t *groups; + gid_t agroup; + int maxgrp, *grpcnt; + int i, rv, ret_errno; + + /* + * As this is a fallback method, only provided src + * list will be respected during methods search. + */ + assert(src[0].name != NULL); + + uname = va_arg(ap, const char *); + agroup = va_arg(ap, gid_t); + groups = va_arg(ap, gid_t *); + maxgrp = va_arg(ap, int); + grpcnt = va_arg(ap, int *); + + rv = NS_UNAVAIL; + + buf = malloc(GRP_STORAGE_INITIAL); + if (buf == NULL) + goto out; + + bufsize = GRP_STORAGE_INITIAL; + + gr_addgid(agroup, groups, maxgrp, grpcnt); + + _nsdispatch(NULL, setgrent_dtab, NSDB_GROUP, "setgrent", src, 0); + for (;;) { + do { + ret_errno = 0; + grp_p = NULL; + rv = _nsdispatch(&grp_p, getgrent_r_dtab, NSDB_GROUP, + "getgrent_r", src, &grp, buf, bufsize, &ret_errno); + + if (grp_p == NULL && ret_errno == ERANGE) { + free(buf); + if ((bufsize << 1) > GRP_STORAGE_MAX) { + buf = NULL; + errno = ERANGE; + goto out; + } + + bufsize <<= 1; + buf = malloc(bufsize); + if (buf == NULL) { + goto out; + } + } + } while (grp_p == NULL && ret_errno == ERANGE); + + if (ret_errno != 0) { + errno = ret_errno; + goto out; + } + + if (grp_p == NULL) + break; + + for (i = 0; grp.gr_mem[i]; i++) { + if (strcmp(grp.gr_mem[i], uname) == 0) + gr_addgid(grp.gr_gid, groups, maxgrp, grpcnt); + } + } + + _nsdispatch(NULL, endgrent_dtab, NSDB_GROUP, "endgrent", src); +out: + free(buf); + return (rv); +} + +/* XXX IEEE Std 1003.1, 2003 specifies `void setgrent(void)' */ +int +setgrent(void) +{ + (void)_nsdispatch(NULL, setgrent_dtab, NSDB_GROUP, "setgrent", defaultsrc, 0); + return (1); +} + + +int +setgroupent(int stayopen) +{ + (void)_nsdispatch(NULL, setgrent_dtab, NSDB_GROUP, "setgrent", defaultsrc, + stayopen); + return (1); +} + + +void +endgrent(void) +{ + (void)_nsdispatch(NULL, endgrent_dtab, NSDB_GROUP, "endgrent", defaultsrc); } @@ -451,31 +561,11 @@ getgrent_r(struct group *grp, char *buffer, size_t bufsize, struct group **result) { -#ifdef NS_CACHING - static const nss_cache_info cache_info = NS_MP_CACHE_INFO_INITIALIZER( - group, (void *)nss_lt_all, - grp_marshal_func, grp_unmarshal_func); -#endif - - static const ns_dtab dtab[] = { - { NSSRC_FILES, files_group, (void *)nss_lt_all }, -#ifdef HESIOD - { NSSRC_DNS, dns_group, (void *)nss_lt_all }, -#endif -#ifdef YP - { NSSRC_NIS, nis_group, (void *)nss_lt_all }, -#endif - { NSSRC_COMPAT, compat_group, (void *)nss_lt_all }, -#ifdef NS_CACHING - NS_CACHE_CB(&cache_info) -#endif - { NULL, NULL, NULL } - }; int rv, ret_errno; ret_errno = 0; *result = NULL; - rv = _nsdispatch(result, dtab, NSDB_GROUP, "getgrent_r", defaultsrc, + rv = _nsdispatch(result, getgrent_r_dtab, NSDB_GROUP, "getgrent_r", defaultsrc, grp, buffer, bufsize, &ret_errno); if (rv == NS_SUCCESS) return (0); @@ -560,6 +650,30 @@ } + +int +__getgroupmembership(const char *uname, gid_t agroup, gid_t *groups, + int maxgrp, int *grpcnt) +{ + static const ns_dtab dtab[] = { + NS_FALLBACK_CB(getgroupmembership_fallback) + { NULL, NULL, NULL } + }; + int rv; + + assert(uname != NULL); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Dec 15 03:25:35 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0739116A421; Sat, 15 Dec 2007 03:25:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A509816A41B for ; Sat, 15 Dec 2007 03:25:34 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7267613C4CC for ; Sat, 15 Dec 2007 03:25:34 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBF3PY7a004796 for ; Sat, 15 Dec 2007 03:25:34 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBF3PYeN004792 for perforce@freebsd.org; Sat, 15 Dec 2007 03:25:34 GMT (envelope-from marcel@freebsd.org) Date: Sat, 15 Dec 2007 03:25:34 GMT Message-Id: <200712150325.lBF3PYeN004792@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 130930 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Dec 2007 03:25:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=130930 Change 130930 by marcel@marcel_cluster on 2007/12/15 03:24:50 Re-add what was lost. Affected files ... .. //depot/projects/powerpc/contrib/pf/pflogd/pidfile.c#5 add .. //depot/projects/powerpc/contrib/pf/pflogd/pidfile.h#5 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Dec 15 03:49:00 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C46E316A468; Sat, 15 Dec 2007 03:48:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 63BD616A417 for ; Sat, 15 Dec 2007 03:48:59 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4B77213C45A for ; Sat, 15 Dec 2007 03:48:59 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBF3mxjV007837 for ; Sat, 15 Dec 2007 03:48:59 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBF3mxgc007834 for perforce@freebsd.org; Sat, 15 Dec 2007 03:48:59 GMT (envelope-from marcel@freebsd.org) Date: Sat, 15 Dec 2007 03:48:59 GMT Message-Id: <200712150348.lBF3mxgc007834@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 130932 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Dec 2007 03:49:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=130932 Change 130932 by marcel@marcel_cluster on 2007/12/15 03:48:14 Re-apply diffs to the moved files. Affected files ... .. //depot/projects/powerpc/sys/powerpc/aim/locore.S#2 edit .. //depot/projects/powerpc/sys/powerpc/aim/machdep.c#2 edit .. //depot/projects/powerpc/sys/powerpc/aim/ofw_machdep.c#2 edit .. //depot/projects/powerpc/sys/powerpc/aim/swtch.S#2 edit .. //depot/projects/powerpc/sys/powerpc/aim/trap.c#2 edit .. //depot/projects/powerpc/sys/powerpc/aim/vm_machdep.c#2 edit Differences ... ==== //depot/projects/powerpc/sys/powerpc/aim/locore.S#2 (text+ko) ==== @@ -183,6 +183,28 @@ b OF_exit /* + * Kernel entry point for application/auxiliary + * processors (APs). + */ + .globl __start_ap +__start_ap: + li 8,0 + li 9,0x100 + mtctr 9 +1: + dcbf 0,8 + icbi 0,8 + addi 8,8,0x20 + bdnz 1b + + sync + isync + + bl mi_startup +9: + b 9b + +/* * int setfault() * * Similar to setjmp to setup for handling faults on accesses to user memory. ==== //depot/projects/powerpc/sys/powerpc/aim/machdep.c#2 (text+ko) ==== @@ -114,6 +114,7 @@ #include #include #include +#include #include #include @@ -127,8 +128,8 @@ int cold = 1; -struct pcpu __pcpu[MAXCPU]; -struct trapframe frame0; +static struct pcpu pcpu0; +static struct trapframe frame0; vm_offset_t kstack0; vm_offset_t kstack0_phys; @@ -234,14 +235,6 @@ EVENTHANDLER_REGISTER(shutdown_final, powerpc_ofw_shutdown, 0, SHUTDOWN_PRI_LAST); - -#ifdef SMP - /* - * OK, enough kmem_alloc/malloc state should be up, lets get on with it! - */ - mp_start(); /* fire up the secondaries */ - mp_announce(); -#endif /* SMP */ } extern char kernel_text[], _end[]; @@ -298,7 +291,7 @@ /* * Set up per-cpu data. */ - pc = &__pcpu[0]; + pc = &pcpu0; pcpu_init(pc, 0, sizeof(struct pcpu)); pc->pc_curthread = &thread0; pc->pc_curpcb = thread0.td_pcb; @@ -804,6 +797,22 @@ tf->srr0 = entry; tf->srr1 = PSL_MBO | PSL_USERSET | PSL_FE_DFLT; + + /* + * Reset the hardware debug registers if they were in use. + * They won't have any meaning for the newly exec'd process. + */ + if (td->td_pcb->pcb_flags & PCB_DBREGS) { + if (td->td_pcb == PCPU_GET(curpcb)) { + /* + * Clear the debug registers on the running + * CPU, otherwise they will end up affecting + * the next process we switch to. + */ + mtspr(SPR_DABR, 0); + } + } + td->td_pcb->pcb_flags = 0; } @@ -821,8 +830,12 @@ int fill_dbregs(struct thread *td, struct dbreg *dbregs) { - /* No debug registers on PowerPC */ - return (ENOSYS); + int has_dbregs; + + has_dbregs = (td->td_pcb->pcb_flags & PCB_DBREGS) ? 1 : 0; + dbregs->dabr = (has_dbregs) ? td->td_pcb->pcb_dabr : 0; + dbregs->wppc = (has_dbregs) ? td->td_pcb->pcb_wppc : 0; + return (0); } int @@ -854,8 +867,17 @@ int set_dbregs(struct thread *td, struct dbreg *dbregs) { - /* No debug registers on PowerPC */ - return (ENOSYS); + + td->td_pcb->pcb_dabr = dbregs->dabr; + td->td_pcb->pcb_wppc = 0; + if (dbregs->dabr != 0) + td->td_pcb->pcb_flags |= PCB_DBREGS; + else + td->td_pcb->pcb_flags &= ~PCB_DBREGS; + mtspr(SPR_DABRX, 1); + if (td == curthread) + mtspr(SPR_DABR, dbregs->dabr); + return (0); } int ==== //depot/projects/powerpc/sys/powerpc/aim/ofw_machdep.c#2 (text+ko) ==== @@ -63,7 +63,6 @@ static struct mem_region OFfree[OFMEM_REGIONS + 3]; extern register_t ofmsr[5]; -extern struct pcpu __pcpu[MAXCPU]; extern struct pmap ofw_pmap; static int (*ofwcall)(void *); @@ -279,6 +278,33 @@ } void +OF_start_cpu(phandle_t cpu, void (*entry)(void *), void *arg) +{ + static struct { + cell_t name; + cell_t nargs; + cell_t nreturns; + cell_t cpu; + cell_t entry; + cell_t arg; + } args = { + (cell_t)"start-cpu", + 3, + 0 + }; + + printf("XXX: %s: cpu=%x, entry=%p, arg=%p...", __func__, cpu, + entry, arg); + + args.cpu = (cell_t)cpu; + args.entry = (cell_t)entry; + args.arg = (cell_t)arg; + openfirmware(&args); + + printf(" ok\n"); +} + +void OF_getetheraddr(device_t dev, u_char *addr) { phandle_t node; ==== //depot/projects/powerpc/sys/powerpc/aim/swtch.S#2 (text+ko) ==== @@ -94,7 +94,16 @@ mr %r14,%r3 /* Copy the old thread ptr... */ mr %r15,%r4 /* and the new thread ptr in scratch */ - lwz %r6,PCB_FLAGS(%r5) /* Save FPU context if needed */ + lwz %r6,PCB_FLAGS(%r5) + /* Save and reset the DABR if needed */ + andi. %r16, %r6, PCB_DBREGS + beq .L0 + mfspr %r16, SPR_DABR + stw %r16, PCB_DABR(%r5) + li %r16, 0 + mtspr SPR_DABR, %r16 +.L0: + /* Save FPU context if needed */ andi. %r6, %r6, PCB_FPU beq .L1 bl save_fpu @@ -111,13 +120,18 @@ stw %r17,PC_CURPCB(%r7) lwz %r6, PCB_FLAGS(%r17) /* Restore FPU context if needed */ + andi. %r16, %r6, PCB_DBREGS + beq .L2 + lwz %r16, PCB_DABR(%r17) + mtspr SPR_DABR, %r16 +.L2: andi. %r6, %r6, PCB_FPU - beq .L2 + beq .L3 mr %r3,%r15 /* Pass curthread to enable_fpu */ bl enable_fpu /* thread to restore is in r3 */ -.L2: +.L3: mr %r3,%r17 /* Recover PCB ptr */ lmw %r12,PCB_CONTEXT(%r3) /* Load the non-volatile GP regs */ mr %r2,%r12 ==== //depot/projects/powerpc/sys/powerpc/aim/trap.c#2 (text+ko) ==== @@ -174,6 +174,13 @@ break; case EXC_DSI: + if (frame->dsisr & DSISR_DABR) { + td->td_pcb->pcb_wppc = frame->srr0; + frame->dar = td->td_pcb->pcb_dabr & ~7; + sig = SIGTRAP; + break; + } + /* FALLTHROUGH */ case EXC_ISI: sig = trap_pfault(frame, 1); break; ==== //depot/projects/powerpc/sys/powerpc/aim/vm_machdep.c#2 (text+ko) ==== @@ -90,6 +90,7 @@ #include #include #include +#include #include @@ -269,6 +270,12 @@ void cpu_thread_exit(struct thread *td) { + + /* Disable any hardware breakpoints. */ + if (td->td_pcb->pcb_flags & PCB_DBREGS) { + mtspr(SPR_DABR, 0); + td->td_pcb->pcb_flags &= ~PCB_DBREGS; + } } void From owner-p4-projects@FreeBSD.ORG Sat Dec 15 04:20:34 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 12AEE16A41A; Sat, 15 Dec 2007 04:20:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 84A3316A417 for ; Sat, 15 Dec 2007 04:20:33 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6FA7613C458 for ; Sat, 15 Dec 2007 04:20:33 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBF4KXuR013749 for ; Sat, 15 Dec 2007 04:20:33 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBF4KXWE013734 for perforce@freebsd.org; Sat, 15 Dec 2007 04:20:33 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 15 Dec 2007 04:20:33 GMT Message-Id: <200712150420.lBF4KXWE013734@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 130934 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Dec 2007 04:20:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=130934 Change 130934 by kmacy@kmacy:storage:toestack on 2007/12/15 04:20:14 add routine to look up listen context from the stid Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.c#22 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.c#22 (text+ko) ==== @@ -523,6 +523,18 @@ mtx_unlock(&t->stid_lock); } +/* + * Free a server TID and return it to the free pool. + */ +void * +cxgb_get_lctx(struct t3cdev *tdev, int stid) +{ + struct tid_info *t = &(T3C_DATA (tdev))->tid_maps; + union listen_entry *p = stid2entry(t, stid); + + return (p->toe_tid.ctx); +} + void cxgb_insert_tid(struct t3cdev *tdev, struct cxgb_client *client, void *ctx, unsigned int tid) From owner-p4-projects@FreeBSD.ORG Sat Dec 15 04:25:39 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ABCD816A468; Sat, 15 Dec 2007 04:25:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 49E0116A41A for ; Sat, 15 Dec 2007 04:25:39 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 34BAE13C44B for ; Sat, 15 Dec 2007 04:25:39 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBF4Pdtg014945 for ; Sat, 15 Dec 2007 04:25:39 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBF4PdCA014942 for perforce@freebsd.org; Sat, 15 Dec 2007 04:25:39 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 15 Dec 2007 04:25:39 GMT Message-Id: <200712150425.lBF4PdCA014942@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 130935 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Dec 2007 04:25:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=130935 Change 130935 by kmacy@kmacy:storage:toestack on 2007/12/15 04:24:38 move arp notification handler further up so that it is always called for a reply Affected files ... .. //depot/projects/toestack/sys/netinet/if_ether.c#15 edit Differences ... ==== //depot/projects/toestack/sys/netinet/if_ether.c#15 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/if_ether.c,v 1.165 2007/12/04 13:01:12 yar Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/if_ether.c,v 1.166 2007/12/12 20:53:24 kmacy Exp $"); #include "opt_inet.h" #include "opt_mac.h" @@ -674,6 +674,11 @@ rt = arplookup(isaddr.s_addr, itaddr.s_addr == myaddr.s_addr, 0); if (rt != NULL) { la = (struct llinfo_arp *)rt->rt_llinfo; + + sin.sin_addr.s_addr = isaddr.s_addr; + EVENTHANDLER_INVOKE(route_event, RTEVENT_ARP_UPDATE, rt, NULL, + (struct sockaddr *)&sin); + if (la == NULL) { RT_UNLOCK(rt); goto reply; @@ -781,9 +786,6 @@ la->la_preempt = arp_maxtries; hold = la->la_hold; la->la_hold = NULL; - - sin.sin_addr.s_addr = be32toh(itaddr.s_addr); - EVENTHANDLER_INVOKE(route_event, RTEVENT_ARP_UPDATE, rt, NULL, (struct sockaddr *)&sin); RT_UNLOCK(rt); if (hold != NULL) (*ifp->if_output)(ifp, hold, rt_key(rt), rt); From owner-p4-projects@FreeBSD.ORG Sat Dec 15 04:25:40 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3455C16A4FD; Sat, 15 Dec 2007 04:25:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 85B5916A41B for ; Sat, 15 Dec 2007 04:25:39 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 58D5113C46A for ; Sat, 15 Dec 2007 04:25:39 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBF4PdcK014951 for ; Sat, 15 Dec 2007 04:25:39 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBF4PdEs014948 for perforce@freebsd.org; Sat, 15 Dec 2007 04:25:39 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 15 Dec 2007 04:25:39 GMT Message-Id: <200712150425.lBF4PdEs014948@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 130936 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Dec 2007 04:25:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=130936 Change 130936 by kmacy@kmacy:storage:toestack on 2007/12/15 04:25:28 export listen_ctx lookup function Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.h#8 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.h#8 (text+ko) ==== @@ -99,6 +99,7 @@ void *ctx); void *cxgb_free_atid(struct t3cdev *dev, int atid); void cxgb_free_stid(struct t3cdev *dev, int stid); +void *cxgb_get_lctx(struct t3cdev *tdev, int stid); void cxgb_insert_tid(struct t3cdev *dev, struct cxgb_client *client, void *ctx, unsigned int tid); From owner-p4-projects@FreeBSD.ORG Sat Dec 15 04:26:41 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 307AD16A421; Sat, 15 Dec 2007 04:26:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EA2EB16A41B for ; Sat, 15 Dec 2007 04:26:40 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D5CD213C455 for ; Sat, 15 Dec 2007 04:26:40 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBF4QeEL015015 for ; Sat, 15 Dec 2007 04:26:40 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBF4Qeba015012 for perforce@freebsd.org; Sat, 15 Dec 2007 04:26:40 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 15 Dec 2007 04:26:40 GMT Message-Id: <200712150426.lBF4Qeba015012@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 130938 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Dec 2007 04:26:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=130938 Change 130938 by kmacy@kmacy:storage:toestack on 2007/12/15 04:26:23 fix arpresolve call Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/cxgb_l2t.c#13 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_l2t.c#13 (text+ko) ==== @@ -170,9 +170,13 @@ { struct rtentry *rt = e->neigh; struct sockaddr_in sin; + + bzero(&sin, sizeof(struct sockaddr_in)); sin.sin_family = AF_INET; sin.sin_len = sizeof(struct sockaddr_in); - sin.sin_addr.s_addr = htonl(e->addr); + sin.sin_addr.s_addr = e->addr; + + printf("send slow on rt=%p eaddr=0x%08x\n", rt, e->addr); @@ -232,7 +236,7 @@ struct sockaddr_in sin; sin.sin_family = AF_INET; sin.sin_len = sizeof(struct sockaddr_in); - sin.sin_addr.s_addr = htonl(e->addr); + sin.sin_addr.s_addr = e->addr; if ((m0 = m_gethdr(M_NOWAIT, MT_DATA)) == NULL) return; From owner-p4-projects@FreeBSD.ORG Sat Dec 15 04:27:42 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A70A116A41A; Sat, 15 Dec 2007 04:27:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5B33116A418 for ; Sat, 15 Dec 2007 04:27:42 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2E68313C442 for ; Sat, 15 Dec 2007 04:27:42 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBF4RgGP015065 for ; Sat, 15 Dec 2007 04:27:42 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBF4RgiS015062 for perforce@freebsd.org; Sat, 15 Dec 2007 04:27:42 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 15 Dec 2007 04:27:42 GMT Message-Id: <200712150427.lBF4RgiS015062@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 130939 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Dec 2007 04:27:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=130939 Change 130939 by kmacy@kmacy:storage:toestack on 2007/12/15 04:27:41 fix bug in offload disabled case Affected files ... .. //depot/projects/toestack/sys/netinet/tcp_ofld.h#11 edit Differences ... ==== //depot/projects/toestack/sys/netinet/tcp_ofld.h#11 (text+ko) ==== @@ -137,7 +137,8 @@ static __inline int tcp_gen_connect(struct socket *so, struct sockaddr *nam) { - + struct tcpcb *tp = sototcpcb(so); + return (tcp_output(tp)); } From owner-p4-projects@FreeBSD.ORG Sat Dec 15 04:29:46 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4244F16A417; Sat, 15 Dec 2007 04:29:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AB49016A421 for ; Sat, 15 Dec 2007 04:29:44 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 966C313C45A for ; Sat, 15 Dec 2007 04:29:44 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBF4TiMZ015121 for ; Sat, 15 Dec 2007 04:29:44 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBF4TiEn015118 for perforce@freebsd.org; Sat, 15 Dec 2007 04:29:44 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 15 Dec 2007 04:29:44 GMT Message-Id: <200712150429.lBF4TiEn015118@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 130940 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Dec 2007 04:29:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=130940 Change 130940 by kmacy@kmacy:storage:toestack on 2007/12/15 04:29:02 add synq to listen_ctx add support for sending reset in SYN_RCVD state style fixes to inline functions Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#34 edit .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_defs.h#13 edit .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_listen.c#7 edit .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#4 edit .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom.h#16 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#34 (text+ko) ==== @@ -140,7 +140,7 @@ extern int tcp_autorcvbuf_max; extern int tcp_autosndbuf_max; -static void t3_send_reset(struct socket *so); +static void t3_send_reset(struct toepcb *toep); static void send_abort_rpl(struct mbuf *m, struct toedev *tdev, int rst_status); static inline void free_atid(struct t3cdev *cdev, unsigned int tid); static void handle_syncache_event(int event, void *arg); @@ -550,17 +550,15 @@ static int cxgb_toe_abort(struct tcpcb *tp) { - struct socket *so; - struct toepcb *toep; + struct toepcb *toep = tp->t_toe; + - so = tp->t_inpcb->inp_socket; - t3_send_reset(so); + t3_send_reset(toep); /* * unhook from socket */ tp->t_flags &= ~TF_TOE; - toep = tp->t_toe; toep->tp_tp = NULL; tp->t_toe = NULL; return (0); @@ -1301,24 +1299,31 @@ * an ABORT_REQ wasn't generated after all, 0 otherwise. */ static void -t3_send_reset(struct socket *so) +t3_send_reset(struct toepcb *toep) { struct cpl_abort_req *req; - struct tcpcb *tp = sototcpcb(so); - struct toepcb *toep = tp->t_toe; unsigned int tid = toep->tp_tid; int mode = CPL_ABORT_SEND_RST; + struct tcpcb *tp = toep->tp_tp; + struct toedev *tdev = toep->tp_toedev; + struct socket *so = NULL; struct mbuf *m; - INP_LOCK_ASSERT(tp->t_inpcb); - if (__predict_false((toep->tp_flags & TP_ABORT_SHUTDOWN) || !TOE_DEV(so))) + if (tp) { + INP_LOCK_ASSERT(tp->t_inpcb); + so = toeptoso(toep); + } + + if (__predict_false((toep->tp_flags & TP_ABORT_SHUTDOWN) || + tdev == NULL)) return; toep->tp_flags |= (TP_ABORT_RPL_PENDING|TP_ABORT_SHUTDOWN); /* Purge the send queue so we don't send anything after an abort. */ - sbflush(&so->so_snd); - if ((toep->tp_flags & TP_CLOSE_CON_REQUESTED) && is_t3a(TOE_DEV(so))) + if (so) + sbflush(&so->so_snd); + if ((toep->tp_flags & TP_CLOSE_CON_REQUESTED) && is_t3a(tdev)) mode |= CPL_ABORT_POST_CLOSE_REQ; m = m_gethdr_nofail(sizeof(*req)); @@ -1329,14 +1334,13 @@ req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_OFLD_HOST_ABORT_CON_REQ)); req->wr.wr_lo = htonl(V_WR_TID(tid)); OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_ABORT_REQ, tid)); - req->rsvd0 = htonl(tp->snd_nxt); + req->rsvd0 = tp ? htonl(tp->snd_nxt) : 0; req->rsvd1 = !(toep->tp_flags & TP_DATASENT); req->cmd = mode; - INP_LOCK_ASSERT(tp->t_inpcb); - if (tp->t_state == TCPS_SYN_SENT) + if (tp && (tp->t_state == TCPS_SYN_SENT)) mbufq_tail(&toep->out_of_order_queue, m); // defer else - l2t_send(T3C_DEV(so), m, toep->tp_l2t); + l2t_send(TOEP_T3C_DEV(toep), m, toep->tp_l2t); } static int @@ -2633,7 +2637,11 @@ printf("inserting tid=%d\n", tid); cxgb_insert_tid(cdev, d->client, newtoep, tid); - + SOCK_LOCK(so); + LIST_INSERT_HEAD(&lctx->synq_head, newtoep, synq_entry); + SOCK_UNLOCK(so); + + if (lctx->ulp_mode) { ddp_mbuf = m_gethdr(M_NOWAIT, MT_DATA); @@ -2653,6 +2661,8 @@ toepcb_hold(newtoep); syncache_add_accept_req(req, so, newtoep); + + rpl = cplhdr(reply_mbuf); reply_mbuf->m_pkthdr.len = reply_mbuf->m_len = sizeof(*rpl); rpl->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD)); @@ -2892,8 +2902,11 @@ so = lso = toeptoso(toep); tdev = toep->tp_toedev; + + SOCK_LOCK(so); + LIST_REMOVE(toep, synq_entry); + SOCK_UNLOCK(so); - INP_INFO_WLOCK(&tcbinfo); if (!syncache_expand_establish_req(req, &so, toep)) { /* @@ -3235,7 +3248,9 @@ static void t3_reset_listen_child(struct socket *child) { - t3_send_reset(child); + struct tcpcb *tp = sototcpcb(child); + + t3_send_reset(tp->t_toe); } /* @@ -3267,17 +3282,20 @@ */ void -t3_reset_synq(struct socket *listen_so) +t3_reset_synq(struct listen_ctx *lctx) { - struct socket *so; - struct tcpcb *tp; + struct toepcb *toep; - TAILQ_FOREACH(so, &listen_so->so_incomp, so_list) { - tp = sototcpcb(so); - - if (tp->t_flags & TF_TOE) - t3_reset_listen_child(so); + SOCK_LOCK(lctx->lso); + while (!LIST_EMPTY(&lctx->synq_head)) { + toep = LIST_FIRST(&lctx->synq_head); + LIST_REMOVE(toep, synq_entry); + toep->tp_tp = NULL; + t3_send_reset(toep); + cxgb_remove_tid(TOEP_T3C_DEV(toep), toep, toep->tp_tid); + toepcb_release(toep); } + SOCK_UNLOCK(lctx->lso); } void ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_defs.h#13 (text+ko) ==== @@ -40,6 +40,8 @@ #define toeptoso(toep) ((toep)->tp_tp->t_inpcb->inp_socket) #define sototoep(so) (sototcpcb((so))->t_toe) +struct listen_ctx; + typedef void (*defer_handler_t)(struct toedev *dev, struct mbuf *m); void t3tom_register_cpl_handler(unsigned int opcode, cxgb_cpl_handler_func h); @@ -59,7 +61,7 @@ void t3_disconnect_acceptq(struct socket *listen_so); -void t3_reset_synq(struct socket *listen_so); +void t3_reset_synq(struct listen_ctx *ctx); void t3_defer_reply(struct mbuf *m, struct toedev *dev, defer_handler_t handler); struct toepcb *toepcb_alloc(void); ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_listen.c#7 (text+ko) ==== @@ -70,7 +70,10 @@ #include #include #include +#include +#include + static struct listen_info *listen_hash_add(struct tom_data *d, struct socket *so, unsigned int stid); static int listen_hash_del(struct tom_data *d, struct socket *so); @@ -91,10 +94,7 @@ struct listen_ctx *listen_ctx = (struct listen_ctx *)ctx; cxgb_free_stid(cdev, stid); -#if 0 - sock_put(listen_ctx->lsk); -#endif - free(listen_ctx, M_DEVBUF); + free(listen_ctx, M_CXGB); } return (CPL_RET_BUF_DONE); @@ -139,7 +139,7 @@ */ sock_put(lso); #endif - free(listen_ctx, M_DEVBUF); + free(listen_ctx, M_CXGB); } return CPL_RET_BUF_DONE; } @@ -166,7 +166,7 @@ { struct listen_info *p; - p = malloc(sizeof(*p), M_DEVBUF, M_NOWAIT|M_ZERO); + p = malloc(sizeof(*p), M_CXGB, M_NOWAIT|M_ZERO); if (p) { int bucket = listen_hashfn(so); @@ -220,7 +220,7 @@ if (p->so == so) { stid = p->stid; *prev = p->next; - free(p, M_DEVBUF); + free(p, M_CXGB); break; } mtx_unlock(&d->listen_lock); @@ -246,14 +246,15 @@ printf("start listen\n"); - ctx = malloc(sizeof(*ctx), M_DEVBUF, M_NOWAIT); - + ctx = malloc(sizeof(*ctx), M_CXGB, M_NOWAIT); + if (!ctx) return; ctx->tom_data = d; ctx->lso = so; ctx->ulp_mode = 0; /* DDP if the default */ + LIST_INIT(&ctx->synq_head); stid = cxgb_alloc_stid(d->cdev, d->client, ctx); if (stid < 0) @@ -297,7 +298,7 @@ sock_put(sk); #endif free_ctx: - free(ctx, M_DEVBUF); + free(ctx, M_CXGB); } /* @@ -309,18 +310,20 @@ { struct mbuf *m; struct cpl_close_listserv_req *req; + struct listen_ctx *lctx; int stid = listen_hash_del(TOM_DATA(dev), so); if (stid < 0) return; + lctx = cxgb_get_lctx(cdev, stid); /* * Do this early so embryonic connections are marked as being aborted * while the stid is still open. This ensures pass_establish messages * that arrive while we are closing the server will be able to locate * the listening socket. */ - t3_reset_synq(so); + t3_reset_synq(lctx); /* Send the close ASAP to stop further passive opens */ m = m_gethdr(M_NOWAIT, MT_DATA); ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#4 (text+ko) ==== @@ -35,18 +35,22 @@ struct mbuf *tp_m_last; bus_dma_tag_t tp_tx_dmat; bus_dmamap_t tp_dmamap; - + + LIST_ENTRY(toepcb) synq_entry; struct mbuf_head wr_list; struct mbuf_head out_of_order_queue; struct ddp_state tp_ddp_state; }; -static inline void reset_wr_list(struct toepcb *toep) +static inline void +reset_wr_list(struct toepcb *toep) { + mbufq_init(&toep->wr_list); } -static inline void purge_wr_queue(struct toepcb *toep) +static inline void +purge_wr_queue(struct toepcb *toep) { struct mbuf *m; @@ -54,20 +58,25 @@ m_freem(m); } -static inline void enqueue_wr(struct toepcb *toep, struct mbuf *m) +static inline void +enqueue_wr(struct toepcb *toep, struct mbuf *m) { + mbufq_tail(&toep->wr_list, m); } +static inline struct mbuf * +peek_wr(struct toepcb *toep) +{ -static inline struct mbuf *peek_wr(struct toepcb *toep) -{ - return mbufq_peek(&toep->wr_list); + return (mbufq_peek(&toep->wr_list)); } -static inline struct mbuf *dequeue_wr(struct toepcb *toep) +static inline struct mbuf * +dequeue_wr(struct toepcb *toep) { - return mbufq_dequeue(&toep->wr_list); + + return (mbufq_dequeue(&toep->wr_list)); } #endif ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom.h#16 (text+ko) ==== @@ -108,8 +108,6 @@ struct mtx ppod_map_lock; struct adap_ports *ports; - - struct taskqueue *tq; }; @@ -118,6 +116,8 @@ struct socket *lso; struct tom_data *tom_data; int ulp_mode; + LIST_HEAD(, toepcb) synq_head; + }; #define TOM_DATA(dev) (*(struct tom_data **)&(dev)->tod_l4opt) From owner-p4-projects@FreeBSD.ORG Sat Dec 15 17:08:13 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C36516A420; Sat, 15 Dec 2007 17:08:13 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A689816A419 for ; Sat, 15 Dec 2007 17:08:12 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8C61E13C458 for ; Sat, 15 Dec 2007 17:08:12 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBFH8CQT079117 for ; Sat, 15 Dec 2007 17:08:12 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBFH8C72079114 for perforce@freebsd.org; Sat, 15 Dec 2007 17:08:12 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 15 Dec 2007 17:08:12 GMT Message-Id: <200712151708.lBFH8C72079114@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 130957 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Dec 2007 17:08:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=130957 Change 130957 by hselasky@hselasky_laptop001 on 2007/12/15 17:07:50 This commit is required for USB device side support. o This commit adds automatic context detection to "usb_callback_wrapper()", so that you can call the "usb_callback_wrapper()" from almost everywhere. This leads to a lot of cleanup related to calling callbacks in the EHCI, OHCI and UHCI drivers. o Optimized "uhci_interrupt()" a little bit. o The interrupt list where USB transfers are queued has been moved to "struct usbd_bus" so that we can factor out some code. o Allow all "usbd_bus_mem_xxx" functions to be passed a NULL callback pointer. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ehci.c#62 edit .. //depot/projects/usb/src/sys/dev/usb/ehci.h#25 edit .. //depot/projects/usb/src/sys/dev/usb/ohci.c#51 edit .. //depot/projects/usb/src/sys/dev/usb/ohci.h#21 edit .. //depot/projects/usb/src/sys/dev/usb/uhci.c#52 edit .. //depot/projects/usb/src/sys/dev/usb/uhci.h#21 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#70 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#75 edit .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#70 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ehci.c#62 (text+ko) ==== @@ -79,7 +79,7 @@ printf x ; } } while (0) #define DPRINTFN(n,x) do { if (ehcidebug > (n)) { printf("%s: ", __FUNCTION__); \ printf x ; } } while (0) -int ehcidebug = 0; +static int ehcidebug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, ehci, CTLFLAG_RW, 0, "USB ehci"); SYSCTL_INT(_hw_usb_ehci, OID_AUTO, debug, CTLFLAG_RW, @@ -105,11 +105,11 @@ extern struct usbd_pipe_methods ehci_root_intr_methods; static usbd_config_td_command_t ehci_root_ctrl_task; -static void ehci_root_ctrl_task_td(struct ehci_softc *sc, struct thread *ctd); static void ehci_do_poll(struct usbd_bus *bus); +static void ehci_root_ctrl_poll(struct ehci_softc *sc); static usbd_std_root_transfer_func_t ehci_root_intr_done; -static usbd_std_root_transfer_func_t ehci_root_ctrl_task_td_sub; +static usbd_std_root_transfer_func_t ehci_root_ctrl_done; struct ehci_std_temp { struct usbd_page_cache *pc; @@ -213,8 +213,6 @@ DPRINTF(("start\n")); - LIST_INIT(&sc->sc_interrupt_list_head); - usb_callout_init_mtx(&sc->sc_tmo_pcd, &sc->sc_bus.mtx, CALLOUT_RETURNUNLOCKED); @@ -1280,18 +1278,12 @@ * Else: USB transfer is finished *------------------------------------------------------------------------*/ static uint8_t -ehci_check_transfer(struct usbd_xfer *xfer, struct thread *ctd) +ehci_check_transfer(struct usbd_xfer *xfer) { struct usbd_pipe_methods *methods = xfer->pipe->methods; uint32_t status; - if (xfer->usb_thread != ctd) { - /* - * cannot call this transfer back due to locking ! - */ - goto done; - } DPRINTFN(12, ("xfer=%p checking transfer\n", xfer)); if (methods == &ehci_device_isoc_fs_methods) { @@ -1402,57 +1394,48 @@ /* acknowledge any PCD interrupt */ EOWRITE4(sc, EHCI_USBSTS, EHCI_STS_PCD); - if (usbd_std_root_transfer(&(sc->sc_root_intr), NULL, - &ehci_root_intr_done)) { - mtx_unlock(&(sc->sc_bus.mtx)); - } + usbd_std_root_transfer(&(sc->sc_root_intr), + &ehci_root_intr_done); + + mtx_unlock(&(sc->sc_bus.mtx)); return; } static void -ehci_interrupt_td(ehci_softc_t *sc, struct thread *ctd) +ehci_interrupt_poll(ehci_softc_t *sc) { - enum { - FINISH_LIST_MAX = 16}; - - struct usbd_xfer *xlist[FINISH_LIST_MAX + 1]; - struct usbd_xfer **xptr = xlist; struct usbd_xfer *xfer; - struct thread *td; - uint32_t status; - uint8_t need_repeat = 0; - td = ctd; /* default value */ - - mtx_lock(&sc->sc_bus.mtx); - - /* - * It can happen that an interrupt will be delivered to - * us before the device has been fully attached and the - * softc struct has been configured. Usually this happens - * when kldloading the USB support as a module after the - * system has been booted. If we detect this condition, - * we need to squelch the unwanted interrupts until we're - * ready for them. - */ - if (sc->sc_bus.bdev == NULL) { - goto done; - } - if (ctd) { + LIST_FOREACH(xfer, &sc->sc_bus.intr_list_head, interrupt_list) { /* - * the poll thread should not read any status registers that - * will clear interrupts! + * check if transfer is transferred */ - goto repeat; + if (ehci_check_transfer(xfer)) { + /* queue callback for execution */ + usbd_callback_wrapper(xfer, NULL, USBD_CONTEXT_CALLBACK); + } } - td = curthread; /* NULL is not a valid thread */ + return; +} + +/*------------------------------------------------------------------------* + * ehci_interrupt - EHCI interrupt handler + * + * NOTE: Do not access "sc->sc_bus.bdev" inside the interrupt handler, + * hence the interrupt handler will be setup before "sc->sc_bus.bdev" + * is present ! + *------------------------------------------------------------------------*/ +void +ehci_interrupt(ehci_softc_t *sc) +{ + uint32_t status; + + mtx_lock(&sc->sc_bus.mtx); - DPRINTFN(15, ("%s: real interrupt\n", - device_get_nameunit(sc->sc_bus.bdev))); + DPRINTFN(15, ("real interrupt\n")); #ifdef USB_DEBUG if (ehcidebug > 15) { - DPRINTF(("%s\n", device_get_nameunit(sc->sc_bus.bdev))); ehci_dump_regs(sc); } #endif @@ -1474,8 +1457,8 @@ wakeup(&sc->sc_async_p_last); } if (status & EHCI_STS_HSE) { - device_printf(sc->sc_bus.bdev, "unrecoverable error, " - "controller halted\n"); + printf("%s: unrecoverable error, " + "controller halted\n", __FUNCTION__); #ifdef USB_DEBUG ehci_dump_regs(sc); ehci_dump_isoc(sc); @@ -1489,13 +1472,12 @@ sc->sc_eintrs &= ~EHCI_STS_PCD; EOWRITE4(sc, EHCI_USBINTR, sc->sc_eintrs); - if (!usbd_std_root_transfer(&(sc->sc_root_intr), ctd, - &ehci_root_intr_done)) { - mtx_lock(&(sc->sc_bus.mtx)); - } + usbd_std_root_transfer(&(sc->sc_root_intr), + &ehci_root_intr_done); + /* do not allow RHSC interrupts > 1 per second */ usb_callout_reset(&sc->sc_tmo_pcd, hz, - (void *)(void *)ehci_pcd_enable, sc); + (void *)&ehci_pcd_enable, sc); } status &= ~(EHCI_STS_INT | EHCI_STS_ERRINT | EHCI_STS_PCD | EHCI_STS_IAA); @@ -1503,69 +1485,24 @@ /* block unprocessed interrupts */ sc->sc_eintrs &= ~status; EOWRITE4(sc, EHCI_USBINTR, sc->sc_eintrs); - device_printf(sc->sc_bus.bdev, "blocking intrs 0x%x\n", - status); + printf("%s: blocking interrupts 0x%x\n", __FUNCTION__, status); } -repeat: - LIST_FOREACH(xfer, &sc->sc_interrupt_list_head, interrupt_list) { - /* - * check if transfer is transferred - */ - if (ehci_check_transfer(xfer, ctd)) { - /* queue callback */ - - *(xptr++) = xfer; + /* poll all the USB transfers */ + ehci_interrupt_poll(sc); - xfer->usb_thread = td; - xfer->usb_root->memory_refcount++; - - /* check queue length */ - if (xptr >= &xlist[FINISH_LIST_MAX]) { - need_repeat = 1; - break; - } - } - } - done: mtx_unlock(&sc->sc_bus.mtx); - - /* zero terminate the callback list */ - *(xptr) = NULL; - - usbd_do_callback(xlist, td); - - if (need_repeat) { - xptr = xlist; - - need_repeat = 0; - - mtx_lock(&sc->sc_bus.mtx); - - goto repeat; - } return; } -void -ehci_interrupt(ehci_softc_t *sc) -{ - ehci_interrupt_td(sc, NULL); - return; -} - /* * called when a request does not complete */ static void ehci_timeout(struct usbd_xfer *xfer) { - struct thread *td; - struct usbd_xfer *xlist[2]; ehci_softc_t *sc = xfer->usb_sc; - td = curthread; - DPRINTF(("xfer=%p\n", xfer)); mtx_assert(&sc->sc_bus.mtx, MA_OWNED); @@ -1573,17 +1510,11 @@ /* transfer is transferred */ ehci_device_done(xfer, USBD_TIMEOUT); - /* queue callback */ - xlist[0] = xfer; - xlist[1] = NULL; - - xfer->usb_thread = td; - xfer->usb_root->memory_refcount++; + /* queue callback for execution */ + usbd_callback_wrapper(xfer, NULL, USBD_CONTEXT_CALLBACK); mtx_unlock(&sc->sc_bus.mtx); - usbd_do_callback(xlist, td); - return; } @@ -1591,29 +1522,15 @@ ehci_do_poll(struct usbd_bus *bus) { struct ehci_softc *sc = EHCI_BUS2SC(bus); - struct thread *ctd = curthread; - ehci_interrupt_td(sc, ctd); mtx_lock(&(sc->sc_bus.mtx)); - ehci_root_ctrl_task_td(sc, ctd); + ehci_interrupt_poll(sc); + ehci_root_ctrl_poll(sc); mtx_unlock(&(sc->sc_bus.mtx)); return; } -#define ehci_add_interrupt_info(sc, xfer) \ - LIST_INSERT_HEAD(&(sc)->sc_interrupt_list_head, (xfer), interrupt_list) - static void -ehci_remove_interrupt_info(struct usbd_xfer *xfer) -{ - if ((xfer)->interrupt_list.le_prev) { - LIST_REMOVE((xfer), interrupt_list); - (xfer)->interrupt_list.le_prev = NULL; - } - return; -} - -static void ehci_setup_standard_chain_sub(struct ehci_std_temp *temp) { struct usbd_page_search buf_res; @@ -2227,12 +2144,6 @@ xfer->td_transfer_first = NULL; xfer->td_transfer_last = NULL; } - /* stop timeout */ - usb_callout_stop(&xfer->timeout_handle); - - /* remove interrupt info (if any) */ - ehci_remove_interrupt_info(xfer); - if ((methods != &ehci_root_ctrl_methods) && (methods != &ehci_root_intr_methods)) { @@ -2329,7 +2240,7 @@ ehci_setup_standard_chain(xfer, &sc->sc_async_p_last); /**/ - ehci_add_interrupt_info(sc, xfer); + usbd_transfer_intr_enqueue(xfer); if (xfer->timeout && (!xfer->flags.use_polling)) { usb_callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout), @@ -2379,7 +2290,7 @@ ehci_setup_standard_chain(xfer, &sc->sc_async_p_last); /**/ - ehci_add_interrupt_info(sc, xfer); + usbd_transfer_intr_enqueue(xfer); if (xfer->timeout && (!xfer->flags.use_polling)) { usb_callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout), @@ -2485,7 +2396,7 @@ ehci_setup_standard_chain(xfer, &sc->sc_intr_p_last[xfer->qh_pos]); /**/ - ehci_add_interrupt_info(sc, xfer); + usbd_transfer_intr_enqueue(xfer); if (xfer->timeout && (!xfer->flags.use_polling)) { usb_callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout), @@ -2741,7 +2652,7 @@ (EHCI_VIRTUAL_FRAMELIST_COUNT - 1); /**/ - ehci_add_interrupt_info(sc, xfer); + usbd_transfer_intr_enqueue(xfer); /* * enqueue transfer (so that it can be aborted through pipe abort) @@ -3020,7 +2931,7 @@ (EHCI_VIRTUAL_FRAMELIST_COUNT - 1); /**/ - ehci_add_interrupt_info(sc, xfer); + usbd_transfer_intr_enqueue(xfer); /* * enqueue transfer (so that it can be aborted through pipe abort) @@ -3192,12 +3103,12 @@ ehci_root_ctrl_task(struct ehci_softc *sc, struct ehci_config_copy *cc, uint16_t refcount) { - ehci_root_ctrl_task_td(sc, NULL); + ehci_root_ctrl_poll(sc); return; } static void -ehci_root_ctrl_task_td_sub(struct usbd_xfer *xfer, +ehci_root_ctrl_done(struct usbd_xfer *xfer, struct usbd_std_root_transfer *std) { struct ehci_softc *sc = xfer->usb_sc; @@ -3592,12 +3503,10 @@ } static void -ehci_root_ctrl_task_td(struct ehci_softc *sc, struct thread *ctd) +ehci_root_ctrl_poll(struct ehci_softc *sc) { - if (!usbd_std_root_transfer(&(sc->sc_root_ctrl), ctd, - &ehci_root_ctrl_task_td_sub)) { - mtx_lock(&sc->sc_bus.mtx); - } + usbd_std_root_transfer(&(sc->sc_root_ctrl), + &ehci_root_ctrl_done); return; } ==== //depot/projects/usb/src/sys/dev/usb/ehci.h#25 (text+ko) ==== @@ -443,7 +443,6 @@ struct usbd_bus sc_bus; /* base device */ struct usbd_config_td sc_config_td; struct usb_callout sc_tmo_pcd; - LIST_HEAD(, usbd_xfer) sc_interrupt_list_head; union ehci_hub_desc sc_hub_desc; struct usbd_std_root_transfer sc_root_ctrl; struct usbd_std_root_transfer sc_root_intr; ==== //depot/projects/usb/src/sys/dev/usb/ohci.c#51 (text+ko) ==== @@ -84,7 +84,7 @@ #undef DPRINTFN #define DPRINTF(x) do { if (ohcidebug) { printf("%s: ", __FUNCTION__); printf x ; } } while (0) #define DPRINTFN(n,x) do { if (ohcidebug > (n)) { printf("%s: ", __FUNCTION__); printf x ; } } while (0) -int ohcidebug = 0; +static int ohcidebug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, ohci, CTLFLAG_RW, 0, "USB ohci"); SYSCTL_INT(_hw_usb_ohci, OID_AUTO, debug, CTLFLAG_RW, @@ -121,12 +121,12 @@ extern struct usbd_pipe_methods ohci_root_intr_methods; static usbd_config_td_command_t ohci_root_ctrl_task; -static void ohci_root_ctrl_task_td(struct ohci_softc *sc, struct thread *ctd); +static void ohci_root_ctrl_poll(struct ohci_softc *sc); static void ohci_do_poll(struct usbd_bus *bus); static void ohci_device_done(struct usbd_xfer *xfer, usbd_status_t error); static usbd_std_root_transfer_func_t ohci_root_intr_done; -static usbd_std_root_transfer_func_t ohci_root_ctrl_task_td_sub; +static usbd_std_root_transfer_func_t ohci_root_ctrl_done; struct ohci_std_temp { struct usbd_page_cache *pc; @@ -412,8 +412,6 @@ usbd_bus_mem_flush_all(&(sc->sc_bus), &ohci_iterate_hw_softc); - LIST_INIT(&sc->sc_interrupt_list_head); - /* set up the bus struct */ sc->sc_bus.methods = &ohci_bus_methods; @@ -1055,19 +1053,13 @@ * Else: USB transfer is finished *------------------------------------------------------------------------*/ static uint8_t -ohci_check_transfer(struct usbd_xfer *xfer, struct thread *ctd) +ohci_check_transfer(struct usbd_xfer *xfer) { ohci_ed_t *ed = xfer->qh_start; uint32_t ed_flags; uint32_t ed_headp; uint32_t ed_tailp; - if (xfer->usb_thread != ctd) { - /* - * cannot call this transfer back due to locking ! - */ - return (0); - } DPRINTFN(12, ("xfer=%p checking transfer\n", xfer)); usbd_pc_cpu_invalidate(ed->page_cache); @@ -1118,54 +1110,52 @@ /* acknowledge any RHSC interrupt */ OWRITE4(sc, OHCI_INTERRUPT_STATUS, OHCI_RHSC); - if (usbd_std_root_transfer(&(sc->sc_root_intr), NULL, - &ohci_root_intr_done)) { - mtx_unlock(&(sc->sc_bus.mtx)); - } + usbd_std_root_transfer(&(sc->sc_root_intr), + &ohci_root_intr_done); + + mtx_unlock(&(sc->sc_bus.mtx)); return; } static void -ohci_interrupt_td(ohci_softc_t *sc, struct thread *ctd) +ohci_interrupt_poll(ohci_softc_t *sc) { - enum { - FINISH_LIST_MAX = 16, - }; + struct usbd_xfer *xfer; + + LIST_FOREACH(xfer, &(sc->sc_bus.intr_list_head), interrupt_list) { + /* + * check if transfer is transferred + */ + if (ohci_check_transfer(xfer)) { + /* queue callback for execution */ + usbd_callback_wrapper(xfer, NULL, USBD_CONTEXT_CALLBACK); + } + } + return; +} - struct usbd_xfer *xlist[FINISH_LIST_MAX + 1]; - struct usbd_xfer **xptr = xlist; +/*------------------------------------------------------------------------* + * ohci_interrupt - OHCI interrupt handler + * + * NOTE: Do not access "sc->sc_bus.bdev" inside the interrupt handler, + * hence the interrupt handler will be setup before "sc->sc_bus.bdev" + * is present ! + *------------------------------------------------------------------------*/ +void +ohci_interrupt(ohci_softc_t *sc) +{ struct ohci_hcca *hcca; - struct usbd_xfer *xfer; - struct thread *td; uint32_t status; uint32_t done; - uint8_t need_repeat = 0; - td = ctd; /* default value */ - mtx_lock(&sc->sc_bus.mtx); - if (sc->sc_bus.bdev == NULL) { - /* too early interrupt */ - goto done; - } - if (ctd) { - /* - * the poll thread should not read any status registers that - * will clear interrupts! - */ - goto repeat; - } - td = curthread; /* NULL is not a valid thread */ - hcca = ohci_get_hcca(sc); - DPRINTFN(15, ("%s: real interrupt\n", - device_get_nameunit(sc->sc_bus.bdev))); + DPRINTFN(15, ("real interrupt\n")); #ifdef USB_DEBUG if (ohcidebug > 15) { - DPRINTF(("%s:\n", device_get_nameunit(sc->sc_bus.bdev))); ohci_dumpregs(sc); } #endif @@ -1221,12 +1211,12 @@ } #endif if (status & OHCI_RD) { - device_printf(sc->sc_bus.bdev, "resume detect\n"); + printf("%s: resume detect\n", __FUNCTION__); /* XXX process resume detect */ } if (status & OHCI_UE) { - device_printf(sc->sc_bus.bdev, "unrecoverable error, " - "controller halted\n"); + printf("%s: unrecoverable error, " + "controller halted\n", __FUNCTION__); OWRITE4(sc, OHCI_CONTROL, OHCI_HCFS_RESET); /* XXX what else */ } @@ -1238,13 +1228,12 @@ sc->sc_eintrs &= ~OHCI_RHSC; OWRITE4(sc, OHCI_INTERRUPT_DISABLE, OHCI_RHSC); - if (!usbd_std_root_transfer(&(sc->sc_root_intr), ctd, - &ohci_root_intr_done)) { - mtx_lock(&(sc->sc_bus.mtx)); - } + usbd_std_root_transfer(&(sc->sc_root_intr), + &ohci_root_intr_done); + /* do not allow RHSC interrupts > 1 per second */ usb_callout_reset(&sc->sc_tmo_rhsc, hz, - (void *)(void *)ohci_rhsc_enable, sc); + (void *)&ohci_rhsc_enable, sc); } } status &= ~(OHCI_RHSC | OHCI_WDH | OHCI_SO); @@ -1252,73 +1241,25 @@ /* Block unprocessed interrupts. XXX */ OWRITE4(sc, OHCI_INTERRUPT_DISABLE, status); sc->sc_eintrs &= ~status; - device_printf(sc->sc_bus.bdev, - "blocking intrs 0x%x\n", status); + printf("%s: blocking intrs 0x%x\n", + __FUNCTION__, status); } - /* - * when the host controller interrupts because a transfer - * is completed, all active transfers are checked! - */ + /* poll all the USB transfers */ + ohci_interrupt_poll(sc); -repeat: - LIST_FOREACH(xfer, &sc->sc_interrupt_list_head, interrupt_list) { - /* - * check if transfer is transferred - */ - if (ohci_check_transfer(xfer, ctd)) { - /* queue callback */ - - *(xptr++) = xfer; - - xfer->usb_thread = td; - xfer->usb_root->memory_refcount++; - - /* check queue length */ - if (xptr >= &xlist[FINISH_LIST_MAX]) { - need_repeat = 1; - break; - } - } - } - done: mtx_unlock(&sc->sc_bus.mtx); - - /* zero terminate the callback list */ - *(xptr) = NULL; - - usbd_do_callback(xlist, td); - - if (need_repeat) { - xptr = xlist; - - need_repeat = 0; - mtx_lock(&sc->sc_bus.mtx); - - goto repeat; - } return; } -void -ohci_interrupt(ohci_softc_t *sc) -{ - ohci_interrupt_td(sc, NULL); - return; -} - /* * called when a request does not complete */ static void ohci_timeout(struct usbd_xfer *xfer) { - struct thread *td; - struct usbd_xfer *xlist[2]; ohci_softc_t *sc = xfer->usb_sc; - td = curthread; - DPRINTF(("xfer=%p\n", xfer)); mtx_assert(&sc->sc_bus.mtx, MA_OWNED); @@ -1326,17 +1267,11 @@ /* transfer is transferred */ ohci_device_done(xfer, USBD_TIMEOUT); - /* queue callback */ - xlist[0] = xfer; - xlist[1] = NULL; - - xfer->usb_thread = td; - xfer->usb_root->memory_refcount++; + /* queue callback for execution */ + usbd_callback_wrapper(xfer, NULL, USBD_CONTEXT_CALLBACK); mtx_unlock(&sc->sc_bus.mtx); - usbd_do_callback(xlist, td); - return; } @@ -1344,28 +1279,14 @@ ohci_do_poll(struct usbd_bus *bus) { struct ohci_softc *sc = OHCI_BUS2SC(bus); - struct thread *ctd = curthread; - ohci_interrupt_td(sc, ctd); mtx_lock(&(sc->sc_bus.mtx)); - ohci_root_ctrl_task_td(sc, ctd); + ohci_interrupt_poll(sc); + ohci_root_ctrl_poll(sc); mtx_unlock(&(sc->sc_bus.mtx)); return; } -#define ohci_add_interrupt_info(sc, xfer) \ - LIST_INSERT_HEAD(&(sc)->sc_interrupt_list_head, (xfer), interrupt_list) - -static void -ohci_remove_interrupt_info(struct usbd_xfer *xfer) -{ - if ((xfer)->interrupt_list.le_prev) { - LIST_REMOVE((xfer), interrupt_list); - (xfer)->interrupt_list.le_prev = NULL; - } - return; -} - static void ohci_setup_standard_chain_sub(struct ohci_std_temp *temp) { @@ -1765,12 +1686,6 @@ xfer->td_transfer_first = NULL; xfer->td_transfer_last = NULL; - /* stop timeout */ - usb_callout_stop(&xfer->timeout_handle); - - /* remove interrupt info */ - ohci_remove_interrupt_info(xfer); - if ((methods != &ohci_root_ctrl_methods) && (methods != &ohci_root_intr_methods)) { @@ -1820,7 +1735,7 @@ ohci_setup_standard_chain(xfer, &sc->sc_bulk_p_last); /**/ - ohci_add_interrupt_info(sc, xfer); + usbd_transfer_intr_enqueue(xfer); if (xfer->timeout && (!(xfer->flags.use_polling))) { usb_callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout), @@ -1870,7 +1785,7 @@ ohci_setup_standard_chain(xfer, &sc->sc_ctrl_p_last); /**/ - ohci_add_interrupt_info(sc, xfer); + usbd_transfer_intr_enqueue(xfer); if (xfer->timeout && (!(xfer->flags.use_polling))) { usb_callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout), @@ -1952,7 +1867,7 @@ ohci_setup_standard_chain(xfer, &sc->sc_intr_p_last[xfer->qh_pos]); /**/ - ohci_add_interrupt_info(sc, xfer); + usbd_transfer_intr_enqueue(xfer); if (xfer->timeout && (!(xfer->flags.use_polling))) { usb_callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout), @@ -2151,7 +2066,7 @@ OHCI_APPEND_QH(ed, td->itd_self, sc->sc_isoc_p_last); /**/ - ohci_add_interrupt_info(sc, xfer); + usbd_transfer_intr_enqueue(xfer); /* * enqueue transfer (so that it can be aborted through pipe abort) @@ -2296,12 +2211,12 @@ ohci_root_ctrl_task(struct ohci_softc *sc, struct ohci_config_copy *cc, uint16_t refcount) { - ohci_root_ctrl_task_td(sc, NULL); + ohci_root_ctrl_poll(sc); return; } static void -ohci_root_ctrl_task_td_sub(struct usbd_xfer *xfer, +ohci_root_ctrl_done(struct usbd_xfer *xfer, struct usbd_std_root_transfer *std) { ohci_softc_t *sc = xfer->usb_sc; @@ -2604,12 +2519,10 @@ } static void -ohci_root_ctrl_task_td(struct ohci_softc *sc, struct thread *ctd) +ohci_root_ctrl_poll(struct ohci_softc *sc) { - if (!usbd_std_root_transfer(&(sc->sc_root_ctrl), ctd, - &ohci_root_ctrl_task_td_sub)) { - mtx_lock(&sc->sc_bus.mtx); - } + usbd_std_root_transfer(&(sc->sc_root_ctrl), + &ohci_root_ctrl_done); return; } ==== //depot/projects/usb/src/sys/dev/usb/ohci.h#21 (text+ko) ==== @@ -320,7 +320,6 @@ struct usbd_bus sc_bus; /* base device */ struct usbd_config_td sc_config_td; struct usb_callout sc_tmo_rhsc; - LIST_HEAD(, usbd_xfer) sc_interrupt_list_head; union ohci_hub_desc sc_hub_desc; struct usbd_std_root_transfer sc_root_ctrl; struct usbd_std_root_transfer sc_root_intr; ==== //depot/projects/usb/src/sys/dev/usb/uhci.c#52 (text+ko) ==== @@ -87,8 +87,8 @@ #undef DPRINTFN #define DPRINTF(x) do { if (uhcidebug) { printf("%s: ", __FUNCTION__); printf x ; } } while (0) #define DPRINTFN(n,x) do { if (uhcidebug > (n)) { printf("%s: ", __FUNCTION__); printf x ; } } while (0) -int uhcidebug = 0; -int uhcinoloop = 0; +static int uhcidebug = 0; +static int uhcinoloop = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, uhci, CTLFLAG_RW, 0, "USB uhci"); SYSCTL_INT(_hw_usb_uhci, OID_AUTO, debug, CTLFLAG_RW, @@ -158,7 +158,7 @@ extern struct usbd_pipe_methods uhci_root_intr_methods; static usbd_config_td_command_t uhci_root_ctrl_task; -static void uhci_root_ctrl_task_td(struct uhci_softc *sc, struct thread *ctd); +static void uhci_root_ctrl_poll(struct uhci_softc *sc); static void uhci_do_poll(struct usbd_bus *bus); static void uhci_device_done(struct usbd_xfer *xfer, usbd_status_t error); @@ -618,8 +618,6 @@ usbd_bus_mem_flush_all(&(sc->sc_bus), &uhci_iterate_hw_softc); - LIST_INIT(&sc->sc_interrupt_list_head); - /* set up the bus struct */ sc->sc_bus.methods = &uhci_bus_methods; @@ -852,20 +850,6 @@ return; } -#if 0 -static void -uhci_dump_iis(struct uhci_softc *sc) -{ - struct usbd_xfer *xfer; - - printf("interrupt list:\n"); - LIST_FOREACH(xfer, &sc->sc_interrupt_list_head, interrupt_list) { - usbd_dump_xfer(xfer); - } - return; -} - -#endif #endif /* @@ -1341,18 +1325,12 @@ * Else: USB transfer is finished *------------------------------------------------------------------------*/ static uint8_t -uhci_check_transfer(struct usbd_xfer *xfer, struct thread *ctd) +uhci_check_transfer(struct usbd_xfer *xfer) { uint32_t status; uint32_t token; uhci_td_t *td; - if (xfer->usb_thread != ctd) { - /* - * cannot call this transfer back due to locking ! - */ - goto done; - } DPRINTFN(15, ("xfer=%p checking transfer\n", xfer)); if (xfer->pipe->methods == &uhci_device_isoc_methods) { @@ -1436,54 +1414,40 @@ } static void -uhci_interrupt_td(uhci_softc_t *sc, struct thread *ctd) +uhci_interrupt_poll(uhci_softc_t *sc) { - enum { - FINISH_LIST_MAX = 16}; - - struct usbd_xfer *xlist[FINISH_LIST_MAX + 1]; - struct usbd_xfer **xptr = xlist; struct usbd_xfer *xfer; - struct thread *td; - uint32_t status; - uint8_t need_repeat = 0; - td = ctd; /* default value */ - - mtx_lock(&sc->sc_bus.mtx); - - /* - * It can happen that an interrupt will be delivered to - * us before the device has been fully attached and the - * softc struct has been configured. Usually this happens - * when kldloading the USB support as a module after the - * system has been booted. If we detect this condition, - * we need to squelch the unwanted interrupts until we're - * ready for them. - */ - if (sc->sc_bus.bdev == NULL) { /* XXX */ -#if 0 - UWRITE2(sc, UHCI_STS, 0xFFFF); /* ack pending interrupts */ - uhci_reset(sc); /* stop the controller */ - UWRITE2(sc, UHCI_INTR, 0); /* disable interrupts */ -#endif - goto done; - } - if (ctd) { + LIST_FOREACH(xfer, &(sc->sc_bus.intr_list_head), interrupt_list) { /* - * the poll thread should not read any status registers that - * will clear interrupts! + * check if transfer is transferred */ - goto repeat; + if (uhci_check_transfer(xfer)) { + /* queue callback for execution */ + usbd_callback_wrapper(xfer, NULL, USBD_CONTEXT_CALLBACK); + } } - td = curthread; /* NULL is not a valid thread */ + return; +} + +/*------------------------------------------------------------------------* + * uhci_interrupt - UHCI interrupt handler + * + * NOTE: Do not access "sc->sc_bus.bdev" inside the interrupt handler, + * hence the interrupt handler will be setup before "sc->sc_bus.bdev" + * is present ! + *------------------------------------------------------------------------*/ +void +uhci_interrupt(uhci_softc_t *sc) +{ + uint32_t status; + + mtx_lock(&sc->sc_bus.mtx); - DPRINTFN(15, ("%s: real interrupt\n", - device_get_nameunit(sc->sc_bus.bdev))); + DPRINTFN(15, ("real interrupt\n")); #ifdef USB_DEBUG if (uhcidebug > 15) { - DPRINTF(("%s\n", device_get_nameunit(sc->sc_bus.bdev))); uhci_dumpregs(sc); } #endif @@ -1492,27 +1456,31 @@ /* the interrupt was not for us */ goto done; } - if (status & UHCI_STS_RD) { + if (status & (UHCI_STS_RD | UHCI_STS_HSE | + UHCI_STS_HCPE | UHCI_STS_HCH)) { + + if (status & UHCI_STS_RD) { #ifdef USB_DEBUG - device_printf(sc->sc_bus.bdev, - "resume detect\n"); + printf("%s: resume detect\n", + __FUNCTION__); #endif - } - if (status & UHCI_STS_HSE) { - device_printf(sc->sc_bus.bdev, - "host system error\n"); - } - if (status & UHCI_STS_HCPE) { - device_printf(sc->sc_bus.bdev, - "host controller process error\n"); - } - if (status & UHCI_STS_HCH) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Dec 15 17:13:18 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9122116A41B; Sat, 15 Dec 2007 17:13:18 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3BF6C16A418 for ; Sat, 15 Dec 2007 17:13:18 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 249BD13C468 for ; Sat, 15 Dec 2007 17:13:18 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBFHDI49080405 for ; Sat, 15 Dec 2007 17:13:18 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBFHDIGk080402 for perforce@freebsd.org; Sat, 15 Dec 2007 17:13:18 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 15 Dec 2007 17:13:18 GMT Message-Id: <200712151713.lBFHDIGk080402@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 130958 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Dec 2007 17:13:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=130958 Change 130958 by hselasky@hselasky_laptop001 on 2007/12/15 17:12:47 Make "usbd_std_root_transfer" like the other standard chain functions. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#71 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#71 (text+ko) ==== @@ -1201,8 +1201,8 @@ /* signal that we plan to do the callback */ xfer->usb_thread = td; - if (xfer->flags_int.control_xfr && - xfer->flags_int.control_hdr) { + if (xfer->flags_int.control_xfr) { + if (xfer->flags_int.control_hdr) { /* copy out the USB request */ @@ -1228,6 +1228,10 @@ if (std->err) { goto done; } + } else { + /* skip the first frame in this case */ + xfer->aframes = 1; + } } std->err = 0; std->state = USBD_STD_ROOT_TR_PRE_DATA; From owner-p4-projects@FreeBSD.ORG Sat Dec 15 17:14:20 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E0BDB16A468; Sat, 15 Dec 2007 17:14:19 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A60DE16A41A for ; Sat, 15 Dec 2007 17:14:19 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8697B13C4E5 for ; Sat, 15 Dec 2007 17:14:19 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBFHEJIN080515 for ; Sat, 15 Dec 2007 17:14:19 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBFHEJMS080512 for perforce@freebsd.org; Sat, 15 Dec 2007 17:14:19 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 15 Dec 2007 17:14:19 GMT Message-Id: <200712151714.lBFHEJMS080512@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 130959 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Dec 2007 17:14:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=130959 Change 130959 by hselasky@hselasky_laptop001 on 2007/12/15 17:13:42 Style change by "usb_style.sh". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#72 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#72 (text+ko) ==== @@ -1202,36 +1202,36 @@ xfer->usb_thread = td; if (xfer->flags_int.control_xfr) { - if (xfer->flags_int.control_hdr) { + if (xfer->flags_int.control_hdr) { - /* copy out the USB request */ + /* copy out the USB request */ - if (xfer->frlengths[0] == sizeof(std->req)) { - usbd_copy_out(xfer->frbuffers + 0, 0, - &(std->req), sizeof(std->req)); - } else { - std->err = USBD_INVAL; - goto done; - } + if (xfer->frlengths[0] == sizeof(std->req)) { + usbd_copy_out(xfer->frbuffers + 0, 0, + &(std->req), sizeof(std->req)); + } else { + std->err = USBD_INVAL; + goto done; + } - xfer->aframes = 1; + xfer->aframes = 1; - std->err = 0; - std->state = USBD_STD_ROOT_TR_SETUP; + std->err = 0; + std->state = USBD_STD_ROOT_TR_SETUP; - (func) (xfer, std); + (func) (xfer, std); - if (xfer->usb_thread != td) { - /* transfer cancelled */ - goto done; + if (xfer->usb_thread != td) { + /* transfer cancelled */ + goto done; + } + if (std->err) { + goto done; + } + } else { + /* skip the first frame in this case */ + xfer->aframes = 1; } - if (std->err) { - goto done; - } - } else { - /* skip the first frame in this case */ - xfer->aframes = 1; - } } std->err = 0; std->state = USBD_STD_ROOT_TR_PRE_DATA; From owner-p4-projects@FreeBSD.ORG Sat Dec 15 17:37:46 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DA23616A419; Sat, 15 Dec 2007 17:37:45 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A034016A418 for ; Sat, 15 Dec 2007 17:37:45 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 89A8713C457 for ; Sat, 15 Dec 2007 17:37:45 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBFHbjOj084848 for ; Sat, 15 Dec 2007 17:37:45 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBFHbjan084845 for perforce@freebsd.org; Sat, 15 Dec 2007 17:37:45 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 15 Dec 2007 17:37:45 GMT Message-Id: <200712151737.lBFHbjan084845@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 130963 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Dec 2007 17:37:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=130963 Change 130963 by hselasky@hselasky_laptop001 on 2007/12/15 17:37:43 Reintroduce support for non-kernel virtual memory after advice from Julian Elischer. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#71 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#76 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#71 (text+ko) ==== @@ -1968,22 +1968,19 @@ { struct usbd_page *page; - res->buffer = USBD_ADD_BYTES(pc->buffer, offset); + if (pc->page_start) { + + /* Case 1 - something has been loaded into DMA */ - offset += pc->page_offset_buf; + if (pc->buffer) { - /* range check */ + /* Case 1a - Kernel Virtual Address */ - if ((offset >= pc->page_offset_end) || - (offset < pc->page_offset_buf)) { + res->buffer = USBD_ADD_BYTES(pc->buffer, offset); + } - /* we've reached the end */ + offset += pc->page_offset_buf; - res->length = 0; - res->buffer = NULL; - res->physaddr = 0; - return; - } /* compute destination page */ page = pc->page_start; @@ -1994,20 +1991,24 @@ res->length = USB_PAGE_SIZE - offset; res->physaddr = page->physaddr + offset; + if (!pc->buffer) { + /* Case 1b - Non Kernel Virtual Address */ + + res->buffer = USBD_ADD_BYTES(page->buffer, offset); + } + } else { + + /* Case 2 - Plain PIO */ + + res->buffer = USBD_ADD_BYTES(pc->buffer, offset); + res->length = 0-1; + res->physaddr = 0; + } return; } /*------------------------------------------------------------------------* - * usbd_get_buffer - *------------------------------------------------------------------------*/ -void * -usbd_get_buffer(struct usbd_page_cache *pc, uint32_t offset) -{ - return (USBD_ADD_BYTES(pc->buffer, offset)); -} - -/*------------------------------------------------------------------------* * usbd_copy_in - copy directly to DMA-able memory *------------------------------------------------------------------------*/ void ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#76 (text+ko) ==== @@ -219,6 +219,7 @@ struct usbd_page { bus_size_t physaddr; + void *buffer; /* non Kernel Virtual Address */ }; struct usbd_page_search { @@ -798,7 +799,6 @@ void usbd_set_desc(device_t dev, struct usbd_device *udev); void *usbd_alloc_mbufs(struct malloc_type *type, struct usbd_ifqueue *ifq, uint32_t block_size, uint16_t block_number); void usbd_get_page(struct usbd_page_cache *cache, uint32_t offset, struct usbd_page_search *res); -void *usbd_get_buffer(struct usbd_page_cache *pc, uint32_t offset); void usbd_copy_in(struct usbd_page_cache *cache, uint32_t offset, const void *ptr, uint32_t len); void usbd_m_copy_in(struct usbd_page_cache *cache, uint32_t dst_offset, struct mbuf *m, uint32_t src_offset, uint32_t src_len); int usbd_uiomove(struct usbd_page_cache *pc, struct uio *uio, uint32_t pc_offset, uint32_t len); From owner-p4-projects@FreeBSD.ORG Sat Dec 15 17:38:47 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 247FE16A474; Sat, 15 Dec 2007 17:38:47 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D049616A4D6 for ; Sat, 15 Dec 2007 17:38:46 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B9F4913C4E8 for ; Sat, 15 Dec 2007 17:38:46 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBFHckM9084937 for ; Sat, 15 Dec 2007 17:38:46 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBFHcksM084934 for perforce@freebsd.org; Sat, 15 Dec 2007 17:38:46 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 15 Dec 2007 17:38:46 GMT Message-Id: <200712151738.lBFHcksM084934@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 130964 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Dec 2007 17:38:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=130964 Change 130964 by hselasky@hselasky_laptop001 on 2007/12/15 17:38:18 Style change by "usb_style.sh". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#72 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#77 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#72 (text+ko) ==== @@ -1970,40 +1970,39 @@ if (pc->page_start) { - /* Case 1 - something has been loaded into DMA */ + /* Case 1 - something has been loaded into DMA */ - if (pc->buffer) { + if (pc->buffer) { - /* Case 1a - Kernel Virtual Address */ + /* Case 1a - Kernel Virtual Address */ - res->buffer = USBD_ADD_BYTES(pc->buffer, offset); - } + res->buffer = USBD_ADD_BYTES(pc->buffer, offset); + } + offset += pc->page_offset_buf; - offset += pc->page_offset_buf; + /* compute destination page */ - /* compute destination page */ + page = pc->page_start; - page = pc->page_start; + page += (offset / USB_PAGE_SIZE); - page += (offset / USB_PAGE_SIZE); + offset %= USB_PAGE_SIZE; - offset %= USB_PAGE_SIZE; + res->length = USB_PAGE_SIZE - offset; + res->physaddr = page->physaddr + offset; + if (!pc->buffer) { - res->length = USB_PAGE_SIZE - offset; - res->physaddr = page->physaddr + offset; - if (!pc->buffer) { + /* Case 1b - Non Kernel Virtual Address */ - /* Case 1b - Non Kernel Virtual Address */ - - res->buffer = USBD_ADD_BYTES(page->buffer, offset); - } + res->buffer = USBD_ADD_BYTES(page->buffer, offset); + } } else { - /* Case 2 - Plain PIO */ + /* Case 2 - Plain PIO */ - res->buffer = USBD_ADD_BYTES(pc->buffer, offset); - res->length = 0-1; - res->physaddr = 0; + res->buffer = USBD_ADD_BYTES(pc->buffer, offset); + res->length = 0 - 1; + res->physaddr = 0; } return; } ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#77 (text+ko) ==== @@ -219,7 +219,7 @@ struct usbd_page { bus_size_t physaddr; - void *buffer; /* non Kernel Virtual Address */ + void *buffer; /* non Kernel Virtual Address */ }; struct usbd_page_search { From owner-p4-projects@FreeBSD.ORG Sat Dec 15 18:05:15 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8ED4716A469; Sat, 15 Dec 2007 18:05:15 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2D7EC16A41A for ; Sat, 15 Dec 2007 18:05:15 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 193A513C478 for ; Sat, 15 Dec 2007 18:05:15 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBFI5EJ8093894 for ; Sat, 15 Dec 2007 18:05:14 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBFI5Eao093889 for perforce@freebsd.org; Sat, 15 Dec 2007 18:05:14 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 15 Dec 2007 18:05:14 GMT Message-Id: <200712151805.lBFI5Eao093889@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 130965 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Dec 2007 18:05:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=130965 Change 130965 by hselasky@hselasky_laptop001 on 2007/12/15 18:04:21 Revert parts of change 130054 to "usb_subr.c". We now support non-kernel virtual addresses again. NOTE: usbd_copy_in, usbd_copy_out, usbd_uiomove, usbd_bzero "struct usbd_page_cache" and "struct usbd_page" are very generic and should be factored out one day using some kind of system provided function and structures. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#73 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#73 (text+ko) ==== @@ -2014,10 +2014,21 @@ usbd_copy_in(struct usbd_page_cache *cache, uint32_t offset, const void *ptr, uint32_t len) { - void *dst; + struct usbd_page_search buf_res; + + while (len != 0) { + + usbd_get_page(cache, offset, &buf_res); + + if (buf_res.length > len) { + buf_res.length = len; + } + bcopy(ptr, buf_res.buffer, buf_res.length); - dst = USBD_ADD_BYTES(cache->buffer, offset); - bcopy(ptr, dst, len); + offset += buf_res.length; + len -= buf_res.length; + ptr = USBD_ADD_BYTES(ptr, buf_res.length); + } return; } @@ -2061,10 +2072,29 @@ usbd_uiomove(struct usbd_page_cache *pc, struct uio *uio, uint32_t pc_offset, uint32_t len) { - void *ptr; + struct usbd_page_search res; + int error = 0; + + while (len != 0) { + + usbd_get_page(pc, pc_offset, &res); + + if (res.length > len) { + res.length = len; + } + /* + * "uiomove()" can sleep so one needs to make a wrapper, + * exiting the mutex and checking things + */ + error = uiomove(res.buffer, res.length, uio); - ptr = USBD_ADD_BYTES(pc->buffer, pc_offset); - return (uiomove(ptr, len, uio)); + if (error) { + break; + } + pc_offset += res.length; + len -= res.length; + } + return (error); } /*------------------------------------------------------------------------* @@ -2074,10 +2104,21 @@ usbd_copy_out(struct usbd_page_cache *cache, uint32_t offset, void *ptr, uint32_t len) { - void *src; + struct usbd_page_search res; + + while (len != 0) { + + usbd_get_page(cache, offset, &res); + + if (res.length > len) { + res.length = len; + } + bcopy(res.buffer, ptr, res.length); - src = USBD_ADD_BYTES(cache->buffer, offset); - bcopy(src, ptr, len); + offset += res.length; + len -= res.length; + ptr = USBD_ADD_BYTES(ptr, res.length); + } return; } @@ -2087,10 +2128,20 @@ void usbd_bzero(struct usbd_page_cache *cache, uint32_t offset, uint32_t len) { - void *ptr; + struct usbd_page_search res; + + while (len != 0) { + + usbd_get_page(cache, offset, &res); + + if (res.length > len) { + res.length = len; + } + bzero(res.buffer, res.length); - ptr = USBD_ADD_BYTES(cache->buffer, offset); - bzero(ptr, len); + offset += res.length; + len -= res.length; + } return; } From owner-p4-projects@FreeBSD.ORG Sat Dec 15 18:19:30 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C3CAB16A4ED; Sat, 15 Dec 2007 18:19:30 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 48D5516A50A for ; Sat, 15 Dec 2007 18:19:30 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 29ADE13C45D for ; Sat, 15 Dec 2007 18:19:30 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBFIJUUD097717 for ; Sat, 15 Dec 2007 18:19:30 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBFIJUQi097714 for perforce@freebsd.org; Sat, 15 Dec 2007 18:19:30 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 15 Dec 2007 18:19:30 GMT Message-Id: <200712151819.lBFIJUQi097714@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 130966 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Dec 2007 18:19:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=130966 Change 130966 by hselasky@hselasky_laptop001 on 2007/12/15 18:19:21 Reintroduce support for non KVA to UCOM layer. Reverts change 130019 . Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ucom.c#26 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ucom.c#26 (text+ko) ==== @@ -1023,8 +1023,10 @@ ucom_get_data(struct ucom_softc *sc, struct usbd_page_cache *pc, uint32_t offset, uint32_t len, uint32_t *actlen) { + struct usbd_page_search res; struct tty *tp = sc->sc_tty; uint32_t cnt; + uint32_t offset_orig; mtx_assert(sc->sc_parent_mtx, MA_OWNED); @@ -1054,9 +1056,27 @@ DPRINTF(0, "stopped\n"); goto done; } - cnt = q_to_b(&(tp->t_outq), usbd_get_buffer(pc, offset), len); + offset_orig = offset; + + while (len != 0) { + + usbd_get_page(pc, offset, &res); + + if (res.length > len) { + res.length = len; + } + cnt = q_to_b(&(tp->t_outq), res.buffer, res.length); + + offset += cnt; + len -= cnt; + + if (cnt < res.length) { + /* end of buffer */ + break; + } + } - actlen[0] = cnt; + actlen[0] = offset - offset_orig; DPRINTF(0, "cnt=%d\n", actlen[0]); @@ -1079,8 +1099,8 @@ ucom_put_data(struct ucom_softc *sc, struct usbd_page_cache *pc, uint32_t offset, uint32_t len) { + struct usbd_page_search res; struct tty *tp = sc->sc_tty; - uint8_t *buf; uint32_t cnt; mtx_assert(sc->sc_parent_mtx, MA_OWNED); @@ -1091,19 +1111,28 @@ } /* set a flag to prevent recursation ? */ - buf = usbd_get_buffer(pc, offset); + while (len > 0) { + + usbd_get_page(pc, offset, &res); + + if (res.length > len) { + res.length = len; + } + len -= res.length; + offset += res.length; if (tp->t_state & TS_CAN_BYPASS_L_RINT) { - if (((tp->t_rawq.c_cc + len) > tp->t_ihiwat) && + if (((tp->t_rawq.c_cc + res.length) > tp->t_ihiwat) && ((sc->sc_flag & UCOM_FLAG_RTS_IFLOW) || (tp->t_iflag & IXOFF)) && (!(tp->t_state & TS_TBLOCK))) { ttyblock(tp); } - cnt = b_to_q(buf, len, &(tp->t_rawq)); + + cnt = b_to_q(res.buffer, res.length, &(tp->t_rawq)); - tp->t_rawcc += len; + tp->t_rawcc += res.length; ttwakeup(tp); @@ -1120,20 +1149,25 @@ } } else { + uint8_t *buf; + /* pass characters to tty layer */ - for (cnt = 0; cnt != len; cnt++) { + buf = res.buffer; + + for (cnt = 0; cnt != res.length; cnt++) { if (ttyld_rint(tp, buf[cnt]) == -1) { /* XXX what should we do? */ DPRINTF(0, "tp=%p, lost %d " - "chars\n", tp, len - cnt); + "chars\n", tp, res.length - cnt); break; } } } + } if ((sc->sc_flag & UCOM_FLAG_RTS_IFLOW) && (!(sc->sc_mcr & SER_RTS)) && From owner-p4-projects@FreeBSD.ORG Sat Dec 15 18:20:34 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 06A9C16A477; Sat, 15 Dec 2007 18:20:34 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 92C2916A474 for ; Sat, 15 Dec 2007 18:20:33 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7E5D613C4D3 for ; Sat, 15 Dec 2007 18:20:33 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBFIKX0t098010 for ; Sat, 15 Dec 2007 18:20:33 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBFIKXAm098004 for perforce@freebsd.org; Sat, 15 Dec 2007 18:20:33 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 15 Dec 2007 18:20:33 GMT Message-Id: <200712151820.lBFIKXAm098004@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 130967 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Dec 2007 18:20:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=130967 Change 130967 by hselasky@hselasky_laptop001 on 2007/12/15 18:20:13 Style change by "usb_style.sh". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ucom.c#27 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ucom.c#27 (text+ko) ==== @@ -1060,20 +1060,20 @@ while (len != 0) { - usbd_get_page(pc, offset, &res); - - if (res.length > len) { - res.length = len; - } - cnt = q_to_b(&(tp->t_outq), res.buffer, res.length); + usbd_get_page(pc, offset, &res); + + if (res.length > len) { + res.length = len; + } + cnt = q_to_b(&(tp->t_outq), res.buffer, res.length); + + offset += cnt; + len -= cnt; - offset += cnt; - len -= cnt; - - if (cnt < res.length) { - /* end of buffer */ - break; - } + if (cnt < res.length) { + /* end of buffer */ + break; + } } actlen[0] = offset - offset_orig; @@ -1112,62 +1112,61 @@ /* set a flag to prevent recursation ? */ while (len > 0) { - - usbd_get_page(pc, offset, &res); - - if (res.length > len) { - res.length = len; - } - len -= res.length; - offset += res.length; - if (tp->t_state & TS_CAN_BYPASS_L_RINT) { + usbd_get_page(pc, offset, &res); - if (((tp->t_rawq.c_cc + res.length) > tp->t_ihiwat) && - ((sc->sc_flag & UCOM_FLAG_RTS_IFLOW) || - (tp->t_iflag & IXOFF)) && - (!(tp->t_state & TS_TBLOCK))) { - ttyblock(tp); + if (res.length > len) { + res.length = len; } + len -= res.length; + offset += res.length; - cnt = b_to_q(res.buffer, res.length, &(tp->t_rawq)); + if (tp->t_state & TS_CAN_BYPASS_L_RINT) { + + if (((tp->t_rawq.c_cc + res.length) > tp->t_ihiwat) && + ((sc->sc_flag & UCOM_FLAG_RTS_IFLOW) || + (tp->t_iflag & IXOFF)) && + (!(tp->t_state & TS_TBLOCK))) { + ttyblock(tp); + } + cnt = b_to_q(res.buffer, res.length, &(tp->t_rawq)); - tp->t_rawcc += res.length; + tp->t_rawcc += res.length; - ttwakeup(tp); + ttwakeup(tp); - if ((tp->t_state & TS_TTSTOP) && - ((tp->t_iflag & IXANY) || - (tp->t_cc[VSTART] == tp->t_cc[VSTOP]))) { - tp->t_state &= ~TS_TTSTOP; - tp->t_lflag &= ~FLUSHO; - ucom_start_write(tp); - } - if (cnt > 0) { - DPRINTF(0, "tp=%p, lost %d " - "chars\n", tp, cnt); - } - } else { + if ((tp->t_state & TS_TTSTOP) && + ((tp->t_iflag & IXANY) || + (tp->t_cc[VSTART] == tp->t_cc[VSTOP]))) { + tp->t_state &= ~TS_TTSTOP; + tp->t_lflag &= ~FLUSHO; + ucom_start_write(tp); + } + if (cnt > 0) { + DPRINTF(0, "tp=%p, lost %d " + "chars\n", tp, cnt); + } + } else { - uint8_t *buf; + uint8_t *buf; - /* pass characters to tty layer */ + /* pass characters to tty layer */ - buf = res.buffer; + buf = res.buffer; - for (cnt = 0; cnt != res.length; cnt++) { + for (cnt = 0; cnt != res.length; cnt++) { - if (ttyld_rint(tp, buf[cnt]) == -1) { + if (ttyld_rint(tp, buf[cnt]) == -1) { - /* XXX what should we do? */ + /* XXX what should we do? */ - DPRINTF(0, "tp=%p, lost %d " - "chars\n", tp, res.length - cnt); - break; + DPRINTF(0, "tp=%p, lost %d " + "chars\n", tp, res.length - cnt); + break; + } } } } - } if ((sc->sc_flag & UCOM_FLAG_RTS_IFLOW) && (!(sc->sc_mcr & SER_RTS)) && From owner-p4-projects@FreeBSD.ORG Sat Dec 15 21:56:29 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 50B6D16A421; Sat, 15 Dec 2007 21:56:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AFB6016A41A for ; Sat, 15 Dec 2007 21:56:28 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8ECCD13C461 for ; Sat, 15 Dec 2007 21:56:28 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBFLuSMi044620 for ; Sat, 15 Dec 2007 21:56:28 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBFLuSnY044617 for perforce@freebsd.org; Sat, 15 Dec 2007 21:56:28 GMT (envelope-from jb@freebsd.org) Date: Sat, 15 Dec 2007 21:56:28 GMT Message-Id: <200712152156.lBFLuSnY044617@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130974 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Dec 2007 21:56:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=130974 Change 130974 by jb@jb_freebsd1 on 2007/12/15 21:56:17 Branch the cyclic timer device. Even the API for this won't be released by Sun under anything but the CDDL, so I intend to use it as DTrace-specific until such time as we have a clean room implementation of similar functionality. This might be a good Google SoC project for someone. Affected files ... .. //depot/projects/opensolaris/src/sys/contrib/opensolaris/uts/common/os/cyclic.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sat Dec 15 22:06:40 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6922016A41B; Sat, 15 Dec 2007 22:06:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1130F16A417 for ; Sat, 15 Dec 2007 22:06:40 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 06AF613C455 for ; Sat, 15 Dec 2007 22:06:40 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBFM6dAp047380 for ; Sat, 15 Dec 2007 22:06:39 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBFM6cUh047377 for perforce@freebsd.org; Sat, 15 Dec 2007 22:06:38 GMT (envelope-from jb@freebsd.org) Date: Sat, 15 Dec 2007 22:06:38 GMT Message-Id: <200712152206.lBFM6cUh047377@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130976 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Dec 2007 22:06:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=130976 Change 130976 by jb@jb_freebsd1 on 2007/12/15 22:06:18 IFC Affected files ... .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/flyer/Makefile#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/flyer/flyer.tex#4 integrate .. //depot/projects/dtrace/ports/LEGAL#28 integrate .. //depot/projects/dtrace/ports/UPDATING#40 integrate .. //depot/projects/dtrace/src/contrib/pf/pflogd/pidfile.c#6 delete .. //depot/projects/dtrace/src/contrib/pf/pflogd/pidfile.h#6 delete .. //depot/projects/dtrace/src/games/fortune/datfiles/fortunes-o.real#9 integrate .. //depot/projects/dtrace/src/include/complex.h#5 integrate .. //depot/projects/dtrace/src/lib/msun/Makefile#7 integrate .. //depot/projects/dtrace/src/lib/msun/Symbol.map#6 integrate .. //depot/projects/dtrace/src/lib/msun/man/csqrt.3#1 branch .. //depot/projects/dtrace/src/lib/msun/src/s_csqrt.c#1 branch .. //depot/projects/dtrace/src/lib/msun/src/s_csqrtf.c#1 branch .. //depot/projects/dtrace/src/share/man/man3/tgmath.3#4 integrate .. //depot/projects/dtrace/src/share/man/man4/Makefile#24 integrate .. //depot/projects/dtrace/src/share/man/man4/hptrr.4#1 branch .. //depot/projects/dtrace/src/sys/amd64/conf/GENERIC#28 integrate .. //depot/projects/dtrace/src/sys/amd64/conf/NOTES#13 integrate .. //depot/projects/dtrace/src/sys/conf/files.amd64#25 integrate .. //depot/projects/dtrace/src/sys/conf/files.i386#29 integrate .. //depot/projects/dtrace/src/sys/conf/files.powerpc#13 integrate .. //depot/projects/dtrace/src/sys/conf/options#34 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_adapter.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_include.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_l2t.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_l2t.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_main.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_offload.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_offload.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_osdep.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/t3cdev.h#1 branch .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h#1 branch .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/toecore/toedev.c#1 branch .. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/toecore/toedev.h#2 delete .. //depot/projects/dtrace/src/sys/dev/hptrr/amd64-elf.hptrr_lib.o.uu#1 branch .. //depot/projects/dtrace/src/sys/dev/hptrr/array.h#1 branch .. //depot/projects/dtrace/src/sys/dev/hptrr/him.h#1 branch .. //depot/projects/dtrace/src/sys/dev/hptrr/himfuncs.h#1 branch .. //depot/projects/dtrace/src/sys/dev/hptrr/hptintf.h#1 branch .. //depot/projects/dtrace/src/sys/dev/hptrr/hptrr_config.c#1 branch .. //depot/projects/dtrace/src/sys/dev/hptrr/hptrr_config.h#1 branch .. //depot/projects/dtrace/src/sys/dev/hptrr/hptrr_os_bsd.c#1 branch .. //depot/projects/dtrace/src/sys/dev/hptrr/hptrr_osm_bsd.c#1 branch .. //depot/projects/dtrace/src/sys/dev/hptrr/i386-elf.hptrr_lib.o.uu#1 branch .. //depot/projects/dtrace/src/sys/dev/hptrr/ldm.h#1 branch .. //depot/projects/dtrace/src/sys/dev/hptrr/list.h#1 branch .. //depot/projects/dtrace/src/sys/dev/hptrr/os_bsd.h#1 branch .. //depot/projects/dtrace/src/sys/dev/hptrr/osm.h#1 branch .. //depot/projects/dtrace/src/sys/i386/conf/GENERIC#26 integrate .. //depot/projects/dtrace/src/sys/i386/conf/NOTES#16 integrate .. //depot/projects/dtrace/src/sys/i386/conf/PAE#9 integrate .. //depot/projects/dtrace/src/sys/modules/Makefile#29 integrate .. //depot/projects/dtrace/src/sys/modules/hptrr/Makefile#1 branch .. //depot/projects/dtrace/src/sys/net/if.h#8 integrate .. //depot/projects/dtrace/src/sys/netinet/toedev.h#3 integrate .. //depot/projects/dtrace/src/sys/powerpc/aim/clock.c#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/aim/copyinout.c#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/aim/interrupt.c#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/aim/locore.S#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/aim/machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/aim/mmu_oea.c#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/aim/nexus.c#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/aim/ofw_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/aim/ofwmagic.S#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/aim/swtch.S#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/aim/trap.c#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/aim/trap_subr.S#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/aim/uio_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/aim/uma_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/aim/vm_machdep.c#2 integrate .. //depot/projects/dtrace/src/sys/powerpc/powerpc/clock.c#11 delete .. //depot/projects/dtrace/src/sys/powerpc/powerpc/copyinout.c#7 delete .. //depot/projects/dtrace/src/sys/powerpc/powerpc/interrupt.c#5 delete .. //depot/projects/dtrace/src/sys/powerpc/powerpc/locore.S#4 delete .. //depot/projects/dtrace/src/sys/powerpc/powerpc/machdep.c#12 delete .. //depot/projects/dtrace/src/sys/powerpc/powerpc/mmu_oea.c#12 delete .. //depot/projects/dtrace/src/sys/powerpc/powerpc/nexus.c#5 delete .. //depot/projects/dtrace/src/sys/powerpc/powerpc/ofw_machdep.c#6 delete .. //depot/projects/dtrace/src/sys/powerpc/powerpc/ofwmagic.S#4 delete .. //depot/projects/dtrace/src/sys/powerpc/powerpc/swtch.S#5 delete .. //depot/projects/dtrace/src/sys/powerpc/powerpc/trap.c#10 delete .. //depot/projects/dtrace/src/sys/powerpc/powerpc/trap_subr.S#4 delete .. //depot/projects/dtrace/src/sys/powerpc/powerpc/uio_machdep.c#6 delete .. //depot/projects/dtrace/src/sys/powerpc/powerpc/uma_machdep.c#5 delete .. //depot/projects/dtrace/src/sys/powerpc/powerpc/vm_machdep.c#10 delete .. //depot/projects/dtrace/src/sys/sys/pcpu.h#17 integrate .. //depot/projects/dtrace/src/tools/regression/lib/msun/Makefile#5 integrate .. //depot/projects/dtrace/src/tools/regression/lib/msun/test-csqrt.c#1 branch .. //depot/projects/dtrace/src/tools/regression/lib/msun/test-csqrt.t#1 branch Differences ... ==== //depot/projects/dtrace/doc/fr_FR.ISO8859-1/flyer/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ -# $FreeBSD: doc/fr_FR.ISO8859-1/flyer/Makefile,v 1.1 2004/01/25 11:55:36 blackend Exp $ -# Original revision: 1.1 +# $FreeBSD: doc/fr_FR.ISO8859-1/flyer/Makefile,v 1.2 2007/12/15 08:45:49 blackend Exp $ +# Original revision: 1.2 # pdf: dvi ps @@ -9,7 +9,10 @@ dvips -t a4 flyer.dvi -o dvi: flyer.tex + pngtopnm -mix ../../share/images/flyer/logo-full.png | \ + pnmtops -noturn > logo-full.eps latex flyer.tex clean: - rm -f flyer.aux flyer.dvi flyer.log flyer.pdf flyer.ps + rm -f flyer.aux flyer.dvi flyer.log flyer.pdf flyer.ps \ + logo-full.eps ==== //depot/projects/dtrace/doc/fr_FR.ISO8859-1/flyer/flyer.tex#4 (text+ko) ==== @@ -1,4 +1,4 @@ -% Copyright (c) 2004 Marc Fonvieille +% Copyright (c) 2004-2006 Marc Fonvieille % All rights reserved. % % Redistribution and use in source and binary forms, with or without @@ -22,11 +22,14 @@ % OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF % SUCH DAMAGE. % -% $FreeBSD: doc/fr_FR.ISO8859-1/flyer/flyer.tex,v 1.8 2006/05/10 16:49:57 blackend Exp $ -% Original revision: 1.10 +% $FreeBSD: doc/fr_FR.ISO8859-1/flyer/flyer.tex,v 1.9 2007/12/15 08:45:49 blackend Exp $ +% Original revision: 1.14 % % FreeBSD Flyer % Use make FORMAT (with FORMAT: pdf, ps or dvi) to build the flyer. +% Two layouts are available: one using Beastie the other one using the +% FreeBSD Logo. The layout selection is done below via the value of +% the \logo variable. By default the Beastie layout is enabled. % \documentclass[11pt]{article} \usepackage[T1]{fontenc} @@ -41,22 +44,34 @@ %\usepackage[verbose,a4paper,noheadfoot,margin=1cm]{geometry} % Le français étant terriblement verbeux s/1cm/0.8cm pour les marges \usepackage[verbose,a4paper,noheadfoot,margin=0.8cm]{geometry} + +\usepackage{ifthen} +% Use of the Logo (set the \logo variable below to true) or Beastie +% (\logo variable set to false). +\newcommand{\logo}{false} + % Colors settings \usepackage{color} +\ifthenelse{\equal{\logo}{true}}{ +\definecolor{bkgrdtitle}{rgb}{.69,0,0} +\definecolor{redtitle}{rgb}{.65,.16,.22} +\definecolor{ovalboxcolor}{rgb}{.69,0,0} +} +{ \definecolor{bkgrdtitle}{rgb}{1,.84,.22} -%\definecolor{bkgrdtitle}{rgb}{1,.81,.3} -%\definecolor{bkgrdtitle}{rgb}{1,.87,.32} -%\definecolor{redtitle}{rgb}{.82,0,0} -%\definecolor{redtitle}{rgb}{.7,.7,.9} -%\definecolor{redtitle}{rgb}{.6,0,0} -%\definecolor{redtitle}{rgb}{.4,0,0} \definecolor{redtitle}{rgb}{.65,.16,.22} \definecolor{ovalboxcolor}{rgb}{.65,.16,.22} +} % Some macros +\ifthenelse{\equal{\logo}{true}}{ +\newcommand{\titledframe}[3]{% +\boxput*(0,1){\colorbox{bkgrdtitle}{\color{white} \large{\textbf{\textsf{#1}}}}} {\setlength {\fboxsep}{12pt} \color{ovalboxcolor}\Ovalbox {\color{black}\begin{minipage}{#3}#2\end{minipage}}} +}} +{ \newcommand{\titledframe}[3]{% \boxput*(0,1){\colorbox{bkgrdtitle}{\color{black} \large{\textbf{\textsf{#1}}}}} {\setlength {\fboxsep}{12pt} \color{ovalboxcolor}\Ovalbox {\color{black}\begin{minipage}{#3}#2\end{minipage}}} -} +}} \newcommand{\reg}{$^{\mbox{\tiny \textregistered}}$} \newcommand{\tm}{$^{\mbox{\tiny TM}}$} @@ -75,35 +90,47 @@ \begin{document} \begin{center} +\ifthenelse{\equal{\logo}{true}}{ +\includegraphics[scale=0.5]{logo-full.eps} +\vspace{0.5mm} +} +{ \fontsize{40}{36}\selectfont -{\color{redtitle} \textrm{\textbf{FreeBSD}}} +{\color{redtitle} \textrm{\textbf{FreeBSD}}}\medskip} \end{center} %\vspace{2mm} % Main part \begin{center} +\ifthenelse{\equal{\logo}{true}}{ +\newcommand{\size}{17.3cm} +} +{\newcommand{\size}{12.7cm}} + \titledframe{Qu'est-ce que FreeBSD?}{ FreeBSD est un système d'exploitation avancé pour les architectures compatibles x86 (en particulier Pentium\reg et Athlon\tm), amd64 -(Opteron\tm, Athlon\tm 64 et EM64T), Alpha/AXP, IA-64 (famille des processeurs Intel\reg -Itanium\reg), PC-98 et UltraSPARC\reg. Un portage vers les -architectures PowerPC\reg et ARM\reg est en cours. +(Opteron\tm, Athlon\tm 64 et EM64T), UltraSPARC\reg, IA-64 (famille des processeurs Intel\reg +Itanium\reg), PC-98 et ARM. FreeBSD est dérivé de BSD, la version d'UNIX\reg développée à l'Université de Californie, Berkeley. -}{12.7cm} -\begin{minipage}{4cm} +}{\size} +\ifthenelse{\equal{\logo}{false}}{ +\begin{minipage}{4.3cm} \includegraphics[scale=0.3]{../../share/images/flyer/beastie.eps} \end{minipage} +} -\vspace{1mm} +\ifthenelse{\equal{\logo}{true}}{ +\vspace{4.3mm}}{\vspace{1.5mm}} \titledframe{Des fonctions avancées}{ FreeBSD offre des fonctions avancées pour le réseau, les performances, la sécurité et la compatibilité qui sont encore absentes d'autres systèmes d'exploitation, y compris certains des meilleurs systèmes commerciaux. -}{5cm} +}{5.05cm} \titledframe{\textsf{\textbf{Des solutions performantes pour l'Internet}}}{ FreeBSD inclus ce que beaucoup considèrent comme la référence en ce @@ -114,12 +141,12 @@ sous de fortes charges, et utilise efficacement la mémoire afin de maintenir des temps de réponses corrects pour des milliers de processus utilisateurs simultanés. -}{11cm} +}{11.05cm} -\vspace{5mm} +\vspace{4.3mm} \titledframe{Des logiciels en abondance!}{ -FreeBSD est proposé avec plus de 13000 logiciels tierce-partie +FreeBSD est proposé avec plus de 14000 logiciels tierce-partie prêts à être installés dont: Apache, Samba, MySQL\reg, OpenOffice.org, KDE, GNOME, MPlayer, etc. @@ -134,7 +161,7 @@ etc., sans aucune dégradation notable de la vitesse d'exécution. }{17.3cm} -\vspace{5mm} +\vspace{4.3mm} \titledframe{FreeBSD est facile à installer}{ FreeBSD peut s'installer depuis divers supports comme des CD-ROMs, des @@ -143,7 +170,7 @@ utilisant un serveur FTP anonyme ou un serveur NFS. }{17.3cm} -\vspace{5mm} +\vspace{4.3mm} \titledframe{FreeBSD est libre et gratuit}{ FreeBSD est disponible gratuitement et est fourni avec l'intégralité @@ -156,7 +183,7 @@ parties du code source de ces logiciels. }{17.3cm} -\vspace{5mm} +\vspace{4.3mm} \titledframe{Une grande variété de domaines d'application}{ FreeBSD est très bien adapté à un grand nombre d'applications, aussi @@ -167,7 +194,7 @@ de Windows\reg et GNU/Linux. }{17.3cm} -\vspace{5mm} +\vspace{4.3mm} \titledframe{Contacts}{ \begin{itemizeflyer} @@ -179,12 +206,16 @@ % % Copyrights \begin{center} -\tiny \copyright 2004-2005 Le projet FreeBSD\\ -FreeBSD est une marque déposée de la fondation FreeBSD.\\ +\tiny \copyright 2004-2006 Le projet FreeBSD\\ +\ifthenelse{\equal{\logo}{true}}{ +FreeBSD et le logo FreeBSD sont des marques déposées de la fondation +FreeBSD.\\} +{FreeBSD est une marque déposée de la fondation FreeBSD.\\} Tous les autres noms de produits et ou de sociétés mentionnés sont les marques de leurs titulaires respectifs.\\ +\ifthenelse{\equal{\logo}{false}}{ BSD Daemon, \copyright 1988 par Marshall Kirk McKusick. Tous droits -réservés. +réservés.}{} \end{center} \end{document} ==== //depot/projects/dtrace/ports/LEGAL#28 (text+ko) ==== @@ -1,5 +1,5 @@ # Creator: Jordan Hubbard -# $FreeBSD: ports/LEGAL,v 1.559 2007/12/14 18:32:14 sat Exp $ +# $FreeBSD: ports/LEGAL,v 1.560 2007/12/14 23:08:17 pav Exp $ ********************************************************************** *** NOTE TO COMMITTERS *** @@ -422,6 +422,7 @@ mysqlman.tar.gz databases/mysqlman Not redistributable, license agreement required ncftpd-* ftp/ncftpd 30 day evaluation license +NeroDigitalAudio.zip audio/linux-nerodigitalaudio Redistribution forbidden netbeans3-* java/netbeans3 Restrictive copyright netbeans4-* java/netbeans4 Restrictive copyright netbeans5-* java/netbeans5 Restrictive copyright ==== //depot/projects/dtrace/ports/UPDATING#40 (text+ko) ==== @@ -6,6 +6,36 @@ time you update your ports collection, before attempting any port upgrades. +20071215: + AFFECTS: users of www/suphp + AUTHOR: koitsu@FreeBSD.org + + The suPHP port has been upgraded to 0.6.2. This update requires + modifications to your Apache httpd.conf, as the new version of suPHP does + things differently than the previous version -- particularly in regards + to how AddHandler is used. + + Previously, enabling suPHP was as simple as: + + suPHP_Engine on + AddType application/x-httpd-php .php + AddHandler x-httpd-php .php + + With suPHP 0.6.2, these should be changed to: + + suPHP_Engine on + AddType application/x-httpd-php .php + suPHP_AddHandler application/x-httpd-php + + If you forget this change, your PHP content will likely be offered as + downloadable content and not parsed by the PHP interpreter! + + Additionally, the new version uses a configuration file vs. compile-time + settings. The configuration file is /usr/local/etc/suphp.conf, and a + working example installed as /usr/local/etc/suphp.conf-example. It's + important that the MIME type under the [handlers] section matches what + the type passed to suPHP_AddHandler in your Apache configuration. + 20071101: AFFECTS: users of x11/nvidia-driver AUTHOR: danfe@FreeBSD.org @@ -5872,4 +5902,4 @@ 2) Update all p5-* modules. portupgrade -f p5-\* -$FreeBSD: ports/UPDATING,v 1.568 2007/11/01 13:01:57 beech Exp $ +$FreeBSD: ports/UPDATING,v 1.569 2007/12/15 15:35:53 koitsu Exp $ ==== //depot/projects/dtrace/src/games/fortune/datfiles/fortunes-o.real#9 (text+ko) ==== @@ -1,4 +1,4 @@ -%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.28 2007/12/09 01:00:11 dougb Exp $ +%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.29 2007/12/14 21:58:58 des Exp $ % PLAYGIRL, Inc. Philadelphia, Pa. 19369 @@ -755,7 +755,7 @@ "What is amiss, my friend?" asked the king. "My lord," gasped Lancelot, "you have given me the wrong key!" % - "Before we get married," said the young woman to her fiancee, + "Before we get married," said the young woman to her fiance, "I want to confess some affairs that I've had in the past." "But you told me all about those a few weeks ago," her young man replied. ==== //depot/projects/dtrace/src/include/complex.h#5 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2001 The FreeBSD Project. + * Copyright (c) 2001-2007 The FreeBSD Project. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/complex.h,v 1.7 2007/12/12 23:43:51 das Exp $ + * $FreeBSD: src/include/complex.h,v 1.8 2007/12/15 08:38:44 das Exp $ */ #ifndef _COMPLEX_H @@ -57,6 +57,8 @@ double creal(double complex); float crealf(float complex); long double creall(long double complex); +double complex csqrt(double complex); +float complex csqrtf(float complex); __END_DECLS ==== //depot/projects/dtrace/src/lib/msun/Makefile#7 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 5.1beta 93/09/24 -# $FreeBSD: src/lib/msun/Makefile,v 1.79 2007/12/12 23:43:50 das Exp $ +# $FreeBSD: src/lib/msun/Makefile,v 1.80 2007/12/15 08:38:44 das Exp $ # # ==================================================== # Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. @@ -40,7 +40,8 @@ k_tan.c k_tanf.c \ s_asinh.c s_asinhf.c s_atan.c s_atanf.c s_carg.c s_cargf.c \ s_cbrt.c s_cbrtf.c s_ceil.c s_ceilf.c s_ceill.c \ - s_copysign.c s_copysignf.c s_cos.c s_cosf.c s_erf.c s_erff.c \ + s_copysign.c s_copysignf.c s_cos.c s_cosf.c \ + s_csqrt.c s_csqrtf.c s_erf.c s_erff.c \ s_exp2.c s_exp2f.c s_expm1.c s_expm1f.c s_fabsf.c s_fdim.c \ s_finite.c s_finitef.c \ s_floor.c s_floorf.c s_floorl.c s_fma.c s_fmaf.c \ @@ -93,7 +94,7 @@ INCS= fenv.h math.h MAN= acos.3 acosh.3 asin.3 asinh.3 atan.3 atan2.3 atanh.3 ceil.3 \ - cimag.3 copysign.3 cos.3 cosh.3 erf.3 exp.3 fabs.3 fdim.3 \ + cimag.3 copysign.3 cos.3 cosh.3 csqrt.3 erf.3 exp.3 fabs.3 fdim.3 \ feclearexcept.3 feenableexcept.3 fegetenv.3 \ fegetround.3 fenv.3 floor.3 \ fma.3 fmax.3 fmod.3 hypot.3 ieee.3 ieee_test.3 ilogb.3 j0.3 \ @@ -114,6 +115,7 @@ MLINKS+=copysign.3 copysignf.3 copysign.3 copysignl.3 MLINKS+=cos.3 cosf.3 MLINKS+=cosh.3 coshf.3 +MLINKS+=csqrt.3 csqrtf.3 MLINKS+=erf.3 erfc.3 erf.3 erff.3 erf.3 erfcf.3 MLINKS+=exp.3 expm1.3 exp.3 log.3 exp.3 log10.3 exp.3 log1p.3 exp.3 pow.3 \ exp.3 exp2.3 exp.3 exp2f.3 exp.3 expf.3 \ ==== //depot/projects/dtrace/src/lib/msun/Symbol.map#6 (text) ==== @@ -1,6 +1,8 @@ /* - * $FreeBSD: src/lib/msun/Symbol.map,v 1.6 2007/12/14 03:08:10 das Exp $ + * $FreeBSD: src/lib/msun/Symbol.map,v 1.7 2007/12/15 08:39:03 das Exp $ */ + +/* 7.0-CURRENT */ FBSD_1.0 { __fe_dfl_env; tgamma; @@ -60,8 +62,6 @@ asinhf; atan; atanf; - carg; - cargf; cbrt; cbrtf; ceil; @@ -183,3 +183,11 @@ drem; dremf; }; + +/* First added in 8.0-CURRENT */ +FBSD_1.1 { + carg; + cargf; + csqrt; + csqrtf; +}; ==== //depot/projects/dtrace/src/share/man/man3/tgmath.3#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man3/tgmath.3,v 1.2 2005/01/13 11:22:29 ru Exp $ +.\" $FreeBSD: src/share/man/man3/tgmath.3,v 1.3 2007/12/15 02:40:10 das Exp $ .\" .Dd August 14, 2004 .Os @@ -101,6 +101,7 @@ .It Fn exp Ta Fn exp Ta Fn cexp .It Fn log Ta Fn log Ta Fn clog .It Fn pow Ta Fn pow Ta Fn cpow +.It Fn sqrt Ta Fn sqrt Ta Fn csqrt .It Fn fabs Ta Fn fabs Ta Fn cabs .El .Pp ==== //depot/projects/dtrace/src/share/man/man4/Makefile#24 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.399 2007/11/13 11:23:52 ru Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.400 2007/12/15 00:56:15 scottl Exp $ MAN= aac.4 \ acpi.4 \ @@ -103,6 +103,7 @@ hme.4 \ ${_hptiop.4} \ ${_hptmv.4} \ + ${_hptrr.4} \ hwpmc.4 \ ichsmb.4 \ ${_ichwd.4} \ @@ -547,6 +548,7 @@ _coretemp.4= coretemp.4 _hptiop.4= hptiop.4 _hptmv.4= hptmv.4 +_hptrr.4= hptrr.4 _ichwd.4= ichwd.4 _if_nfe.4= if_nfe.4 _if_nve.4= if_nve.4 ==== //depot/projects/dtrace/src/sys/amd64/conf/GENERIC#28 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.489 2007/12/02 20:40:30 rwatson Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.490 2007/12/15 00:56:16 scottl Exp $ cpu HAMMER ident GENERIC @@ -131,6 +131,7 @@ device ciss # Compaq Smart RAID 5* device dpt # DPT Smartcache III, IV - See NOTES for options device hptmv # Highpoint RocketRAID 182x +device hptrr # Highpoint RocketRAID 17xx, 22xx, 23xx, 25xx device rr232x # Highpoint RocketRAID 232x device iir # Intel Integrated RAID device ips # IBM (Adaptec) ServeRAID ==== //depot/projects/dtrace/src/sys/amd64/conf/NOTES#13 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.72 2007/12/01 20:07:44 phk Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.73 2007/12/15 00:56:16 scottl Exp $ # # @@ -372,11 +372,15 @@ device aacp # SCSI Passthrough interface (optional, CAM required) # -# Highpoint RocketRAID 182x. This is really just software RAID on a -# Marvell SATA chip. +# Highpoint RocketRAID 182x. device hptmv # +# Highpoint RocketRAID. Supports RR172x, RR222x, RR2240, RR232x, RR2340, +# RR2210, RR174x, RR2522, RR231x, RR230x. +device hptrr + +# # Highpoint RocketRAID 232x. This is software RAID but with hardware # acceleration assistance for RAID_5. device rr232x ==== //depot/projects/dtrace/src/sys/conf/files.amd64#25 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.116 2007/12/09 21:00:36 alc Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.117 2007/12/15 00:56:15 scottl Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -72,6 +72,11 @@ dependency "$S/dev/hptmv/amd64-elf.raid.o.uu" \ compile-with "uudecode < $S/dev/hptmv/amd64-elf.raid.o.uu" \ no-implicit-rule +hptrr_lib.o optional hptrr \ + dependency "$S/dev/hptrr/amd64-elf.hptrr_lib.o.uu" \ + compile-with "uudecode < $S/dev/hptrr/amd64-elf.hptrr_lib.o.uu" \ + no-implicit-rule +# rr232x_lib.o optional rr232x \ dependency "$S/dev/rr232x/amd64-elf.rr232x_lib.o.uu" \ compile-with "uudecode < $S/dev/rr232x/amd64-elf.rr232x_lib.o.uu" \ @@ -183,6 +188,9 @@ dev/hptmv/gui_lib.c optional hptmv dev/hptmv/hptproc.c optional hptmv dev/hptmv/ioctl.c optional hptmv +dev/hptrr/hptrr_os_bsd.c optional hptrr +dev/hptrr/hptrr_osm_bsd.c optional hptrr +dev/hptrr/hptrr_config.c optional hptrr dev/hwpmc/hwpmc_amd.c optional hwpmc dev/hwpmc/hwpmc_piv.c optional hwpmc dev/hwpmc/hwpmc_x86.c optional hwpmc ==== //depot/projects/dtrace/src/sys/conf/files.i386#29 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.589 2007/12/09 21:00:36 alc Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.590 2007/12/15 00:56:15 scottl Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -77,12 +77,16 @@ compile-with "uudecode < $S/dev/hptmv/i386-elf.raid.o.uu" \ no-implicit-rule # +hptrr_lib.o optional hptrr \ + dependency "$S/dev/hptrr/i386-elf.hptrr_lib.o.uu" \ + compile-with "uudecode < $S/dev/hptrr/i386-elf.hptrr_lib.o.uu" \ + no-implicit-rule +# rr232x_lib.o optional rr232x \ dependency "$S/dev/rr232x/i386-elf.rr232x_lib.o.uu" \ compile-with "uudecode < $S/dev/rr232x/i386-elf.rr232x_lib.o.uu" \ no-implicit-rule # -# compat/linprocfs/linprocfs.c optional linprocfs compat/linsysfs/linsysfs.c optional linsysfs compat/linux/linux_emul.c optional compat_linux @@ -194,6 +198,9 @@ dev/hptmv/gui_lib.c optional hptmv dev/hptmv/hptproc.c optional hptmv dev/hptmv/ioctl.c optional hptmv +dev/hptrr/hptrr_os_bsd.c optional hptrr +dev/hptrr/hptrr_osm_bsd.c optional hptrr +dev/hptrr/hptrr_config.c optional hptrr dev/hwpmc/hwpmc_amd.c optional hwpmc dev/hwpmc/hwpmc_pentium.c optional hwpmc dev/hwpmc/hwpmc_piv.c optional hwpmc ==== //depot/projects/dtrace/src/sys/conf/files.powerpc#13 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.powerpc,v 1.67 2007/12/02 20:40:31 rwatson Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.69 2007/12/14 23:47:39 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -10,7 +10,7 @@ # font.h optional sc \ - compile-with "uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'u_char dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'u_char dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'u_char dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h" \ + compile-with "uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'u_char dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'u_char dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'u_char dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h" \ no-obj no-implicit-rule before-depend \ clean "font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8" # @@ -25,66 +25,23 @@ clean "opt_ah.h" # +crypto/blowfish/bf_enc.c optional crypto | ipsec +crypto/des/des_enc.c optional crypto | ipsec | netsmb dev/fb/fb.c optional sc dev/hwpmc/hwpmc_powerpc.c optional hwpmc dev/kbd/kbd.c optional sc +dev/ofw/openfirm.c standard +dev/ofw/ofw_bus_if.m standard +dev/ofw/ofw_bus_subr.c standard +dev/ofw/ofw_console.c standard +dev/ofw/ofw_disk.c optional ofwd +dev/powermac_nvram/powermac_nvram.c optional powermac_nvram powermac +dev/scc/scc_bfe_macio.c optional scc powermac dev/syscons/scgfbrndr.c optional sc dev/syscons/scterm-sc.c optional sc dev/syscons/scvtb.c optional sc dev/uart/uart_cpu_powerpc.c optional uart kern/syscalls.c optional ktr -powerpc/powerpc/atomic.S standard -powerpc/powerpc/autoconf.c standard -powerpc/powerpc/bcopy.c standard -powerpc/powerpc/busdma_machdep.c standard -powerpc/powerpc/clock.c standard -powerpc/powerpc/copyinout.c standard -powerpc/powerpc/copystr.c standard -powerpc/powerpc/cpu.c standard -powerpc/powerpc/elf_machdep.c standard -powerpc/powerpc/fpu.c standard -powerpc/powerpc/fuswintr.c standard -powerpc/powerpc/gdb_machdep.c optional gdb -powerpc/powerpc/in_cksum.c optional inet -powerpc/powerpc/interrupt.c standard -powerpc/powerpc/intr_machdep.c standard -powerpc/powerpc/locore.S standard no-obj -powerpc/powerpc/machdep.c standard -powerpc/powerpc/mmu_if.m standard -powerpc/powerpc/mmu_oea.c standard -powerpc/powerpc/nexus.c standard -powerpc/powerpc/ofwmagic.S standard -powerpc/powerpc/ofw_machdep.c standard -powerpc/powerpc/openpic.c standard -powerpc/powerpc/pic_if.m standard -powerpc/powerpc/pmap_dispatch.c standard -powerpc/powerpc/sc_machdep.c optional sc -powerpc/powerpc/setjmp.S standard -powerpc/powerpc/sigcode.S standard -powerpc/powerpc/stack_machdep.c optional ddb | stack -powerpc/powerpc/suswintr.c standard -powerpc/powerpc/syncicache.c standard -powerpc/powerpc/sys_machdep.c standard -powerpc/powerpc/swtch.S standard -powerpc/powerpc/trap.c standard -powerpc/powerpc/uio_machdep.c standard -powerpc/powerpc/uma_machdep.c standard -powerpc/powerpc/vm_machdep.c standard - -powerpc/powerpc/db_disasm.c optional ddb -powerpc/powerpc/db_interface.c optional ddb -powerpc/powerpc/db_hwwatch.c optional ddb -powerpc/powerpc/db_trace.c optional ddb - -crypto/blowfish/bf_enc.c optional crypto | ipsec -crypto/des/des_enc.c optional crypto | ipsec | netsmb - -dev/ofw/openfirm.c standard -dev/ofw/ofw_bus_if.m standard -dev/ofw/ofw_bus_subr.c standard -dev/ofw/ofw_console.c standard -dev/ofw/ofw_disk.c optional ofwd - libkern/ashldi3.c standard libkern/ashrdi3.c standard libkern/bcmp.c standard @@ -100,14 +57,23 @@ libkern/ucmpdi2.c standard libkern/udivdi3.c standard libkern/umoddi3.c standard - -powerpc/powerpc/mem.c optional mem -powerpc/powerpc/mp_machdep.c optional smp - +powerpc/aim/clock.c standard +powerpc/aim/copyinout.c standard +powerpc/aim/interrupt.c standard +powerpc/aim/locore.S standard no-obj +powerpc/aim/machdep.c standard +powerpc/aim/mmu_oea.c standard +powerpc/aim/nexus.c standard +powerpc/aim/ofw_machdep.c standard +powerpc/aim/ofwmagic.S standard +powerpc/aim/swtch.S standard +powerpc/aim/trap.c standard +powerpc/aim/uio_machdep.c standard +powerpc/aim/uma_machdep.c standard +powerpc/aim/vm_machdep.c standard powerpc/ofw/ofw_pci.c optional pci powerpc/ofw/ofw_pcib_pci.c optional pci powerpc/ofw/ofw_syscons.c optional sc - powerpc/powermac/ata_kauai.c optional powermac ata powerpc/powermac/ata_macio.c optional powermac ata powerpc/powermac/grackle.c optional powermac pci @@ -116,12 +82,36 @@ powerpc/powermac/openpic_macio.c optional powermac pci powerpc/powermac/pswitch.c optional powermac pswitch powerpc/powermac/uninorth.c optional powermac pci - +powerpc/powerpc/atomic.S standard +powerpc/powerpc/autoconf.c standard +powerpc/powerpc/bcopy.c standard +powerpc/powerpc/busdma_machdep.c standard +powerpc/powerpc/copystr.c standard +powerpc/powerpc/cpu.c standard +powerpc/powerpc/db_disasm.c optional ddb +powerpc/powerpc/db_hwwatch.c optional ddb +powerpc/powerpc/db_interface.c optional ddb +powerpc/powerpc/db_trace.c optional ddb +powerpc/powerpc/elf_machdep.c standard +powerpc/powerpc/fpu.c standard +powerpc/powerpc/fuswintr.c standard +powerpc/powerpc/gdb_machdep.c optional gdb +powerpc/powerpc/in_cksum.c optional inet +powerpc/powerpc/intr_machdep.c standard +powerpc/powerpc/mem.c optional mem +powerpc/powerpc/mmu_if.m standard +powerpc/powerpc/mp_machdep.c optional smp +powerpc/powerpc/openpic.c standard +powerpc/powerpc/pic_if.m standard +powerpc/powerpc/pmap_dispatch.c standard +powerpc/powerpc/sc_machdep.c optional sc +powerpc/powerpc/setjmp.S standard +powerpc/powerpc/sigcode.S standard +powerpc/powerpc/stack_machdep.c optional ddb | stack +powerpc/powerpc/suswintr.c standard +powerpc/powerpc/syncicache.c standard +powerpc/powerpc/sys_machdep.c standard powerpc/psim/iobus.c optional psim powerpc/psim/ata_iobus.c optional ata psim powerpc/psim/openpic_iobus.c optional psim powerpc/psim/uart_iobus.c optional uart psim - -dev/scc/scc_bfe_macio.c optional scc powermac - -dev/powermac_nvram/powermac_nvram.c optional powermac powermac_nvram ==== //depot/projects/dtrace/src/sys/conf/options#34 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.611 2007/12/06 02:32:42 marcel Exp $ +# $FreeBSD: src/sys/conf/options,v 1.612 2007/12/15 19:53:35 kmacy Exp $ # # On the handling of kernel options # @@ -753,3 +753,6 @@ # Interrupt filtering INTR_FILTER opt_global.h + +#Disable code to dispatch tcp offloading +TCP_OFFLOAD_DISABLE opt_inet.h ==== //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_adapter.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ POSSIBILITY OF SUCH DAMAGE. -$FreeBSD: src/sys/dev/cxgb/cxgb_adapter.h,v 1.20 2007/09/10 00:59:51 kmacy Exp $ +$FreeBSD: src/sys/dev/cxgb/cxgb_adapter.h,v 1.21 2007/12/15 21:54:58 kmacy Exp $ ***************************************************************************/ @@ -55,12 +55,14 @@ #ifdef CONFIG_DEFINED #include -#include +#include #include +#include #else #include +#include #include -#include +#include #endif #define USE_SX @@ -371,7 +373,7 @@ struct port_info port[MAX_NPORTS]; device_t portdev[MAX_NPORTS]; - struct toedev tdev; + struct t3cdev tdev; char fw_version[64]; uint32_t open_device_map; uint32_t registered_device_map; @@ -497,7 +499,7 @@ void t3_os_link_changed(adapter_t *adapter, int port_id, int link_status, int speed, int duplex, int fc); void t3_sge_err_intr_handler(adapter_t *adapter); -int t3_offload_tx(struct toedev *, struct mbuf *); +int t3_offload_tx(struct t3cdev *, struct mbuf *); void t3_os_ext_intr_handler(adapter_t *adapter); void t3_os_set_hw_addr(adapter_t *adapter, int port_idx, u8 hw_addr[]); int t3_mgmt_tx(adapter_t *adap, struct mbuf *m); @@ -554,7 +556,7 @@ } static __inline struct adapter * -tdev2adap(struct toedev *d) +tdev2adap(struct t3cdev *d) { return container_of(d, struct adapter, tdev); } ==== //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_include.h#2 (text+ko) ==== @@ -1,8 +1,9 @@ /* - * $FreeBSD: src/sys/dev/cxgb/cxgb_include.h,v 1.2 2007/09/10 00:59:51 kmacy Exp $ + * $FreeBSD: src/sys/dev/cxgb/cxgb_include.h,v 1.3 2007/12/15 21:54:58 kmacy Exp $ */ + #ifdef CONFIG_DEFINED #include #include @@ -14,11 +15,9 @@ #include #include #include -#include #include #include - - +#include #else #include #include @@ -31,7 +30,9 @@ #include #include -#include #include #include +#include #endif + + ==== //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_l2t.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_l2t.c,v 1.3 2007/08/17 05:57:03 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_l2t.c,v 1.4 2007/12/15 21:54:58 kmacy Exp $"); #include #include @@ -59,7 +59,7 @@ #define VLAN_NONE 0xfff #define SDL(s) ((struct sockaddr_dl *)s) -#define RT_ENADDR(rt) ((u_char *)LLADDR(SDL((rt)))) +#define RT_ENADDR(sa) ((u_char *)LLADDR(SDL((sa)))) #define rt_expire rt_rmx.rmx_expire struct llinfo_arp { @@ -103,11 +103,8 @@ RT_ADDREF(rt); RT_UNLOCK(rt); - if (e->neigh) { - RT_LOCK(e->neigh); - RT_REMREF(e->neigh); - RT_UNLOCK(e->neigh); - } + if (e->neigh) + RTFREE(e->neigh); e->neigh = rt; } @@ -117,7 +114,7 @@ * entry locked. */ static int -setup_l2e_send_pending(struct toedev *dev, struct mbuf *m, +setup_l2e_send_pending(struct t3cdev *dev, struct mbuf *m, struct l2t_entry *e) { struct cpl_l2t_write_req *req; @@ -130,13 +127,14 @@ * XXX MH_ALIGN */ req = mtod(m, struct cpl_l2t_write_req *); + m->m_pkthdr.len = m->m_len = sizeof(*req); + req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD)); OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_L2T_WRITE_REQ, e->idx)); req->params = htonl(V_L2T_W_IDX(e->idx) | V_L2T_W_IFF(e->smt_idx) | V_L2T_W_VLAN(e->vlan & EVL_VLID_MASK) | >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Dec 15 22:07:41 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B47FE16A420; Sat, 15 Dec 2007 22:07:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7A2BD16A41A for ; Sat, 15 Dec 2007 22:07:41 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 59E7913C4D9 for ; Sat, 15 Dec 2007 22:07:41 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBFM7f4V047452 for ; Sat, 15 Dec 2007 22:07:41 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBFM7fol047449 for perforce@freebsd.org; Sat, 15 Dec 2007 22:07:41 GMT (envelope-from jb@freebsd.org) Date: Sat, 15 Dec 2007 22:07:41 GMT Message-Id: <200712152207.lBFM7fol047449@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130978 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Dec 2007 22:07:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=130978 Change 130978 by jb@jb_freebsd1 on 2007/12/15 22:07:31 Suck the cyclic timer in it's virgin state. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/os/cyclic.c#3 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sat Dec 15 22:17:53 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE0F016A41A; Sat, 15 Dec 2007 22:17:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7045116A47E for ; Sat, 15 Dec 2007 22:17:52 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 642CF13C4F7 for ; Sat, 15 Dec 2007 22:17:52 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBFMHqGX050929 for ; Sat, 15 Dec 2007 22:17:52 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBFMHq7i050926 for perforce@freebsd.org; Sat, 15 Dec 2007 22:17:52 GMT (envelope-from jb@freebsd.org) Date: Sat, 15 Dec 2007 22:17:52 GMT Message-Id: <200712152217.lBFMHq7i050926@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 130980 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Dec 2007 22:17:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=130980 Change 130980 by jb@jb_freebsd1 on 2007/12/15 22:17:16 IFC Affected files ... .. //depot/projects/dtrace/src/sys/modules/cxgb/Makefile#2 integrate .. //depot/projects/dtrace/src/sys/modules/cxgb/cxgb/Makefile#1 branch .. //depot/projects/dtrace/src/sys/modules/cxgb/toecore/Makefile#1 branch .. //depot/projects/dtrace/src/sys/net/if.h#9 integrate Differences ... ==== //depot/projects/dtrace/src/sys/modules/cxgb/Makefile#2 (text+ko) ==== @@ -1,45 +1,7 @@ -# $FreeBSD: src/sys/modules/cxgb/Makefile,v 1.10 2007/09/09 01:28:02 kmacy Exp $ +# $FreeBSD: src/sys/modules/cxgb/Makefile,v 1.11 2007/12/15 22:03:18 kmacy Exp $ +SUBDIR= cxgb +SUBDIR+= toecore +#SUBDIR+= tom +#SUBDIR+= iw_cxgb -CXGB = ${.CURDIR}/../../dev/cxgb -.PATH: ${CXGB} ${CXGB}/common ${CXGB}/sys - -KMOD= if_cxgb -SRCS= cxgb_mc5.c cxgb_vsc8211.c cxgb_ael1002.c cxgb_mv88e1xxx.c -SRCS+= cxgb_xgmac.c cxgb_vsc7323.c cxgb_t3_hw.c cxgb_main.c -SRCS+= cxgb_sge.c cxgb_lro.c cxgb_offload.c cxgb_l2t.c -SRCS+= device_if.h bus_if.h pci_if.h opt_zero.h -SRCS+= uipc_mvec.c - -CFLAGS+= -DCONFIG_CHELSIO_T3_CORE -g -DCONFIG_DEFINED -DDEFAULT_JUMBO -I${CXGB} -#CFLAGS+= -DDEBUG -DDEBUG_PRINT -#CFLAGS+= -DINVARIANT_SUPPORT -DINVARIANTS -DWITNESS - - -.if ${MACHINE_ARCH} != "ia64" -# ld is broken on ia64 -t3fw-4.7.0.bin: ${CXGB}/t3fw-4.7.0.bin.gz.uu - uudecode -p < ${CXGB}/t3fw-4.7.0.bin.gz.uu \ - | gzip -dc > ${.TARGET} - -FIRMWS= t3fw-4.7.0.bin:t3fw470 -CLEANFILES+= t3fw-4.7.0.bin - -t3b_protocol_sram-1.1.0.bin: ${CXGB}/t3b_protocol_sram-1.1.0.bin.gz.uu - uudecode -p < ${CXGB}/t3b_protocol_sram-1.1.0.bin.gz.uu \ - | gzip -dc > ${.TARGET} - -FIRMWS+= t3b_protocol_sram-1.1.0.bin:t3bps110 -CLEANFILES+= t3b_protocol_sram-1.1.0.bin - -t3b_tp_eeprom-1.1.0.bin: ${CXGB}/t3b_tp_eeprom-1.1.0.bin.gz.uu - uudecode -p < ${CXGB}/t3b_tp_eeprom-1.1.0.bin.gz.uu \ - | gzip -dc > ${.TARGET} - -FIRMWS+= t3b_tp_eeprom-1.1.0.bin:t3btpe110 -CLEANFILES+= t3b_tp_eeprom-1.1.0.bin - - -.endif - - -.include +.include ==== //depot/projects/dtrace/src/sys/net/if.h#9 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)if.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/net/if.h,v 1.111 2007/12/15 21:01:48 kmacy Exp $ + * $FreeBSD: src/sys/net/if.h,v 1.112 2007/12/15 22:06:23 kmacy Exp $ */ #ifndef _NET_IF_H_ @@ -218,7 +218,7 @@ #define IFCAP_HWCSUM (IFCAP_RXCSUM | IFCAP_TXCSUM) #define IFCAP_TSO (IFCAP_TSO4 | IFCAP_TSO6) #define IFCAP_WOL (IFCAP_WOL_UCAST | IFCAP_WOL_MCAST | IFCAP_WOL_MAGIC) -#define IFCAP_TSO (IFCAP_TOE4 | IFCAP_TOE6) +#define IFCAP_TOE (IFCAP_TOE4 | IFCAP_TOE6) #define IFQ_MAXLEN 50 #define IFNET_SLOWHZ 1 /* granularity is 1 second */