From owner-p4-projects@FreeBSD.ORG Sun Jun 8 14:26:56 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 631F537B404; Sun, 8 Jun 2003 14:26:55 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1137137B401 for ; Sun, 8 Jun 2003 14:26:55 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CF32A43FBF for ; Sun, 8 Jun 2003 14:26:53 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h58LQr0U001897 for ; Sun, 8 Jun 2003 14:26:53 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h58LQq9G001879 for perforce@freebsd.org; Sun, 8 Jun 2003 14:26:52 -0700 (PDT) Date: Sun, 8 Jun 2003 14:26:52 -0700 (PDT) Message-Id: <200306082126.h58LQq9G001879@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 Subject: PERFORCE change 32817 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Jun 2003 21:26:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=32817 Change 32817 by marcel@marcel_nfs on 2003/06/08 14:26:30 IFC @32816 Affected files ... .. //depot/projects/ia64/Makefile.inc1#65 integrate .. //depot/projects/ia64/bin/cp/cp.1#6 integrate .. //depot/projects/ia64/bin/ed/Makefile#5 integrate .. //depot/projects/ia64/bin/ps/ps.1#15 integrate .. //depot/projects/ia64/contrib/groff/tmac/X.tmac#4 integrate .. //depot/projects/ia64/contrib/groff/tmac/groff_mdoc.man#7 integrate .. //depot/projects/ia64/etc/defaults/rc.conf#33 integrate .. //depot/projects/ia64/etc/network.subr#4 integrate .. //depot/projects/ia64/etc/pccard_ether#7 integrate .. //depot/projects/ia64/etc/rc.d/dhclient#5 integrate .. //depot/projects/ia64/etc/rc.subr#11 integrate .. //depot/projects/ia64/gnu/lib/libdialog/dialog.3#2 integrate .. //depot/projects/ia64/lib/libalias/libalias.3#4 integrate .. //depot/projects/ia64/lib/libc/gen/getpwent.3#6 integrate .. //depot/projects/ia64/lib/libc/gen/popen.3#3 integrate .. //depot/projects/ia64/lib/libc/gen/statvfs.3#5 integrate .. //depot/projects/ia64/lib/libc/gen/tzset.3#2 integrate .. //depot/projects/ia64/lib/libc/net/gethostbyname.3#6 integrate .. //depot/projects/ia64/lib/libc/stdio/fflush.3#3 integrate .. //depot/projects/ia64/lib/libc/sys/getfsstat.2#5 integrate .. //depot/projects/ia64/lib/libc/sys/getsockname.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/sched_setparam.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/sched_setscheduler.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/sigsuspend.2#3 integrate .. //depot/projects/ia64/lib/libc_r/man/sem_post.3#3 integrate .. //depot/projects/ia64/lib/libcompat/regexp/regexp.3#2 integrate .. //depot/projects/ia64/lib/libcrypt/crypt.3#6 integrate .. //depot/projects/ia64/lib/libdisk/disk.c#19 integrate .. //depot/projects/ia64/lib/libftpio/ftpio.3#3 integrate .. //depot/projects/ia64/lib/libipx/ipx.3#2 integrate .. //depot/projects/ia64/lib/libnetgraph/netgraph.3#3 integrate .. //depot/projects/ia64/lib/libpthread/man/pthread_attr.3#2 integrate .. //depot/projects/ia64/lib/libpthread/man/pthread_cancel.3#2 integrate .. //depot/projects/ia64/lib/libpthread/man/pthread_cleanup_pop.3#2 integrate .. //depot/projects/ia64/lib/libpthread/man/pthread_cleanup_push.3#2 integrate .. //depot/projects/ia64/lib/libpthread/man/pthread_cond_broadcast.3#2 integrate .. //depot/projects/ia64/lib/libpthread/man/pthread_cond_destroy.3#2 integrate .. //depot/projects/ia64/lib/libpthread/man/pthread_cond_init.3#2 integrate .. //depot/projects/ia64/lib/libpthread/man/pthread_cond_signal.3#2 integrate .. //depot/projects/ia64/lib/libpthread/man/pthread_cond_timedwait.3#2 integrate .. //depot/projects/ia64/lib/libpthread/man/pthread_cond_wait.3#2 integrate .. //depot/projects/ia64/lib/libpthread/man/pthread_condattr.3#2 integrate .. //depot/projects/ia64/lib/libpthread/man/pthread_create.3#2 integrate .. //depot/projects/ia64/lib/libpthread/man/pthread_detach.3#2 integrate .. //depot/projects/ia64/lib/libpthread/support/Makefile.inc#2 integrate .. //depot/projects/ia64/lib/libpthread/support/thr_support.c#2 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#19 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_sig.c#12 integrate .. //depot/projects/ia64/libexec/ftpd/ftpd.8#13 integrate .. //depot/projects/ia64/libexec/getty/gettytab.5#6 integrate .. //depot/projects/ia64/libexec/rexecd/rexecd.8#3 integrate .. //depot/projects/ia64/libexec/rshd/rshd.8#4 integrate .. //depot/projects/ia64/libexec/rtld-elf/ia64/reloc.c#12 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/errata/article.sgml#18 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#97 integrate .. //depot/projects/ia64/release/doc/share/sgml/release.ent#9 integrate .. //depot/projects/ia64/release/pc98/dokern.sh#12 integrate .. //depot/projects/ia64/sbin/badsect/badsect.8#5 integrate .. //depot/projects/ia64/sbin/bsdlabel/bsdlabel.c#10 integrate .. //depot/projects/ia64/sbin/bsdlabel/runtest.sh#5 integrate .. //depot/projects/ia64/sbin/dump/dump.8#16 integrate .. //depot/projects/ia64/sbin/fsck_msdosfs/fsck_msdosfs.8#7 integrate .. //depot/projects/ia64/sbin/init/init.8#7 integrate .. //depot/projects/ia64/sbin/restore/restore.8#9 integrate .. //depot/projects/ia64/sbin/routed/rtquery/rtquery.8#5 integrate .. //depot/projects/ia64/sbin/sysctl/sysctl.8#10 integrate .. //depot/projects/ia64/secure/usr.bin/Makefile#7 integrate .. //depot/projects/ia64/share/colldef/uk_UA.KOI8-U.src#3 integrate .. //depot/projects/ia64/share/man/man4/mac_lomac.4#7 integrate .. //depot/projects/ia64/share/man/man4/mac_seeotheruids.4#8 integrate .. //depot/projects/ia64/share/man/man4/mac_test.4#8 integrate .. //depot/projects/ia64/share/man/man4/ng_bridge.4#2 integrate .. //depot/projects/ia64/share/man/man4/rp.4#3 integrate .. //depot/projects/ia64/share/man/man5/rc.conf.5#40 integrate .. //depot/projects/ia64/share/man/man7/environ.7#4 integrate .. //depot/projects/ia64/share/man/man8/yp.8#4 integrate .. //depot/projects/ia64/share/man/man9/VOP_SETEXTATTR.9#7 integrate .. //depot/projects/ia64/share/mk/bsd.sys.mk#20 integrate .. //depot/projects/ia64/share/termcap/termcap.5#3 integrate .. //depot/projects/ia64/sys/alpha/conf/GENERIC#23 integrate .. //depot/projects/ia64/sys/boot/ficl/Makefile#5 integrate .. //depot/projects/ia64/sys/boot/ficl/loader.c#5 integrate .. //depot/projects/ia64/sys/boot/i386/kgzldr/Makefile#8 integrate .. //depot/projects/ia64/sys/boot/i386/libi386/Makefile#9 integrate .. //depot/projects/ia64/sys/boot/pc98/kgzldr/Makefile#7 integrate .. //depot/projects/ia64/sys/boot/pc98/libpc98/Makefile#8 integrate .. //depot/projects/ia64/sys/boot/pc98/libpc98/i386_module.c#1 branch .. //depot/projects/ia64/sys/boot/pc98/loader/Makefile#7 integrate .. //depot/projects/ia64/sys/boot/pc98/loader/help.pc98#1 branch .. //depot/projects/ia64/sys/conf/ldscript.sparc64#2 integrate .. //depot/projects/ia64/sys/dev/ata/ata-chipset.c#17 integrate .. //depot/projects/ia64/sys/dev/ata/ata-pci.c#28 integrate .. //depot/projects/ia64/sys/dev/exca/exca.c#7 integrate .. //depot/projects/ia64/sys/dev/exca/excavar.h#5 integrate .. //depot/projects/ia64/sys/dev/ofw/openfirm.c#5 integrate .. //depot/projects/ia64/sys/dev/ofw/openfirm.h#4 integrate .. //depot/projects/ia64/sys/dev/pccbb/pccbb.c#28 integrate .. //depot/projects/ia64/sys/dev/pccbb/pccbbvar.h#9 integrate .. //depot/projects/ia64/sys/dev/pci/pci.c#22 integrate .. //depot/projects/ia64/sys/dev/vx/if_vx.c#10 integrate .. //depot/projects/ia64/sys/geom/geom.h#34 integrate .. //depot/projects/ia64/sys/geom/geom_ccd.c#2 integrate .. //depot/projects/ia64/sys/geom/geom_ctl.c#12 integrate .. //depot/projects/ia64/sys/geom/geom_dev.c#37 integrate .. //depot/projects/ia64/sys/geom/geom_dump.c#20 integrate .. //depot/projects/ia64/sys/geom/geom_event.c#21 integrate .. //depot/projects/ia64/sys/geom/geom_slice.c#29 integrate .. //depot/projects/ia64/sys/geom/geom_subr.c#31 integrate .. //depot/projects/ia64/sys/gnu/dev/sound/pci/emu10k1-alsa.h#1 branch .. //depot/projects/ia64/sys/i386/conf/GENERIC#37 integrate .. //depot/projects/ia64/sys/i386/include/acpica_machdep.h#3 integrate .. //depot/projects/ia64/sys/ia64/conf/GENERIC#31 integrate .. //depot/projects/ia64/sys/kern/kern_exec.c#49 integrate .. //depot/projects/ia64/sys/kern/sched_ule.c#15 integrate .. //depot/projects/ia64/sys/kern/vfs_mount.c#17 integrate .. //depot/projects/ia64/sys/pc98/conf/GENERIC#32 integrate .. //depot/projects/ia64/sys/pc98/pc98/wd.c#11 integrate .. //depot/projects/ia64/sys/pc98/pc98/wd_cd.c#9 integrate .. //depot/projects/ia64/sys/pci/if_dc.c#37 integrate .. //depot/projects/ia64/sys/pci/if_dcreg.h#12 integrate .. //depot/projects/ia64/sys/powerpc/conf/GENERIC#21 integrate .. //depot/projects/ia64/sys/sparc64/conf/GENERIC#35 integrate .. //depot/projects/ia64/sys/sparc64/include/db_machdep.h#3 integrate .. //depot/projects/ia64/sys/sparc64/include/ofw_mem.h#3 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/dump_machdep.c#5 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/machdep.c#40 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/vm_machdep.c#24 integrate .. //depot/projects/ia64/sys/sys/disklabel.h#26 integrate .. //depot/projects/ia64/sys/vm/swap_pager.c#26 integrate .. //depot/projects/ia64/sys/vm/vm_kern.c#22 integrate .. //depot/projects/ia64/sys/vm/vm_page.c#45 integrate .. //depot/projects/ia64/tools/debugscripts/dot.gdbinit#2 integrate .. //depot/projects/ia64/tools/debugscripts/gdbinit.i386#2 integrate .. //depot/projects/ia64/tools/debugscripts/gdbinit.kernel#2 integrate .. //depot/projects/ia64/usr.bin/apply/apply.c#5 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.freebsd#29 integrate .. //depot/projects/ia64/usr.bin/ctags/ctags.1#6 integrate .. //depot/projects/ia64/usr.bin/locate/locate/locate.1#3 integrate .. //depot/projects/ia64/usr.bin/m4/m4.1#8 integrate .. //depot/projects/ia64/usr.bin/rs/rs.1#3 integrate .. //depot/projects/ia64/usr.bin/sockstat/sockstat.c#4 integrate .. //depot/projects/ia64/usr.bin/su/su.1#6 integrate .. //depot/projects/ia64/usr.bin/symorder/symorder.1#4 integrate .. //depot/projects/ia64/usr.bin/tcopy/tcopy.1#5 integrate .. //depot/projects/ia64/usr.bin/tput/tput.1#3 integrate .. //depot/projects/ia64/usr.bin/tset/tset.1#4 integrate .. //depot/projects/ia64/usr.bin/ul/ul.1#3 integrate .. //depot/projects/ia64/usr.bin/vgrind/vgrind.1#3 integrate .. //depot/projects/ia64/usr.bin/xlint/lint1/cgram.y#6 integrate .. //depot/projects/ia64/usr.sbin/IPXrouted/IPXrouted.8#4 integrate .. //depot/projects/ia64/usr.sbin/asf/Makefile#1 branch .. //depot/projects/ia64/usr.sbin/asf/asf.8#1 branch .. //depot/projects/ia64/usr.sbin/asf/asf.c#1 branch .. //depot/projects/ia64/usr.sbin/chroot/chroot.8#5 integrate .. //depot/projects/ia64/usr.sbin/chroot/chroot.c#6 integrate .. //depot/projects/ia64/usr.sbin/i4b/g711conv/g711conv.c#2 integrate .. //depot/projects/ia64/usr.sbin/i4b/isdnd/exec.c#4 integrate .. //depot/projects/ia64/usr.sbin/i4b/isdndecode/main.c#2 integrate .. //depot/projects/ia64/usr.sbin/i4b/isdntel/files.c#2 integrate .. //depot/projects/ia64/usr.sbin/i4b/isdntel/main.c#2 integrate .. //depot/projects/ia64/usr.sbin/i4b/isdntrace/trace.c#2 integrate .. //depot/projects/ia64/usr.sbin/inetd/inetd.8#7 integrate .. //depot/projects/ia64/usr.sbin/lpr/lpd/lpd.8#6 integrate .. //depot/projects/ia64/usr.sbin/moused/moused.8#5 integrate .. //depot/projects/ia64/usr.sbin/mptable/mptable.c#2 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/sign/pkg_sign.1#3 integrate .. //depot/projects/ia64/usr.sbin/pw/pw.conf.5#2 integrate .. //depot/projects/ia64/usr.sbin/rmt/rmt.8#3 integrate .. //depot/projects/ia64/usr.sbin/sliplogin/sliplogin.8#3 integrate .. //depot/projects/ia64/usr.sbin/timed/timedc/timedc.8#3 integrate .. //depot/projects/ia64/usr.sbin/usbd/usbd.c#5 integrate .. //depot/projects/ia64/usr.sbin/ypset/ypset.c#5 integrate Differences ... ==== //depot/projects/ia64/Makefile.inc1#65 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.363 2003/05/31 21:29:38 obrien Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.365 2003/06/08 04:15:05 imp Exp $ # # Make command line options: # -DNO_KERBEROS Do not build Heimdal (Kerberos 5) @@ -202,6 +202,9 @@ PATH=${BPATH}:${PATH} \ WORLDTMP=${WORLDTMP} \ MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" +.if ${BOOTSTRAPPING} < 501100 +BMAKEENV+= CSTD= +.endif BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \ ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ BOOTSTRAPPING=${OSRELDATE} \ @@ -781,8 +784,7 @@ _startup_libs+= lib/csu/${MACHINE_ARCH} .endif -_prebuild_libs= - +_prebuild_libs+= lib/libc _generic_libs= gnu/lib .if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \ ==== //depot/projects/ia64/bin/cp/cp.1#6 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)cp.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/cp/cp.1,v 1.26 2003/04/07 11:00:56 mdodd Exp $ +.\" $FreeBSD: src/bin/cp/cp.1,v 1.27 2003/06/07 06:35:36 ru Exp $ .\" .Dd July 23, 2002 .Dt CP 1 @@ -153,21 +153,22 @@ .It Fl p Cause .Nm -to preserve in the copy as many of the modification time, access time, -file flags, file mode, user ID, and group ID as allowed by permissions. +to preserve the following attributes of each source +file in the copy: modification time, access time, +file flags, file mode, user ID, and group ID, as allowed by permissions. .Pp If the user ID and group ID cannot be preserved, no error message is displayed and the exit value is not altered. .Pp -If the source file has its set user ID bit on and the user ID cannot -be preserved, the set user ID bit is not preserved +If the source file has its set-user-ID bit on and the user ID cannot +be preserved, the set-user-ID bit is not preserved in the copy's permissions. -If the source file has its set group ID bit on and the group ID cannot -be preserved, the set group ID bit is not preserved +If the source file has its set-group-ID bit on and the group ID cannot +be preserved, the set-group-ID bit is not preserved in the copy's permissions. -If the source file has both its set user ID and set group ID bits on, +If the source file has both its set-user-ID and set-group-ID bits on, and either the user ID or group ID cannot be preserved, neither -the set user ID nor set group ID bits are preserved in the copy's +the set-user-ID nor set-group-ID bits are preserved in the copy's permissions. .It Fl v Cause @@ -194,13 +195,13 @@ .Pf ( Ic umask , see .Xr csh 1 ) . -If the source file has its set user ID bit on, that bit is removed +If the source file has its set-user-ID bit on, that bit is removed unless both the source file and the destination file are owned by the same user. -If the source file has its set group ID bit on, that bit is removed +If the source file has its set-group-ID bit on, that bit is removed unless both the source file and the destination file are in the same group and the user is a member of that group. -If both the set user ID and set group ID bits are set, all of the above +If both the set-user-ID and set-group-ID bits are set, all of the above conditions must be fulfilled or both bits are removed. .Pp Appropriate permissions are required for file creation or overwriting. ==== //depot/projects/ia64/bin/ed/Makefile#5 (text+ko) ==== @@ -1,11 +1,11 @@ -# $FreeBSD: src/bin/ed/Makefile,v 1.23 2003/06/02 19:06:28 markm Exp $ +# $FreeBSD: src/bin/ed/Makefile,v 1.24 2003/06/08 08:24:07 markm Exp $ PROG= ed SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c LINKS= ${BINDIR}/ed ${BINDIR}/red MLINKS= ed.1 red.1 -.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) +.if exists(${.CURDIR}/../../crypto) && !defined(NO_OPENSSL) DISTRIBUTION=crypto CFLAGS+=-DDES DPADD= ${LIBCRYPTO} ==== //depot/projects/ia64/bin/ps/ps.1#15 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.61 2003/04/30 19:18:50 schweikh Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.62 2003/06/08 09:48:39 charnier Exp $ .\" .Dd April 18, 1994 .Dt PS 1 @@ -325,7 +325,7 @@ The process is a session leader. .It V The process is suspended during a -.Xr vfork . +.Xr vfork 2 . .It W The process is swapped out. .It X ==== //depot/projects/ia64/contrib/groff/tmac/X.tmac#4 (text+ko) ==== @@ -18,7 +18,7 @@ .char ~ \v'-.55m'\s[\En(.s/2u]\v'.2m'\[ti]\v'-.2m'\s0\v'.55m' .char ^ \v'-.55m'\s[\En(.s/2u]\v'.3m'\[ha]\v'-.3m'\s0\v'.55m' .fchar \[va] \o'\[ua]\[da]' -.fchar \[em] \v'-.25m'\h'.05m'\D'l .9m 0' +.fchar \[em] \v'-.25m'\h'.05m'\D'l .9m 0'\h'0.05m'\v'.25m' .fchar \[en] \- .fchar \[fi] fi .fchar \[fl] fl ==== //depot/projects/ia64/contrib/groff/tmac/groff_mdoc.man#7 (text+ko) ==== @@ -3925,14 +3925,15 @@ device like .Sq latin1 or -.Sq unicode +.Sq unicode , to make the manual more efficient for viewing on-line. This behaviour can be changed (e.g.\& to create a hardcopy of the .Tn TTY output) by setting the register .Ql cR to zero while calling -.Xr groff : +.Xr groff 1 , +resulting in multiple pages instead of a single, very long page: .Pp .Dl groff -Tlatin1 -rcR=0 -mdoc foo.man > foo.txt .Pp ==== //depot/projects/ia64/etc/defaults/rc.conf#33 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.177 2003/06/01 01:43:37 gordon Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.178 2003/06/07 10:31:17 mtm Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -55,8 +55,8 @@ ### Basic network and firewall/security options: ### hostname="" # Set this! nisdomainname="NO" # Set to NIS domain if using NIS (or NO). -dhcp_program="/sbin/dhclient" # Path to dhcp client program. -dhcp_flags="" # Additional flags to pass to dhcp client. +dhclient_program="/sbin/dhclient" # Path to dhcp client program. +dhclient_flags="" # Additional flags to pass to dhcp client. firewall_enable="NO" # Set to YES to enable firewall functionality firewall_script="/etc/rc.firewall" # Which script to run to set up the firewall firewall_type="UNKNOWN" # Firewall type (see /etc/rc.firewall) ==== //depot/projects/ia64/etc/network.subr#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/etc/network.subr,v 1.147 2003/05/12 11:36:49 ume Exp $ +# $FreeBSD: src/etc/network.subr,v 1.149 2003/06/08 11:49:30 mtm Exp $ # # @@ -46,6 +46,37 @@ return 1 } +# ifconfig_down if +# Remove all inet entries from the $if interface. It returns +# 0 if inet entries were found and removed. It returns 1 if +# no entries were found or the could not be removed. +# +ifconfig_down() +{ + [ -z "$1" ] && return 1 + _ifs="^" + _ret=1 + + inetList="`ifconfig $1 | grep 'inet ' | tr "\n" "$_ifs"`" + + oldifs="$IFS" + IFS="$_ifs" + for _inet in $inetList ; do + # get rid of extraneous line + [ -z "$_inet" ] && break + + _inet=`expr "$_inet" : '.*\(inet \([0-9]\{1,3\}\.\)\{3\}[0-9]\{1,3\}\).*'` + + IFS="$oldifs" + ifconfig $1 ${_inet} delete + IFS="$_ifs" + _ret=0 + done + IFS="$oldifs" + + return $_ret +} + # ifalias_up if # Configure aliases for network interface $if. # It returns 0 if at least one alias was configured or @@ -68,6 +99,28 @@ return $_ret } +#ifalias_down if +# Remove aliases for network interface $if. +# It returns 0 if at least one alias was removed or +# 1 if there were none. +# +ifalias_down() +{ + _ret=1 + alias=0 + while : ; do + eval ifconfig_args=\$ifconfig_$1_alias${alias} + if [ -n "${ifconfig_args}" ]; then + ifconfig $1 ${ifconfig_args} -alias + alias=$((${alias} + 1)) + _ret=0 + else + break + fi + done + return $_ret +} + # ifscript_up if # Evaluate a startup script for the $if interface. # It returns 0 if a script was found and processed or @@ -82,6 +135,20 @@ return 1 } +# ifscript_down if +# Evaluate a shutdown script for the $if interface. +# It returns 0 if a script was found and processed or +# 1 if no script was found. +# +ifscript_down() +{ + if [ -r /etc/stop_if.$1 ]; then + . /etc/stop_if.$1 + return 0 + fi + return 1 +} + # Create cloneable interfaces. # clone_up() @@ -153,6 +220,16 @@ return 1 } +# ipx_down ifn +# Remove IPX addresses for interface $ifn. Returns 0 if IPX +# addresses were found and unconfigured. It returns 1, otherwise. +# +ipx_down() +{ + # XXX - So, who's an IPX expert ? + return 1 +} + # # list_net_interfaces type # List all network interfaces. The type of interface returned ==== //depot/projects/ia64/etc/pccard_ether#7 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh - # -# $FreeBSD: src/etc/pccard_ether,v 1.30 2003/05/12 11:36:49 ume Exp $ +# $FreeBSD: src/etc/pccard_ether,v 1.31 2003/06/07 19:40:54 ume Exp $ # # pccard_ether interfacename [start|stop] [ifconfig option] # @@ -28,14 +28,16 @@ sleep ${pccard_ether_delay} ;; esac - if [ -x "${dhcp_program}" ]; then - if [ `basename ${dhcp_program}` = "dhclient" ]; then + [ -n "$dhcp_program" ] && dhclient_program="$dhcp_program" + [ -n "$dhcp_flags" ] && dhclient_flags="$dhcp_flags" + if [ -x "${dhclient_program}" ]; then + if [ `basename ${dhclient_program}` = "dhclient" ]; then pidfile="/var/run/dhclient.${interface}.pid" - dhcp_flags="${dhcp_flags} -pf ${pidfile}" + dhclient_flags="${dhclient_flags} -pf ${pidfile}" fi - ${dhcp_program} ${dhcp_flags} ${interface} + ${dhclient_program} ${dhclient_flags} ${interface} else - echo "${dhcp_program}: DHCP client software not available" + echo "${dhclient_program}: DHCP client software not available" fi } ==== //depot/projects/ia64/etc/rc.d/dhclient#5 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: dhclient,v 1.8 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/dhclient,v 1.4 2003/04/20 19:14:16 mtm Exp $ +# $FreeBSD: src/etc/rc.d/dhclient,v 1.5 2003/06/07 10:31:17 mtm Exp $ # # PROVIDE: dhclient @@ -17,7 +17,6 @@ . /etc/network.subr name="dhclient" -command="/sbin/${name}" pidfile="/var/run/${name}.pid" case "${OSTYPE}" in FreeBSD) @@ -27,6 +26,7 @@ ;; NetBSD) rcvar=$name + command="/sbin/${name}" ;; esac @@ -41,7 +41,7 @@ ifscript_up ${ifn} done - rc_flags="${rc_flags} ${dhcp_flags} ${dhcp_list}" + rc_flags="${rc_flags} ${dhcp_list}" return 0 } ==== //depot/projects/ia64/etc/rc.subr#11 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.49 2002/05/21 12:31:01 lukem Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.11 2003/04/30 03:03:47 mtm Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.12 2003/06/07 10:31:17 mtm Exp $ # # Copyright (c) 1997-2002 The NetBSD Foundation, Inc. # All rights reserved. @@ -837,6 +837,8 @@ [ -n "$xntpd_enable" ] && ntpd_enable="$xntpd_enable" [ -n "$xntpd_program" ] && ntpd_program="$xntpd_program" [ -n "$xntpd_flags" ] && ntpd_flags="$xntpd_flags" + [ -n "$dhcp_program" ] && dhclient_program="$dhcp_program" + [ -n "$dhcp_flags" ] && dhclient_flags="$dhcp_flags" ;; esac ==== //depot/projects/ia64/gnu/lib/libdialog/dialog.3#2 (text+ko) ==== @@ -11,7 +11,7 @@ .\" nor does the author assume any responsibility for damages incurred with .\" its use. .\" -.\" $FreeBSD: src/gnu/lib/libdialog/dialog.3,v 1.21 2001/10/03 04:01:51 bde Exp $ +.\" $FreeBSD: src/gnu/lib/libdialog/dialog.3,v 1.22 2003/06/08 09:51:24 charnier Exp $ .\" .Dd January 1, 2000 .Dt DIALOG 3 @@ -232,16 +232,18 @@ .Pp Below is a short description of the various functions: .Pp +The .Fn draw_shadow -draws a shadow in curses window +function draws a shadow in curses window .Va win using the dimensions of .Va x , y , width and .Va height . .Pp +The .Fn draw_box -draws a bordered box using the dimensions of +function draws a bordered box using the dimensions of .Va x , y , width and .Va height . @@ -252,8 +254,9 @@ are used, if specified, while painting the box and border regions of the object. .Pp +The .Fn line_edit -invoke a simple line editor with an edit box of dimensions +function invokes a simple line editor with an edit box of dimensions .Va box_x , box_y and .Va box_width . @@ -268,23 +271,27 @@ .Va result . Returns 0 on success, 1 on Cancel, and -1 on failure or ESC. .Pp +The .Fn strheight -returns the height of string in +function returns the height of string in .Va p , counting newlines. .Pp +The .Fn strwidth -returns the width of string in +function returns the width of string in .Va p , counting newlines. .Pp +The .Fn dialog_create_rc -dump dialog library settings into +function dumps dialog library settings into .Pa filename for later retrieval as defaults. Returns 0 on success, -1 on failure. .Pp +The .Fn dialog_yesno -display a text box using +function displays a text box using .Va title and .Va prompt @@ -305,14 +312,16 @@ .Em \&No , return TRUE. .Pp +The .Fn dialog_noyes -is the same as +function is the same as .Fn dialog_yesno , except the default selection is .Em \&No . .Pp +The .Fn dialog_prgbox -display a text box of dimensions +function displays a text box of dimensions .Va height and .Va width @@ -331,16 +340,18 @@ is TRUE, a final confirmation requestor will be put up when execution terminates. Returns 0 on success, -1 on failure. .Pp +The .Fn dialog_textbox -display a text box containing the contents of +function displays a text box containing the contents of .Va file with dimensions of .Va height and .Va width . .Pp +The .Fn dialog_menu -display a menu of dimensions +function displays a menu of dimensions .Va height and .Va width @@ -402,8 +413,9 @@ values may be passed in to preserve current item selection and scroll position values across calls. .Pp +The .Fn dialog_checklist -display a menu of dimensions +function displays a menu of dimensions .Va height and .Va width @@ -485,8 +497,9 @@ .Pp Returns 0 on success, 1 on Cancel, and -1 on failure or ESC. .Pp +The .Fn dialog_radiolist -display a menu of dimensions +function displays a menu of dimensions .Va height and .Va width @@ -567,8 +580,9 @@ .Pp Returns 0 on success, 1 on Cancel and -1 on failure or ESC. .Pp +The .Fn dialog_inputbox -displays a single-line text input field in a box displaying +function displays a single-line text input field in a box displaying .Va title and .Va prompt @@ -581,8 +595,9 @@ .Pp Returns 0 on success, -1 on failure or ESC. .Pp +The .Fn dialog_fselect -brings up a file selector dialog starting at +function brings up a file selector dialog starting at .Va dir and showing only those file names matching @@ -590,8 +605,9 @@ .Pp Returns filename selected or NULL. .Pp +The .Fn dialog_dselect -brings up a directory selector dialog starting at +function brings up a directory selector dialog starting at .Va dir and showing only those directory names matching @@ -599,12 +615,14 @@ .Pp Returns directory name selected or NULL. .Pp +The .Fn dialog_notify -brings up a generic "hey, you!" notifier dialog containing +function brings up a generic "hey, you!" notifier dialog containing .Va msg . .Pp +The .Fn dialog_mesgbox -like a notifier dialog, but with more control over +function displays a notifier dialog, but with more control over .Va title , .Va prompt , .Va width @@ -615,8 +633,9 @@ .Pp Returns 0 on success, -1 on failure. .Pp +The .Fn dialog_gauge -displays a horizontal bar-graph style gauge. A value of +function displays a horizontal bar-graph style gauge. A value of .Em 100 for .Em perc @@ -624,37 +643,47 @@ .Em 0 an empty one. .Pp +The .Fn use_helpfile -for any menu supporting context sensitive help, invoke the text box +function for any menu supporting context sensitive help, invokes the text box object on this file whenever the .Em F1 key is pressed. .Pp +The .Fn use_helpline -displays this line of helpful text below any menu being displayed. +function displays this line of helpful text below any menu being displayed. .Pp +The .Fn get_helpline -get the current value of the helpful text line. +function gets the current value of the helpful text line. .Pp +The .Fn dialog_clear_norefresh -clear the screen back to the dialog background color, but don't refresh the -contents just yet. +function clears the screen back to the dialog background color, but don't +refresh the contents just yet. .Pp +The .Fn dialog_clear -clear the screen back to the dialog background color immediately. +function clears the screen back to the dialog background color immediately. .Pp +The .Fn dialog_update -do any pending screen refreshes now. +function does any pending screen refreshes now. .Pp +The .Fn init_dialog -initialize the dialog library (call this routine before any other dialog -API calls). +function initializes the dialog library (call this routine before any other +dialog API calls). .Pp +The .Fn end_dialog -shut down the dialog library (call this if you need to get back to sanity). +function shuts down the dialog library (call this if you need to get back to +sanity). .Pp +The .Fn dialog_ftree -shows a tree described by the data from the file +function shows a tree described by the data from the file .Pa filename . The data in the file should look like .Xr find 1 @@ -728,6 +757,7 @@ .Fn dialog_ftree on ESC, the function returns -1. .Pp +The .Fn dialog_tree function returns the same results as .Fn dialog_ftree . ==== //depot/projects/ia64/lib/libalias/libalias.3#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/lib/libalias/libalias.3,v 1.43 2003/06/01 23:15:00 ru Exp $ +.\" $FreeBSD: src/lib/libalias/libalias.3,v 1.44 2003/06/08 09:53:08 charnier Exp $ .\" .Dd April 13, 2000 .Dt LIBALIAS 3 @@ -98,9 +98,10 @@ .Pp This function will always return the packet aliasing engine to the same initial state. +The .Fn PacketAliasSetAddress -is normally called afterwards, and any desired changes from the default mode -bits listed above require a call to +function is normally called afterwards, and any desired changes from the +default mode bits listed above require a call to .Fn PacketAliasSetMode . .Pp It is mandatory that this function be called at the beginning of a program @@ -781,9 +782,10 @@ Once a fragment pointer is retrieved, it becomes the calling program's responsibility to free the dynamically allocated memory for the fragment. .Pp +The .Fn PacketAliasGetFragment -can be called sequentially until there are no more fragments available, -at which time it returns +function can be called sequentially until there are no more fragments +available, at which time it returns .Dv NULL . .Ed .Pp ==== //depot/projects/ia64/lib/libc/gen/getpwent.3#6 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)getpwent.3 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/lib/libc/gen/getpwent.3,v 1.23 2003/05/22 13:02:26 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/getpwent.3,v 1.24 2003/06/08 10:01:51 charnier Exp $ .\" .Dd April 16, 2003 .Dt GETPWENT 3 @@ -213,7 +213,7 @@ .Sh ERRORS These routines may fail for any of the errors specified in .Xr open 2 , -.Xr dbopen 2 , +.Xr dbopen 3 , .Xr socket 2 , and .Xr connect 2 , ==== //depot/projects/ia64/lib/libc/gen/popen.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)popen.3 8.2 (Berkeley) 5/3/95 -.\" $FreeBSD: src/lib/libc/gen/popen.3,v 1.15 2003/01/03 05:21:59 tjr Exp $ +.\" $FreeBSD: src/lib/libc/gen/popen.3,v 1.16 2003/06/08 10:01:51 charnier Exp $ .\" .Dd May 3, 1995 .Dt POPEN 3 @@ -122,7 +122,7 @@ function waits for the associated process to terminate and returns the exit status of the command as returned by -.Fn wait4 . +.Xr wait4 2 . .Sh RETURN VALUES The .Fn popen @@ -147,7 +147,7 @@ already .Dq pclosed , or if -.Xr wait4 +.Xr wait4 2 returns an error. .Sh ERRORS The ==== //depot/projects/ia64/lib/libc/gen/statvfs.3#5 (text+ko) ==== @@ -26,7 +26,7 @@ .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/statvfs.3,v 1.6 2002/12/12 17:25:53 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/statvfs.3,v 1.7 2003/06/08 10:01:51 charnier Exp $ .\" .Dd July 13, 2002 .Dt STATVFS 3 @@ -63,7 +63,7 @@ .It Va f_namemax The maximum length in bytes of a file name on this file system. Applications should use -.Xr pathconf 3 +.Xr pathconf 2 instead. .It Va f_fsid Not meaningful in this implementation. @@ -141,9 +141,9 @@ or .Xr fstatfs 2 and -.Xr pathconf 3 +.Xr pathconf 2 or -.Xr fpathconf 3 , +.Xr fpathconf 2 , respectively. In addition, .Fn statvfs @@ -157,8 +157,8 @@ .Vt "struct statvfs" . .El .Sh SEE ALSO -.Xr statfs 2 , -.Xr pathconf 3 +.Xr pathconf 2 , +.Xr statfs 2 .Sh STANDARDS The .Fn statvfs ==== //depot/projects/ia64/lib/libc/gen/tzset.3#2 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)tzset.3 8.2 (Berkeley) 11/17/93 -.\" $FreeBSD: src/lib/libc/gen/tzset.3,v 1.12 2001/10/01 16:08:51 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/tzset.3,v 1.13 2003/06/08 10:01:51 charnier Exp $ .\" .Dd November 17, 1993 .Dt TZSET 3 @@ -108,7 +108,7 @@ .Fn tzsetwall function sets things up so that -.Xr localtime +.Xr localtime 3 returns the best available approximation of local wall clock time. .Sh SPECIFICATION FORMAT When ==== //depot/projects/ia64/lib/libc/net/gethostbyname.3#6 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)gethostbyname.3 8.4 (Berkeley) 5/25/95 -.\" $FreeBSD: src/lib/libc/net/gethostbyname.3,v 1.29 2003/02/06 11:04:46 charnier Exp $ +.\" $FreeBSD: src/lib/libc/net/gethostbyname.3,v 1.30 2003/06/08 10:07:14 charnier Exp $ .\" >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jun 8 15:47:33 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D25F137B404; Sun, 8 Jun 2003 15:47:32 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7BD6E37B401 for ; Sun, 8 Jun 2003 15:47:32 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 22A8D43F75 for ; Sun, 8 Jun 2003 15:47:32 -0700 (PDT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h58MlV0U007811 for ; Sun, 8 Jun 2003 15:47:31 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h58MlVPJ007808 for perforce@freebsd.org; Sun, 8 Jun 2003 15:47:31 -0700 (PDT) Date: Sun, 8 Jun 2003 15:47:31 -0700 (PDT) Message-Id: <200306082247.h58MlVPJ007808@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 32819 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Jun 2003 22:47:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=32819 Change 32819 by des@des.at.des.thinksec.com on 2003/06/08 15:47:28 Paranoia: clear buffers before returning. Submitted by: Dmitry V. Levin Affected files ... .. //depot/projects/openpam/lib/openpam_ttyconv.c#21 edit Differences ... ==== //depot/projects/openpam/lib/openpam_ttyconv.c#21 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#20 $ + * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#21 $ */ #include @@ -68,6 +68,7 @@ sigset_t saved_sigset, sigset; unsigned int saved_alarm; size_t len; + char *retval; sigemptyset(&sigset); sigaddset(&sigset, SIGINT); @@ -89,14 +90,18 @@ sigaction(SIGALRM, &saved_action, NULL); sigprocmask(SIG_SETMASK, &saved_sigset, NULL); alarm(saved_alarm); - if (timed_out || ferror(stdin) || feof(stdin)) + if (timed_out || ferror(stdin) || feof(stdin)) { + memset(buf, 0, sizeof(buf)); return (NULL); + } /* trim trailing whitespace */ for (len = strlen(buf); len > 0; --len) if (!isspace(buf[len - 1])) break; buf[len] = '\0'; - return (strdup(buf)); + retval = strdup(buf); + memset(buf, 0, sizeof(buf)); + return (retval); } static char * @@ -179,7 +184,10 @@ RETURNC(PAM_SUCCESS); fail: while (i) - FREE(resp[--i]); + if (resp[--i]->resp) { + memset(resp[i]->resp, 0, strlen(resp[i]->resp)); + FREE(resp[i]->resp); + } FREE(*resp); RETURNC(PAM_CONV_ERR); } From owner-p4-projects@FreeBSD.ORG Sun Jun 8 16:30:26 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2BE0C37B405; Sun, 8 Jun 2003 16:30:26 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B68EB37B401 for ; Sun, 8 Jun 2003 16:30:25 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4103543FDF for ; Sun, 8 Jun 2003 16:30:25 -0700 (PDT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h58NUP0U010356 for ; Sun, 8 Jun 2003 16:30:25 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h58NUO3s010353 for perforce@freebsd.org; Sun, 8 Jun 2003 16:30:24 -0700 (PDT) Date: Sun, 8 Jun 2003 16:30:24 -0700 (PDT) Message-Id: <200306082330.h58NUO3s010353@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 32821 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Jun 2003 23:30:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=32821 Change 32821 by des@des.at.des.thinksec.com on 2003/06/08 16:29:37 Autoconfuse. Affected files ... .. //depot/projects/openpam/MANIFEST#17 edit .. //depot/projects/openpam/Makefile#9 delete .. //depot/projects/openpam/Makefile.am#1 add .. //depot/projects/openpam/Makefile.inc#3 delete .. //depot/projects/openpam/autogen.sh#1 add .. //depot/projects/openpam/bin/Makefile#8 delete .. //depot/projects/openpam/bin/Makefile.am#1 add .. //depot/projects/openpam/bin/Makefile.inc#2 delete .. //depot/projects/openpam/bin/su/Makefile#9 delete .. //depot/projects/openpam/bin/su/Makefile.am#1 add .. //depot/projects/openpam/configure.in#1 add .. //depot/projects/openpam/doc/Makefile#6 delete .. //depot/projects/openpam/doc/Makefile.am#1 add .. //depot/projects/openpam/doc/man/Makefile#14 delete .. //depot/projects/openpam/doc/man/Makefile.am#1 add .. //depot/projects/openpam/include/Makefile.am#1 add .. //depot/projects/openpam/include/security/Makefile.am#1 add .. //depot/projects/openpam/lib/Makefile#22 delete .. //depot/projects/openpam/lib/Makefile.am#1 add .. //depot/projects/openpam/lib/openpam_impl.h#28 edit .. //depot/projects/openpam/misc/gendoc.pl#27 edit .. //depot/projects/openpam/modules/Makefile#10 delete .. //depot/projects/openpam/modules/Makefile.am#1 add .. //depot/projects/openpam/modules/pam_deny/Makefile#7 delete .. //depot/projects/openpam/modules/pam_deny/Makefile.am#1 add .. //depot/projects/openpam/modules/pam_deny/pam_deny.c#9 edit .. //depot/projects/openpam/modules/pam_permit/Makefile#7 delete .. //depot/projects/openpam/modules/pam_permit/Makefile.am#1 add .. //depot/projects/openpam/modules/pam_permit/pam_permit.c#9 edit .. //depot/projects/openpam/modules/pam_unix/Makefile#4 delete .. //depot/projects/openpam/modules/pam_unix/Makefile.am#1 add .. //depot/projects/openpam/modules/pam_unix/pam_unix.c#6 edit Differences ... ==== //depot/projects/openpam/MANIFEST#17 (text+ko) ==== @@ -1,21 +1,32 @@ # -# $P4: //depot/projects/openpam/MANIFEST#16 $ +# $P4: //depot/projects/openpam/MANIFEST#17 $ # CREDITS HISTORY INSTALL LICENSE MANIFEST -Makefile -Makefile.inc +Makefile.am +Makefile.in README RELNOTES -bin/Makefile -bin/Makefile.inc -bin/su/Makefile +aclocal.m4 +autogen.sh +bin/Makefile.am +bin/Makefile.in +bin/su/Makefile.am +bin/su/Makefile.in bin/su/su.c -doc/Makefile -doc/man/Makefile +config.guess +config.h.in +config.sub +configure +configure.in +depcomp +doc/Makefile.am +doc/Makefile.in +doc/man/Makefile.am +doc/man/Makefile.in doc/man/openpam.3 doc/man/openpam.man doc/man/openpam_borrow_cred.3 @@ -61,13 +72,19 @@ doc/man/pam_verror.3 doc/man/pam_vinfo.3 doc/man/pam_vprompt.3 +include/Makefile.am +include/Makefile.in +include/security/Makefile.am +include/security/Makefile.in include/security/openpam.h include/security/openpam_version.h include/security/pam_appl.h include/security/pam_constants.h include/security/pam_modules.h include/security/pam_types.h -lib/Makefile +install-sh +lib/Makefile.am +lib/Makefile.in lib/openpam_borrow_cred.c lib/openpam_configure.c lib/openpam_dispatch.c @@ -125,11 +142,20 @@ lib/pam_verror.c lib/pam_vinfo.c lib/pam_vprompt.c +ltconfig +ltmain.sh misc/gendoc.pl -modules/Makefile -modules/pam_deny/Makefile +missing +mkinstalldirs +modules/Makefile.am +modules/Makefile.in +modules/pam_deny/Makefile.am +modules/pam_deny/Makefile.in modules/pam_deny/pam_deny.c -modules/pam_permit/Makefile +modules/pam_permit/Makefile.am +modules/pam_permit/Makefile.in modules/pam_permit/pam_permit.c -modules/pam_unix/Makefile +modules/pam_unix/Makefile.am +modules/pam_unix/Makefile.in modules/pam_unix/pam_unix.c +stamp-h.in ==== //depot/projects/openpam/lib/openpam_impl.h#28 (text+ko) ==== @@ -31,12 +31,16 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_impl.h#27 $ + * $P4: //depot/projects/openpam/lib/openpam_impl.h#28 $ */ #ifndef _OPENPAM_IMPL_H_INCLUDED #define _OPENPAM_IMPL_H_INCLUDED +#ifdef HAVE_CONFIG_H +# include +#endif + #include extern const char *_pam_func_name[PAM_NUM_PRIMITIVES]; ==== //depot/projects/openpam/misc/gendoc.pl#27 (text+ko) ==== @@ -32,13 +32,14 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/openpam/misc/gendoc.pl#26 $ +# $P4: //depot/projects/openpam/misc/gendoc.pl#27 $ # use strict; +use locale; use Fcntl; use Getopt::Std; -use POSIX qw(strftime); +use POSIX qw(locale_h strftime); use vars qw($COPYRIGHT $TODAY %FUNCTIONS %PAMERR); $COPYRIGHT = ".\\\"- @@ -552,6 +553,7 @@ usage() unless (@ARGV && getopts("op", \%opts)); + setlocale(LC_ALL, "en_US.ISO8859-1"); $TODAY = strftime("%B %e, %Y", localtime(time())); $TODAY =~ s,\s+, ,g; if ($opts{'o'} || $opts{'p'}) { ==== //depot/projects/openpam/modules/pam_deny/pam_deny.c#9 (text+ko) ==== @@ -31,9 +31,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/modules/pam_deny/pam_deny.c#8 $ + * $P4: //depot/projects/openpam/modules/pam_deny/pam_deny.c#9 $ */ +#ifdef HAVE_CONFIG_H +# include +#endif + #include #include ==== //depot/projects/openpam/modules/pam_permit/pam_permit.c#9 (text+ko) ==== @@ -31,9 +31,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/modules/pam_permit/pam_permit.c#8 $ + * $P4: //depot/projects/openpam/modules/pam_permit/pam_permit.c#9 $ */ +#ifdef HAVE_CONFIG_H +# include +#endif + #include #include ==== //depot/projects/openpam/modules/pam_unix/pam_unix.c#6 (text+ko) ==== @@ -31,9 +31,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/modules/pam_unix/pam_unix.c#5 $ + * $P4: //depot/projects/openpam/modules/pam_unix/pam_unix.c#6 $ */ +#ifdef HAVE_CONFIG_H +# include +#endif + #include #include @@ -42,8 +46,8 @@ #include #include -#ifdef __GLIBC__ -#include +#ifdef HAVE_CRYPT_H +# include #endif #include From owner-p4-projects@FreeBSD.ORG Sun Jun 8 16:30:28 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5740C37B409; Sun, 8 Jun 2003 16:30:27 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2511537B404 for ; Sun, 8 Jun 2003 16:30:26 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BAFA343FDF for ; Sun, 8 Jun 2003 16:30:25 -0700 (PDT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h58NUP0U010365 for ; Sun, 8 Jun 2003 16:30:25 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h58NUPj3010360 for perforce@freebsd.org; Sun, 8 Jun 2003 16:30:25 -0700 (PDT) Date: Sun, 8 Jun 2003 16:30:25 -0700 (PDT) Message-Id: <200306082330.h58NUPj3010360@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 32822 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Jun 2003 23:30:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=32822 Change 32822 by des@des.at.des.thinksec.com on 2003/06/08 16:30:10 Document the installation procedure. Affected files ... .. //depot/projects/openpam/INSTALL#3 edit Differences ... ==== //depot/projects/openpam/INSTALL#3 (text+ko) ==== @@ -4,22 +4,44 @@ 1. REQUIREMENTS - This release of OpenPAM is targeted at FreeBSD-CURRENT, and has not - been tested on other platforms. It should, however, build with - little or no trouble other BSDs such as BSDI, Darwin, NetBSD or - OpenBSD, and should not prove much of a challenge to port to other - platforms, except for the static linking support. + See the release notes for a list of platforms OpenPAM has been + tested on. + + You will need GNU Make and the GNU C compiler to build OpenPAM. On + some platforms, you may have to install these separately. 2. CONFIGURATION - No configuration is necessary or possible at this time. + Use the "configure" shell script to configure OpenPAM for your + system. Options include: + + --with-modules-dir=DIR + Indicates the directory where PAM modules will be installed. + This option should not be used if you intend to install PAM + modules in the system library directory. + + --with-pam-su + Builds the sample PAM application. + + --with-pam-unix + Builds the sample PAM module. + + A typical invocation might look like this: + + # ./configure --with-pam-su --with-pam-unix 3. COMPILATION - Change into the top-level OpenPAM directory and run 'make'. + To compile OpenPAM, simply run "make" in the top-level OpenPAM + directory: + + # make 4. INSTALLATION - - Change into the top-level OpenPAM directory and run 'make install'. + + To install OpenPAM, simply run "make install" in the top-level + OpenPAM directory: + + # make install -$P4: //depot/projects/openpam/INSTALL#2 $ +$P4: //depot/projects/openpam/INSTALL#3 $ From owner-p4-projects@FreeBSD.ORG Sun Jun 8 16:31:28 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 43F3237B404; Sun, 8 Jun 2003 16:31:28 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EE37837B401 for ; Sun, 8 Jun 2003 16:31:27 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9533843FDF for ; Sun, 8 Jun 2003 16:31:27 -0700 (PDT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h58NVR0U010405 for ; Sun, 8 Jun 2003 16:31:27 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h58NVRM3010402 for perforce@freebsd.org; Sun, 8 Jun 2003 16:31:27 -0700 (PDT) Date: Sun, 8 Jun 2003 16:31:27 -0700 (PDT) Message-Id: <200306082331.h58NVRM3010402@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 32823 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Jun 2003 23:31:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=32823 Change 32823 by des@des.at.des.thinksec.com on 2003/06/08 16:30:40 Update the distribution script to use configure and GNU make. Affected files ... .. //depot/projects/openpam/dist.sh#7 edit Differences ... ==== //depot/projects/openpam/dist.sh#7 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $P4: //depot/projects/openpam/dist.sh#6 $ +# $P4: //depot/projects/openpam/dist.sh#7 $ # set -e @@ -9,18 +9,23 @@ distname="openpam-${release}" tarball="${distname}.tar.gz" -make cleandir -make cleandir -make depend && make +gmake clean || true +gmake distclean || true +./autogen.sh +./configure --with-pam-su --with-pam-unix +gmake install -d -m 0755 "${distname}" grep -v '^#' MANIFEST | while read file; do install -d -m 0755 "${distname}/$(dirname ${file})" || exit 1 - install -c -m 0644 "${file}" "${distname}/${file}" || exit 1 + install -c -m "${file}" "${distname}/${file}" || exit 1 +done +for f in autogen.sh configure depcomp install-sh ltconfig ltmain.sh ; do + chmod a+x "${distname}/${f}" done tar zcf "${tarball}" "${distname}" rm -rf "${distname}" -make cleandir -make cleandir +gmake clean || true +gmake distclean || true echo md5 "${tarball}" From owner-p4-projects@FreeBSD.ORG Sun Jun 8 16:36:36 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 67A8C37B404; Sun, 8 Jun 2003 16:36:35 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 086D137B401 for ; Sun, 8 Jun 2003 16:36:35 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A6B4844001 for ; Sun, 8 Jun 2003 16:36:34 -0700 (PDT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h58NaY0U010585 for ; Sun, 8 Jun 2003 16:36:34 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h58NaXGY010582 for perforce@freebsd.org; Sun, 8 Jun 2003 16:36:33 -0700 (PDT) Date: Sun, 8 Jun 2003 16:36:33 -0700 (PDT) Message-Id: <200306082336.h58NaXGY010582@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 32824 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Jun 2003 23:36:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=32824 Change 32824 by des@des.at.des.thinksec.com on 2003/06/08 16:35:37 Nits. Affected files ... .. //depot/projects/openpam/configure.in#2 edit Differences ... ==== //depot/projects/openpam/configure.in#2 (text+ko) ==== @@ -1,5 +1,7 @@ +dnl $P4: //depot/projects/openpam/configure.in#2 $ + AC_PREREQ(2.53) -AC_INIT([OpenPAM],[20030601],[des@freebsd.org]) +AC_INIT([OpenPAM],[YYYYMMDD],[des@freebsd.org]) AC_CONFIG_SRCDIR([lib/pam_start.c]) AM_CONFIG_HEADER([config.h]) @@ -82,12 +84,12 @@ AC_CONFIG_FILES([bin/Makefile bin/su/Makefile include/Makefile - include/security/Makefile + include/security/Makefile lib/Makefile modules/Makefile modules/pam_unix/Makefile modules/pam_deny/Makefile - modules/pam_permit/Makefile + modules/pam_permit/Makefile doc/Makefile doc/man/Makefile Makefile]) From owner-p4-projects@FreeBSD.ORG Sun Jun 8 16:52:56 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F309A37B404; Sun, 8 Jun 2003 16:52:55 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A12FD37B401 for ; Sun, 8 Jun 2003 16:52:55 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 442B743FB1 for ; Sun, 8 Jun 2003 16:52:55 -0700 (PDT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h58Nqt0U016526 for ; Sun, 8 Jun 2003 16:52:55 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h58Nqs9w016523 for perforce@freebsd.org; Sun, 8 Jun 2003 16:52:54 -0700 (PDT) Date: Sun, 8 Jun 2003 16:52:54 -0700 (PDT) Message-Id: <200306082352.h58Nqs9w016523@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 32825 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Jun 2003 23:52:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=32825 Change 32825 by des@des.at.des.thinksec.com on 2003/06/08 16:52:07 Have dist.sh automatically set the release date. Touch all files in the distribution directory before rolling the release to avoid false negative dependency checks later. Affected files ... .. //depot/projects/openpam/dist.sh#8 edit .. //depot/projects/openpam/include/security/openpam_version.h#10 edit Differences ... ==== //depot/projects/openpam/dist.sh#8 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $P4: //depot/projects/openpam/dist.sh#7 $ +# $P4: //depot/projects/openpam/dist.sh#8 $ # set -e @@ -11,17 +11,21 @@ gmake clean || true gmake distclean || true -./autogen.sh -./configure --with-pam-su --with-pam-unix +sh -e autogen.sh +sh configure --with-pam-su --with-pam-unix gmake install -d -m 0755 "${distname}" grep -v '^#' MANIFEST | while read file; do install -d -m 0755 "${distname}/$(dirname ${file})" || exit 1 - install -c -m "${file}" "${distname}/${file}" || exit 1 + install -c -m 0644 "${file}" "${distname}/${file}" || exit 1 done for f in autogen.sh configure depcomp install-sh ltconfig ltmain.sh ; do chmod a+x "${distname}/${f}" done +for f in configure configure.in include/security/openpam_version.h ; do + perl -p -i -e "s/YYYYMMDD/${release}/g" "${distname}/${f}" +done +find "${distname}" | xargs touch -t "${release}0000" tar zcf "${tarball}" "${distname}" rm -rf "${distname}" gmake clean || true ==== //depot/projects/openpam/include/security/openpam_version.h#10 (text+ko) ==== @@ -31,14 +31,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/include/security/openpam_version.h#9 $ + * $P4: //depot/projects/openpam/include/security/openpam_version.h#10 $ */ #ifndef _OPENPAM_VERSION_H_INCLUDED #define _OPENPAM_VERSION_H_INCLUDED #define _OPENPAM -#define _OPENPAM_VERSION 20030601 +#define _OPENPAM_VERSION YYYYMMDD #define _OPENPAM_RELEASE "Digitalis" #endif From owner-p4-projects@FreeBSD.ORG Sun Jun 8 17:15:24 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CA51A37B404; Sun, 8 Jun 2003 17:15:23 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6A46C37B401 for ; Sun, 8 Jun 2003 17:15:23 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E6FF343FE9 for ; Sun, 8 Jun 2003 17:15:22 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h590FM0U018340 for ; Sun, 8 Jun 2003 17:15:22 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h590FMxs018337 for perforce@freebsd.org; Sun, 8 Jun 2003 17:15:22 -0700 (PDT) Date: Sun, 8 Jun 2003 17:15:22 -0700 (PDT) Message-Id: <200306090015.h590FMxs018337@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 Subject: PERFORCE change 32826 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jun 2003 00:15:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=32826 Change 32826 by marcel@marcel_nfs on 2003/06/08 17:14:39 Work around what appears to be a processor bug. The cover instruction is architected to only fault when improperly scheduled/bundled. In other words, it has to be the last instruction in an instruction group. How then do we get a page not present fault? The best thing I can come up with is that a cover in the same cycle as the instruction we're restarting when returning from an interrupt (which includes the cover itself), causes RSE interaction (probably only in some conditions), which triggers a page fault that is unrelated to the cover instruction, but probably related to RSE traffic. Sounds good, doesn't it? :-) The bottomline is that once we get the page fault on the cover with a faulting address that's valid, there's no way we can recover from it. We happily return from the interrupt to the cover, which immediately faults again with the exact same, and bogus, faulting address. Note that valid here means that the virtual address is part of the process' address space and bogus means that there's no memory access/lookup done for the cover, so it's probably the value we happen to have in cr.ifa at the time of the fault. Since this typically only happens for break_sigtramp(), pessimize the bundling by forcing the cover to be in the next instruction group. Note that testing with a flushrs instruction prior to the cover resolved the problem, but resulted in two flushes. We need to flush after the cover to make sure all stacked registers are on the register stack. It is believed that it's not so much the flushrs that made the problem go away, but that the flushrs introduced a cycle break that made the problem go away. We'll see... Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/syscall.s#11 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/syscall.s#11 (text+ko) ==== @@ -116,15 +116,21 @@ ENTRY(break_sigtramp, 0) -{ .mib +{ .mfi mov ar.rsc=0 + nop 0 cmp.ne p15,p0=0,gp + ;; +} +{ .mfb +(p15) invala + nop 0 cover ;; } -{ .mmi +{ .mfi flushrs -(p15) invala + nop 0 add r16=16+UC_MCONTEXT+MC_SPECIAL,sp ;; } From owner-p4-projects@FreeBSD.ORG Sun Jun 8 18:27:54 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 88FFC37B404; Sun, 8 Jun 2003 18:27:53 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2FAAA37B401 for ; Sun, 8 Jun 2003 18:27:53 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 56E1E43FE1 for ; Sun, 8 Jun 2003 18:27:52 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h591Rq0U021924 for ; Sun, 8 Jun 2003 18:27:52 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h591Rpgi021921 for perforce@freebsd.org; Sun, 8 Jun 2003 18:27:51 -0700 (PDT) Date: Sun, 8 Jun 2003 18:27:51 -0700 (PDT) Message-Id: <200306090127.h591Rpgi021921@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 Subject: PERFORCE change 32829 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jun 2003 01:27:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=32829 Change 32829 by marcel@marcel_nfs on 2003/06/08 18:27:02 Avoid the possibility that we're trying to send a signal to the process as the result of a fault in the gateway page. If this happens, the fault happens either in epc_sigtramp() or break_sigtramp() and generally means that the register stack space is exhausted or the backing store pointer is invalid. Either way, the fault got triggered while sending a signal to the process and sending a signal to the process because of that is bound to cause exactly the same: a fault, followed by a signal, followed by a fault followed by nausea. Keep a debug printf() in here so that we'll know if and when this kicks in. Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#77 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/machdep.c#77 (text+ko) ==== @@ -831,11 +831,26 @@ int oonstack; td = curthread; + tf = td->td_frame; + + /* + * Bail out if we're sending a signal due to a fault in the gateway + * page. If that happens, we were trying to send a signal but the + * backing store address was invalid. Trying to send a signal in that + * case will not work. + * Note that the test for region 5 is a bit sloppy, but does not + * give false positives. + */ + if ((tf->tf_special.iip >> 61) == 5) { + printf("XXX: Fault in gateway page. Cannot send signal.\n"); + sigexit(td, SIGSEGV); + return; + } + p = td->td_proc; PROC_LOCK_ASSERT(p, MA_OWNED); psp = p->p_sigacts; mtx_assert(&psp->ps_mtx, MA_OWNED); - tf = td->td_frame; sp = tf->tf_special.sp; oonstack = sigonstack(sp); sbs = 0; From owner-p4-projects@FreeBSD.ORG Sun Jun 8 19:05:44 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2CEF337B404; Sun, 8 Jun 2003 19:05:44 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B6F6437B401 for ; Sun, 8 Jun 2003 19:05:43 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D949D43FBD for ; Sun, 8 Jun 2003 19:05:41 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5925f0U024427 for ; Sun, 8 Jun 2003 19:05:41 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5925c6A024424 for perforce@freebsd.org; Sun, 8 Jun 2003 19:05:38 -0700 (PDT) Date: Sun, 8 Jun 2003 19:05:38 -0700 (PDT) Message-Id: <200306090205.h5925c6A024424@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 Subject: PERFORCE change 32830 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jun 2003 02:05:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=32830 Change 32830 by marcel@marcel_nfs on 2003/06/08 19:05:00 IFC @32828 Affected files ... .. //depot/projects/sio/MAINTAINERS#2 integrate .. //depot/projects/sio/Makefile.inc1#5 integrate .. //depot/projects/sio/bin/cp/cp.1#2 integrate .. //depot/projects/sio/bin/csh/Makefile#3 integrate .. //depot/projects/sio/bin/df/df.1#3 integrate .. //depot/projects/sio/bin/df/df.c#4 integrate .. //depot/projects/sio/bin/ed/Makefile#3 integrate .. //depot/projects/sio/bin/ed/cbc.c#2 integrate .. //depot/projects/sio/bin/ed/ed.h#2 integrate .. //depot/projects/sio/bin/ps/ps.1#2 integrate .. //depot/projects/sio/contrib/groff/tmac/X.tmac#3 integrate .. //depot/projects/sio/contrib/groff/tmac/groff_mdoc.man#3 integrate .. //depot/projects/sio/contrib/openpam/lib/openpam_configure.c#3 integrate .. //depot/projects/sio/etc/defaults/rc.conf#4 integrate .. //depot/projects/sio/etc/inetd.conf#2 integrate .. //depot/projects/sio/etc/mtree/BSD.local.dist#3 integrate .. //depot/projects/sio/etc/mtree/BSD.usr.dist#3 integrate .. //depot/projects/sio/etc/network.subr#3 integrate .. //depot/projects/sio/etc/pccard_ether#4 integrate .. //depot/projects/sio/etc/rc.d/dhclient#2 integrate .. //depot/projects/sio/etc/rc.d/network1#2 integrate .. //depot/projects/sio/etc/rc.subr#2 integrate .. //depot/projects/sio/gnu/lib/libdialog/dialog.3#2 integrate .. //depot/projects/sio/gnu/lib/libstdc++/Makefile#3 integrate .. //depot/projects/sio/gnu/usr.bin/cc/cpp/Makefile#2 integrate .. //depot/projects/sio/gnu/usr.bin/cc/f77/Makefile#2 integrate .. //depot/projects/sio/gnu/usr.bin/groff/tmac/mdoc.local#2 integrate .. //depot/projects/sio/lib/Makefile#5 integrate .. //depot/projects/sio/lib/csu/i386-elf/Makefile#3 integrate .. //depot/projects/sio/lib/libalias/libalias.3#3 integrate .. //depot/projects/sio/lib/libc/amd64/gen/_setjmp.S#2 integrate .. //depot/projects/sio/lib/libc/amd64/gen/setjmp.S#4 integrate .. //depot/projects/sio/lib/libc/amd64/gen/sigsetjmp.S#3 integrate .. //depot/projects/sio/lib/libc/gen/devname.c#2 integrate .. //depot/projects/sio/lib/libc/gen/getpwent.3#3 integrate .. //depot/projects/sio/lib/libc/gen/popen.3#2 integrate .. //depot/projects/sio/lib/libc/gen/statvfs.3#2 integrate .. //depot/projects/sio/lib/libc/gen/tzset.3#2 integrate .. //depot/projects/sio/lib/libc/net/gethostbyname.3#2 integrate .. //depot/projects/sio/lib/libc/stdio/fflush.3#2 integrate .. //depot/projects/sio/lib/libc/sys/extattr_get_file.2#2 integrate .. //depot/projects/sio/lib/libc/sys/getfsstat.2#2 integrate .. //depot/projects/sio/lib/libc/sys/getsockname.2#2 integrate .. //depot/projects/sio/lib/libc/sys/kldload.2#2 integrate .. //depot/projects/sio/lib/libc/sys/sched_setparam.2#2 integrate .. //depot/projects/sio/lib/libc/sys/sched_setscheduler.2#2 integrate .. //depot/projects/sio/lib/libc/sys/sigsuspend.2#2 integrate .. //depot/projects/sio/lib/libc_r/arch/amd64/_atomic_lock.S#1 branch .. //depot/projects/sio/lib/libc_r/man/sem_post.3#2 integrate .. //depot/projects/sio/lib/libc_r/test/guard_b.c#3 integrate .. //depot/projects/sio/lib/libc_r/test/join_leak_d.c#2 integrate .. //depot/projects/sio/lib/libc_r/test/mutex_d.c#2 integrate .. //depot/projects/sio/lib/libc_r/uthread/pthread_private.h#2 integrate .. //depot/projects/sio/lib/libcompat/regexp/regexp.3#2 integrate .. //depot/projects/sio/lib/libcrypt/Makefile#3 integrate .. //depot/projects/sio/lib/libcrypt/crypt-md5.c#2 integrate .. //depot/projects/sio/lib/libcrypt/crypt-nthash.c#1 branch .. //depot/projects/sio/lib/libcrypt/crypt.3#2 integrate .. //depot/projects/sio/lib/libcrypt/crypt.c#2 integrate .. //depot/projects/sio/lib/libcrypt/crypt.h#2 integrate .. //depot/projects/sio/lib/libdisk/disk.c#2 integrate .. //depot/projects/sio/lib/libform/Makefile#2 integrate .. //depot/projects/sio/lib/libftpio/ftpio.3#2 integrate .. //depot/projects/sio/lib/libipx/ipx.3#2 integrate .. //depot/projects/sio/lib/libmd/md2c.c#2 integrate .. //depot/projects/sio/lib/libmd/md4c.c#2 integrate .. //depot/projects/sio/lib/libmd/md5c.c#2 integrate .. //depot/projects/sio/lib/libmenu/Makefile#2 integrate .. //depot/projects/sio/lib/libncurses/Makefile#2 integrate .. //depot/projects/sio/lib/libnetgraph/netgraph.3#2 integrate .. //depot/projects/sio/lib/libpanel/Makefile#2 integrate .. //depot/projects/sio/lib/libpthread/man/pthread_attr.3#2 integrate .. //depot/projects/sio/lib/libpthread/man/pthread_cancel.3#2 integrate .. //depot/projects/sio/lib/libpthread/man/pthread_cleanup_pop.3#2 integrate .. //depot/projects/sio/lib/libpthread/man/pthread_cleanup_push.3#2 integrate .. //depot/projects/sio/lib/libpthread/man/pthread_cond_broadcast.3#2 integrate .. //depot/projects/sio/lib/libpthread/man/pthread_cond_destroy.3#2 integrate .. //depot/projects/sio/lib/libpthread/man/pthread_cond_init.3#2 integrate .. //depot/projects/sio/lib/libpthread/man/pthread_cond_signal.3#2 integrate .. //depot/projects/sio/lib/libpthread/man/pthread_cond_timedwait.3#2 integrate .. //depot/projects/sio/lib/libpthread/man/pthread_cond_wait.3#2 integrate .. //depot/projects/sio/lib/libpthread/man/pthread_condattr.3#2 integrate .. //depot/projects/sio/lib/libpthread/man/pthread_create.3#2 integrate .. //depot/projects/sio/lib/libpthread/man/pthread_detach.3#2 integrate .. //depot/projects/sio/lib/libpthread/support/Makefile.inc#2 integrate .. //depot/projects/sio/lib/libpthread/support/thr_support.c#2 integrate .. //depot/projects/sio/lib/libpthread/thread/thr_cond.c#4 integrate .. //depot/projects/sio/lib/libpthread/thread/thr_create.c#4 integrate .. //depot/projects/sio/lib/libpthread/thread/thr_init.c#3 integrate .. //depot/projects/sio/lib/libpthread/thread/thr_kern.c#4 integrate .. //depot/projects/sio/lib/libpthread/thread/thr_mutex.c#3 integrate .. //depot/projects/sio/lib/libpthread/thread/thr_sig.c#4 integrate .. //depot/projects/sio/lib/libpthread/thread/thr_sigprocmask.c#3 integrate .. //depot/projects/sio/lib/libthr/thread/thr_detach.c#3 integrate .. //depot/projects/sio/lib/libthr/thread/thr_init.c#3 integrate .. //depot/projects/sio/lib/libthr/thread/thr_mutex.c#4 integrate .. //depot/projects/sio/lib/libthr/thread/thr_private.h#3 integrate .. //depot/projects/sio/lib/libwrap/Makefile#3 integrate .. //depot/projects/sio/libexec/ftpd/ftpd.8#3 integrate .. //depot/projects/sio/libexec/getty/gettytab.5#2 integrate .. //depot/projects/sio/libexec/getty/main.c#2 integrate .. //depot/projects/sio/libexec/rexecd/rexecd.8#2 integrate .. //depot/projects/sio/libexec/rshd/rshd.8#2 integrate .. //depot/projects/sio/libexec/rtld-elf/Makefile#3 integrate .. //depot/projects/sio/libexec/rtld-elf/ia64/reloc.c#3 integrate .. //depot/projects/sio/libexec/rtld-elf/rtld.1#3 integrate .. //depot/projects/sio/libexec/tcpd/Makefile#3 integrate .. //depot/projects/sio/release/Makefile#5 integrate .. //depot/projects/sio/release/doc/en_US.ISO8859-1/errata/article.sgml#2 integrate .. //depot/projects/sio/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#5 integrate .. //depot/projects/sio/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#9 integrate .. //depot/projects/sio/release/doc/share/sgml/release.ent#4 integrate .. //depot/projects/sio/release/pc98/dokern.sh#3 integrate .. //depot/projects/sio/sbin/badsect/badsect.8#2 integrate .. //depot/projects/sio/sbin/bsdlabel/bsdlabel.c#6 integrate .. //depot/projects/sio/sbin/bsdlabel/runtest.sh#4 integrate .. //depot/projects/sio/sbin/ccdconfig/Makefile#2 integrate .. //depot/projects/sio/sbin/ccdconfig/ccdconfig.c#3 integrate .. //depot/projects/sio/sbin/dump/dump.8#3 integrate .. //depot/projects/sio/sbin/fsck_msdosfs/fsck_msdosfs.8#2 integrate .. //depot/projects/sio/sbin/gpt/gpt.8#2 integrate .. //depot/projects/sio/sbin/init/init.8#2 integrate .. //depot/projects/sio/sbin/ipf/Makefile#2 integrate .. //depot/projects/sio/sbin/ipfstat/Makefile#2 integrate .. //depot/projects/sio/sbin/ipfw/ipfw2.c#2 integrate .. //depot/projects/sio/sbin/ipmon/Makefile#2 integrate .. //depot/projects/sio/sbin/ipnat/Makefile#2 integrate .. //depot/projects/sio/sbin/ping/ping.c#3 integrate .. //depot/projects/sio/sbin/restore/restore.8#3 integrate .. //depot/projects/sio/sbin/routed/rtquery/rtquery.8#4 integrate .. //depot/projects/sio/sbin/sysctl/sysctl.8#3 integrate .. //depot/projects/sio/secure/Makefile#2 integrate .. //depot/projects/sio/secure/lib/Makefile#3 integrate .. //depot/projects/sio/secure/lib/libcipher/Makefile#2 delete .. //depot/projects/sio/secure/lib/libcipher/README#2 delete .. //depot/projects/sio/secure/lib/libcipher/README.FreeBSD#2 delete .. //depot/projects/sio/secure/lib/libcipher/cipher.3#2 delete .. //depot/projects/sio/secure/lib/libcipher/crypt.c#2 delete .. //depot/projects/sio/secure/lib/libcipher/test/Makefile#2 delete .. //depot/projects/sio/secure/lib/libcipher/test/README#2 delete .. //depot/projects/sio/secure/lib/libcipher/test/cert.c#2 delete .. //depot/projects/sio/secure/lib/libcipher/test/cert.input#2 delete .. //depot/projects/sio/secure/lib/libcipher/test/speedcrypt.c#2 delete .. //depot/projects/sio/secure/lib/libcipher/test/speeddes.c#2 delete .. //depot/projects/sio/secure/lib/libcrypt/blowfish.c#2 integrate .. //depot/projects/sio/secure/lib/libcrypt/blowfish.h#2 integrate .. //depot/projects/sio/secure/lib/libcrypt/crypt-blowfish.c#2 integrate .. //depot/projects/sio/secure/usr.bin/Makefile#3 integrate .. //depot/projects/sio/secure/usr.bin/bdes/Makefile#2 integrate .. //depot/projects/sio/secure/usr.bin/bdes/bdes.1#2 integrate .. //depot/projects/sio/secure/usr.bin/bdes/bdes.c#2 integrate .. //depot/projects/sio/share/colldef/Makefile#2 integrate .. //depot/projects/sio/share/colldef/bg_BG.CP1251.src#2 integrate .. //depot/projects/sio/share/colldef/map.CP866#2 integrate .. //depot/projects/sio/share/colldef/map.KOI8-R#2 integrate .. //depot/projects/sio/share/colldef/map.KOI8-U#2 integrate .. //depot/projects/sio/share/colldef/ru_RU.CP1251.src#1 branch .. //depot/projects/sio/share/colldef/ru_RU.CP866.src#2 integrate .. //depot/projects/sio/share/colldef/ru_RU.ISO8859-5.src#2 integrate .. //depot/projects/sio/share/colldef/ru_RU.KOI8-R.src#2 integrate .. //depot/projects/sio/share/colldef/uk_UA.KOI8-U.src#2 integrate .. //depot/projects/sio/share/man/man4/Makefile#4 integrate .. //depot/projects/sio/share/man/man4/acpi.4#3 integrate .. //depot/projects/sio/share/man/man4/cd.4#2 integrate .. //depot/projects/sio/share/man/man4/en.4#1 branch .. //depot/projects/sio/share/man/man4/exca.4#2 integrate .. //depot/projects/sio/share/man/man4/mac_lomac.4#3 integrate .. //depot/projects/sio/share/man/man4/mac_seeotheruids.4#3 integrate .. //depot/projects/sio/share/man/man4/mac_test.4#3 integrate .. //depot/projects/sio/share/man/man4/man4.i386/Makefile#2 integrate .. //depot/projects/sio/share/man/man4/man4.i386/en.4#2 delete .. //depot/projects/sio/share/man/man4/ng_bridge.4#2 integrate .. //depot/projects/sio/share/man/man4/pccbb.4#2 integrate .. //depot/projects/sio/share/man/man4/raid.4#3 integrate .. //depot/projects/sio/share/man/man4/rp.4#2 integrate .. //depot/projects/sio/share/man/man4/sem.4#2 integrate .. //depot/projects/sio/share/man/man4/wi.4#3 integrate .. //depot/projects/sio/share/man/man5/make.conf.5#4 integrate .. //depot/projects/sio/share/man/man5/rc.conf.5#5 integrate .. //depot/projects/sio/share/man/man7/environ.7#2 integrate .. //depot/projects/sio/share/man/man7/maclabel.7#3 integrate .. //depot/projects/sio/share/man/man8/yp.8#2 integrate .. //depot/projects/sio/share/man/man9/Makefile#3 integrate .. //depot/projects/sio/share/man/man9/VFS_SET.9#3 integrate .. //depot/projects/sio/share/man/man9/VFS_VGET.9#3 integrate .. //depot/projects/sio/share/man/man9/VOP_GETEXTATTR.9#3 integrate .. //depot/projects/sio/share/man/man9/VOP_LISTEXTATTR.9#1 branch .. //depot/projects/sio/share/man/man9/VOP_SETEXTATTR.9#2 integrate .. //depot/projects/sio/share/man/man9/devclass.9#3 integrate .. //depot/projects/sio/share/man/man9/devclass_find.9#3 integrate .. //depot/projects/sio/share/man/man9/extattr.9#2 integrate .. //depot/projects/sio/share/man/man9/ktr.9#3 integrate .. //depot/projects/sio/share/man/man9/namei.9#3 integrate .. //depot/projects/sio/share/man/man9/rtalloc.9#3 integrate .. //depot/projects/sio/share/mk/bsd.libnames.mk#3 integrate .. //depot/projects/sio/share/mk/bsd.sys.mk#5 integrate .. //depot/projects/sio/share/mklocale/Makefile#3 integrate .. //depot/projects/sio/share/monetdef/Makefile#2 integrate .. //depot/projects/sio/share/monetdef/ru_RU.CP1251.src#1 branch .. //depot/projects/sio/share/msgdef/Makefile#2 integrate .. //depot/projects/sio/share/msgdef/ru_RU.CP1251.src#1 branch .. //depot/projects/sio/share/numericdef/Makefile#2 integrate .. //depot/projects/sio/share/numericdef/ru_RU.CP866.src#2 delete .. //depot/projects/sio/share/numericdef/ru_RU.ISO8859-5.src#2 delete .. //depot/projects/sio/share/numericdef/uk_UA.ISO8859-5.src#2 delete .. //depot/projects/sio/share/termcap/termcap.5#2 integrate .. //depot/projects/sio/share/timedef/Makefile#2 integrate .. //depot/projects/sio/share/timedef/ru_RU.CP1251.src#1 branch .. //depot/projects/sio/sys/alpha/alpha/vm_machdep.c#2 integrate .. //depot/projects/sio/sys/alpha/conf/GENERIC#3 integrate .. //depot/projects/sio/sys/amd64/amd64/trap.c#3 integrate .. //depot/projects/sio/sys/amd64/amd64/vm_machdep.c#3 integrate .. //depot/projects/sio/sys/amd64/include/param.h#3 integrate .. //depot/projects/sio/sys/amd64/include/setjmp.h#2 integrate .. //depot/projects/sio/sys/boot/ficl/Makefile#2 integrate .. //depot/projects/sio/sys/boot/ficl/loader.c#2 integrate .. //depot/projects/sio/sys/boot/i386/kgzldr/Makefile#2 integrate .. //depot/projects/sio/sys/boot/i386/libi386/Makefile#4 integrate .. //depot/projects/sio/sys/boot/pc98/kgzldr/Makefile#2 integrate .. //depot/projects/sio/sys/boot/pc98/libpc98/Makefile#3 integrate .. //depot/projects/sio/sys/boot/pc98/libpc98/i386_module.c#1 branch .. //depot/projects/sio/sys/boot/pc98/loader/Makefile#2 integrate .. //depot/projects/sio/sys/boot/pc98/loader/help.pc98#1 branch .. //depot/projects/sio/sys/conf/ldscript.sparc64#2 integrate .. //depot/projects/sio/sys/ddb/db_ps.c#2 integrate .. //depot/projects/sio/sys/debugscripts/.gdbinit#1 branch .. //depot/projects/sio/sys/debugscripts/gdbinit.i386#1 branch .. //depot/projects/sio/sys/debugscripts/gdbinit.kernel#1 branch .. //depot/projects/sio/sys/debugscripts/gdbinit.vinum#1 branch .. //depot/projects/sio/sys/dev/aac/aac.c#2 integrate .. //depot/projects/sio/sys/dev/aic7xxx/aic7770.c#3 integrate .. //depot/projects/sio/sys/dev/aic7xxx/aic79xx.c#4 integrate .. //depot/projects/sio/sys/dev/aic7xxx/aic79xx.h#4 integrate .. //depot/projects/sio/sys/dev/aic7xxx/aic79xx_pci.c#4 integrate .. //depot/projects/sio/sys/dev/aic7xxx/aic7xxx.c#4 integrate .. //depot/projects/sio/sys/dev/aic7xxx/aic7xxx.h#4 integrate .. //depot/projects/sio/sys/dev/aic7xxx/aic7xxx_pci.c#4 integrate .. //depot/projects/sio/sys/dev/ata/ata-card.c#3 integrate .. //depot/projects/sio/sys/dev/ata/ata-chipset.c#7 integrate .. //depot/projects/sio/sys/dev/ata/ata-pci.c#3 integrate .. //depot/projects/sio/sys/dev/ccd/ccd.c#3 integrate .. //depot/projects/sio/sys/dev/em/README#2 integrate .. //depot/projects/sio/sys/dev/em/if_em.c#4 integrate .. //depot/projects/sio/sys/dev/em/if_em.h#3 integrate .. //depot/projects/sio/sys/dev/em/if_em_hw.c#3 integrate .. //depot/projects/sio/sys/dev/em/if_em_hw.h#3 integrate .. //depot/projects/sio/sys/dev/en/midway.c#4 integrate .. //depot/projects/sio/sys/dev/exca/exca.c#3 integrate .. //depot/projects/sio/sys/dev/exca/excareg.h#2 integrate .. //depot/projects/sio/sys/dev/exca/excavar.h#2 integrate .. //depot/projects/sio/sys/dev/firewire/firewire.c#4 integrate .. //depot/projects/sio/sys/dev/firewire/fwmem.c#2 integrate .. //depot/projects/sio/sys/dev/firewire/fwohci_pci.c#2 integrate .. //depot/projects/sio/sys/dev/firewire/fwohcireg.h#2 integrate .. //depot/projects/sio/sys/dev/firewire/sbp.c#6 integrate .. //depot/projects/sio/sys/dev/hifn/hifn7751.c#2 integrate .. //depot/projects/sio/sys/dev/hifn/hifn7751var.h#2 integrate .. //depot/projects/sio/sys/dev/mpt/mpilib/mpi.h#2 integrate .. //depot/projects/sio/sys/dev/mpt/mpilib/mpi_cnfg.h#2 integrate .. //depot/projects/sio/sys/dev/mpt/mpilib/mpi_init.h#2 integrate .. //depot/projects/sio/sys/dev/mpt/mpilib/mpi_ioc.h#2 integrate .. //depot/projects/sio/sys/dev/mpt/mpilib/mpi_raid.h#2 integrate .. //depot/projects/sio/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/sio/sys/dev/mpt/mpt.h#2 integrate .. //depot/projects/sio/sys/dev/mpt/mpt_freebsd.c#3 integrate .. //depot/projects/sio/sys/dev/mpt/mpt_freebsd.h#2 integrate .. //depot/projects/sio/sys/dev/ofw/openfirm.c#2 integrate .. //depot/projects/sio/sys/dev/ofw/openfirm.h#2 integrate .. //depot/projects/sio/sys/dev/pccard/pccarddevs#2 integrate .. //depot/projects/sio/sys/dev/pccard/pccarddevs.h#2 integrate .. //depot/projects/sio/sys/dev/pccbb/pccbb.c#4 integrate .. //depot/projects/sio/sys/dev/pccbb/pccbbvar.h#2 integrate .. //depot/projects/sio/sys/dev/pci/pci.c#3 integrate .. //depot/projects/sio/sys/dev/snc/if_snc.c#2 integrate .. //depot/projects/sio/sys/dev/ubsec/ubsec.c#2 integrate .. //depot/projects/sio/sys/dev/ubsec/ubsecvar.h#2 integrate .. //depot/projects/sio/sys/dev/vinum/vinum.c#4 integrate .. //depot/projects/sio/sys/dev/vx/if_vx.c#2 integrate .. //depot/projects/sio/sys/geom/geom.h#6 integrate .. //depot/projects/sio/sys/geom/geom_ccd.c#1 branch .. //depot/projects/sio/sys/geom/geom_ctl.c#5 integrate .. //depot/projects/sio/sys/geom/geom_dev.c#4 integrate .. //depot/projects/sio/sys/geom/geom_dump.c#2 integrate .. //depot/projects/sio/sys/geom/geom_event.c#4 integrate .. //depot/projects/sio/sys/geom/geom_slice.c#4 integrate .. //depot/projects/sio/sys/geom/geom_subr.c#5 integrate .. //depot/projects/sio/sys/gnu/dev/sound/pci/emu10k1-alsa.h#1 branch .. //depot/projects/sio/sys/i386/conf/GENERIC#3 integrate .. //depot/projects/sio/sys/i386/i386/atomic.c#2 integrate .. //depot/projects/sio/sys/i386/i386/autoconf.c#2 integrate .. //depot/projects/sio/sys/i386/i386/bios.c#3 integrate .. //depot/projects/sio/sys/i386/i386/busdma_machdep.c#3 integrate .. //depot/projects/sio/sys/i386/i386/critical.c#2 integrate .. //depot/projects/sio/sys/i386/i386/db_disasm.c#2 integrate .. //depot/projects/sio/sys/i386/i386/db_interface.c#5 integrate .. //depot/projects/sio/sys/i386/i386/db_trace.c#3 integrate .. //depot/projects/sio/sys/i386/i386/dump_machdep.c#2 integrate .. //depot/projects/sio/sys/i386/i386/elan-mmcr.c#2 integrate .. //depot/projects/sio/sys/i386/i386/elf_machdep.c#2 integrate .. //depot/projects/sio/sys/i386/i386/genassym.c#2 integrate .. //depot/projects/sio/sys/i386/i386/i386-gdbstub.c#4 integrate .. //depot/projects/sio/sys/i386/i386/i686_mem.c#2 integrate .. //depot/projects/sio/sys/i386/i386/identcpu.c#3 integrate .. //depot/projects/sio/sys/i386/i386/in_cksum.c#2 integrate .. //depot/projects/sio/sys/i386/i386/initcpu.c#2 integrate .. //depot/projects/sio/sys/i386/i386/k6_mem.c#2 integrate .. //depot/projects/sio/sys/i386/i386/legacy.c#2 integrate .. //depot/projects/sio/sys/i386/i386/machdep.c#4 integrate .. //depot/projects/sio/sys/i386/i386/math_emulate.c#3 integrate .. //depot/projects/sio/sys/i386/i386/mem.c#2 integrate .. //depot/projects/sio/sys/i386/i386/mp_clock.c#2 integrate .. //depot/projects/sio/sys/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/sio/sys/i386/i386/mpapic.c#2 integrate .. //depot/projects/sio/sys/i386/i386/nexus.c#3 integrate .. //depot/projects/sio/sys/i386/i386/perfmon.c#2 integrate .. //depot/projects/sio/sys/i386/i386/pmap.c#2 integrate .. //depot/projects/sio/sys/i386/i386/sys_machdep.c#2 integrate .. //depot/projects/sio/sys/i386/i386/trap.c#3 integrate .. //depot/projects/sio/sys/i386/i386/tsc.c#2 integrate .. //depot/projects/sio/sys/i386/i386/vm86.c#2 integrate .. //depot/projects/sio/sys/i386/i386/vm_machdep.c#3 integrate .. //depot/projects/sio/sys/i386/ibcs2/ibcs2_errno.c#2 integrate .. //depot/projects/sio/sys/i386/ibcs2/ibcs2_fcntl.c#2 integrate .. //depot/projects/sio/sys/i386/ibcs2/ibcs2_ioctl.c#2 integrate .. //depot/projects/sio/sys/i386/ibcs2/ibcs2_ipc.c#2 integrate .. //depot/projects/sio/sys/i386/ibcs2/ibcs2_isc.c#2 integrate .. //depot/projects/sio/sys/i386/ibcs2/ibcs2_isc_sysent.c#2 integrate .. //depot/projects/sio/sys/i386/ibcs2/ibcs2_misc.c#2 integrate .. //depot/projects/sio/sys/i386/ibcs2/ibcs2_msg.c#2 integrate .. //depot/projects/sio/sys/i386/ibcs2/ibcs2_other.c#2 integrate .. //depot/projects/sio/sys/i386/ibcs2/ibcs2_signal.c#2 integrate .. //depot/projects/sio/sys/i386/ibcs2/ibcs2_socksys.c#2 integrate .. //depot/projects/sio/sys/i386/ibcs2/ibcs2_stat.c#2 integrate .. //depot/projects/sio/sys/i386/ibcs2/ibcs2_sysent.c#2 integrate .. //depot/projects/sio/sys/i386/ibcs2/ibcs2_sysi86.c#2 integrate .. //depot/projects/sio/sys/i386/ibcs2/ibcs2_sysvec.c#2 integrate .. //depot/projects/sio/sys/i386/ibcs2/ibcs2_util.c#2 integrate .. //depot/projects/sio/sys/i386/ibcs2/ibcs2_xenix.c#2 integrate .. //depot/projects/sio/sys/i386/ibcs2/ibcs2_xenix_sysent.c#2 integrate .. //depot/projects/sio/sys/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/sio/sys/i386/include/acpica_machdep.h#2 integrate .. //depot/projects/sio/sys/i386/include/apic.h#2 integrate .. //depot/projects/sio/sys/i386/include/legacyvar.h#2 integrate .. //depot/projects/sio/sys/i386/isa/apic_vector.s#2 integrate .. //depot/projects/sio/sys/i386/isa/asc.c#2 integrate .. //depot/projects/sio/sys/i386/isa/clock.c#3 integrate .. //depot/projects/sio/sys/i386/isa/cronyx.c#2 integrate .. //depot/projects/sio/sys/i386/isa/ctx.c#3 integrate .. //depot/projects/sio/sys/i386/isa/cx.c#2 integrate .. //depot/projects/sio/sys/i386/isa/cy.c#2 integrate .. //depot/projects/sio/sys/i386/isa/elink.c#2 integrate .. //depot/projects/sio/sys/i386/isa/gpib.c#3 integrate .. //depot/projects/sio/sys/i386/isa/gsc.c#2 integrate .. //depot/projects/sio/sys/i386/isa/if_cx.c#3 integrate .. //depot/projects/sio/sys/i386/isa/if_el.c#2 integrate .. //depot/projects/sio/sys/i386/isa/if_le.c#2 integrate .. //depot/projects/sio/sys/i386/isa/if_rdp.c#2 integrate .. //depot/projects/sio/sys/i386/isa/intr_machdep.c#3 integrate .. //depot/projects/sio/sys/i386/isa/isa.c#2 integrate .. //depot/projects/sio/sys/i386/isa/isa_compat.c#2 integrate .. //depot/projects/sio/sys/i386/isa/isa_dma.c#2 integrate .. //depot/projects/sio/sys/i386/isa/istallion.c#2 integrate .. //depot/projects/sio/sys/i386/isa/ithread.c#2 integrate .. //depot/projects/sio/sys/i386/isa/loran.c#2 integrate .. //depot/projects/sio/sys/i386/isa/mse.c#2 integrate .. //depot/projects/sio/sys/i386/isa/npx.c#2 integrate .. //depot/projects/sio/sys/i386/isa/pcaudio.c#2 integrate .. //depot/projects/sio/sys/i386/isa/pcf.c#2 integrate .. //depot/projects/sio/sys/i386/isa/pmtimer.c#2 integrate .. //depot/projects/sio/sys/i386/isa/prof_machdep.c#2 integrate .. //depot/projects/sio/sys/i386/isa/spic.c#2 integrate .. //depot/projects/sio/sys/i386/isa/spigot.c#2 integrate .. //depot/projects/sio/sys/i386/isa/spkr.c#2 integrate .. //depot/projects/sio/sys/i386/isa/stallion.c#2 integrate .. //depot/projects/sio/sys/i386/isa/vesa.c#2 integrate .. //depot/projects/sio/sys/i386/isa/wt.c#3 integrate .. //depot/projects/sio/sys/i386/linux/imgact_linux.c#2 integrate .. //depot/projects/sio/sys/i386/linux/linux_dummy.c#2 integrate .. //depot/projects/sio/sys/i386/linux/linux_genassym.c#2 integrate .. //depot/projects/sio/sys/i386/linux/linux_machdep.c#2 integrate .. //depot/projects/sio/sys/i386/linux/linux_ptrace.c#2 integrate .. //depot/projects/sio/sys/i386/linux/linux_sysent.c#2 integrate .. //depot/projects/sio/sys/i386/linux/linux_sysvec.c#3 integrate .. //depot/projects/sio/sys/i386/pci/pci_bus.c#3 integrate .. //depot/projects/sio/sys/i386/pci/pci_cfgreg.c#2 integrate .. //depot/projects/sio/sys/ia64/conf/GENERIC#2 integrate .. //depot/projects/sio/sys/ia64/ia64/mem.c#2 integrate .. //depot/projects/sio/sys/ia64/ia64/pmap.c#3 integrate .. //depot/projects/sio/sys/ia64/ia64/trap.c#3 integrate .. //depot/projects/sio/sys/ia64/ia64/vm_machdep.c#3 integrate .. //depot/projects/sio/sys/ia64/include/cpu.h#3 integrate .. //depot/projects/sio/sys/kern/init_main.c#4 integrate .. //depot/projects/sio/sys/kern/init_sysent.c#2 integrate .. //depot/projects/sio/sys/kern/kern_descrip.c#3 integrate .. //depot/projects/sio/sys/kern/kern_exec.c#3 integrate .. //depot/projects/sio/sys/kern/kern_fork.c#4 integrate .. //depot/projects/sio/sys/kern/kern_thr.c#3 integrate .. //depot/projects/sio/sys/kern/kern_thread.c#4 integrate .. //depot/projects/sio/sys/kern/kern_timeout.c#2 integrate .. //depot/projects/sio/sys/kern/kern_umtx.c#3 integrate .. //depot/projects/sio/sys/kern/sched_ule.c#3 integrate .. //depot/projects/sio/sys/kern/subr_mbuf.c#4 integrate .. //depot/projects/sio/sys/kern/syscalls.c#2 integrate .. //depot/projects/sio/sys/kern/syscalls.master#2 integrate .. //depot/projects/sio/sys/kern/vfs_mount.c#2 integrate .. //depot/projects/sio/sys/kern/vfs_syscalls.c#3 integrate .. //depot/projects/sio/sys/kern/vfs_vnops.c#2 integrate .. //depot/projects/sio/sys/kern/vnode_if.src#2 integrate .. //depot/projects/sio/sys/modules/geom/Makefile#2 integrate .. //depot/projects/sio/sys/modules/geom/geom_vol_ffs/Makefile#1 branch .. //depot/projects/sio/sys/net/if_media.h#2 integrate .. //depot/projects/sio/sys/netinet/ip_dummynet.c#2 integrate .. //depot/projects/sio/sys/netinet/ip_fw.h#2 integrate .. //depot/projects/sio/sys/netinet/ip_fw2.c#2 integrate .. //depot/projects/sio/sys/netinet/ip_input.c#3 integrate .. //depot/projects/sio/sys/netinet/tcp_timer.c#2 integrate .. //depot/projects/sio/sys/nfsserver/nfs_syscalls.c#3 integrate .. //depot/projects/sio/sys/opencrypto/crypto.c#2 integrate .. //depot/projects/sio/sys/opencrypto/cryptodev.c#2 integrate .. //depot/projects/sio/sys/opencrypto/cryptodev.h#2 integrate .. //depot/projects/sio/sys/pc98/conf/GENERIC#2 integrate .. //depot/projects/sio/sys/pc98/pc98/wd.c#2 integrate .. //depot/projects/sio/sys/pc98/pc98/wd_cd.c#2 integrate .. //depot/projects/sio/sys/pci/if_dc.c#4 integrate .. //depot/projects/sio/sys/pci/if_dcreg.h#3 integrate .. //depot/projects/sio/sys/powerpc/conf/GENERIC#2 integrate .. //depot/projects/sio/sys/powerpc/powerpc/vm_machdep.c#2 integrate .. //depot/projects/sio/sys/security/mac_biba/mac_biba.c#3 integrate .. //depot/projects/sio/sys/security/mac_lomac/mac_lomac.c#3 integrate .. //depot/projects/sio/sys/security/mac_mls/mac_mls.c#3 integrate .. //depot/projects/sio/sys/sparc64/conf/GENERIC#2 integrate .. //depot/projects/sio/sys/sparc64/include/db_machdep.h#2 integrate .. //depot/projects/sio/sys/sparc64/include/ofw_mem.h#2 integrate .. //depot/projects/sio/sys/sparc64/sparc64/dump_machdep.c#2 integrate .. //depot/projects/sio/sys/sparc64/sparc64/machdep.c#4 integrate .. //depot/projects/sio/sys/sparc64/sparc64/vm_machdep.c#2 integrate .. //depot/projects/sio/sys/sys/ccdvar.h#2 integrate .. //depot/projects/sio/sys/sys/disklabel.h#3 integrate .. //depot/projects/sio/sys/sys/extattr.h#2 integrate .. //depot/projects/sio/sys/sys/filedesc.h#2 integrate .. //depot/projects/sio/sys/sys/kernel.h#2 integrate .. //depot/projects/sio/sys/sys/kse.h#2 integrate .. //depot/projects/sio/sys/sys/param.h#4 integrate .. //depot/projects/sio/sys/sys/proc.h#5 integrate .. //depot/projects/sio/sys/sys/sem.h#2 integrate .. //depot/projects/sio/sys/sys/syscall.h#2 integrate .. //depot/projects/sio/sys/sys/syscall.mk#2 integrate .. //depot/projects/sio/sys/sys/sysproto.h#2 integrate .. //depot/projects/sio/sys/sys/umtx.h#2 integrate .. //depot/projects/sio/sys/ufs/ffs/ffs_vnops.c#4 integrate .. //depot/projects/sio/sys/ufs/ufs/ufs_extattr.c#3 integrate .. //depot/projects/sio/sys/vm/swap_pager.c#3 integrate .. //depot/projects/sio/sys/vm/vm_kern.c#2 integrate .. //depot/projects/sio/sys/vm/vm_map.c#2 integrate .. //depot/projects/sio/sys/vm/vm_object.c#8 integrate .. //depot/projects/sio/sys/vm/vm_object.h#3 integrate .. //depot/projects/sio/sys/vm/vm_page.c#2 integrate .. //depot/projects/sio/sys/vm/vm_swap.c#2 integrate .. //depot/projects/sio/tools/debugscripts/dot.gdbinit#1 branch .. //depot/projects/sio/tools/debugscripts/gdbinit.i386#1 branch .. //depot/projects/sio/tools/debugscripts/gdbinit.kernel#1 branch .. //depot/projects/sio/tools/debugscripts/gdbinit.vinum#1 branch .. //depot/projects/sio/tools/regression/ccd/layout/ccd.sh#2 integrate .. //depot/projects/sio/tools/regression/lib/libc/locale/Makefile#2 integrate .. //depot/projects/sio/tools/regression/lib/libc/locale/test-iswctype.c#1 branch .. //depot/projects/sio/tools/regression/lib/libc/locale/test-towctrans.c#1 branch .. //depot/projects/sio/tools/regression/usr.bin/sed/regress.s3.out#1 branch .. //depot/projects/sio/tools/regression/usr.bin/sed/regress.s4.out#1 branch .. //depot/projects/sio/tools/regression/usr.bin/sed/regress.s5.out#1 branch .. //depot/projects/sio/tools/regression/usr.bin/sed/regress.sg.out#1 branch .. //depot/projects/sio/tools/regression/usr.bin/sed/regress.sh#2 integrate .. //depot/projects/sio/tools/tools/crypto/cryptotest.c#2 integrate .. //depot/projects/sio/tools/tools/tinderbox/tbmaster.pl#6 integrate .. //depot/projects/sio/usr.bin/apply/apply.c#2 integrate .. //depot/projects/sio/usr.bin/awk/Makefile#2 integrate .. //depot/projects/sio/usr.bin/calendar/calendars/calendar.freebsd#3 integrate .. //depot/projects/sio/usr.bin/ctags/ctags.1#2 integrate .. //depot/projects/sio/usr.bin/kdump/kdump.1#2 integrate .. //depot/projects/sio/usr.bin/kdump/kdump.c#2 integrate .. //depot/projects/sio/usr.bin/less/Makefile.common#2 integrate .. //depot/projects/sio/usr.bin/locate/locate/locate.1#2 integrate .. //depot/projects/sio/usr.bin/m4/m4.1#2 integrate .. //depot/projects/sio/usr.bin/mklocale/yacc.y#2 integrate .. //depot/projects/sio/usr.bin/rs/rs.1#2 integrate .. //depot/projects/sio/usr.bin/sed/process.c#2 integrate .. //depot/projects/sio/usr.bin/sockstat/sockstat.c#3 integrate .. //depot/projects/sio/usr.bin/stat/stat.1#3 integrate .. //depot/projects/sio/usr.bin/su/su.1#2 integrate .. //depot/projects/sio/usr.bin/symorder/symorder.1#2 integrate .. //depot/projects/sio/usr.bin/tcopy/tcopy.1#2 integrate .. //depot/projects/sio/usr.bin/tput/tput.1#2 integrate .. //depot/projects/sio/usr.bin/truss/Makefile#2 integrate .. //depot/projects/sio/usr.bin/tset/tset.1#2 integrate .. //depot/projects/sio/usr.bin/ul/ul.1#2 integrate .. //depot/projects/sio/usr.bin/unifdef/Makefile#2 integrate .. //depot/projects/sio/usr.bin/vgrind/vgrind.1#2 integrate .. //depot/projects/sio/usr.bin/xlint/lint1/cgram.y#2 integrate .. //depot/projects/sio/usr.sbin/IPXrouted/IPXrouted.8#2 integrate .. //depot/projects/sio/usr.sbin/Makefile#3 integrate .. //depot/projects/sio/usr.sbin/asf/Makefile#1 branch .. //depot/projects/sio/usr.sbin/asf/asf.8#1 branch .. //depot/projects/sio/usr.sbin/asf/asf.c#1 branch .. //depot/projects/sio/usr.sbin/chkgrp/chkgrp.c#3 integrate .. //depot/projects/sio/usr.sbin/chroot/chroot.8#2 integrate .. //depot/projects/sio/usr.sbin/chroot/chroot.c#3 integrate .. //depot/projects/sio/usr.sbin/crunch/crunchide/Makefile#2 integrate .. //depot/projects/sio/usr.sbin/crunch/crunchide/exec_elf32.c#2 integrate .. //depot/projects/sio/usr.sbin/extattr/rmextattr.c#2 integrate .. //depot/projects/sio/usr.sbin/fwcontrol/fwcontrol.8#4 integrate .. //depot/projects/sio/usr.sbin/i4b/g711conv/g711conv.c#2 integrate .. //depot/projects/sio/usr.sbin/i4b/isdnd/exec.c#2 integrate .. //depot/projects/sio/usr.sbin/i4b/isdndecode/main.c#2 integrate .. //depot/projects/sio/usr.sbin/i4b/isdntel/files.c#2 integrate .. //depot/projects/sio/usr.sbin/i4b/isdntel/main.c#2 integrate .. //depot/projects/sio/usr.sbin/i4b/isdntrace/trace.c#2 integrate .. //depot/projects/sio/usr.sbin/inetd/inetd.8#2 integrate .. //depot/projects/sio/usr.sbin/ipftest/Makefile#2 integrate .. //depot/projects/sio/usr.sbin/ipresend/Makefile#2 integrate .. //depot/projects/sio/usr.sbin/ipsend/Makefile#2 integrate .. //depot/projects/sio/usr.sbin/iptest/Makefile#2 integrate .. //depot/projects/sio/usr.sbin/lpr/lpd/lpd.8#2 integrate .. //depot/projects/sio/usr.sbin/mergemaster/Makefile#2 integrate .. //depot/projects/sio/usr.sbin/moused/moused.8#2 integrate .. //depot/projects/sio/usr.sbin/mptable/mptable.c#2 integrate .. //depot/projects/sio/usr.sbin/ntp/Makefile#2 integrate .. //depot/projects/sio/usr.sbin/ntp/Makefile.inc#2 integrate .. //depot/projects/sio/usr.sbin/pkg_install/sign/pkg_sign.1#2 integrate .. //depot/projects/sio/usr.sbin/pstat/pstat.c#3 integrate .. //depot/projects/sio/usr.sbin/pw/pw.conf.5#2 integrate .. //depot/projects/sio/usr.sbin/rmt/rmt.8#2 integrate .. //depot/projects/sio/usr.sbin/sliplogin/sliplogin.8#2 integrate .. //depot/projects/sio/usr.sbin/sysinstall/disks.c#3 integrate .. //depot/projects/sio/usr.sbin/sysinstall/dist.c#3 integrate .. //depot/projects/sio/usr.sbin/tcpdchk/Makefile#2 integrate .. //depot/projects/sio/usr.sbin/tcpdmatch/Makefile#2 integrate .. //depot/projects/sio/usr.sbin/timed/timedc/timedc.8#2 integrate .. //depot/projects/sio/usr.sbin/usbd/usbd.c#2 integrate .. //depot/projects/sio/usr.sbin/ypbind/ypbind.8#2 integrate .. //depot/projects/sio/usr.sbin/ypset/ypset.c#3 integrate Differences ... ==== //depot/projects/sio/MAINTAINERS#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.60 2003/04/27 05:51:12 imp Exp $ +$FreeBSD: src/MAINTAINERS,v 1.66 2003/06/06 11:30:49 guido Exp $ subsystem login notes ----------------------------- @@ -78,3 +78,101 @@ sppp(4) joerg Just keep me informed of changes, try not to break it. libc nectar Opportuntity for pre-commit review appreciated for nsdispatch(3) and its consumers. +unifdef(1) fanf Pre-commit review requested. +ntp roberto Pre-commit review requested. + +Following are the entries from the Makefiles, and a few other sources. +Please remove stale entries from both their origin, and this file. + +Please also consider removing the lines from the files listed below and +stating your preferences here instead. + +bin/dd/Makefile:MAINTAINER= green@FreeBSD.org +bin/rmail/Makefile:MAINTAINER= gshapiro@FreeBSD.org +contrib/cvs/FREEBSD-upgrade:MAINTAINER= peter@FreeBSD.org +games/fortune/datfiles/Makefile:MAINTAINER= jkh@FreeBSD.org +gnu/usr.bin/binutils/Makefile:MAINTAINER= obrien@FreeBSD.org +gnu/usr.bin/cvs/Makefile:MAINTAINER= peter@FreeBSD.org +gnu/usr.bin/cvs/contrib/Makefile:MAINTAINER= peter@FreeBSD.org +gnu/usr.bin/cvs/cvs/Makefile:MAINTAINER= peter@FreeBSD.org +gnu/usr.bin/cvs/cvsbug/Makefile:MAINTAINER= peter@FreeBSD.org +gnu/usr.bin/cvs/doc/Makefile:MAINTAINER= peter@FreeBSD.org +gnu/usr.bin/cvs/lib/Makefile:MAINTAINER= peter@FreeBSD.org +gnu/usr.bin/cvs/libdiff/Makefile:MAINTAINER= peter@FreeBSD.org +gnu/usr.bin/man/apropos/Makefile:MAINTAINER= wosch@FreeBSD.org +lib/libbz2/Makefile:MAINTAINER= obrien@FreeBSD.org +lib/libc/posix1e/Makefile.inc:MAINTAINER= rwatson@FreeBSD.org +lib/libcam/Makefile:MAINTAINER= ken@FreeBSD.ORG +lib/libdevstat/Makefile:MAINTAINER= ken@FreeBSD.ORG +lib/libmilter/Makefile:MAINTAINER= gshapiro@FreeBSD.org +lib/libsm/Makefile:MAINTAINER= gshapiro@FreeBSD.org +lib/libsmdb/Makefile:MAINTAINER= gshapiro@FreeBSD.org +lib/libsmutil/Makefile:MAINTAINER= gshapiro@FreeBSD.org +lib/libusbhid/Makefile:MAINTAINER= n_hibma@FreeBSD.ORG +lib/libz/Makefile:MAINTAINER= peter@FreeBSD.org +libexec/lukemftpd/Makefile:MAINTAINER= obrien@FreeBSD.org +libexec/mail.local/Makefile:MAINTAINER= gshapiro@FreeBSD.org +libexec/smrsh/Makefile:MAINTAINER= gshapiro@FreeBSD.org +sbin/camcontrol/Makefile:MAINTAINER= ken@FreeBSD.org +sbin/dhclient/Makefile.inc:MAINTAINER= murray@FreeBSD.org +sbin/ffsinfo/Makefile:MAINTAINER= tomsoft@FreeBSD.ORG, chm@FreeBSD.ORG +sbin/growfs/Makefile:MAINTAINER= tomsoft@FreeBSD.ORG, chm@FreeBSD.ORG +sbin/ipf/Makefile:MAINTAINER= darrenr@freebsd.org +sbin/ipfs/Makefile:MAINTAINER= darrenr@freebsd.org +sbin/ipfstat/Makefile:MAINTAINER= darrenr@freebsd.org +sbin/ipmon/Makefile:MAINTAINER= darrenr@freebsd.org +sbin/ipnat/Makefile:MAINTAINER= darrenr@freebsd.org +share/doc/smm/08.sendmailop/Makefile:MAINTAINER= gshapiro@FreeBSD.org +share/sendmail/Makefile:MAINTAINER= gshapiro@FreeBSD.org +sys/boot/i386/cdboot/Makefile:MAINTAINER= jhb@FreeBSD.org +sys/boot/i386/pxeldr/Makefile:MAINTAINER= jhb@FreeBSD.org +sys/compat/svr4/Makefile:MAINTAINER= newton@freebsd.org +sys/dev/asr/MAINTAINER:MAINTAINER= obrien@freebsd.org, scott_long@btc.adaptec.com, mark_salyzyn@adaptec.com +sys/dev/bktr/CHANGELOG.TXT:MAINTAINER= Roger Hardiman +sys/dev/ep/if_ep.c:MAINTAINER= Matthew N. Dodd +sys/dev/ex/if_ex.c:MAINTAINER= Matthew N. Dodd +sys/dev/ie/if_ie.c:MAINTAINER= Matthew N. Dodd +sys/dev/sound/pcm/feeder_rate.c:MAINTAINER= Orion Hodson +sys/modules/3dfx/Makefile:MAINTAINER= cokane@FreeBSD.org +sys/modules/bktr/bktr_mem/Makefile:MAINTAINER= roger@freebsd.org +sys/modules/cam/Makefile:MAINTAINER= n_hibma@freebsd.org +sys/modules/linux/Makefile:MAINTAINER= emulation@FreeBSD.org +sys/modules/osf1/Makefile:MAINTAINER= gallatin@FreeBSD.org +sys/modules/pecoff/Makefile:MAINTAINER= takawata@FreeBSD.org +sys/modules/streams/Makefile:MAINTAINER= newton@atdot.dotat.org +sys/modules/svr4/Makefile:MAINTAINER= newton@FreeBSD.org +sys/modules/udbp/Makefile:MAINTAINER= n_hibma@freebsd.org +sys/modules/ugen/Makefile:MAINTAINER= n_hibma@freebsd.org +sys/modules/uhid/Makefile:MAINTAINER= n_hibma@freebsd.org +sys/modules/ukbd/Makefile:MAINTAINER= n_hibma@freebsd.org +sys/modules/ulpt/Makefile:MAINTAINER= n_hibma@freebsd.org +sys/modules/umass/Makefile:MAINTAINER= n_hibma@freebsd.org +sys/modules/umodem/Makefile:MAINTAINER= n_hibma@freebsd.org +sys/modules/ums/Makefile:MAINTAINER= n_hibma@freebsd.org +sys/modules/urio/Makefile:MAINTAINER= Iwasa Kazmi +sys/modules/usb/Makefile:MAINTAINER= n_hibma@freebsd.org +sys/modules/uscanner/Makefile:MAINTAINER= n_hibma@freebsd.org +usr.bin/brandelf/Makefile:MAINTAINER= obrien@FreeBSD.org +usr.bin/bzip2/Makefile:MAINTAINER= obrien@FreeBSD.org +usr.bin/bzip2recover/Makefile:MAINTAINER= obrien@FreeBSD.org +usr.bin/chat/Makefile:MAINTAINER= peter@freebsd.org +usr.bin/locate/Makefile:MAINTAINER= wosch@FreeBSD.org +usr.bin/vacation/Makefile:MAINTAINER= gshapiro@FreeBSD.org +usr.bin/whois/Makefile:MAINTAINER= mike@FreeBSD.org +usr.sbin/editmap/Makefile:MAINTAINER= gshapiro@FreeBSD.org +usr.sbin/inetd/Makefile:MAINTAINER= dwmalone@FreeBSD.org +usr.sbin/iostat/Makefile:MAINTAINER= ken@FreeBSD.ORG +usr.sbin/ipftest/Makefile:MAINTAINER= darrenr@freebsd.org +usr.sbin/ipresend/Makefile:MAINTAINER= darrenr@freebsd.org +usr.sbin/ipsend/Makefile:MAINTAINER= darrenr@freebsd.org +usr.sbin/iptest/Makefile:MAINTAINER= darrenr@freebsd.org +usr.sbin/lpr/Makefile:MAINTAINER= wollman@FreeBSD.org +usr.sbin/lpr/Makefile:MAINTAINER+= gad@FreeBSD.org +usr.sbin/mailstats/Makefile:MAINTAINER= gshapiro@FreeBSD.org +usr.sbin/makemap/Makefile:MAINTAINER= gshapiro@FreeBSD.org +usr.sbin/ntp/doc/Makefile:MAINTAINER= sheldonh@FreeBSD.org +usr.sbin/pppd/Makefile:MAINTAINER= peter@freebsd.org +usr.sbin/pppstats/Makefile:MAINTAINER= peter@freebsd.org +usr.sbin/praliases/Makefile:MAINTAINER= gshapiro@FreeBSD.org +usr.sbin/sendmail/Makefile:MAINTAINER= gshapiro@FreeBSD.org +usr.sbin/zic/Makefile:MAINTAINER= wollman@FreeBSD.org ==== //depot/projects/sio/Makefile.inc1#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.363 2003/05/31 21:29:38 obrien Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.365 2003/06/08 04:15:05 imp Exp $ # # Make command line options: # -DNO_KERBEROS Do not build Heimdal (Kerberos 5) @@ -202,6 +202,9 @@ PATH=${BPATH}:${PATH} \ WORLDTMP=${WORLDTMP} \ MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" +.if ${BOOTSTRAPPING} < 501100 +BMAKEENV+= CSTD= +.endif BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \ ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ BOOTSTRAPPING=${OSRELDATE} \ @@ -781,8 +784,7 @@ _startup_libs+= lib/csu/${MACHINE_ARCH} .endif -_prebuild_libs= - +_prebuild_libs+= lib/libc _generic_libs= gnu/lib .if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \ ==== //depot/projects/sio/bin/cp/cp.1#2 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)cp.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/cp/cp.1,v 1.26 2003/04/07 11:00:56 mdodd Exp $ +.\" $FreeBSD: src/bin/cp/cp.1,v 1.27 2003/06/07 06:35:36 ru Exp $ .\" .Dd July 23, 2002 .Dt CP 1 @@ -153,21 +153,22 @@ .It Fl p Cause .Nm -to preserve in the copy as many of the modification time, access time, -file flags, file mode, user ID, and group ID as allowed by permissions. +to preserve the following attributes of each source +file in the copy: modification time, access time, +file flags, file mode, user ID, and group ID, as allowed by permissions. .Pp If the user ID and group ID cannot be preserved, no error message is displayed and the exit value is not altered. .Pp -If the source file has its set user ID bit on and the user ID cannot -be preserved, the set user ID bit is not preserved +If the source file has its set-user-ID bit on and the user ID cannot +be preserved, the set-user-ID bit is not preserved in the copy's permissions. -If the source file has its set group ID bit on and the group ID cannot -be preserved, the set group ID bit is not preserved +If the source file has its set-group-ID bit on and the group ID cannot +be preserved, the set-group-ID bit is not preserved in the copy's permissions. -If the source file has both its set user ID and set group ID bits on, +If the source file has both its set-user-ID and set-group-ID bits on, and either the user ID or group ID cannot be preserved, neither -the set user ID nor set group ID bits are preserved in the copy's +the set-user-ID nor set-group-ID bits are preserved in the copy's permissions. .It Fl v Cause @@ -194,13 +195,13 @@ .Pf ( Ic umask , see .Xr csh 1 ) . -If the source file has its set user ID bit on, that bit is removed +If the source file has its set-user-ID bit on, that bit is removed unless both the source file and the destination file are owned by the same user. -If the source file has its set group ID bit on, that bit is removed +If the source file has its set-group-ID bit on, that bit is removed unless both the source file and the destination file are in the same group and the user is a member of that group. -If both the set user ID and set group ID bits are set, all of the above +If both the set-user-ID and set-group-ID bits are set, all of the above conditions must be fulfilled or both bits are removed. .Pp Appropriate permissions are required for file creation or overwriting. ==== //depot/projects/sio/bin/csh/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/bin/csh/Makefile,v 1.30 2003/05/02 06:39:13 obrien Exp $ +# $FreeBSD: src/bin/csh/Makefile,v 1.31 2003/06/06 13:46:55 kuriyama Exp $ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # # C Shell with process control; VM/UNIX VAX Makefile @@ -73,7 +73,7 @@ .endfor csh.1: tcsh.man - ln -sf ${.ALLSRC} ${.TARGET} + cat ${.ALLSRC} > ${.TARGET} build-tools: gethost ==== //depot/projects/sio/bin/df/df.1#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)df.1 8.3 (Berkeley) 5/8/95 -.\" $FreeBSD: src/bin/df/df.1,v 1.29 2003/05/06 21:54:46 trhodes Exp $ +.\" $FreeBSD: src/bin/df/df.1,v 1.30 2003/06/03 12:00:35 bde Exp $ .\" .Dd May 8, 1995 .Dt DF 1 @@ -148,9 +148,7 @@ .Sh BUGS The .Fl n -and -.Fl t -flags are ignored if a file or file system is specified. +flag is ignored if a file or file system is specified. .Sh SEE ALSO .Xr lsvfs 1 , .Xr quota 1 , ==== //depot/projects/sio/bin/df/df.c#4 (text+ko) ==== @@ -48,7 +48,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.48 2003/05/03 16:02:52 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.50 2003/06/03 11:54:42 bde Exp $"); #include #include @@ -271,6 +271,7 @@ } } else mntpt = *argv; + /* * Statfs does not take a `wait' flag, so we cannot * implement nflag here. @@ -280,6 +281,18 @@ rv = 1; continue; } + + /* + * Check to make sure the arguments we've been given are + * satisfied. Return an error if we have been asked to + * list a mount point that does not match the other args + * we've been given (-l, -t, etc.). + */ + if (checkvfsname(statfsbuf.f_fstypename, vfslist)) { + rv = 1; + continue; + } + if (argc == 1) { bzero(&maxwidths, sizeof(maxwidths)); update_maxwidths(&maxwidths, &statfsbuf); ==== //depot/projects/sio/bin/ed/Makefile#3 (text+ko) ==== @@ -1,15 +1,15 @@ -# $FreeBSD: src/bin/ed/Makefile,v 1.22 2003/05/19 15:51:58 des Exp $ +# $FreeBSD: src/bin/ed/Makefile,v 1.24 2003/06/08 08:24:07 markm Exp $ PROG= ed SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c LINKS= ${BINDIR}/ed ${BINDIR}/red MLINKS= ed.1 red.1 -.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) +.if exists(${.CURDIR}/../../crypto) && !defined(NO_OPENSSL) DISTRIBUTION=crypto CFLAGS+=-DDES -DPADD= ${LIBCIPHER} -LDADD= -lcipher +DPADD= ${LIBCRYPTO} +LDADD= -lcrypto .endif .include ==== //depot/projects/sio/bin/ed/cbc.c#2 (text+ko) ==== @@ -36,13 +36,15 @@ */ #include -__FBSDID("$FreeBSD: src/bin/ed/cbc.c,v 1.17 2002/07/31 16:49:01 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/ed/cbc.c,v 1.19 2003/06/03 17:03:48 jhay Exp $"); #include #include #include #ifdef DES #include +#include +#define ED_DES_INCLUDES #endif #include "ed.h" @@ -56,12 +58,9 @@ #define MEMZERO(dest,len) memset((dest), 0, (len)) /* Hide the calls to the primitive encryption routines. */ -#define DES_KEY(buf) \ - if (des_setkey(buf)) \ - des_error("des_setkey"); #define DES_XFORM(buf) \ - if (des_cipher((char *)buf, (char *)buf, 0L, inverse ? -1 : 1)) \ - des_error("des_cipher"); + DES_ecb_encrypt(buf, buf, &schedule, \ + inverse ? DES_DECRYPT : DES_ENCRYPT); /* * read/write - no error checking @@ -70,15 +69,6 @@ #define WRITE(buf, n, fp) fwrite(buf, sizeof(char), n, fp) /* - * some things to make references easier - */ -typedef char Desbuf[8]; -#define CHAR(x,i) (x[i]) -#define UCHAR(x,i) (x[i]) -#define BUFFER(x) (x) -#define UBUFFER(x) (x) - -/* * global variables and related macros */ @@ -86,18 +76,25 @@ MODE_ENCRYPT, MODE_DECRYPT, MODE_AUTHENTICATE } mode = MODE_ENCRYPT; -Desbuf ivec; /* initialization vector */ -Desbuf pvec; /* padding vector */ +#ifdef DES +DES_cblock ivec; /* initialization vector */ +DES_cblock pvec; /* padding vector */ +#endif + char bits[] = { /* used to extract bits from a char */ '\200', '\100', '\040', '\020', '\010', '\004', '\002', '\001' }; + int pflag; /* 1 to preserve parity bits */ +#ifdef DES +DES_key_schedule schedule; /* expanded DES key */ +#endif + unsigned char des_buf[8]; /* shared buffer for get_des_char/put_des_char */ int des_ct = 0; /* count for get_des_char/put_des_char */ int des_n = 0; /* index for put_des_char/get_des_char */ - /* init_des_cipher: initialize DES */ void init_des_cipher(void) @@ -112,7 +109,7 @@ /* initialize the padding vector */ for (i = 0; i < 8; i++) - CHAR(pvec, i) = (char) (arc4random() % 256); + pvec[i] = (char) (arc4random() % 256); #endif } @@ -172,7 +169,7 @@ get_keyword(void) { char *p; /* used to obtain the key */ - Desbuf msgbuf; /* I/O buffer */ + DES_cblock msgbuf; /* I/O buffer */ /* * get the key @@ -182,9 +179,9 @@ /* * copy it, nul-padded, into the key area */ - expand_des_key(BUFFER(msgbuf), p); + expand_des_key(msgbuf, p); MEMZERO(p, _PASSWORD_LEN); - set_des_key(msgbuf); + set_des_key(&msgbuf); MEMZERO(msgbuf, sizeof msgbuf); return 1; } @@ -303,7 +300,7 @@ * DES ignores the low order bit of each character. */ void -set_des_key(Desbuf buf) /* key block */ +set_des_key(DES_cblock *buf) /* key block */ { int i, j; /* counter in a for loop */ int par; /* parity counter */ @@ -315,16 +312,17 @@ for (i = 0; i < 8; i++) { par = 0; for (j = 1; j < 8; j++) - if ((bits[j]&UCHAR(buf, i)) != 0) + if ((bits[j] & (*buf)[i]) != 0) par++; - if ((par&01) == 01) - UCHAR(buf, i) = UCHAR(buf, i)&0177; + if ((par & 0x01) == 0x01) + (*buf)[i] &= 0x7f; else - UCHAR(buf, i) = (UCHAR(buf, i)&0177)|0200; + (*buf)[i] = ((*buf)[i] & 0x7f) | 0x80; } } - DES_KEY(UBUFFER(buf)); + DES_set_odd_parity(buf); + DES_set_key(buf, &schedule); } @@ -341,10 +339,10 @@ */ if (n == 8) { for (n = 0; n < 8; n++) - CHAR(msgbuf, n) ^= CHAR(ivec, n); - DES_XFORM(UBUFFER(msgbuf)); - MEMCPY(BUFFER(ivec), BUFFER(msgbuf), 8); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 9 11:37:02 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EEE7137B404; Mon, 9 Jun 2003 11:37:01 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 895A837B401 for ; Mon, 9 Jun 2003 11:37:01 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 063CF43F3F for ; Mon, 9 Jun 2003 11:37:00 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h59Iax0U000412 for ; Mon, 9 Jun 2003 11:36:59 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h59IawsT000409 for perforce@freebsd.org; Mon, 9 Jun 2003 11:36:58 -0700 (PDT) Date: Mon, 9 Jun 2003 11:36:58 -0700 (PDT) Message-Id: <200306091836.h59IawsT000409@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 32860 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jun 2003 18:37:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=32860 Change 32860 by jhb@jhb_laptop on 2003/06/09 11:36:12 IFC @32857. Affected files ... .. //depot/projects/smpng/sys/alpha/conf/GENERIC#30 integrate .. //depot/projects/smpng/sys/boot/ficl/Makefile#4 integrate .. //depot/projects/smpng/sys/boot/ficl/loader.c#6 integrate .. //depot/projects/smpng/sys/boot/i386/kgzldr/Makefile#8 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/Makefile#9 integrate .. //depot/projects/smpng/sys/boot/pc98/kgzldr/Makefile#6 integrate .. //depot/projects/smpng/sys/boot/pc98/libpc98/Makefile#8 integrate .. //depot/projects/smpng/sys/boot/pc98/libpc98/i386_module.c#1 branch .. //depot/projects/smpng/sys/boot/pc98/loader/Makefile#9 integrate .. //depot/projects/smpng/sys/boot/pc98/loader/help.pc98#1 branch .. //depot/projects/smpng/sys/conf/NOTES#45 integrate .. //depot/projects/smpng/sys/conf/ldscript.sparc64#3 integrate .. //depot/projects/smpng/sys/conf/newvers.sh#6 integrate .. //depot/projects/smpng/sys/ddb/db_ps.c#19 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7770.c#8 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.c#13 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.h#11 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_pci.c#11 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.c#15 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.h#9 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_pci.c#11 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#14 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.c#32 integrate .. //depot/projects/smpng/sys/dev/exca/exca.c#8 integrate .. //depot/projects/smpng/sys/dev/exca/excavar.h#5 integrate .. //depot/projects/smpng/sys/dev/ofw/openfirm.c#5 integrate .. //depot/projects/smpng/sys/dev/ofw/openfirm.h#5 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#30 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbbvar.h#10 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#26 integrate .. //depot/projects/smpng/sys/dev/vx/if_vx.c#10 integrate .. //depot/projects/smpng/sys/geom/geom.h#30 integrate .. //depot/projects/smpng/sys/geom/geom_ccd.c#2 integrate .. //depot/projects/smpng/sys/geom/geom_ctl.c#14 integrate .. //depot/projects/smpng/sys/geom/geom_dev.c#26 integrate .. //depot/projects/smpng/sys/geom/geom_dump.c#19 integrate .. //depot/projects/smpng/sys/geom/geom_event.c#18 integrate .. //depot/projects/smpng/sys/geom/geom_slice.c#23 integrate .. //depot/projects/smpng/sys/geom/geom_subr.c#29 integrate .. //depot/projects/smpng/sys/gnu/dev/sound/pci/emu10k1-alsa.h#1 branch .. //depot/projects/smpng/sys/i386/conf/GENERIC#39 integrate .. //depot/projects/smpng/sys/i386/include/acpica_machdep.h#4 integrate .. //depot/projects/smpng/sys/i386/include/apic.h#8 integrate .. //depot/projects/smpng/sys/i386/include/legacyvar.h#2 integrate .. //depot/projects/smpng/sys/i386/isa/apic_vector.s#16 integrate .. //depot/projects/smpng/sys/i386/pci/pci_bus.c#15 integrate .. //depot/projects/smpng/sys/ia64/conf/GENERIC#33 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#46 integrate .. //depot/projects/smpng/sys/ia64/ia64/trap.c#50 integrate .. //depot/projects/smpng/sys/ia64/include/cpu.h#14 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#58 integrate .. //depot/projects/smpng/sys/kern/kern_ktr.c#19 integrate .. //depot/projects/smpng/sys/kern/kern_ktrace.c#31 integrate .. //depot/projects/smpng/sys/kern/kern_mib.c#20 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#69 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#11 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#14 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#35 integrate .. //depot/projects/smpng/sys/nfsclient/bootp_subr.c#17 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC#33 integrate .. //depot/projects/smpng/sys/pc98/pc98/wd.c#12 integrate .. //depot/projects/smpng/sys/pc98/pc98/wd_cd.c#13 integrate .. //depot/projects/smpng/sys/pci/if_dc.c#39 integrate .. //depot/projects/smpng/sys/pci/if_dcreg.h#14 integrate .. //depot/projects/smpng/sys/powerpc/conf/GENERIC#17 integrate .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#30 integrate .. //depot/projects/smpng/sys/sparc64/include/db_machdep.h#6 integrate .. //depot/projects/smpng/sys/sparc64/include/ofw_mem.h#3 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/dump_machdep.c#5 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#51 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/vm_machdep.c#32 integrate .. //depot/projects/smpng/sys/sys/disklabel.h#26 integrate .. //depot/projects/smpng/sys/sys/ktrace.h#8 integrate .. //depot/projects/smpng/sys/sys/proc.h#91 integrate .. //depot/projects/smpng/sys/sys/sysctl.h#18 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#27 integrate .. //depot/projects/smpng/sys/vm/vm_kern.c#13 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#36 integrate .. //depot/projects/smpng/sys/vm/vm_mmap.c#28 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#39 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#37 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/conf/GENERIC#30 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.160 2003/05/18 20:39:15 ru Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.161 2003/06/08 02:03:01 jmallett Exp $ machine alpha cpu EV4 @@ -101,7 +101,7 @@ device sym # NCR/Symbios Logic (newer chipsets + those of `ncr') # SCSI peripherals -device scbus # SCSI bus (required) +device scbus # SCSI bus (required for SCSI) device ch # SCSI media changers device da # Direct Access (disks) device sa # Sequential Access (tape etc) ==== //depot/projects/smpng/sys/boot/ficl/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/ficl/Makefile,v 1.32 2002/05/13 11:09:06 ru Exp $ +# $FreeBSD: src/sys/boot/ficl/Makefile,v 1.33 2003/06/08 03:11:16 nyan Exp $ # .PATH: ${.CURDIR}/${MACHINE_ARCH} BASE_SRCS= dict.c ficl.c fileaccess.c float.c loader.c math64.c \ @@ -13,6 +13,9 @@ .if ${MACHINE_ARCH} == "i386" CFLAGS+= -mpreferred-stack-boundary=2 .endif +.if ${MACHINE} == "pc98" +CFLAGS+= -DPC98 +.endif .if HAVE_PNP CFLAGS+= -DHAVE_PNP .endif ==== //depot/projects/smpng/sys/boot/ficl/loader.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/ficl/loader.c,v 1.8 2002/08/21 09:28:00 scottl Exp $ + * $FreeBSD: src/sys/boot/ficl/loader.c,v 1.9 2003/06/08 03:11:16 nyan Exp $ */ /******************************************************************* @@ -656,7 +656,9 @@ dictAppendWord(dp, "ccall", ficlCcall, FW_DEFAULT); #endif -#if defined(__i386__) +#if defined(PC98) + ficlSetEnv(pSys, "arch-pc98", FICL_TRUE); +#elif defined(__i386__) ficlSetEnv(pSys, "arch-i386", FICL_TRUE); ficlSetEnv(pSys, "arch-alpha", FICL_FALSE); ficlSetEnv(pSys, "arch-ia64", FICL_FALSE); ==== //depot/projects/smpng/sys/boot/i386/kgzldr/Makefile#8 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/sys/boot/i386/kgzldr/Makefile,v 1.13 2003/06/06 13:49:51 kuriyama Exp $ +# $FreeBSD: src/sys/boot/i386/kgzldr/Makefile,v 1.15 2003/06/07 17:42:26 obrien Exp $ -SRCS= start.s boot.c inflate.c lib.c crt.s sio.s +SRCS= boot.c inflate.c lib.c OBJS= ${SRCS:N*.h:R:S/$/.o/g} CFLAGS= -ffreestanding CFLAGS+=-Os @@ -8,6 +8,12 @@ LDFLAGS=-nostdlib -static -r .PATH: ${.CURDIR}/../../../kern +.for asm in start crt sio +OBJS+= ${asm}.o +${asm}.o: ${asm}.s + ${AS} ${AFLAGS} -o ${.TARGET} ${.ALLSRC:M*${asm}*} +.endfor + CLEANFILES=kgzldr.o BOOT_COMCONSOLE_PORT?= 0x3f8 ==== //depot/projects/smpng/sys/boot/i386/libi386/Makefile#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/libi386/Makefile,v 1.30 2003/06/02 02:37:27 obrien Exp $ +# $FreeBSD: src/sys/boot/i386/libi386/Makefile,v 1.31 2003/06/07 17:42:26 obrien Exp $ # LIB= i386 INTERNALLIB= true @@ -47,6 +47,6 @@ OBJS+= pxetramp.o pxetramp.o: pxetramp.s - as -o ${.TARGET} ${.ALLSRC:M*pxetramp*} + ${AS} ${AFLAGS} -o ${.TARGET} ${.ALLSRC:M*pxetramp*} .include ==== //depot/projects/smpng/sys/boot/pc98/kgzldr/Makefile#6 (text+ko) ==== @@ -1,24 +1,34 @@ -# $FreeBSD: src/sys/boot/pc98/kgzldr/Makefile,v 1.7 2002/09/30 20:37:58 peter Exp $ +# $FreeBSD: src/sys/boot/pc98/kgzldr/Makefile,v 1.9 2003/06/07 17:42:26 obrien Exp $ -FILES= kgzldr.o -SRCS= start.s boot.c inflate.c lib.c crt.s sio.s +SRCS= boot.c inflate.c lib.c OBJS= ${SRCS:N*.h:R:S/$/.o/g} CFLAGS= -ffreestanding CFLAGS+=-Os CFLAGS+=-DKZIP LDFLAGS=-nostdlib -static -r -BINDIR= /usr/lib .PATH: ${.CURDIR}/../../../kern .PATH: ${.CURDIR}/../../i386/kgzldr AFLAGS+=--defsym PC98=1 -CLEANFILES=${FILES} +.for asm in start crt sio +OBJS+= ${asm}.o +${asm}.o: ${asm}.s + ${AS} ${AFLAGS} -o ${.TARGET} ${.ALLSRC:M*${asm}*} +.endfor + +CLEANFILES=kgzldr.o BOOT_COMCONSOLE_PORT?= 0x238 AFLAGS+=--defsym SIO_PRT=${BOOT_COMCONSOLE_PORT} +all: ${OBJS} kgzldr.o + kgzldr.o: ${OBJS} ${CC} ${LDFLAGS} -o ${.TARGET} ${OBJS} -.include +realinstall: + ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + kgzldr.o ${DESTDIR}${LIBDIR} + +.include ==== //depot/projects/smpng/sys/boot/pc98/libpc98/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/pc98/libpc98/Makefile,v 1.14 2003/05/01 13:17:06 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/libpc98/Makefile,v 1.17 2003/06/08 03:16:59 nyan Exp $ # LIB= pc98 INTERNALLIB= true @@ -7,7 +7,7 @@ SRCS= bioscd.c biosdisk.c biosmem.c biospnp.c biospci.c biossmap.c \ bootinfo.c bootinfo32.c comconsole.c devicename.c elf32_freebsd.c \ - gatea20.c i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \ + gatea20.c i386_copy.c i386_module.c nullconsole.c pxe.c \ time.c vidconsole.c CFLAGS+= -ffreestanding @@ -28,7 +28,6 @@ CFLAGS+= -DPC98 CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../btx/lib \ -I${.CURDIR}/../../i386/libi386 \ - -I${.CURDIR}/../../../contrib/dev/acpica \ -I${.CURDIR}/../../.. -I. # the location of libstand CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ @@ -41,11 +40,14 @@ .if exists(${.CURDIR}/../../../i386/include) beforedepend ${OBJS}: machine +CLEANFILES+= machine machine: ln -sf ${.CURDIR}/../../../i386/include machine .endif -CLEANFILES+= machine +OBJS+= pxetramp.o +pxetramp.o: pxetramp.s + ${AS} ${AFLAGS} -o ${.TARGET} ${.ALLSRC:M*pxetramp*} .include ==== //depot/projects/smpng/sys/boot/pc98/loader/Makefile#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/pc98/loader/Makefile,v 1.28 2003/01/21 13:57:43 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/loader/Makefile,v 1.30 2003/06/08 03:34:49 nyan Exp $ PROG= loader STRIP= @@ -100,15 +100,16 @@ cp ${.ALLSRC} ${.TARGET} strip -R .comment -R .note ${.TARGET} -${PROG}.help: help.common help.i386 +${PROG}.help: help.common help.pc98 cat ${.ALLSRC} | awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET} .PATH: ${.CURDIR}/../../forth FILES= ${PROG}.help loader.4th support.4th loader.conf +FILES+= screen.4th frames.4th beastie.4th FILESDIR_loader.conf= /boot/defaults .if !exists(${DESTDIR}/boot/loader.rc) -FILES+= loader.rc +FILES+= ${.CURDIR}/../../i386/loader/loader.rc .endif .include <${.CURDIR}/../Makefile.inc> ==== //depot/projects/smpng/sys/conf/NOTES#45 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1149 2003/05/15 02:10:29 jmallett Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1150 2003/06/09 17:09:51 hmp Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -102,6 +102,7 @@ options BLKDEV_IOSIZE=8192 # Options for the VM subsystem +# L2 cache size (in KB) can be specified in PQ_CACHESIZE options PQ_CACHESIZE=512 # color for 512k/16k cache # Deprecated options supported for backwards compatibility #options PQ_NOOPT # No coloring ==== //depot/projects/smpng/sys/conf/ldscript.sparc64#3 (text+ko) ==== @@ -1,9 +1,9 @@ -/* $FreeBSD: src/sys/conf/ldscript.sparc64,v 1.3 2001/09/21 05:43:37 jake Exp $ */ +/* $FreeBSD: src/sys/conf/ldscript.sparc64,v 1.4 2003/06/07 18:23:50 jake Exp $ */ OUTPUT_FORMAT("elf64-sparc", "elf64-sparc", "elf64-sparc") OUTPUT_ARCH(sparc:v9) ENTRY(_start) - SEARCH_DIR(/home/jake/sparc64-unknown-elf/lib); +SEARCH_DIR(/usr/lib); /* Do we need any of these for elf? __DYNAMIC = 0; */ SECTIONS ==== //depot/projects/smpng/sys/conf/newvers.sh#6 (text+ko) ==== @@ -32,7 +32,7 @@ # SUCH DAMAGE. # # @(#)newvers.sh 8.1 (Berkeley) 4/20/94 -# $FreeBSD: src/sys/conf/newvers.sh,v 1.51 2003/06/02 04:58:43 scottl Exp $ +# $FreeBSD: src/sys/conf/newvers.sh,v 1.53 2003/06/09 18:19:32 jmallett Exp $ TYPE="FreeBSD" REVISION="5.1" @@ -86,6 +86,7 @@ touch version v=`cat version` u=${USER-root} d=`pwd` h=`hostname` t=`date` +i=`make -V KERN_IDENT` cat << EOF > vers.c $COPYRIGHT char sccspad[32 - 4 /* sizeof(sccs) */] = { '\\0' }; @@ -94,6 +95,7 @@ char ostype[] = "${TYPE}"; char osrelease[] = "${RELEASE}"; int osreldate = ${RELDATE}; +char kern_ident[] = "${i}"; EOF echo `expr ${v} + 1` > version ==== //depot/projects/smpng/sys/ddb/db_ps.c#19 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ddb/db_ps.c,v 1.41 2003/04/10 17:35:43 julian Exp $ + * $FreeBSD: src/sys/ddb/db_ps.c,v 1.44 2003/06/06 20:28:11 julian Exp $ */ #include #include @@ -43,8 +43,8 @@ #include #include -static void -dumpthread(volatile struct proc *p, volatile struct thread *td); + +static void dumpthread(volatile struct proc *p, volatile struct thread *td); void db_ps(dummy1, dummy2, dummy3, dummy4) @@ -72,7 +72,7 @@ /* * XXX just take 20 for now... */ - if (nl++ == 20) { + if (nl++ >= 20) { int c; db_printf("--More--"); @@ -108,7 +108,7 @@ if (P_SHOULDSTOP(p)) state = "stop"; else - state = "norm"; + state = ""; break; case PRS_NEW: state = "new "; @@ -120,7 +120,7 @@ state = "Unkn"; break; } - db_printf("%5d %8p %8p %4d %5d %5d %07x %-4s", + db_printf("%5d %8p %8p %4d %5d %5d %07x %s", p->p_pid, (volatile void *)p, (void *)p->p_uarea, p->p_ucred != NULL ? p->p_ucred->cr_ruid : 0, pp->p_pid, p->p_pgrp != NULL ? p->p_pgrp->pg_id : 0, p->p_flag, @@ -129,6 +129,7 @@ db_printf("(threaded) %s\n", p->p_comm); FOREACH_THREAD_IN_PROC(p, td) { dumpthread(p, td); + nl++; } /* PROC_UNLOCK(p); */ @@ -138,6 +139,7 @@ } /* sx_sunlock(&allproc_lock); */ } + static void dumpthread(volatile struct proc *p, volatile struct thread *td) { @@ -145,10 +147,16 @@ db_printf( " thread %p ksegrp %p ", td, td->td_ksegrp); if (TD_ON_SLEEPQ(td)) { if (td->td_flags & TDF_CVWAITQ) - db_printf("[CVQ "); + if (TD_IS_SLEEPING(td)) + db_printf("[CV]"); + else + db_printf("[CVQ"); else - db_printf("[SLPQ "); - db_printf(" %6s %8p]", td->td_wmesg, + if (TD_IS_SLEEPING(td)) + db_printf("[SLP]"); + else + db_printf("[SLPQ"); + db_printf("%s %p]", td->td_wmesg, (void *)td->td_wchan); } switch (td->td_state) { @@ -158,9 +166,11 @@ td->td_lockname, (void *)td->td_blocked); } +#if 0 /* covered above */ if (TD_IS_SLEEPING(td)) { db_printf("[SLP]"); } +#endif if (TD_IS_SWAPPED(td)) { db_printf("[SWAP]"); } @@ -180,8 +190,11 @@ case TDS_RUNNING: db_printf("[CPU %d]", td->td_oncpu); break; + case TDS_INACTIVE: + db_printf("[INACTIVE]"); + break; default: - panic("unknown thread state"); + db_printf("[UNK: %#x]", td->td_state); } if (p->p_flag & P_THREADED) { if (td->td_kse) ==== //depot/projects/smpng/sys/dev/aic7xxx/aic7770.c#8 (text+ko) ==== @@ -37,9 +37,9 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * - * $Id: //depot/aic7xxx/aic7xxx/aic7770.c#30 $ + * $Id: //depot/aic7xxx/aic7xxx/aic7770.c#32 $ * - * $FreeBSD: src/sys/dev/aic7xxx/aic7770.c,v 1.12 2003/05/03 23:55:38 gibbs Exp $ + * $FreeBSD: src/sys/dev/aic7xxx/aic7770.c,v 1.14 2003/06/06 23:48:18 gibbs Exp $ */ #ifdef __linux__ @@ -67,8 +67,7 @@ static ahc_device_setup_t ahc_aic7770_EISA_setup;; static ahc_device_setup_t ahc_aic7770_setup; - -struct aic7770_identity aic7770_ident_table [] = +struct aic7770_identity aic7770_ident_table[] = { { ID_AHA_274x, @@ -83,6 +82,12 @@ ahc_aic7770_VL_setup }, { + ID_AHA_284x, + 0xFFFFFFFE, + "Adaptec 284X SCSI adapter (BIOS Disabled)", + ahc_aic7770_VL_setup + }, + { ID_OLV_274x, 0xFFFFFFFF, "Adaptec (Olivetti OEM) 274X SCSI adapter", @@ -154,7 +159,7 @@ ahc->bus_suspend = aic7770_suspend; ahc->bus_resume = aic7770_resume; - error = ahc_reset(ahc); + error = ahc_reset(ahc, /*reinit*/FALSE); if (error != 0) return (error); ==== //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.c#13 (text+ko) ==== @@ -37,9 +37,9 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * - * $Id: aic79xx.c,v 1.16 2003/05/26 21:43:29 gibbs Exp $ + * $Id: //depot/aic7xxx/aic7xxx/aic79xx.c#198 $ * - * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.c,v 1.17 2003/05/30 02:15:15 scottl Exp $ + * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.c,v 1.20 2003/06/06 23:53:39 gibbs Exp $ */ #ifdef __linux__ @@ -1880,21 +1880,32 @@ tinfo->goal.ppr_options = 0; ahd_qinfifo_requeue_tail(ahd, scb); printerror = 0; - } else if ((ahd_sent_msg(ahd, AHDMSG_EXT, MSG_EXT_WDTR, FALSE) - || ahd_sent_msg(ahd, AHDMSG_EXT, MSG_EXT_SDTR, FALSE)) + } else if (ahd_sent_msg(ahd, AHDMSG_EXT, MSG_EXT_WDTR, FALSE) && ppr_busfree == 0) { /* - * Negotiation Rejected. Go-async and + * Negotiation Rejected. Go-narrow and * retry command. */ #ifdef AHD_DEBUG if ((ahd_debug & AHD_SHOW_MESSAGES) != 0) - printf("Negotiation rejected busfree.\n"); + printf("WDTR negotiation rejected busfree.\n"); #endif ahd_set_width(ahd, &devinfo, MSG_EXT_WDTR_BUS_8_BIT, AHD_TRANS_CUR|AHD_TRANS_GOAL, /*paused*/TRUE); + ahd_qinfifo_requeue_tail(ahd, scb); + printerror = 0; + } else if (ahd_sent_msg(ahd, AHDMSG_EXT, MSG_EXT_SDTR, FALSE) + && ppr_busfree == 0) { + /* + * Negotiation Rejected. Go-async and + * retry command. + */ +#ifdef AHD_DEBUG + if ((ahd_debug & AHD_SHOW_MESSAGES) != 0) + printf("SDTR negotiation rejected busfree.\n"); +#endif ahd_set_syncrate(ahd, &devinfo, /*period*/0, /*offset*/0, /*ppr_options*/0, @@ -2188,7 +2199,7 @@ ahd_outb(ahd, LQOMODE1, 0); ahd_set_modes(ahd, AHD_MODE_SCSI, AHD_MODE_SCSI); simode1 = ahd_inb(ahd, SIMODE1); - ahd_outb(ahd, SIMODE1, ENBUSFREE); + ahd_outb(ahd, SIMODE1, simode1 & ENBUSFREE); ahd_outb(ahd, SEQCTL0, ahd_inb(ahd, SEQCTL0) | STEP); stepping = TRUE; } @@ -3232,6 +3243,7 @@ * may change. */ period = tinfo->goal.period; + offset = tinfo->goal.offset; ppr_options = tinfo->goal.ppr_options; /* Target initiated PPR is not allowed in the SCSI spec */ if (devinfo->role == ROLE_TARGET) @@ -3239,7 +3251,7 @@ ahd_devlimited_syncrate(ahd, tinfo, &period, &ppr_options, devinfo->role); dowide = tinfo->curr.width != tinfo->goal.width; - dosync = tinfo->curr.period != period; + dosync = tinfo->curr.offset != offset || tinfo->curr.period != period; /* * Only use PPR if we have options that need it, even if the device * claims to support it. There might be an expander in the way @@ -3249,7 +3261,7 @@ if (!dowide && !dosync && !doppr) { dowide = tinfo->goal.width != MSG_EXT_WDTR_BUS_8_BIT; - dosync = tinfo->goal.period != 0; + dosync = tinfo->goal.offset != 0; } if (!dowide && !dosync && !doppr) { @@ -3983,22 +3995,30 @@ response = TRUE; sending_reply = TRUE; } + /* + * After a wide message, we are async, but + * some devices don't seem to honor this portion + * of the spec. Force a renegotiation of the + * sync component of our transfer agreement even + * if our goal is async. By updating our width + * after forcing the negotiation, we avoid + * renegotiating for width. + */ + ahd_update_neg_request(ahd, devinfo, tstate, + tinfo, AHD_NEG_ALWAYS); ahd_set_width(ahd, devinfo, bus_width, AHD_TRANS_ACTIVE|AHD_TRANS_GOAL, /*paused*/TRUE); - /* After a wide message, we are async */ - ahd_set_syncrate(ahd, devinfo, /*period*/0, - /*offset*/0, /*ppr_options*/0, - AHD_TRANS_ACTIVE, /*paused*/TRUE); if (sending_reply == FALSE && reject == FALSE) { - if (tinfo->goal.offset) { - ahd->msgout_index = 0; - ahd->msgout_len = 0; - ahd_build_transfer_msg(ahd, devinfo); - ahd->msgout_index = 0; - response = TRUE; - } + /* + * We will always have an SDTR to send. + */ + ahd->msgout_index = 0; + ahd->msgout_len = 0; + ahd_build_transfer_msg(ahd, devinfo); + ahd->msgout_index = 0; + response = TRUE; } done = MSGLOOP_MSGCOMPLETE; break; @@ -5000,15 +5020,20 @@ ahd_timer_stop(&ahd->stat_timer); /* This will reset most registers to 0, but not all */ - ahd_reset(ahd); + ahd_reset(ahd, /*reinit*/FALSE); } /* * Reset the controller and record some information about it - * that is only available just after a reset. + * that is only available just after a reset. If "reinit" is + * non-zero, this reset occured after initial configuration + * and the caller requests that the chip be fully reinitialized + * to a runable state. Chip interrupts are *not* enabled after + * a reinitialization. The caller must enable interrupts via + * ahd_intr_enable(). */ int -ahd_reset(struct ahd_softc *ahd) +ahd_reset(struct ahd_softc *ahd, int reinit) { u_int sxfrctl1; int wait; @@ -5101,7 +5126,7 @@ * If a recovery action has forced a chip reset, * re-initialize the chip to our liking. */ - if (ahd->init_level > 0) + if (reinit != 0) ahd_chip_init(ahd); return (0); @@ -6703,141 +6728,24 @@ int ahd_suspend(struct ahd_softc *ahd) { -#if 0 - uint8_t *ptr; - int i; ahd_pause_and_flushwork(ahd); - if (LIST_FIRST(&ahd->pending_scbs) != NULL) + if (LIST_FIRST(&ahd->pending_scbs) != NULL) { + ahd_unpause(ahd); return (EBUSY); - -#if AHD_TARGET_MODE - /* - * XXX What about ATIOs that have not yet been serviced? - * Perhaps we should just refuse to be suspended if we - * are acting in a target role. - */ - if (ahd->pending_device != NULL) - return (EBUSY); -#endif - - /* Save volatile registers */ - ahd->suspend_state.channel[0].scsiseq = ahd_inb(ahd, SCSISEQ0); - ahd->suspend_state.channel[0].sxfrctl0 = ahd_inb(ahd, SXFRCTL0); - ahd->suspend_state.channel[0].sxfrctl1 = ahd_inb(ahd, SXFRCTL1); - ahd->suspend_state.channel[0].simode0 = ahd_inb(ahd, SIMODE0); - ahd->suspend_state.channel[0].simode1 = ahd_inb(ahd, SIMODE1); - ahd->suspend_state.channel[0].seltimer = ahd_inb(ahd, SELTIMER); - ahd->suspend_state.channel[0].seqctl = ahd_inb(ahd, SEQCTL0); - ahd->suspend_state.dscommand0 = ahd_inb(ahd, DSCOMMAND0); - ahd->suspend_state.dspcistatus = ahd_inb(ahd, DSPCISTATUS); - - if ((ahd->features & AHD_DT) != 0) { - u_int sfunct; - - sfunct = ahd_inb(ahd, SFUNCT) & ~ALT_MODE; - ahd_outb(ahd, SFUNCT, sfunct | ALT_MODE); - ahd->suspend_state.optionmode = ahd_inb(ahd, OPTIONMODE); - ahd_outb(ahd, SFUNCT, sfunct); - ahd->suspend_state.crccontrol1 = ahd_inb(ahd, CRCCONTROL1); - } - - if ((ahd->features & AHD_MULTI_FUNC) != 0) - ahd->suspend_state.scbbaddr = ahd_inb(ahd, SCBBADDR); - - if ((ahd->features & AHD_ULTRA2) != 0) - ahd->suspend_state.dff_thrsh = ahd_inb(ahd, DFF_THRSH); - - ptr = ahd->suspend_state.scratch_ram; - for (i = 0; i < 64; i++) - *ptr++ = ahd_inb(ahd, SRAM_BASE + i); - - if ((ahd->features & AHD_MORE_SRAM) != 0) { - for (i = 0; i < 16; i++) - *ptr++ = ahd_inb(ahd, TARG_OFFSET + i); - } - - ptr = ahd->suspend_state.btt; - for (i = 0;i < AHD_NUM_TARGETS; i++) { - int j; - - for (j = 0;j < AHD_NUM_LUNS_NONPKT; j++) { - u_int tcl; - - tcl = BUILD_TCL_RAW(i, 'A', j); - *ptr = ahd_find_busy_tcl(ahd, tcl); - } } ahd_shutdown(ahd); -#endif return (0); } int ahd_resume(struct ahd_softc *ahd) { -#if 0 - uint8_t *ptr; - int i; - ahd_reset(ahd); - - ahd_build_free_scb_list(ahd); - - /* Restore volatile registers */ - ahd_outb(ahd, SCSISEQ0, ahd->suspend_state.channel[0].scsiseq); - ahd_outb(ahd, SXFRCTL0, ahd->suspend_state.channel[0].sxfrctl0); - ahd_outb(ahd, SXFRCTL1, ahd->suspend_state.channel[0].sxfrctl1); - ahd_outb(ahd, SIMODE0, ahd->suspend_state.channel[0].simode0); - ahd_outb(ahd, SIMODE1, ahd->suspend_state.channel[0].simode1); - ahd_outb(ahd, SELTIMER, ahd->suspend_state.channel[0].seltimer); - ahd_outb(ahd, SEQCTL0, ahd->suspend_state.channel[0].seqctl); - if ((ahd->features & AHD_ULTRA2) != 0) - ahd_outb(ahd, SCSIID_ULTRA2, ahd->our_id); - else - ahd_outb(ahd, SCSIID, ahd->our_id); - - ahd_outb(ahd, DSCOMMAND0, ahd->suspend_state.dscommand0); - ahd_outb(ahd, DSPCISTATUS, ahd->suspend_state.dspcistatus); - - if ((ahd->features & AHD_DT) != 0) { - u_int sfunct; - - sfunct = ahd_inb(ahd, SFUNCT) & ~ALT_MODE; - ahd_outb(ahd, SFUNCT, sfunct | ALT_MODE); - ahd_outb(ahd, OPTIONMODE, ahd->suspend_state.optionmode); - ahd_outb(ahd, SFUNCT, sfunct); - ahd_outb(ahd, CRCCONTROL1, ahd->suspend_state.crccontrol1); - } - - if ((ahd->features & AHD_MULTI_FUNC) != 0) - ahd_outb(ahd, SCBBADDR, ahd->suspend_state.scbbaddr); - - if ((ahd->features & AHD_ULTRA2) != 0) - ahd_outb(ahd, DFF_THRSH, ahd->suspend_state.dff_thrsh); - - ptr = ahd->suspend_state.scratch_ram; - for (i = 0; i < 64; i++) - ahd_outb(ahd, SRAM_BASE + i, *ptr++); - - if ((ahd->features & AHD_MORE_SRAM) != 0) { - for (i = 0; i < 16; i++) - ahd_outb(ahd, TARG_OFFSET + i, *ptr++); - } - - ptr = ahd->suspend_state.btt; - for (i = 0;i < AHD_NUM_TARGETS; i++) { - int j; - - for (j = 0;j < AHD_NUM_LUNS; j++) { - u_int tcl; - - tcl = BUILD_TCL(i << 4, j); - ahd_busy_tcl(ahd, tcl, *ptr); - } - } -#endif + ahd_reset(ahd, /*reinit*/TRUE); + ahd_intr_enable(ahd, TRUE); + ahd_restart(ahd); return (0); } @@ -7490,7 +7398,7 @@ * we must reset the chip. */ ahd_delay(AHD_BUSRESET_DELAY); - ahd_reset(ahd); + ahd_reset(ahd, /*reinit*/TRUE); ahd_intr_enable(ahd, /*enable*/TRUE); AHD_ASSERT_MODES(ahd, AHD_MODE_SCSI_MSK, AHD_MODE_SCSI_MSK); } @@ -9192,6 +9100,7 @@ ahd->flags &= ~AHD_INITIATORROLE; ahd_pause(ahd); ahd_loadseq(ahd); + ahd_restart(ahd); ahd_unlock(ahd, &s); } cel = &ccb->cel; @@ -9425,6 +9334,11 @@ ahd->flags |= AHD_INITIATORROLE; ahd_pause(ahd); ahd_loadseq(ahd); + ahd_restart(ahd); + /* + * Unpaused. The extra unpause + * that follows is harmless. + */ } } ahd_unpause(ahd); ==== //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.h#11 (text+ko) ==== @@ -37,9 +37,9 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * - * $Id: aic79xx.h,v 1.11 2003/05/26 21:10:58 gibbs Exp $ + * $Id: //depot/aic7xxx/aic7xxx/aic79xx.h#92 $ * - * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.h,v 1.12 2003/05/30 02:14:22 scottl Exp $ + * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.h,v 1.13 2003/06/06 23:48:18 gibbs Exp $ */ #ifndef _AIC79XX_H_ @@ -1379,13 +1379,13 @@ void ahd_free_scb(struct ahd_softc *ahd, struct scb *scb); void ahd_alloc_scbs(struct ahd_softc *ahd); void ahd_free(struct ahd_softc *ahd); -int ahd_reset(struct ahd_softc *ahd); +int ahd_reset(struct ahd_softc *ahd, int reinit); void ahd_shutdown(void *arg); -int ahd_write_flexport(struct ahd_softc *ahd, - u_int addr, u_int value); -int ahd_read_flexport(struct ahd_softc *ahd, u_int addr, - uint8_t *value); -int ahd_wait_flexport(struct ahd_softc *ahd); +int ahd_write_flexport(struct ahd_softc *ahd, + u_int addr, u_int value); +int ahd_read_flexport(struct ahd_softc *ahd, u_int addr, + uint8_t *value); +int ahd_wait_flexport(struct ahd_softc *ahd); /*************************** Interrupt Services *******************************/ void ahd_pci_intr(struct ahd_softc *ahd); ==== //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_pci.c#11 (text+ko) ==== @@ -38,9 +38,9 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * - * $Id: //depot/aic7xxx/aic7xxx/aic79xx_pci.c#73 $ + * $Id: //depot/aic7xxx/aic7xxx/aic79xx_pci.c#75 $ * - * $FreeBSD: src/sys/dev/aic7xxx/aic79xx_pci.c,v 1.11 2003/05/26 21:15:52 gibbs Exp $ + * $FreeBSD: src/sys/dev/aic7xxx/aic79xx_pci.c,v 1.13 2003/06/06 23:52:34 gibbs Exp $ */ #ifdef __linux__ @@ -375,7 +375,7 @@ ahd->bus_intr = ahd_pci_intr; - error = ahd_reset(ahd); + error = ahd_reset(ahd, /*reinit*/FALSE); if (error != 0) return (ENXIO); @@ -418,9 +418,11 @@ int ahd_pci_test_register_access(struct ahd_softc *ahd) { - uint32_t cmd; - int error; - uint8_t hcntrl; + uint32_t cmd; + u_int targpcistat; + u_int pci_status1; + int error; + uint8_t hcntrl; error = EIO; @@ -454,6 +456,18 @@ ahd_outb(ahd, HCNTRL, hcntrl|PAUSE); while (ahd_is_paused(ahd) == 0) ; + + /* Clear any PCI errors that occurred before our driver attached. */ + ahd_set_modes(ahd, AHD_MODE_CFG, AHD_MODE_CFG); + targpcistat = ahd_inb(ahd, TARGPCISTAT); + ahd_outb(ahd, TARGPCISTAT, targpcistat); + pci_status1 = ahd_pci_read_config(ahd->dev_softc, + PCIR_STATUS + 1, /*bytes*/1); + ahd_pci_write_config(ahd->dev_softc, PCIR_STATUS + 1, + pci_status1, /*bytes*/1); + ahd_set_modes(ahd, AHD_MODE_SCSI, AHD_MODE_SCSI); + ahd_outb(ahd, CLRINT, CLRPCIINT); + ahd_outb(ahd, SEQCTL0, PERRORDIS); ahd_outl(ahd, SRAM_BASE, 0x5aa555aa); if (ahd_inl(ahd, SRAM_BASE) != 0x5aa555aa) @@ -472,8 +486,6 @@ fail: if ((ahd_inb(ahd, INTSTAT) & PCIINT) != 0) { - u_int targpcistat; - u_int pci_status1; ahd_set_modes(ahd, AHD_MODE_CFG, AHD_MODE_CFG); targpcistat = ahd_inb(ahd, TARGPCISTAT); @@ -486,7 +498,6 @@ pci_status1, /*bytes*/1); ahd_outb(ahd, CLRINT, CLRPCIINT); } - ahd_outb(ahd, SEQCTL0, PERRORDIS|FAILDIS); ahd_pci_write_config(ahd->dev_softc, PCIR_COMMAND, cmd, /*bytes*/2); return (error); ==== //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.c#15 (text+ko) ==== @@ -37,9 +37,9 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * - * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.c#130 $ + * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.c#134 $ * - * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.c,v 1.92 2003/05/26 21:44:03 gibbs Exp $ + * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.c,v 1.95 2003/06/06 23:53:39 gibbs Exp $ */ #ifdef __linux__ @@ -1304,17 +1304,23 @@ ahc_qinfifo_requeue_tail(ahc, scb); printerror = 0; } else if (ahc_sent_msg(ahc, AHCMSG_EXT, - MSG_EXT_WDTR, FALSE) - || ahc_sent_msg(ahc, AHCMSG_EXT, - MSG_EXT_SDTR, FALSE)) { + MSG_EXT_WDTR, FALSE)) { /* - * Negotiation Rejected. Go-async and + * Negotiation Rejected. Go-narrow and >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 10 10:51:38 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E6D637B404; Tue, 10 Jun 2003 10:51:35 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B52BD37B401 for ; Tue, 10 Jun 2003 10:51:34 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7616043FAF for ; Tue, 10 Jun 2003 10:51:33 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5AHpX0U013626 for ; Tue, 10 Jun 2003 10:51:33 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5AHpWAE013622 for perforce@freebsd.org; Tue, 10 Jun 2003 10:51:32 -0700 (PDT) Date: Tue, 10 Jun 2003 10:51:32 -0700 (PDT) Message-Id: <200306101751.h5AHpWAE013622@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 32923 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jun 2003 17:51:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=32923 Change 32923 by jhb@jhb_laptop on 2003/06/10 10:50:34 IFC @32917. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/alpha-gdbstub.c#3 integrate .. //depot/projects/smpng/sys/alpha/alpha/api_up1000.c#4 integrate .. //depot/projects/smpng/sys/alpha/alpha/autoconf.c#10 integrate .. //depot/projects/smpng/sys/alpha/alpha/busdma_machdep.c#16 integrate .. //depot/projects/smpng/sys/alpha/alpha/busspace.c#2 integrate .. //depot/projects/smpng/sys/alpha/alpha/clock.c#9 integrate .. //depot/projects/smpng/sys/alpha/alpha/cpuconf.c#4 integrate .. //depot/projects/smpng/sys/alpha/alpha/critical.c#3 integrate .. //depot/projects/smpng/sys/alpha/alpha/db_disasm.c#4 integrate .. //depot/projects/smpng/sys/alpha/alpha/db_interface.c#8 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_1000a.c#7 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_2100_a50.c#5 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_2100_a500.c#6 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_3000_300.c#2 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_3000_500.c#2 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_axppci_33.c#6 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_eb164.c#4 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_eb64plus.c#5 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_kn20aa.c#7 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_kn300.c#6 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_kn8ae.c#3 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_st550.c#7 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_st6600.c#4 integrate .. //depot/projects/smpng/sys/alpha/alpha/dump_machdep.c#4 integrate .. //depot/projects/smpng/sys/alpha/alpha/elf_machdep.c#9 integrate .. //depot/projects/smpng/sys/alpha/alpha/fp_emulate.c#3 integrate .. //depot/projects/smpng/sys/alpha/alpha/genassym.c#15 integrate .. //depot/projects/smpng/sys/alpha/alpha/ieee_float.c#2 integrate .. //depot/projects/smpng/sys/alpha/alpha/in_cksum.c#3 integrate .. //depot/projects/smpng/sys/alpha/alpha/interrupt.c#20 integrate .. //depot/projects/smpng/sys/alpha/alpha/machdep.c#57 integrate .. //depot/projects/smpng/sys/alpha/alpha/mem.c#11 integrate .. //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#18 integrate .. //depot/projects/smpng/sys/alpha/alpha/pmap.c#45 integrate .. //depot/projects/smpng/sys/alpha/alpha/prom.c#11 integrate .. //depot/projects/smpng/sys/alpha/alpha/promcons.c#13 integrate .. //depot/projects/smpng/sys/alpha/alpha/sgmap.c#2 integrate .. //depot/projects/smpng/sys/alpha/alpha/sys_machdep.c#16 integrate .. //depot/projects/smpng/sys/alpha/alpha/trap.c#48 integrate .. //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#23 integrate .. //depot/projects/smpng/sys/alpha/isa/isa.c#9 integrate .. //depot/projects/smpng/sys/alpha/isa/isa_dma.c#3 integrate .. //depot/projects/smpng/sys/alpha/isa/mcclock_isa.c#2 integrate .. //depot/projects/smpng/sys/alpha/linux/linux_dummy.c#6 integrate .. //depot/projects/smpng/sys/alpha/linux/linux_genassym.c#4 integrate .. //depot/projects/smpng/sys/alpha/linux/linux_machdep.c#14 integrate .. //depot/projects/smpng/sys/alpha/linux/linux_sysvec.c#13 integrate .. //depot/projects/smpng/sys/alpha/mcbus/mcbus.c#3 integrate .. //depot/projects/smpng/sys/alpha/mcbus/mcmem.c#2 integrate .. //depot/projects/smpng/sys/alpha/mcbus/mcpcia.c#16 integrate .. //depot/projects/smpng/sys/alpha/osf1/imgact_osf1.c#10 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_ioctl.c#6 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_misc.c#22 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_mount.c#9 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_signal.c#21 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_sysvec.c#5 integrate .. //depot/projects/smpng/sys/alpha/pci/apecs.c#9 integrate .. //depot/projects/smpng/sys/alpha/pci/apecs_pci.c#3 integrate .. //depot/projects/smpng/sys/alpha/pci/bwx.c#2 integrate .. //depot/projects/smpng/sys/alpha/pci/cia.c#14 integrate .. //depot/projects/smpng/sys/alpha/pci/cia_pci.c#3 integrate .. //depot/projects/smpng/sys/alpha/pci/irongate.c#4 integrate .. //depot/projects/smpng/sys/alpha/pci/irongate_pci.c#4 integrate .. //depot/projects/smpng/sys/alpha/pci/lca.c#5 integrate .. //depot/projects/smpng/sys/alpha/pci/lca_pci.c#5 integrate .. //depot/projects/smpng/sys/alpha/pci/pcibus.c#3 integrate .. //depot/projects/smpng/sys/alpha/pci/swiz.c#2 integrate .. //depot/projects/smpng/sys/alpha/pci/t2.c#16 integrate .. //depot/projects/smpng/sys/alpha/pci/t2_pci.c#8 integrate .. //depot/projects/smpng/sys/alpha/pci/tsunami.c#12 integrate .. //depot/projects/smpng/sys/alpha/pci/tsunami_pci.c#4 integrate .. //depot/projects/smpng/sys/conf/files#78 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.reg#12 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_osm.c#10 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_osm.h#8 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_osm.c#10 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_osm.h#9 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_card.c#3 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_core.c#9 integrate .. //depot/projects/smpng/sys/dev/ccd/ccd.c#27 delete .. //depot/projects/smpng/sys/dev/firewire/iec13213.h#5 integrate .. //depot/projects/smpng/sys/dev/firewire/if_fwe.c#11 integrate .. //depot/projects/smpng/sys/dev/sio/sio.c#31 integrate .. //depot/projects/smpng/sys/geom/geom_ccd.c#3 integrate .. //depot/projects/smpng/sys/i386/svr4/svr4_genassym.c#3 integrate .. //depot/projects/smpng/sys/i386/svr4/svr4_machdep.c#13 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#59 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#66 integrate .. //depot/projects/smpng/sys/kern/kern_prot.c#70 integrate .. //depot/projects/smpng/sys/kern/kern_subr.c#24 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#36 integrate .. //depot/projects/smpng/sys/kern/kern_time.c#24 integrate .. //depot/projects/smpng/sys/kern/sys_pipe.c#27 integrate .. //depot/projects/smpng/sys/modules/Makefile#54 integrate .. //depot/projects/smpng/sys/modules/ccd/Makefile#4 delete .. //depot/projects/smpng/sys/modules/geom/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/geom/geom_ccd/Makefile#1 branch .. //depot/projects/smpng/sys/pci/ncr.c#9 integrate .. //depot/projects/smpng/sys/sys/ccdvar.h#8 delete .. //depot/projects/smpng/sys/vm/uma_core.c#31 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/alpha-gdbstub.c#3 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/sys/alpha/alpha/alpha-gdbstub.c,v 1.13 2003/02/16 19:22:20 phk Exp $ */ /**************************************************************************** THIS SOFTWARE IS NOT COPYRIGHTED @@ -93,6 +92,9 @@ * ****************************************************************************/ +#include +__FBSDID("$FreeBSD: src/sys/alpha/alpha/alpha-gdbstub.c,v 1.14 2003/06/10 16:50:43 obrien Exp $"); + #include #include #include ==== //depot/projects/smpng/sys/alpha/alpha/api_up1000.c#4 (text+ko) ==== @@ -22,10 +22,11 @@ * 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/alpha/alpha/api_up1000.c,v 1.6 2002/08/22 19:52:15 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/alpha/api_up1000.c,v 1.7 2003/06/10 16:50:43 obrien Exp $"); + #include "opt_ddb.h" #include #include ==== //depot/projects/smpng/sys/alpha/alpha/autoconf.c#10 (text+ko) ==== @@ -22,10 +22,11 @@ * 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/alpha/alpha/autoconf.c,v 1.55 2003/03/08 08:01:26 phk Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/alpha/autoconf.c,v 1.56 2003/06/10 16:50:43 obrien Exp $"); + #include "opt_bootp.h" #include "opt_isa.h" #include "opt_nfs.h" ==== //depot/projects/smpng/sys/alpha/alpha/busdma_machdep.c#16 (text+ko) ==== @@ -22,10 +22,11 @@ * 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/alpha/alpha/busdma_machdep.c,v 1.37 2003/05/27 04:59:56 scottl Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.38 2003/06/10 16:50:43 obrien Exp $"); + #include #include #include ==== //depot/projects/smpng/sys/alpha/alpha/busspace.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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/alpha/alpha/busspace.c,v 1.2 2000/08/29 08:50:17 dfr Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/alpha/busspace.c,v 1.3 2003/06/10 16:50:43 obrien Exp $"); + #include /* RCS ID & Copyright macro defns */ #include ==== //depot/projects/smpng/sys/alpha/alpha/clock.c#9 (text+ko) ==== @@ -1,6 +1,3 @@ -/* $FreeBSD: src/sys/alpha/alpha/clock.c,v 1.32 2003/02/03 17:53:14 jake Exp $ */ -/* $NetBSD: clock.c,v 1.20 1998/01/31 10:32:47 ross Exp $ */ - /* * Copyright (c) 1988 University of Utah. * Copyright (c) 1992, 1993 @@ -41,8 +38,12 @@ * from: Utah Hdr: clock.c 1.18 91/01/21 * * @(#)clock.c 8.1 (Berkeley) 6/10/93 + * $NetBSD: clock.c,v 1.20 1998/01/31 10:32:47 ross Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/alpha/clock.c,v 1.33 2003/06/10 16:50:43 obrien Exp $"); + #include "opt_clock.h" #include /* RCS ID & Copyright macro defns */ ==== //depot/projects/smpng/sys/alpha/alpha/cpuconf.c#4 (text+ko) ==== @@ -1,6 +1,3 @@ -/* $FreeBSD: src/sys/alpha/alpha/cpuconf.c,v 1.14 2002/07/09 19:20:16 obrien Exp $ */ -/* $NetBSD: cpuconf.c,v 1.10 1998/03/20 21:48:21 thorpej Exp $ */ - /* * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. * @@ -29,8 +26,13 @@ * 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. + * + * $NetBSD: cpuconf.c,v 1.10 1998/03/20 21:48:21 thorpej Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/alpha/cpuconf.c,v 1.15 2003/06/10 16:50:43 obrien Exp $"); + #include #include #include ==== //depot/projects/smpng/sys/alpha/alpha/critical.c#3 (text+ko) ==== @@ -1,10 +1,11 @@ /*- * Copyright (c) 2001 Matthew Dillon. This code is distributed under * the BSD copyright, /usr/src/COPYRIGHT. - * - * $FreeBSD: src/sys/alpha/alpha/critical.c,v 1.3 2002/04/01 23:51:21 dillon Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/alpha/critical.c,v 1.4 2003/06/10 16:50:43 obrien Exp $"); + #include #include #include ==== //depot/projects/smpng/sys/alpha/alpha/db_disasm.c#4 (text+ko) ==== @@ -1,6 +1,3 @@ -/* $FreeBSD: src/sys/alpha/alpha/db_disasm.c,v 1.7 2002/08/25 13:16:45 charnier Exp $ */ -/* $NetBSD: db_disasm.c,v 1.4 1997/09/16 22:52:40 thorpej Exp $ */ - /* * Mach Operating System * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University @@ -48,8 +45,8 @@ */ #include /* RCS ID & Copyright macro defns */ - /* __KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.4 1997/09/16 22:52:40 thorpej Exp $"); */ +__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_disasm.c,v 1.8 2003/06/10 16:50:43 obrien Exp $"); #include #include ==== //depot/projects/smpng/sys/alpha/alpha/db_interface.c#8 (text+ko) ==== @@ -1,6 +1,3 @@ -/* $NetBSD: db_interface.c,v 1.2 1997/09/16 19:07:19 thorpej Exp $ */ -/* $FreeBSD: src/sys/alpha/alpha/db_interface.c,v 1.26 2002/03/21 06:14:57 imp Exp $ */ - /* * Mach Operating System * Copyright (c) 1992,1991,1990 Carnegie Mellon University @@ -49,8 +46,8 @@ */ #include /* RCS ID & Copyright macro defns */ - /* __KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.2 1997/09/16 19:07:19 thorpej Exp $"); */ +__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_interface.c,v 1.27 2003/06/10 16:50:43 obrien Exp $"); #include #include ==== //depot/projects/smpng/sys/alpha/alpha/dec_1000a.c#7 (text+ko) ==== @@ -1,5 +1,4 @@ /* $NetBSD: dec_1000a.c,v 1.5 1999/04/15 22:06:47 thorpej Exp $ */ - /* * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. @@ -70,9 +69,11 @@ /* * Additional Copyright (c) 1999 by Andrew Gallatin * - * $FreeBSD: src/sys/alpha/alpha/dec_1000a.c,v 1.13 2002/08/22 19:52:15 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_1000a.c,v 1.14 2003/06/10 16:50:43 obrien Exp $"); + #include "opt_ddb.h" #include ==== //depot/projects/smpng/sys/alpha/alpha/dec_2100_a50.c#5 (text+ko) ==== @@ -1,6 +1,4 @@ /* $NetBSD: dec_2100_a50.c,v 1.39 1998/04/17 02:45:19 mjacob Exp $ */ -/* $FreeBSD: src/sys/alpha/alpha/dec_2100_a50.c,v 1.14 2002/10/04 15:58:03 keramida Exp $ */ - /* * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University. * All rights reserved. @@ -34,6 +32,9 @@ * Additional Copyright (c) 1998 by Andrew Gallatin for Duke University. */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_2100_a50.c,v 1.15 2003/06/10 16:50:43 obrien Exp $"); + #include "opt_ddb.h" #include ==== //depot/projects/smpng/sys/alpha/alpha/dec_2100_a500.c#6 (text+ko) ==== @@ -22,10 +22,11 @@ * 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/alpha/alpha/dec_2100_a500.c,v 1.13 2003/04/21 16:34:18 obrien Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_2100_a500.c,v 1.14 2003/06/10 16:50:43 obrien Exp $"); + #include "opt_ddb.h" #include ==== //depot/projects/smpng/sys/alpha/alpha/dec_3000_300.c#2 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/sys/alpha/alpha/dec_3000_300.c,v 1.4 2000/12/08 22:11:07 msmith Exp $ */ /* * Copyright (c) 1997 by Matthew Jacob * NASA AMES Research Center. @@ -29,6 +28,9 @@ * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_3000_300.c,v 1.5 2003/06/10 16:50:43 obrien Exp $"); + #include "opt_cpu.h" #include ==== //depot/projects/smpng/sys/alpha/alpha/dec_3000_500.c#2 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/sys/alpha/alpha/dec_3000_500.c,v 1.4 2000/12/08 22:11:07 msmith Exp $ */ /* * Copyright (c) 1997 by Matthew Jacob * NASA AMES Research Center. @@ -29,6 +28,9 @@ * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_3000_500.c,v 1.5 2003/06/10 16:50:43 obrien Exp $"); + #include "opt_cpu.h" #include ==== //depot/projects/smpng/sys/alpha/alpha/dec_axppci_33.c#6 (text+ko) ==== @@ -1,6 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/dec_axppci_33.c,v 1.17 2002/10/04 15:56:02 keramida Exp $ */ /* $NetBSD: dec_axppci_33.c,v 1.38 1998/07/07 08:49:12 ross Exp $ */ - /* * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University. * All rights reserved. @@ -31,6 +29,9 @@ * Additional Copyright (c) 1997 by Matthew Jacob for NASA/Ames Research Center */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_axppci_33.c,v 1.18 2003/06/10 16:50:43 obrien Exp $"); + #include "opt_ddb.h" #include ==== //depot/projects/smpng/sys/alpha/alpha/dec_eb164.c#4 (text+ko) ==== @@ -1,6 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/dec_eb164.c,v 1.16 2002/08/22 19:52:16 peter Exp $ */ /* $NetBSD: dec_eb164.c,v 1.26 1998/04/17 02:45:19 mjacob Exp $ */ - /* * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University. * All rights reserved. @@ -31,6 +29,9 @@ * Additional Copyright (c) 1997 by Matthew Jacob for NASA/Ames Research Center */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_eb164.c,v 1.17 2003/06/10 16:50:43 obrien Exp $"); + #include "opt_ddb.h" #include ==== //depot/projects/smpng/sys/alpha/alpha/dec_eb64plus.c#5 (text+ko) ==== @@ -1,5 +1,3 @@ -/* $FreeBSD: src/sys/alpha/alpha/dec_eb64plus.c,v 1.12 2002/08/22 19:52:16 peter Exp $ */ - /* * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University. * All rights reserved. @@ -47,6 +45,9 @@ * ports and a parallel port. All of this hanging off the ISA bridge */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_eb64plus.c,v 1.13 2003/06/10 16:50:43 obrien Exp $"); + #include "opt_ddb.h" #include ==== //depot/projects/smpng/sys/alpha/alpha/dec_kn20aa.c#7 (text+ko) ==== @@ -1,6 +1,4 @@ /* $NetBSD: dec_kn20aa.c,v 1.38 1998/04/17 02:45:19 mjacob Exp $ */ -/* $FreeBSD: src/sys/alpha/alpha/dec_kn20aa.c,v 1.14 2002/08/22 19:52:16 peter Exp $ */ - /* * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University. * All rights reserved. @@ -31,6 +29,9 @@ * Additional Copyright (c) 1997 by Matthew Jacob for NASA/Ames Research Center */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_kn20aa.c,v 1.15 2003/06/10 16:50:43 obrien Exp $"); + #include "opt_ddb.h" #include ==== //depot/projects/smpng/sys/alpha/alpha/dec_kn300.c#6 (text+ko) ==== @@ -1,5 +1,3 @@ -/* $FreeBSD: src/sys/alpha/alpha/dec_kn300.c,v 1.9 2002/08/22 19:52:16 peter Exp $ */ - /* * Copyright (c) 2000 by Matthew Jacob * NASA AMES Research Center. @@ -30,6 +28,9 @@ * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_kn300.c,v 1.10 2003/06/10 16:50:43 obrien Exp $"); + #include "opt_ddb.h" #include #include ==== //depot/projects/smpng/sys/alpha/alpha/dec_kn8ae.c#3 (text+ko) ==== @@ -1,6 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/dec_kn8ae.c,v 1.12 2003/02/25 00:42:39 marcel Exp $ */ /* $NetBSD: dec_kn8ae.c,v 1.15 1998/02/13 00:12:50 thorpej Exp $ */ - /* * Copyright (c) 1997 by Matthew Jacob * NASA AMES Research Center. @@ -31,6 +29,9 @@ * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_kn8ae.c,v 1.13 2003/06/10 16:50:43 obrien Exp $"); + #include #include #include ==== //depot/projects/smpng/sys/alpha/alpha/dec_st550.c#7 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/sys/alpha/alpha/dec_st550.c,v 1.12 2002/08/22 19:52:16 peter Exp $ */ /* * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University. * All rights reserved. @@ -32,6 +31,9 @@ * Additional Copyright (c) 1998 by Andrew Gallatin for Duke University */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_st550.c,v 1.13 2003/06/10 16:50:43 obrien Exp $"); + #include "opt_ddb.h" #include ==== //depot/projects/smpng/sys/alpha/alpha/dec_st6600.c#4 (text+ko) ==== @@ -22,10 +22,11 @@ * 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/alpha/alpha/dec_st6600.c,v 1.13 2002/08/22 19:52:16 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_st6600.c,v 1.14 2003/06/10 16:50:43 obrien Exp $"); + #include "opt_ddb.h" #include #include ==== //depot/projects/smpng/sys/alpha/alpha/dump_machdep.c#4 (text+ko) ==== @@ -31,10 +31,11 @@ * 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/alpha/alpha/dump_machdep.c,v 1.3 2003/01/03 00:19:54 ticso Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dump_machdep.c,v 1.4 2003/06/10 16:50:43 obrien Exp $"); + #include #include #include ==== //depot/projects/smpng/sys/alpha/alpha/elf_machdep.c#9 (text+ko) ==== @@ -21,10 +21,11 @@ * 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/alpha/alpha/elf_machdep.c,v 1.13 2003/01/21 02:42:43 jake Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.14 2003/06/10 16:50:43 obrien Exp $"); + #include #include #include ==== //depot/projects/smpng/sys/alpha/alpha/fp_emulate.c#3 (text+ko) ==== @@ -22,10 +22,11 @@ * 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/alpha/alpha/fp_emulate.c,v 1.11 2001/09/12 08:36:53 julian Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/alpha/fp_emulate.c,v 1.12 2003/06/10 16:50:43 obrien Exp $"); + #include #include #include ==== //depot/projects/smpng/sys/alpha/alpha/genassym.c#15 (text+ko) ==== @@ -34,9 +34,11 @@ * SUCH DAMAGE. * * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 - * $FreeBSD: src/sys/alpha/alpha/genassym.c,v 1.41 2003/02/17 09:55:08 julian Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/alpha/genassym.c,v 1.42 2003/06/10 16:50:43 obrien Exp $"); + #include #include #include ==== //depot/projects/smpng/sys/alpha/alpha/ieee_float.c#2 (text+ko) ==== @@ -23,7 +23,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/ieee_float.c,v 1.7 1999/12/29 04:27:54 peter Exp $ */ /* @@ -37,6 +36,9 @@ * correct use of sticky bits. */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/alpha/ieee_float.c,v 1.8 2003/06/10 16:50:43 obrien Exp $"); + #include #ifdef TEST #include "../include/fpu.h" ==== //depot/projects/smpng/sys/alpha/alpha/in_cksum.c#3 (text+ko) ==== @@ -1,6 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/in_cksum.c,v 1.6 2001/09/10 10:48:19 peter Exp $ */ /* $NetBSD: in_cksum.c,v 1.7 1997/09/02 13:18:15 thorpej Exp $ */ - /* * Copyright (c) 1988, 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -39,6 +37,7 @@ */ #include /* RCS ID & Copyright macro defns */ +__FBSDID("$FreeBSD: src/sys/alpha/alpha/in_cksum.c,v 1.7 2003/06/10 16:50:43 obrien Exp $"); #include #include ==== //depot/projects/smpng/sys/alpha/alpha/interrupt.c#20 (text+ko) ==== @@ -1,6 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.72 2003/02/03 17:53:14 jake Exp $ */ /* $NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $ */ - /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. * All rights reserved. @@ -36,8 +34,8 @@ #include "opt_ddb.h" #include /* RCS ID & Copyright macro defns */ - /* __KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $");*/ +__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.73 2003/06/10 16:50:43 obrien Exp $"); #include #include ==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#57 (text+ko) ==== @@ -23,7 +23,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.202 2003/05/13 20:35:56 jhb Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -88,6 +87,9 @@ * rights to redistribute these changes. */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.203 2003/06/10 16:50:43 obrien Exp $"); + #include "opt_compat.h" #include "opt_ddb.h" #include "opt_msgbuf.h" ==== //depot/projects/smpng/sys/alpha/alpha/mem.c#11 (text+ko) ==== @@ -38,9 +38,11 @@ * * from: Utah $Hdr: mem.c 1.13 89/10/08$ * from: @(#)mem.c 7.2 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/alpha/alpha/mem.c,v 1.44 2003/03/25 00:06:59 jake Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/alpha/mem.c,v 1.45 2003/06/10 16:50:43 obrien Exp $"); + /* * Memory special file */ ==== //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#18 (text+ko) ==== @@ -22,10 +22,11 @@ * 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/alpha/alpha/mp_machdep.c,v 1.41 2003/02/20 20:54:42 phk Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.42 2003/06/10 16:50:43 obrien Exp $"); + #include #include #include ==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#45 (text+ko) ==== @@ -43,7 +43,6 @@ * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp * with some ideas from NetBSD's alpha pmap - * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.122 2003/04/10 18:42:06 jhb Exp $ */ /* @@ -148,6 +147,9 @@ * */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.123 2003/06/10 16:50:43 obrien Exp $"); + #include #include #include ==== //depot/projects/smpng/sys/alpha/alpha/prom.c#11 (text+ko) ==== @@ -1,5 +1,3 @@ -/* $NetBSD: prom.c,v 1.22 1998/02/27 04:03:00 thorpej Exp $ */ - /* * Copyright (c) 1992, 1994, 1995, 1996 Carnegie Mellon University * All Rights Reserved. @@ -24,12 +22,11 @@ * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. * - * $FreeBSD: src/sys/alpha/alpha/prom.c,v 1.26 2003/02/25 00:42:39 marcel Exp $ */ #include /* RCS ID & Copyright macro defns */ - /* __KERNEL_RCSID(0, "$NetBSD: prom.c,v 1.22 1998/02/27 04:03:00 thorpej Exp $"); */ +__FBSDID("$FreeBSD: src/sys/alpha/alpha/prom.c,v 1.27 2003/06/10 16:50:43 obrien Exp $"); #include #include ==== //depot/projects/smpng/sys/alpha/alpha/promcons.c#13 (text+ko) ==== @@ -1,6 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.28 2003/03/03 12:15:38 phk Exp $ */ /* $NetBSD: promcons.c,v 1.13 1998/03/21 22:52:59 mycroft Exp $ */ - /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. * All rights reserved. @@ -28,6 +26,9 @@ * rights to redistribute these changes. */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.29 2003/06/10 16:50:43 obrien Exp $"); + #include #include #include ==== //depot/projects/smpng/sys/alpha/alpha/sgmap.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * 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/alpha/alpha/sgmap.c,v 1.4 2001/05/31 23:31:34 gallatin Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/alpha/sgmap.c,v 1.5 2003/06/10 16:50:43 obrien Exp $"); + #include #include #include ==== //depot/projects/smpng/sys/alpha/alpha/sys_machdep.c#16 (text+ko) ==== @@ -31,10 +31,11 @@ * SUCH DAMAGE. * * from: @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91 - * $FreeBSD: src/sys/alpha/alpha/sys_machdep.c,v 1.24 2003/04/25 20:04:02 jhb Exp $ - * */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/alpha/sys_machdep.c,v 1.25 2003/06/10 16:50:43 obrien Exp $"); + #include "opt_mac.h" #include ==== //depot/projects/smpng/sys/alpha/alpha/trap.c#48 (text+ko) ==== @@ -1,6 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.113 2003/04/30 17:59:26 jhb Exp $ */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ - /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. * All rights reserved. @@ -28,6 +26,9 @@ * rights to redistribute these changes. */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.114 2003/06/10 16:50:43 obrien Exp $"); + /* #include "opt_fix_unaligned_vax_fp.h" */ #include "opt_ddb.h" #include "opt_ktrace.h" ==== //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#23 (text+ko) ==== @@ -38,7 +38,6 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.85 2003/06/04 21:13:19 marcel Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -67,6 +66,9 @@ * rights to redistribute these changes. */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.86 2003/06/10 16:50:43 obrien Exp $"); + #include #include #include ==== //depot/projects/smpng/sys/alpha/isa/isa.c#9 (text+ko) ==== @@ -22,10 +22,11 @@ * 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/alpha/isa/isa.c,v 1.31 2003/04/11 13:30:32 gallatin Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.32 2003/06/10 16:57:28 obrien Exp $"); + #include #include #include ==== //depot/projects/smpng/sys/alpha/isa/isa_dma.c#3 (text+ko) ==== @@ -35,7 +35,6 @@ * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 * from: isa_dma.c,v 1.3 1999/05/09 23:56:00 peter Exp $ - * $FreeBSD: src/sys/alpha/isa/isa_dma.c,v 1.7 2002/04/29 07:43:09 peter Exp $ */ /* @@ -48,6 +47,9 @@ * isa_dmastart() */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/isa/isa_dma.c,v 1.8 2003/06/10 16:57:28 obrien Exp $"); + #include #include #include ==== //depot/projects/smpng/sys/alpha/isa/mcclock_isa.c#2 (text+ko) ==== @@ -1,6 +1,4 @@ -/* $FreeBSD: src/sys/alpha/isa/mcclock_isa.c,v 1.8 2000/05/27 10:02:32 dfr Exp $ */ /* $NetBSD: mcclock_tlsb.c,v 1.8 1998/05/13 02:50:29 thorpej Exp $ */ - /* * Copyright (c) 1997 by Matthew Jacob * NASA AMES Research Center. @@ -31,6 +29,9 @@ * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/isa/mcclock_isa.c,v 1.9 2003/06/10 16:57:28 obrien Exp $"); + #include #include #include ==== //depot/projects/smpng/sys/alpha/linux/linux_dummy.c#6 (text+ko) ==== @@ -25,10 +25,11 @@ * 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/alpha/linux/linux_dummy.c,v 1.35 2002/06/02 20:05:40 schweikh Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_dummy.c,v 1.36 2003/06/10 17:00:35 obrien Exp $"); + #include #include #include ==== //depot/projects/smpng/sys/alpha/linux/linux_genassym.c#4 (text+ko) ==== @@ -1,4 +1,5 @@ -/* $FreeBSD: src/sys/alpha/linux/linux_genassym.c,v 1.17 2002/09/17 07:22:23 peter Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_genassym.c,v 1.18 2003/06/10 17:00:35 obrien Exp $"); #include #include ==== //depot/projects/smpng/sys/alpha/linux/linux_machdep.c#14 (text+ko) ==== @@ -24,10 +24,11 @@ * 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/alpha/linux/linux_machdep.c,v 1.30 2003/04/22 18:23:47 jhb Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_machdep.c,v 1.31 2003/06/10 17:00:35 obrien Exp $"); + #include #include #include ==== //depot/projects/smpng/sys/alpha/linux/linux_sysvec.c#13 (text+ko) ==== @@ -24,10 +24,11 @@ * 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/alpha/linux/linux_sysvec.c,v 1.87 2003/03/27 18:18:35 jhb Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.88 2003/06/10 17:00:35 obrien Exp $"); + /* XXX we use functions that might not exist. */ #include "opt_compat.h" ==== //depot/projects/smpng/sys/alpha/mcbus/mcbus.c#3 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/sys/alpha/mcbus/mcbus.c,v 1.3 2002/03/26 19:46:40 dfr Exp $ */ /* * Copyright (c) 2000 by Matthew Jacob * All rights reserved. @@ -31,6 +30,9 @@ * for Rawhide (Alpha 4100) systems. */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/mcbus/mcbus.c,v 1.4 2003/06/10 17:02:51 obrien Exp $"); + #include >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 10 10:56:42 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 515BB37B404; Tue, 10 Jun 2003 10:56:42 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 07AE937B401 for ; Tue, 10 Jun 2003 10:56:42 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E4AE443FCB for ; Tue, 10 Jun 2003 10:56:40 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5AHue0U013820 for ; Tue, 10 Jun 2003 10:56:40 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5AHuegV013817 for perforce@freebsd.org; Tue, 10 Jun 2003 10:56:40 -0700 (PDT) Date: Tue, 10 Jun 2003 10:56:40 -0700 (PDT) Message-Id: <200306101756.h5AHuegV013817@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 32925 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jun 2003 17:56:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=32925 Change 32925 by jhb@jhb_laptop on 2003/06/10 10:56:39 IFC @32922. Affected files ... .. //depot/projects/smpng/sys/alpha/tlsb/dwlpx.c#12 integrate .. //depot/projects/smpng/sys/alpha/tlsb/gbus.c#2 integrate .. //depot/projects/smpng/sys/alpha/tlsb/kftxx.c#2 integrate .. //depot/projects/smpng/sys/alpha/tlsb/mcclock_tlsb.c#2 integrate .. //depot/projects/smpng/sys/alpha/tlsb/tlsb.c#3 integrate .. //depot/projects/smpng/sys/alpha/tlsb/tlsbcpu.c#4 integrate .. //depot/projects/smpng/sys/alpha/tlsb/tlsbmem.c#2 integrate .. //depot/projects/smpng/sys/alpha/tlsb/zs_tlsb.c#11 integrate .. //depot/projects/smpng/sys/cam/cam.c#4 integrate .. //depot/projects/smpng/sys/cam/cam_periph.c#11 integrate .. //depot/projects/smpng/sys/cam/cam_queue.c#3 integrate .. //depot/projects/smpng/sys/cam/cam_sim.c#3 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.c#16 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/tlsb/dwlpx.c#12 (text+ko) ==== @@ -22,10 +22,7 @@ * 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/alpha/tlsb/dwlpx.c,v 1.24 2003/02/25 00:42:39 marcel Exp $ */ - /* * Based very closely on NetBSD version- * @@ -58,6 +55,9 @@ * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/tlsb/dwlpx.c,v 1.25 2003/06/10 17:31:31 obrien Exp $"); + #include #include #include ==== //depot/projects/smpng/sys/alpha/tlsb/gbus.c#2 (text+ko) ==== @@ -1,6 +1,4 @@ -/* $FreeBSD: src/sys/alpha/tlsb/gbus.c,v 1.10 2000/03/27 08:22:23 mjacob Exp $ */ /* $NetBSD: gbus.c,v 1.8 1998/05/13 22:13:35 thorpej Exp $ */ - /* * Copyright (c) 1997, 2000 by Matthew Jacob * NASA AMES Research Center. @@ -34,6 +32,9 @@ * bus on AlphaServer CPU modules. */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/tlsb/gbus.c,v 1.11 2003/06/10 17:31:31 obrien Exp $"); + #include #include #include ==== //depot/projects/smpng/sys/alpha/tlsb/kftxx.c#2 (text+ko) ==== @@ -1,6 +1,4 @@ -/* $FreeBSD: src/sys/alpha/tlsb/kftxx.c,v 1.10 2000/08/28 21:48:06 dfr Exp $ */ /* $NetBSD: kftxx.c,v 1.9 1998/05/14 00:01:32 thorpej Exp $ */ - /* * Copyright (c) 1997, 2000 by Matthew Jacob * NASA AMES Research Center. @@ -36,6 +34,9 @@ * i.e., handler for all TLSB I/O nodes. */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/tlsb/kftxx.c,v 1.11 2003/06/10 17:31:31 obrien Exp $"); + #include #include #include ==== //depot/projects/smpng/sys/alpha/tlsb/mcclock_tlsb.c#2 (text+ko) ==== @@ -1,6 +1,4 @@ -/* $FreeBSD: src/sys/alpha/tlsb/mcclock_tlsb.c,v 1.7 2000/03/18 07:46:34 mjacob Exp $ */ /* $NetBSD: mcclock_tlsb.c,v 1.8 1998/05/13 02:50:29 thorpej Exp $ */ - /* * Copyright (c) 1997, 2000 by Matthew Jacob * NASA AMES Research Center. @@ -29,6 +27,9 @@ * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/tlsb/mcclock_tlsb.c,v 1.8 2003/06/10 17:31:31 obrien Exp $"); + #include #include #include ==== //depot/projects/smpng/sys/alpha/tlsb/tlsb.c#3 (text+ko) ==== @@ -1,5 +1,3 @@ -/* $FreeBSD: src/sys/alpha/tlsb/tlsb.c,v 1.14 2003/02/25 00:42:40 marcel Exp $ */ - /* * Copyright (c) 1997, 2000 by Matthew Jacob * NASA AMES Research Center. @@ -36,6 +34,9 @@ * found on AlphaServer 8200 and 8400 systems. */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/tlsb/tlsb.c,v 1.15 2003/06/10 17:31:31 obrien Exp $"); + #include #include #include ==== //depot/projects/smpng/sys/alpha/tlsb/tlsbcpu.c#4 (text+ko) ==== @@ -1,5 +1,3 @@ -/* $FreeBSD: src/sys/alpha/tlsb/tlsbcpu.c,v 1.3 2001/10/11 21:47:27 mjacob Exp $ */ - /* * Copyright (c) 1997, 2000 by Matthew Jacob * NASA AMES Research Center. @@ -33,6 +31,9 @@ * AlphaServer 8200 and 8400 systems. */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/tlsb/tlsbcpu.c,v 1.4 2003/06/10 17:31:31 obrien Exp $"); + #include #include #include ==== //depot/projects/smpng/sys/alpha/tlsb/tlsbmem.c#2 (text+ko) ==== @@ -1,5 +1,3 @@ -/* $FreeBSD: src/sys/alpha/tlsb/tlsbmem.c,v 1.3 2000/03/18 07:28:27 mjacob Exp $ */ - /* * Copyright (c) 1997, 2000 by Matthew Jacob * NASA AMES Research Center. @@ -33,6 +31,9 @@ * AlphaServer 8200 and 8400 systems. */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/tlsb/tlsbmem.c,v 1.4 2003/06/10 17:31:31 obrien Exp $"); + #include #include #include ==== //depot/projects/smpng/sys/alpha/tlsb/zs_tlsb.c#11 (text+ko) ==== @@ -23,13 +23,16 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.35 2003/03/03 12:15:38 phk Exp $ */ + /* * This driver is a somewhat hack. A real driver might use the zs driver * source from NetBSD, except that it's no real winner either. */ +#include +__FBSDID("$FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.36 2003/06/10 17:31:31 obrien Exp $"); + #include "opt_ddb.h" #include ==== //depot/projects/smpng/sys/cam/cam.c#4 (text+ko) ==== @@ -24,11 +24,12 @@ * 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/cam/cam.c,v 1.6 2003/05/31 20:46:21 phk Exp $ */ + +#include +__FBSDID("$FreeBSD: src/sys/cam/cam.c,v 1.7 2003/06/10 17:50:20 obrien Exp $"); + #include - #ifdef _KERNEL #include #include ==== //depot/projects/smpng/sys/cam/cam_periph.c#11 (text+ko) ==== @@ -25,10 +25,11 @@ * 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/cam/cam_periph.c,v 1.50 2003/06/01 09:01:02 phk Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.51 2003/06/10 17:50:20 obrien Exp $"); + #include #include #include ==== //depot/projects/smpng/sys/cam/cam_queue.c#3 (text+ko) ==== @@ -24,9 +24,11 @@ * 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/cam/cam_queue.c,v 1.6 2002/12/30 21:18:06 schweikh Exp $ */ + +#include +__FBSDID("$FreeBSD: src/sys/cam/cam_queue.c,v 1.7 2003/06/10 17:50:20 obrien Exp $"); + #include #include #include ==== //depot/projects/smpng/sys/cam/cam_sim.c#3 (text+ko) ==== @@ -24,10 +24,11 @@ * 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/cam/cam_sim.c,v 1.6 2003/02/19 05:46:56 imp Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/cam/cam_sim.c,v 1.7 2003/06/10 17:50:20 obrien Exp $"); + #include #include #include ==== //depot/projects/smpng/sys/cam/cam_xpt.c#16 (text+ko) ==== @@ -25,9 +25,11 @@ * 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/cam/cam_xpt.c,v 1.133 2003/05/31 20:46:21 phk Exp $ */ + +#include +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.134 2003/06/10 17:50:20 obrien Exp $"); + #include #include #include From owner-p4-projects@FreeBSD.ORG Thu Jun 12 23:08:59 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C7B6937B404; Thu, 12 Jun 2003 23:08:58 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7152937B401 for ; Thu, 12 Jun 2003 23:08:58 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 979EB43F3F for ; Thu, 12 Jun 2003 23:08:56 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5D68u0U004484 for ; Thu, 12 Jun 2003 23:08:56 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5D68mcA004412 for perforce@freebsd.org; Thu, 12 Jun 2003 23:08:48 -0700 (PDT) Date: Thu, 12 Jun 2003 23:08:48 -0700 (PDT) Message-Id: <200306130608.h5D68mcA004412@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 Subject: PERFORCE change 33074 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jun 2003 06:09:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=33074 Change 33074 by marcel@marcel_nfs on 2003/06/12 23:08:27 IFC @33073 Affected files ... .. //depot/projects/ia64/MAINTAINERS#29 integrate .. //depot/projects/ia64/UPDATING#42 integrate .. //depot/projects/ia64/bin/ps/ps.1#16 integrate .. //depot/projects/ia64/bin/ps/ps.c#12 integrate .. //depot/projects/ia64/etc/Makefile#30 integrate .. //depot/projects/ia64/etc/inetd.conf#11 integrate .. //depot/projects/ia64/etc/locale.alias#4 delete .. //depot/projects/ia64/etc/locale.deprecated#4 delete .. //depot/projects/ia64/etc/mtree/BSD.include.dist#14 integrate .. //depot/projects/ia64/etc/network.subr#5 integrate .. //depot/projects/ia64/etc/nls.alias#3 integrate .. //depot/projects/ia64/etc/rc.d/Makefile#14 integrate .. //depot/projects/ia64/etc/rc.d/apm#4 integrate .. //depot/projects/ia64/etc/rc.d/apmd#8 integrate .. //depot/projects/ia64/etc/rc.subr#12 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/tmac/mdoc.local#15 integrate .. //depot/projects/ia64/include/Makefile#27 integrate .. //depot/projects/ia64/lib/libc/amd64/gen/ldexp.c#2 integrate .. //depot/projects/ia64/lib/libc/i386/sys/i386_get_ldt.2#4 integrate .. //depot/projects/ia64/lib/libc/locale/ldpart.c#7 integrate .. //depot/projects/ia64/lib/libc/locale/ldpart.h#5 integrate .. //depot/projects/ia64/lib/libc/locale/lmessages.c#6 integrate .. //depot/projects/ia64/lib/libc/locale/lmonetary.c#8 integrate .. //depot/projects/ia64/lib/libc/locale/lnumeric.c#6 integrate .. //depot/projects/ia64/lib/libc/locale/nl_langinfo.c#4 integrate .. //depot/projects/ia64/lib/libc/stdtime/timelocal.c#6 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_close.c#4 integrate .. //depot/projects/ia64/lib/libfetch/fetch.3#8 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_printf.c#3 integrate .. //depot/projects/ia64/lib/libufs/Makefile#5 integrate .. //depot/projects/ia64/lib/libufs/block.c#8 integrate .. //depot/projects/ia64/lib/libufs/bread.3#1 branch .. //depot/projects/ia64/lib/libufs/cgread.3#1 branch .. //depot/projects/ia64/lib/libufs/cgroup.c#2 integrate .. //depot/projects/ia64/lib/libufs/getino.3#1 branch .. //depot/projects/ia64/lib/libufs/inode.c#3 integrate .. //depot/projects/ia64/lib/libufs/libufs.3#1 branch .. //depot/projects/ia64/lib/libufs/libufs.h#7 integrate .. //depot/projects/ia64/lib/libufs/sblock.c#7 integrate .. //depot/projects/ia64/lib/libufs/sbread.3#1 branch .. //depot/projects/ia64/lib/libufs/type.c#8 integrate .. //depot/projects/ia64/lib/libufs/ufs_disk_close.3#1 branch .. //depot/projects/ia64/libexec/getty/gettytab.5#7 integrate .. //depot/projects/ia64/libexec/getty/gettytab.h#3 integrate .. //depot/projects/ia64/libexec/getty/main.c#5 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/errata/article.sgml#19 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#56 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/errata/article.sgml#13 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#13 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#23 integrate .. //depot/projects/ia64/sbin/ccdconfig/ccdconfig.c#8 integrate .. //depot/projects/ia64/sbin/dumpfs/dumpfs.c#15 integrate .. //depot/projects/ia64/sbin/ffsinfo/Makefile#3 integrate .. //depot/projects/ia64/sbin/growfs/Makefile#3 integrate .. //depot/projects/ia64/sbin/mdconfig/mdconfig.8#7 integrate .. //depot/projects/ia64/sbin/mdconfig/mdconfig.c#11 integrate .. //depot/projects/ia64/sbin/vinum/commands.c#9 integrate .. //depot/projects/ia64/sbin/vinum/v.c#6 integrate .. //depot/projects/ia64/share/man/man4/Makefile#47 integrate .. //depot/projects/ia64/share/man/man4/gem.4#1 branch .. //depot/projects/ia64/share/man/man4/hme.4#1 branch .. //depot/projects/ia64/share/man/man4/miibus.4#2 integrate .. //depot/projects/ia64/share/man/man4/utopia.4#1 branch .. //depot/projects/ia64/share/man/man5/elf.5#3 integrate .. //depot/projects/ia64/share/man/man5/make.conf.5#36 integrate .. //depot/projects/ia64/share/man/man7/hier.7#20 integrate .. //depot/projects/ia64/share/man/man9/Makefile#26 integrate .. //depot/projects/ia64/share/man/man9/ifnet.9#8 integrate .. //depot/projects/ia64/share/man/man9/malloc.9#12 integrate .. //depot/projects/ia64/share/man/man9/pci.9#1 branch .. //depot/projects/ia64/share/man/man9/sx.9#7 integrate .. //depot/projects/ia64/share/man/man9/utopia.9#1 branch .. //depot/projects/ia64/share/mk/bsd.lib.mk#19 integrate .. //depot/projects/ia64/sys/alpha/alpha/alpha-gdbstub.c#3 integrate .. //depot/projects/ia64/sys/alpha/alpha/api_up1000.c#5 integrate .. //depot/projects/ia64/sys/alpha/alpha/autoconf.c#7 integrate .. //depot/projects/ia64/sys/alpha/alpha/busdma_machdep.c#16 integrate .. //depot/projects/ia64/sys/alpha/alpha/busspace.c#2 integrate .. //depot/projects/ia64/sys/alpha/alpha/clock.c#8 integrate .. //depot/projects/ia64/sys/alpha/alpha/cpuconf.c#4 integrate .. //depot/projects/ia64/sys/alpha/alpha/critical.c#2 integrate .. //depot/projects/ia64/sys/alpha/alpha/db_disasm.c#4 integrate .. //depot/projects/ia64/sys/alpha/alpha/db_interface.c#6 integrate .. //depot/projects/ia64/sys/alpha/alpha/dec_1000a.c#5 integrate .. //depot/projects/ia64/sys/alpha/alpha/dec_2100_a50.c#6 integrate .. //depot/projects/ia64/sys/alpha/alpha/dec_2100_a500.c#6 integrate .. //depot/projects/ia64/sys/alpha/alpha/dec_3000_300.c#2 integrate .. //depot/projects/ia64/sys/alpha/alpha/dec_3000_500.c#2 integrate .. //depot/projects/ia64/sys/alpha/alpha/dec_axppci_33.c#7 integrate .. //depot/projects/ia64/sys/alpha/alpha/dec_eb164.c#5 integrate .. //depot/projects/ia64/sys/alpha/alpha/dec_eb64plus.c#6 integrate .. //depot/projects/ia64/sys/alpha/alpha/dec_kn20aa.c#5 integrate .. //depot/projects/ia64/sys/alpha/alpha/dec_kn300.c#6 integrate .. //depot/projects/ia64/sys/alpha/alpha/dec_kn8ae.c#3 integrate .. //depot/projects/ia64/sys/alpha/alpha/dec_st550.c#5 integrate .. //depot/projects/ia64/sys/alpha/alpha/dec_st6600.c#5 integrate .. //depot/projects/ia64/sys/alpha/alpha/dump_machdep.c#4 integrate .. //depot/projects/ia64/sys/alpha/alpha/elf_machdep.c#8 integrate .. //depot/projects/ia64/sys/alpha/alpha/fp_emulate.c#2 integrate .. //depot/projects/ia64/sys/alpha/alpha/genassym.c#8 integrate .. //depot/projects/ia64/sys/alpha/alpha/ieee_float.c#2 integrate .. //depot/projects/ia64/sys/alpha/alpha/in_cksum.c#2 integrate .. //depot/projects/ia64/sys/alpha/alpha/interrupt.c#12 integrate .. //depot/projects/ia64/sys/alpha/alpha/machdep.c#29 integrate .. //depot/projects/ia64/sys/alpha/alpha/mem.c#8 integrate .. //depot/projects/ia64/sys/alpha/alpha/mp_machdep.c#9 integrate .. //depot/projects/ia64/sys/alpha/alpha/pmap.c#29 integrate .. //depot/projects/ia64/sys/alpha/alpha/prom.c#8 integrate .. //depot/projects/ia64/sys/alpha/alpha/promcons.c#7 integrate .. //depot/projects/ia64/sys/alpha/alpha/sgmap.c#2 integrate .. //depot/projects/ia64/sys/alpha/alpha/sys_machdep.c#9 integrate .. //depot/projects/ia64/sys/alpha/alpha/trap.c#27 integrate .. //depot/projects/ia64/sys/alpha/alpha/vm_machdep.c#20 integrate .. //depot/projects/ia64/sys/alpha/isa/isa.c#4 integrate .. //depot/projects/ia64/sys/alpha/isa/isa_dma.c#3 integrate .. //depot/projects/ia64/sys/alpha/isa/mcclock_isa.c#2 integrate .. //depot/projects/ia64/sys/alpha/linux/linux_dummy.c#3 integrate .. //depot/projects/ia64/sys/alpha/linux/linux_genassym.c#3 integrate .. //depot/projects/ia64/sys/alpha/linux/linux_machdep.c#10 integrate .. //depot/projects/ia64/sys/alpha/linux/linux_sysvec.c#10 integrate .. //depot/projects/ia64/sys/alpha/mcbus/mcbus.c#3 integrate .. //depot/projects/ia64/sys/alpha/mcbus/mcmem.c#2 integrate .. //depot/projects/ia64/sys/alpha/mcbus/mcpcia.c#6 integrate .. //depot/projects/ia64/sys/alpha/osf1/imgact_osf1.c#11 integrate .. //depot/projects/ia64/sys/alpha/osf1/osf1_ioctl.c#3 integrate .. //depot/projects/ia64/sys/alpha/osf1/osf1_misc.c#16 integrate .. //depot/projects/ia64/sys/alpha/osf1/osf1_mount.c#8 integrate .. //depot/projects/ia64/sys/alpha/osf1/osf1_signal.c#16 integrate .. //depot/projects/ia64/sys/alpha/osf1/osf1_sysvec.c#5 integrate .. //depot/projects/ia64/sys/alpha/pci/apecs.c#3 integrate .. //depot/projects/ia64/sys/alpha/pci/apecs_pci.c#3 integrate .. //depot/projects/ia64/sys/alpha/pci/bwx.c#2 integrate .. //depot/projects/ia64/sys/alpha/pci/cia.c#4 integrate .. //depot/projects/ia64/sys/alpha/pci/cia_pci.c#3 integrate .. //depot/projects/ia64/sys/alpha/pci/irongate.c#2 integrate .. //depot/projects/ia64/sys/alpha/pci/irongate_pci.c#4 integrate .. //depot/projects/ia64/sys/alpha/pci/lca.c#3 integrate .. //depot/projects/ia64/sys/alpha/pci/lca_pci.c#5 integrate .. //depot/projects/ia64/sys/alpha/pci/pcibus.c#3 integrate .. //depot/projects/ia64/sys/alpha/pci/swiz.c#2 integrate .. //depot/projects/ia64/sys/alpha/pci/t2.c#4 integrate .. //depot/projects/ia64/sys/alpha/pci/t2_pci.c#4 integrate .. //depot/projects/ia64/sys/alpha/pci/tsunami.c#4 integrate .. //depot/projects/ia64/sys/alpha/pci/tsunami_pci.c#4 integrate .. //depot/projects/ia64/sys/alpha/tlsb/dwlpx.c#5 integrate .. //depot/projects/ia64/sys/alpha/tlsb/gbus.c#2 integrate .. //depot/projects/ia64/sys/alpha/tlsb/kftxx.c#2 integrate .. //depot/projects/ia64/sys/alpha/tlsb/mcclock_tlsb.c#2 integrate .. //depot/projects/ia64/sys/alpha/tlsb/tlsb.c#3 integrate .. //depot/projects/ia64/sys/alpha/tlsb/tlsbcpu.c#2 integrate .. //depot/projects/ia64/sys/alpha/tlsb/tlsbmem.c#2 integrate .. //depot/projects/ia64/sys/alpha/tlsb/zs_tlsb.c#7 integrate .. //depot/projects/ia64/sys/amd64/amd64/vm_machdep.c#5 integrate .. //depot/projects/ia64/sys/boot/forth/beastie.4th#3 integrate .. //depot/projects/ia64/sys/cam/cam.c#4 integrate .. //depot/projects/ia64/sys/cam/cam_periph.c#12 integrate .. //depot/projects/ia64/sys/cam/cam_queue.c#3 integrate .. //depot/projects/ia64/sys/cam/cam_sim.c#4 integrate .. //depot/projects/ia64/sys/cam/cam_xpt.c#16 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_all.c#14 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_cd.c#17 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_ch.c#9 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_da.c#45 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_low.c#11 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_low_pisa.c#3 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_pass.c#7 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_pt.c#8 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_sa.c#16 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_ses.c#7 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_targ_bh.c#6 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_target.c#10 integrate .. //depot/projects/ia64/sys/coda/coda_fbsd.c#6 integrate .. //depot/projects/ia64/sys/coda/coda_namecache.c#5 integrate .. //depot/projects/ia64/sys/coda/coda_psdev.c#7 integrate .. //depot/projects/ia64/sys/coda/coda_subr.c#6 integrate .. //depot/projects/ia64/sys/coda/coda_venus.c#5 integrate .. //depot/projects/ia64/sys/coda/coda_vfsops.c#9 integrate .. //depot/projects/ia64/sys/coda/coda_vfsops.h#2 integrate .. //depot/projects/ia64/sys/coda/coda_vnops.c#9 integrate .. //depot/projects/ia64/sys/compat/linprocfs/linprocfs.c#18 integrate .. //depot/projects/ia64/sys/compat/linux/linux_file.c#15 integrate .. //depot/projects/ia64/sys/compat/linux/linux_getcwd.c#10 integrate .. //depot/projects/ia64/sys/compat/linux/linux_ioctl.c#25 integrate .. //depot/projects/ia64/sys/compat/linux/linux_ipc.c#9 integrate .. //depot/projects/ia64/sys/compat/linux/linux_mib.c#9 integrate .. //depot/projects/ia64/sys/compat/linux/linux_misc.c#24 integrate .. //depot/projects/ia64/sys/compat/linux/linux_signal.c#12 integrate .. //depot/projects/ia64/sys/compat/linux/linux_socket.c#10 integrate .. //depot/projects/ia64/sys/compat/linux/linux_stats.c#12 integrate .. //depot/projects/ia64/sys/compat/linux/linux_sysctl.c#9 integrate .. //depot/projects/ia64/sys/compat/linux/linux_uid16.c#8 integrate .. //depot/projects/ia64/sys/compat/linux/linux_util.c#7 integrate .. //depot/projects/ia64/sys/compat/pecoff/imgact_pecoff.c#16 integrate .. //depot/projects/ia64/sys/compat/svr4/imgact_svr4.c#9 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_fcntl.c#9 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_filio.c#13 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_ioctl.c#8 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_ipc.c#4 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_misc.c#19 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_resource.c#5 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_signal.c#9 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_socket.c#7 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_sockio.c#6 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_stat.c#8 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_stream.c#14 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_sysvec.c#13 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_termios.c#4 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_ttold.c#4 integrate .. //depot/projects/ia64/sys/conf/NOTES#51 integrate .. //depot/projects/ia64/sys/conf/files#79 integrate .. //depot/projects/ia64/sys/conf/kern.post.mk#32 integrate .. //depot/projects/ia64/sys/conf/majors#23 integrate .. //depot/projects/ia64/sys/conf/newvers.sh#6 integrate .. //depot/projects/ia64/sys/conf/options#53 integrate .. //depot/projects/ia64/sys/conf/options.sparc64#6 integrate .. //depot/projects/ia64/sys/crypto/blowfish/bf_enc.c#3 integrate .. //depot/projects/ia64/sys/crypto/blowfish/bf_skey.c#3 integrate .. //depot/projects/ia64/sys/crypto/cast128/cast128.c#3 integrate .. //depot/projects/ia64/sys/crypto/md5.c#4 integrate .. //depot/projects/ia64/sys/crypto/rc4/rc4.c#3 integrate .. //depot/projects/ia64/sys/crypto/rijndael/rijndael-alg-fst.c#2 integrate .. //depot/projects/ia64/sys/crypto/rijndael/rijndael-api-fst.c#4 integrate .. //depot/projects/ia64/sys/crypto/sha1.c#3 integrate .. //depot/projects/ia64/sys/crypto/sha2/sha2.c#5 integrate .. //depot/projects/ia64/sys/ddb/db_access.c#2 integrate .. //depot/projects/ia64/sys/ddb/db_break.c#5 integrate .. //depot/projects/ia64/sys/ddb/db_command.c#13 integrate .. //depot/projects/ia64/sys/ddb/db_elf.c#4 integrate .. //depot/projects/ia64/sys/ddb/db_examine.c#5 integrate .. //depot/projects/ia64/sys/ddb/db_expr.c#4 integrate .. //depot/projects/ia64/sys/ddb/db_input.c#7 integrate .. //depot/projects/ia64/sys/ddb/db_kld.c#3 integrate .. //depot/projects/ia64/sys/ddb/db_lex.c#4 integrate .. //depot/projects/ia64/sys/ddb/db_output.c#3 integrate .. //depot/projects/ia64/sys/ddb/db_print.c#2 integrate .. //depot/projects/ia64/sys/ddb/db_ps.c#18 integrate .. //depot/projects/ia64/sys/ddb/db_run.c#4 integrate .. //depot/projects/ia64/sys/ddb/db_sym.c#3 integrate .. //depot/projects/ia64/sys/ddb/db_sysctl.c#2 integrate .. //depot/projects/ia64/sys/ddb/db_trap.c#2 integrate .. //depot/projects/ia64/sys/ddb/db_variables.c#3 integrate .. //depot/projects/ia64/sys/ddb/db_watch.c#6 integrate .. //depot/projects/ia64/sys/ddb/db_write_cmd.c#2 integrate .. //depot/projects/ia64/sys/debugscripts/.gdbinit#2 delete .. //depot/projects/ia64/sys/debugscripts/gdbinit.i386#2 delete .. //depot/projects/ia64/sys/debugscripts/gdbinit.kernel#2 delete .. //depot/projects/ia64/sys/debugscripts/gdbinit.vinum#2 delete .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.reg#12 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_osm.c#11 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_osm.h#9 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_osm.c#11 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_osm.h#10 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_card.c#4 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_core.c#8 integrate .. //depot/projects/ia64/sys/dev/ccd/ccd.c#25 delete .. //depot/projects/ia64/sys/dev/firewire/iec13213.h#6 integrate .. //depot/projects/ia64/sys/dev/firewire/if_fwe.c#14 integrate .. //depot/projects/ia64/sys/dev/fxp/if_fxp.c#34 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt_freebsd.c#10 integrate .. //depot/projects/ia64/sys/dev/ofw/openfirmio.c#5 integrate .. //depot/projects/ia64/sys/dev/ofw/openfirmio.h#2 integrate .. //depot/projects/ia64/sys/dev/pccard/pccarddevs#26 integrate .. //depot/projects/ia64/sys/dev/pccard/pccarddevs.h#26 integrate .. //depot/projects/ia64/sys/dev/pccbb/pccbb.c#29 integrate .. //depot/projects/ia64/sys/dev/pccbb/pccbbvar.h#10 integrate .. //depot/projects/ia64/sys/dev/pci/pci.c#23 integrate .. //depot/projects/ia64/sys/dev/sio/sio.c#45 integrate .. //depot/projects/ia64/sys/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/ia64/sys/dev/usb/ohci_pci.c#3 integrate .. //depot/projects/ia64/sys/dev/usb/uhci_pci.c#5 integrate .. //depot/projects/ia64/sys/dev/utopia/idtphy.h#1 branch .. //depot/projects/ia64/sys/dev/utopia/suni.h#1 branch .. //depot/projects/ia64/sys/dev/utopia/utopia.c#1 branch .. //depot/projects/ia64/sys/dev/utopia/utopia.h#1 branch .. //depot/projects/ia64/sys/dev/vinum/vinumconfig.c#12 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumio.c#16 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumio.h#3 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumioctl.c#15 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumkw.h#4 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumparser.c#5 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumrequest.c#12 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumutil.c#3 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi.c#39 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi_pccard.c#20 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi_pci.c#11 integrate .. //depot/projects/ia64/sys/fs/devfs/devfs_vfsops.c#13 integrate .. //depot/projects/ia64/sys/fs/fdescfs/fdesc_vfsops.c#9 integrate .. //depot/projects/ia64/sys/fs/hpfs/hpfs_vfsops.c#15 integrate .. //depot/projects/ia64/sys/fs/msdosfs/msdosfs_vfsops.c#17 integrate .. //depot/projects/ia64/sys/fs/ntfs/ntfs_vfsops.c#14 integrate .. //depot/projects/ia64/sys/fs/nullfs/null_vfsops.c#10 integrate .. //depot/projects/ia64/sys/fs/nwfs/nwfs_vfsops.c#10 integrate .. //depot/projects/ia64/sys/fs/portalfs/portal_vfsops.c#12 integrate .. //depot/projects/ia64/sys/fs/pseudofs/pseudofs.h#12 integrate .. //depot/projects/ia64/sys/fs/smbfs/smbfs_vfsops.c#16 integrate .. //depot/projects/ia64/sys/fs/udf/udf_vfsops.c#11 integrate .. //depot/projects/ia64/sys/fs/umapfs/umap_vfsops.c#12 integrate .. //depot/projects/ia64/sys/fs/unionfs/union_vfsops.c#12 integrate .. //depot/projects/ia64/sys/geom/geom_aes.c#15 integrate .. //depot/projects/ia64/sys/geom/geom_apple.c#8 integrate .. //depot/projects/ia64/sys/geom/geom_bsd.c#37 integrate .. //depot/projects/ia64/sys/geom/geom_bsd_enc.c#4 integrate .. //depot/projects/ia64/sys/geom/geom_ccd.c#3 integrate .. //depot/projects/ia64/sys/geom/geom_ctl.c#13 integrate .. //depot/projects/ia64/sys/geom/geom_dev.c#38 integrate .. //depot/projects/ia64/sys/geom/geom_disk.c#36 integrate .. //depot/projects/ia64/sys/geom/geom_dump.c#21 integrate .. //depot/projects/ia64/sys/geom/geom_event.c#22 integrate .. //depot/projects/ia64/sys/geom/geom_gpt.c#22 integrate .. //depot/projects/ia64/sys/geom/geom_io.c#26 integrate .. //depot/projects/ia64/sys/geom/geom_kern.c#20 integrate .. //depot/projects/ia64/sys/geom/geom_mbr.c#30 integrate .. //depot/projects/ia64/sys/geom/geom_mbr_enc.c#2 integrate .. //depot/projects/ia64/sys/geom/geom_mirror.c#8 integrate .. //depot/projects/ia64/sys/geom/geom_pc98.c#25 integrate .. //depot/projects/ia64/sys/geom/geom_pc98_enc.c#2 integrate .. //depot/projects/ia64/sys/geom/geom_slice.c#30 integrate .. //depot/projects/ia64/sys/geom/geom_subr.c#32 integrate .. //depot/projects/ia64/sys/geom/geom_sunlabel.c#25 integrate .. //depot/projects/ia64/sys/geom/geom_sunlabel_enc.c#2 integrate .. //depot/projects/ia64/sys/geom/geom_vol_ffs.c#7 integrate .. //depot/projects/ia64/sys/gnu/ext2fs/ext2_vfsops.c#18 integrate .. //depot/projects/ia64/sys/i386/bios/smapi.c#3 integrate .. //depot/projects/ia64/sys/i386/bios/smapi_bios.S#3 integrate .. //depot/projects/ia64/sys/i386/conf/PAE#5 integrate .. //depot/projects/ia64/sys/i386/i386/legacy.c#4 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#43 integrate .. //depot/projects/ia64/sys/i386/i386/vm_machdep.c#26 integrate .. //depot/projects/ia64/sys/i386/svr4/svr4_genassym.c#3 integrate .. //depot/projects/ia64/sys/i386/svr4/svr4_machdep.c#9 integrate .. //depot/projects/ia64/sys/i4b/capi/capi_l4if.c#6 integrate .. //depot/projects/ia64/sys/i4b/capi/capi_llif.c#3 integrate .. //depot/projects/ia64/sys/i4b/capi/capi_msgs.c#3 integrate .. //depot/projects/ia64/sys/i4b/capi/iavc/iavc_card.c#4 integrate .. //depot/projects/ia64/sys/i4b/capi/iavc/iavc_isa.c#7 integrate .. //depot/projects/ia64/sys/i4b/capi/iavc/iavc_lli.c#5 integrate .. //depot/projects/ia64/sys/i4b/capi/iavc/iavc_pci.c#7 integrate .. //depot/projects/ia64/sys/i4b/driver/i4b_ctl.c#7 integrate .. //depot/projects/ia64/sys/i4b/driver/i4b_ing.c#7 integrate .. //depot/projects/ia64/sys/i4b/driver/i4b_ipr.c#12 integrate .. //depot/projects/ia64/sys/i4b/driver/i4b_isppp.c#10 integrate .. //depot/projects/ia64/sys/i4b/driver/i4b_rbch.c#10 integrate .. //depot/projects/ia64/sys/i4b/driver/i4b_tel.c#8 integrate .. //depot/projects/ia64/sys/i4b/driver/i4b_trace.c#10 integrate .. //depot/projects/ia64/sys/i4b/layer1/i4b_hdlc.c#2 integrate .. //depot/projects/ia64/sys/i4b/layer1/i4b_l1dmux.c#5 integrate .. //depot/projects/ia64/sys/i4b/layer1/i4b_l1lib.c#2 integrate .. //depot/projects/ia64/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c#4 integrate .. //depot/projects/ia64/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c#4 integrate .. //depot/projects/ia64/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c#4 integrate .. //depot/projects/ia64/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#7 integrate .. //depot/projects/ia64/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c#4 integrate .. //depot/projects/ia64/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c#4 integrate .. //depot/projects/ia64/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c#4 integrate .. //depot/projects/ia64/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#9 integrate .. //depot/projects/ia64/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#6 integrate .. //depot/projects/ia64/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c#7 integrate .. //depot/projects/ia64/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c#6 integrate .. //depot/projects/ia64/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c#4 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_asuscom_ipac.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_avm_a1.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_bchan.c#6 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_ctx_s0P.c#4 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_diva.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_drn_ngo.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_dynalink.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_elsa_qs1i.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#4 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_hscx.c#4 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_isac.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_isic.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_isic_isa.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_isic_pnp.c#4 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_itk_ix1.c#4 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_l1.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_l1fsm.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_siemens_isurf.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_sws.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_tel_s016.c#4 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_tel_s0163.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_tel_s08.c#4 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_usr_sti.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer1/itjc/i4b_itjc_isac.c#4 integrate .. //depot/projects/ia64/sys/i4b/layer1/itjc/i4b_itjc_l1.c#4 integrate .. //depot/projects/ia64/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c#4 integrate .. //depot/projects/ia64/sys/i4b/layer1/itjc/i4b_itjc_pci.c#9 integrate .. //depot/projects/ia64/sys/i4b/layer1/iwic/i4b_iwic_bchan.c#6 integrate .. //depot/projects/ia64/sys/i4b/layer1/iwic/i4b_iwic_dchan.c#4 integrate .. //depot/projects/ia64/sys/i4b/layer1/iwic/i4b_iwic_fsm.c#4 integrate .. //depot/projects/ia64/sys/i4b/layer1/iwic/i4b_iwic_l1if.c#4 integrate .. //depot/projects/ia64/sys/i4b/layer1/iwic/i4b_iwic_pci.c#4 integrate .. //depot/projects/ia64/sys/i4b/layer2/i4b_iframe.c#4 integrate .. //depot/projects/ia64/sys/i4b/layer2/i4b_l2.c#7 integrate .. //depot/projects/ia64/sys/i4b/layer2/i4b_l2fsm.c#6 integrate .. //depot/projects/ia64/sys/i4b/layer2/i4b_l2timer.c#4 integrate .. //depot/projects/ia64/sys/i4b/layer2/i4b_lme.c#4 integrate .. //depot/projects/ia64/sys/i4b/layer2/i4b_mbuf.c#5 integrate .. //depot/projects/ia64/sys/i4b/layer2/i4b_sframe.c#4 integrate .. //depot/projects/ia64/sys/i4b/layer2/i4b_tei.c#4 integrate .. //depot/projects/ia64/sys/i4b/layer2/i4b_uframe.c#4 integrate .. //depot/projects/ia64/sys/i4b/layer2/i4b_util.c#4 integrate .. //depot/projects/ia64/sys/i4b/layer3/i4b_l2if.c#5 integrate .. //depot/projects/ia64/sys/i4b/layer3/i4b_l3fsm.c#5 integrate .. //depot/projects/ia64/sys/i4b/layer3/i4b_l3timer.c#4 integrate .. //depot/projects/ia64/sys/i4b/layer3/i4b_l4if.c#4 integrate .. //depot/projects/ia64/sys/i4b/layer3/i4b_q931.c#7 integrate .. //depot/projects/ia64/sys/i4b/layer3/i4b_q932fac.c#4 integrate .. //depot/projects/ia64/sys/i4b/layer4/i4b_i4bdrv.c#13 integrate .. //depot/projects/ia64/sys/i4b/layer4/i4b_l4.c#6 integrate .. //depot/projects/ia64/sys/i4b/layer4/i4b_l4mgmt.c#6 integrate .. //depot/projects/ia64/sys/i4b/layer4/i4b_l4timer.c#4 integrate .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#78 integrate .. //depot/projects/ia64/sys/ia64/ia64/vm_machdep.c#29 integrate .. //depot/projects/ia64/sys/isa/atkbd_isa.c#3 integrate .. //depot/projects/ia64/sys/isa/atkbdc_isa.c#3 integrate .. //depot/projects/ia64/sys/isa/fd.c#17 integrate .. //depot/projects/ia64/sys/isa/isa_common.c#8 integrate .. //depot/projects/ia64/sys/isa/isahint.c#2 integrate .. //depot/projects/ia64/sys/isa/orm.c#3 integrate .. //depot/projects/ia64/sys/isa/pnp.c#6 integrate .. //depot/projects/ia64/sys/isa/pnpparse.c#3 integrate .. //depot/projects/ia64/sys/isa/ppc.c#7 integrate .. //depot/projects/ia64/sys/isa/psm.c#14 integrate .. //depot/projects/ia64/sys/isa/syscons_isa.c#7 integrate .. //depot/projects/ia64/sys/isa/vga_isa.c#7 integrate .. //depot/projects/ia64/sys/isofs/cd9660/cd9660_bmap.c#3 integrate .. //depot/projects/ia64/sys/isofs/cd9660/cd9660_lookup.c#6 integrate .. //depot/projects/ia64/sys/isofs/cd9660/cd9660_node.c#7 integrate .. //depot/projects/ia64/sys/isofs/cd9660/cd9660_rrip.c#5 integrate .. //depot/projects/ia64/sys/isofs/cd9660/cd9660_util.c#3 integrate .. //depot/projects/ia64/sys/isofs/cd9660/cd9660_vfsops.c#18 integrate .. //depot/projects/ia64/sys/isofs/cd9660/cd9660_vnops.c#15 integrate .. //depot/projects/ia64/sys/kern/imgact_aout.c#16 integrate .. //depot/projects/ia64/sys/kern/imgact_elf.c#32 integrate .. //depot/projects/ia64/sys/kern/imgact_elf32.c#4 integrate .. //depot/projects/ia64/sys/kern/imgact_elf64.c#4 integrate .. //depot/projects/ia64/sys/kern/imgact_gzip.c#8 integrate .. //depot/projects/ia64/sys/kern/imgact_shell.c#5 integrate .. //depot/projects/ia64/sys/kern/inflate.c#6 integrate .. //depot/projects/ia64/sys/kern/init_main.c#34 integrate .. //depot/projects/ia64/sys/kern/kern_acct.c#20 integrate .. //depot/projects/ia64/sys/kern/kern_acl.c#16 integrate .. //depot/projects/ia64/sys/kern/kern_alq.c#6 integrate .. //depot/projects/ia64/sys/kern/kern_clock.c#22 integrate .. //depot/projects/ia64/sys/kern/kern_condvar.c#24 integrate .. //depot/projects/ia64/sys/kern/kern_conf.c#22 integrate .. //depot/projects/ia64/sys/kern/kern_context.c#5 integrate .. //depot/projects/ia64/sys/kern/kern_descrip.c#56 integrate .. //depot/projects/ia64/sys/kern/kern_environment.c#9 integrate .. //depot/projects/ia64/sys/kern/kern_event.c#17 integrate .. //depot/projects/ia64/sys/kern/kern_exec.c#50 integrate .. //depot/projects/ia64/sys/kern/kern_exit.c#45 integrate .. //depot/projects/ia64/sys/kern/kern_fork.c#40 integrate .. //depot/projects/ia64/sys/kern/kern_idle.c#12 integrate .. //depot/projects/ia64/sys/kern/kern_intr.c#24 integrate .. //depot/projects/ia64/sys/kern/kern_jail.c#17 integrate .. //depot/projects/ia64/sys/kern/kern_kthread.c#10 integrate .. //depot/projects/ia64/sys/kern/kern_ktr.c#11 integrate .. //depot/projects/ia64/sys/kern/kern_ktrace.c#19 integrate .. //depot/projects/ia64/sys/kern/kern_linker.c#26 integrate .. //depot/projects/ia64/sys/kern/kern_lock.c#17 integrate .. //depot/projects/ia64/sys/kern/kern_lockf.c#12 integrate .. //depot/projects/ia64/sys/kern/kern_mac.c#27 integrate .. //depot/projects/ia64/sys/kern/kern_malloc.c#23 integrate .. //depot/projects/ia64/sys/kern/kern_mib.c#14 integrate .. //depot/projects/ia64/sys/kern/kern_module.c#9 integrate .. //depot/projects/ia64/sys/kern/kern_mtxpool.c#6 integrate .. //depot/projects/ia64/sys/kern/kern_mutex.c#26 integrate .. //depot/projects/ia64/sys/kern/kern_ntptime.c#8 integrate .. //depot/projects/ia64/sys/kern/kern_physio.c#9 integrate .. //depot/projects/ia64/sys/kern/kern_poll.c#9 integrate .. //depot/projects/ia64/sys/kern/kern_proc.c#40 integrate .. //depot/projects/ia64/sys/kern/kern_prot.c#25 integrate .. //depot/projects/ia64/sys/kern/kern_resource.c#24 integrate .. //depot/projects/ia64/sys/kern/kern_sema.c#4 integrate .. //depot/projects/ia64/sys/kern/kern_shutdown.c#19 integrate .. //depot/projects/ia64/sys/kern/kern_sig.c#52 integrate .. //depot/projects/ia64/sys/kern/kern_subr.c#22 integrate .. //depot/projects/ia64/sys/kern/kern_switch.c#25 integrate .. //depot/projects/ia64/sys/kern/kern_sx.c#7 integrate .. //depot/projects/ia64/sys/kern/kern_synch.c#38 integrate .. //depot/projects/ia64/sys/kern/kern_syscalls.c#3 integrate .. //depot/projects/ia64/sys/kern/kern_sysctl.c#20 integrate .. //depot/projects/ia64/sys/kern/kern_tc.c#22 integrate .. //depot/projects/ia64/sys/kern/kern_thr.c#8 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#50 integrate .. //depot/projects/ia64/sys/kern/kern_time.c#20 integrate .. //depot/projects/ia64/sys/kern/kern_timeout.c#7 integrate .. //depot/projects/ia64/sys/kern/kern_umtx.c#4 integrate .. //depot/projects/ia64/sys/kern/kern_uuid.c#9 integrate .. //depot/projects/ia64/sys/kern/kern_xxx.c#4 integrate .. //depot/projects/ia64/sys/kern/link_elf.c#19 integrate .. //depot/projects/ia64/sys/kern/md4c.c#2 integrate .. //depot/projects/ia64/sys/kern/sched_4bsd.c#12 integrate .. //depot/projects/ia64/sys/kern/sched_ule.c#16 integrate .. //depot/projects/ia64/sys/kern/subr_autoconf.c#3 integrate .. //depot/projects/ia64/sys/kern/subr_blist.c#7 integrate .. //depot/projects/ia64/sys/kern/subr_bus.c#22 integrate .. //depot/projects/ia64/sys/kern/subr_clock.c#4 integrate .. //depot/projects/ia64/sys/kern/subr_devstat.c#8 integrate .. //depot/projects/ia64/sys/kern/subr_disk.c#17 integrate .. //depot/projects/ia64/sys/kern/subr_eventhandler.c#6 integrate .. //depot/projects/ia64/sys/kern/subr_hints.c#5 integrate .. //depot/projects/ia64/sys/kern/subr_kobj.c#3 integrate .. //depot/projects/ia64/sys/kern/subr_log.c#10 integrate .. //depot/projects/ia64/sys/kern/subr_mbuf.c#29 integrate .. //depot/projects/ia64/sys/kern/subr_mchain.c#13 integrate .. //depot/projects/ia64/sys/kern/subr_module.c#2 integrate .. //depot/projects/ia64/sys/kern/subr_param.c#8 integrate .. //depot/projects/ia64/sys/kern/subr_pcpu.c#4 integrate .. //depot/projects/ia64/sys/kern/subr_power.c#4 integrate .. //depot/projects/ia64/sys/kern/subr_prf.c#26 integrate .. //depot/projects/ia64/sys/kern/subr_prof.c#14 integrate .. //depot/projects/ia64/sys/kern/subr_rman.c#11 integrate .. //depot/projects/ia64/sys/kern/subr_sbuf.c#11 integrate .. //depot/projects/ia64/sys/kern/subr_scanf.c#4 integrate .. //depot/projects/ia64/sys/kern/subr_smp.c#14 integrate .. //depot/projects/ia64/sys/kern/subr_taskqueue.c#6 integrate .. //depot/projects/ia64/sys/kern/subr_trap.c#30 integrate .. //depot/projects/ia64/sys/kern/subr_witness.c#35 integrate .. //depot/projects/ia64/sys/kern/subr_xxx.c#8 integrate .. //depot/projects/ia64/sys/kern/sys_generic.c#24 integrate .. //depot/projects/ia64/sys/kern/sys_pipe.c#31 integrate .. //depot/projects/ia64/sys/kern/sys_process.c#21 integrate .. //depot/projects/ia64/sys/kern/sys_socket.c#16 integrate .. //depot/projects/ia64/sys/kern/sysv_ipc.c#7 integrate .. //depot/projects/ia64/sys/kern/sysv_msg.c#11 integrate .. //depot/projects/ia64/sys/kern/sysv_sem.c#14 integrate .. //depot/projects/ia64/sys/kern/sysv_shm.c#12 integrate .. //depot/projects/ia64/sys/kern/tty.c#27 integrate .. //depot/projects/ia64/sys/kern/tty_compat.c#4 integrate .. //depot/projects/ia64/sys/kern/tty_conf.c#2 integrate .. //depot/projects/ia64/sys/kern/tty_cons.c#13 integrate .. //depot/projects/ia64/sys/kern/tty_pty.c#14 integrate .. //depot/projects/ia64/sys/kern/tty_subr.c#6 integrate .. //depot/projects/ia64/sys/kern/tty_tty.c#9 integrate .. //depot/projects/ia64/sys/kern/uipc_accf.c#4 integrate .. //depot/projects/ia64/sys/kern/uipc_cow.c#11 integrate .. //depot/projects/ia64/sys/kern/uipc_domain.c#9 integrate .. //depot/projects/ia64/sys/kern/uipc_jumbo.c#7 integrate .. //depot/projects/ia64/sys/kern/uipc_mbuf.c#18 integrate .. //depot/projects/ia64/sys/kern/uipc_mbuf2.c#11 integrate .. //depot/projects/ia64/sys/kern/uipc_proto.c#2 integrate .. //depot/projects/ia64/sys/kern/uipc_sem.c#9 integrate .. //depot/projects/ia64/sys/kern/uipc_socket.c#31 integrate .. //depot/projects/ia64/sys/kern/uipc_socket2.c#24 integrate .. //depot/projects/ia64/sys/kern/uipc_syscalls.c#33 integrate .. //depot/projects/ia64/sys/kern/uipc_usrreq.c#24 integrate .. //depot/projects/ia64/sys/kern/vfs_aio.c#33 integrate .. //depot/projects/ia64/sys/kern/vfs_bio.c#53 integrate .. //depot/projects/ia64/sys/kern/vfs_cache.c#14 integrate .. //depot/projects/ia64/sys/kern/vfs_cluster.c#23 integrate .. //depot/projects/ia64/sys/kern/vfs_default.c#25 integrate .. //depot/projects/ia64/sys/kern/vfs_export.c#10 integrate .. //depot/projects/ia64/sys/kern/vfs_init.c#10 integrate .. //depot/projects/ia64/sys/kern/vfs_lookup.c#12 integrate .. //depot/projects/ia64/sys/kern/vfs_mount.c#18 integrate .. //depot/projects/ia64/sys/kern/vfs_subr.c#51 integrate .. //depot/projects/ia64/sys/kern/vfs_syscalls.c#45 integrate .. //depot/projects/ia64/sys/kern/vfs_vnops.c#30 integrate .. //depot/projects/ia64/sys/libkern/arc4random.c#3 integrate .. //depot/projects/ia64/sys/libkern/ashldi3.c#2 integrate .. //depot/projects/ia64/sys/libkern/ashrdi3.c#2 integrate .. //depot/projects/ia64/sys/libkern/bcd.c#2 integrate .. //depot/projects/ia64/sys/libkern/bcmp.c#3 integrate .. //depot/projects/ia64/sys/libkern/bsearch.c#4 integrate .. //depot/projects/ia64/sys/libkern/crc32.c#2 integrate .. //depot/projects/ia64/sys/libkern/divdi3.c#2 integrate .. //depot/projects/ia64/sys/libkern/ffs.c#3 integrate .. //depot/projects/ia64/sys/libkern/fnmatch.c#2 integrate .. //depot/projects/ia64/sys/libkern/iconv.c#6 integrate .. //depot/projects/ia64/sys/libkern/iconv_xlat.c#4 integrate .. //depot/projects/ia64/sys/libkern/index.c#2 integrate .. //depot/projects/ia64/sys/libkern/inet_ntoa.c#2 integrate .. //depot/projects/ia64/sys/libkern/lshrdi3.c#2 integrate .. //depot/projects/ia64/sys/libkern/mcount.c#3 integrate .. //depot/projects/ia64/sys/libkern/moddi3.c#2 integrate .. //depot/projects/ia64/sys/libkern/qdivrem.c#2 integrate .. //depot/projects/ia64/sys/libkern/qsort.c#4 integrate .. //depot/projects/ia64/sys/libkern/random.c#3 integrate .. //depot/projects/ia64/sys/libkern/rindex.c#2 integrate .. //depot/projects/ia64/sys/libkern/scanc.c#2 integrate .. //depot/projects/ia64/sys/libkern/skpc.c#2 integrate .. //depot/projects/ia64/sys/libkern/strcat.c#4 integrate .. //depot/projects/ia64/sys/libkern/strcmp.c#3 integrate .. //depot/projects/ia64/sys/libkern/strcpy.c#4 integrate .. //depot/projects/ia64/sys/libkern/strdup.c#2 integrate .. //depot/projects/ia64/sys/libkern/strlen.c#3 integrate .. //depot/projects/ia64/sys/libkern/strncmp.c#3 integrate .. //depot/projects/ia64/sys/libkern/strncpy.c#4 integrate .. //depot/projects/ia64/sys/libkern/strtol.c#3 integrate .. //depot/projects/ia64/sys/libkern/strtoq.c#3 integrate .. //depot/projects/ia64/sys/libkern/strtoul.c#3 integrate .. //depot/projects/ia64/sys/libkern/strtouq.c#3 integrate .. //depot/projects/ia64/sys/libkern/strvalid.c#2 integrate .. //depot/projects/ia64/sys/libkern/ucmpdi2.c#2 integrate .. //depot/projects/ia64/sys/libkern/udivdi3.c#2 integrate .. //depot/projects/ia64/sys/libkern/umoddi3.c#2 integrate .. //depot/projects/ia64/sys/modules/Makefile#51 integrate .. //depot/projects/ia64/sys/modules/ccd/Makefile#3 delete .. //depot/projects/ia64/sys/modules/geom/Makefile#3 integrate .. //depot/projects/ia64/sys/modules/geom/geom_ccd/Makefile#1 branch .. //depot/projects/ia64/sys/modules/utopia/Makefile#1 branch .. //depot/projects/ia64/sys/modules/vinum/.gdbinit.crash#2 delete .. //depot/projects/ia64/sys/modules/vinum/.gdbinit.kernel#2 delete .. //depot/projects/ia64/sys/modules/vinum/.gdbinit.serial#2 delete .. //depot/projects/ia64/sys/modules/vinum/.gdbinit.vinum#2 delete .. //depot/projects/ia64/sys/modules/vinum/.gdbinit.vinum.paths#2 delete .. //depot/projects/ia64/sys/netatm/atm_aal5.c#7 integrate .. //depot/projects/ia64/sys/netatm/atm_cm.c#13 integrate .. //depot/projects/ia64/sys/netatm/atm_device.c#9 integrate .. //depot/projects/ia64/sys/netatm/atm_if.c#11 integrate .. //depot/projects/ia64/sys/netatm/atm_proto.c#3 integrate .. //depot/projects/ia64/sys/netatm/atm_signal.c#5 integrate .. //depot/projects/ia64/sys/netatm/atm_socket.c#9 integrate .. //depot/projects/ia64/sys/netatm/atm_subr.c#12 integrate .. //depot/projects/ia64/sys/netatm/atm_usrreq.c#6 integrate .. //depot/projects/ia64/sys/netatm/ipatm/ipatm_event.c#2 integrate .. //depot/projects/ia64/sys/netatm/ipatm/ipatm_if.c#8 integrate .. //depot/projects/ia64/sys/netatm/ipatm/ipatm_input.c#5 integrate .. //depot/projects/ia64/sys/netatm/ipatm/ipatm_load.c#5 integrate .. //depot/projects/ia64/sys/netatm/ipatm/ipatm_output.c#3 integrate .. //depot/projects/ia64/sys/netatm/ipatm/ipatm_usrreq.c#4 integrate .. //depot/projects/ia64/sys/netatm/ipatm/ipatm_vcm.c#6 integrate .. //depot/projects/ia64/sys/netatm/sigpvc/sigpvc_if.c#5 integrate .. //depot/projects/ia64/sys/netatm/sigpvc/sigpvc_subr.c#6 integrate .. //depot/projects/ia64/sys/netatm/spans/spans_arp.c#7 integrate .. //depot/projects/ia64/sys/netatm/spans/spans_cls.c#7 integrate .. //depot/projects/ia64/sys/netatm/spans/spans_if.c#5 integrate .. //depot/projects/ia64/sys/netatm/spans/spans_kxdr.c#7 integrate .. //depot/projects/ia64/sys/netatm/spans/spans_msg.c#9 integrate .. //depot/projects/ia64/sys/netatm/spans/spans_print.c#3 integrate .. //depot/projects/ia64/sys/netatm/spans/spans_proto.c#7 integrate .. //depot/projects/ia64/sys/netatm/spans/spans_subr.c#5 integrate .. //depot/projects/ia64/sys/netatm/spans/spans_util.c#4 integrate .. //depot/projects/ia64/sys/netatm/uni/q2110_sigaa.c#4 integrate .. //depot/projects/ia64/sys/netatm/uni/q2110_sigcpcs.c#5 integrate .. //depot/projects/ia64/sys/netatm/uni/q2110_subr.c#2 integrate .. //depot/projects/ia64/sys/netatm/uni/qsaal1_sigaa.c#4 integrate .. //depot/projects/ia64/sys/netatm/uni/qsaal1_sigcpcs.c#5 integrate .. //depot/projects/ia64/sys/netatm/uni/qsaal1_subr.c#2 integrate .. //depot/projects/ia64/sys/netatm/uni/sscf_uni.c#6 integrate .. //depot/projects/ia64/sys/netatm/uni/sscf_uni_lower.c#4 integrate .. //depot/projects/ia64/sys/netatm/uni/sscf_uni_upper.c#3 integrate .. //depot/projects/ia64/sys/netatm/uni/sscop.c#6 integrate .. //depot/projects/ia64/sys/netatm/uni/sscop_lower.c#6 integrate .. //depot/projects/ia64/sys/netatm/uni/sscop_pdu.c#5 integrate .. //depot/projects/ia64/sys/netatm/uni/sscop_sigaa.c#3 integrate .. //depot/projects/ia64/sys/netatm/uni/sscop_sigcpcs.c#4 integrate .. //depot/projects/ia64/sys/netatm/uni/sscop_subr.c#6 integrate .. //depot/projects/ia64/sys/netatm/uni/sscop_timer.c#3 integrate .. //depot/projects/ia64/sys/netatm/uni/sscop_upper.c#5 integrate .. //depot/projects/ia64/sys/netatm/uni/uni_load.c#3 integrate .. //depot/projects/ia64/sys/netatm/uni/uniarp.c#7 integrate .. //depot/projects/ia64/sys/netatm/uni/uniarp_cache.c#6 integrate .. //depot/projects/ia64/sys/netatm/uni/uniarp_input.c#3 integrate .. //depot/projects/ia64/sys/netatm/uni/uniarp_output.c#3 integrate .. //depot/projects/ia64/sys/netatm/uni/uniarp_timer.c#4 integrate .. //depot/projects/ia64/sys/netatm/uni/uniarp_vcm.c#5 integrate .. //depot/projects/ia64/sys/netatm/uni/uniip.c#8 integrate .. //depot/projects/ia64/sys/netatm/uni/unisig_decode.c#8 integrate .. //depot/projects/ia64/sys/netatm/uni/unisig_encode.c#4 integrate .. //depot/projects/ia64/sys/netatm/uni/unisig_if.c#5 integrate .. //depot/projects/ia64/sys/netatm/uni/unisig_mbuf.c#2 integrate .. //depot/projects/ia64/sys/netatm/uni/unisig_msg.c#5 integrate .. //depot/projects/ia64/sys/netatm/uni/unisig_print.c#4 integrate .. //depot/projects/ia64/sys/netatm/uni/unisig_proto.c#2 integrate .. //depot/projects/ia64/sys/netatm/uni/unisig_sigmgr_state.c#4 integrate .. //depot/projects/ia64/sys/netatm/uni/unisig_subr.c#6 integrate .. //depot/projects/ia64/sys/netatm/uni/unisig_util.c#4 integrate .. //depot/projects/ia64/sys/netatm/uni/unisig_vc_state.c#7 integrate .. //depot/projects/ia64/sys/netipx/ipx.c#6 integrate .. //depot/projects/ia64/sys/netipx/ipx_cksum.c#2 integrate .. //depot/projects/ia64/sys/netipx/ipx_input.c#7 integrate .. //depot/projects/ia64/sys/netipx/ipx_ip.c#8 integrate .. //depot/projects/ia64/sys/netipx/ipx_outputfl.c#5 integrate .. //depot/projects/ia64/sys/netipx/ipx_pcb.c#6 integrate .. //depot/projects/ia64/sys/netipx/ipx_proto.c#3 integrate .. //depot/projects/ia64/sys/netipx/ipx_usrreq.c#10 integrate .. //depot/projects/ia64/sys/netipx/spx_debug.c#2 integrate .. //depot/projects/ia64/sys/netipx/spx_usrreq.c#8 integrate .. //depot/projects/ia64/sys/netkey/key.c#12 integrate .. //depot/projects/ia64/sys/netkey/key_debug.c#5 integrate .. //depot/projects/ia64/sys/netkey/keydb.c#3 integrate .. //depot/projects/ia64/sys/netkey/keysock.c#15 integrate .. //depot/projects/ia64/sys/netnatm/natm.c#12 integrate .. //depot/projects/ia64/sys/netnatm/natm_pcb.c#5 integrate .. //depot/projects/ia64/sys/netnatm/natm_proto.c#7 integrate .. //depot/projects/ia64/sys/netncp/ncp_conn.c#8 integrate .. //depot/projects/ia64/sys/netncp/ncp_crypt.c#2 integrate .. //depot/projects/ia64/sys/netncp/ncp_login.c#2 integrate .. //depot/projects/ia64/sys/netncp/ncp_mod.c#6 integrate .. //depot/projects/ia64/sys/netncp/ncp_ncp.c#9 integrate .. //depot/projects/ia64/sys/netncp/ncp_nls.c#2 integrate .. //depot/projects/ia64/sys/netncp/ncp_rq.c#7 integrate .. //depot/projects/ia64/sys/netncp/ncp_sock.c#7 integrate .. //depot/projects/ia64/sys/netncp/ncp_subr.c#6 integrate .. //depot/projects/ia64/sys/netsmb/smb_conn.c#7 integrate .. //depot/projects/ia64/sys/netsmb/smb_crypt.c#4 integrate .. //depot/projects/ia64/sys/netsmb/smb_dev.c#11 integrate .. //depot/projects/ia64/sys/netsmb/smb_iod.c#10 integrate .. //depot/projects/ia64/sys/netsmb/smb_rq.c#10 integrate .. //depot/projects/ia64/sys/netsmb/smb_smb.c#9 integrate .. //depot/projects/ia64/sys/netsmb/smb_subr.c#13 integrate .. //depot/projects/ia64/sys/netsmb/smb_trantcp.c#14 integrate .. //depot/projects/ia64/sys/netsmb/smb_usr.c#3 integrate .. //depot/projects/ia64/sys/nfsclient/bootp_subr.c#14 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_diskless.c#3 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_lock.c#16 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_vfsops.c#21 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_vnops.c#22 integrate .. //depot/projects/ia64/sys/nfsserver/nfs_srvsock.c#11 integrate .. //depot/projects/ia64/sys/nfsserver/nfs_srvsubs.c#11 integrate .. //depot/projects/ia64/sys/nfsserver/nfs_syscalls.c#15 integrate .. //depot/projects/ia64/sys/opencrypto/cast.c#2 integrate .. //depot/projects/ia64/sys/opencrypto/criov.c#2 integrate .. //depot/projects/ia64/sys/opencrypto/crmbuf.c#2 integrate .. //depot/projects/ia64/sys/opencrypto/crypto.c#9 integrate .. //depot/projects/ia64/sys/opencrypto/cryptodev.c#11 integrate .. //depot/projects/ia64/sys/opencrypto/cryptosoft.c#3 integrate .. //depot/projects/ia64/sys/opencrypto/deflate.c#2 integrate .. //depot/projects/ia64/sys/opencrypto/rijndael.c#2 integrate .. //depot/projects/ia64/sys/opencrypto/rmd160.c#2 integrate .. //depot/projects/ia64/sys/opencrypto/skipjack.c#2 integrate .. //depot/projects/ia64/sys/opencrypto/xform.c#2 integrate .. //depot/projects/ia64/sys/pc98/conf/GENERIC#33 integrate .. //depot/projects/ia64/sys/pccard/pccard.c#18 integrate .. //depot/projects/ia64/sys/pccard/pccard_beep.c#3 integrate .. //depot/projects/ia64/sys/pccard/pccard_nbk.c#7 integrate .. //depot/projects/ia64/sys/pccard/pcic.c#13 integrate .. //depot/projects/ia64/sys/pccard/pcic_isa.c#4 integrate .. //depot/projects/ia64/sys/pccard/pcic_pci.c#16 integrate .. //depot/projects/ia64/sys/pci/agp.c#17 integrate .. //depot/projects/ia64/sys/pci/agp_ali.c#5 integrate .. //depot/projects/ia64/sys/pci/agp_amd.c#9 integrate .. //depot/projects/ia64/sys/pci/agp_i810.c#14 integrate .. //depot/projects/ia64/sys/pci/agp_intel.c#11 integrate .. //depot/projects/ia64/sys/pci/agp_sis.c#6 integrate .. //depot/projects/ia64/sys/pci/agp_via.c#5 integrate .. //depot/projects/ia64/sys/pci/alpm.c#6 integrate .. //depot/projects/ia64/sys/pci/amdpm.c#7 integrate .. //depot/projects/ia64/sys/pci/cy_pci.c#6 integrate .. //depot/projects/ia64/sys/pci/if_de.c#12 integrate .. //depot/projects/ia64/sys/pci/if_en_pci.c#7 integrate .. //depot/projects/ia64/sys/pci/if_mn.c#7 integrate .. //depot/projects/ia64/sys/pci/if_rl.c#32 integrate .. //depot/projects/ia64/sys/pci/if_sis.c#22 integrate .. //depot/projects/ia64/sys/pci/if_xl.c#32 integrate .. //depot/projects/ia64/sys/pci/intpm.c#7 integrate .. //depot/projects/ia64/sys/pci/meteor.c#8 integrate .. //depot/projects/ia64/sys/pci/ncr.c#9 integrate .. //depot/projects/ia64/sys/pci/viapm.c#4 integrate .. //depot/projects/ia64/sys/pci/xrpu.c#9 integrate .. //depot/projects/ia64/sys/posix4/ksched.c#9 integrate .. //depot/projects/ia64/sys/posix4/p1003_1b.c#6 integrate .. //depot/projects/ia64/sys/posix4/posix4_mib.c#5 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/vm_machdep.c#20 integrate .. //depot/projects/ia64/sys/sparc64/conf/NOTES#2 integrate .. //depot/projects/ia64/sys/sparc64/include/iommuvar.h#11 integrate .. //depot/projects/ia64/sys/sparc64/pci/psycho.c#25 integrate .. //depot/projects/ia64/sys/sparc64/sbus/sbus.c#15 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/iommu.c#18 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/vm_machdep.c#25 integrate .. //depot/projects/ia64/sys/sys/ccdvar.h#8 delete .. //depot/projects/ia64/sys/sys/ktrace.h#5 integrate .. //depot/projects/ia64/sys/sys/param.h#35 integrate .. //depot/projects/ia64/sys/sys/proc.h#67 integrate .. //depot/projects/ia64/sys/sys/sysctl.h#15 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_alloc.c#22 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_balloc.c#9 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_inode.c#14 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_rawread.c#5 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_snapshot.c#29 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_softdep_stub.c#7 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_subr.c#8 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_tables.c#4 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vfsops.c#35 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vnops.c#28 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_acl.c#7 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_bmap.c#9 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_dirhash.c#11 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_extattr.c#18 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_ihash.c#7 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_inode.c#11 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_lookup.c#11 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_quota.c#14 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_vfsops.c#9 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_vnops.c#28 integrate .. //depot/projects/ia64/sys/vm/default_pager.c#5 integrate .. //depot/projects/ia64/sys/vm/device_pager.c#12 integrate .. //depot/projects/ia64/sys/vm/phys_pager.c#9 integrate .. //depot/projects/ia64/sys/vm/swap_pager.c#27 integrate .. //depot/projects/ia64/sys/vm/uma_core.c#41 integrate .. //depot/projects/ia64/sys/vm/uma_dbg.c#9 integrate .. //depot/projects/ia64/sys/vm/vm_contig.c#13 integrate .. //depot/projects/ia64/sys/vm/vm_fault.c#32 integrate .. //depot/projects/ia64/sys/vm/vm_glue.c#29 integrate .. //depot/projects/ia64/sys/vm/vm_init.c#8 integrate .. //depot/projects/ia64/sys/vm/vm_kern.c#23 integrate .. //depot/projects/ia64/sys/vm/vm_map.c#55 integrate .. //depot/projects/ia64/sys/vm/vm_meter.c#12 integrate .. //depot/projects/ia64/sys/vm/vm_mmap.c#19 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#60 integrate .. //depot/projects/ia64/sys/vm/vm_page.c#46 integrate .. //depot/projects/ia64/sys/vm/vm_pageout.c#39 integrate .. //depot/projects/ia64/sys/vm/vm_pageq.c#9 integrate .. //depot/projects/ia64/sys/vm/vm_pager.c#12 integrate .. //depot/projects/ia64/sys/vm/vm_pager.h#6 integrate .. //depot/projects/ia64/sys/vm/vm_swap.c#20 integrate .. //depot/projects/ia64/sys/vm/vm_unix.c#6 integrate .. //depot/projects/ia64/sys/vm/vm_zeroidle.c#8 integrate .. //depot/projects/ia64/sys/vm/vnode_pager.c#32 integrate .. //depot/projects/ia64/tools/debugscripts/dot.gdbinit#3 integrate .. //depot/projects/ia64/usr.bin/apply/apply.c#6 integrate .. //depot/projects/ia64/usr.bin/calendar/Makefile#11 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.freebsd#30 integrate .. //depot/projects/ia64/usr.bin/catman/catman.c#7 integrate .. //depot/projects/ia64/usr.bin/fetch/fetch.1#8 integrate .. //depot/projects/ia64/usr.bin/lock/lock.1#5 integrate .. //depot/projects/ia64/usr.bin/look/look.1#3 integrate .. //depot/projects/ia64/usr.bin/mesg/mesg.1#5 integrate .. //depot/projects/ia64/usr.bin/tail/read.c#3 integrate .. //depot/projects/ia64/usr.bin/time/time.1#6 integrate .. //depot/projects/ia64/usr.bin/uname/uname.1#5 integrate .. //depot/projects/ia64/usr.bin/uname/uname.c#7 integrate .. //depot/projects/ia64/usr.bin/vi/Makefile#8 integrate .. //depot/projects/ia64/usr.bin/whois/Makefile#3 integrate .. //depot/projects/ia64/usr.bin/xstr/xstr.1#3 integrate .. //depot/projects/ia64/usr.sbin/apmd/apmdparse.y#2 integrate .. //depot/projects/ia64/usr.sbin/asf/asf.8#2 integrate .. //depot/projects/ia64/usr.sbin/config/Makefile#2 integrate .. //depot/projects/ia64/usr.sbin/config/main.c#5 integrate .. //depot/projects/ia64/usr.sbin/fwcontrol/fwcontrol.c#9 integrate .. //depot/projects/ia64/usr.sbin/kgzip/Makefile#2 integrate .. //depot/projects/ia64/usr.sbin/kgzip/kgzip.c#3 integrate .. //depot/projects/ia64/usr.sbin/lpr/Makefile#2 integrate .. //depot/projects/ia64/usr.sbin/lpr/Makefile.inc#2 integrate .. //depot/projects/ia64/usr.sbin/lpr/common_source/ctlinfo.c#5 integrate .. //depot/projects/ia64/usr.sbin/lpr/filters.ru/koi2855/koi2855.c#2 integrate .. //depot/projects/ia64/usr.sbin/lpr/filters.ru/koi2alt/koi2alt.c#2 integrate .. //depot/projects/ia64/usr.sbin/ofwdump/ofw_util.c#3 integrate .. //depot/projects/ia64/usr.sbin/ofwdump/ofw_util.h#2 integrate .. //depot/projects/ia64/usr.sbin/pccard/pccardc/pccardc.c#3 integrate .. //depot/projects/ia64/usr.sbin/pccard/pccardc/pccardmem.c#2 integrate .. //depot/projects/ia64/usr.sbin/pccard/pccardd/server.c#2 integrate .. //depot/projects/ia64/usr.sbin/ppp/ipv6cp.c#6 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/dist.c#22 integrate .. //depot/projects/ia64/usr.sbin/timed/timedc/cmds.c#4 integrate .. //depot/projects/ia64/usr.sbin/timed/timedc/timedc.c#2 integrate .. //depot/projects/ia64/usr.sbin/usbd/usbd.c#6 integrate Differences ... ==== //depot/projects/ia64/MAINTAINERS#29 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.66 2003/06/06 11:30:49 guido Exp $ +$FreeBSD: src/MAINTAINERS,v 1.69 2003/06/12 03:37:55 gad Exp $ subsystem login notes ----------------------------- @@ -22,7 +22,11 @@ wi imp Pre-commit review requested. telnet markm commits _must_ be made to src/crypto/telnet first, only then to "base" telnet via "make - unifdef" + unifdef". The "base" commit _must_ be made. +secure/* markm please ensure that a security-aware person + sanity-checks your work. +kerberos5/* markm please ensure that a security-aware person + sanity-checks your work. cdboot jhb Pre-commit review requested. pxeboot jhb Pre-commit review requested. witness jhb Pre-commit review requested. @@ -60,6 +64,7 @@ linprocfs des Advance notification requested. lpr gad Pre-commit review requested, particularly for lpd/recvjob.c and lpd/printjob.c. +newsyslog(8) gad Heads-up appreciated. I'm going thru the PR's for it. patch gad I have a WIP which will change the src a lot. vinum grog Recommends pre-commit review. cvs peter Heads-up appreciated, try not to break it. @@ -158,7 +163,6 @@ usr.bin/chat/Makefile:MAINTAINER= peter@freebsd.org usr.bin/locate/Makefile:MAINTAINER= wosch@FreeBSD.org usr.bin/vacation/Makefile:MAINTAINER= gshapiro@FreeBSD.org -usr.bin/whois/Makefile:MAINTAINER= mike@FreeBSD.org usr.sbin/editmap/Makefile:MAINTAINER= gshapiro@FreeBSD.org usr.sbin/inetd/Makefile:MAINTAINER= dwmalone@FreeBSD.org usr.sbin/iostat/Makefile:MAINTAINER= ken@FreeBSD.ORG @@ -166,8 +170,6 @@ usr.sbin/ipresend/Makefile:MAINTAINER= darrenr@freebsd.org usr.sbin/ipsend/Makefile:MAINTAINER= darrenr@freebsd.org usr.sbin/iptest/Makefile:MAINTAINER= darrenr@freebsd.org -usr.sbin/lpr/Makefile:MAINTAINER= wollman@FreeBSD.org -usr.sbin/lpr/Makefile:MAINTAINER+= gad@FreeBSD.org usr.sbin/mailstats/Makefile:MAINTAINER= gshapiro@FreeBSD.org usr.sbin/makemap/Makefile:MAINTAINER= gshapiro@FreeBSD.org usr.sbin/ntp/doc/Makefile:MAINTAINER= sheldonh@FreeBSD.org ==== //depot/projects/ia64/UPDATING#42 (text+ko) ==== @@ -17,6 +17,19 @@ developers choose to disable these features on build machines to maximize performance. +20030610: + Remove deprecated locale names and transition period code + for them, finishing switching to the new scheme. Check your + LANG environment variable. + +20030609: + CCD has been changed to be a fully GEOMified class. Kernel + and ccdconfig(8) needs to be in sync, this is particularly + important to remember beforehand if your source tree is on + a ccd device. Consider making a copy of the old ccdconfig + into /boot/kernel.good or wherever you keep your backup + kernel. + 20030505: Kerberos 5 (Heimdal) is now built by default. Setting MAKE_KERBEROS5 no longer has any effect. If you do NOT @@ -1278,4 +1291,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.251 2003/05/05 20:05:37 markm Exp $ +$FreeBSD: src/UPDATING,v 1.254 2003/06/11 06:37:55 phk Exp $ ==== //depot/projects/ia64/bin/ps/ps.1#16 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.62 2003/06/08 09:48:39 charnier Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.63 2003/06/12 16:53:55 scottl Exp $ .\" .Dd April 18, 1994 .Dt PS 1 @@ -40,7 +40,7 @@ .Nd process status .Sh SYNOPSIS .Nm -.Op Fl aCcefhjlmrSTuvwxZ +.Op Fl aCcefHhjlmrSTuvwxZ .Op Fl M Ar core .Op Fl N Ar system .Op Fl O Ar fmt @@ -98,6 +98,12 @@ .It Fl f Show commandline and environment information about swapped out processes. This option is honored only if the uid of the user is 0. +.It Fl H +Show all of the +.Em kernel visible +threads associated with each process. Depending on the threading package that +is in use, this may show only the process, only the kernel scheduled entities, +or all of the process threads. .It Fl h Repeat the information header as often as necessary to guarantee one header per page of information. ==== //depot/projects/ia64/bin/ps/ps.c#12 (text+ko) ==== @@ -44,7 +44,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.62 2003/02/05 13:18:17 charnier Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.63 2003/06/12 16:53:55 scottl Exp $"); #include #include @@ -113,9 +113,9 @@ static kvm_t *kd; #if defined(LAZY_PS) -#define PS_ARGS "aCcefghjLlM:mN:O:o:p:rSTt:U:uvwxZ" +#define PS_ARGS "aCcefgHhjLlM:mN:O:o:p:rSTt:U:uvwxZ" #else -#define PS_ARGS "aCceghjLlM:mN:O:o:p:rSTt:U:uvwxZ" +#define PS_ARGS "aCcegHhjLlM:mN:O:o:p:rSTt:U:uvwxZ" #endif int @@ -128,7 +128,7 @@ pid_t pid; uid_t *uids; int all, ch, flag, i, _fmt, lineno, nentries, nocludge, dropgid; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 13 01:22:46 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 96B1937B404; Fri, 13 Jun 2003 01:22:45 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2A58037B401 for ; Fri, 13 Jun 2003 01:22:45 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B866443F93 for ; Fri, 13 Jun 2003 01:22:44 -0700 (PDT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5D8Mi0U051668 for ; Fri, 13 Jun 2003 01:22:44 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5D8MiSc051659 for perforce@freebsd.org; Fri, 13 Jun 2003 01:22:44 -0700 (PDT) Date: Fri, 13 Jun 2003 01:22:44 -0700 (PDT) Message-Id: <200306130822.h5D8MiSc051659@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 33081 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jun 2003 08:22:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=33081 Change 33081 by des@des.at.des.thinksec.com on 2003/06/13 01:22:25 Streamline the distribution process. Affected files ... .. //depot/projects/openpam/MANIFEST#18 edit .. //depot/projects/openpam/dist.sh#9 edit Differences ... ==== //depot/projects/openpam/MANIFEST#18 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/openpam/MANIFEST#17 $ +# $P4: //depot/projects/openpam/MANIFEST#18 $ # CREDITS HISTORY @@ -12,19 +12,29 @@ RELNOTES aclocal.m4 autogen.sh -bin/Makefile.am -bin/Makefile.in -bin/su/Makefile.am -bin/su/Makefile.in -bin/su/su.c config.guess config.h.in config.sub configure configure.in depcomp +install-sh +ltconfig +ltmain.sh +missing +mkinstalldirs +stamp-h.in +bin/ +bin/Makefile.am +bin/Makefile.in +bin/su/ +bin/su/Makefile.am +bin/su/Makefile.in +bin/su/su.c +doc/ doc/Makefile.am doc/Makefile.in +doc/man/ doc/man/Makefile.am doc/man/Makefile.in doc/man/openpam.3 @@ -72,8 +82,10 @@ doc/man/pam_verror.3 doc/man/pam_vinfo.3 doc/man/pam_vprompt.3 +include/ include/Makefile.am include/Makefile.in +include/security/ include/security/Makefile.am include/security/Makefile.in include/security/openpam.h @@ -82,7 +94,7 @@ include/security/pam_constants.h include/security/pam_modules.h include/security/pam_types.h -install-sh +lib/ lib/Makefile.am lib/Makefile.in lib/openpam_borrow_cred.c @@ -142,20 +154,20 @@ lib/pam_verror.c lib/pam_vinfo.c lib/pam_vprompt.c -ltconfig -ltmain.sh +misc/ misc/gendoc.pl -missing -mkinstalldirs +modules/ modules/Makefile.am modules/Makefile.in +modules/pam_deny/ modules/pam_deny/Makefile.am modules/pam_deny/Makefile.in modules/pam_deny/pam_deny.c +modules/pam_permit/ modules/pam_permit/Makefile.am modules/pam_permit/Makefile.in modules/pam_permit/pam_permit.c +modules/pam_unix/ modules/pam_unix/Makefile.am modules/pam_unix/Makefile.in modules/pam_unix/pam_unix.c -stamp-h.in ==== //depot/projects/openpam/dist.sh#9 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $P4: //depot/projects/openpam/dist.sh#8 $ +# $P4: //depot/projects/openpam/dist.sh#9 $ # set -e @@ -9,27 +9,27 @@ distname="openpam-${release}" tarball="${distname}.tar.gz" -gmake clean || true -gmake distclean || true -sh -e autogen.sh -sh configure --with-pam-su --with-pam-unix -gmake install -d -m 0755 "${distname}" -grep -v '^#' MANIFEST | while read file; do - install -d -m 0755 "${distname}/$(dirname ${file})" || exit 1 +grep '^[a-z].*/$' MANIFEST | while read dir; do + echo "Creating ${dir}" + install -d -m 0755 "${distname}/${dir}" || exit 1 +done +grep '^[a-z].*[^/]$' MANIFEST | while read file; do + echo "Adding ${file}" install -c -m 0644 "${file}" "${distname}/${file}" || exit 1 done -for f in autogen.sh configure depcomp install-sh ltconfig ltmain.sh ; do - chmod a+x "${distname}/${f}" +for file in autogen.sh configure depcomp install-sh ltconfig ltmain.sh ; do + echo "Adjusting permissions for ${file}" + chmod a+x "${distname}/${file}" done -for f in configure configure.in include/security/openpam_version.h ; do - perl -p -i -e "s/YYYYMMDD/${release}/g" "${distname}/${f}" +(cd "${distname}" && grep -rl YYYYMMDD *) | while read file ; do + echo "Datestamping ${file}" + perl -p -i -e "s/YYYYMMDD/${release}/g" "${distname}/${file}" done -find "${distname}" | xargs touch -t "${release}0000" +find "${distname}" | sort -r | xargs touch -t "${release}0000" tar zcf "${tarball}" "${distname}" +dd if=/dev/zero of="${tarball}" conv=notrunc bs=4 oseek=1 count=1 rm -rf "${distname}" -gmake clean || true -gmake distclean || true echo md5 "${tarball}" From owner-p4-projects@FreeBSD.ORG Fri Jun 13 01:23:48 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC31C37B404; Fri, 13 Jun 2003 01:23:47 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6114A37B401 for ; Fri, 13 Jun 2003 01:23:47 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EB58043FDD for ; Fri, 13 Jun 2003 01:23:46 -0700 (PDT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5D8Nk0U052382 for ; Fri, 13 Jun 2003 01:23:46 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5D8NkEO052373 for perforce@freebsd.org; Fri, 13 Jun 2003 01:23:46 -0700 (PDT) Date: Fri, 13 Jun 2003 01:23:46 -0700 (PDT) Message-Id: <200306130823.h5D8NkEO052373@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 33082 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jun 2003 08:23:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=33082 Change 33082 by des@des.at.des.thinksec.com on 2003/06/13 01:23:28 A script for removing files P4 doesn't know about. Affected files ... .. //depot/projects/openpam/clean.sh#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Jun 14 23:49:49 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F1B137B404; Sat, 14 Jun 2003 23:49:48 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CDA5237B401 for ; Sat, 14 Jun 2003 23:49:47 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7E09743F85 for ; Sat, 14 Jun 2003 23:49:46 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5F6nk0U078486 for ; Sat, 14 Jun 2003 23:49:46 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5F6niFf078483 for perforce@freebsd.org; Sat, 14 Jun 2003 23:49:44 -0700 (PDT) Date: Sat, 14 Jun 2003 23:49:44 -0700 (PDT) Message-Id: <200306150649.h5F6niFf078483@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 Subject: PERFORCE change 33187 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Jun 2003 06:49:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=33187 Change 33187 by marcel@marcel_nfs on 2003/06/14 23:48:46 IFC @33184 Affected files ... .. //depot/projects/ia64/MAINTAINERS#30 integrate .. //depot/projects/ia64/Makefile.inc1#66 integrate .. //depot/projects/ia64/UPDATING#43 integrate .. //depot/projects/ia64/bin/Makefile.inc#5 integrate .. //depot/projects/ia64/bin/csh/Makefile#8 integrate .. //depot/projects/ia64/bin/date/Makefile#4 integrate .. //depot/projects/ia64/bin/dd/Makefile#5 integrate .. //depot/projects/ia64/bin/df/Makefile#4 integrate .. //depot/projects/ia64/bin/ed/Makefile#6 integrate .. //depot/projects/ia64/bin/expr/Makefile#4 integrate .. //depot/projects/ia64/bin/kenv/Makefile#3 integrate .. //depot/projects/ia64/bin/ls/Makefile#7 integrate .. //depot/projects/ia64/bin/pax/Makefile#5 integrate .. //depot/projects/ia64/bin/ps/Makefile#9 integrate .. //depot/projects/ia64/etc/defaults/rc.conf#34 integrate .. //depot/projects/ia64/etc/pam.d/Makefile#8 integrate .. //depot/projects/ia64/etc/pam.d/login#10 integrate .. //depot/projects/ia64/etc/pam.d/su#10 integrate .. //depot/projects/ia64/etc/pam.d/system#1 branch .. //depot/projects/ia64/gnu/lib/libgcc/Makefile#16 integrate .. //depot/projects/ia64/gnu/lib/libobjc/Makefile#7 integrate .. //depot/projects/ia64/gnu/lib/libstdc++/Makefile#18 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/Makefile#8 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/freebsd-native.h#8 integrate .. //depot/projects/ia64/include/bitstring.h#2 integrate .. //depot/projects/ia64/lib/libalias/alias.c#6 integrate .. //depot/projects/ia64/lib/libalias/libalias.3#5 integrate .. //depot/projects/ia64/lib/libbz2/Makefile#4 integrate .. //depot/projects/ia64/lib/libc/amd64/gen/alloca.S#3 delete .. //depot/projects/ia64/lib/libc/i386/gen/alloca.S#3 integrate .. //depot/projects/ia64/lib/libc/locale/frune.c#4 integrate .. //depot/projects/ia64/lib/libc/locale/mbrune.c#4 integrate .. //depot/projects/ia64/lib/libc/locale/setinvalidrune.c#4 integrate .. //depot/projects/ia64/lib/libc/locale/utf2.c#3 integrate .. //depot/projects/ia64/lib/libc/sys/close.2#5 integrate .. //depot/projects/ia64/lib/libcam/Makefile#2 integrate .. //depot/projects/ia64/lib/libdevstat/Makefile#4 integrate .. //depot/projects/ia64/lib/libkvm/kvm_proc.c#18 integrate .. //depot/projects/ia64/lib/libutil/auth.c#2 integrate .. //depot/projects/ia64/lib/libutil/login_auth.c#3 integrate .. //depot/projects/ia64/lib/libutil/login_cap.c#5 integrate .. //depot/projects/ia64/lib/libutil/login_class.c#6 integrate .. //depot/projects/ia64/lib/libutil/login_ok.c#2 integrate .. //depot/projects/ia64/lib/libutil/login_times.c#2 integrate .. //depot/projects/ia64/lib/libutil/login_tty.c#2 integrate .. //depot/projects/ia64/lib/libutil/logout.c#5 integrate .. //depot/projects/ia64/lib/libutil/property.c#5 integrate .. //depot/projects/ia64/lib/libutil/pty.c#3 integrate .. //depot/projects/ia64/lib/libutil/pw_util.c#8 integrate .. //depot/projects/ia64/lib/libutil/realhostname.c#3 integrate .. //depot/projects/ia64/lib/libutil/uucplock.c#2 integrate .. //depot/projects/ia64/lib/libxpg4/fakelib.c#2 integrate .. //depot/projects/ia64/libexec/bootpd/bootpd.c#5 integrate .. //depot/projects/ia64/libexec/getty/main.c#6 integrate .. //depot/projects/ia64/libexec/lukemftpd/Makefile#11 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#14 integrate .. //depot/projects/ia64/sbin/camcontrol/Makefile#6 integrate .. //depot/projects/ia64/sbin/natd/natd.8#8 integrate .. //depot/projects/ia64/sbin/natd/natd.c#6 integrate .. //depot/projects/ia64/share/man/man4/Makefile#48 integrate .. //depot/projects/ia64/share/man/man4/en.4#2 integrate .. //depot/projects/ia64/share/man/man4/natm.4#2 integrate .. //depot/projects/ia64/share/man/man4/natmip.4#1 branch .. //depot/projects/ia64/share/man/man5/rc.conf.5#41 integrate .. //depot/projects/ia64/share/man/man7/security.7#6 integrate .. //depot/projects/ia64/share/man/man9/bus_dma.9#2 integrate .. //depot/projects/ia64/share/mk/bsd.libnames.mk#17 integrate .. //depot/projects/ia64/share/mk/bsd.sys.mk#21 integrate .. //depot/projects/ia64/sys/alpha/alpha/interrupt.c#13 integrate .. //depot/projects/ia64/sys/alpha/alpha/pmap.c#30 integrate .. //depot/projects/ia64/sys/alpha/alpha/trap.c#28 integrate .. //depot/projects/ia64/sys/alpha/alpha/vm_machdep.c#21 integrate .. //depot/projects/ia64/sys/alpha/include/param.h#5 integrate .. //depot/projects/ia64/sys/alpha/linux/linux_sysvec.c#11 integrate .. //depot/projects/ia64/sys/amd64/amd64/pmap.c#4 integrate .. //depot/projects/ia64/sys/amd64/amd64/trap.c#7 integrate .. //depot/projects/ia64/sys/amd64/include/param.h#5 integrate .. //depot/projects/ia64/sys/cam/cam.c#5 integrate .. //depot/projects/ia64/sys/cam/cam_ccb.h#4 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_low.c#12 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_sysvec.c#14 integrate .. //depot/projects/ia64/sys/conf/NOTES#52 integrate .. //depot/projects/ia64/sys/conf/files#80 integrate .. //depot/projects/ia64/sys/conf/kern.post.mk#33 integrate .. //depot/projects/ia64/sys/conf/kern.pre.mk#17 integrate .. //depot/projects/ia64/sys/conf/options.pc98#17 integrate .. //depot/projects/ia64/sys/ddb/db_ps.c#19 integrate .. //depot/projects/ia64/sys/dev/advansys/advansys.c#6 integrate .. //depot/projects/ia64/sys/dev/advansys/adwcam.c#6 integrate .. //depot/projects/ia64/sys/dev/ahb/ahb.c#7 integrate .. //depot/projects/ia64/sys/dev/aic/aic.c#6 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_osm.c#12 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_osm.c#12 integrate .. //depot/projects/ia64/sys/dev/amd/amd.c#5 integrate .. //depot/projects/ia64/sys/dev/amr/amr_cam.c#7 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-cam.c#12 integrate .. //depot/projects/ia64/sys/dev/dpt/dpt_scsi.c#9 integrate .. //depot/projects/ia64/sys/dev/en/if_en_pci.c#1 branch .. //depot/projects/ia64/sys/dev/en/midway.c#16 integrate .. //depot/projects/ia64/sys/dev/en/midwayvar.h#6 integrate .. //depot/projects/ia64/sys/dev/firewire/firewire.c#30 integrate .. //depot/projects/ia64/sys/dev/firewire/firewirereg.h#18 integrate .. //depot/projects/ia64/sys/dev/firewire/fwcrom.c#5 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohci.c#25 integrate .. //depot/projects/ia64/sys/dev/firewire/iec13213.h#7 integrate .. //depot/projects/ia64/sys/dev/firewire/sbp.c#34 integrate .. //depot/projects/ia64/sys/dev/isp/isp_freebsd.c#14 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt_freebsd.c#11 integrate .. //depot/projects/ia64/sys/dev/pccard/pccard.c#20 integrate .. //depot/projects/ia64/sys/dev/sym/sym_hipd.c#11 integrate .. //depot/projects/ia64/sys/dev/trm/trm.c#9 integrate .. //depot/projects/ia64/sys/dev/usb/umass.c#28 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs#37 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs.h#36 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs_data.h#36 integrate .. //depot/projects/ia64/sys/dev/usb/uscanner.c#9 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumio.c#17 integrate .. //depot/projects/ia64/sys/fs/fifofs/fifo_vnops.c#23 integrate .. //depot/projects/ia64/sys/fs/procfs/procfs_status.c#12 integrate .. //depot/projects/ia64/sys/fs/smbfs/smbfs_subr.c#4 integrate .. //depot/projects/ia64/sys/fs/unionfs/union.h#6 integrate .. //depot/projects/ia64/sys/fs/unionfs/union_subr.c#12 integrate .. //depot/projects/ia64/sys/fs/unionfs/union_vnops.c#9 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#44 integrate .. //depot/projects/ia64/sys/i386/i386/sys_machdep.c#16 integrate .. //depot/projects/ia64/sys/i386/i386/trap.c#33 integrate .. //depot/projects/ia64/sys/i386/include/param.h#7 integrate .. //depot/projects/ia64/sys/i386/linux/linux_sysvec.c#26 integrate .. //depot/projects/ia64/sys/ia64/conf/SKI#14 integrate .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#66 integrate .. //depot/projects/ia64/sys/ia64/ia64/trap.c#58 integrate .. //depot/projects/ia64/sys/ia64/include/param.h#8 integrate .. //depot/projects/ia64/sys/kern/kern_clock.c#23 integrate .. //depot/projects/ia64/sys/kern/kern_exec.c#51 integrate .. //depot/projects/ia64/sys/kern/kern_exit.c#46 integrate .. //depot/projects/ia64/sys/kern/kern_fork.c#41 integrate .. //depot/projects/ia64/sys/kern/kern_mtxpool.c#7 integrate .. //depot/projects/ia64/sys/kern/kern_proc.c#41 integrate .. //depot/projects/ia64/sys/kern/kern_sig.c#53 integrate .. //depot/projects/ia64/sys/kern/kern_switch.c#26 integrate .. //depot/projects/ia64/sys/kern/kern_synch.c#39 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#51 integrate .. //depot/projects/ia64/sys/kern/sched_4bsd.c#13 integrate .. //depot/projects/ia64/sys/kern/sched_ule.c#17 integrate .. //depot/projects/ia64/sys/kern/subr_trap.c#31 integrate .. //depot/projects/ia64/sys/kern/tty.c#28 integrate .. //depot/projects/ia64/sys/kern/vfs_cache.c#15 integrate .. //depot/projects/ia64/sys/modules/Makefile#52 integrate .. //depot/projects/ia64/sys/modules/geom/Makefile.inc#1 branch .. //depot/projects/ia64/sys/modules/i2c/controllers/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/i2c/controllers/lpbb/Makefile#2 integrate .. //depot/projects/ia64/sys/netgraph/bluetooth/socket/ng_btsocket.c#3 integrate .. //depot/projects/ia64/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#8 integrate .. //depot/projects/ia64/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#7 integrate .. //depot/projects/ia64/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#6 integrate .. //depot/projects/ia64/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#2 integrate .. //depot/projects/ia64/sys/netsmb/smb_iod.c#11 integrate .. //depot/projects/ia64/sys/pc98/conf/NOTES#8 integrate .. //depot/projects/ia64/sys/pci/agp_i810.c#15 integrate .. //depot/projects/ia64/sys/pci/if_devar.h#5 integrate .. //depot/projects/ia64/sys/pci/if_en_pci.c#8 integrate .. //depot/projects/ia64/sys/pci/if_ti.c#24 integrate .. //depot/projects/ia64/sys/pci/ncr.c#10 integrate .. //depot/projects/ia64/sys/powerpc/include/param.h#7 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/pmap.c#24 integrate .. //depot/projects/ia64/sys/sparc64/include/param.h#8 integrate .. //depot/projects/ia64/sys/sparc64/pci/apb.c#4 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/pmap.c#37 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/trap.c#27 integrate .. //depot/projects/ia64/sys/sys/bitstring.h#1 branch .. //depot/projects/ia64/sys/sys/cdefs.h#14 integrate .. //depot/projects/ia64/sys/sys/proc.h#68 integrate .. //depot/projects/ia64/sys/vm/pmap.h#17 integrate .. //depot/projects/ia64/sys/vm/swap_pager.c#28 integrate .. //depot/projects/ia64/sys/vm/vm_extern.h#13 integrate .. //depot/projects/ia64/sys/vm/vm_glue.c#30 integrate .. //depot/projects/ia64/tools/tools/tinderbox/tbmaster.pl#13 integrate .. //depot/projects/ia64/usr.bin/brandelf/Makefile#3 integrate .. //depot/projects/ia64/usr.bin/bzip2/Makefile#2 integrate .. //depot/projects/ia64/usr.bin/bzip2recover/Makefile#2 integrate .. //depot/projects/ia64/usr.bin/compress/compress.c#8 integrate .. //depot/projects/ia64/usr.bin/find/extern.h#6 integrate .. //depot/projects/ia64/usr.bin/find/find.c#7 integrate .. //depot/projects/ia64/usr.bin/find/function.c#12 integrate .. //depot/projects/ia64/usr.bin/find/getdate.y#3 integrate .. //depot/projects/ia64/usr.bin/find/ls.c#7 integrate .. //depot/projects/ia64/usr.bin/find/main.c#5 integrate .. //depot/projects/ia64/usr.bin/find/misc.c#4 integrate .. //depot/projects/ia64/usr.bin/find/operator.c#7 integrate .. //depot/projects/ia64/usr.bin/find/option.c#7 integrate .. //depot/projects/ia64/usr.bin/find/parsedate.y#3 delete .. //depot/projects/ia64/usr.bin/xargs/xargs.c#25 integrate .. //depot/projects/ia64/usr.sbin/iostat/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/rarpd/rarpd.c#6 integrate .. //depot/projects/ia64/usr.sbin/ypserv/Makefile.yp#4 integrate Differences ... ==== //depot/projects/ia64/MAINTAINERS#30 (text+ko) ==== @@ -1,15 +1,8 @@ -$FreeBSD: src/MAINTAINERS,v 1.69 2003/06/12 03:37:55 gad Exp $ +$FreeBSD: src/MAINTAINERS,v 1.71 2003/06/14 19:27:10 obrien Exp $ subsystem login notes ----------------------------- mergemaster dougb Prefers to pre-approve commits -binutils obrien Insists to keep BU blocked from other's unapproved - commits -file obrien Insists to keep file blocked from other's unapproved - commits -one-true-awk obrien Insists to keep one-true-awk blocked from other's - unapproved commits -lukemftpd obrien Pre-commit review requested. libc/posix1e rwatson Pre-commit review requested. POSIX.1e ACLs rwatson Pre-commit review requested. UFS EAs rwatson Pre-commit review requested. @@ -107,8 +100,6 @@ gnu/usr.bin/man/apropos/Makefile:MAINTAINER= wosch@FreeBSD.org lib/libbz2/Makefile:MAINTAINER= obrien@FreeBSD.org lib/libc/posix1e/Makefile.inc:MAINTAINER= rwatson@FreeBSD.org -lib/libcam/Makefile:MAINTAINER= ken@FreeBSD.ORG -lib/libdevstat/Makefile:MAINTAINER= ken@FreeBSD.ORG lib/libmilter/Makefile:MAINTAINER= gshapiro@FreeBSD.org lib/libsm/Makefile:MAINTAINER= gshapiro@FreeBSD.org lib/libsmdb/Makefile:MAINTAINER= gshapiro@FreeBSD.org @@ -118,7 +109,6 @@ libexec/lukemftpd/Makefile:MAINTAINER= obrien@FreeBSD.org libexec/mail.local/Makefile:MAINTAINER= gshapiro@FreeBSD.org libexec/smrsh/Makefile:MAINTAINER= gshapiro@FreeBSD.org -sbin/camcontrol/Makefile:MAINTAINER= ken@FreeBSD.org sbin/dhclient/Makefile.inc:MAINTAINER= murray@FreeBSD.org sbin/ffsinfo/Makefile:MAINTAINER= tomsoft@FreeBSD.ORG, chm@FreeBSD.ORG sbin/growfs/Makefile:MAINTAINER= tomsoft@FreeBSD.ORG, chm@FreeBSD.ORG @@ -165,7 +155,6 @@ usr.bin/vacation/Makefile:MAINTAINER= gshapiro@FreeBSD.org usr.sbin/editmap/Makefile:MAINTAINER= gshapiro@FreeBSD.org usr.sbin/inetd/Makefile:MAINTAINER= dwmalone@FreeBSD.org -usr.sbin/iostat/Makefile:MAINTAINER= ken@FreeBSD.ORG usr.sbin/ipftest/Makefile:MAINTAINER= darrenr@freebsd.org usr.sbin/ipresend/Makefile:MAINTAINER= darrenr@freebsd.org usr.sbin/ipsend/Makefile:MAINTAINER= darrenr@freebsd.org ==== //depot/projects/ia64/Makefile.inc1#66 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.365 2003/06/08 04:15:05 imp Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.367 2003/06/14 17:50:13 imp Exp $ # # Make command line options: # -DNO_KERBEROS Do not build Heimdal (Kerberos 5) @@ -202,9 +202,6 @@ PATH=${BPATH}:${PATH} \ WORLDTMP=${WORLDTMP} \ MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" -.if ${BOOTSTRAPPING} < 501100 -BMAKEENV+= CSTD= -.endif BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \ ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ BOOTSTRAPPING=${OSRELDATE} \ @@ -777,6 +774,8 @@ # gnu/lib/csu, gnu/lib/libgcc and lib/csu must be built before all # shared libraries for ELF. # +# lib/libc (libc_pic.a) must be built before lib/libpthread. +# _startup_libs= gnu/lib/csu gnu/lib/libgcc .if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}-elf) _startup_libs+= lib/csu/${MACHINE_ARCH}-elf @@ -784,7 +783,7 @@ _startup_libs+= lib/csu/${MACHINE_ARCH} .endif -_prebuild_libs+= lib/libc +_prebuild_libs= _generic_libs= gnu/lib .if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \ @@ -796,6 +795,9 @@ _generic_libs+= kerberos5/lib .endif +.if !defined(NOLIBPTHREAD) +_prebuild_libs+= lib/libc +.endif _prebuild_libs+= lib/libcom_err lib/libcrypt lib/libexpat \ lib/libkvm lib/libmd \ lib/libncurses lib/libopie lib/libpam lib/libradius \ ==== //depot/projects/ia64/UPDATING#43 (text+ko) ==== @@ -17,6 +17,24 @@ developers choose to disable these features on build machines to maximize performance. +20030613: [retrospective] + There was a small window in which sed(1) was broken. If you + happen to have sed(1) installed during that window, which is + evidenced by an inability to build world with the failure + given below, you need to manually build and install sed(1) + (and only sed(1)) before doing anything else. This is a one- + time snafu. Typical failure mode: + + In file included from /usr/src/contrib/binutils/bfd/targets.c:1092: + targmatch.h:7:1: null character(s) ignored + targmatch.h:12:1: null character(s) ignored + targmatch.h:16:1: null character(s) ignored + : + + The window of "sed(1)-uction" is from Wed Jun 4 15:31:55 2003 UTC + to Thu Jun 5 12:10:19 2003 UTC (from rev 1.30 to rev 1.31 of + usr.bin/sed/process.c). + 20030610: Remove deprecated locale names and transition period code for them, finishing switching to the new scheme. Check your @@ -1291,4 +1309,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.254 2003/06/11 06:37:55 phk Exp $ +$FreeBSD: src/UPDATING,v 1.255 2003/06/13 20:05:46 marcel Exp $ ==== //depot/projects/ia64/bin/Makefile.inc#5 (text+ko) ==== @@ -1,7 +1,6 @@ # @(#)Makefile.inc 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/Makefile.inc,v 1.15 2002/05/10 01:48:15 obrien Exp $ +# $FreeBSD: src/bin/Makefile.inc,v 1.16 2003/06/13 07:04:01 markm Exp $ BINDIR?= /bin NOSHARED?= YES -WARNS?= 2 -WFORMAT?= 1 +WARNS?= 6 ==== //depot/projects/ia64/bin/csh/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/bin/csh/Makefile,v 1.31 2003/06/06 13:46:55 kuriyama Exp $ +# $FreeBSD: src/bin/csh/Makefile,v 1.32 2003/06/13 07:04:01 markm Exp $ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # # C Shell with process control; VM/UNIX VAX Makefile @@ -12,7 +12,7 @@ PROG= csh DFLAGS= -D_PATH_TCSHELL='"/bin/${PROG}"' CFLAGS+= -I. -I${.CURDIR} -I${TCSHDIR} ${DFLAGS} -WARNS= 1 +WARNS= 2 SRCS= sh.c sh.dir.c sh.dol.c sh.err.c sh.exec.c sh.char.c \ sh.exp.c sh.file.c sh.func.c sh.glob.c sh.hist.c sh.init.c \ sh.lex.c sh.misc.c sh.parse.c sh.print.c sh.proc.c sh.sem.c \ ==== //depot/projects/ia64/bin/date/Makefile#4 (text+ko) ==== @@ -1,10 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/date/Makefile,v 1.10 2002/02/04 02:49:18 kris Exp $ +# $FreeBSD: src/bin/date/Makefile,v 1.11 2003/06/13 07:04:01 markm Exp $ PROG= date SRCS= date.c netdate.c vary.c -WARNS= 0 -WFORMAT=0 DPADD= ${LIBUTIL} LDADD= -lutil ==== //depot/projects/ia64/bin/dd/Makefile#5 (text+ko) ==== @@ -1,9 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/dd/Makefile,v 1.11 2003/02/27 18:04:53 markm Exp $ +# $FreeBSD: src/bin/dd/Makefile,v 1.12 2003/06/13 07:04:01 markm Exp $ PROG= dd SRCS= args.c conv.c conv_tab.c dd.c misc.c position.c -WARNS?= 4 MAINTAINER= green@FreeBSD.org ==== //depot/projects/ia64/bin/df/Makefile#4 (text+ko) ==== @@ -1,16 +1,15 @@ # @(#)Makefile 8.3 (Berkeley) 5/8/95 -# $FreeBSD: src/bin/df/Makefile,v 1.15 2002/05/12 19:24:09 phk Exp $ +# $FreeBSD: src/bin/df/Makefile,v 1.16 2003/06/13 07:04:01 markm Exp $ + +MOUNT= ${.CURDIR}/../../sbin/mount +.PATH: ${MOUNT} PROG= df SRCS= df.c vfslist.c -MOUNT= ${.CURDIR}/../../sbin/mount CFLAGS+= -I${MOUNT} -.PATH: ${MOUNT} DPADD= ${LIBM} LDADD= -lm -WARNS?= 5 - .include ==== //depot/projects/ia64/bin/ed/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/bin/ed/Makefile,v 1.24 2003/06/08 08:24:07 markm Exp $ +# $FreeBSD: src/bin/ed/Makefile,v 1.25 2003/06/13 07:04:01 markm Exp $ PROG= ed SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c @@ -8,6 +8,7 @@ .if exists(${.CURDIR}/../../crypto) && !defined(NO_OPENSSL) DISTRIBUTION=crypto CFLAGS+=-DDES +WARNS= 2 DPADD= ${LIBCRYPTO} LDADD= -lcrypto .endif ==== //depot/projects/ia64/bin/expr/Makefile#4 (text+ko) ==== @@ -1,9 +1,7 @@ -# $FreeBSD: src/bin/expr/Makefile,v 1.17 2002/03/23 00:44:00 wollman Exp $ +# $FreeBSD: src/bin/expr/Makefile,v 1.18 2003/06/13 07:04:02 markm Exp $ PROG= expr SRCS= expr.y YFLAGS= -NO_WERROR= "GCC can't handle C99 printf formats." - .include ==== //depot/projects/ia64/bin/kenv/Makefile#3 (text+ko) ==== @@ -1,6 +1,5 @@ -# $FreeBSD: src/bin/kenv/Makefile,v 1.3 2003/01/20 17:56:25 obrien Exp $ +# $FreeBSD: src/bin/kenv/Makefile,v 1.4 2003/06/13 07:04:02 markm Exp $ PROG= kenv -WARNS?= 4 .include ==== //depot/projects/ia64/bin/ls/Makefile#7 (text+ko) ==== @@ -1,10 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/2/93 -# $FreeBSD: src/bin/ls/Makefile,v 1.24 2002/10/24 00:07:30 rwatson Exp $ +# $FreeBSD: src/bin/ls/Makefile,v 1.25 2003/06/13 07:04:02 markm Exp $ PROG= ls SRCS= cmp.c ls.c print.c util.c -NO_WERROR=1 -WFORMAT=0 DPADD= ${LIBM} LDADD= -lm ==== //depot/projects/ia64/bin/pax/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/pax/Makefile,v 1.10 2002/10/06 03:20:27 tjr Exp $ +# $FreeBSD: src/bin/pax/Makefile,v 1.11 2003/06/13 07:04:02 markm Exp $ # To install on versions prior to BSD 4.4 the following may have to be # defined with CFLAGS += @@ -29,7 +29,6 @@ SRCS= ar_io.c ar_subs.c buf_subs.c cache.c cpio.c file_subs.c ftree.c \ gen_subs.c getoldopt.c options.c pat_rep.c pax.c sel_subs.c \ tables.c tar.c tty_subs.c -WFORMAT=0 #XXX NOTYET #MAN= pax.1 tar.1 cpio.1 #LINKS= ${BINDIR}/pax ${BINDIR}/tar ${BINDIR}/pax ${BINDIR}/cpio ==== //depot/projects/ia64/bin/ps/Makefile#9 (text+ko) ==== @@ -1,16 +1,15 @@ -# $FreeBSD: src/bin/ps/Makefile,v 1.23 2003/05/02 01:05:05 obrien Exp $ +# $FreeBSD: src/bin/ps/Makefile,v 1.24 2003/06/13 07:04:02 markm Exp $ # @(#)Makefile 8.1 (Berkeley) 6/2/93 PROG= ps SRCS= fmt.c keyword.c nlist.c print.c ps.c +WARNS= 5 # # To support "lazy" ps for non root/wheel users # add -DLAZY_PS to the cflags. This helps # keep ps from being an unnecessary load # on large systems. # -WARNS= 1 -WFORMAT=0 CFLAGS+=-DLAZY_PS DPADD= ${LIBM} ${LIBKVM} LDADD= -lm -lkvm ==== //depot/projects/ia64/etc/defaults/rc.conf#34 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.178 2003/06/07 10:31:17 mtm Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.179 2003/06/14 22:26:30 mtm Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -144,7 +144,7 @@ named_chrootdir="" # Chroot directory (or "" not to auto-chroot it) named_chroot_autoupdate="YES" # Automatically install/update chrooted # components of named. See /etc/rc.d/named. -named_symlink_enable="YES" # Symlink /var/run/named.pid and /var/run/ndc +named_symlink_enable="YES" # Symlink ${named_pidfile} and /var/run/ndc # to their chrooted counterparts. # ==== //depot/projects/ia64/etc/pam.d/Makefile#8 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/etc/pam.d/Makefile,v 1.9 2003/03/14 09:01:22 ru Exp $ +# $FreeBSD: src/etc/pam.d/Makefile,v 1.10 2003/06/14 12:35:05 des Exp $ NOOBJ= noobj FILES= README ftpd gdm imap kde login other passwd pop3 \ - rexecd rsh sshd su telnetd xdm + rexecd rsh sshd su system telnetd xdm FILESDIR= /etc/pam.d FILESMODE= 644 FILESMODE_README= 444 ==== //depot/projects/ia64/etc/pam.d/login#10 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/login,v 1.15 2003/04/30 21:57:54 markm Exp $ +# $FreeBSD: src/etc/pam.d/login,v 1.16 2003/06/14 12:35:05 des Exp $ # # PAM configuration for the "login" service # @@ -7,22 +7,14 @@ # auth auth required pam_nologin.so no_warn auth sufficient pam_self.so no_warn -auth sufficient pam_opie.so no_warn no_fake_prompts -auth requisite pam_opieaccess.so no_warn allow_local -#auth sufficient pam_krb5.so no_warn try_first_pass -#auth sufficient pam_ssh.so no_warn try_first_pass -auth required pam_unix.so no_warn try_first_pass nullok +auth include system # account -#account required pam_krb5.so -account required pam_login_access.so -account required pam_securetty.so -account required pam_unix.so +account requisite pam_securetty.so +account include system # session -#session optional pam_ssh.so -session required pam_lastlog.so no_fail +session include system # password -#password sufficient pam_krb5.so no_warn try_first_pass -password required pam_unix.so no_warn try_first_pass +password include system ==== //depot/projects/ia64/etc/pam.d/su#10 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/su,v 1.14 2003/04/30 21:57:54 markm Exp $ +# $FreeBSD: src/etc/pam.d/su,v 1.15 2003/06/14 12:35:05 des Exp $ # # PAM configuration for the "su" service # @@ -7,16 +7,11 @@ # auth auth sufficient pam_rootok.so no_warn auth sufficient pam_self.so no_warn -auth requisite pam_group.so no_warn root_only fail_safe -auth sufficient pam_opie.so no_warn no_fake_prompts -auth requisite pam_opieaccess.so no_warn allow_local -#auth sufficient pam_krb5.so no_warn try_first_pass auth_as_self -#auth required pam_ssh.so no_warn try_first_pass -auth required pam_unix.so no_warn try_first_pass nullok +auth requisite pam_group.so no_warn group=wheel root_only fail_safe +auth include system # account -#account required pam_krb5.so -account required pam_unix.so +account include system # session -#session optional pam_ssh.so +session include system ==== //depot/projects/ia64/gnu/lib/libgcc/Makefile#16 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.47 2002/09/28 00:25:27 peter Exp $ +# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.48 2003/06/13 22:07:39 peter Exp $ .include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt" @@ -12,6 +12,9 @@ #SHLIB_MAJOR= 1 +# We need to install libgcc_pic.a as well, for use by shared libs. +INSTALL_PIC_ARCHIVE= yes + # # XXX This is a hack, but it seems to work. # libgcc2.a is meant to be compiled by *this* version of gcc. ==== //depot/projects/ia64/gnu/lib/libobjc/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libobjc/Makefile,v 1.18 2003/06/02 02:30:52 obrien Exp $ +# $FreeBSD: src/gnu/lib/libobjc/Makefile,v 1.19 2003/06/14 13:30:32 des Exp $ OBJCDIR=${.CURDIR}/../../../contrib/libobjc GCCDIR= ${.CURDIR}/../../../contrib/gcc @@ -23,7 +23,6 @@ CFLAGS+= -fpic .endif -CSTD?= CFLAGS+= -fgnu-runtime -DHAVE_GTHR_DEFAULT -DIN_TARGET_LIBS CFLAGS+= -I. -I${.CURDIR}/../../usr.bin/cc/cc_tools CFLAGS+= -I${OBJCDIR}/objc -I${OBJCDIR} ==== //depot/projects/ia64/gnu/lib/libstdc++/Makefile#18 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.44 2003/06/02 06:12:14 obrien Exp $ +# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.45 2003/06/14 13:30:32 des Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc SRCDIR= ${.CURDIR}/../../../contrib/libstdc++ @@ -18,7 +18,6 @@ LIB= stdc++ SHLIB_MAJOR= 4 -CSTD?= CFLAGS+= -DIN_GLIBCPP_V3 -DHAVE_CONFIG_H CFLAGS+= -I${.CURDIR} -I${SUPDIR} -I${GCCDIR} CXXFLAGS+= -fno-implicit-templates -ffunction-sections -fdata-sections -Wno-deprecated ==== //depot/projects/ia64/gnu/usr.bin/binutils/Makefile#8 (text+ko) ==== @@ -1,8 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/Makefile,v 1.24 2002/10/20 21:42:55 obrien Exp $ - -# In my absence, bde and jdp have pre-approval for any commit they feel -# necessary. -MAINTAINER= obrien@FreeBSD.org +# $FreeBSD: src/gnu/usr.bin/binutils/Makefile,v 1.25 2003/06/14 19:32:51 obrien Exp $ SUBDIR= libiberty libbfd libopcodes libbinutils \ addr2line ar as gasp ld nm objcopy objdump ranlib readelf \ ==== //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/freebsd-native.h#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/freebsd-native.h,v 1.21 2002/06/09 00:03:56 obrien Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/freebsd-native.h,v 1.22 2003/06/13 22:25:41 peter Exp $ */ /* FREEBSD_NATIVE is defined when gcc is integrated into the FreeBSD source tree so it can be configured appropriately without using @@ -48,7 +48,8 @@ /* For the native system compiler, we actually build libgcc in a profiled version. So we should use it with -pg. */ -#define LIBGCC_SPEC "%{!pg: -lgcc} %{pg: -lgcc_p}" +#define LIBGCC_SPEC "%{shared: -lgcc_pic} \ + %{!shared: %{!pg: -lgcc} %{pg: -lgcc_p}}" #define LIBSTDCXX_PROFILE "-lstdc++_p" #define MATH_LIBRARY_PROFILE "-lm_p" #define FORTRAN_LIBRARY_PROFILE "-lg2c_p" ==== //depot/projects/ia64/include/bitstring.h#2 (text+ko) ==== @@ -1,9 +1,6 @@ -/* - * Copyright (c) 1989, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Paul Vixie. +/*- + * Copyright (c) 2003 Poul-Henning Kamp + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -13,18 +10,11 @@ * 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. * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) @@ -33,118 +23,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/bitstring.h,v 1.2 2000/10/09 12:34:51 dwmalone Exp $ + * $FreeBSD: src/include/bitstring.h,v 1.3 2003/06/13 19:40:13 phk Exp $ */ #ifndef _BITSTRING_H_ #define _BITSTRING_H_ -typedef unsigned char bitstr_t; +#include -/* internal macros */ - /* byte of the bitstring bit is in */ -#define _bit_byte(bit) \ - ((bit) >> 3) - - /* mask for the bit within its byte */ -#define _bit_mask(bit) \ - (1 << ((bit)&0x7)) +#endif /* _BITSTRING_H_ */ -/* external macros */ - /* bytes in a bitstring of nbits bits */ -#define bitstr_size(nbits) \ - (((nbits) + 7) >> 3) - - /* allocate a bitstring */ -#define bit_alloc(nbits) \ - (bitstr_t *)calloc((size_t)bitstr_size(nbits), sizeof(bitstr_t)) - - /* allocate a bitstring on the stack */ -#define bit_decl(name, nbits) \ - ((name)[bitstr_size(nbits)]) - - /* is bit N of bitstring name set? */ -#define bit_test(name, bit) \ - ((name)[_bit_byte(bit)] & _bit_mask(bit)) - - /* set bit N of bitstring name */ -#define bit_set(name, bit) \ - ((name)[_bit_byte(bit)] |= _bit_mask(bit)) - - /* clear bit N of bitstring name */ -#define bit_clear(name, bit) \ - ((name)[_bit_byte(bit)] &= ~_bit_mask(bit)) - - /* clear bits start ... stop in bitstring */ -#define bit_nclear(name, start, stop) do { \ - register bitstr_t *_name = (name); \ - register int _start = (start), _stop = (stop); \ - register int _startbyte = _bit_byte(_start); \ - register int _stopbyte = _bit_byte(_stop); \ - if (_startbyte == _stopbyte) { \ - _name[_startbyte] &= ((0xff >> (8 - (_start&0x7))) | \ - (0xff << ((_stop&0x7) + 1))); \ - } else { \ - _name[_startbyte] &= 0xff >> (8 - (_start&0x7)); \ - while (++_startbyte < _stopbyte) \ - _name[_startbyte] = 0; \ - _name[_stopbyte] &= 0xff << ((_stop&0x7) + 1); \ - } \ -} while (0) - - /* set bits start ... stop in bitstring */ -#define bit_nset(name, start, stop) do { \ - register bitstr_t *_name = (name); \ - register int _start = (start), _stop = (stop); \ - register int _startbyte = _bit_byte(_start); \ - register int _stopbyte = _bit_byte(_stop); \ - if (_startbyte == _stopbyte) { \ - _name[_startbyte] |= ((0xff << (_start&0x7)) & \ - (0xff >> (7 - (_stop&0x7)))); \ - } else { \ - _name[_startbyte] |= 0xff << ((_start)&0x7); \ - while (++_startbyte < _stopbyte) \ - _name[_startbyte] = 0xff; \ - _name[_stopbyte] |= 0xff >> (7 - (_stop&0x7)); \ - } \ -} while (0) - - /* find first bit clear in name */ -#define bit_ffc(name, nbits, value) do { \ - register bitstr_t *_name = (name); \ - register int _byte, _nbits = (nbits); \ - register int _stopbyte = _bit_byte(_nbits - 1), _value = -1; \ - if (_nbits > 0) \ - for (_byte = 0; _byte <= _stopbyte; ++_byte) \ - if (_name[_byte] != 0xff) { \ - bitstr_t _lb; \ - _value = _byte << 3; \ - for (_lb = _name[_byte]; (_lb&0x1); \ - ++_value, _lb >>= 1); \ - break; \ - } \ - if (_value >= nbits) \ - _value = -1; \ - *(value) = _value; \ -} while (0) - - /* find first bit set in name */ -#define bit_ffs(name, nbits, value) do { \ - register bitstr_t *_name = (name); \ - register int _byte, _nbits = (nbits); \ - register int _stopbyte = _bit_byte(_nbits - 1), _value = -1; \ - if (_nbits > 0) \ - for (_byte = 0; _byte <= _stopbyte; ++_byte) \ - if (_name[_byte]) { \ - bitstr_t _lb; \ - _value = _byte << 3; \ - for (_lb = _name[_byte]; !(_lb&0x1); \ - ++_value, _lb >>= 1); \ - break; \ - } \ - if (_value >= nbits) \ - _value = -1; \ - *(value) = _value; \ -} while (0) - -#endif /* !_BITSTRING_H_ */ ==== //depot/projects/ia64/lib/libalias/alias.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libalias/alias.c,v 1.36 2002/07/23 00:16:19 ru Exp $"); +__FBSDID("$FreeBSD: src/lib/libalias/alias.c,v 1.37 2003/06/13 21:54:01 ru Exp $"); /* Alias.c provides supervisory control for the functions of the @@ -1425,6 +1425,10 @@ SetDefaultAliasAddress(pip->ip_src); } } + else if (packetAliasMode & PKT_ALIAS_PROXY_ONLY) + { + SetDefaultAliasAddress(pip->ip_src); + } iresult = PKT_ALIAS_IGNORED; if ((ntohs(pip->ip_off) & IP_OFFMASK) == 0) ==== //depot/projects/ia64/lib/libalias/libalias.3#5 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libalias/libalias.3,v 1.44 2003/06/08 09:53:08 charnier Exp $ +.\" $FreeBSD: src/lib/libalias/libalias.3,v 1.47 2003/06/13 21:39:22 ru Exp $ .\" .Dd April 13, 2000 .Dt LIBALIAS 3 @@ -600,20 +600,18 @@ server. If .Cm encode_ip_hdr -is specified, the original address and port is passed as an extra IP -option. +is specified, the original destination address and port are passed +as an extra IP option. If .Cm encode_tcp_stream -is specified, the original address and port is passed as the first -piece of data in the TCP stream in the format -.Dq DEST Ar IP port . +is specified, the original destination address and port are passed +as the first piece of data in the TCP stream in the format +.Dq Li DEST Ar IP port . .It Cm port Ar portnum Only packets with the destination port .Ar portnum are proxied. -.It Cm server Ar host Ns Xo -.Op : Ns Ar portnum -.Xc +.It Cm server Ar host Ns Op : Ns Ar portnum This specifies the .Ar host and @@ -648,9 +646,7 @@ are deleted. .It Cm proto tcp | udp If specified, only packets of the given protocol type are matched. -.It Cm src Ar IP Ns Xo -.Op / Ns Ar bits -.Xc +.It Cm src Ar IP Ns Op / Ns Ar bits If specified, only packets with a source address matching the given .Ar IP are matched. @@ -662,9 +658,7 @@ .Ar IP are taken as a network specification, and all IP addresses from that network will be matched. -.It Cm dst Ar IP Ns Xo -.Op / Ns Ar bits -.Xc +.It Cm dst Ar IP Ns Op / Ns Ar bits If specified, only packets with a destination address matching the given .Ar IP are matched. @@ -885,6 +879,8 @@ added support for PPTP and RTSP. .An Junichi Satoh Aq junichi@junichi.org added support for RTSP/PNA. +.An Ruslan Ermilov Aq ru@FreeBSD.org +added support for PPTP and LSNAT as well as general hacking. .Sh ACKNOWLEDGMENTS Listed below, in approximate chronological order, are individuals who have provided valuable comments and/or debugging assistance. ==== //depot/projects/ia64/lib/libbz2/Makefile#4 (text+ko) ==== @@ -1,6 +1,4 @@ -# $FreeBSD: src/lib/libbz2/Makefile,v 1.4 2002/09/28 00:25:28 peter Exp $ - -MAINTAINER= obrien@FreeBSD.org +# $FreeBSD: src/lib/libbz2/Makefile,v 1.5 2003/06/14 19:32:51 obrien Exp $ BZ2DIR= ${.CURDIR}/../../contrib/bzip2 .PATH: ${BZ2DIR} ==== //depot/projects/ia64/lib/libc/i386/gen/alloca.S#3 (text+ko) ==== @@ -34,11 +34,12 @@ * SUCH DAMAGE. */ +#ifndef __GNUC__ #if defined(LIBC_SCCS) && !defined(lint) .asciz "@(#)alloca.s 5.2 (Berkeley) 5/14/90" #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/gen/alloca.S,v 1.10 2002/03/23 02:44:18 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/i386/gen/alloca.S,v 1.11 2003/06/14 06:04:23 obrien Exp $"); /* like alloc, but automatic automatic free in return */ @@ -56,3 +57,4 @@ pushl 0(%ecx) pushl %eax /* dummy to pop at callsite */ jmp *%edx /* "return" */ +#endif /*__GNUC__*/ ==== //depot/projects/ia64/lib/libc/locale/frune.c#4 (text+ko) ==== @@ -34,11 +34,14 @@ * SUCH DAMAGE. */ +/* f*rune() are obsolete in FreeBSD 6 -- use ANSI functions instead. */ +#define OBSOLETE_IN_6 + #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)frune.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ -#include -__FBSDID("$FreeBSD: src/lib/libc/locale/frune.c,v 1.3 2002/09/18 06:19:12 tjr Exp $"); >>> TRUNCATED FOR MAIL (1000 lines) <<<