From owner-p4-projects Sun Mar 2 2:10:45 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0DFD437B405; Sun, 2 Mar 2003 02:10:19 -0800 (PST) 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 90F8037B401 for ; Sun, 2 Mar 2003 02:10:18 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A5A4543F75 for ; Sun, 2 Mar 2003 02:10:16 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h22AAG0U020852 for ; Sun, 2 Mar 2003 02:10:16 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h22AA2jg020766 for perforce@freebsd.org; Sun, 2 Mar 2003 02:10:02 -0800 (PST) Date: Sun, 2 Mar 2003 02:10:02 -0800 (PST) Message-Id: <200303021010.h22AA2jg020766@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 26183 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=26183 Change 26183 by marcel@marcel_vaio on 2003/03/02 02:09:30 IFC Affected files ... .. //depot/projects/tty/MAINTAINERS#3 integrate .. //depot/projects/tty/Makefile#3 integrate .. //depot/projects/tty/Makefile.inc1#3 integrate .. //depot/projects/tty/bin/Makefile#2 integrate .. //depot/projects/tty/bin/chflags/Makefile#1 branch .. //depot/projects/tty/bin/chflags/chflags.1#1 branch .. //depot/projects/tty/bin/chflags/chflags.c#1 branch .. //depot/projects/tty/bin/date/date.1#2 integrate .. //depot/projects/tty/bin/dd/Makefile#2 integrate .. //depot/projects/tty/bin/dd/args.c#2 integrate .. //depot/projects/tty/bin/dd/conv.c#2 integrate .. //depot/projects/tty/bin/dd/dd.c#3 integrate .. //depot/projects/tty/bin/dd/dd.h#2 integrate .. //depot/projects/tty/bin/dd/extern.h#2 integrate .. //depot/projects/tty/bin/dd/misc.c#2 integrate .. //depot/projects/tty/bin/dd/position.c#2 integrate .. //depot/projects/tty/bin/getfacl/getfacl.1#2 integrate .. //depot/projects/tty/bin/sh/machdep.h#2 delete .. //depot/projects/tty/bin/sh/memalloc.c#2 integrate .. //depot/projects/tty/bin/sh/nodes.c.pat#2 integrate .. //depot/projects/tty/contrib/file/.cvsignore#1 branch .. //depot/projects/tty/contrib/file/Magdir/archive#2 integrate .. //depot/projects/tty/contrib/file/Magdir/audio#2 integrate .. //depot/projects/tty/contrib/file/Magdir/compress#2 integrate .. //depot/projects/tty/contrib/file/Magdir/ctags#2 integrate .. //depot/projects/tty/contrib/file/Magdir/elf#2 integrate .. //depot/projects/tty/contrib/file/Magdir/filesystems#2 integrate .. //depot/projects/tty/contrib/file/Magdir/flash#2 integrate .. //depot/projects/tty/contrib/file/Magdir/gringotts#2 integrate .. //depot/projects/tty/contrib/file/Magdir/hdf#1 branch .. //depot/projects/tty/contrib/file/Magdir/hp#2 integrate .. //depot/projects/tty/contrib/file/Magdir/images#2 integrate .. //depot/projects/tty/contrib/file/Magdir/jpeg#2 integrate .. //depot/projects/tty/contrib/file/Magdir/lisp#2 integrate .. //depot/projects/tty/contrib/file/Magdir/macintosh#2 integrate .. //depot/projects/tty/contrib/file/Magdir/msdos#2 integrate .. //depot/projects/tty/contrib/file/Magdir/python#2 integrate .. //depot/projects/tty/contrib/file/Magdir/sgml#2 integrate .. //depot/projects/tty/contrib/file/Magdir/sql#1 branch .. //depot/projects/tty/contrib/file/Magdir/vorbis#2 integrate .. //depot/projects/tty/contrib/file/Makefile.am#2 integrate .. //depot/projects/tty/contrib/file/Makefile.in#2 integrate .. //depot/projects/tty/contrib/file/Makefile.std#2 integrate .. //depot/projects/tty/contrib/file/README#2 integrate .. //depot/projects/tty/contrib/file/acconfig.h#2 integrate .. //depot/projects/tty/contrib/file/aclocal.m4#2 integrate .. //depot/projects/tty/contrib/file/apprentice.c#2 integrate .. //depot/projects/tty/contrib/file/ascmagic.c#2 integrate .. //depot/projects/tty/contrib/file/config.h.in#2 integrate .. //depot/projects/tty/contrib/file/configure#2 integrate .. //depot/projects/tty/contrib/file/configure.in#2 integrate .. //depot/projects/tty/contrib/file/file.c#2 integrate .. //depot/projects/tty/contrib/file/file.h#2 integrate .. //depot/projects/tty/contrib/file/file.man#2 integrate .. //depot/projects/tty/contrib/file/magic.man#2 integrate .. //depot/projects/tty/contrib/file/magic.mime#2 integrate .. //depot/projects/tty/contrib/file/patchlevel.h#2 integrate .. //depot/projects/tty/contrib/file/print.c#2 integrate .. //depot/projects/tty/contrib/file/readelf.c#2 integrate .. //depot/projects/tty/contrib/file/softmagic.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/BSD/Makefile#2 integrate .. //depot/projects/tty/contrib/ipfilter/BSD/kupgrade#2 integrate .. //depot/projects/tty/contrib/ipfilter/FreeBSD-4.0/INST.FreeBSD-4#2 integrate .. //depot/projects/tty/contrib/ipfilter/HISTORY#2 integrate .. //depot/projects/tty/contrib/ipfilter/Makefile#2 integrate .. //depot/projects/tty/contrib/ipfilter/bpf.h#1 branch .. //depot/projects/tty/contrib/ipfilter/common.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/fils.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/ip_lfil.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/ip_sfil.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipf.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipfs.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipft_ef.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipft_hx.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipft_pc.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipft_sn.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipft_td.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipft_tx.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/iplang/iplang_y.y#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipmon.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipnat.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/44arp.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/arp.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/ip.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/ipresend.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/ipsend.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/ipsopt.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/iptest.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/iptests.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/lsock.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/resend.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/sirix.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipsend/sock.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/ipt.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/kmem.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/man/ipf.5#2 integrate .. //depot/projects/tty/contrib/ipfilter/man/ipf.8#2 integrate .. //depot/projects/tty/contrib/ipfilter/man/ipfs.8#2 integrate .. //depot/projects/tty/contrib/ipfilter/man/ipfstat.8#2 integrate .. //depot/projects/tty/contrib/ipfilter/man/ipftest.1#2 integrate .. //depot/projects/tty/contrib/ipfilter/man/ipmon.8#2 integrate .. //depot/projects/tty/contrib/ipfilter/man/ipnat.5#2 integrate .. //depot/projects/tty/contrib/ipfilter/man/ipnat.8#2 integrate .. //depot/projects/tty/contrib/ipfilter/misc.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/mli_ipl.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/mln_ipl.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/natparse.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/opt.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/parse.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/printnat.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/printstate.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/relay.c#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/Makefile#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/expected/ipv6.3#1 branch .. //depot/projects/tty/contrib/ipfilter/test/expected/ni5#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/input/ipv6.3#1 branch .. //depot/projects/tty/contrib/ipfilter/test/input/ni5#2 integrate .. //depot/projects/tty/contrib/ipfilter/test/regress/ipv6.3#1 branch .. //depot/projects/tty/contrib/openpam/lib/pam_vprompt.c#2 integrate .. //depot/projects/tty/contrib/sendmail/cf/ostype/bsd4.4.m4#2 integrate .. //depot/projects/tty/contrib/sendmail/contrib/bitdomain.c#2 integrate .. //depot/projects/tty/contrib/sendmail/mailstats/mailstats.c#2 integrate .. //depot/projects/tty/contrib/sendmail/makemap/makemap.c#2 integrate .. //depot/projects/tty/contrib/sendmail/praliases/praliases.c#2 integrate .. //depot/projects/tty/contrib/sendmail/smrsh/smrsh.c#3 integrate .. //depot/projects/tty/contrib/sendmail/src/aliases.5#2 integrate .. //depot/projects/tty/contrib/sendmail/src/conf.c#3 integrate .. //depot/projects/tty/contrib/sendmail/src/conf.h#3 integrate .. //depot/projects/tty/contrib/sendmail/src/err.c#2 integrate .. //depot/projects/tty/contrib/sendmail/src/headers.c#3 integrate .. //depot/projects/tty/contrib/sendmail/src/mailq.1#3 integrate .. //depot/projects/tty/contrib/sendmail/src/mci.c#3 integrate .. //depot/projects/tty/contrib/sendmail/src/savemail.c#3 integrate .. //depot/projects/tty/contrib/sendmail/vacation/vacation.1#2 integrate .. //depot/projects/tty/contrib/tcpdump/CHANGES#2 integrate .. //depot/projects/tty/contrib/tcpdump/CREDITS#2 integrate .. //depot/projects/tty/contrib/tcpdump/FILES#2 integrate .. //depot/projects/tty/contrib/tcpdump/INSTALL#2 integrate .. //depot/projects/tty/contrib/tcpdump/README#2 integrate .. //depot/projects/tty/contrib/tcpdump/VERSION#3 integrate .. //depot/projects/tty/contrib/tcpdump/addrtoname.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/config.h.in#2 integrate .. //depot/projects/tty/contrib/tcpdump/configure#2 integrate .. //depot/projects/tty/contrib/tcpdump/configure.in#2 integrate .. //depot/projects/tty/contrib/tcpdump/dhcp6.h#2 delete .. //depot/projects/tty/contrib/tcpdump/dhcp6opt.h#2 delete .. //depot/projects/tty/contrib/tcpdump/gmt2local.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/interface.h#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-802_11.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-arcnet.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-arp.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-atalk.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-beep.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-bgp.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-bootp.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-dhcp6.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-egp.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-esp.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-ether.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-fddi.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-gre.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-icmp.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-icmp6.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-igmp.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-ip.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-isakmp.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-isoclns.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-l2tp.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-mobile.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-mpls.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-nfs.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-ntp.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-null.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-pim.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-radius.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-raw.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-rx.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-sctp.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-sll.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-smb.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-snmp.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-stp.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-sunrpc.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/print-zephyr.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/smbutil.c#2 integrate .. //depot/projects/tty/contrib/tcpdump/util.c#2 integrate .. //depot/projects/tty/crypto/openssh/auth2-pam-freebsd.c#3 integrate .. //depot/projects/tty/crypto/openssl/CHANGES#3 integrate .. //depot/projects/tty/crypto/openssl/Configure#3 integrate .. //depot/projects/tty/crypto/openssl/FAQ#3 integrate .. //depot/projects/tty/crypto/openssl/INSTALL#3 integrate .. //depot/projects/tty/crypto/openssl/Makefile.org#3 integrate .. //depot/projects/tty/crypto/openssl/Makefile.ssl#3 integrate .. //depot/projects/tty/crypto/openssl/NEWS#3 integrate .. //depot/projects/tty/crypto/openssl/PROBLEMS#3 integrate .. //depot/projects/tty/crypto/openssl/README#3 integrate .. //depot/projects/tty/crypto/openssl/apps/Makefile.ssl#3 integrate .. //depot/projects/tty/crypto/openssl/apps/apps.c#3 integrate .. //depot/projects/tty/crypto/openssl/apps/apps.h#3 integrate .. //depot/projects/tty/crypto/openssl/apps/ca.c#3 integrate .. //depot/projects/tty/crypto/openssl/apps/dgst.c#3 integrate .. //depot/projects/tty/crypto/openssl/apps/dh.c#3 integrate .. //depot/projects/tty/crypto/openssl/apps/dhparam.c#3 integrate .. //depot/projects/tty/crypto/openssl/apps/dsa.c#3 integrate .. //depot/projects/tty/crypto/openssl/apps/dsaparam.c#3 integrate .. //depot/projects/tty/crypto/openssl/apps/enc.c#3 integrate .. //depot/projects/tty/crypto/openssl/apps/engine.c#2 integrate .. //depot/projects/tty/crypto/openssl/apps/gendh.c#3 integrate .. //depot/projects/tty/crypto/openssl/apps/gendsa.c#3 integrate .. //depot/projects/tty/crypto/openssl/apps/genrsa.c#3 integrate .. //depot/projects/tty/crypto/openssl/apps/ocsp.c#2 integrate .. //depot/projects/tty/crypto/openssl/apps/openssl.c#3 integrate .. //depot/projects/tty/crypto/openssl/apps/pkcs12.c#3 integrate .. //depot/projects/tty/crypto/openssl/apps/pkcs7.c#3 integrate .. //depot/projects/tty/crypto/openssl/apps/pkcs8.c#3 integrate .. //depot/projects/tty/crypto/openssl/apps/progs.h#3 integrate .. //depot/projects/tty/crypto/openssl/apps/rand.c#3 integrate .. //depot/projects/tty/crypto/openssl/apps/req.c#3 integrate .. //depot/projects/tty/crypto/openssl/apps/rsa.c#3 integrate .. //depot/projects/tty/crypto/openssl/apps/rsautl.c#3 integrate .. //depot/projects/tty/crypto/openssl/apps/s_client.c#3 integrate .. //depot/projects/tty/crypto/openssl/apps/s_server.c#3 integrate .. //depot/projects/tty/crypto/openssl/apps/smime.c#3 integrate .. //depot/projects/tty/crypto/openssl/apps/speed.c#3 integrate .. //depot/projects/tty/crypto/openssl/apps/spkac.c#3 integrate .. //depot/projects/tty/crypto/openssl/apps/verify.c#3 integrate .. //depot/projects/tty/crypto/openssl/apps/x509.c#3 integrate .. //depot/projects/tty/crypto/openssl/config#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/aes/aes_core.c#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/asn1/a_time.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/asn1/asn1.h#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/asn1/asn1_err.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/bf/Makefile.ssl#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/bio/b_sock.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/bio/bio.h#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/bio/bio_lib.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/bn/Makefile.ssl#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/bn/asm/ia64.S#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/bn/asm/pa-risc2.s#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/bn/bn_lcl.h#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/bn/bn_prime.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/cast/Makefile.ssl#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/conf/conf_mall.c#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/conf/conf_sap.c#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/des/Makefile.ssl#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/des/asm/crypt586.pl#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/des/asm/des-586.pl#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/des/cbc_cksm.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/des/des_locl.h#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/des/destest.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/dh/dh_key.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/dh/dh_lib.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/dsa/dsa_lib.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/dsa/dsa_ossl.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/dsa/dsa_sign.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/dsa/dsa_vrf.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/dsa/dsagen.c#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/dsa/dsatest.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/dso/dso_dl.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/ec/ec.h#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/ec/ec_err.c#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/ec/ec_lib.c#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/ec/ec_mult.c#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/ec/ectest.c#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/engine/Makefile.ssl#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/engine/engine.h#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/engine/enginetest.c#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/err/err.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/err/err_all.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/evp/digest.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/evp/evp_acnf.c#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/evp/evp_enc.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/evp/evp_test.c#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/krb5/Makefile.ssl#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/md2/md2test.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/md4/md4.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/md5/Makefile.ssl#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/md5/md5.c#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/md5/md5.h#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/mem.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/o_time.c#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/objects/obj_dat.h#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/objects/obj_mac.h#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/objects/objects.txt#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/ocsp/Makefile.ssl#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/opensslv.h#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/perlasm/x86asm.pl#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/perlasm/x86ms.pl#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/perlasm/x86nasm.pl#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/perlasm/x86unix.pl#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/rand/rand.h#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/rand/rand_lib.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/rc4/Makefile.ssl#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/rc5/Makefile.ssl#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/rc5/rc5_locl.h#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/ripemd/Makefile.ssl#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/ripemd/rmd160.c#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/rsa/rsa_eay.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/rsa/rsa_lib.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/rsa/rsa_sign.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/rsa/rsa_test.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/sha/Makefile.ssl#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/ui/Makefile.ssl#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/ui/ui_openssl.c#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/x509v3/ext_dat.h#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/x509v3/v3_ocsp.c#2 integrate .. //depot/projects/tty/crypto/openssl/crypto/x509v3/v3_purp.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/x509v3/v3conf.c#3 integrate .. //depot/projects/tty/crypto/openssl/crypto/x509v3/x509v3.h#3 integrate .. //depot/projects/tty/crypto/openssl/demos/x509/mkcert.c#2 integrate .. //depot/projects/tty/crypto/openssl/demos/x509/mkreq.c#2 integrate .. //depot/projects/tty/crypto/openssl/doc/HOWTO/certificates.txt#2 integrate .. //depot/projects/tty/crypto/openssl/doc/apps/ca.pod#3 integrate .. //depot/projects/tty/crypto/openssl/doc/apps/dhparam.pod#2 integrate .. //depot/projects/tty/crypto/openssl/doc/apps/dsa.pod#2 integrate .. //depot/projects/tty/crypto/openssl/doc/apps/dsaparam.pod#2 integrate .. //depot/projects/tty/crypto/openssl/doc/apps/gendsa.pod#2 integrate .. //depot/projects/tty/crypto/openssl/doc/apps/genrsa.pod#2 integrate .. //depot/projects/tty/crypto/openssl/doc/apps/pkcs7.pod#3 integrate .. //depot/projects/tty/crypto/openssl/doc/apps/pkcs8.pod#2 integrate .. //depot/projects/tty/crypto/openssl/doc/apps/req.pod#3 integrate .. //depot/projects/tty/crypto/openssl/doc/apps/rsa.pod#3 integrate .. //depot/projects/tty/crypto/openssl/doc/apps/spkac.pod#2 integrate .. //depot/projects/tty/crypto/openssl/doc/apps/x509.pod#3 integrate .. //depot/projects/tty/crypto/openssl/doc/crypto/BN_generate_prime.pod#3 integrate .. //depot/projects/tty/crypto/openssl/doc/crypto/EVP_SealInit.pod#3 integrate .. //depot/projects/tty/crypto/openssl/doc/standards.txt#3 integrate .. //depot/projects/tty/crypto/openssl/openssl.spec#3 integrate .. //depot/projects/tty/crypto/openssl/ssl/bio_ssl.c#3 integrate .. //depot/projects/tty/crypto/openssl/ssl/s2_clnt.c#3 integrate .. //depot/projects/tty/crypto/openssl/ssl/s3_both.c#3 integrate .. //depot/projects/tty/crypto/openssl/ssl/s3_enc.c#3 integrate .. //depot/projects/tty/crypto/openssl/ssl/s3_pkt.c#3 integrate .. //depot/projects/tty/crypto/openssl/ssl/ssl.h#3 integrate .. //depot/projects/tty/crypto/openssl/ssl/ssl_cert.c#3 integrate .. //depot/projects/tty/crypto/openssl/ssl/ssl_lib.c#3 integrate .. //depot/projects/tty/crypto/openssl/ssl/ssltest.c#3 integrate .. //depot/projects/tty/crypto/openssl/test/Makefile.ssl#3 integrate .. //depot/projects/tty/crypto/openssl/test/testgen#3 integrate .. //depot/projects/tty/crypto/openssl/util/bat.sh#2 integrate .. //depot/projects/tty/crypto/openssl/util/libeay.num#3 integrate .. //depot/projects/tty/crypto/openssl/util/mk1mf.pl#3 integrate .. //depot/projects/tty/crypto/openssl/util/mkdef.pl#3 integrate .. //depot/projects/tty/crypto/openssl/util/ssleay.num#3 integrate .. //depot/projects/tty/etc/defaults/pccard.conf#3 integrate .. //depot/projects/tty/etc/mtree/BSD.usr.dist#3 integrate .. //depot/projects/tty/etc/newsyslog.conf#2 integrate .. //depot/projects/tty/etc/opieaccess#2 integrate .. //depot/projects/tty/etc/pam.d/ftpd#3 integrate .. //depot/projects/tty/etc/pam.d/login#3 integrate .. //depot/projects/tty/etc/pam.d/other#3 integrate .. //depot/projects/tty/etc/pam.d/sshd#3 integrate .. //depot/projects/tty/etc/pam.d/su#3 integrate .. //depot/projects/tty/etc/pam.d/telnetd#3 integrate .. //depot/projects/tty/etc/pam.d/xdm#3 integrate .. //depot/projects/tty/etc/rc.d/cleanvar#2 integrate .. //depot/projects/tty/etc/rc.d/diskless#2 integrate .. //depot/projects/tty/etc/rc.d/initdiskless#2 integrate .. //depot/projects/tty/etc/rc.d/ipsec#2 integrate .. //depot/projects/tty/etc/rc.d/mountcritremote#2 integrate .. //depot/projects/tty/etc/rc.d/virecover#2 integrate .. //depot/projects/tty/etc/rc.diskless1#2 integrate .. //depot/projects/tty/games/fortune/Notes#2 integrate .. //depot/projects/tty/games/fortune/datfiles/fortunes#3 integrate .. //depot/projects/tty/games/fortune/datfiles/fortunes2#2 integrate .. //depot/projects/tty/games/fortune/datfiles/freebsd-tips#2 integrate .. //depot/projects/tty/games/random/Makefile#3 integrate .. //depot/projects/tty/games/random/random.6#3 integrate .. //depot/projects/tty/games/random/random.c#3 integrate .. //depot/projects/tty/games/random/randomize_fd.c#2 integrate .. //depot/projects/tty/games/random/randomize_fd.h#2 integrate .. //depot/projects/tty/gnu/include/values.h#2 delete .. //depot/projects/tty/gnu/lib/csu/Makefile#2 integrate .. //depot/projects/tty/gnu/lib/libstdc++/c++config.h#2 integrate .. //depot/projects/tty/gnu/lib/libstdc++/config.h#2 integrate .. //depot/projects/tty/gnu/usr.bin/Makefile#2 integrate .. //depot/projects/tty/gnu/usr.bin/binutils/doc/Makefile#2 integrate .. //depot/projects/tty/gnu/usr.bin/binutils/gasp/Makefile#2 integrate .. //depot/projects/tty/gnu/usr.bin/cc/gcov/Makefile#2 integrate .. //depot/projects/tty/include/resolv.h#2 integrate .. //depot/projects/tty/lib/Makefile#4 integrate .. //depot/projects/tty/lib/compat/compat4x.alpha/Makefile#2 integrate .. //depot/projects/tty/lib/compat/compat4x.alpha/libcrypto.so.2.gz.uu#1 branch .. //depot/projects/tty/lib/compat/compat4x.alpha/libgmp.so.3.bz2.uu#1 branch .. //depot/projects/tty/lib/compat/compat4x.alpha/libssl.so.2.gz.uu#1 branch .. //depot/projects/tty/lib/compat/compat4x.i386/Makefile#2 integrate .. //depot/projects/tty/lib/compat/compat4x.i386/libcrypto.so.2.gz.uu#1 branch .. //depot/projects/tty/lib/compat/compat4x.i386/libgmp.so.3.bz2.uu#1 branch .. //depot/projects/tty/lib/compat/compat4x.i386/libssl.so.2.gz.uu#1 branch .. //depot/projects/tty/lib/libc/alpha/gen/getcontext.S#2 delete .. //depot/projects/tty/lib/libc/db/btree/bt_put.c#2 integrate .. //depot/projects/tty/lib/libc/db/btree/bt_split.c#2 integrate .. //depot/projects/tty/lib/libc/db/hash/hash_bigkey.c#2 integrate .. //depot/projects/tty/lib/libc/db/hash/hash_func.c#2 integrate .. //depot/projects/tty/lib/libc/db/recno/rec_close.c#2 integrate .. //depot/projects/tty/lib/libc/db/recno/rec_seq.c#2 integrate .. //depot/projects/tty/lib/libc/gen/Makefile.inc#4 integrate .. //depot/projects/tty/lib/libc/gen/dlinfo.3#2 integrate .. //depot/projects/tty/lib/libc/gen/dlopen.3#3 integrate .. //depot/projects/tty/lib/libc/gen/getdomainname.3#2 integrate .. //depot/projects/tty/lib/libc/gen/getgrouplist.c#2 integrate .. //depot/projects/tty/lib/libc/gen/getosreldate.3#2 integrate .. //depot/projects/tty/lib/libc/gen/getpwent.c#2 integrate .. //depot/projects/tty/lib/libc/gen/nlist.c#2 integrate .. //depot/projects/tty/lib/libc/gen/semctl.c#2 integrate .. //depot/projects/tty/lib/libc/gen/setmode.c#2 integrate .. //depot/projects/tty/lib/libc/gen/signbit.3#2 integrate .. //depot/projects/tty/lib/libc/gen/stringlist.3#2 integrate .. //depot/projects/tty/lib/libc/gen/sysctl.c#2 integrate .. //depot/projects/tty/lib/libc/gen/unvis.c#2 integrate .. //depot/projects/tty/lib/libc/i386/gen/getcontext.S#2 delete .. //depot/projects/tty/lib/libc/i386/gen/signalcontext.c#2 integrate .. //depot/projects/tty/lib/libc/i386/sys/i386_get_ioperm.c#2 integrate .. //depot/projects/tty/lib/libc/i386/sys/i386_get_ldt.c#2 integrate .. //depot/projects/tty/lib/libc/i386/sys/i386_set_ioperm.c#2 integrate .. //depot/projects/tty/lib/libc/i386/sys/i386_set_ldt.c#2 integrate .. //depot/projects/tty/lib/libc/i386/sys/i386_vm86.c#2 integrate .. //depot/projects/tty/lib/libc/ia64/_fpmath.h#2 integrate .. //depot/projects/tty/lib/libc/ia64/gen/infinity.c#3 integrate .. //depot/projects/tty/lib/libc/include/libc_private.h#2 integrate .. //depot/projects/tty/lib/libc/include/namespace.h#2 integrate .. //depot/projects/tty/lib/libc/include/un-namespace.h#2 integrate .. //depot/projects/tty/lib/libc/locale/utf8.c#2 integrate .. //depot/projects/tty/lib/libc/locale/wcstod.c#2 integrate .. //depot/projects/tty/lib/libc/net/getaddrinfo.c#2 integrate .. //depot/projects/tty/lib/libc/net/getservent.c#2 integrate .. //depot/projects/tty/lib/libc/net/if_nametoindex.c#2 integrate .. //depot/projects/tty/lib/libc/net/name6.c#2 integrate .. //depot/projects/tty/lib/libc/net/ns_name.c#2 integrate .. //depot/projects/tty/lib/libc/net/ns_ttl.c#2 integrate .. //depot/projects/tty/lib/libc/net/nsdispatch.c#2 integrate .. //depot/projects/tty/lib/libc/net/nslexer.l#2 integrate .. //depot/projects/tty/lib/libc/net/rcmd.c#2 integrate .. //depot/projects/tty/lib/libc/net/rcmdsh.c#2 integrate .. //depot/projects/tty/lib/libc/net/res_debug.c#2 integrate .. //depot/projects/tty/lib/libc/net/res_mkupdate.c#2 integrate .. //depot/projects/tty/lib/libc/net/res_query.c#2 integrate .. //depot/projects/tty/lib/libc/posix1e/acl_delete.3#2 integrate .. //depot/projects/tty/lib/libc/posix1e/acl_get.3#3 integrate .. //depot/projects/tty/lib/libc/posix1e/acl_set.3#3 integrate .. //depot/projects/tty/lib/libc/posix1e/mac.3#2 integrate .. //depot/projects/tty/lib/libc/posix1e/mac.c#2 integrate .. //depot/projects/tty/lib/libc/posix1e/mac_exec.c#2 integrate .. //depot/projects/tty/lib/libc/posix1e/mac_get.c#2 integrate .. //depot/projects/tty/lib/libc/posix1e/mac_prepare.3#2 integrate .. //depot/projects/tty/lib/libc/posix1e/mac_set.c#2 integrate .. //depot/projects/tty/lib/libc/regex/engine.c#2 integrate .. //depot/projects/tty/lib/libc/regex/regcomp.c#2 integrate .. //depot/projects/tty/lib/libc/regex/regexec.c#2 integrate .. //depot/projects/tty/lib/libc/rpc/Makefile.inc#2 integrate .. //depot/projects/tty/lib/libc/rpc/crypt_client.c#2 integrate .. //depot/projects/tty/lib/libc/rpc/getnetconfig.c#3 integrate .. //depot/projects/tty/lib/libc/rpc/getrpcent.c#2 integrate .. //depot/projects/tty/lib/libc/rpc/mt_misc.c#2 integrate .. //depot/projects/tty/lib/libc/rpc/rpc_com.h#2 integrate .. //depot/projects/tty/lib/libc/rpc/svc_run.c#3 integrate .. //depot/projects/tty/lib/libc/stdio/ferror.3#2 integrate .. //depot/projects/tty/lib/libc/stdio/getc.3#2 integrate .. //depot/projects/tty/lib/libc/stdio/mktemp.c#2 integrate .. //depot/projects/tty/lib/libc/stdio/putc.3#2 integrate .. //depot/projects/tty/lib/libc/stdio/stdio.3#2 integrate .. //depot/projects/tty/lib/libc/stdlib/insque.3#2 integrate .. //depot/projects/tty/lib/libc/stdlib/rand.c#3 integrate .. //depot/projects/tty/lib/libc/stdlib/realpath.c#2 integrate .. //depot/projects/tty/lib/libc/stdtime/asctime.c#2 integrate .. //depot/projects/tty/lib/libc/stdtime/difftime.c#2 integrate .. //depot/projects/tty/lib/libc/stdtime/localtime.c#2 integrate .. //depot/projects/tty/lib/libc/stdtime/strptime.c#2 integrate .. //depot/projects/tty/lib/libc/sys/clock_gettime.2#3 integrate .. //depot/projects/tty/lib/libc/sys/intro.2#2 integrate .. //depot/projects/tty/lib/libc/sys/kse.2#2 integrate .. //depot/projects/tty/lib/libc/sys/mincore.2#2 integrate .. //depot/projects/tty/lib/libc/sys/mount.2#2 integrate .. //depot/projects/tty/lib/libc/sys/mprotect.2#2 integrate .. //depot/projects/tty/lib/libc/sys/rfork.2#3 integrate .. //depot/projects/tty/lib/libc/sys/sem.c#2 integrate .. //depot/projects/tty/lib/libc/xdr/xdr_rec.c#3 integrate .. //depot/projects/tty/lib/libc_r/man/Makefile.inc#3 integrate .. //depot/projects/tty/lib/libc_r/man/pthread_attr.3#4 integrate .. //depot/projects/tty/lib/libc_r/man/pthread_attr_get_np.3#4 integrate .. //depot/projects/tty/lib/libc_r/man/pthread_attr_setcreatesuspend_np.3#2 integrate .. //depot/projects/tty/lib/libc_r/man/pthread_main_np.3#2 integrate .. //depot/projects/tty/lib/libc_r/man/pthread_multi_np.3#2 integrate .. //depot/projects/tty/lib/libc_r/man/pthread_mutexattr_getkind_np.3#2 integrate .. //depot/projects/tty/lib/libc_r/man/pthread_resume_all_np.3#2 integrate .. //depot/projects/tty/lib/libc_r/man/pthread_resume_np.3#2 integrate .. //depot/projects/tty/lib/libc_r/man/pthread_set_name_np.3#2 integrate .. //depot/projects/tty/lib/libc_r/man/pthread_suspend_all_np.3#2 integrate .. //depot/projects/tty/lib/libc_r/man/pthread_suspend_np.3#2 integrate .. //depot/projects/tty/lib/libc_r/man/pthread_switch_add_np.3#2 integrate .. //depot/projects/tty/lib/libc_r/man/sem_open.3#2 integrate .. //depot/projects/tty/lib/libdevinfo/devinfo_var.h#2 integrate .. //depot/projects/tty/lib/libdevstat/devstat.3#2 integrate .. //depot/projects/tty/lib/libdevstat/devstat.c#2 integrate .. //depot/projects/tty/lib/libgeom/libgeom.3#3 integrate .. //depot/projects/tty/lib/libkvm/kvm_proc.c#2 integrate .. //depot/projects/tty/lib/libncp/ncp_mod.h#2 delete .. //depot/projects/tty/lib/libncp/ncpl_net.c#2 integrate .. //depot/projects/tty/lib/libncp/ncpl_subr.c#2 integrate .. //depot/projects/tty/lib/libncurses/Makefile#2 integrate .. //depot/projects/tty/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8#2 integrate .. //depot/projects/tty/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c#2 integrate .. //depot/projects/tty/lib/libpam/modules/pam_ssh/pam_ssh.8#3 integrate .. //depot/projects/tty/lib/libpthread/thread/Makefile.inc#3 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_cancel.c#2 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_init.c#2 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_kern.c#2 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_private.h#2 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_sig.c#2 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_sigaction.c#2 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_sigpending.c#2 integrate .. //depot/projects/tty/lib/libufs/block.c#3 integrate .. //depot/projects/tty/lib/libufs/sblock.c#3 integrate .. //depot/projects/tty/lib/libutil/realhostname_sa.3#2 integrate .. //depot/projects/tty/lib/msun/man/lgamma.3#2 integrate .. //depot/projects/tty/lib/msun/src/math.h#4 integrate .. //depot/projects/tty/libexec/ftpd/ftpd.8#3 integrate .. //depot/projects/tty/libexec/getty/gettytab.5#2 integrate .. //depot/projects/tty/libexec/rpc.rstatd/rstat_proc.c#2 integrate .. //depot/projects/tty/libexec/rtld-elf/rtld.c#4 integrate .. //depot/projects/tty/release/Makefile#3 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/errata/article.sgml#3 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#3 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#2 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml#2 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/installation/common/install.sgml#2 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#4 integrate .. //depot/projects/tty/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#3 integrate .. //depot/projects/tty/release/i386/dokern.sh#2 integrate .. //depot/projects/tty/release/i386/drivers.conf#3 integrate .. //depot/projects/tty/release/pc98/dokern.sh#3 integrate .. //depot/projects/tty/release/scripts/doFS.sh#3 integrate .. //depot/projects/tty/sbin/Makefile#3 integrate .. //depot/projects/tty/sbin/badsect/Makefile#3 integrate .. //depot/projects/tty/sbin/badsect/badsect.c#2 integrate .. //depot/projects/tty/sbin/camcontrol/Makefile#2 integrate .. //depot/projects/tty/sbin/camcontrol/camcontrol.c#2 integrate .. //depot/projects/tty/sbin/camcontrol/modeedit.c#2 integrate .. //depot/projects/tty/sbin/camcontrol/util.c#2 integrate .. //depot/projects/tty/sbin/ccdconfig/ccdconfig.8#3 integrate .. //depot/projects/tty/sbin/comcontrol/Makefile#2 integrate .. //depot/projects/tty/sbin/disklabel/disklabel.8#3 integrate .. //depot/projects/tty/sbin/disklabel/disklabel.c#3 integrate .. //depot/projects/tty/sbin/dmesg/Makefile#2 integrate .. //depot/projects/tty/sbin/dump/dump.8#2 integrate .. //depot/projects/tty/sbin/dump/main.c#2 integrate .. //depot/projects/tty/sbin/dumpfs/dumpfs.8#2 integrate .. //depot/projects/tty/sbin/gbde/gbde.c#2 integrate .. //depot/projects/tty/sbin/ifconfig/ifconfig.8#2 integrate .. //depot/projects/tty/sbin/init/init.8#2 integrate .. //depot/projects/tty/sbin/mknod/mknod.8#2 integrate .. //depot/projects/tty/sbin/mksnap_ffs/Makefile#1 branch .. //depot/projects/tty/sbin/mksnap_ffs/mksnap_ffs.8#1 branch .. //depot/projects/tty/sbin/mksnap_ffs/mksnap_ffs.c#1 branch .. //depot/projects/tty/sbin/mount/mount.8#2 integrate .. //depot/projects/tty/sbin/natd/natd.8#2 integrate .. //depot/projects/tty/sbin/newfs/mkfs.c#4 integrate .. //depot/projects/tty/sbin/newfs/newfs.8#3 integrate .. //depot/projects/tty/sbin/newfs/ref.test#3 integrate .. //depot/projects/tty/sbin/ping/ping.8#3 integrate .. //depot/projects/tty/sbin/ping/ping.c#3 integrate .. //depot/projects/tty/sbin/swapon/swapon.8#2 integrate .. //depot/projects/tty/sbin/swapon/swapon.c#2 integrate .. //depot/projects/tty/sbin/tunefs/tunefs.8#3 integrate .. //depot/projects/tty/sbin/tunefs/tunefs.c#3 integrate .. //depot/projects/tty/sbin/umount/Makefile#2 integrate .. //depot/projects/tty/sbin/vinum/commands.c#2 integrate .. //depot/projects/tty/sbin/vinum/list.c#2 integrate .. //depot/projects/tty/sbin/vinum/vext.h#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/Makefile#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/Makefile.inc#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/ASN1_OBJECT_new.3#2 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/ASN1_STRING_length.3#2 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/ASN1_STRING_new.3#2 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3#2 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/BIO_ctrl.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/BIO_f_base64.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/BIO_f_buffer.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/BIO_f_cipher.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/BIO_f_md.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/BIO_f_null.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/BIO_f_ssl.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/BIO_find_type.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/BIO_new.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/BIO_push.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/BIO_read.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/BIO_s_accept.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/BIO_s_bio.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/BIO_s_connect.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/BIO_s_fd.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/BIO_s_file.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/BIO_s_mem.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/BIO_s_null.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/BIO_s_socket.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/BIO_set_callback.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/BIO_should_retry.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/BN_CTX_new.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/BN_CTX_start.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/BN_add.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/BN_add_word.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/BN_bn2bin.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/BN_cmp.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/BN_copy.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/BN_generate_prime.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/BN_mod_inverse.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/BN_new.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/BN_num_bytes.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/BN_rand.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/BN_set_bit.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/BN_swap.3#2 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/BN_zero.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/DH_generate_key.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/DH_generate_parameters.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/DH_get_ex_new_index.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/DH_new.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/DH_set_method.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/DH_size.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/DSA_SIG_new.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/DSA_do_sign.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/DSA_dup_DH.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/DSA_generate_key.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/DSA_generate_parameters.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/DSA_get_ex_new_index.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/DSA_new.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/DSA_set_method.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/DSA_sign.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/DSA_size.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/ERR_GET_LIB.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/ERR_clear_error.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/ERR_error_string.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/ERR_get_error.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/ERR_load_crypto_strings.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/ERR_load_strings.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/ERR_print_errors.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/ERR_put_error.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/ERR_remove_state.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/EVP_BytesToKey.3#2 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/EVP_DigestInit.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/EVP_EncryptInit.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/EVP_OpenInit.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/EVP_PKEY_new.3#2 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3#2 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/EVP_SealInit.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/EVP_SignInit.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/EVP_VerifyInit.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/OBJ_nid2obj.3#2 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/PKCS12_create.3#2 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/PKCS12_parse.3#2 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/PKCS7_decrypt.3#2 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/PKCS7_encrypt.3#2 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/PKCS7_sign.3#2 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/PKCS7_verify.3#2 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/RAND_add.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/RAND_bytes.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/RAND_cleanup.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/RAND_egd.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/RAND_load_file.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/RAND_set_rand_method.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/RSA_blinding_on.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/RSA_check_key.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/RSA_generate_key.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/RSA_get_ex_new_index.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/RSA_new.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/RSA_print.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/RSA_private_encrypt.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/RSA_public_encrypt.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/RSA_set_method.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/RSA_sign.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/RSA_size.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/SMIME_read_PKCS7.3#2 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/SMIME_write_PKCS7.3#2 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3#2 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3#2 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3#2 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/X509_NAME_print_ex.3#2 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/X509_new.3#2 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/bio.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/blowfish.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/bn.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/bn_internal.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/buffer.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/crypto.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3#2 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/d2i_DHparams.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/d2i_DSAPublicKey.3#2 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3#2 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/d2i_RSAPublicKey.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/d2i_X509.3#2 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/d2i_X509_ALGOR.3#2 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/d2i_X509_CRL.3#2 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/d2i_X509_NAME.3#2 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/d2i_X509_REQ.3#2 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/d2i_X509_SIG.3#2 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/des.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/dh.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/dsa.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/engine.3#2 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/err.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/evp.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/hmac.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/lh_stats.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/lhash.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/md5.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/mdc2.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/pem.3#2 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/rand.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/rc4.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/ripemd.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/rsa.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/sha.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/threads.3#3 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/ui.3#2 integrate .. //depot/projects/tty/secure/lib/libcrypto/man/ui_compat.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_CIPHER_get_name.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_COMP_add_compression_method.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_CTX_add_session.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_CTX_ctrl.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_CTX_flush_sessions.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_CTX_free.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_CTX_new.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_CTX_sess_number.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_CTX_sessions.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_CTX_set_cert_store.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_CTX_set_info_callback.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_CTX_set_mode.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_CTX_set_options.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_CTX_set_timeout.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_CTX_set_verify.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_CTX_use_certificate.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_SESSION_free.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_SESSION_get_time.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_accept.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_alert_type_string.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_clear.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_connect.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_do_handshake.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_free.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_get_SSL_CTX.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_get_ciphers.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_get_client_CA_list.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_get_current_cipher.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_get_default_timeout.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_get_error.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_get_ex_new_index.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_get_fd.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_get_peer_cert_chain.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_get_peer_certificate.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_get_rbio.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_get_session.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_get_verify_result.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_get_version.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_library_init.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_load_client_CA_file.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_new.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_pending.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_read.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_rstate_string.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_session_reused.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_set_bio.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_set_connect_state.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_set_fd.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_set_session.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_set_shutdown.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_set_verify_result.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_shutdown.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_state_string.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_want.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/SSL_write.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/d2i_SSL_SESSION.3#2 integrate .. //depot/projects/tty/secure/lib/libssl/man/ssl.3#2 integrate .. //depot/projects/tty/secure/usr.bin/openssl/Makefile#3 integrate .. //depot/projects/tty/secure/usr.bin/openssl/man/CA.pl.1#2 integrate .. //depot/projects/tty/secure/usr.bin/openssl/man/asn1parse.1#2 integrate .. //depot/projects/tty/secure/usr.bin/openssl/man/ca.1#2 integrate .. //depot/projects/tty/secure/usr.bin/openssl/man/ciphers.1#2 integrate .. //depot/projects/tty/secure/usr.bin/openssl/man/crl.1#2 integrate .. //depot/projects/tty/secure/usr.bin/openssl/man/crl2pkcs7.1#2 integrate .. //depot/projects/tty/secure/usr.bin/openssl/man/dgst.1#2 integrate .. //depot/projects/tty/secure/usr.bin/openssl/man/dhparam.1#2 integrate .. //depot/projects/tty/secure/usr.bin/openssl/man/dsa.1#2 integrate .. //depot/projects/tty/secure/usr.bin/openssl/man/dsaparam.1#2 integrate .. //depot/projects/tty/secure/usr.bin/openssl/man/enc.1#2 integrate .. //depot/projects/tty/secure/usr.bin/openssl/man/gendsa.1#2 integrate .. //depot/projects/tty/secure/usr.bin/openssl/man/genrsa.1#2 integrate .. //depot/projects/tty/secure/usr.bin/openssl/man/nseq.1#2 integrate .. //depot/projects/tty/secure/usr.bin/openssl/man/ocsp.1#2 integrate .. //depot/projects/tty/secure/usr.bin/openssl/man/openssl.1#2 integrate .. //depot/projects/tty/secure/usr.bin/openssl/man/passwd.1#2 integrate .. //depot/projects/tty/secure/usr.bin/openssl/man/pkcs12.1#2 integrate .. //depot/projects/tty/secure/usr.bin/openssl/man/pkcs7.1#2 integrate .. //depot/projects/tty/secure/usr.bin/openssl/man/pkcs8.1#2 integrate .. //depot/projects/tty/secure/usr.bin/openssl/man/rand.1#2 integrate .. //depot/projects/tty/secure/usr.bin/openssl/man/req.1#2 integrate .. //depot/projects/tty/secure/usr.bin/openssl/man/rsa.1#2 integrate .. //depot/projects/tty/secure/usr.bin/openssl/man/rsautl.1#2 integrate .. //depot/projects/tty/secure/usr.bin/openssl/man/s_client.1#2 integrate .. //depot/projects/tty/secure/usr.bin/openssl/man/s_server.1#2 integrate .. //depot/projects/tty/secure/usr.bin/openssl/man/sess_id.1#2 integrate .. //depot/projects/tty/secure/usr.bin/openssl/man/smime.1#2 integrate .. //depot/projects/tty/secure/usr.bin/openssl/man/speed.1#2 integrate .. //depot/projects/tty/secure/usr.bin/openssl/man/spkac.1#2 integrate .. //depot/projects/tty/secure/usr.bin/openssl/man/verify.1#2 integrate .. //depot/projects/tty/secure/usr.bin/openssl/man/version.1#2 integrate .. //depot/projects/tty/secure/usr.bin/openssl/man/x509.1#2 integrate .. //depot/projects/tty/share/man/man4/Makefile#2 integrate .. //depot/projects/tty/share/man/man4/aac.4#2 integrate .. //depot/projects/tty/share/man/man4/an.4#2 integrate .. //depot/projects/tty/share/man/man4/aue.4#2 integrate .. //depot/projects/tty/share/man/man4/awi.4#2 integrate .. //depot/projects/tty/share/man/man4/bge.4#2 integrate .. //depot/projects/tty/share/man/man4/card.4#1 branch .. //depot/projects/tty/share/man/man4/ciss.4#2 integrate .. //depot/projects/tty/share/man/man4/cue.4#2 integrate .. //depot/projects/tty/share/man/man4/dc.4#2 integrate .. //depot/projects/tty/share/man/man4/devctl.4#3 integrate .. //depot/projects/tty/share/man/man4/ed.4#2 integrate .. //depot/projects/tty/share/man/man4/exca.4#1 branch .. //depot/projects/tty/share/man/man4/firewire.4#4 integrate .. //depot/projects/tty/share/man/man4/fwe.4#3 integrate .. //depot/projects/tty/share/man/man4/fwohci.4#3 integrate .. //depot/projects/tty/share/man/man4/fxp.4#2 integrate .. //depot/projects/tty/share/man/man4/gif.4#2 integrate .. //depot/projects/tty/share/man/man4/ida.4#2 integrate .. //depot/projects/tty/share/man/man4/iir.4#2 integrate .. //depot/projects/tty/share/man/man4/ip.4#2 integrate .. //depot/projects/tty/share/man/man4/kue.4#2 integrate .. //depot/projects/tty/share/man/man4/lmc.4#2 integrate .. //depot/projects/tty/share/man/man4/mac.4#3 integrate .. //depot/projects/tty/share/man/man4/mac_biba.4#2 integrate .. //depot/projects/tty/share/man/man4/mac_mls.4#2 integrate .. //depot/projects/tty/share/man/man4/man4.i386/tx.4#2 integrate .. //depot/projects/tty/share/man/man4/miibus.4#1 branch .. //depot/projects/tty/share/man/man4/pcn.4#2 integrate .. //depot/projects/tty/share/man/man4/random.4#2 integrate .. //depot/projects/tty/share/man/man4/rl.4#2 integrate .. //depot/projects/tty/share/man/man4/sbp.4#5 integrate .. //depot/projects/tty/share/man/man4/sf.4#2 integrate .. //depot/projects/tty/share/man/man4/sio.4#2 integrate .. //depot/projects/tty/share/man/man4/sis.4#2 integrate .. //depot/projects/tty/share/man/man4/ste.4#2 integrate .. //depot/projects/tty/share/man/man4/targ.4#2 integrate .. //depot/projects/tty/share/man/man4/tl.4#2 integrate .. //depot/projects/tty/share/man/man4/trm.4#2 integrate .. //depot/projects/tty/share/man/man4/txp.4#2 integrate .. //depot/projects/tty/share/man/man4/ubsec.4#2 integrate .. //depot/projects/tty/share/man/man4/ugen.4#2 integrate .. //depot/projects/tty/share/man/man4/usb.4#2 integrate .. //depot/projects/tty/share/man/man4/vinum.4#3 integrate .. //depot/projects/tty/share/man/man4/vr.4#2 integrate .. //depot/projects/tty/share/man/man4/wb.4#2 integrate .. //depot/projects/tty/share/man/man4/wi.4#3 integrate .. //depot/projects/tty/share/man/man4/xl.4#2 integrate .. //depot/projects/tty/share/man/man5/Makefile#2 integrate .. //depot/projects/tty/share/man/man5/group.5#2 integrate .. //depot/projects/tty/share/man/man5/msdosfs.5#2 integrate .. //depot/projects/tty/share/man/man5/periodic.conf.5#3 integrate .. //depot/projects/tty/share/man/man5/rc.conf.5#4 integrate .. //depot/projects/tty/share/man/man5/style.Makefile.5#1 branch .. //depot/projects/tty/share/man/man7/operator.7#2 integrate .. //depot/projects/tty/share/man/man7/ports.7#2 integrate .. //depot/projects/tty/share/man/man8/diskless.8#2 integrate .. //depot/projects/tty/share/man/man9/malloc.9#3 integrate .. //depot/projects/tty/share/man/man9/mbuf.9#2 integrate .. //depot/projects/tty/share/man/man9/mutex.9#2 integrate .. //depot/projects/tty/share/man/man9/sleep.9#3 integrate .. //depot/projects/tty/share/mk/bsd.kern.mk#2 integrate .. //depot/projects/tty/share/syscons/keymaps/it.iso.kbd#2 integrate .. //depot/projects/tty/sys/alpha/alpha/alpha-gdbstub.c#2 integrate .. //depot/projects/tty/sys/alpha/alpha/busdma_machdep.c#3 integrate .. //depot/projects/tty/sys/alpha/alpha/dec_kn8ae.c#2 integrate .. //depot/projects/tty/sys/alpha/alpha/exception.s#2 integrate .. //depot/projects/tty/sys/alpha/alpha/genassym.c#2 integrate .. //depot/projects/tty/sys/alpha/alpha/machdep.c#2 integrate .. //depot/projects/tty/sys/alpha/alpha/mem.c#2 integrate .. //depot/projects/tty/sys/alpha/alpha/mp_machdep.c#2 integrate .. //depot/projects/tty/sys/alpha/alpha/pmap.c#3 integrate .. //depot/projects/tty/sys/alpha/alpha/prom.c#2 integrate .. //depot/projects/tty/sys/alpha/alpha/promcons.c#2 integrate .. //depot/projects/tty/sys/alpha/alpha/trap.c#3 integrate .. //depot/projects/tty/sys/alpha/alpha/vm_machdep.c#3 integrate .. //depot/projects/tty/sys/alpha/conf/Makefile#2 integrate .. //depot/projects/tty/sys/alpha/conf/NOTES#3 integrate .. //depot/projects/tty/sys/alpha/conf/SIMOS#3 delete .. //depot/projects/tty/sys/alpha/include/atomic.h#2 integrate .. //depot/projects/tty/sys/alpha/include/bus.h#3 integrate .. //depot/projects/tty/sys/alpha/include/db_machdep.h#2 integrate .. //depot/projects/tty/sys/alpha/include/pmap.h#2 integrate .. //depot/projects/tty/sys/alpha/include/prom.h#2 integrate .. //depot/projects/tty/sys/alpha/linux/linux_proto.h#2 integrate .. //depot/projects/tty/sys/alpha/linux/linux_syscall.h#2 integrate .. //depot/projects/tty/sys/alpha/linux/linux_sysent.c#2 integrate .. //depot/projects/tty/sys/alpha/linux/syscalls.master#2 integrate .. //depot/projects/tty/sys/alpha/mcbus/mcpcia.c#2 integrate .. //depot/projects/tty/sys/alpha/osf1/imgact_osf1.c#2 integrate .. //depot/projects/tty/sys/alpha/osf1/osf1_misc.c#3 integrate .. //depot/projects/tty/sys/alpha/osf1/osf1_signal.c#2 integrate .. //depot/projects/tty/sys/alpha/tlsb/dwlpx.c#2 integrate .. //depot/projects/tty/sys/alpha/tlsb/tlsb.c#2 integrate .. //depot/projects/tty/sys/alpha/tlsb/zs_tlsb.c#2 integrate .. //depot/projects/tty/sys/boot/alpha/common/Makefile.common#2 integrate .. //depot/projects/tty/sys/boot/common/ufsread.c#2 integrate .. //depot/projects/tty/sys/boot/efi/libefi/bootinfo.c#2 integrate .. //depot/projects/tty/sys/boot/efi/libefi/efifs.c#2 integrate .. //depot/projects/tty/sys/boot/efi/libefi/libefi.c#2 integrate .. //depot/projects/tty/sys/boot/efi/loader/Makefile#2 integrate .. //depot/projects/tty/sys/boot/efi/loader/main.c#2 integrate .. //depot/projects/tty/sys/boot/i386/boot2/Makefile#3 integrate .. //depot/projects/tty/sys/boot/ia64/libski/bootinfo.c#3 integrate .. //depot/projects/tty/sys/boot/ia64/skiload/Makefile#2 integrate .. //depot/projects/tty/sys/cam/cam_periph.c#2 integrate .. //depot/projects/tty/sys/cam/cam_sim.c#2 integrate .. //depot/projects/tty/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/tty/sys/cam/scsi/scsi_all.c#2 integrate .. //depot/projects/tty/sys/cam/scsi/scsi_all.h#2 integrate .. //depot/projects/tty/sys/cam/scsi/scsi_cd.c#3 integrate .. //depot/projects/tty/sys/cam/scsi/scsi_cd.h#2 integrate .. //depot/projects/tty/sys/cam/scsi/scsi_ch.c#2 integrate .. //depot/projects/tty/sys/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/tty/sys/cam/scsi/scsi_low.c#2 integrate .. //depot/projects/tty/sys/cam/scsi/scsi_sa.c#3 integrate .. //depot/projects/tty/sys/cam/scsi/scsi_target.c#2 integrate .. //depot/projects/tty/sys/coda/cnode.h#2 integrate .. //depot/projects/tty/sys/coda/coda_fbsd.c#2 integrate .. //depot/projects/tty/sys/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/tty/sys/compat/linux/linux_file.c#2 integrate .. //depot/projects/tty/sys/compat/linux/linux_getcwd.c#2 integrate .. //depot/projects/tty/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/tty/sys/compat/linux/linux_mib.c#2 integrate .. //depot/projects/tty/sys/compat/linux/linux_misc.c#3 integrate .. //depot/projects/tty/sys/compat/linux/linux_signal.c#2 integrate .. //depot/projects/tty/sys/compat/linux/linux_socket.c#3 integrate .. //depot/projects/tty/sys/compat/linux/linux_sysctl.c#2 integrate .. //depot/projects/tty/sys/compat/linux/linux_util.c#2 integrate .. //depot/projects/tty/sys/compat/pecoff/imgact_pecoff.c#2 integrate .. //depot/projects/tty/sys/compat/svr4/svr4_filio.c#2 integrate .. //depot/projects/tty/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/tty/sys/compat/svr4/svr4_socket.c#2 integrate .. //depot/projects/tty/sys/compat/svr4/svr4_stream.c#3 integrate .. //depot/projects/tty/sys/compat/svr4/svr4_sysvec.c#2 integrate .. //depot/projects/tty/sys/conf/Makefile.alpha#2 integrate .. //depot/projects/tty/sys/conf/Makefile.i386#2 integrate .. //depot/projects/tty/sys/conf/Makefile.ia64#2 integrate .. //depot/projects/tty/sys/conf/Makefile.pc98#2 integrate .. //depot/projects/tty/sys/conf/Makefile.powerpc#2 integrate .. //depot/projects/tty/sys/conf/Makefile.sparc64#2 integrate .. //depot/projects/tty/sys/conf/Makefile.x86_64#2 integrate .. //depot/projects/tty/sys/conf/NOTES#5 integrate .. //depot/projects/tty/sys/conf/files#4 integrate .. //depot/projects/tty/sys/conf/files.alpha#5 integrate .. //depot/projects/tty/sys/conf/files.i386#5 integrate .. //depot/projects/tty/sys/conf/files.ia64#4 integrate .. //depot/projects/tty/sys/conf/files.pc98#4 integrate .. //depot/projects/tty/sys/conf/files.powerpc#3 integrate .. //depot/projects/tty/sys/conf/files.sparc64#3 integrate .. //depot/projects/tty/sys/conf/files.x86_64#4 integrate .. //depot/projects/tty/sys/conf/kern.mk#2 integrate .. //depot/projects/tty/sys/conf/kern.post.mk#3 integrate .. //depot/projects/tty/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/tty/sys/conf/kmod.mk#3 integrate .. //depot/projects/tty/sys/conf/majors#2 integrate .. //depot/projects/tty/sys/conf/majors.awk#1 branch .. //depot/projects/tty/sys/conf/makeLINT.mk#1 branch .. //depot/projects/tty/sys/conf/makeLINT.sed#2 integrate .. //depot/projects/tty/sys/conf/options#3 integrate .. //depot/projects/tty/sys/contrib/dev/fla/fla.c#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Mar 2 6:43:15 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0DFB137B405; Sun, 2 Mar 2003 06:43:07 -0800 (PST) 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 8131637B401 for ; Sun, 2 Mar 2003 06:43:06 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CDBCD43FB1 for ; Sun, 2 Mar 2003 06:43:05 -0800 (PST) (envelope-from tzukanov@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h22Eh50U044947 for ; Sun, 2 Mar 2003 06:43:05 -0800 (PST) (envelope-from tzukanov@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h22Eh5Wf044944 for perforce@freebsd.org; Sun, 2 Mar 2003 06:43:05 -0800 (PST) Date: Sun, 2 Mar 2003 06:43:05 -0800 (PST) Message-Id: <200303021443.h22Eh5Wf044944@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to tzukanov@freebsd.org using -f From: Serguei Tzukanov Subject: PERFORCE change 26198 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=26198 Change 26198 by tzukanov@tzukanov_antares on 2003/03/02 06:42:18 Post-TFC fixes. Affected files ... .. //depot/projects/s390/sys/conf/Makefile.s390#3 edit .. //depot/projects/s390/sys/conf/files.s390#3 edit .. //depot/projects/s390/sys/s390/include/pmap.h#2 edit .. //depot/projects/s390/sys/s390/s390/dat.h#2 edit .. //depot/projects/s390/sys/s390/s390/hmcsc.c#5 edit .. //depot/projects/s390/sys/s390/s390/mem.c#3 edit .. //depot/projects/s390/sys/s390/s390/pmap.c#9 edit .. //depot/projects/s390/sys/s390/s390/trap.c#5 edit Differences ... ==== //depot/projects/s390/sys/conf/Makefile.s390#3 (text+ko) ==== @@ -33,10 +33,6 @@ WERROR= -CWARNFLAGS= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ - -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ - -ansi - FMT= # Which version of config(8) is required. @@ -44,8 +40,6 @@ STD8X16FONT?= iso -HACK_EXTRA_FLAGS=-Wl,-shared - .if !defined(S) .if exists(./@/.) S= ./@ @@ -55,12 +49,8 @@ .endif .include "$S/conf/kern.pre.mk" -# XXX: this should probably go somewhere else -COPTS+= +MDOBJS= -SYSTEM_SFILES= -SYSTEM_OBJS= vnode_if.o ${OBJS} hints.o env.o config.o hack.So - %BEFORE_DEPEND %OBJS @@ -73,12 +63,6 @@ %CLEAN -#lint: /tmp -# @lint -hbxn -DGENERIC -Dvolatile= ${COPTS} \ -# $S/$M/$M/Locore.c ${CFILES} | \ -# grep -v 'struct/union .* never defined' | \ -# grep -v 'possible pointer alignment problem' - %RULES .include "$S/conf/kern.post.mk" ==== //depot/projects/s390/sys/conf/files.s390#3 (text+ko) ==== @@ -80,7 +80,7 @@ s390/s390/in_cksum.S optional inet s390/s390/in6_cksum.S optional inet6 s390/s390/iucv.c optional iucv -s390/s390/locore.S standard +s390/s390/locore.S standard no-obj s390/s390/machdep.c standard s390/s390/mcheck.c standard s390/s390/mem.c standard ==== //depot/projects/s390/sys/s390/include/pmap.h#2 (text+ko) ==== @@ -67,7 +67,6 @@ TAILQ_HEAD(,pv_entry) pm_pvlist; /* list of mappings in pmap */ u_int pm_active; /* active on cpus */ struct pmap_statistics pm_stats; /* pmap statistics */ - struct vm_page * pm_ptphint; /* pmap ptp hint */ }; #define pmap_page_is_mapped(m) (!TAILQ_EMPTY(&(m)->md.pv_list)) ==== //depot/projects/s390/sys/s390/s390/dat.h#2 (text+ko) ==== @@ -46,11 +46,7 @@ /* Segment-table entry. */ typedef u_long ste_t; -#define STESIZE sizeof(ste_t) - /* Page-table entry. */ typedef u_long pte_t; -#define PTESIZE sizeof(pte_t) - #endif /* !_ESA_DAT_H_ */ ==== //depot/projects/s390/sys/s390/s390/hmcsc.c#5 (text+ko) ==== @@ -170,7 +170,7 @@ #endif static int -hmcsc_cngetc(dev_t dev) +hmcsc_cngetc(struct consdev *cn) { int c; @@ -195,7 +195,7 @@ } static int -hmcsc_cncheckc(dev_t dev) +hmcsc_cncheckc(struct consdev *cn) { int c = -1; @@ -208,7 +208,7 @@ } static void -hmcsc_cnputc(dev_t dev, int c) +hmcsc_cnputc(struct consdev *cn, int c) { mtx_lock_spin(&hmcsc_lock); if ((c == '\n') || (outcur >= HMCSC_BUF_LEN)) @@ -219,7 +219,7 @@ } CONS_DRIVER -(hmcsc, hmcsc_cnprobe, hmcsc_cninit, 0, hmcsc_cngetc, hmcsc_cncheckc, hmcsc_cnputc, 0); +(hmcsc, hmcsc_cnprobe, hmcsc_cninit, NULL, hmcsc_cngetc, hmcsc_cncheckc, hmcsc_cnputc, NULL); static int hmcsc_param(struct tty *tp, struct termios *t) @@ -237,7 +237,7 @@ tp->t_state |= TS_BUSY; while (tp->t_outq.c_cc != 0) - hmcsc_cnputc(tp->t_dev, getc(&tp->t_outq)); + hmcsc_cnputc(NULL, getc(&tp->t_outq)); tp->t_state &= ~TS_BUSY; @@ -262,7 +262,7 @@ if (outcur) hmcsc_flush(); - while ((c = hmcsc_cncheckc(tp->t_dev)) != -1) { + while ((c = hmcsc_cncheckc(NULL)) != -1) { if (tp->t_state & TS_ISOPEN) (*linesw[tp->t_line].l_rint)(c, tp); } ==== //depot/projects/s390/sys/s390/s390/mem.c#3 (text+ko) ==== @@ -153,17 +153,20 @@ } static int -memmmap(dev_t dev, vm_offset_t offset, int prot) +memmmap(dev_t dev, vm_offset_t offset, vm_offset_t *paddr, int prot) { switch (minor(dev)) { case 1: - offset = lra(offset); - /* fall through */ + *paddr = lra(offset); + break; case 0: - return atop(offset); + *paddr = offset; + break; default: return -1; } + + return 0; } #define CDEV_MAJOR 2 ==== //depot/projects/s390/sys/s390/s390/pmap.c#9 (text+ko) ==== @@ -353,7 +353,7 @@ vm_offset_t ptepa = STE_PTO(ste); pte_t pte; - for (i = 0; i < 256; i++, ptepa += PTESIZE) { + for (i = 0; i < 256; i++, ptepa += sizeof(pte_t)) { pte = lura(ptepa); KASSERT(pte & PTE_INVALID, @@ -428,9 +428,6 @@ pmap->pm_stats.resident_count--; - if (pmap->pm_ptphint == mpte) - pmap->pm_ptphint = NULL; - /* Free the page if it is finally unwired. */ if (--mpte->wire_count == 0) { CTR0(KTR_PMAP, "\t\tmpte->wire_count == 0"); @@ -475,14 +472,13 @@ if (mpte == NULL) { vm_pindex_t pindex = VA_SX(va) >> 2; - if (pmap->pm_ptphint && - (pmap->pm_ptphint->pindex == pindex)) { - mpte = pmap->pm_ptphint; + if (pmap->pm_pteobj->root && + (pmap->pm_pteobj->root->pindex == pindex)) { + mpte = pmap->pm_pteobj->root; } else { while ((mpte = vm_page_lookup(pmap->pm_pteobj, pindex)) != NULL && vm_page_sleep_if_busy(mpte, FALSE, "pulook")) vm_page_lock_queues(); - pmap->pm_ptphint = mpte; } KASSERT(mpte != NULL, ("pmap_unuse_ptp: mpte == NULL")); } @@ -600,14 +596,11 @@ /* Set invalid flag in the four page tables. */ ptepa = VM_PAGE_TO_PHYS(mpte); - for (i = 0; i < NPTEP; i++, ptepa += PTESIZE) + for (i = 0; i < NPTEP; i++, ptepa += sizeof(pte_t)) stura(ptepa, PTE_INVALID); pmap_set_ste_quad(&pmap->pm_sto[ptindex & ~3ul], ptepa - PAGE_SIZE); - /* Set the page table page hint. */ - pmap->pm_ptphint = mpte; - vm_page_lock_queues(); mpte->valid = VM_PAGE_BITS_ALL; vm_page_flag_clear(mpte, PG_ZERO); @@ -629,12 +622,11 @@ ste = pmap->pm_sto[ptindex]; CTR1(KTR_PMAP, "\tste = %x", ste); if (ste_valid(ste)) { - if (pmap->pm_ptphint && - (pmap->pm_ptphint->pindex == (ptindex >> 2))) { - mpte = pmap->pm_ptphint; + if (pmap->pm_pteobj->root && + (pmap->pm_pteobj->root->pindex == (ptindex >> 2))) { + mpte = pmap->pm_pteobj->root; } else { mpte = pmap_page_lookup(pmap->pm_pteobj, (ptindex >> 2)); - pmap->pm_ptphint = mpte; } KASSERT(mpte != NULL, ("pmap_get_pte: mpte == NULL")); mpte->hold_count++; @@ -700,9 +692,6 @@ else pmap_clear_ste_quad(&pmap->pm_sto[m->pindex << 2]); - if (pmap->pm_ptphint == m) - pmap->pm_ptphint = NULL; - m->wire_count--; cnt.v_wire_count--; vm_page_free(m); @@ -1223,12 +1212,6 @@ } } -vm_offset_t -pmap_phys_address(int ppn) -{ - return ptoa(ppn); -} - void pmap_pinit(pmap_t pmap) { @@ -1257,7 +1240,6 @@ pmap->pm_sto[i] = STE_INVALID; pmap->pm_active = 0; - pmap->pm_ptphint = NULL; TAILQ_INIT(&pmap->pm_pvlist); bzero(&pmap->pm_stats, sizeof(pmap->pm_stats)); } @@ -1268,7 +1250,6 @@ CTR1(KTR_PMAP, "pmap_pinit0: pmap = %p", pmap); pmap->pm_sto = proc0sto; - pmap->pm_ptphint = NULL; pmap->pm_active = 0; TAILQ_INIT(&pmap->pm_pvlist); bzero(&pmap->pm_stats, sizeof(pmap->pm_stats)); ==== //depot/projects/s390/sys/s390/s390/trap.c#5 (text+ko) ==== @@ -50,7 +50,6 @@ #include #include #include -#include #include #include #include @@ -510,7 +509,7 @@ if (td->td_ucred != p->p_ucred) cred_update_thread(td); - if (p->p_flag & P_KSES) + if (p->p_flag & P_THREADED) thread_user_enter(p, td); code = tf->tf_gpr[0]; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Mar 2 10:18: 7 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B73437B405; Sun, 2 Mar 2003 10:17:41 -0800 (PST) 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 452BC37B401 for ; Sun, 2 Mar 2003 10:17:41 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F282C43FB1 for ; Sun, 2 Mar 2003 10:17:39 -0800 (PST) (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.6/8.12.6) with ESMTP id h22IHd0U067222 for ; Sun, 2 Mar 2003 10:17:39 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h22IHdD7067219 for perforce@freebsd.org; Sun, 2 Mar 2003 10:17:39 -0800 (PST) Date: Sun, 2 Mar 2003 10:17:39 -0800 (PST) Message-Id: <200303021817.h22IHdD7067219@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 Subject: PERFORCE change 26216 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=26216 Change 26216 by rwatson@rwatson_tislabs on 2003/03/02 10:17:20 Force integrate $P4$ tags back to what is in the base branch, and change type of files from text+ko to text so that substitution doesn't happen in the future. Should reduce gratuitous diff output between the base and mac branches. Affected files ... .. //depot/projects/trustedbsd/mac/contrib/openpam/CREDITS#6 edit .. //depot/projects/trustedbsd/mac/contrib/openpam/HISTORY#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/INSTALL#6 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/LICENSE#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/MANIFEST#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/README#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/RELNOTES#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/bin/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/bin/su/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/bin/su/su.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam.3#5 edit .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam.man#3 edit .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_borrow_cred.3#8 edit .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_free_data.3#8 edit .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_get_option.3#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_log.3#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_nullconv.3#6 edit .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_restore_cred.3#8 edit .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_set_option.3#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_ttyconv.3#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam.3#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam.man#3 edit .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_acct_mgmt.3#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_authenticate.3#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_chauthtok.3#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_close_session.3#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_conv.3#3 edit .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_end.3#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_error.3#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_authtok.3#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_data.3#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_item.3#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_user.3#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_getenv.3#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_getenvlist.3#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_info.3#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_open_session.3#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_prompt.3#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_putenv.3#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_set_data.3#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_set_item.3#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_setcred.3#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_setenv.3#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_authenticate.3#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_chauthtok.3#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_close_session.3#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_open_session.3#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_setcred.3#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_start.3#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_strerror.3#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_verror.3#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_vinfo.3#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_vprompt.3#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/include/security/openpam.h#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/include/security/openpam_version.h#5 edit .. //depot/projects/trustedbsd/mac/contrib/openpam/include/security/pam_appl.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/include/security/pam_constants.h#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/include/security/pam_modules.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/include/security/pam_types.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_borrow_cred.c#5 edit .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_configure.c#6 edit .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_dispatch.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_dynamic.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_findenv.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_free_data.c#5 edit .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_get_option.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_impl.h#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_load.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_log.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_nullconv.c#6 edit .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_restore_cred.c#5 edit .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_set_option.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_static.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_ttyconv.c#13 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_acct_mgmt.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_authenticate.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_authenticate_secondary.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_chauthtok.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_close_session.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_end.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_error.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_get_authtok.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_get_data.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_get_item.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_get_mapped_authtok.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_get_mapped_username.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_get_user.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_getenv.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_getenvlist.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_info.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_open_session.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_prompt.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_putenv.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_set_data.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_set_item.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_set_mapped_authtok.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_set_mapped_username.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_setcred.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_setenv.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_acct_mgmt.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_authenticate.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_authenticate_secondary.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_chauthtok.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_close_session.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_get_mapped_username.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_open_session.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_set_mapped_username.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_setcred.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_start.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_strerror.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_verror.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_vinfo.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_vprompt.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/misc/gendoc.pl#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_deny/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_deny/pam_deny.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_dummy/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_dummy/pam_dummy.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_permit/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_permit/pam_permit.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_unix/Makefile#3 edit .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_unix/pam_unix.c#4 edit Differences ... ==== //depot/projects/trustedbsd/mac/contrib/openpam/CREDITS#6 (text) ==== ==== //depot/projects/trustedbsd/mac/contrib/openpam/HISTORY#11 (text/text+ko) ==== @@ -206,4 +206,4 @@ First (beta) release. ============================================================================ -$P4: //depot/projects/trustedbsd/mac/contrib/openpam/HISTORY#10 $ +$P4: //depot/projects/openpam/HISTORY#17 $ ==== //depot/projects/trustedbsd/mac/contrib/openpam/INSTALL#6 (text/text+ko) ==== @@ -22,4 +22,4 @@ Change into the top-level OpenPAM directory and run 'make install'. -$P4: //depot/projects/trustedbsd/mac/contrib/openpam/INSTALL#5 $ +$P4: //depot/projects/openpam/INSTALL#2 $ ==== //depot/projects/trustedbsd/mac/contrib/openpam/LICENSE#7 (text/text+ko) ==== @@ -31,4 +31,4 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$P4: //depot/projects/trustedbsd/mac/contrib/openpam/LICENSE#6 $ +$P4: //depot/projects/openpam/LICENSE#5 $ ==== //depot/projects/trustedbsd/mac/contrib/openpam/MANIFEST#10 (text/text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/mac/contrib/openpam/MANIFEST#9 $ +# $P4: //depot/projects/openpam/MANIFEST#13 $ # CREDITS HISTORY ==== //depot/projects/trustedbsd/mac/contrib/openpam/Makefile#7 (text/text+ko) ==== @@ -32,7 +32,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/trustedbsd/mac/contrib/openpam/Makefile#6 $ +# $P4: //depot/projects/openpam/Makefile#7 $ # SUBDIR = ==== //depot/projects/trustedbsd/mac/contrib/openpam/README#7 (text/text+ko) ==== @@ -24,4 +24,4 @@ Please direct bug reports and inquiries to openpam@thinksec.com. -$P4: //depot/projects/trustedbsd/mac/contrib/openpam/README#6 $ +$P4: //depot/projects/openpam/README#4 $ ==== //depot/projects/trustedbsd/mac/contrib/openpam/RELNOTES#11 (text/text+ko) ==== @@ -27,4 +27,4 @@ lost your name and email address. Please contact me so I can give you proper credit for your contribution. -$P4: //depot/projects/trustedbsd/mac/contrib/openpam/RELNOTES#10 $ +$P4: //depot/projects/openpam/RELNOTES#14 $ ==== //depot/projects/trustedbsd/mac/contrib/openpam/bin/Makefile#7 (text/text+ko) ==== @@ -32,7 +32,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/trustedbsd/mac/contrib/openpam/bin/Makefile#6 $ +# $P4: //depot/projects/openpam/bin/Makefile#6 $ # SUBDIR = ==== //depot/projects/trustedbsd/mac/contrib/openpam/bin/su/Makefile#7 (text/text+ko) ==== @@ -32,7 +32,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/trustedbsd/mac/contrib/openpam/bin/su/Makefile#6 $ +# $P4: //depot/projects/openpam/bin/su/Makefile#5 $ # PROG = su ==== //depot/projects/trustedbsd/mac/contrib/openpam/bin/su/su.c#8 (text/text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/mac/contrib/openpam/bin/su/su.c#7 $ + * $P4: //depot/projects/openpam/bin/su/su.c#8 $ */ #include ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/Makefile#7 (text/text+ko) ==== @@ -32,7 +32,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/trustedbsd/mac/contrib/openpam/doc/Makefile#6 $ +# $P4: //depot/projects/openpam/doc/Makefile#4 $ # SUBDIR = ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/Makefile#8 (text/text+ko) ==== @@ -32,7 +32,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/Makefile#7 $ +# $P4: //depot/projects/openpam/doc/man/Makefile#11 $ # GENDOC = ${.CURDIR}/../../misc/gendoc.pl ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam.3#5 (text) ==== ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam.man#3 (text) ==== ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_borrow_cred.3#8 (text) ==== ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_free_data.3#8 (text) ==== ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_get_option.3#11 (text/text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_get_option.3#10 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt OPENPAM_GET_OPTION 3 ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_log.3#11 (text/text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_log.3#10 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt OPENPAM_LOG 3 ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_nullconv.3#6 (text) ==== ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_restore_cred.3#8 (text) ==== ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_set_option.3#11 (text/text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_set_option.3#10 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt OPENPAM_SET_OPTION 3 ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_ttyconv.3#11 (text/text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_ttyconv.3#10 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt OPENPAM_TTYCONV 3 ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam.3#11 (text/text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam.3#10 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM 3 @@ -94,7 +94,7 @@ .Ft const char * .Fn pam_strerror "pam_handle_t *pamh" "int error_number" .\" -.\" $P4: //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam.3#10 $ +.\" $P4: //depot/projects/openpam/doc/man/pam.man#1 $ .\" .Sh DESCRIPTION The Pluggable Authentication Modules (PAM) library abstracts a number ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam.man#3 (text) ==== ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_acct_mgmt.3#11 (text/text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_acct_mgmt.3#10 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_ACCT_MGMT 3 ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_authenticate.3#11 (text/text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_authenticate.3#10 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_AUTHENTICATE 3 ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_chauthtok.3#11 (text/text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_chauthtok.3#10 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_CHAUTHTOK 3 ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_close_session.3#11 (text/text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_close_session.3#10 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_CLOSE_SESSION 3 ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_conv.3#3 (text) ==== ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_end.3#11 (text/text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_end.3#10 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_END 3 ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_error.3#11 (text/text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_error.3#10 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_ERROR 3 ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_authtok.3#12 (text/text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_authtok.3#11 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_GET_AUTHTOK 3 ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_data.3#11 (text/text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_data.3#10 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_GET_DATA 3 ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_item.3#11 (text/text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_item.3#10 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_GET_ITEM 3 ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_user.3#11 (text/text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_user.3#10 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_GET_USER 3 ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_getenv.3#11 (text/text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_getenv.3#10 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_GETENV 3 ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_getenvlist.3#12 (text/text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_getenvlist.3#11 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_GETENVLIST 3 ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_info.3#11 (text/text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_info.3#10 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_INFO 3 ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_open_session.3#11 (text/text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_open_session.3#10 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_OPEN_SESSION 3 ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_prompt.3#11 (text/text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_prompt.3#10 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_PROMPT 3 ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_putenv.3#11 (text/text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_putenv.3#10 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_PUTENV 3 ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_set_data.3#11 (text/text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_set_data.3#10 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_SET_DATA 3 ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_set_item.3#11 (text/text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_set_item.3#10 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_SET_ITEM 3 ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_setcred.3#11 (text/text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_setcred.3#10 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_SETCRED 3 ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_setenv.3#11 (text/text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_setenv.3#10 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_SETENV 3 ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#11 (text/text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#10 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_SM_ACCT_MGMT 3 ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_authenticate.3#11 (text/text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_authenticate.3#10 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_SM_AUTHENTICATE 3 ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_chauthtok.3#11 (text/text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_chauthtok.3#10 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_SM_CHAUTHTOK 3 ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_close_session.3#11 (text/text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_close_session.3#10 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_SM_CLOSE_SESSION 3 ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_open_session.3#11 (text/text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_open_session.3#10 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_SM_OPEN_SESSION 3 ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_setcred.3#11 (text/text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_setcred.3#10 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_SM_SETCRED 3 ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_start.3#12 (text/text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_start.3#11 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_START 3 ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_strerror.3#11 (text/text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_strerror.3#10 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_STRERROR 3 ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_verror.3#11 (text/text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_verror.3#10 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_VERROR 3 ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_vinfo.3#11 (text/text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_vinfo.3#10 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_VINFO 3 ==== //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_vprompt.3#11 (text/text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_vprompt.3#10 $ +.\" $P4$ .\" .Dd January 6, 2003 .Dt PAM_VPROMPT 3 ==== //depot/projects/trustedbsd/mac/contrib/openpam/include/security/openpam.h#10 (text/text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/mac/contrib/openpam/include/security/openpam.h#9 $ + * $P4: //depot/projects/openpam/include/security/openpam.h#21 $ */ #ifndef _SECURITY_OPENPAM_H_INCLUDED ==== //depot/projects/trustedbsd/mac/contrib/openpam/include/security/openpam_version.h#5 (text) ==== ==== //depot/projects/trustedbsd/mac/contrib/openpam/include/security/pam_appl.h#7 (text/text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/mac/contrib/openpam/include/security/pam_appl.h#6 $ + * $P4: //depot/projects/openpam/include/security/pam_appl.h#10 $ */ #ifndef _PAM_APPL_H_INCLUDED ==== //depot/projects/trustedbsd/mac/contrib/openpam/include/security/pam_constants.h#8 (text/text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/mac/contrib/openpam/include/security/pam_constants.h#7 $ + * $P4: //depot/projects/openpam/include/security/pam_constants.h#19 $ */ #ifndef _PAM_CONSTANTS_H_INCLUDED ==== //depot/projects/trustedbsd/mac/contrib/openpam/include/security/pam_modules.h#7 (text/text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/mac/contrib/openpam/include/security/pam_modules.h#6 $ + * $P4: //depot/projects/openpam/include/security/pam_modules.h#8 $ */ #ifndef _PAM_MODULES_H_INCLUDED ==== //depot/projects/trustedbsd/mac/contrib/openpam/include/security/pam_types.h#7 (text/text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/mac/contrib/openpam/include/security/pam_types.h#6 $ + * $P4: //depot/projects/openpam/include/security/pam_types.h#9 $ */ #ifndef _PAM_TYPES_H_INCLUDED ==== //depot/projects/trustedbsd/mac/contrib/openpam/lib/Makefile#8 (text/text+ko) ==== @@ -31,7 +31,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/trustedbsd/mac/contrib/openpam/lib/Makefile#7 $ +# $P4: //depot/projects/openpam/lib/Makefile#16 $ # LIB = pam ==== //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_borrow_cred.c#5 (text) ==== ==== //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_configure.c#6 (text) ==== ==== //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_dispatch.c#8 (text/text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_dispatch.c#7 $ + * $P4: //depot/projects/openpam/lib/openpam_dispatch.c#18 $ */ #include ==== //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_dynamic.c#8 (text/text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_dynamic.c#7 $ + * $P4: //depot/projects/openpam/lib/openpam_dynamic.c#6 $ */ #include ==== //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_findenv.c#8 (text/text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_findenv.c#7 $ + * $P4: //depot/projects/openpam/lib/openpam_findenv.c#10 $ */ #include ==== //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_free_data.c#5 (text) ==== ==== //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_get_option.c#8 (text/text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_get_option.c#7 $ + * $P4: //depot/projects/openpam/lib/openpam_get_option.c#6 $ */ #include ==== //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_impl.h#10 (text/text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_impl.h#9 $ + * $P4: //depot/projects/openpam/lib/openpam_impl.h#20 $ */ #ifndef _OPENPAM_IMPL_H_INCLUDED ==== //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_load.c#9 (text/text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_load.c#8 $ + * $P4: //depot/projects/openpam/lib/openpam_load.c#15 $ */ #include ==== //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_log.c#11 (text/text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_log.c#10 $ + * $P4: //depot/projects/openpam/lib/openpam_log.c#17 $ */ #include ==== //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_nullconv.c#6 (text) ==== ==== //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_restore_cred.c#5 (text) ==== ==== //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_set_option.c#8 (text/text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_set_option.c#7 $ + * $P4: //depot/projects/openpam/lib/openpam_set_option.c#7 $ */ #include ==== //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_static.c#7 (text/text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_static.c#6 $ + * $P4: //depot/projects/openpam/lib/openpam_static.c#5 $ */ #include ==== //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_ttyconv.c#13 (text/text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_ttyconv.c#12 $ + * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#15 $ */ #include ==== //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_acct_mgmt.c#8 (text/text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_acct_mgmt.c#7 $ + * $P4: //depot/projects/openpam/lib/pam_acct_mgmt.c#11 $ */ #include ==== //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_authenticate.c#8 (text/text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_authenticate.c#7 $ + * $P4: //depot/projects/openpam/lib/pam_authenticate.c#13 $ */ #include ==== //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_authenticate_secondary.c#8 (text/text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_authenticate_secondary.c#7 $ + * $P4: //depot/projects/openpam/lib/pam_authenticate_secondary.c#7 $ */ #include ==== //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_chauthtok.c#8 (text/text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_chauthtok.c#7 $ + * $P4: //depot/projects/openpam/lib/pam_chauthtok.c#14 $ */ #include ==== //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_close_session.c#8 (text/text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Mar 2 10:18:44 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82AE037B405; Sun, 2 Mar 2003 10:18:42 -0800 (PST) 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 332E037B401 for ; Sun, 2 Mar 2003 10:18:42 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D2A0A43F75 for ; Sun, 2 Mar 2003 10:18:41 -0800 (PST) (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.6/8.12.6) with ESMTP id h22IIf0U067243 for ; Sun, 2 Mar 2003 10:18:41 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h22IIfAr067240 for perforce@freebsd.org; Sun, 2 Mar 2003 10:18:41 -0800 (PST) Date: Sun, 2 Mar 2003 10:18:41 -0800 (PST) Message-Id: <200303021818.h22IIfAr067240@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 Subject: PERFORCE change 26217 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=26217 Change 26217 by rwatson@rwatson_tislabs on 2003/03/02 10:18:24 Line-break change to improve diff results. Affected files ... .. //depot/projects/trustedbsd/mac/Makefile.inc1#34 edit Differences ... ==== //depot/projects/trustedbsd/mac/Makefile.inc1#34 (text+ko) ==== @@ -387,7 +387,8 @@ distributeworld installworld: installcheck mkdir -p ${INSTALLTMP} for prog in [ awk cat chflags chmod chown cpio date echo egrep find \ - grep ln m4 make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ + grep \ + ln m4 make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ test touch true uname wc zic; do \ cp `which $$prog` ${INSTALLTMP}; \ done To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Mar 2 17:15:25 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D666537B405; Sun, 2 Mar 2003 17:15:23 -0800 (PST) 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 6C26437B401 for ; Sun, 2 Mar 2003 17:15:23 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8711A43F85 for ; Sun, 2 Mar 2003 17:15:22 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h231FM0U011889 for ; Sun, 2 Mar 2003 17:15:22 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h231FMJu011886 for perforce@freebsd.org; Sun, 2 Mar 2003 17:15:22 -0800 (PST) Date: Sun, 2 Mar 2003 17:15:22 -0800 (PST) Message-Id: <200303030115.h231FMJu011886@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 26245 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=26245 Change 26245 by marcel@marcel_nfs on 2003/03/02 17:14:57 Sync-up with the dev_t -> struct consdev change. Affected files ... .. //depot/projects/tty/sys/dev/vga/vga_cons.c#3 edit Differences ... ==== //depot/projects/tty/sys/dev/vga/vga_cons.c#3 (text+ko) ==== @@ -106,7 +106,7 @@ } static void -vga_cnputc(dev_t dev, int c) +vga_cnputc(struct consdev *cp, int c) { int s; @@ -116,14 +116,14 @@ } static int -vga_cncheckc(dev_t dev) +vga_cncheckc(struct consdev *cp) { return (-1); } static int -vga_cngetc(dev_t dev) +vga_cngetc(struct consdev *cp) { return (-1); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Mar 2 18:19:11 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 635A837B405; Sun, 2 Mar 2003 18:18:45 -0800 (PST) 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 DABBE37B401 for ; Sun, 2 Mar 2003 18:18:44 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 498CB43FA3 for ; Sun, 2 Mar 2003 18:18:43 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h232Ih0U016150 for ; Sun, 2 Mar 2003 18:18:43 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h232Id9L016120 for perforce@freebsd.org; Sun, 2 Mar 2003 18:18:39 -0800 (PST) Date: Sun, 2 Mar 2003 18:18:39 -0800 (PST) Message-Id: <200303030218.h232Id9L016120@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 26247 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=26247 Change 26247 by marcel@marcel_nfs on 2003/03/02 18:18:31 IFC @26246 Affected files ... .. //depot/projects/ia64/contrib/binutils/include/opcode/arc.h#3 delete .. //depot/projects/ia64/contrib/binutils/include/opcode/convex.h#3 delete .. //depot/projects/ia64/contrib/binutils/include/opcode/np1.h#2 delete .. //depot/projects/ia64/contrib/binutils/include/opcode/pn.h#2 delete .. //depot/projects/ia64/contrib/binutils/ld/emulparams/arcelf.sh#2 delete .. //depot/projects/ia64/contrib/binutils/ld/emulparams/elf32b4300.sh#3 delete .. //depot/projects/ia64/contrib/binutils/ld/emulparams/elf32bmip.sh#3 delete .. //depot/projects/ia64/contrib/binutils/ld/emulparams/elf32bmipn32.sh#3 delete .. //depot/projects/ia64/contrib/binutils/ld/emulparams/elf32bsmip.sh#3 delete .. //depot/projects/ia64/contrib/binutils/ld/emulparams/elf32ebmip.sh#3 delete .. //depot/projects/ia64/contrib/binutils/ld/emulparams/elf32elmip.sh#3 delete .. //depot/projects/ia64/contrib/binutils/ld/emulparams/elf32l4300.sh#3 delete .. //depot/projects/ia64/contrib/binutils/ld/emulparams/elf32lmip.sh#3 delete .. //depot/projects/ia64/contrib/binutils/ld/emulparams/elf32lsmip.sh#3 delete .. //depot/projects/ia64/contrib/binutils/ld/emulparams/elf64bmip.sh#3 delete .. //depot/projects/ia64/contrib/binutils/ld/emulparams/sh.sh#3 delete .. //depot/projects/ia64/contrib/binutils/ld/emulparams/shl.sh#3 delete .. //depot/projects/ia64/contrib/binutils/ld/emulparams/shlelf.sh#3 delete .. //depot/projects/ia64/contrib/binutils/ld/emulparams/vsta.sh#2 delete .. //depot/projects/ia64/contrib/file/.cvsignore#1 branch .. //depot/projects/ia64/contrib/file/Magdir/elf#3 integrate .. //depot/projects/ia64/contrib/file/Magdir/filesystems#4 integrate .. //depot/projects/ia64/contrib/file/Magdir/hdf#1 branch .. //depot/projects/ia64/contrib/file/Magdir/jpeg#2 integrate .. //depot/projects/ia64/contrib/file/Magdir/macintosh#2 integrate .. //depot/projects/ia64/contrib/file/Magdir/sql#1 branch .. //depot/projects/ia64/contrib/file/Makefile.am#4 integrate .. //depot/projects/ia64/contrib/file/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/file/Makefile.std#4 integrate .. //depot/projects/ia64/contrib/file/README#4 integrate .. //depot/projects/ia64/contrib/file/acconfig.h#3 integrate .. //depot/projects/ia64/contrib/file/aclocal.m4#3 integrate .. //depot/projects/ia64/contrib/file/apprentice.c#3 integrate .. //depot/projects/ia64/contrib/file/config.h.in#4 integrate .. //depot/projects/ia64/contrib/file/configure#4 integrate .. //depot/projects/ia64/contrib/file/configure.in#4 integrate .. //depot/projects/ia64/contrib/file/file.c#4 integrate .. //depot/projects/ia64/contrib/file/file.man#4 integrate .. //depot/projects/ia64/contrib/file/magic.man#4 integrate .. //depot/projects/ia64/contrib/file/magic.mime#3 integrate .. //depot/projects/ia64/contrib/file/patchlevel.h#4 integrate .. //depot/projects/ia64/contrib/file/readelf.c#4 integrate .. //depot/projects/ia64/contrib/file/softmagic.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/CHANGES#3 integrate .. //depot/projects/ia64/contrib/tcpdump/CREDITS#3 integrate .. //depot/projects/ia64/contrib/tcpdump/FILES#3 integrate .. //depot/projects/ia64/contrib/tcpdump/INSTALL#2 integrate .. //depot/projects/ia64/contrib/tcpdump/README#3 integrate .. //depot/projects/ia64/contrib/tcpdump/VERSION#4 integrate .. //depot/projects/ia64/contrib/tcpdump/addrtoname.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/config.h.in#3 integrate .. //depot/projects/ia64/contrib/tcpdump/configure#3 integrate .. //depot/projects/ia64/contrib/tcpdump/configure.in#3 integrate .. //depot/projects/ia64/contrib/tcpdump/dhcp6.h#3 delete .. //depot/projects/ia64/contrib/tcpdump/dhcp6opt.h#3 delete .. //depot/projects/ia64/contrib/tcpdump/gmt2local.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/interface.h#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-802_11.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/print-arcnet.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/print-arp.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-atalk.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-beep.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/print-bgp.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-bootp.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-dhcp6.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-egp.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-esp.c#5 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ether.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-fddi.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-gre.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-icmp.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-icmp6.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-igmp.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ip.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-isakmp.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-isoclns.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-l2tp.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-mobile.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-mpls.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/print-nfs.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ntp.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-null.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-pim.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-radius.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-raw.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-rx.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-sctp.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/print-sll.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-smb.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-snmp.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-stp.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/print-sunrpc.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/print-zephyr.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/smbutil.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/util.c#3 integrate .. //depot/projects/ia64/lib/libc/ia64/gen/__divdf3.S#2 integrate .. //depot/projects/ia64/lib/libc/ia64/gen/__divdi3.S#2 integrate .. //depot/projects/ia64/lib/libc/ia64/gen/__divsf3.S#2 integrate .. //depot/projects/ia64/lib/libc/ia64/gen/__divsi3.S#2 integrate .. //depot/projects/ia64/lib/libc/ia64/gen/__moddi3.S#3 integrate .. //depot/projects/ia64/lib/libc/ia64/gen/__modsi3.S#2 integrate .. //depot/projects/ia64/lib/libc/ia64/gen/__udivdi3.S#2 integrate .. //depot/projects/ia64/lib/libc/ia64/gen/__udivsi3.S#2 integrate .. //depot/projects/ia64/lib/libc/ia64/gen/__umoddi3.S#3 integrate .. //depot/projects/ia64/lib/libc/ia64/gen/__umodsi3.S#2 integrate .. //depot/projects/ia64/lib/libc/ia64/gen/_setjmp.S#4 integrate .. //depot/projects/ia64/lib/libc/ia64/gen/fabs.S#2 integrate .. //depot/projects/ia64/lib/libc/ia64/gen/setjmp.S#3 integrate .. //depot/projects/ia64/lib/libc/ia64/gen/sigsetjmp.S#3 integrate .. //depot/projects/ia64/lib/libc/ia64/net/byte_swap_2.S#3 integrate .. //depot/projects/ia64/lib/libc/ia64/net/byte_swap_4.S#3 integrate .. //depot/projects/ia64/lib/libc/ia64/net/htonl.S#3 integrate .. //depot/projects/ia64/lib/libc/ia64/net/htons.S#3 integrate .. //depot/projects/ia64/lib/libc/ia64/net/ntohl.S#3 integrate .. //depot/projects/ia64/lib/libc/ia64/net/ntohs.S#3 integrate .. //depot/projects/ia64/lib/libc/ia64/string/bcopy.S#2 integrate .. //depot/projects/ia64/lib/libc/ia64/string/bzero.S#2 integrate .. //depot/projects/ia64/lib/libc/ia64/string/ffs.S#2 integrate .. //depot/projects/ia64/lib/libc/ia64/string/memcpy.S#2 integrate .. //depot/projects/ia64/lib/libc/ia64/string/memmove.S#2 integrate .. //depot/projects/ia64/lib/libc/ia64/sys/Ovfork.S#2 integrate .. //depot/projects/ia64/lib/libc/ia64/sys/brk.S#3 integrate .. //depot/projects/ia64/lib/libc/ia64/sys/cerror.S#2 integrate .. //depot/projects/ia64/lib/libc/ia64/sys/exect.S#2 integrate .. //depot/projects/ia64/lib/libc/ia64/sys/fork.S#2 integrate .. //depot/projects/ia64/lib/libc/ia64/sys/pipe.S#2 integrate .. //depot/projects/ia64/lib/libc/ia64/sys/ptrace.S#2 integrate .. //depot/projects/ia64/lib/libc/ia64/sys/sbrk.S#4 integrate .. //depot/projects/ia64/lib/libc/ia64/sys/setlogin.S#2 integrate .. //depot/projects/ia64/lib/libc/ia64/sys/sigreturn.S#2 integrate .. //depot/projects/ia64/lib/libc/net/res_query.c#6 integrate .. //depot/projects/ia64/lib/libncp/ncp_mod.h#3 delete .. //depot/projects/ia64/lib/libncp/ncpl_net.c#2 integrate .. //depot/projects/ia64/lib/libncp/ncpl_subr.c#3 integrate .. //depot/projects/ia64/lib/libstand/nfs.c#5 integrate .. //depot/projects/ia64/lib/libstand/tftp.c#4 integrate .. //depot/projects/ia64/lib/msun/man/lgamma.3#6 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/errata/article.sgml#12 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#71 integrate .. //depot/projects/ia64/sbin/Makefile#23 integrate .. //depot/projects/ia64/sbin/mksnap_ffs/Makefile#1 branch .. //depot/projects/ia64/sbin/mksnap_ffs/mksnap_ffs.8#1 branch .. //depot/projects/ia64/sbin/mksnap_ffs/mksnap_ffs.c#1 branch .. //depot/projects/ia64/sbin/natd/natd.8#7 integrate .. //depot/projects/ia64/sbin/ping/ping.8#9 integrate .. //depot/projects/ia64/sbin/ping/ping.c#16 integrate .. //depot/projects/ia64/share/man/man4/card.4#2 integrate .. //depot/projects/ia64/share/man/man4/dpt.4#3 integrate .. //depot/projects/ia64/share/man/man4/exca.4#2 integrate .. //depot/projects/ia64/share/man/man4/ubsec.4#3 integrate .. //depot/projects/ia64/share/man/man4/ugen.4#2 integrate .. //depot/projects/ia64/share/man/man4/wi.4#15 integrate .. //depot/projects/ia64/share/man/man5/rc.conf.5#28 integrate .. //depot/projects/ia64/share/man/man5/style.Makefile.5#2 integrate .. //depot/projects/ia64/share/mk/Makefile#8 integrate .. //depot/projects/ia64/share/mk/bsd.kern.mk#9 delete .. //depot/projects/ia64/share/syscons/keymaps/it.iso.kbd#2 integrate .. //depot/projects/ia64/sys/alpha/include/pmap.h#6 integrate .. //depot/projects/ia64/sys/boot/efi/libefi/libefi.c#6 integrate .. //depot/projects/ia64/sys/boot/efi/loader/main.c#16 integrate .. //depot/projects/ia64/sys/boot/forth/loader.conf#14 integrate .. //depot/projects/ia64/sys/boot/pc98/boot2/Makefile#11 integrate .. //depot/projects/ia64/sys/compat/linux/linux_ioctl.c#19 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_misc.c#16 integrate .. //depot/projects/ia64/sys/conf/Makefile.alpha#8 integrate .. //depot/projects/ia64/sys/conf/Makefile.i386#8 integrate .. //depot/projects/ia64/sys/conf/Makefile.ia64#16 integrate .. //depot/projects/ia64/sys/conf/Makefile.pc98#8 integrate .. //depot/projects/ia64/sys/conf/Makefile.powerpc#12 integrate .. //depot/projects/ia64/sys/conf/Makefile.sparc64#15 integrate .. //depot/projects/ia64/sys/conf/Makefile.x86_64#3 integrate .. //depot/projects/ia64/sys/conf/NOTES#41 integrate .. //depot/projects/ia64/sys/conf/files#65 integrate .. //depot/projects/ia64/sys/conf/files.alpha#18 integrate .. //depot/projects/ia64/sys/conf/files.i386#32 integrate .. //depot/projects/ia64/sys/conf/files.ia64#34 integrate .. //depot/projects/ia64/sys/conf/files.pc98#26 integrate .. //depot/projects/ia64/sys/conf/files.powerpc#16 integrate .. //depot/projects/ia64/sys/conf/files.sparc64#26 integrate .. //depot/projects/ia64/sys/conf/files.x86_64#8 integrate .. //depot/projects/ia64/sys/conf/kern.mk#3 integrate .. //depot/projects/ia64/sys/conf/kern.post.mk#26 integrate .. //depot/projects/ia64/sys/conf/kern.pre.mk#16 integrate .. //depot/projects/ia64/sys/conf/kmod.mk#21 integrate .. //depot/projects/ia64/sys/conf/majors#20 integrate .. //depot/projects/ia64/sys/conf/options#45 integrate .. //depot/projects/ia64/sys/dev/aac/aac.c#19 integrate .. //depot/projects/ia64/sys/dev/aac/aac_cam.c#7 integrate .. //depot/projects/ia64/sys/dev/aac/aac_disk.c#12 integrate .. //depot/projects/ia64/sys/dev/aac/aac_pci.c#15 integrate .. //depot/projects/ia64/sys/dev/aac/aacvar.h#14 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi.c#28 integrate .. //depot/projects/ia64/sys/dev/asr/asr.c#14 integrate .. //depot/projects/ia64/sys/dev/ata/ata-all.c#28 integrate .. //depot/projects/ia64/sys/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-all.c#13 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-fd.c#13 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-fd.h#5 integrate .. //depot/projects/ia64/sys/dev/ciss/ciss.c#13 integrate .. //depot/projects/ia64/sys/dev/dgb/dgb.c#8 integrate .. //depot/projects/ia64/sys/dev/digi/digi.c#13 integrate .. //depot/projects/ia64/sys/dev/firewire/fwdev.c#12 integrate .. //depot/projects/ia64/sys/dev/firewire/sbp.c#19 integrate .. //depot/projects/ia64/sys/dev/hfa/fore_command.c#4 integrate .. //depot/projects/ia64/sys/dev/ida/ida.c#5 integrate .. //depot/projects/ia64/sys/dev/iir/iir_ctrl.c#6 integrate .. //depot/projects/ia64/sys/dev/kbd/kbd.c#5 integrate .. //depot/projects/ia64/sys/dev/mcd/mcd.c#3 integrate .. //depot/projects/ia64/sys/dev/mly/mly.c#12 integrate .. //depot/projects/ia64/sys/dev/null/null.c#10 integrate .. //depot/projects/ia64/sys/dev/pci/pci_user.c#5 integrate .. //depot/projects/ia64/sys/dev/pcic/i82365.c#5 integrate .. //depot/projects/ia64/sys/dev/ppbus/lpt.c#6 integrate .. //depot/projects/ia64/sys/dev/raidframe/rf_freebsdkintf.c#9 integrate .. //depot/projects/ia64/sys/dev/rc/rc.c#5 integrate .. //depot/projects/ia64/sys/dev/sab/sab.c#9 integrate .. //depot/projects/ia64/sys/dev/si/si.c#6 integrate .. //depot/projects/ia64/sys/dev/snp/snp.c#12 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/ac97.c#13 integrate .. //depot/projects/ia64/sys/dev/syscons/syscons.c#16 integrate .. //depot/projects/ia64/sys/dev/tdfx/tdfx_pci.c#9 integrate .. //depot/projects/ia64/sys/dev/twe/twe_freebsd.c#11 integrate .. //depot/projects/ia64/sys/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/ia64/sys/dev/usb/ucom.c#6 integrate .. //depot/projects/ia64/sys/dev/usb/ufm.c#7 integrate .. //depot/projects/ia64/sys/dev/usb/ugen.c#10 integrate .. //depot/projects/ia64/sys/dev/usb/uhci.c#15 integrate .. //depot/projects/ia64/sys/dev/usb/uhci_pci.c#3 integrate .. //depot/projects/ia64/sys/dev/usb/ulpt.c#10 integrate .. //depot/projects/ia64/sys/dev/usb/urio.c#11 integrate .. //depot/projects/ia64/sys/dev/usb/usbdi_util.c#5 integrate .. //depot/projects/ia64/sys/dev/usb/usbdi_util.h#4 integrate .. //depot/projects/ia64/sys/dev/vinum/vinum.c#6 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumext.h#6 integrate .. //depot/projects/ia64/sys/dev/zs/zs.c#8 integrate .. //depot/projects/ia64/sys/fs/devfs/devfs_devs.c#11 integrate .. //depot/projects/ia64/sys/fs/devfs/devfs_vnops.c#25 integrate .. //depot/projects/ia64/sys/fs/fdescfs/fdesc_vnops.c#12 integrate .. //depot/projects/ia64/sys/fs/fifofs/fifo_vnops.c#19 integrate .. //depot/projects/ia64/sys/fs/msdosfs/msdosfs_vnops.c#16 integrate .. //depot/projects/ia64/sys/fs/nwfs/nwfs_io.c#6 integrate .. //depot/projects/ia64/sys/fs/procfs/procfs_ctl.c#12 integrate .. //depot/projects/ia64/sys/fs/pseudofs/pseudofs.h#10 integrate .. //depot/projects/ia64/sys/fs/pseudofs/pseudofs_vnops.c#16 integrate .. //depot/projects/ia64/sys/fs/smbfs/smbfs_io.c#8 integrate .. //depot/projects/ia64/sys/fs/udf/udf_vnops.c#15 integrate .. //depot/projects/ia64/sys/fs/unionfs/union_subr.c#11 integrate .. //depot/projects/ia64/sys/geom/geom_dev.c#28 integrate .. //depot/projects/ia64/sys/geom/geom_disk.c#25 integrate .. //depot/projects/ia64/sys/gnu/ext2fs/ext2_lookup.c#11 integrate .. //depot/projects/ia64/sys/i386/isa/asc.c#4 integrate .. //depot/projects/ia64/sys/i386/isa/loran.c#7 integrate .. //depot/projects/ia64/sys/i386/isa/mse.c#5 integrate .. //depot/projects/ia64/sys/i386/isa/pcvt/pcvt_ext.c#4 integrate .. //depot/projects/ia64/sys/i386/isa/pcvt/pcvt_kbd.c#4 integrate .. //depot/projects/ia64/sys/i386/isa/spic.c#4 integrate .. //depot/projects/ia64/sys/i386/isa/spkr.c#10 integrate .. //depot/projects/ia64/sys/i386/isa/tw.c#5 integrate .. //depot/projects/ia64/sys/i386/isa/wt.c#6 integrate .. //depot/projects/ia64/sys/i4b/driver/i4b_rbch.c#8 integrate .. //depot/projects/ia64/sys/i4b/driver/i4b_tel.c#6 integrate .. //depot/projects/ia64/sys/i4b/driver/i4b_trace.c#7 integrate .. //depot/projects/ia64/sys/i4b/layer4/i4b_i4bdrv.c#11 integrate .. //depot/projects/ia64/sys/ia64/include/pmap.h#10 integrate .. //depot/projects/ia64/sys/isa/ppc.c#4 integrate .. //depot/projects/ia64/sys/isa/psm.c#9 integrate .. //depot/projects/ia64/sys/isofs/cd9660/cd9660_vnops.c#13 integrate .. //depot/projects/ia64/sys/kern/kern_conf.c#17 integrate .. //depot/projects/ia64/sys/kern/kern_descrip.c#49 integrate .. //depot/projects/ia64/sys/kern/kern_subr.c#17 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#30 integrate .. //depot/projects/ia64/sys/kern/subr_log.c#8 integrate .. //depot/projects/ia64/sys/kern/tty_pty.c#9 integrate .. //depot/projects/ia64/sys/kern/uipc_socket.c#28 integrate .. //depot/projects/ia64/sys/kern/vfs_bio.c#41 integrate .. //depot/projects/ia64/sys/kern/vfs_subr.c#35 integrate .. //depot/projects/ia64/sys/modules/Makefile#40 integrate .. //depot/projects/ia64/sys/modules/mac_portacl/Makefile#1 branch .. //depot/projects/ia64/sys/net/bpf.c#18 integrate .. //depot/projects/ia64/sys/net/if.c#19 integrate .. //depot/projects/ia64/sys/net/if_arcsubr.c#10 integrate .. //depot/projects/ia64/sys/net/if_atmsubr.c#6 integrate .. //depot/projects/ia64/sys/net/if_ethersubr.c#24 integrate .. //depot/projects/ia64/sys/net/if_fddisubr.c#10 integrate .. //depot/projects/ia64/sys/net/if_iso88025subr.c#9 integrate .. //depot/projects/ia64/sys/net/if_tap.c#17 integrate .. //depot/projects/ia64/sys/net/if_tun.c#15 integrate .. //depot/projects/ia64/sys/net/route.c#11 integrate .. //depot/projects/ia64/sys/net/route.h#6 integrate .. //depot/projects/ia64/sys/netgraph/ng_base.c#10 integrate .. //depot/projects/ia64/sys/netinet/tcp_subr.c#28 integrate .. //depot/projects/ia64/sys/netipsec/ipsec.c#4 integrate .. //depot/projects/ia64/sys/netncp/ncp.h#3 integrate .. //depot/projects/ia64/sys/netncp/ncp_mod.c#3 integrate .. //depot/projects/ia64/sys/netncp/ncpio.h#1 branch .. //depot/projects/ia64/sys/nfsclient/nfs_bio.c#11 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_nfsiod.c#6 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_socket.c#14 integrate .. //depot/projects/ia64/sys/nfsserver/nfs_srvcache.c#5 integrate .. //depot/projects/ia64/sys/nfsserver/nfs_srvsock.c#10 integrate .. //depot/projects/ia64/sys/nfsserver/nfs_syscalls.c#12 integrate .. //depot/projects/ia64/sys/pc98/pc98/atapi.c#4 integrate .. //depot/projects/ia64/sys/pc98/pc98/mse.c#5 integrate .. //depot/projects/ia64/sys/pc98/pc98/olpt.c#3 integrate .. //depot/projects/ia64/sys/pc98/pc98/ppc.c#3 integrate .. //depot/projects/ia64/sys/pc98/pc98/spkr.c#9 integrate .. //depot/projects/ia64/sys/pc98/pc98/syscons.c#14 integrate .. //depot/projects/ia64/sys/pc98/pc98/wd.c#7 integrate .. //depot/projects/ia64/sys/pccard/pccard.c#15 integrate .. //depot/projects/ia64/sys/pci/if_ti.c#17 integrate .. //depot/projects/ia64/sys/pci/meteor.c#5 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/atomic.s#2 delete .. //depot/projects/ia64/sys/powerpc/powerpc/locore.s#8 delete .. //depot/projects/ia64/sys/powerpc/powerpc/ofwmagic.s#2 delete .. //depot/projects/ia64/sys/powerpc/powerpc/swtch.s#9 delete .. //depot/projects/ia64/sys/security/mac_portacl/mac_portacl.c#1 branch .. //depot/projects/ia64/sys/sys/_types.h#9 integrate .. //depot/projects/ia64/sys/sys/buf.h#18 integrate .. //depot/projects/ia64/sys/sys/conf.h#19 integrate .. //depot/projects/ia64/sys/sys/disk.h#12 integrate .. //depot/projects/ia64/sys/sys/socketvar.h#27 integrate .. //depot/projects/ia64/sys/sys/types.h#23 integrate .. //depot/projects/ia64/sys/sys/uio.h#9 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_softdep.c#25 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_quota.c#13 integrate .. //depot/projects/ia64/sys/vm/vm_page.c#39 integrate .. //depot/projects/ia64/sys/vm/vm_swap.c#17 integrate .. //depot/projects/ia64/usr.bin/at/at.man#10 integrate .. //depot/projects/ia64/usr.bin/elfdump/elfdump.1#2 integrate .. //depot/projects/ia64/usr.bin/file/config.h#4 integrate .. //depot/projects/ia64/usr.bin/ruptime/ruptime.1#3 integrate .. //depot/projects/ia64/usr.bin/ruptime/ruptime.c#4 integrate .. //depot/projects/ia64/usr.sbin/jail/jail.8#7 integrate .. //depot/projects/ia64/usr.sbin/newsyslog/newsyslog.c#14 integrate .. //depot/projects/ia64/usr.sbin/pccard/pccardc/pccardc.8#4 integrate .. //depot/projects/ia64/usr.sbin/vidcontrol/vidcontrol.1#9 integrate Differences ... ==== //depot/projects/ia64/contrib/file/Magdir/elf#3 (text+ko) ==== @@ -97,6 +97,7 @@ >>18 leshort 53 Motorola M68HC12, >>18 leshort 62 AMD x86-64, >>18 leshort 75 Digital VAX, +>>18 leshort 97 NatSemi 32k, >>18 leshort 0x9026 Alpha (unofficial), >>20 lelong 0 invalid version >>20 lelong 1 version 1 @@ -183,6 +184,7 @@ >>18 beshort 53 Motorola M68HC12, >>18 beshort 73 Cray NV1, >>18 beshort 75 Digital VAX, +>>18 beshort 97 NatSemi 32k, >>18 beshort 0x9026 Alpha (unofficial), >>20 belong 0 invalid version >>20 belong 1 version 1 ==== //depot/projects/ia64/contrib/file/Magdir/filesystems#4 (text+ko) ==== @@ -167,6 +167,10 @@ >8320 lelong 1 SPACE optimization 9564 belong 0x00011954 Unix Fast File system (big-endian), +>7168 long 0x4c41424c Apple UFS Volume +>>7186 string x named %s, +>>7176 belong x volume label version %d, +>>7180 bedate x created on %s, >8404 string x last mounted on %s, #>9504 bedate x last checked at %s, >8224 bedate x last written at %s, ==== //depot/projects/ia64/contrib/file/Magdir/jpeg#2 (text+ko) ==== @@ -59,3 +59,6 @@ # HSI is Handmade Software's proprietary JPEG encoding scheme 0 string hsi1 JPEG image data, HSI proprietary + +# From: David Santinoli +0 string \x00\x00\x00\x0C\x6A\x50\x20\x20\x0D\x0A\x87\x0A JPEG 2000 image data ==== //depot/projects/ia64/contrib/file/Magdir/macintosh#2 (text+ko) ==== @@ -16,6 +16,10 @@ 0 string Seg StuffIt Deluxe Segment (data) >2 string x : %s +# Newer StuffIt archives (grant@netbsd.org) +0 string StuffIt StuffIt Archive +>162 string >0 : %s + # Macintosh Applications and Installation binaries (franklsm@tuns.ca) 0 string APPL Macintosh Application (data) >2 string x \b: %s ==== //depot/projects/ia64/contrib/file/Makefile.am#4 (text+ko) ==== @@ -110,6 +110,7 @@ Magdir/gnu \ Magdir/grace \ Magdir/gringotts \ +Magdir/hdf \ Magdir/hitachi-sh \ Magdir/hp \ Magdir/ibm370 \ @@ -185,6 +186,7 @@ Magdir/sniffer \ Magdir/softquad \ Magdir/spectrum \ +Magdir/sql \ Magdir/sun \ Magdir/sysex \ Magdir/teapot \ ==== //depot/projects/ia64/contrib/file/Makefile.in#4 (text+ko) ==== @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.4 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -73,20 +73,179 @@ MAGIC = @datadir@/magic CPPFLAGS = -DMAGIC='"$(MAGIC)"' -@FSECT5_TRUE@man_MAGIC = magic.5 -@FSECT5_FALSE@man_MAGIC = magic.4 +@FSECT5_TRUE@man_MAGIC = @FSECT5_TRUE@magic.5 +@FSECT5_FALSE@man_MAGIC = @FSECT5_FALSE@magic.4 fsect = @fsect@ man_MANS = file.1 $(man_MAGIC) -file_SOURCES = file.c apprentice.c fsmagic.c softmagic.c ascmagic.c compress.c is_tar.c readelf.c print.c file.h names.h patchlevel.h readelf.h tar.h +file_SOURCES = file.c apprentice.c fsmagic.c softmagic.c ascmagic.c \ + compress.c is_tar.c readelf.c print.c \ + file.h names.h patchlevel.h readelf.h tar.h -EXTRA_DIST = LEGAL.NOTICE MAINT PORTING Makefile.std magic2mime Localstuff Header $(magic_FRAGMENTS) file.man magic.man +EXTRA_DIST = LEGAL.NOTICE MAINT PORTING Makefile.std magic2mime \ + Localstuff Header $(magic_FRAGMENTS) file.man magic.man CLEANFILES = $(man_MANS) magic magic.mgc magic.mime.mgc -magic_FRAGMENTS = Magdir/acorn Magdir/adi Magdir/adventure Magdir/allegro Magdir/alliant Magdir/alpha Magdir/amanda Magdir/amigaos Magdir/animation Magdir/apl Magdir/apple Magdir/applix Magdir/archive Magdir/asterix Magdir/att3b Magdir/audio Magdir/blender Magdir/blit Magdir/bsdi Magdir/c-lang Magdir/cddb Magdir/chi Magdir/cisco Magdir/citrus Magdir/claris Magdir/clipper Magdir/commands Magdir/compress Magdir/console Magdir/convex Magdir/ctags Magdir/cvs Magdir/database Magdir/diamond Magdir/diff Magdir/digital Magdir/dolby Magdir/dump Magdir/dyadic Magdir/editors Magdir/elf Magdir/encore Magdir/epoc Magdir/filesystems Magdir/flash Magdir/fonts Magdir/frame Magdir/freebsd Magdir/fsav Magdir/gimp Magdir/gnu Magdir/grace Magdir/gringotts Magdir/hitachi-sh Magdir/hp Magdir/ibm370 Magdir/ibm6000 Magdir/iff Magdir/images Magdir/intel Magdir/interleaf Magdir/island Magdir/ispell Magdir/java Magdir/jpeg Magdir/karma Magdir/lecter Magdir/lex Magdir/lif Magdir/linux Magdir/lisp Magd ir/mach Magdir/macintosh Magdir/magic Magdir/mail.news Magdir/maple Magdir/mathematica Magdir/mcrypt Magdir/mime Magdir/mips Magdir/mirage Magdir/mkid Magdir/mmdf Magdir/mlssa Magdir/modem Magdir/motorola Magdir/msdos Magdir/msvc Magdir/natinst Magdir/ncr Magdir/netbsd Magdir/netscape Magdir/news Magdir/nitpicker Magdir/octave Magdir/olf Magdir/os2 Magdir/os9 Magdir/osf1 Magdir/palm Magdir/parix Magdir/pbm Magdir/pdf Magdir/pdp Magdir/perl Magdir/pgp Magdir/pkgadd Magdir/plus5 Magdir/printer Magdir/project Magdir/psdbms Magdir/pulsar Magdir/pyramid Magdir/python Magdir/riff Magdir/rpm Magdir/rtf Magdir/sc Magdir/sccs Magdir/sendmail Magdir/sequent Magdir/sgml Magdir/sharc Magdir/sketch Magdir/smalltalk Magdir/sniffer Magdir/softquad Magdir/spectrum Magdir/sun Magdir/sysex Magdir/teapot Magdir/terminfo Magdir/tex Magdir/tgif Magdir/ti-8x Magdir/timezone Magdir/troff Magdir/tuxedo Magdir/typeset Magdir/unknown Magdir/uuencode Magdir/varied.out Magdir/vax Magdir/vicar Magdir/vi sx Magdir/vms Magdir/vmware Magdir/vorbis Magdir/vxl Magdir/! wordperfect Magdir/xdelta Magdir/xenix Magdir/zilog Magdir/zyxel +magic_FRAGMENTS = \ +Magdir/acorn \ +Magdir/adi \ +Magdir/adventure \ +Magdir/allegro \ +Magdir/alliant \ +Magdir/alpha \ +Magdir/amanda \ +Magdir/amigaos \ +Magdir/animation \ +Magdir/apl \ +Magdir/apple \ +Magdir/applix \ +Magdir/archive \ +Magdir/asterix \ +Magdir/att3b \ +Magdir/audio \ +Magdir/blender \ +Magdir/blit \ +Magdir/bsdi \ +Magdir/c-lang \ +Magdir/cddb \ +Magdir/chi \ +Magdir/cisco \ +Magdir/citrus \ +Magdir/claris \ +Magdir/clipper \ +Magdir/commands \ +Magdir/compress \ +Magdir/console \ +Magdir/convex \ +Magdir/ctags \ +Magdir/cvs \ +Magdir/database \ +Magdir/diamond \ +Magdir/diff \ +Magdir/digital \ +Magdir/dolby \ +Magdir/dump \ +Magdir/dyadic \ +Magdir/editors \ +Magdir/elf \ +Magdir/encore \ +Magdir/epoc \ +Magdir/filesystems \ +Magdir/flash \ +Magdir/fonts \ +Magdir/frame \ +Magdir/freebsd \ +Magdir/fsav \ +Magdir/gimp \ +Magdir/gnu \ +Magdir/grace \ +Magdir/gringotts \ +Magdir/hdf \ +Magdir/hitachi-sh \ +Magdir/hp \ +Magdir/ibm370 \ +Magdir/ibm6000 \ +Magdir/iff \ +Magdir/images \ +Magdir/intel \ +Magdir/interleaf \ +Magdir/island \ +Magdir/ispell \ +Magdir/java \ +Magdir/jpeg \ +Magdir/karma \ +Magdir/lecter \ +Magdir/lex \ +Magdir/lif \ +Magdir/linux \ +Magdir/lisp \ +Magdir/mach \ +Magdir/macintosh \ +Magdir/magic \ +Magdir/mail.news \ +Magdir/maple \ +Magdir/mathematica \ +Magdir/mcrypt \ +Magdir/mime \ +Magdir/mips \ +Magdir/mirage \ +Magdir/mkid \ +Magdir/mmdf \ +Magdir/mlssa \ +Magdir/modem \ +Magdir/motorola \ +Magdir/msdos \ +Magdir/msvc \ +Magdir/natinst \ +Magdir/ncr \ +Magdir/netbsd \ +Magdir/netscape \ +Magdir/news \ +Magdir/nitpicker \ +Magdir/octave \ +Magdir/olf \ +Magdir/os2 \ +Magdir/os9 \ +Magdir/osf1 \ +Magdir/palm \ +Magdir/parix \ +Magdir/pbm \ +Magdir/pdf \ +Magdir/pdp \ +Magdir/perl \ +Magdir/pgp \ +Magdir/pkgadd \ +Magdir/plus5 \ +Magdir/printer \ +Magdir/project \ +Magdir/psdbms \ +Magdir/pulsar \ +Magdir/pyramid \ +Magdir/python \ +Magdir/riff \ +Magdir/rpm \ +Magdir/rtf \ +Magdir/sc \ +Magdir/sccs \ +Magdir/sendmail \ +Magdir/sequent \ +Magdir/sgml \ +Magdir/sharc \ +Magdir/sketch \ +Magdir/smalltalk \ +Magdir/sniffer \ +Magdir/softquad \ +Magdir/spectrum \ +Magdir/sql \ +Magdir/sun \ +Magdir/sysex \ +Magdir/teapot \ +Magdir/terminfo \ +Magdir/tex \ +Magdir/tgif \ +Magdir/ti-8x \ +Magdir/timezone \ +Magdir/troff \ +Magdir/tuxedo \ +Magdir/typeset \ +Magdir/unknown \ +Magdir/uuencode \ +Magdir/varied.out \ +Magdir/vax \ +Magdir/vicar \ +Magdir/visx \ +Magdir/vms \ +Magdir/vmware \ +Magdir/vorbis \ +Magdir/vxl \ +Magdir/wordperfect \ +Magdir/xdelta \ +Magdir/xenix \ +Magdir/zilog \ +Magdir/zyxel ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -122,7 +281,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best SOURCES = $(file_SOURCES) OBJECTS = $(file_OBJECTS) @@ -416,7 +575,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$/$$file $(distdir)/$$file; \ + cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ==== //depot/projects/ia64/contrib/file/Makefile.std#4 (text+ko) ==== @@ -1,6 +1,6 @@ # Makefile for file(1) cmd. # Copyright (c) Ian F. Darwin 86/09/01 - see LEGAL.NOTICE. -# @(#)$Id: Makefile.std,v 1.16 2003/02/08 18:35:36 christos Exp $ +# @(#)$Id: Makefile.std,v 1.17 2003/02/27 20:47:45 christos Exp $ # # This software is not subject to any license of the American Telephone # and Telegraph Company or of the Regents of the University of California. @@ -22,7 +22,7 @@ # # 4. This notice may not be removed or altered. # -VERSION = 3.40 +VERSION = 3.41 SHELL = /bin/sh #MAGIC = /etc/magic MAGIC = /usr/local/etc/magic ==== //depot/projects/ia64/contrib/file/README#4 (text+ko) ==== @@ -1,5 +1,5 @@ ** README for file(1) Command ** -@(#) $Id: README,v 1.28 2003/02/08 18:35:36 christos Exp $ +@(#) $Id: README,v 1.29 2003/02/27 20:47:46 christos Exp $ This is Release 3.x of Ian Darwin's (copyright but distributable) file(1) command. This version is the standard "file" command for Linux, @@ -91,7 +91,7 @@ From: Kees Zeelenberg -An MS-Windows (Win32) port of File-3.40 is available from +An MS-Windows (Win32) port of File-3.41 is available from http://gnuwin32.sourceforge.net/ File is an implementation of the Unix File(1) command. It knows the 'magic number' of several thousands of file types. ==== //depot/projects/ia64/contrib/file/acconfig.h#3 (text+ko) ==== @@ -41,6 +41,9 @@ standard headers don't define. */ #undef uint64_t +/* Define to `int' if standard headers don't define. */ +#undef int32_t + /* FIXME: These have to be added manually because autoheader doesn't know about AC_CHECK_SIZEOF_INCLUDES. */ ==== //depot/projects/ia64/contrib/file/aclocal.m4#3 (text+ko) ==== @@ -1,6 +1,6 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4 +dnl aclocal.m4 generated automatically by aclocal 1.4-p5 -dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -274,7 +274,7 @@ dnl Usage: dnl AM_INIT_AUTOMAKE(package,version, [no-define]) -AC_DEFUN(AM_INIT_AUTOMAKE, +AC_DEFUN([AM_INIT_AUTOMAKE], [AC_REQUIRE([AC_PROG_INSTALL]) PACKAGE=[$1] AC_SUBST(PACKAGE) @@ -302,7 +302,7 @@ # Check to make sure that the build environment is sane. # -AC_DEFUN(AM_SANITY_CHECK, +AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) # Just in case sleep 1 @@ -343,7 +343,7 @@ dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) dnl The program must properly implement --version. -AC_DEFUN(AM_MISSING_PROG, +AC_DEFUN([AM_MISSING_PROG], [AC_MSG_CHECKING(for working $2) # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. @@ -359,7 +359,7 @@ # Like AC_CONFIG_HEADER, but automatically create stamp file. -AC_DEFUN(AM_CONFIG_HEADER, +AC_DEFUN([AM_CONFIG_HEADER], [AC_PREREQ([2.12]) AC_CONFIG_HEADER([$1]) dnl When config.status generates a header, we must update the stamp-h file. @@ -382,7 +382,7 @@ # Define a conditional. -AC_DEFUN(AM_CONDITIONAL, +AC_DEFUN([AM_CONDITIONAL], [AC_SUBST($1_TRUE) AC_SUBST($1_FALSE) if $2; then ==== //depot/projects/ia64/contrib/file/apprentice.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ #endif #ifndef lint -FILE_RCSID("@(#)$Id: apprentice.c,v 1.49 2002/07/03 19:00:41 christos Exp $") +FILE_RCSID("@(#)$Id: apprentice.c,v 1.50 2003/02/27 20:47:46 christos Exp $") #endif /* lint */ #define EATAB {while (isascii((unsigned char) *l) && \ @@ -231,7 +231,7 @@ } maxmagic = MAXMAGIS; - *magicp = (struct magic *) calloc(sizeof(struct magic), maxmagic); + *magicp = (struct magic *) calloc(maxmagic, sizeof(struct magic)); if (*magicp == NULL) { (void) fprintf(stderr, "%s: Out of memory (%s).\n", progname, strerror(errno)); ==== //depot/projects/ia64/contrib/file/config.h.in#4 (text+ko) ==== @@ -55,6 +55,9 @@ standard headers don't define. */ #undef uint64_t +/* Define to `int' if standard headers don't define. */ +#undef int32_t + /* The number of bytes in a uint8_t. */ #define SIZEOF_UINT8_T 0 ==== //depot/projects/ia64/contrib/file/configure#4 (text+ko) ==== @@ -699,7 +699,7 @@ PACKAGE=file -VERSION=3.40 +VERSION=3.41 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -1628,7 +1628,7 @@ fi done -for ac_hdr in unistd.h +for ac_hdr in stdint.h inttypes.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 @@ -1668,7 +1668,7 @@ fi done -for ac_hdr in getopt.h +for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 @@ -1708,7 +1708,7 @@ fi done -for ac_hdr in locale.h +for ac_hdr in getopt.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 @@ -1748,7 +1748,7 @@ fi done -for ac_hdr in stdint.h +for ac_hdr in locale.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 @@ -2462,8 +2462,44 @@ fi +echo $ac_n "checking for int32_t""... $ac_c" 1>&6 +echo "configure:2467: checking for int32_t" >&5 +if eval "test \"`echo '$''{'ac_cv_type_int32_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +#endif +#include +#if STDC_HEADERS +#include +#include +#endif +EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "(^|[^a-zA-Z_0-9])int32_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + rm -rf conftest* + ac_cv_type_int32_t=yes +else + rm -rf conftest* + ac_cv_type_int32_t=no +fi +rm -f conftest* + +fi +echo "$ac_t""$ac_cv_type_int32_t" 1>&6 +if test $ac_cv_type_int32_t = no; then + cat >> confdefs.h <<\EOF +#define int32_t int +EOF + +fi + echo $ac_n "checking for long long""... $ac_c" 1>&6 -echo "configure:2467: checking for long long" >&5 +echo "configure:2503: checking for long long" >&5 if eval "test \"`echo '$''{'ac_cv_c_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2474,13 +2510,13 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_long_long=yes else @@ -2509,12 +2545,12 @@ long64='unsigned long'; fi echo $ac_n "checking for uint64_t""... $ac_c" 1>&6 -echo "configure:2513: checking for uint64_t" >&5 +echo "configure:2549: checking for uint64_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_uint64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -2548,7 +2584,7 @@ echo $ac_n "checking size of uint8_t""... $ac_c" 1>&6 -echo "configure:2552: checking size of uint8_t" >&5 +echo "configure:2588: checking size of uint8_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_uint8_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2556,7 +2592,7 @@ ac_cv_sizeof_uint8_t=0 else cat > conftest.$ac_ext < @@ -2575,7 +2611,7 @@ exit(0); } EOF -if { (eval echo configure:2579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint8_t=`cat conftestval` else @@ -2596,7 +2632,7 @@ echo $ac_n "checking size of uint16_t""... $ac_c" 1>&6 -echo "configure:2600: checking size of uint16_t" >&5 +echo "configure:2636: checking size of uint16_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_uint16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2604,7 +2640,7 @@ ac_cv_sizeof_uint16_t=0 else cat > conftest.$ac_ext < @@ -2623,7 +2659,7 @@ exit(0); } EOF -if { (eval echo configure:2627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint16_t=`cat conftestval` else @@ -2644,7 +2680,7 @@ echo $ac_n "checking size of uint32_t""... $ac_c" 1>&6 -echo "configure:2648: checking size of uint32_t" >&5 +echo "configure:2684: checking size of uint32_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_uint32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2652,7 +2688,7 @@ ac_cv_sizeof_uint32_t=0 else cat > conftest.$ac_ext < @@ -2671,7 +2707,7 @@ exit(0); } EOF -if { (eval echo configure:2675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint32_t=`cat conftestval` else @@ -2692,7 +2728,7 @@ echo $ac_n "checking size of uint64_t""... $ac_c" 1>&6 -echo "configure:2696: checking size of uint64_t" >&5 +echo "configure:2732: checking size of uint64_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_uint64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2700,7 +2736,7 @@ ac_cv_sizeof_uint64_t=0 else cat > conftest.$ac_ext <>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 3 11:56:46 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7042937B405; Mon, 3 Mar 2003 11:56:41 -0800 (PST) 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 E2B9337B401 for ; Mon, 3 Mar 2003 11:56:40 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 82BAF43F93 for ; Mon, 3 Mar 2003 11:56:40 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h23Jue0U020228 for ; Mon, 3 Mar 2003 11:56:40 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h23JudPh020225 for perforce@freebsd.org; Mon, 3 Mar 2003 11:56:39 -0800 (PST) Date: Mon, 3 Mar 2003 11:56:39 -0800 (PST) Message-Id: <200303031956.h23JudPh020225@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 26293 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=26293 Change 26293 by jhb@jhb_laptop on 2003/03/03 11:56:17 Add a HTT kernel option. Affected files ... .. //depot/projects/smpng/sys/conf/options.i386#21 edit .. //depot/projects/smpng/sys/i386/conf/NOTES#49 edit .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#38 edit Differences ... ==== //depot/projects/smpng/sys/conf/options.i386#21 (text+ko) ==== @@ -29,6 +29,7 @@ PECOFF_DEBUG opt_pecoff.h # i386 SMP options APIC_IO opt_global.h +HTT # Change KVM size. Changes things all over the kernel. KVA_PAGES opt_global.h ==== //depot/projects/smpng/sys/i386/conf/NOTES#49 (text+ko) ==== @@ -36,6 +36,7 @@ # Mandatory: options APIC_IO # Symmetric (APIC) I/O +options HTT # HyperThreading Technology # # Rogue SMP hardware: ==== //depot/projects/smpng/sys/i386/i386/mp_machdep.c#38 (text+ko) ==== @@ -26,6 +26,7 @@ */ #include "opt_cpu.h" +#include "opt_htt.h" #include "opt_kstack_pages.h" #ifdef SMP @@ -237,8 +238,10 @@ #define MP_ANNOUNCE_POST 0x19 +#ifdef HTT static int need_hyperthreading_fixup; static u_int logical_cpus; +#endif /* used to hold the AP's until we are ready to release them */ static struct mtx ap_boot_mtx; @@ -315,7 +318,9 @@ static int search_for_sig(u_int32_t target, int count); static void mp_enable(u_int boot_addr); +#ifdef HTT static void mptable_hyperthread_fixup(u_int id_mask); +#endif static void mptable_pass1(void); static int mptable_pass2(void); static void default_mp_table(int type); @@ -786,7 +791,9 @@ void* position; int count; int type; +#ifdef HTT u_int id_mask; +#endif POSTCODE(MPTABLE_PASS1_POST); @@ -800,7 +807,9 @@ mp_nbusses = 0; mp_napics = 0; nintrs = 0; +#ifdef HTT id_mask = 0; +#endif /* check for use of 'default' configuration */ if (MPFPS_MPFB1 != 0) { @@ -835,8 +844,10 @@ & PROCENTRY_FLAG_EN) { ++mp_naps; mp_maxid++; +#ifdef HTT id_mask |= 1 << ((proc_entry_ptr)position)->apic_id; +#endif } break; case 1: /* bus_entry */ @@ -871,8 +882,10 @@ mp_naps = MAXCPU; } +#ifdef HTT /* See if we need to fixup HT logical CPUs. */ mptable_hyperthread_fixup(id_mask); +#endif /* * Count the BSP. @@ -898,7 +911,9 @@ static int mptable_pass2(void) { +#ifdef HTT struct PROCENTRY proc; +#endif int x; mpcth_t cth; int totalSize; @@ -911,10 +926,12 @@ POSTCODE(MPTABLE_PASS2_POST); +#ifdef HTT /* Initialize fake proc entry for use with HT fixup. */ bzero(&proc, sizeof(proc)); proc.type = 0; proc.cpu_flags = PROCENTRY_FLAG_EN; +#endif pgeflag = 0; /* XXX - Not used under SMP yet. */ @@ -994,6 +1011,7 @@ if (processor_entry(position, cpu)) ++cpu; +#ifdef HTT if (need_hyperthreading_fixup) { /* * Create fake mptable processor entries @@ -1007,6 +1025,7 @@ cpu++; } } +#endif break; case 1: if (bus_entry(position, bus)) @@ -1039,6 +1058,7 @@ return 0; } +#ifdef HTT /* * Check if we should perform a hyperthreading "fix-up" to * enumerate any logical CPU's that aren't already listed @@ -1088,6 +1108,7 @@ mp_maxid *= logical_cpus; mp_naps *= logical_cpus; } +#endif void assign_apic_irq(int apic, int intpin, int irq) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 3 13: 3:30 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A53937B405; Mon, 3 Mar 2003 13:03:29 -0800 (PST) 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 9E19337B401; Mon, 3 Mar 2003 13:03:28 -0800 (PST) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id C75E743FDD; Mon, 3 Mar 2003 13:03:27 -0800 (PST) (envelope-from robert@fledge.watson.org) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.12.6/8.12.5) with SMTP id h23L3DP4099560; Mon, 3 Mar 2003 16:03:13 -0500 (EST) (envelope-from robert@fledge.watson.org) Date: Mon, 3 Mar 2003 16:03:13 -0500 (EST) From: Robert Watson X-Sender: robert@fledge.watson.org To: John Baldwin Cc: Perforce Change Reviews Subject: Re: PERFORCE change 26293 for review In-Reply-To: <200303031956.h23JudPh020225@repoman.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Mon, 3 Mar 2003, John Baldwin wrote: > > @@ -29,6 +29,7 @@ > PECOFF_DEBUG opt_pecoff.h > # i386 SMP options > APIC_IO opt_global.h > +HTT ^^^^ Shouldn't there be an opt_global.h here? Robert N M Watson FreeBSD Core Team, TrustedBSD Projects robert@fledge.watson.org Network Associates Laboratories To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 3 13:47:53 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0451937B405; Mon, 3 Mar 2003 13:47:52 -0800 (PST) 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 9259C37B401; Mon, 3 Mar 2003 13:47:51 -0800 (PST) Received: from canning.wemm.org (canning.wemm.org [192.203.228.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0A45843FBD; Mon, 3 Mar 2003 13:47:51 -0800 (PST) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by canning.wemm.org (Postfix) with ESMTP id AEEED2A89E; Mon, 3 Mar 2003 13:47:50 -0800 (PST) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Robert Watson Cc: John Baldwin , Perforce Change Reviews Subject: Re: PERFORCE change 26293 for review In-Reply-To: Date: Mon, 03 Mar 2003 13:47:50 -0800 From: Peter Wemm Message-Id: <20030303214750.AEEED2A89E@canning.wemm.org> Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Robert Watson wrote: > > On Mon, 3 Mar 2003, John Baldwin wrote: > > > > > @@ -29,6 +29,7 @@ > > PECOFF_DEBUG opt_pecoff.h > > # i386 SMP options > > APIC_IO opt_global.h > > +HTT > ^^^^ Shouldn't there be an opt_global.h here? Nope. opt_htt.h is implied, which is what he wants. Cheers, -Peter -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 4 12:28:36 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1EC0137B405; Tue, 4 Mar 2003 12:28:10 -0800 (PST) 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 BAC8C37B401 for ; Tue, 4 Mar 2003 12:28:09 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5D11943FA3 for ; Tue, 4 Mar 2003 12:28:08 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h24KS80U053947 for ; Tue, 4 Mar 2003 12:28:08 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h24KS5WB053944 for perforce@freebsd.org; Tue, 4 Mar 2003 12:28:05 -0800 (PST) Date: Tue, 4 Mar 2003 12:28:05 -0800 (PST) Message-Id: <200303042028.h24KS5WB053944@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 26330 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=26330 Change 26330 by jhb@jhb_laptop on 2003/03/04 12:27:21 IFC @26326. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/busdma_machdep.c#9 integrate .. //depot/projects/smpng/sys/alpha/alpha/mem.c#9 integrate .. //depot/projects/smpng/sys/alpha/alpha/promcons.c#12 integrate .. //depot/projects/smpng/sys/alpha/alpha/trap.c#42 integrate .. //depot/projects/smpng/sys/alpha/conf/Makefile#2 integrate .. //depot/projects/smpng/sys/alpha/conf/NOTES#4 integrate .. //depot/projects/smpng/sys/alpha/include/bus.h#7 integrate .. //depot/projects/smpng/sys/alpha/include/pmap.h#12 integrate .. //depot/projects/smpng/sys/alpha/linux/linux_machdep.c#11 integrate .. //depot/projects/smpng/sys/alpha/tlsb/zs_tlsb.c#10 integrate .. //depot/projects/smpng/sys/boot/alpha/common/Makefile.common#3 integrate .. //depot/projects/smpng/sys/boot/common/help.common#7 integrate .. //depot/projects/smpng/sys/boot/common/loader.8#20 integrate .. //depot/projects/smpng/sys/boot/common/module.c#5 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/efifs.c#7 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/libefi.c#3 integrate .. //depot/projects/smpng/sys/boot/efi/loader/Makefile#9 integrate .. //depot/projects/smpng/sys/boot/efi/loader/main.c#9 integrate .. //depot/projects/smpng/sys/boot/forth/loader.conf#16 integrate .. //depot/projects/smpng/sys/boot/ia64/skiload/Makefile#7 integrate .. //depot/projects/smpng/sys/boot/pc98/boot2/Makefile#10 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.c#13 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_cd.c#13 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_ch.c#6 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#32 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_pass.c#8 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_pt.c#4 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_sa.c#10 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_ses.c#6 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_target.c#8 integrate .. //depot/projects/smpng/sys/coda/coda_fbsd.c#3 integrate .. //depot/projects/smpng/sys/compat/linux/linux_file.c#16 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#22 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ipc.c#11 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#32 integrate .. //depot/projects/smpng/sys/compat/linux/linux_socket.c#9 integrate .. //depot/projects/smpng/sys/compat/linux/linux_stats.c#11 integrate .. //depot/projects/smpng/sys/compat/linux/linux_sysctl.c#8 integrate .. //depot/projects/smpng/sys/compat/linux/linux_uid16.c#14 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#22 integrate .. //depot/projects/smpng/sys/conf/Makefile.alpha#16 integrate .. //depot/projects/smpng/sys/conf/Makefile.i386#16 integrate .. //depot/projects/smpng/sys/conf/Makefile.ia64#22 integrate .. //depot/projects/smpng/sys/conf/Makefile.pc98#15 integrate .. //depot/projects/smpng/sys/conf/Makefile.powerpc#19 integrate .. //depot/projects/smpng/sys/conf/Makefile.sparc64#19 integrate .. //depot/projects/smpng/sys/conf/Makefile.x86_64#3 integrate .. //depot/projects/smpng/sys/conf/NOTES#33 integrate .. //depot/projects/smpng/sys/conf/files#63 integrate .. //depot/projects/smpng/sys/conf/files.alpha#21 integrate .. //depot/projects/smpng/sys/conf/files.i386#36 integrate .. //depot/projects/smpng/sys/conf/files.ia64#24 integrate .. //depot/projects/smpng/sys/conf/files.pc98#36 integrate .. //depot/projects/smpng/sys/conf/files.powerpc#13 integrate .. //depot/projects/smpng/sys/conf/files.sparc64#24 integrate .. //depot/projects/smpng/sys/conf/files.x86_64#5 integrate .. //depot/projects/smpng/sys/conf/kern.mk#3 integrate .. //depot/projects/smpng/sys/conf/kern.post.mk#19 integrate .. //depot/projects/smpng/sys/conf/kern.pre.mk#19 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#19 integrate .. //depot/projects/smpng/sys/conf/majors#22 integrate .. //depot/projects/smpng/sys/conf/majors.awk#1 branch .. //depot/projects/smpng/sys/conf/makeLINT.mk#1 branch .. //depot/projects/smpng/sys/conf/makeLINT.sed#3 integrate .. //depot/projects/smpng/sys/conf/options#44 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/mlfk_ipl.c#3 integrate .. //depot/projects/smpng/sys/ddb/db_ps.c#17 integrate .. //depot/projects/smpng/sys/dev/aac/aac.c#21 integrate .. //depot/projects/smpng/sys/dev/aac/aac_cam.c#6 integrate .. //depot/projects/smpng/sys/dev/aac/aac_disk.c#13 integrate .. //depot/projects/smpng/sys/dev/aac/aac_pci.c#18 integrate .. //depot/projects/smpng/sys/dev/aac/aacvar.h#15 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#39 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.c#8 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.h#6 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.reg#7 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.seq#7 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_inline.h#6 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_osm.c#6 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_pci.c#7 integrate .. //depot/projects/smpng/sys/dev/amr/amr.c#13 integrate .. //depot/projects/smpng/sys/dev/asr/asr.c#17 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#29 integrate .. //depot/projects/smpng/sys/dev/ata/ata-card.c#7 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/smpng/sys/dev/ata/ata-isa.c#10 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-all.c#17 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cam.c#6 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cd.c#30 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-fd.c#15 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-fd.h#6 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-tape.c#14 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_os.c#11 integrate .. //depot/projects/smpng/sys/dev/ccd/ccd.c#20 integrate .. //depot/projects/smpng/sys/dev/ciss/ciss.c#10 integrate .. //depot/projects/smpng/sys/dev/dgb/dgb.c#11 integrate .. //depot/projects/smpng/sys/dev/digi/digi.c#17 integrate .. //depot/projects/smpng/sys/dev/drm/drm_drv.h#7 integrate .. //depot/projects/smpng/sys/dev/fb/fb.c#6 integrate .. //depot/projects/smpng/sys/dev/firewire/firewire.c#10 integrate .. //depot/projects/smpng/sys/dev/firewire/firewirereg.h#5 integrate .. //depot/projects/smpng/sys/dev/firewire/fwdev.c#4 integrate .. //depot/projects/smpng/sys/dev/firewire/fwmem.c#5 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci.c#9 integrate .. //depot/projects/smpng/sys/dev/firewire/sbp.c#9 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#23 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxpreg.h#4 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxpvar.h#7 integrate .. //depot/projects/smpng/sys/dev/hea/eni_buffer.c#8 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_command.c#4 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_load.c#5 integrate .. //depot/projects/smpng/sys/dev/ida/ida.c#5 integrate .. //depot/projects/smpng/sys/dev/iicbus/iic.c#6 integrate .. //depot/projects/smpng/sys/dev/iir/iir_ctrl.c#5 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#21 integrate .. //depot/projects/smpng/sys/dev/joy/joy.c#5 integrate .. //depot/projects/smpng/sys/dev/kbd/kbd.c#6 integrate .. //depot/projects/smpng/sys/dev/mcd/mcd.c#3 integrate .. //depot/projects/smpng/sys/dev/md/md.c#28 integrate .. //depot/projects/smpng/sys/dev/mlx/mlx.c#7 integrate .. //depot/projects/smpng/sys/dev/mlx/mlx_disk.c#5 integrate .. //depot/projects/smpng/sys/dev/mly/mly.c#14 integrate .. //depot/projects/smpng/sys/dev/nmdm/nmdm.c#12 integrate .. //depot/projects/smpng/sys/dev/null/null.c#10 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_console.c#11 integrate .. //depot/projects/smpng/sys/dev/ofw/openfirmio.c#3 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbbdevid.h#8 integrate .. //depot/projects/smpng/sys/dev/pci/pci_user.c#7 integrate .. //depot/projects/smpng/sys/dev/pcic/i82365.c#7 integrate .. //depot/projects/smpng/sys/dev/ppbus/lpt.c#6 integrate .. //depot/projects/smpng/sys/dev/ppbus/pcfclock.c#6 integrate .. //depot/projects/smpng/sys/dev/ppbus/ppi.c#6 integrate .. //depot/projects/smpng/sys/dev/ppbus/pps.c#10 integrate .. //depot/projects/smpng/sys/dev/raidframe/rf_freebsdkintf.c#6 integrate .. //depot/projects/smpng/sys/dev/random/randomdev.c#12 integrate .. //depot/projects/smpng/sys/dev/rc/rc.c#5 integrate .. //depot/projects/smpng/sys/dev/rp/rp.c#11 integrate .. //depot/projects/smpng/sys/dev/sab/sab.c#8 integrate .. //depot/projects/smpng/sys/dev/scd/scd.c#3 integrate .. //depot/projects/smpng/sys/dev/si/si.c#9 integrate .. //depot/projects/smpng/sys/dev/sio/sio.c#24 integrate .. //depot/projects/smpng/sys/dev/sio/sio_pci.c#9 integrate .. //depot/projects/smpng/sys/dev/smbus/smb.c#5 integrate .. //depot/projects/smpng/sys/dev/snp/snp.c#11 integrate .. //depot/projects/smpng/sys/dev/sound/midi/midi.c#7 integrate .. //depot/projects/smpng/sys/dev/sound/midi/sequencer.c#8 integrate .. //depot/projects/smpng/sys/dev/sound/pci/emu10k1.c#9 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/ac97.c#12 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/channel.c#19 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/dsp.c#11 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/mixer.c#10 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sndstat.c#9 integrate .. //depot/projects/smpng/sys/dev/streams/streams.c#12 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.c#26 integrate .. //depot/projects/smpng/sys/dev/syscons/sysmouse.c#6 integrate .. //depot/projects/smpng/sys/dev/tdfx/tdfx_pci.c#10 integrate .. //depot/projects/smpng/sys/dev/tga/tga_pci.c#4 integrate .. //depot/projects/smpng/sys/dev/twe/twe_freebsd.c#11 integrate .. //depot/projects/smpng/sys/dev/ubsec/ubsec.c#7 integrate .. //depot/projects/smpng/sys/dev/ubsec/ubsecreg.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/ucom.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/ufm.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/ugen.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/uhci.c#23 integrate .. //depot/projects/smpng/sys/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/uhid.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/ulpt.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/ums.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/urio.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/usb.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/usbdi_util.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/usbdi_util.h#4 integrate .. //depot/projects/smpng/sys/dev/usb/uscanner.c#10 integrate .. //depot/projects/smpng/sys/dev/vinum/vinum.c#9 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumext.h#7 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi.c#43 integrate .. //depot/projects/smpng/sys/dev/zs/zs.c#5 integrate .. //depot/projects/smpng/sys/fs/deadfs/dead_vnops.c#7 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_devs.c#10 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#27 integrate .. //depot/projects/smpng/sys/fs/fdescfs/fdesc_vnops.c#12 integrate .. //depot/projects/smpng/sys/fs/fifofs/fifo_vnops.c#20 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_alsubr.c#2 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_subr.c#4 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_vnops.c#17 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_fat.c#6 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#16 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_subr.c#12 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_vnops.c#12 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vnops.c#11 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_io.c#7 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_vnops.c#6 integrate .. //depot/projects/smpng/sys/fs/portalfs/portal_vnops.c#14 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_ctl.c#16 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_status.c#14 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs.h#16 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#24 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_io.c#10 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_vnops.c#16 integrate .. //depot/projects/smpng/sys/fs/specfs/spec_vnops.c#22 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vnops.c#9 integrate .. //depot/projects/smpng/sys/fs/umapfs/umap_vnops.c#6 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_subr.c#13 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_vnops.c#9 integrate .. //depot/projects/smpng/sys/geom/geom_dev.c#17 integrate .. //depot/projects/smpng/sys/geom/geom_disk.c#16 integrate .. //depot/projects/smpng/sys/geom/geom_stats.c#2 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_balloc.c#4 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_bmap.c#4 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_inode.c#10 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_lookup.c#10 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_vfsops.c#21 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_vnops.c#16 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_machdep.c#6 integrate .. //depot/projects/smpng/sys/i386/apm/apm.c#8 integrate .. //depot/projects/smpng/sys/i386/conf/Makefile#7 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#50 integrate .. //depot/projects/smpng/sys/i386/i386/busdma_machdep.c#9 integrate .. //depot/projects/smpng/sys/i386/i386/elan-mmcr.c#5 integrate .. //depot/projects/smpng/sys/i386/i386/identcpu.c#16 integrate .. //depot/projects/smpng/sys/i386/i386/mem.c#14 integrate .. //depot/projects/smpng/sys/i386/i386/perfmon.c#9 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#32 integrate .. //depot/projects/smpng/sys/i386/i386/sys_machdep.c#24 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#49 integrate .. //depot/projects/smpng/sys/i386/include/bus_at386.h#6 integrate .. //depot/projects/smpng/sys/i386/include/bus_pc98.h#7 integrate .. //depot/projects/smpng/sys/i386/include/pmap.h#11 integrate .. //depot/projects/smpng/sys/i386/isa/asc.c#5 integrate .. //depot/projects/smpng/sys/i386/isa/ctx.c#6 integrate .. //depot/projects/smpng/sys/i386/isa/cx.c#8 integrate .. //depot/projects/smpng/sys/i386/isa/cy.c#17 integrate .. //depot/projects/smpng/sys/i386/isa/gpib.c#7 integrate .. //depot/projects/smpng/sys/i386/isa/gsc.c#5 integrate .. //depot/projects/smpng/sys/i386/isa/istallion.c#7 integrate .. //depot/projects/smpng/sys/i386/isa/loran.c#6 integrate .. //depot/projects/smpng/sys/i386/isa/mse.c#7 integrate .. //depot/projects/smpng/sys/i386/isa/pcaudio.c#9 integrate .. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_drv.c#8 integrate .. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_ext.c#10 integrate .. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_kbd.c#3 integrate .. //depot/projects/smpng/sys/i386/isa/spic.c#5 integrate .. //depot/projects/smpng/sys/i386/isa/spigot.c#11 integrate .. //depot/projects/smpng/sys/i386/isa/spkr.c#10 integrate .. //depot/projects/smpng/sys/i386/isa/stallion.c#8 integrate .. //depot/projects/smpng/sys/i386/isa/tw.c#6 integrate .. //depot/projects/smpng/sys/i386/isa/wt.c#6 integrate .. //depot/projects/smpng/sys/i386/linux/imgact_linux.c#10 integrate .. //depot/projects/smpng/sys/i386/linux/linux_machdep.c#19 integrate .. //depot/projects/smpng/sys/i386/linux/linux_ptrace.c#5 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#26 integrate .. //depot/projects/smpng/sys/i386/smapi/smapi.c#2 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_ctl.c#6 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_rbch.c#9 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_tel.c#7 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_trace.c#8 integrate .. //depot/projects/smpng/sys/i4b/layer4/i4b_i4bdrv.c#13 integrate .. //depot/projects/smpng/sys/ia64/ia64/busdma_machdep.c#9 integrate .. //depot/projects/smpng/sys/ia64/ia64/mem.c#10 integrate .. //depot/projects/smpng/sys/ia64/ia64/ssc.c#10 integrate .. //depot/projects/smpng/sys/ia64/ia64/trap.c#41 integrate .. //depot/projects/smpng/sys/ia64/include/bus.h#6 integrate .. //depot/projects/smpng/sys/ia64/include/pmap.h#10 integrate .. //depot/projects/smpng/sys/isa/fd.c#17 integrate .. //depot/projects/smpng/sys/isa/ppc.c#5 integrate .. //depot/projects/smpng/sys/isa/psm.c#12 integrate .. //depot/projects/smpng/sys/isa/vga_isa.c#4 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_vnops.c#10 integrate .. //depot/projects/smpng/sys/kern/kern_clock.c#23 integrate .. //depot/projects/smpng/sys/kern/kern_condvar.c#24 integrate .. //depot/projects/smpng/sys/kern/kern_conf.c#17 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#43 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#52 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#53 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#51 integrate .. //depot/projects/smpng/sys/kern/kern_linker.c#29 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#58 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#44 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#53 integrate .. //depot/projects/smpng/sys/kern/kern_subr.c#19 integrate .. //depot/projects/smpng/sys/kern/kern_switch.c#26 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#41 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#17 integrate .. //depot/projects/smpng/sys/kern/kern_time.c#22 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#5 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#2 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#19 integrate .. //depot/projects/smpng/sys/kern/subr_disk.c#15 integrate .. //depot/projects/smpng/sys/kern/subr_log.c#10 integrate .. //depot/projects/smpng/sys/kern/subr_taskqueue.c#10 integrate .. //depot/projects/smpng/sys/kern/subr_trap.c#46 integrate .. //depot/projects/smpng/sys/kern/subr_xxx.c#6 integrate .. //depot/projects/smpng/sys/kern/tty.c#30 integrate .. //depot/projects/smpng/sys/kern/tty_cons.c#18 integrate .. //depot/projects/smpng/sys/kern/tty_pty.c#19 integrate .. //depot/projects/smpng/sys/kern/tty_tty.c#9 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#34 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#36 integrate .. //depot/projects/smpng/sys/kern/vfs_cluster.c#16 integrate .. //depot/projects/smpng/sys/kern/vfs_default.c#14 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#42 integrate .. //depot/projects/smpng/sys/libkern/strdup.c#2 integrate .. //depot/projects/smpng/sys/modules/Makefile#44 integrate .. //depot/projects/smpng/sys/modules/aac/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/mac_portacl/Makefile#1 branch .. //depot/projects/smpng/sys/modules/null/Makefile#1 branch .. //depot/projects/smpng/sys/net/bpf.c#22 integrate .. //depot/projects/smpng/sys/net/if.c#31 integrate .. //depot/projects/smpng/sys/net/if_arcsubr.c#8 integrate .. //depot/projects/smpng/sys/net/if_atmsubr.c#5 integrate .. //depot/projects/smpng/sys/net/if_ef.c#9 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#26 integrate .. //depot/projects/smpng/sys/net/if_fddisubr.c#11 integrate .. //depot/projects/smpng/sys/net/if_ieee80211subr.c#2 integrate .. //depot/projects/smpng/sys/net/if_iso88025subr.c#10 integrate .. //depot/projects/smpng/sys/net/if_tap.c#20 integrate .. //depot/projects/smpng/sys/net/if_tun.c#21 integrate .. //depot/projects/smpng/sys/net/if_vlan.c#15 integrate .. //depot/projects/smpng/sys/net/route.c#10 integrate .. //depot/projects/smpng/sys/net/route.h#9 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#4 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#4 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#3 integrate .. //depot/projects/smpng/sys/netgraph/ng_base.c#12 integrate .. //depot/projects/smpng/sys/netgraph/ng_device.c#3 integrate .. //depot/projects/smpng/sys/netgraph/ng_fec.c#3 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#28 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#28 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#28 integrate .. //depot/projects/smpng/sys/netipsec/ipsec.c#4 integrate .. //depot/projects/smpng/sys/netncp/ncp.h#3 integrate .. //depot/projects/smpng/sys/netncp/ncp_conn.c#7 integrate .. //depot/projects/smpng/sys/netncp/ncp_conn.h#3 integrate .. //depot/projects/smpng/sys/netncp/ncp_mod.c#2 integrate .. //depot/projects/smpng/sys/netncp/ncp_ncp.c#6 integrate .. //depot/projects/smpng/sys/netncp/ncp_ncp.h#3 integrate .. //depot/projects/smpng/sys/netncp/ncp_rq.c#5 integrate .. //depot/projects/smpng/sys/netncp/ncp_rq.h#3 integrate .. //depot/projects/smpng/sys/netncp/ncp_sock.c#5 integrate .. //depot/projects/smpng/sys/netncp/ncp_sock.h#2 integrate .. //depot/projects/smpng/sys/netncp/ncp_subr.c#3 integrate .. //depot/projects/smpng/sys/netncp/ncp_subr.h#5 integrate .. //depot/projects/smpng/sys/netncp/ncpio.h#1 branch .. //depot/projects/smpng/sys/netsmb/smb_dev.c#9 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_bio.c#17 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_nfsiod.c#8 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_socket.c#16 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#22 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvcache.c#6 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvsock.c#12 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_syscalls.c#15 integrate .. //depot/projects/smpng/sys/opencrypto/cryptodev.c#6 integrate .. //depot/projects/smpng/sys/pc98/apm/apm.c#8 integrate .. //depot/projects/smpng/sys/pc98/conf/Makefile#2 integrate .. //depot/projects/smpng/sys/pc98/conf/NOTES#2 integrate .. //depot/projects/smpng/sys/pc98/pc98/atapi.c#4 integrate .. //depot/projects/smpng/sys/pc98/pc98/fd.c#19 integrate .. //depot/projects/smpng/sys/pc98/pc98/mse.c#6 integrate .. //depot/projects/smpng/sys/pc98/pc98/olpt.c#6 integrate .. //depot/projects/smpng/sys/pc98/pc98/pc98gdc.c#6 integrate .. //depot/projects/smpng/sys/pc98/pc98/pcaudio.c#8 integrate .. //depot/projects/smpng/sys/pc98/pc98/ppc.c#4 integrate .. //depot/projects/smpng/sys/pc98/pc98/sio.c#25 integrate .. //depot/projects/smpng/sys/pc98/pc98/spkr.c#8 integrate .. //depot/projects/smpng/sys/pc98/pc98/syscons.c#21 integrate .. //depot/projects/smpng/sys/pc98/pc98/wd.c#8 integrate .. //depot/projects/smpng/sys/pc98/pc98/wd_cd.c#9 integrate .. //depot/projects/smpng/sys/pccard/pccard.c#18 integrate .. //depot/projects/smpng/sys/pccard/pcic_pci.c#27 integrate .. //depot/projects/smpng/sys/pci/agp.c#11 integrate .. //depot/projects/smpng/sys/pci/if_ti.c#20 integrate .. //depot/projects/smpng/sys/pci/intpm.c#6 integrate .. //depot/projects/smpng/sys/pci/meteor.c#6 integrate .. //depot/projects/smpng/sys/pci/xrpu.c#5 integrate .. //depot/projects/smpng/sys/powerpc/include/bus.h#7 integrate .. //depot/projects/smpng/sys/powerpc/ofw/ofw_pci.c#3 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/atomic.s#2 delete .. //depot/projects/smpng/sys/powerpc/powerpc/locore.s#10 delete .. //depot/projects/smpng/sys/powerpc/powerpc/ofwmagic.s#2 delete .. //depot/projects/smpng/sys/powerpc/powerpc/swtch.s#14 delete .. //depot/projects/smpng/sys/powerpc/powerpc/trap_subr.S#7 integrate .. //depot/projects/smpng/sys/security/mac_portacl/mac_portacl.c#1 branch .. //depot/projects/smpng/sys/sparc64/conf/Makefile#1 branch .. //depot/projects/smpng/sys/sparc64/conf/NOTES#1 branch .. //depot/projects/smpng/sys/sparc64/include/bus.h#12 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/iommu.c#12 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mem.c#4 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/trap.c#45 integrate .. //depot/projects/smpng/sys/sys/_iovec.h#2 integrate .. //depot/projects/smpng/sys/sys/_timespec.h#3 integrate .. //depot/projects/smpng/sys/sys/_types.h#8 integrate .. //depot/projects/smpng/sys/sys/buf.h#16 integrate .. //depot/projects/smpng/sys/sys/conf.h#20 integrate .. //depot/projects/smpng/sys/sys/disk.h#9 integrate .. //depot/projects/smpng/sys/sys/interrupt.h#7 integrate .. //depot/projects/smpng/sys/sys/kse.h#6 integrate .. //depot/projects/smpng/sys/sys/libkern.h#10 integrate .. //depot/projects/smpng/sys/sys/malloc.h#14 integrate .. //depot/projects/smpng/sys/sys/mdioctl.h#5 integrate .. //depot/projects/smpng/sys/sys/param.h#33 integrate .. //depot/projects/smpng/sys/sys/proc.h#71 integrate .. //depot/projects/smpng/sys/sys/socket.h#12 integrate .. //depot/projects/smpng/sys/sys/socketvar.h#28 integrate .. //depot/projects/smpng/sys/sys/stat.h#9 integrate .. //depot/projects/smpng/sys/sys/taskqueue.h#5 integrate .. //depot/projects/smpng/sys/sys/types.h#22 integrate .. //depot/projects/smpng/sys/sys/uio.h#10 integrate .. //depot/projects/smpng/sys/sys/watchdog.h#1 branch .. //depot/projects/smpng/sys/ufs/ffs/ffs_alloc.c#20 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_balloc.c#9 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_inode.c#13 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#23 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#24 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#38 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_bmap.c#8 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_quota.c#18 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#26 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#29 integrate .. //depot/projects/smpng/sys/vm/vm_swap.c#21 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/busdma_machdep.c#9 (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/alpha/alpha/busdma_machdep.c,v 1.29 2003/02/19 05:46:56 imp Exp $ + * $FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.30 2003/02/26 02:16:05 mux Exp $ */ #include @@ -410,7 +410,7 @@ bus_dmamem_free_size(dmat, vaddr, map, dmat->maxsize); } -#define BUS_DMAMAP_NSEGS ((BUS_SPACE_MAXSIZE / PAGE_SIZE) + 1) +#define BUS_DMAMAP_NSEGS ((64 * 1024 / PAGE_SIZE) + 1) /* * Map the buffer buf into bus space using the dmamap map. ==== //depot/projects/smpng/sys/alpha/alpha/mem.c#9 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: Utah $Hdr: mem.c 1.13 89/10/08$ * from: @(#)mem.c 7.2 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/alpha/alpha/mem.c,v 1.42 2003/02/25 03:21:18 mux Exp $ + * $FreeBSD: src/sys/alpha/alpha/mem.c,v 1.43 2003/03/03 12:15:38 phk Exp $ */ /* @@ -80,19 +80,15 @@ #define CDEV_MAJOR 2 static struct cdevsw mem_cdevsw = { - /* open */ mmopen, - /* close */ mmclose, - /* read */ mmrw, - /* write */ mmrw, - /* ioctl */ mmioctl, - /* poll */ (d_poll_t *)seltrue, - /* mmap */ memmmap, - /* strategy */ nostrategy, - /* name */ "mem", - /* maj */ CDEV_MAJOR, - /* dump */ nodump, - /* psize */ nopsize, - /* flags */ D_MEM, + .d_open = mmopen, + .d_close = mmclose, + .d_read = mmrw, + .d_write = mmrw, + .d_ioctl = mmioctl, + .d_mmap = memmmap, + .d_name = "mem", + .d_maj = CDEV_MAJOR, + .d_flags = D_MEM, }; struct mem_range_softc mem_range_softc; ==== //depot/projects/smpng/sys/alpha/alpha/promcons.c#12 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.27 2003/02/20 20:54:42 phk Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.28 2003/03/03 12:15:38 phk Exp $ */ /* $NetBSD: promcons.c,v 1.13 1998/03/21 22:52:59 mycroft Exp $ */ /* @@ -64,19 +64,14 @@ #define CDEV_MAJOR 97 static struct cdevsw prom_cdevsw = { - /* open */ promopen, - /* close */ promclose, - /* read */ ttyread, - /* write */ ttywrite, - /* ioctl */ promioctl, - /* poll */ ttypoll, - /* mmap */ nommap, - /* strategy */ nostrategy, - /* name */ "prom", - /* maj */ CDEV_MAJOR, - /* dump */ nodump, - /* psize */ nopsize, - /* flags */ 0, + .d_open = promopen, + .d_close = promclose, + .d_read = ttyread, + .d_write = ttywrite, + .d_ioctl = promioctl, + .d_poll = ttypoll, + .d_name = "prom", + .d_maj = CDEV_MAJOR, }; ==== //depot/projects/smpng/sys/alpha/alpha/trap.c#42 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.106 2003/02/25 00:42:39 marcel Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.108 2003/02/27 02:05:15 julian Exp $ */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ /* @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include @@ -664,7 +663,7 @@ sticks = td->td_sticks; if (td->td_ucred != p->p_ucred) cred_update_thread(td); - if (p->p_flag & P_KSES) + if (p->p_flag & P_THREADED) thread_user_enter(p, td); #ifdef DIAGNOSTIC alpha_fpstate_check(td); ==== //depot/projects/smpng/sys/alpha/conf/Makefile#2 (text+ko) ==== @@ -1,10 +1,3 @@ -# $FreeBSD: src/sys/alpha/conf/Makefile,v 1.1 2002/07/15 17:50:17 jhb Exp $ +# $FreeBSD: src/sys/alpha/conf/Makefile,v 1.3 2003/02/26 23:36:58 ru Exp $ -all: - @echo "make LINT only" - -clean: - rm -f LINT - -LINT: ../../conf/NOTES NOTES ../../conf/makeLINT.sed - cat ../../conf/NOTES NOTES | sed -E -n -f ../../conf/makeLINT.sed > LINT +.include "${.CURDIR}/../../conf/makeLINT.mk" ==== //depot/projects/smpng/sys/alpha/conf/NOTES#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/alpha/conf/NOTES,v 1.149 2003/02/25 00:42:39 marcel Exp $ +# $FreeBSD: src/sys/alpha/conf/NOTES,v 1.150 2003/02/25 20:59:22 obrien Exp $ # # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. @@ -57,199 +57,12 @@ device mcclock # MC146818 real time clock device -# The keyboard controller; it controls the keyboard and the PS/2 mouse. -device atkbdc -hint.atkbdc.0.at="isa" -hint.atkbdc.0.port="0x060" - -# The AT keyboard -device atkbd -hint.atkbd.0.at="atkbdc" -hint.atkbd.0.irq="1" - -# Options for atkbd: -options ATKBD_DFLT_KEYMAP # specify the built-in keymap -makeoptions ATKBD_DFLT_KEYMAP=jp.106 - -# These options are valid for other keyboard drivers as well. -options KBD_DISABLE_KEYMAP_LOAD # refuse to load a keymap -options KBD_INSTALL_CDEV # install a CDEV entry in /dev - -# `flags' for atkbd: -# 0x01 Force detection of keyboard, else we always assume a keyboard -# 0x02 Don't reset keyboard, useful for some newer ThinkPads -# 0x03 Force detection and avoid reset, might help with certain -# dockingstations -# 0x04 Old-style (XT) keyboard support, useful for older ThinkPads - -# PS/2 mouse -device psm -hint.psm.0.at="atkbdc" -hint.psm.0.irq="12" - -# Options for psm: -options PSM_HOOKRESUME #hook the system resume event, useful - #for some laptops -options PSM_RESETAFTERSUSPEND #reset the device at the resume event - -# Video card driver for VGA adapters. -device vga -hint.vga.0.at="isa" - -# Options for vga: -# Try the following option if the mouse pointer is not drawn correctly -# or font does not seem to be loaded properly. May cause flicker on -# some systems. -options VGA_ALT_SEQACCESS - -# If you can dispense with some vga driver features, you may want to -# use the following options to save some memory. -#options VGA_NO_FONT_LOADING # don't save/load font -#options VGA_NO_MODE_CHANGE # don't change video modes - -# Older video cards may require this option for proper operation. -options VGA_SLOW_IOACCESS # do byte-wide i/o's to TS and GDC regs - -# The following option probably won't work with the LCD displays. -options VGA_WIDTH90 # support 90 column modes - -# Yet more undocumented options for linting. -options VGA_DEBUG - # # Optional devices: # device tga # TGA video card driver -# The 'asr' driver provides support for current DPT/Adaptec SCSI RAID -# controllers (SmartRAID V and VI and later). -# These controllers require the CAM infrastructure. -# -device asr - -# The 'dpt' driver provides support for old DPT controllers (http://www.dpt.com/). -# These have hardware RAID-{0,1,5} support, and do multi-initiator I/O. -# The DPT controllers are commonly re-licensed under other brand-names - -# some controllers by Olivetti, Dec, HP, AT&T, SNI, AST, Alphatronic, NEC and -# Compaq are actually DPT controllers. -# -# See src/sys/dev/dpt for debugging and other subtle options. -# DPT_MEASURE_PERFORMANCE Enables a set of (semi)invasive metrics. Various -# instruments are enabled. The tools in -# /usr/sbin/dpt_* assume these to be enabled. -# DPT_HANDLE_TIMEOUTS Normally device timeouts are handled by the DPT. -# If you ant the driver to handle timeouts, enable -# this option. If your system is very busy, this -# option will create more trouble than solve. -# DPT_TIMEOUT_FACTOR Used to compute the excessive amount of time to -# wait when timing out with the above option. -# DPT_DEBUG_xxxx These are controllable from sys/dev/dpt/dpt.h -# DPT_LOST_IRQ When enabled, will try, once per second, to catch -# any interrupt that got lost. Seems to help in some -# DPT-firmware/Motherboard combinations. Minimal -# cost, great benefit. -# DPT_RESET_HBA Make "reset" actually reset the controller -# instead of fudging it. Only enable this if you -# are 100% certain you need it. - -device dpt - -# DPT options -#!CAM# options DPT_MEASURE_PERFORMANCE -#!CAM# options DPT_HANDLE_TIMEOUTS -options DPT_TIMEOUT_FACTOR=4 -options DPT_LOST_IRQ -options DPT_RESET_HBA -options DPT_ALLOW_MEMIO - -# -# Compaq "CISS" RAID controllers (SmartRAID 5* series) -# These controllers have a SCSI-like interface, and require the -# CAM infrastructure. -# -device ciss - -# -# Intel Integrated RAID controllers. -# This driver was developed and is maintained by Intel. Contacts -# at Intel for this driver are -# "Kannanthanam, Boji T" and -# "Leubner, Achim" . -# -device iir - -# -# Mylex AcceleRAID and eXtremeRAID controllers with v6 and later -# firmware. These controllers have a SCSI-like interface, and require -# the CAM infrastructure. -# -device mly - -# -# Compaq Smart RAID, Mylex DAC960 and AMI MegaRAID controllers. Only -# one entry is needed; the code will find and configure all supported -# controllers. -# -device ida # Compaq Smart RAID -device mlx # Mylex DAC960 -device amr # AMI MegaRAID - -# -# 3ware ATA RAID -# -device twe # 3ware ATA RAID - -# -# SCSI host adapters: -# -# aha: Adaptec 154x/1535/1640 -# bt: Most Buslogic controllers: including BT-445, BT-54x, BT-64x, BT-74x, -# BT-75x, BT-946, BT-948, BT-956, BT-958, SDC3211B, SDC3211F, SDC3222F -# wds: WD7000 -# -# Note that the order is important in order for Buslogic ISA/EISA cards to be -# probed correctly. -# -device bt -hint.bt.0.at="isa" -hint.bt.0.port="0x330" -device aha -hint.aha.0.at="isa" -device wds -hint.wds.0.at="isa" -hint.wds.0.port="0x350" -hint.wds.0.irq="11" -hint.wds.0.drq="6" - -# -# PC Card/PCMCIA -# (OLDCARD) -# -# card: pccard slots -# pcic: isa/pccard bridge -#device pcic -#hint.pcic.0.at="isa" -#hint.pcic.1.at="isa" -#device card 1 - -# -# PC Card/PCMCIA and Cardbus -# (NEWCARD) -# -# Note that NEWCARD and OLDCARD are incompatible. Do not use both at the same -# time. -# -# pccbb: pci/cardbus bridge implementing YENTA interface -# pccard: pccard slots -# cardbus: cardbus slots -device cbb -device pccard -device cardbus -#device pcic ISA attachment currently busted -#hint.pcic.0.at="isa" -#hint.pcic.1.at="isa" - ##################################################################### # SIMULATOR OPTIONS ==== //depot/projects/smpng/sys/alpha/include/bus.h#7 (text+ko) ==== @@ -67,7 +67,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD: src/sys/alpha/include/bus.h,v 1.16 2003/01/29 07:25:26 scottl Exp $ */ +/* $FreeBSD: src/sys/alpha/include/bus.h,v 1.17 2003/02/26 02:16:05 mux Exp $ */ #ifndef _ALPHA_BUS_H_ #define _ALPHA_BUS_H_ @@ -82,7 +82,7 @@ #define BUS_SPACE_MAXSIZE_24BIT 0xFFFFFF #define BUS_SPACE_MAXSIZE_32BIT 0xFFFFFFFF -#define BUS_SPACE_MAXSIZE (64 * 1024) /* Maximum supported size */ +#define BUS_SPACE_MAXSIZE 0xFFFFFFFFFFFFFFFF #define BUS_SPACE_MAXADDR_24BIT 0xFFFFFF #define BUS_SPACE_MAXADDR_32BIT 0xFFFFFFFF /* The largest address space known so far is 40 bits */ ==== //depot/projects/smpng/sys/alpha/include/pmap.h#12 (text+ko) ==== @@ -43,7 +43,7 @@ * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 * from: i386 pmap.h,v 1.54 1997/11/20 19:30:35 bde Exp - * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.19 2002/08/07 18:02:59 alc Exp $ + * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.20 2003/03/01 10:02:10 alc Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -207,11 +207,6 @@ vm_page_t pv_ptem; /* VM page for pte */ } *pv_entry_t; -#define PV_ENTRY_NULL ((pv_entry_t) 0) - -#define PV_CI 0x01 /* all entries must be cache inhibited */ -#define PV_PTPAGE 0x02 /* entry maps a page table page */ - #ifdef _KERNEL extern caddr_t CADDR1; @@ -233,7 +228,6 @@ void *pmap_mapdev(vm_offset_t, vm_size_t); void pmap_unmapdev(vm_offset_t, vm_size_t); unsigned *pmap_pte(pmap_t, vm_offset_t) __pure2; -vm_page_t pmap_use_pt(pmap_t, vm_offset_t); void pmap_set_opt (unsigned *); void pmap_set_opt_bsp (void); void pmap_deactivate(struct thread *td); ==== //depot/projects/smpng/sys/alpha/linux/linux_machdep.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/linux/linux_machdep.c,v 1.24 2002/10/02 14:30:14 gallatin Exp $ + * $FreeBSD: src/sys/alpha/linux/linux_machdep.c,v 1.26 2003/03/03 09:17:12 des Exp $ */ #include @@ -133,7 +133,7 @@ #ifdef DEBUG if (ldebug(clone)) { - printf(ARGS(clone, "flags %x, stack %x"), + printf(ARGS(clone, "flags %x, stack %x"), (unsigned int)args->flags, (unsigned int)args->stack); if (args->flags & CLONE_PID) printf(LMSG("CLONE_PID not yet supported")); @@ -387,7 +387,7 @@ return EINVAL; if ((error = - copyin((caddr_t)uap->rlim, (caddr_t)&rlim, sizeof (struct rlimit)))) + copyin(uap->rlim, &rlim, sizeof (struct rlimit)))) return (error); return dosetrlimit(td, which, &rlim); } @@ -412,6 +412,6 @@ if (which == -1) return EINVAL; - return (copyout((caddr_t)&td->td_proc->p_rlimit[which], - (caddr_t)uap->rlim, sizeof (struct rlimit))); + return (copyout(&td->td_proc->p_rlimit[which], + uap->rlim, sizeof (struct rlimit))); } ==== //depot/projects/smpng/sys/alpha/tlsb/zs_tlsb.c#10 (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/alpha/tlsb/zs_tlsb.c,v 1.34 2003/02/20 20:54:43 phk Exp $ + * $FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.35 2003/03/03 12:15:38 phk Exp $ */ /* * This driver is a somewhat hack. A real driver might use the zs driver @@ -69,19 +69,14 @@ #define CDEV_MAJOR 135 static struct cdevsw zs_cdevsw = { - /* open */ zsopen, - /* close */ zsclose, - /* read */ ttyread, - /* write */ ttywrite, - /* ioctl */ zsioctl, - /* poll */ ttypoll, - /* mmap */ nommap, - /* strategy */ nostrategy, - /* name */ "zs", - /* maj */ CDEV_MAJOR, - /* dump */ nodump, - /* psize */ nopsize, - /* flags */ 0, + .d_open = zsopen, + .d_close = zsclose, + .d_read = ttyread, + .d_write = ttywrite, + .d_ioctl = zsioctl, + .d_poll = ttypoll, + .d_name = "zs", + .d_maj = CDEV_MAJOR, }; static void zsstart(struct tty *); ==== //depot/projects/smpng/sys/boot/alpha/common/Makefile.common#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/alpha/common/Makefile.common,v 1.16 2001/09/12 10:25:45 ru Exp $ +# $FreeBSD: src/sys/boot/alpha/common/Makefile.common,v 1.17 2003/02/26 06:18:52 obrien Exp $ # # Common Alpha loader build rules @@ -10,15 +10,17 @@ SRCS+= dev_net.c .endif +.if !defined(NOFORTH) # Enable BootForth BOOT_FORTH= yes +CFLAGS+= -DBOOT_FORTH CFLAGS+= -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/alpha -CFLAGS+= -DBOOT_FORTH .if exists(${.OBJDIR}/../../ficl/libficl.a) LIBFICL= ${.OBJDIR}/../../ficl/libficl.a .else LIBFICL= ${.CURDIR}/../../ficl/libficl.a .endif +.endif # Always add MI sources .PATH: ${.CURDIR}/../../common ==== //depot/projects/smpng/sys/boot/common/help.common#7 (text+ko) ==== @@ -200,7 +200,7 @@ Sets the list of directories which will be searched in for modules named in a load command or implicitly required by a dependancy. The - default module_path is "/boot/kernel;/boot/modules;/modules". + default module_path is "/boot/kernel;/boot/modules". ################################################################################ # Tset Sprompt DSet the command prompt ==== //depot/projects/smpng/sys/boot/common/loader.8#20 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.52 2003/02/08 19:39:01 trhodes Exp $ +.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.53 2003/03/03 22:53:35 ru Exp $ .\" .\" Note: The date here should be updated whenever a non-trivial .\" change is made to the manual page. @@ -374,7 +374,7 @@ Sets the list of directories which will be searched in for modules named in a load command or implicitly required by a dependency. The default value for this variable is -.Dq Li /;/boot;/modules . +.Dq Li /boot/kernel;/boot/modules . .It Va num_ide_disks Sets the number of IDE disks as a work around for some problems in finding the root disk at boot. ==== //depot/projects/smpng/sys/boot/common/module.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/boot/common/module.c,v 1.23 2002/04/11 10:00:44 peter Exp $ + * $FreeBSD: src/sys/boot/common/module.c,v 1.24 2003/03/03 22:53:35 ru Exp $ */ /* @@ -65,7 +65,7 @@ /* load address should be tweaked by first module loaded (kernel) */ static vm_offset_t loadaddr = 0; -static const char *default_searchpath ="/boot/kernel;/boot/modules;/modules"; +static const char *default_searchpath ="/boot/kernel;/boot/modules"; static STAILQ_HEAD(, moduledir) moduledir_list = STAILQ_HEAD_INITIALIZER(moduledir_list); ==== //depot/projects/smpng/sys/boot/efi/libefi/efifs.c#7 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 4 13:18:41 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 14EC037B405; Tue, 4 Mar 2003 13:18:33 -0800 (PST) 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 8506637B401 for ; Tue, 4 Mar 2003 13:18:32 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EDD3F43F3F for ; Tue, 4 Mar 2003 13:18:31 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h24LIV0U063041 for ; Tue, 4 Mar 2003 13:18:31 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h24LIUO5063038 for perforce@freebsd.org; Tue, 4 Mar 2003 13:18:30 -0800 (PST) Date: Tue, 4 Mar 2003 13:18:30 -0800 (PST) Message-Id: <200303042118.h24LIUO5063038@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 26338 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=26338 Change 26338 by jhb@jhb_laptop on 2003/03/04 13:18:08 IFC my own changes. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/trap.c#43 integrate .. //depot/projects/smpng/sys/conf/options.i386#22 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#51 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#39 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#50 integrate .. //depot/projects/smpng/sys/ia64/ia64/trap.c#42 integrate .. //depot/projects/smpng/sys/kern/kern_condvar.c#25 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#27 integrate .. //depot/projects/smpng/sys/kern/kern_lock.c#21 integrate .. //depot/projects/smpng/sys/kern/kern_mac.c#17 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#59 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#54 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#42 integrate .. //depot/projects/smpng/sys/kern/kern_sysctl.c#29 integrate .. //depot/projects/smpng/sys/kern/subr_mbuf.c#25 integrate .. //depot/projects/smpng/sys/kern/subr_trap.c#47 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#73 integrate .. //depot/projects/smpng/sys/pci/if_xl.c#19 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/trap.c#29 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/trap.c#46 integrate .. //depot/projects/smpng/sys/sys/lock.h#26 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#26 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/trap.c#43 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.108 2003/02/27 02:05:15 julian Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.109 2003/03/04 21:03:04 jhb Exp $ */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ /* ==== //depot/projects/smpng/sys/conf/options.i386#22 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.i386,v 1.184 2003/01/15 20:15:33 phk Exp $ +# $FreeBSD: src/sys/conf/options.i386,v 1.185 2003/03/04 20:24:52 jhb Exp $ # Options specific to the i386 platform kernels MATH_EMULATE opt_math_emulate.h ==== //depot/projects/smpng/sys/i386/conf/NOTES#51 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1077 2003/02/26 23:36:58 ru Exp $ +# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1078 2003/03/04 20:24:52 jhb Exp $ # # ==== //depot/projects/smpng/sys/i386/i386/mp_machdep.c#39 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.203 2003/02/24 14:36:03 nyan Exp $ + * $FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.204 2003/03/04 20:24:53 jhb Exp $ */ #include "opt_cpu.h" ==== //depot/projects/smpng/sys/i386/i386/trap.c#50 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/i386/i386/trap.c,v 1.243 2003/02/27 02:05:16 julian Exp $ + * $FreeBSD: src/sys/i386/i386/trap.c,v 1.244 2003/03/04 21:03:04 jhb Exp $ */ /* ==== //depot/projects/smpng/sys/ia64/ia64/trap.c#42 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ia64/ia64/trap.c,v 1.70 2003/02/27 03:16:35 davidxu Exp $ */ +/* $FreeBSD: src/sys/ia64/ia64/trap.c,v 1.71 2003/03/04 21:03:04 jhb Exp $ */ /* From: src/sys/alpha/alpha/trap.c,v 1.33 */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ ==== //depot/projects/smpng/sys/kern/kern_condvar.c#25 (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/kern/kern_condvar.c,v 1.37 2003/02/27 08:43:27 harti Exp $ + * $FreeBSD: src/sys/kern/kern_condvar.c,v 1.38 2003/03/04 21:03:04 jhb Exp $ */ #include "opt_ktrace.h" ==== //depot/projects/smpng/sys/kern/kern_intr.c#27 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_intr.c,v 1.90 2003/02/19 05:47:25 imp Exp $ + * $FreeBSD: src/sys/kern/kern_intr.c,v 1.91 2003/03/04 21:01:42 jhb Exp $ * */ ==== //depot/projects/smpng/sys/kern/kern_lock.c#21 (text+ko) ==== @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * @(#)kern_lock.c 8.18 (Berkeley) 5/21/95 - * $FreeBSD: src/sys/kern/kern_lock.c,v 1.65 2003/02/25 03:37:46 jeff Exp $ + * $FreeBSD: src/sys/kern/kern_lock.c,v 1.66 2003/03/04 21:03:04 jhb Exp $ */ #include ==== //depot/projects/smpng/sys/kern/kern_mac.c#17 (text+ko) ==== @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_mac.c,v 1.78 2003/02/19 05:47:25 imp Exp $ + * $FreeBSD: src/sys/kern/kern_mac.c,v 1.79 2003/03/04 21:03:04 jhb Exp $ */ /* * Developed by the TrustedBSD Project. ==== //depot/projects/smpng/sys/kern/kern_mutex.c#59 (text+ko) ==== @@ -27,7 +27,7 @@ * * from BSDI $Id: mutex_witness.c,v 1.1.2.20 2000/04/27 03:10:27 cp Exp $ * and BSDI $Id: synch_machdep.c,v 2.3.2.39 2000/04/27 03:10:25 cp Exp $ - * $FreeBSD: src/sys/kern/kern_mutex.c,v 1.118 2003/02/25 22:28:46 mtm Exp $ + * $FreeBSD: src/sys/kern/kern_mutex.c,v 1.120 2003/03/04 20:32:41 jhb Exp $ */ /* ==== //depot/projects/smpng/sys/kern/kern_sig.c#54 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_sig.c 8.7 (Berkeley) 4/18/94 - * $FreeBSD: src/sys/kern/kern_sig.c,v 1.212 2003/02/27 02:05:17 julian Exp $ + * $FreeBSD: src/sys/kern/kern_sig.c,v 1.213 2003/03/04 21:03:04 jhb Exp $ */ #include "opt_compat.h" ==== //depot/projects/smpng/sys/kern/kern_synch.c#42 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_synch.c 8.9 (Berkeley) 5/19/95 - * $FreeBSD: src/sys/kern/kern_synch.c,v 1.213 2003/02/27 08:43:27 harti Exp $ + * $FreeBSD: src/sys/kern/kern_synch.c,v 1.214 2003/03/04 21:03:04 jhb Exp $ */ #include "opt_ddb.h" ==== //depot/projects/smpng/sys/kern/kern_sysctl.c#29 (text+ko) ==== @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)kern_sysctl.c 8.4 (Berkeley) 4/14/94 - * $FreeBSD: src/sys/kern/kern_sysctl.c,v 1.140 2003/02/22 17:58:06 rwatson Exp $ + * $FreeBSD: src/sys/kern/kern_sysctl.c,v 1.141 2003/03/04 21:03:04 jhb Exp $ */ #include "opt_compat.h" ==== //depot/projects/smpng/sys/kern/subr_mbuf.c#25 (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/kern/subr_mbuf.c,v 1.40 2003/02/20 04:26:58 bmilekic Exp $ + * $FreeBSD: src/sys/kern/subr_mbuf.c,v 1.41 2003/03/04 21:03:05 jhb Exp $ */ #include "opt_mac.h" ==== //depot/projects/smpng/sys/kern/subr_trap.c#47 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/kern/subr_trap.c,v 1.246 2003/02/27 02:05:18 julian Exp $ + * $FreeBSD: src/sys/kern/subr_trap.c,v 1.247 2003/03/04 21:03:05 jhb Exp $ */ #include "opt_mac.h" ==== //depot/projects/smpng/sys/kern/subr_witness.c#73 (text+ko) ==== @@ -27,7 +27,7 @@ * * from BSDI $Id: mutex_witness.c,v 1.1.2.20 2000/04/27 03:10:27 cp Exp $ * and BSDI $Id: synch_machdep.c,v 2.3.2.39 2000/04/27 03:10:25 cp Exp $ - * $FreeBSD: src/sys/kern/subr_witness.c,v 1.138 2003/02/18 03:36:49 peter Exp $ + * $FreeBSD: src/sys/kern/subr_witness.c,v 1.139 2003/03/04 20:56:39 jhb Exp $ */ /* ==== //depot/projects/smpng/sys/pci/if_xl.c#19 (text+ko) ==== @@ -101,7 +101,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/pci/if_xl.c,v 1.130 2003/02/22 14:46:31 bmilekic Exp $"); +__FBSDID("$FreeBSD: src/sys/pci/if_xl.c,v 1.131 2003/03/04 20:19:26 bmilekic Exp $"); #include #include @@ -2439,7 +2439,7 @@ m_new = m_head->m_pkthdr.len > MHLEN ? m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR) : - m_get(M_DONTWAIT, MT_DATA); + m_gethdr(M_DONTWAIT, MT_DATA); if (m_new == NULL) { m_freem(m_head); printf("xl%d: no memory for tx list\n", sc->xl_unit); ==== //depot/projects/smpng/sys/powerpc/powerpc/trap.c#29 (text+ko) ==== @@ -33,7 +33,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/powerpc/powerpc/trap.c,v 1.37 2003/02/17 02:19:58 jeff Exp $"; + "$FreeBSD: src/sys/powerpc/powerpc/trap.c,v 1.38 2003/03/04 21:03:05 jhb Exp $"; #endif /* not lint */ #include "opt_ddb.h" ==== //depot/projects/smpng/sys/sparc64/sparc64/trap.c#46 (text+ko) ==== @@ -37,7 +37,7 @@ * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 * from: FreeBSD: src/sys/i386/i386/trap.c,v 1.197 2001/07/19 - * $FreeBSD: src/sys/sparc64/sparc64/trap.c,v 1.56 2003/02/27 02:05:19 julian Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/trap.c,v 1.57 2003/03/04 21:03:05 jhb Exp $ */ #include "opt_ddb.h" ==== //depot/projects/smpng/sys/sys/lock.h#26 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * from BSDI $Id: mutex.h,v 2.7.2.35 2000/04/27 03:10:26 cp Exp $ - * $FreeBSD: src/sys/sys/lock.h,v 1.46 2002/08/28 05:14:55 bde Exp $ + * $FreeBSD: src/sys/sys/lock.h,v 1.47 2003/03/04 20:56:39 jhb Exp $ */ #ifndef _SYS_LOCK_H_ ==== //depot/projects/smpng/sys/vm/uma_core.c#26 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/vm/uma_core.c,v 1.49 2003/02/19 05:47:46 imp Exp $ + * $FreeBSD: src/sys/vm/uma_core.c,v 1.50 2003/03/04 21:03:05 jhb Exp $ * */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 4 13:23:47 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E4E4A37B405; Tue, 4 Mar 2003 13:23:45 -0800 (PST) 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 7BD3137B401 for ; Tue, 4 Mar 2003 13:23:45 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B304743F75 for ; Tue, 4 Mar 2003 13:23:44 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h24LNi0U063666 for ; Tue, 4 Mar 2003 13:23:44 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h24LNiQj063663 for perforce@freebsd.org; Tue, 4 Mar 2003 13:23:44 -0800 (PST) Date: Tue, 4 Mar 2003 13:23:44 -0800 (PST) Message-Id: <200303042123.h24LNiQj063663@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 26340 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=26340 Change 26340 by jhb@jhb_laptop on 2003/03/04 13:22:41 Axe trailing newline. Affected files ... .. //depot/projects/smpng/sys/kern/subr_eventhandler.c#17 edit Differences ... ==== //depot/projects/smpng/sys/kern/subr_eventhandler.c#17 (text+ko) ==== @@ -237,4 +237,3 @@ ep = en; } } - To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 4 13:26:51 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B472C37B405; Tue, 4 Mar 2003 13:26:49 -0800 (PST) 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 4B31C37B401 for ; Tue, 4 Mar 2003 13:26:49 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EB38843F3F for ; Tue, 4 Mar 2003 13:26:48 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h24LQm0U063816 for ; Tue, 4 Mar 2003 13:26:48 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h24LQmkM063805 for perforce@freebsd.org; Tue, 4 Mar 2003 13:26:48 -0800 (PST) Date: Tue, 4 Mar 2003 13:26:48 -0800 (PST) Message-Id: <200303042126.h24LQmkM063805@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 26341 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=26341 Change 26341 by jhb@jhb_laptop on 2003/03/04 13:26:17 Grammar. Affected files ... .. //depot/projects/smpng/sys/kern/subr_witness.c#74 edit Differences ... ==== //depot/projects/smpng/sys/kern/subr_witness.c#74 (text+ko) ==== @@ -1460,11 +1460,11 @@ } /* - * This is a bit risky at best. We have call this when we have timed out - * acquiring a spin lock and are assuming that the other CPU is stuck with - * this lock held. So, we go groveling around in the other CPU's per-cpu - * data to try and find the lock instance for this spin lock to see when it - * was last acquired. + * This is a bit risky at best. We call this function when we have timed + * out acquiring a spin lock, and we assume that the other CPU is stuck + * with this lock held. So, we go groveling around in the other CPU's + * per-cpu data to try to find the lock instance for this spin lock to + * see when it was last acquired. */ void witness_display_spinlock(struct lock_object *lock, struct thread *owner) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 4 14:27:10 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 03BCB37B405; Tue, 4 Mar 2003 14:27:09 -0800 (PST) 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 84F9B37B401 for ; Tue, 4 Mar 2003 14:27:08 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1FF7343F93 for ; Tue, 4 Mar 2003 14:27:08 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h24MR70U068117 for ; Tue, 4 Mar 2003 14:27:07 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h24MR6bt068114 for perforce@freebsd.org; Tue, 4 Mar 2003 14:27:06 -0800 (PST) Date: Tue, 4 Mar 2003 14:27:06 -0800 (PST) Message-Id: <200303042227.h24MR6bt068114@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 26344 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=26344 Change 26344 by jhb@jhb_blue on 2003/03/04 14:26:34 Bah, get the sense of a compare right. Affected files ... .. //depot/projects/smpng/sys/kern/subr_witness.c#75 edit Differences ... ==== //depot/projects/smpng/sys/kern/subr_witness.c#75 (text+ko) ==== @@ -699,7 +699,7 @@ * is Giant, then skip it. */ if ((lock->lo_flags & LO_SLEEPABLE) != 0 && - lock1->li_lock != &Giant.mtx_object) + lock1->li_lock == &Giant.mtx_object) continue; /* * If we are locking a sleepable lock and this lock To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 5 12:17:24 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5BF8437B405; Wed, 5 Mar 2003 12:17:22 -0800 (PST) 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 E487537B401 for ; Wed, 5 Mar 2003 12:17:21 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8CA1243F3F for ; Wed, 5 Mar 2003 12:17:21 -0800 (PST) (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.6/8.12.6) with ESMTP id h25KHL0U090016 for ; Wed, 5 Mar 2003 12:17:21 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h25KHKWe090013 for perforce@freebsd.org; Wed, 5 Mar 2003 12:17:20 -0800 (PST) Date: Wed, 5 Mar 2003 12:17:20 -0800 (PST) Message-Id: <200303052017.h25KHKWe090013@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 Subject: PERFORCE change 26386 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=26386 Change 26386 by rwatson@rwatson_tislabs on 2003/03/05 12:17:00 Correct a bug in the handling of mac_check_vnode_setflags() werein an uninitialized value is passed to the MAC Framework. Restructure the code a bit to look like the checks for setowner, setmode by initializing the vattr structure regardless of success of the MAC check. This isn't the exact patch submitted, as a result. Submitted by: mike halderman Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#100 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#100 (text+ko) ==== @@ -1943,16 +1943,13 @@ return (error); VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); + VATTR_NULL(&vattr); + vattr.va_flags = flags; #ifdef MAC error = mac_check_vnode_setflags(td->td_ucred, vp, vattr.va_flags); - if (error == 0) { + if (error == 0) #endif - VATTR_NULL(&vattr); - vattr.va_flags = flags; error = VOP_SETATTR(vp, &vattr, td->td_ucred, td); -#ifdef MAC - } -#endif VOP_UNLOCK(vp, 0, td); vn_finished_write(mp); return (error); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 5 12:37:51 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 27F3837B406; Wed, 5 Mar 2003 12:37:49 -0800 (PST) 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 C920837B405 for ; Wed, 5 Mar 2003 12:37:48 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 028C043F3F for ; Wed, 5 Mar 2003 12:37:46 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h25Kbk0U091442 for ; Wed, 5 Mar 2003 12:37:46 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h25KbkQJ091439 for perforce@freebsd.org; Wed, 5 Mar 2003 12:37:46 -0800 (PST) Date: Wed, 5 Mar 2003 12:37:46 -0800 (PST) Message-Id: <200303052037.h25KbkQJ091439@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 26387 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=26387 Change 26387 by jhb@jhb_laptop on 2003/03/05 12:36:48 Revert previous optimizations since the armchair generals aren't happy with the semantics. Affected files ... .. //depot/projects/smpng/sys/sys/mutex.h#32 edit Differences ... ==== //depot/projects/smpng/sys/sys/mutex.h#32 (text+ko) ==== @@ -254,8 +254,6 @@ _mtx_lock_flags((m), (opts), LOCK_FILE, LOCK_LINE) #define mtx_unlock_flags(m, opts) \ _mtx_unlock_flags((m), (opts), LOCK_FILE, LOCK_LINE) -#define mtx_trylock_flags(m, opts) \ - _mtx_trylock((m), (opts), LOCK_FILE, LOCK_LINE) #define mtx_lock_spin_flags(m, opts) \ _mtx_lock_spin_flags((m), (opts), LOCK_FILE, LOCK_LINE) #define mtx_unlock_spin_flags(m, opts) \ @@ -265,8 +263,6 @@ _get_sleep_lock((m), curthread, (opts), LOCK_FILE, LOCK_LINE) #define mtx_unlock_flags(m, opts) \ _rel_sleep_lock((m), curthread, (opts), LOCK_FILE, LOCK_LINE) -#define mtx_trylock_flags(m, opts) \ - (_obtain_lock((m), curthread)) #ifndef SMPnotyet #define mtx_lock_spin_flags(m, opts) \ _get_spin_lock((m), curthread, (opts), LOCK_FILE, LOCK_LINE) @@ -278,6 +274,9 @@ #endif /* SMP */ #endif /* LOCK_DEBUG */ +#define mtx_trylock_flags(m, opts) \ + _mtx_trylock((m), (opts), LOCK_FILE, LOCK_LINE) + #define mtx_initialized(m) ((m)->mtx_object.lo_flags & LO_INITIALIZED) #define mtx_owned(m) (((m)->mtx_lock & MTX_FLAGMASK) == (uintptr_t)curthread) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 5 12:40:58 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5AD3337B405; Wed, 5 Mar 2003 12:40:53 -0800 (PST) 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 03C0137B401 for ; Wed, 5 Mar 2003 12:40:53 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D661343FCB for ; Wed, 5 Mar 2003 12:40:51 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h25Kep0U091912 for ; Wed, 5 Mar 2003 12:40:51 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h25Kepb6091906 for perforce@freebsd.org; Wed, 5 Mar 2003 12:40:51 -0800 (PST) Date: Wed, 5 Mar 2003 12:40:51 -0800 (PST) Message-Id: <200303052040.h25Kepb6091906@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 26389 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=26389 Change 26389 by jhb@jhb_laptop on 2003/03/05 12:40:27 Split itismychild() out into two separate functions and axe the silly static recursed variable. Also, handle one place where we ignored itismychild() failure and more cleanly handle the failure in witness_lock(). This is mostly a WIP in support of better handling witness's going away. Affected files ... .. //depot/projects/smpng/sys/kern/subr_witness.c#76 edit Differences ... ==== //depot/projects/smpng/sys/kern/subr_witness.c#76 (text+ko) ==== @@ -154,10 +154,12 @@ static struct witness *enroll(const char *description, struct lock_class *lock_class); +static int insertchild(struct witness *parent, struct witness *child); static int itismychild(struct witness *parent, struct witness *child); static void removechild(struct witness *parent, struct witness *child); static int isitmychild(struct witness *parent, struct witness *child); static int isitmydescendant(struct witness *parent, struct witness *child); +static int rebalancetree(void); #ifdef BLESSING static int blessed(struct witness *, struct witness *); #endif @@ -376,7 +378,8 @@ if (w1 == NULL) continue; w1->w_file = "order list"; - itismychild(w, w1); + if (!itismychild(w, w1)) + panic("Not enough memory for static orders!"); w = w1; } } @@ -785,15 +788,15 @@ * Giant if it is the wrong direction. The real lock order is that * sleepable locks come before Giant. */ - if (lock1->li_lock == &Giant.mtx_object && - (lock->lo_flags & LO_SLEEPABLE) != 0) - mtx_unlock_spin(&w_mtx); - else { + if (!(lock1->li_lock == &Giant.mtx_object && + (lock->lo_flags & LO_SLEEPABLE) != 0)) { CTR3(KTR_WITNESS, "%s: adding %s as a child of %s", __func__, lock->lo_type, lock1->li_lock->lo_type); if (!itismychild(lock1->li_lock->lo_witness, w)) - mtx_unlock_spin(&w_mtx); + /* Witness is dead. */ + return; } + mtx_unlock_spin(&w_mtx); out: #ifdef DDB @@ -1116,20 +1119,48 @@ return (w); } +/* + * Prune the whole tree. We look for cases where a lock is now + * both a descendant and a direct child of a given lock. In that + * case, we want to remove the direct child link from the tree. + * + * Returns false if insertchild() fails. + */ static int -itismychild(struct witness *parent, struct witness *child) +rebalancetree(void) +{ + struct witness *child, *parent; + struct witness_list *list; + + if (parent->w_class->lc_flags & LC_SLEEPLOCK) + list = &w_sleep; + else + list = &w_spin; + STAILQ_FOREACH(child, list, w_typelist) { + STAILQ_FOREACH(parent, list, w_typelist) { + if (!isitmychild(parent, child)) + continue; + removechild(parent, child); + if (isitmydescendant(parent, child)) + continue; + if (!insertchild(parent, child)) + return (0); + } + } + witness_levelall(); + return (1); +} + +/* + * Add "child" as a direct child of "parent". Returns false if + * we fail due to out of memory. + */ +static int +insertchild(struct witness *parent, struct witness *child) { - static int recursed; struct witness_child_list_entry **wcl; - struct witness_list *list; MPASS(child != NULL && parent != NULL); - if ((parent->w_class->lc_flags & (LC_SLEEPLOCK | LC_SPINLOCK)) != - (child->w_class->lc_flags & (LC_SLEEPLOCK | LC_SPINLOCK))) - panic( - "%s: parent (%s) and child (%s) are not the same lock type", - __func__, parent->w_class->lc_name, - child->w_class->lc_name); /* * Insert "child" after "parent" @@ -1140,35 +1171,29 @@ if (*wcl == NULL) { *wcl = witness_child_get(); if (*wcl == NULL) - return (1); + return (0); } (*wcl)->wcl_children[(*wcl)->wcl_count++] = child; - /* - * Now prune whole tree. We look for cases where a lock is now - * both a descendant and a direct child of a given lock. In that - * case, we want to remove the direct child link from the tree. - */ - if (recursed) + return (1); +} + +static int +itismychild(struct witness *parent, struct witness *child) +{ + + MPASS(child != NULL && parent != NULL); + if ((parent->w_class->lc_flags & (LC_SLEEPLOCK | LC_SPINLOCK)) != + (child->w_class->lc_flags & (LC_SLEEPLOCK | LC_SPINLOCK))) + panic( + "%s: parent (%s) and child (%s) are not the same lock type", + __func__, parent->w_class->lc_name, + child->w_class->lc_name); + + if (!insertchild(parent, child)) return (0); - recursed = 1; - if (parent->w_class->lc_flags & LC_SLEEPLOCK) - list = &w_sleep; - else - list = &w_spin; - STAILQ_FOREACH(child, list, w_typelist) { - STAILQ_FOREACH(parent, list, w_typelist) { - if (!isitmychild(parent, child)) - continue; - removechild(parent, child); - if (isitmydescendant(parent, child)) - continue; - itismychild(parent, child); - } - } - recursed = 0; - witness_levelall(); - return (0); + + return (rebalancetree()); } static void To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 5 12:42:57 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A06D137B406; Wed, 5 Mar 2003 12:42:55 -0800 (PST) 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 4CAE837B401 for ; Wed, 5 Mar 2003 12:42:55 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ED71943FB1 for ; Wed, 5 Mar 2003 12:42:54 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h25Kgs0U092015 for ; Wed, 5 Mar 2003 12:42:54 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h25Kgs3f092012 for perforce@freebsd.org; Wed, 5 Mar 2003 12:42:54 -0800 (PST) Date: Wed, 5 Mar 2003 12:42:54 -0800 (PST) Message-Id: <200303052042.h25Kgs3f092012@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 26390 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=26390 Change 26390 by jhb@jhb_laptop on 2003/03/05 12:42:02 Bail out of lock order checking for try lock operations after doing the check for recursion. This fixes a bug with witness and sx_try_slock() (I think) and will make witness properly handle forthcoming changes to mtx_trylock(). Affected files ... .. //depot/projects/smpng/sys/kern/subr_witness.c#77 edit Differences ... ==== //depot/projects/smpng/sys/kern/subr_witness.c#77 (text+ko) ==== @@ -583,14 +583,6 @@ lock_list = PCPU_PTR(spinlocks); /* - * Try locks do not block if they fail to acquire the lock, thus - * there is no danger of deadlocks or of switching while holding a - * spin lock if we acquire a lock via a try operation. - */ - if (flags & LOP_TRYLOCK) - goto out; - - /* * Is this the first lock acquired? If so, then no order checking * is needed. */ @@ -636,6 +628,14 @@ } /* + * Try locks do not block if they fail to acquire the lock, thus + * there is no danger of deadlocks or of switching while holding a + * spin lock if we acquire a lock via a try operation. + */ + if (flags & LOP_TRYLOCK) + goto out; + + /* * Check for duplicate locks of the same type. Note that we only * have to check for this on the last lock we just acquired. Any * other cases will be caught as lock order violations. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 5 12:46: 2 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 107D537B405; Wed, 5 Mar 2003 12:46:00 -0800 (PST) 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 9CD3037B401 for ; Wed, 5 Mar 2003 12:45:59 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4840243FB1 for ; Wed, 5 Mar 2003 12:45:59 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h25Kjx0U092198 for ; Wed, 5 Mar 2003 12:45:59 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h25KjwXO092195 for perforce@freebsd.org; Wed, 5 Mar 2003 12:45:58 -0800 (PST) Date: Wed, 5 Mar 2003 12:45:58 -0800 (PST) Message-Id: <200303052045.h25KjwXO092195@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 26391 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=26391 Change 26391 by jhb@jhb_laptop on 2003/03/05 12:45:02 Style. Affected files ... .. //depot/projects/smpng/sys/kern/subr_witness.c#78 edit Differences ... ==== //depot/projects/smpng/sys/kern/subr_witness.c#78 (text+ko) ==== @@ -177,7 +177,7 @@ struct lock_object *lock); static int witness_list(struct thread *td); static void witness_list_lock(struct lock_instance *instance); -#if defined(DDB) +#ifdef DDB static void witness_display_list(void(*prnt)(const char *fmt, ...), struct witness_list *list); static void witness_display(void(*)(const char *fmt, ...)); @@ -489,7 +489,7 @@ mtx_unlock(&all_mtx); } -#if defined(DDB) +#ifdef DDB static void witness_display_list(void(*prnt)(const char *fmt, ...), struct witness_list *list) @@ -547,7 +547,7 @@ prnt("%s\n", w->w_name); } } -#endif +#endif /* DDB */ void witness_lock(struct lock_object *lock, int flags, const char *file, int line) @@ -560,7 +560,7 @@ int i, j; #ifdef DDB int go_into_ddb = 0; -#endif /* DDB */ +#endif if (witness_cold || witness_dead || lock->lo_witness == NULL || panicstr != NULL) @@ -653,7 +653,7 @@ printf(" 2nd %s @ %s:%d\n", lock->lo_name, file, line); #ifdef DDB go_into_ddb = 1; -#endif /* DDB */ +#endif goto out; } MPASS(!mtx_owned(&w_mtx)); @@ -778,7 +778,7 @@ } #ifdef DDB go_into_ddb = 1; -#endif /* DDB */ +#endif goto out; } } @@ -806,7 +806,7 @@ if (witness_ddb) Debugger(__func__); } -#endif /* DDB */ +#endif w->w_file = file; w->w_line = line; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 5 12:50:42 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C34137B40E; Wed, 5 Mar 2003 12:50:09 -0800 (PST) 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 5364637B47A for ; Wed, 5 Mar 2003 12:50:07 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8D96F43F75 for ; Wed, 5 Mar 2003 12:50:05 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h25Ko50U097531 for ; Wed, 5 Mar 2003 12:50:05 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h25Ko4An097523 for perforce@freebsd.org; Wed, 5 Mar 2003 12:50:04 -0800 (PST) Date: Wed, 5 Mar 2003 12:50:04 -0800 (PST) Message-Id: <200303052050.h25Ko4An097523@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 26392 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=26392 Change 26392 by jhb@jhb_laptop on 2003/03/05 12:49:54 IFC @26388. Affected files ... .. //depot/projects/smpng/sys/boot/common/help.common#8 integrate .. //depot/projects/smpng/sys/boot/common/loader.8#21 integrate .. //depot/projects/smpng/sys/coda/coda_vnops.c#9 integrate .. //depot/projects/smpng/sys/coda/coda_vnops.h#6 integrate .. //depot/projects/smpng/sys/conf/NOTES#34 integrate .. //depot/projects/smpng/sys/conf/files#64 integrate .. //depot/projects/smpng/sys/conf/options#45 integrate .. //depot/projects/smpng/sys/conf/options.pc98#24 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_auth.c#10 integrate .. //depot/projects/smpng/sys/dev/dgb/dgb.c#12 integrate .. //depot/projects/smpng/sys/dev/en/midway.c#8 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci.c#10 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#24 integrate .. //depot/projects/smpng/sys/dev/hea/eni_receive.c#5 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_receive.c#6 integrate .. //depot/projects/smpng/sys/dev/iicbus/if_ic.c#7 integrate .. //depot/projects/smpng/sys/dev/nmdm/nmdm.c#13 integrate .. //depot/projects/smpng/sys/dev/ppbus/if_plip.c#6 integrate .. //depot/projects/smpng/sys/dev/ray/if_ray.c#6 integrate .. //depot/projects/smpng/sys/dev/rc/rc.c#6 integrate .. //depot/projects/smpng/sys/dev/si/si.c#10 integrate .. //depot/projects/smpng/sys/dev/sn/if_sn.c#7 integrate .. //depot/projects/smpng/sys/dev/sound/pci/via82c686.c#10 integrate .. //depot/projects/smpng/sys/dev/sound/pci/via82c686.h#4 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/feeder.c#7 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/feeder_fmt.c#6 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/feeder_rate.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/if_aue.c#19 integrate .. //depot/projects/smpng/sys/dev/usb/ohci.c#21 integrate .. //depot/projects/smpng/sys/dev/usb/usb_ethersubr.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/usb_ethersubr.h#3 integrate .. //depot/projects/smpng/sys/i386/isa/if_rdp.c#7 integrate .. //depot/projects/smpng/sys/i386/isa/istallion.c#8 integrate .. //depot/projects/smpng/sys/i386/isa/stallion.c#9 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_ipr.c#14 integrate .. //depot/projects/smpng/sys/ia64/include/setjmp.h#6 integrate .. //depot/projects/smpng/sys/kern/Make.tags.inc#4 integrate .. //depot/projects/smpng/sys/kern/Makefile#3 integrate .. //depot/projects/smpng/sys/kern/kern_clock.c#24 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#60 integrate .. //depot/projects/smpng/sys/kern/kern_poll.c#8 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#79 integrate .. //depot/projects/smpng/sys/kern/tty.c#31 integrate .. //depot/projects/smpng/sys/kern/tty_pty.c#20 integrate .. //depot/projects/smpng/sys/kern/vfs_cluster.c#17 integrate .. //depot/projects/smpng/sys/modules/if_gre/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/nmdm/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/rc/Makefile#2 integrate .. //depot/projects/smpng/sys/net/if_arcsubr.c#9 integrate .. //depot/projects/smpng/sys/net/if_atmsubr.c#6 integrate .. //depot/projects/smpng/sys/net/if_ef.c#10 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#27 integrate .. //depot/projects/smpng/sys/net/if_faith.c#13 integrate .. //depot/projects/smpng/sys/net/if_fddisubr.c#12 integrate .. //depot/projects/smpng/sys/net/if_gif.c#16 integrate .. //depot/projects/smpng/sys/net/if_gre.c#7 integrate .. //depot/projects/smpng/sys/net/if_iso88025subr.c#11 integrate .. //depot/projects/smpng/sys/net/if_loop.c#15 integrate .. //depot/projects/smpng/sys/net/if_ppp.c#19 integrate .. //depot/projects/smpng/sys/net/if_sl.c#17 integrate .. //depot/projects/smpng/sys/net/if_spppsubr.c#13 integrate .. //depot/projects/smpng/sys/net/if_stf.c#19 integrate .. //depot/projects/smpng/sys/net/if_tun.c#22 integrate .. //depot/projects/smpng/sys/net/intrq.c#3 delete .. //depot/projects/smpng/sys/net/intrq.h#4 delete .. //depot/projects/smpng/sys/net/netisr.c#2 integrate .. //depot/projects/smpng/sys/net/netisr.h#5 integrate .. //depot/projects/smpng/sys/net/route.h#10 integrate .. //depot/projects/smpng/sys/net/rtsock.c#25 integrate .. //depot/projects/smpng/sys/netatalk/aarp.c#5 integrate .. //depot/projects/smpng/sys/netatalk/at_extern.h#4 integrate .. //depot/projects/smpng/sys/netatalk/at_var.h#2 integrate .. //depot/projects/smpng/sys/netatalk/ddp_input.c#7 integrate .. //depot/projects/smpng/sys/netatalk/ddp_usrreq.c#13 integrate .. //depot/projects/smpng/sys/netatm/atm_device.c#7 integrate .. //depot/projects/smpng/sys/netatm/atm_subr.c#12 integrate .. //depot/projects/smpng/sys/netatm/atm_var.h#10 integrate .. //depot/projects/smpng/sys/netatm/ipatm/ipatm_input.c#4 integrate .. //depot/projects/smpng/sys/netgraph/ng_base.c#13 integrate .. //depot/projects/smpng/sys/netgraph/ng_gif_demux.c#4 integrate .. //depot/projects/smpng/sys/netgraph/ng_gif_demux.h#2 integrate .. //depot/projects/smpng/sys/netgraph/ng_iface.c#6 integrate .. //depot/projects/smpng/sys/netgraph/ng_iface.h#2 integrate .. //depot/projects/smpng/sys/netgraph/ng_ip_input.c#2 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#17 integrate .. //depot/projects/smpng/sys/netinet/if_ether.h#5 integrate .. //depot/projects/smpng/sys/netinet/in_proto.c#8 integrate .. //depot/projects/smpng/sys/netinet/in_var.h#6 integrate .. //depot/projects/smpng/sys/netinet/ip_gre.c#7 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#29 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.c#21 integrate .. //depot/projects/smpng/sys/netinet6/ah_input.c#8 integrate .. //depot/projects/smpng/sys/netinet6/esp_input.c#12 integrate .. //depot/projects/smpng/sys/netinet6/in6_var.h#5 integrate .. //depot/projects/smpng/sys/netinet6/ip6_input.c#21 integrate .. //depot/projects/smpng/sys/netinet6/ip6_var.h#6 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_input.c#3 integrate .. //depot/projects/smpng/sys/netipsec/xform_ipip.c#4 integrate .. //depot/projects/smpng/sys/netipx/ipx_if.h#3 integrate .. //depot/projects/smpng/sys/netipx/ipx_input.c#6 integrate .. //depot/projects/smpng/sys/netipx/ipx_ip.c#7 integrate .. //depot/projects/smpng/sys/netipx/ipx_var.h#4 integrate .. //depot/projects/smpng/sys/netnatm/natm.c#9 integrate .. //depot/projects/smpng/sys/netnatm/natm.h#3 integrate .. //depot/projects/smpng/sys/netnatm/natm_proto.c#7 integrate .. //depot/projects/smpng/sys/netns/idp.h#2 delete .. //depot/projects/smpng/sys/netns/idp_usrreq.c#7 delete .. //depot/projects/smpng/sys/netns/idp_var.h#2 delete .. //depot/projects/smpng/sys/netns/ns.c#5 delete .. //depot/projects/smpng/sys/netns/ns.h#5 delete .. //depot/projects/smpng/sys/netns/ns_cksum.c#2 delete .. //depot/projects/smpng/sys/netns/ns_error.c#3 delete .. //depot/projects/smpng/sys/netns/ns_error.h#2 delete .. //depot/projects/smpng/sys/netns/ns_if.h#4 delete .. //depot/projects/smpng/sys/netns/ns_input.c#6 delete .. //depot/projects/smpng/sys/netns/ns_ip.c#4 delete .. //depot/projects/smpng/sys/netns/ns_output.c#3 delete .. //depot/projects/smpng/sys/netns/ns_pcb.c#6 delete .. //depot/projects/smpng/sys/netns/ns_pcb.h#2 delete .. //depot/projects/smpng/sys/netns/ns_proto.c#2 delete .. //depot/projects/smpng/sys/netns/sp.h#2 delete .. //depot/projects/smpng/sys/netns/spidp.h#2 delete .. //depot/projects/smpng/sys/netns/spp_debug.c#2 delete .. //depot/projects/smpng/sys/netns/spp_debug.h#2 delete .. //depot/projects/smpng/sys/netns/spp_timer.h#2 delete .. //depot/projects/smpng/sys/netns/spp_usrreq.c#8 delete .. //depot/projects/smpng/sys/netns/spp_var.h#2 delete .. //depot/projects/smpng/sys/netsmb/netbios.h#4 integrate .. //depot/projects/smpng/sys/sys/socket.h#13 integrate .. //depot/projects/smpng/sys/sys/tty.h#9 integrate Differences ... ==== //depot/projects/smpng/sys/boot/common/help.common#8 (text+ko) ==== @@ -234,11 +234,15 @@ cannot be set below the default determined when the kernel was compiled. + set kern.ipc.nsfbufs= NSFBUFS + + Set the number of sendfile buffers to be allocated. This + overrides the value determined when the kernel was compiled. + set kern.vm.kmem.size= VM_KMEM_SIZE Sets the size of kernel memory (bytes). This overrides - completely the value determined when the kernel was - compiled. + the value determined when the kernel was compiled. set machdep.disable_mtrrs=1 ==== //depot/projects/smpng/sys/boot/common/loader.8#21 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.53 2003/03/03 22:53:35 ru Exp $ +.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.54 2003/03/04 23:46:29 seanc Exp $ .\" .\" Note: The date here should be updated whenever a non-trivial .\" change is made to the manual page. @@ -444,10 +444,13 @@ determined when the kernel was compiled. Modifies .Va NMBCLUSTERS . +.It Va kern.ipc.nsfbufs +Set the number of sendfile buffers to be allocated. +Modifies +.Va NSFBUFS . .It Va kern.vm.kmem.size Sets the size of kernel memory (bytes). -This overrides completely the value -determined when the kernel was compiled. +This overrides the value determined when the kernel was compiled. Modifies .Va VM_KMEM_SIZE . .It Va kern.maxswzone ==== //depot/projects/smpng/sys/coda/coda_vnops.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda_vnops.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD: src/sys/coda/coda_vnops.c,v 1.44 2002/09/25 02:33:29 jeff Exp $ + * $FreeBSD: src/sys/coda/coda_vnops.c,v 1.46 2003/03/05 10:23:51 tjr Exp $ * */ @@ -59,6 +59,7 @@ #include #include #include +#include #include #include @@ -138,7 +139,7 @@ { &vop_strategy_desc, coda_strategy }, /* strategy */ { &vop_print_desc, coda_vop_error }, /* print */ { &vop_islocked_desc, coda_islocked }, /* islocked */ - { &vop_pathconf_desc, coda_vop_error }, /* pathconf */ + { &vop_pathconf_desc, coda_pathconf }, /* pathconf */ { &vop_advlock_desc, coda_vop_nop }, /* advlock */ { &vop_lease_desc, coda_vop_nop }, /* lease */ { &vop_poll_desc, (vop_t *) vop_stdpoll }, @@ -798,7 +799,8 @@ return(error); } - error = venus_readlink(vtomi(vp), &cp->c_fid, cred, td->td_proc, &str, &len); + error = venus_readlink(vtomi(vp), &cp->c_fid, cred, + td != NULL ? td->td_proc : NULL, &str, &len); if (!error) { uiop->uio_rw = UIO_READ; @@ -1976,3 +1978,30 @@ return cp; } + +int +coda_pathconf(v) + void *v; +{ + struct vop_pathconf_args *ap; + int error; + int *retval; + + ap = v; + retval = ap->a_retval; + error = 0; + + switch (ap->a_name) { + case _PC_NAME_MAX: + *retval = CODA_MAXNAMLEN; + break; + case _PC_PATH_MAX: + *retval = CODA_MAXPATHLEN; + break; + default: + error = vop_stdpathconf(ap); + break; + } + + return (error); +} ==== //depot/projects/smpng/sys/coda/coda_vnops.h#6 (text+ko) ==== @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda_vnops.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD: src/sys/coda/coda_vnops.h,v 1.11 2002/05/16 21:25:34 trhodes Exp $ + * $FreeBSD: src/sys/coda/coda_vnops.h,v 1.12 2003/03/05 13:48:51 tjr Exp $ * */ @@ -78,6 +78,7 @@ int coda_vop_error(void *); int coda_vop_nop(void *); int coda_fbsd_getpages (void *); +int coda_pathconf(void *); int coda_rdwr(struct vnode *vp, struct uio *uiop, enum uio_rw rw, int ioflag, struct ucred *cred, struct thread *td); ==== //depot/projects/smpng/sys/conf/NOTES#34 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1132 2003/03/02 23:01:41 rwatson Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1134 2003/03/05 19:24:20 peter Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -356,8 +356,6 @@ # # Protocol families: # Only the INET (Internet) family is officially supported in FreeBSD. -# Source code for the NS (Xerox Network Service) is provided for amusement -# value. # options INET #Internet communications protocols options INET6 #IPv6 communications protocols @@ -387,10 +385,6 @@ options NETATALK #Appletalk communications protocols options NETATALKDEBUG #Appletalk debugging -# These are currently broken but are shipped due to interest. -#options NS #Xerox NS protocols -#options NSIP #XNS over IP - # # SMB/CIFS requester # NETSMB enables support for SMB protocol, it requires LIBMCHAIN and LIBICONV @@ -1038,6 +1032,9 @@ # Size of the kernel message buffer. Should be N * pagesize. options MSGBUF_SIZE=40960 +# Maximum size of a tty or pty input buffer. +options TTYHOG=8193 + ##################################################################### # HARDWARE DEVICE CONFIGURATION ==== //depot/projects/smpng/sys/conf/files#64 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.764 2003/03/02 23:01:42 rwatson Exp $ +# $FreeBSD: src/sys/conf/files,v 1.766 2003/03/05 19:24:20 peter Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1172,7 +1172,6 @@ net/if_tun.c optional tun net/if_tap.c optional tap net/if_vlan.c optional vlan -net/intrq.c standard net/net_osdep.c standard net/netisr.c standard net/ppp_deflate.c optional ppp_deflate @@ -1422,16 +1421,6 @@ netncp/ncp_rq.c optional ncp netncp/ncp_sock.c optional ncp netncp/ncp_subr.c optional ncp -netns/idp_usrreq.c optional ns -netns/ns.c optional ns -netns/ns_error.c optional ns -netns/ns_input.c optional ns -netns/ns_ip.c optional ns -netns/ns_output.c optional ns -netns/ns_pcb.c optional ns -netns/ns_proto.c optional ns -netns/spp_debug.c optional ns -netns/spp_usrreq.c optional ns netsmb/smb_conn.c optional netsmb netsmb/smb_crypt.c optional netsmb netsmb/smb_dev.c optional netsmb ==== //depot/projects/smpng/sys/conf/options#45 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.376 2003/03/02 23:01:42 rwatson Exp $ +# $FreeBSD: src/sys/conf/options,v 1.378 2003/03/05 19:24:20 peter Exp $ # # On the handling of kernel options # @@ -141,6 +141,7 @@ VFS_AIO WLCACHE opt_wavelan.h WLDEBUG opt_wavelan.h +TTYHOG opt_tty.h # POSIX kernel options _KPOSIX_PRIORITY_SCHEDULING opt_posix.h @@ -352,7 +353,6 @@ LIBMCHAIN NCP opt_ncp.h NETATALK opt_atalk.h -NS opt_ns.h PPP_BSDCOMP opt_ppp.h PPP_DEFLATE opt_ppp.h PPP_FILTER opt_ppp.h ==== //depot/projects/smpng/sys/conf/options.pc98#24 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.pc98,v 1.158 2003/01/18 08:29:10 nyan Exp $ +# $FreeBSD: src/sys/conf/options.pc98,v 1.159 2003/03/05 18:12:48 jhb Exp $ # Options specific to the pc98 platform kernels MATH_EMULATE opt_math_emulate.h @@ -29,6 +29,7 @@ PECOFF_DEBUG opt_pecoff.h # i386 SMP options APIC_IO opt_global.h +HTT # Change KVM size. Changes things all over the kernel. KVA_PAGES opt_global.h ==== //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_auth.c#10 (text+ko) ==== @@ -105,7 +105,7 @@ #if !defined(lint) /* static const char rcsid[] = "@(#)$Id: ip_auth.c,v 2.11.2.12 2001/07/18 14:57:08 darrenr Exp $"; */ -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.32 2003/02/15 06:25:25 darrenr Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.33 2003/03/04 23:19:55 jlemon Exp $"; #endif @@ -442,10 +442,8 @@ # if SOLARIS error = (fr_qin(fra->fra_q, m) == 0) ? EINVAL : 0; # else /* SOLARIS */ - if (! IF_HANDOFF(&ipintrq, m, NULL)) + if (! netisr_queue(NETISR_IP, m)) error = ENOBUFS; - else - schednetisr(NETISR_IP); # endif /* SOLARIS */ if (error) fr_authstats.fas_quefail++; ==== //depot/projects/smpng/sys/dev/dgb/dgb.c#12 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * dgb.c $FreeBSD: src/sys/dev/dgb/dgb.c,v 1.75 2003/03/03 16:24:43 phk Exp $ + * dgb.c $FreeBSD: src/sys/dev/dgb/dgb.c,v 1.76 2003/03/05 08:16:28 das Exp $ * * Digiboard driver. * @@ -58,6 +58,7 @@ #include "opt_compat.h" #include "opt_dgb.h" +#include "opt_tty.h" #include "dgb.h" ==== //depot/projects/smpng/sys/dev/en/midway.c#8 (text+ko) ==== @@ -32,7 +32,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/en/midway.c,v 1.34 2003/02/19 05:47:04 imp Exp $ + * $FreeBSD: src/sys/dev/en/midway.c,v 1.35 2003/03/04 23:19:54 jlemon Exp $ */ /* @@ -3314,7 +3314,9 @@ printf(" %d cells trashed due almost full buffer\n", sc->ttrash); printf(" %d rx mbuf allocation failures\n", sc->rxmbufout); #ifdef NATM +#if 0 printf(" %d drops at natmintrq\n", natmintrq.ifq_drops); +#endif #ifdef NATM_STAT printf(" natmintr so_rcv: ok/drop cnt: %d/%d, ok/drop bytes: %d/%d\n", natm_sookcnt, natm_sodropcnt, natm_sookbytes, natm_sodropbytes); ==== //depot/projects/smpng/sys/dev/firewire/fwohci.c#10 (text+ko) ==== @@ -30,7 +30,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/fwohci.c,v 1.42 2003/03/03 04:10:56 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/fwohci.c,v 1.43 2003/03/05 01:50:57 simokawa Exp $ * */ @@ -1585,7 +1585,6 @@ dbch = &sc->ir[dmach]; ir = &dbch->xferq; - ldesc = dbch->ndesc - 1; if ((ir->flag & FWXFERQ_RUNNING) == 0) { tag = (ir->flag >> 6) & 3; @@ -1609,8 +1608,6 @@ if(err) return err; - s = splfw(); - first = STAILQ_FIRST(&ir->stfree); if (first == NULL) { device_printf(fc->dev, "IR DMA no free chunk\n"); @@ -1618,6 +1615,8 @@ return 0; } + ldesc = dbch->ndesc - 1; + s = splfw(); prev = STAILQ_LAST(&ir->stdma, fw_bulkxfer, link); while ((chunk = STAILQ_FIRST(&ir->stfree)) != NULL) { volatile struct fwohcidb *db; ==== //depot/projects/smpng/sys/dev/fxp/if_fxp.c#24 (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/fxp/if_fxp.c,v 1.149 2003/02/27 19:41:55 wpaul Exp $ + * $FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.150 2003/03/05 19:24:21 peter Exp $ */ /* @@ -45,11 +45,6 @@ #include #include -#ifdef NS -#include -#include -#endif - #include #include #include ==== //depot/projects/smpng/sys/dev/hea/eni_receive.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $FreeBSD: src/sys/dev/hea/eni_receive.c,v 1.13 2002/11/06 22:58:55 jhb Exp $ + * @(#) $FreeBSD: src/sys/dev/hea/eni_receive.c,v 1.14 2003/03/04 23:19:54 jlemon Exp $ * */ @@ -61,7 +61,7 @@ #include #ifndef lint -__RCSID("@(#) $FreeBSD: src/sys/dev/hea/eni_receive.c,v 1.13 2002/11/06 22:58:55 jhb Exp $"); +__RCSID("@(#) $FreeBSD: src/sys/dev/hea/eni_receive.c,v 1.14 2003/03/04 23:19:54 jlemon Exp $"); #endif static void eni_recv_stack(void *, KBuffer *); @@ -680,7 +680,6 @@ u_long DMA_Rdptr; u_long dma_wrp; u_long start, stop; - int que = 0; int s; s = splimp(); @@ -802,9 +801,7 @@ /* * Schedule callback */ - if (IF_HANDOFF(&atm_intrq, m, NULL)) { - que++; - } else { + if (! netisr_queue(NETISR_ATM, m)) { eup->eu_stats.eni_st_drv.drv_rv_intrq++; eup->eu_pif.pif_ierrors++; #ifdef DO_LOG @@ -827,13 +824,6 @@ } finish: (void) splx(s); - - /* - * If we found any completed buffers, schedule a call into - * the kernel to process the atm_intrq. - */ - if ( que ) - schednetisr(NETISR_ATM); return; } ==== //depot/projects/smpng/sys/dev/hfa/fore_receive.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $FreeBSD: src/sys/dev/hfa/fore_receive.c,v 1.17 2002/11/06 22:58:55 jhb Exp $ + * @(#) $FreeBSD: src/sys/dev/hfa/fore_receive.c,v 1.18 2003/03/04 23:19:54 jlemon Exp $ * */ @@ -64,7 +64,7 @@ #include #ifndef lint -__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_receive.c,v 1.17 2002/11/06 22:58:55 jhb Exp $"); +__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_receive.c,v 1.18 2003/03/04 23:19:54 jlemon Exp $"); #endif @@ -479,9 +479,7 @@ /* * Schedule callback */ - if (IF_HANDOFF(&atm_intrq, mhead, NULL)) { - schednetisr(NETISR_ATM); - } else { + if (! netisr_queue(NETISR_ATM, mhead)) { fup->fu_stats->st_drv.drv_rv_ifull++; goto free_ent; } ==== //depot/projects/smpng/sys/dev/iicbus/if_ic.c#7 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/iicbus/if_ic.c,v 1.16 2003/02/19 05:47:06 imp Exp $ + * $FreeBSD: src/sys/dev/iicbus/if_ic.c,v 1.17 2003/03/04 23:19:54 jlemon Exp $ */ /* @@ -314,10 +314,8 @@ top = m_devget(sc->ic_ifbuf + ICHDRLEN, len, 0, &sc->ic_if, 0); - if (top) { - if (IF_HANDOFF(&ipintrq, top, NULL)) - schednetisr(NETISR_IP); - } + if (top) + netisr_dispatch(NETISR_IP, top); break; err: ==== //depot/projects/smpng/sys/dev/nmdm/nmdm.c#13 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/nmdm/nmdm.c,v 1.13 2003/03/03 12:15:44 phk Exp $ + * $FreeBSD: src/sys/dev/nmdm/nmdm.c,v 1.14 2003/03/05 08:16:28 das Exp $ */ /* @@ -39,6 +39,8 @@ */ #include "opt_compat.h" +#include "opt_tty.h" + #include #include #if defined(COMPAT_43) || defined(COMPAT_SUNOS) ==== //depot/projects/smpng/sys/dev/ppbus/if_plip.c#6 (text+ko) ==== @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * From Id: lpt.c,v 1.55.2.1 1996/11/12 09:08:38 phk Exp - * $FreeBSD: src/sys/dev/ppbus/if_plip.c,v 1.27 2003/02/19 05:47:09 imp Exp $ + * $FreeBSD: src/sys/dev/ppbus/if_plip.c,v 1.28 2003/03/04 23:19:54 jlemon Exp $ */ /* @@ -520,11 +520,7 @@ if (top) { if (sc->sc_if.if_bpf) lptap(&sc->sc_if, top); - if (! IF_HANDOFF(&ipintrq, top, NULL)) { - lprintf("DROP"); - } else { - schednetisr(NETISR_IP); - } + netisr_queue(NETISR_IP, top); } goto done; } @@ -569,11 +565,7 @@ if (top) { if (sc->sc_if.if_bpf) lptap(&sc->sc_if, top); - if (! IF_HANDOFF(&ipintrq, top, NULL)) { - lprintf("DROP"); - } else { - schednetisr(NETISR_IP); - } + netisr_queue(NETISR_IP, top); } } goto done; ==== //depot/projects/smpng/sys/dev/ray/if_ray.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ray/if_ray.c,v 1.61 2003/02/19 05:47:10 imp Exp $ + * $FreeBSD: src/sys/dev/ray/if_ray.c,v 1.62 2003/03/05 18:13:19 dmlb Exp $ * */ @@ -476,7 +476,6 @@ * * Do not update these in ray_init_download's parameter setup * - * XXX see the ray_init_download section for stuff to move */ RAY_MAP_CM(sc); bzero(&sc->sc_d, sizeof(struct ray_nw_param)); @@ -836,7 +835,6 @@ * All of the variables in these sets can be updated by the * card or ioctls. * - * XXX see the ray_attach section for stuff to move */ sc->sc_d.np_upd_param = 0; bzero(sc->sc_d.np_bss_id, ETHER_ADDR_LEN); @@ -1174,7 +1172,7 @@ RAY_COM_CHKRUNNING(sc, com, ifp); /* - * XXX Don't do anything if we are not in a managed network + * Don't do anything if we are not in a managed network * * XXX V4 adhoc does not need this, V5 adhoc unknown */ @@ -2614,12 +2612,12 @@ case RAY_ECMD_REJOIN_DONE: RAY_DPRINTF(sc, RAY_DBG_RX, "REJOIN_DONE"); - sc->sc_c.np_havenet = 1; /* XXX Should not be here but in function */ + sc->sc_c.np_havenet = 1; break; case RAY_ECMD_ROAM_START: RAY_DPRINTF(sc, RAY_DBG_RX, "ROAM_START"); - sc->sc_c.np_havenet = 0; /* XXX Should not be here but in function */ + sc->sc_c.np_havenet = 0; break; case RAY_ECMD_JAPAN_CALL_SIGNAL: @@ -3068,11 +3066,11 @@ /* * Runq entry to update a parameter * - * The card and driver are happy for parameters to be updated - * whenever the card is plugged in - * - * XXX the above is a little bit of a lie until _download is sorted out and we - * XXX keep local copies of things + * The card and driver are basically happy for parameters to be updated + * whenever the card is plugged in. However, there may be a couple of + * network hangs whilst the update is performed. Reading parameters back + * straight away may give the wrong answer and some parameters cannot be + * read at all. Local copies should be kept. */ static void ray_upparams(struct ray_softc *sc, struct ray_comq_entry *com) ==== //depot/projects/smpng/sys/dev/rc/rc.c#6 (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/rc/rc.c,v 1.79 2003/03/03 16:24:43 phk Exp $ + * $FreeBSD: src/sys/dev/rc/rc.c,v 1.80 2003/03/05 08:16:28 das Exp $ */ /* @@ -35,6 +35,8 @@ /*#define RCDEBUG*/ +#include "opt_tty.h" + #include #include #include ==== //depot/projects/smpng/sys/dev/si/si.c#10 (text+ko) ==== @@ -30,7 +30,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN * NO EVENT SHALL THE AUTHORS BE LIABLE. * - * $FreeBSD: src/sys/dev/si/si.c,v 1.116 2003/03/03 16:24:44 phk Exp $ + * $FreeBSD: src/sys/dev/si/si.c,v 1.117 2003/03/05 08:16:29 das Exp $ */ #ifndef lint @@ -41,6 +41,7 @@ #include "opt_compat.h" #include "opt_debug_si.h" +#include "opt_tty.h" #include #include ==== //depot/projects/smpng/sys/dev/sn/if_sn.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sn/if_sn.c,v 1.24 2003/02/19 05:47:11 imp Exp $ + * $FreeBSD: src/sys/dev/sn/if_sn.c,v 1.25 2003/03/05 19:24:21 peter Exp $ */ /* @@ -108,11 +108,6 @@ #include #endif -#ifdef NS -#include -#include -#endif - #include #include ==== //depot/projects/smpng/sys/dev/sound/pci/via82c686.c#10 (text+ko) ==== @@ -33,7 +33,7 @@ #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/via82c686.c,v 1.21 2003/02/21 01:47:59 orion Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/via82c686.c,v 1.22 2003/03/05 05:56:18 orion Exp $"); #define VIA_PCI_ID 0x30581106 #define NSEGS 4 /* Number of segments in SGD table */ @@ -475,8 +475,20 @@ pci_write_config(dev, PCIR_COMMAND, data, 2); data = pci_read_config(dev, PCIR_COMMAND, 2); - pci_write_config(dev, VIA_PCICONF_MISC, - VIA_PCICONF_ACLINKENAB | VIA_PCICONF_ACSGD | VIA_PCICONF_ACNOTRST | VIA_PCICONF_ACVSR, 1); + /* Wake up and reset AC97 if necessary */ + if (!(pci_read_config(dev, VIA_AC97STATUS, 1) & VIA_AC97STATUS_RDY)) { + pci_write_config(dev, VIA_ACLINKCTRL, VIA_ACLINK_EN | VIA_ACLINK_NRST | VIA_ACLINK_SYNC, 1); + DELAY(1000); + pci_write_config(dev, VIA_ACLINKCTRL, 0, 1); + DELAY(1000); + pci_write_config(dev, VIA_ACLINKCTRL, VIA_ACLINK_DESIRED, 1); + DELAY(1000); + } + + if (pci_read_config(dev, VIA_ACLINKCTRL, 1) != VIA_ACLINK_DESIRED) { + pci_write_config(dev, VIA_ACLINKCTRL, VIA_ACLINK_DESIRED, 1); + DELAY(1000); + } via->regid = PCIR_MAPS; via->reg = bus_alloc_resource(dev, SYS_RES_IOPORT, &via->regid, 0, ~0, 1, RF_ACTIVE); @@ -503,7 +515,8 @@ if (!via->codec) goto bad; - mixer_init(dev, ac97_getmixerclass(), via->codec); + if (mixer_init(dev, ac97_getmixerclass(), via->codec)) + goto bad; via->codec_caps = ac97_getextcaps(via->codec); ac97_setextmode(via->codec, ==== //depot/projects/smpng/sys/dev/sound/pci/via82c686.h#4 (text+ko) ==== @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sound/pci/via82c686.h,v 1.4 2002/08/17 16:13:29 orion Exp $ + * $FreeBSD: src/sys/dev/sound/pci/via82c686.h,v 1.5 2003/03/05 05:56:18 orion Exp $ */ #ifndef _VIA_H @@ -49,14 +49,17 @@ * ftp://ftp.alsa-project.org/pub/manuals/ad/AD1881_0.pdf (example AC'97 codec) */ -#define VIA_PCICONF_MISC 0x41 -#define VIA_PCICONF_ACLINKENAB 0x80 /* ac link enab */ -#define VIA_PCICONF_ACNOTRST 0x40 /* ~(ac reset) */ -#define VIA_PCICONF_ACSYNC 0x20 /* ac sync */ -#define VIA_PCICONF_ACVSR 0x08 /* var. samp. rate */ -#define VIA_PCICONF_ACSGD 0x04 /* SGD enab */ -#define VIA_PCICONF_ACFM 0x02 /* FM enab */ -#define VIA_PCICONF_ACSB 0x01 /* SB enab */ +#define VIA_AC97STATUS 0x40 +#define VIA_AC97STATUS_RDY 0x01 +#define VIA_ACLINKCTRL 0x41 +#define VIA_ACLINK_EN 0x80 /* ac link enab */ +#define VIA_ACLINK_NRST 0x40 /* ~(ac reset) */ +#define VIA_ACLINK_SYNC 0x20 /* ac sync */ +#define VIA_ACLINK_VSR 0x08 /* var. samp. rate */ +#define VIA_ACLINK_SGD 0x04 /* SGD enab */ +#define VIA_ACLINK_FM 0x02 /* FM enab */ +#define VIA_ACLINK_SB 0x01 /* SB enab */ +#define VIA_ACLINK_DESIRED (VIA_ACLINK_EN|VIA_ACLINK_NRST|VIA_ACLINK_VSR|VIA_ACLINK_SGD) #define VIA_PCICONF_FUNC_EN 0x42 #define VIA_PLAY_STAT 0x00 @@ -84,13 +87,4 @@ #define VIA_CODEC_PRIVALID 0x02000000 #define VIA_CODEC_INDEX(x) ((x)<<16) -#define AC97_REG_EXT_AUDIO_ID 0x28 -#define AC97_CODEC_DOES_VRA 0x0001 -#define AC97_CODEC_DOES_MICVRA 0x0008 -#define AC97_REG_EXT_AUDIO_STAT 0x2A -#define AC97_ENAB_VRA 0x0001 -#define AC97_ENAB_MICVRA 0x0008 -#define AC97_REG_EXT_DAC_RATE 0x2C -#define AC97_REG_EXT_ADC_RATE 0x32 - #endif /* _VIA_H */ ==== //depot/projects/smpng/sys/dev/sound/pcm/feeder.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ #include "feeder_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/feeder.c,v 1.28 2003/02/23 20:49:45 green Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/feeder.c,v 1.29 2003/03/05 14:48:28 orion Exp $"); MALLOC_DEFINE(M_FEEDER, "feeder", "pcm feeder"); @@ -59,7 +59,7 @@ KASSERT(fc->desc == NULL, ("first feeder not root: %s", fc->name)); SLIST_INIT(&feedertab); - fte = malloc(sizeof(*fte), M_FEEDER, M_WAITOK | M_ZERO); + fte = malloc(sizeof(*fte), M_FEEDER, M_NOWAIT | M_ZERO); if (fte == NULL) { printf("can't allocate memory for root feeder: %s\n", fc->name); @@ -84,7 +84,7 @@ i = 0; while ((feedercnt < MAXFEEDERS) && (fc->desc[i].type > 0)) { /* printf("adding feeder %s, %x -> %x\n", fc->name, fc->desc[i].in, fc->desc[i].out); */ - fte = malloc(sizeof(*fte), M_FEEDER, M_WAITOK | M_ZERO); + fte = malloc(sizeof(*fte), M_FEEDER, M_NOWAIT | M_ZERO); if (fte == NULL) { printf("can't allocate memory for feeder '%s', %x -> %x\n", fc->name, fc->desc[i].in, fc->desc[i].out); @@ -137,7 +137,7 @@ struct pcm_feeder *f; int err; - f = (struct pcm_feeder *)kobj_create((kobj_class_t)fc, M_FEEDER, M_WAITOK | M_ZERO); + f = (struct pcm_feeder *)kobj_create((kobj_class_t)fc, M_FEEDER, M_NOWAIT | M_ZERO); if (f == NULL) return NULL; ==== //depot/projects/smpng/sys/dev/sound/pcm/feeder_fmt.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ #include "feeder_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/feeder_fmt.c,v 1.9 2003/02/23 20:49:45 green Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/feeder_fmt.c,v 1.10 2003/03/05 14:48:28 orion Exp $"); MALLOC_DEFINE(M_FMTFEEDER, "fmtfeed", "pcm format feeder"); @@ -209,7 +209,7 @@ static int feed_16to8_init(struct pcm_feeder *f) { - f->data = malloc(FEEDBUFSZ, M_FMTFEEDER, M_WAITOK | M_ZERO); + f->data = malloc(FEEDBUFSZ, M_FMTFEEDER, M_NOWAIT | M_ZERO); return 0; } @@ -318,7 +318,7 @@ static int feed_stereotomono8_init(struct pcm_feeder *f) { - f->data = malloc(FEEDBUFSZ, M_FMTFEEDER, M_WAITOK | M_ZERO); + f->data = malloc(FEEDBUFSZ, M_FMTFEEDER, M_NOWAIT | M_ZERO); return 0; } @@ -363,7 +363,7 @@ static int feed_stereotomono16_init(struct pcm_feeder *f) { - f->data = malloc(FEEDBUFSZ, M_FMTFEEDER, M_WAITOK | M_ZERO); + f->data = malloc(FEEDBUFSZ, M_FMTFEEDER, M_NOWAIT | M_ZERO); return 0; } ==== //depot/projects/smpng/sys/dev/sound/pcm/feeder_rate.c#5 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 5 12:55:15 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0424337B405; Wed, 5 Mar 2003 12:55:13 -0800 (PST) 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 A6E6C37B401 for ; Wed, 5 Mar 2003 12:55:12 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5396943FBF for ; Wed, 5 Mar 2003 12:55:12 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h25KtC0U098171 for ; Wed, 5 Mar 2003 12:55:12 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h25KtB2Y098168 for perforce@freebsd.org; Wed, 5 Mar 2003 12:55:11 -0800 (PST) Date: Wed, 5 Mar 2003 12:55:11 -0800 (PST) Message-Id: <200303052055.h25KtB2Y098168@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 26393 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=26393 Change 26393 by jhb@jhb_laptop on 2003/03/05 12:54:38 Teach mtx_trylock() to recurse. No hope of inlining this thing in the future now. Too much of a pig. Affected files ... .. //depot/projects/smpng/sys/kern/kern_mutex.c#61 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_mutex.c#61 (text+ko) ==== @@ -454,10 +454,8 @@ /* * The important part of mtx_trylock{,_flags}() - * Tries to acquire lock `m.' We do NOT handle recursion here. If this - * function is called on a recursed mutex, it will return failure and - * will not recursively acquire the lock. You are expected to know what - * you are doing. + * Tries to acquire lock `m.' If this function is called on a mutex that + * is already owned, it will recursively acquire the lock. */ int _mtx_trylock(struct mtx *m, int opts, const char *file, int line) @@ -466,7 +464,12 @@ MPASS(curthread != NULL); - rval = _obtain_lock(m, curthread); + if (mtx_owned(m)) { + m->mtx_recurse++; + atomic_set_ptr(&m->mtx_lock, MTX_RECURSED); + rval = 1; + } else + rval = _obtain_lock(m, curthread); LOCK_LOG_TRY("LOCK", &m->mtx_object, opts, rval, file, line); if (rval) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 5 14:15:58 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2585237B405; Wed, 5 Mar 2003 14:15:52 -0800 (PST) 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 AAE5437B401 for ; Wed, 5 Mar 2003 14:15:51 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3934543F75 for ; Wed, 5 Mar 2003 14:15:51 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h25MFp0U004421 for ; Wed, 5 Mar 2003 14:15:51 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h25MFoYh004418 for perforce@freebsd.org; Wed, 5 Mar 2003 14:15:50 -0800 (PST) Date: Wed, 5 Mar 2003 14:15:50 -0800 (PST) Message-Id: <200303052215.h25MFoYh004418@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 26396 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=26396 Change 26396 by jhb@jhb_laptop on 2003/03/05 14:15:49 - Sort more of the static function prototypes into alphabetical order and add some new ones. - Make the stuff to print out the name of dead witnesses conditional on #if 1 for now to make it easier to remove later. - Add a depart() function to remove a dead witness from the lock order hierarchy and free it and call depart() from witness_destroy() when the refcount hits zero. - Change rebalancetree() to take the type list pointer as an argument so that it will actually compile. - Add a reparentchildren() function to take all the children of one witness and add them as direct children of another witness. We use this in depart() to reparent all the children of a dead witness to each of its parents. Affected files ... .. //depot/projects/smpng/sys/kern/subr_witness.c#80 edit Differences ... ==== //depot/projects/smpng/sys/kern/subr_witness.c#80 (text+ko) ==== @@ -152,17 +152,20 @@ struct lock_class *w_class; }; +#ifdef BLESSING +static int blessed(struct witness *, struct witness *); +#endif +static int depart(struct witness *w); static struct witness *enroll(const char *description, struct lock_class *lock_class); static int insertchild(struct witness *parent, struct witness *child); +static int isitmychild(struct witness *parent, struct witness *child); +static int isitmydescendant(struct witness *parent, struct witness *child); static int itismychild(struct witness *parent, struct witness *child); +static int rebalancetree(struct witness_list *list); static void removechild(struct witness *parent, struct witness *child); -static int isitmychild(struct witness *parent, struct witness *child); -static int isitmydescendant(struct witness *parent, struct witness *child); -static int rebalancetree(void); -#ifdef BLESSING -static int blessed(struct witness *, struct witness *); -#endif +static int reparentchildren(struct witness *newparent, + struct witness *oldparent); static void witness_displaydescendants(void(*)(const char *fmt, ...), struct witness *); static void witness_leveldescendents(struct witness *parent, int level); @@ -442,7 +445,9 @@ witness_destroy(struct lock_object *lock) { struct witness *w; - int print; +#if 1 + const char *name = NULL; +#endif if (witness_cold) panic("lock (%s) %s destroyed while witness_cold", @@ -457,29 +462,20 @@ mtx_lock_spin(&w_mtx); MPASS(w->w_refcount > 0); w->w_refcount--; - print = 0; - if (w->w_refcount == 0) { - /* - * If no locks for this witness were ever acquired, - * then return the witness to the free list. - */ - if (w->w_file == NULL) { - if (w->w_class->lc_flags & LC_SLEEPLOCK) - STAILQ_REMOVE(&w_sleep, w, witness, - w_typelist); - else - STAILQ_REMOVE(&w_spin, w, witness, - w_typelist); - STAILQ_REMOVE(&w_all, w, witness, w_list); - witness_free(w); - } else if (w->w_dead_squawked == 0) { - w->w_dead_squawked = 1; - print = 1; - } - } - mtx_unlock_spin(&w_mtx); - if (print) +#if 1 + if (w->w_refcount == 0) + name = w->w_name; +#endif + /* + * Lock is already released if we have an allocation failure + * and depart() fails. + */ + if (w->w_refcount != 0 || depart(w)) + mtx_unlock_spin(&w_mtx); +#if 1 + if (name != NULL) printf("dead witness: %s\n", w->w_name); +#endif } mtx_lock(&all_mtx); @@ -1119,23 +1115,66 @@ return (w); } +/* Don't let the door bang you on the way out... */ +static int +depart(struct witness *w) +{ + struct witness_child_list_entry *wcl, *nwcl; + struct witness_list *list; + struct witness *parent; + + MPASS(w->w_refcount == 0); + if (w->w_class->lc_flags & LC_SLEEPLOCK) + list = &w_sleep; + else + list = &w_spin; + /* + * First, we run through the entire tree looking for any + * witnesses that the outgoing witness is a child of. For + * each parent that we find, we reparent all the direct + * children of the outgoing witness to its parent. + */ + STAILQ_FOREACH(parent, list, w_typelist) { + if (!isitmychild(parent, w)) + continue; + removechild(parent, w); + if (!reparentchildren(parent, w)) + return (0); + } + + /* + * Now we go through and free up the child list of the + * outgoing witness. + */ + for (wcl = w->w_children; wcl != NULL; wcl = nwcl) { + nwcl = wcl->wcl_next; + witness_child_free(wcl); + } + + /* + * Detach from various lists and free. + */ + STAILQ_REMOVE(list, w, witness, w_typelist); + STAILQ_REMOVE(&w_all, w, witness, w_list); + witness_free(w); + + /* Finally, fixup the tree. */ + return (rebalancetree(list)); +} + + /* - * Prune the whole tree. We look for cases where a lock is now - * both a descendant and a direct child of a given lock. In that - * case, we want to remove the direct child link from the tree. + * Prune an entire lock order tree. We look for cases where a lock + * is now both a descendant and a direct child of a given lock. In + * that case, we want to remove the direct child link from the tree. * * Returns false if insertchild() fails. */ static int -rebalancetree(void) +rebalancetree(struct witness_list *list) { struct witness *child, *parent; - struct witness_list *list; - if (parent->w_class->lc_flags & LC_SLEEPLOCK) - list = &w_sleep; - else - list = &w_spin; STAILQ_FOREACH(child, list, w_typelist) { STAILQ_FOREACH(parent, list, w_typelist) { if (!isitmychild(parent, child)) @@ -1178,9 +1217,30 @@ return (1); } +/* + * Make all the direct descendants of oldparent be direct descendants + * of newparent. + */ static int +reparentchildren(struct witness *newparent, struct witness *oldparent) +{ + struct witness_child_list_entry *wcl; + int i; + + /* Avoid making a witness a child of itself. */ + MPASS(!itismychild(oldparent, newparent)); + + for (wcl = oldparent->w_children; wcl != NULL; wcl = wcl->wcl_next) + for (i = 0; i < wcl->wcl_count; i++) + if (!insertchild(newparent, wcl->wcl_children[i])) + return (0); + return (1); +} + +static int itismychild(struct witness *parent, struct witness *child) { + struct witness_list *list; MPASS(child != NULL && parent != NULL); if ((parent->w_class->lc_flags & (LC_SLEEPLOCK | LC_SPINLOCK)) != @@ -1193,7 +1253,11 @@ if (!insertchild(parent, child)) return (0); - return (rebalancetree()); + if (parent->w_class->lc_flags & LC_SLEEPLOCK) + list = &w_sleep; + else + list = &w_spin; + return (rebalancetree(list)); } static void To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 5 14:52:42 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 68CC737B405; Wed, 5 Mar 2003 14:52:38 -0800 (PST) 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 DB5CE37B401 for ; Wed, 5 Mar 2003 14:52:37 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 67DBF43F93 for ; Wed, 5 Mar 2003 14:52:37 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h25Mqb0U007472 for ; Wed, 5 Mar 2003 14:52:37 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h25Mqavp007469 for perforce@freebsd.org; Wed, 5 Mar 2003 14:52:36 -0800 (PST) Date: Wed, 5 Mar 2003 14:52:36 -0800 (PST) Message-Id: <200303052252.h25Mqavp007469@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler Subject: PERFORCE change 26399 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=26399 Change 26399 by sam@sam_ebb on 2003/03/05 14:52:28 IFC Affected files ... .. //depot/projects/wlan/sys/dev/wi/if_wi.c#4 edit Differences ... ==== //depot/projects/wlan/sys/dev/wi/if_wi.c#4 (text+ko) ==== @@ -113,7 +113,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.127 2003/01/21 08:55:45 alfred Exp $"; + "$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.130 2003/02/26 17:18:35 sam Exp $"; #endif static void wi_start(struct ifnet *); @@ -174,9 +174,9 @@ static struct timeval lasttxerror; /* time of last tx error msg */ static int curtxeps; /* current tx error msgs/sec */ -static int wi_txerate = -1; /* tx error rate: max msgs/sec */ +static int wi_txerate = 0; /* tx error rate: max msgs/sec */ SYSCTL_INT(_hw_wi, OID_AUTO, txerate, CTLFLAG_RW, &wi_txerate, - 0, "max tx error msgs/sec; -1 disables msgs"); + 0, "max tx error msgs/sec; 0 to disable msgs"); #define WI_DEBUG #ifdef WI_DEBUG @@ -782,8 +782,8 @@ if_printf(ifp, "interface not running\n"); wi_stop(ifp, 0); } + WI_UNLOCK(sc); DPRINTF(("wi_init: return %d\n", error)); - WI_UNLOCK(sc); return; } @@ -916,9 +916,9 @@ if (sc->sc_drvbpf) { struct mbuf *mb; - MGETHDR(mb, M_NOWAIT, m0->m_type); + MGETHDR(mb, M_DONTWAIT, m0->m_type); if (mb != NULL) { - (void) m_dup_pkthdr(mb, m0, M_NOWAIT); + (void) m_dup_pkthdr(mb, m0, M_DONTWAIT); mb->m_next = m0; mb->m_data = (caddr_t)&frmhdr; mb->m_len = sizeof(frmhdr); @@ -1345,15 +1345,7 @@ len = le16toh(frmhdr.wi_dat_len); off = ALIGN(sizeof(struct ieee80211_frame)); - if (off + len > MCLBYTES) { - CSR_WRITE_2(sc, WI_EVENT_ACK, WI_EV_RX); - ifp->if_ierrors++; - DPRINTF(("wi_rx_intr: oversized packet (off %u len %u)\n", - off, len)); - return; - } - - MGETHDR(m, M_NOWAIT, MT_DATA); + MGETHDR(m, M_DONTWAIT, MT_DATA); if (m == NULL) { CSR_WRITE_2(sc, WI_EVENT_ACK, WI_EV_RX); ifp->if_ierrors++; @@ -1361,7 +1353,7 @@ return; } if (off + len > MHLEN) { - MCLGET(m, M_NOWAIT); + MCLGET(m, M_DONTWAIT); if ((m->m_flags & M_EXT) == 0) { CSR_WRITE_2(sc, WI_EVENT_ACK, WI_EV_RX); m_freem(m); @@ -1384,9 +1376,9 @@ if (sc->sc_drvbpf) { struct mbuf *mb; - MGETHDR(mb, M_NOWAIT, m->m_type); + MGETHDR(mb, M_DONTWAIT, m->m_type); if (mb != NULL) { - (void) m_dup_pkthdr(mb, m, M_NOWAIT); + (void) m_dup_pkthdr(mb, m, M_DONTWAIT); mb->m_next = m; mb->m_data = (caddr_t)&frmhdr; mb->m_len = sizeof(frmhdr); @@ -1504,7 +1496,6 @@ fid = CSR_READ_2(sc, WI_INFO_FID); wi_read_bap(sc, fid, 0, ltbuf, sizeof(ltbuf)); - DPRINTF(("wi_info_intr: type 0x%x\n", le16toh(ltbuf[1]))); switch (le16toh(ltbuf[1])) { case WI_INFO_LINK_STAT: @@ -1927,7 +1918,7 @@ error = copyin(ifr->ifr_data, &wreq, sizeof(wreq)); if (error) return error; - len = wreq.wi_len ? (wreq.wi_len - 1) * 2 : 0; + len = (wreq.wi_len - 1) * 2; switch (wreq.wi_type) { case WI_RID_DBM_ADJUST: return ENODEV; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 5 21:32:40 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A5B8037B405; Wed, 5 Mar 2003 21:32:10 -0800 (PST) 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 34EFB37B401 for ; Wed, 5 Mar 2003 21:32:10 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7023043F3F for ; Wed, 5 Mar 2003 21:32:07 -0800 (PST) (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.6/8.12.6) with ESMTP id h265W70U049842 for ; Wed, 5 Mar 2003 21:32:07 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h265W0J1049726 for perforce@freebsd.org; Wed, 5 Mar 2003 21:32:00 -0800 (PST) Date: Wed, 5 Mar 2003 21:32:00 -0800 (PST) Message-Id: <200303060532.h265W0J1049726@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 Subject: PERFORCE change 26414 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=26414 Change 26414 by rwatson@rwatson_tislabs on 2003/03/05 21:31:18 Integrate the TrustedBSD base branch. Affected files ... .. //depot/projects/trustedbsd/base/Makefile#21 integrate .. //depot/projects/trustedbsd/base/Makefile.inc1#34 integrate .. //depot/projects/trustedbsd/base/bin/date/date.1#6 integrate .. //depot/projects/trustedbsd/base/bin/dd/Makefile#4 integrate .. //depot/projects/trustedbsd/base/bin/dd/args.c#8 integrate .. //depot/projects/trustedbsd/base/bin/dd/conv.c#4 integrate .. //depot/projects/trustedbsd/base/bin/dd/dd.c#8 integrate .. //depot/projects/trustedbsd/base/bin/dd/dd.h#3 integrate .. //depot/projects/trustedbsd/base/bin/dd/extern.h#4 integrate .. //depot/projects/trustedbsd/base/bin/dd/misc.c#5 integrate .. //depot/projects/trustedbsd/base/bin/dd/position.c#4 integrate .. //depot/projects/trustedbsd/base/bin/getfacl/getfacl.1#5 integrate .. //depot/projects/trustedbsd/base/bin/sh/memalloc.c#5 integrate .. //depot/projects/trustedbsd/base/bin/sh/nodes.c.pat#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/opcode/arc.h#3 delete .. //depot/projects/trustedbsd/base/contrib/binutils/include/opcode/convex.h#3 delete .. //depot/projects/trustedbsd/base/contrib/binutils/include/opcode/np1.h#2 delete .. //depot/projects/trustedbsd/base/contrib/binutils/include/opcode/pn.h#2 delete .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/arcelf.sh#2 delete .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/elf32b4300.sh#3 delete .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/elf32bmip.sh#3 delete .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/elf32bmipn32.sh#3 delete .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/elf32bsmip.sh#3 delete .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/elf32ebmip.sh#3 delete .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/elf32elmip.sh#3 delete .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/elf32l4300.sh#3 delete .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/elf32lmip.sh#3 delete .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/elf32lsmip.sh#3 delete .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/elf64bmip.sh#3 delete .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/sh.sh#3 delete .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/shl.sh#3 delete .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/shlelf.sh#3 delete .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/vsta.sh#2 delete .. //depot/projects/trustedbsd/base/contrib/file/.cvsignore#1 branch .. //depot/projects/trustedbsd/base/contrib/file/Magdir/elf#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/filesystems#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/hdf#1 branch .. //depot/projects/trustedbsd/base/contrib/file/Magdir/jpeg#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/macintosh#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/sql#1 branch .. //depot/projects/trustedbsd/base/contrib/file/Makefile.am#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/Makefile.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/Makefile.std#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/README#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/acconfig.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/aclocal.m4#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/apprentice.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/config.h.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/configure#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/configure.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/file.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/file.man#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/magic.man#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/magic.mime#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/patchlevel.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/readelf.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/softmagic.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/FREEBSD-upgrade#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/PGPKEYS#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/RELEASE_NOTES#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/README#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/submit.cf#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/m4/version.m4#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/bsd4.4.m4#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/contrib/bitdomain.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/doc/op/op.me#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/comm.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_setreply.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/handler.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/libmilter.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/listener.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/main.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/stdio.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsmdb/smdb2.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/mail.local/mail.local.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/mailstats/mailstats.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/makemap/makemap.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/praliases/praliases.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/smrsh/smrsh.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/README#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/TUNING#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/aliases.5#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/conf.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/conf.h#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/daemon.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/deliver.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/domain.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/err.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/headers.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/mailq.1#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/main.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/mci.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/milter.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/parseaddr.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/queue.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/savemail.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/sendmail.h#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/srvrsmtp.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/tls.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/version.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/vacation/vacation.1#8 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/CHANGES#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/CREDITS#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/FILES#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/INSTALL#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/README#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/VERSION#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/addrtoname.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/config.h.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/configure#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/configure.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/dhcp6.h#3 delete .. //depot/projects/trustedbsd/base/contrib/tcpdump/dhcp6opt.h#3 delete .. //depot/projects/trustedbsd/base/contrib/tcpdump/gmt2local.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/interface.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-802_11.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-arcnet.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-arp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-atalk.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-beep.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-bgp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-bootp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-dhcp6.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-egp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-esp.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ether.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-fddi.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-gre.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-icmp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-icmp6.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-igmp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ip.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-isakmp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-isoclns.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-l2tp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-mobile.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-mpls.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-nfs.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ntp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-null.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-pim.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-radius.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-raw.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-rx.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-sctp.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-sll.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-smb.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-snmp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-stp.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-sunrpc.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-zephyr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/smbutil.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/util.c#3 integrate .. //depot/projects/trustedbsd/base/etc/Makefile#27 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.include.dist#16 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ipfilter#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.network#17 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#23 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes2#14 integrate .. //depot/projects/trustedbsd/base/games/random/random.6#3 integrate .. //depot/projects/trustedbsd/base/gnu/include/values.h#2 delete .. //depot/projects/trustedbsd/base/gnu/lib/csu/Makefile#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/Makefile#7 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/doc/Makefile#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gasp/Makefile#4 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/gcov/Makefile#3 integrate .. //depot/projects/trustedbsd/base/include/Makefile#26 integrate .. //depot/projects/trustedbsd/base/include/resolv.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getdomainname.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getosreldate.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getpwent.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/nlist.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/setmode.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/signbit.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/stringlist.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/_fpmath.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/gen/__divdf3.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/gen/__divdi3.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/gen/__divsf3.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/gen/__divsi3.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/gen/__moddi3.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/gen/__modsi3.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/gen/__udivdi3.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/gen/__udivsi3.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/gen/__umoddi3.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/gen/__umodsi3.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/gen/_setjmp.S#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/gen/fabs.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/gen/infinity.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/gen/setjmp.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/gen/sigsetjmp.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/net/byte_swap_2.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/net/byte_swap_4.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/net/htonl.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/net/htons.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/net/ntohl.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/net/ntohs.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/string/bcopy.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/string/bzero.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/string/ffs.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/string/memcpy.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/string/memmove.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/sys/Ovfork.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/sys/brk.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/sys/cerror.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/sys/exect.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/sys/fork.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/sys/pipe.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/sys/ptrace.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/sys/sbrk.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/sys/setlogin.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/sys/sigreturn.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/include/libc_private.h#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/wcstod.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getaddrinfo.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getservent.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/iso_addr.3#3 delete .. //depot/projects/trustedbsd/base/lib/libc/net/iso_addr.c#3 delete .. //depot/projects/trustedbsd/base/lib/libc/net/ns.3#2 delete .. //depot/projects/trustedbsd/base/lib/libc/net/ns_addr.c#6 delete .. //depot/projects/trustedbsd/base/lib/libc/net/ns_ntoa.c#6 delete .. //depot/projects/trustedbsd/base/lib/libc/net/nsdispatch.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/nslexer.l#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/rcmdsh.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/res_query.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_delete.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_get.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_set.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac.3#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac_prepare.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac_set.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/getrpcent.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/rpc_com.h#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/svc_run.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/ferror.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/getc.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/putc.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/stdio.3#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/insque.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/realpath.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/clock_gettime.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/kse.2#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/mincore.2#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/mount.2#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/mprotect.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/rfork.2#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/socket.2#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/xdr/xdr_rec.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_attr.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_attr_get_np.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_attr_setcreatesuspend_np.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_main_np.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_multi_np.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_mutexattr_getkind_np.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_resume_all_np.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_resume_np.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_set_name_np.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_suspend_all_np.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_suspend_np.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_switch_add_np.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/sem_open.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/pthread_private.h#13 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_sig.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libfetch/common.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libfetch/common.h#8 integrate .. //depot/projects/trustedbsd/base/lib/libfetch/fetch.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libgeom/libgeom.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libkvm/kvm_proc.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libncp/ncp_mod.h#3 delete .. //depot/projects/trustedbsd/base/lib/libncp/ncpl_net.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libncp/ncpl_subr.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libncurses/Makefile#10 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_group/pam_group.8#2 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_kerberosIV/pam_kerberosIV.8#2 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8#6 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_ssh/pam_ssh.8#7 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/man/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_attr_get_np.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_get_np.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_kern.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sig.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigaction.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libstand/nfs.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libstand/tftp.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libutil/login.conf.5#7 integrate .. //depot/projects/trustedbsd/base/lib/libutil/realhostname_sa.3#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/man/lgamma.3#4 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/math.h#9 integrate .. //depot/projects/trustedbsd/base/libexec/ftpd/ftpd.8#9 integrate .. //depot/projects/trustedbsd/base/libexec/getty/gettytab.5#5 integrate .. //depot/projects/trustedbsd/base/release/Makefile#38 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/errata/article.sgml#6 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#36 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml#5 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#59 integrate .. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#18 integrate .. //depot/projects/trustedbsd/base/release/i386/dokern.sh#15 integrate .. //depot/projects/trustedbsd/base/release/pc98/dokern.sh#7 integrate .. //depot/projects/trustedbsd/base/release/scripts/checkindex.pl#1 branch .. //depot/projects/trustedbsd/base/release/scripts/doFS.sh#8 integrate .. //depot/projects/trustedbsd/base/release/scripts/print-cdrom-packages.sh#15 integrate .. //depot/projects/trustedbsd/base/sbin/Makefile#12 integrate .. //depot/projects/trustedbsd/base/sbin/badsect/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sbin/badsect/badsect.c#8 integrate .. //depot/projects/trustedbsd/base/sbin/ccdconfig/ccdconfig.8#7 integrate .. //depot/projects/trustedbsd/base/sbin/comcontrol/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sbin/devd/devd.8#6 integrate .. //depot/projects/trustedbsd/base/sbin/devd/devd.conf.5#7 integrate .. //depot/projects/trustedbsd/base/sbin/disklabel/disklabel.8#12 integrate .. //depot/projects/trustedbsd/base/sbin/disklabel/disklabel.c#18 integrate .. //depot/projects/trustedbsd/base/sbin/dmesg/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sbin/dump/dump.8#13 integrate .. //depot/projects/trustedbsd/base/sbin/dump/main.c#15 integrate .. //depot/projects/trustedbsd/base/sbin/dumpfs/dumpfs.8#6 integrate .. //depot/projects/trustedbsd/base/sbin/fsck/fsck.c#8 integrate .. //depot/projects/trustedbsd/base/sbin/gbde/gbde.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.8#17 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.c#14 integrate .. //depot/projects/trustedbsd/base/sbin/init/init.8#5 integrate .. //depot/projects/trustedbsd/base/sbin/ip6fw/ip6fw.8#7 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw.8#21 integrate .. //depot/projects/trustedbsd/base/sbin/kldload/kldload.8#7 integrate .. //depot/projects/trustedbsd/base/sbin/mdconfig/mdconfig.8#5 integrate .. //depot/projects/trustedbsd/base/sbin/mdconfig/mdconfig.c#8 integrate .. //depot/projects/trustedbsd/base/sbin/mknod/mknod.8#5 integrate .. //depot/projects/trustedbsd/base/sbin/mksnap_ffs/Makefile#1 branch .. //depot/projects/trustedbsd/base/sbin/mksnap_ffs/mksnap_ffs.8#1 branch .. //depot/projects/trustedbsd/base/sbin/mksnap_ffs/mksnap_ffs.c#1 branch .. //depot/projects/trustedbsd/base/sbin/mount/mount.8#9 integrate .. //depot/projects/trustedbsd/base/sbin/natd/natd.8#7 integrate .. //depot/projects/trustedbsd/base/sbin/newfs/mkfs.c#14 integrate .. //depot/projects/trustedbsd/base/sbin/newfs/newfs.8#13 integrate .. //depot/projects/trustedbsd/base/sbin/newfs/ref.test#3 integrate .. //depot/projects/trustedbsd/base/sbin/ping/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sbin/ping/ping.8#7 integrate .. //depot/projects/trustedbsd/base/sbin/ping/ping.c#13 integrate .. //depot/projects/trustedbsd/base/sbin/route/route.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/swapon/swapon.8#6 integrate .. //depot/projects/trustedbsd/base/sbin/swapon/swapon.c#5 integrate .. //depot/projects/trustedbsd/base/sbin/tunefs/tunefs.8#12 integrate .. //depot/projects/trustedbsd/base/sbin/tunefs/tunefs.c#11 integrate .. //depot/projects/trustedbsd/base/sbin/umount/Makefile#3 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/Makefile#13 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/Makefile.inc#9 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/openssl/Makefile#5 integrate .. //depot/projects/trustedbsd/base/share/examples/cvsup/cvs-supfile#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/Makefile#27 integrate .. //depot/projects/trustedbsd/base/share/man/man4/aac.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/an.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/card.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/ciss.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/devctl.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/dpt.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/exca.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/fast_ipsec.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/firewire.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/fwe.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/fwohci.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/gif.4#9 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ida.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/iir.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ip.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/lmc.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/mac.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/netgraph.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/random.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/sbp.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/sio.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/targ.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ubsec.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ugen.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/vinum.4#10 integrate .. //depot/projects/trustedbsd/base/share/man/man4/wi.4#9 integrate .. //depot/projects/trustedbsd/base/share/man/man5/Makefile#7 integrate .. //depot/projects/trustedbsd/base/share/man/man5/msdosfs.5#3 integrate .. //depot/projects/trustedbsd/base/share/man/man5/periodic.conf.5#11 integrate .. //depot/projects/trustedbsd/base/share/man/man5/rc.conf.5#22 integrate .. //depot/projects/trustedbsd/base/share/man/man5/style.Makefile.5#1 branch .. //depot/projects/trustedbsd/base/share/man/man7/operator.7#3 integrate .. //depot/projects/trustedbsd/base/share/man/man7/ports.7#7 integrate .. //depot/projects/trustedbsd/base/share/man/man8/diskless.8#8 integrate .. //depot/projects/trustedbsd/base/share/man/man9/malloc.9#6 integrate .. //depot/projects/trustedbsd/base/share/man/man9/mbuf.9#7 integrate .. //depot/projects/trustedbsd/base/share/man/man9/sleep.9#6 integrate .. //depot/projects/trustedbsd/base/share/man/man9/uio.9#4 integrate .. //depot/projects/trustedbsd/base/share/misc/pci_vendors#16 integrate .. //depot/projects/trustedbsd/base/share/mk/Makefile#9 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.kern.mk#6 delete .. //depot/projects/trustedbsd/base/share/mk/bsd.own.mk#7 integrate .. //depot/projects/trustedbsd/base/share/syscons/keymaps/it.iso.kbd#2 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/busdma_machdep.c#6 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/dec_kn8ae.c#2 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/machdep.c#21 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/mem.c#5 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/pmap.c#27 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/prom.c#7 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/promcons.c#5 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/trap.c#18 integrate .. //depot/projects/trustedbsd/base/sys/alpha/conf/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/alpha/conf/NOTES#2 integrate .. //depot/projects/trustedbsd/base/sys/alpha/conf/SIMOS#8 delete .. //depot/projects/trustedbsd/base/sys/alpha/include/atomic.h#6 integrate .. //depot/projects/trustedbsd/base/sys/alpha/include/bus.h#8 integrate .. //depot/projects/trustedbsd/base/sys/alpha/include/db_machdep.h#4 integrate .. //depot/projects/trustedbsd/base/sys/alpha/include/pmap.h#8 integrate .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_machdep.c#7 integrate .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/dwlpx.c#5 integrate .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/tlsb.c#2 integrate .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/zs_tlsb.c#5 integrate .. //depot/projects/trustedbsd/base/sys/boot/alpha/common/Makefile.common#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/common/help.common#7 integrate .. //depot/projects/trustedbsd/base/sys/boot/common/loader.8#17 integrate .. //depot/projects/trustedbsd/base/sys/boot/common/module.c#4 integrate .. //depot/projects/trustedbsd/base/sys/boot/common/ufsread.c#6 integrate .. //depot/projects/trustedbsd/base/sys/boot/efi/libefi/efifs.c#4 integrate .. //depot/projects/trustedbsd/base/sys/boot/efi/libefi/libefi.c#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/efi/loader/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/boot/efi/loader/main.c#7 integrate .. //depot/projects/trustedbsd/base/sys/boot/forth/loader.conf#14 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/boot2/Makefile#9 integrate .. //depot/projects/trustedbsd/base/sys/boot/ia64/skiload/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/boot2/Makefile#8 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_xpt.c#11 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_cd.c#14 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_ch.c#5 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_da.c#26 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_pass.c#5 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_pt.c#3 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_sa.c#7 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_ses.c#5 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_target.c#6 integrate .. //depot/projects/trustedbsd/base/sys/coda/coda_fbsd.c#3 integrate .. //depot/projects/trustedbsd/base/sys/coda/coda_vnops.c#8 integrate .. //depot/projects/trustedbsd/base/sys/coda/coda_vnops.h#5 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_file.c#13 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_ioctl.c#20 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_ipc.c#5 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_misc.c#19 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_socket.c#7 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_stats.c#9 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_sysctl.c#7 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_uid16.c#5 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_misc.c#15 integrate .. //depot/projects/trustedbsd/base/sys/conf/Makefile.alpha#7 integrate .. //depot/projects/trustedbsd/base/sys/conf/Makefile.i386#8 integrate .. //depot/projects/trustedbsd/base/sys/conf/Makefile.ia64#11 integrate .. //depot/projects/trustedbsd/base/sys/conf/Makefile.pc98#7 integrate .. //depot/projects/trustedbsd/base/sys/conf/Makefile.powerpc#10 integrate .. //depot/projects/trustedbsd/base/sys/conf/Makefile.sparc64#13 integrate .. //depot/projects/trustedbsd/base/sys/conf/Makefile.x86_64#3 integrate .. //depot/projects/trustedbsd/base/sys/conf/NOTES#29 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#54 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.alpha#14 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.i386#26 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.ia64#16 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.pc98#24 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.powerpc#10 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.sparc64#21 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.x86_64#5 integrate .. //depot/projects/trustedbsd/base/sys/conf/kern.mk#3 integrate .. //depot/projects/trustedbsd/base/sys/conf/kern.post.mk#22 integrate .. //depot/projects/trustedbsd/base/sys/conf/kern.pre.mk#16 integrate .. //depot/projects/trustedbsd/base/sys/conf/kmod.mk#19 integrate .. //depot/projects/trustedbsd/base/sys/conf/majors#20 integrate .. //depot/projects/trustedbsd/base/sys/conf/majors.awk#1 branch .. //depot/projects/trustedbsd/base/sys/conf/makeLINT.mk#1 branch .. //depot/projects/trustedbsd/base/sys/conf/makeLINT.sed#2 integrate .. //depot/projects/trustedbsd/base/sys/conf/options#31 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.i386#13 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.pc98#14 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/fla/fla.c#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_auth.c#9 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/mlfk_ipl.c#3 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_ps.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/aac/aac.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/aac/aac_cam.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/aac/aac_disk.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/aac/aac_pci.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/aac/aacvar.h#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/advansys/advlib.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx.reg#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx.seq#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx_inline.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx_osm.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx_pci.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/amr/amr.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/amr/amr_disk.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/amr/amrvar.h#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/ar/if_ar.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/ar/if_ar_isa.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/asr/asr.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.c#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-card.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-disk.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-disk.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-isa.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-pci.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-raid.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-raid.h#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-all.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-cam.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-cd.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-fd.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-fd.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-tape.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/bktr/bktr_os.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/ccd/ccd.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/ciss/ciss.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/cnw/if_cnw.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/dgb/dgb.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/digi/digi.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_drv.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_vm.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ed/if_ed_cbus.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/en/midway.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/ep/if_ep_isa.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/fb/fb.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/fb/fbreg.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/fb/gfb.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/fb/s3_pci.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/fb/vga.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/fb/vgareg.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/firewire.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/firewirereg.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/fwdev.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/fwmem.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/fwohci.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/sbp.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/fxp/if_fxp.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/fxp/if_fxpreg.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/fxp/if_fxpvar.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/gfb/gfb_pci.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/hea/eni_buffer.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/hea/eni_receive.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/hfa/fore_command.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/hfa/fore_load.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/hfa/fore_receive.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/ida/ida.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/ida/ida_disk.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/ida/ida_eisa.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ida/ida_pci.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/iicbus/if_ic.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/iicbus/iic.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/iir/iir_ctrl.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_freebsd.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/joy/joy.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/kbd/kbd.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/mcd/mcd.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/md/md.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/mlx/mlx.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/mlx/mlx_compat.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/mlx/mlx_disk.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/mlx/mlxvar.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/mly/mly.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_pci.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/nmdm/nmdm.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/null/null.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/ofw/ofw_console.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/ofw/ofw_disk.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/ofw/openfirmio.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbbdevid.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/pci/pci_user.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/pcic/i82365.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/ppbus/if_plip.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/ppbus/lpt.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/ppbus/pcfclock.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/ppbus/ppi.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/ppbus/pps.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/pst/pst-raid.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/raidframe/rf_freebsdkintf.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/random/randomdev.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/ray/if_ray.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/rc/rc.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/rp/rp.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/sab/sab.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/scd/scd.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/si/si.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/sio/sio.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/sio/sio_pci.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/smbus/smb.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/sn/if_sn.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/snp/snp.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/midi/midi.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/midi/sequencer.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/emu10k1.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/via8233.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/via8233.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/via82c686.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/via82c686.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/ac97.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/channel.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/dsp.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/feeder.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/feeder_fmt.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/feeder_rate.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/mixer.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/sndstat.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/streams/streams.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/syscons/syscons.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/syscons/sysmouse.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/tdfx/tdfx_pci.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/tga/tga_pci.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/twe/twe_compat.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/twe/twe_freebsd.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/tx/if_txvar.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/ubsec/ubsec.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/ubsec/ubsecreg.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_aue.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ohci.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ucom.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ufm.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ugen.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uhci.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uhid.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ulpt.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ums.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/urio.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb_ethersubr.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb_ethersubr.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdi_util.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdi_util.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uscanner.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinum.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumext.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumio.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumioctl.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumrequest.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/wi/if_wi.c#31 integrate .. //depot/projects/trustedbsd/base/sys/dev/zs/zs.c#3 integrate .. //depot/projects/trustedbsd/base/sys/fs/deadfs/dead_vnops.c#8 integrate .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_devs.c#9 integrate .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_vnops.c#23 integrate .. //depot/projects/trustedbsd/base/sys/fs/fdescfs/fdesc_vnops.c#10 integrate .. //depot/projects/trustedbsd/base/sys/fs/fifofs/fifo_vnops.c#22 integrate .. //depot/projects/trustedbsd/base/sys/fs/hpfs/hpfs_alsubr.c#2 integrate .. //depot/projects/trustedbsd/base/sys/fs/hpfs/hpfs_subr.c#4 integrate .. //depot/projects/trustedbsd/base/sys/fs/hpfs/hpfs_vnops.c#16 integrate .. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_fat.c#5 integrate .. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_vnops.c#12 integrate .. //depot/projects/trustedbsd/base/sys/fs/ntfs/ntfs_subr.c#8 integrate .. //depot/projects/trustedbsd/base/sys/fs/ntfs/ntfs_vnops.c#10 integrate .. //depot/projects/trustedbsd/base/sys/fs/nullfs/null_vnops.c#9 integrate .. //depot/projects/trustedbsd/base/sys/fs/nwfs/nwfs_io.c#5 integrate .. //depot/projects/trustedbsd/base/sys/fs/nwfs/nwfs_vnops.c#5 integrate .. //depot/projects/trustedbsd/base/sys/fs/portalfs/portal_vnops.c#11 integrate .. //depot/projects/trustedbsd/base/sys/fs/procfs/procfs_ctl.c#13 integrate .. //depot/projects/trustedbsd/base/sys/fs/procfs/procfs_status.c#9 integrate .. //depot/projects/trustedbsd/base/sys/fs/pseudofs/pseudofs.h#10 integrate .. //depot/projects/trustedbsd/base/sys/fs/pseudofs/pseudofs_vnops.c#16 integrate .. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_io.c#8 integrate .. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_vnops.c#13 integrate .. //depot/projects/trustedbsd/base/sys/fs/specfs/spec_vnops.c#19 integrate .. //depot/projects/trustedbsd/base/sys/fs/udf/udf_vnops.c#12 integrate .. //depot/projects/trustedbsd/base/sys/fs/umapfs/umap_vnops.c#5 integrate .. //depot/projects/trustedbsd/base/sys/fs/unionfs/union_subr.c#13 integrate .. //depot/projects/trustedbsd/base/sys/fs/unionfs/union_vnops.c#10 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_apple.c#2 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_dev.c#22 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_disk.c#21 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_stats.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/ext2fs/ext2_balloc.c#3 integrate .. //depot/projects/trustedbsd/base/sys/gnu/ext2fs/ext2_bmap.c#3 integrate .. //depot/projects/trustedbsd/base/sys/gnu/ext2fs/ext2_inode.c#8 integrate .. //depot/projects/trustedbsd/base/sys/gnu/ext2fs/ext2_lookup.c#9 integrate .. //depot/projects/trustedbsd/base/sys/gnu/ext2fs/ext2_vfsops.c#12 integrate .. //depot/projects/trustedbsd/base/sys/gnu/ext2fs/ext2_vnops.c#13 integrate .. //depot/projects/trustedbsd/base/sys/gnu/ext2fs/fs.h#3 integrate .. //depot/projects/trustedbsd/base/sys/gnu/ext2fs/sparc64-bitops.h#1 branch .. //depot/projects/trustedbsd/base/sys/i386/acpica/acpi_machdep.c#7 integrate .. //depot/projects/trustedbsd/base/sys/i386/apm/apm.c#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/NOTES#33 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/busdma_machdep.c#7 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/db_interface.c#9 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/elan-mmcr.c#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/genassym.c#13 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/identcpu.c#14 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/locore.s#10 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/mem.c#9 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/mp_machdep.c#18 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/perfmon.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#31 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/sys_machdep.c#9 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/trap.c#22 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/vm_machdep.c#18 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/bus_at386.h#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/bus_pc98.h#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/param.h#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/pmap.h#8 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/vmparam.h#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/asc.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/ctx.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/cx.c#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/cy.c#8 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/gpib.c#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/gsc.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/if_rdp.c#8 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/istallion.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/loran.c#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/mse.c#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/pcaudio.c#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/pcvt/pcvt_drv.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/pcvt/pcvt_ext.c#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/pcvt/pcvt_kbd.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/spic.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/spigot.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/spkr.c#9 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/stallion.c#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/tw.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/vesa.c#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/wt.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/imgact_linux.c#9 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux.h#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_machdep.c#11 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_ptrace.c#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_sysvec.c#13 integrate .. //depot/projects/trustedbsd/base/sys/i386/smapi/smapi.c#2 integrate .. //depot/projects/trustedbsd/base/sys/i4b/driver/i4b_ctl.c#5 integrate .. //depot/projects/trustedbsd/base/sys/i4b/driver/i4b_ipr.c#9 integrate .. //depot/projects/trustedbsd/base/sys/i4b/driver/i4b_rbch.c#6 integrate .. //depot/projects/trustedbsd/base/sys/i4b/driver/i4b_tel.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i4b/driver/i4b_trace.c#6 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer4/i4b_i4bdrv.c#8 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/busdma_machdep.c#6 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/mem.c#5 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/pmap.c#28 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/ssc.c#5 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/trap.c#15 integrate .. //depot/projects/trustedbsd/base/sys/ia64/include/bus.h#6 integrate .. //depot/projects/trustedbsd/base/sys/ia64/include/pmap.h#7 integrate .. //depot/projects/trustedbsd/base/sys/ia64/include/setjmp.h#4 integrate .. //depot/projects/trustedbsd/base/sys/isa/fd.c#12 integrate .. //depot/projects/trustedbsd/base/sys/isa/ppc.c#4 integrate .. //depot/projects/trustedbsd/base/sys/isa/psm.c#8 integrate .. //depot/projects/trustedbsd/base/sys/isa/vga_isa.c#2 integrate .. //depot/projects/trustedbsd/base/sys/isofs/cd9660/cd9660_vnops.c#10 integrate .. //depot/projects/trustedbsd/base/sys/kern/Make.tags.inc#4 integrate .. //depot/projects/trustedbsd/base/sys/kern/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_clock.c#15 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_condvar.c#18 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_conf.c#14 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_descrip.c#34 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exec.c#31 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exit.c#25 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_fork.c#28 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_intr.c#20 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_ktr.c#9 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_linker.c#17 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_lock.c#11 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mac.c#37 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mutex.c#22 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_poll.c#8 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_proc.c#30 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sig.c#29 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_subr.c#14 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_switch.c#18 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_synch.c#23 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sysctl.c#18 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_thread.c#22 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_time.c#14 integrate .. //depot/projects/trustedbsd/base/sys/kern/sched_4bsd.c#6 integrate .. //depot/projects/trustedbsd/base/sys/kern/sched_ule.c#2 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_bus.c#18 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_disk.c#15 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_log.c#8 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_mbuf.c#20 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_taskqueue.c#5 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_trap.c#19 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_witness.c#29 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_xxx.c#4 integrate .. //depot/projects/trustedbsd/base/sys/kern/tty.c#16 integrate .. //depot/projects/trustedbsd/base/sys/kern/tty_cons.c#9 integrate .. //depot/projects/trustedbsd/base/sys/kern/tty_pty.c#8 integrate .. //depot/projects/trustedbsd/base/sys/kern/tty_tty.c#10 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket.c#29 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket2.c#25 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_syscalls.c#25 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_bio.c#27 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_cluster.c#12 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_default.c#14 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_mount.c#16 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#36 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_syscalls.c#39 integrate .. //depot/projects/trustedbsd/base/sys/libkern/strdup.c#1 branch .. //depot/projects/trustedbsd/base/sys/modules/Makefile#40 integrate .. //depot/projects/trustedbsd/base/sys/modules/aac/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/modules/if_gre/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/modules/mac_portacl/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/nmdm/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/modules/null/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/osf1/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/modules/rc/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/net/bpf.c#18 integrate .. //depot/projects/trustedbsd/base/sys/net/if.c#18 integrate .. //depot/projects/trustedbsd/base/sys/net/if_arcsubr.c#8 integrate .. //depot/projects/trustedbsd/base/sys/net/if_atmsubr.c#5 integrate .. //depot/projects/trustedbsd/base/sys/net/if_ef.c#8 integrate .. //depot/projects/trustedbsd/base/sys/net/if_ethersubr.c#26 integrate .. //depot/projects/trustedbsd/base/sys/net/if_faith.c#12 integrate .. //depot/projects/trustedbsd/base/sys/net/if_fddisubr.c#9 integrate .. //depot/projects/trustedbsd/base/sys/net/if_gif.c#17 integrate .. //depot/projects/trustedbsd/base/sys/net/if_gre.c#8 integrate .. //depot/projects/trustedbsd/base/sys/net/if_ieee80211subr.c#3 integrate .. //depot/projects/trustedbsd/base/sys/net/if_iso88025subr.c#8 integrate .. //depot/projects/trustedbsd/base/sys/net/if_loop.c#14 integrate .. //depot/projects/trustedbsd/base/sys/net/if_ppp.c#15 integrate .. //depot/projects/trustedbsd/base/sys/net/if_sl.c#11 integrate .. //depot/projects/trustedbsd/base/sys/net/if_spppsubr.c#10 integrate .. //depot/projects/trustedbsd/base/sys/net/if_stf.c#16 integrate .. //depot/projects/trustedbsd/base/sys/net/if_tap.c#14 integrate .. //depot/projects/trustedbsd/base/sys/net/if_tun.c#15 integrate .. //depot/projects/trustedbsd/base/sys/net/if_vlan.c#12 integrate .. //depot/projects/trustedbsd/base/sys/net/intrq.c#3 delete .. //depot/projects/trustedbsd/base/sys/net/intrq.h#4 delete .. //depot/projects/trustedbsd/base/sys/net/netisr.c#2 integrate .. //depot/projects/trustedbsd/base/sys/net/netisr.h#5 integrate .. //depot/projects/trustedbsd/base/sys/net/route.c#8 integrate .. //depot/projects/trustedbsd/base/sys/net/route.h#6 integrate .. //depot/projects/trustedbsd/base/sys/net/rtsock.c#18 integrate .. //depot/projects/trustedbsd/base/sys/netatalk/aarp.c#5 integrate .. //depot/projects/trustedbsd/base/sys/netatalk/at_extern.h#3 integrate .. //depot/projects/trustedbsd/base/sys/netatalk/at_var.h#2 integrate .. //depot/projects/trustedbsd/base/sys/netatalk/ddp_input.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netatalk/ddp_usrreq.c#7 integrate .. //depot/projects/trustedbsd/base/sys/netatm/atm_device.c#7 integrate .. //depot/projects/trustedbsd/base/sys/netatm/atm_subr.c#12 integrate .. //depot/projects/trustedbsd/base/sys/netatm/atm_var.h#10 integrate .. //depot/projects/trustedbsd/base/sys/netatm/ipatm/ipatm_input.c#4 integrate .. //depot/projects/trustedbsd/base/sys/netatm/port.h#8 integrate .. //depot/projects/trustedbsd/base/sys/netatm/uni/q2110_sigcpcs.c#4 integrate .. //depot/projects/trustedbsd/base/sys/netatm/uni/qsaal1_sigcpcs.c#4 integrate .. //depot/projects/trustedbsd/base/sys/netatm/uni/sscop_sigcpcs.c#3 integrate .. //depot/projects/trustedbsd/base/sys/netatm/uni/sscop_subr.c#5 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#4 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#4 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#3 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_base.c#9 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_device.c#3 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_fec.c#4 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_gif_demux.c#4 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_gif_demux.h#2 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_iface.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_iface.h#2 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_ip_input.c#2 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_ppp.c#9 integrate .. //depot/projects/trustedbsd/base/sys/netinet/if_ether.c#11 integrate .. //depot/projects/trustedbsd/base/sys/netinet/if_ether.h#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in_proto.c#7 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in_var.h#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_gre.c#8 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_input.c#22 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_mroute.c#15 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_var.h#11 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#33 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_subr.c#22 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_syncache.c#19 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_usrreq.c#13 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/ah_input.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/esp_input.c#10 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6_var.h#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/ip6_input.c#12 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/ip6_var.h#5 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/ipsec.c#8 integrate .. //depot/projects/trustedbsd/base/sys/netipsec/ipsec.c#3 integrate .. //depot/projects/trustedbsd/base/sys/netipsec/ipsec_input.c#3 integrate .. //depot/projects/trustedbsd/base/sys/netipsec/xform_ah.c#2 integrate .. //depot/projects/trustedbsd/base/sys/netipsec/xform_esp.c#3 integrate .. //depot/projects/trustedbsd/base/sys/netipsec/xform_ipcomp.c#2 integrate .. //depot/projects/trustedbsd/base/sys/netipsec/xform_ipip.c#4 integrate .. //depot/projects/trustedbsd/base/sys/netipx/ipx.c#4 integrate .. //depot/projects/trustedbsd/base/sys/netipx/ipx_if.h#3 integrate .. //depot/projects/trustedbsd/base/sys/netipx/ipx_input.c#5 integrate .. //depot/projects/trustedbsd/base/sys/netipx/ipx_ip.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netipx/ipx_var.h#3 integrate .. //depot/projects/trustedbsd/base/sys/netnatm/natm.c#8 integrate .. //depot/projects/trustedbsd/base/sys/netnatm/natm.h#3 integrate .. //depot/projects/trustedbsd/base/sys/netnatm/natm_proto.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netncp/ncp.h#3 integrate .. //depot/projects/trustedbsd/base/sys/netncp/ncp_conn.c#5 integrate .. //depot/projects/trustedbsd/base/sys/netncp/ncp_conn.h#2 integrate .. //depot/projects/trustedbsd/base/sys/netncp/ncp_mod.c#2 integrate .. //depot/projects/trustedbsd/base/sys/netncp/ncp_ncp.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netncp/ncp_ncp.h#3 integrate .. //depot/projects/trustedbsd/base/sys/netncp/ncp_rq.c#5 integrate .. //depot/projects/trustedbsd/base/sys/netncp/ncp_rq.h#2 integrate .. //depot/projects/trustedbsd/base/sys/netncp/ncp_sock.c#4 integrate .. //depot/projects/trustedbsd/base/sys/netncp/ncp_sock.h#2 integrate .. //depot/projects/trustedbsd/base/sys/netncp/ncp_subr.c#3 integrate .. //depot/projects/trustedbsd/base/sys/netncp/ncp_subr.h#4 integrate .. //depot/projects/trustedbsd/base/sys/netncp/ncpio.h#1 branch .. //depot/projects/trustedbsd/base/sys/netns/idp.h#2 delete .. //depot/projects/trustedbsd/base/sys/netns/idp_usrreq.c#6 delete .. //depot/projects/trustedbsd/base/sys/netns/idp_var.h#2 delete .. //depot/projects/trustedbsd/base/sys/netns/ns.c#4 delete .. //depot/projects/trustedbsd/base/sys/netns/ns.h#4 delete .. //depot/projects/trustedbsd/base/sys/netns/ns_cksum.c#2 delete .. //depot/projects/trustedbsd/base/sys/netns/ns_error.c#3 delete .. //depot/projects/trustedbsd/base/sys/netns/ns_error.h#2 delete .. //depot/projects/trustedbsd/base/sys/netns/ns_if.h#5 delete .. //depot/projects/trustedbsd/base/sys/netns/ns_input.c#5 delete .. //depot/projects/trustedbsd/base/sys/netns/ns_ip.c#4 delete .. //depot/projects/trustedbsd/base/sys/netns/ns_output.c#2 delete .. //depot/projects/trustedbsd/base/sys/netns/ns_pcb.c#5 delete .. //depot/projects/trustedbsd/base/sys/netns/ns_pcb.h#2 delete .. //depot/projects/trustedbsd/base/sys/netns/ns_proto.c#2 delete .. //depot/projects/trustedbsd/base/sys/netns/sp.h#2 delete .. //depot/projects/trustedbsd/base/sys/netns/spidp.h#2 delete .. //depot/projects/trustedbsd/base/sys/netns/spp_debug.c#2 delete .. //depot/projects/trustedbsd/base/sys/netns/spp_debug.h#2 delete .. //depot/projects/trustedbsd/base/sys/netns/spp_timer.h#2 delete .. //depot/projects/trustedbsd/base/sys/netns/spp_usrreq.c#6 delete .. //depot/projects/trustedbsd/base/sys/netns/spp_var.h#2 delete .. //depot/projects/trustedbsd/base/sys/netsmb/netbios.h#4 integrate .. //depot/projects/trustedbsd/base/sys/netsmb/smb_dev.c#7 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_bio.c#10 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_nfsiod.c#6 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_socket.c#14 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_vnops.c#14 integrate .. //depot/projects/trustedbsd/base/sys/nfsserver/nfs_serv.c#20 integrate .. //depot/projects/trustedbsd/base/sys/nfsserver/nfs_srvcache.c#4 integrate .. //depot/projects/trustedbsd/base/sys/nfsserver/nfs_srvsock.c#7 integrate .. //depot/projects/trustedbsd/base/sys/nfsserver/nfs_syscalls.c#10 integrate .. //depot/projects/trustedbsd/base/sys/opencrypto/crypto.c#6 integrate .. //depot/projects/trustedbsd/base/sys/opencrypto/cryptodev.c#7 integrate .. //depot/projects/trustedbsd/base/sys/opencrypto/cryptodev.h#4 integrate .. //depot/projects/trustedbsd/base/sys/pc98/apm/apm.c#8 integrate .. //depot/projects/trustedbsd/base/sys/pc98/conf/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/pc98/conf/NOTES#1 branch .. //depot/projects/trustedbsd/base/sys/pc98/i386/machdep.c#29 integrate .. //depot/projects/trustedbsd/base/sys/pc98/pc98/atapi.c#4 integrate .. //depot/projects/trustedbsd/base/sys/pc98/pc98/fd.c#14 integrate .. //depot/projects/trustedbsd/base/sys/pc98/pc98/mse.c#5 integrate .. //depot/projects/trustedbsd/base/sys/pc98/pc98/olpt.c#3 integrate .. //depot/projects/trustedbsd/base/sys/pc98/pc98/pc98gdc.c#3 integrate .. //depot/projects/trustedbsd/base/sys/pc98/pc98/pcaudio.c#5 integrate .. //depot/projects/trustedbsd/base/sys/pc98/pc98/ppc.c#3 integrate .. //depot/projects/trustedbsd/base/sys/pc98/pc98/sio.c#18 integrate .. //depot/projects/trustedbsd/base/sys/pc98/pc98/spkr.c#8 integrate .. //depot/projects/trustedbsd/base/sys/pc98/pc98/syscons.c#11 integrate .. //depot/projects/trustedbsd/base/sys/pc98/pc98/wd.c#6 integrate .. //depot/projects/trustedbsd/base/sys/pc98/pc98/wd_cd.c#5 integrate .. //depot/projects/trustedbsd/base/sys/pccard/pccard.c#12 integrate .. //depot/projects/trustedbsd/base/sys/pccard/pcic_pci.c#11 integrate .. //depot/projects/trustedbsd/base/sys/pci/agp.c#10 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_rl.c#19 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_rlreg.h#8 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_ti.c#17 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_xl.c#17 integrate .. //depot/projects/trustedbsd/base/sys/pci/intpm.c#6 integrate .. //depot/projects/trustedbsd/base/sys/pci/meteor.c#3 integrate .. //depot/projects/trustedbsd/base/sys/pci/simos.c#5 delete .. //depot/projects/trustedbsd/base/sys/pci/simos.h#2 delete .. //depot/projects/trustedbsd/base/sys/pci/xrpu.c#4 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/include/bus.h#7 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/include/cpufunc.h#11 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/ofw/ofw_pci.c#3 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powermac/ata_macio.c#4 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/atomic.s#2 delete .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/locore.s#7 delete .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/ofwmagic.s#2 delete .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/pmap.c#17 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/swtch.s#8 delete .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/trap.c#12 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/trap_subr.S#6 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/psim/ata_iobus.c#3 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_portacl/mac_portacl.c#1 branch .. //depot/projects/trustedbsd/base/sys/sparc64/conf/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/sparc64/conf/NOTES#1 branch .. //depot/projects/trustedbsd/base/sys/sparc64/include/bus.h#11 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/iommu.c#11 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/mem.c#4 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/pmap.c#32 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/trap.c#20 integrate .. //depot/projects/trustedbsd/base/sys/sys/_iovec.h#2 integrate .. //depot/projects/trustedbsd/base/sys/sys/_timespec.h#3 integrate .. //depot/projects/trustedbsd/base/sys/sys/_types.h#9 integrate .. //depot/projects/trustedbsd/base/sys/sys/buf.h#12 integrate .. //depot/projects/trustedbsd/base/sys/sys/ccdvar.h#4 integrate .. //depot/projects/trustedbsd/base/sys/sys/conf.h#14 integrate .. //depot/projects/trustedbsd/base/sys/sys/disk.h#8 integrate .. //depot/projects/trustedbsd/base/sys/sys/interrupt.h#4 integrate .. //depot/projects/trustedbsd/base/sys/sys/kse.h#8 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 5 21:42:44 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C529337B405; Wed, 5 Mar 2003 21:42:22 -0800 (PST) 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 5A01937B401 for ; Wed, 5 Mar 2003 21:42:22 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7560C43FAF for ; Wed, 5 Mar 2003 21:42:21 -0800 (PST) (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.6/8.12.6) with ESMTP id h265gL0U058645 for ; Wed, 5 Mar 2003 21:42:21 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h265gLmK058627 for perforce@freebsd.org; Wed, 5 Mar 2003 21:42:21 -0800 (PST) Date: Wed, 5 Mar 2003 21:42:21 -0800 (PST) Message-Id: <200303060542.h265gLmK058627@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 Subject: PERFORCE change 26416 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=26416 Change 26416 by rwatson@rwatson_tislabs on 2003/03/05 21:42:03 Further integrate the TrustedBSD base branch -- loop back the sysarch_ioperm MAC check. Affected files ... .. //depot/projects/trustedbsd/base/sys/alpha/alpha/sys_machdep.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/firewire.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/firewire.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/firewirereg.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/fwdev.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/fwohci.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/if_fwe.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/if_fwevar.h#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/sys_machdep.c#10 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mac.c#38 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_syscalls.c#26 integrate .. //depot/projects/trustedbsd/base/sys/sys/mac.h#25 integrate .. //depot/projects/trustedbsd/base/sys/sys/mac_policy.h#25 integrate Differences ... ==== //depot/projects/trustedbsd/base/sys/alpha/alpha/sys_machdep.c#7 (text+ko) ==== @@ -31,13 +31,16 @@ * SUCH DAMAGE. * * from: @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91 - * $FreeBSD: src/sys/alpha/alpha/sys_machdep.c,v 1.21 2002/12/14 01:56:23 alfred Exp $ + * $FreeBSD: src/sys/alpha/alpha/sys_machdep.c,v 1.22 2003/03/06 04:47:47 rwatson Exp $ * */ +#include "opt_mac.h" + #include #include #include +#include #include #include #include @@ -114,6 +117,12 @@ if (error) return (error); +#ifdef MAC + error = mac_check_sysarch_ioperm(td->td_ucred); + if (error) + return (error); +#endif + error = securelevel_gt(td->td_ucred, 0); if (error) return (error); ==== //depot/projects/trustedbsd/base/sys/dev/firewire/firewire.c#10 (text+ko) ==== @@ -30,7 +30,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.43 2003/02/27 12:51:24 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.44 2003/03/06 05:06:44 simokawa Exp $ * */ @@ -522,6 +522,7 @@ while ((xfer = STAILQ_FIRST(&xferq->q)) != NULL) { STAILQ_REMOVE_HEAD(&xferq->q, link); + xferq->queued --; xfer->resp = EAGAIN; switch (xfer->act_type) { case FWACT_XFER: ==== //depot/projects/trustedbsd/base/sys/dev/firewire/firewire.h#5 (text+ko) ==== @@ -30,7 +30,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/firewire.h,v 1.10 2003/02/09 10:14:22 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/firewire.h,v 1.11 2003/03/06 05:06:44 simokawa Exp $ * */ @@ -93,7 +93,7 @@ #define MAXREC(x) (2 << (x)) #define FWPMAX_S400 (2048 + 20) /* MAXREC plus space for control data */ -#define FWMAXQUEUE 128 +#define FWMAXQUEUE 256 #define FWLOCALBUS 0xffc0 ==== //depot/projects/trustedbsd/base/sys/dev/firewire/firewirereg.h#7 (text+ko) ==== @@ -30,7 +30,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/firewirereg.h,v 1.21 2003/02/27 12:51:24 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/firewirereg.h,v 1.22 2003/03/06 05:06:44 simokawa Exp $ * */ @@ -230,10 +230,12 @@ struct fw_bulkxfer{ caddr_t buf; + struct mbuf *mbuf; STAILQ_ENTRY(fw_bulkxfer) link; caddr_t start; caddr_t end; u_int npacket; + int resp; }; struct fw_dvbuf{ ==== //depot/projects/trustedbsd/base/sys/dev/firewire/fwdev.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/fwdev.c,v 1.24 2003/03/03 12:15:42 phk Exp $ + * $FreeBSD: src/sys/dev/firewire/fwdev.c,v 1.25 2003/03/06 05:06:44 simokawa Exp $ * */ @@ -67,6 +67,7 @@ struct cdevsw firewire_cdevsw = { +#if __FreeBSD_version >= 500104 .d_open = fw_open, .d_close = fw_close, .d_read = fw_read, @@ -77,6 +78,10 @@ .d_name = "fw", .d_maj = CDEV_MAJOR, .d_flags = D_MEM +#else + fw_open, fw_close, fw_read, fw_write, fw_ioctl, + fw_poll, fw_mmap, nostrategy, "fw", CDEV_MAJOR, nodump, nopsize, D_MEM +#endif }; static int @@ -707,18 +712,14 @@ for(i = 0 ; i < sc->fc->ir[sub]->bnchunk; i++){ ir->bulkxfer[i].buf = - ir->buf + - i * sc->fc->ir[sub]->bnpacket * - sc->fc->ir[sub]->psize; + ir->buf + i * ir->bnpacket * ir->psize; STAILQ_INSERT_TAIL(&ir->stfree, &ir->bulkxfer[i], link); ir->bulkxfer[i].npacket = ir->bnpacket; } for(i = 0 ; i < sc->fc->it[sub]->bnchunk; i++){ it->bulkxfer[i].buf = - it->buf + - i * sc->fc->it[sub]->bnpacket * - sc->fc->it[sub]->psize; + it->buf + i * it->bnpacket * it->psize; STAILQ_INSERT_TAIL(&it->stfree, &it->bulkxfer[i], link); it->bulkxfer[i].npacket = it->bnpacket; ==== //depot/projects/trustedbsd/base/sys/dev/firewire/fwohci.c#10 (text+ko) ==== @@ -30,7 +30,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/fwohci.c,v 1.43 2003/03/05 01:50:57 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/fwohci.c,v 1.44 2003/03/06 05:06:44 simokawa Exp $ * */ @@ -835,6 +835,7 @@ = (OREAD(sc, OHCI_CYCLETIMER) >> 12) + (1 << 13); } +again: db_tr->dbcnt = 2; db = &db_tr->db[db_tr->dbcnt]; if(len > hdr_off){ @@ -848,7 +849,7 @@ db_tr->dbcnt++; } else { int mchain=0; - /* XXX we assume mbuf chain is shorter than ndesc */ + /* XXX we can handle only 6 (=8-2) mbuf chains */ for (m = xfer->mbuf; m != NULL; m = m->m_next) { if (m->m_len == 0) /* unrecoverable error could occur. */ @@ -864,11 +865,25 @@ db++; db_tr->dbcnt++; } - if (mchain > dbch->ndesc - 2) - device_printf(sc->fc.dev, - "dbch->ndesc(%d) is too small for" - " mbuf chain(%d), trancated.\n", - dbch->ndesc, mchain); + if (mchain > dbch->ndesc - 2) { + struct mbuf *m_new; + if (bootverbose) + device_printf(sc->fc.dev, + "too long mbuf chain(%d)\n", + mchain); + m_new = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); + if (m_new != NULL) { + m_copydata(xfer->mbuf, 0, + xfer->mbuf->m_pkthdr.len, + mtod(m_new, caddr_t)); + m_new->m_pkthdr.len = m_new->m_len = + xfer->mbuf->m_pkthdr.len; + m_freem(xfer->mbuf); + xfer->mbuf = m_new; + goto again; + } + device_printf(sc->fc.dev, "m_getcl failed.\n"); + } } } if (maxdesc < db_tr->dbcnt) { @@ -1401,7 +1416,10 @@ }else{ fwohci_add_rx_buf(db_tr, dbch->xferq.psize, dbch->xferq.flag, - dbch->xferq.buf + dbch->xferq.psize * idb, + dbch->xferq.bulkxfer[idb + / dbch->xferq.bnpacket].buf + + dbch->xferq.psize * + (idb % dbch->xferq.bnpacket), dbch->dummy + sizeof(u_int32_t) * idb); } if(STAILQ_NEXT(db_tr, link) == NULL){ @@ -1611,7 +1629,6 @@ first = STAILQ_FIRST(&ir->stfree); if (first == NULL) { device_printf(fc->dev, "IR DMA no free chunk\n"); - splx(s); return 0; } @@ -1621,6 +1638,10 @@ while ((chunk = STAILQ_FIRST(&ir->stfree)) != NULL) { volatile struct fwohcidb *db; +#if 1 /* XXX for if_fwe */ + db = ((struct fwohcidb_tr *)(chunk->start))->db; + db[ldesc].db.desc.addr = vtophys(chunk->buf); +#endif db = ((struct fwohcidb_tr *)(chunk->end))->db; db[ldesc].db.desc.status = db[ldesc].db.desc.count = 0; db[ldesc].db.desc.depend &= ~0xf; @@ -2068,16 +2089,22 @@ STAILQ_INSERT_TAIL(&ir->stvalid, chunk, link); switch (stat & FWOHCIEV_MASK) { case FWOHCIEV_ACKCOMPL: + chunk->resp = 0; break; default: + chunk->resp = EINVAL; device_printf(fc->dev, "Isochronous receive err %02x\n", stat); } w++; } splx(s); - if (w) - wakeup(ir); + if (w) { + if (ir->flag & FWXFERQ_HANDLER) + ir->hand(ir); + else + wakeup(ir); + } } void ==== //depot/projects/trustedbsd/base/sys/dev/firewire/if_fwe.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/if_fwe.c,v 1.10 2003/02/19 05:47:05 imp Exp $ + * $FreeBSD: src/sys/dev/firewire/if_fwe.c,v 1.11 2003/03/06 05:06:44 simokawa Exp $ */ #include "opt_inet.h" @@ -62,20 +62,21 @@ #include #define FWEDEBUG if (fwedebug) printf -#define MAX_QUEUED IFQ_MAXLEN /* 50 */ +#define TX_MAX_QUEUE (FWMAXQUEUE - 1) +#define RX_MAX_QUEUE FWMAXQUEUE /* network interface */ static void fwe_start __P((struct ifnet *)); static int fwe_ioctl __P((struct ifnet *, u_long, caddr_t)); static void fwe_init __P((void *)); +static void fwe_output_callback __P((struct fw_xfer *)); static void fwe_as_output __P((struct fwe_softc *, struct ifnet *)); static void fwe_as_input __P((struct fw_xferq *)); static int fwedebug = 0; static int stream_ch = 1; -MALLOC_DECLARE(M_FWE); MALLOC_DEFINE(M_FWE, "if_fwe", "Ethernet over FireWire interface"); SYSCTL_INT(_debug, OID_AUTO, if_fwe_debug, CTLFLAG_RW, &fwedebug, 0, ""); SYSCTL_DECL(_hw_firewire); @@ -193,7 +194,7 @@ ifp->if_ioctl = fwe_ioctl; ifp->if_mtu = ETHERMTU; ifp->if_flags = (IFF_BROADCAST|IFF_SIMPLEX|IFF_MULTICAST); - ifp->if_snd.ifq_maxlen = FWMAXQUEUE - 1; + ifp->if_snd.ifq_maxlen = TX_MAX_QUEUE; s = splimp(); #if __FreeBSD_version >= 500000 @@ -209,7 +210,6 @@ ifp->if_capabilities |= IFCAP_VLAN_MTU; #endif - ifp->if_snd.ifq_maxlen = MAX_QUEUED - 1; FWEDEBUG("interface %s%d created.\n", ifp->if_name, ifp->if_unit); return 0; @@ -221,6 +221,8 @@ struct firewire_comm *fc; struct fw_xferq *xferq; struct ifnet *ifp = &fwe->fwe_if; + struct fw_xfer *xfer, *next; + int i; fc = fwe->fd.fc; @@ -232,8 +234,22 @@ if (xferq->flag & FWXFERQ_RUNNING) fc->irx_disable(fc, fwe->dma_ch); xferq->flag &= - ~(FWXFERQ_MODEMASK | FWXFERQ_OPEN | FWXFERQ_HANDLER); - /* XXX dequeue xferq->q */ + ~(FWXFERQ_MODEMASK | FWXFERQ_OPEN | + FWXFERQ_EXTBUF | FWXFERQ_HANDLER); + xferq->hand = NULL; + + for (i = 0; i < xferq->bnchunk; i ++) + m_freem(xferq->bulkxfer[i].mbuf); + free(xferq->bulkxfer, M_FWE); + + for (xfer = STAILQ_FIRST(&fwe->xferlist); xfer != NULL; + xfer = next) { + next = STAILQ_NEXT(xfer, link); + fw_xfer_free(xfer); + } + STAILQ_INIT(&fwe->xferlist); + + xferq->bulkxfer = NULL; fwe->dma_ch = -1; } @@ -260,7 +276,6 @@ return 0; } - static void fwe_init(void *arg) { @@ -268,6 +283,7 @@ struct firewire_comm *fc; struct ifnet *ifp = &fwe->fwe_if; struct fw_xferq *xferq; + struct fw_xfer *xfer; int i; FWEDEBUG("initializing %s%d\n", ifp->if_name, ifp->if_unit); @@ -293,12 +309,51 @@ fwe->stream_ch = stream_ch; fwe->pkt_hdr.mode.stream.chtag = fwe->stream_ch; /* allocate DMA channel and init packet mode */ - xferq->flag |= FWXFERQ_OPEN | FWXFERQ_PACKET; + xferq->flag |= FWXFERQ_OPEN | FWXFERQ_EXTBUF; xferq->flag |= fwe->stream_ch & 0xff; /* register fwe_input handler */ xferq->sc = (caddr_t) fwe; xferq->hand = fwe_as_input; xferq->flag |= FWXFERQ_HANDLER; + xferq->bnchunk = RX_MAX_QUEUE; + xferq->bnpacket = 1; + xferq->psize = MCLBYTES; + xferq->queued = 0; + xferq->bulkxfer = (struct fw_bulkxfer *) malloc( + sizeof(struct fw_bulkxfer) * xferq->bnchunk, M_FWE, 0); + if (xferq->bulkxfer == NULL) { + printf("if_fwe: malloc failed\n"); + return; + } + STAILQ_INIT(&xferq->stvalid); + STAILQ_INIT(&xferq->stfree); + STAILQ_INIT(&xferq->stdma); + xferq->stproc = NULL; + for (i = 0; i < xferq->bnchunk; i ++) { + xferq->bulkxfer[i].mbuf = +#if __FreeBSD_version >= 500000 + m_getcl(M_TRYWAIT, MT_DATA, M_PKTHDR); +#else + m_getcl(M_WAIT, MT_DATA, M_PKTHDR); +#endif + xferq->bulkxfer[i].buf = + mtod(xferq->bulkxfer[i].mbuf, char *); + STAILQ_INSERT_TAIL(&xferq->stfree, + &xferq->bulkxfer[i], link); + } + STAILQ_INIT(&fwe->xferlist); + for (i = 0; i < TX_MAX_QUEUE; i++) { + xfer = fw_xfer_alloc(M_FWE); + if (xfer == NULL) + break; + xfer->send.off = 0; + xfer->spd = 2; + xfer->fc = fwe->fd.fc; + xfer->retry_req = fw_asybusy; + xfer->sc = (caddr_t)fwe; + xfer->act.hand = fwe_output_callback; + STAILQ_INSERT_TAIL(&fwe->xferlist, xfer, link); + } } else xferq = fc->ir[fwe->dma_ch]; @@ -375,6 +430,39 @@ } static void +fwe_output_callback(struct fw_xfer *xfer) +{ + struct fwe_softc *fwe; + struct ifnet *ifp; + int s; + + fwe = (struct fwe_softc *)xfer->sc; + ifp = &fwe->fwe_if; + /* XXX error check */ + FWEDEBUG("resp = %d\n", xfer->resp); + if (xfer->resp != 0) + ifp->if_oerrors ++; + + m_freem(xfer->mbuf); + xfer->send.buf = NULL; +#if 0 + fw_xfer_unload(xfer); +#else + xfer->state = FWXF_INIT; + xfer->resp = 0; + xfer->retry = 0; +#endif + s = splimp(); + STAILQ_INSERT_TAIL(&fwe->xferlist, xfer, link); + splx(s); +#if 1 + /* XXX for queue full */ + if (ifp->if_snd.ifq_head != NULL) + fwe_start(ifp); +#endif +} + +static void fwe_start(struct ifnet *ifp) { struct fwe_softc *fwe = ((struct fwe_eth_softc *)ifp->if_softc)->fwe; @@ -411,29 +499,10 @@ splx(s); } - -static void -fwe_output_callback(struct fw_xfer *xfer) -{ - struct fwe_softc *fwe; - struct ifnet *ifp; - - fwe = (struct fwe_softc *)xfer->sc; - /* XXX error check */ - FWEDEBUG("resp = %d\n", xfer->resp); - m_freem(xfer->mbuf); - xfer->send.buf = NULL; - fw_xfer_free(xfer); -#if 1 - /* XXX for queue full */ - ifp = &fwe->fwe_if; - if (ifp->if_snd.ifq_head != NULL) - fwe_start(ifp); +#define HDR_LEN 4 +#ifndef ETHER_ALIGN +#define ETHER_ALIGN 2 #endif -} - -#define HDR_LEN 4 -#define ALIGN_PAD 2 /* Async. stream output */ static void fwe_as_output(struct fwe_softc *fwe, struct ifnet *ifp) @@ -446,14 +515,16 @@ xfer = NULL; xferq = fwe->fd.fc->atq; - while (xferq->queued < xferq->maxq) { + while (xferq->queued < xferq->maxq - 1) { + xfer = STAILQ_FIRST(&fwe->xferlist); + if (xfer == NULL) { + printf("if_fwe: lack of xfer\n"); + return; + } IF_DEQUEUE(&ifp->if_snd, m); if (m == NULL) break; - xfer = fw_xfer_alloc(M_FWXFER); - if (xfer == NULL) { - return; - } + STAILQ_REMOVE_HEAD(&fwe->xferlist, link); #if __FreeBSD_version >= 500000 BPF_MTAP(ifp, m); #else @@ -461,15 +532,8 @@ bpf_mtap(ifp, m); #endif - xfer->send.off = 0; - xfer->spd = 2; - xfer->fc = fwe->fd.fc; - xfer->retry_req = fw_asybusy; - xfer->sc = (caddr_t)fwe; - xfer->act.hand = fwe_output_callback; - /* keep ip packet alignment for alpha */ - M_PREPEND(m, ALIGN_PAD, M_DONTWAIT); + M_PREPEND(m, ETHER_ALIGN, M_DONTWAIT); fp = (struct fw_pkt *)&xfer->dst; /* XXX */ xfer->dst = *((int32_t *)&fwe->pkt_hdr); fp->mode.stream.len = htons(m->m_pkthdr.len); @@ -477,24 +541,25 @@ xfer->mbuf = m; xfer->send.len = m->m_pkthdr.len + HDR_LEN; - i++; - if (fw_asyreq(xfer->fc, -1, xfer) != 0) { + if (fw_asyreq(fwe->fd.fc, -1, xfer) != 0) { /* error */ ifp->if_oerrors ++; /* XXX set error code */ fwe_output_callback(xfer); } else { ifp->if_opackets ++; + i++; } } #if 0 if (i > 1) printf("%d queued\n", i); #endif - if (xfer != NULL) - xferq->start(xfer->fc); + if (i > 0) + xferq->start(fwe->fd.fc); } +#if 0 #if __FreeBSD_version >= 500000 static void fwe_free(void *buf, void *args) @@ -525,59 +590,54 @@ (*p) ++; } #endif +#endif /* Async. stream output */ static void fwe_as_input(struct fw_xferq *xferq) { struct mbuf *m; - struct ether_header *eh; struct ifnet *ifp; - struct fw_xfer *xfer; struct fwe_softc *fwe; + struct fw_bulkxfer *sxfer; + struct fw_pkt *fp; u_char *c; - int len; - caddr_t p; +#if __FreeBSD_version < 500000 + struct ether_header *eh; +#endif fwe = (struct fwe_softc *)xferq->sc; ifp = &fwe->fwe_if; #if 0 FWE_POLL_REGISTER(fwe_poll, fwe, ifp); #endif - while ((xfer = STAILQ_FIRST(&xferq->q)) != NULL) { - STAILQ_REMOVE_HEAD(&xferq->q, link); + while ((sxfer = STAILQ_FIRST(&xferq->stvalid)) != NULL) { + STAILQ_REMOVE_HEAD(&xferq->stvalid, link); +#if 0 xferq->queued --; - MGETHDR(m, M_DONTWAIT, MT_DATA); - if (m == NULL) { - printf("MGETHDR failed\n"); - fw_xfer_free(xfer); - return; - } - len = xfer->recv.off + xfer->recv.len; - FWEDEBUG("fwe_as_input len=%d\n", len); -#if __FreeBSD_version >= 500000 - MEXTADD(m, xfer->recv.buf, len, fwe_free, NULL, 0, EXT_NET_DRV); -#else - m->m_flags |= M_EXT; - m->m_ext.ext_buf = xfer->recv.buf; - m->m_ext.ext_size = len; - m->m_ext.ext_free = fwe_free; - m->m_ext.ext_ref = fwe_ref; - *((int *)m->m_ext.ext_buf) = 1; /* XXX refcount */ #endif - p = xfer->recv.buf + xfer->recv.off + HDR_LEN + ALIGN_PAD; - eh = (struct ether_header *)p; -#if __FreeBSD_version >= 500000 - len -= xfer->recv.off + HDR_LEN + ALIGN_PAD; -#else - p += sizeof(struct ether_header); - len -= xfer->recv.off + HDR_LEN + ALIGN_PAD - + sizeof(struct ether_header); + if (sxfer->resp != 0) + ifp->if_ierrors ++; + fp = (struct fw_pkt *)sxfer->buf; + /* XXX */ + if (fwe->fd.fc->irx_post != NULL) + fwe->fd.fc->irx_post(fwe->fd.fc, fp->mode.ld); + m = sxfer->mbuf; + + /* insert rbuf */ + sxfer->mbuf = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); + sxfer->buf = mtod(sxfer->mbuf, char *); + STAILQ_INSERT_TAIL(&xferq->stfree, sxfer, link); + + m->m_data += HDR_LEN + ETHER_ALIGN; + c = mtod(m, char *); +#if __FreeBSD_version < 500000 + eh = (struct ether_header *)c; + m->m_data += sizeof(struct ether_header); #endif - m->m_data = p; - m->m_len = m->m_pkthdr.len = len; + m->m_len = m->m_pkthdr.len = + ntohs(fp->mode.stream.len) - ETHER_ALIGN; m->m_pkthdr.rcvif = ifp; - c = (char *)eh; #if 0 FWEDEBUG("%02x %02x %02x %02x %02x %02x\n" "%02x %02x %02x %02x %02x %02x\n" @@ -599,10 +659,9 @@ ether_input(ifp, eh, m); #endif ifp->if_ipackets ++; - - xfer->recv.buf = NULL; - fw_xfer_free(xfer); } + if (STAILQ_FIRST(&xferq->stfree) != NULL) + fwe->fd.fc->irx_enable(fwe->fd.fc, fwe->dma_ch); } ==== //depot/projects/trustedbsd/base/sys/dev/firewire/if_fwevar.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/if_fwevar.h,v 1.1 2002/09/13 12:31:56 ikob Exp $ + * $FreeBSD: src/sys/dev/firewire/if_fwevar.h,v 1.2 2003/03/06 05:06:44 simokawa Exp $ */ #ifndef _NET_IF_FWEVAR_H_ @@ -43,8 +43,9 @@ short stream_ch; short dma_ch; struct fw_pkt pkt_hdr; + STAILQ_HEAD(, fw_xfer) xferlist; struct fwe_eth_softc { - /* XXX this must be first for if_ethersub.c */ + /* XXX this must be the first for if_ethersub.c */ struct arpcom arpcom; /* ethernet common data */ #define fwe_if eth_softc.arpcom.ac_if struct fwe_softc *fwe; ==== //depot/projects/trustedbsd/base/sys/i386/i386/sys_machdep.c#10 (text+ko) ==== @@ -31,15 +31,17 @@ * SUCH DAMAGE. * * from: @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91 - * $FreeBSD: src/sys/i386/i386/sys_machdep.c,v 1.78 2003/02/27 02:05:16 julian Exp $ + * $FreeBSD: src/sys/i386/i386/sys_machdep.c,v 1.79 2003/03/06 04:47:47 rwatson Exp $ * */ #include "opt_kstack_pages.h" +#include "opt_mac.h" #include #include #include +#include #include #include #include @@ -183,6 +185,10 @@ if ((error = copyin(args, &ua, sizeof(struct i386_ioperm_args))) != 0) return (error); +#ifdef MAC + if ((error = mac_check_sysarch_ioperm(td->td_ucred)) != 0) + return (error); +#endif if ((error = suser(td)) != 0) return (error); if ((error = securelevel_gt(td->td_ucred, 0)) != 0) ==== //depot/projects/trustedbsd/base/sys/kern/kern_mac.c#38 (text+ko) ==== @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_mac.c,v 1.80 2003/03/05 23:50:15 rwatson Exp $ + * $FreeBSD: src/sys/kern/kern_mac.c,v 1.81 2003/03/06 04:47:47 rwatson Exp $ */ /* * Developed by the TrustedBSD Project. @@ -2623,6 +2623,18 @@ } int +mac_check_sysarch_ioperm(struct ucred *cred) +{ + int error; + + if (!mac_enforce_system) + return (0); + + MAC_CHECK(check_sysarch_ioperm, cred); + return (error); +} + +int mac_check_system_acct(struct ucred *cred, struct vnode *vp) { int error; ==== //depot/projects/trustedbsd/base/sys/kern/uipc_syscalls.c#26 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)uipc_syscalls.c 8.4 (Berkeley) 2/21/94 - * $FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.141 2003/02/23 23:00:28 tegge Exp $ + * $FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.142 2003/03/06 04:48:19 alc Exp $ */ #include "opt_compat.h" @@ -1672,8 +1672,6 @@ struct sf_buf *sf; struct vm_page *m; - GIANT_REQUIRED; - sf = dtosf(addr); pmap_qremove((vm_offset_t)addr, 1); m = sf->m; ==== //depot/projects/trustedbsd/base/sys/sys/mac.h#25 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/mac.h,v 1.35 2003/03/05 23:50:14 rwatson Exp $ + * $FreeBSD: src/sys/sys/mac.h,v 1.36 2003/03/06 04:47:47 rwatson Exp $ */ /* * Userland/kernel interface for Mandatory Access Control. @@ -264,6 +264,7 @@ int mac_check_socket_receive(struct ucred *cred, struct socket *so); int mac_check_socket_send(struct ucred *cred, struct socket *so); int mac_check_socket_visible(struct ucred *cred, struct socket *so); +int mac_check_sysarch_ioperm(struct ucred *cred); int mac_check_system_acct(struct ucred *cred, struct vnode *vp); int mac_check_system_nfsd(struct ucred *cred); int mac_check_system_reboot(struct ucred *cred, int howto); ==== //depot/projects/trustedbsd/base/sys/sys/mac_policy.h#25 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/mac_policy.h,v 1.35 2003/03/05 23:50:14 rwatson Exp $ + * $FreeBSD: src/sys/sys/mac_policy.h,v 1.36 2003/03/06 04:47:47 rwatson Exp $ */ /* * Kernel interface for MAC policy modules. @@ -322,6 +322,7 @@ struct socket *so, struct label *socketlabel); int (*mpo_check_socket_visible)(struct ucred *cred, struct socket *so, struct label *socketlabel); + int (*mpo_check_sysarch_ioperm)(struct ucred *cred); int (*mpo_check_system_acct)(struct ucred *cred, struct vnode *vp, struct label *vlabel); int (*mpo_check_system_nfsd)(struct ucred *cred); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 5 22:14:37 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C349937B405; Wed, 5 Mar 2003 22:14:10 -0800 (PST) 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 238FF37B401 for ; Wed, 5 Mar 2003 22:14:10 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1794143F75 for ; Wed, 5 Mar 2003 22:14:08 -0800 (PST) (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.6/8.12.6) with ESMTP id h266E70U061986 for ; Wed, 5 Mar 2003 22:14:07 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h266DxuC061885 for perforce@freebsd.org; Wed, 5 Mar 2003 22:13:59 -0800 (PST) Date: Wed, 5 Mar 2003 22:13:59 -0800 (PST) Message-Id: <200303060613.h266DxuC061885@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 Subject: PERFORCE change 26417 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=26417 Change 26417 by rwatson@rwatson_tislabs on 2003/03/05 22:13:02 Integrate the MAC branch: sendmail bugfix, tcpdump fix; also loop back sysarch check, swapoff check, portacl, and countless other things. Affected files ... .. //depot/projects/trustedbsd/mac/Makefile#19 integrate .. //depot/projects/trustedbsd/mac/Makefile.inc1#35 integrate .. //depot/projects/trustedbsd/mac/bin/date/date.1#7 integrate .. //depot/projects/trustedbsd/mac/bin/dd/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/bin/dd/args.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/dd/conv.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/dd/dd.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/dd/dd.h#4 integrate .. //depot/projects/trustedbsd/mac/bin/dd/extern.h#5 integrate .. //depot/projects/trustedbsd/mac/bin/dd/misc.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/dd/position.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/getfacl/getfacl.1#6 integrate .. //depot/projects/trustedbsd/mac/bin/sh/memalloc.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/sh/nodes.c.pat#5 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/include/opcode/arc.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/binutils/include/opcode/convex.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/binutils/include/opcode/np1.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/binutils/include/opcode/pn.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/binutils/ld/emulparams/arcelf.sh#3 delete .. //depot/projects/trustedbsd/mac/contrib/binutils/ld/emulparams/elf32b4300.sh#4 delete .. //depot/projects/trustedbsd/mac/contrib/binutils/ld/emulparams/elf32bmip.sh#4 delete .. //depot/projects/trustedbsd/mac/contrib/binutils/ld/emulparams/elf32bmipn32.sh#4 delete .. //depot/projects/trustedbsd/mac/contrib/binutils/ld/emulparams/elf32bsmip.sh#4 delete .. //depot/projects/trustedbsd/mac/contrib/binutils/ld/emulparams/elf32ebmip.sh#4 delete .. //depot/projects/trustedbsd/mac/contrib/binutils/ld/emulparams/elf32elmip.sh#4 delete .. //depot/projects/trustedbsd/mac/contrib/binutils/ld/emulparams/elf32l4300.sh#4 delete .. //depot/projects/trustedbsd/mac/contrib/binutils/ld/emulparams/elf32lmip.sh#4 delete .. //depot/projects/trustedbsd/mac/contrib/binutils/ld/emulparams/elf32lsmip.sh#4 delete .. //depot/projects/trustedbsd/mac/contrib/binutils/ld/emulparams/elf64bmip.sh#4 delete .. //depot/projects/trustedbsd/mac/contrib/binutils/ld/emulparams/sh.sh#4 delete .. //depot/projects/trustedbsd/mac/contrib/binutils/ld/emulparams/shl.sh#4 delete .. //depot/projects/trustedbsd/mac/contrib/binutils/ld/emulparams/shlelf.sh#4 delete .. //depot/projects/trustedbsd/mac/contrib/binutils/ld/emulparams/vsta.sh#3 delete .. //depot/projects/trustedbsd/mac/contrib/file/.cvsignore#1 branch .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/elf#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/filesystems#5 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/hdf#1 branch .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/jpeg#3 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/macintosh#3 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/sql#1 branch .. //depot/projects/trustedbsd/mac/contrib/file/Makefile.am#5 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Makefile.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Makefile.std#5 integrate .. //depot/projects/trustedbsd/mac/contrib/file/README#5 integrate .. //depot/projects/trustedbsd/mac/contrib/file/acconfig.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/aclocal.m4#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/apprentice.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/config.h.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/file/configure#5 integrate .. //depot/projects/trustedbsd/mac/contrib/file/configure.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/file/file.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/file/file.man#5 integrate .. //depot/projects/trustedbsd/mac/contrib/file/magic.man#5 integrate .. //depot/projects/trustedbsd/mac/contrib/file/magic.mime#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/patchlevel.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/file/readelf.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/file/softmagic.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/FREEBSD-upgrade#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/PGPKEYS#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/RELEASE_NOTES#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/README#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/submit.cf#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/m4/version.m4#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/bsd4.4.m4#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/contrib/bitdomain.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/doc/op/op.me#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/comm.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_setreply.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/handler.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/libmilter.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/listener.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/main.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/stdio.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsmdb/smdb2.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/mail.local/mail.local.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/mailstats/mailstats.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/makemap/makemap.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/praliases/praliases.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/smrsh/smrsh.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/README#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/TUNING#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/aliases.5#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/conf.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/conf.h#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/daemon.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/deliver.c#13 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/domain.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/err.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/headers.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/mailq.1#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/main.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/mci.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/milter.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/parseaddr.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/queue.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/savemail.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/sendmail.h#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/srvrsmtp.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/tls.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/version.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/vacation/vacation.1#8 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/CHANGES#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/CREDITS#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/FILES#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/INSTALL#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/README#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/VERSION#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/addrtoname.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/config.h.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/configure#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/configure.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/dhcp6.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/tcpdump/dhcp6opt.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/tcpdump/gmt2local.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/interface.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-802_11.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-arcnet.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-arp.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-atalk.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-beep.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-bgp.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-bootp.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-dhcp6.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-egp.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-esp.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ether.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-fddi.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-gre.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-icmp.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-icmp6.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-igmp.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ip.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-isakmp.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-isoclns.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-l2tp.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-mobile.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-mpls.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-nfs.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ntp.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-null.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-pim.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-radius.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-raw.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-rx.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-sctp.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-sll.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-smb.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-snmp.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-stp.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-sunrpc.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-zephyr.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/smbutil.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/util.c#3 integrate .. //depot/projects/trustedbsd/mac/etc/Makefile#27 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.include.dist#23 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ipfilter#6 integrate .. //depot/projects/trustedbsd/mac/etc/rc.network#16 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes#22 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes2#14 integrate .. //depot/projects/trustedbsd/mac/games/random/random.6#3 integrate .. //depot/projects/trustedbsd/mac/gnu/include/values.h#2 delete .. //depot/projects/trustedbsd/mac/gnu/lib/csu/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/doc/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gasp/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/gcov/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/include/Makefile#30 integrate .. //depot/projects/trustedbsd/mac/include/resolv.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/getdomainname.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/getosreldate.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/getpwent.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/nlist.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/setmode.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/signbit.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/stringlist.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/_fpmath.h#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/gen/__divdf3.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/gen/__divdi3.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/gen/__divsf3.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/gen/__divsi3.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/gen/__moddi3.S#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/gen/__modsi3.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/gen/__udivdi3.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/gen/__udivsi3.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/gen/__umoddi3.S#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/gen/__umodsi3.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/gen/_setjmp.S#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/gen/fabs.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/gen/infinity.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/gen/setjmp.S#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/gen/sigsetjmp.S#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/net/byte_swap_2.S#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/net/byte_swap_4.S#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/net/htonl.S#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/net/htons.S#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/net/ntohl.S#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/net/ntohs.S#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/string/bcopy.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/string/bzero.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/string/ffs.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/string/memcpy.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/string/memmove.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/sys/Ovfork.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/sys/brk.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/sys/cerror.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/sys/exect.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/sys/fork.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/sys/pipe.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/sys/ptrace.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/sys/sbrk.S#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/sys/setlogin.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/sys/sigreturn.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/include/libc_private.h#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/wcstod.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getaddrinfo.c#10 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getservent.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/iso_addr.3#3 delete .. //depot/projects/trustedbsd/mac/lib/libc/net/iso_addr.c#3 delete .. //depot/projects/trustedbsd/mac/lib/libc/net/ns.3#2 delete .. //depot/projects/trustedbsd/mac/lib/libc/net/ns_addr.c#6 delete .. //depot/projects/trustedbsd/mac/lib/libc/net/ns_ntoa.c#6 delete .. //depot/projects/trustedbsd/mac/lib/libc/net/nsdispatch.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/nslexer.l#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/rcmdsh.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/res_query.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/acl_delete.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/acl_get.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/acl_set.3#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac.3#13 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_prepare.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_set.c#9 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/getrpcent.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/rpc_com.h#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/svc_run.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/ferror.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/getc.3#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/putc.3#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/stdio.3#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/insque.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/realpath.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/clock_gettime.2#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/kse.2#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/mincore.2#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/mount.2#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/mprotect.2#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/rfork.2#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/socket.2#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/xdr/xdr_rec.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/pthread_attr.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/pthread_attr_get_np.3#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/pthread_attr_setcreatesuspend_np.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/pthread_main_np.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/pthread_multi_np.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/pthread_mutexattr_getkind_np.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/pthread_resume_all_np.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/pthread_resume_np.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/pthread_set_name_np.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/pthread_suspend_all_np.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/pthread_suspend_np.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/pthread_switch_add_np.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/man/sem_open.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/pthread_private.h#13 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_sig.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libfetch/common.c#11 integrate .. //depot/projects/trustedbsd/mac/lib/libfetch/common.h#8 integrate .. //depot/projects/trustedbsd/mac/lib/libfetch/fetch.3#6 integrate .. //depot/projects/trustedbsd/mac/lib/libgeom/libgeom.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libkvm/kvm_proc.c#10 integrate .. //depot/projects/trustedbsd/mac/lib/libncp/ncp_mod.h#3 delete .. //depot/projects/trustedbsd/mac/lib/libncp/ncpl_net.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libncp/ncpl_subr.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libncurses/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_group/pam_group.8#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_kerberosIV/pam_kerberosIV.8#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_ssh/pam_ssh.8#6 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/man/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/man/pthread_attr_get_np.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_get_np.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_kern.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_sig.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_sigaction.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libstand/nfs.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libstand/tftp.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libutil/login.conf.5#7 integrate .. //depot/projects/trustedbsd/mac/lib/libutil/realhostname_sa.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/msun/man/lgamma.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/msun/src/math.h#9 integrate .. //depot/projects/trustedbsd/mac/libexec/ftpd/ftpd.8#8 integrate .. //depot/projects/trustedbsd/mac/libexec/getty/gettytab.5#4 integrate .. //depot/projects/trustedbsd/mac/release/Makefile#40 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/errata/article.sgml#6 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#33 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml#5 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#51 integrate .. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#16 integrate .. //depot/projects/trustedbsd/mac/release/i386/dokern.sh#15 integrate .. //depot/projects/trustedbsd/mac/release/pc98/dokern.sh#7 integrate .. //depot/projects/trustedbsd/mac/release/scripts/checkindex.pl#1 branch .. //depot/projects/trustedbsd/mac/release/scripts/doFS.sh#8 integrate .. //depot/projects/trustedbsd/mac/release/scripts/print-cdrom-packages.sh#15 integrate .. //depot/projects/trustedbsd/mac/sbin/Makefile#15 integrate .. //depot/projects/trustedbsd/mac/sbin/badsect/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sbin/badsect/badsect.c#8 integrate .. //depot/projects/trustedbsd/mac/sbin/ccdconfig/ccdconfig.8#7 integrate .. //depot/projects/trustedbsd/mac/sbin/comcontrol/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sbin/devd/devd.8#6 integrate .. //depot/projects/trustedbsd/mac/sbin/devd/devd.conf.5#6 integrate .. //depot/projects/trustedbsd/mac/sbin/disklabel/disklabel.8#14 integrate .. //depot/projects/trustedbsd/mac/sbin/disklabel/disklabel.c#18 integrate .. //depot/projects/trustedbsd/mac/sbin/dmesg/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sbin/dump/dump.8#12 integrate .. //depot/projects/trustedbsd/mac/sbin/dump/main.c#15 integrate .. //depot/projects/trustedbsd/mac/sbin/dumpfs/dumpfs.8#6 integrate .. //depot/projects/trustedbsd/mac/sbin/fsck/fsck.c#8 integrate .. //depot/projects/trustedbsd/mac/sbin/gbde/gbde.c#6 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifconfig.8#17 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifconfig.c#16 integrate .. //depot/projects/trustedbsd/mac/sbin/init/init.8#5 integrate .. //depot/projects/trustedbsd/mac/sbin/ip6fw/ip6fw.8#7 integrate .. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw.8#19 integrate .. //depot/projects/trustedbsd/mac/sbin/kldload/kldload.8#7 integrate .. //depot/projects/trustedbsd/mac/sbin/mdconfig/mdconfig.8#5 integrate .. //depot/projects/trustedbsd/mac/sbin/mdconfig/mdconfig.c#8 integrate .. //depot/projects/trustedbsd/mac/sbin/mknod/mknod.8#5 integrate .. //depot/projects/trustedbsd/mac/sbin/mksnap_ffs/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sbin/mksnap_ffs/mksnap_ffs.8#1 branch .. //depot/projects/trustedbsd/mac/sbin/mksnap_ffs/mksnap_ffs.c#1 branch .. //depot/projects/trustedbsd/mac/sbin/mount/mount.8#9 integrate .. //depot/projects/trustedbsd/mac/sbin/natd/natd.8#7 integrate .. //depot/projects/trustedbsd/mac/sbin/newfs/mkfs.c#13 integrate .. //depot/projects/trustedbsd/mac/sbin/newfs/newfs.8#12 integrate .. //depot/projects/trustedbsd/mac/sbin/newfs/ref.test#3 integrate .. //depot/projects/trustedbsd/mac/sbin/ping/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sbin/ping/ping.8#7 integrate .. //depot/projects/trustedbsd/mac/sbin/ping/ping.c#13 integrate .. //depot/projects/trustedbsd/mac/sbin/route/route.c#6 integrate .. //depot/projects/trustedbsd/mac/sbin/swapon/swapon.8#6 integrate .. //depot/projects/trustedbsd/mac/sbin/swapon/swapon.c#5 integrate .. //depot/projects/trustedbsd/mac/sbin/tunefs/tunefs.8#14 integrate .. //depot/projects/trustedbsd/mac/sbin/tunefs/tunefs.c#13 integrate .. //depot/projects/trustedbsd/mac/sbin/umount/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/Makefile.inc#9 integrate .. //depot/projects/trustedbsd/mac/secure/usr.bin/openssl/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/share/examples/cvsup/cvs-supfile#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/Makefile#26 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/aac.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/an.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/card.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/ciss.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/devctl.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/dpt.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/exca.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/fast_ipsec.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/firewire.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/fwe.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/fwohci.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/gif.4#9 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ida.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/iir.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ip.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/lmc.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/mac.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/netgraph.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/random.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/sbp.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/sio.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/targ.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ubsec.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ugen.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/vinum.4#9 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/wi.4#9 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/msdosfs.5#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/periodic.conf.5#11 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/rc.conf.5#19 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/style.Makefile.5#1 branch .. //depot/projects/trustedbsd/mac/share/man/man7/operator.7#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man7/ports.7#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man8/diskless.8#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/malloc.9#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/mbuf.9#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/sleep.9#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/uio.9#4 integrate .. //depot/projects/trustedbsd/mac/share/misc/pci_vendors#16 integrate .. //depot/projects/trustedbsd/mac/share/mk/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.kern.mk#6 delete .. //depot/projects/trustedbsd/mac/share/mk/bsd.own.mk#7 integrate .. //depot/projects/trustedbsd/mac/share/syscons/keymaps/it.iso.kbd#2 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/busdma_machdep.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/dec_kn8ae.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/machdep.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/mem.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/pmap.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/prom.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/promcons.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/sys_machdep.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/trap.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/conf/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/conf/NOTES#2 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/conf/SIMOS#8 delete .. //depot/projects/trustedbsd/mac/sys/alpha/include/atomic.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/include/bus.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/include/db_machdep.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/include/pmap.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/linux/linux_machdep.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/tlsb/dwlpx.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/tlsb/tlsb.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/tlsb/zs_tlsb.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/boot/alpha/common/Makefile.common#2 integrate .. //depot/projects/trustedbsd/mac/sys/boot/common/help.common#8 integrate .. //depot/projects/trustedbsd/mac/sys/boot/common/loader.8#17 integrate .. //depot/projects/trustedbsd/mac/sys/boot/common/module.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/boot/common/ufsread.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/boot/efi/libefi/efifs.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/boot/efi/libefi/libefi.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/boot/efi/loader/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/boot/efi/loader/main.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/boot/forth/loader.conf#18 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/boot2/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/sys/boot/ia64/skiload/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sys/boot/pc98/boot2/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/sys/cam/cam_xpt.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_cd.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_ch.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_da.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_pass.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_pt.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_sa.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_ses.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_target.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/coda/coda_fbsd.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/coda/coda_vnops.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/coda/coda_vnops.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_file.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_ioctl.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_ipc.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_misc.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_socket.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_stats.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_sysctl.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_uid16.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_misc.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/conf/Makefile.alpha#6 integrate .. //depot/projects/trustedbsd/mac/sys/conf/Makefile.i386#7 integrate .. //depot/projects/trustedbsd/mac/sys/conf/Makefile.ia64#10 integrate .. //depot/projects/trustedbsd/mac/sys/conf/Makefile.pc98#6 integrate .. //depot/projects/trustedbsd/mac/sys/conf/Makefile.powerpc#9 integrate .. //depot/projects/trustedbsd/mac/sys/conf/Makefile.sparc64#11 integrate .. //depot/projects/trustedbsd/mac/sys/conf/Makefile.x86_64#3 integrate .. //depot/projects/trustedbsd/mac/sys/conf/NOTES#35 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files#76 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.alpha#14 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.i386#24 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.ia64#16 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.pc98#21 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.powerpc#10 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.sparc64#18 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.x86_64#5 integrate .. //depot/projects/trustedbsd/mac/sys/conf/kern.mk#3 integrate .. //depot/projects/trustedbsd/mac/sys/conf/kern.post.mk#19 integrate .. //depot/projects/trustedbsd/mac/sys/conf/kern.pre.mk#15 integrate .. //depot/projects/trustedbsd/mac/sys/conf/kmod.mk#17 integrate .. //depot/projects/trustedbsd/mac/sys/conf/majors#19 integrate .. //depot/projects/trustedbsd/mac/sys/conf/majors.awk#1 branch .. //depot/projects/trustedbsd/mac/sys/conf/makeLINT.mk#1 branch .. //depot/projects/trustedbsd/mac/sys/conf/makeLINT.sed#2 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options#44 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options.i386#12 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options.pc98#13 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/fla/fla.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_auth.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/mlfk_ipl.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/db_ps.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aac/aac.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aac/aac_cam.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aac/aac_disk.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aac/aac_pci.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aac/aacvar.h#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/dev/advansys/advlib.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aic79xx.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aic79xx.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aic79xx.reg#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aic79xx.seq#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aic79xx_inline.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aic79xx_osm.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aic79xx_pci.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/amr/amr.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/amr/amr_disk.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/amr/amrvar.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ar/if_ar.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ar/if_ar_isa.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/asr/asr.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-all.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-card.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-disk.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-disk.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-isa.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-pci.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-raid.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-raid.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/atapi-all.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/atapi-cam.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/atapi-cd.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/atapi-fd.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/atapi-fd.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/atapi-tape.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/bktr/bktr_os.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ccd/ccd.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ciss/ciss.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/cnw/if_cnw.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/dgb/dgb.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/digi/digi.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_drv.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_vm.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ed/if_ed_cbus.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/en/midway.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ep/if_ep_isa.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fb/fb.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fb/fbreg.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fb/gfb.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fb/s3_pci.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fb/vga.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fb/vgareg.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/firewire/firewire.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/firewire/firewire.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/firewire/firewirereg.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/firewire/fwdev.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/firewire/fwmem.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/firewire/fwohci.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/firewire/if_fwe.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/firewire/if_fwevar.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/firewire/sbp.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fxp/if_fxp.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fxp/if_fxpreg.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fxp/if_fxpvar.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/gfb/gfb_pci.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hea/eni_buffer.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hea/eni_receive.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hfa/fore_command.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hfa/fore_load.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hfa/fore_receive.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ida/ida.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ida/ida_disk.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ida/ida_eisa.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ida/ida_pci.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/iicbus/if_ic.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/iicbus/iic.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/iir/iir_ctrl.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_freebsd.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/joy/joy.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/kbd/kbd.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mcd/mcd.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/md/md.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mlx/mlx.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mlx/mlx_compat.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mlx/mlx_disk.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mlx/mlxvar.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mly/mly.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_pci.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/nmdm/nmdm.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/null/null.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ofw/ofw_console.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ofw/ofw_disk.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ofw/openfirmio.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pccbb/pccbbdevid.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pci/pci_user.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pcic/i82365.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ppbus/if_plip.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ppbus/lpt.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ppbus/pcfclock.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ppbus/ppi.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ppbus/pps.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pst/pst-raid.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/raidframe/rf_freebsdkintf.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/random/randomdev.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ray/if_ray.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/rc/rc.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/rp/rp.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sab/sab.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/scd/scd.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/si/si.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sio/sio.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sio/sio_pci.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/smbus/smb.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sn/if_sn.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/snp/snp.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/midi/midi.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/midi/sequencer.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/emu10k1.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/via8233.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/via8233.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/via82c686.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/via82c686.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/ac97.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/channel.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/dsp.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/feeder.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/feeder_fmt.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/feeder_rate.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/mixer.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/sndstat.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/streams/streams.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/syscons/syscons.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/syscons/sysmouse.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/tdfx/tdfx_pci.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/tga/tga_pci.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/twe/twe_compat.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/twe/twe_freebsd.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/tx/if_txvar.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ubsec/ubsec.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ubsec/ubsecreg.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/if_aue.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ohci.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ucom.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ufm.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ugen.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uhci.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uhid.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ulpt.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ums.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/urio.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usb.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usb_ethersubr.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usb_ethersubr.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdi_util.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdi_util.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uscanner.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinum.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumext.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumio.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumioctl.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumrequest.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/wi/if_wi.c#30 integrate .. //depot/projects/trustedbsd/mac/sys/dev/zs/zs.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/fs/deadfs/dead_vnops.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_devs.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#44 integrate .. //depot/projects/trustedbsd/mac/sys/fs/fdescfs/fdesc_vnops.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/fs/fifofs/fifo_vnops.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/fs/hpfs/hpfs_alsubr.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/fs/hpfs/hpfs_subr.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/fs/hpfs/hpfs_vnops.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/fs/msdosfs/msdosfs_fat.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/fs/msdosfs/msdosfs_vnops.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/fs/ntfs/ntfs_subr.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/fs/ntfs/ntfs_vnops.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/fs/nullfs/null_vnops.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/fs/nwfs/nwfs_io.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/fs/nwfs/nwfs_vnops.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/fs/portalfs/portal_vnops.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/fs/procfs/procfs_ctl.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/fs/procfs/procfs_status.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs.h#16 integrate .. //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs_vnops.c#25 integrate .. //depot/projects/trustedbsd/mac/sys/fs/smbfs/smbfs_io.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/fs/smbfs/smbfs_vnops.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/fs/specfs/spec_vnops.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/fs/udf/udf_vnops.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/fs/umapfs/umap_vnops.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/fs/unionfs/union_subr.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/fs/unionfs/union_vnops.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_apple.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_dev.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_disk.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_stats.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_balloc.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_bmap.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_inode.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_lookup.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_vfsops.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_vnops.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/fs.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/sparc64-bitops.h#1 branch .. //depot/projects/trustedbsd/mac/sys/i386/acpica/acpi_machdep.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/i386/apm/apm.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/i386/conf/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/sys/i386/conf/NOTES#34 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/busdma_machdep.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/db_interface.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/elan-mmcr.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/genassym.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/identcpu.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/locore.s#10 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/mem.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/mp_machdep.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/perfmon.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/pmap.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/sys_machdep.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/trap.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/vm_machdep.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/bus_at386.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/bus_pc98.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/param.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/pmap.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/vmparam.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/asc.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/ctx.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/cx.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/cy.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/gpib.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/gsc.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/if_rdp.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/istallion.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/loran.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/mse.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/pcaudio.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/pcvt/pcvt_drv.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/pcvt/pcvt_ext.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/pcvt/pcvt_kbd.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/spic.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/spigot.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/spkr.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/stallion.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/tw.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/vesa.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/wt.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/i386/linux/imgact_linux.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/i386/linux/linux.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/i386/linux/linux_machdep.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/i386/linux/linux_ptrace.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/i386/linux/linux_sysvec.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/i386/smapi/smapi.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/i4b/driver/i4b_ctl.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/i4b/driver/i4b_ipr.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/i4b/driver/i4b_rbch.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/i4b/driver/i4b_tel.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/i4b/driver/i4b_trace.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/i4b/layer4/i4b_i4bdrv.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/busdma_machdep.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/mem.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/pmap.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/ssc.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/trap.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/include/bus.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/include/pmap.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/include/setjmp.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/isa/fd.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/isa/ppc.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/isa/psm.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/isa/vga_isa.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/isofs/cd9660/cd9660_vnops.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/kern/Make.tags.inc#4 integrate .. //depot/projects/trustedbsd/mac/sys/kern/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_clock.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_condvar.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_conf.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#40 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#55 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_exit.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_fork.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_intr.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_ktr.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_linker.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_lock.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#375 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_mutex.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_poll.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_proc.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_sig.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_subr.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_switch.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_synch.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_sysctl.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_thread.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_time.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sched_4bsd.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sched_ule.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_bus.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_disk.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_log.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_mbuf.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_taskqueue.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_trap.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_witness.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_xxx.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/kern/tty.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/kern/tty_cons.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/kern/tty_pty.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/kern/tty_tty.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#48 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket2.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_syscalls.c#29 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_bio.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_cluster.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_default.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_mount.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#52 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#101 integrate .. //depot/projects/trustedbsd/mac/sys/libkern/strdup.c#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/Makefile#57 integrate .. //depot/projects/trustedbsd/mac/sys/modules/aac/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/modules/if_gre/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sys/modules/mac_portacl/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/nmdm/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sys/modules/null/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/osf1/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/modules/rc/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sys/net/bpf.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/net/if.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_arcsubr.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_atmsubr.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_ef.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_ethersubr.c#30 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_faith.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_fddisubr.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_gif.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_gre.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_ieee80211subr.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_iso88025subr.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_loop.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_ppp.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_sl.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_spppsubr.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_stf.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_tap.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_tun.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_vlan.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/net/intrq.c#5 delete .. //depot/projects/trustedbsd/mac/sys/net/intrq.h#4 delete .. //depot/projects/trustedbsd/mac/sys/net/netisr.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/net/netisr.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/net/route.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/net/route.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/net/rtsock.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/netatalk/aarp.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/netatalk/at_extern.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/netatalk/at_var.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/netatalk/ddp_input.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/netatalk/ddp_usrreq.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/atm_device.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/atm_subr.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/atm_var.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/ipatm/ipatm_input.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/port.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/uni/q2110_sigcpcs.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/uni/qsaal1_sigcpcs.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/uni/sscop_sigcpcs.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/uni/sscop_subr.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_base.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_device.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_fec.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_gif_demux.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_gif_demux.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_iface.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_iface.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_ip_input.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_ppp.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/if_ether.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/if_ether.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/in_proto.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/in_var.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_gre.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_input.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_mroute.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_var.h#13 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_input.c#35 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_subr.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_syncache.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_usrreq.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/ah_input.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/esp_input.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/in6_var.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/ip6_input.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/ip6_var.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/ipsec.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/netipsec/ipsec.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/netipsec/ipsec_input.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/netipsec/xform_ah.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/netipsec/xform_esp.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/netipsec/xform_ipcomp.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/netipsec/xform_ipip.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/netipx/ipx.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/netipx/ipx_if.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/netipx/ipx_input.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/netipx/ipx_ip.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/netipx/ipx_var.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/netnatm/natm.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/netnatm/natm.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/netnatm/natm_proto.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/netncp/ncp.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/netncp/ncp_conn.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/netncp/ncp_conn.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/netncp/ncp_mod.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/netncp/ncp_ncp.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/netncp/ncp_ncp.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/netncp/ncp_rq.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/netncp/ncp_rq.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/netncp/ncp_sock.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/netncp/ncp_sock.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/netncp/ncp_subr.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/netncp/ncp_subr.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/netncp/ncpio.h#1 branch .. //depot/projects/trustedbsd/mac/sys/netns/idp.h#2 delete .. //depot/projects/trustedbsd/mac/sys/netns/idp_usrreq.c#6 delete .. //depot/projects/trustedbsd/mac/sys/netns/idp_var.h#2 delete .. //depot/projects/trustedbsd/mac/sys/netns/ns.c#4 delete .. //depot/projects/trustedbsd/mac/sys/netns/ns.h#4 delete .. //depot/projects/trustedbsd/mac/sys/netns/ns_cksum.c#2 delete .. //depot/projects/trustedbsd/mac/sys/netns/ns_error.c#3 delete .. //depot/projects/trustedbsd/mac/sys/netns/ns_error.h#2 delete .. //depot/projects/trustedbsd/mac/sys/netns/ns_if.h#5 delete .. //depot/projects/trustedbsd/mac/sys/netns/ns_input.c#5 delete .. //depot/projects/trustedbsd/mac/sys/netns/ns_ip.c#4 delete .. //depot/projects/trustedbsd/mac/sys/netns/ns_output.c#2 delete .. //depot/projects/trustedbsd/mac/sys/netns/ns_pcb.c#5 delete .. //depot/projects/trustedbsd/mac/sys/netns/ns_pcb.h#2 delete .. //depot/projects/trustedbsd/mac/sys/netns/ns_proto.c#2 delete .. //depot/projects/trustedbsd/mac/sys/netns/sp.h#2 delete .. //depot/projects/trustedbsd/mac/sys/netns/spidp.h#2 delete .. //depot/projects/trustedbsd/mac/sys/netns/spp_debug.c#2 delete .. //depot/projects/trustedbsd/mac/sys/netns/spp_debug.h#2 delete .. //depot/projects/trustedbsd/mac/sys/netns/spp_timer.h#2 delete .. //depot/projects/trustedbsd/mac/sys/netns/spp_usrreq.c#6 delete .. //depot/projects/trustedbsd/mac/sys/netns/spp_var.h#2 delete .. //depot/projects/trustedbsd/mac/sys/netsmb/netbios.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/netsmb/smb_dev.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_bio.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_nfsiod.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_socket.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_vnops.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_serv.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_srvcache.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_srvsock.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_syscalls.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/opencrypto/crypto.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/opencrypto/cryptodev.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/opencrypto/cryptodev.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/apm/apm.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/conf/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/pc98/conf/NOTES#1 branch .. //depot/projects/trustedbsd/mac/sys/pc98/i386/machdep.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/pc98/atapi.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/pc98/fd.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/pc98/mse.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/pc98/olpt.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/pc98/pc98gdc.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/pc98/pcaudio.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/pc98/ppc.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/pc98/sio.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/pc98/spkr.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/pc98/syscons.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/pc98/wd.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/pc98/wd_cd.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/pccard/pccard.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/pccard/pcic_pci.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/pci/agp.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_rl.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_rlreg.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_ti.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_xl.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/pci/intpm.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/pci/meteor.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/pci/simos.c#5 delete .. //depot/projects/trustedbsd/mac/sys/pci/simos.h#2 delete .. //depot/projects/trustedbsd/mac/sys/pci/xrpu.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/powerpc/include/bus.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/powerpc/include/cpufunc.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/powerpc/ofw/ofw_pci.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/powerpc/powermac/ata_macio.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/atomic.s#2 delete .. //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/locore.s#7 delete .. //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/ofwmagic.s#2 delete .. //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/pmap.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/swtch.s#8 delete .. //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/trap.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/trap_subr.S#6 integrate .. //depot/projects/trustedbsd/mac/sys/powerpc/psim/ata_iobus.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_portacl/mac_portacl.c#1 branch .. //depot/projects/trustedbsd/mac/sys/sparc64/conf/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/sparc64/conf/NOTES#1 branch .. //depot/projects/trustedbsd/mac/sys/sparc64/include/bus.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/iommu.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/mem.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/pmap.c#29 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/trap.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/sys/_iovec.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/sys/_timespec.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/sys/_types.h#9 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Mar 6 9:44:29 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 49FF237B405; Thu, 6 Mar 2003 09:44:27 -0800 (PST) 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 ED2D937B401 for ; Thu, 6 Mar 2003 09:44:26 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9E5E143F93 for ; Thu, 6 Mar 2003 09:44:26 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h26HiQ0U035377 for ; Thu, 6 Mar 2003 09:44:26 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h26HiQBT035374 for perforce@freebsd.org; Thu, 6 Mar 2003 09:44:26 -0800 (PST) Date: Thu, 6 Mar 2003 09:44:26 -0800 (PST) Message-Id: <200303061744.h26HiQBT035374@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 26435 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=26435 Change 26435 by jhb@jhb_laptop on 2003/03/06 09:44:05 We don't actually need sched_lock to test TDF_DEADLKTREAT because we only ever set it on curthread and test it on curthread. Affected files ... .. //depot/projects/smpng/sys/kern/kern_lock.c#22 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_lock.c#22 (text+ko) ==== @@ -265,10 +265,8 @@ */ if (lkp->lk_lockholder != thr) { lockflags = LK_HAVE_EXCL; - mtx_lock_spin(&sched_lock); if (td != NULL && !(td->td_flags & TDF_DEADLKTREAT)) lockflags |= LK_WANT_EXCL | LK_WANT_UPGRADE; - mtx_unlock_spin(&sched_lock); error = acquire(&lkp, extflags, lockflags); if (error) break; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Mar 6 12:19: 4 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7153B37B405; Thu, 6 Mar 2003 12:18:38 -0800 (PST) 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 063F037B401 for ; Thu, 6 Mar 2003 12:18:38 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2EDF543F3F for ; Thu, 6 Mar 2003 12:18:34 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h26KIY0U049102 for ; Thu, 6 Mar 2003 12:18:34 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h26KIXj6049099 for perforce@freebsd.org; Thu, 6 Mar 2003 12:18:33 -0800 (PST) Date: Thu, 6 Mar 2003 12:18:33 -0800 (PST) Message-Id: <200303062018.h26KIXj6049099@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 26438 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=26438 Change 26438 by jhb@jhb_laptop on 2003/03/06 12:17:46 IFC @26434. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/sys_machdep.c#13 integrate .. //depot/projects/smpng/sys/coda/cnode.h#4 integrate .. //depot/projects/smpng/sys/coda/coda_vfsops.c#10 integrate .. //depot/projects/smpng/sys/coda/coda_vnops.c#10 integrate .. //depot/projects/smpng/sys/conf/NOTES#35 integrate .. //depot/projects/smpng/sys/conf/options#46 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#40 integrate .. //depot/projects/smpng/sys/dev/firewire/firewire.c#11 integrate .. //depot/projects/smpng/sys/dev/firewire/firewire.h#5 integrate .. //depot/projects/smpng/sys/dev/firewire/firewirereg.h#6 integrate .. //depot/projects/smpng/sys/dev/firewire/fwdev.c#5 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci.c#11 integrate .. //depot/projects/smpng/sys/dev/firewire/if_fwe.c#7 integrate .. //depot/projects/smpng/sys/dev/firewire/if_fwevar.h#2 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_node.h#4 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_vfsops.c#15 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_vnops.c#17 integrate .. //depot/projects/smpng/sys/i386/i386/sys_machdep.c#25 integrate .. //depot/projects/smpng/sys/kern/kern_mac.c#18 integrate .. //depot/projects/smpng/sys/kern/kern_subr.c#20 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#81 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#30 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#43 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#52 integrate .. //depot/projects/smpng/sys/netgraph/ng_ppp.c#10 integrate .. //depot/projects/smpng/sys/netsmb/smb_dev.c#10 integrate .. //depot/projects/smpng/sys/netsmb/smb_subr.h#10 integrate .. //depot/projects/smpng/sys/sys/mac.h#12 integrate .. //depot/projects/smpng/sys/sys/mac_policy.h#11 integrate .. //depot/projects/smpng/sys/sys/uio.h#11 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#13 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#21 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#29 integrate .. //depot/projects/smpng/sys/vm/vm_map.h#16 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#26 integrate .. //depot/projects/smpng/sys/vm/vm_object.h#14 integrate .. //depot/projects/smpng/sys/vm/vm_swap.c#22 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.c#26 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/sys_machdep.c#13 (text+ko) ==== @@ -31,13 +31,16 @@ * SUCH DAMAGE. * * from: @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91 - * $FreeBSD: src/sys/alpha/alpha/sys_machdep.c,v 1.21 2002/12/14 01:56:23 alfred Exp $ + * $FreeBSD: src/sys/alpha/alpha/sys_machdep.c,v 1.22 2003/03/06 04:47:47 rwatson Exp $ * */ +#include "opt_mac.h" + #include #include #include +#include #include #include #include @@ -114,6 +117,12 @@ if (error) return (error); +#ifdef MAC + error = mac_check_sysarch_ioperm(td->td_ucred); + if (error) + return (error); +#endif + error = securelevel_gt(td->td_ucred, 0); if (error) return (error); ==== //depot/projects/smpng/sys/coda/cnode.h#4 (text+ko) ==== @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/cnode.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD: src/sys/coda/cnode.h,v 1.11 2003/02/19 05:46:58 imp Exp $ + * $FreeBSD: src/sys/coda/cnode.h,v 1.12 2003/03/06 10:48:03 tjr Exp $ * */ @@ -154,6 +154,7 @@ struct mount *mi_vfsp; struct vcomm mi_vcomm; dev_t dev; + int mi_started; }; extern struct coda_mntinfo coda_mnttbl[]; /* indexed by minor device number */ ==== //depot/projects/smpng/sys/coda/coda_vfsops.c#10 (text+ko) ==== @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/cfs/coda_vfsops.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD: src/sys/coda/coda_vfsops.c,v 1.41 2002/08/04 10:29:24 jeff Exp $ + * $FreeBSD: src/sys/coda/coda_vfsops.c,v 1.42 2003/03/06 10:48:03 tjr Exp $ * */ @@ -181,6 +181,7 @@ vfs_getnewfsid (vfsp); mi->mi_vfsp = vfsp; + mi->mi_started = 0; /* XXX See coda_root() */ /* * Make a root vnode to placate the Vnode interface, but don't @@ -301,9 +302,21 @@ result = NULL; if (vfsp == mi->mi_vfsp) { + /* + * Cache the root across calls. We only need to pass the request + * on to Venus if the root vnode is the dummy we installed in + * coda_mount() with all c_fid members zeroed. + * + * XXX In addition, if we are called between coda_mount() and + * coda_start(), we assume that the request is from vfs_mount() + * (before the call to checkdirs()) and return the dummy root + * node to avoid a deadlock. This bug is fixed in the Coda CVS + * repository but not in any released versions as of 6 Mar 2003. + */ if ((VTOC(mi->mi_rootvp)->c_fid.Volume != 0) || (VTOC(mi->mi_rootvp)->c_fid.Vnode != 0) || - (VTOC(mi->mi_rootvp)->c_fid.Unique != 0)) + (VTOC(mi->mi_rootvp)->c_fid.Unique != 0) || + mi->mi_started == 0) { /* Found valid root. */ *vpp = mi->mi_rootvp; /* On Mach, this is vref. On NetBSD, VOP_LOCK */ @@ -371,6 +384,18 @@ return(error); } +int +coda_start(mp, flags, td) + struct mount *mp; + int flags; + struct thread *td; +{ + + /* XXX See coda_root(). */ + vftomi(mp)->mi_started = 1; + return (0); +} + /* * Get filesystem statistics. */ @@ -526,7 +551,7 @@ struct vfsops coda_vfsops = { coda_mount, - vfs_stdstart, + coda_start, coda_unmount, coda_root, vfs_stdquotactl, ==== //depot/projects/smpng/sys/coda/coda_vnops.c#10 (text+ko) ==== @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda_vnops.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD: src/sys/coda/coda_vnops.c,v 1.46 2003/03/05 10:23:51 tjr Exp $ + * $FreeBSD: src/sys/coda/coda_vnops.c,v 1.47 2003/03/05 22:30:02 tjr Exp $ * */ @@ -1985,7 +1985,7 @@ { struct vop_pathconf_args *ap; int error; - int *retval; + register_t *retval; ap = v; retval = ap->a_retval; ==== //depot/projects/smpng/sys/conf/NOTES#35 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1134 2003/03/05 19:24:20 peter Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1135 2003/03/06 03:41:00 alc Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -756,21 +756,6 @@ # unsuitable for inclusion on machines with untrusted local users. options VFS_AIO -# Enable the code UFS IO optimization through the VM system. This allows -# use VM operations instead of copying operations when possible. -# -# Even with this enabled, actual use of the code is still controlled by the -# sysctl vfs.ioopt. 0 gives no optimization, 1 gives normal (use VM -# operations if a request happens to fit), 2 gives agressive optimization -# (the operations are split to do as much as possible through the VM system.) -# -# Enabling this will probably not give an overall speedup except for -# special workloads. -# -# WARNING: Do not enable this, it is known to be broken, and will result -# in system instability, as well as possible data loss. -options ENABLE_VFS_IOOPT - # Cryptographically secure random number generator; /dev/[u]random device random ==== //depot/projects/smpng/sys/conf/options#46 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.378 2003/03/05 19:24:20 peter Exp $ +# $FreeBSD: src/sys/conf/options,v 1.379 2003/03/06 03:41:01 alc Exp $ # # On the handling of kernel options # @@ -460,7 +460,6 @@ DEBUG_VFS_LOCKS opt_global.h LOOKUP_SHARED opt_global.h DIAGNOSTIC opt_global.h -ENABLE_VFS_IOOPT opt_global.h INVARIANT_SUPPORT opt_global.h INVARIANTS opt_global.h MCLSHIFT opt_global.h ==== //depot/projects/smpng/sys/dev/acpica/acpi.c#40 (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.86 2003/03/03 12:15:40 phk Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.87 2003/03/06 14:40:15 takawata Exp $ */ #include "opt_acpi.h" @@ -107,6 +107,7 @@ u_long start, u_long end, u_long count, u_int flags); static int acpi_release_resource(device_t bus, device_t child, int type, int rid, struct resource *r); static u_int32_t acpi_isa_get_logicalid(device_t dev); +static u_int32_t acpi_isa_get_compatid(device_t dev); static int acpi_isa_pnp_probe(device_t bus, device_t child, struct isa_pnp_id *ids); static void acpi_probe_children(device_t bus); @@ -719,11 +720,39 @@ return_VALUE(pnpid); } +static u_int32_t +acpi_isa_get_compatid(device_t dev) +{ + ACPI_HANDLE h; + ACPI_DEVICE_INFO devinfo; + ACPI_STATUS error; + u_int32_t pnpid; + ACPI_LOCK_DECL; + + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); + + pnpid = 0; + ACPI_LOCK; + + /* fetch and validate the HID */ + if ((h = acpi_get_handle(dev)) == NULL) + goto out; + if (ACPI_FAILURE(error = AcpiGetObjectInfo(h, &devinfo))) + goto out; + if (ACPI_FAILURE(error = acpi_EvaluateInteger(h, "_CID", &pnpid))) + goto out; + +out: + ACPI_UNLOCK; + return_VALUE(pnpid); +} + + static int acpi_isa_pnp_probe(device_t bus, device_t child, struct isa_pnp_id *ids) { int result; - u_int32_t pnpid; + u_int32_t lid, cid; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); @@ -735,9 +764,10 @@ result = ENXIO; /* scan the supplied IDs for a match */ - pnpid = acpi_isa_get_logicalid(child); + lid = acpi_isa_get_logicalid(child); + cid = acpi_isa_get_compatid(child); while (ids && ids->ip_id) { - if (pnpid == ids->ip_id) { + if (lid == ids->ip_id || cid == ids->ip_id) { result = 0; goto out; } ==== //depot/projects/smpng/sys/dev/firewire/firewire.c#11 (text+ko) ==== @@ -30,7 +30,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.43 2003/02/27 12:51:24 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.44 2003/03/06 05:06:44 simokawa Exp $ * */ @@ -522,6 +522,7 @@ while ((xfer = STAILQ_FIRST(&xferq->q)) != NULL) { STAILQ_REMOVE_HEAD(&xferq->q, link); + xferq->queued --; xfer->resp = EAGAIN; switch (xfer->act_type) { case FWACT_XFER: ==== //depot/projects/smpng/sys/dev/firewire/firewire.h#5 (text+ko) ==== @@ -30,7 +30,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/firewire.h,v 1.10 2003/02/09 10:14:22 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/firewire.h,v 1.11 2003/03/06 05:06:44 simokawa Exp $ * */ @@ -93,7 +93,7 @@ #define MAXREC(x) (2 << (x)) #define FWPMAX_S400 (2048 + 20) /* MAXREC plus space for control data */ -#define FWMAXQUEUE 128 +#define FWMAXQUEUE 256 #define FWLOCALBUS 0xffc0 ==== //depot/projects/smpng/sys/dev/firewire/firewirereg.h#6 (text+ko) ==== @@ -30,7 +30,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/firewirereg.h,v 1.21 2003/02/27 12:51:24 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/firewirereg.h,v 1.22 2003/03/06 05:06:44 simokawa Exp $ * */ @@ -230,10 +230,12 @@ struct fw_bulkxfer{ caddr_t buf; + struct mbuf *mbuf; STAILQ_ENTRY(fw_bulkxfer) link; caddr_t start; caddr_t end; u_int npacket; + int resp; }; struct fw_dvbuf{ ==== //depot/projects/smpng/sys/dev/firewire/fwdev.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/fwdev.c,v 1.24 2003/03/03 12:15:42 phk Exp $ + * $FreeBSD: src/sys/dev/firewire/fwdev.c,v 1.25 2003/03/06 05:06:44 simokawa Exp $ * */ @@ -67,6 +67,7 @@ struct cdevsw firewire_cdevsw = { +#if __FreeBSD_version >= 500104 .d_open = fw_open, .d_close = fw_close, .d_read = fw_read, @@ -77,6 +78,10 @@ .d_name = "fw", .d_maj = CDEV_MAJOR, .d_flags = D_MEM +#else + fw_open, fw_close, fw_read, fw_write, fw_ioctl, + fw_poll, fw_mmap, nostrategy, "fw", CDEV_MAJOR, nodump, nopsize, D_MEM +#endif }; static int @@ -707,18 +712,14 @@ for(i = 0 ; i < sc->fc->ir[sub]->bnchunk; i++){ ir->bulkxfer[i].buf = - ir->buf + - i * sc->fc->ir[sub]->bnpacket * - sc->fc->ir[sub]->psize; + ir->buf + i * ir->bnpacket * ir->psize; STAILQ_INSERT_TAIL(&ir->stfree, &ir->bulkxfer[i], link); ir->bulkxfer[i].npacket = ir->bnpacket; } for(i = 0 ; i < sc->fc->it[sub]->bnchunk; i++){ it->bulkxfer[i].buf = - it->buf + - i * sc->fc->it[sub]->bnpacket * - sc->fc->it[sub]->psize; + it->buf + i * it->bnpacket * it->psize; STAILQ_INSERT_TAIL(&it->stfree, &it->bulkxfer[i], link); it->bulkxfer[i].npacket = it->bnpacket; ==== //depot/projects/smpng/sys/dev/firewire/fwohci.c#11 (text+ko) ==== @@ -30,7 +30,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/fwohci.c,v 1.43 2003/03/05 01:50:57 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/fwohci.c,v 1.44 2003/03/06 05:06:44 simokawa Exp $ * */ @@ -835,6 +835,7 @@ = (OREAD(sc, OHCI_CYCLETIMER) >> 12) + (1 << 13); } +again: db_tr->dbcnt = 2; db = &db_tr->db[db_tr->dbcnt]; if(len > hdr_off){ @@ -848,7 +849,7 @@ db_tr->dbcnt++; } else { int mchain=0; - /* XXX we assume mbuf chain is shorter than ndesc */ + /* XXX we can handle only 6 (=8-2) mbuf chains */ for (m = xfer->mbuf; m != NULL; m = m->m_next) { if (m->m_len == 0) /* unrecoverable error could occur. */ @@ -864,11 +865,25 @@ db++; db_tr->dbcnt++; } - if (mchain > dbch->ndesc - 2) - device_printf(sc->fc.dev, - "dbch->ndesc(%d) is too small for" - " mbuf chain(%d), trancated.\n", - dbch->ndesc, mchain); + if (mchain > dbch->ndesc - 2) { + struct mbuf *m_new; + if (bootverbose) + device_printf(sc->fc.dev, + "too long mbuf chain(%d)\n", + mchain); + m_new = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); + if (m_new != NULL) { + m_copydata(xfer->mbuf, 0, + xfer->mbuf->m_pkthdr.len, + mtod(m_new, caddr_t)); + m_new->m_pkthdr.len = m_new->m_len = + xfer->mbuf->m_pkthdr.len; + m_freem(xfer->mbuf); + xfer->mbuf = m_new; + goto again; + } + device_printf(sc->fc.dev, "m_getcl failed.\n"); + } } } if (maxdesc < db_tr->dbcnt) { @@ -1401,7 +1416,10 @@ }else{ fwohci_add_rx_buf(db_tr, dbch->xferq.psize, dbch->xferq.flag, - dbch->xferq.buf + dbch->xferq.psize * idb, + dbch->xferq.bulkxfer[idb + / dbch->xferq.bnpacket].buf + + dbch->xferq.psize * + (idb % dbch->xferq.bnpacket), dbch->dummy + sizeof(u_int32_t) * idb); } if(STAILQ_NEXT(db_tr, link) == NULL){ @@ -1611,7 +1629,6 @@ first = STAILQ_FIRST(&ir->stfree); if (first == NULL) { device_printf(fc->dev, "IR DMA no free chunk\n"); - splx(s); return 0; } @@ -1621,6 +1638,10 @@ while ((chunk = STAILQ_FIRST(&ir->stfree)) != NULL) { volatile struct fwohcidb *db; +#if 1 /* XXX for if_fwe */ + db = ((struct fwohcidb_tr *)(chunk->start))->db; + db[ldesc].db.desc.addr = vtophys(chunk->buf); +#endif db = ((struct fwohcidb_tr *)(chunk->end))->db; db[ldesc].db.desc.status = db[ldesc].db.desc.count = 0; db[ldesc].db.desc.depend &= ~0xf; @@ -2068,16 +2089,22 @@ STAILQ_INSERT_TAIL(&ir->stvalid, chunk, link); switch (stat & FWOHCIEV_MASK) { case FWOHCIEV_ACKCOMPL: + chunk->resp = 0; break; default: + chunk->resp = EINVAL; device_printf(fc->dev, "Isochronous receive err %02x\n", stat); } w++; } splx(s); - if (w) - wakeup(ir); + if (w) { + if (ir->flag & FWXFERQ_HANDLER) + ir->hand(ir); + else + wakeup(ir); + } } void ==== //depot/projects/smpng/sys/dev/firewire/if_fwe.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/if_fwe.c,v 1.10 2003/02/19 05:47:05 imp Exp $ + * $FreeBSD: src/sys/dev/firewire/if_fwe.c,v 1.11 2003/03/06 05:06:44 simokawa Exp $ */ #include "opt_inet.h" @@ -62,20 +62,21 @@ #include #define FWEDEBUG if (fwedebug) printf -#define MAX_QUEUED IFQ_MAXLEN /* 50 */ +#define TX_MAX_QUEUE (FWMAXQUEUE - 1) +#define RX_MAX_QUEUE FWMAXQUEUE /* network interface */ static void fwe_start __P((struct ifnet *)); static int fwe_ioctl __P((struct ifnet *, u_long, caddr_t)); static void fwe_init __P((void *)); +static void fwe_output_callback __P((struct fw_xfer *)); static void fwe_as_output __P((struct fwe_softc *, struct ifnet *)); static void fwe_as_input __P((struct fw_xferq *)); static int fwedebug = 0; static int stream_ch = 1; -MALLOC_DECLARE(M_FWE); MALLOC_DEFINE(M_FWE, "if_fwe", "Ethernet over FireWire interface"); SYSCTL_INT(_debug, OID_AUTO, if_fwe_debug, CTLFLAG_RW, &fwedebug, 0, ""); SYSCTL_DECL(_hw_firewire); @@ -193,7 +194,7 @@ ifp->if_ioctl = fwe_ioctl; ifp->if_mtu = ETHERMTU; ifp->if_flags = (IFF_BROADCAST|IFF_SIMPLEX|IFF_MULTICAST); - ifp->if_snd.ifq_maxlen = FWMAXQUEUE - 1; + ifp->if_snd.ifq_maxlen = TX_MAX_QUEUE; s = splimp(); #if __FreeBSD_version >= 500000 @@ -209,7 +210,6 @@ ifp->if_capabilities |= IFCAP_VLAN_MTU; #endif - ifp->if_snd.ifq_maxlen = MAX_QUEUED - 1; FWEDEBUG("interface %s%d created.\n", ifp->if_name, ifp->if_unit); return 0; @@ -221,6 +221,8 @@ struct firewire_comm *fc; struct fw_xferq *xferq; struct ifnet *ifp = &fwe->fwe_if; + struct fw_xfer *xfer, *next; + int i; fc = fwe->fd.fc; @@ -232,8 +234,22 @@ if (xferq->flag & FWXFERQ_RUNNING) fc->irx_disable(fc, fwe->dma_ch); xferq->flag &= - ~(FWXFERQ_MODEMASK | FWXFERQ_OPEN | FWXFERQ_HANDLER); - /* XXX dequeue xferq->q */ + ~(FWXFERQ_MODEMASK | FWXFERQ_OPEN | + FWXFERQ_EXTBUF | FWXFERQ_HANDLER); + xferq->hand = NULL; + + for (i = 0; i < xferq->bnchunk; i ++) + m_freem(xferq->bulkxfer[i].mbuf); + free(xferq->bulkxfer, M_FWE); + + for (xfer = STAILQ_FIRST(&fwe->xferlist); xfer != NULL; + xfer = next) { + next = STAILQ_NEXT(xfer, link); + fw_xfer_free(xfer); + } + STAILQ_INIT(&fwe->xferlist); + + xferq->bulkxfer = NULL; fwe->dma_ch = -1; } @@ -260,7 +276,6 @@ return 0; } - static void fwe_init(void *arg) { @@ -268,6 +283,7 @@ struct firewire_comm *fc; struct ifnet *ifp = &fwe->fwe_if; struct fw_xferq *xferq; + struct fw_xfer *xfer; int i; FWEDEBUG("initializing %s%d\n", ifp->if_name, ifp->if_unit); @@ -293,12 +309,51 @@ fwe->stream_ch = stream_ch; fwe->pkt_hdr.mode.stream.chtag = fwe->stream_ch; /* allocate DMA channel and init packet mode */ - xferq->flag |= FWXFERQ_OPEN | FWXFERQ_PACKET; + xferq->flag |= FWXFERQ_OPEN | FWXFERQ_EXTBUF; xferq->flag |= fwe->stream_ch & 0xff; /* register fwe_input handler */ xferq->sc = (caddr_t) fwe; xferq->hand = fwe_as_input; xferq->flag |= FWXFERQ_HANDLER; + xferq->bnchunk = RX_MAX_QUEUE; + xferq->bnpacket = 1; + xferq->psize = MCLBYTES; + xferq->queued = 0; + xferq->bulkxfer = (struct fw_bulkxfer *) malloc( + sizeof(struct fw_bulkxfer) * xferq->bnchunk, M_FWE, 0); + if (xferq->bulkxfer == NULL) { + printf("if_fwe: malloc failed\n"); + return; + } + STAILQ_INIT(&xferq->stvalid); + STAILQ_INIT(&xferq->stfree); + STAILQ_INIT(&xferq->stdma); + xferq->stproc = NULL; + for (i = 0; i < xferq->bnchunk; i ++) { + xferq->bulkxfer[i].mbuf = +#if __FreeBSD_version >= 500000 + m_getcl(M_TRYWAIT, MT_DATA, M_PKTHDR); +#else + m_getcl(M_WAIT, MT_DATA, M_PKTHDR); +#endif + xferq->bulkxfer[i].buf = + mtod(xferq->bulkxfer[i].mbuf, char *); + STAILQ_INSERT_TAIL(&xferq->stfree, + &xferq->bulkxfer[i], link); + } + STAILQ_INIT(&fwe->xferlist); + for (i = 0; i < TX_MAX_QUEUE; i++) { + xfer = fw_xfer_alloc(M_FWE); + if (xfer == NULL) + break; + xfer->send.off = 0; + xfer->spd = 2; + xfer->fc = fwe->fd.fc; + xfer->retry_req = fw_asybusy; + xfer->sc = (caddr_t)fwe; + xfer->act.hand = fwe_output_callback; + STAILQ_INSERT_TAIL(&fwe->xferlist, xfer, link); + } } else xferq = fc->ir[fwe->dma_ch]; @@ -375,6 +430,39 @@ } static void +fwe_output_callback(struct fw_xfer *xfer) +{ + struct fwe_softc *fwe; + struct ifnet *ifp; + int s; + + fwe = (struct fwe_softc *)xfer->sc; + ifp = &fwe->fwe_if; + /* XXX error check */ + FWEDEBUG("resp = %d\n", xfer->resp); + if (xfer->resp != 0) + ifp->if_oerrors ++; + + m_freem(xfer->mbuf); + xfer->send.buf = NULL; +#if 0 + fw_xfer_unload(xfer); +#else + xfer->state = FWXF_INIT; + xfer->resp = 0; + xfer->retry = 0; +#endif + s = splimp(); + STAILQ_INSERT_TAIL(&fwe->xferlist, xfer, link); + splx(s); +#if 1 + /* XXX for queue full */ + if (ifp->if_snd.ifq_head != NULL) + fwe_start(ifp); +#endif +} + +static void fwe_start(struct ifnet *ifp) { struct fwe_softc *fwe = ((struct fwe_eth_softc *)ifp->if_softc)->fwe; @@ -411,29 +499,10 @@ splx(s); } - -static void -fwe_output_callback(struct fw_xfer *xfer) -{ - struct fwe_softc *fwe; - struct ifnet *ifp; - - fwe = (struct fwe_softc *)xfer->sc; - /* XXX error check */ - FWEDEBUG("resp = %d\n", xfer->resp); - m_freem(xfer->mbuf); - xfer->send.buf = NULL; - fw_xfer_free(xfer); -#if 1 - /* XXX for queue full */ - ifp = &fwe->fwe_if; - if (ifp->if_snd.ifq_head != NULL) - fwe_start(ifp); +#define HDR_LEN 4 +#ifndef ETHER_ALIGN +#define ETHER_ALIGN 2 #endif -} - -#define HDR_LEN 4 -#define ALIGN_PAD 2 /* Async. stream output */ static void fwe_as_output(struct fwe_softc *fwe, struct ifnet *ifp) @@ -446,14 +515,16 @@ xfer = NULL; xferq = fwe->fd.fc->atq; - while (xferq->queued < xferq->maxq) { + while (xferq->queued < xferq->maxq - 1) { + xfer = STAILQ_FIRST(&fwe->xferlist); + if (xfer == NULL) { + printf("if_fwe: lack of xfer\n"); + return; + } IF_DEQUEUE(&ifp->if_snd, m); if (m == NULL) break; - xfer = fw_xfer_alloc(M_FWXFER); - if (xfer == NULL) { - return; - } + STAILQ_REMOVE_HEAD(&fwe->xferlist, link); #if __FreeBSD_version >= 500000 BPF_MTAP(ifp, m); #else @@ -461,15 +532,8 @@ bpf_mtap(ifp, m); #endif - xfer->send.off = 0; - xfer->spd = 2; - xfer->fc = fwe->fd.fc; - xfer->retry_req = fw_asybusy; - xfer->sc = (caddr_t)fwe; - xfer->act.hand = fwe_output_callback; - /* keep ip packet alignment for alpha */ - M_PREPEND(m, ALIGN_PAD, M_DONTWAIT); + M_PREPEND(m, ETHER_ALIGN, M_DONTWAIT); fp = (struct fw_pkt *)&xfer->dst; /* XXX */ xfer->dst = *((int32_t *)&fwe->pkt_hdr); fp->mode.stream.len = htons(m->m_pkthdr.len); @@ -477,24 +541,25 @@ xfer->mbuf = m; xfer->send.len = m->m_pkthdr.len + HDR_LEN; - i++; - if (fw_asyreq(xfer->fc, -1, xfer) != 0) { + if (fw_asyreq(fwe->fd.fc, -1, xfer) != 0) { /* error */ ifp->if_oerrors ++; /* XXX set error code */ fwe_output_callback(xfer); } else { ifp->if_opackets ++; + i++; } } #if 0 if (i > 1) printf("%d queued\n", i); #endif - if (xfer != NULL) - xferq->start(xfer->fc); + if (i > 0) + xferq->start(fwe->fd.fc); } +#if 0 #if __FreeBSD_version >= 500000 static void fwe_free(void *buf, void *args) @@ -525,59 +590,54 @@ (*p) ++; } #endif +#endif /* Async. stream output */ static void fwe_as_input(struct fw_xferq *xferq) { struct mbuf *m; - struct ether_header *eh; struct ifnet *ifp; - struct fw_xfer *xfer; struct fwe_softc *fwe; + struct fw_bulkxfer *sxfer; + struct fw_pkt *fp; u_char *c; - int len; - caddr_t p; +#if __FreeBSD_version < 500000 + struct ether_header *eh; +#endif fwe = (struct fwe_softc *)xferq->sc; ifp = &fwe->fwe_if; #if 0 FWE_POLL_REGISTER(fwe_poll, fwe, ifp); #endif - while ((xfer = STAILQ_FIRST(&xferq->q)) != NULL) { - STAILQ_REMOVE_HEAD(&xferq->q, link); + while ((sxfer = STAILQ_FIRST(&xferq->stvalid)) != NULL) { + STAILQ_REMOVE_HEAD(&xferq->stvalid, link); +#if 0 xferq->queued --; - MGETHDR(m, M_DONTWAIT, MT_DATA); - if (m == NULL) { - printf("MGETHDR failed\n"); - fw_xfer_free(xfer); - return; - } - len = xfer->recv.off + xfer->recv.len; - FWEDEBUG("fwe_as_input len=%d\n", len); -#if __FreeBSD_version >= 500000 - MEXTADD(m, xfer->recv.buf, len, fwe_free, NULL, 0, EXT_NET_DRV); -#else - m->m_flags |= M_EXT; - m->m_ext.ext_buf = xfer->recv.buf; - m->m_ext.ext_size = len; - m->m_ext.ext_free = fwe_free; - m->m_ext.ext_ref = fwe_ref; - *((int *)m->m_ext.ext_buf) = 1; /* XXX refcount */ #endif - p = xfer->recv.buf + xfer->recv.off + HDR_LEN + ALIGN_PAD; - eh = (struct ether_header *)p; -#if __FreeBSD_version >= 500000 - len -= xfer->recv.off + HDR_LEN + ALIGN_PAD; -#else - p += sizeof(struct ether_header); - len -= xfer->recv.off + HDR_LEN + ALIGN_PAD - + sizeof(struct ether_header); + if (sxfer->resp != 0) + ifp->if_ierrors ++; + fp = (struct fw_pkt *)sxfer->buf; + /* XXX */ + if (fwe->fd.fc->irx_post != NULL) + fwe->fd.fc->irx_post(fwe->fd.fc, fp->mode.ld); + m = sxfer->mbuf; + + /* insert rbuf */ + sxfer->mbuf = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); + sxfer->buf = mtod(sxfer->mbuf, char *); + STAILQ_INSERT_TAIL(&xferq->stfree, sxfer, link); + + m->m_data += HDR_LEN + ETHER_ALIGN; + c = mtod(m, char *); +#if __FreeBSD_version < 500000 + eh = (struct ether_header *)c; + m->m_data += sizeof(struct ether_header); #endif - m->m_data = p; - m->m_len = m->m_pkthdr.len = len; + m->m_len = m->m_pkthdr.len = + ntohs(fp->mode.stream.len) - ETHER_ALIGN; m->m_pkthdr.rcvif = ifp; - c = (char *)eh; #if 0 FWEDEBUG("%02x %02x %02x %02x %02x %02x\n" "%02x %02x %02x %02x %02x %02x\n" @@ -599,10 +659,9 @@ ether_input(ifp, eh, m); #endif ifp->if_ipackets ++; - - xfer->recv.buf = NULL; - fw_xfer_free(xfer); } + if (STAILQ_FIRST(&xferq->stfree) != NULL) + fwe->fd.fc->irx_enable(fwe->fd.fc, fwe->dma_ch); } ==== //depot/projects/smpng/sys/dev/firewire/if_fwevar.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/if_fwevar.h,v 1.1 2002/09/13 12:31:56 ikob Exp $ + * $FreeBSD: src/sys/dev/firewire/if_fwevar.h,v 1.2 2003/03/06 05:06:44 simokawa Exp $ */ #ifndef _NET_IF_FWEVAR_H_ @@ -43,8 +43,9 @@ short stream_ch; short dma_ch; struct fw_pkt pkt_hdr; + STAILQ_HEAD(, fw_xfer) xferlist; struct fwe_eth_softc { - /* XXX this must be first for if_ethersub.c */ + /* XXX this must be the first for if_ethersub.c */ struct arpcom arpcom; /* ethernet common data */ #define fwe_if eth_softc.arpcom.ac_if struct fwe_softc *fwe; ==== //depot/projects/smpng/sys/fs/smbfs/smbfs_node.h#4 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/smbfs/smbfs_node.h,v 1.3 2002/12/13 10:15:01 tjr Exp $ + * $FreeBSD: src/sys/fs/smbfs/smbfs_node.h,v 1.4 2003/03/06 10:38:18 tjr Exp $ */ #ifndef _FS_SMBFS_NODE_H_ #define _FS_SMBFS_NODE_H_ @@ -47,9 +47,6 @@ struct smbfs_fctx; struct smbnode { -#ifndef FB_CURRENT - struct lock n_lock; /* smbnode lock. (mbf) */ -#endif int n_flag; struct vnode * n_parent; struct vnode * n_vnode; ==== //depot/projects/smpng/sys/fs/smbfs/smbfs_vfsops.c#15 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Mar 6 13:45:33 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5EDA137B409; Thu, 6 Mar 2003 13:45:31 -0800 (PST) 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 E561237B408 for ; Thu, 6 Mar 2003 13:45:30 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 90CB243FB1 for ; Thu, 6 Mar 2003 13:45:30 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h26LjU0U060977 for ; Thu, 6 Mar 2003 13:45:30 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h26LjUiU060974 for perforce@freebsd.org; Thu, 6 Mar 2003 13:45:30 -0800 (PST) Date: Thu, 6 Mar 2003 13:45:30 -0800 (PST) Message-Id: <200303062145.h26LjUiU060974@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 26445 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=26445 Change 26445 by jhb@jhb_laptop on 2003/03/06 13:44:50 Remove some cruft I don't think I need. Affected files ... .. //depot/projects/smpng/sys/alpha/linux/linux_sysvec.c#10 edit .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#33 edit .. //depot/projects/smpng/sys/i386/linux/imgact_linux.c#11 edit .. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#27 edit Differences ... ==== //depot/projects/smpng/sys/alpha/linux/linux_sysvec.c#10 (text+ko) ==== @@ -276,6 +276,5 @@ DUMMY(rt_sigreturn); -MODULE_DEPEND(linuxelf, osf1, 1, 1, 1); -MODULE_DEPEND(linuxelf, linux, 1, 1, 1); +MODULE_DEPEND(linux, osf1, 1, 1, 1); DECLARE_MODULE(linuxelf, linux_elf_mod, SI_SUB_EXEC, SI_ORDER_ANY); ==== //depot/projects/smpng/sys/compat/linux/linux_misc.c#33 (text+ko) ==== @@ -1318,11 +1318,3 @@ MODULE_DEPEND(linux, sysvmsg, 1, 1, 1); MODULE_DEPEND(linux, sysvsem, 1, 1, 1); MODULE_DEPEND(linux, sysvshm, 1, 1, 1); - -static moduledata_t linux_mod = { - "linux", - NULL, - 0 -}; - -DECLARE_MODULE(linux, linux_mod, SI_SUB_EXEC, SI_ORDER_ANY); ==== //depot/projects/smpng/sys/i386/linux/imgact_linux.c#11 (text+ko) ==== @@ -241,5 +241,4 @@ * Tell kern_execve.c about it, with a little help from the linker. */ static struct execsw linux_execsw = { exec_linux_imgact, "linux a.out" }; -MODULE_DEPEND(linuxaout, linux, 1, 1, 1); EXEC_SET(linuxaout, linux_execsw); ==== //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#27 (text+ko) ==== @@ -933,5 +933,4 @@ 0 }; -MODULE_DEPEND(linuxelf, linux, 1, 1, 1); DECLARE_MODULE(linuxelf, linux_elf_mod, SI_SUB_EXEC, SI_ORDER_ANY); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Mar 6 13:46:36 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D6CE37B405; Thu, 6 Mar 2003 13:46:33 -0800 (PST) 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 D7C7837B401 for ; Thu, 6 Mar 2003 13:46:32 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7331543FBD for ; Thu, 6 Mar 2003 13:46:32 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h26LkW0U061055 for ; Thu, 6 Mar 2003 13:46:32 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h26LkW7I061052 for perforce@freebsd.org; Thu, 6 Mar 2003 13:46:32 -0800 (PST) Date: Thu, 6 Mar 2003 13:46:32 -0800 (PST) Message-Id: <200303062146.h26LkW7I061052@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 26446 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=26446 Change 26446 by jhb@jhb_laptop on 2003/03/06 13:46:00 Remove unused field. Affected files ... .. //depot/projects/smpng/sys/kern/subr_witness.c#82 edit Differences ... ==== //depot/projects/smpng/sys/kern/subr_witness.c#82 (text+ko) ==== @@ -129,7 +129,6 @@ u_char w_Giant_squawked:1; u_char w_other_squawked:1; u_char w_same_squawked:1; - u_char w_dead_squawked:1; }; struct witness_child_list_entry { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Mar 6 14: 3:26 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 436AB37B405; Thu, 6 Mar 2003 14:02:56 -0800 (PST) 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 BF19837B401 for ; Thu, 6 Mar 2003 14:02:55 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 12B7043FA3 for ; Thu, 6 Mar 2003 14:02:54 -0800 (PST) (envelope-from chris@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h26M2r0U062299 for ; Thu, 6 Mar 2003 14:02:53 -0800 (PST) (envelope-from chris@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h26M2rGb062296 for perforce@freebsd.org; Thu, 6 Mar 2003 14:02:53 -0800 (PST) Date: Thu, 6 Mar 2003 14:02:53 -0800 (PST) Message-Id: <200303062202.h26M2rGb062296@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 26448 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=26448 Change 26448 by chris@chris_holly on 2003/03/06 14:02:06 Integrate. Affected files ... .. //depot/projects/trustedbsd/doc/Makefile#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/5-roadmap/article.sgml#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#13 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributors/article.sgml#16 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/cvs-freebsd/article.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/dialup-firewall/article.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/euro/article.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/filtering-bridges/article.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/freebsd-questions/article.sgml#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/hats/article.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/pam/article.sgml#6 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/releng/article.sgml#10 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/smp/article.sgml#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/design-44bsd/book.sgml#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/boot/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/isa/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml#6 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/faq/book.sgml#12 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#6 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml#12 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#8 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#13 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#13 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#7 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#10 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml#6 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/mail/chapter.sgml#10 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#15 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#11 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/das.key#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent#11 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#10 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#16 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/sgml/authors.ent#11 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent#5 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml#7 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/introduction/chapter.sgml#6 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/l10n/chapter.sgml#6 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#7 integrate .. //depot/projects/trustedbsd/doc/share/sgml/bibliography.sgml#2 integrate .. //depot/projects/trustedbsd/doc/share/sgml/man-refs.ent#15 integrate Differences ... ==== //depot/projects/trustedbsd/doc/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: doc/Makefile,v 1.28 2002/10/01 03:15:12 lioux Exp $ +# $FreeBSD: doc/Makefile,v 1.29 2003/03/06 15:06:17 ru Exp $ # # The user can override the default list of languages to build and install # with the DOC_LANG variable. @@ -29,7 +29,7 @@ .endif CVS?= /usr/bin/cvs -CVSFLAGS?= -q +CVSFLAGS?= -R -q update: .if defined(SUP_UPDATE) ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/5-roadmap/article.sgml#2 (text+ko) ==== @@ -14,6 +14,13 @@ %mailing-lists; +RELENG_3"> +RELENG_4"> +RELENG_5"> +RELENG_5_1"> +RELENG_5_2"> +HEAD"> + ]>
@@ -24,7 +31,7 @@ The &os; Release Engineering Team - $FreeBSD: doc/en_US.ISO8859-1/articles/5-roadmap/article.sgml,v 1.1 2003/02/17 18:55:14 scottl Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/5-roadmap/article.sgml,v 1.8 2003/02/17 22:43:35 bmah Exp $ 2003 @@ -50,24 +57,24 @@ This is somewhat similar to the situation that &os; faced in the 3.X series. Work on 3-CURRENT trudged along - seemingly forever, and finally a cry was made to 'just ship it' and + seemingly forever, and finally a cry was made to just ship it and clean up later. This decision resulted in the 3.0 and 3.1 releases being very unsatisfying for most, and it wasn't until 3.2 that the - series was considered 'stable'. To make matters worse, the RELENG_3 - branch was created along with the 3.0 release, and the HEAD branch was + series was considered stable. To make matters worse, the &t.releng.3; + branch was created along with the 3.0 release, and the &t.releng.head; branch was allowed to advance immediately towards 4-CURRENT. This resulted in a - quick divergence between HEAD and RELENG_3, making maintenance of the - RELENG_3 branch very difficult. &os; 2.2.8 was left for quite a while + quick divergence between &t.releng.head; and &t.releng.3;, making maintenance of the + &t.releng.3; branch very difficult. &os; 2.2.8 was left for quite a while as the last production-quality version of &os;. Our intent is to avoid repeating that scenario with &os; 5.x. - Delaying the RELENG_5 branch until it is stable and production quality + Delaying the &t.releng.5; branch until it is stable and production quality will ensure that it stays maintainable and provides a compelling reason to upgrade from 4.X, To do this, we must identify the current areas of weakness and set clear goals for resolving them. This document contains what we as the release engineering team feel are the milestones and issues that must be - resolved for the RELENG_5 branch. It does not dictate every aspect of + resolved for the &t.releng.5; branch. It does not dictate every aspect of &os; development, and we welcome further input. Nothing that follows is meant to be a sleight against any person or group, or to trivialize any work that has been done. There are some significant issues, @@ -112,7 +119,7 @@ Work has not started on any of the other protocols such as AppleTalk, XNS, or IPX. Locking of the socket layer is in progress but has been largely untested. None of the hardware drivers or - ethernet layers have been locked. + Ethernet layers have been locked. @@ -161,7 +168,7 @@ - kernel encryption: crypto drivers and core crypto framework are + kernel encryption: crypto drivers and core &man.crypto.4; framework are Giant-free. KAME IPsec and FAST IPSec have not been locked. @@ -186,7 +193,7 @@ will also help this, as will converting drivers to be as efficient as possible in their interrupt routines. - Next, the state of KSE must resolved for RELENG_5. Work on it has + Next, the state of KSE must resolved for &t.releng.5;. Work on it has slowed noticeably in the past 6 months but appears to be picking up again. There are a number of issues that must be addressed: @@ -206,11 +213,11 @@ According to the release schedule below, KSE kernel and userland components must be functionality complete by June 2003 in order to be - included in the RELENG_5 branch. For security and stability reasons, + included in the &t.releng.5; branch. For security and stability reasons, if KSE cannot be finished in time then, by default, all KSE-specific syscalls should be modified to return ENOSYS and all other KSE-specific - interfaces disabled. Deprecating KSE from RELENG_5 but keeping it in - the HEAD branch will pose problems in porting bugfixes and features + interfaces disabled. Deprecating KSE from &t.releng.5; but keeping it in + the &t.releng.head; branch will pose problems in porting bugfixes and features between the two branches, so every effort should be made to finish it on time. @@ -218,7 +225,7 @@ Goals for 5-STABLE - The goals for the RELENG_5 branch point are: + The goals for the &t.releng.5; branch point are: @@ -241,13 +248,13 @@ Both UP and SMP configurations should be evaluated. SMP has the potential to perform much better than 4.X, though for the purposes of creating - the RELENG_5 branch, comparable performance between the two should + the &t.releng.5; branch, comparable performance between the two should be acceptable. It is unrealistic to expect that the SMPng project will be fully - complete by RELENG_5, or that performance will be significantly better + complete by &t.releng.5;, or that performance will be significantly better than 4.X. However, focusing on a subset of the outstanding tasks will give enough benefit for the branch to be viable and maintainable. To break it down: @@ -255,8 +262,8 @@ ABI/API/Infrastructure stability - Enough infrastructure must - be in place and stable to allow fixes from HEAD to easily and - safely be merged into RELENG_5. Also, we must draw a line as to + be in place and stable to allow fixes from &t.releng.head; to easily and + safely be merged into &t.releng.5;. Also, we must draw a line as to what subsystems are to be locked down when we go into 5-STABLE. @@ -267,7 +274,7 @@ VM: Most codepaths, others than the ones that interact with - VFS, should be Giant-free for RELENG_5. + VFS, should be Giant-free for &t.releng.5;. @@ -275,10 +282,10 @@ the risk of uncovering latent bugs and races. Locking it down but not removing Giant imposes further performance penalties. A decision on which parts of the network stack should be locked and - taken out from under Giant for RELENG_5 should be made no later + taken out from under Giant for &t.releng.5; should be made no later than March 15. Work on the IP, TCP, UDP,raw IP, routing sockets, and Unix domain sockets stands a good chance of being complete in - time for RELENG_5. + time for &t.releng.5;. If the decision is made to not lift Giant from the stack, then the locks in these layers could be optimized out with a @@ -324,7 +331,7 @@ demonstrate a real-world application running correctly on it using the standard POSIX Threads API. Examples would be apache 2.0, Java, and/or mozilla. A functional regression test suite is also a - requirement for RELENG_5 and should test signal delivery, + requirement for &t.releng.5; and should test signal delivery, scheduling, performance, and process security/credentials for both KSE and non-KSE processes. KSE kernel and userland components must also reach the same level of functionality for all Tier-1 platforms @@ -343,10 +350,10 @@ http://www.FreeBSD.org/projects/busdma tracks the progress of this and should be used to determine which drivers - must be converted for RELENG_5 and which can be left behind. + must be converted for &t.releng.5; and which can be left behind. Also, there has been talk by several developers and the original author to give the busdma interface a minor overhaul. If this is - to happen, it needs to happen before RELENG_5. Otherwise, + to happen, it needs to happen before &t.releng.5;. Otherwise, differences between the old and new API will make driver maintenance difficult. @@ -358,8 +365,8 @@ manage and allocate PCI memory resources on its own. Implementing this should take into account cardbus, PCI-HotPlug, and laptop dockstation requirements. This feature will become increasingly - critical through the lifetime of RELENG_5, and therefore is a - requirement for the RELENG_5 branch. + critical through the lifetime of &t.releng.5;, and therefore is a + requirement for the &t.releng.5; branch. @@ -387,8 +394,8 @@ Make all drivers defer most of their processing out of their interrupt thread. Significant performance gains have - been shown recently in the aac(4) driver by making its - interrupt handler be INTR_MPSAFE and moving + been shown recently in the &man.aac.4; driver by making its + interrupt handler be INTR_MPSAFE and moving all processing to a taskqueue. @@ -431,7 +438,7 @@ - webstone: /usr/ports/www/webstone + webstone: www/webstone @@ -440,11 +447,11 @@ - ApacheBench: /usr/ports/www/p5-ApacheBench + ApacheBench: www/p5-ApacheBench - netperf: /usr/ports/benchmarks/netperf + netperf: benchmarks/netperf @@ -485,16 +492,16 @@ problems on some laptops. The classic 16-bit bridge support, OLDCARD, still exists and can be compiled in, but this is highly inconvenient for users of older laptops. If OLDCARD cannot be - completely deprecated for RELENG_5, then provisions must be made + completely deprecated for &t.releng.5;, then provisions must be made to allow users to easily install an OLDCARD-enabled kernel. Documentation should be written to help trasition users from - OLDCARD to NEWCARD and from pccardd to - devd. The power management and - dumpcis functionality of pccardc(1) needs to be + OLDCARD to NEWCARD and from &man.pccardd.8; to + &man.devd.8;. The power management and + dumpcis functionality of &man.pccardc.8; needs to be brought forward to work with NEWCARD, along with the ability to load CIS quirk entries. Most of this functionality can be - integrated into devd and - devctl. + integrated into &man.devd.8; and + &man.devctl.4;. @@ -503,7 +510,7 @@ and the new ULE scheduler. A scheduler that demonstrates processor affinity, HyperThreading and KSE awareness, and no regressions in performance or interactivity characteristics must - be available for RELENG_5. + be available for &t.releng.5;. @@ -512,34 +519,34 @@ console support. This is a major support hole for what is a Tier 1 platform. Whether syscons can be shoe-horned in or wscons be adopted from NetBSD is up for debate. However, - sparc64 must have local console support for RELENG_5. Having + sparc64 must have local console support for &t.releng.5;. Having this will also enable the XFree86 server to run, which is also a - requirement for RELENG_5. + requirement for &t.releng.5;. gcc/toolchain: gcc 3.3 might be available in time for - RELENG_5 and might offer some attractive benefits, but also + &t.releng.5; and might offer some attractive benefits, but also likely to introduce ABI incompatibility with prior gcc versions. - ABI compatibility should be locked down for the RELENG_5 + ABI compatibility should be locked down for the &t.releng.5; branch. There has also been a request to move /usr/include/g++ to /usr/include/g++-v3 to be more compliant with the stock behavior - of gcc. This should also be investigated for RELENG_5. + of gcc. This should also be investigated for &t.releng.5;. gdb: gdb from the base system should work for sparc64. It should also understand KSE thread semantics, assuming that KSE - is included in the RELENG_5 branch. gdb 5.3 is available and + is included in the &t.releng.5; branch. gdb 5.3 is available and there are reports that it should address the sparc64 issue. - disklabel(8) regressions: The biggest casualty of the + &man.disklabel.8; regressions: The biggest casualty of the introduction of GEOM appears to be the disklabel utility. The - -r option gives unpredictable results in most + option gives unpredictable results in most cases now and should be removed or fixed. Work is planned for a new unified interface for modifying labels and slices, however this should not preclude disklabel from being fixed. @@ -566,9 +573,9 @@ - If &os; 5.1 is not the branch point for RELENG_5 then the + If &os; 5.1 is not the branch point for &t.releng.5; then the Early Adopters Guide needs to be updated. This document should - then be removed just before the release closest to the RELENG_5 + then be removed just before the release closest to the &t.releng.5; branch point. @@ -579,7 +586,7 @@ Schedule - If branching RELENG_5 at the 5.1 release is paramount, 5.1 will + If branching &t.releng.5; at the 5.1 release is paramount, 5.1 will probably need to move out by at least 3 months. The schedule would be: @@ -588,10 +595,10 @@ Jun 30, 2003: KSE and SMPng feature freeze - Aug 4, 2003: 5.1-BETA, general code freeze + Aug 4, 2003: 5.1-BETA, general code freeze - Aug 18, 2003: 5.1-RC1, RELENG_5 and RELENG_5_1 branched + Aug 18, 2003: 5.1-RC1, &t.releng.5; and &t.releng.5.1; branched Aug 25, 2003: 5.1-RC2 @@ -614,25 +621,25 @@ - May 5, 2003: 5.1-BETA, general code freeze + May 5, 2003: 5.1-BETA, general code freeze - May 19, 2003: 5.1-RC1, RELENG_5_1 branched + May 19, 2003: 5.1-RC1, &t.releng.5.1; branched - May 27, 2003: 5.1-RC2 + May 27, 2003: 5.1-RC2 - Jun 2, 2003: 5.1-RELEASE + Jun 2, 2003: 5.1-RELEASE - Jun 30, 2003: KSE and SMPng feature freeze + Jun 30, 2003: KSE and SMPng feature freeze - Sept 1, 2003: 5.2-BETA, general code freeze + Sept 1, 2003: 5.2-BETA, general code freeze - Sept 15, 2003: 5.2-RC1, RELENG_5 and RELENG_5_2 branched + Sept 15, 2003: 5.2-RC1, &t.releng.5; and &t.releng.5.2; branched Sept 22, 2003: 5.2-RC2 @@ -644,20 +651,20 @@ - Post RELENG_5 direction + Post &t.releng.5; direction As with all -STABLE development streams, the focus should be bug fixes and incremental improvements. Just like normal, everything - should be vetted through the HEAD branch first and committed to - RELENG_5 with caution. As before, new device drivers, incremental + should be vetted through the &t.releng.head; branch first and committed to + &t.releng.5; with caution. As before, new device drivers, incremental features, etc, will be welcome in the branch once they have been proven - in HEAD. + in &t.releng.head;. Further SMPng lockdowns will be divided into two categories, driver and subsystem. The only subsystem that will be sufficiently locked - down for RELENG_5 will be GEOM, so incrementally locking down device + down for &t.releng.5; will be GEOM, so incrementally locking down device drivers under it is a worthy goal for the branch. Full subsystem - lockdowns will have to be fully tested and proven in HEAD before - consideration will be given to merging them into RELENG_5. + lockdowns will have to be fully tested and proven in &t.releng.head; before + consideration will be given to merging them into &t.releng.5;.
==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#13 (text+ko) ==== @@ -17,7 +17,7 @@
- Committer Guide + Committer's Guide @@ -25,7 +25,7 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.154 2003/02/08 23:43:56 will Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.161 2003/03/01 23:08:14 ceri Exp $ 1999 @@ -76,7 +76,7 @@ Mailing Lists &a.developers;, &a.committers; - (Both of these are private list; archives can be found + (Both of these are private lists; archives can be found in /home/mail/developers-archive and /home/mail/committers-archive on the FreeBSD.org @@ -145,8 +145,8 @@ doc - nik@ - doc/, src/ documentation + doceng@ + doc/, www/, src/ documentation @@ -188,9 +188,9 @@ operation, mail the &a.cvs; (or call one of them) and report the problem to one of them. The only ones able to directly fiddle the repository bits on the repository hosts are the repomeisters. - There are no login shells on - ncvs.FreeBSD.org installed, except - for the repomeisters. + There are no login shells available on + ncvs.FreeBSD.org, except + to the repomeisters. CVS operations are done remotely by setting the CVSROOT environment variable to @@ -400,7 +400,7 @@ &prompt.user; cvs status shazam This displays the status of the - shazam file or of every file in the + file shazam or of every file in the shazam directory. For every file, the status is given as one of: @@ -446,12 +446,12 @@ - Once you have checked something out, update it with the + Once you have checked something out, you can update it with the update command. &prompt.user; cvs update shazam - This updates the shazam file or the + This updates the file shazam or the contents of the shazam directory to the latest version along the branch you checked out. If you checked out a point in time, does nothing @@ -490,7 +490,7 @@ sticky tags, dates or revisions whereas and set new ones. - Theoretically, specifying HEAD as + Theoretically, specifying HEAD as the argument to will give you the same result as , but that is just theory. @@ -875,7 +875,7 @@ (editors/vim5) have color support and when used as a pager with color syntax highlighting switched on will highlight many types of file, including diffs, patches, - and cvs/rcs logs. + and CVS/RCS logs. &prompt.user; echo "syn on" >> ~/.vimrc &prompt.user; cvs diff -Nu shazam | vim - @@ -1036,9 +1036,9 @@ again until the matter is settled. Remember – with CVS we can always change it back. - Don't impugn the intentions of someone you disagree with. + Do not impugn the intentions of someone you disagree with. If they see a different solution to a problem than you, or even - a different problem, it's not because they are stupid, because + a different problem, it is not because they are stupid, because they have questionable parentage, or because they are trying to destroy your hard work, personal image, or FreeBSD, but simply because they have a different outlook on the world. Different @@ -1049,15 +1049,15 @@ seeing their solution, or even their vision of the problem, with an open mind. - Accept correction. We're all fallible. When you've made - a mistake, apologize and get on with life. Don't beat up - yourself, and certainly don't beat up others for your mistake. - Don't waste time on embarassment or recrimination, just fix + Accept correction. We are all fallible. When you have made + a mistake, apologize and get on with life. Do not beat up + yourself, and certainly do not beat up others for your mistake. + Do not waste time on embarrassment or recrimination, just fix the problem and move on. Ask for help. Seek out (and give) peer reviews. One of the ways open source software is supposed to excel is in the - number of eyeballs applied to it; this doesn't apply if nobody + number of eyeballs applied to it; this does not apply if nobody will review code. @@ -1090,10 +1090,6 @@ - http://www.FreeBSD.org/send-pr.html - - - &man.send-pr.1; @@ -1163,7 +1159,7 @@ # # FreeBSD categories # -docs:Documentation Bug:nik: +docs:Documentation Bug:freebsd-doc: @@ -1208,6 +1204,8 @@ probably get to know in your role as a committer. Briefly, and by no means all-inclusively, these are: + + @@ -1218,7 +1216,7 @@ authority over the architectural design and implementation of the move to fine-grained kernel threading and locking. He's also the editor of the SMPng Architecture Document. - If you're working on fine-grained SMP and locking, please + If you are working on fine-grained SMP and locking, please coordinate with John. You can learn more about the SMPng Project on its home page: @@ -1391,7 +1389,7 @@ &a.developers; - developers is all committers. This list was created to be a + All committers are subscribed to -developers. This list was created to be a forum for the committers community issues. Examples are Core voting, announcements, etc. This list is @@ -1504,11 +1502,6 @@ - Never touch the repository directly. Ask a - Repomeister. - - - Any disputed change must be backed out pending resolution of the dispute if requested by a maintainer. Security related changes may @@ -1526,7 +1519,7 @@ merging so that it can be given sufficient testing. The release engineer has the same authority over the &os.stable; branch as outlined for the - maintainer in rule #6. + maintainer in rule #5. @@ -1591,8 +1584,8 @@ In all other aspects of project operation, core is a subset of committers and is bound by the same - rules. Just because someone is in core does not mean - that they have special dispensation to step outside of any of + rules. Just because someone is in core this does not mean + that they have special dispensation to step outside any of the lines painted here; core's special powers only kick in when it acts as a group, not on an individual basis. As individuals, the core team members are all committers @@ -1672,8 +1665,8 @@ The CVS repository is not where changes should be initially submitted for correctness or argued over, that - should happen first in the mailing lists and then - committed only once something resembling consensus has + should happen first in the mailing lists and the commit should + only happen once something resembling consensus has been reached. This does not mean that you have to ask permission before correcting every obvious syntax error or manual page misspelling, simply that you should try to @@ -1715,32 +1708,12 @@ someone who manages an overall category of FreeBSD evolution, such as internationalization or networking. See + url="../contributors/staff-who.html"> http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/contributors/staff-who.html for more information on this. - Never touch the repository directly. Ask a - Repomeister. - - This is pretty clear - you are not allowed to make - direct modifications to the CVS repository, period. In - case of difficulty, ask one of the repository meisters by - sending mail to the &a.cvs; and simply - wait for them to fix the problem and get back to you. Do - not attempt to fix the problem yourself! - - If you are thinking about putting down a tag or doing a - new import of code on a vendor branch, you might also find - it useful to ask for advice first. A lot of people get - this wrong the first few times and the consequences are - expensive in terms of files touched and angry CVSup/CTM - folks who are suddenly getting a lot of changes sent over - unnecessarily. - - - Any disputed change must be backed out pending resolution of the dispute if requested by a maintainer. Security related changes may @@ -1775,7 +1748,7 @@ 3 days before merging so that it can be given sufficient testing. The release engineer has the same authority over the &os.stable; branch as outlined in rule - #6. + #5. This is another do not argue about it issue since it is the release engineer who is ultimately @@ -1835,6 +1808,7 @@ to resolve the dispute. All parties involved must then agree to be bound by the decision reached by this 3rd party. + @@ -1869,6 +1843,9 @@ Test your changes before committing them. + This may sound obvious, but if it really were so obvious then we probably would not see so many cases of people clearly not doing this. If your changes are to the @@ -2167,7 +2144,7 @@ First, please read the section about repository - copy. + copies. The easiest way to add a new port is to use the addport script on @@ -2293,7 +2270,7 @@ Upgrade the copied port to the new version (remember to change the PORTNAME so there - aren't duplicate ports with the same name). + are not duplicate ports with the same name). @@ -2552,7 +2529,7 @@ Perks of the Job - Unfortunately, there aren't many perks involved with being a + Unfortunately, there are not many perks involved with being a committer. Recognition as a competent software engineer is probably the only thing that will be of benefit in the long run. However, there are at least some perks: ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributors/article.sgml#16 (text+ko) ==== @@ -20,7 +20,7 @@ Contributors to FreeBSD - $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/article.sgml,v 1.342 2003/02/16 03:00:36 markp Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/article.sgml,v 1.355 2003/03/05 16:07:59 obraun Exp $ This article lists individuals and organizations who have @@ -1444,6 +1444,10 @@ + &a.das; + + + &a.schweikh; @@ -2840,6 +2844,11 @@ + Brad Davis + so14k@so14k.com + + + Brad Hendrickse bradh@uunet.co.za @@ -3005,6 +3014,11 @@ + Carl Schmidt + carl@perlpimp.codersluts.net + + + Casper casper@acc.am @@ -5062,6 +5076,11 @@ + Jon Nistor + nistor@snickers.org + + + Jon Wilson jon@phuq.co.uk @@ -5486,6 +5505,11 @@ + Koop Mast + einekoai@chello.nl + + + Kostya Lukin lukin@okbmei.msk.su @@ -5736,6 +5760,11 @@ + Mark Linimon + linimon@lonesome.com + + + Mark Mayo markm@vmunix.com @@ -5806,6 +5835,11 @@ + Martin Preuss + martin@libchipcard.de + + + Martti Kuparinen martti.kuparinen@ericsson.com @@ -5961,6 +5995,11 @@ + Maxim Tuliuk + mt@primats.org.ua + + + Maxime Romano verbophobe@hotmail.com @@ -7330,6 +7369,11 @@ + Rui Lopes + rui@ruilopes.com + + + Ruslan Belkin rus@home2.UA.net @@ -7440,6 +7484,11 @@ + Sascha Holzleiter + sascha@root-login.org + + + Sascha Wildner swildner@channelz.GUN.de @@ -7700,6 +7749,11 @@ + Steffen Mazanek + steffen.mazanek@unibw-muenchen.de + + + Steffen Vogelreuter Steffen@Vogelreuter.De @@ -7851,7 +7905,7 @@ Sune Stjerneby - stjerneby@usa.net + sst@vmunix.dk @@ -8083,6 +8137,11 @@ Tim Bishop tim@bishnet.net + + + Tim Daneliuk + tundra@tundraware.com + Tim Kientzle ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/cvs-freebsd/article.sgml#3 (text+ko) ==== @@ -19,10 +19,12 @@ 2001 + 2002 + 2003 Stijn Hoop - $FreeBSD: doc/en_US.ISO8859-1/articles/cvs-freebsd/article.sgml,v 1.7 2002/07/25 17:22:43 fanf Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/cvs-freebsd/article.sgml,v 1.9 2003/02/18 11:14:38 blackend Exp $ This article describes the steps I took to setup a CVS repository @@ -135,7 +137,7 @@ &prompt.user; cvs add * Note that you will probably get a few warnings about some directories - not being copied; this is normal, you don't need those. + not being copied; this is normal, you do not need those. @@ -241,7 +243,7 @@ can edit this as you wish. More information about this file is available in the CVS manual. Note that the -t and -f - options don't work correctly with client/server + options do not work correctly with client/server CVS. @@ -257,7 +259,7 @@ functionality, as parsing the log message is done by verifymsg and logcheck. This is because the editinfo - functionality doesn't work properly with remote commits, or ones + functionality does not work properly with remote commits, or ones that use the -m or -F options. You should not have to touch this file. @@ -371,7 +373,7 @@ automatically unwrap binary files (see cvswrappers) on checkout. It is not used in the current FreeBSD setup because the functionality it hooks into - doesn't work well with remote commits. You should not have to + does not work well with remote commits. You should not have to touch this file. @@ -387,7 +389,7 @@ automatically wrap binary files (see cvswrappers) on checkin. It is not used in the current FreeBSD setup because the functionality it - hooks into doesn't work well with remote commits. You should + hooks into does not work well with remote commits. You should not have to touch this file. @@ -442,7 +444,7 @@ $MAIL_BRANCH_HDR - if you want to insert a header into each commit mail describing the branch on which the commit was made, define this to match - your setup. Or leave it empty if you don't want such a >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Mar 6 14:25:32 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 975FB37B405; Thu, 6 Mar 2003 14:25:23 -0800 (PST) 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 42E9737B401 for ; Thu, 6 Mar 2003 14:25:23 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9018C43F85 for ; Thu, 6 Mar 2003 14:25:22 -0800 (PST) (envelope-from chris@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h26MPM0U064416 for ; Thu, 6 Mar 2003 14:25:22 -0800 (PST) (envelope-from chris@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h26MPLt8064413 for perforce@freebsd.org; Thu, 6 Mar 2003 14:25:21 -0800 (PST) Date: Thu, 6 Mar 2003 14:25:21 -0800 (PST) Message-Id: <200303062225.h26MPLt8064413@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 26450 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=26450 Change 26450 by chris@chris_holly on 2003/03/06 14:24:56 Bring the vendor version of chapter.sgml back up to the (incorrectly) spammed head of this branch. Affected files ... .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#13 integrate Differences ... ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#13 (text+ko) ==== @@ -3546,58 +3546,261 @@ - - Chris - Costello - Contributed by - + + Robert + Watson + Sponsored by DARPA and Network Associates Laboratories. + Contributed by + - + + MAC + + Mandatory Access Control (MAC) + + FreeBSD 5.0 includes a new kernel security framework, the + TrustedBSD MAC Framework. The MAC Framework permits compile-time, + boot-time, and run-time extension of the kernel access control + policy, and can be used to load support for Mandatory Access + Control (MAC), and custom security modules + such as hardening modules. The MAC Framework is currently + considered to be an experimental feature, and should not yet + be used in production environments without careful consideration. + It is anticipated that the MAC Framework will be appropriate for + more widespread production use by FreeBSD 5.2. - Mandatory Access Control + When configured into a kernel, the MAC Framework permits + security modules to augment the existing kernel access control + model, restricting access to system services and objects. For + example, the &man.mac.bsdextended.4; module augments file system + access control, permitting administrators to provide a + firewall-like ruleset constraining access to file system objects + based on user ids and group membership. Some modules require + little or no configuration, such as &man.mac.seeotheruids.4, + whereas others perform ubiquitous object labeling, such as + &man.mac.biba.4; and &man.mac.mls.4;, and require extensive + configuration. - Mandatory Access Control, or MAC, permits administrators to - enforce non-bypassable security policies for all subjects (such - as processes, sockets, pipes) and objects (such as file system - objects, processes, sockets, pipes). A framework is provided in - order to load, unload and standardize individual MAC policy - modules. + To enable the MAC Framework in your system kernel, you must + add the following entry to your kernel configuration: - The MAC framework and policies were contributed by the - TrustedBSD Project. + options MAC - This feature is in FreeBSD versions 5.0 and - later. + Security policy modules shipped with the base system may + be loaded using &man.kldload.8; or in the boot &man.loader.8; + They may also be compiled directly into the kernel using the + following options, if the use of modules is not desired. - - A Basic Look at MAC + Different MAC policies may be configured in different ways; + frequently, MAC policy modules export configuration parameters + using the &man.sysctl.8; MIB using the + security.mac namespace. Policies relying on + file system or other labels may require a configuration step + that involes assigning initial labels to system objects or + creating a policy configuration file. For information on how to + configure and use each policy module, see its man page. - The main benefits of MAC lie in its modular structure. - A variety of policies are available, all of which are - available as loadable kernel modules. A MAC policy is - generally defined as the code which determines access - controls, often based on labels applied to subjects (e.g. - processes) and objects (e.g. files, processes, sockets, - network interfaces). + A variety of tools are available to configure the MAC Framework + and labels maintained by various policies. Extensions have been + made to the login and credential management mechanisms + (&man.setusercontext.3;) to support initial user labeling using + &man.login.conf.5;. In addition, modifications have been made + to &man.su.1;, &man.ps.1;, &man.ls.1;, and &man.ifconfig.8; to + inspect and set labels on processes, files, and interfaces. In + addition, several new tools have been added to manage labels + on objects, including &man.getfmac.8;, &man.setfmac.8;, and + &man.setfsmac.8; to manage labels on files, and &man.getpmac.8; and + &man.setpmac.8;. - Each subject and each object in a system where MAC is - enabled has a policy label associated with it. Typically - there is information in a label for each policy currently - enforced in the system. See &man.maclabel.7; for more info. + What follows is a list of policy modules shipped with FreeBSD + 5.0. + + Biba Integrity Policy (mac_biba) + + Biba Integrity Policy + + Vendor: TrustedBSD Project + Module name: mac_biba.ko + Kernel option: MAC_BIBA + + TCB + + The Biba Integrity Policy (&man.mac.biba.4;) provides + for hierarchical and non-hierarchical labeling of all system + objects with integrity data, and the strict enforcement of + an information flow policy to prevent corruption of high + integrity subjects and data by low-integrity subjects. + Integrity is enforced by preventing high integrity + subjects (generally processes) from reading low integrity + objects (often files), and preventing low integrity + subjects from writing to high integrity objects. + This security policy is frequently used in commercial + trusted systems to provide strong protection for the + Trusted Code Base (TCB). Because it + provides ubiquitous labeling, the Biba integrity policy + must be compiled into the kernel or loaded at boot. + + + File System Firewall Policy (mac_bsdextended) + + File System Firewall Policy + + Vendor: TrustedBSD Project + Module name: mac_bsdextended.ko + Kernel option: MAC_BSDEXTENDED + The File System Firewall Policy (&man.mac.bsdextended.4;) + provides an extension to the BSD file system permission model, + permitting the administrator to define a set of firewall-like + rules for limiting access to file system objects owned by + other users and groups. Managed using &man.ugidfw.8;, rules + may limit access to files and directories based on the uid + and gids of the process attempting the access, and the owner + and group of the target of the access attempt. All rules + are restrictive, so they may be placed in any order. This policy + requires no prior configuration or labeling, and may be + appropriate in multi-user environments where mandatory limits + on inter-user data exchange are required. Caution should be + exercised in limiting access to files owned by the super-user or + other system user ids, as many useful programs and directories + are owned by these users. As with a network firewall, + improper application of file system firewall rules may render + the system unusable. New tools to manage the rule set may be + easily written using the &man.libugidfw.3; library. + + + Interface Silencing Policy (mac_ifoff) + + Interface Silencing Policy + + Vendor: TrustedBSD Project + Module name: mac_ifoff.ko + Kernel option: MAC_IFOFF + The interface silencing policy (&man.mac.ifoff.4;) + prohibits the use of network interfaces during the boot + until explicitly enabled, preventing spurious stack output + stack response to incoming packets. This is appropriate + for use in environments where the monitoring of packets + is required, but no traffic may be generated. + + + Low-Watermark Mandatory Access Control (LOMAC) + (mac_lomac) + + Low-Watermark Mandatory Access Control + + + LOMAC + + Vendor: Network Associates Laboratories + Module name: mac_lomac.ko + Kernel option: MAC_LOMAC + Similar to the Biba Integrity Policy, the LOMAC + policy (&man.mac.lomac.4;) relies on the ubiquitous + labeling of all system objects with integrity labels. + Unlike Biba, LOMAC permits high integrity subjects to + read from low integrity objects, but then downgrades the + label on the subject to prevent future writes to high + integrity objects. This policy may provide for greater + compatibility, as well as require less initial + configuration than Biba. However, as with Biba, it + ubiquitously labels objects and must therefore be + compiled into the kernel or loaded at boot. + + + Multi-Level Security Policy (MLS) (mac_mls) + + Multi-Level Security Policy + + + MLS + + Vendor: TrustedBSD Project + Module name: mac_mls.ko + Kernel option: MAC_MLS + Multi-Level Security (MLS) + (&man.mac.mls.4;) provides for hierarchical and non-hierarchical + labeling of all system objects with sensitivity data, and the + strict enforcement of an information flow policy to prevent + the leakage of confidential data to untrusted parties. The + logical conjugate of the Biba Integrity Policy, + MLS is frequently shipped in commercial + trusted operating systems to protect data secrecy in + multi-user environments. Hierarchal labels provide support + for the notion of clearances and classifications in + traditional parlance; non-hierarchical labels provide support + for need-to-know. As with Biba, ubiquitous + labeling of objects occurs, and it must therefore be compiled + into the kernel or loaded at boot. As with Biba, extensive + initial configuration may be required. + + + MAC Stub Policy (mac_none) + + MAC Stub Policy + + Vendor: TrustedBSD Project + Module name: mac_none.ko + Kernel option: MAC_NONE + The None policy (&man.mac.none.4;) provides a stub + sample policy for developers, implementing all entry + points, but not changing the system access control + policy. Running this on a production system would + not be highly beneficial. + + + Process Partition Policy (mac_partition) + + Process Partition Policy + + Vendor: TrustedBSD Project + Module name: mac_partition.ko + Kernel option: MAC_PARTITION + The Partition policy (&man.mac.partition.4;) provides for a + simple process visibility limitation, assigning labels to + processes identifying what numeric system partition they + are present in. If none, all other processes are visible + using standard monitoring tools; if a partition identifier + is present, then only other processes in the same + partition are visible. This policy may be compiled into + the kernel, loaded at boot, or loaded at run-time. + + + See Other Uids Policy (mac_seeotheruids) + + See Other Uids Policy + + Vendor: TrustedBSD Project + Module name: mac_seeotheruids.ko + Kernel option: MAC_SEEOTHERUIDS + The See Other Uids policy (&man.mac.seeotheruids.4;) + implements a similar process visibility model to + mac_partition, except that it relies on process credentials to + control visibility of processes, rather than partition labels. + This policy may be configured to exempt certain users and + groups, including permitting system operators to view all + processes without special privilege. This policy may be + compiled into the kernel, loaded at boot, or loaded at + run-time. + + + MAC Framework Test Policy (mac_test) + + MAC Framework Test Policy + + Vendor: TrustedBSD Project + Module name: mac_test.ko + Kernel option: MAC_TEST + The Test policy (&man.mac.test.4;) provides a regression + test environment for the MAC Framework, and will cause a + fail-stop in the event that internal MAC Framework assertions + about proper data labeling fail. This module can be used to + detect failures to properly label system objects in the kernel + implementation. This policy may be compiled into the kernel, + loaded at boot, or loaded at run-time. - - Using MAC - - - Configuring a File System for MAC - - In order to configure a UFS1 file system to have - - -<<<<