From owner-p4-projects@FreeBSD.ORG Sun Oct 10 18:53:11 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6CED716A4D1; Sun, 10 Oct 2004 18:53:11 +0000 (GMT) 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 41CF516A4CF for ; Sun, 10 Oct 2004 18:53:11 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1979643D2F for ; Sun, 10 Oct 2004 18:53:11 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9AIrAEU095847 for ; Sun, 10 Oct 2004 18:53:10 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9AIrAYI095844 for perforce@freebsd.org; Sun, 10 Oct 2004 18:53:10 GMT (envelope-from peter@freebsd.org) Date: Sun, 10 Oct 2004 18:53:10 GMT Message-Id: <200410101853.i9AIrAYI095844@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 62955 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, 10 Oct 2004 18:53:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=62955 Change 62955 by peter@peter_daintree on 2004/10/10 18:52:30 checkpoint something that I was playing with so I dont lose it. Affected files ... .. //depot/projects/hammer/Makefile.inc1#62 edit Differences ... ==== //depot/projects/hammer/Makefile.inc1#62 (text+ko) ==== @@ -129,6 +129,7 @@ OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET} .endif WORLDTMP= ${OBJTREE}${.CURDIR}/${MACHINE_ARCH} +I386TMP= ${OBJTREE}${.CURDIR}/i386 # /usr/games added for fortune which depend on strfile BPATH= ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games @@ -201,6 +202,21 @@ PATH=${TMPPATH} WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP} +# i386 world +I386CROSSENV= MAKEOBJDIRPREFIX=${OBJTREE} \ + MACHINE_ARCH=${TARGET_ARCH} \ + MACHINE=${TARGET} \ + CPUTYPE=${TARGET_CPUTYPE} \ + GROFF_BIN_PATH=${WORLDTMP}/legacy/usr/bin \ + GROFF_FONT_PATH=${WORLDTMP}/legacy/usr/share/groff_font \ + GROFF_TMAC_PATH=${WORLDTMP}/legacy/usr/share/tmac + +I386MAKEENV= ${I386CROSSENV} \ + _SHLIBDIRPREFIX=${I386TMP} \ + INSTALL="sh ${.CURDIR}/tools/install.sh" \ + PATH=${TMPPATH} +I386MAKE= ${I386MAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${I386TMP} + # install stage .if empty(.MAKEFLAGS:M-n) IMAKEENV= ${CROSSENV} \ From owner-p4-projects@FreeBSD.ORG Sun Oct 10 18:58:20 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A343F16A4D1; Sun, 10 Oct 2004 18:58:19 +0000 (GMT) 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 6716116A4CE for ; Sun, 10 Oct 2004 18:58:19 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2E1ED43D3F for ; Sun, 10 Oct 2004 18:58:19 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9AIwJX1096043 for ; Sun, 10 Oct 2004 18:58:19 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9AIwIwI096040 for perforce@freebsd.org; Sun, 10 Oct 2004 18:58:18 GMT (envelope-from peter@freebsd.org) Date: Sun, 10 Oct 2004 18:58:18 GMT Message-Id: <200410101858.i9AIwIwI096040@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 62957 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, 10 Oct 2004 18:58:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=62957 Change 62957 by peter@peter_daintree on 2004/10/10 18:57:19 IFC @62954 Affected files ... .. //depot/projects/hammer/UPDATING#61 integrate .. //depot/projects/hammer/contrib/pf/man/pf.conf.5#5 integrate .. //depot/projects/hammer/etc/Makefile#32 integrate .. //depot/projects/hammer/etc/rc#15 integrate .. //depot/projects/hammer/etc/rc.d/DAEMON#4 integrate .. //depot/projects/hammer/etc/rc.d/LOGIN#4 integrate .. //depot/projects/hammer/etc/rc.d/NETWORKING#8 integrate .. //depot/projects/hammer/etc/rc.d/SERVERS#4 integrate .. //depot/projects/hammer/etc/rc.d/abi#4 integrate .. //depot/projects/hammer/etc/rc.d/accounting#7 integrate .. //depot/projects/hammer/etc/rc.d/addswap#4 integrate .. //depot/projects/hammer/etc/rc.d/adjkerntz#5 integrate .. //depot/projects/hammer/etc/rc.d/amd#8 integrate .. //depot/projects/hammer/etc/rc.d/apm#6 integrate .. //depot/projects/hammer/etc/rc.d/apmd#9 integrate .. //depot/projects/hammer/etc/rc.d/archdep#7 integrate .. //depot/projects/hammer/etc/rc.d/atm1#6 integrate .. //depot/projects/hammer/etc/rc.d/atm2#3 integrate .. //depot/projects/hammer/etc/rc.d/atm3#4 integrate .. //depot/projects/hammer/etc/rc.d/bgfsck#5 integrate .. //depot/projects/hammer/etc/rc.d/bootparams#5 integrate .. //depot/projects/hammer/etc/rc.d/ccd#4 integrate .. //depot/projects/hammer/etc/rc.d/cleanvar#7 integrate .. //depot/projects/hammer/etc/rc.d/cleartmp#9 integrate .. //depot/projects/hammer/etc/rc.d/cron#5 integrate .. //depot/projects/hammer/etc/rc.d/devd#4 integrate .. //depot/projects/hammer/etc/rc.d/devfs#9 integrate .. //depot/projects/hammer/etc/rc.d/dhclient#12 integrate .. //depot/projects/hammer/etc/rc.d/dmesg#3 integrate .. //depot/projects/hammer/etc/rc.d/dumpon#5 integrate .. //depot/projects/hammer/etc/rc.d/early.sh#2 integrate .. //depot/projects/hammer/etc/rc.d/fsck#6 integrate .. //depot/projects/hammer/etc/rc.d/gbde#6 integrate .. //depot/projects/hammer/etc/rc.d/gbde_swap#4 integrate .. //depot/projects/hammer/etc/rc.d/hostname#7 integrate .. //depot/projects/hammer/etc/rc.d/ike#4 integrate .. //depot/projects/hammer/etc/rc.d/inetd#3 integrate .. //depot/projects/hammer/etc/rc.d/initdiskless#13 integrate .. //depot/projects/hammer/etc/rc.d/initrandom#4 integrate .. //depot/projects/hammer/etc/rc.d/ip6addrctl#4 integrate .. //depot/projects/hammer/etc/rc.d/ip6fw#6 integrate .. //depot/projects/hammer/etc/rc.d/ipfilter#18 integrate .. //depot/projects/hammer/etc/rc.d/ipfs#5 integrate .. //depot/projects/hammer/etc/rc.d/ipfw#9 integrate .. //depot/projects/hammer/etc/rc.d/ipmon#10 integrate .. //depot/projects/hammer/etc/rc.d/ipnat#11 integrate .. //depot/projects/hammer/etc/rc.d/ipsec#8 integrate .. //depot/projects/hammer/etc/rc.d/ipxrouted#3 integrate .. //depot/projects/hammer/etc/rc.d/isdnd#9 integrate .. //depot/projects/hammer/etc/rc.d/jail#10 integrate .. //depot/projects/hammer/etc/rc.d/kadmind#3 integrate .. //depot/projects/hammer/etc/rc.d/kerberos#3 integrate .. //depot/projects/hammer/etc/rc.d/keyserv#3 integrate .. //depot/projects/hammer/etc/rc.d/kldxref#4 integrate .. //depot/projects/hammer/etc/rc.d/kpasswdd#3 integrate .. //depot/projects/hammer/etc/rc.d/ldconfig#10 integrate .. //depot/projects/hammer/etc/rc.d/local#5 integrate .. //depot/projects/hammer/etc/rc.d/localpkg#3 integrate .. //depot/projects/hammer/etc/rc.d/lomac#4 integrate .. //depot/projects/hammer/etc/rc.d/lpd#4 integrate .. //depot/projects/hammer/etc/rc.d/mixer#4 integrate .. //depot/projects/hammer/etc/rc.d/motd#7 integrate .. //depot/projects/hammer/etc/rc.d/mountcritlocal#9 integrate .. //depot/projects/hammer/etc/rc.d/mountcritremote#8 integrate .. //depot/projects/hammer/etc/rc.d/mountd#7 integrate .. //depot/projects/hammer/etc/rc.d/moused#6 integrate .. //depot/projects/hammer/etc/rc.d/mroute6d#4 integrate .. //depot/projects/hammer/etc/rc.d/mrouted#7 integrate .. //depot/projects/hammer/etc/rc.d/msgs#2 integrate .. //depot/projects/hammer/etc/rc.d/named#9 integrate .. //depot/projects/hammer/etc/rc.d/natd#2 integrate .. //depot/projects/hammer/etc/rc.d/netif#9 integrate .. //depot/projects/hammer/etc/rc.d/netoptions#5 integrate .. //depot/projects/hammer/etc/rc.d/network_ipv6#7 integrate .. //depot/projects/hammer/etc/rc.d/nfsclient#5 integrate .. //depot/projects/hammer/etc/rc.d/nfsd#7 integrate .. //depot/projects/hammer/etc/rc.d/nfslocking#7 integrate .. //depot/projects/hammer/etc/rc.d/nfsserver#4 integrate .. //depot/projects/hammer/etc/rc.d/nisdomain#3 integrate .. //depot/projects/hammer/etc/rc.d/nsswitch#4 integrate .. //depot/projects/hammer/etc/rc.d/ntpd#7 integrate .. //depot/projects/hammer/etc/rc.d/ntpdate#10 integrate .. //depot/projects/hammer/etc/rc.d/othermta#2 integrate .. //depot/projects/hammer/etc/rc.d/pccard#5 integrate .. //depot/projects/hammer/etc/rc.d/pcvt#4 integrate .. //depot/projects/hammer/etc/rc.d/pf#5 integrate .. //depot/projects/hammer/etc/rc.d/pflog#4 integrate .. //depot/projects/hammer/etc/rc.d/power_profile#4 integrate .. //depot/projects/hammer/etc/rc.d/ppp-user#6 integrate .. //depot/projects/hammer/etc/rc.d/pppoed#3 integrate .. //depot/projects/hammer/etc/rc.d/preseedrandom#4 integrate .. //depot/projects/hammer/etc/rc.d/pwcheck#3 integrate .. //depot/projects/hammer/etc/rc.d/quota#4 integrate .. //depot/projects/hammer/etc/rc.d/ramdisk#3 integrate .. //depot/projects/hammer/etc/rc.d/ramdisk-own#2 integrate .. //depot/projects/hammer/etc/rc.d/random#7 integrate .. //depot/projects/hammer/etc/rc.d/rarpd#4 integrate .. //depot/projects/hammer/etc/rc.d/rcconf.sh#2 integrate .. //depot/projects/hammer/etc/rc.d/resolv#3 integrate .. //depot/projects/hammer/etc/rc.d/root#8 integrate .. //depot/projects/hammer/etc/rc.d/route6d#6 integrate .. //depot/projects/hammer/etc/rc.d/routed#10 integrate .. //depot/projects/hammer/etc/rc.d/routing#5 integrate .. //depot/projects/hammer/etc/rc.d/rpcbind#7 integrate .. //depot/projects/hammer/etc/rc.d/rtadvd#7 integrate .. //depot/projects/hammer/etc/rc.d/rwho#3 integrate .. //depot/projects/hammer/etc/rc.d/savecore#6 integrate .. //depot/projects/hammer/etc/rc.d/securelevel#6 integrate .. //depot/projects/hammer/etc/rc.d/sendmail#9 integrate .. //depot/projects/hammer/etc/rc.d/serial#5 integrate .. //depot/projects/hammer/etc/rc.d/sppp#4 integrate .. //depot/projects/hammer/etc/rc.d/sshd#5 integrate .. //depot/projects/hammer/etc/rc.d/swap1#6 integrate .. //depot/projects/hammer/etc/rc.d/syscons#6 integrate .. //depot/projects/hammer/etc/rc.d/sysctl#6 integrate .. //depot/projects/hammer/etc/rc.d/syslogd#6 integrate .. //depot/projects/hammer/etc/rc.d/timed#4 integrate .. //depot/projects/hammer/etc/rc.d/tmp#3 integrate .. //depot/projects/hammer/etc/rc.d/usbd#3 integrate .. //depot/projects/hammer/etc/rc.d/var#3 integrate .. //depot/projects/hammer/etc/rc.d/vinum#3 integrate .. //depot/projects/hammer/etc/rc.d/virecover#7 integrate .. //depot/projects/hammer/etc/rc.d/watchdogd#4 integrate .. //depot/projects/hammer/etc/rc.d/ypbind#7 integrate .. //depot/projects/hammer/etc/rc.d/yppasswdd#6 integrate .. //depot/projects/hammer/etc/rc.d/ypserv#7 integrate .. //depot/projects/hammer/etc/rc.d/ypset#6 integrate .. //depot/projects/hammer/etc/rc.d/ypupdated#5 integrate .. //depot/projects/hammer/etc/rc.d/ypxfrd#6 integrate .. //depot/projects/hammer/etc/rc.shutdown#6 integrate .. //depot/projects/hammer/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.3#5 integrate .. //depot/projects/hammer/lib/libc/gen/syslog.c#5 integrate .. //depot/projects/hammer/lib/libc/net/addr2ascii.3#6 integrate .. //depot/projects/hammer/lib/libc/sys/kse.2#6 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_execve.c#2 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_kern.c#33 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_exit.c#12 integrate .. //depot/projects/hammer/lib/msun/src/s_ilogb.c#3 integrate .. //depot/projects/hammer/lib/msun/src/s_ilogbf.c#2 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#81 integrate .. //depot/projects/hammer/sbin/fsck_ffs/dir.c#7 integrate .. //depot/projects/hammer/sbin/fsck_ffs/fsck.h#8 integrate .. //depot/projects/hammer/sbin/fsck_ffs/fsutil.c#9 integrate .. //depot/projects/hammer/sbin/fsck_ffs/inode.c#5 integrate .. //depot/projects/hammer/sbin/fsck_ffs/main.c#8 integrate .. //depot/projects/hammer/sbin/fsck_ffs/pass1.c#10 integrate .. //depot/projects/hammer/sbin/fsck_ffs/pass1b.c#5 integrate .. //depot/projects/hammer/sbin/fsck_ffs/pass2.c#7 integrate .. //depot/projects/hammer/sbin/fsck_ffs/pass3.c#5 integrate .. //depot/projects/hammer/sbin/fsck_ffs/pass4.c#5 integrate .. //depot/projects/hammer/sbin/fsck_ffs/pass5.c#9 integrate .. //depot/projects/hammer/sbin/fsdb/Makefile#6 integrate .. //depot/projects/hammer/sbin/fsdb/fsdb.c#4 integrate .. //depot/projects/hammer/sbin/growfs/growfs.c#11 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#30 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#33 integrate .. //depot/projects/hammer/share/examples/etc/make.conf#25 integrate .. //depot/projects/hammer/share/man/man4/Makefile#51 integrate .. //depot/projects/hammer/share/man/man4/altq.4#1 branch .. //depot/projects/hammer/share/man/man4/ieee80211.4#5 integrate .. //depot/projects/hammer/share/man/man4/mac_bsdextended.4#8 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/Makefile#25 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/pbio.4#1 branch .. //depot/projects/hammer/share/man/man4/man4.sparc64/Makefile#1 branch .. //depot/projects/hammer/share/man/man4/man4.sparc64/auxio.4#1 branch .. //depot/projects/hammer/share/man/man4/vinum.4#4 integrate .. //depot/projects/hammer/share/man/man5/make.conf.5#25 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#36 integrate .. //depot/projects/hammer/share/man/man8/rc.8#6 integrate .. //depot/projects/hammer/share/man/man9/Makefile#41 integrate .. //depot/projects/hammer/share/man/man9/altq.9#4 integrate .. //depot/projects/hammer/share/man/man9/mbuf_tags.9#2 integrate .. //depot/projects/hammer/share/man/man9/pfil.9#8 integrate .. //depot/projects/hammer/share/man/man9/rtalloc.9#5 integrate .. //depot/projects/hammer/share/man/man9/rtentry.9#6 integrate .. //depot/projects/hammer/share/mk/bsd.cpu.mk#22 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#116 integrate .. //depot/projects/hammer/sys/amd64/include/pmap.h#49 integrate .. //depot/projects/hammer/sys/compat/linux/linux_util.h#5 integrate .. //depot/projects/hammer/sys/conf/files#86 integrate .. //depot/projects/hammer/sys/conf/files.i386#41 integrate .. //depot/projects/hammer/sys/conf/files.sparc64#22 integrate .. //depot/projects/hammer/sys/conf/kern.pre.mk#32 integrate .. //depot/projects/hammer/sys/conf/kmod.mk#34 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_quirks#3 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_timer.c#11 integrate .. //depot/projects/hammer/sys/dev/acpica/acpivar.h#36 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#39 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.h#23 integrate .. //depot/projects/hammer/sys/dev/ata/ata-cbus.c#9 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#47 integrate .. //depot/projects/hammer/sys/dev/ata/ata-disk.c#25 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.h#25 integrate .. //depot/projects/hammer/sys/dev/auxio/auxio.c#1 branch .. //depot/projects/hammer/sys/dev/auxio/auxioreg.h#1 branch .. //depot/projects/hammer/sys/dev/bfe/if_bfe.c#11 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#30 integrate .. //depot/projects/hammer/sys/dev/fe/if_fe.c#15 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#20 integrate .. //depot/projects/hammer/sys/dev/random/randomdev_soft.c#5 integrate .. //depot/projects/hammer/sys/dev/rc/rc.c#14 integrate .. //depot/projects/hammer/sys/dev/sx/sx.c#10 integrate .. //depot/projects/hammer/sys/dev/sx/sx.h#4 integrate .. //depot/projects/hammer/sys/dev/usb/uhid.c#16 integrate .. //depot/projects/hammer/sys/geom/geom_pc98.c#21 integrate .. //depot/projects/hammer/sys/geom/mirror/g_mirror.c#11 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#55 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#59 integrate .. //depot/projects/hammer/sys/i386/include/pmap.h#19 integrate .. //depot/projects/hammer/sys/i386/isa/pbio.c#1 branch .. //depot/projects/hammer/sys/kern/init_sysent.c#34 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#35 integrate .. //depot/projects/hammer/sys/kern/kern_kse.c#15 integrate .. //depot/projects/hammer/sys/kern/kern_proc.c#38 integrate .. //depot/projects/hammer/sys/kern/kern_switch.c#32 integrate .. //depot/projects/hammer/sys/kern/subr_witness.c#34 integrate .. //depot/projects/hammer/sys/kern/syscalls.c#33 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#33 integrate .. //depot/projects/hammer/sys/kern/uipc_mbuf2.c#12 integrate .. //depot/projects/hammer/sys/modules/Makefile#56 integrate .. //depot/projects/hammer/sys/modules/auxio/Makefile#1 branch .. //depot/projects/hammer/sys/net/net_osdep.c#4 delete .. //depot/projects/hammer/sys/net/net_osdep.h#6 integrate .. //depot/projects/hammer/sys/net/pfil.c#6 integrate .. //depot/projects/hammer/sys/netgraph/ng_ether.c#14 integrate .. //depot/projects/hammer/sys/netinet/ip_mroute.c#24 integrate .. //depot/projects/hammer/sys/netinet/tcp_output.c#23 integrate .. //depot/projects/hammer/sys/pci/if_sis.c#30 integrate .. //depot/projects/hammer/sys/sparc64/conf/GENERIC#30 integrate .. //depot/projects/hammer/sys/sparc64/conf/NOTES#9 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#33 integrate .. //depot/projects/hammer/sys/sys/kse.h#18 integrate .. //depot/projects/hammer/sys/sys/mbuf.h#32 integrate .. //depot/projects/hammer/sys/sys/pbioio.h#1 branch .. //depot/projects/hammer/sys/sys/socketvar.h#22 integrate .. //depot/projects/hammer/sys/sys/syscall.h#33 integrate .. //depot/projects/hammer/sys/sys/syscall.mk#33 integrate .. //depot/projects/hammer/sys/sys/syscallsubr.h#11 integrate .. //depot/projects/hammer/sys/sys/sysproto.h#33 integrate .. //depot/projects/hammer/sys/ufs/ffs/fs.h#9 integrate .. //depot/projects/hammer/sys/vm/uma_core.c#31 integrate .. //depot/projects/hammer/sys/vm/uma_dbg.c#9 integrate .. //depot/projects/hammer/tools/regression/netinet/tcpconnect/Makefile#1 branch .. //depot/projects/hammer/tools/regression/netinet/tcpconnect/tcpconnect.c#1 branch .. //depot/projects/hammer/tools/tools/netrate/netblast/Makefile#1 branch .. //depot/projects/hammer/tools/tools/netrate/netblast/netblast.c#1 branch .. //depot/projects/hammer/tools/tools/netrate/netsend/netsend.c#5 integrate .. //depot/projects/hammer/tools/tools/recoverdisk/recoverdisk.c#2 integrate .. //depot/projects/hammer/usr.sbin/gstat/gstat.8#5 integrate .. //depot/projects/hammer/usr.sbin/gstat/gstat.c#7 integrate .. //depot/projects/hammer/usr.sbin/rpc.lockd/lock_proc.c#6 integrate Differences ... ==== //depot/projects/hammer/UPDATING#61 (text+ko) ==== @@ -23,6 +23,20 @@ developers choose to disable these features on build machines to maximize performance. +20041007: + The FreeBSD keyword is no longer a requirement for a valid + rc.d script. The rc(8) and rc.shutdown(8) scripts no longer check + for the existence of this keyword when ordering rc.d scripts. + This change touches most of the file in /etc/rc.d; therefore, + if you have not modified any files in that directory it may + be easier to rm -rf /etc/rc.d and then use the -i switch with + mergemaster(8). + +20041007: + One of the syscalls the 1:1 threading library libthr uses has + changed, thus breaking ABI compatibility. Make sure you rebuild + this library with the kernel. + 20041001: The following libraries had their version number bumped up: /lib/libm.so.2 -> libm.so.3 @@ -1939,4 +1953,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.369 2004/10/04 20:11:34 dougb Exp $ +$FreeBSD: src/UPDATING,v 1.373 2004/10/10 16:12:09 mtm Exp $ ==== //depot/projects/hammer/contrib/pf/man/pf.conf.5#5 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/contrib/pf/man/pf.conf.5,v 1.3 2004/10/03 10:42:42 mlaier Exp $ +.\" $FreeBSD: src/contrib/pf/man/pf.conf.5,v 1.4 2004/10/07 15:39:02 mlaier Exp $ .\" $OpenBSD: pf.conf.5,v 1.292 2004/02/24 05:44:48 mcbride Exp $ .\" .\" Copyright (c) 2002, Daniel Hartmeier @@ -626,7 +626,7 @@ .Bd -literal -offset indent scrub in on $ext_if all fragment reassemble .Ed -.Sh QUEUEING +.Sh QUEUEING/ALTQ Packets can be assigned to queues for the purpose of bandwidth control. At least two declarations are required to configure queues, and later @@ -1473,7 +1473,7 @@ .Em lowdelay and TCP ACKs with no data payload will be assigned to the second one. See -.Sx QUEUEING +.Sx QUEUEING/ALTQ for setup details. .Pp For example: ==== //depot/projects/hammer/etc/Makefile#32 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.334 2004/10/05 13:03:08 ru Exp $ +# $FreeBSD: src/etc/Makefile,v 1.335 2004/10/08 00:14:27 dougb Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -122,7 +122,8 @@ ln ${DESTDIR}/root/.profile ${DESTDIR}/.profile cd ${.CURDIR}/mtree; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${MTREE} ${DESTDIR}/etc/mtree -.if !defined(NO_BIND_ETC) && !defined(NO_BIND) +.if !defined(NO_BIND) +.if !defined(NO_BIND_ETC) .if defined(NO_BIND_CHROOT) cd ${.CURDIR}/namedb; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${NAMEDB} ${DESTDIR}/etc/namedb @@ -130,6 +131,13 @@ cd ${.CURDIR}/namedb; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${NAMEDB} ${DESTDIR}/var/named/etc/namedb .endif +.if !defined(NO_BIND_MTREE) + @if [ ! -e ${DESTDIR}/etc/namedb ]; then \ + set -x; \ + ln -s ../var/named/etc/namedb ${DESTDIR}/etc/namedb; \ + fi +.endif +.endif .endif cd ${.CURDIR}/ppp; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \ ${PPPCNF} ${DESTDIR}/etc/ppp @@ -189,6 +197,7 @@ mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BIND.include.dist \ -p ${DESTDIR}/usr/include .endif +.if !defined(NO_BIND_MTREE) .if defined(NO_BIND_CHROOT) mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BIND.etc.dist \ -p ${DESTDIR}/etc @@ -197,7 +206,8 @@ .else mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BIND.chroot.dist \ -p ${DESTDIR}/var/named - ln -fhs /var/named/etc/namedb ${DESTDIR}/etc/namedb +.endif +.endif .endif .endif .if !defined(NO_SENDMAIL) ==== //depot/projects/hammer/etc/rc#15 (text+ko) ==== @@ -25,7 +25,7 @@ # SUCH DAMAGE. # # @(#)rc 5.27 (Berkeley) 6/5/91 -# $FreeBSD: src/etc/rc,v 1.333 2004/07/24 16:30:31 mtm Exp $ +# $FreeBSD: src/etc/rc,v 1.335 2004/10/08 14:23:49 mtm Exp $ # # System startup script run by init on autoboot @@ -65,10 +65,9 @@ _boot="start" fi -os=`eval ${CMD_OSTYPE}` skip="-s nostart" [ `/sbin/sysctl -n security.jail.jailed` -eq 1 ] && skip="$skip -s nojail" -files=`rcorder -k ${os} ${skip} /etc/rc.d/* 2>/dev/null` +files=`rcorder ${skip} /etc/rc.d/* 2>/dev/null` for _rc_elem in ${files}; do run_rc_script ${_rc_elem} ${_boot} ==== //depot/projects/hammer/etc/rc.d/DAEMON#4 (text+ko) ==== @@ -1,12 +1,11 @@ #!/bin/sh # # $NetBSD: DAEMON,v 1.8 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/DAEMON,v 1.4 2004/01/17 10:16:38 mtm Exp $ +# $FreeBSD: src/etc/rc.d/DAEMON,v 1.5 2004/10/07 13:55:25 mtm Exp $ # # PROVIDE: DAEMON # REQUIRE: NETWORKING SERVERS -# KEYWORD: FreeBSD # This is a dummy dependency, to ensure that general purpose daemons # are run _after_ the above are. ==== //depot/projects/hammer/etc/rc.d/LOGIN#4 (text+ko) ==== @@ -1,12 +1,11 @@ #!/bin/sh # # $NetBSD: LOGIN,v 1.7 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/LOGIN,v 1.4 2004/01/17 10:16:38 mtm Exp $ +# $FreeBSD: src/etc/rc.d/LOGIN,v 1.5 2004/10/07 13:55:25 mtm Exp $ # # PROVIDE: LOGIN # REQUIRE: DAEMON -# KEYWORD: FreeBSD # This is a dummy dependency to ensure user services such as xdm, # inetd, cron and kerberos are started after everything else, in case ==== //depot/projects/hammer/etc/rc.d/NETWORKING#8 (text+ko) ==== @@ -1,13 +1,12 @@ #!/bin/sh # # $NetBSD: NETWORKING,v 1.2 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/NETWORKING,v 1.8 2004/03/05 07:43:37 mtm Exp $ +# $FreeBSD: src/etc/rc.d/NETWORKING,v 1.9 2004/10/07 13:55:25 mtm Exp $ # # PROVIDE: NETWORKING NETWORK # REQUIRE: dhclient netif routing network_ipv6 isdnd ppp-user # REQUIRE: routed mrouted route6d mroute6d -# KEYWORD: FreeBSD # This is a dummy dependency, for services which require networking # to be operational before starting. ==== //depot/projects/hammer/etc/rc.d/SERVERS#4 (text+ko) ==== @@ -1,12 +1,11 @@ #!/bin/sh # # $NetBSD: SERVERS,v 1.9 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/SERVERS,v 1.4 2004/01/17 10:16:38 mtm Exp $ +# $FreeBSD: src/etc/rc.d/SERVERS,v 1.5 2004/10/07 13:55:25 mtm Exp $ # # PROVIDE: SERVERS # REQUIRE: mountcritremote -# KEYWORD: FreeBSD # This is a dummy dependency, for early-start servers relying on # some basic configuration. ==== //depot/projects/hammer/etc/rc.d/abi#4 (text+ko) ==== @@ -1,12 +1,12 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/abi,v 1.3 2004/03/08 12:25:05 pjd Exp $ +# $FreeBSD: src/etc/rc.d/abi,v 1.4 2004/10/07 13:55:25 mtm Exp $ # # PROVIDE: abi # REQUIRE: LOGIN # BEFORE: securelevel -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/hammer/etc/rc.d/accounting#7 (text+ko) ==== @@ -1,13 +1,13 @@ #!/bin/sh # # $NetBSD: accounting,v 1.7 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/accounting,v 1.8 2004/03/08 12:25:05 pjd Exp $ +# $FreeBSD: src/etc/rc.d/accounting,v 1.9 2004/10/07 13:55:25 mtm Exp $ # # PROVIDE: accounting # REQUIRE: mountcritremote # BEFORE: DAEMON -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/hammer/etc/rc.d/addswap#4 (text+ko) ==== @@ -2,13 +2,13 @@ # # Add additional swap files # -# $FreeBSD: src/etc/rc.d/addswap,v 1.3 2004/03/08 12:25:05 pjd Exp $ +# $FreeBSD: src/etc/rc.d/addswap,v 1.4 2004/10/07 13:55:25 mtm Exp $ # # PROVIDE: addswap # REQUIRE: mountcritlocal # BEFORE: sysctl -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/hammer/etc/rc.d/adjkerntz#5 (text+ko) ==== @@ -1,12 +1,12 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/adjkerntz,v 1.4 2004/04/12 18:11:00 brooks Exp $ +# $FreeBSD: src/etc/rc.d/adjkerntz,v 1.5 2004/10/07 13:55:25 mtm Exp $ # # PROVIDE: adjkerntz # REQUIRE: mountcritlocal random # BEFORE: netif -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/hammer/etc/rc.d/amd#8 (text+ko) ==== @@ -1,13 +1,13 @@ #!/bin/sh # # $NetBSD: amd,v 1.10 2002/04/29 12:08:17 lukem Exp $ -# $FreeBSD: src/etc/rc.d/amd,v 1.13 2004/03/08 12:25:05 pjd Exp $ +# $FreeBSD: src/etc/rc.d/amd,v 1.14 2004/10/07 13:55:25 mtm Exp $ # # PROVIDE: amd # REQUIRE: rpcbind ypbind nfsclient # BEFORE: DAEMON -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/hammer/etc/rc.d/apm#6 (text+ko) ==== @@ -1,12 +1,12 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/apm,v 1.5 2004/03/08 12:25:05 pjd Exp $ +# $FreeBSD: src/etc/rc.d/apm,v 1.6 2004/10/07 13:55:25 mtm Exp $ # # PROVIDE: apm # REQUIRE: DAEMON # BEFORE: LOGIN -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/hammer/etc/rc.d/apmd#9 (text+ko) ==== @@ -1,13 +1,13 @@ #!/bin/sh # # $NetBSD: apmd,v 1.5 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/apmd,v 1.11 2004/03/08 12:25:05 pjd Exp $ +# $FreeBSD: src/etc/rc.d/apmd,v 1.12 2004/10/07 13:55:25 mtm Exp $ # # PROVIDE: apmd # REQUIRE: DAEMON apm # BEFORE: LOGIN -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/hammer/etc/rc.d/archdep#7 (text+ko) ==== @@ -1,12 +1,12 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/archdep,v 1.6 2004/03/08 12:25:05 pjd Exp $ +# $FreeBSD: src/etc/rc.d/archdep,v 1.7 2004/10/07 13:55:25 mtm Exp $ # # PROVIDE: archdep # REQUIRE: LOGIN # BEFORE: abi -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/hammer/etc/rc.d/atm1#6 (text+ko) ==== @@ -24,13 +24,13 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/atm1,v 1.14 2004/03/08 12:25:05 pjd Exp $ +# $FreeBSD: src/etc/rc.d/atm1,v 1.15 2004/10/07 13:55:25 mtm Exp $ # # PROVIDE: atm1 # REQUIRE: root # BEFORE: netif -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/hammer/etc/rc.d/atm2#3 (text+ko) ==== @@ -24,13 +24,13 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/atm2,v 1.15 2004/03/08 12:25:05 pjd Exp $ +# $FreeBSD: src/etc/rc.d/atm2,v 1.16 2004/10/07 13:55:25 mtm Exp $ # # PROVIDE: atm2 # REQUIRE: atm1 netif # BEFORE: routing -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail # # Additional ATM interface configuration ==== //depot/projects/hammer/etc/rc.d/atm3#4 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/atm3,v 1.13 2004/03/08 12:25:05 pjd Exp $ +# $FreeBSD: src/etc/rc.d/atm3,v 1.14 2004/10/07 13:55:25 mtm Exp $ # # Start ATM daemons @@ -32,7 +32,7 @@ # PROVIDE: atm3 # REQUIRE: atm2 # BEFORE: DAEMON -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/hammer/etc/rc.d/bgfsck#5 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/bgfsck,v 1.5 2004/03/08 12:25:05 pjd Exp $ +# $FreeBSD: src/etc/rc.d/bgfsck,v 1.6 2004/10/07 13:55:25 mtm Exp $ # # PROVIDE: bgfsck # REQUIRE: cron devfs -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/hammer/etc/rc.d/bootparams#5 (text+ko) ==== @@ -1,13 +1,13 @@ #!/bin/sh # # $NetBSD: bootparams,v 1.6 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/bootparams,v 1.6 2004/03/08 12:25:05 pjd Exp $ +# $FreeBSD: src/etc/rc.d/bootparams,v 1.7 2004/10/07 13:55:25 mtm Exp $ # # PROVIDE: bootparams # REQUIRE: rpcbind DAEMON # BEFORE: LOGIN -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/hammer/etc/rc.d/ccd#4 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # # $NetBSD: ccd,v 1.3 2000/05/13 08:45:06 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ccd,v 1.4 2004/03/08 12:25:05 pjd Exp $ +# $FreeBSD: src/etc/rc.d/ccd,v 1.5 2004/10/07 13:55:25 mtm Exp $ # # PROVIDE: disks -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/hammer/etc/rc.d/cleanvar#7 (text+ko) ==== @@ -1,11 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/cleanvar,v 1.6 2004/03/23 23:22:34 brooks Exp $ +# $FreeBSD: src/etc/rc.d/cleanvar,v 1.7 2004/10/07 13:55:25 mtm Exp $ # # PROVIDE: cleanvar # REQUIRE: mountcritlocal var -# KEYWORD: FreeBSD purgedir() { ==== //depot/projects/hammer/etc/rc.d/cleartmp#9 (text+ko) ==== @@ -1,13 +1,12 @@ #!/bin/sh # # $NetBSD: cleartmp,v 1.4 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/cleartmp,v 1.10 2004/03/23 23:22:34 brooks Exp $ +# $FreeBSD: src/etc/rc.d/cleartmp,v 1.11 2004/10/07 13:55:25 mtm Exp $ # # PROVIDE: cleartmp # REQUIRE: mountcritremote tmp # BEFORE: DAEMON -# KEYWORD: FreeBSD . /etc/rc.subr ==== //depot/projects/hammer/etc/rc.d/cron#5 (text+ko) ==== @@ -1,13 +1,13 @@ #!/bin/sh # # $NetBSD: cron,v 1.5 2000/09/19 13:04:38 lukem Exp $ -# $FreeBSD: src/etc/rc.d/cron,v 1.5 2004/01/17 10:16:38 mtm Exp $ +# $FreeBSD: src/etc/rc.d/cron,v 1.6 2004/10/07 13:55:25 mtm Exp $ # # PROVIDE: cron # REQUIRE: LOGIN # BEFORE: securelevel -# KEYWORD: FreeBSD shutdown +# KEYWORD: shutdown . /etc/rc.subr ==== //depot/projects/hammer/etc/rc.d/devd#4 (text+ko) ==== @@ -1,12 +1,12 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/devd,v 1.6 2004/03/08 12:25:05 pjd Exp $ +# $FreeBSD: src/etc/rc.d/devd,v 1.7 2004/10/07 13:55:25 mtm Exp $ # # PROVIDE: devd # REQUIRE: NETWORKING # BEFORE: mountcritremote -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/hammer/etc/rc.d/devfs#9 (text+ko) ==== @@ -1,12 +1,12 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/devfs,v 1.8 2004/03/20 07:10:16 green Exp $ +# $FreeBSD: src/etc/rc.d/devfs,v 1.9 2004/10/07 13:55:25 mtm Exp $ # # PROVIDE: devfs # REQUIRE: LOGIN # BEFORE: securelevel -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/hammer/etc/rc.d/dhclient#12 (text+ko) ==== @@ -1,13 +1,13 @@ #!/bin/sh # # $NetBSD: dhclient,v 1.8 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/dhclient,v 1.16 2004/05/20 14:16:04 mtm Exp $ +# $FreeBSD: src/etc/rc.d/dhclient,v 1.17 2004/10/07 13:55:25 mtm Exp $ # # PROVIDE: dhclient # REQUIRE: netif ipfw ipfilter mountcritlocal # BEFORE: NETWORKING -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail # # Note that there no syslog logging of dhclient messages at boot because # dhclient needs to start before services that syslog depends upon do. ==== //depot/projects/hammer/etc/rc.d/dmesg#3 (text+ko) ==== @@ -1,13 +1,13 @@ #!/bin/sh # # $NetBSD: dmesg,v 1.8 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/dmesg,v 1.3 2004/03/08 12:25:05 pjd Exp $ +# $FreeBSD: src/etc/rc.d/dmesg,v 1.4 2004/10/07 13:55:25 mtm Exp $ # # PROVIDE: dmesg # REQUIRE: mountcritremote # BEFORE: DAEMON -# KEYWORD: FreeBSD Daemon nojail +# KEYWORD: Daemon nojail . /etc/rc.subr ==== //depot/projects/hammer/etc/rc.d/dumpon#5 (text+ko) ==== @@ -1,12 +1,12 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/dumpon,v 1.4 2004/09/20 17:48:45 des Exp $ +# $FreeBSD: src/etc/rc.d/dumpon,v 1.5 2004/10/07 13:55:25 mtm Exp $ # # PROVIDE: dumpon # REQUIRE: initrandom # BEFORE: disks savecore -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/hammer/etc/rc.d/early.sh#2 (text+ko) ==== @@ -1,12 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/early.sh,v 1.1 2003/04/24 08:27:29 mtm Exp $ +# $FreeBSD: src/etc/rc.d/early.sh,v 1.2 2004/10/07 13:55:25 mtm Exp $ # # PROVIDE: early # REQUIRE: disks localswap # BEFORE: fsck -# KEYWORD: FreeBSD # # Support for legacy /etc/rc.early script ==== //depot/projects/hammer/etc/rc.d/fsck#6 (text+ko) ==== @@ -1,12 +1,12 @@ #!/bin/sh # # $NetBSD: fsck,v 1.2 2001/06/18 06:42:35 lukem Exp $ -# $FreeBSD: src/etc/rc.d/fsck,v 1.9 2004/03/11 20:00:10 kientzle Exp $ +# $FreeBSD: src/etc/rc.d/fsck,v 1.10 2004/10/07 13:55:25 mtm Exp $ # # PROVIDE: fsck # REQUIRE: localswap -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/hammer/etc/rc.d/gbde#6 (text+ko) ==== @@ -3,11 +3,11 @@ # This file, originally written by Garrett A. Wollman, is in the public # domain. # -# $FreeBSD: src/etc/rc.d/gbde,v 1.6 2004/10/06 14:42:35 pjd Exp $ +# $FreeBSD: src/etc/rc.d/gbde,v 1.9 2004/10/07 13:55:25 mtm Exp $ # # PROVIDE: disks -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr @@ -79,26 +79,25 @@ gbde_start() { for device in $gbde_devices; do - parentdev=${device%.bde} - parent=${parentdev#/dev/} + parent=${device%.bde} + parent=${parent#/dev/} eval "lock=\${gbde_lock_${parent}-\"${gbde_lockdir}/${parent}.lock\"}" - if [ ! -e "${device}" ]; then - echo "Configuring Disk Encryption for ${device}." + if [ -e "/dev/${parent}" -a ! -e "/dev/${parent}.bde" ]; then + echo "Configuring Disk Encryption for ${parent}." count=1 while [ ${count} -le ${gbde_attach_attempts} ]; do if [ -e "${lock}" ]; then - gbde attach ${parentdev} -l ${lock} + gbde attach ${parent} -l ${lock} else - gbde attach ${parentdev} + gbde attach ${parent} fi - if [ -e ${device} ]; then + if [ -e "/dev/${parent}.bde" ]; then break fi echo "Attach failed; attempt ${count} of ${gbde_attach_attempts}." count=$((${count} + 1)) done - fi done } @@ -106,8 +105,12 @@ gbde_stop() { for device in $gbde_devices; do - umount ${device} - gbde detach ${device%.bde} + parent=${device%.bde} + parent=${parent#/dev/} + if [ -e "/dev/${parent}.bde" ]; then + umount "/dev/${parent}.bde" 2>/dev/null + gbde detach "${parent}" + fi done } ==== //depot/projects/hammer/etc/rc.d/gbde_swap#4 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/gbde_swap,v 1.5 2004/08/18 21:54:40 thomas Exp $ +# $FreeBSD: src/etc/rc.d/gbde_swap,v 1.6 2004/10/07 13:55:25 mtm Exp $ # # PROVIDE: disks # REQUIRE: initrandom -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/hammer/etc/rc.d/hostname#7 (text+ko) ==== @@ -23,13 +23,12 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/hostname,v 1.7 2004/04/02 12:18:40 krion Exp $ +# $FreeBSD: src/etc/rc.d/hostname,v 1.8 2004/10/07 13:55:25 mtm Exp $ # # PROVIDE: hostname # REQUIRE: mountcritlocal # BEFORE: netif -# KEYWORD: FreeBSD >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Oct 10 19:09:33 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9982516A4D1; Sun, 10 Oct 2004 19:09:33 +0000 (GMT) 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 5CCFE16A4CE for ; Sun, 10 Oct 2004 19:09:33 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3FD8143D1D for ; Sun, 10 Oct 2004 19:09:33 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9AJ9XXW096462 for ; Sun, 10 Oct 2004 19:09:33 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9AJ9Wu0096459 for perforce@freebsd.org; Sun, 10 Oct 2004 19:09:32 GMT (envelope-from peter@freebsd.org) Date: Sun, 10 Oct 2004 19:09:32 GMT Message-Id: <200410101909.i9AJ9Wu0096459@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 62958 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, 10 Oct 2004 19:09:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=62958 Change 62958 by peter@peter_daintree on 2004/10/10 19:09:08 integ -I -b i386_hammer Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/gdb_machdep.c#2 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#48 integrate .. //depot/projects/hammer/sys/amd64/include/pmap.h#50 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_bus.c#22 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/gdb_machdep.c#2 (text+ko) ==== @@ -39,6 +39,8 @@ #include #include #include +#include +#include #include @@ -48,6 +50,16 @@ struct trapframe *tf = kdb_frame; *regsz = gdb_cpu_regsz(regnum); + + /* XXX this stuff is mighty suspicious */ + if (kdb_thread == curthread) { + switch (regnum) { + case 0: return (&tf->tf_rax); + case 1: return (&tf->tf_rcx); + case 2: return (&tf->tf_rdx); + } + } + /* i386 uses kdb_thrctx, a pcb for these */ switch (regnum) { case 0: return (&tf->tf_rax); case 1: return (&tf->tf_rbx); @@ -78,7 +90,11 @@ { struct trapframe *tf = kdb_frame; + val = __bswap64(val); switch (regnum) { - case GDB_REG_PC: tf->tf_rip = val; break; + case GDB_REG_PC: + kdb_thrctx->pcb_rip = val; + if (kdb_thread == curthread) + tf->tf_rip = val; } } ==== //depot/projects/hammer/sys/amd64/conf/NOTES#48 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# (XXX from i386:NOTES,v 1.1172) +# (XXX from i386:NOTES,v 1.1173) # $FreeBSD: src/sys/amd64/conf/NOTES,v 1.20 2004/09/22 01:04:54 peter Exp $ # @@ -312,6 +312,10 @@ device digi_Xe device digi_Xem device digi_Xr +# Parallel (8255 PPI) basic I/O (mode 0) port (e.g. Advantech PCL-724) +#device pbio +#hint.pbio.0.at="isa" +#hint.pbio.0.port="0x360" # sx device is i386 and pc98 only at the moment. device sx options SX_DEBUG ==== //depot/projects/hammer/sys/amd64/include/pmap.h#50 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/pci/pci_bus.c#22 (text+ko) ==== @@ -42,6 +42,7 @@ #include #include #include +#include #include "pcib_if.h" @@ -81,8 +82,8 @@ static const char * legacy_pcib_is_host_bridge(int bus, int slot, int func, - u_int32_t id, u_int8_t class, u_int8_t subclass, - u_int8_t *busnum) + uint32_t id, uint8_t class, uint8_t subclass, + uint8_t *busnum) { const char *s = NULL; @@ -262,6 +263,24 @@ return ENOENT; } +static struct resource * +legacy_pcib_alloc_resource(device_t dev, device_t child, int type, int *rid, + u_long start, u_long end, u_long count, u_int flags) +{ + /* + * If no memory preference is given, use upper 32MB slot most + * bioses use for their memory window. Typically other bridges + * before us get in the way to assert their preferences on memory. + * Hardcoding like this sucks, so a more MD/MI way needs to be + * found to do it. This is typically only used on older laptops + * that don't have pci busses behind pci bridge, so assuming > 32MB + * is liekly OK. + */ + if (type == SYS_RES_MEMORY && start == 0UL && end == ~0UL) + start = 0xfe000000; + return (bus_generic_alloc_resource(dev, child, type, rid, start, end, + count, flags)); +} static device_method_t legacy_pcib_methods[] = { /* Device interface */ @@ -276,7 +295,7 @@ DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_read_ivar, legacy_pcib_read_ivar), DEVMETHOD(bus_write_ivar, legacy_pcib_write_ivar), - DEVMETHOD(bus_alloc_resource, bus_generic_alloc_resource), + DEVMETHOD(bus_alloc_resource, legacy_pcib_alloc_resource), DEVMETHOD(bus_release_resource, bus_generic_release_resource), DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), From owner-p4-projects@FreeBSD.ORG Sun Oct 10 19:10:35 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 42A6216A4D1; Sun, 10 Oct 2004 19:10:35 +0000 (GMT) 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 1FB0E16A4CE for ; Sun, 10 Oct 2004 19:10:35 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F365F43D39 for ; Sun, 10 Oct 2004 19:10:34 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9AJAYqI096576 for ; Sun, 10 Oct 2004 19:10:34 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9AJAYuv096573 for perforce@freebsd.org; Sun, 10 Oct 2004 19:10:34 GMT (envelope-from peter@freebsd.org) Date: Sun, 10 Oct 2004 19:10:34 GMT Message-Id: <200410101910.i9AJAYuv096573@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 62959 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, 10 Oct 2004 19:10:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=62959 Change 62959 by peter@peter_daintree on 2004/10/10 19:10:29 duplicate i386/isa/pbio.c Affected files ... .. //depot/projects/hammer/sys/amd64/isa/pbio.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Mon Oct 11 15:52:48 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D35C516A4D1; Mon, 11 Oct 2004 15:52:47 +0000 (GMT) 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 A618716A4CE for ; Mon, 11 Oct 2004 15:52:47 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 73B7043D2D for ; Mon, 11 Oct 2004 15:52:47 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9BFqlww069075 for ; Mon, 11 Oct 2004 15:52:47 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9BFqlTV069072 for perforce@freebsd.org; Mon, 11 Oct 2004 15:52:47 GMT (envelope-from peter@freebsd.org) Date: Mon, 11 Oct 2004 15:52:47 GMT Message-Id: <200410111552.i9BFqlTV069072@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 62991 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, 11 Oct 2004 15:52:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=62991 Change 62991 by peter@peter_overcee on 2004/10/11 15:51:46 IFC @62990 Affected files ... .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#82 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#8 integrate .. //depot/projects/hammer/share/man/man4/polling.4#11 integrate .. //depot/projects/hammer/sys/amd64/acpica/acpi_machdep.c#18 integrate .. //depot/projects/hammer/sys/amd64/include/acpica_machdep.h#12 integrate .. //depot/projects/hammer/sys/arm/conf/SIMICS#3 integrate .. //depot/projects/hammer/sys/arm/sa11x0/assabet_machdep.c#5 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cmbat.c#19 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#25 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc.c#19 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_machdep.c#20 integrate .. //depot/projects/hammer/sys/i386/include/acpica_machdep.h#6 integrate .. //depot/projects/hammer/sys/i386/isa/pbio.c#2 integrate .. //depot/projects/hammer/sys/ia64/acpica/acpi_machdep.c#5 integrate .. //depot/projects/hammer/sys/ia64/include/acpica_machdep.h#4 integrate .. //depot/projects/hammer/sys/kern/subr_witness.c#35 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#39 integrate .. //depot/projects/hammer/sys/net/if_ethersubr.c#33 integrate .. //depot/projects/hammer/sys/net/if_tun.c#20 integrate .. //depot/projects/hammer/usr.sbin/moused/moused.8#8 integrate .. //depot/projects/hammer/usr.sbin/moused/moused.c#9 integrate .. //depot/projects/hammer/usr.sbin/ppp/ccp.c#4 integrate .. //depot/projects/hammer/usr.sbin/ppp/chat.c#3 integrate .. //depot/projects/hammer/usr.sbin/ppp/command.c#10 integrate .. //depot/projects/hammer/usr.sbin/ppp/datalink.c#5 integrate .. //depot/projects/hammer/usr.sbin/ppp/datalink.h#3 integrate .. //depot/projects/hammer/usr.sbin/ppp/nat_cmd.c#5 integrate .. //depot/projects/hammer/usr.sbin/ppp/ncp.c#4 integrate .. //depot/projects/hammer/usr.sbin/ppp/physical.c#7 integrate .. //depot/projects/hammer/usr.sbin/ppp/radius.c#11 integrate .. //depot/projects/hammer/usr.sbin/ppp/route.c#5 integrate Differences ... ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#82 (text+ko) ==== @@ -3,7 +3,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.780 2004/10/08 15:51:02 hrs Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.781 2004/10/11 13:07:04 den Exp $ 2000 @@ -1677,7 +1677,7 @@ updated from the 29 July 2003 release to the 7 February 2004 release. - BIND has been updated to + BIND has been updated from version 8.3.1-REL to version 9.3.0. &merged; Binutils have been updated to ==== //depot/projects/hammer/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#8 (text+ko) ==== @@ -1,9 +1,9 @@ @@ -11,7 +11,7 @@ Проект &os; - $FreeBSD: src/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml,v 1.11 2004/10/01 08:54:34 den Exp $ + $FreeBSD: src/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml,v 1.12 2004/10/11 06:36:48 den Exp $ 2000 @@ -230,6 +230,14 @@ За дальнейшей информацией обращайтесь к сообщению безопасности FreeBSD-SA-04:14. &merged; + Ошибка в CONS_SCRSHOT &man.ioctl.2; + была исправлена; она может привести к получению неавторизованного + доступа к областям памяти ядра с возможным раскрытием + критической информации, пропуску механизмов контроля доступа, + или к получению повышенных привилегий. За дальнейшей информацией + обращайтесь к сообщению безопасности FreeBSD-SA-04:15. &merged; + @@ -794,11 +802,11 @@ скорость передачи данных. &merged; Поддержка интерфейсами &man.polling.4; теперь может быть включена - поинтерфейсно. Все драйвера, поддерживающие &man.polling.4; - (&man.dc.4;, &man.fxp.4;, &man.em.4;, &man.nge.4;, &man.re.4;, - &man.rl.4;, &man.sis.4;, &man.ste.4;, и &man.vr.4;), - теперь также поддерживают эту возможность, которая может управляться - через &man.ifconfig.8;. &merged; + поинтерфейсно. Следующие сетевые драйверы поддерживают &man.polling.4;: + &man.dc.4;, &man.fxp.4;, &man.em.4;, &man.ixgb.4;, + &man.nge.4;, &man.re.4;, &man.rl.4;, &man.sis.4;, &man.ste.4;, &man.vge.4;, + и &man.vr.4;. Эта возможность может управляться + через &man.ifconfig.8; (за исключением &man.ixgb.4;). &merged; @@ -1630,6 +1638,41 @@ работы сохраняет текущие настройки всех аудио микшеров, присутствующих в системе, и восстанавливает их при загрузке. + Скрипт named был обновлен для поддержки + BIND 9 в базовой системе. Изменения + включают: + + + + &man.named.8; по умолчанию запускается в каталоге + &man.chroot.2; /var/named. + Это поведение может быть отменено переменной + named_chrootdir в файле + named_chrootdir, + а каталог &man.chroot.2; может быть изменен переменной + named_chrootdir в том же файле. + + + + Когда переменная named_chroot_autoupdate + установлена в YES (это значение по умолчанию), + каталог chroot автоматически настраивается во время загрузки. + Символическая ссылка, которая указывает на + /var/named/etc/namedb, создается как + /etc/namedb, а символическая ссылка, + которая указывает в + /var/named/var/run/named/pid, создается + как /var/run/named/pid. Последнее может + быть отменено переменной named_symlink_enable + в файле rc.conf. + + + + Файл rndc.key создается + автоматически, если еще не существует. + + + Были добавлены скрипты pf и pflog для &man.pf.4;. @@ -1647,6 +1690,9 @@ awk от Bell Labs был обновлен с релиза от 29 июня 2003 года до релиза 7 февраля 2004 года. + BIND был обновлен с версии + 8.3.1-REL до версии 9.3.0. &merged; + Binutils были обновлены до снэпшота от 23 мая 2004 из ветви FSF 2.15. @@ -1695,7 +1741,7 @@ libpcap была обновлена с версии 0.7.1 до версии 0.8.3. - lukemftp + lukemftpd был обновлен с снэпшота от 3 ноября 2003 года до снэпшота от 9 августа 2004 года. ==== //depot/projects/hammer/share/man/man4/polling.4#11 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/polling.4,v 1.13 2004/09/18 12:33:01 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/polling.4,v 1.14 2004/10/11 13:27:44 brueffer Exp $ .\" .Dd April 5, 2004 .Dt POLLING 4 @@ -188,6 +188,7 @@ .Xr rl 4 , .Xr sis 4 , .Xr ste 4 , +.Xr vge 4 , and .Xr vr 4 devices are supported, with others in the works. ==== //depot/projects/hammer/sys/amd64/acpica/acpi_machdep.c#18 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.15 2004/08/16 23:10:18 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.16 2004/10/11 05:39:14 njl Exp $"); #include #include @@ -61,3 +61,9 @@ { return (0); } + +void +acpi_cpu_c1() +{ + __asm __volatile("sti; hlt"); +} ==== //depot/projects/hammer/sys/amd64/include/acpica_machdep.h#12 (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/amd64/include/acpica_machdep.h,v 1.5 2004/05/05 20:04:14 njl Exp $ + * $FreeBSD: src/sys/amd64/include/acpica_machdep.h,v 1.6 2004/10/11 05:39:15 njl Exp $ */ /****************************************************************************** @@ -73,6 +73,7 @@ #define COMPILER_DEPENDENT_INT64 long #define COMPILER_DEPENDENT_UINT64 unsigned long -void acpi_SetDefaultIntrModel(int model); +void acpi_SetDefaultIntrModel(int model); +void acpi_cpu_c1(void); #endif /* __ACPICA_MACHDEP_H__ */ ==== //depot/projects/hammer/sys/arm/conf/SIMICS#3 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.3 2004/09/23 22:53:50 cognet Exp $ +# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.4 2004/10/11 14:42:06 cognet Exp $ machine arm ident SIMICS @@ -40,6 +40,7 @@ options UFS_ACL #Support for access control lists options UFS_DIRHASH #Improve performance on big directories options MD_ROOT #MD is a potential root device +options MD_ROOT_SIZE=65535 options ROOTDEVNAME=\"ufs:md0\" options NFSCLIENT #Network Filesystem Client options NFSSERVER #Network Filesystem Server ==== //depot/projects/hammer/sys/arm/sa11x0/assabet_machdep.c#5 (text+ko) ==== @@ -47,7 +47,9 @@ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.4 2004/09/23 22:32:33 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.5 2004/10/11 14:41:38 cognet Exp $"); + +#include "opt_md.h" #define _ARM32_BUS_DMA_PRIVATE #include @@ -131,7 +133,9 @@ struct pcpu __pcpu; struct pcpu *pcpup = &__pcpu; -#define MDSIZE 8192 +#ifndef MD_ROOT_SIZE +#error SIMICS needs MD_ROOT and MD_ROOT_SIZE +#endif /* Physical and virtual addresses for some global pages */ vm_paddr_t phys_avail[10]; @@ -218,7 +222,7 @@ fake_preload[i++] = MDROOT_ADDR; fake_preload[i++] = MODINFO_SIZE; fake_preload[i++] = sizeof(uint32_t); - fake_preload[i++] = MDSIZE * 1024; + fake_preload[i++] = MD_ROOT_SIZE * 1024; fake_preload[i++] = 0; fake_preload[i] = 0; preload_metadata = (void *)fake_preload; @@ -236,7 +240,6 @@ kerneldatasize = (u_int32_t)&end - (u_int32_t)KERNEL_TEXT_BASE; symbolsize = 0; freemempos = (vm_offset_t)round_page(physical_freestart); - printf("freemempos %p\n", (void*)freemempos); memset((void *)freemempos, 0, 256*1024); /* Define a macro to simplify memory allocation */ #define valloc_pages(var, np) \ @@ -311,12 +314,10 @@ pmap_map_chunk(l1pagetable, KERNBASE, KERNBASE, (uint32_t)&end - KERNBASE, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); /* Map the stack pages */ - printf("avant irq %p %p\n", (void*)irqstack.pv_va, (void*)irqstack.pv_pa); pmap_map_chunk(l1pagetable, irqstack.pv_va, irqstack.pv_pa, IRQ_STACK_SIZE * PAGE_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); - printf("apres irq\n"); pmap_map_chunk(l1pagetable, md_addr.pv_va, md_addr.pv_pa, - MDSIZE * 1024, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); + MD_ROOT_SIZE * 1024, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); pmap_map_chunk(l1pagetable, abtstack.pv_va, abtstack.pv_pa, ABT_STACK_SIZE * PAGE_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); pmap_map_chunk(l1pagetable, undstack.pv_va, undstack.pv_pa, @@ -365,7 +366,6 @@ * Since the ARM stacks use STMFD etc. we must set r13 to the top end * of the stack memory. */ - printf("init subsystems: stacks\n"); set_stackptr(PSR_IRQ32_MODE, irqstack.pv_va + IRQ_STACK_SIZE * PAGE_SIZE); set_stackptr(PSR_ABT32_MODE, ==== //depot/projects/hammer/sys/dev/acpica/acpi_cmbat.c#19 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_cmbat.c,v 1.36 2004/08/17 18:36:07 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_cmbat.c,v 1.37 2004/10/11 06:18:07 njl Exp $ */ #include "opt_acpi.h" @@ -189,6 +189,10 @@ goto end; acpi_cmbat_info_updated(&sc->bst_lastupdated); + /* XXX Should we shut down here? */ + if (sc->bst.state & ACPI_BATT_STAT_CRITICAL) + device_printf(dev, "critically low charge!\n"); + end: if (bst_buffer.Pointer != NULL) AcpiOsFree(bst_buffer.Pointer); ==== //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#25 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.42 2004/08/13 06:21:47 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.44 2004/10/11 06:06:42 njl Exp $"); #include "opt_acpi.h" #include @@ -43,9 +43,6 @@ #include #include #include -#ifdef __ia64__ -#include -#endif #include #include "acpi.h" @@ -106,8 +103,9 @@ #define ACPI_CPU_NOTIFY_PERF_STATES 0x80 /* _PSS changed. */ #define ACPI_CPU_NOTIFY_CX_STATES 0x81 /* _CST changed. */ -#define CPU_QUIRK_NO_C3 0x0001 /* C3-type states are not usable. */ -#define CPU_QUIRK_NO_THROTTLE 0x0002 /* Throttling is not usable. */ +#define CPU_QUIRK_NO_C3 (1<<0) /* C3-type states are not usable. */ +#define CPU_QUIRK_NO_THROTTLE (1<<1) /* Throttling is not usable. */ +#define CPU_QUIRK_NO_BM_CTRL (1<<2) /* No bus mastering control. */ #define PCI_VENDOR_INTEL 0x8086 #define PCI_DEVICE_82371AB_3 0x7113 /* PIIX4 chipset for quirks. */ @@ -155,7 +153,6 @@ static void acpi_cpu_startup_cx(void); static void acpi_cpu_throttle_set(uint32_t speed); static void acpi_cpu_idle(void); -static void acpi_cpu_c1(void); static void acpi_cpu_notify(ACPI_HANDLE h, UINT32 notify, void *context); static int acpi_cpu_quirks(struct acpi_cpu_softc *sc); static int acpi_cpu_throttle_sysctl(SYSCTL_HANDLER_ARGS); @@ -465,12 +462,16 @@ ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); - /* Bus mastering arbitration control is needed for C3. */ + /* + * Bus mastering arbitration control is needed to keep caches coherent + * while sleeping in C3. If it's not present, we flush the caches before + * entering C3 instead. + */ if (AcpiGbl_FADT->V1_Pm2CntBlk == 0 || AcpiGbl_FADT->Pm2CntLen == 0) { - cpu_quirks |= CPU_QUIRK_NO_C3; + cpu_quirks |= CPU_QUIRK_NO_BM_CTRL; ACPI_DEBUG_PRINT((ACPI_DB_INFO, - "acpi_cpu%d: No BM control, C3 disabled\n", - device_get_unit(sc->cpu_dev))); + "acpi_cpu%d: no BM control, using flush cache method\n", + device_get_unit(sc->cpu_dev))); } /* @@ -856,15 +857,20 @@ * Check for bus master activity. If there was activity, clear * the bit and use the lowest non-C3 state. Note that the USB * driver polling for new devices keeps this bit set all the - * time if USB is loaded. + * time if USB is loaded. If bus mastering control is not available, + * flush caches. This can be quite slow but may be useful since not + * all systems support BM control. */ - AcpiGetRegister(ACPI_BITREG_BUS_MASTER_STATUS, &bm_active, - ACPI_MTX_DO_NOT_LOCK); - if (bm_active != 0) { - AcpiSetRegister(ACPI_BITREG_BUS_MASTER_STATUS, 1, - ACPI_MTX_DO_NOT_LOCK); - cx_next_idx = min(cx_next_idx, cpu_non_c3); - } + if ((cpu_quirks & CPU_QUIRK_NO_BM_CTRL) == 0) { + AcpiGetRegister(ACPI_BITREG_BUS_MASTER_STATUS, &bm_active, + ACPI_MTX_DO_NOT_LOCK); + if (bm_active != 0) { + AcpiSetRegister(ACPI_BITREG_BUS_MASTER_STATUS, 1, + ACPI_MTX_DO_NOT_LOCK); + cx_next_idx = min(cx_next_idx, cpu_non_c3); + } + } else + ACPI_FLUSH_CPU_CACHE(); /* Select the next state and update statistics. */ cx_next = &sc->cpu_cx_states[cx_next_idx]; @@ -907,7 +913,8 @@ AcpiHwLowLevelRead(32, &end_time, &AcpiGbl_FADT->XPmTmrBlk); /* Enable bus master arbitration and disable bus master wakeup. */ - if (cx_next->type == ACPI_STATE_C3) { + if (cx_next->type == ACPI_STATE_C3 && + (cpu_quirks & CPU_QUIRK_NO_BM_CTRL) == 0) { AcpiSetRegister(ACPI_BITREG_ARB_DISABLE, 0, ACPI_MTX_DO_NOT_LOCK); AcpiSetRegister(ACPI_BITREG_BUS_MASTER_RLD, 0, ACPI_MTX_DO_NOT_LOCK); } @@ -918,17 +925,6 @@ ACPI_ENABLE_IRQS(); } -/* Put the CPU in C1 in a machine-dependant way. */ -static void -acpi_cpu_c1() -{ -#ifdef __ia64__ - ia64_call_pal_static(PAL_HALT_LIGHT, 0, 0, 0); -#else - __asm __volatile("sti; hlt"); -#endif -} - /* * Re-evaluate the _PSS and _CST objects when we are notified that they * have changed. @@ -964,7 +960,7 @@ * flushing all caches which is currently too expensive. */ if (mp_ncpus > 1) - cpu_quirks |= CPU_QUIRK_NO_C3; + cpu_quirks |= CPU_QUIRK_NO_BM_CTRL; #ifdef notyet /* Look for various quirks of the PIIX4 part. */ ==== //depot/projects/hammer/sys/dev/fdc/fdc.c#19 (text+ko) ==== @@ -51,7 +51,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc.c,v 1.295 2004/09/25 08:56:57 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc.c,v 1.296 2004/10/10 23:39:59 peadar Exp $"); #include "opt_fdc.h" @@ -173,6 +173,7 @@ fd_searchlist_12m, /* FDT_12M */ fd_searchlist_720k, /* FDT_720K */ fd_searchlist_144m, /* FDT_144M */ + fd_searchlist_288m, /* FDT_288M_1 (mapped to FDT_288M) */ fd_searchlist_288m, /* FDT_288M */ }; ==== //depot/projects/hammer/sys/i386/acpica/acpi_machdep.c#20 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/acpica/acpi_machdep.c,v 1.25 2004/07/24 22:41:30 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/acpica/acpi_machdep.c,v 1.27 2004/10/11 05:42:12 njl Exp $"); #include #include @@ -333,20 +333,26 @@ int acpi_machdep_quirks(int *quirks) { - char *va; - int year; + char *va; + int year; + + /* BIOS address 0xffff5 contains the date in the format mm/dd/yy. */ + va = pmap_mapdev(0xffff0, 16); + sscanf(va + 11, "%2d", &year); + pmap_unmapdev((vm_offset_t)va, 16); - /* BIOS address 0xffff5 contains the date in the format mm/dd/yy. */ - va = pmap_mapdev(0xffff0, 16); - sscanf(va + 11, "%2d", &year); - pmap_unmapdev((vm_offset_t)va, 16); + /* + * Date must be >= 1/1/1999 or we don't trust ACPI. Note that this + * check must be changed by my 114th birthday. + */ + if (year > 90 && year < 99) + *quirks = ACPI_Q_BROKEN; - /* - * Date must be >= 1/1/1999 or we don't trust ACPI. Note that this - * check must be changed by my 114th birthday. - */ - if (year > 90 && year < 99) - *quirks = ACPI_Q_BROKEN; + return (0); +} - return (0); +void +acpi_cpu_c1() +{ + __asm __volatile("sti; hlt"); } ==== //depot/projects/hammer/sys/i386/include/acpica_machdep.h#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/include/acpica_machdep.h,v 1.6 2004/05/05 20:04:14 njl Exp $ + * $FreeBSD: src/sys/i386/include/acpica_machdep.h,v 1.7 2004/10/11 05:39:15 njl Exp $ */ /****************************************************************************** @@ -93,6 +93,7 @@ #define COMPILER_DEPENDENT_UINT64 unsigned long long #define ACPI_USE_NATIVE_DIVIDE -void acpi_SetDefaultIntrModel(int model); +void acpi_SetDefaultIntrModel(int model); +void acpi_cpu_c1(void); #endif /* __ACPICA_MACHDEP_H__ */ ==== //depot/projects/hammer/sys/i386/isa/pbio.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/isa/pbio.c,v 1.4 2004/10/10 03:26:20 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/isa/pbio.c,v 1.5 2004/10/11 00:58:24 imp Exp $"); #include #include @@ -113,7 +113,6 @@ * One of these per allocated device */ struct pbio_softc { - int iobase; /* I/O base */ struct portdata pd[PBIO_NPORTS];/* Per port data */ int iomode; /* Virtualized I/O mode port value */ /* The real port is write-only */ @@ -186,7 +185,7 @@ /* Set all ports to output */ pboutb(scp, PBIO_CFG, 0x80); printf("pbio val(CFG: 0x%03x)=0x%02x (should be 0x80)\n", - iobase, pbinb(scp, PBIO_CFG)); + rman_get_start(scp->res), pbinb(scp, PBIO_CFG)); pboutb(scp, PBIO_PORTA, 0xa5); val = pbinb(scp, PBIO_PORTA); printf("pbio val=0x%02x (should be 0xa5)\n", val); @@ -221,7 +220,6 @@ int i; int rid; struct pbio_softc *sc; - int flags, i, iobase, rid, unit; sc = device_get_softc(dev); unit = device_get_unit(dev); @@ -403,7 +401,7 @@ pbiowrite(struct cdev *dev, struct uio *uio, int ioflag) { struct pbio_softc *scp; - int i, iobase, port, ret, towrite, unit; + int i, port, ret, towrite, unit; char val, oval; unit = UNIT(dev); ==== //depot/projects/hammer/sys/ia64/acpica/acpi_machdep.c#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/sys/ia64/acpica/acpi_machdep.c,v 1.4 2004/06/30 04:42:29 njl Exp $ + * $FreeBSD: src/sys/ia64/acpica/acpi_machdep.c,v 1.5 2004/10/11 05:39:14 njl Exp $ */ #include @@ -31,6 +31,7 @@ #include "acpi.h" #include +#include int acpi_machdep_init(device_t dev) @@ -49,3 +50,9 @@ { return (0); } + +void +acpi_cpu_c1() +{ + ia64_call_pal_static(PAL_HALT_LIGHT, 0, 0, 0); +} ==== //depot/projects/hammer/sys/ia64/include/acpica_machdep.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/include/acpica_machdep.h,v 1.3 2004/05/05 20:04:14 njl Exp $ + * $FreeBSD: src/sys/ia64/include/acpica_machdep.h,v 1.4 2004/10/11 05:39:15 njl Exp $ */ /****************************************************************************** @@ -75,4 +75,6 @@ #define COMPILER_DEPENDENT_INT64 long #define COMPILER_DEPENDENT_UINT64 unsigned long +void acpi_cpu_c1(void); + #endif /* __ACPICA_MACHDEP_H__ */ ==== //depot/projects/hammer/sys/kern/subr_witness.c#35 (text+ko) ==== @@ -82,7 +82,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_witness.c,v 1.181 2004/10/09 08:16:37 green Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_witness.c,v 1.182 2004/10/11 08:26:18 rwatson Exp $"); #include "opt_ddb.h" #include "opt_witness.h" @@ -352,8 +352,7 @@ { "turnstile chain", &lock_class_mtx_spin }, { "td_contested", &lock_class_mtx_spin }, { "callout", &lock_class_mtx_spin }, - { "entropy harvest", &lock_class_mtx_spin }, - { "entropy harvest buffers", &lock_class_mtx_spin }, + { "entropy harvest mutex", &lock_class_mtx_spin }, /* * leaf locks */ ==== //depot/projects/hammer/sys/kern/uipc_socket.c#39 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.212 2004/09/05 14:33:21 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.213 2004/10/11 08:11:26 rwatson Exp $"); #include "opt_inet.h" #include "opt_mac.h" @@ -316,22 +316,34 @@ return (0); } +/* + * Attempt to free a socket. This should really be sotryfree(). + * + * We free the socket if the protocol is no longer interested in the socket, + * there's no file descriptor reference, and the refcount is 0. While the + * calling macro sotryfree() tests the refcount, sofree() has to test it + * again as it's possible to race with an accept()ing thread if the socket is + * in an listen queue of a listen socket, as being in the listen queue + * doesn't elevate the reference count. sofree() acquires the accept mutex + * early for this test in order to avoid that race. + */ void sofree(so) struct socket *so; { struct socket *head; - KASSERT(so->so_count == 0, ("socket %p so_count not 0", so)); - SOCK_LOCK_ASSERT(so); + SOCK_UNLOCK(so); + ACCEPT_LOCK(); + SOCK_LOCK(so); - if (so->so_pcb != NULL || (so->so_state & SS_NOFDREF) == 0) { + if (so->so_pcb != NULL || (so->so_state & SS_NOFDREF) == 0 || + so->so_count != 0) { SOCK_UNLOCK(so); + ACCEPT_UNLOCK(); return; } - SOCK_UNLOCK(so); - ACCEPT_LOCK(); head = so->so_head; if (head != NULL) { KASSERT((so->so_qstate & SQ_COMP) != 0 || @@ -353,6 +365,7 @@ * the listening socket is closed. */ if ((so->so_qstate & SQ_COMP) != 0) { + SOCK_UNLOCK(so); ACCEPT_UNLOCK(); return; } @@ -365,6 +378,7 @@ (so->so_qstate & SQ_INCOMP) == 0, ("sofree: so_head == NULL, but still SQ_COMP(%d) or SQ_INCOMP(%d)", so->so_qstate & SQ_COMP, so->so_qstate & SQ_INCOMP)); + SOCK_UNLOCK(so); ACCEPT_UNLOCK(); SOCKBUF_LOCK(&so->so_snd); so->so_snd.sb_flags |= SB_NOINTR; ==== //depot/projects/hammer/sys/net/if_ethersubr.c#33 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)if_ethersubr.c 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/net/if_ethersubr.c,v 1.177 2004/07/27 23:20:45 rwatson Exp $ + * $FreeBSD: src/sys/net/if_ethersubr.c,v 1.178 2004/10/11 10:21:34 rwatson Exp $ */ #include "opt_atalk.h" @@ -614,10 +614,10 @@ } } - ether_demux(ifp, m); /* First chunk of an mbuf contains good entropy */ if (harvest.ethernet) random_harvest(m, 16, 3, 0, RANDOM_NET); + ether_demux(ifp, m); } /* ==== //depot/projects/hammer/sys/net/if_tun.c#20 (text+ko) ==== @@ -13,7 +13,7 @@ * UCL. This driver is based much more on read/write/poll mode of * operation though. * - * $FreeBSD: src/sys/net/if_tun.c,v 1.144 2004/07/15 08:26:06 phk Exp $ + * $FreeBSD: src/sys/net/if_tun.c,v 1.145 2004/10/11 07:28:36 glebius Exp $ */ #include "opt_atalk.h" @@ -765,7 +765,7 @@ return (ENOBUFS); mlen = MHLEN; - top = 0; + top = NULL; mp = ⊤ while (error == 0 && uio->uio_resid > 0) { m->m_len = min(mlen, uio->uio_resid); ==== //depot/projects/hammer/usr.sbin/moused/moused.8#8 (text+ko) ==== @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/usr.sbin/moused/moused.8,v 1.46 2004/08/03 18:43:45 philip Exp $ +.\" $FreeBSD: src/usr.sbin/moused/moused.8,v 1.47 2004/10/11 07:57:08 philip Exp $ .\" .Dd April 1, 2000 .Dt MOUSED 8 @@ -43,6 +43,7 @@ .Op Fl F Ar rate .Op Fl r Ar resolution .Op Fl S Ar baudrate +.Op Fl V Op Fl U Ar distance .Op Fl a Ar X Ns Op , Ns Ar Y .Op Fl C Ar threshold .Op Fl m Ar N=M @@ -156,6 +157,12 @@ .It Fl S Ar baudrate Select the baudrate for the serial port (1200 to 9600). Not all serial mice support this option. +.It Fl V +Enable ``Virtual Scrolling'', with this option set, holding the middle mouse +button down will cause motion to be interpreted as scrolling. Use the +.Fl U +option to set the distance the mouse must move before the scrolling mode is +activated. .It Fl a Ar X Ns Op , Ns Ar Y Accelerate or decelerate the mouse input. This is a linear acceleration only. ==== //depot/projects/hammer/usr.sbin/moused/moused.c#9 (text+ko) ==== @@ -45,7 +45,7 @@ **/ #include -__FBSDID("$FreeBSD: src/usr.sbin/moused/moused.c,v 1.67 2004/08/03 18:43:45 philip Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/moused/moused.c,v 1.68 2004/10/11 07:57:08 philip Exp $"); #include #include @@ -76,6 +76,7 @@ #define MAX_BUTTON2TIMEOUT 2000 /* 2 seconds */ #define DFLT_CLICKTHRESHOLD 500 /* 0.5 second */ #define DFLT_BUTTON2TIMEOUT 100 /* 0.1 second */ +#define DFLT_SCROLLTHRESHOLD 3 /* 3 pixels */ /* Abort 3-button emulation delay after this many movement events. */ #define BUTTON2_MAXMOVE 3 @@ -97,11 +98,12 @@ #define ClearDTR 0x0004 #define ClearRTS 0x0008 #define NoPnP 0x0010 +#define VirtualScroll 0x0020 #define ID_NONE 0 #define ID_PORT 1 #define ID_IF 2 -#define ID_TYPE 4 +#define ID_TYPE 4 #define ID_MODEL 8 #define ID_ALL (ID_PORT | ID_IF | ID_TYPE | ID_MODEL) @@ -159,6 +161,13 @@ int extioctl = FALSE; char *pidfile = "/var/run/moused.pid"; +#define SCROLL_NOTSCROLLING 0 +#define SCROLL_PREPARE 1 +#define SCROLL_SCROLLING 2 + +static int scroll_state; +static int scroll_movement; + /* local variables */ /* interface (the table must be ordered by MOUSE_IF_XXX in mouse.h) */ @@ -380,6 +389,7 @@ mousemode_t mode; /* protocol information */ float accelx; /* Acceleration in the X axis */ float accely; /* Acceleration in the Y axis */ + int scrollthreshold; /* Movement distance before virtual scrolling */ } rodent = { .flags = 0, .portname = NULL, @@ -398,6 +408,7 @@ .button2timeout = DFLT_BUTTON2TIMEOUT, .accelx = 1.0, .accely = 1.0, + .scrollthreshold = DFLT_SCROLLTHRESHOLD, }; /* button status */ @@ -509,7 +520,7 @@ for (i = 0; i < MOUSE_MAXBUTTON; ++i) mstate[i] = &bstate[i]; - while ((c = getopt(argc, argv, "3C:DE:F:I:PRS:a:cdfhi:l:m:p:r:st:w:z:")) != -1) + while ((c = getopt(argc, argv, "3C:DE:F:I:PRS:VU:a:cdfhi:l:m:p:r:st:w:z:")) != -1) switch(c) { case '3': @@ -714,6 +725,17 @@ warnx("no such mouse type `%s'", optarg); usage(); + case 'V': + rodent.flags |= VirtualScroll; + break; + case 'U': + rodent.scrollthreshold = atoi(optarg); + if (rodent.scrollthreshold < 0) { + warnx("invalid argument `%s'", optarg); + usage(); + } + break; + case 'h': case '?': default: @@ -967,6 +989,50 @@ } if ((flags = r_protocol(b, &action0)) == 0) continue; + + if (rodent.flags & VirtualScroll) { + /* Allow middle button drags to scroll up and down */ + if (action0.button == MOUSE_BUTTON2DOWN) { + if (scroll_state == SCROLL_NOTSCROLLING) { + scroll_state = SCROLL_PREPARE; + debug("PREPARING TO SCROLL"); + } + debug("[BUTTON2] flags:%08x buttons:%08x obuttons:%08x", + action.flags, action.button, action.obutton); + } else { + debug("[NOTBUTTON2] flags:%08x buttons:%08x obuttons:%08x", + action.flags, action.button, action.obutton); + + /* This isn't a middle button down... move along... */ + if (scroll_state == SCROLL_SCROLLING) { + /* + * We were scrolling, someone let go of button 2. + * Now turn autoscroll off. + */ + scroll_state = SCROLL_NOTSCROLLING; + debug("DONE WITH SCROLLING / %d", scroll_state); + } else if (scroll_state == SCROLL_PREPARE) { + mousestatus_t newaction = action0; + + /* We were preparing to scroll, but we never moved... */ + r_timestamp(&action0); + r_statetrans(&action0, &newaction, + A(newaction.button & MOUSE_BUTTON1DOWN, + action0.button & MOUSE_BUTTON3DOWN)); + + /* Send middle down */ + newaction.button = MOUSE_BUTTON2DOWN; + r_click(&newaction); + + /* Send middle up */ + r_timestamp(&newaction); + newaction.obutton = newaction.button; + newaction.button = action0.button; + r_click(&newaction); + } + } + } + r_timestamp(&action0); r_statetrans(&action0, &action, A(action0.button & MOUSE_BUTTON1DOWN, @@ -984,8 +1050,41 @@ debug("activity : buttons 0x%08x dx %d dy %d dz %d", action2.button, action2.dx, action2.dy, action2.dz); + if (rodent.flags & VirtualScroll) { + /* + * If *only* the middle button is pressed AND we are moving + * the stick/trackpoint/nipple, scroll! + */ + if (scroll_state == SCROLL_PREPARE) { + /* Ok, Set we're really scrolling now.... */ + if (action2.dy || action2.dx) + scroll_state = SCROLL_SCROLLING; + } + if (scroll_state == SCROLL_SCROLLING) { + scroll_movement += action2.dy; + debug("SCROLL: %d", scroll_movement); + + if (scroll_movement < -rodent.scrollthreshold) { + /* Scroll down */ + action2.dz = -1; + scroll_movement = 0; + } + else if (scroll_movement > rodent.scrollthreshold) { + /* Scroll up */ + action2.dz = 1; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Oct 11 17:00:10 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B99816A4DB; Mon, 11 Oct 2004 17:00:10 +0000 (GMT) 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 01E7216A4DA for ; Mon, 11 Oct 2004 17:00:10 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D651343D2D for ; Mon, 11 Oct 2004 17:00:09 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9BH09ZG077486 for ; Mon, 11 Oct 2004 17:00:09 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9BH09iP077483 for perforce@freebsd.org; Mon, 11 Oct 2004 17:00:09 GMT (envelope-from peter@freebsd.org) Date: Mon, 11 Oct 2004 17:00:09 GMT Message-Id: <200410111700.i9BH09iP077483@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 62994 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, 11 Oct 2004 17:00:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=62994 Change 62994 by peter@peter_daintree on 2004/10/11 16:59:10 just in case it works Affected files ... .. //depot/projects/hammer/sys/conf/files.amd64#58 edit Differences ... ==== //depot/projects/hammer/sys/conf/files.amd64#58 (text+ko) ==== @@ -102,6 +102,7 @@ amd64/isa/isa.c standard amd64/isa/isa_dma.c standard amd64/isa/nmi.c standard +amd64/isa/pbio.c optional pbio amd64/pci/pci_bus.c optional pci amd64/pci/pci_cfgreg.c optional pci crypto/blowfish/bf_enc.c optional crypto From owner-p4-projects@FreeBSD.ORG Mon Oct 11 20:26:33 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C82216A501; Mon, 11 Oct 2004 20:26:33 +0000 (GMT) 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 C07D216A4EF for ; Mon, 11 Oct 2004 20:26:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 27EE143D31 for ; Mon, 11 Oct 2004 20:26:32 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9BKQWZ5085097 for ; Mon, 11 Oct 2004 20:26:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9BKQFer085094 for perforce@freebsd.org; Mon, 11 Oct 2004 20:26:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 11 Oct 2004 20:26:15 GMT Message-Id: <200410112026.i9BKQFer085094@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 63008 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, 11 Oct 2004 20:26:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=63008 Change 63008 by rwatson@rwatson_tislabs on 2004/10/11 20:25:22 Big momma integrate of the TrustedBSD base branch to 6.0-CURRENT. Many, many things, including Giant off the network stack by default, vast scheduler changes, MBUMA, BIND9, maybe a gcc upgrade, etc. Affected files ... .. //depot/projects/trustedbsd/base/MAINTAINERS#26 integrate .. //depot/projects/trustedbsd/base/Makefile#35 integrate .. //depot/projects/trustedbsd/base/Makefile.inc1#53 integrate .. //depot/projects/trustedbsd/base/UPDATING#47 integrate .. //depot/projects/trustedbsd/base/bin/Makefile.inc#11 integrate .. //depot/projects/trustedbsd/base/bin/chflags/Makefile#2 integrate .. //depot/projects/trustedbsd/base/bin/chflags/chflags.1#6 integrate .. //depot/projects/trustedbsd/base/bin/chflags/chflags.c#6 integrate .. //depot/projects/trustedbsd/base/bin/date/date.1#11 integrate .. //depot/projects/trustedbsd/base/bin/date/vary.c#4 integrate .. //depot/projects/trustedbsd/base/bin/dd/args.c#13 integrate .. //depot/projects/trustedbsd/base/bin/dd/dd.1#9 integrate .. //depot/projects/trustedbsd/base/bin/dd/dd.c#13 integrate .. //depot/projects/trustedbsd/base/bin/dd/dd.h#7 integrate .. //depot/projects/trustedbsd/base/bin/dd/extern.h#7 integrate .. //depot/projects/trustedbsd/base/bin/ed/Makefile#9 integrate .. //depot/projects/trustedbsd/base/bin/mkdir/mkdir.c#8 integrate .. //depot/projects/trustedbsd/base/bin/rm/rm.1#9 integrate .. //depot/projects/trustedbsd/base/bin/rm/rm.c#13 integrate .. //depot/projects/trustedbsd/base/bin/sh/exec.c#11 integrate .. //depot/projects/trustedbsd/base/bin/sh/var.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/amd/conf/trap/trap_default.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind/CHANGES#9 delete .. //depot/projects/trustedbsd/base/contrib/bind/DNSSEC#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/FREEBSD-Upgrade#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/FREEBSD-Xlist#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/INSTALL#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/LICENSE#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/Makefile#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/README#8 delete .. //depot/projects/trustedbsd/base/contrib/bind/SUPPORT#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/TODO#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/Version#8 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/Makefile#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/addr/Makefile#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/addr/addr.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/dig/Makefile#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/dig/dig.c#6 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/dnskeygen/Makefile#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/dnskeygen/dnskeygen.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/dnsquery/Makefile#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/dnsquery/dnsquery.c#5 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/host/Makefile#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/host/host.c#6 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/irpd/Makefile#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/irpd/irpd.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/irpd/irs-irpd.conf#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/irpd/version.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/mkservdb/Makefile#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/mkservdb/mkservdb.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named-bootconf/Grot/named-bootconf.pl#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named-bootconf/Makefile#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named-bootconf/named-bootconf.sh#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named-bootconf/test.boot#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named-xfer/Makefile#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named-xfer/named-xfer.c#5 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/Makefile#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/db_defs.h#7 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/db_dump.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/db_func.h#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/db_glob.h#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/db_glue.c#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/db_ixfr.c#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/db_load.c#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/db_lookup.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/db_save.c#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/db_sec.c#6 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/db_tsig.c#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/db_update.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/named.conf#5 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/named.h#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_config.c#6 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_ctl.c#5 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_defs.h#8 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_forw.c#6 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_func.h#5 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_glob.h#5 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_glue.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_init.c#5 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_ixfr.c#5 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_lexer.c#6 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_lexer.h#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_main.c#6 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_maint.c#6 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_ncache.c#6 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_notify.c#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_parser.y#6 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_parseutil.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_parseutil.h#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_req.c#8 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_resp.c#9 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_signal.c#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_sort.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_stats.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_udp.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_update.c#5 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_xfr.c#5 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/pathtemplate.h#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/test/127.0.0.zone#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/test/localhost.zone#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/test/named.conf#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/test/root.hint#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/version.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/ndc/Makefile#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/ndc/ndc.c#5 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/nslookup/Makefile#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/nslookup/commands.l#5 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/nslookup/debug.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/nslookup/getinfo.c#6 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/nslookup/list.c#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/nslookup/main.c#6 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/nslookup/nslookup.help#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/nslookup/pathnames.h#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/nslookup/res.h#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/nslookup/send.c#6 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/nslookup/skip.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/nslookup/subr.c#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/nsupdate/Makefile#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/bin/nsupdate/nsupdate.c#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/html/acl.html#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/html/address_list.html#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/html/comments.html#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/html/config.html#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/html/controls.html#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/html/docdef.html#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/html/example.html#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/html/include.html#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/html/index.html#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/html/key.html#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/html/logging.html#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/html/master.html#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/html/options.html#5 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/html/server.html#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/html/trusted-keys.html#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/html/zone.html#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/man/Makefile#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/man/dig.1#5 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/man/dnskeygen.1#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/man/dnsquery.1#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/man/getaddrinfo.3#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/man/gethostbyname.3#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/man/getipnodebyname.3#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/man/getnameinfo.3#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/man/getnetent.3#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/man/hesiod.3#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/man/host.1#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/man/hostname.7#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/man/inet_cidr.3#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/man/irs.conf.5#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/man/mailaddr.7#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/man/mkdep.1#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/man/named-bootconf.8#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/man/named-xfer.8#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/man/named.8#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/man/named.conf.5#6 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/man/ndc.8#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/man/nslookup.8#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/man/nsupdate.8#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/man/resolver.3#5 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/man/resolver.5#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/man/tsig.3#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/misc/DynamicUpdate#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/misc/FAQ.1of2#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/misc/FAQ.2of2#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/misc/rfc2317-notes.txt#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/misc/style.txt#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/include/Makefile#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/include/arpa/Makefile#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/include/arpa/inet.h#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/include/arpa/nameser.h#5 delete .. //depot/projects/trustedbsd/base/contrib/bind/include/arpa/nameser_compat.h#5 delete .. //depot/projects/trustedbsd/base/contrib/bind/include/fd_setsize.h#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/include/hesiod.h#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/include/irp.h#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/include/irs.h#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/include/isc/Makefile#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/include/isc/assertions.h#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/include/isc/ctl.h#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/include/isc/dst.h#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/include/isc/eventlib.h#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/include/isc/heap.h#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/include/isc/irpmarshall.h#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/include/isc/list.h#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/include/isc/logging.h#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/include/isc/memcluster.h#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/include/isc/misc.h#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/include/isc/tree.h#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/include/netdb.h#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/include/netgroup.h#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/include/res_update.h#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/include/resolv.h#6 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/Makefile#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/dst/Makefile#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/dst/README#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/dst/bsafe_link.c#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/dst/cylink_link.c#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/dst/dst_api.c#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/dst/dst_internal.h#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/dst/eay_dss_link.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/dst/hmac_link.c#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/dst/md5.h#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/dst/md5_dgst.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/dst/md5_locl.h#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/dst/prandom.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/dst/rsaref_link.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/dst/support.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/inet/Makefile#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/inet/inet_addr.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/inet/inet_cidr_ntop.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/inet/inet_cidr_pton.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/inet/inet_data.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/inet/inet_lnaof.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/inet/inet_makeaddr.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/inet/inet_net_ntop.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/inet/inet_net_pton.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/inet/inet_neta.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/inet/inet_netof.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/inet/inet_network.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/inet/inet_ntoa.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/inet/inet_ntop.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/inet/inet_pton.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/inet/nsap_addr.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/Makefile#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/Makefile.BSD#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/README#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/dns.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/dns_gr.c#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/dns_ho.c#6 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/dns_nw.c#6 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/dns_p.h#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/dns_pr.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/dns_pw.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/dns_sv.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/gai_strerror.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/gen.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/gen_gr.c#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/gen_ho.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/gen_ng.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/gen_nw.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/gen_p.h#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/gen_pr.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/gen_pw.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/gen_sv.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/getaddrinfo.c#5 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/getgrent.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/getgrent_r.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/gethostent.c#5 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/gethostent_r.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/getnameinfo.c#5 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/getnetent.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/getnetent_r.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/getnetgrent.c#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/getnetgrent_r.c#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/getprotoent.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/getprotoent_r.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/getpwent.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/getpwent_r.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/getservent.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/getservent_r.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/hesiod.c#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/hesiod_p.h#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/irp.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/irp_gr.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/irp_ho.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/irp_ng.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/irp_nw.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/irp_p.h#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/irp_pr.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/irp_pw.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/irp_sv.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/irpmarshall.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/irs_data.c#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/irs_data.h#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/irs_p.h#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/lcl.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/lcl_gr.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/lcl_ho.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/lcl_ng.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/lcl_nw.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/lcl_p.h#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/lcl_pr.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/lcl_pw.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/lcl_sv.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/nis.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/nis_gr.c#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/nis_ho.c#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/nis_ng.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/nis_nw.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/nis_p.h#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/nis_pr.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/nis_pw.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/nis_sv.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/nul_ng.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/pathnames.h#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/util.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/isc/Makefile#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/isc/assertions.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/isc/assertions.mdoc#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/isc/base64.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/isc/bitncmp.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/isc/bitncmp.mdoc#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/isc/ctl_clnt.c#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/isc/ctl_p.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/isc/ctl_p.h#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/isc/ctl_srvr.c#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/isc/ev_connects.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/isc/ev_files.c#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/isc/ev_streams.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/isc/ev_timers.c#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/isc/ev_waits.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/isc/eventlib.c#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/isc/eventlib.mdoc#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/isc/eventlib_p.h#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/isc/heap.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/isc/heap.mdoc#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/isc/hex.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/isc/logging.c#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/isc/logging.mdoc#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/isc/logging_p.h#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/isc/memcluster.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/isc/memcluster.mdoc#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/isc/movefile.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/isc/tree.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/isc/tree.mdoc#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/nameser/Makefile#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/nameser/ns_date.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/nameser/ns_name.c#7 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/nameser/ns_netint.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/nameser/ns_parse.c#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/nameser/ns_print.c#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/nameser/ns_samedomain.c#5 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/nameser/ns_sign.c#5 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/nameser/ns_ttl.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/nameser/ns_verify.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/resolv/Makefile#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/resolv/herror.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/resolv/res_comp.c#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/resolv/res_data.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/resolv/res_debug.c#5 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/resolv/res_debug.h#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/resolv/res_findzonecut.c#5 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/resolv/res_init.c#5 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/resolv/res_mkquery.c#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/resolv/res_mkupdate.c#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/resolv/res_mkupdate.h#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/resolv/res_private.h#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/resolv/res_query.c#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/resolv/res_send.c#5 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/resolv/res_sendsigned.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/lib/resolv/res_update.c#5 delete .. //depot/projects/trustedbsd/base/contrib/bind/port/Makefile#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/port/README#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/port/freebsd/Makefile#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/port/freebsd/Makefile.set#5 delete .. //depot/projects/trustedbsd/base/contrib/bind/port/freebsd/bin/probe_ipv6#3 delete .. //depot/projects/trustedbsd/base/contrib/bind/port/freebsd/include/Makefile#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/port/freebsd/include/port_after.h#6 delete .. //depot/projects/trustedbsd/base/contrib/bind/port/freebsd/include/port_before.h#4 delete .. //depot/projects/trustedbsd/base/contrib/bind/port/freebsd/include/prand_conf.h#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/port/freebsd/include/sys/Makefile#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/port/freebsd/include/sys/bitypes.h#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/port/freebsd/noop.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/port/freebsd/probe#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/port/prand_conf/Makefile#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/port/prand_conf/README#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/port/prand_conf/prand_conf.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/port/settings#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/port/systype#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/tests/irs_testclient.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/tests/irs_testirpd.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/tests/irs_testserver.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/tests/test_cidr.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/tests/test_getaddr.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/CHANGES#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/COPYRIGHT#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/FAQ#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/FREEBSD-Upgrade#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/FREEBSD-Xlist#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/KNOWN_DEFECTS#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/README#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/acconfig.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/check-tool.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/check-tool.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/named-checkconf.8#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/named-checkconf.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/named-checkconf.docbook#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/named-checkconf.html#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/named-checkzone.8#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/named-checkzone.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/named-checkzone.docbook#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/named-checkzone.html#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/dig.1#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/dig.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/dig.docbook#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/dig.html#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/dighost.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/host.1#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/host.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/host.docbook#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/host.html#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/include/dig/dig.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/nslookup.1#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/nslookup.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/nslookup.docbook#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/nslookup.html#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-keygen.8#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-keygen.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-keygen.html#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-makekeyset.8#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-makekeyset.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-makekeyset.docbook#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-makekeyset.html#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-signkey.8#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-signkey.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-signkey.docbook#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-signkey.html#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-signzone.8#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-signzone.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-signzone.html#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssectool.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssectool.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/aclconf.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/builtin.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/client.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/config.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/control.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/controlconf.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/aclconf.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/builtin.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/client.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/config.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/control.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/globals.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/interfacemgr.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/listenlist.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/log.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/logconf.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/lwaddr.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/lwdclient.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/lwresd.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/lwsearch.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/main.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/notify.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/query.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/server.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/sortlist.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/tkeyconf.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/tsigconf.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/types.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/update.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/xfrout.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/zoneconf.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/interfacemgr.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/listenlist.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/log.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/logconf.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/lwaddr.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/lwdclient.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/lwderror.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/lwdgabn.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/lwdgnba.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/lwdgrbn.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/lwdnoop.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/lwresd.8#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/lwresd.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/lwresd.docbook#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/lwresd.html#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/lwsearch.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/main.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/named.8#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/named.conf.5#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/named.conf.docbook#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/named.conf.html#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/named.docbook#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/named.html#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/notify.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/query.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/server.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/sortlist.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/tkeyconf.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/tsigconf.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/unix/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/unix/include/named/os.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/unix/os.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/update.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/xfrout.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/zoneconf.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/nsupdate/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/nsupdate/nsupdate.8#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/nsupdate/nsupdate.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/nsupdate/nsupdate.docbook#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/nsupdate/nsupdate.html#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/include/rndc/os.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc-confgen.8#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc-confgen.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc-confgen.docbook#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc-confgen.html#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc.8#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc.conf#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc.conf.5#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc.conf.docbook#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc.conf.html#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc.docbook#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc.html#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/unix/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/unix/os.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/util.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/util.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/config.guess#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/config.sub#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/configure.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM-book.xml#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch01.html#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch02.html#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch03.html#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch04.html#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch05.html#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch06.html#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch07.html#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch08.html#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch09.html#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.html#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/README-SGML#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/isc.color.gif#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/nominum-docbook-html.dsl.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/nominum-docbook-print.dsl.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/validate.sh.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-08.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-intro-11.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-protocol-07.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-records-09.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-04.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-01.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-33.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-04.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-00.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-02.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-02.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-01.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-02.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-09.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-01.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsop-misbehavior-against-aaaa-00.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-01.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-02.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-ipseckey-rr-09.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/update#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/misc/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/misc/dnssec#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/misc/format-options.pl#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/misc/ipv6#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/misc/migration#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/misc/migration-4to9#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/misc/options#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/misc/rfc-compliance#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/misc/roadmap#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/misc/sdb#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/index#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc1032.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc1033.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc1034.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc1035.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc1101.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc1122.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc1123.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc1183.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc1348.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc1535.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc1536.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc1537.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc1591.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc1611.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc1612.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc1706.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc1712.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc1750.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc1876.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc1886.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc1982.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc1995.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc1996.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc2052.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc2104.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc2119.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc2133.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc2136.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc2137.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc2163.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc2168.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc2181.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc2230.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc2308.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc2317.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc2373.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc2374.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc2375.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc2418.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc2535.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc2536.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc2537.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc2538.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc2539.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc2540.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc2541.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc2553.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc2671.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc2672.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc2673.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc2782.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc2825.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc2826.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc2845.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc2874.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc2915.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc2929.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc2930.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc2931.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc3007.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc3008.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc3071.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc3090.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc3110.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc3123.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc3152.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc3197.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc3225.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc3226.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc3258.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc3363.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc3364.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc3425.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc3445.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc3467.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc3490.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc3491.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc3492.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc3493.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc3513.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc3596.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc3597.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc3645.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc3655.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc3658.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc3833.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc3845.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc952.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/install-sh#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/isc-config.sh.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/README#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/aclocal.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/api#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/bsd/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/bsd/daemon.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/bsd/ftruncate.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/bsd/gettimeofday.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/bsd/mktemp.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/bsd/putenv.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/bsd/readv.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/bsd/setenv.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/bsd/setitimer.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/bsd/strcasecmp.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/bsd/strdup.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/bsd/strerror.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/bsd/strpbrk.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/bsd/strsep.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/bsd/strtoul.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/bsd/utimes.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/bsd/writev.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/config.h.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/configure#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/configure.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/dst/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/dst/dst_api.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/dst/dst_internal.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/dst/hmac_link.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/dst/md5.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/dst/md5_dgst.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/dst/md5_locl.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/dst/support.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/arpa/inet.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/arpa/nameser.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/arpa/nameser_compat.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/fd_setsize.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/hesiod.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/irp.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/irs.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/isc/assertions.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/isc/ctl.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/isc/dst.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/isc/eventlib.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/isc/heap.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/isc/irpmarshall.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/isc/list.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/isc/logging.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/isc/memcluster.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/isc/misc.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/isc/tree.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/netdb.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/netgroup.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/res_update.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/resolv.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/inet/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/inet/inet_addr.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/inet/inet_cidr_pton.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/inet/inet_data.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/inet/inet_lnaof.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/inet/inet_makeaddr.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/inet/inet_net_ntop.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/inet/inet_net_pton.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/inet/inet_neta.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/inet/inet_netof.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/inet/inet_network.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/inet/inet_ntoa.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/inet/inet_ntop.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/inet/inet_pton.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/inet/nsap_addr.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/dns.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/dns_gr.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/dns_ho.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/dns_nw.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/dns_p.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/dns_pr.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/dns_pw.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/dns_sv.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/gai_strerror.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/gen.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/gen_gr.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/gen_ho.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/gen_ng.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/gen_nw.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/gen_p.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/gen_pr.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/gen_pw.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/gen_sv.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/getaddrinfo.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/getgrent.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/getgrent_r.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/gethostent.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/gethostent_r.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/getnameinfo.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/getnetent.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/getnetent_r.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/getnetgrent.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/getnetgrent_r.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/getprotoent.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/getprotoent_r.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/getpwent.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/getpwent_r.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/getservent.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/getservent_r.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/hesiod.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/hesiod_p.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/irp.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/irp_gr.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/irp_ho.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/irp_ng.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/irp_nw.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/irp_p.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/irp_pr.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/irp_pw.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/irp_sv.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/irpmarshall.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/irs_data.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/irs_data.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/irs_p.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/lcl.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/lcl_gr.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/lcl_ho.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/lcl_ng.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/lcl_nw.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/lcl_p.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/lcl_pr.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/lcl_pw.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/lcl_sv.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/nis.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/nis_gr.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/nis_ho.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/nis_ng.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/nis_nw.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/nis_p.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/nis_pr.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/nis_pw.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/nis_sv.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/nul_ng.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/pathnames.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/util.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/assertions.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/assertions.mdoc#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/base64.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/bitncmp.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/bitncmp.mdoc#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/ctl_clnt.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/ctl_p.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/ctl_p.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/ctl_srvr.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/ev_connects.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/ev_files.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/ev_streams.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/ev_timers.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/ev_waits.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/eventlib.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/eventlib.mdoc#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/eventlib_p.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/heap.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/heap.mdoc#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/hex.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/logging.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/logging.mdoc#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/logging_p.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/memcluster.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/memcluster.mdoc#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/movefile.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/tree.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/tree.mdoc#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/libtool.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/ltmain.sh#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/make/includes.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/make/mkdep.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/make/rules.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/mkinstalldirs#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/nameser/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/nameser/ns_date.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/nameser/ns_name.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/nameser/ns_netint.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/nameser/ns_parse.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/nameser/ns_print.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/nameser/ns_samedomain.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/nameser/ns_sign.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/nameser/ns_ttl.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/nameser/ns_verify.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/port/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/port/freebsd/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/port/freebsd/include/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/port/freebsd/include/sys/bitypes.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/port_after.h.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/port_before.h.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/herror.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/res_comp.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/res_data.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/res_debug.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/res_debug.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/res_findzonecut.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/res_init.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/res_mkquery.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/res_mkupdate.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/res_mkupdate.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/res_private.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/res_query.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/res_send.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/res_sendsigned.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/res_update.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind9/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind9/api#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind9/check.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind9/getaddresses.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind9/include/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind9/include/bind9/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind9/include/bind9/check.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind9/include/bind9/getaddresses.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind9/include/bind9/version.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind9/version.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/acl.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/adb.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/api#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/byaddr.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/cache.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/callbacks.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/compress.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/db.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/dbiterator.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/dbtable.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/diff.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/dispatch.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/dnssec.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/ds.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/forward.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/gen-unix.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/gen.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/acl.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/adb.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/bit.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/byaddr.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/cache.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/callbacks.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/cert.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/compress.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/db.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/dbiterator.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/dbtable.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/diff.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/dispatch.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/dnssec.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/ds.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/events.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/fixedname.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/forward.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/journal.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/keyflags.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/keytable.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/keyvalues.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/lib.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/log.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/lookup.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/master.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/masterdump.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/message.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/name.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/ncache.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/nsec.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/opcode.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/order.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/peer.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/portlist.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/rbt.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/rcode.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/rdata.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/rdataclass.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/rdatalist.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/rdataset.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/rdatasetiter.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/rdataslab.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/rdatatype.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/request.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/resolver.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/result.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/rootns.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/sdb.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/secalg.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/secproto.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/soa.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/ssu.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/stats.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/tcpmsg.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/time.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/timer.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/tkey.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/tsig.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/ttl.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/types.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/validator.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/version.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/view.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/xfrin.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/zone.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/zonekey.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/zt.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/journal.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/keytable.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/lib.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/log.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/lookup.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/master.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/masterdump.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/message.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/name.c#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Oct 11 20:49:00 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 730F416A4D1; Mon, 11 Oct 2004 20:49:00 +0000 (GMT) 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 36DF816A4CE for ; Mon, 11 Oct 2004 20:49:00 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2BF4443D31 for ; Mon, 11 Oct 2004 20:49:00 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9BKn0U3092123 for ; Mon, 11 Oct 2004 20:49:00 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9BKmx0Q092120 for perforce@freebsd.org; Mon, 11 Oct 2004 20:48:59 GMT (envelope-from jhb@freebsd.org) Date: Mon, 11 Oct 2004 20:48:59 GMT Message-Id: <200410112048.i9BKmx0Q092120@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 63010 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, 11 Oct 2004 20:49:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=63010 Change 63010 by jhb@jhb_twclab on 2004/10/11 20:48:34 - Remove superflous nothing comments. - Use cpu_spinwait() in the rendezvous spins. - Correct the counter indices for the second and third spins. Affected files ... .. //depot/projects/smpng/sys/kern/subr_smp.c#38 edit Differences ... ==== //depot/projects/smpng/sys/kern/subr_smp.c#38 (text+ko) ==== @@ -284,7 +284,6 @@ /* wait for each to clear its bit */ while ((stopped_cpus & map) != 0) - /* nothing */ cpu_spinwait(); return 1; @@ -306,21 +305,26 @@ /* Ensure we have up-to-date values. */ atomic_add_acq_int(&smp_rv_waiters[0], 1); while (smp_rv_waiters[0] < mp_ncpus) - ; /* nothing */ + cpu_spinwait(); + /* setup function */ if (smp_rv_setup_func != NULL) smp_rv_setup_func(smp_rv_func_arg); + /* spin on entry rendezvous */ atomic_add_int(&smp_rv_waiters[1], 1); - while (smp_rv_waiters[0] < mp_ncpus) - ; /* nothing */ + while (smp_rv_waiters[1] < mp_ncpus) + cpu_spinwait(); + /* action function */ if (smp_rv_action_func != NULL) smp_rv_action_func(smp_rv_func_arg); + /* spin on exit rendezvous */ atomic_add_int(&smp_rv_waiters[2], 1); - while (smp_rv_waiters[1] < mp_ncpus) - ; /* nothing */ + while (smp_rv_waiters[2] < mp_ncpus) + cpu_spinwait(); + /* teardown function */ if (smp_rv_teardown_func != NULL) smp_rv_teardown_func(smp_rv_func_arg); From owner-p4-projects@FreeBSD.ORG Mon Oct 11 21:26:49 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E0A8716A4D2; Mon, 11 Oct 2004 21:26:48 +0000 (GMT) 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 A310516A4CE for ; Mon, 11 Oct 2004 21:26:48 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 66DC543D53 for ; Mon, 11 Oct 2004 21:26:48 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9BLQmrF093661 for ; Mon, 11 Oct 2004 21:26:48 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9BLQlCu093658 for perforce@freebsd.org; Mon, 11 Oct 2004 21:26:47 GMT (envelope-from peter@freebsd.org) Date: Mon, 11 Oct 2004 21:26:47 GMT Message-Id: <200410112126.i9BLQlCu093658@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 63016 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, 11 Oct 2004 21:26:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=63016 Change 63016 by peter@peter_melody on 2004/10/11 21:26:18 Make the i386 sysctl binary work on amd64. This covers most of the visible fields. Things like kern.proc.* and the netstat structs are a nightmare. I think I'm going to cry. Affected files ... .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#17 edit .. //depot/projects/hammer/sys/kern/kern_exec.c#36 edit .. //depot/projects/hammer/sys/kern/kern_sysctl.c#16 edit .. //depot/projects/hammer/sys/kern/kern_tc.c#15 edit .. //depot/projects/hammer/sys/kern/kern_xxx.c#8 edit .. //depot/projects/hammer/sys/sys/sysctl.h#20 edit .. //depot/projects/hammer/sys/vm/vm_meter.c#11 edit Differences ... ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#17 (text+ko) ==== @@ -1198,44 +1198,26 @@ int freebsd32_sysctl(struct thread *td, struct freebsd32_sysctl_args *uap) { - int error, name[CTL_MAXNAME + 2]; - u_char buf[256]; + int error, name[CTL_MAXNAME]; size_t j, oldlen; if (uap->namelen > CTL_MAXNAME || uap->namelen < 2) return (EINVAL); - - name[0] = 0; /* Internal sysctl function */ - name[1] = 4; /* This is magic */ - error = copyin(uap->name, &name[2], uap->namelen * sizeof(int)); + error = copyin(uap->name, name, uap->namelen * sizeof(int)); if (error) return (error); - mtx_lock(&Giant); - - j = sizeof(buf); - error = kernel_sysctl(td, name, uap->namelen + 2, buf, &j, 0, 0, &j); - if (error == 0 && j >= sizeof(u_int)) { - int kind = *(u_int *)buf; - if ((kind & CTLTYPE) == CTLTYPE_LONG || - (kind & CTLTYPE) == CTLTYPE_ULONG) { - printf("sysctl LONG!\n"); - /* do conversion */ - } - } - if (uap->oldlenp) oldlen = fuword32(uap->oldlenp); else oldlen = 0; error = userland_sysctl(td, name, uap->namelen, uap->old, &oldlen, 1, - uap->new, uap->newlen, &j); + uap->new, uap->newlen, &j, SCTL_MASK32); if (error && error != ENOMEM) goto done2; - if (uap->oldlenp) { + if (uap->oldlenp) suword32(uap->oldlenp, j); - } done2: mtx_unlock(&Giant); return (error); ==== //depot/projects/hammer/sys/kern/kern_exec.c#36 (text+ko) ==== @@ -104,8 +104,8 @@ int error; p = curproc; -#if defined(__amd64__) || defined(__ia64__) - if (req->oldlen == sizeof(unsigned int)) { +#ifdef SCTL_MASK32 + if (req->flags & SCTL_MASK32) { unsigned int val; val = (unsigned int)p->p_sysent->sv_psstrings; error = SYSCTL_OUT(req, &val, sizeof(val)); @@ -123,8 +123,8 @@ int error; p = curproc; -#if defined(__amd64__) || defined(__ia64__) - if (req->oldlen == sizeof(unsigned int)) { +#ifdef SCTL_MASK32 + if (req->flags & SCTL_MASK32) { unsigned int val; val = (unsigned int)p->p_sysent->sv_usrstack; error = SYSCTL_OUT(req, &val, sizeof(val)); ==== //depot/projects/hammer/sys/kern/kern_sysctl.c#16 (text+ko) ==== @@ -828,20 +828,35 @@ sysctl_handle_long(SYSCTL_HANDLER_ARGS) { int error = 0; - long tmpout; + long tmplong; +#ifdef SCTL_MASK32 + int tmpint; +#endif /* * Attempt to get a coherent snapshot by making a copy of the data. */ if (!arg1) return (EINVAL); - tmpout = *(long *)arg1; - error = SYSCTL_OUT(req, &tmpout, sizeof(long)); + tmplong = *(long *)arg1; +#ifdef SCTL_MASK32 + if (req->flags & SCTL_MASK32) { + tmpint = tmplong; + error = SYSCTL_OUT(req, &tmpint, sizeof(int)); + } else +#endif + error = SYSCTL_OUT(req, &tmplong, sizeof(long)); if (error || !req->newptr) return (error); - error = SYSCTL_IN(req, arg1, sizeof(long)); +#ifdef SCTL_MASK32 + if (req->flags & SCTL_MASK32) { + error = SYSCTL_IN(req, &tmpint, sizeof(int)); + *(long *)arg1 = (long)tmpint; + } else +#endif + error = SYSCTL_IN(req, arg1, sizeof(long)); return (error); } @@ -965,7 +980,7 @@ int kernel_sysctl(struct thread *td, int *name, u_int namelen, void *old, - size_t *oldlenp, void *new, size_t newlen, size_t *retval) + size_t *oldlenp, void *new, size_t newlen, size_t *retval, int flags) { int error = 0; struct sysctl_req req; @@ -973,6 +988,7 @@ bzero(&req, sizeof req); req.td = td; + req.flags = flags; if (oldlenp) { req.oldlen = *oldlenp; @@ -1015,7 +1031,7 @@ int kernel_sysctlbyname(struct thread *td, char *name, void *old, size_t *oldlenp, - void *new, size_t newlen, size_t *retval) + void *new, size_t newlen, size_t *retval, int flags) { int oid[CTL_MAXNAME]; size_t oidlen, plen; @@ -1026,12 +1042,12 @@ oidlen = sizeof(oid); error = kernel_sysctl(td, oid, 2, oid, &oidlen, - (void *)name, strlen(name), &plen); + (void *)name, strlen(name), &plen, flags); if (error) return (error); error = kernel_sysctl(td, oid, plen / sizeof(int), old, oldlenp, - new, newlen, retval); + new, newlen, retval, flags); return (error); } @@ -1256,7 +1272,7 @@ error = userland_sysctl(td, name, uap->namelen, uap->old, uap->oldlenp, 0, - uap->new, uap->newlen, &j); + uap->new, uap->newlen, &j, 0); if (error && error != ENOMEM) goto done2; if (uap->oldlenp) { @@ -1275,7 +1291,8 @@ */ int userland_sysctl(struct thread *td, int *name, u_int namelen, void *old, - size_t *oldlenp, int inkernel, void *new, size_t newlen, size_t *retval) + size_t *oldlenp, int inkernel, void *new, size_t newlen, size_t *retval, + int flags) { int error = 0; struct sysctl_req req; @@ -1283,6 +1300,7 @@ bzero(&req, sizeof req); req.td = td; + req.flags = flags; if (oldlenp) { if (inkernel) { ==== //depot/projects/hammer/sys/kern/kern_tc.c#15 (text+ko) ==== @@ -92,8 +92,9 @@ static struct bintime boottimebin; struct timeval boottime; -SYSCTL_STRUCT(_kern, KERN_BOOTTIME, boottime, CTLFLAG_RD, - &boottime, timeval, "System boottime"); +static int sysctl_kern_boottime(SYSCTL_HANDLER_ARGS); +SYSCTL_PROC(_kern, KERN_BOOTTIME, boottime, CTLTYPE_STRUCT|CTLFLAG_RD, + NULL, 0, sysctl_kern_boottime, "S,timeval", "System boottime"); SYSCTL_NODE(_kern, OID_AUTO, timecounter, CTLFLAG_RW, 0, ""); @@ -116,6 +117,20 @@ static void tc_windup(void); +static int +sysctl_kern_boottime(SYSCTL_HANDLER_ARGS) +{ +#ifdef SCTL_MASK32 + int tv[2]; + + if (req->flags & SCTL_MASK32) { + tv[0] = boottime.tv_sec; + tv[1] = boottime.tv_usec; + return SYSCTL_OUT(req, tv, sizeof(tv)); + } else +#endif + return SYSCTL_OUT(req, &boottime, sizeof(boottime)); +} /* * Return the difference between the timehands' counter value now and what * was when we copied it to the timehands' offset_count. ==== //depot/projects/hammer/sys/kern/kern_xxx.c#8 (text+ko) ==== @@ -192,7 +192,7 @@ len = sizeof (uap->name->sysname); mtx_lock(&Giant); error = userland_sysctl(td, name, 2, uap->name->sysname, &len, - 1, 0, 0, 0); + 1, 0, 0, 0, 0); if (error) goto done2; subyte( uap->name->sysname + sizeof(uap->name->sysname) - 1, 0); @@ -200,7 +200,7 @@ name[1] = KERN_HOSTNAME; len = sizeof uap->name->nodename; error = userland_sysctl(td, name, 2, uap->name->nodename, &len, - 1, 0, 0, 0); + 1, 0, 0, 0, 0); if (error) goto done2; subyte( uap->name->nodename + sizeof(uap->name->nodename) - 1, 0); @@ -208,7 +208,7 @@ name[1] = KERN_OSRELEASE; len = sizeof uap->name->release; error = userland_sysctl(td, name, 2, uap->name->release, &len, - 1, 0, 0, 0); + 1, 0, 0, 0, 0); if (error) goto done2; subyte( uap->name->release + sizeof(uap->name->release) - 1, 0); @@ -217,7 +217,7 @@ name = KERN_VERSION; len = sizeof uap->name->version; error = userland_sysctl(td, name, 2, uap->name->version, &len, - 1, 0, 0, 0); + 1, 0, 0, 0, 0); if (error) goto done2; subyte( uap->name->version + sizeof(uap->name->version) - 1, 0); @@ -241,7 +241,7 @@ name[1] = HW_MACHINE; len = sizeof uap->name->machine; error = userland_sysctl(td, name, 2, uap->name->machine, &len, - 1, 0, 0, 0); + 1, 0, 0, 0, 0); if (error) goto done2; subyte( uap->name->machine + sizeof(uap->name->machine) - 1, 0); ==== //depot/projects/hammer/sys/sys/sysctl.h#20 (text+ko) ==== @@ -120,6 +120,11 @@ #define REQ_LOCKED 1 /* locked and not wired */ #define REQ_WIRED 2 /* locked and wired */ +/* definitions for sysctl_req 'flags' member */ +#if defined(__amd64__) || defined(__ia64__) +#define SCTL_MASK32 1 /* 32 bit emulation */ +#endif + /* * This describes the access space for a sysctl request. This is needed * so that we can use the interface from the kernel or from user-space. @@ -136,6 +141,7 @@ size_t newidx; int (*newfunc)(struct sysctl_req *, void *, size_t); size_t validlen; + int flags; }; SLIST_HEAD(sysctl_oid_list, sysctl_oid); @@ -617,13 +623,13 @@ int kernel_sysctl(struct thread *td, int *name, u_int namelen, void *old, size_t *oldlenp, void *new, size_t newlen, - size_t *retval); + size_t *retval, int flags); int kernel_sysctlbyname(struct thread *td, char *name, void *old, size_t *oldlenp, void *new, size_t newlen, - size_t *retval); + size_t *retval, int flags); int userland_sysctl(struct thread *td, int *name, u_int namelen, void *old, size_t *oldlenp, int inkernel, void *new, size_t newlen, - size_t *retval); + size_t *retval, int flags); int sysctl_find_oid(int *name, u_int namelen, struct sysctl_oid **noid, int *nindx, struct sysctl_req *req); int sysctl_wire_old_buffer(struct sysctl_req *req, size_t len); ==== //depot/projects/hammer/sys/vm/vm_meter.c#11 (text+ko) ==== @@ -85,8 +85,24 @@ SYSCTL_UINT(_vm, OID_AUTO, v_free_severe, CTLFLAG_RW, &cnt.v_free_severe, 0, ""); -SYSCTL_STRUCT(_vm, VM_LOADAVG, loadavg, CTLFLAG_RD, - &averunnable, loadavg, "Machine loadaverage history"); +static int +sysctl_vm_loadavg(SYSCTL_HANDLER_ARGS) +{ +#ifdef SCTL_MASK32 + u_int32_t la[4]; + + if (req->flags & SCTL_MASK32) { + la[0] = averunnable.ldavg[0]; + la[1] = averunnable.ldavg[1]; + la[2] = averunnable.ldavg[2]; + la[3] = averunnable.fscale; + return SYSCTL_OUT(req, la, sizeof(la)); + } else +#endif + return SYSCTL_OUT(req, &averunnable, sizeof(averunnable)); +} +SYSCTL_PROC(_vm, VM_LOADAVG, loadavg, CTLTYPE_STRUCT|CTLFLAG_RD, + NULL, 0, sysctl_vm_loadavg, "S,loadavg", "Machine loadaverage history"); static int vmtotal(SYSCTL_HANDLER_ARGS) From owner-p4-projects@FreeBSD.ORG Mon Oct 11 21:40:05 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B2AB816A4D1; Mon, 11 Oct 2004 21:40:05 +0000 (GMT) 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 81E0216A4CE for ; Mon, 11 Oct 2004 21:40:05 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4C43E43D1D for ; Mon, 11 Oct 2004 21:40:05 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9BLe5Ic094046 for ; Mon, 11 Oct 2004 21:40:05 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9BLe4LA094043 for perforce@freebsd.org; Mon, 11 Oct 2004 21:40:04 GMT (envelope-from peter@freebsd.org) Date: Mon, 11 Oct 2004 21:40:04 GMT Message-Id: <200410112140.i9BLe4LA094043@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 63018 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, 11 Oct 2004 21:40:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=63018 Change 63018 by peter@peter_daintree on 2004/10/11 21:39:56 IFC @63017 Affected files ... .. //depot/projects/hammer/lib/msun/Makefile#18 integrate .. //depot/projects/hammer/lib/msun/man/ieee.3#6 integrate .. //depot/projects/hammer/lib/msun/man/math.3#4 integrate .. //depot/projects/hammer/lib/msun/src/math.h#23 integrate .. //depot/projects/hammer/lib/msun/src/s_ilogbl.c#1 branch .. //depot/projects/hammer/share/man/man9/pfil.9#9 integrate .. //depot/projects/hammer/share/man/man9/rtalloc.9#6 integrate .. //depot/projects/hammer/sys/conf/kmod.mk#35 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#26 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pcib_acpi.c#14 integrate .. //depot/projects/hammer/sys/dev/pbio/pbio.c#1 branch .. //depot/projects/hammer/sys/dev/pbio/pbioio.h#1 branch .. //depot/projects/hammer/sys/dev/sound/isa/ad1816.c#9 integrate .. //depot/projects/hammer/sys/dev/sound/isa/es1888.c#4 integrate .. //depot/projects/hammer/sys/dev/sound/isa/gusc.c#4 integrate .. //depot/projects/hammer/sys/dev/sound/isa/sbc.c#7 integrate .. //depot/projects/hammer/sys/geom/geom_io.c#29 integrate .. //depot/projects/hammer/sys/i386/pci/pci_bus.c#18 integrate .. //depot/projects/hammer/sys/kern/uipc_mbuf2.c#13 integrate .. //depot/projects/hammer/sys/net/netisr.c#10 integrate .. //depot/projects/hammer/sys/sys/mbuf.h#33 integrate .. //depot/projects/hammer/tools/regression/lib/msun/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/lib/msun/test-ilogb.c#1 branch .. //depot/projects/hammer/tools/regression/netinet/ipsockopt/Makefile#1 branch .. //depot/projects/hammer/tools/regression/netinet/ipsockopt/ipsockopt.c#1 branch Differences ... ==== //depot/projects/hammer/lib/msun/Makefile#18 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 5.1beta 93/09/24 -# $FreeBSD: src/lib/msun/Makefile,v 1.52 2004/10/01 15:38:07 kensmith Exp $ +# $FreeBSD: src/lib/msun/Makefile,v 1.53 2004/10/11 18:13:52 stefanf Exp $ # # ==================================================== # Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. @@ -85,7 +85,7 @@ s_expm1.c s_expm1f.c s_fabsf.c s_fdim.c s_finite.c s_finitef.c \ s_floor.c s_floorf.c s_fmax.c s_fmaxf.c s_fmaxl.c s_fmin.c \ s_fminf.c s_fminl.c s_frexp.c s_frexpf.c s_ilogb.c s_ilogbf.c \ - s_isfinite.c s_isnan.c s_isnormal.c s_ldexpf.c \ + s_ilogbl.c s_isfinite.c s_isnan.c s_isnormal.c s_ldexpf.c \ s_lib_version.c s_log1p.c \ s_log1pf.c s_logb.c s_logbf.c s_matherr.c s_modff.c \ s_nearbyint.c s_nextafter.c s_nextafterf.c \ @@ -167,7 +167,8 @@ MLINKS+=hypot.3 cabs.3 hypot.3 cabsf.3 hypot.3 hypotf.3 MLINKS+=ieee.3 copysign.3 ieee.3 copysignf.3 ieee.3 copysignl.3 \ ieee.3 finite.3 ieee.3 finitef.3 \ - ieee.3 ilogb.3 ieee.3 ilogbf.3 ieee.3 nextafter.3 ieee.3 nextafterf.3 \ + ieee.3 ilogb.3 ieee.3 ilogbf.3 ieee.3 ilogbl.3 \ + ieee.3 nextafter.3 ieee.3 nextafterf.3 \ ieee.3 remainder.3 ieee.3 remainderf.3 \ ieee.3 scalbln.3 ieee.3 scalblnf.3 ieee.3 scalbn.3 ieee.3 scalbnf.3 MLINKS+=ieee_test.3 logb.3 ieee_test.3 logbf.3 ==== //depot/projects/hammer/lib/msun/man/ieee.3#6 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)ieee.3 6.4 (Berkeley) 5/6/91 -.\" $FreeBSD: src/lib/msun/man/ieee.3,v 1.17 2004/07/02 23:52:20 ru Exp $ +.\" $FreeBSD: src/lib/msun/man/ieee.3,v 1.18 2004/10/11 18:13:52 stefanf Exp $ .\" .Dd June 20, 2004 .Dt IEEE 3 @@ -43,6 +43,7 @@ .Nm finitef , .Nm ilogb , .Nm ilogbf , +.Nm ilogbl , .Nm nextafter , .Nm nextafterf , .Nm remainder , @@ -70,6 +71,8 @@ .Fn ilogb "double x" .Ft int .Fn ilogbf "float x" +.Ft int +.Fn ilogbl "long double x" .Ft double .Fn nextafter "double x" "double y" .Ft float @@ -116,9 +119,10 @@ .Fa x is \*(Na). .Pp -.Fn ilogb +.Fn ilogb , +.Fn ilogbf and -.Fn ilogbf +.Fn ilogbl return .Fa x Ns 's exponent, in integer format. ==== //depot/projects/hammer/lib/msun/man/math.3#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)math.3 6.10 (Berkeley) 5/6/91 -.\" $FreeBSD: src/lib/msun/man/math.3,v 1.12 2004/06/20 10:39:09 das Exp $ +.\" $FreeBSD: src/lib/msun/man/math.3,v 1.13 2004/10/11 20:13:52 das Exp $ .\" .Dd June 11, 2004 .Dt MATH 3 @@ -43,13 +43,13 @@ \\$1\\(if\\$2 .. .Sh NAME -math \- introduction to mathematical library functions +math \- floating-point mathematical library +.Sh LIBRARY +.Lb libm +.Sh SYNOPSIS +.In math.h .Sh DESCRIPTION -These functions constitute the C math library, -.I libm. -The link editor searches this library under the \*(lq\-lm\*(rq option. -Declarations for these functions may be obtained from the include file -.In math.h . +These functions constitute the C math library. .Sh "LIST OF FUNCTIONS" Each of the following .Vt double @@ -76,6 +76,10 @@ .Ft long double .Fn acosl "long double x" , respectively. +.Pp +The programs are accurate to within the numbers +of \*(ups tabulated below; an \*(up is one \fIU\fRnit in the \fIL\fRast +\fIP\fRlace. .sp 2 .nf .ta \w'nexttoward'u+10n +\w'remainder with partial quot'u @@ -83,29 +87,29 @@ .ta \w'nexttoward'u+4n +\w'remainder with partial quotient'u+6nC .sp 5p .\" XXX Many of these error bounds are wrong for the current implementation! -acos inverse trigonometric function 3 -acosh inverse hyperbolic function 3 -asin inverse trigonometric function 3 -asinh inverse hyperbolic function 3 -atan inverse trigonometric function 1 -atanh inverse hyperbolic function 3 -atan2 inverse trigonometric function 2 +acos inverse trigonometric function ??? +acosh inverse hyperbolic function ??? +asin inverse trigonometric function ??? +asinh inverse hyperbolic function ??? +atan inverse trigonometric function ??? +atanh inverse hyperbolic function ??? +atan2 inverse trigonometric function ??? cbrt cube root 1 ceil integer no less than 0 copysign copy sign bit 0 cos trigonometric function 1 -cosh hyperbolic function 3 -erf error function ??? -erfc complementary error function ??? +cosh hyperbolic function ??? +erf error function 1 +erfc complementary error function 1 exp exponential base e 1 .\" exp2 exponential base 2 ??? expm1 exp(x)\-1 1 fabs absolute value 0 -.\" fdim positive difference ??? +fdim positive difference 1 floor integer no greater than 0 .\" fma multiply-add ??? -.\" fmax maximum function 0 -.\" fmin minimum function 0 +fmax maximum function 0 +fmin minimum function 0 fmod remainder function ??? frexp extract mantissa and exponent 0 hypot Euclidean distance 1 @@ -114,19 +118,19 @@ j1 bessel function ??? jn bessel function ??? ldexp multiply by power of 2 0 -lgamma log gamma function ??? +lgamma log gamma function 1 .\" llrint round to integer 0 .\" llround round to nearest integer 0 log natural logarithm 1 -log10 logarithm to base 10 3 +log10 logarithm to base 10 1 log1p log(1+x) 1 .\" log2 base 2 logarithm 0 logb exponent extraction 0 .\" lrint round to integer 0 .\" lround round to nearest integer 0 -modf extract fractional part ??? +modf extract fractional part 0 .\" nan return quiet \*(Na) 0 -.\" nearbyint round to integer 0 +nearbyint round to integer 0 nextafter next representable value 0 .\" nexttoward next representable value 0 pow exponential x**y 60\-500 @@ -137,11 +141,11 @@ scalbln exponent adjustment 0 scalbn exponent adjustment 0 sin trigonometric function 1 -sinh hyperbolic function 3 +sinh hyperbolic function ??? sqrt square root 1 -tan trigonometric function 3 -tanh hyperbolic function 3 -tgamma gamma function ??? +tan trigonometric function 1 +tanh hyperbolic function ??? +tgamma gamma function 1 trunc round towards zero 0 y0 bessel function ??? y1 bessel function ??? @@ -157,12 +161,10 @@ it primarily defines representations of numbers and abstract properties of arithmetic operations relating to precision, rounding, and exceptional cases, as described below. -The programs are accurate to within the numbers -of \*(ups tabulated above; an \*(up is one \fIU\fRnit in the \fIL\fRast -\fIP\fRlace. .Pp \fBIEEE STANDARD 754 Floating\-Point Arithmetic:\fR .Pp +.\" XXX mention single- and extended-/quad- precisions Properties of IEEE 754 Double\-Precision: .Bd -filled -offset indent Wordsize: 64 bits, 8 bytes. Radix: Binary. @@ -462,6 +464,14 @@ are missing, and many functions are not available in their .Vt long double variants. +.Pp +On some architectures, trigonometric argument reduction is not +performed accurately, resulting in errors greater than 1 ulp for large +arguments to +.Fn cos , +.Fn sin , +and +.Fn tan . .Sh SEE ALSO .Xr fenv 3 , .Xr ieee 3 ==== //depot/projects/hammer/lib/msun/src/math.h#23 (text+ko) ==== @@ -11,7 +11,7 @@ /* * from: @(#)fdlibm.h 5.1 93/09/24 - * $FreeBSD: src/lib/msun/src/math.h,v 1.44 2004/09/17 05:15:33 das Exp $ + * $FreeBSD: src/lib/msun/src/math.h,v 1.45 2004/10/11 18:13:52 stefanf Exp $ */ #ifndef _MATH_H_ @@ -447,7 +447,9 @@ long double fmodl(long double, long double); long double frexpl(long double value, int *); long double hypotl(long double, long double); +#endif int ilogbl(long double); +#if 0 long double ldexpl(long double, int); long double lgammal(long double); long long llrintl(long double); ==== //depot/projects/hammer/share/man/man9/pfil.9#9 (text+ko) ==== @@ -26,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/pfil.9,v 1.17 2004/10/08 12:07:20 mlaier Exp $ +.\" $FreeBSD: src/share/man/man9/pfil.9,v 1.18 2004/10/11 18:40:50 green Exp $ .\" .Dd September 29, 2004 .Dt PFIL 9 @@ -207,7 +207,7 @@ of time. .Fn pfil_run_hooks will return -.Dv ENOBUF +.Dv ENOBUFS to indicate this. .Sh SEE ALSO .Xr bpf 4 , ==== //depot/projects/hammer/share/man/man9/rtalloc.9#6 (text+ko) ==== @@ -26,8 +26,8 @@ .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/rtalloc.9,v 1.18 2004/10/08 09:52:00 glebius Exp $ -.Dd October 7, 2004 +.\" $FreeBSD: src/share/man/man9/rtalloc.9,v 1.19 2004/10/11 20:48:36 glebius Exp $ +.Dd October 11, 2004 .Os .Dt RTALLOC 9 .Sh NAME @@ -49,6 +49,10 @@ .Ft void .Fn rtfree "struct rt_entry *rt" .Fn RTFREE "struct rt_entry *rt" +.Fn RT_LOCK "struct rt_entry *rt" +.Fn RT_UNLOCK "struct rt_entry *rt" +.Fn RT_ADDREF "struct rt_entry *rt" +.Fn RT_REMREF "struct rt_entry *rt" .Sh DESCRIPTION The kernel uses a radix tree structure to manage routes for the networking subsystem. @@ -189,12 +193,31 @@ .Fn rtalloc or .Fn rtalloc_ign . +The +.Fn RTFREE +macro decrements the reference count on the routing table entry (see below), +and frees it if the reference count has reached zero. +.Pp The preferred usage is allocating a route using .Fn rtalloc or .Fn rtalloc_ign and freeing using .Fn RTFREE . +.Pp +The +.Fn RT_LOCK +macro is used to lock a routing table entry. +The +.Fn RT_UNLOCK +macro is used to unlock a routing table entry. +.Pp +The +.Fn RT_ADDREF +macro increments the reference count on a previously locked route entry. +The +.Fn RT_REMREF +macro decrements the reference count on a previously locked route entry. .Sh RETURN VALUES The .Fn rtalloc , @@ -228,6 +251,8 @@ .Fn rtalloc1 first appeared in .Fx 2.0 . +Routing table locking was introduced in +.Fx 5.2 . .Sh AUTHORS This manual page was written by .An Garrett Wollman , ==== //depot/projects/hammer/sys/conf/kmod.mk#35 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.168 2004/10/09 13:51:28 joerg Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.169 2004/10/11 21:23:56 joerg Exp $ # # The include file handles installing Kernel Loadable Device # drivers (KLD's). @@ -280,7 +280,7 @@ CLEANFILES+= ${_src} .if !target(${_src}) ${_src}: - ln -sf ${KERNBUILDDIR}/${_src} ${.TARGET} + ln -s ${KERNBUILDDIR}/${_src} ${.TARGET} .endif .endfor .else ==== //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#26 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.44 2004/10/11 06:06:42 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.45 2004/10/11 21:15:10 njl Exp $"); #include "opt_acpi.h" #include @@ -464,14 +464,22 @@ /* * Bus mastering arbitration control is needed to keep caches coherent - * while sleeping in C3. If it's not present, we flush the caches before - * entering C3 instead. + * while sleeping in C3. If it's not present but a working flush cache + * instruction is present, flush the caches before entering C3 instead. + * Otherwise, just disable C3 completely. */ if (AcpiGbl_FADT->V1_Pm2CntBlk == 0 || AcpiGbl_FADT->Pm2CntLen == 0) { - cpu_quirks |= CPU_QUIRK_NO_BM_CTRL; - ACPI_DEBUG_PRINT((ACPI_DB_INFO, - "acpi_cpu%d: no BM control, using flush cache method\n", - device_get_unit(sc->cpu_dev))); + if (AcpiGbl_FADT->WbInvd && AcpiGbl_FADT->WbInvdFlush == 0) { + cpu_quirks |= CPU_QUIRK_NO_BM_CTRL; + ACPI_DEBUG_PRINT((ACPI_DB_INFO, + "acpi_cpu%d: no BM control, using flush cache method\n", + device_get_unit(sc->cpu_dev))); + } else { + cpu_quirks |= CPU_QUIRK_NO_C3; + ACPI_DEBUG_PRINT((ACPI_DB_INFO, + "acpi_cpu%d: no BM control, C3 not available\n", + device_get_unit(sc->cpu_dev))); + } } /* @@ -857,9 +865,7 @@ * Check for bus master activity. If there was activity, clear * the bit and use the lowest non-C3 state. Note that the USB * driver polling for new devices keeps this bit set all the - * time if USB is loaded. If bus mastering control is not available, - * flush caches. This can be quite slow but may be useful since not - * all systems support BM control. + * time if USB is loaded. */ if ((cpu_quirks & CPU_QUIRK_NO_BM_CTRL) == 0) { AcpiGetRegister(ACPI_BITREG_BUS_MASTER_STATUS, &bm_active, @@ -869,8 +875,7 @@ ACPI_MTX_DO_NOT_LOCK); cx_next_idx = min(cx_next_idx, cpu_non_c3); } - } else - ACPI_FLUSH_CPU_CACHE(); + } /* Select the next state and update statistics. */ cx_next = &sc->cpu_cx_states[cx_next_idx]; @@ -888,10 +893,17 @@ return; } - /* For C3, disable bus master arbitration and enable bus master wake. */ + /* + * For C3, disable bus master arbitration and enable bus master wake + * if BM control is available, otherwise flush the CPU cache. + */ if (cx_next->type == ACPI_STATE_C3) { - AcpiSetRegister(ACPI_BITREG_ARB_DISABLE, 1, ACPI_MTX_DO_NOT_LOCK); - AcpiSetRegister(ACPI_BITREG_BUS_MASTER_RLD, 1, ACPI_MTX_DO_NOT_LOCK); + if ((cpu_quirks & CPU_QUIRK_NO_BM_CTRL) == 0) { + AcpiSetRegister(ACPI_BITREG_ARB_DISABLE, 1, ACPI_MTX_DO_NOT_LOCK); + AcpiSetRegister(ACPI_BITREG_BUS_MASTER_RLD, 1, + ACPI_MTX_DO_NOT_LOCK); + } else + ACPI_FLUSH_CPU_CACHE(); } /* @@ -956,8 +968,8 @@ { /* - * C3 is not supported on multiple CPUs since this would require - * flushing all caches which is currently too expensive. + * C3 on multiple CPUs requires using the expensive flush cache + * instruction. */ if (mp_ncpus > 1) cpu_quirks |= CPU_QUIRK_NO_BM_CTRL; ==== //depot/projects/hammer/sys/dev/acpica/acpi_pcib_acpi.c#14 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.41 2004/10/06 07:26:52 imp Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.42 2004/10/11 21:10:23 imp Exp $ */ #include "opt_acpi.h" #include @@ -32,6 +32,7 @@ #include #include #include +#include #include "acpi.h" #include @@ -300,6 +301,9 @@ return (acpi_pcib_route_interrupt(pcib, dev, pin)); } +static int acpi_host_mem_start = 0x80000000; +TUNABLE_INT("hw.acpi.host_mem_start", &acpi_host_mem_start); + struct resource * acpi_pcib_acpi_alloc_resource(device_t dev, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) @@ -314,7 +318,7 @@ * is liekly OK. */ if (type == SYS_RES_MEMORY && start == 0UL && end == ~0UL) - start = 0xfe000000; + start = acpi_host_mem_start; return (bus_generic_alloc_resource(dev, child, type, rid, start, end, count, flags)); } ==== //depot/projects/hammer/sys/dev/sound/isa/ad1816.c#9 (text+ko) ==== @@ -33,7 +33,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/ad1816.c,v 1.33 2004/07/16 03:59:54 tanimura Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/ad1816.c,v 1.34 2004/10/11 19:52:31 njl Exp $"); struct ad1816_info; @@ -673,6 +673,7 @@ }; DRIVER_MODULE(snd_ad1816, isa, ad1816_driver, pcm_devclass, 0, 0); +DRIVER_MODULE(snd_ad1816, acpi, ad1816_driver, pcm_devclass, 0, 0); MODULE_DEPEND(snd_ad1816, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); MODULE_VERSION(snd_ad1816, 1); ==== //depot/projects/hammer/sys/dev/sound/isa/es1888.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/es1888.c,v 1.11 2004/07/16 03:59:54 tanimura Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/es1888.c,v 1.12 2004/10/11 19:52:31 njl Exp $"); #ifdef __alpha__ static int @@ -171,6 +171,7 @@ }; DRIVER_MODULE(snd_es1888, isa, es1888_driver, pcm_devclass, 0, 0); +DRIVER_MODULE(snd_es1888, acpi, es1888_driver, pcm_devclass, 0, 0); MODULE_DEPEND(snd_es1888, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); MODULE_VERSION(snd_es1888, 1); ==== //depot/projects/hammer/sys/dev/sound/isa/gusc.c#4 (text+ko) ==== @@ -45,7 +45,7 @@ #include #endif -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/gusc.c,v 1.14 2004/07/16 03:59:54 tanimura Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/gusc.c,v 1.15 2004/10/11 19:52:31 njl Exp $"); #define LOGICALID_NOPNP 0 #define LOGICALID_PCM 0x0000561e @@ -656,6 +656,7 @@ * gusc can be attached to an isa bus. */ DRIVER_MODULE(snd_gusc, isa, gusc_driver, gusc_devclass, 0, 0); +DRIVER_MODULE(snd_gusc, acpi, gusc_driver, gusc_devclass, 0, 0); MODULE_DEPEND(snd_gusc, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); MODULE_VERSION(snd_gusc, 1); ==== //depot/projects/hammer/sys/dev/sound/isa/sbc.c#7 (text+ko) ==== @@ -30,7 +30,7 @@ #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sbc.c,v 1.42 2004/07/16 03:59:54 tanimura Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sbc.c,v 1.43 2004/10/11 19:52:31 njl Exp $"); #define IO_MAX 3 #define IRQ_MAX 1 @@ -790,5 +790,6 @@ /* sbc can be attached to an isa bus. */ DRIVER_MODULE(snd_sbc, isa, sbc_driver, sbc_devclass, 0, 0); +DRIVER_MODULE(snd_sbc, acpi, sbc_driver, sbc_devclass, 0, 0); MODULE_DEPEND(snd_sbc, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); MODULE_VERSION(snd_sbc, 1); ==== //depot/projects/hammer/sys/geom/geom_io.c#29 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/geom_io.c,v 1.62 2004/10/06 20:59:59 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/geom_io.c,v 1.63 2004/10/11 21:22:59 ups Exp $"); #include #include @@ -254,6 +254,9 @@ bp->bio_length, cp->provider->sectorsize)); } + g_trace(G_T_BIO, "bio_request(%p) from %p(%s) to %p(%s) cmd %d", + bp, cp, cp->geom->name, pp, pp->name, bp->bio_cmd); + bp->bio_from = cp; bp->bio_to = pp; bp->bio_error = 0; @@ -280,8 +283,6 @@ g_bioq_unlock(&g_bio_run_down); /* Pass it on down. */ - g_trace(G_T_BIO, "bio_request(%p) from %p(%s) to %p(%s) cmd %d", - bp, cp, cp->geom->name, pp, pp->name, bp->bio_cmd); wakeup(&g_wait_down); } ==== //depot/projects/hammer/sys/i386/pci/pci_bus.c#18 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/pci/pci_bus.c,v 1.114 2004/10/06 15:18:12 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/pci/pci_bus.c,v 1.115 2004/10/11 21:10:23 imp Exp $"); #include "opt_cpu.h" @@ -35,6 +35,7 @@ #include #include #include +#include #include #include @@ -469,6 +470,16 @@ return ENOENT; } +SYSCTL_DECL(_hw_pci); + +static int legacy_host_mem_start = 0x80000000; +/* No TUNABLE_ULONG :-( */ +TUNABLE_INT("hw.pci.host_mem_start", &legacy_host_mem_start); +SYSCTL_INT(_hw_pci, OID_AUTO, host_mem_start, CTLFLAG_RDTUN, + &legacy_host_mem_start, 0x80000000, + "Limit the host bridge memory to being above this address. Must be\n\ +set at boot via a tunable."); + static struct resource * legacy_pcib_alloc_resource(device_t dev, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) @@ -481,9 +492,12 @@ * found to do it. This is typically only used on older laptops * that don't have pci busses behind pci bridge, so assuming > 32MB * is liekly OK. + * + * However, this can cause problems for other chipsets, so we make + * this tunable by hw.pci.host_mem_start. */ if (type == SYS_RES_MEMORY && start == 0UL && end == ~0UL) - start = 0xfe000000; + start = legacy_host_mem_start; return (bus_generic_alloc_resource(dev, child, type, rid, start, end, count, flags)); } ==== //depot/projects/hammer/sys/kern/uipc_mbuf2.c#13 (text+ko) ==== @@ -61,7 +61,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_mbuf2.c,v 1.28 2004/10/10 09:16:48 glebius Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_mbuf2.c,v 1.29 2004/10/11 18:40:19 glebius Exp $"); /*#define PULLDOWN_DEBUG*/ @@ -302,8 +302,8 @@ } /* Free a packet tag. */ -static void -_m_tag_free(struct m_tag *t) +void +m_tag_free_default(struct m_tag *t) { #ifdef MAC if (t->m_tag_id == PACKET_TAG_MACLABEL) @@ -325,7 +325,7 @@ if (t == NULL) return NULL; m_tag_setup(t, cookie, type, len); - t->m_tag_free = _m_tag_free; + t->m_tag_free = m_tag_free_default; return t; } ==== //depot/projects/hammer/sys/net/netisr.c#10 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/net/netisr.c,v 1.14 2004/09/03 01:37:02 rwatson Exp $ + * $FreeBSD: src/sys/net/netisr.c,v 1.15 2004/10/11 20:01:43 andre Exp $ */ #include "opt_net.h" @@ -185,6 +185,7 @@ ni->ni_handler = NULL; if (ni->ni_queue != NULL) IF_DRAIN(ni->ni_queue); + ni->ni_queue = NULL; } struct isrstat { ==== //depot/projects/hammer/sys/sys/mbuf.h#33 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)mbuf.h 8.5 (Berkeley) 2/19/95 - * $FreeBSD: src/sys/sys/mbuf.h,v 1.161 2004/10/10 09:16:48 glebius Exp $ + * $FreeBSD: src/sys/sys/mbuf.h,v 1.162 2004/10/11 18:40:19 glebius Exp $ */ #ifndef _SYS_MBUF_H_ @@ -648,6 +648,7 @@ struct m_tag *m_tag_alloc(u_int32_t, int, int, int); void m_tag_delete(struct mbuf *, struct m_tag *); void m_tag_delete_chain(struct mbuf *, struct m_tag *); +void m_tag_free_default(struct m_tag *); struct m_tag *m_tag_locate(struct mbuf *, u_int32_t, int, struct m_tag *); struct m_tag *m_tag_copy(struct m_tag *, int); int m_tag_copy_chain(struct mbuf *, struct mbuf *, int); ==== //depot/projects/hammer/tools/regression/lib/msun/Makefile#2 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/tools/regression/lib/msun/Makefile,v 1.1 2004/06/11 03:22:34 das Exp $ +# $FreeBSD: src/tools/regression/lib/msun/Makefile,v 1.2 2004/10/11 18:40:45 stefanf Exp $ -TESTS= test-fenv +TESTS= test-fenv test-ilogb CFLAGS+= -O0 -lm ARCH!= uname -m .if ${ARCH} == "alpha" From owner-p4-projects@FreeBSD.ORG Mon Oct 11 21:44:11 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 25DA916A4D1; Mon, 11 Oct 2004 21:44:11 +0000 (GMT) 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 DFB7E16A4CE for ; Mon, 11 Oct 2004 21:44:10 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C610643D39 for ; Mon, 11 Oct 2004 21:44:10 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9BLiAv9094252 for ; Mon, 11 Oct 2004 21:44:10 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9BLiA8I094249 for perforce@freebsd.org; Mon, 11 Oct 2004 21:44:10 GMT (envelope-from peter@freebsd.org) Date: Mon, 11 Oct 2004 21:44:10 GMT Message-Id: <200410112144.i9BLiA8I094249@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 63019 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, 11 Oct 2004 21:44:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=63019 Change 63019 by peter@peter_daintree on 2004/10/11 21:43:50 integ -I -b i386_hammer Affected files ... .. //depot/projects/hammer/sys/amd64/acpica/acpi_machdep.c#19 integrate .. //depot/projects/hammer/sys/amd64/include/acpica_machdep.h#13 integrate .. //depot/projects/hammer/sys/amd64/isa/pbio.c#2 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_bus.c#23 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/acpica/acpi_machdep.c#19 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/acpica_machdep.h#13 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/pbio.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/isa/pbio.c,v 1.4 2004/10/10 03:26:20 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/isa/pbio.c,v 1.5 2004/10/11 00:58:24 imp Exp $"); #include #include @@ -113,7 +113,6 @@ * One of these per allocated device */ struct pbio_softc { - int iobase; /* I/O base */ struct portdata pd[PBIO_NPORTS];/* Per port data */ int iomode; /* Virtualized I/O mode port value */ /* The real port is write-only */ @@ -186,7 +185,7 @@ /* Set all ports to output */ pboutb(scp, PBIO_CFG, 0x80); printf("pbio val(CFG: 0x%03x)=0x%02x (should be 0x80)\n", - iobase, pbinb(scp, PBIO_CFG)); + rman_get_start(scp->res), pbinb(scp, PBIO_CFG)); pboutb(scp, PBIO_PORTA, 0xa5); val = pbinb(scp, PBIO_PORTA); printf("pbio val=0x%02x (should be 0xa5)\n", val); @@ -221,7 +220,6 @@ int i; int rid; struct pbio_softc *sc; - int flags, i, iobase, rid, unit; sc = device_get_softc(dev); unit = device_get_unit(dev); @@ -403,7 +401,7 @@ pbiowrite(struct cdev *dev, struct uio *uio, int ioflag) { struct pbio_softc *scp; - int i, iobase, port, ret, towrite, unit; + int i, port, ret, towrite, unit; char val, oval; unit = UNIT(dev); ==== //depot/projects/hammer/sys/amd64/pci/pci_bus.c#23 (text+ko) ==== @@ -35,6 +35,7 @@ #include #include #include +#include #include #include @@ -263,6 +264,16 @@ return ENOENT; } +SYSCTL_DECL(_hw_pci); + +static int legacy_host_mem_start = 0x80000000; +/* No TUNABLE_ULONG :-( */ +TUNABLE_INT("hw.pci.host_mem_start", &legacy_host_mem_start); +SYSCTL_INT(_hw_pci, OID_AUTO, host_mem_start, CTLFLAG_RDTUN, + &legacy_host_mem_start, 0x80000000, + "Limit the host bridge memory to being above this address. Must be\n\ +set at boot via a tunable."); + static struct resource * legacy_pcib_alloc_resource(device_t dev, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) @@ -275,9 +286,12 @@ * found to do it. This is typically only used on older laptops * that don't have pci busses behind pci bridge, so assuming > 32MB * is liekly OK. + * + * However, this can cause problems for other chipsets, so we make + * this tunable by hw.pci.host_mem_start. */ if (type == SYS_RES_MEMORY && start == 0UL && end == ~0UL) - start = 0xfe000000; + start = legacy_host_mem_start; return (bus_generic_alloc_resource(dev, child, type, rid, start, end, count, flags)); } From owner-p4-projects@FreeBSD.ORG Mon Oct 11 22:20:58 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E35816A4D1; Mon, 11 Oct 2004 22:20:58 +0000 (GMT) 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 31CEF16A4CF for ; Mon, 11 Oct 2004 22:20:58 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 12EA943D49 for ; Mon, 11 Oct 2004 22:20:58 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9BMKvma032366 for ; Mon, 11 Oct 2004 22:20:57 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9BMKvJO032363 for perforce@freebsd.org; Mon, 11 Oct 2004 22:20:57 GMT (envelope-from peter@freebsd.org) Date: Mon, 11 Oct 2004 22:20:57 GMT Message-Id: <200410112220.i9BMKvJO032363@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 63025 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, 11 Oct 2004 22:20:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=63025 Change 63025 by peter@peter_daintree on 2004/10/11 22:20:08 IFC @63022 Affected files ... .. //depot/projects/hammer/sys/amd64/pci/pci_bus.c#24 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#18 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#37 integrate .. //depot/projects/hammer/sys/kern/kern_sysctl.c#17 integrate .. //depot/projects/hammer/sys/kern/kern_tc.c#16 integrate .. //depot/projects/hammer/sys/kern/kern_xxx.c#9 integrate .. //depot/projects/hammer/sys/sys/conf.h#24 integrate .. //depot/projects/hammer/sys/sys/sysctl.h#21 integrate .. //depot/projects/hammer/sys/vm/vm_meter.c#12 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/pci/pci_bus.c#24 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.109 2004/06/03 05:58:30 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.110 2004/10/11 21:51:27 peter Exp $"); #include "opt_cpu.h" ==== //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#18 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.24 2004/10/05 18:51:10 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.25 2004/10/11 22:04:15 peter Exp $"); #include "opt_compat.h" ==== //depot/projects/hammer/sys/kern/kern_exec.c#37 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.255 2004/10/07 13:50:10 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_exec.c,v 1.256 2004/10/11 22:04:15 peter Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" ==== //depot/projects/hammer/sys/kern/kern_sysctl.c#17 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_sysctl.c,v 1.159 2004/07/28 06:42:41 kan Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_sysctl.c,v 1.160 2004/10/11 22:04:15 peter Exp $"); #include "opt_compat.h" #include "opt_mac.h" ==== //depot/projects/hammer/sys/kern/kern_tc.c#16 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_tc.c,v 1.162 2004/08/14 08:33:49 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_tc.c,v 1.163 2004/10/11 22:04:15 peter Exp $"); #include "opt_ntp.h" ==== //depot/projects/hammer/sys/kern/kern_xxx.c#9 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_xxx.c,v 1.42 2004/07/26 07:24:03 cperciva Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_xxx.c,v 1.43 2004/10/11 22:04:15 peter Exp $"); #include "opt_compat.h" ==== //depot/projects/hammer/sys/sys/conf.h#24 (text+ko) ==== @@ -34,16 +34,16 @@ * SUCH DAMAGE. * * @(#)conf.h 8.5 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/sys/conf.h,v 1.201 2004/10/01 06:33:39 phk Exp $ + * $FreeBSD: src/sys/sys/conf.h,v 1.202 2004/10/11 21:56:27 peter Exp $ */ #ifndef _SYS_CONF_H_ #define _SYS_CONF_H_ -#ifndef _KERNEL +#ifdef _KERNEL +#include +#else #include -#else -#include #endif struct tty; ==== //depot/projects/hammer/sys/sys/sysctl.h#21 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)sysctl.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/sys/sys/sysctl.h,v 1.132 2004/07/28 07:08:39 kan Exp $ + * $FreeBSD: src/sys/sys/sysctl.h,v 1.133 2004/10/11 22:04:16 peter Exp $ */ #ifndef _SYS_SYSCTL_H_ ==== //depot/projects/hammer/sys/vm/vm_meter.c#12 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_meter.c,v 1.77 2004/09/04 05:51:54 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_meter.c,v 1.78 2004/10/11 22:04:16 peter Exp $"); #include #include From owner-p4-projects@FreeBSD.ORG Mon Oct 11 22:34:15 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E7E616A4D1; Mon, 11 Oct 2004 22:34:14 +0000 (GMT) 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 794EB16A4CE for ; Mon, 11 Oct 2004 22:34:14 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6A64543D2D for ; Mon, 11 Oct 2004 22:34:14 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9BMYE7i033177 for ; Mon, 11 Oct 2004 22:34:14 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9BMYE4X033174 for perforce@freebsd.org; Mon, 11 Oct 2004 22:34:14 GMT (envelope-from peter@freebsd.org) Date: Mon, 11 Oct 2004 22:34:14 GMT Message-Id: <200410112234.i9BMYE4X033174@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 63026 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, 11 Oct 2004 22:34:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=63026 Change 63026 by peter@peter_daintree on 2004/10/11 22:33:20 IFC @63024 (oops, used wrong number last time) Affected files ... .. //depot/projects/hammer/lib/libarchive/Makefile#13 integrate .. //depot/projects/hammer/lib/libkvm/kvm_proc.c#26 integrate .. //depot/projects/hammer/tools/lib32/build32.sh#6 integrate Differences ... ==== //depot/projects/hammer/lib/libarchive/Makefile#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.22 2004/09/01 05:07:17 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.23 2004/10/11 22:04:05 obrien Exp $ # # Use "make distfile" to build a conventional tar.gz archive @@ -21,10 +21,6 @@ WARNS?= 6 .endif -# I'm not yet ready for a shared version of this library, as -# there are a couple of API changes still in the works. -NOPIC= 1 - INCS= archive.h archive_entry.h # Note: archive.h does need to be listed here, since it's built ==== //depot/projects/hammer/lib/libkvm/kvm_proc.c#26 (text+ko) ==== @@ -42,7 +42,7 @@ #endif #include -__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.81 2004/10/06 17:10:56 jhb Exp $"); +__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.82 2004/10/11 21:56:27 peter Exp $"); /* * Proc traversal interface for kvm. ps and w are (probably) the exclusive ==== //depot/projects/hammer/tools/lib32/build32.sh#6 (text+ko) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# $FreeBSD: src/tools/lib32/build32.sh,v 1.6 2004/09/16 01:41:11 peter Exp $ +# $FreeBSD: src/tools/lib32/build32.sh,v 1.7 2004/10/11 22:14:47 peter Exp $ # # This script is for running on a self-hosted amd64 machine, with an up-to-date # world and toolchain etc. ie: the installed world is assumed to match the sources. @@ -66,3 +66,5 @@ make -s -DNOMAN -DNODOC -DNOINFO -k depend make -s -DNOMAN -DNODOC -DNOINFO -k make -s -DNOMAN -DNODOC -DNOINFO -k install + +chflags -R noschg $MAKEOBJDIRPREFIX From owner-p4-projects@FreeBSD.ORG Mon Oct 11 23:38:33 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C478716A4D2; Mon, 11 Oct 2004 23:38:32 +0000 (GMT) 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 815F616A4CE for ; Mon, 11 Oct 2004 23:38:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 616A743D1D for ; Mon, 11 Oct 2004 23:38:32 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9BNcW8e038284 for ; Mon, 11 Oct 2004 23:38:32 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9BNcWvS038281 for perforce@freebsd.org; Mon, 11 Oct 2004 23:38:32 GMT (envelope-from peter@freebsd.org) Date: Mon, 11 Oct 2004 23:38:32 GMT Message-Id: <200410112338.i9BNcWvS038281@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 63028 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, 11 Oct 2004 23:38:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=63028 Change 63028 by peter@peter_melody on 2004/10/11 23:37:44 fix unbalance Affected files ... .. //depot/projects/hammer/etc/Makefile#33 edit Differences ... ==== //depot/projects/hammer/etc/Makefile#33 (text+ko) ==== @@ -209,7 +209,6 @@ .endif .endif .endif -.endif .if !defined(NO_SENDMAIL) mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.sendmail.dist -p ${DESTDIR}/ .endif From owner-p4-projects@FreeBSD.ORG Mon Oct 11 23:39:34 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9058716A4D1; Mon, 11 Oct 2004 23:39:34 +0000 (GMT) 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 55DAE16A4CE for ; Mon, 11 Oct 2004 23:39:34 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3A8DF43D41 for ; Mon, 11 Oct 2004 23:39:34 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9BNdY4P038392 for ; Mon, 11 Oct 2004 23:39:34 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9BNdX0W038389 for perforce@freebsd.org; Mon, 11 Oct 2004 23:39:33 GMT (envelope-from peter@freebsd.org) Date: Mon, 11 Oct 2004 23:39:33 GMT Message-Id: <200410112339.i9BNdX0W038389@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 63029 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, 11 Oct 2004 23:39:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=63029 Change 63029 by peter@peter_melody on 2004/10/11 23:38:35 HACK HACK HACK! (WIP) Affected files ... .. //depot/projects/hammer/Makefile#24 edit .. //depot/projects/hammer/Makefile.inc1#63 edit Differences ... ==== //depot/projects/hammer/Makefile#24 (text+ko) ==== @@ -69,7 +69,8 @@ kernel-toolchain libraries lint maninstall \ obj objlink regress rerelease tags toolchain update \ _worldtmp _legacy _bootstrap-tools _cleanobj _obj \ - _build-tools _cross-tools _includes _libraries _depend + _build-tools _cross-tools _includes _libraries _depend \ + _build32 _install32 BITGTS= files includes BITGTS:=${BITGTS} ${BITGTS:S/^/build/} ${BITGTS:S/^/install/} ==== //depot/projects/hammer/Makefile.inc1#63 (text+ko) ==== @@ -129,7 +129,7 @@ OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET} .endif WORLDTMP= ${OBJTREE}${.CURDIR}/${MACHINE_ARCH} -I386TMP= ${OBJTREE}${.CURDIR}/i386 +LIB32TMP= ${OBJTREE}${.CURDIR}/lib32 # /usr/games added for fortune which depend on strfile BPATH= ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games @@ -202,20 +202,27 @@ PATH=${TMPPATH} WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP} -# i386 world -I386CROSSENV= MAKEOBJDIRPREFIX=${OBJTREE} \ - MACHINE_ARCH=${TARGET_ARCH} \ - MACHINE=${TARGET} \ - CPUTYPE=${TARGET_CPUTYPE} \ - GROFF_BIN_PATH=${WORLDTMP}/legacy/usr/bin \ - GROFF_FONT_PATH=${WORLDTMP}/legacy/usr/share/groff_font \ - GROFF_TMAC_PATH=${WORLDTMP}/legacy/usr/share/tmac +# 32 bit world +CCARGS=-m32 -march=athlon-xp -msse2 -mfancy-math-387 -I${LIB32TMP}/usr/include -L${LIB32TMP}/usr/lib32 -B${LIB32TMP}/usr/lib32 +CXXARGS=-m32 -march=athlon-xp -msse2 -mfancy-math-387 -I${LIB32TMP}/usr/include/c++/3.4 -I${LIB32BIT}/usr/include -L${LIB32TMP}/usr/lib32 -B${LIB32TMP}/usr/lib32 +LIB32MAKEENV= MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \ + _SHLIBDIRPREFIX=${LIB32TMP} \ + INSTALL="sh ${.CURDIR}/tools/install.sh" \ + PATH=${TMPPATH} \ + CC="cc ${CCARGS}" \ + CXX="c++ ${CXXARGS}" \ + LD="ld -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \ + AS="as --32" \ + LIBDIR=/usr/lib32 \ + SHLIBDIR=/usr/lib32 -I386MAKEENV= ${I386CROSSENV} \ - _SHLIBDIRPREFIX=${I386TMP} \ - INSTALL="sh ${.CURDIR}/tools/install.sh" \ - PATH=${TMPPATH} -I386MAKE= ${I386MAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${I386TMP} +LIB32MAKE= ${LIB32MAKEENV} ${MAKE} -f Makefile.inc1 \ + CC="cc ${CCARGS}" \ + CXX="c++ ${CXXARGS}" \ + LD="ld -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \ + AS="as --32" \ + LIBDIR=/usr/lib32 \ + SHLIBDIR=/usr/lib32 # install stage .if empty(.MAKEFLAGS:M-n) @@ -355,6 +362,29 @@ @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${WMAKE} par-all +_build32: + @echo + @echo "--------------------------------------------------------------" + @echo ">>> stage 5.1: building 32 bit libraries" + @echo "--------------------------------------------------------------" +.for _dir in \ + lib lib32 usr/bin usr/include usr/lib32 usr/lib/compat/aout usr/libdata/ldscripts \ + usr/libexec usr/sbin usr/share/misc \ + usr/share/snmp/defs usr/share/snmp/mibs + mkdir -p ${LIB32TMP}/${_dir} +.endfor + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ + -p ${WORLDTMP}/usr/include >/dev/null + ln -sf ${.CURDIR}/sys ${WORLDTMP} + cd ${.CURDIR}; MACHINE_ARCH=i386 ${LIB32MAKE} DESTDIR=${LIB32TMP} hierarchy + cd ${.CURDIR}; MACHINE_ARCH=i386 ${LIB32MAKE} DESTDIR=${LIB32TMP} includes + cd ${.CURDIR}/lib/libncurses; ${MAKE} build-tools + cd ${.CURDIR}/lib/libmagic; ${MAKE} build-tools + cd ${.CURDIR}; MACHINE_ARCH=i386 ${LIB32MAKE} DESTDIR=${LIB32TMP} -DNO_BIND -DNOMAN -DNODOC -DNOINFO libraries + + +_install32: + WMAKE_TGTS= .if !defined(SUBDIR_OVERRIDE) From owner-p4-projects@FreeBSD.ORG Tue Oct 12 10:57:25 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 02EF816A4D1; Tue, 12 Oct 2004 10:57:25 +0000 (GMT) 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 B116716A4CE; Tue, 12 Oct 2004 10:57:24 +0000 (GMT) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2387343D45; Tue, 12 Oct 2004 10:57:24 +0000 (GMT) (envelope-from robert@fledge.watson.org) Received: from fledge.watson.org (localhost [127.0.0.1]) by fledge.watson.org (8.13.1/8.13.1) with ESMTP id i9CAtmxl065291; Tue, 12 Oct 2004 06:55:48 -0400 (EDT) (envelope-from robert@fledge.watson.org) Received: from localhost (robert@localhost)i9CAtm2H065288; Tue, 12 Oct 2004 06:55:48 -0400 (EDT) (envelope-from robert@fledge.watson.org) Date: Tue, 12 Oct 2004 06:55:48 -0400 (EDT) From: Robert Watson X-Sender: robert@fledge.watson.org To: Peter Wemm In-Reply-To: <200410112126.i9BLQlCu093658@repoman.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII cc: Perforce Change Reviews Subject: Re: PERFORCE change 63016 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, 12 Oct 2004 10:57:25 -0000 On Mon, 11 Oct 2004, Peter Wemm wrote: > Change 63016 by peter@peter_melody on 2004/10/11 21:26:18 > > Make the i386 sysctl binary work on amd64. This covers > most of the visible fields. Things like kern.proc.* and the > netstat structs are a nightmare. I think I'm going to cry. I wonder if it would make sense to convert 32-bit 6.x to use 64-bit-happy datastructures for the xfoo versions of the structures. We go through an externalization stage for all x structures anyway, and likely bzero() the structure, so 32-bit binaries would truncate the kernel values, which result in often useful numbers. Byte order might or might not be an issue, I suppose. Robert N M Watson FreeBSD Core Team, TrustedBSD Projects robert@fledge.watson.org Principal Research Scientist, McAfee Research From owner-p4-projects@FreeBSD.ORG Tue Oct 12 13:27:16 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2212E16A4D1; Tue, 12 Oct 2004 13:27:16 +0000 (GMT) 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 D337916A4CE for ; Tue, 12 Oct 2004 13:27:15 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 919EB43D2D for ; Tue, 12 Oct 2004 13:27:15 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9CDRFYQ011804 for ; Tue, 12 Oct 2004 13:27:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9CDPnv4011777 for perforce@freebsd.org; Tue, 12 Oct 2004 13:25:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 12 Oct 2004 13:25:49 GMT Message-Id: <200410121325.i9CDPnv4011777@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 63060 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, 12 Oct 2004 13:27:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=63060 Change 63060 by rwatson@rwatson_tislabs on 2004/10/12 13:24:34 Integrate TrustedBSD MAC branch up to FreeBSD 6.x-HEAD (around 5.3-BETA7). Affected files ... .. //depot/projects/trustedbsd/mac/MAINTAINERS#23 integrate .. //depot/projects/trustedbsd/mac/Makefile#30 integrate .. //depot/projects/trustedbsd/mac/Makefile.inc1#48 integrate .. //depot/projects/trustedbsd/mac/UPDATING#39 integrate .. //depot/projects/trustedbsd/mac/bin/Makefile.inc#12 integrate .. //depot/projects/trustedbsd/mac/bin/cat/cat.c#12 integrate .. //depot/projects/trustedbsd/mac/bin/chflags/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/bin/chflags/chflags.1#5 integrate .. //depot/projects/trustedbsd/mac/bin/chflags/chflags.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/chio/chio.1#5 integrate .. //depot/projects/trustedbsd/mac/bin/cp/cp.1#9 integrate .. //depot/projects/trustedbsd/mac/bin/cp/utils.c#13 integrate .. //depot/projects/trustedbsd/mac/bin/csh/config.h#3 integrate .. //depot/projects/trustedbsd/mac/bin/date/date.1#10 integrate .. //depot/projects/trustedbsd/mac/bin/date/vary.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/dd/args.c#13 integrate .. //depot/projects/trustedbsd/mac/bin/dd/dd.1#8 integrate .. //depot/projects/trustedbsd/mac/bin/dd/dd.c#13 integrate .. //depot/projects/trustedbsd/mac/bin/dd/dd.h#7 integrate .. //depot/projects/trustedbsd/mac/bin/dd/extern.h#7 integrate .. //depot/projects/trustedbsd/mac/bin/df/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/bin/df/df.1#8 integrate .. //depot/projects/trustedbsd/mac/bin/df/df.c#20 integrate .. //depot/projects/trustedbsd/mac/bin/domainname/domainname.1#5 integrate .. //depot/projects/trustedbsd/mac/bin/echo/echo.1#6 integrate .. //depot/projects/trustedbsd/mac/bin/ed/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/bin/ed/ed.1#7 integrate .. //depot/projects/trustedbsd/mac/bin/expr/expr.1#8 integrate .. //depot/projects/trustedbsd/mac/bin/getfacl/getfacl.1#7 integrate .. //depot/projects/trustedbsd/mac/bin/hostname/hostname.1#5 integrate .. //depot/projects/trustedbsd/mac/bin/kill/kill.1#5 integrate .. //depot/projects/trustedbsd/mac/bin/ln/ln.1#8 integrate .. //depot/projects/trustedbsd/mac/bin/ln/symlink.7#6 integrate .. //depot/projects/trustedbsd/mac/bin/ls/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/bin/ls/cmp.c#7 integrate .. //depot/projects/trustedbsd/mac/bin/ls/ls.1#25 integrate .. //depot/projects/trustedbsd/mac/bin/ls/ls.c#30 integrate .. //depot/projects/trustedbsd/mac/bin/ls/print.c#24 integrate .. //depot/projects/trustedbsd/mac/bin/mkdir/mkdir.1#6 integrate .. //depot/projects/trustedbsd/mac/bin/mkdir/mkdir.c#8 integrate .. //depot/projects/trustedbsd/mac/bin/pax/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/bin/pax/ar_io.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/pax/pax.1#9 integrate .. //depot/projects/trustedbsd/mac/bin/ps/extern.h#17 integrate .. //depot/projects/trustedbsd/mac/bin/ps/fmt.c#11 integrate .. //depot/projects/trustedbsd/mac/bin/ps/keyword.c#21 integrate .. //depot/projects/trustedbsd/mac/bin/ps/print.c#24 integrate .. //depot/projects/trustedbsd/mac/bin/ps/ps.1#21 integrate .. //depot/projects/trustedbsd/mac/bin/ps/ps.c#21 integrate .. //depot/projects/trustedbsd/mac/bin/ps/ps.h#9 integrate .. //depot/projects/trustedbsd/mac/bin/pwd/pwd.1#10 integrate .. //depot/projects/trustedbsd/mac/bin/rcp/rcp.1#6 integrate .. //depot/projects/trustedbsd/mac/bin/rm/rm.1#8 integrate .. //depot/projects/trustedbsd/mac/bin/rm/rm.c#13 integrate .. //depot/projects/trustedbsd/mac/bin/rmdir/rmdir.c#8 integrate .. //depot/projects/trustedbsd/mac/bin/setfacl/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/bin/setfacl/setfacl.1#6 integrate .. //depot/projects/trustedbsd/mac/bin/sh/arith.y#7 integrate .. //depot/projects/trustedbsd/mac/bin/sh/bltin/echo.1#6 integrate .. //depot/projects/trustedbsd/mac/bin/sh/exec.c#11 integrate .. //depot/projects/trustedbsd/mac/bin/sh/sh.1#16 integrate .. //depot/projects/trustedbsd/mac/bin/sh/var.c#10 integrate .. //depot/projects/trustedbsd/mac/bin/stty/stty.1#5 integrate .. //depot/projects/trustedbsd/mac/bin/test/TEST.README#3 integrate .. //depot/projects/trustedbsd/mac/bin/test/test.1#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/AUTHORS#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/BUGS#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/COPYING#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/ChangeLog#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/FREEBSD-Xlist#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/FREEBSD-upgrade#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/INSTALL#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/MIRRORS#4 delete .. //depot/projects/trustedbsd/mac/contrib/amd/MIRRORS.html#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/MIRRORS.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/amd/NEWS#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/README#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/README.y2k#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/am_ops.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amd.8#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amd.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amd.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_auto.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_direct.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_error.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_host.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_inherit.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_link.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_linkx.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_nfsl.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_nfsx.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_program.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_root.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_toplvl.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amfs_union.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amq_subr.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amq_svc.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/autil.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/clock.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/conf.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/conf_parse.y#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/conf_tok.l#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/get_args.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/info_file.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/info_hesiod.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/info_ldap.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/info_ndbm.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/info_nis.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/info_nisplus.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/info_passwd.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/info_union.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/map.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/mapc.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/mntfs.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/nfs_prot_svc.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/nfs_start.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/nfs_subr.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_TEMPLATE.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_cachefs.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_cdfs.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_efs.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_lofs.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_mfs.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_nfs.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_nfs3.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_nullfs.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_pcfs.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_tfs.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_tmpfs.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_ufs.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_umapfs.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_unionfs.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/ops_xfs.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/opts.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/restart.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/rpc_fwd.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/sched.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/srvr_amfs_auto.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/srvr_nfs.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amq/amq.8#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amq/amq.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amq/amq.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amq/amq_clnt.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amq/amq_xdr.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amq/pawd.1#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amq/pawd.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/bootstrap#2 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/commit#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/conf/checkmount/checkmount_bsd44.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/conf/hn_dref/hn_dref_default.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/amd/conf/mount/mount_default.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/conf/mtab/mtab_bsd.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/conf/nfs_prot/nfs_prot_aix5_1.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/conf/nfs_prot/nfs_prot_darwin.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/conf/nfs_prot/nfs_prot_osf5.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/conf/nfs_prot/nfs_prot_sunos5_8.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/conf/transp/transp_sockets.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/conf/trap/trap_default.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/conf/umount/umount_bsd44.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/config.guess#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/config.guess.long#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/config.sub#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/configure.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/cvs-server.txt#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/depcomp#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/doc/am-utils.texi#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/doc/mdate-sh#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/fixmount/fixmount.8#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fixmount/fixmount.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/fsi_analyze.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/fsi_data.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/fsi_dict.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/fsi_gram.y#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/fsi_lex.l#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/fsi_util.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/fsinfo.8#6 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/fsinfo.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/fsinfo.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/wr_atab.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/wr_bparam.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/wr_dumpset.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/wr_exportfs.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/wr_fstab.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/hlfsd/hlfsd.8#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/hlfsd/hlfsd.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/hlfsd/hlfsd.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/hlfsd/homedir.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/hlfsd/nfs_prot_svc.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/hlfsd/stubs.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/include/am_defs.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/include/am_utils.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/include/am_xdr_func.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/include/amq_defs.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/install-sh#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/libamu/amu.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/libamu/hasmntopt.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/libamu/misc_rpc.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/libamu/mount_fs.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/libamu/mtab.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/libamu/nfs_prot_xdr.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/libamu/strerror.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/libamu/util.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/libamu/wire.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/libamu/xdr_func.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/libamu/xutil.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/ltmain.sh#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/c_void_p.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/cache_check_dynamic.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_amu_fs.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_checkmount_style.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_extern.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_fhandle.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_field.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_fs_headers.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_fs_mntent.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_gnu_getopt.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_hide_mount_type.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_lib2.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_map_funcs.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_mnt2_cdfs_opt.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_mnt2_gen_opt.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_mnt2_nfs_opt.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_mnttab_file_name.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_mnttab_location.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_mnttab_opt.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_mnttab_style.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_mnttab_type.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_mount_style.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_mount_trap.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_mount_type.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_mtype_printf_type.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_mtype_type.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_network_transport_type.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_nfs_fh_dref.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_nfs_hn_dref.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_nfs_prot_headers.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_nfs_sa_dref.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_nfs_socket_connection.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_os_libs.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_restartable_signal_handler.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_umount_style.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_unmount_args.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/check_unmount_call.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/expand_cpp_hex.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/expand_cpp_int.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/expand_cpp_string.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/expand_run_string.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/extern_optarg.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/extern_sys_errlist.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/field_mntent_t_mnt_time_string.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/func_bad_memcmp.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/func_bad_yp_all.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/header_templates.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/host_macros.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/linux_headers.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/localconfig.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/mount_headers.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/name_package.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/name_version.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/opt_amu_cflags.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/opt_cppflags.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/opt_debug.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/opt_ldflags.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/opt_libs.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/os_cflags.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/os_cppflags.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/os_ldflags.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/package_bugreport.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/package_name.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/package_version.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/save_state.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/struct_field_nfs_fh.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/struct_mntent.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/struct_mnttab.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/struct_nfs_args.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/struct_nfs_fh.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/struct_nfs_fh3.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/struct_nfs_gfs_mount.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/try_compile_anyfs.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/try_compile_nfs.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/try_compile_rpc.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_auth_create_gidlist.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_cachefs_args.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_cdfs_args.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_efs_args.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_lofs_args.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_mfs_args.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_pcfs_args.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_recvfrom_fromlen.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_rfs_args.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_svc_in_arg.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_time_t.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_tmpfs_args.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_ufs_args.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_xdrproc_t.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_xfs_args.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/type_yp_order_outorder.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/m4/macros/with_addon.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/missing#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/mk-amd-map/mk-amd-map.8#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/mk-amd-map/mk-amd-map.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/mkinstalldirs#2 delete .. //depot/projects/trustedbsd/mac/contrib/amd/scripts/amd.conf-sample#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/scripts/amd.conf.5#6 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/scripts/automount2amd.8#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/scripts/expn.1#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/scripts/expn.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/scripts/lostaltmail.conf-sample#3 delete .. //depot/projects/trustedbsd/mac/contrib/amd/scripts/lostaltmail.in#4 delete .. //depot/projects/trustedbsd/mac/contrib/amd/tasks#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/wire-test/wire-test.8#4 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/wire-test/wire-test.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/CHANGES#10 delete .. //depot/projects/trustedbsd/mac/contrib/bind/DNSSEC#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/FREEBSD-Upgrade#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/FREEBSD-Xlist#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/INSTALL#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/LICENSE#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/Makefile#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/README#9 delete .. //depot/projects/trustedbsd/mac/contrib/bind/SUPPORT#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/TODO#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/Version#9 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/Makefile#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/addr/Makefile#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/addr/addr.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/dig/Makefile#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/dig/dig.c#7 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/dnskeygen/Makefile#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/dnskeygen/dnskeygen.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/dnsquery/Makefile#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/dnsquery/dnsquery.c#6 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/host/Makefile#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/host/host.c#7 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/irpd/Makefile#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/irpd/irpd.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/irpd/irs-irpd.conf#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/irpd/version.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/mkservdb/Makefile#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/mkservdb/mkservdb.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named-bootconf/Grot/named-bootconf.pl#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named-bootconf/Makefile#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named-bootconf/named-bootconf.sh#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named-bootconf/test.boot#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named-xfer/Makefile#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named-xfer/named-xfer.c#6 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/Makefile#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/db_defs.h#8 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/db_dump.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/db_func.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/db_glob.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/db_glue.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/db_ixfr.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/db_load.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/db_lookup.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/db_save.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/db_sec.c#7 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/db_tsig.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/db_update.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/named.conf#6 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/named.h#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_config.c#7 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_ctl.c#6 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_defs.h#9 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_forw.c#7 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_func.h#6 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_glob.h#6 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_glue.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_init.c#6 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_ixfr.c#6 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_lexer.c#7 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_lexer.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_main.c#8 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_maint.c#7 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_ncache.c#7 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_notify.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_parser.y#7 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_parseutil.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_parseutil.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_req.c#9 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_resp.c#10 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_signal.c#6 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_sort.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_stats.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_udp.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_update.c#6 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_xfr.c#6 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/pathtemplate.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/test/127.0.0.zone#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/test/localhost.zone#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/test/named.conf#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/test/root.hint#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/version.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/ndc/Makefile#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/ndc/ndc.c#6 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/nslookup/Makefile#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/nslookup/commands.l#6 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/nslookup/debug.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/nslookup/getinfo.c#7 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/nslookup/list.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/nslookup/main.c#7 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/nslookup/nslookup.help#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/nslookup/pathnames.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/nslookup/res.h#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/nslookup/send.c#7 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/nslookup/skip.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/nslookup/subr.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/nsupdate/Makefile#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/bin/nsupdate/nsupdate.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/html/acl.html#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/html/address_list.html#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/html/comments.html#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/html/config.html#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/html/controls.html#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/html/docdef.html#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/html/example.html#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/html/include.html#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/html/index.html#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/html/key.html#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/html/logging.html#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/html/master.html#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/html/options.html#6 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/html/server.html#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/html/trusted-keys.html#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/html/zone.html#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/Makefile#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/dig.1#6 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/dnskeygen.1#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/dnsquery.1#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/getaddrinfo.3#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/gethostbyname.3#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/getipnodebyname.3#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/getnameinfo.3#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/getnetent.3#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/hesiod.3#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/host.1#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/hostname.7#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/inet_cidr.3#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/irs.conf.5#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/mailaddr.7#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/mkdep.1#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/named-bootconf.8#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/named-xfer.8#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/named.8#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/named.conf.5#7 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/ndc.8#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/nslookup.8#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/nsupdate.8#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/resolver.3#6 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/resolver.5#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/tsig.3#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/misc/DynamicUpdate#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/misc/FAQ.1of2#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/misc/FAQ.2of2#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/misc/rfc2317-notes.txt#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/misc/style.txt#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/include/Makefile#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/include/arpa/Makefile#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/include/arpa/inet.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/include/arpa/nameser.h#6 delete .. //depot/projects/trustedbsd/mac/contrib/bind/include/arpa/nameser_compat.h#6 delete .. //depot/projects/trustedbsd/mac/contrib/bind/include/fd_setsize.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/include/hesiod.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/include/irp.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/include/irs.h#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/include/isc/Makefile#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/include/isc/assertions.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/include/isc/ctl.h#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/include/isc/dst.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/include/isc/eventlib.h#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/include/isc/heap.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/include/isc/irpmarshall.h#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/include/isc/list.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/include/isc/logging.h#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/include/isc/memcluster.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/include/isc/misc.h#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/include/isc/tree.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/include/netdb.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/include/netgroup.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/include/res_update.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/include/resolv.h#7 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/Makefile#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/dst/Makefile#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/dst/README#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/dst/bsafe_link.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/dst/cylink_link.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/dst/dst_api.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/dst/dst_internal.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/dst/eay_dss_link.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/dst/hmac_link.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/dst/md5.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/dst/md5_dgst.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/dst/md5_locl.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/dst/prandom.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/dst/rsaref_link.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/dst/support.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/inet/Makefile#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/inet/inet_addr.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/inet/inet_cidr_ntop.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/inet/inet_cidr_pton.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/inet/inet_data.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/inet/inet_lnaof.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/inet/inet_makeaddr.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/inet/inet_net_ntop.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/inet/inet_net_pton.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/inet/inet_neta.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/inet/inet_netof.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/inet/inet_network.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/inet/inet_ntoa.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/inet/inet_ntop.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/inet/inet_pton.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/inet/nsap_addr.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/Makefile#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/Makefile.BSD#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/README#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/dns.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/dns_gr.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/dns_ho.c#7 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/dns_nw.c#7 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/dns_p.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/dns_pr.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/dns_pw.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/dns_sv.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/gai_strerror.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/gen.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/gen_gr.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/gen_ho.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/gen_ng.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/gen_nw.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/gen_p.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/gen_pr.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/gen_pw.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/gen_sv.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/getaddrinfo.c#6 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/getgrent.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/getgrent_r.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/gethostent.c#6 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/gethostent_r.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/getnameinfo.c#6 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/getnetent.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/getnetent_r.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/getnetgrent.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/getnetgrent_r.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/getprotoent.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/getprotoent_r.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/getpwent.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/getpwent_r.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/getservent.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/getservent_r.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/hesiod.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/hesiod_p.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/irp.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/irp_gr.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/irp_ho.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/irp_ng.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/irp_nw.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/irp_p.h#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/irp_pr.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/irp_pw.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/irp_sv.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/irpmarshall.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/irs_data.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/irs_data.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/irs_p.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/lcl.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/lcl_gr.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/lcl_ho.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/lcl_ng.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/lcl_nw.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/lcl_p.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/lcl_pr.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/lcl_pw.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/lcl_sv.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/nis.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/nis_gr.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/nis_ho.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/nis_ng.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/nis_nw.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/nis_p.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/nis_pr.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/nis_pw.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/nis_sv.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/nul_ng.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/pathnames.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/util.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/isc/Makefile#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/isc/assertions.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/isc/assertions.mdoc#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/isc/base64.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/isc/bitncmp.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/isc/bitncmp.mdoc#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/isc/ctl_clnt.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/isc/ctl_p.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/isc/ctl_p.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/isc/ctl_srvr.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/isc/ev_connects.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/isc/ev_files.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/isc/ev_streams.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/isc/ev_timers.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/isc/ev_waits.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/isc/eventlib.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/isc/eventlib.mdoc#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/isc/eventlib_p.h#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/isc/heap.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/isc/heap.mdoc#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/isc/hex.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/isc/logging.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/isc/logging.mdoc#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/isc/logging_p.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/isc/memcluster.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/isc/memcluster.mdoc#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/isc/movefile.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/isc/tree.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/isc/tree.mdoc#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/nameser/Makefile#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/nameser/ns_date.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/nameser/ns_name.c#8 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/nameser/ns_netint.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/nameser/ns_parse.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/nameser/ns_print.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/nameser/ns_samedomain.c#6 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/nameser/ns_sign.c#6 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/nameser/ns_ttl.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/nameser/ns_verify.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/resolv/Makefile#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/resolv/herror.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/resolv/res_comp.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/resolv/res_data.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/resolv/res_debug.c#6 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/resolv/res_debug.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/resolv/res_findzonecut.c#6 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/resolv/res_init.c#6 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/resolv/res_mkquery.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/resolv/res_mkupdate.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/resolv/res_mkupdate.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/resolv/res_private.h#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/resolv/res_query.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/resolv/res_send.c#6 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/resolv/res_sendsigned.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/lib/resolv/res_update.c#6 delete .. //depot/projects/trustedbsd/mac/contrib/bind/port/Makefile#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/port/README#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/port/freebsd/Makefile#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/port/freebsd/Makefile.set#6 delete .. //depot/projects/trustedbsd/mac/contrib/bind/port/freebsd/bin/probe_ipv6#4 delete .. //depot/projects/trustedbsd/mac/contrib/bind/port/freebsd/include/Makefile#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/port/freebsd/include/port_after.h#7 delete .. //depot/projects/trustedbsd/mac/contrib/bind/port/freebsd/include/port_before.h#5 delete .. //depot/projects/trustedbsd/mac/contrib/bind/port/freebsd/include/prand_conf.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/port/freebsd/include/sys/Makefile#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/port/freebsd/include/sys/bitypes.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/port/freebsd/noop.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/port/freebsd/probe#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/port/prand_conf/Makefile#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/port/prand_conf/README#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/port/prand_conf/prand_conf.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/port/settings#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/port/systype#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/tests/irs_testclient.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/tests/irs_testirpd.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/tests/irs_testserver.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/tests/test_cidr.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind/tests/test_getaddr.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/bind9/CHANGES#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/COPYRIGHT#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/FAQ#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/FREEBSD-Upgrade#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/FREEBSD-Xlist#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/KNOWN_DEFECTS#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/README#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/acconfig.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/check/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/check/check-tool.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/check/check-tool.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/check/named-checkconf.8#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/check/named-checkconf.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/check/named-checkconf.docbook#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/check/named-checkconf.html#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/check/named-checkzone.8#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/check/named-checkzone.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/check/named-checkzone.docbook#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/check/named-checkzone.html#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/dig.1#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/dig.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/dig.docbook#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/dig.html#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/dighost.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/host.1#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/host.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/host.docbook#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/host.html#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/include/dig/dig.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/nslookup.1#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/nslookup.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/nslookup.docbook#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dig/nslookup.html#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-keygen.8#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-keygen.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-keygen.html#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-makekeyset.8#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-makekeyset.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-makekeyset.docbook#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-makekeyset.html#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-signkey.8#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-signkey.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-signkey.docbook#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-signkey.html#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-signzone.8#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-signzone.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssec-signzone.html#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssectool.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/dnssec/dnssectool.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/aclconf.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/builtin.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/client.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/config.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/control.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/controlconf.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/include/named/aclconf.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/include/named/builtin.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/include/named/client.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/include/named/config.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/include/named/control.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/include/named/globals.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/include/named/interfacemgr.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/include/named/listenlist.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/include/named/log.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/include/named/logconf.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/include/named/lwaddr.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/include/named/lwdclient.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/include/named/lwresd.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/include/named/lwsearch.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/include/named/main.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/include/named/notify.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/include/named/query.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/include/named/server.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/include/named/sortlist.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/include/named/tkeyconf.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/include/named/tsigconf.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/include/named/types.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/include/named/update.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/include/named/xfrout.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/include/named/zoneconf.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/interfacemgr.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/listenlist.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/log.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/logconf.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/lwaddr.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/lwdclient.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/lwderror.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/lwdgabn.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/lwdgnba.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/lwdgrbn.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/lwdnoop.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/lwresd.8#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/lwresd.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/lwresd.docbook#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/lwresd.html#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/lwsearch.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/main.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/named.8#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/named.conf.5#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/named.conf.docbook#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/named.conf.html#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/named.docbook#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/named.html#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/notify.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/query.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/server.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/sortlist.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/tkeyconf.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/tsigconf.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/unix/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/unix/include/named/os.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/unix/os.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/update.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/xfrout.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/named/zoneconf.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/nsupdate/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/nsupdate/nsupdate.8#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/nsupdate/nsupdate.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/nsupdate/nsupdate.docbook#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/nsupdate/nsupdate.html#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/include/rndc/os.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/rndc-confgen.8#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/rndc-confgen.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/rndc-confgen.docbook#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/rndc-confgen.html#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/rndc.8#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/rndc.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/rndc.conf#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/rndc.conf.5#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/rndc.conf.docbook#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/rndc.conf.html#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/rndc.docbook#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/rndc.html#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/unix/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/unix/os.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/util.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/bin/rndc/util.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/config.guess#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/config.sub#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/configure.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM-book.xml#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.ch01.html#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.ch02.html#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.ch03.html#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.ch04.html#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.ch05.html#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.ch06.html#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.ch07.html#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.ch08.html#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.ch09.html#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Bv9ARM.html#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/README-SGML#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/isc.color.gif#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/nominum-docbook-html.dsl.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/nominum-docbook-print.dsl.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/arm/validate.sh.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-08.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-intro-11.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-protocol-07.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-records-09.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-04.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-01.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-33.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-04.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-00.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-02.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-02.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-01.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-02.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-09.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-01.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsop-misbehavior-against-aaaa-00.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-01.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-02.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-ipseckey-rr-09.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/draft/update#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/misc/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/misc/dnssec#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/misc/format-options.pl#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/misc/ipv6#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/misc/migration#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/misc/migration-4to9#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/misc/options#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/misc/rfc-compliance#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/misc/roadmap#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/misc/sdb#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/index#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc1032.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc1033.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc1034.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc1035.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc1101.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc1122.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc1123.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc1183.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc1348.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc1535.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc1536.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc1537.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc1591.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc1611.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc1612.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc1706.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc1712.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc1750.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc1876.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc1886.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc1982.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc1995.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc1996.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc2052.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc2104.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc2119.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc2133.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc2136.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc2137.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc2163.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc2168.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc2181.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc2230.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc2308.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc2317.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc2373.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc2374.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc2375.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc2418.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc2535.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc2536.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc2537.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc2538.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc2539.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc2540.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc2541.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc2553.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc2671.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc2672.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc2673.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc2782.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc2825.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc2826.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc2845.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc2874.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc2915.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc2929.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc2930.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc2931.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc3007.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc3008.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc3071.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc3090.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc3110.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc3123.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc3152.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc3197.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc3225.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc3226.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc3258.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc3363.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc3364.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc3425.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc3445.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc3467.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc3490.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc3491.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc3492.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc3493.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc3513.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc3596.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc3597.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc3645.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc3655.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc3658.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc3833.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc3845.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/doc/rfc/rfc952.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/install-sh#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/isc-config.sh.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/README#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/aclocal.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/api#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/bsd/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/bsd/daemon.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/bsd/ftruncate.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/bsd/gettimeofday.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/bsd/mktemp.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/bsd/putenv.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/bsd/readv.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/bsd/setenv.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/bsd/setitimer.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/bsd/strcasecmp.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/bsd/strdup.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/bsd/strerror.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/bsd/strpbrk.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/bsd/strsep.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/bsd/strtoul.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/bsd/utimes.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/bsd/writev.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/config.h.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/configure#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/configure.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind9/lib/bind/dst/Makefile.in#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Oct 12 14:27:30 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F261C16A4D1; Tue, 12 Oct 2004 14:27:29 +0000 (GMT) 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 C899A16A4CE for ; Tue, 12 Oct 2004 14:27:29 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A192A43D39 for ; Tue, 12 Oct 2004 14:27:29 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9CERTKX014409 for ; Tue, 12 Oct 2004 14:27:29 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9CERTDP014406 for perforce@freebsd.org; Tue, 12 Oct 2004 14:27:29 GMT (envelope-from jhb@freebsd.org) Date: Tue, 12 Oct 2004 14:27:29 GMT Message-Id: <200410121427.i9CERTDP014406@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 63064 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, 12 Oct 2004 14:27:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=63064 Change 63064 by jhb@jhb_slimer on 2004/10/12 14:27:25 Giant, Giant everywhere. Suggested by: rwatson Affected files ... .. //depot/projects/smpng/sys/pci/if_de.c#20 edit Differences ... ==== //depot/projects/smpng/sys/pci/if_de.c#20 (text+ko) ==== @@ -146,6 +146,7 @@ tulip_softc_t * const sc = arg; int s = splimp(); + mtx_assert(&Giant, MA_OWNED); TULIP_PERFSTART(timeout) sc->tulip_flags &= ~TULIP_TIMEOUTPENDING; @@ -160,6 +161,7 @@ tulip_timeout( tulip_softc_t * const sc) { + mtx_assert(&Giant, MA_OWNED); if (sc->tulip_flags & TULIP_TIMEOUTPENDING) return; sc->tulip_flags |= TULIP_TIMEOUTPENDING; @@ -174,6 +176,7 @@ tulip_softc_t * const sc = arg; int s = splimp(); + mtx_assert(&Giant, MA_OWNED); sc->tulip_flags &= ~TULIP_FASTTIMEOUTPENDING; (sc->tulip_boardsw->bd_media_poll)(sc, TULIP_MEDIAPOLL_FASTTIMER); splx(s); @@ -183,6 +186,7 @@ tulip_fasttimeout( tulip_softc_t * const sc) { + mtx_assert(&Giant, MA_OWNED); if (sc->tulip_flags & TULIP_FASTTIMEOUTPENDING) return; sc->tulip_flags |= TULIP_FASTTIMEOUTPENDING; @@ -195,6 +199,8 @@ tulip_softc_t * const sc) { struct mbuf *m; + + mtx_assert(&Giant, MA_OWNED); /* * Before we are sure this is the right media we need * to send a small packet to make sure there's carrier. @@ -242,6 +248,7 @@ { const tulip_media_info_t *mi = sc->tulip_mediums[media]; + mtx_assert(&Giant, MA_OWNED); if (mi == NULL) return; @@ -334,6 +341,8 @@ tulip_softc_t * const sc, tulip_media_t media) { + + mtx_assert(&Giant, MA_OWNED); if ((sc->tulip_flags & TULIP_LINKUP) == 0) sc->tulip_flags |= TULIP_PRINTLINKUP; sc->tulip_flags |= TULIP_LINKUP; @@ -387,6 +396,8 @@ tulip_media_print( tulip_softc_t * const sc) { + + mtx_assert(&Giant, MA_OWNED); if ((sc->tulip_flags & TULIP_LINKUP) == 0) return; if (sc->tulip_flags & TULIP_PRINTMEDIA) { @@ -409,6 +420,7 @@ tulip_media_t last_media = TULIP_MEDIA_UNKNOWN; tulip_media_t media; + mtx_assert(&Giant, MA_OWNED); /* * If one of the media blocks contained a default media flag, * use that. @@ -480,6 +492,7 @@ } + mtx_assert(&Giant, MA_OWNED); /* * Have we seen some packets? If so, the link must be good. */ @@ -578,6 +591,7 @@ tulip_softc_t * const sc, tulip_mediapoll_event_t event) { + mtx_assert(&Giant, MA_OWNED); #if defined(TULIP_DEBUG) sc->tulip_dbg.dbg_events[event]++; #endif @@ -867,6 +881,7 @@ tulip_media_select( tulip_softc_t * const sc) { + mtx_assert(&Giant, MA_OWNED); if (sc->tulip_features & TULIP_HAVE_GPR) { TULIP_CSR_WRITE(sc, csr_gp, TULIP_GP_PINSET|sc->tulip_gpinit); DELAY(10); @@ -891,6 +906,7 @@ tulip_softc_t * const sc, tulip_media_t media) { + mtx_assert(&Giant, MA_OWNED); sc->tulip_cmdmode |= TULIP_CMD_CAPTREFFCT|TULIP_CMD_THRSHLD160 |TULIP_CMD_BACKOFFCTR; sc->tulip_if.if_baudrate = 10000000; @@ -914,6 +930,7 @@ tulip_21040_media_probe( tulip_softc_t * const sc) { + mtx_assert(&Giant, MA_OWNED); tulip_21040_mediainfo_init(sc, TULIP_MEDIA_UNKNOWN); return; } @@ -922,6 +939,7 @@ tulip_21040_10baset_only_media_probe( tulip_softc_t * const sc) { + mtx_assert(&Giant, MA_OWNED); tulip_21040_mediainfo_init(sc, TULIP_MEDIA_10BASET); tulip_media_set(sc, TULIP_MEDIA_10BASET); sc->tulip_media = TULIP_MEDIA_10BASET; @@ -931,6 +949,7 @@ tulip_21040_10baset_only_media_select( tulip_softc_t * const sc) { + mtx_assert(&Giant, MA_OWNED); sc->tulip_flags |= TULIP_LINKUP; if (sc->tulip_media == TULIP_MEDIA_10BASET_FD) { sc->tulip_cmdmode |= TULIP_CMD_FULLDUPLEX; @@ -946,6 +965,7 @@ tulip_21040_auibnc_only_media_probe( tulip_softc_t * const sc) { + mtx_assert(&Giant, MA_OWNED); tulip_21040_mediainfo_init(sc, TULIP_MEDIA_AUIBNC); sc->tulip_flags |= TULIP_SQETEST|TULIP_LINKUP; tulip_media_set(sc, TULIP_MEDIA_AUIBNC); @@ -956,6 +976,7 @@ tulip_21040_auibnc_only_media_select( tulip_softc_t * const sc) { + mtx_assert(&Giant, MA_OWNED); tulip_media_set(sc, TULIP_MEDIA_AUIBNC); sc->tulip_cmdmode &= ~TULIP_CMD_FULLDUPLEX; } @@ -987,6 +1008,7 @@ { tulip_media_info_t * const mi = sc->tulip_mediainfo; + mtx_assert(&Giant, MA_OWNED); #ifdef notyet if (sc->tulip_revinfo >= 0x20) { TULIP_MEDIAINFO_SIA_INIT(sc, &mi[0], 21041P2, 10BASET); @@ -1006,6 +1028,7 @@ tulip_21041_media_probe( tulip_softc_t * const sc) { + mtx_assert(&Giant, MA_OWNED); sc->tulip_if.if_baudrate = 10000000; sc->tulip_cmdmode |= TULIP_CMD_CAPTREFFCT|TULIP_CMD_ENHCAPTEFFCT |TULIP_CMD_THRSHLD160|TULIP_CMD_BACKOFFCTR; @@ -1020,6 +1043,7 @@ { u_int32_t sia_status; + mtx_assert(&Giant, MA_OWNED); #if defined(TULIP_DEBUG) sc->tulip_dbg.dbg_events[event]++; #endif @@ -1241,6 +1265,7 @@ TULIP_MEDIA_UNKNOWN }; + mtx_assert(&Giant, MA_OWNED); /* * Don't read phy specific registers if link is not up. */ @@ -1290,6 +1315,7 @@ { unsigned phyaddr; + mtx_assert(&Giant, MA_OWNED); for (phyaddr = 1; phyaddr < 32; phyaddr++) { unsigned status = tulip_mii_readreg(sc, phyaddr, PHYREG_STATUS); if (status == 0 || status == 0xFFFF || status < PHYSTS_10BASET) @@ -1312,6 +1338,7 @@ tulip_softc_t * const sc, unsigned abilities) { + mtx_assert(&Giant, MA_OWNED); sc->tulip_abilities = abilities; if (abilities & PHYSTS_100BASETX_FD) { sc->tulip_probe_media = TULIP_MEDIA_100BASETX_FD; @@ -1336,6 +1363,7 @@ tulip_softc_t * const sc, const unsigned phyaddr) { + mtx_assert(&Giant, MA_OWNED); switch (sc->tulip_probe_state) { case TULIP_PROBE_MEDIATEST: case TULIP_PROBE_INACTIVE: { @@ -1436,6 +1464,7 @@ const tulip_media_info_t *mi = NULL; tulip_media_t media = sc->tulip_media; + mtx_assert(&Giant, MA_OWNED); if (sc->tulip_probe_state == TULIP_PROBE_INACTIVE) media = sc->tulip_media; else @@ -1511,6 +1540,7 @@ tulip_softc_t * const sc, tulip_mediapoll_event_t event) { + mtx_assert(&Giant, MA_OWNED); #if defined(TULIP_DEBUG) sc->tulip_dbg.dbg_events[event]++; #endif @@ -1528,6 +1558,7 @@ unsigned gpdata, unsigned cmdmode) { + mtx_assert(&Giant, MA_OWNED); sc->tulip_mediums[media] = mip; mip->mi_type = TULIP_MEDIAINFO_GPR; mip->mi_cmdmode = cmdmode; @@ -1540,6 +1571,7 @@ { tulip_media_info_t *mip = sc->tulip_mediainfo; + mtx_assert(&Giant, MA_OWNED); sc->tulip_gpinit = TULIP_GP_EB_PINS; sc->tulip_gpdata = TULIP_GP_EB_INIT; TULIP_CSR_WRITE(sc, csr_gp, TULIP_GP_EB_PINS); @@ -1586,6 +1618,7 @@ tulip_media_info_t *mip = sc->tulip_mediainfo; unsigned gpdata; + mtx_assert(&Giant, MA_OWNED); sc->tulip_gpinit = TULIP_GP_EB_PINS; sc->tulip_gpdata = TULIP_GP_EB_INIT; TULIP_CSR_WRITE(sc, csr_gp, TULIP_GP_EB_PINS); @@ -1640,6 +1673,7 @@ tulip_media_info_t *mip = sc->tulip_mediainfo; int idx, cnt = 0; + mtx_assert(&Giant, MA_OWNED); TULIP_CSR_WRITE(sc, csr_command, TULIP_CMD_PORTSELECT|TULIP_CMD_MUSTBEONE); TULIP_CSR_WRITE(sc, csr_busmode, TULIP_BUSMODE_SWRESET); DELAY(10); /* Wait 10 microseconds (actually 50 PCI cycles but at @@ -1696,6 +1730,7 @@ tulip_media_info_t *mip = sc->tulip_mediainfo; u_int32_t cmdmode = TULIP_CSR_READ(sc, csr_command); + mtx_assert(&Giant, MA_OWNED); sc->tulip_gpinit = TULIP_GP_EM100_PINS; sc->tulip_gpdata = TULIP_GP_EM100_INIT; TULIP_CSR_WRITE(sc, csr_gp, TULIP_GP_EM100_PINS); @@ -1743,6 +1778,7 @@ tulip_media_info_t *mip = sc->tulip_mediainfo; int cnt10 = 0, cnt100 = 0, idx; + mtx_assert(&Giant, MA_OWNED); sc->tulip_gpinit = TULIP_GP_ZX34X_PINS; sc->tulip_gpdata = TULIP_GP_ZX34X_INIT; TULIP_CSR_WRITE(sc, csr_gp, TULIP_GP_ZX34X_PINS); @@ -1797,6 +1833,7 @@ tulip_2114x_media_probe( tulip_softc_t * const sc) { + mtx_assert(&Giant, MA_OWNED); sc->tulip_cmdmode |= TULIP_CMD_MUSTBEONE |TULIP_CMD_BACKOFFCTR|TULIP_CMD_THRSHLD72; } @@ -1824,6 +1861,7 @@ { unsigned bit, csr; + mtx_assert(&Giant, MA_OWNED); csr = SROMSEL ; EMIT; csr = SROMSEL | SROMRD; EMIT; csr ^= SROMCS; EMIT; @@ -1852,6 +1890,7 @@ const unsigned msb = 1 << (bitwidth + 3 - 1); unsigned lastidx = (1 << bitwidth) - 1; + mtx_assert(&Giant, MA_OWNED); tulip_srom_idle(sc); for (idx = 0; idx <= lastidx; idx++) { @@ -1901,6 +1940,7 @@ unsigned csr = TULIP_CSR_READ(sc, csr_srom_mii) & (MII_RD|MII_DOUT|MII_CLK); unsigned lastbit = (csr & MII_DOUT) ? msb : 0; + mtx_assert(&Giant, MA_OWNED); csr |= MII_WR; MII_EMIT; /* clock low; assert write */ for (; bits > 0; bits--, data <<= 1) { @@ -1921,6 +1961,7 @@ { unsigned csr = TULIP_CSR_READ(sc, csr_srom_mii) & (MII_RD|MII_DOUT|MII_CLK); + mtx_assert(&Giant, MA_OWNED); if (cmd == MII_WRCMD) { csr |= MII_DOUT; MII_EMIT; /* clock low; change data */ csr ^= MII_CLKON; MII_EMIT; /* clock high; data valid */ @@ -1941,6 +1982,7 @@ unsigned csr = TULIP_CSR_READ(sc, csr_srom_mii) & (MII_RD|MII_DOUT|MII_CLK); int idx; + mtx_assert(&Giant, MA_OWNED); for (idx = 0, data = 0; idx < 16; idx++) { data <<= 1; /* this is NOOP on the first pass through */ csr ^= MII_CLKON; MII_EMIT; /* clock high; data valid */ @@ -1962,6 +2004,7 @@ unsigned csr = TULIP_CSR_READ(sc, csr_srom_mii) & (MII_RD|MII_DOUT|MII_CLK); unsigned data; + mtx_assert(&Giant, MA_OWNED); csr &= ~(MII_RD|MII_CLK); MII_EMIT; tulip_mii_writebits(sc, MII_PREAMBLE, 32); tulip_mii_writebits(sc, MII_RDCMD, 8); @@ -1985,6 +2028,7 @@ unsigned data) { unsigned csr = TULIP_CSR_READ(sc, csr_srom_mii) & (MII_RD|MII_DOUT|MII_CLK); + mtx_assert(&Giant, MA_OWNED); csr &= ~(MII_RD|MII_CLK); MII_EMIT; tulip_mii_writebits(sc, MII_PREAMBLE, 32); tulip_mii_writebits(sc, MII_WRCMD, 8); @@ -2007,6 +2051,7 @@ tulip_identify_dec_nic( tulip_softc_t * const sc) { + mtx_assert(&Giant, MA_OWNED); strcpy(sc->tulip_boardid, "DEC "); #define D0 4 if (sc->tulip_chipid <= TULIP_21040) @@ -2024,6 +2069,7 @@ tulip_softc_t * const sc) { unsigned id = 0; + mtx_assert(&Giant, MA_OWNED); strcpy(sc->tulip_boardid, "ZNYX ZX3XX "); if (sc->tulip_chipid == TULIP_21140 || sc->tulip_chipid == TULIP_21140A) { unsigned znyx_ptr; @@ -2120,6 +2166,7 @@ int auibnc = 0, utp = 0; char *cp; + mtx_assert(&Giant, MA_OWNED); strcpy(sc->tulip_boardid, "SMC "); if (sc->tulip_chipid == TULIP_21041) return; @@ -2165,6 +2212,7 @@ tulip_identify_cogent_nic( tulip_softc_t * const sc) { + mtx_assert(&Giant, MA_OWNED); strcpy(sc->tulip_boardid, "Cogent "); if (sc->tulip_chipid == TULIP_21140 || sc->tulip_chipid == TULIP_21140A) { if (sc->tulip_rombuf[32] == TULIP_COGENT_EM100TX_ID) { @@ -2201,6 +2249,7 @@ tulip_identify_accton_nic( tulip_softc_t * const sc) { + mtx_assert(&Giant, MA_OWNED); strcpy(sc->tulip_boardid, "ACCTON "); switch (sc->tulip_chipid) { case TULIP_21140A: @@ -2231,6 +2280,7 @@ tulip_identify_asante_nic( tulip_softc_t * const sc) { + mtx_assert(&Giant, MA_OWNED); strcpy(sc->tulip_boardid, "Asante "); if ((sc->tulip_chipid == TULIP_21140 || sc->tulip_chipid == TULIP_21140A) && sc->tulip_boardsw != &tulip_2114x_isv_boardsw) { @@ -2287,6 +2337,7 @@ tulip_identify_compex_nic( tulip_softc_t * const sc) { + mtx_assert(&Giant, MA_OWNED); strcpy(sc->tulip_boardid, "COMPEX "); if (sc->tulip_chipid == TULIP_21140A) { int root_unit; @@ -2335,6 +2386,7 @@ const u_int8_t *dp; u_int32_t leaf_offset, blocks, data; + mtx_assert(&Giant, MA_OWNED); for (idx1 = 0; idx1 < shp->sh_adapter_count; idx1++, saip++) { if (shp->sh_adapter_count == 1) break; @@ -2714,6 +2766,7 @@ unsigned char tmpbuf[8]; static const u_char testpat[] = { 0xFF, 0, 0x55, 0xAA, 0xFF, 0, 0x55, 0xAA }; + mtx_assert(&Giant, MA_OWNED); sc->tulip_connidx = TULIP_SROM_LASTCONNIDX; if (sc->tulip_chipid == TULIP_21040) { @@ -2914,6 +2967,7 @@ tulip_media_t media; int medias = 0; + mtx_assert(&Giant, MA_OWNED); for (media = TULIP_MEDIA_UNKNOWN; media < TULIP_MEDIA_MAX; media++) { if (sc->tulip_mediums[media] != NULL) { ifmedia_add(&sc->tulip_ifmedia, tulip_media_to_ifmedia[media], @@ -2941,6 +2995,7 @@ { tulip_softc_t * const sc = (tulip_softc_t *)ifp->if_softc; + mtx_assert(&Giant, MA_OWNED); sc->tulip_flags |= TULIP_NEEDRESET; sc->tulip_probe_state = TULIP_PROBE_INACTIVE; sc->tulip_media = TULIP_MEDIA_UNKNOWN; @@ -2972,6 +3027,7 @@ { tulip_softc_t *sc = (tulip_softc_t *)ifp->if_softc; + mtx_assert(&Giant, MA_OWNED); if (sc->tulip_media == TULIP_MEDIA_UNKNOWN) return; @@ -2990,6 +3046,7 @@ u_char *addrp; int multicnt; + mtx_assert(&Giant, MA_OWNED); sc->tulip_flags &= ~(TULIP_WANTHASHPERFECT|TULIP_WANTHASHONLY|TULIP_ALLMULTI); sc->tulip_flags |= TULIP_WANTSETUP|TULIP_WANTTXSTART; sc->tulip_cmdmode &= ~TULIP_CMD_RXRUN; @@ -3136,6 +3193,7 @@ tulip_desc_t *di; u_int32_t inreset = (sc->tulip_flags & TULIP_INRESET); + mtx_assert(&Giant, MA_OWNED); /* * Brilliant. Simply brilliant. When switching modes/speeds * on a 2114*, you need to set the appriopriate MII/PCS/SCL/PS @@ -3277,6 +3335,7 @@ tulip_ifinit( void * sc) { + mtx_assert(&Giant, MA_OWNED); tulip_init((tulip_softc_t *)sc); } @@ -3284,6 +3343,7 @@ tulip_init( tulip_softc_t * const sc) { + mtx_assert(&Giant, MA_OWNED); if (sc->tulip_if.if_flags & IFF_UP) { if ((sc->tulip_if.if_flags & IFF_RUNNING) == 0) { /* initialize the media */ @@ -3335,6 +3395,7 @@ int cnt = 0; #endif + mtx_assert(&Giant, MA_OWNED); for (;;) { TULIP_PERFSTART(rxget) tulip_desc_t *eop = ri->ri_nextin; @@ -3650,6 +3711,7 @@ int xmits = 0; int descs = 0; + mtx_assert(&Giant, MA_OWNED); while (ri->ri_free < ri->ri_max) { u_int32_t d_flag; @@ -3782,6 +3844,7 @@ u_int32_t mask; const char thrsh[] = "72|128\0\0\0" "96|256\0\0\0" "128|512\0\0" "160|1024"; + mtx_assert(&Giant, MA_OWNED); csr &= (1 << (sizeof(tulip_status_bits)/sizeof(tulip_status_bits[0]))) - 1; printf("%s: abnormal interrupt:", sc->tulip_xname); for (sep = " ", mask = 1; mask <= csr; mask <<= 1, msgp++) { @@ -3810,6 +3873,7 @@ TULIP_PERFSTART(intr) u_int32_t csr; + mtx_assert(&Giant, MA_OWNED); while ((csr = TULIP_CSR_READ(sc, csr_status)) & sc->tulip_intrmask) { *progress_p = 1; TULIP_CSR_WRITE(sc, csr_status, csr); @@ -3922,6 +3986,7 @@ tulip_softc_t * const sc, int *progress_p) { + mtx_assert(&Giant, MA_OWNED); if (TULIP_CSR_READ(sc, csr_status) & (TULIP_STS_NORMALINTR|TULIP_STS_ABNRMLINTR) == 0) return; *progress_p = 1; @@ -3944,6 +4009,7 @@ int unit; int s; + mtx_assert(&Giant, MA_OWNED); /* * Copy mask to local copy and reset global one to 0. */ @@ -4005,6 +4071,7 @@ tulip_softc_t * sc = arg; int progress = 0; + mtx_assert(&Giant, MA_OWNED); for (; sc != NULL; sc = sc->tulip_slaves) { #if defined(TULIP_DEBUG) sc->tulip_dbg.dbg_intrs++; @@ -4028,6 +4095,7 @@ tulip_softc_t * sc = (tulip_softc_t *) arg; int progress = 0; + mtx_assert(&Giant, MA_OWNED); #if defined(TULIP_DEBUG) sc->tulip_dbg.dbg_intrs++; #endif @@ -4064,6 +4132,7 @@ int len = m->m_pkthdr.len; struct mbuf **mp = &m0; + mtx_assert(&Giant, MA_OWNED); while (len > 0) { if (mlen == MHLEN) { MGETHDR(*mp, M_DONTWAIT, MT_DATA); @@ -4114,6 +4183,7 @@ struct mbuf *m0; #endif + mtx_assert(&Giant, MA_OWNED); #if defined(TULIP_DEBUG) if ((sc->tulip_cmdmode & TULIP_CMD_TXRUN) == 0) { printf("%s: txput%s: tx not running\n", @@ -4435,6 +4505,7 @@ tulip_ringinfo_t * const ri = &sc->tulip_txinfo; tulip_desc_t *nextout; + mtx_assert(&Giant, MA_OWNED); /* * We will transmit, at most, one setup packet per call to ifstart. */ @@ -4534,6 +4605,7 @@ int s; int error = 0; + mtx_assert(&Giant, MA_OWNED); #if defined(TULIP_USE_SOFTINTR) s = splnet(); #else @@ -4620,6 +4692,7 @@ TULIP_PERFSTART(ifstart) tulip_softc_t * const sc = (tulip_softc_t *)ifp->if_softc; + mtx_assert(&Giant, MA_OWNED); if (sc->tulip_if.if_flags & IFF_RUNNING) { if ((sc->tulip_flags & (TULIP_WANTSETUP|TULIP_TXPROBE_ACTIVE)) == TULIP_WANTSETUP) @@ -4649,6 +4722,7 @@ TULIP_PERFSTART(ifstart_one) tulip_softc_t * const sc = (tulip_softc_t *)ifp->if_softc; + mtx_assert(&Giant, MA_OWNED); if ((sc->tulip_if.if_flags & IFF_RUNNING) && !IFQ_DRV_IS_EMPTY(&sc->tulip_if.if_snd)) { struct mbuf *m; @@ -4676,11 +4750,13 @@ #if defined(TULIP_DEBUG) u_int32_t rxintrs = sc->tulip_dbg.dbg_rxintrs - sc->tulip_dbg.dbg_last_rxintrs; + mtx_assert(&Giant, MA_OWNED); if (rxintrs > sc->tulip_dbg.dbg_high_rxintrs_hz) sc->tulip_dbg.dbg_high_rxintrs_hz = rxintrs; sc->tulip_dbg.dbg_last_rxintrs = sc->tulip_dbg.dbg_rxintrs; #endif /* TULIP_DEBUG */ + mtx_assert(&Giant, MA_OWNED); sc->tulip_if.if_timer = 1; /* * These should be rare so do a bulk test up front so we can just skip @@ -4755,6 +4831,7 @@ { struct ifnet * const ifp = &sc->tulip_if; + mtx_assert(&Giant, MA_OWNED); /* XXX: driver name/unit should be set some other way */ ifp->if_dname = "de"; ifp->if_dunit = sc->tulip_unit; @@ -4813,6 +4890,7 @@ { bus_dma_segment_t segs[1]; int nsegs, error; + mtx_assert(&Giant, MA_OWNED); error = bus_dmamem_alloc(sc->tulip_dmatag, size, 1, PAGE_SIZE, segs, sizeof(segs)/sizeof(segs[0]), &nsegs, BUS_DMA_NOWAIT); @@ -4850,6 +4928,7 @@ { int error = 0; + mtx_assert(&Giant, MA_OWNED); #if !defined(TULIP_BUS_DMA_NOTX) /* * Allocate dmamap for setup descriptor @@ -4937,6 +5016,7 @@ tulip_csrptr_t csr_base, size_t csr_size) { + mtx_assert(&Giant, MA_OWNED); sc->tulip_csrs.csr_busmode = csr_base + 0 * csr_size; sc->tulip_csrs.csr_txpoll = csr_base + 1 * csr_size; sc->tulip_csrs.csr_rxpoll = csr_base + 2 * csr_size; @@ -4962,6 +5042,7 @@ tulip_desc_t *descs, int ndescs) { + mtx_assert(&Giant, MA_OWNED); ri->ri_max = ndescs; ri->ri_first = descs; ri->ri_last = ri->ri_first + ri->ri_max; @@ -4982,6 +5063,7 @@ { const char *name = NULL; + mtx_assert(&Giant, MA_OWNED); if (pci_get_vendor(dev) != DEC_VENDORID) return ENXIO; @@ -5023,6 +5105,7 @@ tulip_shutdown(device_t dev) { tulip_softc_t * const sc = device_get_softc(dev); + mtx_assert(&Giant, MA_OWNED); TULIP_CSR_WRITE(sc, csr_busmode, TULIP_BUSMODE_SWRESET); DELAY(10); /* Wait 10 microseconds (actually 50 PCI cycles but at 33MHz that comes to two microseconds but wait a @@ -5046,6 +5129,7 @@ struct resource *res; int rid, unit; + mtx_assert(&Giant, MA_OWNED); unit = device_get_unit(dev); if (unit >= TULIP_MAX_DEVICES) { From owner-p4-projects@FreeBSD.ORG Tue Oct 12 17:17:00 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2493716A4D1; Tue, 12 Oct 2004 17:17:00 +0000 (GMT) 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 E900716A4CE for ; Tue, 12 Oct 2004 17:16:59 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DC86B43D4C for ; Tue, 12 Oct 2004 17:16:59 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9CHGxbF028249 for ; Tue, 12 Oct 2004 17:16:59 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9CHGxmX028246 for perforce@freebsd.org; Tue, 12 Oct 2004 17:16:59 GMT (envelope-from jhb@freebsd.org) Date: Tue, 12 Oct 2004 17:16:59 GMT Message-Id: <200410121716.i9CHGxmX028246@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 63077 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, 12 Oct 2004 17:17:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=63077 Change 63077 by jhb@jhb_twclab on 2004/10/12 17:16:25 Merge in a patch to whine if a task takes a long time to run. Submitted by: rwatson Affected files ... .. //depot/projects/smpng/sys/kern/subr_taskqueue.c#22 edit .. //depot/projects/smpng/sys/sys/_task.h#4 edit Differences ... ==== //depot/projects/smpng/sys/kern/subr_taskqueue.c#22 (text+ko) ==== @@ -36,9 +36,16 @@ #include #include #include +#include #include +#include #include +int tq_in; +SYSCTL_INT(_kern, OID_AUTO, tq_in, CTLFLAG_RD, &tq_in, 0, ""); +int tq_out; +SYSCTL_INT(_kern, OID_AUTO, tq_out, CTLFLAG_RD, &tq_out, 0, ""); + static MALLOC_DEFINE(M_TASKQUEUE, "taskqueue", "Task Queues"); static void *taskqueue_giant_ih; static void *taskqueue_ih; @@ -140,6 +147,9 @@ return 0; } + getnanotime(&task->ta_queuetime); + tq_in++; + /* * Optimise the case when all tasks have the same priority. */ @@ -172,6 +182,7 @@ taskqueue_run(struct taskqueue *queue) { struct task *task; + struct timespec tv; int owned, pending; owned = mtx_owned(&queue->tq_mutex); @@ -187,7 +198,15 @@ pending = task->ta_pending; task->ta_pending = 0; task->ta_flags |= TAF_PENDING; + tq_out++; + getnanotime(&tv); + timespecsub(&tv, &task->ta_queuetime); mtx_unlock(&queue->tq_mutex); + if (tv.tv_nsec >= 0500000000) { + printf("taskqueue_run: warning, queue time of %d.%09ld " + "for context %p\n", tv.tv_sec, tv.tv_nsec, + task->ta_func); + } task->ta_func(task->ta_context, pending); ==== //depot/projects/smpng/sys/sys/_task.h#4 (text+ko) ==== @@ -46,6 +46,7 @@ task_fn_t *ta_func; /* task handler */ void *ta_context; /* argument for handler */ int ta_flags; /* Flags */ + struct timespec ta_queuetime; /* time enqueued */ }; #define TAF_PENDING 0x1 /* Task is being run now */ From owner-p4-projects@FreeBSD.ORG Tue Oct 12 19:10:30 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC73316A4D2; Tue, 12 Oct 2004 19:10:29 +0000 (GMT) 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 74F9D16A4D1 for ; Tue, 12 Oct 2004 19:10:19 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C4F1643D3F for ; Tue, 12 Oct 2004 19:10:18 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9CJAIJW032630 for ; Tue, 12 Oct 2004 19:10:18 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9CJAIO0032627 for perforce@freebsd.org; Tue, 12 Oct 2004 19:10:18 GMT (envelope-from jhb@freebsd.org) Date: Tue, 12 Oct 2004 19:10:18 GMT Message-Id: <200410121910.i9CJAIO0032627@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 63082 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, 12 Oct 2004 19:10:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=63082 Change 63082 by jhb@jhb_slimer on 2004/10/12 19:09:56 IFC @63081. Affected files ... .. //depot/projects/smpng/sys/amd64/acpica/acpi_machdep.c#8 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#37 integrate .. //depot/projects/smpng/sys/amd64/include/acpica_machdep.h#5 integrate .. //depot/projects/smpng/sys/amd64/include/pmap.h#16 integrate .. //depot/projects/smpng/sys/amd64/pci/pci_bus.c#10 integrate .. //depot/projects/smpng/sys/arm/conf/SIMICS#3 integrate .. //depot/projects/smpng/sys/arm/sa11x0/assabet_machdep.c#5 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.h#2 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#12 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#11 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#11 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#11 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#11 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#11 integrate .. //depot/projects/smpng/sys/compat/linux/linux_util.h#10 integrate .. //depot/projects/smpng/sys/conf/files#124 integrate .. //depot/projects/smpng/sys/conf/files.i386#68 integrate .. //depot/projects/smpng/sys/conf/files.sparc64#43 integrate .. //depot/projects/smpng/sys/conf/kern.pre.mk#40 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#35 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdTable.c#8 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cmbat.c#23 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#28 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib_acpi.c#14 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_quirks#3 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_timer.c#19 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#49 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#62 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.h#32 integrate .. //depot/projects/smpng/sys/dev/ata/ata-card.c#20 integrate .. //depot/projects/smpng/sys/dev/ata/ata-cbus.c#12 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#45 integrate .. //depot/projects/smpng/sys/dev/ata/ata-disk.c#45 integrate .. //depot/projects/smpng/sys/dev/ata/ata-isa.c#18 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.c#50 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#25 integrate .. //depot/projects/smpng/sys/dev/ata/ata-queue.c#20 integrate .. //depot/projects/smpng/sys/dev/auxio/auxio.c#1 branch .. //depot/projects/smpng/sys/dev/auxio/auxioreg.h#1 branch .. //depot/projects/smpng/sys/dev/bfe/if_bfe.c#11 integrate .. //depot/projects/smpng/sys/dev/digi/digi.c#26 integrate .. //depot/projects/smpng/sys/dev/digi/digi.h#9 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#37 integrate .. //depot/projects/smpng/sys/dev/fdc/fdc.c#11 integrate .. //depot/projects/smpng/sys/dev/fe/if_fe.c#15 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#19 integrate .. //depot/projects/smpng/sys/dev/md/md.c#57 integrate .. //depot/projects/smpng/sys/dev/pbio/pbio.c#1 branch .. //depot/projects/smpng/sys/dev/pbio/pbioio.h#1 branch .. //depot/projects/smpng/sys/dev/random/randomdev_soft.c#4 integrate .. //depot/projects/smpng/sys/dev/rc/rc.c#14 integrate .. //depot/projects/smpng/sys/dev/sound/isa/ad1816.c#16 integrate .. //depot/projects/smpng/sys/dev/sound/isa/es1888.c#5 integrate .. //depot/projects/smpng/sys/dev/sound/isa/ess.c#13 integrate .. //depot/projects/smpng/sys/dev/sound/isa/gusc.c#5 integrate .. //depot/projects/smpng/sys/dev/sound/isa/mss.c#18 integrate .. //depot/projects/smpng/sys/dev/sound/isa/sbc.c#13 integrate .. //depot/projects/smpng/sys/dev/sx/sx.c#5 integrate .. //depot/projects/smpng/sys/dev/sx/sx.h#4 integrate .. //depot/projects/smpng/sys/dev/uart/uart_bus.h#5 integrate .. //depot/projects/smpng/sys/dev/uart/uart_tty.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/ubser.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/ucycom.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/ugen.c#29 integrate .. //depot/projects/smpng/sys/dev/usb/uhid.c#23 integrate .. //depot/projects/smpng/sys/dev/usb/umass.c#42 integrate .. //depot/projects/smpng/sys/geom/geom_io.c#34 integrate .. //depot/projects/smpng/sys/geom/geom_pc98.c#25 integrate .. //depot/projects/smpng/sys/geom/geom_subr.c#44 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror.c#9 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_machdep.c#19 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#90 integrate .. //depot/projects/smpng/sys/i386/i386/elan-mmcr.c#21 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#75 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_misc.c#16 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_socksys.c#11 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_sysi86.c#9 integrate .. //depot/projects/smpng/sys/i386/include/acpica_machdep.h#7 integrate .. //depot/projects/smpng/sys/i386/include/pmap.h#25 integrate .. //depot/projects/smpng/sys/i386/isa/pbio.c#1 branch .. //depot/projects/smpng/sys/i386/pci/pci_bus.c#23 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_ipr.c#19 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_isppp.c#11 integrate .. //depot/projects/smpng/sys/ia64/acpica/acpi_machdep.c#5 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#87 integrate .. //depot/projects/smpng/sys/ia64/include/acpica_machdep.h#4 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#46 integrate .. //depot/projects/smpng/sys/kern/kern_condvar.c#39 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#78 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#86 integrate .. //depot/projects/smpng/sys/kern/kern_kse.c#12 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#87 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#68 integrate .. //depot/projects/smpng/sys/kern/kern_subr.c#35 integrate .. //depot/projects/smpng/sys/kern/kern_switch.c#47 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#83 integrate .. //depot/projects/smpng/sys/kern/kern_sysctl.c#42 integrate .. //depot/projects/smpng/sys/kern/kern_tc.c#30 integrate .. //depot/projects/smpng/sys/kern/kern_thr.c#21 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#70 integrate .. //depot/projects/smpng/sys/kern/kern_xxx.c#15 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#40 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#44 integrate .. //depot/projects/smpng/sys/kern/subr_sleepqueue.c#11 integrate .. //depot/projects/smpng/sys/kern/subr_turnstile.c#17 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#122 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#46 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#47 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf2.c#17 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#58 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#85 integrate .. //depot/projects/smpng/sys/modules/Makefile#84 integrate .. //depot/projects/smpng/sys/modules/auxio/Makefile#1 branch .. //depot/projects/smpng/sys/net/bpf.c#41 integrate .. //depot/projects/smpng/sys/net/bridge.c#31 integrate .. //depot/projects/smpng/sys/net/bridge.h#7 integrate .. //depot/projects/smpng/sys/net/ethernet.h#9 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#53 integrate .. //depot/projects/smpng/sys/net/if_tun.c#36 integrate .. //depot/projects/smpng/sys/net/net_osdep.c#6 delete .. //depot/projects/smpng/sys/net/net_osdep.h#10 integrate .. //depot/projects/smpng/sys/net/netisr.c#9 integrate .. //depot/projects/smpng/sys/net/pfil.c#7 integrate .. //depot/projects/smpng/sys/net/route.h#20 integrate .. //depot/projects/smpng/sys/net/rtsock.c#40 integrate .. //depot/projects/smpng/sys/netgraph/ng_ether.c#18 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#29 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.c#38 integrate .. //depot/projects/smpng/sys/netinet/raw_ip.c#45 integrate .. //depot/projects/smpng/sys/netinet/tcp_output.c#31 integrate .. //depot/projects/smpng/sys/netinet6/in6_rmx.c#7 integrate .. //depot/projects/smpng/sys/netncp/ncp_ncp.c#11 integrate .. //depot/projects/smpng/sys/pci/if_sis.c#44 integrate .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#47 integrate .. //depot/projects/smpng/sys/sparc64/conf/NOTES#9 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#67 integrate .. //depot/projects/smpng/sys/sys/conf.h#34 integrate .. //depot/projects/smpng/sys/sys/kse.h#18 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#45 integrate .. //depot/projects/smpng/sys/sys/param.h#73 integrate .. //depot/projects/smpng/sys/sys/pbioio.h#1 branch .. //depot/projects/smpng/sys/sys/proc.h#131 integrate .. //depot/projects/smpng/sys/sys/random.h#4 integrate .. //depot/projects/smpng/sys/sys/runq.h#5 integrate .. //depot/projects/smpng/sys/sys/sleepqueue.h#5 integrate .. //depot/projects/smpng/sys/sys/socketvar.h#40 integrate .. //depot/projects/smpng/sys/sys/syscall.h#46 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#46 integrate .. //depot/projects/smpng/sys/sys/syscallsubr.h#12 integrate .. //depot/projects/smpng/sys/sys/sysctl.h#31 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#48 integrate .. //depot/projects/smpng/sys/sys/thr.h#4 integrate .. //depot/projects/smpng/sys/sys/ttydefaults.h#4 integrate .. //depot/projects/smpng/sys/sys/turnstile.h#4 integrate .. //depot/projects/smpng/sys/ufs/ffs/fs.h#16 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#48 integrate .. //depot/projects/smpng/sys/vm/uma_dbg.c#10 integrate .. //depot/projects/smpng/sys/vm/vm_meter.c#20 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/acpica/acpi_machdep.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.15 2004/08/16 23:10:18 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.16 2004/10/11 05:39:14 njl Exp $"); #include #include @@ -61,3 +61,9 @@ { return (0); } + +void +acpi_cpu_c1() +{ + __asm __volatile("sti; hlt"); +} ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#37 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.507 2004/10/03 20:14:06 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.508 2004/10/08 08:23:42 alc Exp $"); /* * Manages physical address maps. @@ -1839,7 +1839,7 @@ vm_paddr_t opa; pd_entry_t ptepde; pt_entry_t origpte, newpte; - vm_page_t mpte; + vm_page_t mpte, om; va = trunc_page(va); #ifdef PMAP_DIAGNOSTIC @@ -1881,6 +1881,7 @@ panic("pmap_enter: invalid page directory va=%#lx\n", va); pa = VM_PAGE_TO_PHYS(m); + om = NULL; origpte = *pte; opa = origpte & PG_FRAME; @@ -1921,8 +1922,7 @@ * so we go ahead and sense modify status. */ if (origpte & PG_MANAGED) { - if ((origpte & PG_M) && pmap_track_modified(va)) - vm_page_dirty(m); + om = m; pa |= PG_MANAGED; } goto validate; @@ -1933,10 +1933,17 @@ */ if (opa) { int err; - err = pmap_remove_pte(pmap, pte, va, ptepde); + if (origpte & PG_W) + pmap->pm_stats.wired_count--; + if (origpte & PG_MANAGED) { + om = PHYS_TO_VM_PAGE(opa); + err = pmap_remove_entry(pmap, om, va, ptepde); + } else + err = pmap_unuse_pt(pmap, va, ptepde); if (err) panic("pmap_enter: pte vanished, va: 0x%lx", va); - } + } else + pmap->pm_stats.resident_count++; /* * Enter on the PV list if part of our managed memory. Note that we @@ -1952,7 +1959,6 @@ /* * Increment counters */ - pmap->pm_stats.resident_count++; if (wired) pmap->pm_stats.wired_count++; @@ -1977,7 +1983,14 @@ * to update the pte. */ if ((origpte & ~(PG_M|PG_A)) != newpte) { - pte_store(pte, newpte | PG_A); + if (origpte & PG_MANAGED) { + origpte = pte_load_store(pte, newpte | PG_A); + if ((origpte & PG_M) && pmap_track_modified(va)) + vm_page_dirty(om); + if (origpte & PG_A) + vm_page_flag_set(om, PG_REFERENCED); + } else + pte_store(pte, newpte | PG_A); if (origpte) { pmap_invalidate_page(pmap, va); } ==== //depot/projects/smpng/sys/amd64/include/acpica_machdep.h#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/sys/amd64/include/acpica_machdep.h,v 1.5 2004/05/05 20:04:14 njl Exp $ + * $FreeBSD: src/sys/amd64/include/acpica_machdep.h,v 1.6 2004/10/11 05:39:15 njl Exp $ */ /****************************************************************************** @@ -73,6 +73,7 @@ #define COMPILER_DEPENDENT_INT64 long #define COMPILER_DEPENDENT_UINT64 unsigned long -void acpi_SetDefaultIntrModel(int model); +void acpi_SetDefaultIntrModel(int model); +void acpi_cpu_c1(void); #endif /* __ACPICA_MACHDEP_H__ */ ==== //depot/projects/smpng/sys/amd64/include/pmap.h#16 (text+ko) ==== @@ -39,7 +39,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.124 2004/09/29 19:20:39 alc Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.125 2004/10/08 08:23:43 alc Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -194,15 +194,25 @@ { pt_entry_t r; - r = *ptep; - *ptep = pte; + __asm __volatile( + "xchgq %0,%1" + : "=m" (*ptep), + "=r" (r) + : "1" (pte), + "m" (*ptep)); return (r); } #define pte_load_clear(pte) atomic_readandclear_long(pte) -#define pte_clear(ptep) pte_load_store((ptep), (pt_entry_t)0ULL) -#define pte_store(ptep, pte) pte_load_store((ptep), (pt_entry_t)pte) +static __inline void +pte_store(pt_entry_t *ptep, pt_entry_t pte) +{ + + *ptep = pte; +} + +#define pte_clear(ptep) pte_store((ptep), (pt_entry_t)0ULL) #define pde_store(pdep, pde) pte_store((pdep), (pde)) ==== //depot/projects/smpng/sys/amd64/pci/pci_bus.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.109 2004/06/03 05:58:30 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.110 2004/10/11 21:51:27 peter Exp $"); #include "opt_cpu.h" @@ -35,6 +35,7 @@ #include #include #include +#include #include #include @@ -42,6 +43,7 @@ #include #include #include +#include #include "pcib_if.h" @@ -81,8 +83,8 @@ static const char * legacy_pcib_is_host_bridge(int bus, int slot, int func, - u_int32_t id, u_int8_t class, u_int8_t subclass, - u_int8_t *busnum) + uint32_t id, uint8_t class, uint8_t subclass, + uint8_t *busnum) { const char *s = NULL; @@ -262,7 +264,38 @@ return ENOENT; } +SYSCTL_DECL(_hw_pci); +static int legacy_host_mem_start = 0x80000000; +/* No TUNABLE_ULONG :-( */ +TUNABLE_INT("hw.pci.host_mem_start", &legacy_host_mem_start); +SYSCTL_INT(_hw_pci, OID_AUTO, host_mem_start, CTLFLAG_RDTUN, + &legacy_host_mem_start, 0x80000000, + "Limit the host bridge memory to being above this address. Must be\n\ +set at boot via a tunable."); + +static struct resource * +legacy_pcib_alloc_resource(device_t dev, device_t child, int type, int *rid, + u_long start, u_long end, u_long count, u_int flags) +{ + /* + * If no memory preference is given, use upper 32MB slot most + * bioses use for their memory window. Typically other bridges + * before us get in the way to assert their preferences on memory. + * Hardcoding like this sucks, so a more MD/MI way needs to be + * found to do it. This is typically only used on older laptops + * that don't have pci busses behind pci bridge, so assuming > 32MB + * is liekly OK. + * + * However, this can cause problems for other chipsets, so we make + * this tunable by hw.pci.host_mem_start. + */ + if (type == SYS_RES_MEMORY && start == 0UL && end == ~0UL) + start = legacy_host_mem_start; + return (bus_generic_alloc_resource(dev, child, type, rid, start, end, + count, flags)); +} + static device_method_t legacy_pcib_methods[] = { /* Device interface */ DEVMETHOD(device_identify, legacy_pcib_identify), @@ -276,7 +309,7 @@ DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_read_ivar, legacy_pcib_read_ivar), DEVMETHOD(bus_write_ivar, legacy_pcib_write_ivar), - DEVMETHOD(bus_alloc_resource, bus_generic_alloc_resource), + DEVMETHOD(bus_alloc_resource, legacy_pcib_alloc_resource), DEVMETHOD(bus_release_resource, bus_generic_release_resource), DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), ==== //depot/projects/smpng/sys/arm/conf/SIMICS#3 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.3 2004/09/23 22:53:50 cognet Exp $ +# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.4 2004/10/11 14:42:06 cognet Exp $ machine arm ident SIMICS @@ -40,6 +40,7 @@ options UFS_ACL #Support for access control lists options UFS_DIRHASH #Improve performance on big directories options MD_ROOT #MD is a potential root device +options MD_ROOT_SIZE=65535 options ROOTDEVNAME=\"ufs:md0\" options NFSCLIENT #Network Filesystem Client options NFSSERVER #Network Filesystem Server ==== //depot/projects/smpng/sys/arm/sa11x0/assabet_machdep.c#5 (text+ko) ==== @@ -47,7 +47,9 @@ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.4 2004/09/23 22:32:33 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.5 2004/10/11 14:41:38 cognet Exp $"); + +#include "opt_md.h" #define _ARM32_BUS_DMA_PRIVATE #include @@ -131,7 +133,9 @@ struct pcpu __pcpu; struct pcpu *pcpup = &__pcpu; -#define MDSIZE 8192 +#ifndef MD_ROOT_SIZE +#error SIMICS needs MD_ROOT and MD_ROOT_SIZE +#endif /* Physical and virtual addresses for some global pages */ vm_paddr_t phys_avail[10]; @@ -218,7 +222,7 @@ fake_preload[i++] = MDROOT_ADDR; fake_preload[i++] = MODINFO_SIZE; fake_preload[i++] = sizeof(uint32_t); - fake_preload[i++] = MDSIZE * 1024; + fake_preload[i++] = MD_ROOT_SIZE * 1024; fake_preload[i++] = 0; fake_preload[i] = 0; preload_metadata = (void *)fake_preload; @@ -236,7 +240,6 @@ kerneldatasize = (u_int32_t)&end - (u_int32_t)KERNEL_TEXT_BASE; symbolsize = 0; freemempos = (vm_offset_t)round_page(physical_freestart); - printf("freemempos %p\n", (void*)freemempos); memset((void *)freemempos, 0, 256*1024); /* Define a macro to simplify memory allocation */ #define valloc_pages(var, np) \ @@ -311,12 +314,10 @@ pmap_map_chunk(l1pagetable, KERNBASE, KERNBASE, (uint32_t)&end - KERNBASE, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); /* Map the stack pages */ - printf("avant irq %p %p\n", (void*)irqstack.pv_va, (void*)irqstack.pv_pa); pmap_map_chunk(l1pagetable, irqstack.pv_va, irqstack.pv_pa, IRQ_STACK_SIZE * PAGE_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); - printf("apres irq\n"); pmap_map_chunk(l1pagetable, md_addr.pv_va, md_addr.pv_pa, - MDSIZE * 1024, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); + MD_ROOT_SIZE * 1024, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); pmap_map_chunk(l1pagetable, abtstack.pv_va, abtstack.pv_pa, ABT_STACK_SIZE * PAGE_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); pmap_map_chunk(l1pagetable, undstack.pv_va, undstack.pv_pa, @@ -365,7 +366,6 @@ * Since the ARM stacks use STMFD etc. we must set r13 to the top end * of the stack memory. */ - printf("init subsystems: stacks\n"); set_stackptr(PSR_IRQ32_MODE, irqstack.pv_va + IRQ_STACK_SIZE * PAGE_SIZE); set_stackptr(PSR_ABT32_MODE, ==== //depot/projects/smpng/sys/cam/scsi/scsi_da.h#2 (text+ko) ==== @@ -46,7 +46,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $FreeBSD: src/sys/cam/scsi/scsi_da.h,v 1.5 2000/05/21 23:57:52 ken Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_da.h,v 1.6 2004/10/12 08:55:02 bms Exp $ */ #ifndef _SCSI_SCSI_DA_H @@ -151,6 +151,9 @@ #define REASSIGN_BLOCKS 0x07 #define MODE_SELECT 0x15 #define MODE_SENSE 0x1a +#define READ_FORMAT_CAPACITIES 0x23 +#define WRITE_AND_VERIFY 0x2e +#define VERIFY 0x2f #define READ_DEFECT_DATA_10 0x37 #define READ_DEFECT_DATA_12 0xb7 @@ -182,6 +185,82 @@ u_int8_t pat_length[2]; }; +struct scsi_read_format_capacities +{ + uint8_t opcode; /* READ_FORMAT_CAPACITIES */ + uint8_t byte2; /* top 3 bits contain LUN */ +#define SRFC_LUN_MASK 0xE0 + uint8_t reserved0[5]; + uint8_t alloc_length[2]; + uint8_t reserved1[3]; +}; + +struct scsi_verify +{ + uint8_t opcode; /* VERIFY */ + uint8_t lun; /* All other bits should be zero */ +#define SVFY_RELADR 0x01 +#define SVFY_BYTECHK 0x02 +#define SVFY_DPO 0x10 +#define SVFY_LUN_MASK 0xE0 /* Top 3 MSBs are LUN */ + uint8_t addr[4]; /* LBA to begin verification at */ + uint8_t reserved0[1]; + uint8_t len[2]; /* number of blocks to verify */ + uint8_t reserved1[3]; +}; + +struct scsi_write_and_verify +{ + uint8_t opcode; /* WRITE_AND_VERIFY */ + uint8_t byte2; /* top 3 bits are the LUN */ +#define SWVY_LUN_MASK 0xE0 +#define SWVY_RELADR 0x01 +#define SWVY_BYTECHK 0x02 +#define SWVY_DPO 0x10 + uint8_t addr[4]; /* LBA to begin verification at */ + uint8_t reserved0[1]; + uint8_t len[2]; /* number of blocks to write and verify */ + uint8_t reserved1[3]; +}; + +/* + * Replies to READ_FORMAT_CAPACITIES look like this: + * + * struct format_capacity_list_header + * struct format_capacity_descriptor[1..n] + * + * These are similar, but not totally identical to, the + * defect list used to format a rigid disk. + * + * The appropriate csio_decode() format string looks like this: + * "{} *i3 {Len} i1 {Blocks} i4 {} *b6 {Code} b2 {Blocklen} i3" + * + * If the capacity_list_length is greater than + * sizeof(struct format_capacity_descriptor), then there are + * additional format capacity descriptors available which + * denote which format(s) the drive can handle. + * + * (Source: USB Mass Storage UFI Specification) + */ + +struct format_capacity_list_header { + uint8_t unused[3]; + uint8_t capacity_list_length; +}; + +struct format_capacity_descriptor { + uint8_t nblocks[4]; /* total number of LBAs */ + uint8_t byte4; /* only present in max/cur descriptor */ +#define FCD_CODE_MASK 0x03 /* mask for code field above */ +#define FCD_UNFORMATTED 0x01 /* unformatted media present, + * maximum capacity returned */ +#define FCD_FORMATTED 0x02 /* formatted media present, + * current capacity returned */ +#define FCD_NOMEDIA 0x03 /* no media present, + * maximum device capacity returned */ + uint8_t block_length[3]; /* length of an LBA in bytes */ +}; + struct scsi_reassign_blocks_data { u_int8_t reserved[2]; ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#12 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.24 2004/10/05 18:51:10 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.25 2004/10/11 22:04:15 peter Exp $"); #include "opt_compat.h" @@ -1203,25 +1203,21 @@ if (uap->namelen > CTL_MAXNAME || uap->namelen < 2) return (EINVAL); - - error = copyin(uap->name, &name, uap->namelen * sizeof(int)); + error = copyin(uap->name, name, uap->namelen * sizeof(int)); if (error) return (error); - mtx_lock(&Giant); - if (uap->oldlenp) oldlen = fuword32(uap->oldlenp); else oldlen = 0; error = userland_sysctl(td, name, uap->namelen, uap->old, &oldlen, 1, - uap->new, uap->newlen, &j); + uap->new, uap->newlen, &j, SCTL_MASK32); if (error && error != ENOMEM) goto done2; - if (uap->oldlenp) { + if (uap->oldlenp) suword32(uap->oldlenp, j); - } done2: mtx_unlock(&Giant); return (error); ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#11 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.28 2004/07/14 00:03:51 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.40 2004/07/14 00:03:30 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.29 2004/10/06 14:23:00 mtm Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.41 2004/10/06 14:20:57 mtm Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#11 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.28 2004/07/14 00:03:51 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.40 2004/07/14 00:03:30 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.29 2004/10/06 14:23:00 mtm Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.41 2004/10/06 14:20:57 mtm Exp */ #define FREEBSD32_SYS_syscall 0 ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#11 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.19 2004/07/14 00:03:51 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.40 2004/07/14 00:03:30 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.20 2004/10/06 14:23:00 mtm Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.41 2004/10/06 14:20:57 mtm Exp */ const char *freebsd32_syscallnames[] = { ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#11 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.29 2004/07/14 00:03:51 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.40 2004/07/14 00:03:30 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.30 2004/10/06 14:23:00 mtm Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.41 2004/10/06 14:20:57 mtm Exp */ #include "opt_compat.h" @@ -456,7 +456,7 @@ { 0, (sy_call_t *)nosys }, /* 428 = __acl_aclcheck_link */ { 0, (sy_call_t *)nosys }, /* 429 = sigwait */ { SYF_MPSAFE | AS(thr_create_args), (sy_call_t *)thr_create }, /* 430 = thr_create */ - { SYF_MPSAFE | 0, (sy_call_t *)thr_exit }, /* 431 = thr_exit */ + { SYF_MPSAFE | AS(thr_exit_args), (sy_call_t *)thr_exit }, /* 431 = thr_exit */ { SYF_MPSAFE | AS(thr_self_args), (sy_call_t *)thr_self }, /* 432 = thr_self */ { SYF_MPSAFE | AS(thr_kill_args), (sy_call_t *)thr_kill }, /* 433 = thr_kill */ { SYF_MPSAFE | AS(_umtx_lock_args), (sy_call_t *)_umtx_lock }, /* 434 = _umtx_lock */ ==== //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#11 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.40 2004/07/14 00:03:30 peter Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.41 2004/10/06 14:20:57 mtm Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -596,7 +596,7 @@ ; XXX implement 429 UNIMPL sigwait 430 MNOPROTO { int thr_create(ucontext_t *ctx, long *id, int flag s); } -431 MNOPROTO { void thr_exit(void); } +431 MNOPROTO { void thr_exit(long *state); } 432 MNOPROTO { int thr_self(long *id); } 433 MNOPROTO { int thr_kill(long id, int sig); } 434 MNOPROTO { int _umtx_lock(struct umtx *umtx); } ==== //depot/projects/smpng/sys/compat/linux/linux_util.h#10 (text+ko) ==== @@ -28,7 +28,7 @@ * * from: svr4_util.h,v 1.5 1994/11/18 02:54:31 christos Exp * from: linux_util.h,v 1.2 1995/03/05 23:23:50 fvdl Exp - * $FreeBSD: src/sys/compat/linux/linux_util.h,v 1.22 2004/08/15 11:52:45 tjr Exp $ + * $FreeBSD: src/sys/compat/linux/linux_util.h,v 1.23 2004/10/10 18:34:30 dwmalone Exp $ */ /* @@ -80,17 +80,17 @@ int linux_emul_convpath(struct thread *, char *, enum uio_seg, char **, int); int linux_emul_find(struct thread *, caddr_t *, char *, char **, int); -#define CHECKALT(p, sgp, path, i) \ +#define CHECKALT(td, sgp, path, i) \ do { \ int _error; \ \ - _error = linux_emul_find(p, sgp, path, &path, i); \ + _error = linux_emul_find(td, sgp, path, &path, i); \ if (_error == EFAULT) \ return (_error); \ } while (0) -#define CHECKALTEXIST(p, sgp, path) CHECKALT(p, sgp, path, 0) -#define CHECKALTCREAT(p, sgp, path) CHECKALT(p, sgp, path, 1) +#define CHECKALTEXIST(td, sgp, path) CHECKALT(td, sgp, path, 0) +#define CHECKALTCREAT(td, sgp, path) CHECKALT(td, sgp, path, 1) #define LCONVPATH(td, upath, pathp, i) \ do { \ @@ -108,9 +108,9 @@ #define DUMMY(s) \ int \ -linux_ ## s(struct thread *p, struct linux_ ## s ## _args *args) \ +linux_ ## s(struct thread *td, struct linux_ ## s ## _args *args) \ { \ - return (unimplemented_syscall(p, #s)); \ + return (unimplemented_syscall(td, #s)); \ } \ struct __hack ==== //depot/projects/smpng/sys/conf/files#124 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.955 2004/09/30 07:04:03 phk Exp $ +# $FreeBSD: src/sys/conf/files,v 1.956 2004/10/08 00:24:30 brooks Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1252,7 +1252,6 @@ net/if_tun.c optional tun net/if_tap.c optional tap net/if_vlan.c optional vlan -net/net_osdep.c standard net/netisr.c standard net/ppp_deflate.c optional ppp_deflate net/ppp_tty.c optional ppp ==== //depot/projects/smpng/sys/conf/files.i386#68 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.504 2004/08/16 12:25:47 obrien Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.505 2004/10/07 16:21:03 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -282,6 +282,7 @@ i386/isa/mse.c optional mse i386/isa/nmi.c standard i386/isa/npx.c optional npx +i386/isa/pbio.c optional pbio i386/isa/pcf.c optional pcf i386/isa/pcvt/pcvt_drv.c optional vt i386/isa/pcvt/pcvt_ext.c optional vt ==== //depot/projects/smpng/sys/conf/files.sparc64#43 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sparc64,v 1.59 2004/08/15 22:59:34 marius Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.60 2004/10/09 07:31:02 yongari Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -12,6 +12,8 @@ crypto/des/des_enc.c optional ipsec ipsec_esp crypto/blowfish/bf_enc.c optional crypto crypto/des/des_enc.c optional crypto +dev/auxio/auxio.c optional auxio sbus +dev/auxio/auxio.c optional auxio ebus dev/esp/esp_sbus.c optional esp sbus dev/esp/lsi64854.c optional esp sbus dev/fb/creator.c optional creator sc ==== //depot/projects/smpng/sys/conf/kern.pre.mk#40 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.57 2004/09/23 22:53:22 cognet Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.59 2004/10/07 20:36:56 kensmith Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. ==== //depot/projects/smpng/sys/conf/kmod.mk#35 (text+ko) ==== @@ -1,43 +1,43 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.167 2004/08/29 02:00:50 iedowse Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.171 2004/10/12 15:08:24 ru Exp $ # -# The include file handles installing Kernel Loadable Device -# drivers (KLD's). +# The include file handles building and installing loadable +# kernel modules. # # # +++ variables +++ # # CLEANFILES Additional files to remove for the clean and cleandir targets. # -# KMOD The name of the kernel module to build. +# EXPORT_SYMS A list of symbols that should be exported from the module, +# or the name of a file containing a list of symbols, or YES +# to export all symbols. If not defined, no symbols are +# exported. +# +# KMOD The name of the kernel module to build. # # KMODDIR Base path for kernel modules (see kld(4)). [/boot/kernel] # -# KMODOWN KLD owner. [${BINOWN}] +# KMODOWN Module file owner. [${BINOWN}] # -# KMODGRP KLD group. [${BINGRP}] +# KMODGRP Module file group. [${BINGRP}] # -# KMODMODE KLD mode. [${BINMODE}] +# KMODMODE Module file mode. [${BINMODE}] # # KMODLOAD Command to load a kernel module [/sbin/kldload] # # KMODUNLOAD Command to unload a kernel module [/sbin/kldunload] # -# PROG The name of the kernel module to build. -# If not supplied, ${KMOD}.o is used. +# MFILES Optionally a list of interfaces used by the module. +# This file contains a default list of interfaces. # -# SRCS List of source files +# PROG The name of the kernel module to build. +# If not supplied, ${KMOD}.ko is used. # -# DESTDIR Change the tree where the module gets installed. [not set] +# SRCS List of source files. # -# MFILES Optionally a list of interfaces used by the module. -# This file contains a default list of interfaces. +# DESTDIR The tree where the module gets installed. [not set] # -# EXPORT_SYMS A list of symbols that should be exported from the module, -# or the name of a file containing a list of symbols, or YES -# to export all symbols. If not defined, no symbols are -# exported. -# # +++ targets +++ # # install: @@ -48,14 +48,11 @@ # is executed. # # load: -# Load KLD. +# Load a module. # # unload: -# Unload KLD. +# Unload a module. # -# bsd.obj.mk: clean, cleandir and obj -# bsd.dep.mk: cleandepend, depend and tags -# AWK?= awk KMODLOAD?= /sbin/kldload @@ -63,7 +60,7 @@ OBJCOPY?= objcopy .if defined(KMODDEPS) -.error "Do not use KMODDEPS on 5.0+, use MODULE_VERSION/MODULE_DEPEND" +.error "Do not use KMODDEPS on 5.0+; use MODULE_VERSION/MODULE_DEPEND" .endif .include @@ -88,10 +85,10 @@ .endif CFLAGS+= ${NOSTDINC} -I- ${INCLMAGIC} ${_ICFLAGS} .if defined(KERNBUILDDIR) -CFLAGS+= -include ${KERNBUILDDIR}/opt_global.h +CFLAGS+= -include ${KERNBUILDDIR}/opt_global.h .endif -# Add -I paths for system headers. Individual KLD makefiles don't +# Add -I paths for system headers. Individual module makefiles don't # need any -I paths for this. Similar defaults for .PATH can't be # set because there are no standard paths for non-headers. CFLAGS+= -I. -I@ @@ -130,7 +127,7 @@ CFLAGS+= -fno-omit-frame-pointer .endif -OBJS+= ${SRCS:N*.h:R:S/$/.o/g} +OBJS+= ${SRCS:N*.h:R:S/$/.o/g} .if !defined(PROG) PROG= ${KMOD}.ko @@ -154,7 +151,7 @@ EXPORT_SYMS?= NO .if ${EXPORT_SYMS} != YES -CLEANFILES+= ${.OBJDIR}/export_syms +CLEANFILES+= export_syms .endif .if ${MACHINE_ARCH} != amd64 @@ -166,15 +163,14 @@ .if defined(EXPORT_SYMS) .if ${EXPORT_SYMS} != YES .if ${EXPORT_SYMS} == NO - touch ${.OBJDIR}/export_syms + touch export_syms .elif !exists(${.CURDIR}/${EXPORT_SYMS}) - echo ${EXPORT_SYMS} > ${.OBJDIR}/export_syms + echo ${EXPORT_SYMS} > export_syms .else - grep -v '^#' < ${EXPORT_SYMS} > ${.OBJDIR}/export_syms + grep -v '^#' < ${EXPORT_SYMS} > export_syms .endif awk -f ${SYSDIR}/conf/kmod_syms.awk ${.TARGET} \ - ${.OBJDIR}/export_syms | \ - xargs -J% ${OBJCOPY} % ${.TARGET} + export_syms | xargs -J% ${OBJCOPY} % ${.TARGET} .endif .endif .if !defined(DEBUG_FLAGS) && ${MACHINE_ARCH} == amd64 @@ -186,7 +182,6 @@ all: objwarn ${PROG} beforedepend: ${_ILINKS} - @rm -f .depend # Ensure that the links exist without depending on it when it exists which # causes all the modules to be rebuilt when the directory pointed to changes. @@ -217,7 +212,7 @@ ${ECHO} ${.TARGET} "->" $$path ; \ ln -s $$path ${.TARGET} >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Oct 12 20:56:39 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3698B16A4D2; Tue, 12 Oct 2004 20:56:39 +0000 (GMT) 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 106AC16A4CE for ; Tue, 12 Oct 2004 20:56:39 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0551A43D55 for ; Tue, 12 Oct 2004 20:56:38 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9CKuc9D043093 for ; Tue, 12 Oct 2004 20:56:38 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9CKucPv043090 for perforce@freebsd.org; Tue, 12 Oct 2004 20:56:38 GMT (envelope-from jhb@freebsd.org) Date: Tue, 12 Oct 2004 20:56:38 GMT Message-Id: <200410122056.i9CKucPv043090@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 63099 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, 12 Oct 2004 20:56:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=63099 Change 63099 by jhb@jhb_slimer on 2004/10/12 20:56:31 Move this task. Affected files ... .. //depot/projects/smpng/sys/notes#20 edit .. //depot/user/jhb/proc/notes#35 edit Differences ... ==== //depot/projects/smpng/sys/notes#20 (text+ko) ==== @@ -49,6 +49,5 @@ go figure) - Optimize spin locks on UP such that they don't do atomic operations - Untested -- Move kern_setrlimit() and kern_wait() prototypes to Space reserved for child branches: ==== //depot/user/jhb/proc/notes#35 (text+ko) ==== @@ -52,6 +52,8 @@ - Move kern_setrlimit() and kern_wait() prototypes to Space reserved for child branches: ++ Move kern_setrlimit() and kern_wait() prototypes to + - LINT - Add an idle_cpus variable - Try to avoid needlessly IPI'ing idle CPUs (like from roundrobin) - Revisit round-robin locking From owner-p4-projects@FreeBSD.ORG Tue Oct 12 20:58:42 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 09F5316A4D1; Tue, 12 Oct 2004 20:58:42 +0000 (GMT) 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 C20E516A4CE for ; Tue, 12 Oct 2004 20:58:41 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B0C4F43D1F for ; Tue, 12 Oct 2004 20:58:41 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9CKwfrq043223 for ; Tue, 12 Oct 2004 20:58:41 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9CKwf2A043220 for perforce@freebsd.org; Tue, 12 Oct 2004 20:58:41 GMT (envelope-from jhb@freebsd.org) Date: Tue, 12 Oct 2004 20:58:41 GMT Message-Id: <200410122058.i9CKwf2A043220@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 63100 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, 12 Oct 2004 20:58:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=63100 Change 63100 by jhb@jhb_slimer on 2004/10/12 20:58:20 IFC @63091. Affected files ... .. //depot/projects/smpng/sys/dev/sio/sio.c#50 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#71 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#50 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#46 integrate Differences ... ==== //depot/projects/smpng/sys/dev/sio/sio.c#50 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sio/sio.c,v 1.454 2004/09/20 13:55:26 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sio/sio.c,v 1.455 2004/10/12 20:16:02 phk Exp $"); #include "opt_comconsole.h" #include "opt_compat.h" @@ -993,14 +993,7 @@ tp->t_init_in.c_cflag = TTYDEF_CFLAG; tp->t_init_in.c_lflag = 0; if (unit == comconsole) { - tp->t_init_in.c_iflag = TTYDEF_IFLAG; - tp->t_init_in.c_oflag = TTYDEF_OFLAG; - tp->t_init_in.c_cflag = TTYDEF_CFLAG | CLOCAL; - tp->t_init_in.c_lflag = TTYDEF_LFLAG; - tp->t_lock_out.c_cflag = tp->t_lock_in.c_cflag = CLOCAL; - tp->t_lock_out.c_ispeed = tp->t_lock_out.c_ospeed = - tp->t_lock_in.c_ispeed = tp->t_lock_in.c_ospeed = - tp->t_init_in.c_ispeed = tp->t_init_in.c_ospeed = comdefaultrate; + ttyconsolemode(tp, comdefaultrate); } else tp->t_init_in.c_ispeed = tp->t_init_in.c_ospeed = TTYDEF_SPEED; if (siosetwater(com, tp->t_init_in.c_ispeed) != 0) { ==== //depot/projects/smpng/sys/kern/kern_thread.c#71 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.203 2004/10/06 00:40:41 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.204 2004/10/12 19:36:00 jhb Exp $"); #include #include @@ -1069,7 +1069,7 @@ * to continue however as this is a bad place to stop. */ if ((p->p_numthreads != 1) && (!P_SHOULDSTOP(p))) { - while (( td = TAILQ_FIRST(&p->p_suspended))) { + while ((td = TAILQ_FIRST(&p->p_suspended))) { thread_unsuspend_one(td); } } ==== //depot/projects/smpng/sys/netinet/udp_usrreq.c#50 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)udp_usrreq.c 8.6 (Berkeley) 5/23/95 - * $FreeBSD: src/sys/netinet/udp_usrreq.c,v 1.166 2004/09/05 02:34:12 jmg Exp $ + * $FreeBSD: src/sys/netinet/udp_usrreq.c,v 1.167 2004/10/12 20:03:56 rwatson Exp $ */ #include "opt_ipsec.h" @@ -363,9 +363,9 @@ udpstat.udps_noportbcast++; goto badheadlocked; } - INP_INFO_RUNLOCK(&udbinfo); udp_append(last, ip, m, iphlen + sizeof(struct udphdr)); INP_UNLOCK(last); + INP_INFO_RUNLOCK(&udbinfo); return; } /* @@ -399,15 +399,15 @@ return; } INP_LOCK(inp); - INP_INFO_RUNLOCK(&udbinfo); udp_append(inp, ip, m, iphlen + sizeof(struct udphdr)); INP_UNLOCK(inp); + INP_INFO_RUNLOCK(&udbinfo); return; badheadlocked: - INP_INFO_RUNLOCK(&udbinfo); if (inp) INP_UNLOCK(inp); + INP_INFO_RUNLOCK(&udbinfo); badunlocked: m_freem(m); if (opts) ==== //depot/projects/smpng/sys/sys/mbuf.h#46 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)mbuf.h 8.5 (Berkeley) 2/19/95 - * $FreeBSD: src/sys/sys/mbuf.h,v 1.162 2004/10/11 18:40:19 glebius Exp $ + * $FreeBSD: src/sys/sys/mbuf.h,v 1.163 2004/10/12 20:18:27 glebius Exp $ */ #ifndef _SYS_MBUF_H_ @@ -319,7 +319,7 @@ /* * Network buffer allocation API * - * The rest of it is defined in kern/subr_mbuf.c + * The rest of it is defined in kern/kern_mbuf.c */ extern uma_zone_t zone_mbuf; From owner-p4-projects@FreeBSD.ORG Wed Oct 13 01:14:58 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 97AD716A4D1; Wed, 13 Oct 2004 01:14:58 +0000 (GMT) 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 597F616A4CE for ; Wed, 13 Oct 2004 01:14:58 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 307D943D2D for ; Wed, 13 Oct 2004 01:14:58 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9D1Ew51059182 for ; Wed, 13 Oct 2004 01:14:58 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9D1Evf9059179 for perforce@freebsd.org; Wed, 13 Oct 2004 01:14:57 GMT (envelope-from wsalamon@computer.org) Date: Wed, 13 Oct 2004 01:14:57 GMT Message-Id: <200410130114.i9D1Evf9059179@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Subject: PERFORCE change 63119 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: Wed, 13 Oct 2004 01:14:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=63119 Change 63119 by wsalamon@wsalamon_epi on 2004/10/13 01:14:20 Change the auditctl() system call to take just a path. Enable the kerne->auditd IPC for audit log full and disk full messages. Uses a FIFO for this communication. Note: auditd still needs work when rotating the audit log. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/auditd.c#5 edit .. //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#6 edit .. //depot/projects/trustedbsd/audit3/sys/kern/init_sysent.c#5 edit .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.c#5 edit .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#5 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#10 edit .. //depot/projects/trustedbsd/audit3/sys/sys/syscall.h#5 edit .. //depot/projects/trustedbsd/audit3/sys/sys/syscall.mk#5 edit .. //depot/projects/trustedbsd/audit3/sys/sys/sysproto.h#6 edit Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/auditd.c#5 (text+ko) ==== @@ -185,9 +185,8 @@ if (open(fn, O_RDONLY | O_CREAT, S_IRUSR | S_IRGRP) < 0) { perror("File open"); } - /* else if (auditctl(AC_SETLOGFILE, fn, strlen(fn)) != 0) { */ - else if (syscall(SYS_auditctl, AC_SETLOGFILE, fn, - strlen(fn)) != 0) { + /* else if (auditctl(AC_SETLOGFILE, fn)) != 0) { */ + else if (syscall(SYS_auditctl, AC_SETLOGFILE, fn) != 0) { syslog(LOG_ERR, "auditctl failed setting log file! : %s\n", strerror(errno)); @@ -307,7 +306,7 @@ /* flush contents */ /* err_ret = auditctl(NULL); */ - err_ret = syscall(SYS_auditctl, NULL, sizeof(char)); + err_ret = syscall(SYS_auditctl, AC_SETLOGFILE, NULL); if (err_ret != 0) { syslog(LOG_ERR, "auditctl failed! : %s\n", strerror(errno)); @@ -326,6 +325,10 @@ return (1); } endac(); + + if(close(controlfd) != 0) { + syslog(LOG_ERR, "Error closing control file\n"); + } syslog(LOG_INFO, "Finished.\n"); return (0); } @@ -350,13 +353,19 @@ /* Set up the signal hander */ if (signal(SIGTERM, relay_signal) == SIG_ERR) { + syslog(LOG_ERR, + "Could not set signal handler for SIGTERM\n"); fail_exit(); } if (signal(SIGCHLD, relay_signal) == SIG_ERR) { + syslog(LOG_ERR, + "Could not set signal handler for SIGCHLD\n"); fail_exit(); } if ((pidfile = fopen(AUDITD_PIDFILE, "a")) == NULL) { + syslog(LOG_ERR, + "Could not open PID file\n"); audit_warn_tmpfile(); return -1; } @@ -364,7 +373,8 @@ /* attempt to lock the pid file; if a lock is present, exit */ fd = fileno(pidfile); if(flock(fd, LOCK_EX | LOCK_NB) < 0) { - syslog(LOG_ERR, "PID file is locked (is another auditd running?).\n"); + syslog(LOG_ERR, + "PID file is locked (is another auditd running?).\n"); audit_warn_ebusy(); return -1; } @@ -560,7 +570,8 @@ evc_map.ec_number = ev->ae_number; evc_map.ec_class = ev->ae_class; /* if (auditon(A_SETCLASS, &evc_map, sizeof(au_evclass_map_t)) != 0) { */ - if (syscall(SYS_auditon,A_SETCLASS, &evc_map, sizeof(au_evclass_map_t)) != 0) { + if (syscall(SYS_auditon, A_SETCLASS, &evc_map, + sizeof(au_evclass_map_t)) != 0) { syslog(LOG_ERR, "Failed to register class mapping for event %s", ev->ae_name); @@ -630,15 +641,6 @@ return rc; } - /* Tell the kernel the name of the auditd control file */ - /*else if (auditctl(AC_SETCTLFILE, fn, strlen(fn)) != 0) { */ - if (syscall(SYS_auditctl, AC_SETCTLFILE, AUDITD_CTL_FILE, - strlen(AUDITD_CTL_FILE)) != 0) { - syslog(LOG_ERR, - "config_auditd_ipc() : failed sending control file " - " name to the kernel: %s\n", - strerror(errno)); - } /* Set up the signal hander */ if (signal(SIGIO, sigio_handler) == SIG_ERR) { syslog(LOG_ERR, @@ -646,7 +648,7 @@ return -1; } - controlfd = open(AUDITD_CTL_FILE, O_RDONLY); + controlfd = open(AUDITD_CTL_FILE, O_RDONLY | O_NONBLOCK); if (controlfd < 0) { syslog(LOG_ERR, "config_auditd_ipc() : error opening control file\n"); @@ -663,6 +665,14 @@ "config_auditd_ipc() : error setting file ASYNC\n"); return -1; } + /* Tell the kernel the name of the auditd control file */ + /*if (auditctl(AC_SETCTLFILE, fn) != 0) { */ + if (syscall(SYS_auditctl, AC_SETCTLFILE, AUDITD_CTL_FILE) != 0) { + syslog(LOG_ERR, + "config_auditd_ipc() : failed sending control file " + "name to the kernel: %s\n", + strerror(errno)); + } return 0; } @@ -735,7 +745,7 @@ } } - openlog("auditd", LOG_CONS | LOG_PID, LOG_DAEMON); + openlog("auditd", LOG_CONS | LOG_PID, LOG_SECURITY); syslog(LOG_INFO, "starting...\n"); if (debug == 0 && daemon(0, 0) == -1) { ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#6 (text+ko) ==== @@ -302,7 +302,7 @@ int audit (const void *, int); int auditon (int, void *, int); -int auditctl (int, void *, int); +int auditctl (int, const char *); int getauid (au_id_t *); int setauid (const au_id_t *); int getaudit (struct auditinfo *); ==== //depot/projects/trustedbsd/audit3/sys/kern/init_sysent.c#5 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/kern/syscalls.c#5 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#5 (text+ko) ==== @@ -705,6 +705,6 @@ *auditinfo_addr, u_int length); } AUE_GETAUDIT_ADDR 451 MSTD { int setaudit_addr(struct auditinfo_addr \ *auditinfo_addr, u_int length); } AUE_SETAUDIT_ADDR -452 MSTD { int auditctl(int cmd, void *data, u_int length); } AUE_AUDITCTL +452 MSTD { int auditctl(int cmd, char *path); } AUE_AUDITCTL ; Please copy any additions and changes to the following compatability tables: ; sys/compat/freebsd32/syscalls.master ==== //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#10 (text+ko) ==== @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -63,7 +64,7 @@ * volume, it should be left off unless you want your system * to churn a lot whenever the audit record flow gets high. */ -#define AUDIT_EXCESSIVELY_VERBOSE +//#define AUDIT_EXCESSIVELY_VERBOSE #ifdef AUDIT_EXCESSIVELY_VERBOSE #define AUDIT_PRINTF(x) printf x #else @@ -177,6 +178,10 @@ static int audit_file_rotate_wait; /* + * vnode for the audit daemon control file + */ +static struct vnode *auditd_ctl_vp; +/* * Flags controlling behavior in low storage situations. * Should we panic if a write fails? Should we fail stop * if we're out of disk space? Are we currently "failing @@ -215,7 +220,10 @@ struct thread *td) { int ret; + int trigger; struct au_record *bsm; + struct vattr vattr; + struct statfs *mnt_stat = &vp->v_mount->mnt_stat; mtx_assert(&Giant, MA_OWNED); @@ -226,14 +234,11 @@ * and return. However, this is arguably an assertion failure. * XXX Need a FreeBSD equivalent. */ -#if DARWIN_FOO - struct vattr vattr; - struct statfs *mnt_stat = &vp->v_mount->mnt_stat; - ret = VFS_STATFS(vp->v_mount, mnt_stat, p); + ret = VFS_STATFS(vp->v_mount, mnt_stat, td); if (ret) goto out; - ret = VOP_GETATTR(vp, &vattr, cred, p); + ret = VOP_GETATTR(vp, &vattr, cred, td); if (ret) goto out; @@ -246,11 +251,7 @@ * XXX Need to decide what to do if the trigger to the audit daemon * fails. */ - if(host_get_audit_control_port(host_priv_self(), &audit_port) - != KERN_SUCCESS) - printf("Cannot get audit control port\n"); - - if (audit_port != MACH_PORT_NULL) { + if (auditd_ctl_vp != NULL) { long temp; /* @@ -260,9 +261,12 @@ if (audit_qctrl.aq_minfree != 0) { temp = mnt_stat->f_blocks / (100 / audit_qctrl.aq_minfree); if (mnt_stat->f_bfree < temp) { - ret = audit_triggers(audit_port, - AUDIT_TRIGGER_LOW_SPACE); - if (ret != KERN_SUCCESS) { + trigger = AUDITD_TRIGGER_LOW_SPACE; + ret = vn_rdwr(UIO_WRITE, auditd_ctl_vp, + (void *)&trigger, sizeof(trigger), + (off_t)0, UIO_SYSSPACE, IO_APPEND|IO_UNIT, + cred, NULL, NULL, td); + if (ret != 0) { printf( "Failed audit_triggers(AUDIT_TRIGGER_LOW_SPACE): %d\n", ret); /* @@ -281,9 +285,12 @@ (audit_file_rotate_wait == 0) && (vattr.va_size >= audit_fstat.af_filesz)) { audit_file_rotate_wait = 1; - ret = audit_triggers(audit_port, - AUDIT_TRIGGER_FILE_FULL); - if (ret != KERN_SUCCESS) { + trigger = AUDITD_TRIGGER_FILE_FULL; + ret = vn_rdwr(UIO_WRITE, auditd_ctl_vp, + (void *)&trigger, sizeof(trigger), + (off_t)0, UIO_SYSSPACE, IO_APPEND|IO_UNIT, + cred, NULL, NULL, td); + if (ret != 0) { printf( "Failed audit_triggers(AUDIT_TRIGGER_FILE_FULL): %d\n", ret); /* XXX what to do here? */ @@ -312,7 +319,6 @@ audit_in_failure = 1; } -#endif /* * If there is a user audit record attached to the kernel record, * then write the user record. @@ -370,7 +376,6 @@ kau_free(bsm); out: -#if DARWIN_FOO /* * When we're done processing the current record, we have to * check to see if we're in a failure mode, and if so, whether @@ -379,12 +384,11 @@ */ if (audit_in_failure && audit_q_len == 0 && audit_pre_q_len == 0) { - VOP_LOCK(vp, LK_DRAIN | LK_INTERLOCK, p); - (void)VOP_FSYNC(vp, cred, MNT_WAIT, p); - VOP_UNLOCK(vp, 0, p); + VOP_LOCK(vp, LK_DRAIN | LK_INTERLOCK, td); + (void)VOP_FSYNC(vp, cred, MNT_WAIT, td); + VOP_UNLOCK(vp, 0, td); panic("Audit store overflow; record queue drained."); } -#endif return (ret); } @@ -585,6 +589,7 @@ audit_replacement_flag = 0; audit_file_rotate_wait = 0; audit_replacement_vp = NULL; + auditd_ctl_vp = NULL; audit_fstat.af_filesz = 0; /* '0' means unset, unbounded */ audit_fstat.af_currsz = 0; audit_qctrl.aq_hiwater = AQ_HIWATER; @@ -1089,7 +1094,6 @@ struct ucred *cred; struct vnode *vp; int error, flags; - union auditctl_udata udata; error = suser(td); if (error) @@ -1098,8 +1102,6 @@ vp = NULL; cred = NULL; - memset((void *)&udata, 0, sizeof(udata)); - switch (uap->cmd) { case AC_SETLOGFILE: /* @@ -1107,18 +1109,11 @@ * validity checks, and grab another reference to the current * credential. */ - if (uap->data != NULL) { + if (uap->path != NULL) { - if ((uap->length <= 0) || (uap->length > MAXPATHLEN)) - return (EINVAL); - - error = copyin(uap->data, (void *)&udata, uap->length); - if (error) - return (error); - mtx_lock(&Giant); NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_SYSSPACE, - udata.ac_path, td); + uap->path, td); flags = audit_open_flags; error = vn_open(&nd, &flags, 0, -1); if (error) { @@ -1141,7 +1136,29 @@ audit_rotate_vnode(cred, vp); break; - case AC_SETCTLFD: /* Set control file descriptor */ + + case AC_SETCTLFILE: /* Set auditd control file */ + if (uap->path != NULL) { + mtx_lock(&Giant); + NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_SYSSPACE, + uap->path, td); + flags = FWRITE | O_NONBLOCK; + error = vn_open(&nd, &flags, 0, -1); + if (error) { + mtx_unlock(&Giant); + return (error); + } + VOP_UNLOCK(nd.ni_vp, 0, td); + vp = nd.ni_vp; + if (vp->v_type != VFIFO) { + vn_close(vp, audit_close_flags, + td->td_ucred, td); + mtx_unlock(&Giant); + return (EINVAL); + } + auditd_ctl_vp = vp; + mtx_unlock(&Giant); + } break; } return (0); ==== //depot/projects/trustedbsd/audit3/sys/sys/syscall.h#5 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/sys/syscall.mk#5 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/sys/sysproto.h#6 (text+ko) ==== @@ -1334,8 +1334,7 @@ }; struct auditctl_args { char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)]; - char data_l_[PADL_(void *)]; void * data; char data_r_[PADR_(void *)]; - char length_l_[PADL_(u_int)]; u_int length; char length_r_[PADR_(u_int)]; + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; }; int nosys(struct thread *, struct nosys_args *); void sys_exit(struct thread *, struct sys_exit_args *); From owner-p4-projects@FreeBSD.ORG Wed Oct 13 09:43:24 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0940F16A4D1; Wed, 13 Oct 2004 09:43:24 +0000 (GMT) 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 D751C16A4CE for ; Wed, 13 Oct 2004 09:43:23 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C9CE643D53 for ; Wed, 13 Oct 2004 09:43:23 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9D9hNsQ092172 for ; Wed, 13 Oct 2004 09:43:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9D9hNpj092169 for perforce@freebsd.org; Wed, 13 Oct 2004 09:43:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 13 Oct 2004 09:43:23 GMT Message-Id: <200410130943.i9D9hNpj092169@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 63146 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: Wed, 13 Oct 2004 09:43:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=63146 Change 63146 by rwatson@rwatson_tislabs on 2004/10/13 09:42:37 Correct a mis-merge: in the TrustedBSD MAC tree, the kernel uses a wrapper structure for System V SHM segment descriptions to avoid breaking the ABI. I neglected to adapt a FreeBSD-derived change to use the wrapper. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/sysv_shm.c#24 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/sysv_shm.c#24 (text+ko) ==== @@ -405,7 +405,7 @@ rv = vm_map_find(&p->p_vmspace->vm_map, shmseg->u.shm_internal, 0, &attach_va, size, (flags & MAP_FIXED)?0:1, prot, prot, 0); if (rv != KERN_SUCCESS) { - vm_object_deallocate(shmseg->shm_internal); + vm_object_deallocate(shmseg->u.shm_internal); error = ENOMEM; goto done2; } From owner-p4-projects@FreeBSD.ORG Wed Oct 13 09:44:26 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0878216A4D1; Wed, 13 Oct 2004 09:44:26 +0000 (GMT) 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 C1E4816A4CE for ; Wed, 13 Oct 2004 09:44:25 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A61BE43D3F for ; Wed, 13 Oct 2004 09:44:25 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9D9iPtd092280 for ; Wed, 13 Oct 2004 09:44:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9D9iPch092277 for perforce@freebsd.org; Wed, 13 Oct 2004 09:44:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 13 Oct 2004 09:44:25 GMT Message-Id: <200410130944.i9D9iPch092277@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 63147 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: Wed, 13 Oct 2004 09:44:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=63147 Change 63147 by rwatson@rwatson_tislabs on 2004/10/13 09:44:17 Integ changes from GENERIC to MAC. Affected files ... .. //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#54 integrate Differences ... ==== //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#54 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.402 2004/04/26 22:52:09 sobomax Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.418 2004/09/19 00:52:22 mjacob Exp $ machine i386 cpu I486_CPU @@ -38,7 +38,9 @@ options UFS_EXTATTR options UFS_EXTATTR_AUTOSTART -options SCHED_ULE # ULE scheduler +#options SCHED_ULE # ULE scheduler +options SCHED_4BSD # 4BSD scheduler +options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking options INET6 # IPv6 communications protocols options FFS # Berkeley Fast Filesystem @@ -53,6 +55,7 @@ options CD9660 # ISO 9660 Filesystem options PROCFS # Process filesystem (requires PSEUDOFS) options PSEUDOFS # Pseudo-filesystem framework +options GEOM_GPT # GUID Partition Tables. options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!] options COMPAT_FREEBSD4 # Compatible with FreeBSD4 options SCSI_DELAY=15000 # Delay (in ms) before probing SCSI @@ -66,12 +69,14 @@ # output. Adds ~128k to driver. options AHD_REG_PRETTY_PRINT # Print register bitfields in debug # output. Adds ~215k to driver. -options PFIL_HOOKS # pfil(9) framework +options ADAPTIVE_GIANT # Giant mutex is adaptive. # Debugging for use in -current +options KDB # Enable kernel debugger support. +options DDB # Support DDB. +options GDB # Support remote GDB. options ALT_BREAK_TO_DEBUGGER options BREAK_TO_DEBUGGER -options DDB # Enable the kernel debugger options INVARIANTS # Enable calls of extra sanity checking options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS options WITNESS # Enable checks to detect deadlocks and cycles @@ -104,6 +109,7 @@ device ahd # AHA39320/29320 and onboard AIC79xx devices device amd # AMD 53C974 (Tekram DC-390(T)) device isp # Qlogic family +#device ispfw # Firmware for QLogic HBAs- normally a module device mpt # LSI-Logic MPT-Fusion #device ncr # NCR/Symbios Logic device sym # NCR/Symbios Logic (newer chipsets + those of `ncr') @@ -176,7 +182,6 @@ # PCCARD (PCMCIA) support # PCMCIA and cardbus bridge support device cbb # cardbus (yenta) bridge -#device pcic # ExCA ISA and PCI bridges device pccard # PC Card (16-bit) bus device cardbus # CardBus (32-bit) bus @@ -199,26 +204,30 @@ # PCI Ethernet NICs. device de # DEC/Intel DC21x4x (``Tulip'') device em # Intel PRO/1000 adapter Gigabit Ethernet Card +device ixgb # Intel PRO/10GbE Ethernet Card device txp # 3Com 3cR990 (``Typhoon'') device vx # 3Com 3c590, 3c595 (``Vortex'') # PCI Ethernet NICs that use the common MII bus controller code. # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs! device miibus # MII bus support -device bfe # Broadcom BCM440x 10/100 ethernet +device bfe # Broadcom BCM440x 10/100 Ethernet device bge # Broadcom BCM570xx Gigabit Ethernet device dc # DEC/Intel 21143 and various workalikes device fxp # Intel EtherExpress PRO/100B (82557, 82558) +device lge # Level 1 LXT1001 gigabit ethernet +device nge # NatSemi DP83820 gigabit ethernet device pcn # AMD Am79C97x PCI 10/100 (precedence over 'lnc') device re # RealTek 8139C+/8169/8169S/8110S device rl # RealTek 8129/8139 device sf # Adaptec AIC-6915 (``Starfire'') device sis # Silicon Integrated Systems SiS 900/SiS 7016 -device sk # SysKonnect SK-984x & SK-982x gigabit ethernet +device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet device ste # Sundance ST201 (D-Link DFE-550TX) -device ti # Alteon Networks Tigon I/II gigabit ethernet +device ti # Alteon Networks Tigon I/II gigabit Ethernet device tl # Texas Instruments ThunderLAN device tx # SMC EtherPower II (83c170 ``EPIC'') +device vge # VIA VT612x gigabit ethernet device vr # VIA Rhine, Rhine II device wb # Winbond W89C840F device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') @@ -233,8 +242,8 @@ device fe # Fujitsu MB8696x based cards device ie # EtherExpress 8/16, 3C507, StarLAN 10 etc. device lnc # NE2100, NE32-VL Lance Ethernet cards -device sn # SMC's 9000 series of ethernet chips -device xe # Xircom pccard ethernet +device sn # SMC's 9000 series of Ethernet chips +device xe # Xircom pccard Ethernet # ISA devices that use the old ISA shims #device le @@ -246,9 +255,11 @@ device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. #device wl # Older non 802.11 Wavelan wireless NIC. -# Pseudo devices - the number indicates how many units to allocate. +# Pseudo devices. +device loop # Network loopback +device mem # Memory and kernel memory devices +device io # I/O device device random # Entropy device -device loop # Network loopback device ether # Ethernet support #device sl # Kernel SLIP #device ppp # Kernel PPP @@ -274,11 +285,11 @@ device urio # Diamond Rio 500 MP3 player device uscanner # Scanners # USB Ethernet, requires mii -device aue # ADMtek USB ethernet -device axe # ASIX Electronics USB ethernet -device cue # CATC USB ethernet -device kue # Kawasaki LSI USB ethernet -device rue # RealTek RTL8150 USB ethernet +device aue # ADMtek USB Ethernet +device axe # ASIX Electronics USB Ethernet +device cue # CATC USB Ethernet +device kue # Kawasaki LSI USB Ethernet +device rue # RealTek RTL8150 USB Ethernet # FireWire support device firewire # FireWire bus code From owner-p4-projects@FreeBSD.ORG Wed Oct 13 10:35:51 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 05C4E16A4D1; Wed, 13 Oct 2004 10:35:51 +0000 (GMT) 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 CCEA616A4CE for ; Wed, 13 Oct 2004 10:35:50 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BF7E143D49 for ; Wed, 13 Oct 2004 10:35:50 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9DAZoRO097062 for ; Wed, 13 Oct 2004 10:35:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9DAZoxe097059 for perforce@freebsd.org; Wed, 13 Oct 2004 10:35:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 13 Oct 2004 10:35:50 GMT Message-Id: <200410131035.i9DAZoxe097059@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 63149 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: Wed, 13 Oct 2004 10:35:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=63149 Change 63149 by rwatson@rwatson_tislabs on 2004/10/13 10:35:37 Include module.h to get the definition of module_t used in a function prototype in mac_policy.h. Probably a better way to get that definition. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_posix_sem.c#8 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac/mac_posix_sem.c#8 (text+ko) ==== @@ -39,6 +39,7 @@ #include #include #include +#include #include #include From owner-p4-projects@FreeBSD.ORG Wed Oct 13 11:19:44 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C0D016A4D1; Wed, 13 Oct 2004 11:19:44 +0000 (GMT) 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 EEC1716A4CE for ; Wed, 13 Oct 2004 11:19:43 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CFFC543D39 for ; Wed, 13 Oct 2004 11:19:43 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9DBJhAl098495 for ; Wed, 13 Oct 2004 11:19:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9DBJhKY098492 for perforce@freebsd.org; Wed, 13 Oct 2004 11:19:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 13 Oct 2004 11:19:43 GMT Message-Id: <200410131119.i9DBJhKY098492@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 63150 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: Wed, 13 Oct 2004 11:19:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=63150 Change 63150 by rwatson@rwatson_tislabs on 2004/10/13 11:19:18 When forcing entry to the debugger, use a DEBUGGER() macro to get there; if KDB is compiled into the kernel, use kdb_enter(), otherwise an advisory printf(). Eliminate some stragglin calls to Debugger() that pre-date the new kernel debugger infrastructure. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#135 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#135 (text+ko) ==== @@ -271,6 +271,12 @@ SYSCTL_INT(_security_mac_test, OID_AUTO, internalize_count, CTLFLAG_RD, &internalize_count, 0, "Subject/object internalize calls"); +#ifdef KDB +#define DEBUGGER(x) kdb_enter(x) +#else +#define DEBUGGER(x) printf("mac_test: %s\n", (x)) +#endif + /* * Policy module operations. */ @@ -482,9 +488,9 @@ atomic_add_int(&destroy_count_bpfdesc, 1); SLOT(label) = EXMAGIC; } else if (SLOT(label) == EXMAGIC) { - kdb_enter("mac_test_destroy_bpfdesc: dup destroy"); + DEBUGGER("mac_test_destroy_bpfdesc: dup destroy"); } else { - kdb_enter("mac_test_destroy_bpfdesc: corrupted label"); + DEBUGGER("mac_test_destroy_bpfdesc: corrupted label"); } } @@ -496,9 +502,9 @@ atomic_add_int(&destroy_count_cred, 1); SLOT(label) = EXMAGIC; } else if (SLOT(label) == EXMAGIC) { - kdb_enter("mac_test_destroy_cred: dup destroy"); + DEBUGGER("mac_test_destroy_cred: dup destroy"); } else { - kdb_enter("mac_test_destroy_cred: corrupted label"); + DEBUGGER("mac_test_destroy_cred: corrupted label"); } } @@ -510,9 +516,9 @@ atomic_add_int(&destroy_count_devfsdirent, 1); SLOT(label) = EXMAGIC; } else if (SLOT(label) == EXMAGIC) { - kdb_enter("mac_test_destroy_devfsdirent: dup destroy"); + DEBUGGER("mac_test_destroy_devfsdirent: dup destroy"); } else { - kdb_enter("mac_test_destroy_devfsdirent: corrupted label"); + DEBUGGER("mac_test_destroy_devfsdirent: corrupted label"); } } @@ -524,9 +530,9 @@ atomic_add_int(&destroy_count_ifnet, 1); SLOT(label) = EXMAGIC; } else if (SLOT(label) == EXMAGIC) { - kdb_enter("mac_test_destroy_ifnet: dup destroy"); + DEBUGGER("mac_test_destroy_ifnet: dup destroy"); } else { - kdb_enter("mac_test_destroy_ifnet: corrupted label"); + DEBUGGER("mac_test_destroy_ifnet: corrupted label"); } } @@ -538,9 +544,9 @@ atomic_add_int(&destroy_count_inpcb, 1); SLOT(label) = EXMAGIC; } else if (SLOT(label) == EXMAGIC) { - kdb_enter("mac_test_destroy_inpcb: dup destroy"); + DEBUGGER("mac_test_destroy_inpcb: dup destroy"); } else { - kdb_enter("mac_test_destroy_inpcb: corrupted label"); + DEBUGGER("mac_test_destroy_inpcb: corrupted label"); } } @@ -552,9 +558,9 @@ atomic_add_int(&destroy_count_ipc_msg, 1); SLOT(label) = EXMAGIC; } else if (SLOT(label) == EXMAGIC) { - Debugger("mac_test_destroy_ipc_msgmsg_label: dup destroy"); + DEBUGGER("mac_test_destroy_ipc_msgmsg_label: dup destroy"); } else { - Debugger("mac_test_destroy_ipc_msgmsg_label: corrupted label"); + DEBUGGER("mac_test_destroy_ipc_msgmsg_label: corrupted label"); } } @@ -566,9 +572,9 @@ atomic_add_int(&destroy_count_ipc_msq, 1); SLOT(label) = EXMAGIC; } else if (SLOT(label) == EXMAGIC) { - Debugger("mac_test_destroy_ipc_msgqueue_label: dup destroy"); + DEBUGGER("mac_test_destroy_ipc_msgqueue_label: dup destroy"); } else { - Debugger("mac_test_destroy_ipc_msgqueue_label: corrupted label"); + DEBUGGER("mac_test_destroy_ipc_msgqueue_label: corrupted label"); } } @@ -580,9 +586,9 @@ atomic_add_int(&destroy_count_ipc_sema, 1); SLOT(label) = EXMAGIC; } else if (SLOT(label) == EXMAGIC) { - Debugger("mac_test_destroy_ipc_sema_label: dup destroy"); + DEBUGGER("mac_test_destroy_ipc_sema_label: dup destroy"); } else { - Debugger("mac_test_destroy_ipc_sema_label: corrupted label"); + DEBUGGER("mac_test_destroy_ipc_sema_label: corrupted label"); } } @@ -594,9 +600,9 @@ atomic_add_int(&destroy_count_ipc_shm, 1); SLOT(label) = EXMAGIC; } else if (SLOT(label) == EXMAGIC) { - Debugger("mac_test_destroy_ipc_shm_label: dup destroy"); + DEBUGGER("mac_test_destroy_ipc_shm_label: dup destroy"); } else { - Debugger("mac_test_destroy_ipc_shm_label: corrupted label"); + DEBUGGER("mac_test_destroy_ipc_shm_label: corrupted label"); } } @@ -608,9 +614,9 @@ atomic_add_int(&destroy_count_ipq, 1); SLOT(label) = EXMAGIC; } else if (SLOT(label) == EXMAGIC) { - kdb_enter("mac_test_destroy_ipq: dup destroy"); + DEBUGGER("mac_test_destroy_ipq: dup destroy"); } else { - kdb_enter("mac_test_destroy_ipq: corrupted label"); + DEBUGGER("mac_test_destroy_ipq: corrupted label"); } } @@ -630,9 +636,9 @@ atomic_add_int(&destroy_count_mbuf, 1); SLOT(label) = EXMAGIC; } else if (SLOT(label) == EXMAGIC) { - kdb_enter("mac_test_destroy_mbuf: dup destroy"); + DEBUGGER("mac_test_destroy_mbuf: dup destroy"); } else { - kdb_enter("mac_test_destroy_mbuf: corrupted label"); + DEBUGGER("mac_test_destroy_mbuf: corrupted label"); } } @@ -644,9 +650,9 @@ atomic_add_int(&destroy_count_mount, 1); SLOT(label) = EXMAGIC; } else if (SLOT(label) == EXMAGIC) { - kdb_enter("mac_test_destroy_mount: dup destroy"); + DEBUGGER("mac_test_destroy_mount: dup destroy"); } else { - kdb_enter("mac_test_destroy_mount: corrupted label"); + DEBUGGER("mac_test_destroy_mount: corrupted label"); } } @@ -658,9 +664,9 @@ atomic_add_int(&destroy_count_mount_fslabel, 1); SLOT(label) = EXMAGIC; } else if (SLOT(label) == EXMAGIC) { - kdb_enter("mac_test_destroy_mount_fslabel: dup destroy"); + DEBUGGER("mac_test_destroy_mount_fslabel: dup destroy"); } else { - kdb_enter("mac_test_destroy_mount_fslabel: corrupted label"); + DEBUGGER("mac_test_destroy_mount_fslabel: corrupted label"); } } @@ -672,9 +678,9 @@ atomic_add_int(&destroy_count_socket, 1); SLOT(label) = EXMAGIC; } else if (SLOT(label) == EXMAGIC) { - kdb_enter("mac_test_destroy_socket: dup destroy"); + DEBUGGER("mac_test_destroy_socket: dup destroy"); } else { - kdb_enter("mac_test_destroy_socket: corrupted label"); + DEBUGGER("mac_test_destroy_socket: corrupted label"); } } @@ -686,9 +692,9 @@ atomic_add_int(&destroy_count_socket_peerlabel, 1); SLOT(label) = EXMAGIC; } else if (SLOT(label) == EXMAGIC) { - kdb_enter("mac_test_destroy_socket_peerlabel: dup destroy"); + DEBUGGER("mac_test_destroy_socket_peerlabel: dup destroy"); } else { - kdb_enter("mac_test_destroy_socket_peerlabel: corrupted label"); + DEBUGGER("mac_test_destroy_socket_peerlabel: corrupted label"); } } @@ -700,9 +706,9 @@ atomic_add_int(&destroy_count_pipe, 1); SLOT(label) = EXMAGIC; } else if (SLOT(label) == EXMAGIC) { - kdb_enter("mac_test_destroy_pipe: dup destroy"); + DEBUGGER("mac_test_destroy_pipe: dup destroy"); } else { - kdb_enter("mac_test_destroy_pipe: corrupted label"); + DEBUGGER("mac_test_destroy_pipe: corrupted label"); } } @@ -714,9 +720,9 @@ atomic_add_int(&destroy_count_posixsems, 1); SLOT(label) = EXMAGIC; } else if (SLOT(label) == EXMAGIC) { - Debugger("mac_test_destroy_posix_ksem: dup destroy"); + DEBUGGER("mac_test_destroy_posix_ksem: dup destroy"); } else { - Debugger("mac_test_destroy_posix_ksem: corrupted label"); + DEBUGGER("mac_test_destroy_posix_ksem: corrupted label"); } } @@ -728,9 +734,9 @@ atomic_add_int(&destroy_count_proc, 1); SLOT(label) = EXMAGIC; } else if (SLOT(label) == EXMAGIC) { - kdb_enter("mac_test_destroy_proc: dup destroy"); + DEBUGGER("mac_test_destroy_proc: dup destroy"); } else { - kdb_enter("mac_test_destroy_proc: corrupted label"); + DEBUGGER("mac_test_destroy_proc: corrupted label"); } } @@ -742,9 +748,9 @@ atomic_add_int(&destroy_count_vnode, 1); SLOT(label) = EXMAGIC; } else if (SLOT(label) == EXMAGIC) { - kdb_enter("mac_test_destroy_vnode: dup destroy"); + DEBUGGER("mac_test_destroy_vnode: dup destroy"); } else { - kdb_enter("mac_test_destroy_vnode: corrupted label"); + DEBUGGER("mac_test_destroy_vnode: corrupted label"); } } From owner-p4-projects@FreeBSD.ORG Wed Oct 13 11:49:20 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 49C0B16A4D1; Wed, 13 Oct 2004 11:49:20 +0000 (GMT) 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 D597816A4CF for ; Wed, 13 Oct 2004 11:49:19 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B2F7B43D1F for ; Wed, 13 Oct 2004 11:49:19 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9DBnJga099531 for ; Wed, 13 Oct 2004 11:49:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9DBnJd7099528 for perforce@freebsd.org; Wed, 13 Oct 2004 11:49:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 13 Oct 2004 11:49:19 GMT Message-Id: <200410131149.i9DBnJd7099528@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 63151 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: Wed, 13 Oct 2004 11:49:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=63151 Change 63151 by rwatson@rwatson_tislabs on 2004/10/13 11:48:55 An 'error' variable has been introduced, so MAC doesn't need to declare its own. Affected files ... .. //depot/projects/trustedbsd/mac/sys/net/if_spppsubr.c#21 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/net/if_spppsubr.c#21 (text+ko) ==== @@ -749,9 +749,6 @@ int s, error, rv = 0; int ipproto = PPP_IP; int debug = ifp->if_flags & IFF_DEBUG; -#ifdef MAC - int error; -#endif s = splimp(); From owner-p4-projects@FreeBSD.ORG Wed Oct 13 12:22:00 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D8B2316A4D1; Wed, 13 Oct 2004 12:21:59 +0000 (GMT) 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 7B0AE16A4CE for ; Wed, 13 Oct 2004 12:21:59 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4E42043D3F for ; Wed, 13 Oct 2004 12:21:59 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9DCLxB0001272 for ; Wed, 13 Oct 2004 12:21:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9DCLw2d001269 for perforce@freebsd.org; Wed, 13 Oct 2004 12:21:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 13 Oct 2004 12:21:58 GMT Message-Id: <200410131221.i9DCLw2d001269@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 63152 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: Wed, 13 Oct 2004 12:22:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=63152 Change 63152 by rwatson@rwatson_tislabs on 2004/10/13 12:21:16 Merge McAfee Research change made to System V IPC MAC support on SEDarwin: rename System V IPC MAC Framework entry points and policy entry points to use _sysv_ instead of _ipc_ to make it more clear when System V vs Posix or Mach IPC are in use. Submitted by: cvance Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/sysv_msg.c#25 edit .. //depot/projects/trustedbsd/mac/sys/kern/sysv_sem.c#28 edit .. //depot/projects/trustedbsd/mac/sys/kern/sysv_shm.c#25 edit .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_sysv_msg.c#9 edit .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_sysv_sem.c#9 edit .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_sysv_shm.c#8 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#246 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#87 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#200 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_stub/mac_stub.c#23 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#136 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#262 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#217 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/sysv_msg.c#25 (text+ko) ==== @@ -194,7 +194,7 @@ msghdrs[i-1].msg_next = &msghdrs[i]; msghdrs[i].msg_next = NULL; #ifdef MAC - mac_init_ipc_msgmsg(&msghdrs[i]); + mac_init_sysv_msgmsg(&msghdrs[i]); #endif } free_msghdrs = &msghdrs[0]; @@ -207,7 +207,7 @@ msqids[i].u.msg_perm.seq = 0; /* reset to a known value */ msqids[i].u.msg_perm.mode = 0; #ifdef MAC - mac_init_ipc_msgqueue(&msqids[i]); + mac_init_sysv_msgqueue(&msqids[i]); #endif } mtx_init(&msq_mtx, "msq", NULL, MTX_DEF); @@ -243,10 +243,10 @@ int i; /* Clean up the MAC label associated with the msg objects. */ for (i = 0; i < msginfo.msgtql; i++) - mac_destroy_ipc_msgmsg(&msghdrs[i]); + mac_destroy_sysv_msgmsg(&msghdrs[i]); /* Clean up the MAC label associated with the msq objects. */ for (msqid = 0; msqid < msginfo.msgmni; msqid++) - mac_destroy_ipc_msgqueue(&msqids[msqid]); + mac_destroy_sysv_msgqueue(&msqids[msqid]); #endif free(msgpool, M_MSG); free(msgmaps, M_MSG); @@ -347,7 +347,7 @@ free_msghdrs = msghdr; #ifdef MAC /* XXX: Reset the MAC label */ - mac_cleanup_ipc_msgmsg(msghdr); + mac_cleanup_sysv_msgmsg(msghdr); #endif } @@ -403,9 +403,9 @@ goto done2; } #ifdef MAC - if ((error = mac_check_ipc_msqctl(td->td_ucred,msqkptr,cmd))) { + if ((error = mac_check_sysv_msqctl(td->td_ucred,msqkptr,cmd))) { MPRINTF(( - "MAC Framework: mac_check_ipc_msqctl permission denied!\n")); + "MAC Framework: mac_check_sysv_msqctl permission denied!\n")); goto done2; } #endif @@ -433,10 +433,10 @@ */ msghdr = msqkptr->u.msg_first; while (msghdr != NULL) { - if ((error = mac_check_ipc_msgrmid(td->td_ucred, + if ((error = mac_check_sysv_msgrmid(td->td_ucred, msghdr))) { MPRINTF( - "MAC Framework: mac_check_ipc_msgrmid permission denied\n"); + "MAC Framework: mac_check_sysv_msgrmid permission denied\n"); /* XXX wakeup(msqkptr); ??? */ goto done2; } @@ -466,7 +466,7 @@ #ifdef MAC /* XXX: Reset the MAC label */ - mac_cleanup_ipc_msgqueue(msqkptr); + mac_cleanup_sysv_msgqueue(msqkptr); #endif wakeup(msqkptr); @@ -570,9 +570,9 @@ goto done2; } #ifdef MAC - if ((error = mac_check_ipc_msqget(cred, msqkptr))) { + if ((error = mac_check_sysv_msqget(cred, msqkptr))) { MPRINTF( - "MAC Framework: mac_check_ipc_msqget access denied\n"); + "MAC Framework: mac_check_sysv_msqget access denied\n"); goto done2; } #endif @@ -619,7 +619,7 @@ msqkptr->u.msg_rtime = 0; msqkptr->u.msg_ctime = time_second; #ifdef MAC - mac_create_ipc_msgqueue(cred, msqkptr); + mac_create_sysv_msgqueue(cred, msqkptr); #endif } else { DPRINTF(("didn't find it and wasn't asked to create it\n")); @@ -698,9 +698,9 @@ * Make sure that the thread has access rights to the message * queue. */ - if ((error = mac_check_ipc_msqsnd(td->td_ucred, msqkptr))) { + if ((error = mac_check_sysv_msqsnd(td->td_ucred, msqkptr))) { MPRINTF(( -"MAC Framework: mac_check_ipc_msqsnd permission denied\n")); +"MAC Framework: mac_check_sysv_msqsnd permission denied\n")); goto done2; } #endif @@ -819,9 +819,9 @@ msghdr->msg_spot = -1; msghdr->msg_ts = msgsz; #ifdef MAC - mac_create_ipc_msgmsg(td->td_ucred, msqkptr, msghdr); + mac_create_sysv_msgmsg(td->td_ucred, msqkptr, msghdr); /* - * XXX: Should the mac_check_ipc_msgmsq check follow here + * XXX: Should the mac_check_sysv_msgmsq check follow here * immediately? Or, should it be checked just before the msg is * enqueued in the msgq (as it is done now)? */ @@ -939,16 +939,16 @@ * Note: Since the task/thread allocates the msghdr and usually * primes it with its own MAC label,for a majority of policies, it * won't be necessary to check whether the msghdr has access - * permissions to the msgq. The mac_check_ipc_msqsnd check would + * permissions to the msgq. The mac_check_sysv_msqsnd check would * suffice in that case. However, this hook may be required where * individual policies derive a non-identical label for the msghdr * from the current thread label and may want to check the msghdr * enqueue permissions, along with read/write permissions to the * msgq. */ - if ((error = mac_check_ipc_msgmsq(td->td_ucred,msghdr,msqkptr))) { + if ((error = mac_check_sysv_msgmsq(td->td_ucred,msghdr,msqkptr))) { MPRINTF(( - "MAC Framework: mac_check_ipc_msqmsq permission denied\n")); + "MAC Framework: mac_check_sysv_msqmsq permission denied\n")); msg_freehdr(msghdr); wakeup(msqkptr); goto done2; @@ -1041,9 +1041,9 @@ /* * Make sure that the thread has access rights to the message queue. */ - if ((error = mac_check_ipc_msqrcv(td->td_ucred, msqkptr))) { + if ((error = mac_check_sysv_msqrcv(td->td_ucred, msqkptr))) { MPRINTF(( -"MAC Framework: mac_check_ipc_msqrcv permission denied\n")); +"MAC Framework: mac_check_sysv_msqrcv permission denied\n")); goto done2; } #endif @@ -1066,10 +1066,10 @@ * Make sure that the thread has access * rights to the message header. */ - if ((error = mac_check_ipc_msgrcv(td->td_ucred, + if ((error = mac_check_sysv_msgrcv(td->td_ucred, msghdr))) { MPRINTF(( - "MAC Framework: mac_check_ipc_msgrcv permission denied\n")); + "MAC Framework: mac_check_sysv_msgrcv permission denied\n")); goto done2; } #endif @@ -1119,10 +1119,10 @@ * header. */ if ((error = - mac_check_ipc_msgrcv(td->td_ucred, + mac_check_sysv_msgrcv(td->td_ucred, msghdr))) { MPRINTF(( - "MAC Framework: mac_check_ipc_msgrcv permission denied\n")); + "MAC Framework: mac_check_sysv_msgrcv permission denied\n")); goto done2; } #endif ==== //depot/projects/trustedbsd/mac/sys/kern/sysv_sem.c#28 (text+ko) ==== @@ -208,7 +208,7 @@ sema[i].u.sem_perm.mode = 0; sema[i].u.sem_perm.seq = 0; #ifdef MAC - mac_init_ipc_sema(&sema[i]); + mac_init_sysv_sema(&sema[i]); #endif } for (i = 0; i < seminfo.semmni; i++) @@ -234,7 +234,7 @@ EVENTHANDLER_DEREGISTER(process_exit, semexit_tag); #ifdef MAC for (i = 0; i < seminfo.semmni; i++) - mac_destroy_ipc_sema(&sema[i]); + mac_destroy_sysv_sema(&sema[i]); #endif free(sem, M_SEM); free(sema, M_SEM); @@ -551,9 +551,9 @@ if ((error = ipcperm(td, &semakptr->u.sem_perm, IPC_R))) goto done2; #ifdef MAC - if ((error = mac_check_ipc_semctl(cred, semakptr, cmd))) { + if ((error = mac_check_sysv_semctl(cred, semakptr, cmd))) { MPRINTF(( - "MAC Framework: mac_check_ipc_semctl access denied\n")); + "MAC Framework: mac_check_sysv_semctl access denied\n")); goto done2; } #endif @@ -574,9 +574,9 @@ sema_mtxp = &sema_mtx[semid]; #ifdef MAC mtx_lock(sema_mtxp); - if ((error = mac_check_ipc_semctl(cred, semakptr, cmd))) { + if ((error = mac_check_sysv_semctl(cred, semakptr, cmd))) { MPRINTF(( - "MAC Framework: mac_check_ipc_semctl access denied\n")); + "MAC Framework: mac_check_sysv_semctl access denied\n")); goto done2; } mtx_unlock(sema_mtxp); @@ -604,7 +604,7 @@ } semakptr->u.sem_perm.mode = 0; #ifdef MAC - mac_cleanup_ipc_sema(semakptr); + mac_cleanup_sysv_sema(semakptr); #endif SEMUNDO_LOCK(); semundo_clear(semid, -1); @@ -838,10 +838,10 @@ goto done2; } #ifdef MAC - if ((error = mac_check_ipc_semget(cred, + if ((error = mac_check_sysv_semget(cred, &sema[semid]))) { MPRINTF(( - "MAC Framework: mac_check_ipc_semget access denied\n")); + "MAC Framework: mac_check_sysv_semget access denied\n")); goto done2; } #endif @@ -890,7 +890,7 @@ bzero(sema[semid].u.sem_base, sizeof(sema[semid].u.sem_base[0])*nsems); #ifdef MAC - mac_create_ipc_sema(cred, &sema[semid]); + mac_create_sysv_sema(cred, &sema[semid]); #endif DPRINTF(("sembase = 0x%x, next = 0x%x\n", sema[semid].u.sem_base, &sem[semtot])); @@ -1004,9 +1004,9 @@ * write) permissions to the semaphore array based on the * sopptr->sem_op value. */ - if ((error = mac_check_ipc_semop(td->td_ucred, semakptr, j))) { + if ((error = mac_check_sysv_semop(td->td_ucred, semakptr, j))) { MPRINTF(( - "MAC Framework: mac_check_ipc_semop access denied\n")); + "MAC Framework: mac_check_sysv_semop access denied\n")); goto done2; } #endif ==== //depot/projects/trustedbsd/mac/sys/kern/sysv_shm.c#25 (text+ko) ==== @@ -222,7 +222,7 @@ shmseg->u.shm_perm.mode = SHMSEG_FREE; #ifdef MAC /* Reset the MAC label */ - mac_cleanup_ipc_shm(shmseg); + mac_cleanup_sysv_shm(shmseg); #endif } @@ -295,9 +295,9 @@ */ struct shmid_kernel *shmsegptr; shmsegptr = &shmsegs[IPCID_TO_IX(shmmap_s->shmid)]; - if ((error = mac_check_ipc_shmdt(td->td_ucred, shmsegptr))) { + if ((error = mac_check_sysv_shmdt(td->td_ucred, shmsegptr))) { MPRINTF(( - "MAC Framework: mac_check_ipc_shmdt access denied\n")); + "MAC Framework: mac_check_sysv_shmdt access denied\n")); goto done2; } #endif @@ -356,9 +356,9 @@ if (error) goto done2; #ifdef MAC - if ((error = mac_check_ipc_shmat(td->td_ucred, shmseg, shmflg))) { + if ((error = mac_check_sysv_shmat(td->td_ucred, shmseg, shmflg))) { MPRINTF(( - "MAC Framework: mac_check_ipc_shmat access denied\n")); + "MAC Framework: mac_check_sysv_shmat access denied\n")); goto done2; } #endif @@ -476,9 +476,9 @@ if (error) goto done2; #ifdef MAC - if ((error = mac_check_ipc_shmctl(td->td_ucred, shmseg, uap->cmd))) { + if ((error = mac_check_sysv_shmctl(td->td_ucred, shmseg, uap->cmd))) { MPRINTF(( - "MAC Framework: mac_check_ipc_shmctl access denied\n")); + "MAC Framework: mac_check_sysv_shmctl access denied\n")); goto done2; } #endif @@ -564,9 +564,9 @@ goto done2; } #ifdef MAC - if ((error = mac_check_ipc_shmctl(td->td_ucred, shmseg, cmd))) { + if ((error = mac_check_sysv_shmctl(td->td_ucred, shmseg, cmd))) { MPRINTF(( - "MAC Framework: mac_check_ipc_shmctl access denied\n")); + "MAC Framework: mac_check_sysv_shmctl access denied\n")); goto done2; } #endif @@ -694,9 +694,9 @@ return (EEXIST); error = ipcperm(td, &shmseg->u.shm_perm, mode); #ifdef MAC - if ((error = mac_check_ipc_shmget(td->td_ucred,shmseg,uap->shmflg))) { + if ((error = mac_check_sysv_shmget(td->td_ucred,shmseg,uap->shmflg))) { MPRINTF(( - "MAC Framework: mac_check_ipc_shmget access denied\n")); + "MAC Framework: mac_check_sysv_shmget access denied\n")); } #endif if (error) @@ -775,7 +775,7 @@ shmseg->u.shm_lpid = shmseg->u.shm_nattch = 0; shmseg->u.shm_atime = shmseg->u.shm_dtime = 0; #ifdef MAC - mac_create_ipc_shm(cred, shmseg); + mac_create_sysv_shm(cred, shmseg); #endif shmseg->u.shm_ctime = time_second; shm_committed += btoc(size); @@ -913,7 +913,7 @@ shmsegs[i].u.shm_perm.mode = SHMSEG_FREE; shmsegs[i].u.shm_perm.seq = 0; #ifdef MAC - mac_init_ipc_shm(&shmsegs[i]); + mac_init_sysv_shm(&shmsegs[i]); #endif } free(shmsegs, M_SHM); @@ -945,7 +945,7 @@ shmsegs[i].u.shm_perm.mode = SHMSEG_FREE; shmsegs[i].u.shm_perm.seq = 0; #ifdef MAC - mac_init_ipc_shm(&shmsegs[i]); + mac_init_sysv_shm(&shmsegs[i]); #endif } shm_last_free = 0; @@ -967,7 +967,7 @@ #ifdef MAC for (i = 0; i < shmalloced; i++) - mac_destroy_ipc_shm(&shmsegs[i]); + mac_destroy_sysv_shm(&shmsegs[i]); #endif free(shmsegs, M_SHM); shmexit_hook = NULL; ==== //depot/projects/trustedbsd/mac/sys/security/mac/mac_sysv_msg.c#9 (text+ko) ==== @@ -68,108 +68,108 @@ #endif static struct label * -mac_ipc_msgmsg_label_alloc(void) +mac_sysv_msgmsg_label_alloc(void) { struct label *label; label = mac_labelzone_alloc(M_WAITOK); - MAC_PERFORM(init_ipc_msgmsg_label, label); + MAC_PERFORM(init_sysv_msgmsg_label, label); MAC_DEBUG_COUNTER_INC(&nmacipcmsgs); return (label); } void -mac_init_ipc_msgmsg(struct msg *msgptr) +mac_init_sysv_msgmsg(struct msg *msgptr) { - msgptr->label = mac_ipc_msgmsg_label_alloc(); + msgptr->label = mac_sysv_msgmsg_label_alloc(); } static struct label * -mac_ipc_msgqueue_label_alloc(void) +mac_sysv_msgqueue_label_alloc(void) { struct label *label; label = mac_labelzone_alloc(M_WAITOK); - MAC_PERFORM(init_ipc_msgqueue_label, label); + MAC_PERFORM(init_sysv_msgqueue_label, label); MAC_DEBUG_COUNTER_INC(&nmacipcmsqs); return (label); } void -mac_init_ipc_msgqueue(struct msqid_kernel *msqkptr) +mac_init_sysv_msgqueue(struct msqid_kernel *msqkptr) { - msqkptr->label = mac_ipc_msgqueue_label_alloc(); + msqkptr->label = mac_sysv_msgqueue_label_alloc(); msqkptr->label = NULL; } static void -mac_ipc_msgmsg_label_free(struct label *label) +mac_sysv_msgmsg_label_free(struct label *label) { - MAC_PERFORM(destroy_ipc_msgmsg_label, label); + MAC_PERFORM(destroy_sysv_msgmsg_label, label); mac_labelzone_free(label); MAC_DEBUG_COUNTER_DEC(&nmacipcmsgs); } void -mac_destroy_ipc_msgmsg(struct msg *msgptr) +mac_destroy_sysv_msgmsg(struct msg *msgptr) { - mac_ipc_msgmsg_label_free(msgptr->label); + mac_sysv_msgmsg_label_free(msgptr->label); msgptr->label = NULL; } static void -mac_ipc_msgqueue_label_free(struct label *label) +mac_sysv_msgqueue_label_free(struct label *label) { - MAC_PERFORM(destroy_ipc_msgqueue_label, label); + MAC_PERFORM(destroy_sysv_msgqueue_label, label); mac_labelzone_free(label); MAC_DEBUG_COUNTER_DEC(&nmacipcmsqs); } void -mac_destroy_ipc_msgqueue(struct msqid_kernel *msqkptr) +mac_destroy_sysv_msgqueue(struct msqid_kernel *msqkptr) { - mac_ipc_msgqueue_label_free(msqkptr->label); + mac_sysv_msgqueue_label_free(msqkptr->label); msqkptr->label = NULL; } void -mac_create_ipc_msgmsg(struct ucred *cred, struct msqid_kernel *msqkptr, +mac_create_sysv_msgmsg(struct ucred *cred, struct msqid_kernel *msqkptr, struct msg *msgptr) { - MAC_PERFORM(create_ipc_msgmsg, cred, msqkptr, msqkptr->label, + MAC_PERFORM(create_sysv_msgmsg, cred, msqkptr, msqkptr->label, msgptr, msgptr->label); } void -mac_create_ipc_msgqueue(struct ucred *cred, struct msqid_kernel *msqkptr) +mac_create_sysv_msgqueue(struct ucred *cred, struct msqid_kernel *msqkptr) { - MAC_PERFORM(create_ipc_msgqueue, cred, msqkptr, msqkptr->label); + MAC_PERFORM(create_sysv_msgqueue, cred, msqkptr, msqkptr->label); } void -mac_cleanup_ipc_msgmsg(struct msg *msgptr) +mac_cleanup_sysv_msgmsg(struct msg *msgptr) { - MAC_PERFORM(cleanup_ipc_msgmsg, msgptr->label); + MAC_PERFORM(cleanup_sysv_msgmsg, msgptr->label); } void -mac_cleanup_ipc_msgqueue(struct msqid_kernel *msqkptr) +mac_cleanup_sysv_msgqueue(struct msqid_kernel *msqkptr) { - MAC_PERFORM(cleanup_ipc_msgqueue, msqkptr->label); + MAC_PERFORM(cleanup_sysv_msgqueue, msqkptr->label); } int -mac_check_ipc_msgmsq(struct ucred *cred, struct msg *msgptr, +mac_check_sysv_msgmsq(struct ucred *cred, struct msg *msgptr, struct msqid_kernel *msqkptr) { int error; @@ -177,79 +177,79 @@ if (!mac_enforce_sysv_msg) return (0); - MAC_CHECK(check_ipc_msgmsq, cred, msgptr, msgptr->label, msqkptr, + MAC_CHECK(check_sysv_msgmsq, cred, msgptr, msgptr->label, msqkptr, msqkptr->label); return(error); } int -mac_check_ipc_msgrcv(struct ucred *cred, struct msg *msgptr) +mac_check_sysv_msgrcv(struct ucred *cred, struct msg *msgptr) { int error; if (!mac_enforce_sysv_msg) return (0); - MAC_CHECK(check_ipc_msgrcv, cred, msgptr, msgptr->label); + MAC_CHECK(check_sysv_msgrcv, cred, msgptr, msgptr->label); return(error); } int -mac_check_ipc_msgrmid(struct ucred *cred, struct msg *msgptr) +mac_check_sysv_msgrmid(struct ucred *cred, struct msg *msgptr) { int error; if (!mac_enforce_sysv_msg) return (0); - MAC_CHECK(check_ipc_msgrmid, cred, msgptr, msgptr->label); + MAC_CHECK(check_sysv_msgrmid, cred, msgptr, msgptr->label); return(error); } int -mac_check_ipc_msqget(struct ucred *cred, struct msqid_kernel *msqkptr) +mac_check_sysv_msqget(struct ucred *cred, struct msqid_kernel *msqkptr) { int error; if (!mac_enforce_sysv_msg) return (0); - MAC_CHECK(check_ipc_msqget, cred, msqkptr, msqkptr->label); + MAC_CHECK(check_sysv_msqget, cred, msqkptr, msqkptr->label); return(error); } int -mac_check_ipc_msqsnd(struct ucred *cred, struct msqid_kernel *msqkptr) +mac_check_sysv_msqsnd(struct ucred *cred, struct msqid_kernel *msqkptr) { int error; if (!mac_enforce_sysv_msg) return (0); - MAC_CHECK(check_ipc_msqsnd, cred, msqkptr, msqkptr->label); + MAC_CHECK(check_sysv_msqsnd, cred, msqkptr, msqkptr->label); return(error); } int -mac_check_ipc_msqrcv(struct ucred *cred, struct msqid_kernel *msqkptr) +mac_check_sysv_msqrcv(struct ucred *cred, struct msqid_kernel *msqkptr) { int error; if (!mac_enforce_sysv_msg) return (0); - MAC_CHECK(check_ipc_msqrcv, cred, msqkptr, msqkptr->label); + MAC_CHECK(check_sysv_msqrcv, cred, msqkptr, msqkptr->label); return(error); } int -mac_check_ipc_msqctl(struct ucred *cred, struct msqid_kernel *msqkptr, +mac_check_sysv_msqctl(struct ucred *cred, struct msqid_kernel *msqkptr, int cmd) { int error; @@ -257,7 +257,7 @@ if (!mac_enforce_sysv_msg) return (0); - MAC_CHECK(check_ipc_msqctl, cred, msqkptr, msqkptr->label, cmd); + MAC_CHECK(check_sysv_msqctl, cred, msqkptr, msqkptr->label, cmd); return(error); } ==== //depot/projects/trustedbsd/mac/sys/security/mac/mac_sysv_sem.c#9 (text+ko) ==== @@ -65,56 +65,56 @@ #endif static struct label * -mac_ipc_sema_label_alloc(void) +mac_sysv_sema_label_alloc(void) { struct label *label; label = mac_labelzone_alloc(M_WAITOK); - MAC_PERFORM(init_ipc_sema_label, label); + MAC_PERFORM(init_sysv_sema_label, label); MAC_DEBUG_COUNTER_INC(&nmacipcsemas); return (label); } void -mac_init_ipc_sema(struct semid_kernel *semakptr) +mac_init_sysv_sema(struct semid_kernel *semakptr) { - semakptr->label = mac_ipc_sema_label_alloc(); + semakptr->label = mac_sysv_sema_label_alloc(); } static void -mac_ipc_sema_label_free(struct label *label) +mac_sysv_sema_label_free(struct label *label) { - MAC_PERFORM(destroy_ipc_sema_label, label); + MAC_PERFORM(destroy_sysv_sema_label, label); mac_labelzone_free(label); MAC_DEBUG_COUNTER_DEC(&nmacipcsemas); } void -mac_destroy_ipc_sema(struct semid_kernel *semakptr) +mac_destroy_sysv_sema(struct semid_kernel *semakptr) { - mac_ipc_sema_label_free(semakptr->label); + mac_sysv_sema_label_free(semakptr->label); semakptr->label = NULL; } void -mac_create_ipc_sema(struct ucred *cred, struct semid_kernel *semakptr) +mac_create_sysv_sema(struct ucred *cred, struct semid_kernel *semakptr) { - MAC_PERFORM(create_ipc_sema, cred, semakptr, semakptr->label); + MAC_PERFORM(create_sysv_sema, cred, semakptr, semakptr->label); } void -mac_cleanup_ipc_sema(struct semid_kernel *semakptr) +mac_cleanup_sysv_sema(struct semid_kernel *semakptr) { - MAC_PERFORM(cleanup_ipc_sema, semakptr->label); + MAC_PERFORM(cleanup_sysv_sema, semakptr->label); } int -mac_check_ipc_semctl(struct ucred *cred, struct semid_kernel *semakptr, +mac_check_sysv_semctl(struct ucred *cred, struct semid_kernel *semakptr, int cmd) { int error; @@ -122,26 +122,26 @@ if (!mac_enforce_sysv_sem) return (0); - MAC_CHECK(check_ipc_semctl, cred, semakptr, semakptr->label, cmd); + MAC_CHECK(check_sysv_semctl, cred, semakptr, semakptr->label, cmd); return(error); } int -mac_check_ipc_semget(struct ucred *cred, struct semid_kernel *semakptr) +mac_check_sysv_semget(struct ucred *cred, struct semid_kernel *semakptr) { int error; if (!mac_enforce_sysv_sem) return (0); - MAC_CHECK(check_ipc_semget, cred, semakptr, semakptr->label); + MAC_CHECK(check_sysv_semget, cred, semakptr, semakptr->label); return(error); } int -mac_check_ipc_semop(struct ucred *cred, struct semid_kernel *semakptr, +mac_check_sysv_semop(struct ucred *cred, struct semid_kernel *semakptr, size_t accesstype) { int error; @@ -149,7 +149,7 @@ if (!mac_enforce_sysv_sem) return (0); - MAC_CHECK(check_ipc_semop, cred, semakptr, semakptr->label, + MAC_CHECK(check_sysv_semop, cred, semakptr, semakptr->label, accesstype); return(error); ==== //depot/projects/trustedbsd/mac/sys/security/mac/mac_sysv_shm.c#8 (text+ko) ==== @@ -66,56 +66,56 @@ #endif static struct label * -mac_ipc_shm_label_alloc(void) +mac_sysv_shm_label_alloc(void) { struct label *label; label = mac_labelzone_alloc(M_WAITOK); - MAC_PERFORM(init_ipc_shm_label, label); + MAC_PERFORM(init_sysv_shm_label, label); MAC_DEBUG_COUNTER_INC(&nmacipcshms); return (label); } void -mac_init_ipc_shm(struct shmid_kernel *shmsegptr) +mac_init_sysv_shm(struct shmid_kernel *shmsegptr) { - shmsegptr->label = mac_ipc_shm_label_alloc(); + shmsegptr->label = mac_sysv_shm_label_alloc(); } static void -mac_ipc_shm_label_free(struct label *label) +mac_sysv_shm_label_free(struct label *label) { - MAC_PERFORM(destroy_ipc_shm_label, label); + MAC_PERFORM(destroy_sysv_shm_label, label); mac_labelzone_free(label); MAC_DEBUG_COUNTER_DEC(&nmacipcshms); } void -mac_destroy_ipc_shm(struct shmid_kernel *shmsegptr) +mac_destroy_sysv_shm(struct shmid_kernel *shmsegptr) { - mac_ipc_shm_label_free(shmsegptr->label); + mac_sysv_shm_label_free(shmsegptr->label); shmsegptr->label = NULL; } void -mac_create_ipc_shm(struct ucred *cred, struct shmid_kernel *shmsegptr) +mac_create_sysv_shm(struct ucred *cred, struct shmid_kernel *shmsegptr) { - MAC_PERFORM(create_ipc_shm, cred, shmsegptr, shmsegptr->label); + MAC_PERFORM(create_sysv_shm, cred, shmsegptr, shmsegptr->label); } void -mac_cleanup_ipc_shm(struct shmid_kernel *shmsegptr) +mac_cleanup_sysv_shm(struct shmid_kernel *shmsegptr) { - MAC_PERFORM(cleanup_ipc_shm, shmsegptr->label); + MAC_PERFORM(cleanup_sysv_shm, shmsegptr->label); } int -mac_check_ipc_shmat(struct ucred *cred, struct shmid_kernel *shmsegptr, +mac_check_sysv_shmat(struct ucred *cred, struct shmid_kernel *shmsegptr, int shmflg) { int error; @@ -123,14 +123,14 @@ if (!mac_enforce_sysv_shm) return (0); - MAC_CHECK(check_ipc_shmat, cred, shmsegptr, shmsegptr->label, + MAC_CHECK(check_sysv_shmat, cred, shmsegptr, shmsegptr->label, shmflg); return(error); } int -mac_check_ipc_shmctl(struct ucred *cred, struct shmid_kernel *shmsegptr, +mac_check_sysv_shmctl(struct ucred *cred, struct shmid_kernel *shmsegptr, int cmd) { int error; @@ -138,27 +138,27 @@ if (!mac_enforce_sysv_shm) return (0); - MAC_CHECK(check_ipc_shmctl, cred, shmsegptr, shmsegptr->label, + MAC_CHECK(check_sysv_shmctl, cred, shmsegptr, shmsegptr->label, cmd); return(error); } int -mac_check_ipc_shmdt(struct ucred *cred, struct shmid_kernel *shmsegptr) +mac_check_sysv_shmdt(struct ucred *cred, struct shmid_kernel *shmsegptr) { int error; if (!mac_enforce_sysv_shm) return (0); - MAC_CHECK(check_ipc_shmdt, cred, shmsegptr, shmsegptr->label); + MAC_CHECK(check_sysv_shmdt, cred, shmsegptr, shmsegptr->label); return(error); } int -mac_check_ipc_shmget(struct ucred *cred, struct shmid_kernel *shmsegptr, +mac_check_sysv_shmget(struct ucred *cred, struct shmid_kernel *shmsegptr, int shmflg) { int error; @@ -166,7 +166,7 @@ if (!mac_enforce_sysv_shm) return (0); - MAC_CHECK(check_ipc_shmget, cred, shmsegptr, shmsegptr->label, + MAC_CHECK(check_sysv_shmget, cred, shmsegptr, shmsegptr->label, shmflg); return(error); ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#246 (text+ko) ==== @@ -1181,7 +1181,7 @@ */ static void -mac_biba_create_ipc_msgmsg(struct ucred *cred, struct msqid_kernel *msqkptr, +mac_biba_create_sysv_msgmsg(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqlabel, struct msg *msgptr, struct label *msglabel) { struct mac_biba *source, *dest; @@ -1194,8 +1194,8 @@ } static void -mac_biba_create_ipc_msgqueue(struct ucred *cred, struct msqid_kernel *msqkptr, - struct label *msqlabel) +mac_biba_create_sysv_msgqueue(struct ucred *cred, + struct msqid_kernel *msqkptr, struct label *msqlabel) { struct mac_biba *source, *dest; @@ -1206,7 +1206,7 @@ } static void -mac_biba_create_ipc_sema(struct ucred *cred, struct semid_kernel *semakptr, +mac_biba_create_sysv_sema(struct ucred *cred, struct semid_kernel *semakptr, struct label *semalabel) { struct mac_biba *source, *dest; @@ -1218,7 +1218,7 @@ } static void -mac_biba_create_ipc_shm(struct ucred *cred, struct shmid_kernel *shmsegptr, +mac_biba_create_sysv_shm(struct ucred *cred, struct shmid_kernel *shmsegptr, struct label *shmlabel) { struct mac_biba *source, *dest; @@ -1519,28 +1519,28 @@ * Label cleanup/flush operations */ static void -mac_biba_cleanup_ipc_msgmsg(struct label *msglabel) +mac_biba_cleanup_sysv_msgmsg(struct label *msglabel) { bzero(SLOT(msglabel), sizeof(struct mac_biba)); } static void -mac_biba_cleanup_ipc_msgqueue(struct label *msqlabel) +mac_biba_cleanup_sysv_msgqueue(struct label *msqlabel) { bzero(SLOT(msqlabel), sizeof(struct mac_biba)); } static void -mac_biba_cleanup_ipc_sema(struct label *semalabel) +mac_biba_cleanup_sysv_sema(struct label *semalabel) { bzero(SLOT(semalabel), sizeof(struct mac_biba)); } static void -mac_biba_cleanup_ipc_shm(struct label *shmlabel) +mac_biba_cleanup_sysv_shm(struct label *shmlabel) { bzero(SLOT(shmlabel), sizeof(struct mac_biba)); } @@ -1704,7 +1704,7 @@ } static int -mac_biba_check_ipc_msgrcv(struct ucred *cred, struct msg *msgptr, +mac_biba_check_sysv_msgrcv(struct ucred *cred, struct msg *msgptr, struct label *msglabel) { struct mac_biba *subj, *obj; @@ -1722,7 +1722,7 @@ } static int -mac_biba_check_ipc_msgrmid(struct ucred *cred, struct msg *msgptr, +mac_biba_check_sysv_msgrmid(struct ucred *cred, struct msg *msgptr, struct label *msglabel) { struct mac_biba *subj, *obj; @@ -1740,7 +1740,7 @@ } static int -mac_biba_check_ipc_msqget(struct ucred *cred, struct msqid_kernel *msqkptr, +mac_biba_check_sysv_msqget(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqklabel) { struct mac_biba *subj, *obj; @@ -1758,7 +1758,7 @@ } static int -mac_biba_check_ipc_msqsnd(struct ucred *cred, struct msqid_kernel *msqkptr, +mac_biba_check_sysv_msqsnd(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqklabel) { struct mac_biba *subj, *obj; @@ -1776,7 +1776,7 @@ } static int -mac_biba_check_ipc_msqrcv(struct ucred *cred, struct msqid_kernel *msqkptr, +mac_biba_check_sysv_msqrcv(struct ucred *cred, struct msqid_kernel *msqkptr, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Oct 13 15:09:32 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CFBA516A4D1; Wed, 13 Oct 2004 15:09:31 +0000 (GMT) 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 8C1BD16A4CE; Wed, 13 Oct 2004 15:09:31 +0000 (GMT) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1F53643D31; Wed, 13 Oct 2004 15:09:30 +0000 (GMT) (envelope-from arr@watson.org) Received: from fledge.watson.org (localhost [127.0.0.1]) by fledge.watson.org (8.13.1/8.13.1) with ESMTP id i9DF7pBc090757; Wed, 13 Oct 2004 11:07:51 -0400 (EDT) (envelope-from arr@watson.org) Received: from localhost (arr@localhost)i9DF7p28090754; Wed, 13 Oct 2004 11:07:51 -0400 (EDT) (envelope-from arr@watson.org) X-Authentication-Warning: fledge.watson.org: arr owned process doing -bs Date: Wed, 13 Oct 2004 11:07:51 -0400 (EDT) From: "Andrew R. Reiter" To: Wayne Salamon In-Reply-To: <200410130114.i9D1Evf9059179@repoman.freebsd.org> Message-ID: <20041013110656.K90680@fledge.watson.org> References: <200410130114.i9D1Evf9059179@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII cc: Perforce Change Reviews Subject: Re: PERFORCE change 63119 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: Wed, 13 Oct 2004 15:09:32 -0000 Is this p4 tree available via cvsup? If so, just curious if you could let me know the label. I'd like to help out where I can. Cheers, Andrew On Wed, 13 Oct 2004, Wayne Salamon wrote: :http://perforce.freebsd.org/chv.cgi?CH=63119 : :Change 63119 by wsalamon@wsalamon_epi on 2004/10/13 01:14:20 : : Change the auditctl() system call to take just a path. : Enable the kerne->auditd IPC for audit log full and disk full : messages. Uses a FIFO for this communication. : Note: auditd still needs work when rotating the audit log. : :Affected files ... : :.. //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/auditd.c#5 edit :.. //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#6 edit :.. //depot/projects/trustedbsd/audit3/sys/kern/init_sysent.c#5 edit :.. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.c#5 edit :.. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#5 edit :.. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#10 edit :.. //depot/projects/trustedbsd/audit3/sys/sys/syscall.h#5 edit :.. //depot/projects/trustedbsd/audit3/sys/sys/syscall.mk#5 edit :.. //depot/projects/trustedbsd/audit3/sys/sys/sysproto.h#6 edit : :Differences ... : :==== //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/auditd.c#5 (text+ko) ==== : :@@ -185,9 +185,8 @@ : if (open(fn, O_RDONLY | O_CREAT, S_IRUSR | S_IRGRP) < 0) { : perror("File open"); : } :- /* else if (auditctl(AC_SETLOGFILE, fn, strlen(fn)) != 0) { */ :- else if (syscall(SYS_auditctl, AC_SETLOGFILE, fn, :- strlen(fn)) != 0) { :+ /* else if (auditctl(AC_SETLOGFILE, fn)) != 0) { */ :+ else if (syscall(SYS_auditctl, AC_SETLOGFILE, fn) != 0) { : syslog(LOG_ERR, : "auditctl failed setting log file! : %s\n", : strerror(errno)); :@@ -307,7 +306,7 @@ : : /* flush contents */ : /* err_ret = auditctl(NULL); */ :- err_ret = syscall(SYS_auditctl, NULL, sizeof(char)); :+ err_ret = syscall(SYS_auditctl, AC_SETLOGFILE, NULL); : if (err_ret != 0) { : syslog(LOG_ERR, "auditctl failed! : %s\n", : strerror(errno)); :@@ -326,6 +325,10 @@ : return (1); : } : endac(); :+ :+ if(close(controlfd) != 0) { :+ syslog(LOG_ERR, "Error closing control file\n"); :+ } : syslog(LOG_INFO, "Finished.\n"); : return (0); : } :@@ -350,13 +353,19 @@ : : /* Set up the signal hander */ : if (signal(SIGTERM, relay_signal) == SIG_ERR) { :+ syslog(LOG_ERR, :+ "Could not set signal handler for SIGTERM\n"); : fail_exit(); : } : if (signal(SIGCHLD, relay_signal) == SIG_ERR) { :+ syslog(LOG_ERR, :+ "Could not set signal handler for SIGCHLD\n"); : fail_exit(); : } : : if ((pidfile = fopen(AUDITD_PIDFILE, "a")) == NULL) { :+ syslog(LOG_ERR, :+ "Could not open PID file\n"); : audit_warn_tmpfile(); : return -1; : } :@@ -364,7 +373,8 @@ : /* attempt to lock the pid file; if a lock is present, exit */ : fd = fileno(pidfile); : if(flock(fd, LOCK_EX | LOCK_NB) < 0) { :- syslog(LOG_ERR, "PID file is locked (is another auditd running?).\n"); :+ syslog(LOG_ERR, :+ "PID file is locked (is another auditd running?).\n"); : audit_warn_ebusy(); : return -1; : } :@@ -560,7 +570,8 @@ : evc_map.ec_number = ev->ae_number; : evc_map.ec_class = ev->ae_class; : /* if (auditon(A_SETCLASS, &evc_map, sizeof(au_evclass_map_t)) != 0) { */ :- if (syscall(SYS_auditon,A_SETCLASS, &evc_map, sizeof(au_evclass_map_t)) != 0) { :+ if (syscall(SYS_auditon, A_SETCLASS, &evc_map, :+ sizeof(au_evclass_map_t)) != 0) { : syslog(LOG_ERR, : "Failed to register class mapping for event %s", : ev->ae_name); :@@ -630,15 +641,6 @@ : return rc; : } : :- /* Tell the kernel the name of the auditd control file */ :- /*else if (auditctl(AC_SETCTLFILE, fn, strlen(fn)) != 0) { */ :- if (syscall(SYS_auditctl, AC_SETCTLFILE, AUDITD_CTL_FILE, :- strlen(AUDITD_CTL_FILE)) != 0) { :- syslog(LOG_ERR, :- "config_auditd_ipc() : failed sending control file " :- " name to the kernel: %s\n", :- strerror(errno)); :- } : /* Set up the signal hander */ : if (signal(SIGIO, sigio_handler) == SIG_ERR) { : syslog(LOG_ERR, :@@ -646,7 +648,7 @@ : return -1; : } : :- controlfd = open(AUDITD_CTL_FILE, O_RDONLY); :+ controlfd = open(AUDITD_CTL_FILE, O_RDONLY | O_NONBLOCK); : if (controlfd < 0) { : syslog(LOG_ERR, : "config_auditd_ipc() : error opening control file\n"); :@@ -663,6 +665,14 @@ : "config_auditd_ipc() : error setting file ASYNC\n"); : return -1; : } :+ /* Tell the kernel the name of the auditd control file */ :+ /*if (auditctl(AC_SETCTLFILE, fn) != 0) { */ :+ if (syscall(SYS_auditctl, AC_SETCTLFILE, AUDITD_CTL_FILE) != 0) { :+ syslog(LOG_ERR, :+ "config_auditd_ipc() : failed sending control file " :+ "name to the kernel: %s\n", :+ strerror(errno)); :+ } : return 0; : } : :@@ -735,7 +745,7 @@ : } : } : :- openlog("auditd", LOG_CONS | LOG_PID, LOG_DAEMON); :+ openlog("auditd", LOG_CONS | LOG_PID, LOG_SECURITY); : syslog(LOG_INFO, "starting...\n"); : : if (debug == 0 && daemon(0, 0) == -1) { : :==== //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#6 (text+ko) ==== : :@@ -302,7 +302,7 @@ : : int audit (const void *, int); : int auditon (int, void *, int); :-int auditctl (int, void *, int); :+int auditctl (int, const char *); : int getauid (au_id_t *); : int setauid (const au_id_t *); : int getaudit (struct auditinfo *); : :==== //depot/projects/trustedbsd/audit3/sys/kern/init_sysent.c#5 (text+ko) ==== : : :==== //depot/projects/trustedbsd/audit3/sys/kern/syscalls.c#5 (text+ko) ==== : : :==== //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#5 (text+ko) ==== : :@@ -705,6 +705,6 @@ : *auditinfo_addr, u_int length); } AUE_GETAUDIT_ADDR : 451 MSTD { int setaudit_addr(struct auditinfo_addr \ : *auditinfo_addr, u_int length); } AUE_SETAUDIT_ADDR :-452 MSTD { int auditctl(int cmd, void *data, u_int length); } AUE_AUDITCTL :+452 MSTD { int auditctl(int cmd, char *path); } AUE_AUDITCTL : ; Please copy any additions and changes to the following compatability tables: : ; sys/compat/freebsd32/syscalls.master : :==== //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#10 (text+ko) ==== : :@@ -29,6 +29,7 @@ : #include : #include : #include :+#include : #include : #include : #include :@@ -63,7 +64,7 @@ : * volume, it should be left off unless you want your system : * to churn a lot whenever the audit record flow gets high. : */ :-#define AUDIT_EXCESSIVELY_VERBOSE :+//#define AUDIT_EXCESSIVELY_VERBOSE : #ifdef AUDIT_EXCESSIVELY_VERBOSE : #define AUDIT_PRINTF(x) printf x : #else :@@ -177,6 +178,10 @@ : static int audit_file_rotate_wait; : : /* :+ * vnode for the audit daemon control file :+ */ :+static struct vnode *auditd_ctl_vp; :+/* : * Flags controlling behavior in low storage situations. : * Should we panic if a write fails? Should we fail stop : * if we're out of disk space? Are we currently "failing :@@ -215,7 +220,10 @@ : struct thread *td) : { : int ret; :+ int trigger; : struct au_record *bsm; :+ struct vattr vattr; :+ struct statfs *mnt_stat = &vp->v_mount->mnt_stat; : : mtx_assert(&Giant, MA_OWNED); : :@@ -226,14 +234,11 @@ : * and return. However, this is arguably an assertion failure. : * XXX Need a FreeBSD equivalent. : */ :-#if DARWIN_FOO :- struct vattr vattr; :- struct statfs *mnt_stat = &vp->v_mount->mnt_stat; :- ret = VFS_STATFS(vp->v_mount, mnt_stat, p); :+ ret = VFS_STATFS(vp->v_mount, mnt_stat, td); : if (ret) : goto out; : :- ret = VOP_GETATTR(vp, &vattr, cred, p); :+ ret = VOP_GETATTR(vp, &vattr, cred, td); : if (ret) : goto out; : :@@ -246,11 +251,7 @@ : * XXX Need to decide what to do if the trigger to the audit daemon : * fails. : */ :- if(host_get_audit_control_port(host_priv_self(), &audit_port) :- != KERN_SUCCESS) :- printf("Cannot get audit control port\n"); :- :- if (audit_port != MACH_PORT_NULL) { :+ if (auditd_ctl_vp != NULL) { : long temp; : : /* :@@ -260,9 +261,12 @@ : if (audit_qctrl.aq_minfree != 0) { : temp = mnt_stat->f_blocks / (100 / audit_qctrl.aq_minfree); : if (mnt_stat->f_bfree < temp) { :- ret = audit_triggers(audit_port, :- AUDIT_TRIGGER_LOW_SPACE); :- if (ret != KERN_SUCCESS) { :+ trigger = AUDITD_TRIGGER_LOW_SPACE; :+ ret = vn_rdwr(UIO_WRITE, auditd_ctl_vp, :+ (void *)&trigger, sizeof(trigger), :+ (off_t)0, UIO_SYSSPACE, IO_APPEND|IO_UNIT, :+ cred, NULL, NULL, td); :+ if (ret != 0) { : printf( : "Failed audit_triggers(AUDIT_TRIGGER_LOW_SPACE): %d\n", ret); : /* :@@ -281,9 +285,12 @@ : (audit_file_rotate_wait == 0) && : (vattr.va_size >= audit_fstat.af_filesz)) { : audit_file_rotate_wait = 1; :- ret = audit_triggers(audit_port, :- AUDIT_TRIGGER_FILE_FULL); :- if (ret != KERN_SUCCESS) { :+ trigger = AUDITD_TRIGGER_FILE_FULL; :+ ret = vn_rdwr(UIO_WRITE, auditd_ctl_vp, :+ (void *)&trigger, sizeof(trigger), :+ (off_t)0, UIO_SYSSPACE, IO_APPEND|IO_UNIT, :+ cred, NULL, NULL, td); :+ if (ret != 0) { : printf( : "Failed audit_triggers(AUDIT_TRIGGER_FILE_FULL): %d\n", ret); : /* XXX what to do here? */ :@@ -312,7 +319,6 @@ : audit_in_failure = 1; : } : :-#endif : /* : * If there is a user audit record attached to the kernel record, : * then write the user record. :@@ -370,7 +376,6 @@ : kau_free(bsm); : : out: :-#if DARWIN_FOO : /* : * When we're done processing the current record, we have to : * check to see if we're in a failure mode, and if so, whether :@@ -379,12 +384,11 @@ : */ : if (audit_in_failure && : audit_q_len == 0 && audit_pre_q_len == 0) { :- VOP_LOCK(vp, LK_DRAIN | LK_INTERLOCK, p); :- (void)VOP_FSYNC(vp, cred, MNT_WAIT, p); :- VOP_UNLOCK(vp, 0, p); :+ VOP_LOCK(vp, LK_DRAIN | LK_INTERLOCK, td); :+ (void)VOP_FSYNC(vp, cred, MNT_WAIT, td); :+ VOP_UNLOCK(vp, 0, td); : panic("Audit store overflow; record queue drained."); : } :-#endif : : return (ret); : } :@@ -585,6 +589,7 @@ : audit_replacement_flag = 0; : audit_file_rotate_wait = 0; : audit_replacement_vp = NULL; :+ auditd_ctl_vp = NULL; : audit_fstat.af_filesz = 0; /* '0' means unset, unbounded */ : audit_fstat.af_currsz = 0; : audit_qctrl.aq_hiwater = AQ_HIWATER; :@@ -1089,7 +1094,6 @@ : struct ucred *cred; : struct vnode *vp; : int error, flags; :- union auditctl_udata udata; : : error = suser(td); : if (error) :@@ -1098,8 +1102,6 @@ : vp = NULL; : cred = NULL; : :- memset((void *)&udata, 0, sizeof(udata)); :- : switch (uap->cmd) { : case AC_SETLOGFILE: : /* :@@ -1107,18 +1109,11 @@ : * validity checks, and grab another reference to the current : * credential. : */ :- if (uap->data != NULL) { :+ if (uap->path != NULL) { : :- if ((uap->length <= 0) || (uap->length > MAXPATHLEN)) :- return (EINVAL); :- :- error = copyin(uap->data, (void *)&udata, uap->length); :- if (error) :- return (error); :- : mtx_lock(&Giant); : NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_SYSSPACE, :- udata.ac_path, td); :+ uap->path, td); : flags = audit_open_flags; : error = vn_open(&nd, &flags, 0, -1); : if (error) { :@@ -1141,7 +1136,29 @@ : : audit_rotate_vnode(cred, vp); : break; :- case AC_SETCTLFD: /* Set control file descriptor */ :+ :+ case AC_SETCTLFILE: /* Set auditd control file */ :+ if (uap->path != NULL) { :+ mtx_lock(&Giant); :+ NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_SYSSPACE, :+ uap->path, td); :+ flags = FWRITE | O_NONBLOCK; :+ error = vn_open(&nd, &flags, 0, -1); :+ if (error) { :+ mtx_unlock(&Giant); :+ return (error); :+ } :+ VOP_UNLOCK(nd.ni_vp, 0, td); :+ vp = nd.ni_vp; :+ if (vp->v_type != VFIFO) { :+ vn_close(vp, audit_close_flags, :+ td->td_ucred, td); :+ mtx_unlock(&Giant); :+ return (EINVAL); :+ } :+ auditd_ctl_vp = vp; :+ mtx_unlock(&Giant); :+ } : break; : } : return (0); : :==== //depot/projects/trustedbsd/audit3/sys/sys/syscall.h#5 (text+ko) ==== : : :==== //depot/projects/trustedbsd/audit3/sys/sys/syscall.mk#5 (text+ko) ==== : : :==== //depot/projects/trustedbsd/audit3/sys/sys/sysproto.h#6 (text+ko) ==== : :@@ -1334,8 +1334,7 @@ : }; : struct auditctl_args { : char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)]; :- char data_l_[PADL_(void *)]; void * data; char data_r_[PADR_(void *)]; :- char length_l_[PADL_(u_int)]; u_int length; char length_r_[PADR_(u_int)]; :+ char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; : }; : int nosys(struct thread *, struct nosys_args *); : void sys_exit(struct thread *, struct sys_exit_args *); : : -- Andrew R. Reiter arr@watson.org arr@FreeBSD.org From owner-p4-projects@FreeBSD.ORG Wed Oct 13 17:55:44 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7641D16A4D3; Wed, 13 Oct 2004 17:55:44 +0000 (GMT) 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 332C216A4CE for ; Wed, 13 Oct 2004 17:55:44 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 02F3E43D1D for ; Wed, 13 Oct 2004 17:55:44 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9DHthdu026944 for ; Wed, 13 Oct 2004 17:55:43 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9DHthRK026941 for perforce@freebsd.org; Wed, 13 Oct 2004 17:55:43 GMT (envelope-from jhb@freebsd.org) Date: Wed, 13 Oct 2004 17:55:43 GMT Message-Id: <200410131755.i9DHthRK026941@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 63162 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: Wed, 13 Oct 2004 17:55:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=63162 Change 63162 by jhb@jhb_slimer on 2004/10/13 17:54:58 IFC @63160. Affected files ... .. //depot/projects/smpng/sys/cam/scsi/scsi_da.h#3 integrate .. //depot/projects/smpng/sys/conf/files#125 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#74 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#63 integrate .. //depot/projects/smpng/sys/dev/ata/ata-queue.c#21 integrate .. //depot/projects/smpng/sys/dev/cx/if_cx.c#14 integrate .. //depot/projects/smpng/sys/dev/cx/machdep.h#3 integrate .. //depot/projects/smpng/sys/dev/dcons/dcons.c#7 integrate .. //depot/projects/smpng/sys/dev/dcons/dcons.h#3 integrate .. //depot/projects/smpng/sys/dev/dcons/dcons_crom.c#5 integrate .. //depot/projects/smpng/sys/dev/dcons/dcons_os.c#1 branch .. //depot/projects/smpng/sys/dev/dcons/dcons_os.h#1 branch .. //depot/projects/smpng/sys/dev/ofw/ofw_console.c#20 integrate .. //depot/projects/smpng/sys/dev/sab/sab.c#23 integrate .. //depot/projects/smpng/sys/dev/sio/sio.c#51 integrate .. //depot/projects/smpng/sys/dev/sound/isa/ad1816.c#17 integrate .. //depot/projects/smpng/sys/dev/sound/isa/ess.c#14 integrate .. //depot/projects/smpng/sys/dev/sound/isa/mss.c#19 integrate .. //depot/projects/smpng/sys/dev/sound/isa/sb16.c#18 integrate .. //depot/projects/smpng/sys/dev/sound/isa/sb8.c#13 integrate .. //depot/projects/smpng/sys/dev/sound/pci/au88x0.c#9 integrate .. //depot/projects/smpng/sys/dev/sound/pci/aureal.c#11 integrate .. //depot/projects/smpng/sys/dev/sound/pci/csapcm.c#11 integrate .. //depot/projects/smpng/sys/dev/sound/pci/ds1.c#16 integrate .. //depot/projects/smpng/sys/dev/sound/pci/emu10k1.c#22 integrate .. //depot/projects/smpng/sys/dev/sound/pci/es137x.c#13 integrate .. //depot/projects/smpng/sys/dev/sound/pci/fm801.c#15 integrate .. //depot/projects/smpng/sys/dev/sound/pci/ich.c#31 integrate .. //depot/projects/smpng/sys/dev/sound/pci/maestro3.c#19 integrate .. //depot/projects/smpng/sys/dev/sound/pci/solo.c#12 integrate .. //depot/projects/smpng/sys/dev/sound/pci/t4dwave.c#19 integrate .. //depot/projects/smpng/sys/dev/sound/pci/via8233.c#14 integrate .. //depot/projects/smpng/sys/dev/sound/pci/via82c686.c#19 integrate .. //depot/projects/smpng/sys/dev/uart/uart_tty.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/ugen.c#30 integrate .. //depot/projects/smpng/sys/dev/usb/uhci_pci.c#11 integrate .. //depot/projects/smpng/sys/kern/kern_switch.c#48 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#41 integrate .. //depot/projects/smpng/sys/kern/tty.c#50 integrate .. //depot/projects/smpng/sys/modules/dcons/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/dcons_crom/Makefile#2 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#13 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#4 integrate .. //depot/projects/smpng/sys/pc98/pc98/sio.c#48 integrate Differences ... ==== //depot/projects/smpng/sys/cam/scsi/scsi_da.h#3 (text+ko) ==== @@ -46,7 +46,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $FreeBSD: src/sys/cam/scsi/scsi_da.h,v 1.6 2004/10/12 08:55:02 bms Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_da.h,v 1.7 2004/10/13 09:31:04 bms Exp $ */ #ifndef _SCSI_SCSI_DA_H @@ -188,7 +188,7 @@ struct scsi_read_format_capacities { uint8_t opcode; /* READ_FORMAT_CAPACITIES */ - uint8_t byte2; /* top 3 bits contain LUN */ + uint8_t byte2; #define SRFC_LUN_MASK 0xE0 uint8_t reserved0[5]; uint8_t alloc_length[2]; @@ -198,11 +198,11 @@ struct scsi_verify { uint8_t opcode; /* VERIFY */ - uint8_t lun; /* All other bits should be zero */ + uint8_t byte2; +#define SVFY_LUN_MASK 0xE0 #define SVFY_RELADR 0x01 #define SVFY_BYTECHK 0x02 #define SVFY_DPO 0x10 -#define SVFY_LUN_MASK 0xE0 /* Top 3 MSBs are LUN */ uint8_t addr[4]; /* LBA to begin verification at */ uint8_t reserved0[1]; uint8_t len[2]; /* number of blocks to verify */ @@ -212,7 +212,7 @@ struct scsi_write_and_verify { uint8_t opcode; /* WRITE_AND_VERIFY */ - uint8_t byte2; /* top 3 bits are the LUN */ + uint8_t byte2; #define SWVY_LUN_MASK 0xE0 #define SWVY_RELADR 0x01 #define SWVY_BYTECHK 0x02 ==== //depot/projects/smpng/sys/conf/files#125 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.956 2004/10/08 00:24:30 brooks Exp $ +# $FreeBSD: src/sys/conf/files,v 1.957 2004/10/13 05:41:09 simokawa Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -393,6 +393,7 @@ dev/cy/cy_pci.c optional cy pci dev/dcons/dcons.c optional dcons dev/dcons/dcons_crom.c optional dcons_crom +dev/dcons/dcons_os.c optional dcons dev/digi/digi.c optional digi dev/digi/digi_isa.c optional digi isa dev/digi/digi_pci.c optional digi pci ==== //depot/projects/smpng/sys/dev/acpica/acpi.c#74 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.190 2004/09/21 17:19:38 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.193 2004/10/13 07:29:29 njl Exp $ */ #include "opt_acpi.h" @@ -617,6 +617,8 @@ retval += resource_list_print_type(rl, "iomem", SYS_RES_MEMORY, "%#lx"); retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld"); retval += resource_list_print_type(rl, "drq", SYS_RES_DRQ, "%ld"); + if (device_get_flags(child)) + retval += printf(" flags %#x", device_get_flags(child)); retval += bus_print_child_footer(bus, child); return (retval); @@ -1169,6 +1171,9 @@ } out: + if (result == 0 && ids->ip_desc) + device_set_desc(child, ids->ip_desc); + return_VALUE (result); } ==== //depot/projects/smpng/sys/dev/ata/ata-all.c#63 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.231 2004/10/10 13:24:39 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.232 2004/10/13 15:16:35 sos Exp $"); #include "opt_ata.h" #include @@ -248,6 +248,8 @@ while (ch->locking(ch, ATA_LF_LOCK) != ch->unit) tsleep(&devices, PRIBIO, "atarint", 1); + ata_catch_inflight(ch); + /* grap the channel lock no matter what */ mtx_lock(&ch->state_mtx); ch->state = ATA_ACTIVE; @@ -258,7 +260,6 @@ else ch->flags |= ATA_IMMEDIATE_MODE; - ata_catch_inflight(ch); devices = ch->devices; ch->hw.reset(ch); @@ -270,15 +271,15 @@ if ((misdev = devices & ~ch->devices)) { if ((misdev & (ATA_ATA_MASTER | ATA_ATAPI_MASTER)) && ch->device[MASTER].detach) { + ata_fail_requests(ch, &ch->device[MASTER]); ch->device[MASTER].detach(&ch->device[MASTER]); - ata_fail_requests(ch, &ch->device[MASTER]); free(ch->device[MASTER].param, M_ATA); ch->device[MASTER].param = NULL; } if ((misdev & (ATA_ATA_SLAVE | ATA_ATAPI_SLAVE)) && ch->device[SLAVE].detach) { + ata_fail_requests(ch, &ch->device[SLAVE]); ch->device[SLAVE].detach(&ch->device[SLAVE]); - ata_fail_requests(ch, &ch->device[SLAVE]); free(ch->device[SLAVE].param, M_ATA); ch->device[SLAVE].param = NULL; } @@ -291,15 +292,15 @@ if ((misdev = devices & ~ch->devices)) { if ((misdev & (ATA_ATA_MASTER | ATA_ATAPI_MASTER)) && ch->device[MASTER].detach) { + ata_fail_requests(ch, &ch->device[MASTER]); ch->device[MASTER].detach(&ch->device[MASTER]); - ata_fail_requests(ch, &ch->device[MASTER]); free(ch->device[MASTER].param, M_ATA); ch->device[MASTER].param = NULL; } if ((misdev & (ATA_ATA_SLAVE | ATA_ATAPI_SLAVE)) && ch->device[SLAVE].detach) { + ata_fail_requests(ch, &ch->device[SLAVE]); ch->device[SLAVE].detach(&ch->device[SLAVE]); - ata_fail_requests(ch, &ch->device[SLAVE]); free(ch->device[SLAVE].param, M_ATA); ch->device[SLAVE].param = NULL; } @@ -391,55 +392,51 @@ ata_interrupt(void *data) { struct ata_channel *ch = (struct ata_channel *)data; - struct ata_request *request = ch->running; - int gotit = 0; + struct ata_request *request; - /* ignore interrupt if there is no running request */ - if (!request) - return; + mtx_lock(&ch->state_mtx); + do { + /* do we have a running request */ + if (!(request = ch->running)) + break; - ATA_DEBUG_RQ(request, "interrupt"); + ATA_DEBUG_RQ(request, "interrupt"); - /* ignore interrupt if device is busy */ - if (ATA_IDX_INB(ch, ATA_ALTSTAT) & ATA_S_BUSY) { - DELAY(100); - if (ATA_IDX_INB(ch, ATA_ALTSTAT) & ATA_S_BUSY) - return; - } + /* ignore interrupt if device is busy */ + if (ATA_IDX_INB(ch, ATA_ALTSTAT) & ATA_S_BUSY) { + DELAY(100); + if (ATA_IDX_INB(ch, ATA_ALTSTAT) & ATA_S_BUSY) + break; + } - ATA_DEBUG_RQ(request, "interrupt accepted"); - - mtx_lock(&ch->state_mtx); - if (ch->state == ATA_ACTIVE) { - ch->state = ATA_INTERRUPT; - gotit = 1; - } - else - ata_printf(ch, -1, - "unexpected state in ata_interrupt 0x%02x\n", ch->state); - mtx_unlock(&ch->state_mtx); - - /* if we got our locks finish up this request */ - if (gotit) { - request->flags |= ATA_R_INTR_SEEN; - if (ch->hw.end_transaction(request) == ATA_OP_CONTINUES) { - request->flags &= ~ATA_R_INTR_SEEN; - mtx_lock(&ch->state_mtx); - ch->state = ATA_ACTIVE; - mtx_unlock(&ch->state_mtx); + /* check for the right state */ + if (ch->state == ATA_ACTIVE) { + request->flags |= ATA_R_INTR_SEEN; + ch->state = ATA_INTERRUPT; } else { + ata_prtdev(request->device, + "interrupt state=%d unexpected\n", ch->state); + break; + } + + if (ch->hw.end_transaction(request) == ATA_OP_FINISHED) { ch->running = NULL; - mtx_lock(&ch->state_mtx); if (ch->flags & ATA_IMMEDIATE_MODE) - ch->state = ATA_ACTIVE; + ch->state = ATA_ACTIVE; else ch->state = ATA_IDLE; mtx_unlock(&ch->state_mtx); ch->locking(ch, ATA_LF_UNLOCK); ata_finish(request); + return; } - } + else { + request->flags &= ~ATA_R_INTR_SEEN; + ch->state = ATA_ACTIVE; + } + } while (0); + mtx_unlock(&ch->state_mtx); } /* ==== //depot/projects/smpng/sys/dev/ata/ata-queue.c#21 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.36 2004/10/06 19:46:08 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.37 2004/10/13 15:16:35 sos Exp $"); #include "opt_ata.h" #include @@ -157,7 +157,6 @@ ata_start(struct ata_channel *ch) { struct ata_request *request; - int gotit = 0; /* if in immediate mode, just skip start requests (stall queue) */ if (ch->flags & ATA_IMMEDIATE_MODE) @@ -174,42 +173,40 @@ mtx_lock(&ch->queue_mtx); } - /* if we have work todo, try to grap the ATA HW and start transaction */ + /* if we have a request on the queue try to get it running */ if ((request = TAILQ_FIRST(&ch->ata_queue))) { + + /* we need the locking function to get the lock for this channel */ if (ch->locking(ch, ATA_LF_LOCK) == ch->unit) { + + /* check for the right state */ mtx_lock(&ch->state_mtx); - if (ch->state == ATA_IDLE) { - ch->state = ATA_ACTIVE; - gotit = 1; - } - mtx_unlock(&ch->state_mtx); - } - if (!gotit) { - mtx_unlock(&ch->queue_mtx); - return; - } - TAILQ_REMOVE(&ch->ata_queue, request, chain); - mtx_unlock(&ch->queue_mtx); - ATA_DEBUG_RQ(request, "starting"); + if (ch->state == ATA_IDLE) { + TAILQ_REMOVE(&ch->ata_queue, request, chain); + ch->running = request; + + ATA_DEBUG_RQ(request, "starting"); - /* arm timeout */ - if (!dumping) - callout_reset(&request->callout, request->timeout * hz, - (timeout_t*)ata_timeout, request); + if (!dumping) + callout_reset(&request->callout, request->timeout * hz, + (timeout_t*)ata_timeout, request); - /* kick HW into action */ - ch->running = request; - if (ch->hw.begin_transaction(request) == ATA_OP_FINISHED) { - ch->running = NULL; - mtx_lock(&ch->state_mtx); - ch->state = ATA_IDLE; + if (ch->hw.begin_transaction(request) == ATA_OP_FINISHED) { + ch->running = NULL; + ch->state = ATA_IDLE; + mtx_unlock(&ch->queue_mtx); + mtx_unlock(&ch->state_mtx); + ch->locking(ch, ATA_LF_UNLOCK); + ata_finish(request); + return; + } + else + ch->state = ATA_ACTIVE; + } mtx_unlock(&ch->state_mtx); - ata_finish(request); - ch->locking(ch, ATA_LF_UNLOCK); } } - else - mtx_unlock(&ch->queue_mtx); + mtx_unlock(&ch->queue_mtx); } void @@ -224,12 +221,12 @@ } else { if (request->bio && !(request->flags & ATA_R_TIMEOUT)) { - ATA_DEBUG_RQ(request, "finish via bio_taskqueue"); + ATA_DEBUG_RQ(request, "finish bio_taskqueue"); bio_taskqueue(request->bio, (bio_task_t *)ata_completed, request); } else { TASK_INIT(&request->task, 0, ata_completed, request); - ATA_DEBUG_RQ(request, "finish via taskqueue_thread"); + ATA_DEBUG_RQ(request, "finish taskqueue_thread"); taskqueue_enqueue(taskqueue_thread, &request->task); } } @@ -243,19 +240,24 @@ ATA_DEBUG_RQ(request, "completed entered"); - /* did everything go according to plan ? */ + /* if we had a timeout, reinit channel and deal with the falldown */ if (request->flags & ATA_R_TIMEOUT) { + int error = ata_reinit(ch); - /* if reinit succeeds and retries still permit, reinject request */ - if (!ata_reinit(ch) && request->retries-- > 0) { + /* if our device disappeared return as cleanup was done already */ + if (!request->device->param) + return; + + /* if reinit succeeded and retries still permit, reinject request */ + if (!error && request->retries-- > 0) { request->flags &= ~(ATA_R_TIMEOUT | ATA_R_DEBUG); request->flags |= (ATA_R_IMMEDIATE | ATA_R_REQUEUE); - ATA_DEBUG_RQ(request, "completed reinjecting"); + ATA_DEBUG_RQ(request, "completed reinject"); ata_queue_request(request); return; } - /* finish with error */ + /* nothing more to try so finish with error */ if (!(request->flags & ATA_R_QUIET)) ata_prtdev(request->device, "FAILURE - %s timed out\n", @@ -267,7 +269,7 @@ /* untimeout request now we have control back */ callout_drain(&request->callout); - /* do the all the magic for completition evt retry etc etc */ + /* if this is a soft ECC error warn about it */ if ((request->status & (ATA_S_CORR | ATA_S_ERROR)) == ATA_S_CORR) { ata_prtdev(request->device, "WARNING - %s soft error (ECC corrected)", @@ -408,14 +410,12 @@ ata_timeout(struct ata_request *request) { struct ata_channel *ch = request->device->channel; - int gotit = 0; - /* mark request as no longer running we'll shoot it down shortly */ - ch->running = NULL; + mtx_lock(&ch->state_mtx); ATA_DEBUG_RQ(request, "timeout"); - /* if we saw an interrupt before the timeout, shout and re_arm timeout */ + /* if interrupt has been seen, shout and just rearm timeout */ if (request->flags & ATA_R_INTR_SEEN) { ata_prtdev(request->device, "WARNING - %s interrupt was seen but timeout fired", @@ -428,48 +428,47 @@ if (!dumping) callout_reset(&request->callout, request->timeout * hz, (timeout_t*)ata_timeout, request); + mtx_unlock(&ch->state_mtx); return; } - /* report that we timed out if we have any retries left */ - if (!(request->flags & ATA_R_QUIET) && request->retries > 0) { - ata_prtdev(request->device, - "TIMEOUT - %s retrying (%d retr%s left)", - ata_cmd2str(request), request->retries, - request->retries == 1 ? "y" : "ies"); - if (!(request->flags & (ATA_R_ATAPI | ATA_R_CONTROL))) - printf(" LBA=%llu", (unsigned long long)request->u.ata.lba); - printf("\n"); - } - /* - * if we are waiting for a commend to complete set ATA_TIMEOUT so + * if we are waiting for a command to complete set ATA_TIMEOUT so * we wont loose the race with an eventual interrupt arriving late */ - mtx_lock(&ch->state_mtx); if (ch->state == ATA_ACTIVE) { + request->flags |= ATA_R_TIMEOUT; ch->state = ATA_TIMEOUT; - gotit = 1; - } - else - ata_printf(ch, -1, - "unexpected state in ata_timeout 0x%02x\n", ch->state); - mtx_unlock(&ch->state_mtx); - - /* we got our locks now try to clean up the situation */ - if (gotit) { - request->flags |= ATA_R_TIMEOUT; + ch->running = NULL; + if (!(request->flags & ATA_R_QUIET) && request->retries > 0) { + ata_prtdev(request->device, + "TIMEOUT - %s retrying (%d retr%s left)", + ata_cmd2str(request), request->retries, + request->retries == 1 ? "y" : "ies"); + if (!(request->flags & (ATA_R_ATAPI | ATA_R_CONTROL))) + printf(" LBA=%llu", (unsigned long long)request->u.ata.lba); + printf("\n"); + } ch->hw.end_transaction(request); + mtx_unlock(&ch->state_mtx); ata_finish(request); } + else { + mtx_unlock(&ch->state_mtx); + ata_prtdev(request->device, "timeout state=%d unexpected\n", ch->state); + } } void ata_catch_inflight(struct ata_channel *ch) { - struct ata_request *request = ch->running; + struct ata_request *request; + mtx_lock(&ch->state_mtx); + request = ch->running; ch->running = NULL; + mtx_unlock(&ch->state_mtx); + if (request) { callout_drain(&request->callout); ata_prtdev(request->device, @@ -502,10 +501,14 @@ } mtx_unlock(&ch->queue_mtx); + mtx_lock(&ch->state_mtx); + request = ch->running; + ch->running = NULL; + mtx_unlock(&ch->state_mtx); + /* if we have a request "in flight" fail it as well */ - if ((request = ch->running) && (!device || request->device == device)){ + if (request && (!device || request->device == device)) { callout_drain(&request->callout); - ch->running = NULL; request->result = ENXIO; if (request->callback) (request->callback)(request); ==== //depot/projects/smpng/sys/dev/cx/if_cx.c#14 (text+ko) ==== @@ -23,17 +23,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cx/if_cx.c,v 1.32 2004/09/23 12:21:11 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cx/if_cx.c,v 1.34 2004/10/13 09:27:18 phk Exp $"); #include -#if __FreeBSD_version >= 500000 -# define NCX 1 -#else -# include "cx.h" -#endif - -#if NCX > 0 #include #include #include @@ -44,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -57,14 +51,7 @@ #include #include #include -#if __FreeBSD_version < 500000 -# include -# include -#endif #include -#if __FreeBSD_version <= 501000 -# include -#endif #include #include #include @@ -76,30 +63,12 @@ # include #else # include -# if __FreeBSD_version < 500000 -# include "sppp.h" -# if NSPPP <= 0 -# error The device cx requires sppp or netgraph. -# endif -# endif # include # define PP_CISCO IFF_LINK2 -# if __FreeBSD_version < 500000 -# include -# endif # include -# define NBPFILTER NBPF #endif -#if __FreeBSD_version < 502113 -#define ttyld_modem(foo, bar) ((*linesw[(foo)->t_line].l_modem)((foo), (bar))) -#define ttyld_rint(foo, bar) ((*linesw[(foo)->t_line].l_rint)((bar), (foo))) -#define ttyld_start(foo) ((*linesw[(foo)->t_line].l_start)((foo))) -#define ttyld_open(foo, bar) ((*linesw[(foo)->t_line].l_open) ((bar), (foo))) -#define ttyld_close(foo, bar) ((*linesw[(foo)->t_line].l_close) ((foo), (bar))) -#define ttyld_read(foo, bar, barf) ((*linesw[(foo)->t_line].l_read) ((foo), (bar), (barf))) -#define ttyld_write(foo, bar, barf) ((*linesw[(foo)->t_line].l_write) ((foo), (bar), (barf))) -#endif +#define NCX 1 /* If we don't have Cronyx's sppp version, we don't have fr support via sppp */ #ifndef PP_FR @@ -111,12 +80,6 @@ #define CX_DEBUG2(d,s) ({if (d->chan->debug>1) {\ printf ("%s: ", d->name); printf s;}}) -#define UNIT(d) (minor(d) & 0x3f) -#define IF_CUNIT(d) (minor(d) & 0x40) -#define UNIT_CTL 0x3f -#define CALLOUT(d) (minor(d) & 0x80) -#define CDEV_MAJOR 42 - typedef struct _async_q { int beg; int end; @@ -134,6 +97,9 @@ static int cx_probe __P((device_t)); static int cx_attach __P((device_t)); static int cx_detach __P((device_t)); +static t_open_t cx_topen; +static t_modem_t cx_tmodem; +static t_close_t cx_tclose; static device_method_t cx_isa_methods [] = { DEVMETHOD(device_identify, cx_identify), @@ -147,10 +113,8 @@ unsigned long phys; void *virt; size_t size; -#if __FreeBSD_version >= 500000 bus_dma_tag_t dmat; bus_dmamap_t mapp; -#endif } cx_dma_mem_t; typedef struct _drv_t { @@ -177,7 +141,7 @@ #else struct sppp pp; #endif - struct cdev *devt[3]; + struct cdev *devt; async_q aqueue; #define CX_READ 1 #define CX_WRITE 2 @@ -220,15 +184,8 @@ static void cx_modem (cx_chan_t *c); static void cx_up (drv_t *d); static void cx_start (drv_t *d); -#if __FreeBSD_version < 502113 -static void ttyldoptim(struct tty *tp); -#endif -#if __FreeBSD_version < 500000 -static swihand_t cx_softintr; -#else static void cx_softintr (void *); static void *cx_fast_ih; -#endif static void cx_down (drv_t *d); static void cx_watchdog (drv_t *d); static void cx_carrier (void *arg); @@ -335,11 +292,7 @@ if (d->tty->t_dev) { d->intr_action |= CX_WRITE; MY_SOFT_INTR = 1; -#if __FreeBSD_version >= 500000 swi_sched (cx_fast_ih, 0); -#else - setsofttty (); -#endif } CX_DEBUG (d, ("cx_timeout\n")); } @@ -579,7 +532,6 @@ return 0; } -#if __FreeBSD_version >= 500000 static void cx_bus_dmamap_addr (void *arg, bus_dma_segment_t *segs, int nseg, int error) { @@ -636,28 +588,6 @@ bus_dmamem_free (dmem->dmat, dmem->virt, dmem->mapp); bus_dma_tag_destroy (dmem->dmat); } -#else -static int -cx_bus_dma_mem_alloc (int bnum, int cnum, cx_dma_mem_t *dmem) -{ - dmem->virt = contigmalloc (dmem->size, M_DEVBUF, M_WAITOK, - 0x100000, 0x1000000, 16, 0); - if (dmem->virt == NULL) { - if (cnum >= 0) printf ("cx%d-%d: ", bnum, cnum); - else printf ("cx%d: ", bnum); - printf ("couldn't allocate memory for dma memory\n", unit); - return 0; - } - dmem->phys = vtophys (dmem->virt); - return 1; -} - -static void -cx_bus_dma_mem_free (cx_dma_mem_t *dmem) -{ - contigfree (dmem->virt, dmem->size, M_DEVBUF); -} -#endif /* * The adapter is present, initialize the driver structures. @@ -801,8 +731,6 @@ printf ("cx%d: \n", b->num, b->name); for (c=b->chan; cchan+NCHAN; ++c) { - char *dnmt="tty %x"; - char *dnmc="cua %x"; if (c->type == T_NONE) continue; d = &bd->channel[c->num]; @@ -832,21 +760,12 @@ cx_bus_dma_mem_free (&d->dmamem); continue; } -#if __FreeBSD_version >= 500000 NG_NODE_SET_PRIVATE (d->node, d); -#else - d->node->private = d; -#endif sprintf (d->nodename, "%s%d", NG_CX_NODE_TYPE, c->board->num*NCHAN + c->num); if (ng_name_node (d->node, d->nodename)) { printf ("%s: cannot name node\n", d->nodename); -#if __FreeBSD_version >= 500000 NG_NODE_UNREF (d->node); -#else - ng_rmnode (d->node); - ng_unref (d->node); -#endif channel [b->num*NCHAN + c->num] = 0; c->sys = 0; cx_bus_dma_mem_free (&d->dmamem); @@ -854,18 +773,11 @@ } d->lo_queue.ifq_maxlen = IFQ_MAXLEN; d->hi_queue.ifq_maxlen = IFQ_MAXLEN; -#if __FreeBSD_version >= 500000 mtx_init (&d->lo_queue.ifq_mtx, "cx_queue_lo", NULL, MTX_DEF); mtx_init (&d->hi_queue.ifq_mtx, "cx_queue_hi", NULL, MTX_DEF); -#endif #else /*NETGRAPH*/ d->pp.pp_if.if_softc = d; -#if __FreeBSD_version > 501000 if_initname (&d->pp.pp_if, "cx", b->num * NCHAN + c->num); -#else - d->pp.pp_if.if_unit = b->num * NCHAN + c->num; - d->pp.pp_if.if_name = "cx"; -#endif d->pp.pp_if.if_mtu = PP_MTU; d->pp.pp_if.if_flags = IFF_POINTOPOINT | IFF_MULTICAST | IFF_NEEDSGIANT; @@ -882,16 +794,23 @@ bpfattach (&d->pp.pp_if, DLT_PPP, 4); #endif /*NETGRAPH*/ } + d->tty = ttyalloc (); + d->tty->t_open = cx_topen; + d->tty->t_close = cx_tclose; + d->tty->t_param = cx_param; + d->tty->t_stop = cx_stop; + d->tty->t_modem = cx_tmodem; + d->tty->t_sc = d; cx_start_chan (c, d->dmamem.virt, d->dmamem.phys); cx_register_receive (c, &cx_receive); cx_register_transmit (c, &cx_transmit); cx_register_error (c, &cx_error); cx_register_modem (c, &cx_modem); - dnmt[3] = 'x'+b->num; - dnmc[3] = 'x'+b->num; - d->devt[0] = make_dev (&cx_cdevsw, b->num*NCHAN + c->num, UID_ROOT, GID_WHEEL, 0644, dnmt, b->num*NCHAN + c->num); - d->devt[1] = make_dev (&cx_cdevsw, b->num*NCHAN + c->num + 64, UID_ROOT, GID_WHEEL, 0600, "cx%d", b->num*NCHAN + c->num); - d->devt[2] = make_dev (&cx_cdevsw, b->num*NCHAN + c->num + 128, UID_ROOT, GID_WHEEL, 0660, dnmc, b->num*NCHAN + c->num); + + ttycreate(d->tty, NULL, 0, MINOR_CALLOUT, + "x%r%r", b->num, c->num); + d->devt = make_dev (&cx_cdevsw, b->num*NCHAN + c->num + 64, UID_ROOT, GID_WHEEL, 0600, "cx%d", b->num*NCHAN + c->num); + d->devt->si_drv1 = d; } splx (s); @@ -958,15 +877,12 @@ if (!d || d->chan->type == T_NONE) continue; -#if __FreeBSD_version >= 502113 if (d->tty) { - ttyrel (d->tty); + ttyfree (d->tty); d->tty = NULL; } -#endif #ifdef NETGRAPH -#if __FreeBSD_version >= 500000 if (d->node) { ng_rmnode_self (d->node); NG_NODE_UNREF (d->node); @@ -975,22 +891,14 @@ mtx_destroy (&d->lo_queue.ifq_mtx); mtx_destroy (&d->hi_queue.ifq_mtx); #else - ng_rmnode (d->node); - d->node = NULL; -#endif -#else -#if __FreeBSD_version >= 410000 && NBPFILTER > 0 /* Detach from the packet filter list of interfaces. */ bpfdetach (&d->pp.pp_if); -#endif /* Detach from the sync PPP list. */ sppp_detach (&d->pp.pp_if); if_detach (&d->pp.pp_if); #endif - destroy_dev (d->devt[0]); - destroy_dev (d->devt[1]); - destroy_dev (d->devt[2]); + destroy_dev (d->devt); } cx_led_off (b); @@ -1167,11 +1075,7 @@ return; #ifndef NETGRAPH if (d->pp.pp_if.if_bpf) -#if __FreeBSD_version >= 500000 BPF_MTAP (&d->pp.pp_if, m); -#else - bpf_mtap (&d->pp.pp_if, m); -#endif #endif len = m->m_pkthdr.len; if (! m->m_next) @@ -1248,11 +1152,7 @@ if (d->tty->t_dev) { d->intr_action |= CX_WRITE; MY_SOFT_INTR = 1; -#if __FreeBSD_version >= 500000 swi_sched (cx_fast_ih, 0); -#else - setsofttty (); -#endif } return; } @@ -1274,7 +1174,7 @@ drv_t *d = c->sys; struct mbuf *m; char *cc = data; -#if __FreeBSD_version >= 500000 && defined NETGRAPH +#if defined NETGRAPH int error; #endif @@ -1302,11 +1202,7 @@ d->intr_action |= CX_READ; MY_SOFT_INTR = 1; -#if __FreeBSD_version >= 500000 swi_sched (cx_fast_ih, 0); -#else - setsofttty (); -#endif } return; } @@ -1325,41 +1221,24 @@ printmbuf (m); #ifdef NETGRAPH m->m_pkthdr.rcvif = 0; -#if __FreeBSD_version >= 500000 NG_SEND_DATA_ONLY (error, d->hook, m); #else - ng_queue_data (d->hook, m, 0); -#endif -#else ++d->pp.pp_if.if_ipackets; m->m_pkthdr.rcvif = &d->pp.pp_if; /* Check if there's a BPF listener on this interface. * If so, hand off the raw packet to bpf. */ if (d->pp.pp_if.if_bpf) -#if __FreeBSD_version >= 500000 BPF_TAP (&d->pp.pp_if, data, len); -#else - bpf_tap (&d->pp.pp_if, data, len); -#endif sppp_input (&d->pp.pp_if, m); #endif } -#if __FreeBSD_version < 502113 -#define CONDITION(t,tp) (!(t->c_iflag & (ICRNL | IGNCR | IMAXBEL | INLCR | ISTRIP | IXON))\ - && (!(tp->t_iflag & BRKINT) || (tp->t_iflag & IGNBRK))\ - && (!(tp->t_iflag & PARMRK)\ - || (tp->t_iflag & (IGNPAR | IGNBRK)) == (IGNPAR | IGNBRK))\ - && !(t->c_lflag & (ECHO | ICANON | IEXTEN | ISIG | PENDIN))\ - && linesw[tp->t_line].l_rint == ttyinput) -#else #define CONDITION(t,tp) (!(t->c_iflag & (ICRNL | IGNCR | IMAXBEL | INLCR | ISTRIP | IXON))\ && (!(tp->t_iflag & BRKINT) || (tp->t_iflag & IGNBRK))\ && (!(tp->t_iflag & PARMRK)\ || (tp->t_iflag & (IGNPAR | IGNBRK)) == (IGNPAR | IGNBRK))\ && !(t->c_lflag & (ECHO | ICANON | IEXTEN | ISIG | PENDIN))\ && linesw[tp->t_line]->l_rint == ttyinput) -#endif /* * Error callback function. @@ -1384,11 +1263,7 @@ AQ_PUSH (q, TTY_FE); d->intr_action |= CX_READ; MY_SOFT_INTR = 1; -#if __FreeBSD_version >= 500000 swi_sched (cx_fast_ih, 0); -#else - setsofttty (); -#endif } #ifndef NETGRAPH else @@ -1405,11 +1280,7 @@ AQ_PUSH (q, TTY_PE); d->intr_action |= CX_READ; MY_SOFT_INTR = 1; -#if __FreeBSD_version >= 500000 swi_sched (cx_fast_ih, 0); -#else - setsofttty (); -#endif } #ifndef NETGRAPH else @@ -1425,11 +1296,7 @@ AQ_PUSH (q, TTY_OE); d->intr_action |= CX_READ; MY_SOFT_INTR = 1; -#if __FreeBSD_version >= 500000 swi_sched (cx_fast_ih, 0); -#else - setsofttty (); -#endif } #endif #ifndef NETGRAPH @@ -1468,11 +1335,7 @@ AQ_PUSH (q, TTY_BI); d->intr_action |= CX_READ; MY_SOFT_INTR = 1; -#if __FreeBSD_version >= 500000 swi_sched (cx_fast_ih, 0); -#else - setsofttty (); -#endif } #ifndef NETGRAPH else @@ -1484,233 +1347,92 @@ } } -#if __FreeBSD_version < 500000 -static int cx_open (dev_t dev, int flag, int mode, struct proc *p) -#else -static int cx_open (struct cdev *dev, int flag, int mode, struct thread *td) -#endif +static int cx_topen (struct tty *tp, struct cdev *dev) { - int unit = UNIT (dev); drv_t *d; - int error; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Oct 13 22:15:08 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 84F6E16A4D2; Wed, 13 Oct 2004 22:15:08 +0000 (GMT) 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 567B516A4CF for ; Wed, 13 Oct 2004 22:15:08 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ECB1343D54 for ; Wed, 13 Oct 2004 22:15:07 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9DMF7JJ044482 for ; Wed, 13 Oct 2004 22:15:07 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9DMF7Do044479 for perforce@freebsd.org; Wed, 13 Oct 2004 22:15:07 GMT (envelope-from peter@freebsd.org) Date: Wed, 13 Oct 2004 22:15:07 GMT Message-Id: <200410132215.i9DMF7Do044479@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 63177 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: Wed, 13 Oct 2004 22:15:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=63177 Change 63177 by peter@peter_daintree on 2004/10/13 22:14:49 IFC @63176 Affected files ... .. //depot/projects/hammer/Makefile.inc1#64 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#37 integrate .. //depot/projects/hammer/etc/remote#6 integrate .. //depot/projects/hammer/lib/libc/string/strerror.3#4 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_exit.c#13 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_join.c#9 integrate .. //depot/projects/hammer/sbin/dmesg/dmesg.c#9 integrate .. //depot/projects/hammer/share/man/man4/Makefile#52 integrate .. //depot/projects/hammer/share/man/man4/de.4#6 integrate .. //depot/projects/hammer/share/man/man4/man4.sparc64/auxio.4#2 integrate .. //depot/projects/hammer/share/man/man4/ng_ubt.4#10 integrate .. //depot/projects/hammer/share/man/man4/re.4#10 integrate .. //depot/projects/hammer/share/man/man4/tcp.4#12 integrate .. //depot/projects/hammer/share/man/man9/Makefile#42 integrate .. //depot/projects/hammer/share/man/man9/contigmalloc.9#3 integrate .. //depot/projects/hammer/share/man/man9/hashinit.9#1 branch .. //depot/projects/hammer/share/misc/scsi_modes#2 integrate .. //depot/projects/hammer/share/monetdef/Makefile#15 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_da.h#2 integrate .. //depot/projects/hammer/sys/conf/files#87 integrate .. //depot/projects/hammer/sys/conf/kmod.mk#36 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#48 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#40 integrate .. //depot/projects/hammer/sys/dev/ata/ata-queue.c#19 integrate .. //depot/projects/hammer/sys/dev/cx/if_cx.c#19 integrate .. //depot/projects/hammer/sys/dev/cx/machdep.h#3 integrate .. //depot/projects/hammer/sys/dev/dcons/dcons.c#10 integrate .. //depot/projects/hammer/sys/dev/dcons/dcons.h#3 integrate .. //depot/projects/hammer/sys/dev/dcons/dcons_crom.c#5 integrate .. //depot/projects/hammer/sys/dev/dcons/dcons_os.c#1 branch .. //depot/projects/hammer/sys/dev/dcons/dcons_os.h#1 branch .. //depot/projects/hammer/sys/dev/md/md.c#41 integrate .. //depot/projects/hammer/sys/dev/ofw/ofw_console.c#16 integrate .. //depot/projects/hammer/sys/dev/random/randomdev_soft.c#6 integrate .. //depot/projects/hammer/sys/dev/sab/sab.c#21 integrate .. //depot/projects/hammer/sys/dev/sio/sio.c#43 integrate .. //depot/projects/hammer/sys/dev/sound/isa/ad1816.c#10 integrate .. //depot/projects/hammer/sys/dev/sound/isa/es1888.c#5 integrate .. //depot/projects/hammer/sys/dev/sound/isa/ess.c#9 integrate .. //depot/projects/hammer/sys/dev/sound/isa/mss.c#9 integrate .. //depot/projects/hammer/sys/dev/sound/isa/sb16.c#12 integrate .. //depot/projects/hammer/sys/dev/sound/isa/sb8.c#9 integrate .. //depot/projects/hammer/sys/dev/sound/pci/au88x0.c#8 integrate .. //depot/projects/hammer/sys/dev/sound/pci/aureal.c#8 integrate .. //depot/projects/hammer/sys/dev/sound/pci/csapcm.c#9 integrate .. //depot/projects/hammer/sys/dev/sound/pci/ds1.c#10 integrate .. //depot/projects/hammer/sys/dev/sound/pci/emu10k1.c#14 integrate .. //depot/projects/hammer/sys/dev/sound/pci/es137x.c#8 integrate .. //depot/projects/hammer/sys/dev/sound/pci/fm801.c#10 integrate .. //depot/projects/hammer/sys/dev/sound/pci/ich.c#17 integrate .. //depot/projects/hammer/sys/dev/sound/pci/maestro3.c#9 integrate .. //depot/projects/hammer/sys/dev/sound/pci/solo.c#9 integrate .. //depot/projects/hammer/sys/dev/sound/pci/t4dwave.c#10 integrate .. //depot/projects/hammer/sys/dev/sound/pci/via8233.c#11 integrate .. //depot/projects/hammer/sys/dev/sound/pci/via82c686.c#11 integrate .. //depot/projects/hammer/sys/dev/uart/uart_bus.h#6 integrate .. //depot/projects/hammer/sys/dev/uart/uart_tty.c#14 integrate .. //depot/projects/hammer/sys/dev/usb/ubser.c#9 integrate .. //depot/projects/hammer/sys/dev/usb/ucycom.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/ugen.c#22 integrate .. //depot/projects/hammer/sys/dev/usb/uhci_pci.c#10 integrate .. //depot/projects/hammer/sys/dev/usb/umass.c#26 integrate .. //depot/projects/hammer/sys/geom/geom_subr.c#30 integrate .. //depot/projects/hammer/sys/i386/i386/elan-mmcr.c#19 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_misc.c#10 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_socksys.c#4 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_sysi86.c#4 integrate .. //depot/projects/hammer/sys/i4b/driver/i4b_ipr.c#12 integrate .. //depot/projects/hammer/sys/i4b/driver/i4b_isppp.c#10 integrate .. //depot/projects/hammer/sys/kern/kern_condvar.c#20 integrate .. //depot/projects/hammer/sys/kern/kern_event.c#25 integrate .. //depot/projects/hammer/sys/kern/kern_mutex.c#26 integrate .. //depot/projects/hammer/sys/kern/kern_subr.c#15 integrate .. //depot/projects/hammer/sys/kern/kern_switch.c#33 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#43 integrate .. //depot/projects/hammer/sys/kern/kern_sysctl.c#18 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#69 integrate .. //depot/projects/hammer/sys/kern/kern_xxx.c#10 integrate .. //depot/projects/hammer/sys/kern/subr_bus.c#27 integrate .. //depot/projects/hammer/sys/kern/subr_sleepqueue.c#10 integrate .. //depot/projects/hammer/sys/kern/subr_turnstile.c#14 integrate .. //depot/projects/hammer/sys/kern/tty.c#29 integrate .. //depot/projects/hammer/sys/modules/dcons/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/dcons_crom/Makefile#2 integrate .. //depot/projects/hammer/sys/net/bridge.c#19 integrate .. //depot/projects/hammer/sys/net/bridge.h#3 integrate .. //depot/projects/hammer/sys/net/if_ethersubr.c#34 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#14 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#4 integrate .. //depot/projects/hammer/sys/netgraph/ng_ether.c#15 integrate .. //depot/projects/hammer/sys/netinet/if_ether.c#15 integrate .. //depot/projects/hammer/sys/netinet/raw_ip.c#29 integrate .. //depot/projects/hammer/sys/netinet/udp_usrreq.c#25 integrate .. //depot/projects/hammer/sys/netncp/ncp_ncp.c#9 integrate .. //depot/projects/hammer/sys/pc98/pc98/sio.c#32 integrate .. //depot/projects/hammer/sys/sys/mbuf.h#34 integrate .. //depot/projects/hammer/sys/sys/random.h#3 integrate .. //depot/projects/hammer/sys/sys/sleepqueue.h#5 integrate .. //depot/projects/hammer/sys/sys/ttydefaults.h#5 integrate .. //depot/projects/hammer/sys/sys/turnstile.h#4 integrate .. //depot/projects/hammer/usr.sbin/config/lang.l#7 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#64 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.448 2004/09/27 08:23:42 dougb Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.449 2004/10/11 23:51:13 peter Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -265,7 +265,7 @@ rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c .endif .for _dir in \ - usr/bin usr/games usr/include/c++/3.3 usr/include/sys usr/lib \ + usr/bin usr/games usr/include/c++/3.4 usr/include/sys usr/lib \ usr/libexec usr/sbin usr/share/dict \ usr/share/groff_font/devX100 \ usr/share/groff_font/devX100-12 \ ==== //depot/projects/hammer/etc/defaults/rc.conf#37 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.220 2004/09/29 07:07:43 trhodes Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.225 2004/10/13 07:12:14 ru Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -152,7 +152,6 @@ syslogd_enable="YES" # Run syslog daemon (or NO). syslogd_program="/usr/sbin/syslogd" # path to syslogd, if you want a different one. syslogd_flags="-s" # Flags to syslogd (if enabled). -#syslogd_flags="-ss" # Syslogd flags to not bind an inet socket inetd_enable="NO" # Run the network daemon dispatcher (YES/NO). inetd_program="/usr/sbin/inetd" # path to inetd, if you want a different one. inetd_flags="-wW -C 60" # Optional flags to inetd @@ -438,7 +437,7 @@ osf1_enable="NO" # Alpha OSF/1 emulation loaded at startup (or NO). clear_tmp_enable="NO" # Clear /tmp at startup. ldconfig_insecure="NO" # Set to YES to disable ldconfig security checks -ldconfig_paths="/usr/lib/compat /usr/X11R6/lib /usr/local/lib" +ldconfig_paths="/usr/lib/compat /usr/X11R6/lib /usr/local/lib /usr/local/lib/compat/pkg" # shared library search paths ldconfig_paths_aout="/usr/lib/compat/aout /usr/X11R6/lib/aout /usr/local/lib/aout" # a.out shared library search paths ==== //depot/projects/hammer/etc/remote#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/remote,v 1.15 2004/06/06 11:46:27 schweikh Exp $ +# $FreeBSD: src/etc/remote,v 1.16 2004/10/13 08:32:34 phk Exp $ # # @(#)remote 5.2 (Berkeley) 6/30/90 # @@ -52,17 +52,17 @@ dial14400|14400 Baud Hayes attributes:\ br#57600:tc=dial: dial|Generic dialing parameters:\ - :dv=/dev/cuaa0:cu=/dev/cuaa0:at=hayes:du:pa=none: + :dv=/dev/cuad0:cu=/dev/cuad0:at=hayes:du:pa=none: # Hardwired line -cuaa0c|cua0c:dv=/dev/cuaa0:br#9600:pa=none: +cuad0c|cua0c:dv=/dev/cuad0:br#9600:pa=none: # Finger friendly shortcuts -sio0|com1:dv=/dev/cuaa0:br#9600:pa=none: -sio1|com2:dv=/dev/cuaa1:br#9600:pa=none: -sio2|com3:dv=/dev/cuaa2:br#9600:pa=none: -sio3|com4:dv=/dev/cuaa3:br#9600:pa=none: -sio4|com5:dv=/dev/cuaa4:br#9600:pa=none: -sio5|com6:dv=/dev/cuaa5:br#9600:pa=none: -sio6|com7:dv=/dev/cuaa6:br#9600:pa=none: -sio7|com8:dv=/dev/cuaa7:br#9600:pa=none: +sio0|com1:dv=/dev/cuad0:br#9600:pa=none: +sio1|com2:dv=/dev/cuad1:br#9600:pa=none: +sio2|com3:dv=/dev/cuad2:br#9600:pa=none: +sio3|com4:dv=/dev/cuad3:br#9600:pa=none: +sio4|com5:dv=/dev/cuad4:br#9600:pa=none: +sio5|com6:dv=/dev/cuad5:br#9600:pa=none: +sio6|com7:dv=/dev/cuad6:br#9600:pa=none: +sio7|com8:dv=/dev/cuad7:br#9600:pa=none: ==== //depot/projects/hammer/lib/libc/string/strerror.3#4 (text+ko) ==== @@ -34,9 +34,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)strerror.3 8.1 (Berkeley) 6/9/93 -.\" $FreeBSD: src/lib/libc/string/strerror.3,v 1.22 2002/12/19 10:24:52 tjr Exp $ +.\" $FreeBSD: src/lib/libc/string/strerror.3,v 1.23 2004/10/12 14:52:52 keramida Exp $ .\" -.Dd December 19, 2002 +.Dd October 12, 2004 .Dt STRERROR 3 .Os .Sh NAME @@ -102,18 +102,17 @@ .Pq Dq Li ":\ " ; otherwise, only the error message string is printed. .Pp -If -.Fa errnum -is not a recognized error number, +If the error number is not recognized, these functions return an error message +string containing +.Dq Li "Unknown error:\ " +followed by the error number in decimal. +The .Fn strerror -returns an error message string containing -.Dq Li "Unknown error:\ " -followed by the error number in decimal, while +and .Fn strerror_r -leaves -.Fa strerrbuf -unchanged and returns -.Er EINVAL . +functions return +.Er EINVAL +as a warning. Error numbers recognized by this implementation fall in the range 0 < .Fa errnum ==== //depot/projects/hammer/lib/libthr/thread/thr_exit.c#13 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_exit.c,v 1.15 2004/10/08 14:48:02 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_exit.c,v 1.16 2004/10/13 11:42:20 mtm Exp $ */ #include #include @@ -195,7 +195,8 @@ TAILQ_FOREACH_SAFE(ptd, &_dead_list, dle, ptdTemp) { /* Don't destroy the initial thread or non-detached threads. */ if (ptd == _thread_initial || - (ptd->attr.flags & PTHREAD_DETACHED) == 0) + (ptd->attr.flags & PTHREAD_DETACHED) == 0 || + !ptd->isdead) continue; TAILQ_REMOVE(&_dead_list, ptd, dle); deadlist_free_onethread(ptd); ==== //depot/projects/hammer/lib/libthr/thread/thr_join.c#9 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_join.c,v 1.14 2004/05/20 12:06:16 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_join.c,v 1.15 2004/10/13 11:42:20 mtm Exp $ */ #include #include @@ -41,7 +41,7 @@ int _pthread_join(pthread_t pthread, void **thread_return) { - int ret = 0; + int ret, dead; pthread_t thread; /* Check if the caller has specified an invalid thread: */ @@ -60,6 +60,9 @@ * the searches in _thread_list and _dead_list (as well as setting up * join/detach state) have to be done atomically. */ + ret = 0; + dead = 0; + thread = NULL; _thread_sigblock(); DEAD_LIST_LOCK; THREAD_LIST_LOCK; @@ -70,10 +73,12 @@ break; } } - } else { + } + if (thread == NULL) { TAILQ_FOREACH(thread, &_dead_list, dle) { if (thread == pthread) { PTHREAD_LOCK(pthread); + dead = 1; break; } } @@ -109,7 +114,7 @@ } /* Check if the thread is not dead: */ - if (!pthread->isdead) { + if (!dead) { /* Set the running thread to be the joiner: */ pthread->joiner = curthread; PTHREAD_UNLOCK(pthread); ==== //depot/projects/hammer/sbin/dmesg/dmesg.c#9 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/dmesg/dmesg.c,v 1.25 2004/10/03 15:48:32 stefanf Exp $"); +__FBSDID("$FreeBSD: src/sbin/dmesg/dmesg.c,v 1.26 2004/10/13 20:33:18 schweikh Exp $"); #include #include @@ -99,7 +99,8 @@ usage(); } argc -= optind; - argv += optind; + if (argc != 0) + usage(); if (memf == NULL) { /* ==== //depot/projects/hammer/share/man/man4/Makefile#52 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.285 2004/10/07 12:10:24 mlaier Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.287 2004/10/12 23:38:22 emax Exp $ MAN= aac.4 \ acpi.4 \ ==== //depot/projects/hammer/share/man/man4/de.4#6 (text+ko) ==== @@ -23,7 +23,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/de.4,v 1.17 2004/09/16 20:29:19 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/de.4,v 1.18 2004/10/13 11:03:50 brueffer Exp $ .\" .Dd August 15, 2004 .Dt DE 4 @@ -92,12 +92,12 @@ .It Adaptec ANA-6944/TX .It -Asante -.It Cogent EM100FX and EM440TX .It Corega FastEther PCI-TX .It +D-Link DFE-500TX +.It DEC DE435, DE425, DEC DE450, and DEC DE500 .It ELECOM LD-PCI2T, LD-PCITS ==== //depot/projects/hammer/share/man/man4/man4.sparc64/auxio.4#2 (text+ko) ==== @@ -23,10 +23,10 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/man4.sparc64/auxio.4,v 1.1 2004/10/09 07:31:02 yongari Exp $ +.\" $FreeBSD: src/share/man/man4/man4.sparc64/auxio.4,v 1.2 2004/10/13 05:15:41 yongari Exp $ .\" .Dd October 8, 2004 -.Dt AUXIO 4 +.Dt AUXIO 4 sparc64 .Os .Sh NAME .Nm auxio @@ -40,16 +40,16 @@ .Nm device provides auxiliary I/O functions required by Sun .Tn UltraSPARC -workstation and server models. The front panel LED is also -controlled by the deivce. +workstation and server models. +The front panel LED is also controlled by the deivce. This LED can be made to blink by writing .Tn ASCII strings to the -.Pa /dev/led/auxio +.Pa /dev/led/auxioled device. .Sh FILES -.Bl -tag -width "/dev/led/auxio" -.It Pa /dev/led/auxio +.Bl -tag -width ".Pa /dev/led/auxioled" +.It Pa /dev/led/auxioled Auxiliary I/O device node .El .Sh SEE ALSO @@ -57,14 +57,16 @@ .Sh HISTORY The .Nm -driver was written for -.Nx -by -.An Matthew R. Green . +driver appeared in +.Fx 5.3 . +.Sh AUTHORS +.An -nosplit The .Nm -driver was then ported to -.Fx 5.3 -by +driver was ported by .An Pyun YongHyeon -.Aq yongari@FreeBSD.org . +.Aq yongari@FreeBSD.org +from the +.Nx +driver written by +.An Matthew R. Green . ==== //depot/projects/hammer/share/man/man4/ng_ubt.4#10 (text+ko) ==== @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .\" $Id: ng_ubt.4,v 1.3 2003/05/21 19:37:35 max Exp $ -.\" $FreeBSD: src/share/man/man4/ng_ubt.4,v 1.9 2004/09/16 18:46:21 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/ng_ubt.4,v 1.10 2004/10/12 23:35:34 emax Exp $ .\" .Dd September 13, 2004 .Dt NG_UBT 4 @@ -102,86 +102,6 @@ input (output) errors. .It Dv NGM_UBT_NODE_RESET_STAT Reset all statistic counters to zero. -.It Dv NGM_UBT_NODE_DEV_NODES -This command takes a single integer parameter. -If the parameter's value is not zero, then the driver will create device nodes -for the control, interrupt, bulk-in and bulk-out endpoints. -If the parameter's value is zero, then the driver will destroy the device nodes -for the endpoints. -The device nodes interface is mutually exclusive with the Netgraph interface. -.El -.Sh DEVICE NODES INTERFACE -The -.Nm ubt -driver can create or destroy endpoint device nodes on request. -This feature can be used to implement an external firmware download utility. -.Pp -Control transfers can only happen on the control endpoint which -is always endpoint 0. -Control requests are issued by -.Xr ioctl 2 -calls. -.Pp -Only incoming transfers are supported on an interrupt endpoint. -To perform I/O on an interrupt endpoint, -.Xr read 2 -should be used. -All I/O operations on an interrupt endpoint are unbuffered. -.Pp -The bulk transfers can be in or out depending on the endpoint. -To perform I/O on a bulk endpoint, -.Xr read 2 -and -.Xr write 2 -should be used. -All I/O operations on a bulk endpoint are unbuffered. -.Pp -The control endpoint (endpoint 0) handles the following -.Xr ioctl 2 -calls: -.Bl -tag -width indent -.It Dv USB_GET_DEVICE_DESC Pq Vt usb_device_descriptor_t -Return the device descriptor. -.It Dv USB_GET_STRING_DESC Pq Vt "struct usb_string_desc" -Get a string descriptor for the given language ID and string index. -.Bd -literal -struct usb_string_desc { - int string_index; - int language_id; - usb_string_descriptor_t desc; -}; -.Ed -.It Dv USB_DO_REQUEST Pq Vt "struct usb_ctl_request" -Send a USB request to the device on the control endpoint. -Any data sent to/from the device is located at -.Va data . -The size of the transferred data is determined from the -.Va request . -The -.Va addr -field is ignored in this call. -The -.Va flags -field can be used to flag that the request is allowed to -be shorter than the requested size, and the -.Va actlen -will contain the actual size on completion. -.Bd -literal -struct usb_ctl_request { - int addr; - usb_device_request_t request; - void *data; - int flags; -#define USBD_SHORT_XFER_OK 0x04 /* allow short reads */ - int actlen; /* actual length transferred */ -}; -.Ed -This is a dangerous operation in that it can perform arbitrary operations -on the device. -Some of the most dangerous (e.g., changing the device address) are not allowed. -.It Dv USB_GET_DEVICEINFO Pq Vt "struct usb_device_info" -Get an information summary for the device. -This call will not issue any USB transactions. .El .Sh SHUTDOWN This node shuts down when the corresponding USB device is un-plugged. @@ -189,14 +109,6 @@ Isochronous USB transfers are broken. This means that the USB device will not be able to transfer SCO data (voice). USB interrupt transfers are implemented as bulk-in transfers (not really a bug). -.Sh FILES -.Bl -tag -width ".Pa /dev/ubt Ns Ar N Ns Pa \&. Ns Ar EE" -compact -.It Pa /dev/ubt Ns Ar N Ns Pa \&. Ns Ar EE -Endpoint -.Ar EE -of device -.Ar N . -.El .Sh SEE ALSO .Xr netgraph 4 , .Xr ugen 4 , ==== //depot/projects/hammer/share/man/man4/re.4#10 (text+ko) ==== @@ -28,9 +28,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/re.4,v 1.9 2004/09/28 18:24:19 jmg Exp $ +.\" $FreeBSD: src/share/man/man4/re.4,v 1.10 2004/10/12 21:43:03 jmg Exp $ .\" -.Dd September 4, 2004 +.Dd September 28, 2004 .Dt RE 4 .Os .Sh NAME ==== //depot/projects/hammer/share/man/man4/tcp.4#12 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)tcp.4 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/share/man/man4/tcp.4,v 1.46 2004/08/03 13:54:11 andre Exp $ +.\" $FreeBSD: src/share/man/man4/tcp.4,v 1.49 2004/10/13 12:05:33 maxim Exp $ .\" -.Dd July 10, 2004 +.Dd October 12, 2004 .Dt TCP 4 .Os .Sh NAME @@ -482,6 +482,9 @@ which allows the receiver to inform the sender about all successfully arrived segments, allowing the sender to retransmit the missing segments only. +.It Va sack.initburst +Control the number of SACK retransmissions done upon initiation of SACK +recovery. .El .Sh ERRORS A socket operation may fail with one of the following errors returned: ==== //depot/projects/hammer/share/man/man9/Makefile#42 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.244 2004/10/08 09:52:56 glebius Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.245 2004/10/12 02:36:24 jkoshy Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -103,6 +103,7 @@ g_provider_by_name.9 \ groupmember.9 \ g_wither_geom.9 \ + hashinit.9 \ hexdump.9 \ ieee80211.9 \ ieee80211_crypto.9 \ @@ -467,6 +468,8 @@ MLINKS+=g_provider.9 g_destroy_provider.9 \ g_provider.9 g_error_provider.9 \ g_provider.9 g_new_providerf.9 +MLINKS+=hashinit.9 hashdestroy.9 \ + hashinit.9 phashinit.9 MLINKS+=ieee80211.9 ieee80211_attach.9 \ ieee80211.9 ieee80211_chan2ieee.9 \ ieee80211.9 ieee80211_chan2mode.9 \ ==== //depot/projects/hammer/share/man/man9/contigmalloc.9#3 (text+ko) ==== @@ -11,10 +11,10 @@ .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. .\" -.\" THIS SOFTWARE IS PROVIDED BY JOSEPH KOSHY AND CONTRIBUTORS ``AS IS'' +.\" 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 +.\" PURPOSE 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 @@ -23,7 +23,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/contigmalloc.9,v 1.3 2004/08/10 16:38:19 green Exp $ +.\" $FreeBSD: src/share/man/man9/contigmalloc.9,v 1.4 2004/10/12 02:04:11 jkoshy Exp $ .\" .Dd August 10, 2004 .Dt CONTIGMALLOC 9 ==== //depot/projects/hammer/share/misc/scsi_modes#2 (text+ko) ==== @@ -29,7 +29,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/share/misc/scsi_modes,v 1.11 2002/02/24 13:27:57 joerg Exp $ +# $FreeBSD: src/share/misc/scsi_modes,v 1.12 2004/10/12 08:51:04 bms Exp $ # # The ordering is alphabetical by page name, as it appears in the SCSI spec. @@ -291,6 +291,18 @@ {Reserved} *i4 } +# Removable devices +0x1b "Removable Block Access Capacities Page" { + {System Floppy Type Device} t1 + {Supports Reporting Format Progress} t1 + {Reserved} *t6 + {Non CD Optical Device} t1 + {Single or Multiple LUN Supported} t1 + {Reserved} *t3 + {Total Logical Units Supported} t3 + {Reserved} *i8 +} + # CD-ROM (and CD-R[W]) devices 0x2a "CD capabilities and mechanical status page" { {Reserved} *t4 ==== //depot/projects/hammer/share/monetdef/Makefile#15 (text+ko) ==== @@ -1,9 +1,6 @@ -# $FreeBSD: src/share/monetdef/Makefile,v 1.60 2004/08/28 13:24:24 tjr Exp $ +# $FreeBSD: src/share/monetdef/Makefile,v 1.61 2004/10/13 15:47:02 ru Exp $ -NOMAN=YES -CLEANFILES+= ${LOCALES:S/$/.out/g} - -LOCALES= af_ZA.ISO8859-1 \ +LOCALES= af_ZA.ISO8859-1 \ am_ET.UTF-8 \ be_BY.CP1131 \ be_BY.CP1251 \ @@ -77,94 +74,56 @@ zh_HK.UTF-8 \ zh_TW.Big5 -LOCALEDIR= ${DESTDIR}/usr/share/locale - -ASCIILINKS= en_AU en_CA en_GB en_NZ en_US -LATIN15LINKS= af_ZA ca_ES da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_NZ \ - en_US es_ES fi_FI fr_BE fr_CA fr_CH fr_FR is_IS is_IS it_IT \ - it_CH nl_BE nl_NL no_NO pt_PT sv_SE +LOCALEDIR= /usr/share/locale -UTF8_LATIN1LINKS= af_ZA ca_ES da_DK de_AT de_CH de_DE en_AU en_CA en_NZ \ - en_US es_ES fi_FI fr_BE fr_CA fr_FR is_IS it_IT nl_BE \ - nl_NL no_NO pt_BR pt_PT sv_SE -UTF8_LATIN2LINKS= hr_HR hu_HU ro_RO sk_SK sl_SI sr_YU -UTF8_LATIN7LINKS= el_GR -UTF8_LATIN9LINKS= tr_TR -UTF8_LATIN13LINKS= lt_LT -UTF8_LATIN15LINKS= et_EE - -CH_SRC= de_CH -CH_LINKS= fr_CH it_CH - .SUFFIXES: .src .out .src.out: grep -v '^#' < ${.IMPSRC} > ${.TARGET} -all: ${LOCALES:S/$/.out/g} +FILES= ${LOCALES:S/$/.out/} +FILESNAME= LC_MONETARY -afterinstall: .for lang in ${LOCALES} - ${INSTALL} -m 644 -o ${BINOWN} -g ${BINGRP} ${lang}.out \ - ${LOCALEDIR}/${lang}/LC_MONETARY +FILESDIR_${lang}.out= ${LOCALEDIR}/${lang} .endfor -.for link in ${LATIN15LINKS} - ln -sf ../${link}.ISO8859-1/LC_MONETARY \ - ${LOCALEDIR}/${link}.ISO8859-15/LC_MONETARY + +CLEANFILES= ${FILES} + +ENCODINGS= Big5 Big5HKSCS CP949 eucJP eucKR GB2312 GBK \ + ISO8859-1 ISO8859-2 ISO8859-4 ISO8859-7 ISO8859-9 \ + ISO8859-13 ISO8859-15 SJIS US-ASCII UTF-8 + +Big5_UTF-8= zh_TW +eucJP_SJIS= ja_JP +eucKR_CP949= ko_KR +GB2312_GBK= zh_CN +ISO8859-1_ISO8859-1= es_ES:eu_ES de_CH:fr_CH de_CH:it_CH +ISO8859-1_ISO8859-15= af_ZA ca_ES da_DK de_AT de_CH de_DE en_AU en_CA \ + en_GB en_NZ en_US es_ES fi_FI fr_BE fr_CA fr_CH fr_FR \ + is_IS it_IT it_CH nl_BE nl_NL no_NO pt_PT sv_SE +ISO8859-1_US-ASCII= en_AU en_CA en_GB en_NZ en_US +ISO8859-1_UTF-8= af_ZA ca_ES da_DK de_AT de_CH de_DE en_AU en_CA en_NZ \ + en_US es_ES fi_FI fr_BE fr_CA fr_FR is_IS it_IT nl_BE \ + nl_NL no_NO pt_BR pt_PT sv_SE +ISO8859-2_UTF-8= hr_HR hu_HU ro_RO sk_SK sl_SI sr_YU +ISO8859-7_UTF-8= el_GR +ISO8859-9_UTF-8= tr_TR +ISO8859-13_ISO8859-4= lt_LT +ISO8859-13_UTF-8= lt_LT +ISO8859-15_ISO8859-15= es_ES:eu_ES +ISO8859-15_UTF-8= et_EE +UTF-8_Big5HKSCS= zh_HK +UTF-8_UTF-8= es_ES:eu_ES de_CH:fr_CH de_CH:it_CH + +SYMLINKS= +.for enc1 in ${ENCODINGS} +.for enc2 in ${ENCODINGS} +.for lang_terr in ${${enc1}_${enc2}} +SYMLINKS+= ../${lang_terr:C/:.*$//}.${enc1}/${FILESNAME} \ + ${LOCALEDIR}/${lang_terr:C/^.*://}.${enc2} .endfor -.for link in ${ASCIILINKS} - ln -sf ../${link}.ISO8859-1/LC_MONETARY \ - ${LOCALEDIR}/${link}.US-ASCII/LC_MONETARY .endfor -.for link in ${CH_LINKS} - ln -sf ../${CH_SRC}.ISO8859-1/LC_MONETARY \ - ${LOCALEDIR}/${link}.ISO8859-1/LC_MONETARY .endfor - ln -sf ../ja_JP.eucJP/LC_MONETARY \ - ${LOCALEDIR}/ja_JP.SJIS/LC_MONETARY - ln -sf ../ko_KR.eucKR/LC_MONETARY \ - ${LOCALEDIR}/ko_KR.CP949/LC_MONETARY - ln -sf ../zh_CN.GB2312/LC_MONETARY \ - ${LOCALEDIR}/zh_CN.GBK/LC_MONETARY -.for link in ${UTF8_LATIN1LINKS} - ln -sf ../${link}.ISO8859-1/LC_MONETARY \ - ${LOCALEDIR}/${link}.UTF-8/LC_MONETARY -.endfor -.for link in ${UTF8_LATIN2LINKS} - ln -sf ../${link}.ISO8859-2/LC_MONETARY \ - ${LOCALEDIR}/${link}.UTF-8/LC_MONETARY -.endfor -.for link in ${UTF8_LATIN7LINKS} - ln -sf ../${link}.ISO8859-7/LC_MONETARY \ - ${LOCALEDIR}/${link}.UTF-8/LC_MONETARY -.endfor -.for link in ${UTF8_LATIN9LINKS} - ln -sf ../${link}.ISO8859-9/LC_MONETARY \ - ${LOCALEDIR}/${link}.UTF-8/LC_MONETARY -.endfor -.for link in ${UTF8_LATIN13LINKS} - ln -sf ../${link}.ISO8859-13/LC_MONETARY \ - ${LOCALEDIR}/${link}.UTF-8/LC_MONETARY -.endfor -.for link in ${UTF8_LATIN15LINKS} - ln -sf ../${link}.ISO8859-15/LC_MONETARY \ - ${LOCALEDIR}/${link}.UTF-8/LC_MONETARY -.endfor -.for link in ${CH_LINKS} - ln -sf ../${CH_SRC}.UTF-8/LC_MONETARY \ - ${LOCALEDIR}/${link}.UTF-8/LC_MONETARY -.endfor - ln -sf ../zh_TW.Big5/LC_MONETARY \ - ${LOCALEDIR}/zh_TW.UTF-8/LC_MONETARY - ln -sf ../zh_HK.UTF-8/LC_MONETARY \ - ${LOCALEDIR}/zh_HK.Big5HKSCS/LC_MONETARY - ln -sf ../es_ES.ISO8859-1/LC_MONETARY \ - ${LOCALEDIR}/eu_ES.ISO8859-1/LC_MONETARY - ln -sf ../es_ES.ISO8859-15/LC_MONETARY \ - ${LOCALEDIR}/eu_ES.ISO8859-15/LC_MONETARY - ln -sf ../es_ES.UTF-8/LC_MONETARY \ - ${LOCALEDIR}/eu_ES.UTF-8/LC_MONETARY - ln -sf ../lt_LT.ISO8859-13/LC_MONETARY \ - ${LOCALEDIR}/lt_LT.ISO8859-4/LC_MONETARY .include ==== //depot/projects/hammer/sys/cam/scsi/scsi_da.h#2 (text+ko) ==== @@ -46,7 +46,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $FreeBSD: src/sys/cam/scsi/scsi_da.h,v 1.5 2000/05/21 23:57:52 ken Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_da.h,v 1.7 2004/10/13 09:31:04 bms Exp $ */ #ifndef _SCSI_SCSI_DA_H @@ -151,6 +151,9 @@ #define REASSIGN_BLOCKS 0x07 #define MODE_SELECT 0x15 #define MODE_SENSE 0x1a +#define READ_FORMAT_CAPACITIES 0x23 +#define WRITE_AND_VERIFY 0x2e +#define VERIFY 0x2f #define READ_DEFECT_DATA_10 0x37 #define READ_DEFECT_DATA_12 0xb7 @@ -182,6 +185,82 @@ u_int8_t pat_length[2]; }; +struct scsi_read_format_capacities +{ + uint8_t opcode; /* READ_FORMAT_CAPACITIES */ + uint8_t byte2; +#define SRFC_LUN_MASK 0xE0 + uint8_t reserved0[5]; + uint8_t alloc_length[2]; + uint8_t reserved1[3]; +}; + +struct scsi_verify +{ + uint8_t opcode; /* VERIFY */ + uint8_t byte2; +#define SVFY_LUN_MASK 0xE0 +#define SVFY_RELADR 0x01 +#define SVFY_BYTECHK 0x02 +#define SVFY_DPO 0x10 + uint8_t addr[4]; /* LBA to begin verification at */ + uint8_t reserved0[1]; + uint8_t len[2]; /* number of blocks to verify */ + uint8_t reserved1[3]; +}; + +struct scsi_write_and_verify +{ + uint8_t opcode; /* WRITE_AND_VERIFY */ + uint8_t byte2; +#define SWVY_LUN_MASK 0xE0 +#define SWVY_RELADR 0x01 +#define SWVY_BYTECHK 0x02 +#define SWVY_DPO 0x10 + uint8_t addr[4]; /* LBA to begin verification at */ + uint8_t reserved0[1]; + uint8_t len[2]; /* number of blocks to write and verify */ + uint8_t reserved1[3]; +}; + +/* + * Replies to READ_FORMAT_CAPACITIES look like this: + * + * struct format_capacity_list_header + * struct format_capacity_descriptor[1..n] + * + * These are similar, but not totally identical to, the + * defect list used to format a rigid disk. + * + * The appropriate csio_decode() format string looks like this: + * "{} *i3 {Len} i1 {Blocks} i4 {} *b6 {Code} b2 {Blocklen} i3" + * + * If the capacity_list_length is greater than + * sizeof(struct format_capacity_descriptor), then there are + * additional format capacity descriptors available which + * denote which format(s) the drive can handle. + * + * (Source: USB Mass Storage UFI Specification) + */ + +struct format_capacity_list_header { + uint8_t unused[3]; + uint8_t capacity_list_length; +}; + +struct format_capacity_descriptor { + uint8_t nblocks[4]; /* total number of LBAs */ + uint8_t byte4; /* only present in max/cur descriptor */ +#define FCD_CODE_MASK 0x03 /* mask for code field above */ +#define FCD_UNFORMATTED 0x01 /* unformatted media present, + * maximum capacity returned */ +#define FCD_FORMATTED 0x02 /* formatted media present, + * current capacity returned */ +#define FCD_NOMEDIA 0x03 /* no media present, + * maximum device capacity returned */ + uint8_t block_length[3]; /* length of an LBA in bytes */ +}; + struct scsi_reassign_blocks_data { u_int8_t reserved[2]; ==== //depot/projects/hammer/sys/conf/files#87 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.956 2004/10/08 00:24:30 brooks Exp $ +# $FreeBSD: src/sys/conf/files,v 1.957 2004/10/13 05:41:09 simokawa Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -393,6 +393,7 @@ dev/cy/cy_pci.c optional cy pci dev/dcons/dcons.c optional dcons dev/dcons/dcons_crom.c optional dcons_crom +dev/dcons/dcons_os.c optional dcons dev/digi/digi.c optional digi dev/digi/digi_isa.c optional digi isa dev/digi/digi_pci.c optional digi pci ==== //depot/projects/hammer/sys/conf/kmod.mk#36 (text+ko) ==== @@ -1,43 +1,43 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.169 2004/10/11 21:23:56 joerg Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.171 2004/10/12 15:08:24 ru Exp $ # -# The include file handles installing Kernel Loadable Device -# drivers (KLD's). +# The include file handles building and installing loadable +# kernel modules. # # # +++ variables +++ # # CLEANFILES Additional files to remove for the clean and cleandir targets. # -# KMOD The name of the kernel module to build. +# EXPORT_SYMS A list of symbols that should be exported from the module, +# or the name of a file containing a list of symbols, or YES +# to export all symbols. If not defined, no symbols are +# exported. +# +# KMOD The name of the kernel module to build. # # KMODDIR Base path for kernel modules (see kld(4)). [/boot/kernel] # -# KMODOWN KLD owner. [${BINOWN}] +# KMODOWN Module file owner. [${BINOWN}] # -# KMODGRP KLD group. [${BINGRP}] +# KMODGRP Module file group. [${BINGRP}] # -# KMODMODE KLD mode. [${BINMODE}] +# KMODMODE Module file mode. [${BINMODE}] # # KMODLOAD Command to load a kernel module [/sbin/kldload] # # KMODUNLOAD Command to unload a kernel module [/sbin/kldunload] # -# PROG The name of the kernel module to build. -# If not supplied, ${KMOD}.o is used. +# MFILES Optionally a list of interfaces used by the module. +# This file contains a default list of interfaces. # -# SRCS List of source files +# PROG The name of the kernel module to build. +# If not supplied, ${KMOD}.ko is used. # -# DESTDIR Change the tree where the module gets installed. [not set] +# SRCS List of source files. # -# MFILES Optionally a list of interfaces used by the module. -# This file contains a default list of interfaces. +# DESTDIR The tree where the module gets installed. [not set] # -# EXPORT_SYMS A list of symbols that should be exported from the module, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Oct 13 22:21:16 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0331916A4D1; Wed, 13 Oct 2004 22:21:16 +0000 (GMT) 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 D2FFA16A4CE for ; Wed, 13 Oct 2004 22:21:15 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C3E2D43D45 for ; Wed, 13 Oct 2004 22:21:15 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9DMLF9v044868 for ; Wed, 13 Oct 2004 22:21:15 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9DMLFFu044865 for perforce@freebsd.org; Wed, 13 Oct 2004 22:21:15 GMT (envelope-from peter@freebsd.org) Date: Wed, 13 Oct 2004 22:21:15 GMT Message-Id: <200410132221.i9DMLFFu044865@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 63178 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: Wed, 13 Oct 2004 22:21:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=63178 Change 63178 by peter@peter_melody on 2004/10/13 22:20:37 checkpoint. Note. do not forget obj. Affected files ... .. //depot/projects/hammer/Makefile.inc1#65 edit Differences ... ==== //depot/projects/hammer/Makefile.inc1#65 (text+ko) ==== @@ -204,7 +204,7 @@ # 32 bit world CCARGS=-m32 -march=athlon-xp -msse2 -mfancy-math-387 -I${LIB32TMP}/usr/include -L${LIB32TMP}/usr/lib32 -B${LIB32TMP}/usr/lib32 -CXXARGS=-m32 -march=athlon-xp -msse2 -mfancy-math-387 -I${LIB32TMP}/usr/include/c++/3.4 -I${LIB32BIT}/usr/include -L${LIB32TMP}/usr/lib32 -B${LIB32TMP}/usr/lib32 +CXXARGS=-m32 -march=athlon-xp -msse2 -mfancy-math-387 -I${LIB32TMP}/usr/include/c++/3.4 -I${LIB32TMP}/usr/include -L${LIB32TMP}/usr/lib32 -B${LIB32TMP}/usr/lib32 LIB32MAKEENV= MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \ _SHLIBDIRPREFIX=${LIB32TMP} \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ @@ -377,10 +377,16 @@ -p ${WORLDTMP}/usr/include >/dev/null ln -sf ${.CURDIR}/sys ${WORLDTMP} cd ${.CURDIR}; MACHINE_ARCH=i386 ${LIB32MAKE} DESTDIR=${LIB32TMP} hierarchy + cd ${.CURDIR}; MACHINE_ARCH=i386 ${LIB32MAKE} DESTDIR=${LIB32TMP} obj cd ${.CURDIR}; MACHINE_ARCH=i386 ${LIB32MAKE} DESTDIR=${LIB32TMP} includes - cd ${.CURDIR}/lib/libncurses; ${MAKE} build-tools - cd ${.CURDIR}/lib/libmagic; ${MAKE} build-tools + cd ${.CURDIR}/lib/libncurses; MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} build-tools + cd ${.CURDIR}/lib/libmagic; MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} build-tools cd ${.CURDIR}; MACHINE_ARCH=i386 ${LIB32MAKE} DESTDIR=${LIB32TMP} -DNO_BIND -DNOMAN -DNODOC -DNOINFO libraries +.for _t in obj depend all install + cd ${.CURDIR}/libexec/rtld-elf; \ + PROG=ld-elf32.so.1 MAKEOBJDIRPREFIX=${OBJTREE}/lib32 MACHINE_ARCH=i386 LIBDIR=/usr/lib32 SHLIBDIR=/usr/lib32 \ + ${MAKE} -DNOMAN -DNODOC -DNOINFO CC="cc ${CCARGS} -DCOMPAT_32BIT" DESTDIR=${LIB32TMP} LIBDIR=/usr/lib32 SHLIBDIR=/usr/lib32 ${_t} +.endfor _install32: From owner-p4-projects@FreeBSD.ORG Wed Oct 13 23:20:28 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 35ACF16A4D2; Wed, 13 Oct 2004 23:20:28 +0000 (GMT) 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 EC84916A4CE for ; Wed, 13 Oct 2004 23:20:27 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D167043D3F for ; Wed, 13 Oct 2004 23:20:27 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9DNKRLr047265 for ; Wed, 13 Oct 2004 23:20:27 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9DNKRQj047262 for perforce@freebsd.org; Wed, 13 Oct 2004 23:20:27 GMT (envelope-from peter@freebsd.org) Date: Wed, 13 Oct 2004 23:20:27 GMT Message-Id: <200410132320.i9DNKRQj047262@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 63180 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: Wed, 13 Oct 2004 23:20:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=63180 Change 63180 by peter@peter_melody on 2004/10/13 23:19:57 prepare for acid test Affected files ... .. //depot/projects/hammer/Makefile.inc1#66 edit Differences ... ==== //depot/projects/hammer/Makefile.inc1#66 (text+ko) ==== @@ -216,7 +216,7 @@ LIBDIR=/usr/lib32 \ SHLIBDIR=/usr/lib32 -LIB32MAKE= ${LIB32MAKEENV} ${MAKE} -f Makefile.inc1 \ +LIB32MAKE= ${LIB32MAKEENV} ${MAKE} -DNO_BIND -DNOMAN -DNODOC -DNOINFO \ CC="cc ${CCARGS}" \ CXX="c++ ${CXXARGS}" \ LD="ld -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \ @@ -361,35 +361,40 @@ @echo ">>> stage 4.4: building everything" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${WMAKE} par-all - +.if ${MACHINE_ARCH} == amd64 && defined(WANT_LIB32) _build32: @echo @echo "--------------------------------------------------------------" @echo ">>> stage 5.1: building 32 bit libraries" @echo "--------------------------------------------------------------" .for _dir in \ - lib lib32 usr/bin usr/include usr/lib32 usr/lib/compat/aout usr/libdata/ldscripts \ + lib lib32 usr/bin usr/include usr/lib32 usr/libdata/ldscripts \ usr/libexec usr/sbin usr/share/misc \ usr/share/snmp/defs usr/share/snmp/mibs mkdir -p ${LIB32TMP}/${_dir} .endfor mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ - -p ${WORLDTMP}/usr/include >/dev/null + -p ${LIB32TMP}/usr/include >/dev/null ln -sf ${.CURDIR}/sys ${WORLDTMP} - cd ${.CURDIR}; MACHINE_ARCH=i386 ${LIB32MAKE} DESTDIR=${LIB32TMP} hierarchy - cd ${.CURDIR}; MACHINE_ARCH=i386 ${LIB32MAKE} DESTDIR=${LIB32TMP} obj - cd ${.CURDIR}; MACHINE_ARCH=i386 ${LIB32MAKE} DESTDIR=${LIB32TMP} includes + cd ${.CURDIR}; MACHINE_ARCH=i386 ${LIB32MAKE} -f Makefile.inc1 DESTDIR=${LIB32TMP} hierarchy + cd ${.CURDIR}; MACHINE_ARCH=i386 ${LIB32MAKE} -f Makefile.inc1 DESTDIR=${LIB32TMP} obj + cd ${.CURDIR}; MACHINE_ARCH=i386 ${LIB32MAKE} -f Makefile.inc1 DESTDIR=${LIB32TMP} includes cd ${.CURDIR}/lib/libncurses; MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} build-tools cd ${.CURDIR}/lib/libmagic; MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} build-tools - cd ${.CURDIR}; MACHINE_ARCH=i386 ${LIB32MAKE} DESTDIR=${LIB32TMP} -DNO_BIND -DNOMAN -DNODOC -DNOINFO libraries -.for _t in obj depend all install + cd ${.CURDIR}; MACHINE_ARCH=i386 ${LIB32MAKE} -f Makefile.inc1 DESTDIR=${LIB32TMP} libraries +.for _t in obj depend all cd ${.CURDIR}/libexec/rtld-elf; \ PROG=ld-elf32.so.1 MAKEOBJDIRPREFIX=${OBJTREE}/lib32 MACHINE_ARCH=i386 LIBDIR=/usr/lib32 SHLIBDIR=/usr/lib32 \ ${MAKE} -DNOMAN -DNODOC -DNOINFO CC="cc ${CCARGS} -DCOMPAT_32BIT" DESTDIR=${LIB32TMP} LIBDIR=/usr/lib32 SHLIBDIR=/usr/lib32 ${_t} .endfor - _install32: + mkdir -p ${DESTDIR}/usr/lib32 + cd ${.CURDIR}/lib; MACHINE_ARCH=i386 ${LIB32MAKE} install + cd ${.CURDIR}/gnu/lib; MACHINE_ARCH=i386 ${LIB32MAKE} install + cd ${.CURDIR}/secure/lib; MACHINE_ARCH=i386 ${LIB32MAKE} install + cd ${.CURDIR}/libexec/rtld-elf; MACHINE_ARCH=i386 PROG=ld-elf32.so.1 ${LIB32MAKE} install +.endif WMAKE_TGTS= @@ -401,6 +406,9 @@ WMAKE_TGTS+= _cross-tools .endif WMAKE_TGTS+= _includes _libraries _depend everything +.if ${MACHINE_ARCH} == amd64 && defined(WANT_LIB32) +WMAKE_TGTS+= _build32 +.endif buildworld: ${WMAKE_TGTS} .ORDER: ${WMAKE_TGTS} @@ -531,6 +539,9 @@ @echo ">>> Installing everything" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install +.if ${MACHINE_ARCH} == amd64 && defined(WANT_LIB32) + ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 _install32 +.endif redistribute: @echo "--------------------------------------------------------------" From owner-p4-projects@FreeBSD.ORG Sat Oct 16 23:46:02 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AB91916A4D1; Sat, 16 Oct 2004 23:46:01 +0000 (GMT) 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 8020716A4CE for ; Sat, 16 Oct 2004 23:46:01 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3FCDC43D39 for ; Sat, 16 Oct 2004 23:46:01 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9GNk1pZ041368 for ; Sat, 16 Oct 2004 23:46:01 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9GNk0MJ041365 for perforce@freebsd.org; Sat, 16 Oct 2004 23:46:00 GMT (envelope-from peter@freebsd.org) Date: Sat, 16 Oct 2004 23:46:00 GMT Message-Id: <200410162346.i9GNk0MJ041365@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 63267 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: Sat, 16 Oct 2004 23:46:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=63267 Change 63267 by peter@peter_overcee on 2004/10/16 23:45:02 IFC @63266 Affected files ... .. //depot/projects/hammer/contrib/amd/fsinfo/fsinfo.8#6 integrate .. //depot/projects/hammer/contrib/gcc/c-ppoutput.c#2 integrate .. //depot/projects/hammer/etc/mtree/BSD.var.dist#7 integrate .. //depot/projects/hammer/etc/rc.d/ugidfw#2 integrate .. //depot/projects/hammer/lib/libc/gmon/gmon.c#7 integrate .. //depot/projects/hammer/lib/libc/gmon/mcount.c#3 integrate .. //depot/projects/hammer/lib/libc/rpc/auth_des.c#2 integrate .. //depot/projects/hammer/lib/libc/rpc/auth_none.c#2 integrate .. //depot/projects/hammer/lib/libc/rpc/auth_unix.c#2 integrate .. //depot/projects/hammer/lib/libc/rpc/authunix_prot.c#2 integrate .. //depot/projects/hammer/lib/libc/rpc/bindresvport.c#2 integrate .. //depot/projects/hammer/lib/libc/rpc/clnt_bcast.c#3 integrate .. //depot/projects/hammer/lib/libc/rpc/clnt_dg.c#4 integrate .. //depot/projects/hammer/lib/libc/rpc/clnt_generic.c#2 integrate .. //depot/projects/hammer/lib/libc/rpc/clnt_perror.c#2 integrate .. //depot/projects/hammer/lib/libc/rpc/clnt_raw.c#2 integrate .. //depot/projects/hammer/lib/libc/rpc/clnt_simple.c#3 integrate .. //depot/projects/hammer/lib/libc/rpc/clnt_vc.c#3 integrate .. //depot/projects/hammer/lib/libc/rpc/des_crypt.c#2 integrate .. //depot/projects/hammer/lib/libc/rpc/des_soft.c#2 integrate .. //depot/projects/hammer/lib/libc/rpc/getnetconfig.c#4 integrate .. //depot/projects/hammer/lib/libc/rpc/getnetpath.c#3 integrate .. //depot/projects/hammer/lib/libc/rpc/getpublickey.c#2 integrate .. //depot/projects/hammer/lib/libc/rpc/getrpcport.c#2 integrate .. //depot/projects/hammer/lib/libc/rpc/key_call.c#2 integrate .. //depot/projects/hammer/lib/libc/rpc/key_prot_xdr.c#2 integrate .. //depot/projects/hammer/lib/libc/rpc/mt_misc.c#3 integrate .. //depot/projects/hammer/lib/libc/rpc/netname.c#2 integrate .. //depot/projects/hammer/lib/libc/rpc/netnamer.c#2 integrate .. //depot/projects/hammer/lib/libc/rpc/pmap_clnt.c#2 integrate .. //depot/projects/hammer/lib/libc/rpc/pmap_getmaps.c#2 integrate .. //depot/projects/hammer/lib/libc/rpc/pmap_getport.c#2 integrate .. //depot/projects/hammer/lib/libc/rpc/pmap_prot.c#2 integrate .. //depot/projects/hammer/lib/libc/rpc/pmap_prot2.c#2 integrate .. //depot/projects/hammer/lib/libc/rpc/pmap_rmt.c#2 integrate .. //depot/projects/hammer/lib/libc/rpc/rpc_callmsg.c#2 integrate .. //depot/projects/hammer/lib/libc/rpc/rpc_dtablesize.c#2 integrate .. //depot/projects/hammer/lib/libc/rpc/rpc_prot.c#2 integrate .. //depot/projects/hammer/lib/libc/rpc/rpc_soc.c#4 integrate .. //depot/projects/hammer/lib/libc/rpc/rpcb_clnt.c#4 integrate .. //depot/projects/hammer/lib/libc/rpc/rpcb_prot.c#3 integrate .. //depot/projects/hammer/lib/libc/rpc/rpcdname.c#2 integrate .. //depot/projects/hammer/lib/libc/rpc/svc.c#3 integrate .. //depot/projects/hammer/lib/libc/rpc/svc_auth.c#2 integrate .. //depot/projects/hammer/lib/libc/rpc/svc_auth_unix.c#2 integrate .. //depot/projects/hammer/lib/libc/rpc/svc_dg.c#3 integrate .. //depot/projects/hammer/lib/libc/rpc/svc_generic.c#3 integrate .. //depot/projects/hammer/lib/libc/rpc/svc_raw.c#2 integrate .. //depot/projects/hammer/lib/libc/rpc/svc_run.c#3 integrate .. //depot/projects/hammer/lib/libc/rpc/svc_vc.c#7 integrate .. //depot/projects/hammer/lib/libc/stdio/printf.3#9 integrate .. //depot/projects/hammer/lib/libc/string/strlcat.c#4 integrate .. //depot/projects/hammer/lib/libc/string/strlcpy.c#4 integrate .. //depot/projects/hammer/lib/libc/sys/read.2#7 integrate .. //depot/projects/hammer/lib/libc/sys/sendfile.2#9 integrate .. //depot/projects/hammer/lib/libc/sys/write.2#6 integrate .. //depot/projects/hammer/lib/libc/xdr/xdr.c#2 integrate .. //depot/projects/hammer/lib/libc/xdr/xdr_array.c#2 integrate .. //depot/projects/hammer/lib/libc/xdr/xdr_float.c#5 integrate .. //depot/projects/hammer/lib/libc/xdr/xdr_mem.c#3 integrate .. //depot/projects/hammer/lib/libc/xdr/xdr_rec.c#4 integrate .. //depot/projects/hammer/lib/libc/xdr/xdr_reference.c#2 integrate .. //depot/projects/hammer/lib/libc/xdr/xdr_stdio.c#3 integrate .. //depot/projects/hammer/libexec/ftpd/ftpd.c#17 integrate .. //depot/projects/hammer/release/doc/zh_CN.GB2312/Makefile#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/early-adopter/Makefile#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/early-adopter/article.sgml#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/errata/Makefile#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/errata/article.sgml#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/Makefile#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/Makefile.inc#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/amd64/Makefile#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/amd64/article.sgml#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/amd64/proc-amd64.sgml#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/common/hw.ent#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/common/intro.sgml#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/i386/Makefile#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/i386/article.sgml#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/i386/proc-i386.sgml#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/Makefile#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/Makefile.inc#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/alpha/Makefile#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/alpha/article.sgml#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/amd64/Makefile#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/amd64/article.sgml#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/common/abstract.sgml#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/common/artheader.sgml#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/common/install.ent#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/common/install.sgml#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/common/layout.sgml#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/common/trouble.sgml#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/common/upgrade.sgml#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/i386/Makefile#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/i386/article.sgml#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/ia64/Makefile#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/ia64/article.sgml#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/pc98/Makefile#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/pc98/article.sgml#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/sparc64/Makefile#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/sparc64/article.sgml#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/installation/sparc64/install.sgml#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/readme/Makefile#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/readme/article.sgml#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/Makefile#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/Makefile.inc#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/alpha/Makefile#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/alpha/article.sgml#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/amd64/Makefile#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/amd64/article.sgml#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/common/relnotes.ent#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/i386/Makefile#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/i386/article.sgml#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/ia64/Makefile#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/ia64/article.sgml#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/pc98/Makefile#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/pc98/article.sgml#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/sparc64/Makefile#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/relnotes/sparc64/article.sgml#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/share/sgml/catalog#1 branch .. //depot/projects/hammer/release/doc/zh_CN.GB2312/share/sgml/release.dsl#1 branch .. //depot/projects/hammer/share/colldef/Makefile#16 integrate .. //depot/projects/hammer/share/examples/etc/make.conf#26 integrate .. //depot/projects/hammer/share/man/man4/ubsa.4#5 integrate .. //depot/projects/hammer/share/man/man5/disktab.5#5 integrate .. //depot/projects/hammer/share/man/man5/make.conf.5#26 integrate .. //depot/projects/hammer/share/numericdef/el_GR.ISO8859-7.src#2 integrate .. //depot/projects/hammer/share/timedef/Makefile#16 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_misc.c#12 integrate .. //depot/projects/hammer/sys/amd64/amd64/nexus.c#30 integrate .. //depot/projects/hammer/sys/boot/common/help.common#11 integrate .. //depot/projects/hammer/sys/boot/common/loader.8#16 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/ahc_isa.c#4 integrate .. //depot/projects/hammer/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/hammer/sys/dev/digi/digi.h#7 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc.c#20 integrate .. //depot/projects/hammer/sys/dev/hifn/hifn7751.c#13 integrate .. //depot/projects/hammer/sys/dev/hifn/hifn7751var.h#5 integrate .. //depot/projects/hammer/sys/dev/pci/pci.c#25 integrate .. //depot/projects/hammer/sys/dev/sio/sio_pci.c#7 integrate .. //depot/projects/hammer/sys/dev/sound/isa/mss.c#10 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/buffer.c#8 integrate .. //depot/projects/hammer/sys/dev/syscons/syscons.c#25 integrate .. //depot/projects/hammer/sys/dev/syscons/sysmouse.c#9 integrate .. //depot/projects/hammer/sys/dev/usb/ubsa.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#50 integrate .. //depot/projects/hammer/sys/geom/label/g_label.c#8 integrate .. //depot/projects/hammer/sys/geom/mirror/g_mirror.c#12 integrate .. //depot/projects/hammer/sys/i386/bios/apm.c#9 integrate .. //depot/projects/hammer/sys/i386/i386/nexus.c#15 integrate .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#32 integrate .. //depot/projects/hammer/sys/i386/isa/npx.c#21 integrate .. //depot/projects/hammer/sys/ia64/ia64/nexus.c#5 integrate .. //depot/projects/hammer/sys/isa/atkbdc_isa.c#7 integrate .. //depot/projects/hammer/sys/isa/isahint.c#4 integrate .. //depot/projects/hammer/sys/kern/kern_event.c#26 integrate .. //depot/projects/hammer/sys/kern/kern_switch.c#34 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#44 integrate .. //depot/projects/hammer/sys/kern/subr_bus.c#28 integrate .. //depot/projects/hammer/sys/kern/tty.c#30 integrate .. //depot/projects/hammer/sys/kern/tty_pty.c#22 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#27 integrate .. //depot/projects/hammer/sys/pc98/pc98/fd.c#23 integrate .. //depot/projects/hammer/sys/pc98/pc98/sio.c#33 integrate .. //depot/projects/hammer/sys/sys/proc.h#69 integrate .. //depot/projects/hammer/sys/sys/ttydefaults.h#6 integrate .. //depot/projects/hammer/tools/regression/lib/libc/stdio/test-printfloat.c#6 integrate .. //depot/projects/hammer/usr.bin/login/login.1#5 integrate Differences ... ==== //depot/projects/hammer/contrib/amd/fsinfo/fsinfo.8#6 (text+ko) ==== @@ -34,7 +34,7 @@ .\" .\" from: @(#)fsinfo.8 8.1 (Berkeley) 6/28/93 .\" $Id: fsinfo.8,v 1.3.2.5 2004/01/06 03:15:23 ezk Exp $ -.\" $FreeBSD: src/contrib/amd/fsinfo/fsinfo.8,v 1.10 2004/07/06 13:16:46 mbr Exp $ +.\" $FreeBSD: src/contrib/amd/fsinfo/fsinfo.8,v 1.11 2004/10/15 12:50:05 trhodes Exp $ .\" .Dd June 26, 1999 .Dt FSINFO 8 @@ -64,9 +64,8 @@ .Nm utility takes a set of system configuration information, and generates a coordinated set of -.I amd -, -.I mount +.Xr amd 8 , +.Xr mount 8 and .Xr mountd 8 configuration files. ==== //depot/projects/hammer/contrib/gcc/c-ppoutput.c#2 (text+ko) ==== @@ -292,7 +292,7 @@ const cpp_string *str) { maybe_print_line (print.map, line); - fprintf (print.outf, "#ident \"%s\"\n", str->text); + fprintf (print.outf, "#ident %s\n", str->text); print.line++; } ==== //depot/projects/hammer/etc/mtree/BSD.var.dist#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.var.dist,v 1.70 2004/09/28 09:46:00 dougb Exp $ +# $FreeBSD: src/etc/mtree/BSD.var.dist,v 1.71 2004/10/15 08:57:24 ru Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -47,7 +47,7 @@ .. msgs uname=daemon .. - named uname=root + named .. preserve .. ==== //depot/projects/hammer/etc/rc.d/ugidfw#2 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ugidfw,v 1.1 2004/09/29 00:12:28 trhodes Exp $ +# $FreeBSD: src/etc/rc.d/ugidfw,v 1.2 2004/10/14 04:37:57 trhodes Exp $ # PROVIDE: ugidfw # REQUIRE: # BEFORE: LOGIN -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/hammer/lib/libc/gmon/gmon.c#7 (text+ko) ==== @@ -31,11 +31,11 @@ * SUCH DAMAGE. */ -#if !defined(lint) && defined(LIBC_SCCS) +#if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)gmon.c 8.1 (Berkeley) 6/4/93"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/gmon/gmon.c,v 1.19 2004/09/10 05:44:17 kuriyama Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gmon/gmon.c,v 1.20 2004/10/16 06:32:43 obrien Exp $"); #include "namespace.h" #include ==== //depot/projects/hammer/lib/libc/gmon/mcount.c#3 (text+ko) ==== @@ -31,11 +31,11 @@ * SUCH DAMAGE. */ -#if !defined(lint) && !defined(_KERNEL) && defined(LIBC_SCCS) +#if !defined(_KERNEL) && defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)mcount.c 8.1 (Berkeley) 6/4/93"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/gmon/mcount.c,v 1.19 2004/01/06 18:49:54 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gmon/mcount.c,v 1.20 2004/10/16 06:32:43 obrien Exp $"); #include #include ==== //depot/projects/hammer/lib/libc/rpc/auth_des.c#2 (text+ko) ==== @@ -54,10 +54,10 @@ #include "un-namespace.h" #if defined(LIBC_SCCS) && !defined(lint) -/* from: static char sccsid[] = "@(#)auth_des.c 2.2 88/07/29 4.0 RPCSRC; from 1.9 88/02/08 SMI"; */ +static char sccsid[] = "@(#)auth_des.c 2.2 88/07/29 4.0 RPCSRC; from 1.9 88/02/08 SMI"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/auth_des.c,v 1.8 2002/03/22 23:18:35 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/auth_des.c,v 1.9 2004/10/16 06:11:34 obrien Exp $"); #define USEC_PER_SEC 1000000 #define RTIME_TIMEOUT 5 /* seconds to wait for sync */ ==== //depot/projects/hammer/lib/libc/rpc/auth_none.c#2 (text+ko) ==== @@ -30,11 +30,11 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *sccsid = "@(#)auth_none.c 1.19 87/08/11 Copyr 1984 Sun Micro"; +static char *sccsid2 = "@(#)auth_none.c 1.19 87/08/11 Copyr 1984 Sun Micro"; static char *sccsid = "@(#)auth_none.c 2.1 88/07/29 4.0 RPCSRC"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/auth_none.c,v 1.12 2002/03/22 23:18:35 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/auth_none.c,v 1.13 2004/10/16 06:11:34 obrien Exp $"); /* * auth_none.c ==== //depot/projects/hammer/lib/libc/rpc/auth_unix.c#2 (text+ko) ==== @@ -30,11 +30,11 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *sccsid = "@(#)auth_unix.c 1.19 87/08/11 Copyr 1984 Sun Micro"; +static char *sccsid2 = "@(#)auth_unix.c 1.19 87/08/11 Copyr 1984 Sun Micro"; static char *sccsid = "@(#)auth_unix.c 2.2 88/08/01 4.0 RPCSRC"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/auth_unix.c,v 1.15 2002/03/22 23:18:35 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/auth_unix.c,v 1.16 2004/10/16 06:11:34 obrien Exp $"); /* * auth_unix.c, Implements UNIX style authentication parameters. ==== //depot/projects/hammer/lib/libc/rpc/authunix_prot.c#2 (text+ko) ==== @@ -30,11 +30,11 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *sccsid = "@(#)authunix_prot.c 1.15 87/08/11 Copyr 1984 Sun Micro"; +static char *sccsid2 = "@(#)authunix_prot.c 1.15 87/08/11 Copyr 1984 Sun Micro"; static char *sccsid = "@(#)authunix_prot.c 2.1 88/07/29 4.0 RPCSRC"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/authunix_prot.c,v 1.8 2002/03/22 23:18:36 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/authunix_prot.c,v 1.9 2004/10/16 06:11:34 obrien Exp $"); /* * authunix_prot.c ==== //depot/projects/hammer/lib/libc/rpc/bindresvport.c#2 (text+ko) ==== @@ -30,12 +30,12 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -/*static char *sccsid = "from: @(#)bindresvport.c 1.8 88/02/08 SMI";*/ -/*static char *sccsid = "from: @(#)bindresvport.c 2.2 88/07/29 4.0 RPCSRC";*/ -/*from: OpenBSD: bindresvport.c,v 1.7 1996/07/30 16:25:47 downsj Exp */ +static char *sccsid2 = "from: @(#)bindresvport.c 1.8 88/02/08 SMI"; +static char *sccsid = "from: @(#)bindresvport.c 2.2 88/07/29 4.0 RPCSRC"; #endif +/* from: $OpenBSD: bindresvport.c,v 1.7 1996/07/30 16:25:47 downsj Exp $ */ #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/bindresvport.c,v 1.15 2002/03/22 23:18:36 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/bindresvport.c,v 1.16 2004/10/16 06:11:34 obrien Exp $"); /* * Copyright (c) 1987 by Sun Microsystems, Inc. ==== //depot/projects/hammer/lib/libc/rpc/clnt_bcast.c#3 (text+ko) ==== @@ -32,13 +32,12 @@ * Copyright (c) 1986-1991 by Sun Microsystems Inc. */ -/* #ident "@(#)clnt_bcast.c 1.18 94/05/03 SMI" */ - -#if !defined(lint) && defined(SCCSIDS) +#if defined(LIBC_SCCS) && !defined(lint) +#ident "@(#)clnt_bcast.c 1.18 94/05/03 SMI" static char sccsid[] = "@(#)clnt_bcast.c 1.15 89/04/21 Copyr 1988 Sun Micro"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_bcast.c,v 1.7 2003/01/27 22:43:23 mbr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_bcast.c,v 1.8 2004/10/16 06:11:34 obrien Exp $"); /* ==== //depot/projects/hammer/lib/libc/rpc/clnt_dg.c#4 (text+ko) ==== @@ -32,13 +32,12 @@ * Copyright (c) 1986-1991 by Sun Microsystems Inc. */ -/* #ident "@(#)clnt_dg.c 1.23 94/04/22 SMI" */ - -#if !defined(lint) && defined(SCCSIDS) +#if defined(LIBC_SCCS) && !defined(lint) +#ident "@(#)clnt_dg.c 1.23 94/04/22 SMI" static char sccsid[] = "@(#)clnt_dg.c 1.19 89/03/16 Copyr 1988 Sun Micro"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_dg.c,v 1.16 2003/10/29 09:25:07 mbr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_dg.c,v 1.17 2004/10/16 06:11:34 obrien Exp $"); /* * Implements a connectionless client side RPC. ==== //depot/projects/hammer/lib/libc/rpc/clnt_generic.c#2 (text+ko) ==== @@ -49,11 +49,11 @@ /* #ident "@(#)clnt_generic.c 1.40 99/04/21 SMI" */ #if defined(LIBC_SCCS) && !defined(lint) -/*static char *sccsid = "from: @(#)clnt_generic.c 1.4 87/08/11 (C) 1987 SMI";*/ -/*static char *sccsid = "from: @(#)clnt_generic.c 2.2 88/08/01 4.0 RPCSRC";*/ +static char *sccsid2 = "from: @(#)clnt_generic.c 1.4 87/08/11 (C) 1987 SMI"; +static char *sccsid = "from: @(#)clnt_generic.c 2.2 88/08/01 4.0 RPCSRC"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_generic.c,v 1.14 2002/07/11 16:23:04 alfred Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_generic.c,v 1.15 2004/10/16 06:11:34 obrien Exp $"); /* * Copyright (c) 1986-1996,1998 by Sun Microsystems, Inc. ==== //depot/projects/hammer/lib/libc/rpc/clnt_perror.c#2 (text+ko) ==== @@ -31,11 +31,11 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *sccsid = "@(#)clnt_perror.c 1.15 87/10/07 Copyr 1984 Sun Micro"; +static char *sccsid2 = "@(#)clnt_perror.c 1.15 87/10/07 Copyr 1984 Sun Micro"; static char *sccsid = "@(#)clnt_perror.c 2.1 88/07/29 4.0 RPCSRC"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_perror.c,v 1.16 2002/03/22 23:18:36 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_perror.c,v 1.17 2004/10/16 06:11:34 obrien Exp $"); /* * clnt_perror.c ==== //depot/projects/hammer/lib/libc/rpc/clnt_raw.c#2 (text+ko) ==== @@ -30,11 +30,11 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *sccsid = "@(#)clnt_raw.c 1.22 87/08/11 Copyr 1984 Sun Micro"; +static char *sccsid2 = "@(#)clnt_raw.c 1.22 87/08/11 Copyr 1984 Sun Micro"; static char *sccsid = "@(#)clnt_raw.c 2.2 88/08/01 4.0 RPCSRC"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_raw.c,v 1.18 2002/07/14 23:14:02 alfred Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_raw.c,v 1.19 2004/10/16 06:11:34 obrien Exp $"); /* * clnt_raw.c ==== //depot/projects/hammer/lib/libc/rpc/clnt_simple.c#3 (text+ko) ==== @@ -33,11 +33,11 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *sccsid = "from: @(#)clnt_simple.c 1.35 87/08/11 Copyr 1984 Sun Micro"; +static char *sccsid2 = "from: @(#)clnt_simple.c 1.35 87/08/11 Copyr 1984 Sun Micro"; static char *sccsid = "from: @(#)clnt_simple.c 2.2 88/08/01 4.0 RPCSRC"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_simple.c,v 1.18 2003/10/29 09:18:44 mbr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_simple.c,v 1.19 2004/10/16 06:11:34 obrien Exp $"); /* * clnt_simple.c ==== //depot/projects/hammer/lib/libc/rpc/clnt_vc.c#3 (text+ko) ==== @@ -30,12 +30,12 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *sccsid = "@(#)clnt_tcp.c 1.37 87/10/05 Copyr 1984 Sun Micro"; +static char *sccsid2 = "@(#)clnt_tcp.c 1.37 87/10/05 Copyr 1984 Sun Micro"; static char *sccsid = "@(#)clnt_tcp.c 2.2 88/08/01 4.0 RPCSRC"; -static char sccsid[] = "@(#)clnt_vc.c 1.19 89/03/16 Copyr 1988 Sun Micro"; +static char sccsid3[] = "@(#)clnt_vc.c 1.19 89/03/16 Copyr 1988 Sun Micro"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_vc.c,v 1.16 2004/08/13 23:22:38 stefanf Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_vc.c,v 1.17 2004/10/16 06:11:34 obrien Exp $"); /* * clnt_tcp.c, Implements a TCP/IP based, client side RPC. ==== //depot/projects/hammer/lib/libc/rpc/des_crypt.c#2 (text+ko) ==== @@ -35,13 +35,11 @@ #include #include -#if 0 -#ifndef lint +#if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)des_crypt.c 2.2 88/08/10 4.0 RPCSRC; from 1.13 88/02/08 SMI"; #endif -#endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/des_crypt.c,v 1.7 2002/03/22 23:18:36 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/des_crypt.c,v 1.8 2004/10/16 06:11:34 obrien Exp $"); static int common_crypt( char *, char *, unsigned, unsigned, struct desparams * ); int (*__des_crypt_LOCAL)() = 0; ==== //depot/projects/hammer/lib/libc/rpc/des_soft.c#2 (text+ko) ==== @@ -1,9 +1,3 @@ -#if !defined(lint) && defined(SCCSIDS) -static char sccsid[] = "@(#)des_soft.c 2.2 88/08/10 4.0 RPCSRC; from 1.13 88/02/08 SMI"; -#endif -#include -__FBSDID("$FreeBSD: src/lib/libc/rpc/des_soft.c,v 1.2 2002/03/22 23:18:36 obrien Exp $"); - /* * Sun RPC is a product of Sun Microsystems, Inc. and is provided for * unrestricted use provided that this legend is included on all tape @@ -32,6 +26,13 @@ * 2550 Garcia Avenue * Mountain View, California 94043 */ + +#if defined(LIBC_SCCS) && !defined(lint) +static char sccsid[] = "@(#)des_soft.c 2.2 88/08/10 4.0 RPCSRC; from 1.13 88/02/08 SMI"; +#endif +#include +__FBSDID("$FreeBSD: src/lib/libc/rpc/des_soft.c,v 1.3 2004/10/16 06:11:34 obrien Exp $"); + /* * Table giving odd parity in the low bit for ASCII characters */ ==== //depot/projects/hammer/lib/libc/rpc/getnetconfig.c#4 (text+ko) ==== @@ -29,13 +29,12 @@ * 2550 Garcia Avenue * Mountain View, California 94043 */ -/* -#ifndef lint -static char sccsid[] = "@(#)getnetconfig.c 1.12 91/12/19 SMI"; + +#if defined(LIBC_SCCS) && !defined(lint) +static char sccsid[] = "@(#)getnetconfig.c 1.12 91/12/19 SMI"; #endif -*/ #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/getnetconfig.c,v 1.10 2004/03/05 08:10:17 markm Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/getnetconfig.c,v 1.11 2004/10/16 06:11:34 obrien Exp $"); /* * Copyright (c) 1989 by Sun Microsystems, Inc. ==== //depot/projects/hammer/lib/libc/rpc/getnetpath.c#3 (text+ko) ==== @@ -29,13 +29,12 @@ * 2550 Garcia Avenue * Mountain View, California 94043 */ -/* -#ifndef lint -static char sccsid[] = "@(#)getnetpath.c 1.11 91/12/19 SMI"; + +#if defined(LIBC_SCCS) && !defined(lint) +static char sccsid[] = "@(#)getnetpath.c 1.11 91/12/19 SMI"; #endif -*/ #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/getnetpath.c,v 1.4 2003/01/27 22:36:53 mbr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/getnetpath.c,v 1.5 2004/10/16 06:11:34 obrien Exp $"); /* * Copyright (c) 1989 by Sun Microsystems, Inc. ==== //depot/projects/hammer/lib/libc/rpc/getpublickey.c#2 (text+ko) ==== @@ -27,11 +27,12 @@ * 2550 Garcia Avenue * Mountain View, California 94043 */ -#if !defined(lint) && defined(SCCSIDS) + +#if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)publickey.c 1.10 91/03/11 Copyr 1986 Sun Micro"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/getpublickey.c,v 1.6 2002/03/22 23:18:36 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/getpublickey.c,v 1.7 2004/10/16 06:11:34 obrien Exp $"); /* * publickey.c ==== //depot/projects/hammer/lib/libc/rpc/getrpcport.c#2 (text+ko) ==== @@ -29,13 +29,12 @@ * Mountain View, California 94043 */ -#include #if defined(LIBC_SCCS) && !defined(lint) -static char *sccsid = "@(#)getrpcport.c 1.3 87/08/11 SMI"; +static char *sccsid2 = "@(#)getrpcport.c 1.3 87/08/11 SMI"; static char *sccsid = "@(#)getrpcport.c 2.1 88/07/29 4.0 RPCSRC"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/getrpcport.c,v 1.12 2002/03/22 23:18:36 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/getrpcport.c,v 1.13 2004/10/16 06:11:34 obrien Exp $"); /* * Copyright (c) 1985 by Sun Microsystems, Inc. ==== //depot/projects/hammer/lib/libc/rpc/key_call.c#2 (text+ko) ==== @@ -31,9 +31,8 @@ */ #ident "@(#)key_call.c 1.25 94/04/24 SMI" - #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/key_call.c,v 1.14 2002/07/14 23:20:08 alfred Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/key_call.c,v 1.15 2004/10/16 06:11:34 obrien Exp $"); /* * key_call.c, Interface to keyserver ==== //depot/projects/hammer/lib/libc/rpc/key_prot_xdr.c#2 (text+ko) ==== @@ -34,11 +34,11 @@ * 2550 Garcia Avenue * Mountain View, California 94043 */ -/* From: #pragma ident "@(#)key_prot.x 1.7 94/04/29 SMI" */ /* Copyright (c) 1990, 1991 Sun Microsystems, Inc. */ +/* #pragma ident "@(#)key_prot.x 1.7 94/04/29 SMI" */ #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/key_prot_xdr.c,v 1.4 2002/03/22 23:18:36 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/key_prot_xdr.c,v 1.5 2004/10/16 06:11:34 obrien Exp $"); /* * Compiled from key_prot.x using rpcgen. ==== //depot/projects/hammer/lib/libc/rpc/mt_misc.c#3 (text+ko) ==== @@ -1,9 +1,8 @@ /* $NetBSD: mt_misc.c,v 1.1 2000/06/02 23:11:11 fvdl Exp $ */ /* #pragma ident "@(#)mt_misc.c 1.24 93/04/29 SMI" */ - #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/mt_misc.c,v 1.5 2003/02/16 17:29:10 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/mt_misc.c,v 1.6 2004/10/16 06:11:34 obrien Exp $"); #include "namespace.h" #include "reentrant.h" ==== //depot/projects/hammer/lib/libc/rpc/netname.c#2 (text+ko) ==== @@ -27,11 +27,12 @@ * 2550 Garcia Avenue * Mountain View, California 94043 */ -#if !defined(lint) && defined(SCCSIDS) + +#if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)netname.c 1.8 91/03/11 Copyr 1986 Sun Micro"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/netname.c,v 1.7 2002/03/22 23:18:36 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/netname.c,v 1.8 2004/10/16 06:11:35 obrien Exp $"); /* * netname utility routines ==== //depot/projects/hammer/lib/libc/rpc/netnamer.c#2 (text+ko) ==== @@ -27,11 +27,13 @@ * 2550 Garcia Avenue * Mountain View, California 94043 */ -#if !defined(lint) && defined(SCCSIDS) + +#if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)netnamer.c 1.13 91/03/11 Copyr 1986 Sun Micro"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/netnamer.c,v 1.9 2002/03/22 23:18:36 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/netnamer.c,v 1.10 2004/10/16 06:11:35 obrien Exp $"); + /* * netname utility routines convert from unix names to network names and * vice-versa This module is operating system dependent! What we define here ==== //depot/projects/hammer/lib/libc/rpc/pmap_clnt.c#2 (text+ko) ==== @@ -30,11 +30,11 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *sccsid = "@(#)pmap_clnt.c 1.37 87/08/11 Copyr 1984 Sun Micro"; +static char *sccsid2 = "@(#)pmap_clnt.c 1.37 87/08/11 Copyr 1984 Sun Micro"; static char *sccsid = "@(#)pmap_clnt.c 2.2 88/08/01 4.0 RPCSRC"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/pmap_clnt.c,v 1.14 2002/03/22 23:18:36 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/pmap_clnt.c,v 1.15 2004/10/16 06:11:35 obrien Exp $"); /* * pmap_clnt.c ==== //depot/projects/hammer/lib/libc/rpc/pmap_getmaps.c#2 (text+ko) ==== @@ -30,11 +30,11 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *sccsid = "@(#)pmap_getmaps.c 1.10 87/08/11 Copyr 1984 Sun Micro"; +static char *sccsid2 = "@(#)pmap_getmaps.c 1.10 87/08/11 Copyr 1984 Sun Micro"; static char *sccsid = "@(#)pmap_getmaps.c 2.2 88/08/01 4.0 RPCSRC"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/pmap_getmaps.c,v 1.15 2002/03/22 23:18:36 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/pmap_getmaps.c,v 1.16 2004/10/16 06:11:35 obrien Exp $"); /* * pmap_getmap.c ==== //depot/projects/hammer/lib/libc/rpc/pmap_getport.c#2 (text+ko) ==== @@ -30,11 +30,11 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *sccsid = "from: @(#)pmap_getport.c 1.9 87/08/11 Copyr 1984 Sun Micro"; +static char *sccsid2 = "from: @(#)pmap_getport.c 1.9 87/08/11 Copyr 1984 Sun Micro"; static char *sccsid = "from: @(#)pmap_getport.c 2.2 88/08/01 4.0 RPCSRC"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/pmap_getport.c,v 1.14 2002/03/22 23:18:36 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/pmap_getport.c,v 1.15 2004/10/16 06:11:35 obrien Exp $"); /* * pmap_getport.c ==== //depot/projects/hammer/lib/libc/rpc/pmap_prot.c#2 (text+ko) ==== @@ -30,11 +30,11 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *sccsid = "@(#)pmap_prot.c 1.17 87/08/11 Copyr 1984 Sun Micro"; +static char *sccsid2 = "@(#)pmap_prot.c 1.17 87/08/11 Copyr 1984 Sun Micro"; static char *sccsid = "@(#)pmap_prot.c 2.1 88/07/29 4.0 RPCSRC"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/pmap_prot.c,v 1.8 2002/03/22 23:18:36 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/pmap_prot.c,v 1.9 2004/10/16 06:11:35 obrien Exp $"); /* * pmap_prot.c ==== //depot/projects/hammer/lib/libc/rpc/pmap_prot2.c#2 (text+ko) ==== @@ -30,11 +30,11 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *sccsid = "@(#)pmap_prot2.c 1.3 87/08/11 Copyr 1984 Sun Micro"; +static char *sccsid2 = "@(#)pmap_prot2.c 1.3 87/08/11 Copyr 1984 Sun Micro"; static char *sccsid = "@(#)pmap_prot2.c 2.1 88/07/29 4.0 RPCSRC"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/pmap_prot2.c,v 1.9 2002/03/22 23:18:36 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/pmap_prot2.c,v 1.10 2004/10/16 06:11:35 obrien Exp $"); /* * pmap_prot2.c ==== //depot/projects/hammer/lib/libc/rpc/pmap_rmt.c#2 (text+ko) ==== @@ -29,13 +29,12 @@ * Mountain View, California 94043 */ -#include #if defined(LIBC_SCCS) && !defined(lint) -static char *sccsid = "@(#)pmap_rmt.c 1.21 87/08/27 Copyr 1984 Sun Micro"; +static char *sccsid2 = "@(#)pmap_rmt.c 1.21 87/08/27 Copyr 1984 Sun Micro"; static char *sccsid = "@(#)pmap_rmt.c 2.2 88/08/01 4.0 RPCSRC"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/pmap_rmt.c,v 1.19 2002/03/22 23:18:36 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/pmap_rmt.c,v 1.20 2004/10/16 06:11:35 obrien Exp $"); /* * pmap_rmt.c ==== //depot/projects/hammer/lib/libc/rpc/rpc_callmsg.c#2 (text+ko) ==== @@ -30,11 +30,11 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *sccsid = "@(#)rpc_callmsg.c 1.4 87/08/11 Copyr 1984 Sun Micro"; +static char *sccsid2 = "@(#)rpc_callmsg.c 1.4 87/08/11 Copyr 1984 Sun Micro"; static char *sccsid = "@(#)rpc_callmsg.c 2.1 88/07/29 4.0 RPCSRC"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/rpc_callmsg.c,v 1.11 2002/03/22 23:18:36 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/rpc_callmsg.c,v 1.12 2004/10/16 06:11:35 obrien Exp $"); /* * rpc_callmsg.c ==== //depot/projects/hammer/lib/libc/rpc/rpc_dtablesize.c#2 (text+ko) ==== @@ -30,11 +30,11 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *sccsid = "@(#)rpc_dtablesize.c 1.2 87/08/11 Copyr 1987 Sun Micro"; +static char *sccsid2 = "@(#)rpc_dtablesize.c 1.2 87/08/11 Copyr 1987 Sun Micro"; static char *sccsid = "@(#)rpc_dtablesize.c 2.1 88/07/29 4.0 RPCSRC"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/rpc_dtablesize.c,v 1.14 2002/03/22 23:18:37 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/rpc_dtablesize.c,v 1.15 2004/10/16 06:11:35 obrien Exp $"); #include "namespace.h" #include ==== //depot/projects/hammer/lib/libc/rpc/rpc_prot.c#2 (text+ko) ==== @@ -30,11 +30,11 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *sccsid = "@(#)rpc_prot.c 1.36 87/08/11 Copyr 1984 Sun Micro"; +static char *sccsid2 = "@(#)rpc_prot.c 1.36 87/08/11 Copyr 1984 Sun Micro"; static char *sccsid = "@(#)rpc_prot.c 2.3 88/08/07 4.0 RPCSRC"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/rpc_prot.c,v 1.11 2002/03/22 23:18:37 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/rpc_prot.c,v 1.12 2004/10/16 06:11:35 obrien Exp $"); /* * rpc_prot.c ==== //depot/projects/hammer/lib/libc/rpc/rpc_soc.c#4 (text+ko) ==== @@ -38,11 +38,11 @@ * California. */ -#if !defined(lint) && defined(SCCSIDS) +#if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)rpc_soc.c 1.41 89/05/02 Copyr 1988 Sun Micro"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/rpc_soc.c,v 1.13 2003/05/01 19:03:14 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/rpc_soc.c,v 1.14 2004/10/16 06:11:35 obrien Exp $"); #ifdef PORTMAP /* ==== //depot/projects/hammer/lib/libc/rpc/rpcb_clnt.c#4 (text+ko) ==== @@ -52,11 +52,11 @@ /* #ident "@(#)rpcb_clnt.c 1.27 94/04/24 SMI" */ -#if !defined(lint) && defined(SCCSIDS) +#if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)rpcb_clnt.c 1.30 89/06/21 Copyr 1988 Sun Micro"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/rpcb_clnt.c,v 1.13 2003/10/29 09:22:49 mbr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/rpcb_clnt.c,v 1.14 2004/10/16 06:11:35 obrien Exp $"); /* * rpcb_clnt.c ==== //depot/projects/hammer/lib/libc/rpc/rpcb_prot.c#3 (text+ko) ==== @@ -34,11 +34,11 @@ /* #ident "@(#)rpcb_prot.c 1.13 94/04/24 SMI" */ -#if !defined(lint) && defined(SCCSIDS) +#if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)rpcb_prot.c 1.9 89/04/21 Copyr 1984 Sun Micro"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/rpcb_prot.c,v 1.4 2004/02/10 20:40:17 cperciva Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/rpcb_prot.c,v 1.5 2004/10/16 06:11:35 obrien Exp $"); /* * rpcb_prot.c ==== //depot/projects/hammer/lib/libc/rpc/rpcdname.c#2 (text+ko) ==== @@ -27,11 +27,12 @@ * 2550 Garcia Avenue * Mountain View, California 94043 */ -#if !defined(lint) && defined(SCCSIDS) + +#if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)rpcdname.c 1.7 91/03/11 Copyr 1989 Sun Micro"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/rpcdname.c,v 1.4 2002/03/22 23:18:37 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/rpcdname.c,v 1.5 2004/10/16 06:11:35 obrien Exp $"); /* * rpcdname.c ==== //depot/projects/hammer/lib/libc/rpc/svc.c#3 (text+ko) ==== @@ -30,11 +30,11 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *sccsid = "@(#)svc.c 1.44 88/02/08 Copyr 1984 Sun Micro"; +static char *sccsid2 = "@(#)svc.c 1.44 88/02/08 Copyr 1984 Sun Micro"; static char *sccsid = "@(#)svc.c 2.4 88/08/11 4.0 RPCSRC"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/svc.c,v 1.22 2003/01/16 07:13:51 mbr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/svc.c,v 1.23 2004/10/16 06:11:35 obrien Exp $"); /* * svc.c, Server-side remote procedure call interface. ==== //depot/projects/hammer/lib/libc/rpc/svc_auth.c#2 (text+ko) ==== @@ -32,13 +32,12 @@ * Copyright (c) 1986-1991 by Sun Microsystems Inc. */ -/* #ident "@(#)svc_auth.c 1.16 94/04/24 SMI" */ - -#if !defined(lint) && defined(SCCSIDS) +#if defined(LIBC_SCCS) && !defined(lint) +#ident "@(#)svc_auth.c 1.16 94/04/24 SMI" static char sccsid[] = "@(#)svc_auth.c 1.26 89/02/07 Copyr 1984 Sun Micro"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_auth.c,v 1.11 2002/03/22 23:18:37 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_auth.c,v 1.12 2004/10/16 06:11:35 obrien Exp $"); /* * svc_auth.c, Server-side rpc authenticator interface. ==== //depot/projects/hammer/lib/libc/rpc/svc_auth_unix.c#2 (text+ko) ==== @@ -28,11 +28,11 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *sccsid = "@(#)svc_auth_unix.c 1.28 88/02/08 Copyr 1984 Sun Micro"; +static char *sccsid2 = "@(#)svc_auth_unix.c 1.28 88/02/08 Copyr 1984 Sun Micro"; static char *sccsid = "@(#)svc_auth_unix.c 2.3 88/08/01 4.0 RPCSRC"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_auth_unix.c,v 1.10 2002/03/22 23:18:37 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_auth_unix.c,v 1.11 2004/10/16 06:11:35 obrien Exp $"); /* * svc_auth_unix.c ==== //depot/projects/hammer/lib/libc/rpc/svc_dg.c#3 (text+ko) ==== @@ -33,9 +33,11 @@ * Copyright (c) 1986-1991 by Sun Microsystems Inc. */ -/* #ident "@(#)svc_dg.c 1.17 94/04/24 SMI" */ +#if defined(LIBC_SCCS) && !defined(lint) +#ident "@(#)svc_dg.c 1.17 94/04/24 SMI" +#endif #include -__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_dg.c,v 1.6 2003/01/27 22:46:50 mbr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_dg.c,v 1.7 2004/10/16 06:11:35 obrien Exp $"); /* * svc_dg.c, Server side for connectionless RPC. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Oct 16 23:49:05 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 92E2E16A4D1; Sat, 16 Oct 2004 23:49:05 +0000 (GMT) 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 6EB5A16A4CE for ; Sat, 16 Oct 2004 23:49:05 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4BCE443D41 for ; Sat, 16 Oct 2004 23:49:05 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9GNn5eJ041410 for ; Sat, 16 Oct 2004 23:49:05 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9GNn5i8041407 for perforce@freebsd.org; Sat, 16 Oct 2004 23:49:05 GMT (envelope-from peter@freebsd.org) Date: Sat, 16 Oct 2004 23:49:05 GMT Message-Id: <200410162349.i9GNn5i8041407@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 63268 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: Sat, 16 Oct 2004 23:49:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=63268 Change 63268 by peter@peter_overcee on 2004/10/16 23:48:25 integ -I -b i386_hammer (metadata sync) Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/fpu.c#21 integrate .. //depot/projects/hammer/sys/amd64/amd64/nexus.c#31 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#49 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/fpu.c#21 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/nexus.c#31 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#49 (text+ko) ====