From owner-p4-projects@FreeBSD.ORG Sun Oct 17 10:52:39 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3AA3816A4D1; Sun, 17 Oct 2004 10:52:39 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BE59A16A4CF for ; Sun, 17 Oct 2004 10:52:38 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B2EE743D2F for ; Sun, 17 Oct 2004 10:52:38 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9HAqcxm085082 for ; Sun, 17 Oct 2004 10:52:38 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9HAqbhF085079 for perforce@freebsd.org; Sun, 17 Oct 2004 10:52:37 GMT (envelope-from peter@freebsd.org) Date: Sun, 17 Oct 2004 10:52:37 GMT Message-Id: <200410171052.i9HAqbhF085079@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 63279 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Oct 2004 10:52:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=63279 Change 63279 by peter@peter_daintree on 2004/10/17 10:51:44 argh. increase disk command timeout from 5 to 30 seconds. On my dying maxtor "sata" drive, it takes 10-20 seconds to read some sectors. Meanwhile, the read and subsequent identify commands timeout and the kernel decides the drive is gone. (!). It wasn't gone, just slow. Increasing the timeout means that we do successfully read. Affected files ... .. //depot/projects/hammer/sys/dev/ata/ata-disk.c#26 edit Differences ... ==== //depot/projects/hammer/sys/dev/ata/ata-disk.c#26 (text+ko) ==== @@ -252,7 +252,7 @@ request->device = atadev; request->bio = bp; request->callback = ad_done; - request->timeout = 5; + request->timeout = 30; request->retries = 2; request->data = bp->bio_data; request->bytecount = bp->bio_bcount; From owner-p4-projects@FreeBSD.ORG Mon Oct 18 20:07:12 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 06D3416A4D2; Mon, 18 Oct 2004 20:07:12 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D15A816A4CE for ; Mon, 18 Oct 2004 20:07:11 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B0E0943D2D for ; Mon, 18 Oct 2004 20:07:11 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9IK7Bn7002591 for ; Mon, 18 Oct 2004 20:07:11 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9IK7BOe002588 for perforce@freebsd.org; Mon, 18 Oct 2004 20:07:11 GMT (envelope-from peter@freebsd.org) Date: Mon, 18 Oct 2004 20:07:11 GMT Message-Id: <200410182007.i9IK7BOe002588@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 63328 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Oct 2004 20:07:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=63328 Change 63328 by peter@peter_daintree on 2004/10/18 20:06:21 make this compile. oops, there is debug stuff lacking here. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/gdb_machdep.c#3 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/gdb_machdep.c#3 (text+ko) ==== @@ -93,7 +93,6 @@ val = __bswap64(val); switch (regnum) { case GDB_REG_PC: - kdb_thrctx->pcb_rip = val; if (kdb_thread == curthread) tf->tf_rip = val; } From owner-p4-projects@FreeBSD.ORG Mon Oct 18 20:20:30 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 03F0116A58C; Mon, 18 Oct 2004 20:20:29 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9917F16A58A for ; Mon, 18 Oct 2004 20:20:29 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 596DD43D2F for ; Mon, 18 Oct 2004 20:20:29 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9IKKTY4003080 for ; Mon, 18 Oct 2004 20:20:29 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9IKKSR7003071 for perforce@freebsd.org; Mon, 18 Oct 2004 20:20:28 GMT (envelope-from peter@freebsd.org) Date: Mon, 18 Oct 2004 20:20:28 GMT Message-Id: <200410182020.i9IKKSR7003071@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 63330 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Oct 2004 20:20:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=63330 Change 63330 by peter@peter_daintree on 2004/10/18 20:19:39 IFC @63327 Affected files ... .. //depot/projects/hammer/Makefile#25 integrate .. //depot/projects/hammer/UPDATING#62 integrate .. //depot/projects/hammer/contrib/libreadline/CHANGELOG#3 integrate .. //depot/projects/hammer/contrib/libreadline/CHANGES#3 integrate .. //depot/projects/hammer/contrib/libreadline/FREEBSD-upgrade#4 integrate .. //depot/projects/hammer/contrib/libreadline/INSTALL#3 integrate .. //depot/projects/hammer/contrib/libreadline/MANIFEST#3 integrate .. //depot/projects/hammer/contrib/libreadline/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/libreadline/NEWS#1 branch .. //depot/projects/hammer/contrib/libreadline/README#3 integrate .. //depot/projects/hammer/contrib/libreadline/aclocal.m4#3 integrate .. //depot/projects/hammer/contrib/libreadline/bind.c#4 integrate .. //depot/projects/hammer/contrib/libreadline/callback.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/chardefs.h#3 integrate .. //depot/projects/hammer/contrib/libreadline/complete.c#4 integrate .. //depot/projects/hammer/contrib/libreadline/config.h.in#3 integrate .. //depot/projects/hammer/contrib/libreadline/configure#3 integrate .. //depot/projects/hammer/contrib/libreadline/configure.in#3 integrate .. //depot/projects/hammer/contrib/libreadline/display.c#4 integrate .. //depot/projects/hammer/contrib/libreadline/doc/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/libreadline/doc/fdl.texi#1 branch .. //depot/projects/hammer/contrib/libreadline/doc/hist.texinfo#3 delete .. //depot/projects/hammer/contrib/libreadline/doc/history.3#3 integrate .. //depot/projects/hammer/contrib/libreadline/doc/history.texi#1 branch .. //depot/projects/hammer/contrib/libreadline/doc/hstech.texi#1 branch .. //depot/projects/hammer/contrib/libreadline/doc/hstech.texinfo#3 delete .. //depot/projects/hammer/contrib/libreadline/doc/hsuser.texi#1 branch .. //depot/projects/hammer/contrib/libreadline/doc/hsuser.texinfo#3 delete .. //depot/projects/hammer/contrib/libreadline/doc/manvers.texinfo#3 delete .. //depot/projects/hammer/contrib/libreadline/doc/readline.3#4 integrate .. //depot/projects/hammer/contrib/libreadline/doc/rlman.texi#1 branch .. //depot/projects/hammer/contrib/libreadline/doc/rlman.texinfo#3 delete .. //depot/projects/hammer/contrib/libreadline/doc/rltech.texi#1 branch .. //depot/projects/hammer/contrib/libreadline/doc/rltech.texinfo#3 delete .. //depot/projects/hammer/contrib/libreadline/doc/rluser.texi#1 branch .. //depot/projects/hammer/contrib/libreadline/doc/rluser.texinfo#3 delete .. //depot/projects/hammer/contrib/libreadline/doc/rluserman.texi#1 branch .. //depot/projects/hammer/contrib/libreadline/doc/rluserman.texinfo#3 delete .. //depot/projects/hammer/contrib/libreadline/doc/version.texi#1 branch .. //depot/projects/hammer/contrib/libreadline/examples/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/libreadline/examples/histexamp.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/examples/rl-fgets.c#1 branch .. //depot/projects/hammer/contrib/libreadline/funmap.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/histexpand.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/histfile.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/history.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/history.h#3 integrate .. //depot/projects/hammer/contrib/libreadline/histsearch.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/input.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/keymaps.c#2 integrate .. //depot/projects/hammer/contrib/libreadline/kill.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/mbutil.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/misc.c#2 integrate .. //depot/projects/hammer/contrib/libreadline/nls.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/parens.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/posixdir.h#3 integrate .. //depot/projects/hammer/contrib/libreadline/readline.c#4 integrate .. //depot/projects/hammer/contrib/libreadline/readline.h#5 integrate .. //depot/projects/hammer/contrib/libreadline/rldefs.h#3 integrate .. //depot/projects/hammer/contrib/libreadline/rlmbutil.h#2 integrate .. //depot/projects/hammer/contrib/libreadline/rlprivate.h#3 integrate .. //depot/projects/hammer/contrib/libreadline/rlstdc.h#3 integrate .. //depot/projects/hammer/contrib/libreadline/rltty.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/rltty.h#2 integrate .. //depot/projects/hammer/contrib/libreadline/rltypedefs.h#3 integrate .. //depot/projects/hammer/contrib/libreadline/search.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/shell.c#4 integrate .. //depot/projects/hammer/contrib/libreadline/shlib/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/libreadline/signals.c#3 integrate .. //depot/projects/hammer/contrib/libreadline/support/config.guess#3 integrate .. //depot/projects/hammer/contrib/libreadline/support/config.rpath#1 branch .. //depot/projects/hammer/contrib/libreadline/support/config.sub#3 integrate .. //depot/projects/hammer/contrib/libreadline/support/mkinstalldirs#1 branch .. //depot/projects/hammer/contrib/libreadline/support/shlib-install#3 integrate .. //depot/projects/hammer/contrib/libreadline/support/shobj-conf#3 integrate .. //depot/projects/hammer/contrib/libreadline/terminal.c#4 integrate .. //depot/projects/hammer/contrib/libreadline/text.c#2 integrate .. //depot/projects/hammer/contrib/libreadline/util.c#4 integrate .. //depot/projects/hammer/contrib/libreadline/vi_mode.c#4 integrate .. //depot/projects/hammer/etc/etc.ia64/ttys#4 integrate .. //depot/projects/hammer/etc/mtree/BSD.usr.dist#30 integrate .. //depot/projects/hammer/etc/rc.d/dumpon#6 integrate .. //depot/projects/hammer/etc/rc.shutdown#7 integrate .. //depot/projects/hammer/gnu/lib/libdialog/Makefile#4 integrate .. //depot/projects/hammer/gnu/lib/libreadline/Makefile.inc#6 integrate .. //depot/projects/hammer/gnu/lib/libreadline/config.h#3 integrate .. //depot/projects/hammer/gnu/lib/libreadline/history/doc/Makefile#2 integrate .. //depot/projects/hammer/gnu/lib/libreadline/readline/Makefile#3 integrate .. //depot/projects/hammer/gnu/lib/libreadline/readline/doc/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/doc/Makefile#2 integrate .. //depot/projects/hammer/include/Makefile#32 integrate .. //depot/projects/hammer/include/rune.h#5 delete .. //depot/projects/hammer/lib/libarchive/archive.h.in#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_check_magic.c#4 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_compress.c#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_open_fd.c#4 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_open_file.c#8 integrate .. //depot/projects/hammer/lib/libc/Makefile#17 integrate .. //depot/projects/hammer/lib/libc/i386/net/htonl.S#2 integrate .. //depot/projects/hammer/lib/libc/i386/net/ntohl.S#2 integrate .. //depot/projects/hammer/lib/libc/locale/Makefile.inc#22 integrate .. //depot/projects/hammer/lib/libc/locale/frune.c#6 delete .. //depot/projects/hammer/lib/libc/locale/mblocal.h#4 integrate .. //depot/projects/hammer/lib/libc/locale/mbrune.3#7 delete .. //depot/projects/hammer/lib/libc/locale/mbrune.c#5 delete .. //depot/projects/hammer/lib/libc/locale/multibyte.3#11 integrate .. //depot/projects/hammer/lib/libc/locale/rune.3#9 delete .. //depot/projects/hammer/lib/libc/locale/setinvalidrune.c#5 delete .. //depot/projects/hammer/lib/libc/locale/setlocale.3#9 integrate .. //depot/projects/hammer/lib/libc/locale/setrunelocale.c#17 integrate .. //depot/projects/hammer/lib/libc/locale/srune.c#5 delete .. //depot/projects/hammer/lib/libc/locale/table.c#11 integrate .. //depot/projects/hammer/lib/libc/locale/utf2.5#4 delete .. //depot/projects/hammer/lib/libc/locale/utf2.c#6 delete .. //depot/projects/hammer/lib/libc/locale/utf8.5#6 integrate .. //depot/projects/hammer/lib/libc/sys/recv.2#6 integrate .. //depot/projects/hammer/lib/libc/sys/sendfile.2#10 integrate .. //depot/projects/hammer/lib/libncurses/Makefile#13 integrate .. //depot/projects/hammer/libexec/ypxfr/ypxfr_main.c#4 integrate .. //depot/projects/hammer/libexec/ypxfr/ypxfr_misc.c#4 integrate .. //depot/projects/hammer/release/scripts/print-cdrom-packages.sh#24 integrate .. //depot/projects/hammer/share/examples/etc/make.conf#27 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#37 integrate .. //depot/projects/hammer/share/mk/bsd.cpu.mk#23 integrate .. //depot/projects/hammer/share/mklocale/Makefile#14 integrate .. //depot/projects/hammer/share/msgdef/Makefile#16 integrate .. //depot/projects/hammer/share/numericdef/Makefile#14 integrate .. //depot/projects/hammer/share/zoneinfo/asia#5 integrate .. //depot/projects/hammer/share/zoneinfo/backward#3 integrate .. //depot/projects/hammer/share/zoneinfo/europe#4 integrate .. //depot/projects/hammer/share/zoneinfo/leapseconds#3 integrate .. //depot/projects/hammer/share/zoneinfo/northamerica#4 integrate .. //depot/projects/hammer/share/zoneinfo/southamerica#5 integrate .. //depot/projects/hammer/share/zoneinfo/zone.tab#6 integrate .. //depot/projects/hammer/sys/dev/ex/if_ex.c#13 integrate .. //depot/projects/hammer/sys/dev/random/harvest.c#8 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_serv.c#16 integrate .. //depot/projects/hammer/sys/vm/vm_fault.c#26 integrate .. //depot/projects/hammer/sys/vm/vm_page.c#35 integrate .. //depot/projects/hammer/tools/regression/netinet/tcpconnect/tcpconnect.c#2 integrate .. //depot/projects/hammer/tools/tools/README#11 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tbmaster.1#12 integrate .. //depot/projects/hammer/usr.bin/mklocale/mklocale.1#11 integrate .. //depot/projects/hammer/usr.bin/mklocale/yacc.y#10 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.c#20 integrate .. //depot/projects/hammer/usr.bin/tar/read.c#12 integrate .. //depot/projects/hammer/usr.bin/vi/Makefile#5 integrate .. //depot/projects/hammer/usr.bin/xargs/strnsubst.c#2 integrate .. //depot/projects/hammer/usr.sbin/mailwrapper/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/add/main.c#9 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/info/info.h#5 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/info/main.c#6 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/lib/global.c#2 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/lib/lib.h#7 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/version/main.c#3 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/version/perform.c#6 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/version/pkg_version.1#4 integrate .. //depot/projects/hammer/usr.sbin/rpc.yppasswdd/yppasswdd_main.c#4 integrate .. //depot/projects/hammer/usr.sbin/rpc.ypupdated/yp_dbupdate.c#4 integrate .. //depot/projects/hammer/usr.sbin/wicontrol/wicontrol.c#8 integrate .. //depot/projects/hammer/usr.sbin/ypbind/ypbind.c#3 integrate .. //depot/projects/hammer/usr.sbin/yppush/yppush_main.c#3 integrate .. //depot/projects/hammer/usr.sbin/ypset/ypset.c#5 integrate Differences ... ==== //depot/projects/hammer/Makefile#25 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.308 2004/08/18 07:17:01 ru Exp $ +# $FreeBSD: src/Makefile,v 1.309 2004/10/18 17:47:31 ru Exp $ # # The user-driven targets are: # @@ -86,7 +86,8 @@ PATH= /sbin:/bin:/usr/sbin:/usr/bin MAKEOBJDIRPREFIX?= /usr/obj -_MAKEOBJDIRPREFIX!= env -i PATH=${PATH} MAKEFLAGS="${.MAKEFLAGS}" ${MAKE} \ +_MAKEOBJDIRPREFIX!= /usr/bin/env -i \ + PATH=${PATH} MAKEFLAGS="${.MAKEFLAGS}" ${MAKE} \ -f /dev/null -V MAKEOBJDIRPREFIX dummy .if !empty(_MAKEOBJDIRPREFIX) .error MAKEOBJDIRPREFIX can only be set in environment, not as a global\ ==== //depot/projects/hammer/UPDATING#62 (text+ko) ==== @@ -52,16 +52,6 @@ have all your ports/packages rebuilt before removing the old libraries. - As a temporary measure, if you do not have any 4.X executables, - you can add the following lines to /etc/libmap.conf to force - 5.X executables to use the new libraries: - - libhistory.so.4 libhistory.so.5 - libm.so.2 libm.so.3 - libopie.so.2 libopie.so.3 - libpcap.so.2 libpcap.so.3 - libreadline.so.4 libreadline.so.5 - 20040929: The pfil API has gained an additional argument to pass an inpcb. You should rebuild all pfil consuming modules: ipfw, ipfilter @@ -1953,4 +1943,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.373 2004/10/10 16:12:09 mtm Exp $ +$FreeBSD: src/UPDATING,v 1.374 2004/10/17 14:59:18 obrien Exp $ ==== //depot/projects/hammer/contrib/libreadline/CHANGELOG#3 (text+ko) ==== @@ -697,3 +697,114 @@ - new maybe-clean target that removes the generated documentation if the build directory differs from the source directory - distclean target now depends on maybe-clean + + 7/17 + ---- +[readline-4.3 released] + + 7/18 + ---- +shlib/Makefile.in + - fix bad dependency: text.so: terminal.c, make it depend on text.c + + 8/7 + --- +support/shlib-install + - break `linux' out into its own stanza: it seems that linux + distributions are all moving to the following scheme: + + libreadline.so.4.3 installed version + libreadline.so.4 -> libreadline.so.4.3 symlink + libreadline.so -> libreadline.so.4 symlink + + 10/29 + ----- +support/shlib-install + - change INSTALL_LINK[12] to use `&&' instead of `;' so it only + tries the link if the cd succeeds; put ${echo} in there, too + - use $LN instead of `ln -s' so it works on machines without symlinks + - change special linux stanza to use cd before ln also + - change to use $INSTALL_LINK1 and $INSTALL_LINK2 appropriately + instead of explicit commands in various stanzas + + 2/1 + --- +config.h.in + - add HAVE_MBRTOWC and HAVE_MBRLEN + - add NO_MULTIBYTE_SUPPORT for new configure argument + - add STDC_HEADERS + +configure.in + - new argument --enable-multibyte (enabled by default), allows + multibyte support to be turned off even on systems that support it + - add check for ansi stdc headers with call to AC_HEADER_STDC + + 2/3 + --- +configure.in + - add call to BASH_FUNC_CTYPE_NONASCII + +config.h.in + - add CTYPE_NON_ASCII + + 2/20 + ---- + +doc/manvers.texinfo + - renamed to version.texi to match other GNU software + - UPDATE-MONTH variable is now `UPDATED-MONTH' + +doc/{hist,rlman,rluserman}.texinfo + - include version.texi + +doc/{rltech,rluser,hstech,hsuser}.texi + - changed the suffix from `texinfo' to `texi' + +doc/Makefile.in + - made appropriate changes for {{rl,hs}tech,{rl,hs}user}.texi + +doc/{rlman,rluserman}.texinfo + - changed the suffix from `texinfo' to `texi' + +doc/hist.texinfo + - renamed to history.texi to be more consistent + + 6/11 + ---- +shlib/Makefile.in + - have configure substitute value of `@LDFLAGS@' into the assignment + to SHLIB_XLDFLAGS + + 6/16 + ---- +configure.in + - readline and history libraries are now at version 5.0 + + 8/18 + ---- +support/shlib-install + - support for FreeBSD-gnu (from Robert Millan) + + 12/4 + ---- +Makefile.in + - add variables for localedir and the PACKAGE_* variables, auto-set + by configure + + 12/9 + ---- +Makefile.in + - use mkinstalldirs instead of mkdirs + + 4/22 + ---- +Makefile.in + - separate doc install/uninstall out into two new targets: + install-doc and uninstall-doc + - make install-doc and uninstall-doc prerequisites of appropriate + install and uninstall targets + +examples/rl-fgets.c + - new example from Harold Levy that wraps fgets replacement functions + that call readline in a shared library that can be interposed with + LD_PRELOAD ==== //depot/projects/hammer/contrib/libreadline/CHANGES#3 (text+ko) ==== @@ -1,3 +1,183 @@ +This document details the changes between this version, readline-5.0, +and the previous version, readline-4.3. + +1. Changes to Readline + +a. Fixes to avoid core dumps because of null pointer references in the + multibyte character code. + +b. Fix to avoid infinite recursion caused by certain key combinations. + +c. Fixed a bug that caused the vi-mode `last command' to be set incorrectly. + +d. Readline no longer tries to read ahead more than one line of input, even + when more is available. + +e. Fixed the code that adjusts the point to not mishandle null wide + characters. + +f. Fixed a bug in the history expansion `g' modifier that caused it to skip + every other match. + +g. Fixed a bug that caused the prompt to overwrite previous output when the + output doesn't contain a newline and the locale supports multibyte + characters. This same change fixes the problem of readline redisplay + slowing down dramatically as the line gets longer in multibyte locales. + +h. History traversal with arrow keys in vi insertion mode causes the cursor + to be placed at the end of the new line, like in emacs mode. + +i. The locale initialization code does a better job of using the right + precedence and defaulting when checking the appropriate environment + variables. + +j. Fixed the history word tokenizer to handle <( and >( better when used as + part of bash. + +k. The overwrite mode code received several bug fixes to improve undo. + +l. Many speedups to the multibyte character redisplay code. + +m. The callback character reading interface should not hang waiting to read + keyboard input. + +n. Fixed a bug with redoing vi-mode `s' command. + +o. The code that initializes the terminal tracks changes made to the terminal + special characters with stty(1) (or equivalent), so that these changes + are reflected in the readline bindings. New application-callable function + to make it work: rl_tty_unset_default_bindings(). + +p. Fixed a bug that could cause garbage to be inserted in the buffer when + changing character case in vi mode when using a multibyte locale. + +q. Fixed a bug in the redisplay code that caused problems on systems + supporting multibyte characters when moving between history lines when the + new line has more glyphs but fewer bytes. + +r. Undo and redo now work better after exiting vi insertion mode. + +s. Make sure system calls are restarted after a SIGWINCH is received using + SA_RESTART. + +t. Improvements to the code that displays possible completions when using + multibyte characters. + +u. Fixed a problem when parsing nested if statements in inputrc files. + +v. The completer now takes multibyte characters into account when looking for + quoted substrings on which to perform completion. + +w. The history search functions now perform better bounds checking on the + history list. + +x. Change to history expansion functions to treat `^' as equivalent to word + one, as the documention states. + +y. Some changes to the display code to improve display and redisplay of + multibyte characters. + +z. Changes to speed up the multibyte character redisplay code. + +aa. Fixed a bug in the vi-mode `E' command that caused it to skip over the + last character of a word if invoked while point was on the word's + next-to-last character. + +bb. Fixed a bug that could cause incorrect filename quoting when + case-insensitive completion was enabled and the word being completed + contained backslashes quoting word break characters. + +cc. Fixed a bug in redisplay triggered when the prompt string contains + invisible characters. + +dd. Fixed some display (and other) bugs encountered in multibyte locales + when a non-ascii character was the last character on a line. + +ee. Fixed some display bugs caused by multibyte characters in prompt strings. + +ff. Fixed a problem with history expansion caused by non-whitespace characters + used as history word delimiters. + +gg. Fixed a problem that could cause readline to refer to freed memory when + moving between history lines while doing searches. + +hh. Improvements to the code that expands and displays prompt strings + containing multibyte characters. + +ii. Fixed a problem with vi-mode not correctly remembering the numeric argument + to the last `c'hange command for later use with `.'. + +jj. Fixed a bug in vi-mode that caused multi-digit count arguments to work + incorrectly. + +kk. Fixed a problem in vi-mode that caused the last text modification command + to not be remembered across different command lines. + +ll. Fixed problems with changing characters and changing case at the end of + the line. + +mm. Fixed a problem with readline saving the contents of the current line + before beginning a non-interactive search. + +nn. Fixed a problem with EOF detection when using rl_event_hook. + +oo. Fixed a problem with the vi mode `p' and `P' commands ignoring numeric + arguments. + +2. New Features in Readline + +a. History expansion has a new `a' modifier equivalent to the `g' modifier + for compatibility with the BSD csh. + +b. History expansion has a new `G' modifier equivalent to the BSD csh `g' + modifier, which performs a substitution once per word. + +c. All non-incremental search operations may now undo the operation of + replacing the current line with the history line. + +d. The text inserted by an `a' command in vi mode can be reinserted with + `.'. + +e. New bindable variable, `show-all-if-unmodified'. If set, the readline + completer will list possible completions immediately if there is more + than one completion and partial completion cannot be performed. + +f. There is a new application-callable `free_history_entry()' function. + +g. History list entries now contain timestamp information; the history file + functions know how to read and write timestamp information associated + with each entry. + +h. Four new key binding functions have been added: + + rl_bind_key_if_unbound() + rl_bind_key_if_unbound_in_map() + rl_bind_keyseq_if_unbound() + rl_bind_keyseq_if_unbound_in_map() + +i. New application variable, rl_completion_quote_character, set to any + quote character readline finds before it calls the application completion + function. + +j. New application variable, rl_completion_suppress_quote, settable by an + application completion function. If set to non-zero, readline does not + attempt to append a closing quote to a completed word. + +k. New application variable, rl_completion_found_quote, set to a non-zero + value if readline determines that the word to be completed is quoted. + Set before readline calls any application completion function. + +l. New function hook, rl_completion_word_break_hook, called when readline + needs to break a line into words when completion is attempted. Allows + the word break characters to vary based on position in the line. + +m. New bindable command: unix-filename-rubout. Does the same thing as + unix-word-rubout, but adds `/' to the set of word delimiters. + +n. When listing completions, directories have a `/' appended if the + `mark-directories' option has been enabled. + +------------------------------------------------------------------------------- This document details the changes between this version, readline-4.3, and the previous version, readline-4.2a. ==== //depot/projects/hammer/contrib/libreadline/FREEBSD-upgrade#4 (text+ko) ==== @@ -1,11 +1,11 @@ -# $FreeBSD: src/contrib/libreadline/FREEBSD-upgrade,v 1.5 2004/02/13 01:16:12 ache Exp $ +# $FreeBSD: src/contrib/libreadline/FREEBSD-upgrade,v 1.6 2004/10/18 07:15:43 ache Exp $ # -# Official patches 001-005 imported as v4_3_p1_p5 +# Official patches 001-005 imported as v5_0_p1_p5 # -rm doc/*.dvi doc/*.html doc/*.ps doc/*.0 doc/*.info doc/*.tex doc/texi2* +rm doc/*.dvi doc/*.html doc/*.ps doc/*.0 doc/*.info doc/*.tex doc/texi2* doc/*.pdf rm savestring.c cvs import \ - -m "Virgin import of GNU Readline 4.3" \ - src/contrib/libreadline FSF v4_3 + -m "Virgin import of GNU Readline 5.0" \ + src/contrib/libreadline FSF v5_0 ==== //depot/projects/hammer/contrib/libreadline/INSTALL#3 (text+ko) ==== @@ -1,7 +1,7 @@ Basic Installation ================== -These are installation instructions for Readline-4.3. +These are installation instructions for Readline-5.0. The simplest way to compile readline is: ==== //depot/projects/hammer/contrib/libreadline/MANIFEST#3 (text+ko) ==== @@ -11,6 +11,7 @@ INSTALL f CHANGELOG f CHANGES f +NEWS f USAGE f aclocal.m4 f config.h.in f @@ -74,23 +75,26 @@ histsearch.c f shlib/Makefile.in f support/config.guess f +support/config.rpath f support/config.sub f support/install.sh f support/mkdirs f support/mkdist f +support/mkinstalldirs f support/shobj-conf f support/shlib-install f support/wcwidth.c f doc/Makefile.in f doc/texinfo.tex f -doc/manvers.texinfo f -doc/rlman.texinfo f -doc/rltech.texinfo f -doc/rluser.texinfo f -doc/rluserman.texinfo f -doc/hist.texinfo f -doc/hstech.texinfo f -doc/hsuser.texinfo f +doc/version.texi f +doc/fdl.texi f +doc/rlman.texi f +doc/rltech.texi f +doc/rluser.texi f +doc/rluserman.texi f +doc/history.texi f +doc/hstech.texi f +doc/hsuser.texi f doc/readline.3 f doc/history.3 f doc/texi2dvi f @@ -100,6 +104,7 @@ examples/fileman.c f examples/manexamp.c f examples/readlinebuf.h f +examples/rl-fgets.c f examples/rlcat.c f examples/rlfe.c f examples/rltest.c f @@ -124,3 +129,6 @@ doc/history.0 f doc/readline_3.ps f doc/history_3.ps f +doc/history.pdf f +doc/readline.pdf f +doc/rluserman.pdf f ==== //depot/projects/hammer/contrib/libreadline/Makefile.in#3 (text+ko) ==== @@ -1,6 +1,6 @@ ## -*- text -*- ## # Master Makefile for the GNU readline library. -# Copyright (C) 1994 Free Software Foundation, Inc. +# Copyright (C) 1994-2004 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,6 +18,14 @@ RL_LIBRARY_VERSION = @LIBVERSION@ RL_LIBRARY_NAME = readline +PACKAGE = @PACKAGE_NAME@ +VERSION = @PACKAGE_VERSION@ + +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_VERSION = @PACKAGE_VERSION@ + srcdir = @srcdir@ VPATH = .:@srcdir@ top_srcdir = @top_srcdir@ @@ -45,6 +53,8 @@ libdir = @libdir@ mandir = @mandir@ includedir = @includedir@ +datadir = @datadir@ +localedir = $(datadir)/locale infodir = @infodir@ @@ -207,38 +217,42 @@ install: $(INSTALL_TARGETS) -install-static: installdirs $(STATIC_LIBS) install-headers +install-static: installdirs $(STATIC_LIBS) install-headers install-doc -$(MV) $(DESTDIR)$(libdir)/libreadline.a $(DESTDIR)$(libdir)/libreadline.old $(INSTALL_DATA) libreadline.a $(DESTDIR)$(libdir)/libreadline.a -test -n "$(RANLIB)" && $(RANLIB) $(DESTDIR)$(libdir)/libreadline.a -$(MV) $(DESTDIR)$(libdir)/libhistory.a $(DESTDIR)$(libdir)/libhistory.old $(INSTALL_DATA) libhistory.a $(DESTDIR)$(libdir)/libhistory.a -test -n "$(RANLIB)" && $(RANLIB) $(DESTDIR)$(libdir)/libhistory.a - -( if test -d doc ; then \ - cd doc && \ - ${MAKE} ${MFLAGS} infodir=$(infodir) DESTDIR=${DESTDIR} install; \ - fi ) -installdirs: $(srcdir)/support/mkdirs - -$(SHELL) $(srcdir)/support/mkdirs $(DESTDIR)$(includedir) \ +installdirs: $(srcdir)/support/mkinstalldirs + -$(SHELL) $(srcdir)/support/mkinstalldirs $(DESTDIR)$(includedir) \ $(DESTDIR)$(includedir)/readline $(DESTDIR)$(libdir) \ $(DESTDIR)$(infodir) $(DESTDIR)$(man3dir) -uninstall: uninstall-headers +uninstall: uninstall-headers uninstall-doc -test -n "$(DESTDIR)$(libdir)" && cd $(DESTDIR)$(libdir) && \ ${RM} libreadline.a libreadline.old libhistory.a libhistory.old $(SHARED_LIBS) - -( if test -d doc ; then \ - cd doc && \ - ${MAKE} ${MFLAGS} infodir=$(infodir) DESTDIR=${DESTDIR} $@; \ - fi ) -( cd shlib; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} uninstall ) -install-shared: installdirs install-headers shared +install-shared: installdirs install-headers shared install-doc -( cd shlib ; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} install ) - + uninstall-shared: maybe-uninstall-headers -( cd shlib; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} uninstall ) +install-doc: installdirs + -( if test -d doc ; then \ + cd doc && \ + ${MAKE} ${MFLAGS} infodir=$(infodir) DESTDIR=${DESTDIR} install; \ + fi ) + +uninstall-doc: + -( if test -d doc ; then \ + cd doc && \ + ${MAKE} ${MFLAGS} infodir=$(infodir) DESTDIR=${DESTDIR} uninstall; \ + fi ) + TAGS: force $(ETAGS) $(CSOURCES) $(HSOURCES) ==== //depot/projects/hammer/contrib/libreadline/README#3 (text+ko) ==== @@ -1,7 +1,7 @@ Introduction ============ -This is the Gnu Readline library, version 4.3. +This is the Gnu Readline library, version 5.0. The Readline library provides a set of functions for use by applications that allow users to edit command lines as they are typed in. Both ==== //depot/projects/hammer/contrib/libreadline/aclocal.m4#3 (text+ko) ==== @@ -685,65 +685,26 @@ ]) AC_DEFUN(BASH_FUNC_GETCWD, -[AC_MSG_CHECKING([if getcwd() calls popen()]) -AC_CACHE_VAL(bash_cv_getcwd_calls_popen, +[AC_MSG_CHECKING([if getcwd() will dynamically allocate memory]) +AC_CACHE_VAL(bash_cv_getcwd_malloc, [AC_TRY_RUN([ #include #ifdef HAVE_UNISTD_H #include #endif -#ifndef __STDC__ -#ifndef const -#define const -#endif -#endif - -int popen_called; - -FILE * -popen(command, type) - const char *command; - const char *type; -{ - popen_called = 1; - return (FILE *)NULL; -} - -FILE *_popen(command, type) - const char *command; - const char *type; -{ - return (popen (command, type)); -} - -int -pclose(stream) -FILE *stream; -{ - return 0; -} - -int -_pclose(stream) -FILE *stream; -{ - return 0; -} - main() { - char lbuf[32]; - popen_called = 0; - getcwd(lbuf, 32); - exit (popen_called); + char *xpwd; + xpwd = getcwd(0, 0); + exit (xpwd == 0); } -], bash_cv_getcwd_calls_popen=no, bash_cv_getcwd_calls_popen=yes, - [AC_MSG_WARN(cannot check whether getcwd calls popen if cross compiling -- defaulting to no) - bash_cv_getcwd_calls_popen=no] +], bash_cv_getcwd_malloc=yes, bash_cv_getcwd_malloc=no, + [AC_MSG_WARN(cannot check whether getcwd allocates memory when cross-compiling -- defaulting to no) + bash_cv_getcwd_malloc=no] )]) -AC_MSG_RESULT($bash_cv_getcwd_calls_popen) -if test $bash_cv_getcwd_calls_popen = yes; then +AC_MSG_RESULT($bash_cv_getcwd_malloc) +if test $bash_cv_getcwd_malloc = no; then AC_DEFINE(GETCWD_BROKEN) AC_LIBOBJ(getcwd) fi @@ -981,11 +942,12 @@ _bash_needmsg= fi AC_CACHE_VAL(bash_cv_termcap_lib, -[AC_CHECK_LIB(termcap, tgetent, bash_cv_termcap_lib=libtermcap, +[AC_CHECK_FUNC(tgetent, bash_cv_termcap_lib=libc, + [AC_CHECK_LIB(termcap, tgetent, bash_cv_termcap_lib=libtermcap, [AC_CHECK_LIB(tinfo, tgetent, bash_cv_termcap_lib=libtinfo, [AC_CHECK_LIB(curses, tgetent, bash_cv_termcap_lib=libcurses, [AC_CHECK_LIB(ncurses, tgetent, bash_cv_termcap_lib=libncurses, - bash_cv_termcap_lib=gnutermcap)])])])]) + bash_cv_termcap_lib=gnutermcap)])])])])]) if test "X$_bash_needmsg" = "Xyes"; then AC_MSG_CHECKING(which library has the termcap functions) fi @@ -1003,6 +965,9 @@ elif test $bash_cv_termcap_lib = libncurses; then TERMCAP_LIB=-lncurses TERMCAP_DEP= +elif test $bash_cv_termcap_lib = libc; then +TERMCAP_LIB= +TERMCAP_DEP= else TERMCAP_LIB=-lcurses TERMCAP_DEP= @@ -1061,7 +1026,7 @@ AC_DEFUN(BASH_STRUCT_DIRENT_D_INO, [AC_REQUIRE([AC_HEADER_DIRENT]) -AC_MSG_CHECKING(if struct dirent has a d_ino member) +AC_MSG_CHECKING(for struct dirent.d_ino) AC_CACHE_VAL(bash_cv_dirent_has_dino, [AC_TRY_COMPILE([ #include @@ -1088,13 +1053,13 @@ ], bash_cv_dirent_has_dino=yes, bash_cv_dirent_has_dino=no)]) AC_MSG_RESULT($bash_cv_dirent_has_dino) if test $bash_cv_dirent_has_dino = yes; then -AC_DEFINE(STRUCT_DIRENT_HAS_D_INO) +AC_DEFINE(HAVE_STRUCT_DIRENT_D_INO) fi ]) AC_DEFUN(BASH_STRUCT_DIRENT_D_FILENO, [AC_REQUIRE([AC_HEADER_DIRENT]) -AC_MSG_CHECKING(if struct dirent has a d_fileno member) +AC_MSG_CHECKING(for struct dirent.d_fileno) AC_CACHE_VAL(bash_cv_dirent_has_d_fileno, [AC_TRY_COMPILE([ #include @@ -1121,7 +1086,40 @@ ], bash_cv_dirent_has_d_fileno=yes, bash_cv_dirent_has_d_fileno=no)]) AC_MSG_RESULT($bash_cv_dirent_has_d_fileno) if test $bash_cv_dirent_has_d_fileno = yes; then -AC_DEFINE(STRUCT_DIRENT_HAS_D_FILENO) +AC_DEFINE(HAVE_STRUCT_DIRENT_D_FILENO) +fi +]) + +AC_DEFUN(BASH_STRUCT_DIRENT_D_NAMLEN, +[AC_REQUIRE([AC_HEADER_DIRENT]) +AC_MSG_CHECKING(for struct dirent.d_namlen) +AC_CACHE_VAL(bash_cv_dirent_has_d_namlen, +[AC_TRY_COMPILE([ +#include +#include +#ifdef HAVE_UNISTD_H +# include +#endif /* HAVE_UNISTD_H */ +#if defined(HAVE_DIRENT_H) +# include +#else +# define dirent direct +# ifdef HAVE_SYS_NDIR_H +# include +# endif /* SYSNDIR */ +# ifdef HAVE_SYS_DIR_H +# include +# endif /* SYSDIR */ +# ifdef HAVE_NDIR_H +# include +# endif +#endif /* HAVE_DIRENT_H */ +],[ +struct dirent d; int z; z = d.d_namlen; +], bash_cv_dirent_has_d_namlen=yes, bash_cv_dirent_has_d_namlen=no)]) +AC_MSG_RESULT($bash_cv_dirent_has_d_namlen) +if test $bash_cv_dirent_has_d_namlen = yes; then +AC_DEFINE(HAVE_STRUCT_DIRENT_D_NAMLEN) fi ]) @@ -1141,6 +1139,22 @@ fi ]) +AC_DEFUN(BASH_STRUCT_TIMEZONE, +[AC_MSG_CHECKING(for struct timezone in sys/time.h and time.h) +AC_CACHE_VAL(bash_cv_struct_timezone, +[ +AC_EGREP_HEADER(struct timezone, sys/time.h, + bash_cv_struct_timezone=yes, + AC_EGREP_HEADER(struct timezone, time.h, + bash_cv_struct_timezone=yes, + bash_cv_struct_timezone=no)) +]) +AC_MSG_RESULT($bash_cv_struct_timezone) +if test $bash_cv_struct_timezone = yes; then + AC_DEFINE(HAVE_STRUCT_TIMEZONE) +fi +]) + AC_DEFUN(BASH_STRUCT_WINSIZE, [AC_MSG_CHECKING(for struct winsize in sys/ioctl.h and termios.h) AC_CACHE_VAL(bash_cv_struct_winsize_header, @@ -1526,9 +1540,9 @@ AC_DEFUN(BASH_CHECK_DEV_FD, [AC_MSG_CHECKING(whether /dev/fd is available) AC_CACHE_VAL(bash_cv_dev_fd, -[if test -d /dev/fd && test -r /dev/fd/0; then +[if test -d /dev/fd && test -r /dev/fd/0 < /dev/null; then bash_cv_dev_fd=standard - elif test -d /proc/self/fd && test -r /proc/self/fd/0; then + elif test -d /proc/self/fd && test -r /proc/self/fd/0 < /dev/null; then bash_cv_dev_fd=whacky else bash_cv_dev_fd=absent @@ -1547,9 +1561,9 @@ AC_DEFUN(BASH_CHECK_DEV_STDIN, [AC_MSG_CHECKING(whether /dev/stdin stdout stderr are available) AC_CACHE_VAL(bash_cv_dev_stdin, -[if test -d /dev/fd && test -r /dev/stdin; then +[if test -d /dev/fd && test -r /dev/stdin < /dev/null; then bash_cv_dev_stdin=present - elif test -d /proc/self/fd && test -r /dev/stdin; then + elif test -d /proc/self/fd && test -r /dev/stdin < /dev/null; then bash_cv_dev_stdin=present else bash_cv_dev_stdin=absent @@ -1653,17 +1667,19 @@ AC_CHECK_HEADERS(langinfo.h) AC_CHECK_FUNC(mbsrtowcs, AC_DEFINE(HAVE_MBSRTOWCS)) +AC_CHECK_FUNC(mbrtowc, AC_DEFINE(HAVE_MBRTOWC)) +AC_CHECK_FUNC(mbrlen, AC_DEFINE(HAVE_MBRLEN)) +AC_CHECK_FUNC(wctomb, AC_DEFINE(HAVE_WCTOMB)) AC_CHECK_FUNC(wcwidth, AC_DEFINE(HAVE_WCWIDTH)) +AC_CHECK_FUNC(wcsdup, AC_DEFINE(HAVE_WCSDUP)) AC_CACHE_CHECK([for mbstate_t], bash_cv_have_mbstate_t, -[AC_TRY_RUN([ -#include -int -main () -{ +[AC_TRY_COMPILE([ +#include ], [ mbstate_t ps; - return 0; -}], bash_cv_have_mbstate_t=yes, bash_cv_have_mbstate_t=no)]) + mbstate_t *psp; + psp = (mbstate_t *)0; +], bash_cv_have_mbstate_t=yes, bash_cv_have_mbstate_t=no)]) if test $bash_cv_have_mbstate_t = yes; then AC_DEFINE(HAVE_MBSTATE_T) fi @@ -1712,7 +1728,8 @@ CFLAGS="$CFLAGS -I${ac_cv_rl_includedir}" LDFLAGS="$LDFLAGS -L${ac_cv_rl_libdir}" -AC_TRY_RUN([ +AC_CACHE_VAL(ac_cv_rl_version, +[AC_TRY_RUN([ #include #include @@ -1728,7 +1745,7 @@ ], ac_cv_rl_version=`cat conftest.rlv`, ac_cv_rl_version='0.0', -ac_cv_rl_version='4.2') +ac_cv_rl_version='4.2')]) CFLAGS="$_save_CFLAGS" LDFLAGS="$_save_LDFLAGS" @@ -1790,3 +1807,2107 @@ fi ]) + +AC_DEFUN(BASH_FUNC_CTYPE_NONASCII, +[ +AC_MSG_CHECKING(whether the ctype macros accept non-ascii characters) +AC_CACHE_VAL(bash_cv_func_ctype_nonascii, +[AC_TRY_RUN([ +#ifdef HAVE_LOCALE_H +#include +#endif +#include +#include + +main(c, v) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Oct 19 00:17:55 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5261916A4D2; Tue, 19 Oct 2004 00:17:55 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0E7FA16A4CE for ; Tue, 19 Oct 2004 00:17:55 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DB31A43D31 for ; Tue, 19 Oct 2004 00:17:54 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9J0Hs5x018715 for ; Tue, 19 Oct 2004 00:17:54 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9J0Hsb1018712 for perforce@freebsd.org; Tue, 19 Oct 2004 00:17:54 GMT (envelope-from peter@freebsd.org) Date: Tue, 19 Oct 2004 00:17:54 GMT Message-Id: <200410190017.i9J0Hsb1018712@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 63340 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Oct 2004 00:17:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=63340 Change 63340 by peter@peter_daintree on 2004/10/19 00:17:19 Recognize and convert the 32-bit ioctl's that the 3ware tools generate. This is kinda gross, but there isn't much choice unless we can sweet-talk them into a native binary. Affected files ... .. //depot/projects/hammer/sys/dev/twe/twe.c#10 edit .. //depot/projects/hammer/sys/dev/twe/tweio.h#4 edit Differences ... ==== //depot/projects/hammer/sys/dev/twe/twe.c#10 (text+ko) ==== @@ -500,9 +500,25 @@ struct twe_request *tr; u_int8_t srid; int s, error; +#ifdef __amd64__ + struct twe_paramcommand32 *tp32 = (struct twe_paramcommand32 *)addr; + struct twe_usercommand32 *tu32 = (struct twe_usercommand32 *)addr; + struct twe_paramcommand tp_swab; + struct twe_usercommand tu_swab; +#endif error = 0; switch(ioctlcmd) { + +#ifdef __amd64__ + case TWEIO_COMMAND32: + tu_swab.tu_command = tu32->tu_command; + tu_swab.tu_data = (void *)(uintptr_t)tu32->tu_data; + tu_swab.tu_size = tu32->tu_size; + tu = &tu_swab; + /* FALLTHROUGH */ +#endif + /* handle a command from userspace */ case TWEIO_COMMAND: /* get a request */ @@ -588,6 +604,16 @@ splx(s); break; +#ifdef __amd64__ + case TWEIO_GET_PARAM32: + tp_swab.tp_table_id = tp32->tp_table_id; + tp_swab.tp_param_id = tp32->tp_param_id; + tp_swab.tp_data = (void *)(uintptr_t)tp32->tp_data; + tp_swab.tp_size = tp32->tp_size; + tp = &tp_swab; + /* FALLTHROUGH */ +#endif + case TWEIO_GET_PARAM: if ((param = twe_get_param(sc, tp->tp_table_id, tp->tp_param_id, tp->tp_size, NULL)) == NULL) { twe_printf(sc, "TWEIO_GET_PARAM failed for 0x%x/0x%x/%d\n", @@ -605,6 +631,16 @@ } break; +#ifdef __amd64__ + case TWEIO_SET_PARAM32: + tp_swab.tp_table_id = tp32->tp_table_id; + tp_swab.tp_param_id = tp32->tp_param_id; + tp_swab.tp_data = (void *)(uintptr_t)tp32->tp_data; + tp_swab.tp_size = tp32->tp_size; + tp = &tp_swab; + /* FALLTHROUGH */ +#endif + case TWEIO_SET_PARAM: if ((data = malloc(tp->tp_size, M_DEVBUF, M_WAITOK)) == NULL) { error = ENOMEM; ==== //depot/projects/hammer/sys/dev/twe/tweio.h#4 (text+ko) ==== @@ -44,6 +44,17 @@ #define TWEIO_COMMAND _IOWR('T', 100, struct twe_usercommand) +#ifdef __amd64__ +struct twe_usercommand32 { + TWE_Command tu_command; /* command ready for the controller */ + uint32_t tu_data; /* pointer to data in userspace */ + uint32_t tu_size; /* userspace data length */ +}; + +#define TWEIO_COMMAND32 _IOWR('T', 100, struct twe_usercommand32) +#endif + + /* * Command queue statistics */ @@ -89,6 +100,18 @@ #define TWEIO_SET_PARAM _IOW ('T', 104, struct twe_paramcommand) #define TWEIO_GET_PARAM _IOW ('T', 105, struct twe_paramcommand) +#ifdef __amd64__ +struct twe_paramcommand32 { + u_int16_t tp_table_id; + u_int8_t tp_param_id; + u_int32_t tp_data; + u_int8_t tp_size; +}; + +#define TWEIO_SET_PARAM32 _IOW ('T', 104, struct twe_paramcommand32) +#define TWEIO_GET_PARAM32 _IOW ('T', 105, struct twe_paramcommand32) +#endif + /* * Request a controller soft-reset */ From owner-p4-projects@FreeBSD.ORG Tue Oct 19 00:17:56 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C9A5C16A4FB; Tue, 19 Oct 2004 00:17:55 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2804116A4CF for ; Tue, 19 Oct 2004 00:17:55 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1B7E443D46 for ; Tue, 19 Oct 2004 00:17:55 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9J0HsVH018721 for ; Tue, 19 Oct 2004 00:17:55 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9J0Hs3L018718 for perforce@freebsd.org; Tue, 19 Oct 2004 00:17:54 GMT (envelope-from peter@freebsd.org) Date: Tue, 19 Oct 2004 00:17:54 GMT Message-Id: <200410190017.i9J0Hs3L018718@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 63341 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Oct 2004 00:17:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=63341 Change 63341 by peter@peter_daintree on 2004/10/19 00:17:51 update for the new world order Affected files ... .. //depot/projects/hammer/share/mk/bsd.cpu.mk#24 edit Differences ... ==== //depot/projects/hammer/share/mk/bsd.cpu.mk#24 (text+ko) ==== @@ -12,7 +12,6 @@ _CPUCFLAGS = -mcpu=ev4 -mtune=ev5 MACHINE_CPU = ev4 . elif ${MACHINE_ARCH} == "amd64" -_CPUCFLAGS = MACHINE_CPU = amd64 sse2 sse . elif ${MACHINE_ARCH} == "ia64" MACHINE_CPU = itanium @@ -88,10 +87,8 @@ . elif ${CPUTYPE} == "k5" _ICC_CPUCFLAGS = -tpp5 . elif ${CPUTYPE} == "prescott" -_CPUCFLAGS = -march=prescott _ICC_CPUCFLAGS = -tpp7 -xiMKW . elif ${CPUTYPE} == "pentium4" || ${CPUTYPE} == "pentium4m" -_CPUCFLAGS = -march=pentium4 _ICC_CPUCFLAGS = -tpp7 -xiMKW . elif ${CPUTYPE} == "pentium3" || ${CPUTYPE} == "pentium3m" || \ ${CPUTYPE} == "pentium-m" @@ -117,12 +114,6 @@ . else _CPUCFLAGS = -mcpu=${CPUTYPE} . endif -. elif ${MACHINE_ARCH} == "amd64" -. if ${CPUTYPE} == "k8" -_CPUCFLAGS = -march=k8 -. elif ${CPUTYPE} == "nocona" -_CPUCFLAGS = -march=nocona -. endif . endif # Set up the list of CPU features based on the CPU type. This is an @@ -180,7 +171,7 @@ . elif ${CPUTYPE} == "nocona" MACHINE_CPU = sse3 sse2 sse mmx . else -MACHINE_CPU = amd64 sse2 sse +MACHINE_CPU = amd64 sse2 sse #unspecified, no 3dnow nor sse3 . endif . elif ${MACHINE_ARCH} == "ia64" . if ${CPUTYPE} == "itanium" From owner-p4-projects@FreeBSD.ORG Tue Oct 19 00:29:09 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 83EEB16A4CE; Tue, 19 Oct 2004 00:29:09 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5C04216A4CE for ; Tue, 19 Oct 2004 00:29:09 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2433D43D41 for ; Tue, 19 Oct 2004 00:29:09 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9J0T9Rh019021 for ; Tue, 19 Oct 2004 00:29:09 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9J0T8RK019018 for perforce@freebsd.org; Tue, 19 Oct 2004 00:29:08 GMT (envelope-from peter@freebsd.org) Date: Tue, 19 Oct 2004 00:29:08 GMT Message-Id: <200410190029.i9J0T8RK019018@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 63342 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Oct 2004 00:29:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=63342 Change 63342 by peter@peter_daintree on 2004/10/19 00:28:19 IFC @63337 Affected files ... .. //depot/projects/hammer/UPDATING#63 integrate .. //depot/projects/hammer/gnu/usr.bin/rcs/rcsfreeze/Makefile#2 integrate .. //depot/projects/hammer/lib/libmagic/Makefile#2 integrate .. //depot/projects/hammer/share/man/man4/sio.4#7 integrate .. //depot/projects/hammer/sys/alpha/alpha/promcons.c#12 integrate .. //depot/projects/hammer/sys/alpha/tlsb/zs_tlsb.c#13 integrate .. //depot/projects/hammer/sys/dev/dcons/dcons_os.c#3 integrate .. //depot/projects/hammer/sys/dev/digi/digi.c#19 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#21 integrate .. //depot/projects/hammer/sys/dev/nmdm/nmdm.c#16 integrate .. //depot/projects/hammer/sys/dev/ofw/ofw_console.c#17 integrate .. //depot/projects/hammer/sys/dev/syscons/syscons.c#26 integrate .. //depot/projects/hammer/sys/dev/syscons/sysmouse.c#10 integrate .. //depot/projects/hammer/sys/dev/zs/zs.c#16 integrate .. //depot/projects/hammer/sys/i386/isa/pcvt/pcvt_drv.c#12 integrate .. //depot/projects/hammer/sys/ia64/ia64/ssc.c#9 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#33 integrate .. //depot/projects/hammer/sys/kern/tty.c#31 integrate .. //depot/projects/hammer/sys/kern/tty_pty.c#23 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#40 integrate .. //depot/projects/hammer/sys/kern/uipc_usrreq.c#25 integrate .. //depot/projects/hammer/sys/modules/netgraph/device/Makefile#2 integrate .. //depot/projects/hammer/sys/net/raw_cb.c#7 integrate .. //depot/projects/hammer/sys/net/raw_usrreq.c#10 integrate .. //depot/projects/hammer/sys/netatalk/ddp_pcb.c#5 integrate .. //depot/projects/hammer/sys/netatm/atm_socket.c#8 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#13 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#11 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#11 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#10 integrate .. //depot/projects/hammer/sys/netgraph/ng_device.c#9 integrate .. //depot/projects/hammer/sys/netgraph/ng_device.h#4 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.c#30 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#30 integrate .. //depot/projects/hammer/sys/netinet6/in6_pcb.c#18 integrate .. //depot/projects/hammer/sys/netipx/ipx_pcb.c#5 integrate .. //depot/projects/hammer/sys/netipx/ipx_usrreq.c#6 integrate .. //depot/projects/hammer/sys/netnatm/natm.c#13 integrate .. //depot/projects/hammer/sys/pci/if_de.c#20 integrate .. //depot/projects/hammer/sys/sys/socketvar.h#23 integrate .. //depot/projects/hammer/sys/sys/tty.h#19 integrate .. //depot/projects/hammer/usr.sbin/rpc.yppasswdd/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/ypserv/Makefile#3 integrate Differences ... ==== //depot/projects/hammer/UPDATING#63 (text+ko) ==== @@ -23,6 +23,14 @@ developers choose to disable these features on build machines to maximize performance. +20041018: + A major sweep over the tty drivers to elimnate approx 3100 + lines of copy&pasted code have been performed. As a part of + this change some tty devices have changed names: + sio devices are now named: {tty,cua}d%d[.init,.lock] + ucom devices are now named: {tty,cua}U%d[.init,.lock] + For other drivers see the commit logs. + 20041007: The FreeBSD keyword is no longer a requirement for a valid rc.d script. The rc(8) and rc.shutdown(8) scripts no longer check @@ -1943,4 +1951,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.374 2004/10/17 14:59:18 obrien Exp $ +$FreeBSD: src/UPDATING,v 1.375 2004/10/18 21:24:21 phk Exp $ ==== //depot/projects/hammer/gnu/usr.bin/rcs/rcsfreeze/Makefile#2 (text+ko) ==== @@ -1,10 +1,7 @@ -# $FreeBSD: src/gnu/usr.bin/rcs/rcsfreeze/Makefile,v 1.8 2002/07/29 09:40:09 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/rcs/rcsfreeze/Makefile,v 1.9 2004/10/18 21:44:17 ru Exp $ +SCRIPTS= rcsfreeze.sh MAN= rcsfreeze.1 -afterinstall: - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${.CURDIR}/rcsfreeze.sh ${DESTDIR}${BINDIR}/rcsfreeze - .include "../../Makefile.inc" .include ==== //depot/projects/hammer/lib/libmagic/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libmagic/Makefile,v 1.3 2004/08/09 11:05:09 obrien Exp $ +# $FreeBSD: src/lib/libmagic/Makefile,v 1.4 2004/10/18 22:18:23 ru Exp $ # Copyright (c) David E. O'Brien, 2000-2004 CONTRDIR= ${.CURDIR}/../../contrib/file @@ -45,8 +45,8 @@ ${CC} -DHAVE_CONFIG_H -DCOMPILE_ONLY \ -I${.CURDIR} -I${CONTRDIR} -o ${.TARGET} ${.ALLSRC} -FILEVER!= awk '$$1 == "\#define" && $$2 == "VERSION" { print $$3 }' \ - ${.CURDIR}/config.h | uniq +FILEVER!= awk '$$1 == "\#define" && $$2 == "VERSION" { print $$3; exit }' \ + ${.CURDIR}/config.h CLEANFILES+= ${MAN} .for mp in ${MAN} ${mp}: ${mp:C/[0-9]/man/} ==== //depot/projects/hammer/share/man/man4/sio.4#7 (text+ko) ==== @@ -34,9 +34,9 @@ .\" .\" from: @(#)dca.4 5.2 (Berkeley) 3/27/91 .\" from: com.4,v 1.1 1993/08/06 11:19:07 cgd Exp -.\" $FreeBSD: src/share/man/man4/sio.4,v 1.53 2004/07/03 18:29:20 ru Exp $ +.\" $FreeBSD: src/share/man/man4/sio.4,v 1.54 2004/10/18 21:31:05 obrien Exp $ .\" -.Dd July 10, 2002 +.Dd October 17, 2004 .Dt SIO 4 .Os .Sh NAME @@ -342,22 +342,22 @@ to avoid certain security holes, but this needs to be done by getty if the callin port is used for anything else. .Sh FILES -.Bl -tag -width /dev/ttyid? -compact +.Bl -tag -width /dev/ttyd?.init -compact .It Pa /dev/ttyd? for callin ports -.It Pa /dev/ttyid? -.It Pa /dev/ttyld? +.It Pa /dev/ttyd?.init +.It Pa /dev/ttyd?.lock corresponding callin initial-state and lock-state devices .Pp -.It Pa /dev/cuaa? +.It Pa /dev/cuad? for callout ports -.It Pa /dev/cuaia? -.It Pa /dev/cuala? +.It Pa /dev/cuad?.init +.It Pa /dev/cuad?.lock corresponding callout initial-state and lock-state devices .El .Pp -.Bl -tag -width /etc/rc.serial -compact -.It Pa /etc/rc.serial +.Bl -tag -width /etc/rc.d/serial -compact +.It Pa /etc/rc.d/serial examples of setting the initial-state and lock-state devices .El .Pp ==== //depot/projects/hammer/sys/alpha/alpha/promcons.c#12 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.41 2004/09/17 11:02:53 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.42 2004/10/18 21:51:24 phk Exp $"); #include #include @@ -107,12 +107,7 @@ tp->t_dev = dev; if ((tp->t_state & TS_ISOPEN) == 0) { tp->t_state |= TS_CARR_ON; - ttychars(tp); - tp->t_iflag = TTYDEF_IFLAG; - tp->t_oflag = TTYDEF_OFLAG; - tp->t_cflag = TTYDEF_CFLAG|CLOCAL; - tp->t_lflag = TTYDEF_LFLAG; - tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED; + ttyconsmode(tp, 0); ttsetwater(tp); setuptimeout = 1; ==== //depot/projects/hammer/sys/alpha/tlsb/zs_tlsb.c#13 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.48 2004/09/17 11:04:57 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.49 2004/10/18 21:51:24 phk Exp $"); #include #include @@ -283,12 +283,7 @@ tp = dev->si_tty; if ((tp->t_state & TS_ISOPEN) == 0) { tp->t_state |= TS_CARR_ON; - ttychars(tp); - tp->t_iflag = TTYDEF_IFLAG; - tp->t_oflag = TTYDEF_OFLAG; - tp->t_cflag = TTYDEF_CFLAG|CLOCAL; - tp->t_lflag = TTYDEF_LFLAG; - tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED; + ttyconsolemode(tp, 0); ttsetwater(tp); setuptimeout = 1; } else if ((tp->t_state & TS_XCLUDE) && suser(td)) { ==== //depot/projects/hammer/sys/dev/dcons/dcons_os.c#3 (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/dcons/dcons_os.c,v 1.2 2004/10/14 00:21:32 simokawa Exp $ + * $FreeBSD: src/sys/dev/dcons/dcons_os.c,v 1.3 2004/10/18 21:51:25 phk Exp $ */ #include @@ -294,12 +294,7 @@ s = spltty(); if ((tp->t_state & TS_ISOPEN) == 0) { tp->t_state |= TS_CARR_ON; - ttychars(tp); - tp->t_iflag = TTYDEF_IFLAG; - tp->t_oflag = TTYDEF_OFLAG; - tp->t_cflag = TTYDEF_CFLAG|CLOCAL; - tp->t_lflag = TTYDEF_LFLAG; - tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED; + ttyconsolemode(tp, 0); ttsetwater(tp); } else if ((tp->t_state & TS_XCLUDE) && suser(td)) { splx(s); ==== //depot/projects/hammer/sys/dev/digi/digi.c#19 (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/digi/digi.c,v 1.56 2004/10/06 20:01:49 phk Exp $ + * $FreeBSD: src/sys/dev/digi/digi.c,v 1.57 2004/10/18 21:51:25 phk Exp $ */ /*- @@ -85,9 +85,6 @@ fepcmd(port, cmd, (op2 << 8) | op1, ncmds) #define fepcmd_w fepcmd - -static speed_t digidefaultrate = TTYDEF_SPEED; - struct con_bios { struct con_bios *next; u_char *bios; @@ -589,19 +586,7 @@ bc->edelay = 100; - /* - * We don't use all the flags from since - * they are only relevant for logins. It's important to have - * echo off initially so that the line doesn't start blathering - * before the echo flag can be turned off. - */ - tp->t_init_in.c_iflag = 0; - tp->t_init_in.c_oflag = 0; - tp->t_init_in.c_cflag = TTYDEF_CFLAG; - tp->t_init_in.c_lflag = 0; - termioschars(&tp->t_init_in); - tp->t_init_in.c_ispeed = tp->t_init_in.c_ospeed = digidefaultrate; - tp->t_init_out = tp->t_init_in; + ttyinitmode(tp, 0, 0); port->send_ring = 1; /* Default action on signal RI */ ttycreate(tp, NULL, 0, MINOR_CALLOUT, "D%r%r", sc->res.unit, i); } ==== //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#21 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.70 2004/10/08 16:14:42 mlaier Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.71 2004/10/18 21:33:56 le Exp $"); #include "opt_bdg.h" @@ -1291,8 +1291,10 @@ break; } - if (pcnt == 0) + if (pcnt == 0) { + NDIS_UNLOCK(sc); return; + } if (sc->ndis_txpending == 0) ifp->if_flags |= IFF_OACTIVE; ==== //depot/projects/hammer/sys/dev/nmdm/nmdm.c#16 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/nmdm/nmdm.c,v 1.30 2004/07/15 20:47:37 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/nmdm/nmdm.c,v 1.31 2004/10/18 21:51:25 phk Exp $"); /* * Pseudo-nulmodem driver @@ -247,13 +247,7 @@ tp2 = sp->other->nm_tty; if ((tp->t_state & TS_ISOPEN) == 0) { - ttychars(tp); /* Set up default chars */ - tp->t_iflag = TTYDEF_IFLAG; - tp->t_oflag = TTYDEF_OFLAG; - tp->t_lflag = TTYDEF_LFLAG; - tp->t_lflag = 0; - tp->t_cflag = TTYDEF_CFLAG; - tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED; + ttyinitmode(tp, 0, 0); ttsetwater(tp); /* XXX ? */ } else if (tp->t_state & TS_XCLUDE && suser(td)) { return (EBUSY); ==== //depot/projects/hammer/sys/dev/ofw/ofw_console.c#17 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_console.c,v 1.29 2004/10/12 21:23:33 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_console.c,v 1.30 2004/10/18 21:51:25 phk Exp $"); #include "opt_comconsole.h" #include "opt_ofw.h" @@ -138,12 +138,7 @@ if ((tp->t_state & TS_ISOPEN) == 0) { tp->t_state |= TS_CARR_ON; - ttychars(tp); - tp->t_iflag = TTYDEF_IFLAG; - tp->t_oflag = TTYDEF_OFLAG; - tp->t_cflag = TTYDEF_CFLAG | CLOCAL; - tp->t_lflag = TTYDEF_LFLAG; - tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED; + ttyconsolemode(tp, 0); ttsetwater(tp); setuptimeout = 1; ==== //depot/projects/hammer/sys/dev/syscons/syscons.c#26 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/syscons/syscons.c,v 1.430 2004/10/14 08:58:28 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/syscons/syscons.c,v 1.431 2004/10/18 21:51:25 phk Exp $"); #include "opt_syscons.h" #include "opt_splash.h" @@ -145,6 +145,7 @@ static int debugger; /* prototypes */ +static struct tty *sc_alloc_tty(struct cdev *dev); static int scvidprobe(int unit, int flags, int cons); static int sckbdprobe(int unit, int flags, int cons); static void scmeminit(void *arg); @@ -288,10 +289,23 @@ return names[i].name[(adp->va_flags & V_ADP_COLOR) ? 0 : 1]; } +static struct tty * +sc_alloc_tty(struct cdev *dev) +{ + struct tty *tp; + + tp = dev->si_tty = ttyalloc(); + ttyinitmode(tp, 1, 0); + tp->t_oproc = scstart; + tp->t_param = scparam; + tp->t_stop = nottystop; + tp->t_dev = dev; + return (tp); +} + int sc_attach_unit(int unit, int flags) { - struct tty *tp; sc_softc_t *sc; scr_stat *scp; #ifdef SC_PIXEL_MODE @@ -383,14 +397,9 @@ for (vc = 0; vc < sc->vtys; vc++) { if (sc->dev[vc] == NULL) { - dev = make_dev(&sc_cdevsw, vc + unit * MAXCONS, + sc->dev[vc] = make_dev(&sc_cdevsw, vc + unit * MAXCONS, UID_ROOT, GID_WHEEL, 0600, "ttyv%r", vc + unit * MAXCONS); - sc->dev[vc] = dev; - tp = sc->dev[vc]->si_tty = ttyalloc(); - tp->t_oproc = scstart; - tp->t_param = scparam; - tp->t_stop = nottystop; - tp->t_dev = sc->dev[vc]; + sc_alloc_tty(sc->dev[vc]); if (vc == 0 && sc->dev == main_devs) SC_STAT(sc->dev[0]) = &main_console; } @@ -403,12 +412,8 @@ dev = make_dev(&sc_cdevsw, SC_CONSOLECTL, UID_ROOT, GID_WHEEL, 0600, "consolectl"); - tp = dev->si_tty = sc_console_tty = ttyalloc(); - ttyconsolemode(tp, 0); - tp->t_oproc = scstart; - tp->t_param = scparam; - tp->t_stop = nottystop; - tp->t_dev = dev; + sc_console_tty = sc_alloc_tty(dev); + ttyconsolemode(sc_console_tty, 0); SC_STAT(dev) = sc_console; return 0; @@ -2581,7 +2586,6 @@ static void scinit(int unit, int flags) { - struct tty *tp; /* * When syscons is being initialized as the kernel console, malloc() @@ -2692,11 +2696,7 @@ sc->dev = malloc(sizeof(struct cdev *)*sc->vtys, M_DEVBUF, M_WAITOK|M_ZERO); sc->dev[0] = make_dev(&sc_cdevsw, unit * MAXCONS, UID_ROOT, GID_WHEEL, 0600, "ttyv%r", unit * MAXCONS); - tp = sc->dev[0]->si_tty = ttyalloc(); - tp->t_oproc = scstart; - tp->t_param = scparam; - tp->t_stop = nottystop; - tp->t_dev = sc->dev[0]; + sc_alloc_tty(sc->dev[0]); scp = alloc_scp(sc, sc->first_vty); SC_STAT(sc->dev[0]) = scp; } ==== //depot/projects/hammer/sys/dev/syscons/sysmouse.c#10 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/syscons/sysmouse.c,v 1.25 2004/10/14 08:58:28 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/syscons/sysmouse.c,v 1.26 2004/10/18 21:51:26 phk Exp $"); #include "opt_syscons.h" @@ -80,12 +80,7 @@ tp = dev->si_tty; if (!(tp->t_state & TS_ISOPEN)) { - ttychars(tp); - tp->t_iflag = TTYDEF_IFLAG; - tp->t_oflag = TTYDEF_OFLAG; - tp->t_cflag = TTYDEF_CFLAG; - tp->t_lflag = TTYDEF_LFLAG; - tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED; + ttyinitmode(tp, 0, 0); smparam(tp, &tp->t_termios); ttyld_modem(tp, 1); } else if (tp->t_state & TS_XCLUDE && suser(td)) { ==== //depot/projects/hammer/sys/dev/zs/zs.c#16 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/zs/zs.c,v 1.28 2004/09/18 16:43:15 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/zs/zs.c,v 1.29 2004/10/18 21:51:26 phk Exp $"); /*- * Copyright (c) 2003 Jake Burkholder. * All rights reserved. @@ -276,12 +276,8 @@ tp->t_modem = zsttymodem; tp->t_break = zsttybreak; tp->t_stop = zsttystop; - tp->t_iflag = TTYDEF_IFLAG; - tp->t_oflag = TTYDEF_OFLAG; - tp->t_lflag = TTYDEF_LFLAG; + ttyinitmode(tp, 0, 0); tp->t_cflag = CREAD | CLOCAL | CS8; - tp->t_ospeed = TTYDEF_SPEED; - tp->t_ispeed = TTYDEF_SPEED; if (zstty_console(dev, mode, sizeof(mode))) { ttychars(tp); @@ -472,19 +468,10 @@ sc->sc_preg[1] |= ZSWR1_RIE | ZSWR1_SIE; sc->sc_iput = sc->sc_iget = sc->sc_ibuf; - /* - * Initialize the termios status to the defaults. Add in the - * sticky bits from TIOCSFLAGS. - */ - t.c_ispeed = 0; - t.c_ospeed = tp->t_ospeed; - t.c_cflag = TTYDEF_CFLAG; + ttyconsolemode(t, 0); /* Make sure zstty_param() will do something. */ tp->t_ospeed = 0; (void)zstty_param(sc, tp, &t); - tp->t_iflag = TTYDEF_IFLAG; - tp->t_oflag = TTYDEF_OFLAG; - tp->t_lflag = TTYDEF_LFLAG; ttychars(tp); ttsetwater(tp); ==== //depot/projects/hammer/sys/i386/isa/pcvt/pcvt_drv.c#12 (text+ko) ==== @@ -50,7 +50,7 @@ * * Last Edit-Date: [Sat Jul 15 15:06:06 2000] * - * $FreeBSD: src/sys/i386/isa/pcvt/pcvt_drv.c,v 1.89 2004/07/15 20:47:40 phk Exp $ + * $FreeBSD: src/sys/i386/isa/pcvt/pcvt_drv.c,v 1.90 2004/10/18 21:51:26 phk Exp $ * *---------------------------------------------------------------------------*/ @@ -297,12 +297,7 @@ if ((tp->t_state & TS_ISOPEN) == 0) { - ttychars(tp); - tp->t_iflag = TTYDEF_IFLAG; - tp->t_oflag = TTYDEF_OFLAG; - tp->t_cflag = TTYDEF_CFLAG; - tp->t_lflag = TTYDEF_LFLAG; - tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED; + ttyinitmode(tp, 1, 0); pcvt_param(tp, &tp->t_termios); ttyld_modem(tp, 1); /* fake connection */ winsz = 1; /* set winsize later */ ==== //depot/projects/hammer/sys/ia64/ia64/ssc.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/ia64/ia64/ssc.c,v 1.23 2004/07/15 20:47:40 phk Exp $ + * $FreeBSD: src/sys/ia64/ia64/ssc.c,v 1.24 2004/10/18 21:51:26 phk Exp $ */ #include #include @@ -148,12 +148,7 @@ tp->t_dev = dev; if ((tp->t_state & TS_ISOPEN) == 0) { tp->t_state |= TS_CARR_ON; - ttychars(tp); - tp->t_iflag = TTYDEF_IFLAG; - tp->t_oflag = TTYDEF_OFLAG; - tp->t_cflag = TTYDEF_CFLAG|CLOCAL; - tp->t_lflag = TTYDEF_LFLAG; - tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED; + ttyconsolemode(tp, 0); ttsetwater(tp); setuptimeout = 1; ==== //depot/projects/hammer/sys/kern/kern_descrip.c#33 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_descrip.c,v 1.245 2004/10/04 06:45:48 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_descrip.c,v 1.246 2004/10/18 22:19:42 rwatson Exp $"); #include "opt_compat.h" @@ -2063,6 +2063,7 @@ { NET_ASSERT_GIANT(); + ACCEPT_LOCK(); SOCK_LOCK(so); sorele(so); } ==== //depot/projects/hammer/sys/kern/tty.c#31 (text+ko) ==== @@ -71,7 +71,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/tty.c,v 1.238 2004/10/15 09:03:07 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/tty.c,v 1.239 2004/10/18 21:51:26 phk Exp $"); #include "opt_compat.h" #include "opt_tty.h" @@ -2845,11 +2845,7 @@ tp->t_timeout = -1; tp->t_dtr_wait = 3 * hz; - tp->t_init_in.c_iflag = TTYDEF_IFLAG; - tp->t_init_in.c_oflag = TTYDEF_OFLAG; - tp->t_init_in.c_cflag = TTYDEF_CFLAG; - tp->t_init_in.c_lflag = TTYDEF_LFLAG; - tp->t_init_in.c_ispeed = tp->t_init_in.c_ospeed = TTYDEF_SPEED; + ttyinitmode(tp, 0, 0); bcopy(ttydefchars, tp->t_init_in.c_cc, sizeof tp->t_init_in.c_cc); /* Make callout the same as callin */ @@ -3365,23 +3361,44 @@ } /* + * Initialize a tty to sane modes. + */ +void +ttyinitmode(struct tty *tp, int echo, int speed) +{ + + if (speed == 0) + speed = TTYDEF_SPEED; + tp->t_init_in.c_iflag = TTYDEF_IFLAG; + tp->t_init_in.c_oflag = TTYDEF_OFLAG; + tp->t_init_in.c_cflag = TTYDEF_CFLAG; + if (echo) + tp->t_init_in.c_lflag = TTYDEF_LFLAG_ECHO; + else + tp->t_init_in.c_lflag = TTYDEF_LFLAG; + + tp->t_init_in.c_ispeed = tp->t_init_in.c_ospeed = speed; + termioschars(&tp->t_init_in); + tp->t_init_out = tp->t_init_in; + tp->t_termios = tp->t_init_in; +} + +/* * Use more "normal" termios paramters for consoles. */ void ttyconsolemode(struct tty *tp, int speed) { - tp->t_init_in.c_iflag = TTYDEF_IFLAG; - tp->t_init_in.c_oflag = TTYDEF_OFLAG; - tp->t_init_in.c_cflag = TTYDEF_CFLAG | CLOCAL; - tp->t_init_in.c_lflag = TTYDEF_LFLAG_ECHO; - tp->t_lock_out.c_cflag = tp->t_lock_in.c_cflag = CLOCAL; if (speed == 0) speed = TTYDEF_SPEED; + ttyinitmode(tp, 1, speed); + tp->t_init_in.c_cflag |= CLOCAL; + tp->t_lock_out.c_cflag = tp->t_lock_in.c_cflag = CLOCAL; tp->t_lock_out.c_ispeed = tp->t_lock_out.c_ospeed = - tp->t_lock_in.c_ispeed = tp->t_lock_in.c_ospeed = - tp->t_init_in.c_ispeed = tp->t_init_in.c_ospeed = speed; + tp->t_lock_in.c_ispeed = tp->t_lock_in.c_ospeed = speed; tp->t_init_out = tp->t_init_in; + tp->t_termios = tp->t_init_in; } /* ==== //depot/projects/hammer/sys/kern/tty_pty.c#23 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/tty_pty.c,v 1.132 2004/10/15 09:03:07 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/tty_pty.c,v 1.133 2004/10/18 21:51:26 phk Exp $"); /* * Pseudo-teletype Driver @@ -175,12 +175,7 @@ pt = dev->si_drv1; tp = dev->si_tty; if ((tp->t_state & TS_ISOPEN) == 0) { - ttychars(tp); /* Set up default chars */ - tp->t_iflag = TTYDEF_IFLAG; - tp->t_oflag = TTYDEF_OFLAG; - tp->t_lflag = TTYDEF_LFLAG_ECHO; - tp->t_cflag = TTYDEF_CFLAG; - tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED; + ttyinitmode(tp, 1, 0); } else if (tp->t_state & TS_XCLUDE && suser(td)) return (EBUSY); else if (pt->pt_prison != td->td_ucred->cr_prison) ==== //depot/projects/hammer/sys/kern/uipc_socket.c#40 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.213 2004/10/11 08:11:26 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.214 2004/10/18 22:19:42 rwatson Exp $"); #include "opt_inet.h" #include "opt_mac.h" @@ -227,6 +227,7 @@ SOCK_UNLOCK(so); error = (*prp->pr_usrreqs->pru_attach)(so, proto, td); if (error) { + ACCEPT_LOCK(); SOCK_LOCK(so); so->so_state |= SS_NOFDREF; sorele(so); @@ -333,9 +334,8 @@ { struct socket *head; - SOCK_UNLOCK(so); - ACCEPT_LOCK(); - SOCK_LOCK(so); + ACCEPT_LOCK_ASSERT(); + SOCK_LOCK_ASSERT(so); if (so->so_pcb != NULL || (so->so_state & SS_NOFDREF) == 0 || so->so_count != 0) { @@ -467,6 +467,7 @@ error = error2; } discard: + ACCEPT_LOCK(); SOCK_LOCK(so); KASSERT((so->so_state & SS_NOFDREF) == 0, ("soclose: NOFDREF")); so->so_state |= SS_NOFDREF; ==== //depot/projects/hammer/sys/kern/uipc_usrreq.c#25 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.140 2004/08/25 21:24:36 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.141 2004/10/18 22:19:42 rwatson Exp $"); #include "opt_mac.h" @@ -140,6 +140,7 @@ unp_drop(unp, ECONNABORTED); unp_detach(unp); UNP_UNLOCK_ASSERT(); + ACCEPT_LOCK(); SOCK_LOCK(so); sotryfree(so); return (0); ==== //depot/projects/hammer/sys/modules/netgraph/device/Makefile#2 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/sys/modules/netgraph/device/Makefile,v 1.1 2002/06/18 21:32:33 julian Exp $ +# $FreeBSD: src/sys/modules/netgraph/device/Makefile,v 1.2 2004/10/18 20:13:57 glebius Exp $ KMOD= ng_device SRCS= ng_device.c -SRCS+= device_if.h +SRCS+= device_if.h vnode_if.h .include ==== //depot/projects/hammer/sys/net/raw_cb.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)raw_cb.c 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/net/raw_cb.c,v 1.29 2004/06/15 04:13:59 rwatson Exp $ + * $FreeBSD: src/sys/net/raw_cb.c,v 1.30 2004/10/18 22:19:42 rwatson Exp $ */ #include @@ -98,6 +98,7 @@ { struct socket *so = rp->rcb_socket; + ACCEPT_LOCK(); SOCK_LOCK(so); so->so_pcb = 0; sotryfree(so); ==== //depot/projects/hammer/sys/net/raw_usrreq.c#10 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)raw_usrreq.c 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/net/raw_usrreq.c,v 1.34 2004/06/15 04:13:59 rwatson Exp $ + * $FreeBSD: src/sys/net/raw_usrreq.c,v 1.35 2004/10/18 22:19:42 rwatson Exp $ */ #include @@ -147,6 +147,7 @@ return EINVAL; raw_disconnect(rp); soisdisconnected(so); + ACCEPT_LOCK(); SOCK_LOCK(so); sotryfree(so); return 0; ==== //depot/projects/hammer/sys/netatalk/ddp_pcb.c#5 (text+ko) ==== @@ -3,7 +3,7 @@ * Copyright (c) 1990,1994 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. * - * $FreeBSD: src/sys/netatalk/ddp_pcb.c,v 1.44 2004/07/12 18:39:59 rwatson Exp $ + * $FreeBSD: src/sys/netatalk/ddp_pcb.c,v 1.45 2004/10/18 22:19:42 rwatson Exp $ */ #include @@ -282,6 +282,7 @@ DDP_LOCK_ASSERT(ddp); soisdisconnected(so); + ACCEPT_LOCK(); SOCK_LOCK(so); so->so_pcb = NULL; sotryfree(so); ==== //depot/projects/hammer/sys/netatm/atm_socket.c#8 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netatm/atm_socket.c,v 1.20 2004/06/12 20:47:29 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/netatm/atm_socket.c,v 1.21 2004/10/18 22:19:42 rwatson Exp $"); #include #include @@ -173,6 +173,7 @@ /* * Break links and free control blocks */ + ACCEPT_LOCK(); SOCK_LOCK(so); so->so_pcb = NULL; sotryfree(so); ==== //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#13 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $Id: ng_btsocket_hci_raw.c,v 1.14 2003/09/14 23:29:06 max Exp $ - * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c,v 1.15 2004/06/12 20:47:30 rwatson Exp $ + * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c,v 1.16 2004/10/18 22:19:42 rwatson Exp $ */ #include @@ -1417,6 +1417,7 @@ bzero(pcb, sizeof(*pcb)); FREE(pcb, M_NETGRAPH_BTSOCKET_HCI_RAW); + ACCEPT_LOCK(); SOCK_LOCK(so); so->so_pcb = NULL; sotryfree(so); ==== //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#11 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $Id: ng_btsocket_l2cap.c,v 1.16 2003/09/14 23:29:06 max Exp $ - * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c,v 1.13 2004/06/12 20:47:30 rwatson Exp $ + * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c,v 1.14 2004/10/18 22:19:42 rwatson Exp $ */ #include @@ -1804,6 +1804,7 @@ FREE(pcb, M_NETGRAPH_BTSOCKET_L2CAP); soisdisconnected(so); + ACCEPT_LOCK(); SOCK_LOCK(so); so->so_pcb = NULL; sotryfree(so); @@ -2347,6 +2348,7 @@ FREE(pcb, M_NETGRAPH_BTSOCKET_L2CAP); soisdisconnected(so); + ACCEPT_LOCK(); SOCK_LOCK(so); so->so_pcb = NULL; sotryfree(so); ==== //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#11 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $Id: ng_btsocket_l2cap_raw.c,v 1.12 2003/09/14 23:29:06 max Exp $ - * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c,v 1.12 2004/06/12 20:47:30 rwatson Exp $ + * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c,v 1.13 2004/10/18 22:19:42 rwatson Exp $ */ #include @@ -1129,6 +1129,7 @@ bzero(pcb, sizeof(*pcb)); FREE(pcb, M_NETGRAPH_BTSOCKET_L2CAP_RAW); + ACCEPT_LOCK(); SOCK_LOCK(so); so->so_pcb = NULL; sotryfree(so); ==== //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#10 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $Id: ng_btsocket_rfcomm.c,v 1.28 2003/09/14 23:29:06 max Exp $ - * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c,v 1.12 2004/06/18 05:09:42 rwatson Exp $ + * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c,v 1.13 2004/10/18 22:19:42 rwatson Exp $ */ #include @@ -724,6 +724,7 @@ FREE(pcb, M_NETGRAPH_BTSOCKET_RFCOMM); soisdisconnected(so); + ACCEPT_LOCK(); SOCK_LOCK(so); so->so_pcb = NULL; sotryfree(so); ==== //depot/projects/hammer/sys/netgraph/ng_device.c#9 (text+ko) ==== @@ -23,13 +23,19 @@ * * Netgraph "device" node * - * This node presents a /dev/ngd%d device that interfaces to an other + * This node presents a /dev/ngd%d device that interfaces to an other * netgraph node. * - * $FreeBSD: src/sys/netgraph/ng_device.c,v 1.11 2004/07/20 13:16:17 glebius Exp $ + * $FreeBSD: src/sys/netgraph/ng_device.c,v 1.12 2004/10/18 20:13:57 glebius Exp $ * */ +#if 0 +#define AAA printf("ng_device: %s\n", __func__ ); +#else +#define AAA +#endif + #include #include #include @@ -38,407 +44,328 @@ #include #include #include +#include #include #include +#include + +#include +#include +#include +#include +#include #include #include #include -/* turn this on for verbose messages */ -#define NGD_DEBUG - #define ERROUT(x) do { error = (x); goto done; } while (0) /* Netgraph methods */ -static ng_constructor_t ng_device_cons; +static ng_constructor_t ng_device_constructor; static ng_rcvmsg_t ng_device_rcvmsg; +static ng_shutdown_t ng_device_shutdown; static ng_newhook_t ng_device_newhook; -static ng_connect_t ng_device_connect; static ng_rcvdata_t ng_device_rcvdata; static ng_disconnect_t ng_device_disconnect; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Oct 19 17:41:04 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C51AA16A4D0; Tue, 19 Oct 2004 17:41:03 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9CAB016A4CE for ; Tue, 19 Oct 2004 17:41:03 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5E2EB43D55 for ; Tue, 19 Oct 2004 17:41:03 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9JHf3pa084000 for ; Tue, 19 Oct 2004 17:41:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9JHf2L1083997 for perforce@freebsd.org; Tue, 19 Oct 2004 17:41:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 19 Oct 2004 17:41:02 GMT Message-Id: <200410191741.i9JHf2L1083997@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 63364 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Oct 2004 17:41:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=63364 Change 63364 by rwatson@rwatson_zoo on 2004/10/19 17:40:48 Integrate netperf_socket: Accept locking fix -- accept mutex now covers sofree(), avoids dropping the socket mutex in sofree(), and appears to eliminate a class of races involving multiple simultaenous freeing of a socket. The new strategy hits the accept mutex more than I would like, however. if_em and if_bge busdma optimization. if_ndis locking fix More harvesting loopback: comments, assertions, hard-coded witness lock order, ethernet input fix. i4b marked as NET_NEEDS_GIANT(). Raw IP socket access control fix. Edge UDP pcbinfo lock around udp_append() since it constitutes a reference on the pcb. NFS server locking bugfixes. if_de fix. Affected files ... .. //depot/projects/netperf_socket/sys/alpha/alpha/promcons.c#8 integrate .. //depot/projects/netperf_socket/sys/alpha/osf1/osf1_misc.c#7 integrate .. //depot/projects/netperf_socket/sys/alpha/tlsb/zs_tlsb.c#9 integrate .. //depot/projects/netperf_socket/sys/amd64/acpica/acpi_machdep.c#5 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/nexus.c#7 integrate .. //depot/projects/netperf_socket/sys/amd64/include/acpica_machdep.h#3 integrate .. //depot/projects/netperf_socket/sys/amd64/pci/pci_bus.c#5 integrate .. //depot/projects/netperf_socket/sys/arm/conf/SIMICS#3 integrate .. //depot/projects/netperf_socket/sys/arm/sa11x0/assabet_machdep.c#5 integrate .. //depot/projects/netperf_socket/sys/boot/common/help.common#7 integrate .. //depot/projects/netperf_socket/sys/boot/common/loader.8#9 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_da.h#2 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_misc.c#8 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_util.h#3 integrate .. //depot/projects/netperf_socket/sys/conf/files#54 integrate .. //depot/projects/netperf_socket/sys/conf/kmod.mk#16 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#41 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_cmbat.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_cpu.c#13 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pcib_acpi.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/ahc_isa.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-all.c#20 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-card.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-queue.c#15 integrate .. //depot/projects/netperf_socket/sys/dev/bge/if_bge.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/cx/if_cx.c#18 integrate .. //depot/projects/netperf_socket/sys/dev/cx/machdep.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/dcons/dcons.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/dcons/dcons.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/dcons/dcons_crom.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/dcons/dcons_os.c#1 branch .. //depot/projects/netperf_socket/sys/dev/dcons/dcons_os.h#1 branch .. //depot/projects/netperf_socket/sys/dev/digi/digi.c#16 integrate .. //depot/projects/netperf_socket/sys/dev/digi/digi.h#6 integrate .. //depot/projects/netperf_socket/sys/dev/em/if_em.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/ex/if_ex.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/fdc/fdc.c#12 integrate .. //depot/projects/netperf_socket/sys/dev/hifn/hifn7751.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/hifn/hifn7751var.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis.c#19 integrate .. //depot/projects/netperf_socket/sys/dev/md/md.c#22 integrate .. //depot/projects/netperf_socket/sys/dev/nmdm/nmdm.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/ofw/ofw_console.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/pbio/pbio.c#1 branch .. //depot/projects/netperf_socket/sys/dev/pbio/pbioio.h#1 branch .. //depot/projects/netperf_socket/sys/dev/pci/pci.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/random/harvest.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/random/randomdev_soft.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/sab/sab.c#13 integrate .. //depot/projects/netperf_socket/sys/dev/sio/sio.c#21 integrate .. //depot/projects/netperf_socket/sys/dev/sio/sio_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sound/isa/ad1816.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/sound/isa/es1888.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sound/isa/ess.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/sound/isa/gusc.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/sound/isa/mss.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/sound/isa/sb16.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/sound/isa/sb8.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/sound/isa/sbc.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/au88x0.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/aureal.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/csapcm.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/ds1.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/emu10k1.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/es137x.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/fm801.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/ich.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/maestro3.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/solo.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/t4dwave.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/via8233.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/via82c686.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pcm/buffer.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/syscons.c#14 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/sysmouse.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_bus.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_tty.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ubsa.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ubser.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ucycom.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ugen.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uhci_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/umass.c#12 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs#26 integrate .. //depot/projects/netperf_socket/sys/dev/zs/zs.c#11 integrate .. //depot/projects/netperf_socket/sys/geom/geom_io.c#10 integrate .. //depot/projects/netperf_socket/sys/geom/geom_subr.c#9 integrate .. //depot/projects/netperf_socket/sys/geom/label/g_label.c#8 integrate .. //depot/projects/netperf_socket/sys/geom/mirror/g_mirror.c#13 integrate .. //depot/projects/netperf_socket/sys/i386/acpica/acpi_machdep.c#10 integrate .. //depot/projects/netperf_socket/sys/i386/bios/apm.c#5 integrate .. //depot/projects/netperf_socket/sys/i386/i386/elan-mmcr.c#10 integrate .. //depot/projects/netperf_socket/sys/i386/i386/nexus.c#7 integrate .. //depot/projects/netperf_socket/sys/i386/i386/vm_machdep.c#15 integrate .. //depot/projects/netperf_socket/sys/i386/ibcs2/ibcs2_misc.c#5 integrate .. //depot/projects/netperf_socket/sys/i386/ibcs2/ibcs2_socksys.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/ibcs2/ibcs2_sysi86.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/acpica_machdep.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/isa/npx.c#9 integrate .. //depot/projects/netperf_socket/sys/i386/isa/pbio.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/isa/pcvt/pcvt_drv.c#7 integrate .. //depot/projects/netperf_socket/sys/i386/pci/pci_bus.c#8 integrate .. //depot/projects/netperf_socket/sys/i4b/driver/i4b_ipr.c#5 integrate .. //depot/projects/netperf_socket/sys/i4b/driver/i4b_isppp.c#3 integrate .. //depot/projects/netperf_socket/sys/ia64/acpica/acpi_machdep.c#4 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/nexus.c#4 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/ssc.c#7 integrate .. //depot/projects/netperf_socket/sys/ia64/include/acpica_machdep.h#3 integrate .. //depot/projects/netperf_socket/sys/isa/atkbdc_isa.c#4 integrate .. //depot/projects/netperf_socket/sys/isa/isahint.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_condvar.c#8 integrate .. //depot/projects/netperf_socket/sys/kern/kern_descrip.c#20 integrate .. //depot/projects/netperf_socket/sys/kern/kern_event.c#14 integrate .. //depot/projects/netperf_socket/sys/kern/kern_exec.c#17 integrate .. //depot/projects/netperf_socket/sys/kern/kern_mutex.c#13 integrate .. //depot/projects/netperf_socket/sys/kern/kern_proc.c#18 integrate .. //depot/projects/netperf_socket/sys/kern/kern_subr.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/kern_switch.c#16 integrate .. //depot/projects/netperf_socket/sys/kern/kern_synch.c#19 integrate .. //depot/projects/netperf_socket/sys/kern/kern_sysctl.c#9 integrate .. //depot/projects/netperf_socket/sys/kern/kern_tc.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/kern_thread.c#28 integrate .. //depot/projects/netperf_socket/sys/kern/kern_xxx.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/subr_bus.c#15 integrate .. //depot/projects/netperf_socket/sys/kern/subr_sleepqueue.c#10 integrate .. //depot/projects/netperf_socket/sys/kern/subr_turnstile.c#9 integrate .. //depot/projects/netperf_socket/sys/kern/subr_witness.c#12 integrate .. //depot/projects/netperf_socket/sys/kern/tty.c#16 integrate .. //depot/projects/netperf_socket/sys/kern/tty_pty.c#13 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_mbuf2.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket.c#41 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_usrreq.c#27 integrate .. //depot/projects/netperf_socket/sys/modules/dcons/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/modules/dcons_crom/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/netgraph/device/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/net/bridge.c#12 integrate .. //depot/projects/netperf_socket/sys/net/bridge.h#2 integrate .. //depot/projects/netperf_socket/sys/net/if_ethersubr.c#20 integrate .. //depot/projects/netperf_socket/sys/net/if_tun.c#11 integrate .. //depot/projects/netperf_socket/sys/net/netisr.c#6 integrate .. //depot/projects/netperf_socket/sys/net/raw_cb.c#7 integrate .. //depot/projects/netperf_socket/sys/net/raw_usrreq.c#7 integrate .. //depot/projects/netperf_socket/sys/netatalk/ddp_pcb.c#8 integrate .. //depot/projects/netperf_socket/sys/netatm/atm_socket.c#4 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#9 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#7 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#6 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#6 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#10 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_device.c#7 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_device.h#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_ether.c#10 integrate .. //depot/projects/netperf_socket/sys/netinet/if_ether.c#11 integrate .. //depot/projects/netperf_socket/sys/netinet/in_pcb.c#17 integrate .. //depot/projects/netperf_socket/sys/netinet/raw_ip.c#16 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_subr.c#22 integrate .. //depot/projects/netperf_socket/sys/netinet/udp_usrreq.c#16 integrate .. //depot/projects/netperf_socket/sys/netinet6/in6_pcb.c#11 integrate .. //depot/projects/netperf_socket/sys/netipx/ipx_pcb.c#5 integrate .. //depot/projects/netperf_socket/sys/netipx/ipx_usrreq.c#4 integrate .. //depot/projects/netperf_socket/sys/netnatm/natm.c#6 integrate .. //depot/projects/netperf_socket/sys/netncp/ncp_ncp.c#2 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_vfsops.c#9 integrate .. //depot/projects/netperf_socket/sys/nfsserver/nfs_serv.c#10 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/fd.c#14 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/sio.c#19 integrate .. //depot/projects/netperf_socket/sys/pci/if_de.c#10 integrate .. //depot/projects/netperf_socket/sys/sys/conf.h#10 integrate .. //depot/projects/netperf_socket/sys/sys/mbuf.h#19 integrate .. //depot/projects/netperf_socket/sys/sys/proc.h#28 integrate .. //depot/projects/netperf_socket/sys/sys/random.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/sleepqueue.h#5 integrate .. //depot/projects/netperf_socket/sys/sys/socketvar.h#24 integrate .. //depot/projects/netperf_socket/sys/sys/sysctl.h#9 integrate .. //depot/projects/netperf_socket/sys/sys/tty.h#13 integrate .. //depot/projects/netperf_socket/sys/sys/ttydefaults.h#4 integrate .. //depot/projects/netperf_socket/sys/sys/turnstile.h#4 integrate .. //depot/projects/netperf_socket/sys/vm/vm_fault.c#12 integrate .. //depot/projects/netperf_socket/sys/vm/vm_meter.c#5 integrate .. //depot/projects/netperf_socket/sys/vm/vm_page.c#15 integrate Differences ... ==== //depot/projects/netperf_socket/sys/alpha/alpha/promcons.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.41 2004/09/17 11:02:53 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.42 2004/10/18 21:51:24 phk Exp $"); #include #include @@ -107,12 +107,7 @@ tp->t_dev = dev; if ((tp->t_state & TS_ISOPEN) == 0) { tp->t_state |= TS_CARR_ON; - ttychars(tp); - tp->t_iflag = TTYDEF_IFLAG; - tp->t_oflag = TTYDEF_OFLAG; - tp->t_cflag = TTYDEF_CFLAG|CLOCAL; - tp->t_lflag = TTYDEF_LFLAG; - tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED; + ttyconsmode(tp, 0); ttsetwater(tp); setuptimeout = 1; ==== //depot/projects/netperf_socket/sys/alpha/osf1/osf1_misc.c#7 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.49 2004/10/05 18:51:09 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.50 2004/10/14 10:43:47 phk Exp $"); #include #include @@ -1772,7 +1772,7 @@ name[1] = KERN_HOSTNAME; mtx_lock(&Giant); retval = userland_sysctl(td, name, 2, uap->buf, &len, - 1, 0, 0, &bytes); + 1, 0, 0, &bytes, 0); mtx_unlock(&Giant); td->td_retval[0] = bytes; return(retval); ==== //depot/projects/netperf_socket/sys/alpha/tlsb/zs_tlsb.c#9 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.48 2004/09/17 11:04:57 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.49 2004/10/18 21:51:24 phk Exp $"); #include #include @@ -283,12 +283,7 @@ tp = dev->si_tty; if ((tp->t_state & TS_ISOPEN) == 0) { tp->t_state |= TS_CARR_ON; - ttychars(tp); - tp->t_iflag = TTYDEF_IFLAG; - tp->t_oflag = TTYDEF_OFLAG; - tp->t_cflag = TTYDEF_CFLAG|CLOCAL; - tp->t_lflag = TTYDEF_LFLAG; - tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED; + ttyconsolemode(tp, 0); ttsetwater(tp); setuptimeout = 1; } else if ((tp->t_state & TS_XCLUDE) && suser(td)) { ==== //depot/projects/netperf_socket/sys/amd64/acpica/acpi_machdep.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.15 2004/08/16 23:10:18 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.16 2004/10/11 05:39:14 njl Exp $"); #include #include @@ -61,3 +61,9 @@ { return (0); } + +void +acpi_cpu_c1() +{ + __asm __volatile("sti; hlt"); +} ==== //depot/projects/netperf_socket/sys/amd64/amd64/nexus.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.63 2004/08/24 19:22:54 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.64 2004/10/14 22:36:47 njl Exp $"); /* * This code implements a `root nexus' for Intel Architecture @@ -259,6 +259,8 @@ retval += bus_print_child_header(bus, child); retval += nexus_print_all_resources(child); + if (device_get_flags(child)) + retval += printf(" flags %#x", device_get_flags(child)); retval += printf(" on motherboard\n"); /* XXX "motherboard", ick */ return (retval); ==== //depot/projects/netperf_socket/sys/amd64/include/acpica_machdep.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/acpica_machdep.h,v 1.5 2004/05/05 20:04:14 njl Exp $ + * $FreeBSD: src/sys/amd64/include/acpica_machdep.h,v 1.6 2004/10/11 05:39:15 njl Exp $ */ /****************************************************************************** @@ -73,6 +73,7 @@ #define COMPILER_DEPENDENT_INT64 long #define COMPILER_DEPENDENT_UINT64 unsigned long -void acpi_SetDefaultIntrModel(int model); +void acpi_SetDefaultIntrModel(int model); +void acpi_cpu_c1(void); #endif /* __ACPICA_MACHDEP_H__ */ ==== //depot/projects/netperf_socket/sys/amd64/pci/pci_bus.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.109 2004/06/03 05:58:30 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.110 2004/10/11 21:51:27 peter Exp $"); #include "opt_cpu.h" @@ -35,6 +35,7 @@ #include #include #include +#include #include #include @@ -42,6 +43,7 @@ #include #include #include +#include #include "pcib_if.h" @@ -81,8 +83,8 @@ static const char * legacy_pcib_is_host_bridge(int bus, int slot, int func, - u_int32_t id, u_int8_t class, u_int8_t subclass, - u_int8_t *busnum) + uint32_t id, uint8_t class, uint8_t subclass, + uint8_t *busnum) { const char *s = NULL; @@ -262,7 +264,38 @@ return ENOENT; } +SYSCTL_DECL(_hw_pci); +static int legacy_host_mem_start = 0x80000000; +/* No TUNABLE_ULONG :-( */ +TUNABLE_INT("hw.pci.host_mem_start", &legacy_host_mem_start); +SYSCTL_INT(_hw_pci, OID_AUTO, host_mem_start, CTLFLAG_RDTUN, + &legacy_host_mem_start, 0x80000000, + "Limit the host bridge memory to being above this address. Must be\n\ +set at boot via a tunable."); + +static struct resource * +legacy_pcib_alloc_resource(device_t dev, device_t child, int type, int *rid, + u_long start, u_long end, u_long count, u_int flags) +{ + /* + * If no memory preference is given, use upper 32MB slot most + * bioses use for their memory window. Typically other bridges + * before us get in the way to assert their preferences on memory. + * Hardcoding like this sucks, so a more MD/MI way needs to be + * found to do it. This is typically only used on older laptops + * that don't have pci busses behind pci bridge, so assuming > 32MB + * is liekly OK. + * + * However, this can cause problems for other chipsets, so we make + * this tunable by hw.pci.host_mem_start. + */ + if (type == SYS_RES_MEMORY && start == 0UL && end == ~0UL) + start = legacy_host_mem_start; + return (bus_generic_alloc_resource(dev, child, type, rid, start, end, + count, flags)); +} + static device_method_t legacy_pcib_methods[] = { /* Device interface */ DEVMETHOD(device_identify, legacy_pcib_identify), @@ -276,7 +309,7 @@ DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_read_ivar, legacy_pcib_read_ivar), DEVMETHOD(bus_write_ivar, legacy_pcib_write_ivar), - DEVMETHOD(bus_alloc_resource, bus_generic_alloc_resource), + DEVMETHOD(bus_alloc_resource, legacy_pcib_alloc_resource), DEVMETHOD(bus_release_resource, bus_generic_release_resource), DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), ==== //depot/projects/netperf_socket/sys/arm/conf/SIMICS#3 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.3 2004/09/23 22:53:50 cognet Exp $ +# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.4 2004/10/11 14:42:06 cognet Exp $ machine arm ident SIMICS @@ -40,6 +40,7 @@ options UFS_ACL #Support for access control lists options UFS_DIRHASH #Improve performance on big directories options MD_ROOT #MD is a potential root device +options MD_ROOT_SIZE=65535 options ROOTDEVNAME=\"ufs:md0\" options NFSCLIENT #Network Filesystem Client options NFSSERVER #Network Filesystem Server ==== //depot/projects/netperf_socket/sys/arm/sa11x0/assabet_machdep.c#5 (text+ko) ==== @@ -47,7 +47,9 @@ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.4 2004/09/23 22:32:33 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.5 2004/10/11 14:41:38 cognet Exp $"); + +#include "opt_md.h" #define _ARM32_BUS_DMA_PRIVATE #include @@ -131,7 +133,9 @@ struct pcpu __pcpu; struct pcpu *pcpup = &__pcpu; -#define MDSIZE 8192 +#ifndef MD_ROOT_SIZE +#error SIMICS needs MD_ROOT and MD_ROOT_SIZE +#endif /* Physical and virtual addresses for some global pages */ vm_paddr_t phys_avail[10]; @@ -218,7 +222,7 @@ fake_preload[i++] = MDROOT_ADDR; fake_preload[i++] = MODINFO_SIZE; fake_preload[i++] = sizeof(uint32_t); - fake_preload[i++] = MDSIZE * 1024; + fake_preload[i++] = MD_ROOT_SIZE * 1024; fake_preload[i++] = 0; fake_preload[i] = 0; preload_metadata = (void *)fake_preload; @@ -236,7 +240,6 @@ kerneldatasize = (u_int32_t)&end - (u_int32_t)KERNEL_TEXT_BASE; symbolsize = 0; freemempos = (vm_offset_t)round_page(physical_freestart); - printf("freemempos %p\n", (void*)freemempos); memset((void *)freemempos, 0, 256*1024); /* Define a macro to simplify memory allocation */ #define valloc_pages(var, np) \ @@ -311,12 +314,10 @@ pmap_map_chunk(l1pagetable, KERNBASE, KERNBASE, (uint32_t)&end - KERNBASE, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); /* Map the stack pages */ - printf("avant irq %p %p\n", (void*)irqstack.pv_va, (void*)irqstack.pv_pa); pmap_map_chunk(l1pagetable, irqstack.pv_va, irqstack.pv_pa, IRQ_STACK_SIZE * PAGE_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); - printf("apres irq\n"); pmap_map_chunk(l1pagetable, md_addr.pv_va, md_addr.pv_pa, - MDSIZE * 1024, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); + MD_ROOT_SIZE * 1024, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); pmap_map_chunk(l1pagetable, abtstack.pv_va, abtstack.pv_pa, ABT_STACK_SIZE * PAGE_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); pmap_map_chunk(l1pagetable, undstack.pv_va, undstack.pv_pa, @@ -365,7 +366,6 @@ * Since the ARM stacks use STMFD etc. we must set r13 to the top end * of the stack memory. */ - printf("init subsystems: stacks\n"); set_stackptr(PSR_IRQ32_MODE, irqstack.pv_va + IRQ_STACK_SIZE * PAGE_SIZE); set_stackptr(PSR_ABT32_MODE, ==== //depot/projects/netperf_socket/sys/boot/common/help.common#7 (text+ko) ==== @@ -311,6 +311,18 @@ this option provides a hint as to the actual size of system memory (which will be tested before use). + set hw.{acpi,pci}.host_start_mem= + + Sets the lowest address that the pci code will assign + when it doesn't have other information about the address + to assign (like from a pci bridge). This is only useful + in older systems without a pci bridge. Also, it only + impacts devices that the BIOS doesn't assign to, typically + CardBus bridges. The default is 0x80000000, but + some systems need values like 0xf0000000, 0xfc000000 or + 0xfe000000 may be suitable for older systems (the older + the system, the higher the number typically should be). + set hw.pci.enable_io_modes= Enable PCI resources which are left off by some BIOSes ==== //depot/projects/netperf_socket/sys/boot/common/loader.8#9 (text+ko) ==== @@ -22,9 +22,9 @@ .\" 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.74 2004/10/01 00:15:13 ru Exp $ +.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.76 2004/10/15 06:44:13 ru Exp $ .\" -.Dd October 1, 2004 +.Dd October 15, 2004 .Dt LOADER 8 .Os .Sh NAME @@ -429,6 +429,15 @@ respectively. An invalid suffix will result in the variable being ignored by the kernel. +.It Va hw.pci.host_start_mem , hw.acpi.host_start_mem +When not otherwise constrained, this limits the memory start +address. +The default is 0x80000000 and should be set to at least size of the +memory and not conflict with other resources. +Typically, only systems without PCI bridges need to set this variable +since PCI bridges typically constrain the memory starting address +(and the variable is only used when bridges do not constrain this +address). .It Va hw.pci.enable_io_modes Enable PCI resources which are left off by some BIOSes or are not enabled correctly by the device driver. ==== //depot/projects/netperf_socket/sys/cam/scsi/scsi_da.h#2 (text+ko) ==== @@ -46,7 +46,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $FreeBSD: src/sys/cam/scsi/scsi_da.h,v 1.5 2000/05/21 23:57:52 ken Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_da.h,v 1.7 2004/10/13 09:31:04 bms Exp $ */ #ifndef _SCSI_SCSI_DA_H @@ -151,6 +151,9 @@ #define REASSIGN_BLOCKS 0x07 #define MODE_SELECT 0x15 #define MODE_SENSE 0x1a +#define READ_FORMAT_CAPACITIES 0x23 +#define WRITE_AND_VERIFY 0x2e +#define VERIFY 0x2f #define READ_DEFECT_DATA_10 0x37 #define READ_DEFECT_DATA_12 0xb7 @@ -182,6 +185,82 @@ u_int8_t pat_length[2]; }; +struct scsi_read_format_capacities +{ + uint8_t opcode; /* READ_FORMAT_CAPACITIES */ + uint8_t byte2; +#define SRFC_LUN_MASK 0xE0 + uint8_t reserved0[5]; + uint8_t alloc_length[2]; + uint8_t reserved1[3]; +}; + +struct scsi_verify +{ + uint8_t opcode; /* VERIFY */ + uint8_t byte2; +#define SVFY_LUN_MASK 0xE0 +#define SVFY_RELADR 0x01 +#define SVFY_BYTECHK 0x02 +#define SVFY_DPO 0x10 + uint8_t addr[4]; /* LBA to begin verification at */ + uint8_t reserved0[1]; + uint8_t len[2]; /* number of blocks to verify */ + uint8_t reserved1[3]; +}; + +struct scsi_write_and_verify +{ + uint8_t opcode; /* WRITE_AND_VERIFY */ + uint8_t byte2; +#define SWVY_LUN_MASK 0xE0 +#define SWVY_RELADR 0x01 +#define SWVY_BYTECHK 0x02 +#define SWVY_DPO 0x10 + uint8_t addr[4]; /* LBA to begin verification at */ + uint8_t reserved0[1]; + uint8_t len[2]; /* number of blocks to write and verify */ + uint8_t reserved1[3]; +}; + +/* + * Replies to READ_FORMAT_CAPACITIES look like this: + * + * struct format_capacity_list_header + * struct format_capacity_descriptor[1..n] + * + * These are similar, but not totally identical to, the + * defect list used to format a rigid disk. + * + * The appropriate csio_decode() format string looks like this: + * "{} *i3 {Len} i1 {Blocks} i4 {} *b6 {Code} b2 {Blocklen} i3" + * + * If the capacity_list_length is greater than + * sizeof(struct format_capacity_descriptor), then there are + * additional format capacity descriptors available which + * denote which format(s) the drive can handle. + * + * (Source: USB Mass Storage UFI Specification) + */ + +struct format_capacity_list_header { + uint8_t unused[3]; + uint8_t capacity_list_length; +}; + +struct format_capacity_descriptor { + uint8_t nblocks[4]; /* total number of LBAs */ + uint8_t byte4; /* only present in max/cur descriptor */ +#define FCD_CODE_MASK 0x03 /* mask for code field above */ +#define FCD_UNFORMATTED 0x01 /* unformatted media present, + * maximum capacity returned */ +#define FCD_FORMATTED 0x02 /* formatted media present, + * current capacity returned */ +#define FCD_NOMEDIA 0x03 /* no media present, + * maximum device capacity returned */ + uint8_t block_length[3]; /* length of an LBA in bytes */ +}; + struct scsi_reassign_blocks_data { u_int8_t reserved[2]; ==== //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_misc.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.24 2004/10/05 18:51:10 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.25 2004/10/11 22:04:15 peter Exp $"); #include "opt_compat.h" @@ -1203,25 +1203,21 @@ if (uap->namelen > CTL_MAXNAME || uap->namelen < 2) return (EINVAL); - - error = copyin(uap->name, &name, uap->namelen * sizeof(int)); + error = copyin(uap->name, name, uap->namelen * sizeof(int)); if (error) return (error); - mtx_lock(&Giant); - if (uap->oldlenp) oldlen = fuword32(uap->oldlenp); else oldlen = 0; error = userland_sysctl(td, name, uap->namelen, uap->old, &oldlen, 1, - uap->new, uap->newlen, &j); + uap->new, uap->newlen, &j, SCTL_MASK32); if (error && error != ENOMEM) goto done2; - if (uap->oldlenp) { + if (uap->oldlenp) suword32(uap->oldlenp, j); - } done2: mtx_unlock(&Giant); return (error); ==== //depot/projects/netperf_socket/sys/compat/linux/linux_util.h#3 (text+ko) ==== @@ -28,7 +28,7 @@ * * from: svr4_util.h,v 1.5 1994/11/18 02:54:31 christos Exp * from: linux_util.h,v 1.2 1995/03/05 23:23:50 fvdl Exp - * $FreeBSD: src/sys/compat/linux/linux_util.h,v 1.22 2004/08/15 11:52:45 tjr Exp $ + * $FreeBSD: src/sys/compat/linux/linux_util.h,v 1.23 2004/10/10 18:34:30 dwmalone Exp $ */ /* @@ -80,17 +80,17 @@ int linux_emul_convpath(struct thread *, char *, enum uio_seg, char **, int); int linux_emul_find(struct thread *, caddr_t *, char *, char **, int); -#define CHECKALT(p, sgp, path, i) \ +#define CHECKALT(td, sgp, path, i) \ do { \ int _error; \ \ - _error = linux_emul_find(p, sgp, path, &path, i); \ + _error = linux_emul_find(td, sgp, path, &path, i); \ if (_error == EFAULT) \ return (_error); \ } while (0) -#define CHECKALTEXIST(p, sgp, path) CHECKALT(p, sgp, path, 0) -#define CHECKALTCREAT(p, sgp, path) CHECKALT(p, sgp, path, 1) +#define CHECKALTEXIST(td, sgp, path) CHECKALT(td, sgp, path, 0) +#define CHECKALTCREAT(td, sgp, path) CHECKALT(td, sgp, path, 1) #define LCONVPATH(td, upath, pathp, i) \ do { \ @@ -108,9 +108,9 @@ #define DUMMY(s) \ int \ -linux_ ## s(struct thread *p, struct linux_ ## s ## _args *args) \ +linux_ ## s(struct thread *td, struct linux_ ## s ## _args *args) \ { \ - return (unimplemented_syscall(p, #s)); \ + return (unimplemented_syscall(td, #s)); \ } \ struct __hack ==== //depot/projects/netperf_socket/sys/conf/files#54 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.956 2004/10/08 00:24:30 brooks Exp $ +# $FreeBSD: src/sys/conf/files,v 1.957 2004/10/13 05:41:09 simokawa Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -393,6 +393,7 @@ dev/cy/cy_pci.c optional cy pci dev/dcons/dcons.c optional dcons dev/dcons/dcons_crom.c optional dcons_crom +dev/dcons/dcons_os.c optional dcons dev/digi/digi.c optional digi dev/digi/digi_isa.c optional digi isa dev/digi/digi_pci.c optional digi pci ==== //depot/projects/netperf_socket/sys/conf/kmod.mk#16 (text+ko) ==== @@ -1,42 +1,42 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.168 2004/10/09 13:51:28 joerg Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.171 2004/10/12 15:08:24 ru Exp $ # -# The include file handles installing Kernel Loadable Device -# drivers (KLD's). +# The include file handles building and installing loadable +# kernel modules. # # # +++ variables +++ # # CLEANFILES Additional files to remove for the clean and cleandir targets. # -# KMOD The name of the kernel module to build. +# EXPORT_SYMS A list of symbols that should be exported from the module, +# or the name of a file containing a list of symbols, or YES +# to export all symbols. If not defined, no symbols are +# exported. +# +# KMOD The name of the kernel module to build. # # KMODDIR Base path for kernel modules (see kld(4)). [/boot/kernel] # -# KMODOWN KLD owner. [${BINOWN}] +# KMODOWN Module file owner. [${BINOWN}] # -# KMODGRP KLD group. [${BINGRP}] +# KMODGRP Module file group. [${BINGRP}] # -# KMODMODE KLD mode. [${BINMODE}] +# KMODMODE Module file mode. [${BINMODE}] # # KMODLOAD Command to load a kernel module [/sbin/kldload] # # KMODUNLOAD Command to unload a kernel module [/sbin/kldunload] # -# PROG The name of the kernel module to build. -# If not supplied, ${KMOD}.o is used. +# MFILES Optionally a list of interfaces used by the module. +# This file contains a default list of interfaces. # -# SRCS List of source files +# PROG The name of the kernel module to build. +# If not supplied, ${KMOD}.ko is used. # -# DESTDIR Change the tree where the module gets installed. [not set] +# SRCS List of source files. # -# MFILES Optionally a list of interfaces used by the module. -# This file contains a default list of interfaces. -# -# EXPORT_SYMS A list of symbols that should be exported from the module, -# or the name of a file containing a list of symbols, or YES -# to export all symbols. If not defined, no symbols are -# exported. +# DESTDIR The tree where the module gets installed. [not set] # # +++ targets +++ # @@ -48,14 +48,11 @@ # is executed. # # load: -# Load KLD. +# Load a module. # # unload: -# Unload KLD. +# Unload a module. # -# bsd.obj.mk: clean, cleandir and obj -# bsd.dep.mk: cleandepend, depend and tags -# AWK?= awk KMODLOAD?= /sbin/kldload @@ -63,7 +60,7 @@ OBJCOPY?= objcopy .if defined(KMODDEPS) -.error "Do not use KMODDEPS on 5.0+, use MODULE_VERSION/MODULE_DEPEND" +.error "Do not use KMODDEPS on 5.0+; use MODULE_VERSION/MODULE_DEPEND" .endif .include @@ -88,10 +85,10 @@ .endif CFLAGS+= ${NOSTDINC} -I- ${INCLMAGIC} ${_ICFLAGS} .if defined(KERNBUILDDIR) -CFLAGS+= -include ${KERNBUILDDIR}/opt_global.h +CFLAGS+= -include ${KERNBUILDDIR}/opt_global.h .endif -# Add -I paths for system headers. Individual KLD makefiles don't +# Add -I paths for system headers. Individual module makefiles don't # need any -I paths for this. Similar defaults for .PATH can't be # set because there are no standard paths for non-headers. CFLAGS+= -I. -I@ @@ -130,7 +127,7 @@ CFLAGS+= -fno-omit-frame-pointer .endif -OBJS+= ${SRCS:N*.h:R:S/$/.o/g} +OBJS+= ${SRCS:N*.h:R:S/$/.o/g} .if !defined(PROG) PROG= ${KMOD}.ko @@ -154,7 +151,7 @@ EXPORT_SYMS?= NO .if ${EXPORT_SYMS} != YES -CLEANFILES+= ${.OBJDIR}/export_syms +CLEANFILES+= export_syms .endif .if ${MACHINE_ARCH} != amd64 @@ -166,15 +163,14 @@ .if defined(EXPORT_SYMS) .if ${EXPORT_SYMS} != YES .if ${EXPORT_SYMS} == NO - touch ${.OBJDIR}/export_syms + touch export_syms .elif !exists(${.CURDIR}/${EXPORT_SYMS}) - echo ${EXPORT_SYMS} > ${.OBJDIR}/export_syms + echo ${EXPORT_SYMS} > export_syms .else - grep -v '^#' < ${EXPORT_SYMS} > ${.OBJDIR}/export_syms + grep -v '^#' < ${EXPORT_SYMS} > export_syms .endif awk -f ${SYSDIR}/conf/kmod_syms.awk ${.TARGET} \ - ${.OBJDIR}/export_syms | \ - xargs -J% ${OBJCOPY} % ${.TARGET} + export_syms | xargs -J% ${OBJCOPY} % ${.TARGET} .endif .endif .if !defined(DEBUG_FLAGS) && ${MACHINE_ARCH} == amd64 @@ -186,7 +182,6 @@ all: objwarn ${PROG} beforedepend: ${_ILINKS} - @rm -f .depend # Ensure that the links exist without depending on it when it exists which # causes all the modules to be rebuilt when the directory pointed to changes. @@ -217,7 +212,7 @@ ${ECHO} ${.TARGET} "->" $$path ; \ ln -s $$path ${.TARGET} -CLEANFILES+= ${PROG} ${KMOD}.kld ${OBJS} ${_ILINKS} symb.tmp tmp.o +CLEANFILES+= ${PROG} ${KMOD}.kld ${OBJS} ${_ILINKS} .if defined(DEBUG_FLAGS) CLEANFILES+= ${FULLPROG} @@ -230,7 +225,7 @@ _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}} .endfor -.if defined(DEBUG_FLAGS) +.if !target(install.debug) && defined(DEBUG_FLAGS) install.debug: cd ${.CURDIR}; ${MAKE} -DINSTALL_DEBUG install .endif @@ -264,23 +259,23 @@ .endif !target(install) .if !target(load) -load: ${PROG} - ${KMODLOAD} -v ${.OBJDIR}/${KMOD}.ko +load: ${PROG} + ${KMODLOAD} -v ${.OBJDIR}/${PROG} .endif .if !target(unload) unload: - ${KMODUNLOAD} -v ${KMOD} + ${KMODUNLOAD} -v ${PROG} .endif .if defined(KERNBUILDDIR) .PATH: ${KERNBUILDDIR} -CFLAGS += -I${KERNBUILDDIR} +CFLAGS+= -I${KERNBUILDDIR} .for _src in ${SRCS:Mopt_*.h} CLEANFILES+= ${_src} .if !target(${_src}) ${_src}: - ln -sf ${KERNBUILDDIR}/${_src} ${.TARGET} + ln -s ${KERNBUILDDIR}/${_src} ${.TARGET} .endif .endfor .else @@ -359,8 +354,6 @@ ${AWK} -f @/tools/acpi_quirks2h.awk @/dev/acpica/acpi_quirks .endif -regress: - lint: ${SRCS} ${LINT} ${LINTKERNFLAGS} ${CFLAGS:M-[DILU]*} ${.ALLSRC:M*.c} ==== //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#41 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.190 2004/09/21 17:19:38 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.193 2004/10/13 07:29:29 njl Exp $ */ #include "opt_acpi.h" @@ -617,6 +617,8 @@ retval += resource_list_print_type(rl, "iomem", SYS_RES_MEMORY, "%#lx"); retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld"); retval += resource_list_print_type(rl, "drq", SYS_RES_DRQ, "%ld"); + if (device_get_flags(child)) + retval += printf(" flags %#x", device_get_flags(child)); retval += bus_print_child_footer(bus, child); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Oct 19 18:21:55 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 77D3116A4D0; Tue, 19 Oct 2004 18:21:55 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 23CE316A4CE for ; Tue, 19 Oct 2004 18:21:55 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EF53C43D53 for ; Tue, 19 Oct 2004 18:21:54 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9JILscC085687 for ; Tue, 19 Oct 2004 18:21:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9JILsKd085683 for perforce@freebsd.org; Tue, 19 Oct 2004 18:21:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 19 Oct 2004 18:21:54 GMT Message-Id: <200410191821.i9JILsKd085683@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 63368 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Oct 2004 18:21:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=63368 Change 63368 by rwatson@rwatson_zoo on 2004/10/19 18:21:38 Integ netperf_socket: - Pluggable IP protocols - IFF_LOCKGIANT() around if_ioctl Affected files ... .. //depot/projects/netperf_socket/sys/kern/uipc_domain.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket2.c#23 integrate .. //depot/projects/netperf_socket/sys/net/if.c#22 integrate .. //depot/projects/netperf_socket/sys/net/if_var.h#20 integrate .. //depot/projects/netperf_socket/sys/netinet/in_pcb.h#8 integrate .. //depot/projects/netperf_socket/sys/netinet/in_proto.c#7 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_fastfwd.c#12 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_input.c#26 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_var.h#11 integrate .. //depot/projects/netperf_socket/sys/netinet6/ip6_input.c#12 integrate .. //depot/projects/netperf_socket/sys/pci/if_vr.c#14 integrate .. //depot/projects/netperf_socket/sys/sys/protosw.h#3 integrate Differences ... ==== //depot/projects/netperf_socket/sys/kern/uipc_domain.c#6 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_domain.c,v 1.36 2004/04/05 21:03:36 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_domain.c,v 1.37 2004/10/19 15:13:30 andre Exp $"); #include #include @@ -70,8 +70,22 @@ MTX_SYSINIT(domain, &dom_mtx, "domain list", MTX_DEF); /* + * Dummy protocol specific user requests function pointer array. + * All functions return EOPNOTSUPP. + */ +struct pr_usrreqs nousrreqs = { + pru_abort_notsupp, pru_accept_notsupp, pru_attach_notsupp, + pru_bind_notsupp, pru_connect_notsupp, pru_connect2_notsupp, + pru_control_notsupp, pru_detach_notsupp, pru_disconnect_notsupp, + pru_listen_notsupp, pru_peeraddr_notsupp, pru_rcvd_notsupp, + pru_rcvoob_notsupp, pru_send_notsupp, pru_sense_null, + pru_shutdown_notsupp, pru_sockaddr_notsupp, pru_sosend_notsupp, + pru_soreceive_notsupp, pru_sopoll_notsupp, pru_sosetlabel_null +}; + +/* * Add a new protocol domain to the list of supported domains - * Note: you cant unload it again because a socket may be using it. + * Note: you cant unload it again because a socket may be using it. * XXX can't fail at this time. */ static void @@ -98,7 +112,7 @@ /* * Add a new protocol domain to the list of supported domains - * Note: you cant unload it again because a socket may be using it. + * Note: you cant unload it again because a socket may be using it. * XXX can't fail at this time. */ void @@ -190,6 +204,126 @@ return (maybe); } +/* + * The caller must make sure that the new protocol is fully set up and ready to + * accept requests before it is registered. + */ +int +pf_proto_register(family, npr) + int family; + struct protosw *npr; +{ + struct domain *dp; + struct protosw *pr, *fpr; + + /* Sanity checks. */ + if (family == 0) + return (EPFNOSUPPORT); + if (npr->pr_type == 0) + return (EPROTOTYPE); + if (npr->pr_protocol == 0) + return (EPROTONOSUPPORT); + if (npr->pr_usrreqs == NULL) + return (ENXIO); + + /* Try to find the specified domain based on the family. */ + for (dp = domains; dp; dp = dp->dom_next) + if (dp->dom_family == family) + goto found; + return (EPFNOSUPPORT); + +found: + /* Initialize backpointer to struct domain. */ + npr->pr_domain = dp; + fpr = NULL; + + /* The new protocol must not yet exist. */ + for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++) { + if ((pr->pr_type == npr->pr_type) && + (pr->pr_protocol == npr->pr_protocol)) + return (EEXIST); /* XXX: Check only protocol? */ + /* While here, remember the first free spacer. */ + if ((fpr == NULL) && (pr->pr_protocol == PROTO_SPACER)) + fpr = pr; + } + + /* If no free spacer is found we can't add the new protocol. */ + if (fpr == NULL) + return (ENOMEM); + + /* Copy the new struct protosw over the spacer. */ + bcopy(npr, fpr, sizeof(*fpr)); + + /* Initialize and activate the protocol. */ + if (fpr->pr_init) + (fpr->pr_init)(); + + return (0); +} + +/* + * The caller must make sure the protocol and its functions correctly shut down + * all sockets and release all locks and memory references. + */ +int +pf_proto_unregister(family, protocol, type) + int family; + int protocol; + int type; +{ + struct domain *dp; + struct protosw *pr, *dpr; + + /* Sanity checks. */ + if (family == 0) + return (EPFNOSUPPORT); + if (protocol == 0) + return (EPROTONOSUPPORT); + if (type == 0) + return (EPROTOTYPE); + + /* Try to find the specified domain based on the family type. */ + for (dp = domains; dp; dp = dp->dom_next) + if (dp->dom_family == family) + goto found; + return (EPFNOSUPPORT); + +found: + dpr = NULL; + + /* The protocol must exist and only once. */ + for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++) { + if ((pr->pr_type == type) && (pr->pr_protocol == protocol)) { + if (dpr != NULL) + return (EMLINK); /* Should not happen! */ + else + dpr = pr; + } + } + + /* Protocol does not exist. */ + if (dpr == NULL) + return (EPROTONOSUPPORT); + + /* De-orbit the protocol and make the slot available again. */ + dpr->pr_type = 0; + dpr->pr_domain = dp; + dpr->pr_protocol = PROTO_SPACER; + dpr->pr_flags = 0; + dpr->pr_input = NULL; + dpr->pr_output = NULL; + dpr->pr_ctlinput = NULL; + dpr->pr_ctloutput = NULL; + dpr->pr_ousrreq = NULL; + dpr->pr_init = NULL; + dpr->pr_fasttimo = NULL; + dpr->pr_slowtimo = NULL; + dpr->pr_drain = NULL; + dpr->pr_usrreqs = &nousrreqs; + + return (0); +} + void pfctlinput(cmd, sa) int cmd; ==== //depot/projects/netperf_socket/sys/kern/uipc_socket2.c#23 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_socket2.c,v 1.137 2004/08/15 06:24:41 jmg Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_socket2.c,v 1.138 2004/10/19 15:13:30 andre Exp $"); #include "opt_mac.h" #include "opt_param.h" @@ -1339,12 +1339,30 @@ * supported by a protocol. Fill in as needed. */ int +pru_abort_notsupp(struct socket *so) +{ + return EOPNOTSUPP; +} + +int pru_accept_notsupp(struct socket *so, struct sockaddr **nam) { return EOPNOTSUPP; } int +pru_attach_notsupp(struct socket *so, int proto, struct thread *td) +{ + return EOPNOTSUPP; +} + +int +pru_bind_notsupp(struct socket *so, struct sockaddr *nam, struct thread *td) +{ + return EOPNOTSUPP; +} + +int pru_connect_notsupp(struct socket *so, struct sockaddr *nam, struct thread *td) { return EOPNOTSUPP; @@ -1358,7 +1376,19 @@ int pru_control_notsupp(struct socket *so, u_long cmd, caddr_t data, - struct ifnet *ifp, struct thread *td) + struct ifnet *ifp, struct thread *td) +{ + return EOPNOTSUPP; +} + +int +pru_detach_notsupp(struct socket *so) +{ + return EOPNOTSUPP; +} + +int +pru_disconnect_notsupp(struct socket *so) { return EOPNOTSUPP; } @@ -1370,6 +1400,12 @@ } int +pru_peeraddr_notsupp(struct socket *so, struct sockaddr **nam) +{ + return EOPNOTSUPP; +} + +int pru_rcvd_notsupp(struct socket *so, int flags) { return EOPNOTSUPP; @@ -1381,6 +1417,13 @@ return EOPNOTSUPP; } +int +pru_send_notsupp(struct socket *so, int flags, struct mbuf *m, + struct sockaddr *addr, struct mbuf *control, struct thread *td) +{ + return EOPNOTSUPP; +} + /* * This isn't really a ``null'' operation, but it's the default one * and doesn't do anything destructive. @@ -1392,6 +1435,40 @@ return 0; } +int +pru_shutdown_notsupp(struct socket *so) +{ + return EOPNOTSUPP; +} + +int +pru_sockaddr_notsupp(struct socket *so, struct sockaddr **nam) +{ + return EOPNOTSUPP; +} + +int +pru_sosend_notsupp(struct socket *so, struct sockaddr *addr, struct uio *uio, + struct mbuf *top, struct mbuf *control, int flags, struct thread *td) +{ + return EOPNOTSUPP; +} + +int +pru_soreceive_notsupp(struct socket *so, struct sockaddr **paddr, + struct uio *uio, struct mbuf **mp0, struct mbuf **controlp, + int *flagsp) +{ + return EOPNOTSUPP; +} + +int +pru_sopoll_notsupp(struct socket *so, int events, struct ucred *cred, + struct thread *td) +{ + return EOPNOTSUPP; +} + /* * For protocol types that don't keep cached copies of labels in their * pcbs, provide a null sosetlabel that does a NOOP. ==== //depot/projects/netperf_socket/sys/net/if.c#22 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)if.c 8.5 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/net/if.c,v 1.209 2004/09/22 12:53:27 green Exp $ + * $FreeBSD: src/sys/net/if.c,v 1.210 2004/10/19 18:11:55 rwatson Exp $ */ #include "opt_compat.h" @@ -1122,8 +1122,11 @@ } else if (ifp->if_pcount == 0) { ifp->if_flags &= ~IFF_PROMISC; } - if (ifp->if_ioctl) + if (ifp->if_ioctl) { + IFF_LOCKGIANT(ifp); (void) (*ifp->if_ioctl)(ifp, cmd, data); + IFF_UNLOCKGIANT(ifp); + } getmicrotime(&ifp->if_lastchange); break; @@ -1135,7 +1138,9 @@ return (EOPNOTSUPP); if (ifr->ifr_reqcap & ~ifp->if_capabilities) return (EINVAL); + IFF_LOCKGIANT(ifp); error = (*ifp->if_ioctl)(ifp, cmd, data); + IFF_UNLOCKGIANT(ifp); if (error == 0) getmicrotime(&ifp->if_lastchange); break; @@ -1207,7 +1212,9 @@ return (error); if (ifp->if_ioctl == NULL) return (EOPNOTSUPP); + IFF_LOCKGIANT(ifp); error = (*ifp->if_ioctl)(ifp, cmd, data); + IFF_UNLOCKGIANT(ifp); if (error == 0) getmicrotime(&ifp->if_lastchange); break; @@ -1223,7 +1230,9 @@ return (EINVAL); if (ifp->if_ioctl == NULL) return (EOPNOTSUPP); + IFF_LOCKGIANT(ifp); error = (*ifp->if_ioctl)(ifp, cmd, data); + IFF_UNLOCKGIANT(ifp); if (error == 0) { getmicrotime(&ifp->if_lastchange); rt_ifmsg(ifp); @@ -1276,7 +1285,9 @@ return (error); if (ifp->if_ioctl == NULL) return (EOPNOTSUPP); + IFF_LOCKGIANT(ifp); error = (*ifp->if_ioctl)(ifp, cmd, data); + IFF_UNLOCKGIANT(ifp); if (error == 0) getmicrotime(&ifp->if_lastchange); break; @@ -1292,7 +1303,9 @@ case SIOCGIFGENERIC: if (ifp->if_ioctl == NULL) return (EOPNOTSUPP); + IFF_LOCKGIANT(ifp); error = (*ifp->if_ioctl)(ifp, cmd, data); + IFF_UNLOCKGIANT(ifp); break; case SIOCSIFLLADDR: @@ -1459,7 +1472,9 @@ } ifr.ifr_flags = ifp->if_flags & 0xffff; ifr.ifr_flagshigh = ifp->if_flags >> 16; + IFF_LOCKGIANT(ifp); error = (*ifp->if_ioctl)(ifp, SIOCSIFFLAGS, (caddr_t)&ifr); + IFF_UNLOCKGIANT(ifp); if (error == 0) { log(LOG_INFO, "%s: promiscuous mode %s\n", ifp->if_xname, @@ -1585,7 +1600,9 @@ ifp->if_flags |= IFF_ALLMULTI; ifr.ifr_flags = ifp->if_flags & 0xffff; ifr.ifr_flagshigh = ifp->if_flags >> 16; + IFF_LOCKGIANT(ifp); error = ifp->if_ioctl(ifp, SIOCSIFFLAGS, (caddr_t)&ifr); + IFF_UNLOCKGIANT(ifp); } } else { if (ifp->if_amcount > 1) { @@ -1595,7 +1612,9 @@ ifp->if_flags &= ~IFF_ALLMULTI; ifr.ifr_flags = ifp->if_flags & 0xffff;; ifr.ifr_flagshigh = ifp->if_flags >> 16; + IFF_LOCKGIANT(ifp); error = ifp->if_ioctl(ifp, SIOCSIFFLAGS, (caddr_t)&ifr); + IFF_UNLOCKGIANT(ifp); } } splx(s); @@ -1690,7 +1709,9 @@ * interface to let them know about it. */ s = splimp(); + IFF_LOCKGIANT(ifp); ifp->if_ioctl(ifp, SIOCADDMULTI, 0); + IFF_UNLOCKGIANT(ifp); splx(s); return 0; @@ -1725,8 +1746,11 @@ * Make sure the interface driver is notified * in the case of a link layer mcast group being left. */ - if (ifma->ifma_addr->sa_family == AF_LINK && sa == 0) + if (ifma->ifma_addr->sa_family == AF_LINK && sa == 0) { + IFF_LOCKGIANT(ifp); ifp->if_ioctl(ifp, SIOCDELMULTI, 0); + IFF_UNLOCKGIANT(ifp); + } splx(s); free(ifma->ifma_addr, M_IFMADDR); free(ifma, M_IFMADDR); @@ -1757,7 +1781,9 @@ s = splimp(); TAILQ_REMOVE(&ifp->if_multiaddrs, ifma, ifma_link); + IFF_LOCKGIANT(ifp); ifp->if_ioctl(ifp, SIOCDELMULTI, 0); + IFF_UNLOCKGIANT(ifp); splx(s); free(ifma->ifma_addr, M_IFMADDR); free(sa, M_IFMADDR); @@ -1812,6 +1838,7 @@ * address filter. */ if ((ifp->if_flags & IFF_UP) != 0) { + IFF_LOCKGIANT(ifp); ifp->if_flags &= ~IFF_UP; ifr.ifr_flags = ifp->if_flags & 0xffff; ifr.ifr_flagshigh = ifp->if_flags >> 16; @@ -1820,6 +1847,7 @@ ifr.ifr_flags = ifp->if_flags & 0xffff; ifr.ifr_flagshigh = ifp->if_flags >> 16; (*ifp->if_ioctl)(ifp, SIOCSIFFLAGS, (caddr_t)&ifr); + IFF_UNLOCKGIANT(ifp); #ifdef INET /* * Also send gratuitous ARPs to notify other nodes about ==== //depot/projects/netperf_socket/sys/net/if_var.h#20 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * From: @(#)if.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/net/if_var.h,v 1.84 2004/08/15 06:24:42 jmg Exp $ + * $FreeBSD: src/sys/net/if_var.h,v 1.85 2004/10/19 18:11:55 rwatson Exp $ */ #ifndef _NET_IF_VAR_H_ @@ -327,6 +327,16 @@ #define IF_AFDATA_UNLOCK(ifp) mtx_unlock(&(ifp)->if_afdata_mtx) #define IF_AFDATA_DESTROY(ifp) mtx_destroy(&(ifp)->if_afdata_mtx) +#define IFF_LOCKGIANT(ifp) do { \ + if ((ifp)->if_flags & IFF_NEEDSGIANT) \ + mtx_lock(&Giant); \ +} while (0) + +#define IFF_UNLOCKGIANT(ifp) do { \ + if ((ifp)->if_flags & IFF_NEEDSGIANT) \ + mtx_unlock(&Giant); \ +} while (0) + #define IF_HANDOFF(ifq, m, ifp) \ if_handoff((struct ifqueue *)ifq, m, ifp, 0) #define IF_HANDOFF_ADJ(ifq, m, ifp, adj) \ ==== //depot/projects/netperf_socket/sys/netinet/in_pcb.h#8 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)in_pcb.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/netinet/in_pcb.h,v 1.76 2004/08/16 18:32:07 rwatson Exp $ + * $FreeBSD: src/sys/netinet/in_pcb.h,v 1.77 2004/10/19 14:34:13 andre Exp $ */ #ifndef _NETINET_IN_PCB_H_ @@ -250,6 +250,7 @@ #define INP_INFO_LOCK_INIT(ipi, d) \ mtx_init(&(ipi)->ipi_mtx, (d), NULL, MTX_DEF | MTX_RECURSE) +#define INP_INFO_LOCK_DESTROY(ipi) mtx_destroy(&(ipi)->ipi_mtx) #define INP_INFO_RLOCK(ipi) mtx_lock(&(ipi)->ipi_mtx) #define INP_INFO_WLOCK(ipi) mtx_lock(&(ipi)->ipi_mtx) #define INP_INFO_RUNLOCK(ipi) mtx_unlock(&(ipi)->ipi_mtx) ==== //depot/projects/netperf_socket/sys/netinet/in_proto.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)in_proto.c 8.2 (Berkeley) 2/9/95 - * $FreeBSD: src/sys/netinet/in_proto.c,v 1.73 2004/08/16 18:32:07 rwatson Exp $ + * $FreeBSD: src/sys/netinet/in_proto.c,v 1.74 2004/10/19 15:58:22 andre Exp $ */ #include "opt_ipdivert.h" @@ -93,7 +93,15 @@ #endif extern struct domain inetdomain; -static struct pr_usrreqs nousrreqs; + +/* Spacer for loadable protocols. */ +#define IPPROTOSPACER \ +{ 0, &inetdomain, PROTO_SPACER, 0, \ + NULL, NULL, NULL, NULL, \ + NULL, \ + NULL, NULL, NULL, NULL, \ + &nousrreqs \ +} struct protosw inetsw[] = { { 0, &inetdomain, 0, 0, @@ -239,7 +247,16 @@ &rip_usrreqs }, #endif /* DEV_PFSYNC */ - /* raw wildcard */ +/* Spacer n-times for loadable protocols. */ +IPPROTOSPACER, +IPPROTOSPACER, +IPPROTOSPACER, +IPPROTOSPACER, +IPPROTOSPACER, +IPPROTOSPACER, +IPPROTOSPACER, +IPPROTOSPACER, +/* raw wildcard */ { SOCK_RAW, &inetdomain, 0, PR_ATOMIC|PR_ADDR, rip_input, 0, 0, rip_ctloutput, 0, ==== //depot/projects/netperf_socket/sys/netinet/ip_fastfwd.c#12 (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/netinet/ip_fastfwd.c,v 1.21 2004/09/29 04:54:33 mlaier Exp $ + * $FreeBSD: src/sys/netinet/ip_fastfwd.c,v 1.22 2004/10/19 14:31:56 andre Exp $ */ /* @@ -241,6 +241,10 @@ ipstat.ips_badsum++; goto drop; } + + /* + * Remeber that we have checked the IP header and found it valid. + */ m->m_pkthdr.csum_flags |= (CSUM_IP_CHECKED | CSUM_IP_VALID); ip_len = ntohs(ip->ip_len); @@ -408,8 +412,9 @@ } /* - * Decrement the TTL and incrementally change the checksum. - * Don't bother doing this with hw checksum offloading. + * Decrement the TTL and incrementally change the IP header checksum. + * Don't bother doing this with hw checksum offloading, it's faster + * doing it right here. */ ip->ip_ttl -= IPTTLDEC; if (ip->ip_sum >= (u_int16_t) ~htons(IPTTLDEC << 8)) @@ -462,7 +467,7 @@ #ifndef IPFIREWALL_FORWARD if (in_localip(dest)) { #else - if (in_localip(dest) || m->m_flags & M_FASTFWD_OURS) { + if (m->m_flags & M_FASTFWD_OURS || in_localip(dest)) { #endif /* IPFIREWALL_FORWARD */ forwardlocal: /* ==== //depot/projects/netperf_socket/sys/netinet/ip_input.c#26 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)ip_input.c 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/netinet/ip_input.c,v 1.291 2004/09/29 04:54:33 mlaier Exp $ + * $FreeBSD: src/sys/netinet/ip_input.c,v 1.292 2004/10/19 15:45:57 andre Exp $ */ #include "opt_bootp.h" @@ -261,7 +261,7 @@ if (pr->pr_domain->dom_family == PF_INET && pr->pr_protocol && pr->pr_protocol != IPPROTO_RAW) { /* Be careful to only index valid IP protocols. */ - if (pr->pr_protocol && pr->pr_protocol < IPPROTO_MAX) + if (pr->pr_protocol <= IPPROTO_MAX) ip_protox[pr->pr_protocol] = pr - inetsw; } @@ -1145,6 +1145,67 @@ } /* + * The protocol to be inserted into ip_protox[] must be already registered + * in inetsw[], either statically or through pf_proto_register(). + */ +int +ipproto_register(u_char ipproto) +{ + struct protosw *pr; + + /* Sanity checks. */ + if (ipproto == 0) + return (EPROTONOSUPPORT); + + /* + * The protocol slot must not be occupied by another protocol + * already. An index pointing to IPPROTO_RAW is unused. + */ + pr = pffindproto(PF_INET, IPPROTO_RAW, SOCK_RAW); + if (pr == NULL) + return (EPFNOSUPPORT); + if (ip_protox[ipproto] != pr - inetsw) /* IPPROTO_RAW */ + return (EEXIST); + + /* Find the protocol position in inetsw[] and set the index. */ + for (pr = inetdomain.dom_protosw; + pr < inetdomain.dom_protoswNPROTOSW; pr++) { + if (pr->pr_domain->dom_family == PF_INET && + pr->pr_protocol && pr->pr_protocol == ipproto) { + /* Be careful to only index valid IP protocols. */ + if (pr->pr_protocol <= IPPROTO_MAX) { + ip_protox[pr->pr_protocol] = pr - inetsw; + return (0); + } else + return (EINVAL); + } + } + return (EPROTONOSUPPORT); +} + +int +ipproto_unregister(u_char ipproto) +{ + struct protosw *pr; + + /* Sanity checks. */ + if (ipproto == 0) + return (EPROTONOSUPPORT); + + /* Check if the protocol was indeed registered. */ + pr = pffindproto(PF_INET, IPPROTO_RAW, SOCK_RAW); + if (pr == NULL) + return (EPFNOSUPPORT); + if (ip_protox[ipproto] == pr - inetsw) /* IPPROTO_RAW */ + return (ENOENT); + + /* Reset the protocol slot to IPPROTO_RAW. */ + ip_protox[ipproto] = pr - inetsw; + return (0); +} + + +/* * Do option processing on a datagram, * possibly discarding it if bad options are encountered, * or forwarding it if source-routed. ==== //depot/projects/netperf_socket/sys/netinet/ip_var.h#11 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)ip_var.h 8.2 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/netinet/ip_var.h,v 1.91 2004/09/15 20:13:26 andre Exp $ + * $FreeBSD: src/sys/netinet/ip_var.h,v 1.92 2004/10/19 15:45:57 andre Exp $ */ #ifndef _NETINET_IP_VAR_H_ @@ -168,6 +168,8 @@ int ip_output(struct mbuf *, struct mbuf *, struct route *, int, struct ip_moptions *, struct inpcb *); +int ipproto_register(u_char); +int ipproto_unregister(u_char); struct mbuf * ip_reass(struct mbuf *); struct in_ifaddr * ==== //depot/projects/netperf_socket/sys/netinet6/ip6_input.c#12 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/ip6_input.c,v 1.78 2004/09/29 04:54:33 mlaier Exp $ */ +/* $FreeBSD: src/sys/netinet6/ip6_input.c,v 1.79 2004/10/19 14:26:44 andre Exp $ */ /* $KAME: ip6_input.c,v 1.259 2002/01/21 04:58:09 jinmei Exp $ */ /* @@ -169,13 +169,22 @@ pr = (struct ip6protosw *)pffindproto(PF_INET6, IPPROTO_RAW, SOCK_RAW); if (pr == 0) panic("ip6_init"); + + /* Initialize the entire ip_protox[] array to IPPROTO_RAW. */ for (i = 0; i < IPPROTO_MAX; i++) ip6_protox[i] = pr - inet6sw; + /* + * Cycle through IP protocols and put them into the appropriate place + * in ip6_protox[]. + */ for (pr = (struct ip6protosw *)inet6domain.dom_protosw; pr < (struct ip6protosw *)inet6domain.dom_protoswNPROTOSW; pr++) if (pr->pr_domain->dom_family == PF_INET6 && - pr->pr_protocol && pr->pr_protocol != IPPROTO_RAW) - ip6_protox[pr->pr_protocol] = pr - inet6sw; + pr->pr_protocol && pr->pr_protocol != IPPROTO_RAW) { + /* Be careful to only index valid IP protocols. */ + if (pr->pr_protocol <= IPPROTO_MAX) + ip6_protox[pr->pr_protocol] = pr - inet6sw; + } /* Initialize packet filter hooks. */ inet6_pfil_hook.ph_type = PFIL_TYPE_AF; ==== //depot/projects/netperf_socket/sys/pci/if_vr.c#14 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/pci/if_vr.c,v 1.94 2004/08/11 04:30:49 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/pci/if_vr.c,v 1.96 2004/10/19 16:47:53 bms Exp $"); /* * VIA Rhine fast ethernet PCI NIC driver @@ -1692,7 +1692,5 @@ { struct vr_softc *sc = device_get_softc(dev); - VR_LOCK(sc); - vr_stop(sc); - VR_UNLOCK(sc); + vr_detach(dev); } ==== //depot/projects/netperf_socket/sys/sys/protosw.h#3 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)protosw.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/sys/sys/protosw.h,v 1.43 2004/04/07 04:19:49 imp Exp $ + * $FreeBSD: src/sys/sys/protosw.h,v 1.44 2004/10/19 15:13:29 andre Exp $ */ #ifndef _SYS_PROTOSW_H_ @@ -105,6 +105,12 @@ #define PR_FASTHZ 5 /* 5 fast timeouts per second */ /* + * This number should be defined again within each protocol family to avoid + * confusion. + */ +#define PROTO_SPACER 32767 /* spacer for loadable protocols */ + +/* * Values for pr_flags. * PR_ADDR requires PR_ATOMIC; * PR_ADDR and PR_CONNREQUIRED are mutually exclusive. @@ -231,16 +237,41 @@ void (*pru_sosetlabel)(struct socket *so); }; +/* + * The dummy protocol specific user requests function pointer array is + * initialized to the functions below. All functions return EOPNOTSUPP. + */ +extern struct pr_usrreqs nousrreqs; + +int pru_abort_notsupp(struct socket *so); int pru_accept_notsupp(struct socket *so, struct sockaddr **nam); +int pru_attach_notsupp(struct socket *so, int proto, struct thread *td); +int pru_bind_notsupp(struct socket *so, struct sockaddr *nam, + struct thread *td); int pru_connect_notsupp(struct socket *so, struct sockaddr *nam, struct thread *td); int pru_connect2_notsupp(struct socket *so1, struct socket *so2); int pru_control_notsupp(struct socket *so, u_long cmd, caddr_t data, struct ifnet *ifp, struct thread *td); +int pru_detach_notsupp(struct socket *so); +int pru_disconnect_notsupp(struct socket *so); int pru_listen_notsupp(struct socket *so, struct thread *td); +int pru_peeraddr_notsupp(struct socket *so, struct sockaddr **nam); int pru_rcvd_notsupp(struct socket *so, int flags); int pru_rcvoob_notsupp(struct socket *so, struct mbuf *m, int flags); +int pru_send_notsupp(struct socket *so, int flags, struct mbuf *m, + struct sockaddr *addr, struct mbuf *control, struct thread *td); int pru_sense_null(struct socket *so, struct stat *sb); +int pru_shutdown_notsupp(struct socket *so); +int pru_sockaddr_notsupp(struct socket *so, struct sockaddr **nam); +int pru_sosend_notsupp(struct socket *so, struct sockaddr *addr, + struct uio *uio, struct mbuf *top, struct mbuf *control, int flags, + struct thread *td); +int pru_soreceive_notsupp(struct socket *so, struct sockaddr **paddr, + struct uio *uio, struct mbuf **mp0, struct mbuf **controlp, + int *flagsp); +int pru_sopoll_notsupp(struct socket *so, int events, struct ucred *cred, + struct thread *td); void pru_sosetlabel_null(struct socket *so); #endif /* _KERNEL */ @@ -319,6 +350,8 @@ void pfctlinput2(int, struct sockaddr *, void *); struct protosw *pffindproto(int family, int protocol, int type); struct protosw *pffindtype(int family, int type); +int pf_proto_register(int family, struct protosw *npr); +int pf_proto_unregister(int family, int protocol, int type); #endif #endif From owner-p4-projects@FreeBSD.ORG Tue Oct 19 20:21:03 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6BFF516A52D; Tue, 19 Oct 2004 20:21:03 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 27CB716A4F2 for ; Tue, 19 Oct 2004 20:21:03 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 11B9A43D49 for ; Tue, 19 Oct 2004 20:21:03 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9JKL2Lj092713 for ; Tue, 19 Oct 2004 20:21:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9JKL2I5092710 for perforce@freebsd.org; Tue, 19 Oct 2004 20:21:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 19 Oct 2004 20:21:02 GMT Message-Id: <200410192021.i9JKL2I5092710@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 63380 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Oct 2004 20:21:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=63380 Change 63380 by rwatson@rwatson_zoo on 2004/10/19 20:20:23 Integ changes from CVS HEAD to netperf_socket--ATA fixes, if_vr build fix. Affected files ... .. //depot/projects/netperf_socket/sys/dev/ata/ata-all.c#21 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-queue.c#16 integrate .. //depot/projects/netperf_socket/sys/pci/if_vr.c#15 integrate Differences ... ==== //depot/projects/netperf_socket/sys/dev/ata/ata-all.c#21 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.232 2004/10/13 15:16:35 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.233 2004/10/19 20:13:38 sos Exp $"); #include "opt_ata.h" #include @@ -306,6 +306,12 @@ } } + ch->flags &= ~ATA_IMMEDIATE_MODE; + mtx_lock(&ch->state_mtx); + ch->state = ATA_IDLE; + mtx_unlock(&ch->state_mtx); + ch->locking(ch, ATA_LF_UNLOCK); + /* attach new devices */ if ((newdev = ~devices & ch->devices)) { if ((newdev & (ATA_ATA_MASTER | ATA_ATAPI_MASTER)) && @@ -323,12 +329,6 @@ if (bootverbose) ata_printf(ch, -1, "device config done ..\n"); - ch->flags &= ~ATA_IMMEDIATE_MODE; - mtx_lock(&ch->state_mtx); - ch->state = ATA_IDLE; - mtx_unlock(&ch->state_mtx); - ch->locking(ch, ATA_LF_UNLOCK); - ata_start(ch); return 0; } @@ -337,19 +337,19 @@ ata_suspend(device_t dev) { struct ata_channel *ch; - int gotit = 0; if (!dev || !(ch = device_get_softc(dev))) return ENXIO; - while (!gotit) { + while (1) { mtx_lock(&ch->state_mtx); if (ch->state == ATA_IDLE) { ch->state = ATA_ACTIVE; - gotit = 1; + mtx_unlock(&ch->state_mtx); + break; } mtx_unlock(&ch->state_mtx); - tsleep(&gotit, PRIBIO, "atasusp", hz/10); + tsleep(ch, PRIBIO, "atasusp", hz/10); } ch->locking(ch, ATA_LF_UNLOCK); return 0; ==== //depot/projects/netperf_socket/sys/dev/ata/ata-queue.c#16 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.37 2004/10/13 15:16:35 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.38 2004/10/19 20:11:23 sos Exp $"); #include "opt_ata.h" #include @@ -182,15 +182,13 @@ /* check for the right state */ mtx_lock(&ch->state_mtx); if (ch->state == ATA_IDLE) { + ATA_DEBUG_RQ(request, "starting"); TAILQ_REMOVE(&ch->ata_queue, request, chain); ch->running = request; - - ATA_DEBUG_RQ(request, "starting"); - + ch->state = ATA_ACTIVE; if (!dumping) callout_reset(&request->callout, request->timeout * hz, (timeout_t*)ata_timeout, request); - if (ch->hw.begin_transaction(request) == ATA_OP_FINISHED) { ch->running = NULL; ch->state = ATA_IDLE; @@ -200,8 +198,6 @@ ata_finish(request); return; } - else - ch->state = ATA_ACTIVE; } mtx_unlock(&ch->state_mtx); } ==== //depot/projects/netperf_socket/sys/pci/if_vr.c#15 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/pci/if_vr.c,v 1.96 2004/10/19 16:47:53 bms Exp $"); +__FBSDID("$FreeBSD: src/sys/pci/if_vr.c,v 1.97 2004/10/19 20:02:07 bms Exp $"); /* * VIA Rhine fast ethernet PCI NIC driver @@ -1690,7 +1690,6 @@ static void vr_shutdown(device_t dev) { - struct vr_softc *sc = device_get_softc(dev); vr_detach(dev); } From owner-p4-projects@FreeBSD.ORG Tue Oct 19 20:23:06 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6684216A4D2; Tue, 19 Oct 2004 20:23:06 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2A83E16A4D0 for ; Tue, 19 Oct 2004 20:23:06 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 058FC43D48 for ; Tue, 19 Oct 2004 20:23:06 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9JKN52e092749 for ; Tue, 19 Oct 2004 20:23:05 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9JKN5Na092746 for perforce@freebsd.org; Tue, 19 Oct 2004 20:23:05 GMT (envelope-from jhb@freebsd.org) Date: Tue, 19 Oct 2004 20:23:05 GMT Message-Id: <200410192023.i9JKN5Na092746@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 63381 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Oct 2004 20:23:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=63381 Change 63381 by jhb@jhb_tibook on 2004/10/19 20:22:10 Use fences on amd64 for memory barriers (untested). Affected files ... .. //depot/projects/smpng/sys/amd64/include/atomic.h#4 edit Differences ... ==== //depot/projects/smpng/sys/amd64/include/atomic.h#4 (text+ko) ==== @@ -162,30 +162,22 @@ #if defined(__GNUC__) -#define ATOMIC_STORE_LOAD(TYPE, LOP, SOP) \ +#define ATOMIC_STORE_LOAD(TYPE) \ static __inline u_##TYPE \ atomic_load_acq_##TYPE(volatile u_##TYPE *p) \ { \ - u_##TYPE res; \ + u_##TYPE v; \ \ - __asm __volatile(__XSTRING(MPLOCKED) LOP \ - : "=a" (res), /* 0 (result) */\ - "+m" (*p) /* 1 */ \ - : : "memory"); \ - \ - return (res); \ + v = *p; \ + __asm __volatile("lfence" ::: "memory"); \ + return (v); \ } \ \ -/* \ - * The XCHG instruction asserts LOCK automagically. \ - */ \ static __inline void \ atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\ { \ - __asm __volatile(SOP \ - : "+m" (*p), /* 0 */ \ - "+r" (v) /* 1 */ \ - : : "memory"); \ + __asm __volatile("sfence" ::: "memory"); \ + *p = v; \ } \ struct __hack @@ -194,7 +186,7 @@ extern int atomic_cmpset_int(volatile u_int *, u_int, u_int); extern int atomic_cmpset_long(volatile u_long *, u_long, u_long); -#define ATOMIC_STORE_LOAD(TYPE, LOP, SOP) \ +#define ATOMIC_STORE_LOAD(TYPE) \ extern u_##TYPE atomic_load_acq_##TYPE(volatile u_##TYPE *p); \ extern void atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v) @@ -222,10 +214,10 @@ ATOMIC_ASM(add, long, "addq %1,%0", "ir", v); ATOMIC_ASM(subtract, long, "subq %1,%0", "ir", v); -ATOMIC_STORE_LOAD(char, "cmpxchgb %b0,%1", "xchgb %b1,%0"); -ATOMIC_STORE_LOAD(short,"cmpxchgw %w0,%1", "xchgw %w1,%0"); -ATOMIC_STORE_LOAD(int, "cmpxchgl %0,%1", "xchgl %1,%0"); -ATOMIC_STORE_LOAD(long, "cmpxchgq %0,%1", "xchgq %1,%0"); +ATOMIC_STORE_LOAD(char); +ATOMIC_STORE_LOAD(short); +ATOMIC_STORE_LOAD(int); +ATOMIC_STORE_LOAD(long); #undef ATOMIC_ASM #undef ATOMIC_STORE_LOAD From owner-p4-projects@FreeBSD.ORG Tue Oct 19 20:29:15 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5AFDC16A4D0; Tue, 19 Oct 2004 20:29:15 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 37A6F16A4CE for ; Tue, 19 Oct 2004 20:29:15 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 18A4743D54 for ; Tue, 19 Oct 2004 20:29:15 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9JKTE9T093207 for ; Tue, 19 Oct 2004 20:29:14 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9JKTE86093204 for perforce@freebsd.org; Tue, 19 Oct 2004 20:29:14 GMT (envelope-from jhb@freebsd.org) Date: Tue, 19 Oct 2004 20:29:14 GMT Message-Id: <200410192029.i9JKTE86093204@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 63384 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Oct 2004 20:29:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=63384 Change 63384 by jhb@jhb_tibook on 2004/10/19 20:29:11 Use fences here as well. Affected files ... .. //depot/projects/smpng/sys/amd64/include/bus_amd64.h#4 edit Differences ... ==== //depot/projects/smpng/sys/amd64/include/bus_amd64.h#4 (text+ko) ==== @@ -1215,9 +1215,9 @@ { #ifdef __GNUC__ if (flags & BUS_SPACE_BARRIER_READ) - __asm __volatile("lock; addl $0,0(%%rsp)" : : : "memory"); + __asm __volatile("lfence" : : : "memory"); else - __asm __volatile("" : : : "memory"); + __asm __volatile("sfence" : : : "memory"); #endif } From owner-p4-projects@FreeBSD.ORG Tue Oct 19 20:31:18 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 38FF816A4D0; Tue, 19 Oct 2004 20:31:18 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1511416A4CE for ; Tue, 19 Oct 2004 20:31:18 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0C7DB43D31 for ; Tue, 19 Oct 2004 20:31:18 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9JKVHD4093345 for ; Tue, 19 Oct 2004 20:31:17 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9JKVHI6093342 for perforce@freebsd.org; Tue, 19 Oct 2004 20:31:17 GMT (envelope-from jhb@freebsd.org) Date: Tue, 19 Oct 2004 20:31:17 GMT Message-Id: <200410192031.i9JKVHI6093342@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 63385 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Oct 2004 20:31:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=63385 Change 63385 by jhb@jhb_tibook on 2004/10/19 20:31:02 Turn off ipiwakeup in this and child branches due to SMP IPI deadlocks. Affected files ... .. //depot/projects/smpng/sys/kern/sched_4bsd.c#41 edit Differences ... ==== //depot/projects/smpng/sys/kern/sched_4bsd.c#41 (text+ko) ==== @@ -234,7 +234,7 @@ /* Enable forwarding of wakeups to all other cpus */ SYSCTL_NODE(_kern_sched, OID_AUTO, ipiwakeup, CTLFLAG_RD, NULL, "Kernel SMP"); -static int forward_wakeup_enabled = 1; +static int forward_wakeup_enabled = 0; SYSCTL_INT(_kern_sched_ipiwakeup, OID_AUTO, enabled, CTLFLAG_RW, &forward_wakeup_enabled, 0, "Forwarding of wakeup to idle CPUs"); From owner-p4-projects@FreeBSD.ORG Tue Oct 19 21:59:24 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5CAE916A4D0; Tue, 19 Oct 2004 21:59:24 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1290116A4CE for ; Tue, 19 Oct 2004 21:59:24 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0940543D1F for ; Tue, 19 Oct 2004 21:59:24 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9JLxNit003027 for ; Tue, 19 Oct 2004 21:59:23 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9JLxNLE003024 for perforce@freebsd.org; Tue, 19 Oct 2004 21:59:23 GMT (envelope-from jhb@freebsd.org) Date: Tue, 19 Oct 2004 21:59:23 GMT Message-Id: <200410192159.i9JLxNLE003024@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 63396 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Oct 2004 21:59:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=63396 Change 63396 by jhb@jhb_tibook on 2004/10/19 21:58:24 Update. Affected files ... .. //depot/projects/smpng/sys/notes#21 edit Differences ... ==== //depot/projects/smpng/sys/notes#21 (text+ko) ==== @@ -33,6 +33,10 @@ - Untested - Don't allow kthreads to get signalled and do bad things - Untested +- Change amd64 to use [ls]fence instructions for memory barriers. + - Untested (and no hardware, maybe peter can test) +- Turn off the ipiwakeups in 4BSD since the currently implementation can + lead to IPI deadlocks - Add a kproc API that does what kthread does right now - Add a real kthread API that creates just another thread inside of a kproc - Figure out what needs to be done to make a new kthread.. should each From owner-p4-projects@FreeBSD.ORG Tue Oct 19 22:19:08 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 598A716A4D3; Tue, 19 Oct 2004 22:19:08 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 12CF816A4CF; Tue, 19 Oct 2004 22:19:08 +0000 (GMT) Received: from mail.vicor-nb.com (bigwoop.vicor-nb.com [208.206.78.2]) by mx1.FreeBSD.org (Postfix) with ESMTP id E5FD343D2D; Tue, 19 Oct 2004 22:19:07 +0000 (GMT) (envelope-from julian@elischer.org) Received: from elischer.org (julian.vicor-nb.com [208.206.78.97]) by mail.vicor-nb.com (Postfix) with ESMTP id C73857A403; Tue, 19 Oct 2004 15:19:07 -0700 (PDT) Message-ID: <417592DB.6050609@elischer.org> Date: Tue, 19 Oct 2004 15:19:07 -0700 From: Julian Elischer User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.3.1) Gecko/20030516 X-Accept-Language: en, hu MIME-Version: 1.0 To: John Baldwin References: <200410192159.i9JLxNLE003024@repoman.freebsd.org> In-Reply-To: <200410192159.i9JLxNLE003024@repoman.freebsd.org> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit cc: Perforce Change Reviews Subject: Re: PERFORCE change 63396 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Oct 2004 22:19:09 -0000 John Baldwin wrote: >http://perforce.freebsd.org/chv.cgi?CH=63396 > >Change 63396 by jhb@jhb_tibook on 2004/10/19 21:58:24 > > Update. > >Affected files ... > >.. //depot/projects/smpng/sys/notes#21 edit > >Differences ... > >==== //depot/projects/smpng/sys/notes#21 (text+ko) ==== > >@@ -33,6 +33,10 @@ > - Untested > - Don't allow kthreads to get signalled and do bad things > - Untested >+- Change amd64 to use [ls]fence instructions for memory barriers. >+ - Untested (and no hardware, maybe peter can test) >+- Turn off the ipiwakeups in 4BSD since the currently implementation can >+ lead to IPI deadlocks > the implementation of IPIs or the implementation of IPIwakeup? > - Add a kproc API that does what kthread does right now > - Add a real kthread API that creates just another thread inside of a kproc > - Figure out what needs to be done to make a new kthread.. should each > > From owner-p4-projects@FreeBSD.ORG Wed Oct 20 19:10:58 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF44016A53D; Wed, 20 Oct 2004 19:10:57 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F09E616A531 for ; Wed, 20 Oct 2004 19:10:56 +0000 (GMT) Received: from mail3.speakeasy.net (mail3.speakeasy.net [216.254.0.203]) by mx1.FreeBSD.org (Postfix) with ESMTP id C6FC243D2D for ; Wed, 20 Oct 2004 19:10:56 +0000 (GMT) (envelope-from jhb@FreeBSD.org) Received: (qmail 31470 invoked from network); 20 Oct 2004 19:10:56 -0000 Received: from dsl027-160-063.atl1.dsl.speakeasy.net (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) encrypted SMTP for ; 20 Oct 2004 19:10:56 -0000 Received: from [10.50.41.228] (gw1.twc.weather.com [216.133.140.1]) (authenticated bits=0) by server.baldwin.cx (8.12.11/8.12.11) with ESMTP id i9KJAlbh059480; Wed, 20 Oct 2004 15:10:52 -0400 (EDT) (envelope-from jhb@FreeBSD.org) From: John Baldwin To: Julian Elischer Date: Wed, 20 Oct 2004 12:58:26 -0400 User-Agent: KMail/1.6.2 References: <200410192159.i9JLxNLE003024@repoman.freebsd.org> <417592DB.6050609@elischer.org> In-Reply-To: <417592DB.6050609@elischer.org> MIME-Version: 1.0 Content-Disposition: inline Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <200410201258.26325.jhb@FreeBSD.org> X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on server.baldwin.cx cc: Perforce Change Reviews Subject: Re: PERFORCE change 63396 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Oct 2004 19:10:58 -0000 On Tuesday 19 October 2004 06:19 pm, Julian Elischer wrote: > John Baldwin wrote: > >http://perforce.freebsd.org/chv.cgi?CH=63396 > > > >Change 63396 by jhb@jhb_tibook on 2004/10/19 21:58:24 > > > > Update. > > > >Affected files ... > > > >.. //depot/projects/smpng/sys/notes#21 edit > > > >Differences ... > > > >==== //depot/projects/smpng/sys/notes#21 (text+ko) ==== > > > >@@ -33,6 +33,10 @@ > > - Untested > > - Don't allow kthreads to get signalled and do bad things > > - Untested > >+- Change amd64 to use [ls]fence instructions for memory barriers. > >+ - Untested (and no hardware, maybe peter can test) > >+- Turn off the ipiwakeups in 4BSD since the currently implementation can > >+ lead to IPI deadlocks > > the implementation of IPIs or the implementation of IPIwakeup? Kind of hard to say. The problem is if a CPU tries to send two IPI_AST's without enabling interrupts in between. The first IPI may not be delivered when the second one is requested because the target of the first IPI has interrupts disabled for some reason (doing a TLB shootdown is the worst case scenario). The other CPU won't enable interrupts to allow the first AST until it's shootdown is acknowledged. Since the first IPI is never delivered, then the second IPI attempt will never be able to deliver an IPI, resulting in either a panic or deadlock. My quad xeon is highly unstable on HEAD, btw, and this does seem to help it. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org From owner-p4-projects@FreeBSD.ORG Thu Oct 21 04:52:00 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A3AC16A4D0; Thu, 21 Oct 2004 04:52:00 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 63F7B16A4CE for ; Thu, 21 Oct 2004 04:52:00 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1FC1F43D2D for ; Thu, 21 Oct 2004 04:52:00 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9L4q0Hj014782 for ; Thu, 21 Oct 2004 04:52:00 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9L4pwY7014779 for perforce@freebsd.org; Thu, 21 Oct 2004 04:51:58 GMT (envelope-from julian@freebsd.org) Date: Thu, 21 Oct 2004 04:51:58 GMT Message-Id: <200410210451.i9L4pwY7014779@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 63442 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Oct 2004 04:52:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=63442 Change 63442 by julian@julian_ref on 2004/10/21 04:51:27 IFC@63441 Affected files ... .. //depot/projects/nsched/sys/alpha/alpha/promcons.c#6 integrate .. //depot/projects/nsched/sys/alpha/osf1/osf1_misc.c#5 integrate .. //depot/projects/nsched/sys/alpha/tlsb/zs_tlsb.c#6 integrate .. //depot/projects/nsched/sys/amd64/acpica/acpi_machdep.c#5 integrate .. //depot/projects/nsched/sys/amd64/amd64/nexus.c#7 integrate .. //depot/projects/nsched/sys/amd64/amd64/pmap.c#25 integrate .. //depot/projects/nsched/sys/amd64/include/acpica_machdep.h#3 integrate .. //depot/projects/nsched/sys/amd64/include/pmap.h#13 integrate .. //depot/projects/nsched/sys/amd64/pci/pci_bus.c#4 integrate .. //depot/projects/nsched/sys/arm/conf/SIMICS#3 integrate .. //depot/projects/nsched/sys/arm/sa11x0/assabet_machdep.c#6 integrate .. //depot/projects/nsched/sys/boot/common/help.common#6 integrate .. //depot/projects/nsched/sys/boot/common/loader.8#8 integrate .. //depot/projects/nsched/sys/cam/scsi/scsi_da.h#2 integrate .. //depot/projects/nsched/sys/compat/freebsd32/freebsd32_misc.c#5 integrate .. //depot/projects/nsched/sys/compat/freebsd32/freebsd32_proto.h#6 integrate .. //depot/projects/nsched/sys/compat/freebsd32/freebsd32_syscall.h#6 integrate .. //depot/projects/nsched/sys/compat/freebsd32/freebsd32_syscalls.c#6 integrate .. //depot/projects/nsched/sys/compat/freebsd32/freebsd32_sysent.c#6 integrate .. //depot/projects/nsched/sys/compat/freebsd32/syscalls.master#5 integrate .. //depot/projects/nsched/sys/compat/linux/linux_util.h#3 integrate .. //depot/projects/nsched/sys/conf/files#29 integrate .. //depot/projects/nsched/sys/conf/files.i386#10 integrate .. //depot/projects/nsched/sys/conf/files.sparc64#6 integrate .. //depot/projects/nsched/sys/conf/kern.pre.mk#7 integrate .. //depot/projects/nsched/sys/conf/kmod.mk#10 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi.c#13 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_cmbat.c#8 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_cpu.c#9 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_pcib_acpi.c#9 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_quirks#3 integrate .. //depot/projects/nsched/sys/dev/acpica/acpi_timer.c#6 integrate .. //depot/projects/nsched/sys/dev/acpica/acpivar.h#12 integrate .. //depot/projects/nsched/sys/dev/aic7xxx/ahc_isa.c#3 integrate .. //depot/projects/nsched/sys/dev/aic7xxx/aic7xxx.c#4 integrate .. //depot/projects/nsched/sys/dev/aic7xxx/aic7xxx.h#3 integrate .. //depot/projects/nsched/sys/dev/ata/ata-all.c#15 integrate .. //depot/projects/nsched/sys/dev/ata/ata-all.h#8 integrate .. //depot/projects/nsched/sys/dev/ata/ata-card.c#4 integrate .. //depot/projects/nsched/sys/dev/ata/ata-cbus.c#4 integrate .. //depot/projects/nsched/sys/dev/ata/ata-chipset.c#16 integrate .. //depot/projects/nsched/sys/dev/ata/ata-disk.c#10 integrate .. //depot/projects/nsched/sys/dev/ata/ata-isa.c#3 integrate .. //depot/projects/nsched/sys/dev/ata/ata-pci.c#7 integrate .. //depot/projects/nsched/sys/dev/ata/ata-pci.h#5 integrate .. //depot/projects/nsched/sys/dev/ata/ata-queue.c#9 integrate .. //depot/projects/nsched/sys/dev/auxio/auxio.c#1 branch .. //depot/projects/nsched/sys/dev/auxio/auxioreg.h#1 branch .. //depot/projects/nsched/sys/dev/bfe/if_bfe.c#6 integrate .. //depot/projects/nsched/sys/dev/bge/if_bge.c#8 integrate .. //depot/projects/nsched/sys/dev/cx/if_cx.c#13 integrate .. //depot/projects/nsched/sys/dev/cx/machdep.h#2 integrate .. //depot/projects/nsched/sys/dev/dcons/dcons.c#8 integrate .. //depot/projects/nsched/sys/dev/dcons/dcons.h#2 integrate .. //depot/projects/nsched/sys/dev/dcons/dcons_crom.c#3 integrate .. //depot/projects/nsched/sys/dev/dcons/dcons_os.c#1 branch .. //depot/projects/nsched/sys/dev/dcons/dcons_os.h#1 branch .. //depot/projects/nsched/sys/dev/digi/digi.c#11 integrate .. //depot/projects/nsched/sys/dev/digi/digi.h#5 integrate .. //depot/projects/nsched/sys/dev/ed/if_ed_pccard.c#5 integrate .. //depot/projects/nsched/sys/dev/em/if_em.c#8 integrate .. //depot/projects/nsched/sys/dev/ex/if_ex.c#6 integrate .. //depot/projects/nsched/sys/dev/fdc/fdc.c#12 integrate .. //depot/projects/nsched/sys/dev/fe/if_fe.c#6 integrate .. //depot/projects/nsched/sys/dev/hifn/hifn7751.c#4 integrate .. //depot/projects/nsched/sys/dev/hifn/hifn7751var.h#2 integrate .. //depot/projects/nsched/sys/dev/if_ndis/if_ndis.c#9 integrate .. //depot/projects/nsched/sys/dev/md/md.c#13 integrate .. //depot/projects/nsched/sys/dev/nmdm/nmdm.c#9 integrate .. //depot/projects/nsched/sys/dev/ofw/ofw_console.c#7 integrate .. //depot/projects/nsched/sys/dev/pbio/pbio.c#1 branch .. //depot/projects/nsched/sys/dev/pbio/pbioio.h#1 branch .. //depot/projects/nsched/sys/dev/pci/pci.c#8 integrate .. //depot/projects/nsched/sys/dev/random/harvest.c#4 integrate .. //depot/projects/nsched/sys/dev/random/randomdev_soft.c#5 integrate .. //depot/projects/nsched/sys/dev/rc/rc.c#8 integrate .. //depot/projects/nsched/sys/dev/sab/sab.c#9 integrate .. //depot/projects/nsched/sys/dev/sio/sio.c#13 integrate .. //depot/projects/nsched/sys/dev/sio/sio_pci.c#3 integrate .. //depot/projects/nsched/sys/dev/sound/isa/ad1816.c#4 integrate .. //depot/projects/nsched/sys/dev/sound/isa/es1888.c#3 integrate .. //depot/projects/nsched/sys/dev/sound/isa/ess.c#4 integrate .. //depot/projects/nsched/sys/dev/sound/isa/gusc.c#3 integrate .. //depot/projects/nsched/sys/dev/sound/isa/mss.c#4 integrate .. //depot/projects/nsched/sys/dev/sound/isa/sb16.c#7 integrate .. //depot/projects/nsched/sys/dev/sound/isa/sb8.c#4 integrate .. //depot/projects/nsched/sys/dev/sound/isa/sbc.c#5 integrate .. //depot/projects/nsched/sys/dev/sound/pci/au88x0.c#3 integrate .. //depot/projects/nsched/sys/dev/sound/pci/aureal.c#3 integrate .. //depot/projects/nsched/sys/dev/sound/pci/csapcm.c#4 integrate .. //depot/projects/nsched/sys/dev/sound/pci/ds1.c#4 integrate .. //depot/projects/nsched/sys/dev/sound/pci/emu10k1.c#7 integrate .. //depot/projects/nsched/sys/dev/sound/pci/es137x.c#3 integrate .. //depot/projects/nsched/sys/dev/sound/pci/fm801.c#4 integrate .. //depot/projects/nsched/sys/dev/sound/pci/ich.c#7 integrate .. //depot/projects/nsched/sys/dev/sound/pci/maestro3.c#3 integrate .. //depot/projects/nsched/sys/dev/sound/pci/solo.c#3 integrate .. //depot/projects/nsched/sys/dev/sound/pci/t4dwave.c#4 integrate .. //depot/projects/nsched/sys/dev/sound/pci/via8233.c#4 integrate .. //depot/projects/nsched/sys/dev/sound/pci/via82c686.c#4 integrate .. //depot/projects/nsched/sys/dev/sound/pcm/buffer.c#3 integrate .. //depot/projects/nsched/sys/dev/sx/sx.c#7 integrate .. //depot/projects/nsched/sys/dev/sx/sx.h#4 integrate .. //depot/projects/nsched/sys/dev/syscons/syscons.c#9 integrate .. //depot/projects/nsched/sys/dev/syscons/sysmouse.c#5 integrate .. //depot/projects/nsched/sys/dev/uart/uart_bus.h#4 integrate .. //depot/projects/nsched/sys/dev/uart/uart_tty.c#8 integrate .. //depot/projects/nsched/sys/dev/usb/ubsa.c#4 integrate .. //depot/projects/nsched/sys/dev/usb/ubser.c#10 integrate .. //depot/projects/nsched/sys/dev/usb/ucycom.c#2 integrate .. //depot/projects/nsched/sys/dev/usb/ugen.c#8 integrate .. //depot/projects/nsched/sys/dev/usb/uhci_pci.c#3 integrate .. //depot/projects/nsched/sys/dev/usb/uhid.c#7 integrate .. //depot/projects/nsched/sys/dev/usb/umass.c#7 integrate .. //depot/projects/nsched/sys/dev/usb/usbdevs#15 integrate .. //depot/projects/nsched/sys/dev/zs/zs.c#9 integrate .. //depot/projects/nsched/sys/geom/geom_io.c#9 integrate .. //depot/projects/nsched/sys/geom/geom_pc98.c#3 integrate .. //depot/projects/nsched/sys/geom/geom_subr.c#5 integrate .. //depot/projects/nsched/sys/geom/label/g_label.c#8 integrate .. //depot/projects/nsched/sys/geom/mirror/g_mirror.c#11 integrate .. //depot/projects/nsched/sys/i386/acpica/acpi_machdep.c#7 integrate .. //depot/projects/nsched/sys/i386/bios/apm.c#4 integrate .. //depot/projects/nsched/sys/i386/conf/NOTES#13 integrate .. //depot/projects/nsched/sys/i386/i386/elan-mmcr.c#6 integrate .. //depot/projects/nsched/sys/i386/i386/nexus.c#7 integrate .. //depot/projects/nsched/sys/i386/i386/pmap.c#27 integrate .. //depot/projects/nsched/sys/i386/i386/vm_machdep.c#8 integrate .. //depot/projects/nsched/sys/i386/ibcs2/ibcs2_misc.c#3 integrate .. //depot/projects/nsched/sys/i386/ibcs2/ibcs2_socksys.c#2 integrate .. //depot/projects/nsched/sys/i386/ibcs2/ibcs2_sysi86.c#2 integrate .. //depot/projects/nsched/sys/i386/include/acpica_machdep.h#3 integrate .. //depot/projects/nsched/sys/i386/include/pmap.h#9 integrate .. //depot/projects/nsched/sys/i386/isa/npx.c#6 integrate .. //depot/projects/nsched/sys/i386/isa/pbio.c#1 branch .. //depot/projects/nsched/sys/i386/isa/pcvt/pcvt_drv.c#5 integrate .. //depot/projects/nsched/sys/i386/pci/pci_bus.c#5 integrate .. //depot/projects/nsched/sys/i4b/driver/i4b_ipr.c#5 integrate .. //depot/projects/nsched/sys/i4b/driver/i4b_isppp.c#3 integrate .. //depot/projects/nsched/sys/ia64/acpica/acpi_machdep.c#4 integrate .. //depot/projects/nsched/sys/ia64/ia64/machdep.c#9 integrate .. //depot/projects/nsched/sys/ia64/ia64/nexus.c#4 integrate .. //depot/projects/nsched/sys/ia64/ia64/ssc.c#5 integrate .. //depot/projects/nsched/sys/ia64/include/acpica_machdep.h#3 integrate .. //depot/projects/nsched/sys/isa/atkbdc_isa.c#3 integrate .. //depot/projects/nsched/sys/isa/isahint.c#2 integrate .. //depot/projects/nsched/sys/kern/init_sysent.c#6 integrate .. //depot/projects/nsched/sys/kern/kern_condvar.c#5 integrate .. //depot/projects/nsched/sys/kern/kern_descrip.c#10 integrate .. //depot/projects/nsched/sys/kern/kern_event.c#10 integrate .. //depot/projects/nsched/sys/kern/kern_exec.c#13 integrate .. //depot/projects/nsched/sys/kern/kern_fork.c#16 integrate .. //depot/projects/nsched/sys/kern/kern_kse.c#34 integrate .. //depot/projects/nsched/sys/kern/kern_mutex.c#7 integrate .. //depot/projects/nsched/sys/kern/kern_proc.c#15 integrate .. //depot/projects/nsched/sys/kern/kern_subr.c#6 integrate .. //depot/projects/nsched/sys/kern/kern_switch.c#40 integrate .. //depot/projects/nsched/sys/kern/kern_synch.c#18 integrate .. //depot/projects/nsched/sys/kern/kern_sysctl.c#5 integrate .. //depot/projects/nsched/sys/kern/kern_tc.c#3 integrate .. //depot/projects/nsched/sys/kern/kern_thr.c#20 integrate .. //depot/projects/nsched/sys/kern/kern_thread.c#44 integrate .. //depot/projects/nsched/sys/kern/kern_xxx.c#5 integrate .. //depot/projects/nsched/sys/kern/subr_bus.c#10 integrate .. //depot/projects/nsched/sys/kern/subr_kdb.c#6 integrate .. //depot/projects/nsched/sys/kern/subr_sleepqueue.c#6 integrate .. //depot/projects/nsched/sys/kern/subr_turnstile.c#7 integrate .. //depot/projects/nsched/sys/kern/subr_witness.c#8 integrate .. //depot/projects/nsched/sys/kern/syscalls.c#6 integrate .. //depot/projects/nsched/sys/kern/syscalls.master#6 integrate .. //depot/projects/nsched/sys/kern/tty.c#13 integrate .. //depot/projects/nsched/sys/kern/tty_pty.c#11 integrate .. //depot/projects/nsched/sys/kern/uipc_domain.c#3 integrate .. //depot/projects/nsched/sys/kern/uipc_mbuf2.c#6 integrate .. //depot/projects/nsched/sys/kern/uipc_socket.c#14 integrate .. //depot/projects/nsched/sys/kern/uipc_socket2.c#10 integrate .. //depot/projects/nsched/sys/kern/uipc_syscalls.c#13 integrate .. //depot/projects/nsched/sys/kern/uipc_usrreq.c#12 integrate .. //depot/projects/nsched/sys/kern/vfs_subr.c#15 integrate .. //depot/projects/nsched/sys/modules/Makefile#14 integrate .. //depot/projects/nsched/sys/modules/auxio/Makefile#1 branch .. //depot/projects/nsched/sys/modules/dcons/Makefile#3 integrate .. //depot/projects/nsched/sys/modules/dcons_crom/Makefile#2 integrate .. //depot/projects/nsched/sys/modules/ipdivert/Makefile#1 branch .. //depot/projects/nsched/sys/modules/netgraph/device/Makefile#2 integrate .. //depot/projects/nsched/sys/net/bpf.c#9 integrate .. //depot/projects/nsched/sys/net/bridge.c#9 integrate .. //depot/projects/nsched/sys/net/bridge.h#2 integrate .. //depot/projects/nsched/sys/net/if.c#15 integrate .. //depot/projects/nsched/sys/net/if_ethersubr.c#11 integrate .. //depot/projects/nsched/sys/net/if_tun.c#6 integrate .. //depot/projects/nsched/sys/net/if_var.h#8 integrate .. //depot/projects/nsched/sys/net/net_osdep.c#2 delete .. //depot/projects/nsched/sys/net/net_osdep.h#2 integrate .. //depot/projects/nsched/sys/net/netisr.c#6 integrate .. //depot/projects/nsched/sys/net/pfil.c#4 integrate .. //depot/projects/nsched/sys/net/raw_cb.c#5 integrate .. //depot/projects/nsched/sys/net/raw_usrreq.c#4 integrate .. //depot/projects/nsched/sys/netatalk/ddp_pcb.c#4 integrate .. //depot/projects/nsched/sys/netatm/atm_socket.c#3 integrate .. //depot/projects/nsched/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#9 integrate .. //depot/projects/nsched/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#3 integrate .. //depot/projects/nsched/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#5 integrate .. //depot/projects/nsched/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#5 integrate .. //depot/projects/nsched/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#5 integrate .. //depot/projects/nsched/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#6 integrate .. //depot/projects/nsched/sys/netgraph/ng_device.c#6 integrate .. //depot/projects/nsched/sys/netgraph/ng_device.h#3 integrate .. //depot/projects/nsched/sys/netgraph/ng_ether.c#7 integrate .. //depot/projects/nsched/sys/netinet/if_ether.c#6 integrate .. //depot/projects/nsched/sys/netinet/in.h#6 integrate .. //depot/projects/nsched/sys/netinet/in_pcb.c#8 integrate .. //depot/projects/nsched/sys/netinet/in_pcb.h#6 integrate .. //depot/projects/nsched/sys/netinet/in_proto.c#5 integrate .. //depot/projects/nsched/sys/netinet/in_var.h#4 integrate .. //depot/projects/nsched/sys/netinet/ip_divert.c#10 integrate .. //depot/projects/nsched/sys/netinet/ip_divert.h#2 integrate .. //depot/projects/nsched/sys/netinet/ip_fastfwd.c#8 integrate .. //depot/projects/nsched/sys/netinet/ip_fw2.c#13 integrate .. //depot/projects/nsched/sys/netinet/ip_fw_pfil.c#5 integrate .. //depot/projects/nsched/sys/netinet/ip_input.c#13 integrate .. //depot/projects/nsched/sys/netinet/ip_mroute.c#8 integrate .. //depot/projects/nsched/sys/netinet/ip_var.h#7 integrate .. //depot/projects/nsched/sys/netinet/raw_ip.c#8 integrate .. //depot/projects/nsched/sys/netinet/tcp_output.c#9 integrate .. //depot/projects/nsched/sys/netinet/tcp_subr.c#10 integrate .. //depot/projects/nsched/sys/netinet/udp_usrreq.c#8 integrate .. //depot/projects/nsched/sys/netinet6/in6_pcb.c#5 integrate .. //depot/projects/nsched/sys/netinet6/in6_rmx.c#2 integrate .. //depot/projects/nsched/sys/netinet6/ip6_input.c#9 integrate .. //depot/projects/nsched/sys/netipx/ipx_pcb.c#3 integrate .. //depot/projects/nsched/sys/netipx/ipx_usrreq.c#3 integrate .. //depot/projects/nsched/sys/netnatm/natm.c#4 integrate .. //depot/projects/nsched/sys/netncp/ncp_ncp.c#2 integrate .. //depot/projects/nsched/sys/nfsclient/nfs_vfsops.c#6 integrate .. //depot/projects/nsched/sys/nfsserver/nfs_serv.c#7 integrate .. //depot/projects/nsched/sys/pc98/pc98/fd.c#7 integrate .. //depot/projects/nsched/sys/pc98/pc98/sio.c#13 integrate .. //depot/projects/nsched/sys/pci/if_de.c#7 integrate .. //depot/projects/nsched/sys/pci/if_sis.c#6 integrate .. //depot/projects/nsched/sys/pci/if_vr.c#9 integrate .. //depot/projects/nsched/sys/sparc64/conf/GENERIC#8 integrate .. //depot/projects/nsched/sys/sparc64/conf/NOTES#6 integrate .. //depot/projects/nsched/sys/sparc64/sparc64/machdep.c#8 integrate .. //depot/projects/nsched/sys/sys/conf.h#13 integrate .. //depot/projects/nsched/sys/sys/kse.h#4 integrate .. //depot/projects/nsched/sys/sys/mbuf.h#11 integrate .. //depot/projects/nsched/sys/sys/pbioio.h#1 branch .. //depot/projects/nsched/sys/sys/proc.h#39 integrate .. //depot/projects/nsched/sys/sys/protosw.h#3 integrate .. //depot/projects/nsched/sys/sys/random.h#2 integrate .. //depot/projects/nsched/sys/sys/sleepqueue.h#4 integrate .. //depot/projects/nsched/sys/sys/socketvar.h#9 integrate .. //depot/projects/nsched/sys/sys/syscall.h#6 integrate .. //depot/projects/nsched/sys/sys/syscall.mk#6 integrate .. //depot/projects/nsched/sys/sys/syscallsubr.h#5 integrate .. //depot/projects/nsched/sys/sys/sysctl.h#7 integrate .. //depot/projects/nsched/sys/sys/sysproto.h#6 integrate .. //depot/projects/nsched/sys/sys/thr.h#3 integrate .. //depot/projects/nsched/sys/sys/tty.h#11 integrate .. //depot/projects/nsched/sys/sys/ttydefaults.h#4 integrate .. //depot/projects/nsched/sys/sys/turnstile.h#3 integrate .. //depot/projects/nsched/sys/ufs/ffs/ffs_alloc.c#8 integrate .. //depot/projects/nsched/sys/ufs/ffs/ffs_balloc.c#3 integrate .. //depot/projects/nsched/sys/ufs/ffs/ffs_vnops.c#7 integrate .. //depot/projects/nsched/sys/ufs/ffs/fs.h#6 integrate .. //depot/projects/nsched/sys/ufs/ufs/dinode.h#4 integrate .. //depot/projects/nsched/sys/vm/uma_core.c#6 integrate .. //depot/projects/nsched/sys/vm/uma_dbg.c#4 integrate .. //depot/projects/nsched/sys/vm/vm_fault.c#8 integrate .. //depot/projects/nsched/sys/vm/vm_meter.c#5 integrate .. //depot/projects/nsched/sys/vm/vm_page.c#10 integrate Differences ... ==== //depot/projects/nsched/sys/alpha/alpha/promcons.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.41 2004/09/17 11:02:53 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.43 2004/10/20 16:22:53 jhb Exp $"); #include #include @@ -107,12 +107,7 @@ tp->t_dev = dev; if ((tp->t_state & TS_ISOPEN) == 0) { tp->t_state |= TS_CARR_ON; - ttychars(tp); - tp->t_iflag = TTYDEF_IFLAG; - tp->t_oflag = TTYDEF_OFLAG; - tp->t_cflag = TTYDEF_CFLAG|CLOCAL; - tp->t_lflag = TTYDEF_LFLAG; - tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED; + ttyconsolemode(tp, 0); ttsetwater(tp); setuptimeout = 1; ==== //depot/projects/nsched/sys/alpha/osf1/osf1_misc.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.49 2004/10/05 18:51:09 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.50 2004/10/14 10:43:47 phk Exp $"); #include #include @@ -1772,7 +1772,7 @@ name[1] = KERN_HOSTNAME; mtx_lock(&Giant); retval = userland_sysctl(td, name, 2, uap->buf, &len, - 1, 0, 0, &bytes); + 1, 0, 0, &bytes, 0); mtx_unlock(&Giant); td->td_retval[0] = bytes; return(retval); ==== //depot/projects/nsched/sys/alpha/tlsb/zs_tlsb.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.48 2004/09/17 11:04:57 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.49 2004/10/18 21:51:24 phk Exp $"); #include #include @@ -283,12 +283,7 @@ tp = dev->si_tty; if ((tp->t_state & TS_ISOPEN) == 0) { tp->t_state |= TS_CARR_ON; - ttychars(tp); - tp->t_iflag = TTYDEF_IFLAG; - tp->t_oflag = TTYDEF_OFLAG; - tp->t_cflag = TTYDEF_CFLAG|CLOCAL; - tp->t_lflag = TTYDEF_LFLAG; - tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED; + ttyconsolemode(tp, 0); ttsetwater(tp); setuptimeout = 1; } else if ((tp->t_state & TS_XCLUDE) && suser(td)) { ==== //depot/projects/nsched/sys/amd64/acpica/acpi_machdep.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.15 2004/08/16 23:10:18 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.16 2004/10/11 05:39:14 njl Exp $"); #include #include @@ -61,3 +61,9 @@ { return (0); } + +void +acpi_cpu_c1() +{ + __asm __volatile("sti; hlt"); +} ==== //depot/projects/nsched/sys/amd64/amd64/nexus.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.63 2004/08/24 19:22:54 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.64 2004/10/14 22:36:47 njl Exp $"); /* * This code implements a `root nexus' for Intel Architecture @@ -259,6 +259,8 @@ retval += bus_print_child_header(bus, child); retval += nexus_print_all_resources(child); + if (device_get_flags(child)) + retval += printf(" flags %#x", device_get_flags(child)); retval += printf(" on motherboard\n"); /* XXX "motherboard", ick */ return (retval); ==== //depot/projects/nsched/sys/amd64/amd64/pmap.c#25 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.507 2004/10/03 20:14:06 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.508 2004/10/08 08:23:42 alc Exp $"); /* * Manages physical address maps. @@ -1839,7 +1839,7 @@ vm_paddr_t opa; pd_entry_t ptepde; pt_entry_t origpte, newpte; - vm_page_t mpte; + vm_page_t mpte, om; va = trunc_page(va); #ifdef PMAP_DIAGNOSTIC @@ -1881,6 +1881,7 @@ panic("pmap_enter: invalid page directory va=%#lx\n", va); pa = VM_PAGE_TO_PHYS(m); + om = NULL; origpte = *pte; opa = origpte & PG_FRAME; @@ -1921,8 +1922,7 @@ * so we go ahead and sense modify status. */ if (origpte & PG_MANAGED) { - if ((origpte & PG_M) && pmap_track_modified(va)) - vm_page_dirty(m); + om = m; pa |= PG_MANAGED; } goto validate; @@ -1933,10 +1933,17 @@ */ if (opa) { int err; - err = pmap_remove_pte(pmap, pte, va, ptepde); + if (origpte & PG_W) + pmap->pm_stats.wired_count--; + if (origpte & PG_MANAGED) { + om = PHYS_TO_VM_PAGE(opa); + err = pmap_remove_entry(pmap, om, va, ptepde); + } else + err = pmap_unuse_pt(pmap, va, ptepde); if (err) panic("pmap_enter: pte vanished, va: 0x%lx", va); - } + } else + pmap->pm_stats.resident_count++; /* * Enter on the PV list if part of our managed memory. Note that we @@ -1952,7 +1959,6 @@ /* * Increment counters */ - pmap->pm_stats.resident_count++; if (wired) pmap->pm_stats.wired_count++; @@ -1977,7 +1983,14 @@ * to update the pte. */ if ((origpte & ~(PG_M|PG_A)) != newpte) { - pte_store(pte, newpte | PG_A); + if (origpte & PG_MANAGED) { + origpte = pte_load_store(pte, newpte | PG_A); + if ((origpte & PG_M) && pmap_track_modified(va)) + vm_page_dirty(om); + if (origpte & PG_A) + vm_page_flag_set(om, PG_REFERENCED); + } else + pte_store(pte, newpte | PG_A); if (origpte) { pmap_invalidate_page(pmap, va); } ==== //depot/projects/nsched/sys/amd64/include/acpica_machdep.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/acpica_machdep.h,v 1.5 2004/05/05 20:04:14 njl Exp $ + * $FreeBSD: src/sys/amd64/include/acpica_machdep.h,v 1.6 2004/10/11 05:39:15 njl Exp $ */ /****************************************************************************** @@ -73,6 +73,7 @@ #define COMPILER_DEPENDENT_INT64 long #define COMPILER_DEPENDENT_UINT64 unsigned long -void acpi_SetDefaultIntrModel(int model); +void acpi_SetDefaultIntrModel(int model); +void acpi_cpu_c1(void); #endif /* __ACPICA_MACHDEP_H__ */ ==== //depot/projects/nsched/sys/amd64/include/pmap.h#13 (text+ko) ==== @@ -39,7 +39,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.124 2004/09/29 19:20:39 alc Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.125 2004/10/08 08:23:43 alc Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -194,15 +194,25 @@ { pt_entry_t r; - r = *ptep; - *ptep = pte; + __asm __volatile( + "xchgq %0,%1" + : "=m" (*ptep), + "=r" (r) + : "1" (pte), + "m" (*ptep)); return (r); } #define pte_load_clear(pte) atomic_readandclear_long(pte) -#define pte_clear(ptep) pte_load_store((ptep), (pt_entry_t)0ULL) -#define pte_store(ptep, pte) pte_load_store((ptep), (pt_entry_t)pte) +static __inline void +pte_store(pt_entry_t *ptep, pt_entry_t pte) +{ + + *ptep = pte; +} + +#define pte_clear(ptep) pte_store((ptep), (pt_entry_t)0ULL) #define pde_store(pdep, pde) pte_store((pdep), (pde)) ==== //depot/projects/nsched/sys/amd64/pci/pci_bus.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.109 2004/06/03 05:58:30 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.110 2004/10/11 21:51:27 peter Exp $"); #include "opt_cpu.h" @@ -35,6 +35,7 @@ #include #include #include +#include #include #include @@ -42,6 +43,7 @@ #include #include #include +#include #include "pcib_if.h" @@ -81,8 +83,8 @@ static const char * legacy_pcib_is_host_bridge(int bus, int slot, int func, - u_int32_t id, u_int8_t class, u_int8_t subclass, - u_int8_t *busnum) + uint32_t id, uint8_t class, uint8_t subclass, + uint8_t *busnum) { const char *s = NULL; @@ -262,7 +264,38 @@ return ENOENT; } +SYSCTL_DECL(_hw_pci); +static int legacy_host_mem_start = 0x80000000; +/* No TUNABLE_ULONG :-( */ +TUNABLE_INT("hw.pci.host_mem_start", &legacy_host_mem_start); +SYSCTL_INT(_hw_pci, OID_AUTO, host_mem_start, CTLFLAG_RDTUN, + &legacy_host_mem_start, 0x80000000, + "Limit the host bridge memory to being above this address. Must be\n\ +set at boot via a tunable."); + +static struct resource * +legacy_pcib_alloc_resource(device_t dev, device_t child, int type, int *rid, + u_long start, u_long end, u_long count, u_int flags) +{ + /* + * If no memory preference is given, use upper 32MB slot most + * bioses use for their memory window. Typically other bridges + * before us get in the way to assert their preferences on memory. + * Hardcoding like this sucks, so a more MD/MI way needs to be + * found to do it. This is typically only used on older laptops + * that don't have pci busses behind pci bridge, so assuming > 32MB + * is liekly OK. + * + * However, this can cause problems for other chipsets, so we make + * this tunable by hw.pci.host_mem_start. + */ + if (type == SYS_RES_MEMORY && start == 0UL && end == ~0UL) + start = legacy_host_mem_start; + return (bus_generic_alloc_resource(dev, child, type, rid, start, end, + count, flags)); +} + static device_method_t legacy_pcib_methods[] = { /* Device interface */ DEVMETHOD(device_identify, legacy_pcib_identify), @@ -276,7 +309,7 @@ DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_read_ivar, legacy_pcib_read_ivar), DEVMETHOD(bus_write_ivar, legacy_pcib_write_ivar), - DEVMETHOD(bus_alloc_resource, bus_generic_alloc_resource), + DEVMETHOD(bus_alloc_resource, legacy_pcib_alloc_resource), DEVMETHOD(bus_release_resource, bus_generic_release_resource), DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), ==== //depot/projects/nsched/sys/arm/conf/SIMICS#3 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.3 2004/09/23 22:53:50 cognet Exp $ +# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.4 2004/10/11 14:42:06 cognet Exp $ machine arm ident SIMICS @@ -40,6 +40,7 @@ options UFS_ACL #Support for access control lists options UFS_DIRHASH #Improve performance on big directories options MD_ROOT #MD is a potential root device +options MD_ROOT_SIZE=65535 options ROOTDEVNAME=\"ufs:md0\" options NFSCLIENT #Network Filesystem Client options NFSSERVER #Network Filesystem Server ==== //depot/projects/nsched/sys/arm/sa11x0/assabet_machdep.c#6 (text+ko) ==== @@ -47,7 +47,9 @@ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.4 2004/09/23 22:32:33 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.5 2004/10/11 14:41:38 cognet Exp $"); + +#include "opt_md.h" #define _ARM32_BUS_DMA_PRIVATE #include @@ -131,7 +133,9 @@ struct pcpu __pcpu; struct pcpu *pcpup = &__pcpu; -#define MDSIZE 8192 +#ifndef MD_ROOT_SIZE +#error SIMICS needs MD_ROOT and MD_ROOT_SIZE +#endif /* Physical and virtual addresses for some global pages */ vm_paddr_t phys_avail[10]; @@ -218,7 +222,7 @@ fake_preload[i++] = MDROOT_ADDR; fake_preload[i++] = MODINFO_SIZE; fake_preload[i++] = sizeof(uint32_t); - fake_preload[i++] = MDSIZE * 1024; + fake_preload[i++] = MD_ROOT_SIZE * 1024; fake_preload[i++] = 0; fake_preload[i] = 0; preload_metadata = (void *)fake_preload; @@ -236,7 +240,6 @@ kerneldatasize = (u_int32_t)&end - (u_int32_t)KERNEL_TEXT_BASE; symbolsize = 0; freemempos = (vm_offset_t)round_page(physical_freestart); - printf("freemempos %p\n", (void*)freemempos); memset((void *)freemempos, 0, 256*1024); /* Define a macro to simplify memory allocation */ #define valloc_pages(var, np) \ @@ -311,12 +314,10 @@ pmap_map_chunk(l1pagetable, KERNBASE, KERNBASE, (uint32_t)&end - KERNBASE, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); /* Map the stack pages */ - printf("avant irq %p %p\n", (void*)irqstack.pv_va, (void*)irqstack.pv_pa); pmap_map_chunk(l1pagetable, irqstack.pv_va, irqstack.pv_pa, IRQ_STACK_SIZE * PAGE_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); - printf("apres irq\n"); pmap_map_chunk(l1pagetable, md_addr.pv_va, md_addr.pv_pa, - MDSIZE * 1024, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); + MD_ROOT_SIZE * 1024, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); pmap_map_chunk(l1pagetable, abtstack.pv_va, abtstack.pv_pa, ABT_STACK_SIZE * PAGE_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); pmap_map_chunk(l1pagetable, undstack.pv_va, undstack.pv_pa, @@ -365,7 +366,6 @@ * Since the ARM stacks use STMFD etc. we must set r13 to the top end * of the stack memory. */ - printf("init subsystems: stacks\n"); set_stackptr(PSR_IRQ32_MODE, irqstack.pv_va + IRQ_STACK_SIZE * PAGE_SIZE); set_stackptr(PSR_ABT32_MODE, ==== //depot/projects/nsched/sys/boot/common/help.common#6 (text+ko) ==== @@ -311,6 +311,18 @@ this option provides a hint as to the actual size of system memory (which will be tested before use). + set hw.{acpi,pci}.host_start_mem= + + Sets the lowest address that the pci code will assign + when it doesn't have other information about the address + to assign (like from a pci bridge). This is only useful + in older systems without a pci bridge. Also, it only + impacts devices that the BIOS doesn't assign to, typically + CardBus bridges. The default is 0x80000000, but + some systems need values like 0xf0000000, 0xfc000000 or + 0xfe000000 may be suitable for older systems (the older + the system, the higher the number typically should be). + set hw.pci.enable_io_modes= Enable PCI resources which are left off by some BIOSes ==== //depot/projects/nsched/sys/boot/common/loader.8#8 (text+ko) ==== @@ -22,9 +22,9 @@ .\" 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.74 2004/10/01 00:15:13 ru Exp $ +.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.76 2004/10/15 06:44:13 ru Exp $ .\" -.Dd October 1, 2004 +.Dd October 15, 2004 .Dt LOADER 8 .Os .Sh NAME @@ -429,6 +429,15 @@ respectively. An invalid suffix will result in the variable being ignored by the kernel. +.It Va hw.pci.host_start_mem , hw.acpi.host_start_mem +When not otherwise constrained, this limits the memory start +address. +The default is 0x80000000 and should be set to at least size of the +memory and not conflict with other resources. +Typically, only systems without PCI bridges need to set this variable +since PCI bridges typically constrain the memory starting address +(and the variable is only used when bridges do not constrain this +address). .It Va hw.pci.enable_io_modes Enable PCI resources which are left off by some BIOSes or are not enabled correctly by the device driver. ==== //depot/projects/nsched/sys/cam/scsi/scsi_da.h#2 (text+ko) ==== @@ -46,7 +46,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $FreeBSD: src/sys/cam/scsi/scsi_da.h,v 1.5 2000/05/21 23:57:52 ken Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_da.h,v 1.7 2004/10/13 09:31:04 bms Exp $ */ #ifndef _SCSI_SCSI_DA_H @@ -151,6 +151,9 @@ #define REASSIGN_BLOCKS 0x07 #define MODE_SELECT 0x15 #define MODE_SENSE 0x1a +#define READ_FORMAT_CAPACITIES 0x23 +#define WRITE_AND_VERIFY 0x2e +#define VERIFY 0x2f #define READ_DEFECT_DATA_10 0x37 #define READ_DEFECT_DATA_12 0xb7 @@ -182,6 +185,82 @@ u_int8_t pat_length[2]; }; +struct scsi_read_format_capacities +{ + uint8_t opcode; /* READ_FORMAT_CAPACITIES */ + uint8_t byte2; +#define SRFC_LUN_MASK 0xE0 + uint8_t reserved0[5]; + uint8_t alloc_length[2]; + uint8_t reserved1[3]; +}; + +struct scsi_verify +{ + uint8_t opcode; /* VERIFY */ + uint8_t byte2; +#define SVFY_LUN_MASK 0xE0 +#define SVFY_RELADR 0x01 +#define SVFY_BYTECHK 0x02 +#define SVFY_DPO 0x10 + uint8_t addr[4]; /* LBA to begin verification at */ + uint8_t reserved0[1]; + uint8_t len[2]; /* number of blocks to verify */ + uint8_t reserved1[3]; +}; + +struct scsi_write_and_verify +{ + uint8_t opcode; /* WRITE_AND_VERIFY */ + uint8_t byte2; +#define SWVY_LUN_MASK 0xE0 +#define SWVY_RELADR 0x01 +#define SWVY_BYTECHK 0x02 +#define SWVY_DPO 0x10 + uint8_t addr[4]; /* LBA to begin verification at */ + uint8_t reserved0[1]; + uint8_t len[2]; /* number of blocks to write and verify */ + uint8_t reserved1[3]; +}; + +/* + * Replies to READ_FORMAT_CAPACITIES look like this: + * + * struct format_capacity_list_header + * struct format_capacity_descriptor[1..n] + * + * These are similar, but not totally identical to, the + * defect list used to format a rigid disk. + * + * The appropriate csio_decode() format string looks like this: + * "{} *i3 {Len} i1 {Blocks} i4 {} *b6 {Code} b2 {Blocklen} i3" + * + * If the capacity_list_length is greater than + * sizeof(struct format_capacity_descriptor), then there are + * additional format capacity descriptors available which + * denote which format(s) the drive can handle. + * + * (Source: USB Mass Storage UFI Specification) + */ + +struct format_capacity_list_header { + uint8_t unused[3]; + uint8_t capacity_list_length; +}; + +struct format_capacity_descriptor { + uint8_t nblocks[4]; /* total number of LBAs */ + uint8_t byte4; /* only present in max/cur descriptor */ +#define FCD_CODE_MASK 0x03 /* mask for code field above */ +#define FCD_UNFORMATTED 0x01 /* unformatted media present, + * maximum capacity returned */ +#define FCD_FORMATTED 0x02 /* formatted media present, + * current capacity returned */ +#define FCD_NOMEDIA 0x03 /* no media present, + * maximum device capacity returned */ + uint8_t block_length[3]; /* length of an LBA in bytes */ +}; + struct scsi_reassign_blocks_data { u_int8_t reserved[2]; ==== //depot/projects/nsched/sys/compat/freebsd32/freebsd32_misc.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.24 2004/10/05 18:51:10 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.25 2004/10/11 22:04:15 peter Exp $"); #include "opt_compat.h" @@ -1203,25 +1203,21 @@ if (uap->namelen > CTL_MAXNAME || uap->namelen < 2) return (EINVAL); - - error = copyin(uap->name, &name, uap->namelen * sizeof(int)); + error = copyin(uap->name, name, uap->namelen * sizeof(int)); if (error) return (error); - mtx_lock(&Giant); - if (uap->oldlenp) oldlen = fuword32(uap->oldlenp); else oldlen = 0; error = userland_sysctl(td, name, uap->namelen, uap->old, &oldlen, 1, - uap->new, uap->newlen, &j); + uap->new, uap->newlen, &j, SCTL_MASK32); if (error && error != ENOMEM) goto done2; - if (uap->oldlenp) { + if (uap->oldlenp) suword32(uap->oldlenp, j); - } done2: mtx_unlock(&Giant); return (error); ==== //depot/projects/nsched/sys/compat/freebsd32/freebsd32_proto.h#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.28 2004/07/14 00:03:51 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.40 2004/07/14 00:03:30 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.29 2004/10/06 14:23:00 mtm Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.41 2004/10/06 14:20:57 mtm Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ ==== //depot/projects/nsched/sys/compat/freebsd32/freebsd32_syscall.h#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.28 2004/07/14 00:03:51 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.40 2004/07/14 00:03:30 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.29 2004/10/06 14:23:00 mtm Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.41 2004/10/06 14:20:57 mtm Exp */ #define FREEBSD32_SYS_syscall 0 ==== //depot/projects/nsched/sys/compat/freebsd32/freebsd32_syscalls.c#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.19 2004/07/14 00:03:51 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.40 2004/07/14 00:03:30 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.20 2004/10/06 14:23:00 mtm Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.41 2004/10/06 14:20:57 mtm Exp */ const char *freebsd32_syscallnames[] = { ==== //depot/projects/nsched/sys/compat/freebsd32/freebsd32_sysent.c#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.29 2004/07/14 00:03:51 peter Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.40 2004/07/14 00:03:30 peter Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.30 2004/10/06 14:23:00 mtm Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.41 2004/10/06 14:20:57 mtm Exp */ #include "opt_compat.h" @@ -456,7 +456,7 @@ { 0, (sy_call_t *)nosys }, /* 428 = __acl_aclcheck_link */ { 0, (sy_call_t *)nosys }, /* 429 = sigwait */ { SYF_MPSAFE | AS(thr_create_args), (sy_call_t *)thr_create }, /* 430 = thr_create */ - { SYF_MPSAFE | 0, (sy_call_t *)thr_exit }, /* 431 = thr_exit */ + { SYF_MPSAFE | AS(thr_exit_args), (sy_call_t *)thr_exit }, /* 431 = thr_exit */ { SYF_MPSAFE | AS(thr_self_args), (sy_call_t *)thr_self }, /* 432 = thr_self */ { SYF_MPSAFE | AS(thr_kill_args), (sy_call_t *)thr_kill }, /* 433 = thr_kill */ { SYF_MPSAFE | AS(_umtx_lock_args), (sy_call_t *)_umtx_lock }, /* 434 = _umtx_lock */ ==== //depot/projects/nsched/sys/compat/freebsd32/syscalls.master#5 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.40 2004/07/14 00:03:30 peter Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.41 2004/10/06 14:20:57 mtm Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -596,7 +596,7 @@ ; XXX implement 429 UNIMPL sigwait 430 MNOPROTO { int thr_create(ucontext_t *ctx, long *id, int flag s); } -431 MNOPROTO { void thr_exit(void); } +431 MNOPROTO { void thr_exit(long *state); } 432 MNOPROTO { int thr_self(long *id); } 433 MNOPROTO { int thr_kill(long id, int sig); } 434 MNOPROTO { int _umtx_lock(struct umtx *umtx); } ==== //depot/projects/nsched/sys/compat/linux/linux_util.h#3 (text+ko) ==== @@ -28,7 +28,7 @@ * >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Oct 21 15:55:35 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F05916A4D0; Thu, 21 Oct 2004 15:55:35 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5863B16A4CE for ; Thu, 21 Oct 2004 15:55:35 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1A81C43D45 for ; Thu, 21 Oct 2004 15:55:35 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9LFtZZT048907 for ; Thu, 21 Oct 2004 15:55:35 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9LFtYmY048903 for perforce@freebsd.org; Thu, 21 Oct 2004 15:55:34 GMT (envelope-from jhb@freebsd.org) Date: Thu, 21 Oct 2004 15:55:34 GMT Message-Id: <200410211555.i9LFtYmY048903@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 63472 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Oct 2004 15:55:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=63472 Change 63472 by jhb@jhb_slimer on 2004/10/21 15:55:18 IFC @63467. Working if_de(4), compilable LINT, etc. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/promcons.c#21 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_misc.c#32 integrate .. //depot/projects/smpng/sys/alpha/tlsb/zs_tlsb.c#18 integrate .. //depot/projects/smpng/sys/amd64/amd64/nexus.c#14 integrate .. //depot/projects/smpng/sys/arm/arm/busdma_machdep.c#5 integrate .. //depot/projects/smpng/sys/boot/common/help.common#16 integrate .. //depot/projects/smpng/sys/boot/common/loader.8#31 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/ahc_isa.c#3 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.c#21 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.h#12 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#64 integrate .. //depot/projects/smpng/sys/dev/ata/ata-card.c#21 integrate .. //depot/projects/smpng/sys/dev/ata/ata-queue.c#22 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#47 integrate .. //depot/projects/smpng/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/smpng/sys/dev/digi/digi.c#27 integrate .. //depot/projects/smpng/sys/dev/digi/digi.h#10 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_pccard.c#24 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#38 integrate .. //depot/projects/smpng/sys/dev/ex/if_ex.c#14 integrate .. //depot/projects/smpng/sys/dev/fdc/fdc.c#12 integrate .. //depot/projects/smpng/sys/dev/hifn/hifn7751.c#18 integrate .. //depot/projects/smpng/sys/dev/hifn/hifn7751var.h#5 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#20 integrate .. //depot/projects/smpng/sys/dev/nmdm/nmdm.c#23 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_console.c#21 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#43 integrate .. //depot/projects/smpng/sys/dev/random/harvest.c#10 integrate .. //depot/projects/smpng/sys/dev/sio/sio_pci.c#14 integrate .. //depot/projects/smpng/sys/dev/sound/isa/mss.c#20 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/buffer.c#12 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.c#44 integrate .. //depot/projects/smpng/sys/dev/syscons/sysmouse.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/ubsa.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#64 integrate .. //depot/projects/smpng/sys/dev/zs/zs.c#19 integrate .. //depot/projects/smpng/sys/geom/label/g_label.c#7 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror.c#10 integrate .. //depot/projects/smpng/sys/i386/bios/apm.c#9 integrate .. //depot/projects/smpng/sys/i386/i386/nexus.c#16 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#54 integrate .. //depot/projects/smpng/sys/i386/isa/npx.c#43 integrate .. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_drv.c#16 integrate .. //depot/projects/smpng/sys/ia64/ia64/nexus.c#8 integrate .. //depot/projects/smpng/sys/ia64/ia64/ssc.c#15 integrate .. //depot/projects/smpng/sys/isa/atkbdc_isa.c#10 integrate .. //depot/projects/smpng/sys/isa/isahint.c#4 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#70 integrate .. //depot/projects/smpng/sys/kern/kern_event.c#34 integrate .. //depot/projects/smpng/sys/kern/kern_switch.c#49 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#84 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#42 integrate .. //depot/projects/smpng/sys/kern/subr_kdb.c#7 integrate .. //depot/projects/smpng/sys/kern/tty.c#51 integrate .. //depot/projects/smpng/sys/kern/tty_pty.c#35 integrate .. //depot/projects/smpng/sys/kern/uipc_domain.c#10 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#59 integrate .. //depot/projects/smpng/sys/kern/uipc_socket2.c#37 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#60 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#41 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#86 integrate .. //depot/projects/smpng/sys/modules/ipdivert/Makefile#1 branch .. //depot/projects/smpng/sys/modules/netgraph/device/Makefile#2 integrate .. //depot/projects/smpng/sys/net/if.c#56 integrate .. //depot/projects/smpng/sys/net/if_var.h#31 integrate .. //depot/projects/smpng/sys/net/raw_cb.c#10 integrate .. //depot/projects/smpng/sys/net/raw_usrreq.c#17 integrate .. //depot/projects/smpng/sys/netatalk/ddp_pcb.c#4 integrate .. //depot/projects/smpng/sys/netatm/atm_socket.c#12 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#14 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#12 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#11 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#7 integrate .. //depot/projects/smpng/sys/netgraph/ng_device.c#9 integrate .. //depot/projects/smpng/sys/netgraph/ng_device.h#4 integrate .. //depot/projects/smpng/sys/netinet/in.h#28 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#50 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#33 integrate .. //depot/projects/smpng/sys/netinet/in_proto.c#17 integrate .. //depot/projects/smpng/sys/netinet/in_var.h#12 integrate .. //depot/projects/smpng/sys/netinet/ip_divert.c#39 integrate .. //depot/projects/smpng/sys/netinet/ip_divert.h#2 integrate .. //depot/projects/smpng/sys/netinet/ip_fastfwd.c#12 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#43 integrate .. //depot/projects/smpng/sys/netinet/ip_fw_pfil.c#6 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#60 integrate .. //depot/projects/smpng/sys/netinet/ip_var.h#26 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#56 integrate .. //depot/projects/smpng/sys/netinet6/in6_pcb.c#35 integrate .. //depot/projects/smpng/sys/netinet6/ip6_input.c#37 integrate .. //depot/projects/smpng/sys/netipx/ipx_pcb.c#12 integrate .. //depot/projects/smpng/sys/netipx/ipx_usrreq.c#15 integrate .. //depot/projects/smpng/sys/netnatm/natm.c#20 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#40 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_serv.c#35 integrate .. //depot/projects/smpng/sys/pc98/pc98/fd.c#38 integrate .. //depot/projects/smpng/sys/pc98/pc98/sio.c#49 integrate .. //depot/projects/smpng/sys/pci/if_de.c#21 integrate .. //depot/projects/smpng/sys/pci/if_vr.c#31 integrate .. //depot/projects/smpng/sys/security/mac_bsdextended/mac_bsdextended.c#13 integrate .. //depot/projects/smpng/sys/security/mac_bsdextended/mac_bsdextended.h#4 integrate .. //depot/projects/smpng/sys/sys/bufobj.h#1 branch .. //depot/projects/smpng/sys/sys/proc.h#132 integrate .. //depot/projects/smpng/sys/sys/protosw.h#12 integrate .. //depot/projects/smpng/sys/sys/socketvar.h#41 integrate .. //depot/projects/smpng/sys/sys/tty.h#18 integrate .. //depot/projects/smpng/sys/sys/ttydefaults.h#5 integrate .. //depot/projects/smpng/sys/sys/vnode.h#49 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_alloc.c#30 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_balloc.c#13 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#34 integrate .. //depot/projects/smpng/sys/ufs/ufs/dinode.h#7 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#42 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#57 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/promcons.c#21 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.41 2004/09/17 11:02:53 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.43 2004/10/20 16:22:53 jhb Exp $"); #include #include @@ -107,12 +107,7 @@ tp->t_dev = dev; if ((tp->t_state & TS_ISOPEN) == 0) { tp->t_state |= TS_CARR_ON; - ttychars(tp); - tp->t_iflag = TTYDEF_IFLAG; - tp->t_oflag = TTYDEF_OFLAG; - tp->t_cflag = TTYDEF_CFLAG|CLOCAL; - tp->t_lflag = TTYDEF_LFLAG; - tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED; + ttyconsolemode(tp, 0); ttsetwater(tp); setuptimeout = 1; ==== //depot/projects/smpng/sys/alpha/osf1/osf1_misc.c#32 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.49 2004/10/05 18:51:09 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.50 2004/10/14 10:43:47 phk Exp $"); #include #include @@ -1772,7 +1772,7 @@ name[1] = KERN_HOSTNAME; mtx_lock(&Giant); retval = userland_sysctl(td, name, 2, uap->buf, &len, - 1, 0, 0, &bytes); + 1, 0, 0, &bytes, 0); mtx_unlock(&Giant); td->td_retval[0] = bytes; return(retval); ==== //depot/projects/smpng/sys/alpha/tlsb/zs_tlsb.c#18 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.48 2004/09/17 11:04:57 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.49 2004/10/18 21:51:24 phk Exp $"); #include #include @@ -283,12 +283,7 @@ tp = dev->si_tty; if ((tp->t_state & TS_ISOPEN) == 0) { tp->t_state |= TS_CARR_ON; - ttychars(tp); - tp->t_iflag = TTYDEF_IFLAG; - tp->t_oflag = TTYDEF_OFLAG; - tp->t_cflag = TTYDEF_CFLAG|CLOCAL; - tp->t_lflag = TTYDEF_LFLAG; - tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED; + ttyconsolemode(tp, 0); ttsetwater(tp); setuptimeout = 1; } else if ((tp->t_state & TS_XCLUDE) && suser(td)) { ==== //depot/projects/smpng/sys/amd64/amd64/nexus.c#14 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.63 2004/08/24 19:22:54 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.64 2004/10/14 22:36:47 njl Exp $"); /* * This code implements a `root nexus' for Intel Architecture @@ -259,6 +259,8 @@ retval += bus_print_child_header(bus, child); retval += nexus_print_all_resources(child); + if (device_get_flags(child)) + retval += printf(" flags %#x", device_get_flags(child)); retval += printf(" on motherboard\n"); /* XXX "motherboard", ick */ return (retval); ==== //depot/projects/smpng/sys/arm/arm/busdma_machdep.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.4 2004/09/23 21:57:47 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.5 2004/10/21 11:59:33 cognet Exp $"); /* * MacPPC bus dma support routines @@ -687,7 +687,7 @@ int resid; struct iovec *iov; - if (op == BUS_DMASYNC_POSTREAD) + if (op == BUS_DMASYNC_POSTWRITE) return; if (map->flags & DMAMAP_COHERENT) return; ==== //depot/projects/smpng/sys/boot/common/help.common#16 (text+ko) ==== @@ -311,6 +311,18 @@ this option provides a hint as to the actual size of system memory (which will be tested before use). + set hw.{acpi,pci}.host_start_mem= + + Sets the lowest address that the pci code will assign + when it doesn't have other information about the address + to assign (like from a pci bridge). This is only useful + in older systems without a pci bridge. Also, it only + impacts devices that the BIOS doesn't assign to, typically + CardBus bridges. The default is 0x80000000, but + some systems need values like 0xf0000000, 0xfc000000 or + 0xfe000000 may be suitable for older systems (the older + the system, the higher the number typically should be). + set hw.pci.enable_io_modes= Enable PCI resources which are left off by some BIOSes ==== //depot/projects/smpng/sys/boot/common/loader.8#31 (text+ko) ==== @@ -22,9 +22,9 @@ .\" 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.74 2004/10/01 00:15:13 ru Exp $ +.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.76 2004/10/15 06:44:13 ru Exp $ .\" -.Dd October 1, 2004 +.Dd October 15, 2004 .Dt LOADER 8 .Os .Sh NAME @@ -429,6 +429,15 @@ respectively. An invalid suffix will result in the variable being ignored by the kernel. +.It Va hw.pci.host_start_mem , hw.acpi.host_start_mem +When not otherwise constrained, this limits the memory start +address. +The default is 0x80000000 and should be set to at least size of the +memory and not conflict with other resources. +Typically, only systems without PCI bridges need to set this variable +since PCI bridges typically constrain the memory starting address +(and the variable is only used when bridges do not constrain this +address). .It Va hw.pci.enable_io_modes Enable PCI resources which are left off by some BIOSes or are not enabled correctly by the device driver. ==== //depot/projects/smpng/sys/dev/aic7xxx/ahc_isa.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/ahc_isa.c,v 1.4 2004/08/30 20:15:42 gibbs Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/ahc_isa.c,v 1.5 2004/10/15 23:39:52 gibbs Exp $"); #include @@ -137,11 +137,15 @@ int error; int zero; - error = ENODEV; + error = ENXIO; zero = 0; regs = NULL; irq = NULL; + /* Skip probes for ISA PnP devices */ + if (isa_get_logicalid(dev) != 0) + return (error); + regs = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &zero, RF_ACTIVE); if (regs == NULL) { device_printf(dev, "No resources allocated.\n"); ==== //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.c#21 (text+ko) ==== @@ -46,7 +46,7 @@ #include "aicasm/aicasm_insformat.h" #else #include -__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic7xxx.c,v 1.102 2004/08/17 00:14:30 gibbs Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic7xxx.c,v 1.103 2004/10/19 20:48:05 gibbs Exp $"); #include #include #include @@ -2828,11 +2828,17 @@ case MSG_TYPE_TARGET_MSGIN: { int msgdone; - int msgout_request; if (ahc->msgout_len == 0) panic("Target MSGIN with no active message"); +#ifdef AHC_DEBUG + if ((ahc_debug & AHC_SHOW_MESSAGES) != 0) { + ahc_print_devinfo(ahc, &devinfo); + printf("TARGET_MSG_IN"); + } +#endif + /* * If we interrupted a mesgout session, the initiator * will not know this until our first REQ. So, we @@ -2840,24 +2846,47 @@ * first byte. */ if ((ahc_inb(ahc, SCSISIGI) & ATNI) != 0 - && ahc->msgout_index > 0) - msgout_request = TRUE; - else - msgout_request = FALSE; + && ahc->msgout_index > 0) { + + /* + * Change gears and see if this messages is + * of interest to us or should be passed back + * to the sequencer. + */ +#ifdef AHC_DEBUG + if ((ahc_debug & AHC_SHOW_MESSAGES) != 0) + printf(" Honoring ATN Request.\n"); +#endif + ahc->msg_type = MSG_TYPE_TARGET_MSGOUT; - if (msgout_request) { + /* + * Disable SCSI Programmed I/O during the + * phase change so as to avoid phantom REQs. + */ + ahc_outb(ahc, SXFRCTL0, + ahc_inb(ahc, SXFRCTL0) & ~SPIOEN); /* - * Change gears and see if - * this messages is of interest to - * us or should be passed back to - * the sequencer. + * Since SPIORDY asserts when ACK is asserted + * for P_MSGOUT, and SPIORDY's assertion triggered + * our entry into this routine, wait for ACK to + * *de-assert* before changing phases. */ - ahc->msg_type = MSG_TYPE_TARGET_MSGOUT; + while ((ahc_inb(ahc, SCSISIGI) & ACKI) != 0) + ; + ahc_outb(ahc, SCSISIGO, P_MESGOUT | BSYO); + + /* + * All phase line changes require a bus + * settle delay before REQ is asserted. + * [SCSI SPI4 10.7.1] + */ + ahc_flush_device_writes(ahc); + aic_delay(AHC_BUSSETTLE_DELAY); + ahc->msgin_index = 0; - /* Dummy read to REQ for first byte */ - ahc_inb(ahc, SCSIDATL); + /* Enable SCSI Programmed I/O to REQ for first byte */ ahc_outb(ahc, SXFRCTL0, ahc_inb(ahc, SXFRCTL0) | SPIOEN); break; @@ -2874,6 +2903,11 @@ /* * Present the next byte on the bus. */ +#ifdef AHC_DEBUG + if ((ahc_debug & AHC_SHOW_MESSAGES) != 0) + printf(" byte 0x%x\n", + ahc->msgout_buf[ahc->msgout_index]); +#endif ahc_outb(ahc, SXFRCTL0, ahc_inb(ahc, SXFRCTL0) | SPIOEN); ahc_outb(ahc, SCSIDATL, ahc->msgout_buf[ahc->msgout_index++]); break; @@ -2883,6 +2917,12 @@ int lastbyte; int msgdone; +#ifdef AHC_DEBUG + if ((ahc_debug & AHC_SHOW_MESSAGES) != 0) { + ahc_print_devinfo(ahc, &devinfo); + printf("TARGET_MSG_OUT"); + } +#endif /* * The initiator signals that this is * the last byte by dropping ATN. @@ -2896,6 +2936,13 @@ */ ahc_outb(ahc, SXFRCTL0, ahc_inb(ahc, SXFRCTL0) & ~SPIOEN); ahc->msgin_buf[ahc->msgin_index] = ahc_inb(ahc, SCSIDATL); + +#ifdef AHC_DEBUG + if ((ahc_debug & AHC_SHOW_MESSAGES) != 0) + printf(" byte 0x%x\n", + ahc->msgin_buf[ahc->msgin_index]); +#endif + msgdone = ahc_parse_msg(ahc, &devinfo); if (msgdone == MSGLOOP_TERMINATED) { /* @@ -2921,7 +2968,33 @@ * to the Message in phase and send it. */ if (ahc->msgout_len != 0) { +#ifdef AHC_DEBUG + if ((ahc_debug & AHC_SHOW_MESSAGES) != 0) { + ahc_print_devinfo(ahc, &devinfo); + printf(" preparing response.\n"); + } +#endif ahc_outb(ahc, SCSISIGO, P_MESGIN | BSYO); + + /* + * All phase line changes require a bus + * settle delay before REQ is asserted. + * [SCSI SPI4 10.7.1] When transitioning + * from an OUT to an IN phase, we must + * also wait a data release delay to allow + * the initiator time to release the data + * lines. [SCSI SPI4 10.12] + */ + ahc_flush_device_writes(ahc); + aic_delay(AHC_BUSSETTLE_DELAY + + AHC_DATARELEASE_DELAY); + + /* + * Enable SCSI Programmed I/O. This will + * immediately cause SPIORDY to assert, + * and the sequencer will call our message + * loop again. + */ ahc_outb(ahc, SXFRCTL0, ahc_inb(ahc, SXFRCTL0) | SPIOEN); ahc->msg_type = MSG_TYPE_TARGET_MSGIN; @@ -7052,7 +7125,7 @@ active_scb = ahc_lookup_scb(ahc, active_scb_index); if (active_scb != scb) { if (ahc_other_scb_timeout(ahc, scb, - active_scb) != 0) + active_scb) == 0) goto bus_reset; continue; } ==== //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.h#12 (text+ko) ==== @@ -39,7 +39,7 @@ * * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.h#85 $ * - * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.h,v 1.52 2004/08/18 16:31:56 gibbs Exp $ + * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.h,v 1.53 2004/10/19 20:48:06 gibbs Exp $ */ #ifndef _AIC7XXX_H_ @@ -181,6 +181,10 @@ /* Reset line assertion time in us */ #define AHC_BUSRESET_DELAY 25 +/* Phase change constants used in target mode. */ +#define AHC_BUSSETTLE_DELAY 400 +#define AHC_DATARELEASE_DELAY 400 + /******************* Chip Characteristics/Operating Settings *****************/ /* * Chip Type ==== //depot/projects/smpng/sys/dev/ata/ata-all.c#64 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.232 2004/10/13 15:16:35 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.233 2004/10/19 20:13:38 sos Exp $"); #include "opt_ata.h" #include @@ -306,6 +306,12 @@ } } + ch->flags &= ~ATA_IMMEDIATE_MODE; + mtx_lock(&ch->state_mtx); + ch->state = ATA_IDLE; + mtx_unlock(&ch->state_mtx); + ch->locking(ch, ATA_LF_UNLOCK); + /* attach new devices */ if ((newdev = ~devices & ch->devices)) { if ((newdev & (ATA_ATA_MASTER | ATA_ATAPI_MASTER)) && @@ -323,12 +329,6 @@ if (bootverbose) ata_printf(ch, -1, "device config done ..\n"); - ch->flags &= ~ATA_IMMEDIATE_MODE; - mtx_lock(&ch->state_mtx); - ch->state = ATA_IDLE; - mtx_unlock(&ch->state_mtx); - ch->locking(ch, ATA_LF_UNLOCK); - ata_start(ch); return 0; } @@ -337,19 +337,19 @@ ata_suspend(device_t dev) { struct ata_channel *ch; - int gotit = 0; if (!dev || !(ch = device_get_softc(dev))) return ENXIO; - while (!gotit) { + while (1) { mtx_lock(&ch->state_mtx); if (ch->state == ATA_IDLE) { ch->state = ATA_ACTIVE; - gotit = 1; + mtx_unlock(&ch->state_mtx); + break; } mtx_unlock(&ch->state_mtx); - tsleep(&gotit, PRIBIO, "atasusp", hz/10); + tsleep(ch, PRIBIO, "atasusp", hz/10); } ch->locking(ch, ATA_LF_UNLOCK); return 0; ==== //depot/projects/smpng/sys/dev/ata/ata-card.c#21 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-card.c,v 1.26 2004/10/06 19:46:07 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-card.c,v 1.27 2004/10/19 10:29:00 le Exp $"); #include #include @@ -91,7 +91,7 @@ static int ata_pccard_locknoop(struct ata_channel *ch, int type) { - return 1; + return ch->unit; } static void ==== //depot/projects/smpng/sys/dev/ata/ata-queue.c#22 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.37 2004/10/13 15:16:35 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.39 2004/10/20 10:11:05 sos Exp $"); #include "opt_ata.h" #include @@ -182,15 +182,13 @@ /* check for the right state */ mtx_lock(&ch->state_mtx); if (ch->state == ATA_IDLE) { + ATA_DEBUG_RQ(request, "starting"); TAILQ_REMOVE(&ch->ata_queue, request, chain); ch->running = request; - - ATA_DEBUG_RQ(request, "starting"); - + ch->state = ATA_ACTIVE; if (!dumping) callout_reset(&request->callout, request->timeout * hz, (timeout_t*)ata_timeout, request); - if (ch->hw.begin_transaction(request) == ATA_OP_FINISHED) { ch->running = NULL; ch->state = ATA_IDLE; @@ -200,8 +198,6 @@ ata_finish(request); return; } - else - ch->state = ATA_ACTIVE; } mtx_unlock(&ch->state_mtx); } @@ -242,14 +238,11 @@ /* if we had a timeout, reinit channel and deal with the falldown */ if (request->flags & ATA_R_TIMEOUT) { - int error = ata_reinit(ch); - - /* if our device disappeared return as cleanup was done already */ - if (!request->device->param) - return; - - /* if reinit succeeded and retries still permit, reinject request */ - if (!error && request->retries-- > 0) { + /* + * if reinit succeeds, retries still permit and device didn't + * get removed by the reinit, reinject request + */ + if (ata_reinit(ch) && request->retries-- > 0 && request->device->param){ request->flags &= ~(ATA_R_TIMEOUT | ATA_R_DEBUG); request->flags |= (ATA_R_IMMEDIATE | ATA_R_REQUEUE); ATA_DEBUG_RQ(request, "completed reinject"); ==== //depot/projects/smpng/sys/dev/bge/if_bge.c#47 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.75 2004/09/25 05:07:20 ps Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.76 2004/10/19 02:42:49 scottl Exp $"); /* * Broadcom BCM570x family gigabit ethernet driver for FreeBSD. @@ -1935,7 +1935,7 @@ * Create tag for RX mbufs. */ nseg = 32; - error = bus_dma_tag_create(sc->bge_cdata.bge_parent_tag, ETHER_ALIGN, + error = bus_dma_tag_create(sc->bge_cdata.bge_parent_tag, 1, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, MCLBYTES * nseg, nseg, MCLBYTES, 0, NULL, NULL, &sc->bge_cdata.bge_mtag); @@ -2024,7 +2024,7 @@ */ error = bus_dma_tag_create(sc->bge_cdata.bge_parent_tag, - ETHER_ALIGN, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, + 1, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, MCLBYTES * nseg, nseg, BGE_JLEN, 0, NULL, NULL, &sc->bge_cdata.bge_mtag_jumbo); ==== //depot/projects/smpng/sys/dev/dcons/dcons_os.c#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/dcons/dcons_os.c,v 1.1 2004/10/13 05:38:42 simokawa Exp $ + * $FreeBSD: src/sys/dev/dcons/dcons_os.c,v 1.3 2004/10/18 21:51:25 phk Exp $ */ #include @@ -294,12 +294,7 @@ s = spltty(); if ((tp->t_state & TS_ISOPEN) == 0) { tp->t_state |= TS_CARR_ON; - ttychars(tp); - tp->t_iflag = TTYDEF_IFLAG; - tp->t_oflag = TTYDEF_OFLAG; - tp->t_cflag = TTYDEF_CFLAG|CLOCAL; - tp->t_lflag = TTYDEF_LFLAG; - tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED; + ttyconsolemode(tp, 0); ttsetwater(tp); } else if ((tp->t_state & TS_XCLUDE) && suser(td)) { splx(s); @@ -493,7 +488,9 @@ static int dcons_drv_init(int stage) { +#ifdef __i386__ int addr, size; +#endif if (drv_init) return(drv_init); ==== //depot/projects/smpng/sys/dev/digi/digi.c#27 (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/digi/digi.c,v 1.56 2004/10/06 20:01:49 phk Exp $ + * $FreeBSD: src/sys/dev/digi/digi.c,v 1.57 2004/10/18 21:51:25 phk Exp $ */ /*- @@ -85,9 +85,6 @@ fepcmd(port, cmd, (op2 << 8) | op1, ncmds) #define fepcmd_w fepcmd - -static speed_t digidefaultrate = TTYDEF_SPEED; - struct con_bios { struct con_bios *next; u_char *bios; @@ -589,19 +586,7 @@ bc->edelay = 100; - /* - * We don't use all the flags from since - * they are only relevant for logins. It's important to have - * echo off initially so that the line doesn't start blathering - * before the echo flag can be turned off. - */ - tp->t_init_in.c_iflag = 0; - tp->t_init_in.c_oflag = 0; - tp->t_init_in.c_cflag = TTYDEF_CFLAG; - tp->t_init_in.c_lflag = 0; - termioschars(&tp->t_init_in); - tp->t_init_in.c_ispeed = tp->t_init_in.c_ospeed = digidefaultrate; - tp->t_init_out = tp->t_init_in; + ttyinitmode(tp, 0, 0); port->send_ring = 1; /* Default action on signal RI */ ttycreate(tp, NULL, 0, MINOR_CALLOUT, "D%r%r", sc->res.unit, i); } ==== //depot/projects/smpng/sys/dev/digi/digi.h#10 (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/digi/digi.h,v 1.18 2004/10/06 20:01:49 phk Exp $ + * $FreeBSD: src/sys/dev/digi/digi.h,v 1.19 2004/10/14 18:37:59 phk Exp $ */ #define W(p) (*(u_int16_t *)(p)) @@ -163,7 +163,6 @@ #endif struct digi_p *ports; /* pointer to array of port descriptors */ - struct tty *ttys; /* pointer to array of TTY structures */ volatile struct global_data *gdata; u_char window; /* saved window */ int win_size; ==== //depot/projects/smpng/sys/dev/ed/if_ed_pccard.c#24 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ed/if_ed_pccard.c,v 1.59 2004/07/21 20:38:12 imp Exp $ + * $FreeBSD: src/sys/dev/ed/if_ed_pccard.c,v 1.60 2004/10/20 04:54:50 imp Exp $ */ #include "opt_ed.h" @@ -123,6 +123,7 @@ #define NE2000DVF_AX88190 0x0002 /* chip is ASIX AX88190 */ } ed_pccard_products[] = { { PCMCIA_CARD(ACCTON, EN2212, 0), 0}, + { PCMCIA_CARD(ACCTON, EN2216, 0), 0}, { PCMCIA_CARD(ALLIEDTELESIS, LA_PCM, 0), 0}, { PCMCIA_CARD(AMBICOM, AMB8002T, 0), 0}, { PCMCIA_CARD(BILLIONTON, LNT10TN, 0), 0}, ==== //depot/projects/smpng/sys/dev/em/if_em.c#38 (text+ko) ==== @@ -31,7 +31,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.47 2004/10/09 07:27:03 scottl Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.50 2004/10/19 23:31:44 mux Exp $*/ #include @@ -1339,6 +1339,8 @@ * Advance the Transmit Descriptor Tail (Tdt), this tells the E1000 * that this frame is available to transmit. */ + bus_dmamap_sync(adapter->txdma.dma_tag, adapter->txdma.dma_map, + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); if (adapter->hw.mac_type == em_82547 && adapter->link_duplex == HALF_DUPLEX) { em_82547_move_tail_locked(adapter); @@ -2056,13 +2058,6 @@ goto fail_0; } - r = bus_dmamap_create(dma->dma_tag, BUS_DMA_NOWAIT, &dma->dma_map); - if (r != 0) { - printf("em%d: em_dma_malloc: bus_dmamap_create failed; " - "error %u\n", adapter->unit, r); - goto fail_1; - } - r = bus_dmamem_alloc(dma->dma_tag, (void**) &dma->dma_vaddr, BUS_DMA_NOWAIT, &dma->dma_map); if (r != 0) { @@ -2090,8 +2085,6 @@ bus_dmamap_unload(dma->dma_tag, dma->dma_map); fail_2: bus_dmamem_free(dma->dma_tag, dma->dma_vaddr, dma->dma_map); -fail_1: - bus_dmamap_destroy(dma->dma_tag, dma->dma_map); bus_dma_tag_destroy(dma->dma_tag); fail_0: dma->dma_map = NULL; @@ -2104,7 +2097,6 @@ { bus_dmamap_unload(dma->dma_tag, dma->dma_map); bus_dmamem_free(dma->dma_tag, dma->dma_vaddr, dma->dma_map); - bus_dmamap_destroy(dma->dma_tag, dma->dma_map); bus_dma_tag_destroy(dma->dma_tag); } @@ -2145,7 +2137,7 @@ * Setup DMA descriptor areas. */ if (bus_dma_tag_create(NULL, /* parent */ - PAGE_SIZE, 0, /* alignment, bounds */ + 1, 0, /* alignment, bounds */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ @@ -2400,6 +2392,8 @@ tx_buffer = &adapter->tx_buffer_area[i]; tx_desc = &adapter->tx_desc_base[i]; + bus_dmamap_sync(adapter->txdma.dma_tag, adapter->txdma.dma_map, + BUS_DMASYNC_POSTREAD); while (tx_desc->upper.fields.status & E1000_TXD_STAT_DD) { tx_desc->upper.data = 0; @@ -2407,8 +2401,6 @@ if (tx_buffer->m_head) { ifp->if_opackets++; - bus_dmamap_sync(adapter->txtag, tx_buffer->map, - BUS_DMASYNC_POSTWRITE); bus_dmamap_unload(adapter->txtag, tx_buffer->map); bus_dmamap_destroy(adapter->txtag, tx_buffer->map); @@ -2422,6 +2414,8 @@ tx_buffer = &adapter->tx_buffer_area[i]; tx_desc = &adapter->tx_desc_base[i]; } + bus_dmamap_sync(adapter->txdma.dma_tag, adapter->txdma.dma_map, + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); adapter->oldest_used_tx_desc = i; @@ -2523,7 +2517,7 @@ sizeof(struct em_buffer) * adapter->num_rx_desc); error = bus_dma_tag_create(NULL, /* parent */ - PAGE_SIZE, 0, /* alignment, bounds */ + 1, 0, /* alignment, bounds */ BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ @@ -2561,6 +2555,8 @@ return(error); } } + bus_dmamap_sync(adapter->rxdma.dma_tag, adapter->rxdma.dma_map, + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); return(0); @@ -2746,6 +2742,8 @@ ifp = &adapter->interface_data.ac_if; i = adapter->next_rx_desc_to_check; current_desc = &adapter->rx_desc_base[i]; + bus_dmamap_sync(adapter->rxdma.dma_tag, adapter->rxdma.dma_map, + BUS_DMASYNC_POSTREAD); if (!((current_desc->status) & E1000_RXD_STAT_DD)) { #ifdef DBG_STATS @@ -2893,6 +2891,8 @@ } else current_desc++; } + bus_dmamap_sync(adapter->rxdma.dma_tag, adapter->rxdma.dma_map, + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); adapter->next_rx_desc_to_check = i; return; } ==== //depot/projects/smpng/sys/dev/ex/if_ex.c#14 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ex/if_ex.c,v 1.53 2004/08/13 23:06:55 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ex/if_ex.c,v 1.54 2004/10/17 21:44:11 glebius Exp $"); /* * Intel EtherExpress Pro/10, Pro/10+ Ethernet driver @@ -697,7 +697,7 @@ ipkt->m_len = MHLEN; while (pkt_len > 0) { - if (pkt_len > MINCLSIZE) { + if (pkt_len >= MINCLSIZE) { MCLGET(m, M_DONTWAIT); if (m->m_flags & M_EXT) { m->m_len = MCLBYTES; ==== //depot/projects/smpng/sys/dev/fdc/fdc.c#12 (text+ko) ==== @@ -51,7 +51,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc.c,v 1.296 2004/10/10 23:39:59 peadar Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc.c,v 1.298 2004/10/15 04:54:16 njl Exp $"); #include "opt_fdc.h" @@ -1682,7 +1682,6 @@ device_t fdc_add_child(device_t dev, const char *name, int unit) { - int flags; struct fdc_ivars *ivar; device_t child; @@ -1697,8 +1696,6 @@ device_set_ivars(child, ivar); ivar->fdunit = unit; ivar->fdtype = FDT_NONE; - if (resource_int_value(name, unit, "flags", &flags) == 0) - device_set_flags(child, flags); if (resource_disabled(name, unit)) device_disable(child); return (child); ==== //depot/projects/smpng/sys/dev/hifn/hifn7751.c#18 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/hifn/hifn7751.c,v 1.28 2004/07/04 16:11:01 stefanf Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hifn/hifn7751.c,v 1.30 2004/10/15 03:54:56 sam Exp $"); /* * Driver for various Hifn encryption processors. @@ -465,10 +465,9 @@ rbase = 'M'; rseg /= 1024; } - device_printf(sc->sc_dev, "%s, rev %u, %d%cB %cram, %u sessions\n", + device_printf(sc->sc_dev, "%s, rev %u, %d%cB %cram\n", hifn_partname(sc), rev, - rseg, rbase, sc->sc_drammodel ? 'd' : 's', >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Oct 21 16:02:45 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2096716A4D1; Thu, 21 Oct 2004 16:02:45 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BCF3416A4CE for ; Thu, 21 Oct 2004 16:02:44 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B1C4143D45 for ; Thu, 21 Oct 2004 16:02:44 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9LG2i13049259 for ; Thu, 21 Oct 2004 16:02:44 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9LG2iKO049256 for perforce@freebsd.org; Thu, 21 Oct 2004 16:02:44 GMT (envelope-from jhb@freebsd.org) Date: Thu, 21 Oct 2004 16:02:44 GMT Message-Id: <200410211602.i9LG2iKO049256@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 63474 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Oct 2004 16:02:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=63474 Change 63474 by jhb@jhb_slimer on 2004/10/21 16:02:18 Revert to CVS on this comment. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/local_apic.c#9 edit .. //depot/projects/smpng/sys/i386/i386/local_apic.c#14 edit Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/local_apic.c#9 (text+ko) ==== @@ -725,7 +725,7 @@ destfield = dest; } - /* Check for an earlier stuck IPI. */ + /* Wait for an earlier IPI to finish. */ if (!lapic_ipi_wait(BEFORE_SPIN)) panic("APIC: Previous IPI is stuck"); ==== //depot/projects/smpng/sys/i386/i386/local_apic.c#14 (text+ko) ==== @@ -725,7 +725,7 @@ destfield = dest; } - /* Check for an earlier stuck IPI. */ + /* Wait for an earlier IPI to finish. */ if (!lapic_ipi_wait(BEFORE_SPIN)) panic("APIC: Previous IPI is stuck"); From owner-p4-projects@FreeBSD.ORG Thu Oct 21 16:02:46 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A09216A4F6; Thu, 21 Oct 2004 16:02:45 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 19ADD16A4CF for ; Thu, 21 Oct 2004 16:02:45 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0B90043D31 for ; Thu, 21 Oct 2004 16:02:45 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9LG2ilW049267 for ; Thu, 21 Oct 2004 16:02:44 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9LG2iFv049263 for perforce@freebsd.org; Thu, 21 Oct 2004 16:02:44 GMT (envelope-from jhb@freebsd.org) Date: Thu, 21 Oct 2004 16:02:44 GMT Message-Id: <200410211602.i9LG2iFv049263@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 63475 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Oct 2004 16:02:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=63475 Change 63475 by jhb@jhb_slimer on 2004/10/21 16:02:43 Revert the taskqueue profiling stuff. Affected files ... .. //depot/projects/smpng/sys/kern/subr_taskqueue.c#23 edit .. //depot/projects/smpng/sys/sys/_task.h#5 edit Differences ... ==== //depot/projects/smpng/sys/kern/subr_taskqueue.c#23 (text+ko) ==== @@ -36,16 +36,9 @@ #include #include #include -#include #include -#include #include -int tq_in; -SYSCTL_INT(_kern, OID_AUTO, tq_in, CTLFLAG_RD, &tq_in, 0, ""); -int tq_out; -SYSCTL_INT(_kern, OID_AUTO, tq_out, CTLFLAG_RD, &tq_out, 0, ""); - static MALLOC_DEFINE(M_TASKQUEUE, "taskqueue", "Task Queues"); static void *taskqueue_giant_ih; static void *taskqueue_ih; @@ -147,9 +140,6 @@ return 0; } - getnanotime(&task->ta_queuetime); - tq_in++; - /* * Optimise the case when all tasks have the same priority. */ @@ -182,7 +172,6 @@ taskqueue_run(struct taskqueue *queue) { struct task *task; - struct timespec tv; int owned, pending; owned = mtx_owned(&queue->tq_mutex); @@ -198,15 +187,7 @@ pending = task->ta_pending; task->ta_pending = 0; task->ta_flags |= TAF_PENDING; - tq_out++; - getnanotime(&tv); - timespecsub(&tv, &task->ta_queuetime); mtx_unlock(&queue->tq_mutex); - if (tv.tv_nsec >= 0500000000) { - printf("taskqueue_run: warning, queue time of %d.%09ld " - "for context %p\n", tv.tv_sec, tv.tv_nsec, - task->ta_func); - } task->ta_func(task->ta_context, pending); ==== //depot/projects/smpng/sys/sys/_task.h#5 (text+ko) ==== @@ -46,7 +46,6 @@ task_fn_t *ta_func; /* task handler */ void *ta_context; /* argument for handler */ int ta_flags; /* Flags */ - struct timespec ta_queuetime; /* time enqueued */ }; #define TAF_PENDING 0x1 /* Task is being run now */ From owner-p4-projects@FreeBSD.ORG Thu Oct 21 16:03:47 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 019AA16A4D0; Thu, 21 Oct 2004 16:03:46 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CFC4816A4CE for ; Thu, 21 Oct 2004 16:03:46 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A918B43D1F for ; Thu, 21 Oct 2004 16:03:46 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9LG3kid049298 for ; Thu, 21 Oct 2004 16:03:46 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9LG3kPs049295 for perforce@freebsd.org; Thu, 21 Oct 2004 16:03:46 GMT (envelope-from jhb@freebsd.org) Date: Thu, 21 Oct 2004 16:03:46 GMT Message-Id: <200410211603.i9LG3kPs049295@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 63476 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Oct 2004 16:03:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=63476 Change 63476 by jhb@jhb_slimer on 2004/10/21 16:03:32 Remove Giant assertions. Affected files ... .. //depot/projects/smpng/sys/pci/if_de.c#22 edit Differences ... ==== //depot/projects/smpng/sys/pci/if_de.c#22 (text+ko) ==== @@ -145,7 +145,6 @@ tulip_softc_t * const sc = arg; int s = splimp(); - mtx_assert(&Giant, MA_OWNED); TULIP_PERFSTART(timeout) sc->tulip_flags &= ~TULIP_TIMEOUTPENDING; @@ -160,7 +159,6 @@ tulip_timeout( tulip_softc_t * const sc) { - mtx_assert(&Giant, MA_OWNED); if (sc->tulip_flags & TULIP_TIMEOUTPENDING) return; sc->tulip_flags |= TULIP_TIMEOUTPENDING; @@ -175,7 +173,6 @@ tulip_softc_t * const sc = arg; int s = splimp(); - mtx_assert(&Giant, MA_OWNED); sc->tulip_flags &= ~TULIP_FASTTIMEOUTPENDING; (sc->tulip_boardsw->bd_media_poll)(sc, TULIP_MEDIAPOLL_FASTTIMER); splx(s); @@ -185,7 +182,6 @@ tulip_fasttimeout( tulip_softc_t * const sc) { - mtx_assert(&Giant, MA_OWNED); if (sc->tulip_flags & TULIP_FASTTIMEOUTPENDING) return; sc->tulip_flags |= TULIP_FASTTIMEOUTPENDING; @@ -198,8 +194,6 @@ tulip_softc_t * const sc) { struct mbuf *m; - - mtx_assert(&Giant, MA_OWNED); /* * Before we are sure this is the right media we need * to send a small packet to make sure there's carrier. @@ -247,7 +241,6 @@ { const tulip_media_info_t *mi = sc->tulip_mediums[media]; - mtx_assert(&Giant, MA_OWNED); if (mi == NULL) return; @@ -340,8 +333,6 @@ tulip_softc_t * const sc, tulip_media_t media) { - - mtx_assert(&Giant, MA_OWNED); if ((sc->tulip_flags & TULIP_LINKUP) == 0) sc->tulip_flags |= TULIP_PRINTLINKUP; sc->tulip_flags |= TULIP_LINKUP; @@ -395,8 +386,6 @@ tulip_media_print( tulip_softc_t * const sc) { - - mtx_assert(&Giant, MA_OWNED); if ((sc->tulip_flags & TULIP_LINKUP) == 0) return; if (sc->tulip_flags & TULIP_PRINTMEDIA) { @@ -419,7 +408,6 @@ tulip_media_t last_media = TULIP_MEDIA_UNKNOWN; tulip_media_t media; - mtx_assert(&Giant, MA_OWNED); /* * If one of the media blocks contained a default media flag, * use that. @@ -491,7 +479,6 @@ } - mtx_assert(&Giant, MA_OWNED); /* * Have we seen some packets? If so, the link must be good. */ @@ -590,7 +577,6 @@ tulip_softc_t * const sc, tulip_mediapoll_event_t event) { - mtx_assert(&Giant, MA_OWNED); #if defined(TULIP_DEBUG) sc->tulip_dbg.dbg_events[event]++; #endif @@ -880,7 +866,6 @@ tulip_media_select( tulip_softc_t * const sc) { - mtx_assert(&Giant, MA_OWNED); if (sc->tulip_features & TULIP_HAVE_GPR) { TULIP_CSR_WRITE(sc, csr_gp, TULIP_GP_PINSET|sc->tulip_gpinit); DELAY(10); @@ -905,7 +890,6 @@ tulip_softc_t * const sc, tulip_media_t media) { - mtx_assert(&Giant, MA_OWNED); sc->tulip_cmdmode |= TULIP_CMD_CAPTREFFCT|TULIP_CMD_THRSHLD160 |TULIP_CMD_BACKOFFCTR; sc->tulip_if.if_baudrate = 10000000; @@ -929,7 +913,6 @@ tulip_21040_media_probe( tulip_softc_t * const sc) { - mtx_assert(&Giant, MA_OWNED); tulip_21040_mediainfo_init(sc, TULIP_MEDIA_UNKNOWN); return; } @@ -938,7 +921,6 @@ tulip_21040_10baset_only_media_probe( tulip_softc_t * const sc) { - mtx_assert(&Giant, MA_OWNED); tulip_21040_mediainfo_init(sc, TULIP_MEDIA_10BASET); tulip_media_set(sc, TULIP_MEDIA_10BASET); sc->tulip_media = TULIP_MEDIA_10BASET; @@ -948,7 +930,6 @@ tulip_21040_10baset_only_media_select( tulip_softc_t * const sc) { - mtx_assert(&Giant, MA_OWNED); sc->tulip_flags |= TULIP_LINKUP; if (sc->tulip_media == TULIP_MEDIA_10BASET_FD) { sc->tulip_cmdmode |= TULIP_CMD_FULLDUPLEX; @@ -964,7 +945,6 @@ tulip_21040_auibnc_only_media_probe( tulip_softc_t * const sc) { - mtx_assert(&Giant, MA_OWNED); tulip_21040_mediainfo_init(sc, TULIP_MEDIA_AUIBNC); sc->tulip_flags |= TULIP_SQETEST|TULIP_LINKUP; tulip_media_set(sc, TULIP_MEDIA_AUIBNC); @@ -975,7 +955,6 @@ tulip_21040_auibnc_only_media_select( tulip_softc_t * const sc) { - mtx_assert(&Giant, MA_OWNED); tulip_media_set(sc, TULIP_MEDIA_AUIBNC); sc->tulip_cmdmode &= ~TULIP_CMD_FULLDUPLEX; } @@ -1007,7 +986,6 @@ { tulip_media_info_t * const mi = sc->tulip_mediainfo; - mtx_assert(&Giant, MA_OWNED); #ifdef notyet if (sc->tulip_revinfo >= 0x20) { TULIP_MEDIAINFO_SIA_INIT(sc, &mi[0], 21041P2, 10BASET); @@ -1027,7 +1005,6 @@ tulip_21041_media_probe( tulip_softc_t * const sc) { - mtx_assert(&Giant, MA_OWNED); sc->tulip_if.if_baudrate = 10000000; sc->tulip_cmdmode |= TULIP_CMD_CAPTREFFCT|TULIP_CMD_ENHCAPTEFFCT |TULIP_CMD_THRSHLD160|TULIP_CMD_BACKOFFCTR; @@ -1042,7 +1019,6 @@ { u_int32_t sia_status; - mtx_assert(&Giant, MA_OWNED); #if defined(TULIP_DEBUG) sc->tulip_dbg.dbg_events[event]++; #endif @@ -1264,7 +1240,6 @@ TULIP_MEDIA_UNKNOWN }; - mtx_assert(&Giant, MA_OWNED); /* * Don't read phy specific registers if link is not up. */ @@ -1314,7 +1289,6 @@ { unsigned phyaddr; - mtx_assert(&Giant, MA_OWNED); for (phyaddr = 1; phyaddr < 32; phyaddr++) { unsigned status = tulip_mii_readreg(sc, phyaddr, PHYREG_STATUS); if (status == 0 || status == 0xFFFF || status < PHYSTS_10BASET) @@ -1337,7 +1311,6 @@ tulip_softc_t * const sc, unsigned abilities) { - mtx_assert(&Giant, MA_OWNED); sc->tulip_abilities = abilities; if (abilities & PHYSTS_100BASETX_FD) { sc->tulip_probe_media = TULIP_MEDIA_100BASETX_FD; @@ -1362,7 +1335,6 @@ tulip_softc_t * const sc, const unsigned phyaddr) { - mtx_assert(&Giant, MA_OWNED); switch (sc->tulip_probe_state) { case TULIP_PROBE_MEDIATEST: case TULIP_PROBE_INACTIVE: { @@ -1463,7 +1435,6 @@ const tulip_media_info_t *mi = NULL; tulip_media_t media = sc->tulip_media; - mtx_assert(&Giant, MA_OWNED); if (sc->tulip_probe_state == TULIP_PROBE_INACTIVE) media = sc->tulip_media; else @@ -1539,7 +1510,6 @@ tulip_softc_t * const sc, tulip_mediapoll_event_t event) { - mtx_assert(&Giant, MA_OWNED); #if defined(TULIP_DEBUG) sc->tulip_dbg.dbg_events[event]++; #endif @@ -1557,7 +1527,6 @@ unsigned gpdata, unsigned cmdmode) { - mtx_assert(&Giant, MA_OWNED); sc->tulip_mediums[media] = mip; mip->mi_type = TULIP_MEDIAINFO_GPR; mip->mi_cmdmode = cmdmode; @@ -1570,7 +1539,6 @@ { tulip_media_info_t *mip = sc->tulip_mediainfo; - mtx_assert(&Giant, MA_OWNED); sc->tulip_gpinit = TULIP_GP_EB_PINS; sc->tulip_gpdata = TULIP_GP_EB_INIT; TULIP_CSR_WRITE(sc, csr_gp, TULIP_GP_EB_PINS); @@ -1617,7 +1585,6 @@ tulip_media_info_t *mip = sc->tulip_mediainfo; unsigned gpdata; - mtx_assert(&Giant, MA_OWNED); sc->tulip_gpinit = TULIP_GP_EB_PINS; sc->tulip_gpdata = TULIP_GP_EB_INIT; TULIP_CSR_WRITE(sc, csr_gp, TULIP_GP_EB_PINS); @@ -1672,7 +1639,6 @@ tulip_media_info_t *mip = sc->tulip_mediainfo; int idx, cnt = 0; - mtx_assert(&Giant, MA_OWNED); TULIP_CSR_WRITE(sc, csr_command, TULIP_CMD_PORTSELECT|TULIP_CMD_MUSTBEONE); TULIP_CSR_WRITE(sc, csr_busmode, TULIP_BUSMODE_SWRESET); DELAY(10); /* Wait 10 microseconds (actually 50 PCI cycles but at @@ -1729,7 +1695,6 @@ tulip_media_info_t *mip = sc->tulip_mediainfo; u_int32_t cmdmode = TULIP_CSR_READ(sc, csr_command); - mtx_assert(&Giant, MA_OWNED); sc->tulip_gpinit = TULIP_GP_EM100_PINS; sc->tulip_gpdata = TULIP_GP_EM100_INIT; TULIP_CSR_WRITE(sc, csr_gp, TULIP_GP_EM100_PINS); @@ -1777,7 +1742,6 @@ tulip_media_info_t *mip = sc->tulip_mediainfo; int cnt10 = 0, cnt100 = 0, idx; - mtx_assert(&Giant, MA_OWNED); sc->tulip_gpinit = TULIP_GP_ZX34X_PINS; sc->tulip_gpdata = TULIP_GP_ZX34X_INIT; TULIP_CSR_WRITE(sc, csr_gp, TULIP_GP_ZX34X_PINS); @@ -1832,7 +1796,6 @@ tulip_2114x_media_probe( tulip_softc_t * const sc) { - mtx_assert(&Giant, MA_OWNED); sc->tulip_cmdmode |= TULIP_CMD_MUSTBEONE |TULIP_CMD_BACKOFFCTR|TULIP_CMD_THRSHLD72; } @@ -1860,7 +1823,6 @@ { unsigned bit, csr; - mtx_assert(&Giant, MA_OWNED); csr = SROMSEL ; EMIT; csr = SROMSEL | SROMRD; EMIT; csr ^= SROMCS; EMIT; @@ -1889,7 +1851,6 @@ const unsigned msb = 1 << (bitwidth + 3 - 1); unsigned lastidx = (1 << bitwidth) - 1; - mtx_assert(&Giant, MA_OWNED); tulip_srom_idle(sc); for (idx = 0; idx <= lastidx; idx++) { @@ -1939,7 +1900,6 @@ unsigned csr = TULIP_CSR_READ(sc, csr_srom_mii) & (MII_RD|MII_DOUT|MII_CLK); unsigned lastbit = (csr & MII_DOUT) ? msb : 0; - mtx_assert(&Giant, MA_OWNED); csr |= MII_WR; MII_EMIT; /* clock low; assert write */ for (; bits > 0; bits--, data <<= 1) { @@ -1960,7 +1920,6 @@ { unsigned csr = TULIP_CSR_READ(sc, csr_srom_mii) & (MII_RD|MII_DOUT|MII_CLK); - mtx_assert(&Giant, MA_OWNED); if (cmd == MII_WRCMD) { csr |= MII_DOUT; MII_EMIT; /* clock low; change data */ csr ^= MII_CLKON; MII_EMIT; /* clock high; data valid */ @@ -1981,7 +1940,6 @@ unsigned csr = TULIP_CSR_READ(sc, csr_srom_mii) & (MII_RD|MII_DOUT|MII_CLK); int idx; - mtx_assert(&Giant, MA_OWNED); for (idx = 0, data = 0; idx < 16; idx++) { data <<= 1; /* this is NOOP on the first pass through */ csr ^= MII_CLKON; MII_EMIT; /* clock high; data valid */ @@ -2003,7 +1961,6 @@ unsigned csr = TULIP_CSR_READ(sc, csr_srom_mii) & (MII_RD|MII_DOUT|MII_CLK); unsigned data; - mtx_assert(&Giant, MA_OWNED); csr &= ~(MII_RD|MII_CLK); MII_EMIT; tulip_mii_writebits(sc, MII_PREAMBLE, 32); tulip_mii_writebits(sc, MII_RDCMD, 8); @@ -2027,7 +1984,6 @@ unsigned data) { unsigned csr = TULIP_CSR_READ(sc, csr_srom_mii) & (MII_RD|MII_DOUT|MII_CLK); - mtx_assert(&Giant, MA_OWNED); csr &= ~(MII_RD|MII_CLK); MII_EMIT; tulip_mii_writebits(sc, MII_PREAMBLE, 32); tulip_mii_writebits(sc, MII_WRCMD, 8); @@ -2050,7 +2006,6 @@ tulip_identify_dec_nic( tulip_softc_t * const sc) { - mtx_assert(&Giant, MA_OWNED); strcpy(sc->tulip_boardid, "DEC "); #define D0 4 if (sc->tulip_chipid <= TULIP_21040) @@ -2068,7 +2023,6 @@ tulip_softc_t * const sc) { unsigned id = 0; - mtx_assert(&Giant, MA_OWNED); strcpy(sc->tulip_boardid, "ZNYX ZX3XX "); if (sc->tulip_chipid == TULIP_21140 || sc->tulip_chipid == TULIP_21140A) { unsigned znyx_ptr; @@ -2165,7 +2119,6 @@ int auibnc = 0, utp = 0; char *cp; - mtx_assert(&Giant, MA_OWNED); strcpy(sc->tulip_boardid, "SMC "); if (sc->tulip_chipid == TULIP_21041) return; @@ -2211,7 +2164,6 @@ tulip_identify_cogent_nic( tulip_softc_t * const sc) { - mtx_assert(&Giant, MA_OWNED); strcpy(sc->tulip_boardid, "Cogent "); if (sc->tulip_chipid == TULIP_21140 || sc->tulip_chipid == TULIP_21140A) { if (sc->tulip_rombuf[32] == TULIP_COGENT_EM100TX_ID) { @@ -2248,7 +2200,6 @@ tulip_identify_accton_nic( tulip_softc_t * const sc) { - mtx_assert(&Giant, MA_OWNED); strcpy(sc->tulip_boardid, "ACCTON "); switch (sc->tulip_chipid) { case TULIP_21140A: @@ -2279,7 +2230,6 @@ tulip_identify_asante_nic( tulip_softc_t * const sc) { - mtx_assert(&Giant, MA_OWNED); strcpy(sc->tulip_boardid, "Asante "); if ((sc->tulip_chipid == TULIP_21140 || sc->tulip_chipid == TULIP_21140A) && sc->tulip_boardsw != &tulip_2114x_isv_boardsw) { @@ -2336,7 +2286,6 @@ tulip_identify_compex_nic( tulip_softc_t * const sc) { - mtx_assert(&Giant, MA_OWNED); strcpy(sc->tulip_boardid, "COMPEX "); if (sc->tulip_chipid == TULIP_21140A) { int root_unit; @@ -2385,7 +2334,6 @@ const u_int8_t *dp; u_int32_t leaf_offset, blocks, data; - mtx_assert(&Giant, MA_OWNED); for (idx1 = 0; idx1 < shp->sh_adapter_count; idx1++, saip++) { if (shp->sh_adapter_count == 1) break; @@ -2765,7 +2713,6 @@ unsigned char tmpbuf[8]; static const u_char testpat[] = { 0xFF, 0, 0x55, 0xAA, 0xFF, 0, 0x55, 0xAA }; - mtx_assert(&Giant, MA_OWNED); sc->tulip_connidx = TULIP_SROM_LASTCONNIDX; if (sc->tulip_chipid == TULIP_21040) { @@ -2966,7 +2913,6 @@ tulip_media_t media; int medias = 0; - mtx_assert(&Giant, MA_OWNED); for (media = TULIP_MEDIA_UNKNOWN; media < TULIP_MEDIA_MAX; media++) { if (sc->tulip_mediums[media] != NULL) { ifmedia_add(&sc->tulip_ifmedia, tulip_media_to_ifmedia[media], @@ -2994,7 +2940,6 @@ { tulip_softc_t * const sc = (tulip_softc_t *)ifp->if_softc; - mtx_assert(&Giant, MA_OWNED); sc->tulip_flags |= TULIP_NEEDRESET; sc->tulip_probe_state = TULIP_PROBE_INACTIVE; sc->tulip_media = TULIP_MEDIA_UNKNOWN; @@ -3026,7 +2971,6 @@ { tulip_softc_t *sc = (tulip_softc_t *)ifp->if_softc; - mtx_assert(&Giant, MA_OWNED); if (sc->tulip_media == TULIP_MEDIA_UNKNOWN) return; @@ -3045,7 +2989,6 @@ u_char *addrp; int multicnt; - mtx_assert(&Giant, MA_OWNED); sc->tulip_flags &= ~(TULIP_WANTHASHPERFECT|TULIP_WANTHASHONLY|TULIP_ALLMULTI); sc->tulip_flags |= TULIP_WANTSETUP|TULIP_WANTTXSTART; sc->tulip_cmdmode &= ~TULIP_CMD_RXRUN; @@ -3192,7 +3135,6 @@ tulip_desc_t *di; u_int32_t inreset = (sc->tulip_flags & TULIP_INRESET); - mtx_assert(&Giant, MA_OWNED); /* * Brilliant. Simply brilliant. When switching modes/speeds * on a 2114*, you need to set the appriopriate MII/PCS/SCL/PS @@ -3334,7 +3276,6 @@ tulip_ifinit( void * sc) { - mtx_assert(&Giant, MA_OWNED); tulip_init((tulip_softc_t *)sc); } @@ -3342,7 +3283,6 @@ tulip_init( tulip_softc_t * const sc) { - mtx_assert(&Giant, MA_OWNED); if (sc->tulip_if.if_flags & IFF_UP) { if ((sc->tulip_if.if_flags & IFF_RUNNING) == 0) { /* initialize the media */ @@ -3394,7 +3334,6 @@ int cnt = 0; #endif - mtx_assert(&Giant, MA_OWNED); for (;;) { TULIP_PERFSTART(rxget) tulip_desc_t *eop = ri->ri_nextin; @@ -3710,7 +3649,6 @@ int xmits = 0; int descs = 0; - mtx_assert(&Giant, MA_OWNED); while (ri->ri_free < ri->ri_max) { u_int32_t d_flag; @@ -3843,7 +3781,6 @@ u_int32_t mask; const char thrsh[] = "72|128\0\0\0" "96|256\0\0\0" "128|512\0\0" "160|1024"; - mtx_assert(&Giant, MA_OWNED); csr &= (1 << (sizeof(tulip_status_bits)/sizeof(tulip_status_bits[0]))) - 1; printf("%s: abnormal interrupt:", sc->tulip_xname); for (sep = " ", mask = 1; mask <= csr; mask <<= 1, msgp++) { @@ -3872,7 +3809,6 @@ TULIP_PERFSTART(intr) u_int32_t csr; - mtx_assert(&Giant, MA_OWNED); while ((csr = TULIP_CSR_READ(sc, csr_status)) & sc->tulip_intrmask) { *progress_p = 1; TULIP_CSR_WRITE(sc, csr_status, csr); @@ -3985,7 +3921,6 @@ tulip_softc_t * const sc, int *progress_p) { - mtx_assert(&Giant, MA_OWNED); if (TULIP_CSR_READ(sc, csr_status) & (TULIP_STS_NORMALINTR|TULIP_STS_ABNRMLINTR) == 0) return; *progress_p = 1; @@ -4008,7 +3943,6 @@ int unit; int s; - mtx_assert(&Giant, MA_OWNED); /* * Copy mask to local copy and reset global one to 0. */ @@ -4070,7 +4004,6 @@ tulip_softc_t * sc = arg; int progress = 0; - mtx_assert(&Giant, MA_OWNED); for (; sc != NULL; sc = sc->tulip_slaves) { #if defined(TULIP_DEBUG) sc->tulip_dbg.dbg_intrs++; @@ -4094,7 +4027,6 @@ tulip_softc_t * sc = (tulip_softc_t *) arg; int progress = 0; - mtx_assert(&Giant, MA_OWNED); #if defined(TULIP_DEBUG) sc->tulip_dbg.dbg_intrs++; #endif @@ -4131,7 +4063,6 @@ int len = m->m_pkthdr.len; struct mbuf **mp = &m0; - mtx_assert(&Giant, MA_OWNED); while (len > 0) { if (mlen == MHLEN) { MGETHDR(*mp, M_DONTWAIT, MT_DATA); @@ -4182,7 +4113,6 @@ struct mbuf *m0; #endif - mtx_assert(&Giant, MA_OWNED); #if defined(TULIP_DEBUG) if ((sc->tulip_cmdmode & TULIP_CMD_TXRUN) == 0) { printf("%s: txput%s: tx not running\n", @@ -4504,7 +4434,6 @@ tulip_ringinfo_t * const ri = &sc->tulip_txinfo; tulip_desc_t *nextout; - mtx_assert(&Giant, MA_OWNED); /* * We will transmit, at most, one setup packet per call to ifstart. */ @@ -4604,7 +4533,6 @@ int s; int error = 0; - mtx_assert(&Giant, MA_OWNED); #if defined(TULIP_USE_SOFTINTR) s = splnet(); #else @@ -4691,7 +4619,6 @@ TULIP_PERFSTART(ifstart) tulip_softc_t * const sc = (tulip_softc_t *)ifp->if_softc; - mtx_assert(&Giant, MA_OWNED); if (sc->tulip_if.if_flags & IFF_RUNNING) { if ((sc->tulip_flags & (TULIP_WANTSETUP|TULIP_TXPROBE_ACTIVE)) == TULIP_WANTSETUP) @@ -4728,13 +4655,11 @@ #if defined(TULIP_DEBUG) u_int32_t rxintrs = sc->tulip_dbg.dbg_rxintrs - sc->tulip_dbg.dbg_last_rxintrs; - mtx_assert(&Giant, MA_OWNED); if (rxintrs > sc->tulip_dbg.dbg_high_rxintrs_hz) sc->tulip_dbg.dbg_high_rxintrs_hz = rxintrs; sc->tulip_dbg.dbg_last_rxintrs = sc->tulip_dbg.dbg_rxintrs; #endif /* TULIP_DEBUG */ - mtx_assert(&Giant, MA_OWNED); sc->tulip_if.if_timer = 1; /* * These should be rare so do a bulk test up front so we can just skip @@ -4809,7 +4734,6 @@ { struct ifnet * const ifp = &sc->tulip_if; - mtx_assert(&Giant, MA_OWNED); /* XXX: driver name/unit should be set some other way */ ifp->if_dname = "de"; ifp->if_dunit = sc->tulip_unit; @@ -4868,7 +4792,6 @@ { bus_dma_segment_t segs[1]; int nsegs, error; - mtx_assert(&Giant, MA_OWNED); error = bus_dmamem_alloc(sc->tulip_dmatag, size, 1, PAGE_SIZE, segs, sizeof(segs)/sizeof(segs[0]), &nsegs, BUS_DMA_NOWAIT); @@ -4906,7 +4829,6 @@ { int error = 0; - mtx_assert(&Giant, MA_OWNED); #if !defined(TULIP_BUS_DMA_NOTX) /* * Allocate dmamap for setup descriptor @@ -4994,7 +4916,6 @@ tulip_csrptr_t csr_base, size_t csr_size) { - mtx_assert(&Giant, MA_OWNED); sc->tulip_csrs.csr_busmode = csr_base + 0 * csr_size; sc->tulip_csrs.csr_txpoll = csr_base + 1 * csr_size; sc->tulip_csrs.csr_rxpoll = csr_base + 2 * csr_size; @@ -5020,7 +4941,6 @@ tulip_desc_t *descs, int ndescs) { - mtx_assert(&Giant, MA_OWNED); ri->ri_max = ndescs; ri->ri_first = descs; ri->ri_last = ri->ri_first + ri->ri_max; @@ -5041,7 +4961,6 @@ { const char *name = NULL; - mtx_assert(&Giant, MA_OWNED); if (pci_get_vendor(dev) != DEC_VENDORID) return ENXIO; @@ -5083,7 +5002,6 @@ tulip_shutdown(device_t dev) { tulip_softc_t * const sc = device_get_softc(dev); - mtx_assert(&Giant, MA_OWNED); TULIP_CSR_WRITE(sc, csr_busmode, TULIP_BUSMODE_SWRESET); DELAY(10); /* Wait 10 microseconds (actually 50 PCI cycles but at 33MHz that comes to two microseconds but wait a @@ -5107,7 +5025,6 @@ struct resource *res; int rid, unit; - mtx_assert(&Giant, MA_OWNED); unit = device_get_unit(dev); if (unit >= TULIP_MAX_DEVICES) { From owner-p4-projects@FreeBSD.ORG Thu Oct 21 16:05:50 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C9A9616A4D0; Thu, 21 Oct 2004 16:05:49 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A5F0316A4CE for ; Thu, 21 Oct 2004 16:05:49 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9D4C743D46 for ; Thu, 21 Oct 2004 16:05:49 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9LG5nRI049429 for ; Thu, 21 Oct 2004 16:05:49 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9LG5n1t049426 for perforce@freebsd.org; Thu, 21 Oct 2004 16:05:49 GMT (envelope-from jhb@freebsd.org) Date: Thu, 21 Oct 2004 16:05:49 GMT Message-Id: <200410211605.i9LG5n1t049426@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 63477 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Oct 2004 16:05:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=63477 Change 63477 by jhb@jhb_slimer on 2004/10/21 16:05:20 Merge from needresched the change to do the sched_prio() before putting the thread on the run queue rather than when it starts executing. Affected files ... .. //depot/projects/smpng/sys/vm/vm_zeroidle.c#20 integrate Differences ... ==== //depot/projects/smpng/sys/vm/vm_zeroidle.c#20 (text+ko) ==== @@ -137,14 +137,9 @@ static void vm_pagezero(void __unused *arg) { - struct proc *p; struct thread *td; td = curthread; - p = td->td_proc; - mtx_lock_spin(&sched_lock); - sched_prio(td, PRI_MAX_IDLE); - mtx_unlock_spin(&sched_lock); idlezero_enable = idlezero_enable_default; for (;;) { @@ -181,6 +176,7 @@ pagezero_proc->p_flag |= P_NOLOAD; PROC_UNLOCK(pagezero_proc); mtx_lock_spin(&sched_lock); + sched_prio(FIRST_THREAD_IN_PROC(pagezero_proc), PRI_MAX_IDLE); setrunqueue(FIRST_THREAD_IN_PROC(pagezero_proc), SRQ_BORING); mtx_unlock_spin(&sched_lock); } From owner-p4-projects@FreeBSD.ORG Fri Oct 22 03:37:06 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7893616A4D0; Fri, 22 Oct 2004 03:37:06 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from green.homeunix.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E41BD16A4CE; Fri, 22 Oct 2004 03:37:05 +0000 (GMT) Received: from green.homeunix.org (green@localhost [127.0.0.1]) by green.homeunix.org (8.13.1/8.13.1) with ESMTP id i9M3b5bt079820; Thu, 21 Oct 2004 23:37:05 -0400 (EDT) (envelope-from green@green.homeunix.org) Received: (from green@localhost) by green.homeunix.org (8.13.1/8.13.1/Submit) id i9M3b0ph079819; Thu, 21 Oct 2004 23:37:00 -0400 (EDT) (envelope-from green) Date: Thu, 21 Oct 2004 23:37:00 -0400 From: Brian Fundakowski Feldman To: John Baldwin Message-ID: <20041022033700.GL1072@green.homeunix.org> References: <200410192159.i9JLxNLE003024@repoman.freebsd.org> <417592DB.6050609@elischer.org> <200410201258.26325.jhb@FreeBSD.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200410201258.26325.jhb@FreeBSD.org> User-Agent: Mutt/1.5.6i cc: Perforce Change Reviews cc: Julian Elischer Subject: Re: PERFORCE change 63396 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Oct 2004 03:37:07 -0000 On Wed, Oct 20, 2004 at 12:58:26PM -0400, John Baldwin wrote: > On Tuesday 19 October 2004 06:19 pm, Julian Elischer wrote: > > John Baldwin wrote: > > >http://perforce.freebsd.org/chv.cgi?CH=63396 > > > > > >Change 63396 by jhb@jhb_tibook on 2004/10/19 21:58:24 > > > > > > Update. > > > > > >Affected files ... > > > > > >.. //depot/projects/smpng/sys/notes#21 edit > > > > > >Differences ... > > > > > >==== //depot/projects/smpng/sys/notes#21 (text+ko) ==== > > > > > >@@ -33,6 +33,10 @@ > > > - Untested > > > - Don't allow kthreads to get signalled and do bad things > > > - Untested > > >+- Change amd64 to use [ls]fence instructions for memory barriers. > > >+ - Untested (and no hardware, maybe peter can test) > > >+- Turn off the ipiwakeups in 4BSD since the currently implementation can > > >+ lead to IPI deadlocks > > > > the implementation of IPIs or the implementation of IPIwakeup? > > Kind of hard to say. The problem is if a CPU tries to send two IPI_AST's > without enabling interrupts in between. The first IPI may not be delivered > when the second one is requested because the target of the first IPI has > interrupts disabled for some reason (doing a TLB shootdown is the worst case > scenario). The other CPU won't enable interrupts to allow the first AST > until it's shootdown is acknowledged. Since the first IPI is never > delivered, then the second IPI attempt will never be able to deliver an IPI, > resulting in either a panic or deadlock. My quad xeon is highly unstable on > HEAD, btw, and this does seem to help it. Isn't this what I said a few weeks ago was probably the problem? -- Brian Fundakowski Feldman \'[ FreeBSD ]''''''''''\ <> green@FreeBSD.org \ The Power to Serve! \ Opinions expressed are my own. \,,,,,,,,,,,,,,,,,,,,,,\ From owner-p4-projects@FreeBSD.ORG Fri Oct 22 03:44:00 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E4FC16A4D0; Fri, 22 Oct 2004 03:44:00 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B64F016A4CE for ; Fri, 22 Oct 2004 03:43:59 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7435D43D45 for ; Fri, 22 Oct 2004 03:43:59 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9M3hx6r071527 for ; Fri, 22 Oct 2004 03:43:59 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9M3hxmB071524 for perforce@freebsd.org; Fri, 22 Oct 2004 03:43:59 GMT (envelope-from peter@freebsd.org) Date: Fri, 22 Oct 2004 03:43:59 GMT Message-Id: <200410220343.i9M3hxmB071524@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 63497 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Oct 2004 03:44:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=63497 Change 63497 by peter@peter_daintree on 2004/10/22 03:43:21 IFC @63496 Affected files ... .. //depot/projects/hammer/contrib/libreadline/complete.c#5 integrate .. //depot/projects/hammer/contrib/libreadline/display.c#5 integrate .. //depot/projects/hammer/contrib/libreadline/doc/readline.3#5 integrate .. //depot/projects/hammer/contrib/libreadline/rlconf.h#4 integrate .. //depot/projects/hammer/contrib/libreadline/shell.c#5 integrate .. //depot/projects/hammer/contrib/libreadline/terminal.c#5 integrate .. //depot/projects/hammer/contrib/libreadline/util.c#5 integrate .. //depot/projects/hammer/contrib/libreadline/vi_mode.c#5 integrate .. //depot/projects/hammer/contrib/smbfs/lib/smb/kiconv.c#4 integrate .. //depot/projects/hammer/contrib/smbfs/lib/smb/mbuf.c#2 integrate .. //depot/projects/hammer/contrib/smbfs/lib/smb/nls.c#2 integrate .. //depot/projects/hammer/contrib/smbfs/lib/smb/rcfile.c#2 integrate .. //depot/projects/hammer/contrib/smbfs/lib/smb/rq.c#3 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#38 integrate .. //depot/projects/hammer/etc/mtree/BSD.usr.dist#31 integrate .. //depot/projects/hammer/etc/rc.d/dumpon#7 integrate .. //depot/projects/hammer/etc/rc.d/savecore#7 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sig.c#22 integrate .. //depot/projects/hammer/lib/libsmb/Makefile#3 integrate .. //depot/projects/hammer/lib/libugidfw/ugidfw.c#7 integrate .. //depot/projects/hammer/release/Makefile#64 integrate .. //depot/projects/hammer/sbin/fdisk/fdisk.c#13 integrate .. //depot/projects/hammer/sbin/fsck_ffs/fsck.h#9 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#38 integrate .. //depot/projects/hammer/share/mk/bsd.cpu.mk#25 integrate .. //depot/projects/hammer/share/zoneinfo/Makefile#2 integrate .. //depot/projects/hammer/sys/alpha/alpha/promcons.c#13 integrate .. //depot/projects/hammer/sys/arm/arm/busdma_machdep.c#5 integrate .. //depot/projects/hammer/sys/dev/aac/aac_pci.c#16 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx.c#15 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx.h#10 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#41 integrate .. //depot/projects/hammer/sys/dev/ata/ata-card.c#17 integrate .. //depot/projects/hammer/sys/dev/ata/ata-queue.c#20 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#36 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_pccard.c#15 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#31 integrate .. //depot/projects/hammer/sys/dev/zs/zs.c#17 integrate .. //depot/projects/hammer/sys/geom/geom_io.c#30 integrate .. //depot/projects/hammer/sys/kern/subr_kdb.c#7 integrate .. //depot/projects/hammer/sys/kern/uipc_domain.c#7 integrate .. //depot/projects/hammer/sys/kern/uipc_socket2.c#27 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#35 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#41 integrate .. //depot/projects/hammer/sys/kern/vfs_cluster.c#18 integrate .. //depot/projects/hammer/sys/kern/vfs_default.c#24 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#57 integrate .. //depot/projects/hammer/sys/modules/ipdivert/Makefile#1 branch .. //depot/projects/hammer/sys/net/if.c#33 integrate .. //depot/projects/hammer/sys/net/if_var.h#22 integrate .. //depot/projects/hammer/sys/netinet/in.h#15 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.h#20 integrate .. //depot/projects/hammer/sys/netinet/in_proto.c#13 integrate .. //depot/projects/hammer/sys/netinet/in_var.h#8 integrate .. //depot/projects/hammer/sys/netinet/ip_divert.c#23 integrate .. //depot/projects/hammer/sys/netinet/ip_divert.h#2 integrate .. //depot/projects/hammer/sys/netinet/ip_fastfwd.c#14 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#43 integrate .. //depot/projects/hammer/sys/netinet/ip_fw_pfil.c#6 integrate .. //depot/projects/hammer/sys/netinet/ip_input.c#44 integrate .. //depot/projects/hammer/sys/netinet/ip_var.h#22 integrate .. //depot/projects/hammer/sys/netinet6/ip6_input.c#19 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_vnops.c#9 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_subs.c#17 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#24 integrate .. //depot/projects/hammer/sys/pci/if_vr.c#26 integrate .. //depot/projects/hammer/sys/security/mac_bsdextended/mac_bsdextended.c#13 integrate .. //depot/projects/hammer/sys/security/mac_bsdextended/mac_bsdextended.h#4 integrate .. //depot/projects/hammer/sys/sys/buf.h#15 integrate .. //depot/projects/hammer/sys/sys/bufobj.h#1 branch .. //depot/projects/hammer/sys/sys/ktr.h#6 integrate .. //depot/projects/hammer/sys/sys/protosw.h#7 integrate .. //depot/projects/hammer/sys/sys/vnode.h#31 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_alloc.c#15 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_balloc.c#7 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_rawread.c#10 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_softdep.c#16 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vnops.c#25 integrate .. //depot/projects/hammer/sys/ufs/ufs/dinode.h#4 integrate .. //depot/projects/hammer/sys/vm/swap_pager.c#30 integrate .. //depot/projects/hammer/tools/tools/nanobsd/make.conf#4 integrate .. //depot/projects/hammer/usr.bin/fstat/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/netstat/main.c#10 integrate .. //depot/projects/hammer/usr.sbin/mount_smbfs/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/ntp/doc/ntpdate.8#3 integrate .. //depot/projects/hammer/usr.sbin/ugidfw/ugidfw.c#3 integrate .. //depot/projects/hammer/usr.sbin/zic/zic.c#4 integrate Differences ... ==== //depot/projects/hammer/contrib/libreadline/complete.c#5 (text+ko) ==== @@ -1,3 +1,5 @@ +/* $FreeBSD: src/contrib/libreadline/complete.c,v 1.11 2004/10/21 23:45:57 ache Exp $ */ + /* complete.c -- filename completion for readline. */ /* Copyright (C) 1987-2004 Free Software Foundation, Inc. ==== //depot/projects/hammer/contrib/libreadline/display.c#5 (text+ko) ==== @@ -1,3 +1,5 @@ +/* $FreeBSD: src/contrib/libreadline/display.c,v 1.8 2004/10/21 23:45:57 ache Exp $ */ + /* display.c -- readline redisplay facility. */ /* Copyright (C) 1987-2004 Free Software Foundation, Inc. ==== //depot/projects/hammer/contrib/libreadline/doc/readline.3#5 (text+ko) ==== @@ -12,6 +12,7 @@ .\" .\" File Name macro. This used to be `.PN', for Path Name, .\" but Sun doesn't seem to like that very much. +.\" $FreeBSD: src/contrib/libreadline/doc/readline.3,v 1.10 2004/10/21 23:45:57 ache Exp $ .\" .de FN \fI\|\\$1\|\fP ==== //depot/projects/hammer/contrib/libreadline/rlconf.h#4 (text+ko) ==== @@ -1,3 +1,5 @@ +/* $FreeBSD: src/contrib/libreadline/rlconf.h,v 1.7 2004/10/21 23:45:57 ache Exp $ */ + /* rlconf.h -- readline configuration definitions */ /* Copyright (C) 1994 Free Software Foundation, Inc. ==== //depot/projects/hammer/contrib/libreadline/shell.c#5 (text+ko) ==== @@ -1,3 +1,5 @@ +/* $FreeBSD: src/contrib/libreadline/shell.c,v 1.9 2004/10/21 23:45:57 ache Exp $ */ + /* shell.c -- readline utility functions that are normally provided by bash when readline is linked as part of the shell. */ ==== //depot/projects/hammer/contrib/libreadline/terminal.c#5 (text+ko) ==== @@ -1,3 +1,5 @@ +/* $FreeBSD: src/contrib/libreadline/terminal.c,v 1.7 2004/10/21 23:45:57 ache Exp $ */ + /* terminal.c -- controlling the terminal with termcap. */ /* Copyright (C) 1996 Free Software Foundation, Inc. ==== //depot/projects/hammer/contrib/libreadline/util.c#5 (text+ko) ==== @@ -1,3 +1,5 @@ +/* $FreeBSD: src/contrib/libreadline/util.c,v 1.10 2004/10/21 23:45:57 ache Exp $ */ + /* util.c -- readline utility functions */ /* Copyright (C) 1987, 1989, 1992 Free Software Foundation, Inc. ==== //depot/projects/hammer/contrib/libreadline/vi_mode.c#5 (text+ko) ==== @@ -1,3 +1,5 @@ +/* $FreeBSD: src/contrib/libreadline/vi_mode.c,v 1.4 2004/10/21 23:45:57 ache Exp $ */ + /* vi_mode.c -- A vi emulation mode for Bash. Derived from code written by Jeff Sparkes (jsparkes@bnr.ca). */ ==== //depot/projects/hammer/contrib/smbfs/lib/smb/kiconv.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $Id: kiconv.c,v 1.3 2001/08/22 03:31:36 bp Exp $ - * $FreeBSD: src/contrib/smbfs/lib/smb/kiconv.c,v 1.2 2003/07/26 04:03:18 peter Exp $ + * $FreeBSD: src/contrib/smbfs/lib/smb/kiconv.c,v 1.3 2004/10/19 17:44:31 obrien Exp $ */ #include @@ -38,6 +38,7 @@ #include #include #include +#include #ifdef APPLE #include ==== //depot/projects/hammer/contrib/smbfs/lib/smb/mbuf.c#2 (text+ko) ==== @@ -32,8 +32,12 @@ * $Id: mbuf.c,v 1.6 2001/02/24 15:56:04 bp Exp $ */ +#include +__FBSDID("$FreeBSD: src/contrib/smbfs/lib/smb/mbuf.c,v 1.2 2004/10/19 17:44:31 obrien Exp $"); + #include #include +#include #include #include #include ==== //depot/projects/hammer/contrib/smbfs/lib/smb/nls.c#2 (text+ko) ==== @@ -32,6 +32,9 @@ * $Id: nls.c,v 1.10 2002/07/22 08:33:59 bp Exp $ */ +#include +__FBSDID("$FreeBSD: src/contrib/smbfs/lib/smb/nls.c,v 1.2 2004/10/19 17:39:15 obrien Exp $"); + #include #include #include @@ -41,7 +44,7 @@ #endif #include #include -#include +#include #include #include #include @@ -125,7 +128,7 @@ nls_str_toloc(char *dst, const char *src) { char *p = dst; - int inlen, outlen; + size_t inlen, outlen; if (!iconv_loaded) return strcpy(dst, src); @@ -147,7 +150,7 @@ nls_str_toext(char *dst, const char *src) { char *p = dst; - int inlen, outlen; + size_t inlen, outlen; if (!iconv_loaded) return strcpy(dst, src); @@ -170,7 +173,7 @@ { char *p = dst; const char *s = src; - int inlen, outlen; + size_t inlen, outlen; if (!iconv_loaded) return memcpy(dst, src, size); @@ -195,7 +198,7 @@ { char *p = dst; const char *s = src; - int inlen, outlen; + size_t inlen, outlen; if (size == 0) return NULL; ==== //depot/projects/hammer/contrib/smbfs/lib/smb/rcfile.c#2 (text+ko) ==== @@ -31,6 +31,10 @@ * * $Id: rcfile.c,v 1.5 2001/04/16 12:46:46 bp Exp $ */ + +#include +__FBSDID("$FreeBSD: src/contrib/smbfs/lib/smb/rcfile.c,v 1.2 2004/10/19 17:44:31 obrien Exp $"); + #include #include #include @@ -344,7 +348,7 @@ if (error) return error; if (strlen(value) >= maxlen) { - warnx("line too long for key '%s' in section '%s', max = %d\n", key, section, maxlen); + warnx("line too long for key '%s' in section '%s', max = %zd\n", key, section, maxlen); return EINVAL; } strcpy(dest, value); ==== //depot/projects/hammer/contrib/smbfs/lib/smb/rq.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $Id: rq.c,v 1.7 2001/04/16 04:33:01 bp Exp $ - * $FreeBSD: src/contrib/smbfs/lib/smb/rq.c,v 1.2 2004/07/28 05:33:58 kan Exp $ + * $FreeBSD: src/contrib/smbfs/lib/smb/rq.c,v 1.3 2004/10/19 17:44:31 obrien Exp $ */ #include #include @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include ==== //depot/projects/hammer/etc/defaults/rc.conf#38 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.225 2004/10/13 07:12:14 ru Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.226 2004/10/20 16:58:27 keramida Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -55,6 +55,7 @@ gbde_swap_enable="NO" # Set to YES to automatically initialize gbde swap # devices listed in fstab with a random one-shot key +root_rw_mount="YES" # Set to NO to inhibit remounting root read-write. fsck_y_enable="NO" # Set to YES to do fsck -y if the initial preen fails. background_fsck="YES" # Attempt to run fsck in the background where possible. background_fsck_delay="60" # Time to wait (seconds) before starting the fsck. ==== //depot/projects/hammer/etc/mtree/BSD.usr.dist#31 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.309 2004/10/18 17:03:53 wollman Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.310 2004/10/19 17:32:56 ru Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -1166,8 +1166,8 @@ Africa .. America - Argentina - .. + Argentina + .. Indiana .. Kentucky ==== //depot/projects/hammer/etc/rc.d/dumpon#7 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/dumpon,v 1.6 2004/10/18 14:59:53 thomas Exp $ +# $FreeBSD: src/etc/rc.d/dumpon,v 1.7 2004/10/18 23:40:13 thomas Exp $ # # PROVIDE: dumpon @@ -26,7 +26,11 @@ while read dev mp type more ; do [ "${type}" = "swap" ] || continue [ -c "${dev}" ] || continue - /sbin/dumpon -v "${dev}" 2>/dev/null && return 0 + if /sbin/dumpon -v "${dev}" 2>/dev/null; then + # Make a symlink in devfs for savecore + ln -s ${dev} /dev/dumpdev + return 0 + fi done &2 return 1 @@ -43,6 +47,7 @@ [Nn][Oo] | '') ;; *) + rm -f /dev/dumpdev /sbin/dumpon -v off ;; esac ==== //depot/projects/hammer/etc/rc.d/savecore#7 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: savecore,v 1.5 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/savecore,v 1.8 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/savecore,v 1.9 2004/10/18 23:40:13 thomas Exp $ # # PROVIDE: savecore @@ -29,6 +29,9 @@ debug 'No dump device. Quitting.' return 1 ;; + [Aa][Uu][Tt][Oo]) + dumpdev=/dev/dumpdev + ;; esac # If there is no crash directory set it now @@ -50,8 +53,8 @@ savecore_start() { - echo "Checking for core dump on ${dumpdev} ..." - savecore ${savecore_flags} ${DUMPDIR} ${dumpdev} + echo "Checking for core dump on ${dumpdev}..." + savecore ${savecore_flags} ${DUMPDIR} ${dumpdev} } load_rc_config $name ==== //depot/projects/hammer/lib/libpthread/thread/thr_sig.c#22 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_sig.c,v 1.79 2004/07/13 22:52:11 davidxu Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_sig.c,v 1.80 2004/10/21 03:42:24 davidxu Exp $ */ #include #include @@ -705,6 +705,10 @@ KSE_LOCK_RELEASE(curkse, &_thread_list_lock); if (kmbx != NULL) kse_wakeup(kmbx); + if (suspended_thread != NULL) + _thr_ref_delete(NULL, suspended_thread); + if (signaled_thread != NULL) + _thr_ref_delete(NULL, signaled_thread); return (NULL); } else if (!SIGISMEMBER(pthread->sigmask, sig)) { /* ==== //depot/projects/hammer/lib/libsmb/Makefile#3 (text+ko) ==== @@ -1,18 +1,18 @@ -# $FreeBSD: src/lib/libsmb/Makefile,v 1.3 2002/09/28 00:25:31 peter Exp $ +# $FreeBSD: src/lib/libsmb/Makefile,v 1.5 2004/10/19 18:07:26 obrien Exp $ -LIB= smb +CONTRIBDIR= ${.CURDIR}/../../contrib/smbfs +.PATH: ${CONTRIBDIR}/lib/smb +LIB= smb SHLIB_MAJOR= 1 - NOMAN= SRCS= rcfile.c ctx.c cfopt.c subr.c nls.c rap.c mbuf.c rq.c file.c \ print.c \ kiconv.c \ nb.c nb_name.c nb_net.c nbns_rq.c -CONTRIBDIR= ${.CURDIR}/../../contrib/smbfs -CFLAGS+= -DSMB_CFG_FILE=\"/etc/nsmb.conf\" -I${CONTRIBDIR}/include -.PATH: ${CONTRIBDIR}/lib/smb +WARNS?= 2 +CFLAGS+= -DSMB_CFG_FILE=\"/etc/nsmb.conf\" -I${CONTRIBDIR}/include .include ==== //depot/projects/hammer/lib/libugidfw/ugidfw.c#7 (text+ko) ==== @@ -28,13 +28,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libugidfw/ugidfw.c,v 1.6 2004/03/11 09:56:04 bde Exp $ + * $FreeBSD: src/lib/libugidfw/ugidfw.c,v 1.7 2004/10/21 11:21:13 rwatson Exp $ */ #include #include #include #include -#include #include @@ -178,10 +177,10 @@ left -= len; cur += len; - anymode = (rule->mbr_mode & VALLPERM); - unknownmode = (rule->mbr_mode & ~VALLPERM); + anymode = (rule->mbr_mode & MBI_ALLPERM); + unknownmode = (rule->mbr_mode & ~MBI_ALLPERM); - if (rule->mbr_mode & VADMIN) { + if (rule->mbr_mode & MBI_ADMIN) { len = snprintf(cur, left, "a"); if (len < 0 || len > left) goto truncated; @@ -189,7 +188,7 @@ left -= len; cur += len; } - if (rule->mbr_mode & VREAD) { + if (rule->mbr_mode & MBI_READ) { len = snprintf(cur, left, "r"); if (len < 0 || len > left) goto truncated; @@ -197,7 +196,7 @@ left -= len; cur += len; } - if (rule->mbr_mode & VSTAT) { + if (rule->mbr_mode & MBI_STAT) { len = snprintf(cur, left, "s"); if (len < 0 || len > left) goto truncated; @@ -205,7 +204,7 @@ left -= len; cur += len; } - if (rule->mbr_mode & VWRITE) { + if (rule->mbr_mode & MBI_WRITE) { len = snprintf(cur, left, "w"); if (len < 0 || len > left) goto truncated; @@ -213,7 +212,7 @@ left -= len; cur += len; } - if (rule->mbr_mode & VEXEC) { + if (rule->mbr_mode & MBI_EXEC) { len = snprintf(cur, left, "x"); if (len < 0 || len > left) goto truncated; @@ -425,19 +424,19 @@ for (i = 0; i < strlen(argv[0]); i++) { switch (argv[0][i]) { case 'a': - *mode |= VADMIN; + *mode |= MBI_ADMIN; break; case 'r': - *mode |= VREAD; + *mode |= MBI_READ; break; case 's': - *mode |= VSTAT; + *mode |= MBI_STAT; break; case 'w': - *mode |= VWRITE; + *mode |= MBI_WRITE; break; case 'x': - *mode |= VEXEC; + *mode |= MBI_EXEC; break; case 'n': /* ignore */ ==== //depot/projects/hammer/release/Makefile#64 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.865 2004/09/30 22:59:47 kensmith Exp $ +# $FreeBSD: src/release/Makefile,v 1.866 2004/10/21 08:54:10 ru Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -586,7 +586,8 @@ # Install the system into the various distributions. release.2: cd ${.CURDIR}/../etc && make distrib-dirs DESTDIR=${RD}/trees/base - cd ${.CURDIR}/.. && ${CROSSMAKE} distributeworld DISTDIR=${RD}/trees + cd ${.CURDIR}/.. && ${CROSSMAKE} ${WORLD_FLAGS} distributeworld \ + DISTDIR=${RD}/trees touch ${.TARGET} # Make and install the generic kernel(s). ==== //depot/projects/hammer/sbin/fdisk/fdisk.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/fdisk/fdisk.c,v 1.74 2004/06/14 07:21:19 phk Exp $"); +__FBSDID("$FreeBSD: src/sbin/fdisk/fdisk.c,v 1.75 2004/10/20 05:43:45 ru Exp $"); #include #include @@ -302,7 +302,7 @@ if (stat(argv[0], &sb) == 0) { /* OK, full pathname given */ disk = argv[0]; - } else if (errno == ENOENT) { + } else if (errno == ENOENT && argv[0][0] != '/') { /* Try prepending "/dev" */ asprintf(&disk, "%s%s", _PATH_DEV, argv[0]); if (disk == NULL) ==== //depot/projects/hammer/sbin/fsck_ffs/fsck.h#9 (text+ko) ==== @@ -8,6 +8,27 @@ * contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS * research program. * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * * Copyright (c) 1980, 1986, 1993 * The Regents of the University of California. All rights reserved. * @@ -36,7 +57,7 @@ * SUCH DAMAGE. * * @(#)fsck.h 8.4 (Berkeley) 5/9/95 - * $FreeBSD: src/sbin/fsck_ffs/fsck.h,v 1.33 2004/10/08 20:44:47 truckman Exp $ + * $FreeBSD: src/sbin/fsck_ffs/fsck.h,v 1.34 2004/10/20 08:01:32 rwatson Exp $ */ #include ==== //depot/projects/hammer/share/man/man5/rc.conf.5#38 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.228 2004/10/17 13:19:10 keramida Exp $ +.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.230 2004/10/20 19:05:50 keramida Exp $ .\" -.Dd September 29, 2004 +.Dd October 20, 2004 .Dt RC.CONF 5 .Os .Sh NAME @@ -1093,6 +1093,19 @@ .Pa /etc/fstab will be initialized with a random, one-shot key. Note that this makes recovery of kernel dumps impossible. +.It Va root_rw_mount +.Pq Vt bool +Set to +.Dq Li YES +by default. +After the file systems are checked at boot time, the root file system +is remounted as read-write if this is set to +.Dq Li YES . +Diskless systems that mount their root file system from a read-only remote +NFS share should set this to +.Dq Li NO +in their +.Pa rc.conf . .It Va fsck_y_enable .Pq Vt bool If set to ==== //depot/projects/hammer/share/mk/bsd.cpu.mk#25 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.44 2004/10/17 05:19:45 obrien Exp $ +# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.45 2004/10/19 17:25:33 obrien Exp $ # Set default CPU compile flags and baseline CPUTYPE for each arch. The # compile flags must support the minimum CPU type for each architecture but @@ -102,6 +102,9 @@ . else _ICC_CPUCFLAGS = . endif # ICC on 'i386' +. if ${CPUTYPE} == "i386" +CFLAGS += -DI386_CPU +. endif . elif ${MACHINE_ARCH} == "alpha" _CPUCFLAGS = -mcpu=${CPUTYPE} . elif ${MACHINE_ARCH} == "amd64" ==== //depot/projects/hammer/share/zoneinfo/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/zoneinfo/Makefile,v 1.19 2002/07/29 09:40:14 ru Exp $ +# $FreeBSD: src/share/zoneinfo/Makefile,v 1.20 2004/10/19 20:38:49 ru Exp $ CLEANFILES+= yearistype @@ -16,23 +16,13 @@ TZFILES+= backward .endif -.if exists(${.OBJDIR}/yearistype) -YEARISTYPE= ${.OBJDIR}/yearistype -.else -YEARISTYPE= ${.CURDIR}/yearistype -.endif - all: yearistype -yearistype: yearistype.sh - cp ${.ALLSRC} ${.TARGET} - chmod +x ${.TARGET} - beforeinstall: umask 022; cd ${.CURDIR}; \ zic -D -d ${DESTDIR}/usr/share/zoneinfo -p ${POSIXRULES} \ - -u ${BINOWN} -g ${BINGRP} \ - ${LEAPFILE} -y ${YEARISTYPE} ${TZFILES} + -u ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ + ${LEAPFILE} -y ${.OBJDIR}/yearistype ${TZFILES} ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ ${.CURDIR}/zone.tab ${DESTDIR}/usr/share/zoneinfo/ ==== //depot/projects/hammer/sys/alpha/alpha/promcons.c#13 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.42 2004/10/18 21:51:24 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.43 2004/10/20 16:22:53 jhb Exp $"); #include #include @@ -107,7 +107,7 @@ tp->t_dev = dev; if ((tp->t_state & TS_ISOPEN) == 0) { tp->t_state |= TS_CARR_ON; - ttyconsmode(tp, 0); + ttyconsolemode(tp, 0); ttsetwater(tp); setuptimeout = 1; ==== //depot/projects/hammer/sys/arm/arm/busdma_machdep.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.4 2004/09/23 21:57:47 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.5 2004/10/21 11:59:33 cognet Exp $"); /* * MacPPC bus dma support routines @@ -687,7 +687,7 @@ int resid; struct iovec *iov; - if (op == BUS_DMASYNC_POSTREAD) + if (op == BUS_DMASYNC_POSTWRITE) return; if (map->flags & DMAMAP_COHERENT) return; ==== //depot/projects/hammer/sys/dev/aac/aac_pci.c#16 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.48 2004/08/13 01:44:09 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.49 2004/10/21 19:14:32 scottl Exp $"); /* * PCI bus interface and resource allocation. @@ -132,6 +132,8 @@ "Dell CERC SATA RAID 2"}, {0x9005, 0x0285, 0x9005, 0x0292, AAC_HWIF_I960RX, AAC_FLAGS_NO4GB, "Adaptec SCSI RAID 2810SA"}, + {0x9005, 0x0285, 0x9005, 0x0293, AAC_HWIF_I960RX, AAC_FLAGS_NO4GB, + "Adaptec SCSI RAID 21610SA"}, {0x9005, 0x0286, 0x9005, 0x028d, AAC_HWIF_RKT, 0, "Adaptec SCSI RAID 2130S"}, {0, 0, 0, 0, 0, 0, 0} ==== //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx.c#15 (text+ko) ==== @@ -46,7 +46,7 @@ #include "aicasm/aicasm_insformat.h" #else #include -__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic7xxx.c,v 1.102 2004/08/17 00:14:30 gibbs Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic7xxx.c,v 1.103 2004/10/19 20:48:05 gibbs Exp $"); #include #include #include @@ -2828,11 +2828,17 @@ case MSG_TYPE_TARGET_MSGIN: { int msgdone; - int msgout_request; if (ahc->msgout_len == 0) panic("Target MSGIN with no active message"); +#ifdef AHC_DEBUG + if ((ahc_debug & AHC_SHOW_MESSAGES) != 0) { + ahc_print_devinfo(ahc, &devinfo); + printf("TARGET_MSG_IN"); + } +#endif + /* * If we interrupted a mesgout session, the initiator * will not know this until our first REQ. So, we @@ -2840,24 +2846,47 @@ * first byte. */ if ((ahc_inb(ahc, SCSISIGI) & ATNI) != 0 - && ahc->msgout_index > 0) - msgout_request = TRUE; - else - msgout_request = FALSE; + && ahc->msgout_index > 0) { + + /* + * Change gears and see if this messages is + * of interest to us or should be passed back + * to the sequencer. + */ +#ifdef AHC_DEBUG + if ((ahc_debug & AHC_SHOW_MESSAGES) != 0) + printf(" Honoring ATN Request.\n"); +#endif + ahc->msg_type = MSG_TYPE_TARGET_MSGOUT; - if (msgout_request) { + /* + * Disable SCSI Programmed I/O during the + * phase change so as to avoid phantom REQs. + */ + ahc_outb(ahc, SXFRCTL0, + ahc_inb(ahc, SXFRCTL0) & ~SPIOEN); /* - * Change gears and see if - * this messages is of interest to - * us or should be passed back to - * the sequencer. + * Since SPIORDY asserts when ACK is asserted + * for P_MSGOUT, and SPIORDY's assertion triggered + * our entry into this routine, wait for ACK to + * *de-assert* before changing phases. */ - ahc->msg_type = MSG_TYPE_TARGET_MSGOUT; + while ((ahc_inb(ahc, SCSISIGI) & ACKI) != 0) + ; + ahc_outb(ahc, SCSISIGO, P_MESGOUT | BSYO); + + /* + * All phase line changes require a bus + * settle delay before REQ is asserted. + * [SCSI SPI4 10.7.1] + */ + ahc_flush_device_writes(ahc); + aic_delay(AHC_BUSSETTLE_DELAY); + ahc->msgin_index = 0; - /* Dummy read to REQ for first byte */ - ahc_inb(ahc, SCSIDATL); + /* Enable SCSI Programmed I/O to REQ for first byte */ ahc_outb(ahc, SXFRCTL0, ahc_inb(ahc, SXFRCTL0) | SPIOEN); break; @@ -2874,6 +2903,11 @@ /* * Present the next byte on the bus. */ +#ifdef AHC_DEBUG + if ((ahc_debug & AHC_SHOW_MESSAGES) != 0) + printf(" byte 0x%x\n", + ahc->msgout_buf[ahc->msgout_index]); +#endif ahc_outb(ahc, SXFRCTL0, ahc_inb(ahc, SXFRCTL0) | SPIOEN); ahc_outb(ahc, SCSIDATL, ahc->msgout_buf[ahc->msgout_index++]); break; @@ -2883,6 +2917,12 @@ int lastbyte; int msgdone; +#ifdef AHC_DEBUG + if ((ahc_debug & AHC_SHOW_MESSAGES) != 0) { + ahc_print_devinfo(ahc, &devinfo); + printf("TARGET_MSG_OUT"); + } +#endif /* * The initiator signals that this is * the last byte by dropping ATN. @@ -2896,6 +2936,13 @@ */ ahc_outb(ahc, SXFRCTL0, ahc_inb(ahc, SXFRCTL0) & ~SPIOEN); ahc->msgin_buf[ahc->msgin_index] = ahc_inb(ahc, SCSIDATL); + +#ifdef AHC_DEBUG + if ((ahc_debug & AHC_SHOW_MESSAGES) != 0) + printf(" byte 0x%x\n", + ahc->msgin_buf[ahc->msgin_index]); +#endif + msgdone = ahc_parse_msg(ahc, &devinfo); if (msgdone == MSGLOOP_TERMINATED) { /* @@ -2921,7 +2968,33 @@ * to the Message in phase and send it. */ if (ahc->msgout_len != 0) { +#ifdef AHC_DEBUG + if ((ahc_debug & AHC_SHOW_MESSAGES) != 0) { + ahc_print_devinfo(ahc, &devinfo); + printf(" preparing response.\n"); + } +#endif ahc_outb(ahc, SCSISIGO, P_MESGIN | BSYO); + + /* + * All phase line changes require a bus + * settle delay before REQ is asserted. + * [SCSI SPI4 10.7.1] When transitioning + * from an OUT to an IN phase, we must + * also wait a data release delay to allow + * the initiator time to release the data + * lines. [SCSI SPI4 10.12] + */ + ahc_flush_device_writes(ahc); + aic_delay(AHC_BUSSETTLE_DELAY + + AHC_DATARELEASE_DELAY); + + /* + * Enable SCSI Programmed I/O. This will + * immediately cause SPIORDY to assert, + * and the sequencer will call our message + * loop again. + */ ahc_outb(ahc, SXFRCTL0, ahc_inb(ahc, SXFRCTL0) | SPIOEN); ahc->msg_type = MSG_TYPE_TARGET_MSGIN; @@ -7052,7 +7125,7 @@ active_scb = ahc_lookup_scb(ahc, active_scb_index); if (active_scb != scb) { if (ahc_other_scb_timeout(ahc, scb, - active_scb) != 0) + active_scb) == 0) goto bus_reset; continue; } ==== //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx.h#10 (text+ko) ==== @@ -39,7 +39,7 @@ * * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.h#85 $ * - * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.h,v 1.52 2004/08/18 16:31:56 gibbs Exp $ + * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.h,v 1.53 2004/10/19 20:48:06 gibbs Exp $ */ #ifndef _AIC7XXX_H_ @@ -181,6 +181,10 @@ /* Reset line assertion time in us */ #define AHC_BUSRESET_DELAY 25 +/* Phase change constants used in target mode. */ +#define AHC_BUSSETTLE_DELAY 400 +#define AHC_DATARELEASE_DELAY 400 + /******************* Chip Characteristics/Operating Settings *****************/ /* * Chip Type ==== //depot/projects/hammer/sys/dev/ata/ata-all.c#41 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.232 2004/10/13 15:16:35 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.233 2004/10/19 20:13:38 sos Exp $"); #include "opt_ata.h" #include @@ -306,6 +306,12 @@ } } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Oct 22 10:56:19 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 23A1416A4D0; Fri, 22 Oct 2004 10:56:19 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EBB9316A4CE for ; Fri, 22 Oct 2004 10:56:18 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E148F43D1F for ; Fri, 22 Oct 2004 10:56:18 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9MAuIHa098962 for ; Fri, 22 Oct 2004 10:56:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9MAuIM6098959 for perforce@freebsd.org; Fri, 22 Oct 2004 10:56:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 22 Oct 2004 10:56:18 GMT Message-Id: <200410221056.i9MAuIM6098959@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 63513 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Oct 2004 10:56:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=63513 Change 63513 by rwatson@rwatson_tislabs on 2004/10/22 10:55:51 M_PKTHDR assertion redundant to M_ASSERTPKTRHDR() introduced in the CVS tree. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/uipc_mbuf.c#29 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_mbuf.c#29 (text+ko) ==== @@ -303,7 +303,6 @@ * smash the pkthdr as needed causing these * assertions to trip. For now just disable them. */ - KASSERT(to->m_flags & M_PKTHDR, ("m_dup_pkthdr: called on non-header")); M_ASSERTPKTHDR(to); /* Note: with MAC, this may not be a good assertion. */ KASSERT(SLIST_EMPTY(&to->m_pkthdr.tags), ("m_dup_pkthdr: to has tags")); From owner-p4-projects@FreeBSD.ORG Fri Oct 22 11:43:21 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EBD0D16A4D0; Fri, 22 Oct 2004 11:43:20 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C201416A4CE for ; Fri, 22 Oct 2004 11:43:20 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8052C43D48 for ; Fri, 22 Oct 2004 11:43:20 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9MBhKnB000892 for ; Fri, 22 Oct 2004 11:43:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9MBhIkL000889 for perforce@freebsd.org; Fri, 22 Oct 2004 11:43:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 22 Oct 2004 11:43:18 GMT Message-Id: <200410221143.i9MBhIkL000889@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 63520 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Oct 2004 11:43:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=63520 Change 63520 by rwatson@rwatson_tislabs on 2004/10/22 11:42:56 Integrate TrustedBSD base branch from FreeBSD CVS HEAD: - libreadline update - bufwork merges, including s/specfs//. - A number of critical network stack locking bug fixes. TrustedBSD-related changes: - mac_bsdextended vnode.h cleanup - comments and white space synchronization - getnewvnode() NULL mp warning Affected files ... .. //depot/projects/trustedbsd/base/Makefile#36 integrate .. //depot/projects/trustedbsd/base/Makefile.inc1#54 integrate .. //depot/projects/trustedbsd/base/UPDATING#48 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/fsinfo.8#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-ppoutput.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/CHANGELOG#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/CHANGES#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/FREEBSD-upgrade#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/INSTALL#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/MANIFEST#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/NEWS#1 branch .. //depot/projects/trustedbsd/base/contrib/libreadline/README#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/aclocal.m4#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/bind.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/callback.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/chardefs.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/complete.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/config.h.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/configure#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/configure.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/display.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/fdl.texi#1 branch .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/hist.texinfo#3 delete .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/history.3#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/history.texi#1 branch .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/hstech.texi#1 branch .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/hstech.texinfo#3 delete .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/hsuser.texi#1 branch .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/hsuser.texinfo#3 delete .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/manvers.texinfo#3 delete .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/readline.3#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/rlman.texi#1 branch .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/rlman.texinfo#3 delete .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/rltech.texi#1 branch .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/rltech.texinfo#3 delete .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/rluser.texi#1 branch .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/rluser.texinfo#3 delete .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/rluserman.texi#1 branch .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/rluserman.texinfo#3 delete .. //depot/projects/trustedbsd/base/contrib/libreadline/doc/version.texi#1 branch .. //depot/projects/trustedbsd/base/contrib/libreadline/examples/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/examples/histexamp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/examples/rl-fgets.c#1 branch .. //depot/projects/trustedbsd/base/contrib/libreadline/funmap.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/histexpand.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/histfile.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/history.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/history.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/histsearch.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/input.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/keymaps.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/kill.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/mbutil.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/misc.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/nls.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/parens.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/posixdir.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/readline.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/readline.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/rlconf.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/rldefs.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/rlmbutil.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/rlprivate.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/rlstdc.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/rltty.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/rltty.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/rltypedefs.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/search.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/shell.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/shlib/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/signals.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/support/config.guess#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/support/config.rpath#1 branch .. //depot/projects/trustedbsd/base/contrib/libreadline/support/config.sub#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/support/mkinstalldirs#1 branch .. //depot/projects/trustedbsd/base/contrib/libreadline/support/shlib-install#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/support/shobj-conf#3 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/terminal.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/text.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/util.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libreadline/vi_mode.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/smbfs/lib/smb/kiconv.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/smbfs/lib/smb/mbuf.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/smbfs/lib/smb/nls.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/smbfs/lib/smb/rcfile.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/smbfs/lib/smb/rq.c#3 integrate .. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#40 integrate .. //depot/projects/trustedbsd/base/etc/etc.ia64/ttys#5 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.usr.dist#38 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.var.dist#11 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/dumpon#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/savecore#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ugidfw#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.shutdown#10 integrate .. //depot/projects/trustedbsd/base/etc/remote#7 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/Makefile#7 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libreadline/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libreadline/config.h#3 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libreadline/history/doc/Makefile#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libreadline/readline/Makefile#6 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libreadline/readline/doc/Makefile#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/doc/Makefile#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/rcs/rcsfreeze/Makefile#4 integrate .. //depot/projects/trustedbsd/base/include/Makefile#40 integrate .. //depot/projects/trustedbsd/base/include/rune.h#6 delete .. //depot/projects/trustedbsd/base/lib/libarchive/Makefile#6 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive.h.in#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_check_magic.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_compression_compress.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_open_fd.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_open_file.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/Makefile#15 integrate .. //depot/projects/trustedbsd/base/lib/libc/gmon/gmon.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libc/gmon/mcount.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/net/htonl.S#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/net/ntohl.S#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/Makefile.inc#22 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/frune.c#7 delete .. //depot/projects/trustedbsd/base/lib/libc/locale/mblocal.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/mbrune.3#8 delete .. //depot/projects/trustedbsd/base/lib/libc/locale/mbrune.c#6 delete .. //depot/projects/trustedbsd/base/lib/libc/locale/multibyte.3#14 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/rune.3#11 delete .. //depot/projects/trustedbsd/base/lib/libc/locale/setinvalidrune.c#6 delete .. //depot/projects/trustedbsd/base/lib/libc/locale/setlocale.3#10 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/setrunelocale.c#16 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/srune.c#6 delete .. //depot/projects/trustedbsd/base/lib/libc/locale/table.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/utf2.5#4 delete .. //depot/projects/trustedbsd/base/lib/libc/locale/utf2.c#7 delete .. //depot/projects/trustedbsd/base/lib/libc/locale/utf8.5#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/auth_des.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/auth_none.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/auth_unix.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/authunix_prot.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/bindresvport.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/clnt_bcast.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/clnt_dg.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/clnt_generic.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/clnt_perror.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/clnt_raw.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/clnt_simple.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/clnt_vc.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/des_crypt.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/des_soft.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/getnetconfig.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/getnetpath.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/getpublickey.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/getrpcport.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/key_call.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/key_prot_xdr.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/mt_misc.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/netname.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/netnamer.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/pmap_clnt.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/pmap_getmaps.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/pmap_getport.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/pmap_prot.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/pmap_prot2.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/pmap_rmt.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/rpc_callmsg.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/rpc_dtablesize.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/rpc_prot.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/rpc_soc.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/rpcb_clnt.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/rpcb_prot.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/rpcdname.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/svc.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/svc_auth.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/svc_auth_unix.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/svc_dg.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/svc_generic.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/svc_raw.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/svc_run.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/svc_vc.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/printf.3#20 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/strerror.3#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/strlcat.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/strlcpy.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/read.2#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/recv.2#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/sendfile.2#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/write.2#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/xdr/xdr.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/xdr/xdr_array.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/xdr/xdr_float.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/xdr/xdr_mem.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/xdr/xdr_rec.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/xdr/xdr_reference.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/xdr/xdr_stdio.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libkvm/kvm_proc.c#23 integrate .. //depot/projects/trustedbsd/base/lib/libmagic/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/libncurses/Makefile#15 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sig.c#16 integrate .. //depot/projects/trustedbsd/base/lib/libsmb/Makefile#4 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_exit.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_join.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libugidfw/ugidfw.c#7 integrate .. //depot/projects/trustedbsd/base/lib/msun/Makefile#11 integrate .. //depot/projects/trustedbsd/base/lib/msun/man/ieee.3#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/man/math.3#3 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/math.h#18 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/s_ilogbl.c#1 branch .. //depot/projects/trustedbsd/base/libexec/ftpd/ftpd.c#26 integrate .. //depot/projects/trustedbsd/base/libexec/ypxfr/ypxfr_main.c#6 integrate .. //depot/projects/trustedbsd/base/libexec/ypxfr/ypxfr_misc.c#7 integrate .. //depot/projects/trustedbsd/base/release/Makefile#60 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#85 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/Makefile#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/early-adopter/Makefile#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/early-adopter/article.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/errata/Makefile#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/errata/article.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/hardware/Makefile#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/hardware/Makefile.inc#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/hardware/amd64/Makefile#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/hardware/amd64/article.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/hardware/amd64/proc-amd64.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/hardware/common/hw.ent#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/hardware/common/intro.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/hardware/i386/Makefile#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/hardware/i386/article.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/hardware/i386/proc-i386.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/installation/Makefile#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/installation/Makefile.inc#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/installation/alpha/Makefile#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/installation/alpha/article.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/installation/amd64/Makefile#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/installation/amd64/article.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/installation/common/abstract.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/installation/common/artheader.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/installation/common/install.ent#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/installation/common/install.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/installation/common/layout.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/installation/common/trouble.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/installation/common/upgrade.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/installation/i386/Makefile#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/installation/i386/article.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/installation/ia64/Makefile#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/installation/ia64/article.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/installation/pc98/Makefile#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/installation/pc98/article.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/installation/sparc64/Makefile#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/installation/sparc64/article.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/installation/sparc64/install.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/readme/Makefile#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/readme/article.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/relnotes/Makefile#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/relnotes/Makefile.inc#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/relnotes/alpha/Makefile#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/relnotes/alpha/article.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/relnotes/amd64/Makefile#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/relnotes/amd64/article.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/relnotes/common/relnotes.ent#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/relnotes/i386/Makefile#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/relnotes/i386/article.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/relnotes/ia64/Makefile#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/relnotes/ia64/article.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/relnotes/pc98/Makefile#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/relnotes/pc98/article.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/relnotes/sparc64/Makefile#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/relnotes/sparc64/article.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/share/sgml/catalog#1 branch .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/share/sgml/release.dsl#1 branch .. //depot/projects/trustedbsd/base/release/scripts/print-cdrom-packages.sh#29 integrate .. //depot/projects/trustedbsd/base/sbin/dmesg/dmesg.c#10 integrate .. //depot/projects/trustedbsd/base/sbin/fdisk/fdisk.c#20 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/fsck.h#14 integrate .. //depot/projects/trustedbsd/base/share/colldef/Makefile#24 integrate .. //depot/projects/trustedbsd/base/share/examples/etc/make.conf#29 integrate .. //depot/projects/trustedbsd/base/share/man/man4/Makefile#49 integrate .. //depot/projects/trustedbsd/base/share/man/man4/aac.4#9 integrate .. //depot/projects/trustedbsd/base/share/man/man4/de.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.sparc64/auxio.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ng_ubt.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/polling.4#12 integrate .. //depot/projects/trustedbsd/base/share/man/man4/re.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/sio.4#12 integrate .. //depot/projects/trustedbsd/base/share/man/man4/tcp.4#16 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ubsa.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man5/disktab.5#6 integrate .. //depot/projects/trustedbsd/base/share/man/man5/make.conf.5#31 integrate .. //depot/projects/trustedbsd/base/share/man/man5/rc.conf.5#41 integrate .. //depot/projects/trustedbsd/base/share/man/man9/Makefile#39 integrate .. //depot/projects/trustedbsd/base/share/man/man9/bus_dma.9#8 integrate .. //depot/projects/trustedbsd/base/share/man/man9/contigmalloc.9#3 integrate .. //depot/projects/trustedbsd/base/share/man/man9/hashinit.9#1 branch .. //depot/projects/trustedbsd/base/share/man/man9/pfil.9#9 integrate .. //depot/projects/trustedbsd/base/share/man/man9/rtalloc.9#6 integrate .. //depot/projects/trustedbsd/base/share/misc/scsi_modes#3 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.cpu.mk#18 integrate .. //depot/projects/trustedbsd/base/share/mklocale/Makefile#22 integrate .. //depot/projects/trustedbsd/base/share/monetdef/Makefile#22 integrate .. //depot/projects/trustedbsd/base/share/msgdef/Makefile#22 integrate .. //depot/projects/trustedbsd/base/share/numericdef/Makefile#22 integrate .. //depot/projects/trustedbsd/base/share/numericdef/el_GR.ISO8859-7.src#2 integrate .. //depot/projects/trustedbsd/base/share/timedef/Makefile#21 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/Makefile#4 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/asia#8 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/backward#5 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/europe#7 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/leapseconds#6 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/northamerica#7 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/southamerica#8 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/zone.tab#10 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/promcons.c#12 integrate .. //depot/projects/trustedbsd/base/sys/alpha/osf1/osf1_misc.c#19 integrate .. //depot/projects/trustedbsd/base/sys/alpha/tlsb/zs_tlsb.c#12 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/nexus.c#10 integrate .. //depot/projects/trustedbsd/base/sys/amd64/pci/pci_bus.c#9 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/busdma_machdep.c#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/conf/SIMICS#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/sa11x0/assabet_machdep.c#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/common/help.common#12 integrate .. //depot/projects/trustedbsd/base/sys/boot/common/loader.8#26 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_da.h#2 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_misc.c#9 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#77 integrate .. //depot/projects/trustedbsd/base/sys/conf/kmod.mk#31 integrate .. //depot/projects/trustedbsd/base/sys/dev/aac/aac_pci.c#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi.c#39 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_cpu.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_pcib_acpi.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/ahc_isa.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx.h#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.c#40 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-card.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-queue.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#37 integrate .. //depot/projects/trustedbsd/base/sys/dev/cx/if_cx.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/cx/machdep.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/dcons/dcons.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/dcons/dcons.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/dcons/dcons_crom.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/dcons/dcons_os.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/dcons/dcons_os.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/digi/digi.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/digi/digi.h#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/ed/if_ed_pccard.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.c#34 integrate .. //depot/projects/trustedbsd/base/sys/dev/ex/if_ex.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/fdc/fdc.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/hifn/hifn7751.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/hifn/hifn7751var.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/if_ndis/if_ndis.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/md/md.c#40 integrate .. //depot/projects/trustedbsd/base/sys/dev/nmdm/nmdm.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/ofw/ofw_console.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/pbio/pbio.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/pbio/pbioio.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/pci/pci.c#35 integrate .. //depot/projects/trustedbsd/base/sys/dev/random/harvest.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/random/randomdev_soft.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/sab/sab.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/sio/sio.c#36 integrate .. //depot/projects/trustedbsd/base/sys/dev/sio/sio_pci.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/isa/ad1816.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/isa/es1888.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/isa/ess.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/isa/gusc.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/isa/mss.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/isa/sb16.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/isa/sb8.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/isa/sbc.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/au88x0.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/aureal.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/csapcm.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/ds1.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/emu10k1.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/es137x.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/fm801.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/ich.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/maestro3.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/solo.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/t4dwave.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/via8233.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/via82c686.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/buffer.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/syscons/syscons.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/syscons/sysmouse.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_bus.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/uart/uart_tty.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ubsa.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ubser.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ucycom.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ugen.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uhci_pci.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/umass.c#35 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs#38 integrate .. //depot/projects/trustedbsd/base/sys/dev/zs/zs.c#14 integrate .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_vnops.c#29 integrate .. //depot/projects/trustedbsd/base/sys/fs/specfs/spec_vnops.c#32 delete .. //depot/projects/trustedbsd/base/sys/geom/geom_io.c#26 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_subr.c#31 integrate .. //depot/projects/trustedbsd/base/sys/geom/label/g_label.c#3 integrate .. //depot/projects/trustedbsd/base/sys/geom/mirror/g_mirror.c#2 integrate .. //depot/projects/trustedbsd/base/sys/gnu/ext2fs/ext2_bmap.c#7 integrate .. //depot/projects/trustedbsd/base/sys/i386/bios/apm.c#9 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/elan-mmcr.c#18 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/nexus.c#13 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/vm_machdep.c#35 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_misc.c#13 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_socksys.c#7 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_sysi86.c#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/npx.c#26 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/pcvt/pcvt_drv.c#10 integrate .. //depot/projects/trustedbsd/base/sys/i386/pci/pci_bus.c#26 integrate .. //depot/projects/trustedbsd/base/sys/i4b/driver/i4b_ipr.c#14 integrate .. //depot/projects/trustedbsd/base/sys/i4b/driver/i4b_isppp.c#11 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/nexus.c#7 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/ssc.c#9 integrate .. //depot/projects/trustedbsd/base/sys/isa/atkbdc_isa.c#7 integrate .. //depot/projects/trustedbsd/base/sys/isa/isahint.c#4 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_condvar.c#29 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_descrip.c#51 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_event.c#29 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exec.c#47 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mutex.c#36 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_subr.c#25 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_switch.c#29 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_synch.c#40 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sysctl.c#27 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_tc.c#25 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_thread.c#40 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_xxx.c#10 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_bus.c#30 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_kdb.c#3 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_sleepqueue.c#6 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_turnstile.c#9 integrate .. //depot/projects/trustedbsd/base/sys/kern/tty.c#27 integrate .. //depot/projects/trustedbsd/base/sys/kern/tty_pty.c#19 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_domain.c#10 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_mbuf2.c#17 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket.c#43 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket2.c#37 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_syscalls.c#43 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_usrreq.c#28 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_bio.c#44 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_cluster.c#25 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_default.c#26 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#55 integrate .. //depot/projects/trustedbsd/base/sys/modules/dcons/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/modules/dcons_crom/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/modules/ipdivert/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/netgraph/device/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/net/bridge.c#23 integrate .. //depot/projects/trustedbsd/base/sys/net/bridge.h#4 integrate .. //depot/projects/trustedbsd/base/sys/net/if.c#31 integrate .. //depot/projects/trustedbsd/base/sys/net/if_ethersubr.c#40 integrate .. //depot/projects/trustedbsd/base/sys/net/if_var.h#25 integrate .. //depot/projects/trustedbsd/base/sys/net/netisr.c#9 integrate .. //depot/projects/trustedbsd/base/sys/net/raw_cb.c#10 integrate .. //depot/projects/trustedbsd/base/sys/net/raw_usrreq.c#14 integrate .. //depot/projects/trustedbsd/base/sys/netatalk/ddp_pcb.c#3 integrate .. //depot/projects/trustedbsd/base/sys/netatm/atm_socket.c#10 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#12 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#4 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#14 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#13 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#12 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#8 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_device.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_device.h#4 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_ether.c#14 integrate .. //depot/projects/trustedbsd/base/sys/netinet/if_ether.c#21 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in.h#21 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in_pcb.c#30 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in_pcb.h#25 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in_proto.c#16 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in_var.h#11 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_divert.c#24 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_divert.h#2 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_fastfwd.c#8 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_fw2.c#32 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_fw_pfil.c#2 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_input.c#39 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_var.h#25 integrate .. //depot/projects/trustedbsd/base/sys/netinet/raw_ip.c#29 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_subr.c#37 integrate .. //depot/projects/trustedbsd/base/sys/netinet/udp_usrreq.c#30 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6_pcb.c#22 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/ip6_input.c#23 integrate .. //depot/projects/trustedbsd/base/sys/netipx/ipx_pcb.c#8 integrate .. //depot/projects/trustedbsd/base/sys/netipx/ipx_usrreq.c#11 integrate .. //depot/projects/trustedbsd/base/sys/netnatm/natm.c#17 integrate .. //depot/projects/trustedbsd/base/sys/netncp/ncp_ncp.c#11 integrate .. //depot/projects/trustedbsd/base/sys/nfs4client/nfs4_vnops.c#7 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_bio.c#22 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_subs.c#18 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_vfsops.c#34 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_vnops.c#29 integrate .. //depot/projects/trustedbsd/base/sys/nfsserver/nfs_serv.c#31 integrate .. //depot/projects/trustedbsd/base/sys/pc98/pc98/fd.c#26 integrate .. //depot/projects/trustedbsd/base/sys/pc98/pc98/sio.c#33 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_de.c#17 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_vr.c#26 integrate .. //depot/projects/trustedbsd/base/sys/security/mac/mac_internal.h#6 integrate .. //depot/projects/trustedbsd/base/sys/security/mac/mac_label.c#3 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_biba/mac_biba.c#41 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_bsdextended/mac_bsdextended.c#17 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_bsdextended/mac_bsdextended.h#4 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_test/mac_test.c#31 integrate .. //depot/projects/trustedbsd/base/sys/sys/buf.h#25 integrate .. //depot/projects/trustedbsd/base/sys/sys/bufobj.h#1 branch .. //depot/projects/trustedbsd/base/sys/sys/conf.h#24 integrate .. //depot/projects/trustedbsd/base/sys/sys/ktr.h#10 integrate .. //depot/projects/trustedbsd/base/sys/sys/mac_policy.h#36 integrate .. //depot/projects/trustedbsd/base/sys/sys/mbuf.h#36 integrate .. //depot/projects/trustedbsd/base/sys/sys/proc.h#58 integrate .. //depot/projects/trustedbsd/base/sys/sys/protosw.h#10 integrate .. //depot/projects/trustedbsd/base/sys/sys/random.h#4 integrate .. //depot/projects/trustedbsd/base/sys/sys/sleepqueue.h#4 integrate .. //depot/projects/trustedbsd/base/sys/sys/socketvar.h#37 integrate .. //depot/projects/trustedbsd/base/sys/sys/sysctl.h#23 integrate .. //depot/projects/trustedbsd/base/sys/sys/tty.h#12 integrate .. //depot/projects/trustedbsd/base/sys/sys/ttydefaults.h#5 integrate .. //depot/projects/trustedbsd/base/sys/sys/turnstile.h#5 integrate .. //depot/projects/trustedbsd/base/sys/sys/vnode.h#48 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_alloc.c#27 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_balloc.c#14 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_rawread.c#10 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_softdep.c#29 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_vnops.c#31 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/dinode.h#7 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_bmap.c#12 integrate .. //depot/projects/trustedbsd/base/sys/vm/swap_pager.c#32 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_fault.c#34 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_meter.c#16 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.c#47 integrate .. //depot/projects/trustedbsd/base/tools/lib32/build32.sh#4 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/stdio/test-printfloat.c#3 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/msun/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/msun/test-ilogb.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/netinet/ipsockopt/Makefile#1 branch .. //depot/projects/trustedbsd/base/tools/regression/netinet/ipsockopt/ipsockopt.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/netinet/tcpconnect/tcpconnect.c#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/README#15 integrate .. //depot/projects/trustedbsd/base/tools/tools/nanobsd/make.conf#3 integrate .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/tbmaster.1#9 integrate .. //depot/projects/trustedbsd/base/usr.bin/fstat/Makefile#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/login/login.1#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/mklocale/mklocale.1#12 integrate .. //depot/projects/trustedbsd/base/usr.bin/mklocale/yacc.y#13 integrate .. //depot/projects/trustedbsd/base/usr.bin/netstat/main.c#11 integrate .. //depot/projects/trustedbsd/base/usr.bin/tar/bsdtar.c#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/tar/read.c#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/vi/Makefile#10 integrate .. //depot/projects/trustedbsd/base/usr.bin/xargs/strnsubst.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/config/lang.l#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mailwrapper/Makefile#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mount_smbfs/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ntp/doc/ntpdate.8#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/add/main.c#9 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/info/info.h#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/info/main.c#10 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/lib/global.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/lib/lib.h#9 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/version/main.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/version/perform.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/version/pkg_version.1#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ppp/ccp.c#9 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ppp/chat.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ppp/command.c#15 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ppp/datalink.c#9 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ppp/datalink.h#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ppp/nat_cmd.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ppp/ncp.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ppp/physical.c#10 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ppp/radius.c#10 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ppp/route.c#10 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpc.yppasswdd/Makefile#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpc.yppasswdd/yppasswdd_main.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpc.ypupdated/yp_dbupdate.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rtadvd/config.c#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rtadvd/timer.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ugidfw/ugidfw.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/wicontrol/wicontrol.c#14 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ypbind/ypbind.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/yppush/yppush_main.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ypserv/Makefile#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ypset/ypset.c#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/zic/zic.c#4 integrate Differences ... ==== //depot/projects/trustedbsd/base/Makefile#36 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.308 2004/08/18 07:17:01 ru Exp $ +# $FreeBSD: src/Makefile,v 1.309 2004/10/18 17:47:31 ru Exp $ # # The user-driven targets are: # @@ -85,7 +85,8 @@ PATH= /sbin:/bin:/usr/sbin:/usr/bin MAKEOBJDIRPREFIX?= /usr/obj -_MAKEOBJDIRPREFIX!= env -i PATH=${PATH} MAKEFLAGS="${.MAKEFLAGS}" ${MAKE} \ +_MAKEOBJDIRPREFIX!= /usr/bin/env -i \ + PATH=${PATH} MAKEFLAGS="${.MAKEFLAGS}" ${MAKE} \ -f /dev/null -V MAKEOBJDIRPREFIX dummy .if !empty(_MAKEOBJDIRPREFIX) .error MAKEOBJDIRPREFIX can only be set in environment, not as a global\ ==== //depot/projects/trustedbsd/base/Makefile.inc1#54 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.448 2004/09/27 08:23:42 dougb Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.449 2004/10/11 23:51:13 peter Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -242,7 +242,7 @@ rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c .endif .for _dir in \ - usr/bin usr/games usr/include/c++/3.3 usr/include/sys usr/lib \ + usr/bin usr/games usr/include/c++/3.4 usr/include/sys usr/lib \ usr/libexec usr/sbin usr/share/dict \ usr/share/groff_font/devX100 \ usr/share/groff_font/devX100-12 \ ==== //depot/projects/trustedbsd/base/UPDATING#48 (text+ko) ==== @@ -23,6 +23,14 @@ developers choose to disable these features on build machines to maximize performance. +20041018: + A major sweep over the tty drivers to elimnate approx 3100 + lines of copy&pasted code have been performed. As a part of + this change some tty devices have changed names: + sio devices are now named: {tty,cua}d%d[.init,.lock] + ucom devices are now named: {tty,cua}U%d[.init,.lock] + For other drivers see the commit logs. + 20041007: The FreeBSD keyword is no longer a requirement for a valid rc.d script. The rc(8) and rc.shutdown(8) scripts no longer check @@ -52,16 +60,6 @@ have all your ports/packages rebuilt before removing the old libraries. - As a temporary measure, if you do not have any 4.X executables, - you can add the following lines to /etc/libmap.conf to force - 5.X executables to use the new libraries: - - libhistory.so.4 libhistory.so.5 - libm.so.2 libm.so.3 - libopie.so.2 libopie.so.3 - libpcap.so.2 libpcap.so.3 - libreadline.so.4 libreadline.so.5 - 20040929: The pfil API has gained an additional argument to pass an inpcb. You should rebuild all pfil consuming modules: ipfw, ipfilter @@ -1953,4 +1951,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.373 2004/10/10 16:12:09 mtm Exp $ +$FreeBSD: src/UPDATING,v 1.375 2004/10/18 21:24:21 phk Exp $ ==== //depot/projects/trustedbsd/base/contrib/amd/fsinfo/fsinfo.8#6 (text+ko) ==== @@ -34,7 +34,7 @@ .\" .\" from: @(#)fsinfo.8 8.1 (Berkeley) 6/28/93 .\" $Id: fsinfo.8,v 1.3.2.5 2004/01/06 03:15:23 ezk Exp $ -.\" $FreeBSD: src/contrib/amd/fsinfo/fsinfo.8,v 1.10 2004/07/06 13:16:46 mbr Exp $ +.\" $FreeBSD: src/contrib/amd/fsinfo/fsinfo.8,v 1.11 2004/10/15 12:50:05 trhodes Exp $ .\" .Dd June 26, 1999 .Dt FSINFO 8 @@ -64,9 +64,8 @@ .Nm utility takes a set of system configuration information, and generates a coordinated set of -.I amd -, -.I mount +.Xr amd 8 , +.Xr mount 8 and .Xr mountd 8 configuration files. ==== //depot/projects/trustedbsd/base/contrib/gcc/c-ppoutput.c#2 (text+ko) ==== @@ -292,7 +292,7 @@ const cpp_string *str) { maybe_print_line (print.map, line); - fprintf (print.outf, "#ident \"%s\"\n", str->text); + fprintf (print.outf, "#ident %s\n", str->text); print.line++; } ==== //depot/projects/trustedbsd/base/contrib/libreadline/CHANGELOG#3 (text+ko) ==== @@ -697,3 +697,114 @@ - new maybe-clean target that removes the generated documentation if the build directory differs from the source directory - distclean target now depends on maybe-clean + + 7/17 + ---- +[readline-4.3 released] + + 7/18 + ---- +shlib/Makefile.in + - fix bad dependency: text.so: terminal.c, make it depend on text.c + + 8/7 + --- +support/shlib-install + - break `linux' out into its own stanza: it seems that linux + distributions are all moving to the following scheme: + + libreadline.so.4.3 installed version + libreadline.so.4 -> libreadline.so.4.3 symlink + libreadline.so -> libreadline.so.4 symlink + + 10/29 + ----- +support/shlib-install + - change INSTALL_LINK[12] to use `&&' instead of `;' so it only + tries the link if the cd succeeds; put ${echo} in there, too + - use $LN instead of `ln -s' so it works on machines without symlinks + - change special linux stanza to use cd before ln also + - change to use $INSTALL_LINK1 and $INSTALL_LINK2 appropriately + instead of explicit commands in various stanzas + + 2/1 + --- +config.h.in + - add HAVE_MBRTOWC and HAVE_MBRLEN + - add NO_MULTIBYTE_SUPPORT for new configure argument + - add STDC_HEADERS + +configure.in + - new argument --enable-multibyte (enabled by default), allows + multibyte support to be turned off even on systems that support it + - add check for ansi stdc headers with call to AC_HEADER_STDC + + 2/3 + --- +configure.in + - add call to BASH_FUNC_CTYPE_NONASCII + +config.h.in + - add CTYPE_NON_ASCII + + 2/20 + ---- + +doc/manvers.texinfo + - renamed to version.texi to match other GNU software + - UPDATE-MONTH variable is now `UPDATED-MONTH' + +doc/{hist,rlman,rluserman}.texinfo + - include version.texi + +doc/{rltech,rluser,hstech,hsuser}.texi + - changed the suffix from `texinfo' to `texi' + +doc/Makefile.in + - made appropriate changes for {{rl,hs}tech,{rl,hs}user}.texi + +doc/{rlman,rluserman}.texinfo + - changed the suffix from `texinfo' to `texi' + +doc/hist.texinfo + - renamed to history.texi to be more consistent + + 6/11 + ---- +shlib/Makefile.in + - have configure substitute value of `@LDFLAGS@' into the assignment + to SHLIB_XLDFLAGS + + 6/16 + ---- +configure.in + - readline and history libraries are now at version 5.0 + + 8/18 + ---- +support/shlib-install + - support for FreeBSD-gnu (from Robert Millan) + + 12/4 + ---- +Makefile.in + - add variables for localedir and the PACKAGE_* variables, auto-set + by configure + + 12/9 + ---- +Makefile.in + - use mkinstalldirs instead of mkdirs + + 4/22 + ---- +Makefile.in + - separate doc install/uninstall out into two new targets: + install-doc and uninstall-doc + - make install-doc and uninstall-doc prerequisites of appropriate + install and uninstall targets + +examples/rl-fgets.c + - new example from Harold Levy that wraps fgets replacement functions + that call readline in a shared library that can be interposed with + LD_PRELOAD ==== //depot/projects/trustedbsd/base/contrib/libreadline/CHANGES#3 (text+ko) ==== @@ -1,3 +1,183 @@ +This document details the changes between this version, readline-5.0, +and the previous version, readline-4.3. + +1. Changes to Readline + +a. Fixes to avoid core dumps because of null pointer references in the + multibyte character code. + +b. Fix to avoid infinite recursion caused by certain key combinations. + +c. Fixed a bug that caused the vi-mode `last command' to be set incorrectly. + +d. Readline no longer tries to read ahead more than one line of input, even + when more is available. + +e. Fixed the code that adjusts the point to not mishandle null wide + characters. + +f. Fixed a bug in the history expansion `g' modifier that caused it to skip + every other match. + +g. Fixed a bug that caused the prompt to overwrite previous output when the + output doesn't contain a newline and the locale supports multibyte + characters. This same change fixes the problem of readline redisplay + slowing down dramatically as the line gets longer in multibyte locales. + +h. History traversal with arrow keys in vi insertion mode causes the cursor + to be placed at the end of the new line, like in emacs mode. + +i. The locale initialization code does a better job of using the right + precedence and defaulting when checking the appropriate environment + variables. + +j. Fixed the history word tokenizer to handle <( and >( better when used as + part of bash. + +k. The overwrite mode code received several bug fixes to improve undo. + +l. Many speedups to the multibyte character redisplay code. + +m. The callback character reading interface should not hang waiting to read + keyboard input. + +n. Fixed a bug with redoing vi-mode `s' command. + +o. The code that initializes the terminal tracks changes made to the terminal + special characters with stty(1) (or equivalent), so that these changes + are reflected in the readline bindings. New application-callable function + to make it work: rl_tty_unset_default_bindings(). + +p. Fixed a bug that could cause garbage to be inserted in the buffer when + changing character case in vi mode when using a multibyte locale. + +q. Fixed a bug in the redisplay code that caused problems on systems + supporting multibyte characters when moving between history lines when the + new line has more glyphs but fewer bytes. + +r. Undo and redo now work better after exiting vi insertion mode. + +s. Make sure system calls are restarted after a SIGWINCH is received using + SA_RESTART. + +t. Improvements to the code that displays possible completions when using + multibyte characters. + +u. Fixed a problem when parsing nested if statements in inputrc files. + +v. The completer now takes multibyte characters into account when looking for + quoted substrings on which to perform completion. + +w. The history search functions now perform better bounds checking on the + history list. + +x. Change to history expansion functions to treat `^' as equivalent to word + one, as the documention states. + +y. Some changes to the display code to improve display and redisplay of + multibyte characters. + +z. Changes to speed up the multibyte character redisplay code. + +aa. Fixed a bug in the vi-mode `E' command that caused it to skip over the + last character of a word if invoked while point was on the word's + next-to-last character. + +bb. Fixed a bug that could cause incorrect filename quoting when + case-insensitive completion was enabled and the word being completed + contained backslashes quoting word break characters. + +cc. Fixed a bug in redisplay triggered when the prompt string contains + invisible characters. + +dd. Fixed some display (and other) bugs encountered in multibyte locales + when a non-ascii character was the last character on a line. + +ee. Fixed some display bugs caused by multibyte characters in prompt strings. + +ff. Fixed a problem with history expansion caused by non-whitespace characters + used as history word delimiters. + +gg. Fixed a problem that could cause readline to refer to freed memory when + moving between history lines while doing searches. + +hh. Improvements to the code that expands and displays prompt strings + containing multibyte characters. + +ii. Fixed a problem with vi-mode not correctly remembering the numeric argument + to the last `c'hange command for later use with `.'. + +jj. Fixed a bug in vi-mode that caused multi-digit count arguments to work + incorrectly. + +kk. Fixed a problem in vi-mode that caused the last text modification command + to not be remembered across different command lines. + +ll. Fixed problems with changing characters and changing case at the end of + the line. + +mm. Fixed a problem with readline saving the contents of the current line + before beginning a non-interactive search. + +nn. Fixed a problem with EOF detection when using rl_event_hook. + +oo. Fixed a problem with the vi mode `p' and `P' commands ignoring numeric + arguments. + +2. New Features in Readline + +a. History expansion has a new `a' modifier equivalent to the `g' modifier + for compatibility with the BSD csh. + +b. History expansion has a new `G' modifier equivalent to the BSD csh `g' + modifier, which performs a substitution once per word. + +c. All non-incremental search operations may now undo the operation of + replacing the current line with the history line. + +d. The text inserted by an `a' command in vi mode can be reinserted with + `.'. + +e. New bindable variable, `show-all-if-unmodified'. If set, the readline + completer will list possible completions immediately if there is more + than one completion and partial completion cannot be performed. + +f. There is a new application-callable `free_history_entry()' function. + +g. History list entries now contain timestamp information; the history file + functions know how to read and write timestamp information associated + with each entry. + +h. Four new key binding functions have been added: + + rl_bind_key_if_unbound() + rl_bind_key_if_unbound_in_map() + rl_bind_keyseq_if_unbound() + rl_bind_keyseq_if_unbound_in_map() >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Oct 22 12:00:44 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E2DB16A4D3; Fri, 22 Oct 2004 12:00:44 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 101F816A4CF for ; Fri, 22 Oct 2004 12:00:44 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C1E8043D45 for ; Fri, 22 Oct 2004 12:00:43 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9MC0hFU001415 for ; Fri, 22 Oct 2004 12:00:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9MC0fp1001412 for perforce@freebsd.org; Fri, 22 Oct 2004 12:00:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 22 Oct 2004 12:00:41 GMT Message-Id: <200410221200.i9MC0fp1001412@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 63521 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Oct 2004 12:00:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=63521 Change 63521 by rwatson@rwatson_tislabs on 2004/10/22 12:00:34 Integrate TrustedBSD MAC branch from TrustedBSD base branch: - libreadline update - bufwork merges, including s/specfs//. - A number of critical network stack locking bug fixes. TrustedBSD-related changes: - mac_bsdextended vnode.h cleanup - comments and white space synchronization - getnewvnode() NULL mp warning Affected files ... .. //depot/projects/trustedbsd/mac/Makefile#31 integrate .. //depot/projects/trustedbsd/mac/Makefile.inc1#49 integrate .. //depot/projects/trustedbsd/mac/UPDATING#40 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/fsinfo.8#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-ppoutput.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/CHANGELOG#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/CHANGES#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/FREEBSD-upgrade#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/INSTALL#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/MANIFEST#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/Makefile.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/NEWS#1 branch .. //depot/projects/trustedbsd/mac/contrib/libreadline/README#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/aclocal.m4#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/bind.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/callback.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/chardefs.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/complete.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/config.h.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/configure#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/configure.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/display.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/Makefile.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/fdl.texi#1 branch .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/hist.texinfo#4 delete .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/history.3#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/history.texi#1 branch .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/hstech.texi#1 branch .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/hstech.texinfo#4 delete .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/hsuser.texi#1 branch .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/hsuser.texinfo#4 delete .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/manvers.texinfo#4 delete .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/readline.3#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/rlman.texi#1 branch .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/rlman.texinfo#4 delete .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/rltech.texi#1 branch .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/rltech.texinfo#4 delete .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/rluser.texi#1 branch .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/rluser.texinfo#4 delete .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/rluserman.texi#1 branch .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/rluserman.texinfo#4 delete .. //depot/projects/trustedbsd/mac/contrib/libreadline/doc/version.texi#1 branch .. //depot/projects/trustedbsd/mac/contrib/libreadline/examples/Makefile.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/examples/histexamp.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/examples/rl-fgets.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/libreadline/funmap.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/histexpand.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/histfile.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/history.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/history.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/histsearch.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/input.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/keymaps.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/kill.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/mbutil.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/misc.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/nls.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/parens.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/posixdir.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/readline.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/readline.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/rlconf.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/rldefs.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/rlmbutil.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/rlprivate.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/rlstdc.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/rltty.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/rltty.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/rltypedefs.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/search.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/shell.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/shlib/Makefile.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/signals.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/support/config.guess#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/support/config.rpath#1 branch .. //depot/projects/trustedbsd/mac/contrib/libreadline/support/config.sub#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/support/mkinstalldirs#1 branch .. //depot/projects/trustedbsd/mac/contrib/libreadline/support/shlib-install#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/support/shobj-conf#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/terminal.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/text.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/util.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libreadline/vi_mode.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/smbfs/lib/smb/kiconv.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/smbfs/lib/smb/mbuf.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/smbfs/lib/smb/nls.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/smbfs/lib/smb/rcfile.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/smbfs/lib/smb/rq.c#3 integrate .. //depot/projects/trustedbsd/mac/etc/defaults/rc.conf#36 integrate .. //depot/projects/trustedbsd/mac/etc/etc.ia64/ttys#5 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.usr.dist#35 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.var.dist#11 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/dumpon#4 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/savecore#6 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ugidfw#2 integrate .. //depot/projects/trustedbsd/mac/etc/rc.shutdown#9 integrate .. //depot/projects/trustedbsd/mac/etc/remote#7 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libdialog/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libreadline/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libreadline/config.h#3 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libreadline/history/doc/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libreadline/readline/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libreadline/readline/doc/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/doc/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/rcs/rcsfreeze/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/include/Makefile#43 integrate .. //depot/projects/trustedbsd/mac/include/rune.h#6 delete .. //depot/projects/trustedbsd/mac/lib/libarchive/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive.h.in#2 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_check_magic.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_compression_compress.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write_open_fd.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write_open_file.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/Makefile#15 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gmon/gmon.c#11 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gmon/mcount.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/i386/net/htonl.S#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/i386/net/ntohl.S#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/Makefile.inc#20 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/frune.c#7 delete .. //depot/projects/trustedbsd/mac/lib/libc/locale/mblocal.h#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/mbrune.3#8 delete .. //depot/projects/trustedbsd/mac/lib/libc/locale/mbrune.c#6 delete .. //depot/projects/trustedbsd/mac/lib/libc/locale/multibyte.3#13 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/rune.3#10 delete .. //depot/projects/trustedbsd/mac/lib/libc/locale/setinvalidrune.c#6 delete .. //depot/projects/trustedbsd/mac/lib/libc/locale/setlocale.3#10 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/setrunelocale.c#13 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/srune.c#5 delete .. //depot/projects/trustedbsd/mac/lib/libc/locale/table.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/utf2.5#3 delete .. //depot/projects/trustedbsd/mac/lib/libc/locale/utf2.c#6 delete .. //depot/projects/trustedbsd/mac/lib/libc/locale/utf8.5#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/auth_des.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/auth_none.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/auth_unix.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/authunix_prot.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/bindresvport.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/clnt_bcast.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/clnt_dg.c#9 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/clnt_generic.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/clnt_perror.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/clnt_raw.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/clnt_simple.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/clnt_vc.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/des_crypt.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/des_soft.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/getnetconfig.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/getnetpath.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/getpublickey.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/getrpcport.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/key_call.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/key_prot_xdr.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/mt_misc.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/netname.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/netnamer.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/pmap_clnt.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/pmap_getmaps.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/pmap_getport.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/pmap_prot.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/pmap_prot2.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/pmap_rmt.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/rpc_callmsg.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/rpc_dtablesize.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/rpc_prot.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/rpc_soc.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/rpcb_clnt.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/rpcb_prot.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/rpcdname.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/svc.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/svc_auth.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/svc_auth_unix.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/svc_dg.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/svc_generic.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/svc_raw.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/svc_run.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/svc_vc.c#11 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/printf.3#18 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/strerror.3#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/strlcat.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/strlcpy.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/read.2#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/recv.2#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/sendfile.2#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/write.2#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/xdr/xdr.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/xdr/xdr_array.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/xdr/xdr_float.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/xdr/xdr_mem.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/xdr/xdr_rec.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/xdr/xdr_reference.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/xdr/xdr_stdio.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libkvm/kvm_proc.c#20 integrate .. //depot/projects/trustedbsd/mac/lib/libmagic/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/lib/libncurses/Makefile#11 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_sig.c#13 integrate .. //depot/projects/trustedbsd/mac/lib/libsmb/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_exit.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_join.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libugidfw/ugidfw.c#13 integrate .. //depot/projects/trustedbsd/mac/lib/msun/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/lib/msun/man/ieee.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/msun/man/math.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/msun/src/math.h#16 integrate .. //depot/projects/trustedbsd/mac/lib/msun/src/s_ilogbl.c#1 branch .. //depot/projects/trustedbsd/mac/libexec/ftpd/ftpd.c#25 integrate .. //depot/projects/trustedbsd/mac/libexec/ypxfr/ypxfr_main.c#6 integrate .. //depot/projects/trustedbsd/mac/libexec/ypxfr/ypxfr_misc.c#7 integrate .. //depot/projects/trustedbsd/mac/release/Makefile#57 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#72 integrate .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/Makefile#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/early-adopter/Makefile#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/early-adopter/article.sgml#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/errata/Makefile#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/errata/article.sgml#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/hardware/Makefile#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/hardware/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/hardware/amd64/Makefile#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/hardware/amd64/article.sgml#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/hardware/amd64/proc-amd64.sgml#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/hardware/common/hw.ent#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/hardware/common/intro.sgml#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/hardware/i386/Makefile#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/hardware/i386/article.sgml#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/hardware/i386/proc-i386.sgml#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/installation/Makefile#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/installation/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/installation/alpha/Makefile#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/installation/alpha/article.sgml#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/installation/amd64/Makefile#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/installation/amd64/article.sgml#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/installation/common/abstract.sgml#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/installation/common/artheader.sgml#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/installation/common/install.ent#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/installation/common/install.sgml#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/installation/common/layout.sgml#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/installation/common/trouble.sgml#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/installation/common/upgrade.sgml#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/installation/i386/Makefile#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/installation/i386/article.sgml#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/installation/ia64/Makefile#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/installation/ia64/article.sgml#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/installation/pc98/Makefile#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/installation/pc98/article.sgml#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/installation/sparc64/Makefile#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/installation/sparc64/article.sgml#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/installation/sparc64/install.sgml#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/readme/Makefile#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/readme/article.sgml#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/relnotes/Makefile#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/relnotes/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/relnotes/alpha/Makefile#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/relnotes/alpha/article.sgml#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/relnotes/amd64/Makefile#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/relnotes/amd64/article.sgml#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/relnotes/common/relnotes.ent#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/relnotes/i386/Makefile#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/relnotes/i386/article.sgml#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/relnotes/ia64/Makefile#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/relnotes/ia64/article.sgml#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/relnotes/pc98/Makefile#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/relnotes/pc98/article.sgml#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/relnotes/sparc64/Makefile#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/relnotes/sparc64/article.sgml#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/share/sgml/catalog#1 branch .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/share/sgml/release.dsl#1 branch .. //depot/projects/trustedbsd/mac/release/scripts/print-cdrom-packages.sh#26 integrate .. //depot/projects/trustedbsd/mac/sbin/dmesg/dmesg.c#9 integrate .. //depot/projects/trustedbsd/mac/sbin/fdisk/fdisk.c#18 integrate .. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/fsck.h#13 integrate .. //depot/projects/trustedbsd/mac/share/colldef/Makefile#21 integrate .. //depot/projects/trustedbsd/mac/share/examples/etc/make.conf#26 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/Makefile#43 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/aac.4#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/de.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.sparc64/auxio.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ng_ubt.4#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/polling.4#11 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/re.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/sio.4#11 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/tcp.4#14 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ubsa.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/disktab.5#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/make.conf.5#28 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/rc.conf.5#33 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/Makefile#37 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/bus_dma.9#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/contigmalloc.9#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/hashinit.9#1 branch .. //depot/projects/trustedbsd/mac/share/man/man9/pfil.9#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/rtalloc.9#6 integrate .. //depot/projects/trustedbsd/mac/share/misc/scsi_modes#3 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.cpu.mk#16 integrate .. //depot/projects/trustedbsd/mac/share/mklocale/Makefile#20 integrate .. //depot/projects/trustedbsd/mac/share/monetdef/Makefile#21 integrate .. //depot/projects/trustedbsd/mac/share/msgdef/Makefile#21 integrate .. //depot/projects/trustedbsd/mac/share/numericdef/Makefile#21 integrate .. //depot/projects/trustedbsd/mac/share/numericdef/el_GR.ISO8859-7.src#2 integrate .. //depot/projects/trustedbsd/mac/share/timedef/Makefile#20 integrate .. //depot/projects/trustedbsd/mac/share/zoneinfo/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/share/zoneinfo/asia#7 integrate .. //depot/projects/trustedbsd/mac/share/zoneinfo/backward#4 integrate .. //depot/projects/trustedbsd/mac/share/zoneinfo/europe#6 integrate .. //depot/projects/trustedbsd/mac/share/zoneinfo/leapseconds#5 integrate .. //depot/projects/trustedbsd/mac/share/zoneinfo/northamerica#6 integrate .. //depot/projects/trustedbsd/mac/share/zoneinfo/southamerica#7 integrate .. //depot/projects/trustedbsd/mac/share/zoneinfo/zone.tab#9 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/promcons.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/osf1_misc.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/tlsb/zs_tlsb.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/nexus.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/pci/pci_bus.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/conf/SIMICS#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/sa11x0/assabet_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/boot/common/help.common#13 integrate .. //depot/projects/trustedbsd/mac/sys/boot/common/loader.8#24 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_da.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_misc.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files#107 integrate .. //depot/projects/trustedbsd/mac/sys/conf/kmod.mk#27 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aac/aac_pci.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi.c#35 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_cpu.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_pcib_acpi.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/ahc_isa.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aic7xxx.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aic7xxx.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-all.c#34 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-card.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-queue.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/bge/if_bge.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/dev/cx/if_cx.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/cx/machdep.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/dcons/dcons.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/dcons/dcons.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/dcons/dcons_crom.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/dcons/dcons_os.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/dcons/dcons_os.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/digi/digi.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/digi/digi.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ed/if_ed_pccard.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/dev/em/if_em.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ex/if_ex.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fdc/fdc.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hifn/hifn7751.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hifn/hifn7751var.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/if_ndis/if_ndis.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/md/md.c#35 integrate .. //depot/projects/trustedbsd/mac/sys/dev/nmdm/nmdm.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ofw/ofw_console.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pbio/pbio.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/pbio/pbioio.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/pci/pci.c#30 integrate .. //depot/projects/trustedbsd/mac/sys/dev/random/harvest.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/random/randomdev_soft.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sab/sab.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sio/sio.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sio/sio_pci.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/isa/ad1816.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/isa/es1888.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/isa/ess.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/isa/gusc.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/isa/mss.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/isa/sb16.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/isa/sb8.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/isa/sbc.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/au88x0.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/aureal.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/csapcm.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/ds1.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/emu10k1.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/es137x.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/fm801.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/ich.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/maestro3.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/solo.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/t4dwave.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/via8233.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/via82c686.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/buffer.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/syscons/syscons.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/dev/syscons/sysmouse.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/uart/uart_bus.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/uart/uart_tty.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ubsa.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ubser.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ucycom.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ugen.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uhci_pci.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/umass.c#30 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs#34 integrate .. //depot/projects/trustedbsd/mac/sys/dev/zs/zs.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#50 integrate .. //depot/projects/trustedbsd/mac/sys/fs/specfs/spec_vnops.c#29 delete .. //depot/projects/trustedbsd/mac/sys/geom/geom_io.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_subr.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/geom/label/g_label.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/geom/mirror/g_mirror.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_bmap.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/i386/bios/apm.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/elan-mmcr.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/nexus.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/vm_machdep.c#33 integrate .. //depot/projects/trustedbsd/mac/sys/i386/ibcs2/ibcs2_misc.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/i386/ibcs2/ibcs2_socksys.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/i386/ibcs2/ibcs2_sysi86.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/npx.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/pcvt/pcvt_drv.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/i386/pci/pci_bus.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/i4b/driver/i4b_ipr.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/i4b/driver/i4b_isppp.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/nexus.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/ssc.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/isa/atkbdc_isa.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/isa/isahint.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_condvar.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#53 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_event.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#73 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_mutex.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_subr.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_switch.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_synch.c#34 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_sysctl.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_tc.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_thread.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_xxx.c#9 edit .. //depot/projects/trustedbsd/mac/sys/kern/subr_bus.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_kdb.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_sleepqueue.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_turnstile.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/kern/tty.c#25 integrate .. //depot/projects/trustedbsd/mac/sys/kern/tty_pty.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_domain.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_mbuf2.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#61 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket2.c#42 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_syscalls.c#43 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_usrreq.c#35 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_bio.c#38 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_cluster.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_default.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#66 integrate .. //depot/projects/trustedbsd/mac/sys/modules/dcons/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/dcons_crom/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sys/modules/ipdivert/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/netgraph/device/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sys/net/bridge.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/net/bridge.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/net/if.c#38 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_ethersubr.c#41 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_var.h#26 integrate .. //depot/projects/trustedbsd/mac/sys/net/netisr.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/net/raw_cb.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/net/raw_usrreq.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/netatalk/ddp_pcb.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/atm_socket.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_device.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_device.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_ether.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/if_ether.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/in.h#19 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/in_pcb.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/in_pcb.h#25 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/in_proto.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/in_var.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_divert.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_divert.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_fastfwd.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_fw2.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_fw_pfil.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_input.c#46 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_var.h#25 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/raw_ip.c#37 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_subr.c#47 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/udp_usrreq.c#36 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/in6_pcb.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/ip6_input.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/netipx/ipx_pcb.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/netipx/ipx_usrreq.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/netnatm/natm.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/netncp/ncp_ncp.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/nfs4client/nfs4_vnops.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_bio.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_subs.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_vfsops.c#33 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_vnops.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_serv.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/pc98/fd.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/pc98/sio.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_de.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_vr.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_internal.h#22 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_label.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#247 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#77 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#137 integrate .. //depot/projects/trustedbsd/mac/sys/sys/buf.h#22 integrate .. //depot/projects/trustedbsd/mac/sys/sys/bufobj.h#1 branch .. //depot/projects/trustedbsd/mac/sys/sys/conf.h#21 integrate .. //depot/projects/trustedbsd/mac/sys/sys/ktr.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#218 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mbuf.h#40 integrate .. //depot/projects/trustedbsd/mac/sys/sys/proc.h#56 integrate .. //depot/projects/trustedbsd/mac/sys/sys/protosw.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/sys/random.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/sys/sleepqueue.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/sys/socketvar.h#40 integrate .. //depot/projects/trustedbsd/mac/sys/sys/sysctl.h#21 integrate .. //depot/projects/trustedbsd/mac/sys/sys/tty.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/sys/ttydefaults.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/sys/turnstile.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/sys/vnode.h#67 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_alloc.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_balloc.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_rawread.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_softdep.c#25 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_vnops.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/dinode.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_bmap.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/vm/swap_pager.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_fault.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_meter.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_page.c#40 integrate .. //depot/projects/trustedbsd/mac/tools/lib32/build32.sh#3 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/stdio/test-printfloat.c#3 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/msun/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/msun/test-ilogb.c#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/netinet/ipsockopt/Makefile#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/netinet/ipsockopt/ipsockopt.c#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/netinet/tcpconnect/tcpconnect.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/README#15 integrate .. //depot/projects/trustedbsd/mac/tools/tools/nanobsd/make.conf#3 integrate .. //depot/projects/trustedbsd/mac/tools/tools/tinderbox/tbmaster.1#8 integrate .. //depot/projects/trustedbsd/mac/usr.bin/fstat/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/login/login.1#6 integrate .. //depot/projects/trustedbsd/mac/usr.bin/mklocale/mklocale.1#11 integrate .. //depot/projects/trustedbsd/mac/usr.bin/mklocale/yacc.y#12 integrate .. //depot/projects/trustedbsd/mac/usr.bin/netstat/main.c#11 integrate .. //depot/projects/trustedbsd/mac/usr.bin/tar/bsdtar.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/tar/read.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/vi/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/usr.bin/xargs/strnsubst.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/config/lang.l#6 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/mailwrapper/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/mount_smbfs/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ntp/doc/ntpdate.8#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/add/main.c#9 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/info/info.h#6 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/info/main.c#9 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/lib/global.c#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/lib/lib.h#9 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/version/main.c#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/version/perform.c#6 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/version/pkg_version.1#8 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ppp/ccp.c#9 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ppp/chat.c#6 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ppp/command.c#14 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ppp/datalink.c#9 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ppp/datalink.h#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ppp/nat_cmd.c#6 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ppp/ncp.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ppp/physical.c#9 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ppp/radius.c#9 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ppp/route.c#10 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/rpc.yppasswdd/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/rpc.yppasswdd/yppasswdd_main.c#6 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/rpc.ypupdated/yp_dbupdate.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/rtadvd/config.c#7 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/rtadvd/timer.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ugidfw/ugidfw.c#13 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/wicontrol/wicontrol.c#13 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ypbind/ypbind.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/yppush/yppush_main.c#6 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ypserv/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ypset/ypset.c#7 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/zic/zic.c#4 integrate Differences ... ==== //depot/projects/trustedbsd/mac/Makefile#31 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.308 2004/08/18 07:17:01 ru Exp $ +# $FreeBSD: src/Makefile,v 1.309 2004/10/18 17:47:31 ru Exp $ # # The user-driven targets are: # @@ -85,7 +85,8 @@ PATH= /sbin:/bin:/usr/sbin:/usr/bin MAKEOBJDIRPREFIX?= /usr/obj -_MAKEOBJDIRPREFIX!= env -i PATH=${PATH} MAKEFLAGS="${.MAKEFLAGS}" ${MAKE} \ +_MAKEOBJDIRPREFIX!= /usr/bin/env -i \ + PATH=${PATH} MAKEFLAGS="${.MAKEFLAGS}" ${MAKE} \ -f /dev/null -V MAKEOBJDIRPREFIX dummy .if !empty(_MAKEOBJDIRPREFIX) .error MAKEOBJDIRPREFIX can only be set in environment, not as a global\ ==== //depot/projects/trustedbsd/mac/Makefile.inc1#49 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.448 2004/09/27 08:23:42 dougb Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.449 2004/10/11 23:51:13 peter Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -242,7 +242,7 @@ rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c .endif .for _dir in \ - usr/bin usr/games usr/include/c++/3.3 usr/include/sys usr/lib \ + usr/bin usr/games usr/include/c++/3.4 usr/include/sys usr/lib \ usr/libexec usr/sbin usr/share/dict \ usr/share/groff_font/devX100 \ usr/share/groff_font/devX100-12 \ ==== //depot/projects/trustedbsd/mac/UPDATING#40 (text+ko) ==== @@ -23,6 +23,14 @@ developers choose to disable these features on build machines to maximize performance. +20041018: + A major sweep over the tty drivers to elimnate approx 3100 + lines of copy&pasted code have been performed. As a part of + this change some tty devices have changed names: + sio devices are now named: {tty,cua}d%d[.init,.lock] + ucom devices are now named: {tty,cua}U%d[.init,.lock] + For other drivers see the commit logs. + 20041007: The FreeBSD keyword is no longer a requirement for a valid rc.d script. The rc(8) and rc.shutdown(8) scripts no longer check @@ -52,16 +60,6 @@ have all your ports/packages rebuilt before removing the old libraries. - As a temporary measure, if you do not have any 4.X executables, - you can add the following lines to /etc/libmap.conf to force - 5.X executables to use the new libraries: - - libhistory.so.4 libhistory.so.5 - libm.so.2 libm.so.3 - libopie.so.2 libopie.so.3 - libpcap.so.2 libpcap.so.3 - libreadline.so.4 libreadline.so.5 - 20040929: The pfil API has gained an additional argument to pass an inpcb. You should rebuild all pfil consuming modules: ipfw, ipfilter @@ -1953,4 +1951,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.373 2004/10/10 16:12:09 mtm Exp $ +$FreeBSD: src/UPDATING,v 1.375 2004/10/18 21:24:21 phk Exp $ ==== //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/fsinfo.8#7 (text+ko) ==== @@ -34,7 +34,7 @@ .\" .\" from: @(#)fsinfo.8 8.1 (Berkeley) 6/28/93 .\" $Id: fsinfo.8,v 1.3.2.5 2004/01/06 03:15:23 ezk Exp $ -.\" $FreeBSD: src/contrib/amd/fsinfo/fsinfo.8,v 1.10 2004/07/06 13:16:46 mbr Exp $ +.\" $FreeBSD: src/contrib/amd/fsinfo/fsinfo.8,v 1.11 2004/10/15 12:50:05 trhodes Exp $ .\" .Dd June 26, 1999 .Dt FSINFO 8 @@ -64,9 +64,8 @@ .Nm utility takes a set of system configuration information, and generates a coordinated set of -.I amd -, -.I mount +.Xr amd 8 , +.Xr mount 8 and .Xr mountd 8 configuration files. ==== //depot/projects/trustedbsd/mac/contrib/gcc/c-ppoutput.c#2 (text+ko) ==== @@ -292,7 +292,7 @@ const cpp_string *str) { maybe_print_line (print.map, line); - fprintf (print.outf, "#ident \"%s\"\n", str->text); + fprintf (print.outf, "#ident %s\n", str->text); print.line++; } ==== //depot/projects/trustedbsd/mac/contrib/libreadline/CHANGELOG#4 (text+ko) ==== @@ -697,3 +697,114 @@ - new maybe-clean target that removes the generated documentation if the build directory differs from the source directory - distclean target now depends on maybe-clean + + 7/17 + ---- +[readline-4.3 released] + + 7/18 + ---- +shlib/Makefile.in + - fix bad dependency: text.so: terminal.c, make it depend on text.c + + 8/7 + --- +support/shlib-install + - break `linux' out into its own stanza: it seems that linux + distributions are all moving to the following scheme: + + libreadline.so.4.3 installed version + libreadline.so.4 -> libreadline.so.4.3 symlink + libreadline.so -> libreadline.so.4 symlink + + 10/29 + ----- +support/shlib-install + - change INSTALL_LINK[12] to use `&&' instead of `;' so it only + tries the link if the cd succeeds; put ${echo} in there, too + - use $LN instead of `ln -s' so it works on machines without symlinks + - change special linux stanza to use cd before ln also + - change to use $INSTALL_LINK1 and $INSTALL_LINK2 appropriately + instead of explicit commands in various stanzas + + 2/1 + --- +config.h.in + - add HAVE_MBRTOWC and HAVE_MBRLEN + - add NO_MULTIBYTE_SUPPORT for new configure argument + - add STDC_HEADERS + +configure.in + - new argument --enable-multibyte (enabled by default), allows + multibyte support to be turned off even on systems that support it + - add check for ansi stdc headers with call to AC_HEADER_STDC + + 2/3 + --- +configure.in + - add call to BASH_FUNC_CTYPE_NONASCII + +config.h.in + - add CTYPE_NON_ASCII + + 2/20 + ---- + +doc/manvers.texinfo + - renamed to version.texi to match other GNU software + - UPDATE-MONTH variable is now `UPDATED-MONTH' + +doc/{hist,rlman,rluserman}.texinfo + - include version.texi + +doc/{rltech,rluser,hstech,hsuser}.texi + - changed the suffix from `texinfo' to `texi' + +doc/Makefile.in + - made appropriate changes for {{rl,hs}tech,{rl,hs}user}.texi + +doc/{rlman,rluserman}.texinfo + - changed the suffix from `texinfo' to `texi' + +doc/hist.texinfo + - renamed to history.texi to be more consistent + + 6/11 + ---- +shlib/Makefile.in + - have configure substitute value of `@LDFLAGS@' into the assignment + to SHLIB_XLDFLAGS + + 6/16 + ---- +configure.in + - readline and history libraries are now at version 5.0 + + 8/18 + ---- +support/shlib-install + - support for FreeBSD-gnu (from Robert Millan) + + 12/4 + ---- +Makefile.in + - add variables for localedir and the PACKAGE_* variables, auto-set + by configure + + 12/9 + ---- +Makefile.in + - use mkinstalldirs instead of mkdirs + + 4/22 + ---- +Makefile.in + - separate doc install/uninstall out into two new targets: + install-doc and uninstall-doc + - make install-doc and uninstall-doc prerequisites of appropriate + install and uninstall targets + +examples/rl-fgets.c + - new example from Harold Levy that wraps fgets replacement functions + that call readline in a shared library that can be interposed with + LD_PRELOAD ==== //depot/projects/trustedbsd/mac/contrib/libreadline/CHANGES#4 (text+ko) ==== @@ -1,3 +1,183 @@ +This document details the changes between this version, readline-5.0, +and the previous version, readline-4.3. + +1. Changes to Readline + +a. Fixes to avoid core dumps because of null pointer references in the + multibyte character code. + +b. Fix to avoid infinite recursion caused by certain key combinations. + +c. Fixed a bug that caused the vi-mode `last command' to be set incorrectly. + +d. Readline no longer tries to read ahead more than one line of input, even + when more is available. + +e. Fixed the code that adjusts the point to not mishandle null wide + characters. + +f. Fixed a bug in the history expansion `g' modifier that caused it to skip + every other match. + +g. Fixed a bug that caused the prompt to overwrite previous output when the + output doesn't contain a newline and the locale supports multibyte + characters. This same change fixes the problem of readline redisplay + slowing down dramatically as the line gets longer in multibyte locales. + +h. History traversal with arrow keys in vi insertion mode causes the cursor + to be placed at the end of the new line, like in emacs mode. + +i. The locale initialization code does a better job of using the right + precedence and defaulting when checking the appropriate environment + variables. + +j. Fixed the history word tokenizer to handle <( and >( better when used as + part of bash. + +k. The overwrite mode code received several bug fixes to improve undo. + +l. Many speedups to the multibyte character redisplay code. + +m. The callback character reading interface should not hang waiting to read + keyboard input. + +n. Fixed a bug with redoing vi-mode `s' command. + +o. The code that initializes the terminal tracks changes made to the terminal + special characters with stty(1) (or equivalent), so that these changes + are reflected in the readline bindings. New application-callable function + to make it work: rl_tty_unset_default_bindings(). + +p. Fixed a bug that could cause garbage to be inserted in the buffer when + changing character case in vi mode when using a multibyte locale. + +q. Fixed a bug in the redisplay code that caused problems on systems + supporting multibyte characters when moving between history lines when the + new line has more glyphs but fewer bytes. + +r. Undo and redo now work better after exiting vi insertion mode. + +s. Make sure system calls are restarted after a SIGWINCH is received using + SA_RESTART. + +t. Improvements to the code that displays possible completions when using + multibyte characters. + +u. Fixed a problem when parsing nested if statements in inputrc files. + +v. The completer now takes multibyte characters into account when looking for + quoted substrings on which to perform completion. + +w. The history search functions now perform better bounds checking on the + history list. + +x. Change to history expansion functions to treat `^' as equivalent to word + one, as the documention states. + +y. Some changes to the display code to improve display and redisplay of + multibyte characters. + +z. Changes to speed up the multibyte character redisplay code. + +aa. Fixed a bug in the vi-mode `E' command that caused it to skip over the + last character of a word if invoked while point was on the word's + next-to-last character. + +bb. Fixed a bug that could cause incorrect filename quoting when + case-insensitive completion was enabled and the word being completed + contained backslashes quoting word break characters. + +cc. Fixed a bug in redisplay triggered when the prompt string contains + invisible characters. + +dd. Fixed some display (and other) bugs encountered in multibyte locales + when a non-ascii character was the last character on a line. + +ee. Fixed some display bugs caused by multibyte characters in prompt strings. + +ff. Fixed a problem with history expansion caused by non-whitespace characters + used as history word delimiters. + +gg. Fixed a problem that could cause readline to refer to freed memory when + moving between history lines while doing searches. + +hh. Improvements to the code that expands and displays prompt strings + containing multibyte characters. + +ii. Fixed a problem with vi-mode not correctly remembering the numeric argument + to the last `c'hange command for later use with `.'. + +jj. Fixed a bug in vi-mode that caused multi-digit count arguments to work + incorrectly. + +kk. Fixed a problem in vi-mode that caused the last text modification command + to not be remembered across different command lines. + +ll. Fixed problems with changing characters and changing case at the end of + the line. + +mm. Fixed a problem with readline saving the contents of the current line + before beginning a non-interactive search. + +nn. Fixed a problem with EOF detection when using rl_event_hook. + +oo. Fixed a problem with the vi mode `p' and `P' commands ignoring numeric + arguments. + +2. New Features in Readline + +a. History expansion has a new `a' modifier equivalent to the `g' modifier + for compatibility with the BSD csh. + +b. History expansion has a new `G' modifier equivalent to the BSD csh `g' + modifier, which performs a substitution once per word. + +c. All non-incremental search operations may now undo the operation of + replacing the current line with the history line. + +d. The text inserted by an `a' command in vi mode can be reinserted with + `.'. + +e. New bindable variable, `show-all-if-unmodified'. If set, the readline + completer will list possible completions immediately if there is more + than one completion and partial completion cannot be performed. + +f. There is a new application-callable `free_history_entry()' function. + +g. History list entries now contain timestamp information; the history file + functions know how to read and write timestamp information associated + with each entry. + +h. Four new key binding functions have been added: + + rl_bind_key_if_unbound() + rl_bind_key_if_unbound_in_map() + rl_bind_keyseq_if_unbound() + rl_bind_keyseq_if_unbound_in_map() >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Oct 22 22:07:06 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C86516A4D0; Fri, 22 Oct 2004 22:07:06 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 106A616A4CE for ; Fri, 22 Oct 2004 22:07:05 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BF1FF43D48 for ; Fri, 22 Oct 2004 22:07:05 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9MM75gp041747 for ; Fri, 22 Oct 2004 22:07:05 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9MM756V041744 for perforce@freebsd.org; Fri, 22 Oct 2004 22:07:05 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 22 Oct 2004 22:07:05 GMT Message-Id: <200410222207.i9MM756V041744@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 63543 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Oct 2004 22:07:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=63543 Change 63543 by rwatson@rwatson_tislabs on 2004/10/22 22:06:20 Some cleanup for merge to CVS: formatting, layout, structure. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/sysv_ipc.c#11 edit .. //depot/projects/trustedbsd/mac/sys/kern/sysv_msg.c#26 edit .. //depot/projects/trustedbsd/mac/sys/kern/sysv_sem.c#29 edit .. //depot/projects/trustedbsd/mac/sys/kern/sysv_shm.c#26 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/sysv_ipc.c#11 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/kern/sysv_msg.c#26 (text+ko) ==== @@ -218,6 +218,9 @@ { struct msqid_kernel *msqkptr; int msqid; +#ifdef MAC + int i; +#endif /* * Make sure that the msgunload maintains the consistency of the @@ -240,11 +243,8 @@ #ifdef MAC - int i; - /* Clean up the MAC label associated with the msg objects. */ for (i = 0; i < msginfo.msgtql; i++) mac_destroy_sysv_msgmsg(&msghdrs[i]); - /* Clean up the MAC label associated with the msq objects. */ for (msqid = 0; msqid < msginfo.msgmni; msqid++) mac_destroy_sysv_msgqueue(&msqids[msqid]); #endif @@ -346,7 +346,6 @@ msghdr->msg_next = free_msghdrs; free_msghdrs = msghdr; #ifdef MAC - /* XXX: Reset the MAC label */ mac_cleanup_sysv_msgmsg(msghdr); #endif } @@ -403,9 +402,9 @@ goto done2; } #ifdef MAC - if ((error = mac_check_sysv_msqctl(td->td_ucred,msqkptr,cmd))) { - MPRINTF(( - "MAC Framework: mac_check_sysv_msqctl permission denied!\n")); + error = mac_check_sysv_msqctl(td->td_ucred, msqkptr, cmd); + if (error != 0) { + MPRINTF(("mac_check_sysv_msqctl returned %d\n", error)); goto done2; } #endif @@ -431,16 +430,14 @@ * thread cannot free a certain msghdr. The msq will get * into an inconsistent state. */ - msghdr = msqkptr->u.msg_first; - while (msghdr != NULL) { - if ((error = mac_check_sysv_msgrmid(td->td_ucred, - msghdr))) { - MPRINTF( - "MAC Framework: mac_check_sysv_msgrmid permission denied\n"); - /* XXX wakeup(msqkptr); ??? */ + for (msghdr = msqkptr->u.msg_first; msghdr != NULL; + msghdr = msghdr->msg_next) { + error = mac_check_sysv_msgrmid(td->td_ucred, msghdr); + if (error != 0) { + MPRINTF(("mac_check_sysv_msgrmid returned %d\n", + error)); goto done2; } - msghdr = msghdr->msg_next; } #endif @@ -465,7 +462,6 @@ msqkptr->u.msg_qbytes = 0; /* Mark it as free */ #ifdef MAC - /* XXX: Reset the MAC label */ mac_cleanup_sysv_msgqueue(msqkptr); #endif @@ -570,9 +566,10 @@ goto done2; } #ifdef MAC - if ((error = mac_check_sysv_msqget(cred, msqkptr))) { - MPRINTF( - "MAC Framework: mac_check_sysv_msqget access denied\n"); + error = mac_check_sysv_msqget(cred, msqkptr); + if (error != 0) { + MPRINTF(("mac_check_sysv_msqget returned %d\n", + error); goto done2; } #endif @@ -694,13 +691,9 @@ } #ifdef MAC - /* - * Make sure that the thread has access rights to the message - * queue. - */ - if ((error = mac_check_sysv_msqsnd(td->td_ucred, msqkptr))) { - MPRINTF(( -"MAC Framework: mac_check_sysv_msqsnd permission denied\n")); + error = mac_check_sysv_msqsnd(td->td_ucred, msqkptr); + if (error != 0) { + MPRINTF(("mac_check_sysv_msqsnd returned %d\n", error)); goto done2; } #endif @@ -819,12 +812,12 @@ msghdr->msg_spot = -1; msghdr->msg_ts = msgsz; #ifdef MAC - mac_create_sysv_msgmsg(td->td_ucred, msqkptr, msghdr); /* - * XXX: Should the mac_check_sysv_msgmsq check follow here + * XXXMAC: Should the mac_check_sysv_msgmsq check follow here * immediately? Or, should it be checked just before the msg is * enqueued in the msgq (as it is done now)? */ + mac_create_sysv_msgmsg(td->td_ucred, msqkptr, msghdr); #endif /* @@ -930,31 +923,30 @@ goto done2; } - /* - * Put the message into the queue - */ - #ifdef MAC /* * Note: Since the task/thread allocates the msghdr and usually - * primes it with its own MAC label,for a majority of policies, it + * primes it with its own MAC label, for a majority of policies, it * won't be necessary to check whether the msghdr has access - * permissions to the msgq. The mac_check_sysv_msqsnd check would + * permissions to the msgq. The mac_check_sysv_msqsnd check would * suffice in that case. However, this hook may be required where * individual policies derive a non-identical label for the msghdr * from the current thread label and may want to check the msghdr * enqueue permissions, along with read/write permissions to the * msgq. */ - if ((error = mac_check_sysv_msgmsq(td->td_ucred,msghdr,msqkptr))) { - MPRINTF(( - "MAC Framework: mac_check_sysv_msqmsq permission denied\n")); + error = mac_check_sysv_msgmsq(td->td_ucred, msghdr, msqkptr); + if (error != 0) { + MPRINTF(("mac_check_sysv_msqmsq returned %d\n", error)); msg_freehdr(msghdr); wakeup(msqkptr); goto done2; } #endif + /* + * Put the message into the queue + */ if (msqkptr->u.msg_first == NULL) { msqkptr->u.msg_first = msghdr; msqkptr->u.msg_last = msghdr; @@ -1038,12 +1030,9 @@ } #ifdef MAC - /* - * Make sure that the thread has access rights to the message queue. - */ - if ((error = mac_check_sysv_msqrcv(td->td_ucred, msqkptr))) { - MPRINTF(( -"MAC Framework: mac_check_sysv_msqrcv permission denied\n")); + error = mac_check_sysv_msqrcv(td->td_ucred, msqkptr); + if (error != 0) { + MPRINTF(("mac_check_sysv_msqrcv returned %d\n", error)); goto done2; } #endif @@ -1062,14 +1051,11 @@ goto done2; } #ifdef MAC - /* - * Make sure that the thread has access - * rights to the message header. - */ - if ((error = mac_check_sysv_msgrcv(td->td_ucred, - msghdr))) { - MPRINTF(( - "MAC Framework: mac_check_sysv_msgrcv permission denied\n")); + error = mac_check_sysv_msgrcv(td->td_ucred, + msghdr); + if (error != 0) { + MPRINTF(("mac_check_sysv_msgrcv " + "returned %d\n", error)); goto done2; } #endif @@ -1113,16 +1099,12 @@ goto done2; } #ifdef MAC - /* - * Make sure that the thread has - * access rights to the message - * header. - */ - if ((error = - mac_check_sysv_msgrcv(td->td_ucred, - msghdr))) { - MPRINTF(( - "MAC Framework: mac_check_sysv_msgrcv permission denied\n")); + error = mac_check_sysv_msgrcv( + td->td_ucred, msghdr); + if (error != 0) { + MPRINTF(("mac_check_sysv_" + "msgrcv returned %d\n", + error)); goto done2; } #endif ==== //depot/projects/trustedbsd/mac/sys/kern/sysv_sem.c#29 (text+ko) ==== @@ -551,9 +551,9 @@ if ((error = ipcperm(td, &semakptr->u.sem_perm, IPC_R))) goto done2; #ifdef MAC - if ((error = mac_check_sysv_semctl(cred, semakptr, cmd))) { - MPRINTF(( - "MAC Framework: mac_check_sysv_semctl access denied\n")); + error = mac_check_sysv_semctl(cred, semakptr, cmd); + if (error != 0) { + MPRINTF(("mac_check_sysv_semctl returned %d\n", error)); goto done2; } #endif @@ -574,9 +574,9 @@ sema_mtxp = &sema_mtx[semid]; #ifdef MAC mtx_lock(sema_mtxp); - if ((error = mac_check_sysv_semctl(cred, semakptr, cmd))) { - MPRINTF(( - "MAC Framework: mac_check_sysv_semctl access denied\n")); + error = mac_check_sysv_semctl(cred, semakptr, cmd); + if (error != 0) { + MPRINTF(("mac_check_sysv_semctl returned %d\n", error)); goto done2; } mtx_unlock(sema_mtxp); @@ -838,10 +838,10 @@ goto done2; } #ifdef MAC - if ((error = mac_check_sysv_semget(cred, - &sema[semid]))) { - MPRINTF(( - "MAC Framework: mac_check_sysv_semget access denied\n")); + error = mac_check_sysv_semget(cred, &sema[semid]); + if (error != 0) { + MPRINTF(("mac_check_sysv_semget returned %d\n", + error); goto done2; } #endif @@ -999,14 +999,9 @@ goto done2; } #ifdef MAC - /* - * The MAC hook checks whether the thread has read (and possibly - * write) permissions to the semaphore array based on the - * sopptr->sem_op value. - */ - if ((error = mac_check_sysv_semop(td->td_ucred, semakptr, j))) { - MPRINTF(( - "MAC Framework: mac_check_sysv_semop access denied\n")); + error = mac_check_sysv_semop(td->td_ucred, semakptr, j); + if (error != 0) { + MPRINTF(("mac_check_sysv_semop returned %d\n", error)); goto done2; } #endif ==== //depot/projects/trustedbsd/mac/sys/kern/sysv_shm.c#26 (text+ko) ==== @@ -221,7 +221,6 @@ shm_nused--; shmseg->u.shm_perm.mode = SHMSEG_FREE; #ifdef MAC - /* Reset the MAC label */ mac_cleanup_sysv_shm(shmseg); #endif } @@ -295,9 +294,9 @@ */ struct shmid_kernel *shmsegptr; shmsegptr = &shmsegs[IPCID_TO_IX(shmmap_s->shmid)]; - if ((error = mac_check_sysv_shmdt(td->td_ucred, shmsegptr))) { - MPRINTF(( - "MAC Framework: mac_check_sysv_shmdt access denied\n")); + error = mac_check_sysv_shmdt(td->td_ucred, shmsegptr); + if (error != 0) { + MPRINTF(("mac_check_sysv_shmdt returned %d\n", error)); goto done2; } #endif @@ -356,9 +355,9 @@ if (error) goto done2; #ifdef MAC - if ((error = mac_check_sysv_shmat(td->td_ucred, shmseg, shmflg))) { - MPRINTF(( - "MAC Framework: mac_check_sysv_shmat access denied\n")); + error = mac_check_sysv_shmat(td->td_ucred, shmseg, shmflg); + if (error != 0) { + MPRINTF(("mac_check_sysv_shmat returned %d\n", error); goto done2; } #endif @@ -476,9 +475,9 @@ if (error) goto done2; #ifdef MAC - if ((error = mac_check_sysv_shmctl(td->td_ucred, shmseg, uap->cmd))) { - MPRINTF(( - "MAC Framework: mac_check_sysv_shmctl access denied\n")); + error = mac_check_sysv_shmctl(td->td_ucred, shmseg, uap->cmd); + if (error != 0) { + MPRINTF(("mac_check_sysv_shmctl returned %d\n", error); goto done2; } #endif @@ -564,9 +563,9 @@ goto done2; } #ifdef MAC - if ((error = mac_check_sysv_shmctl(td->td_ucred, shmseg, cmd))) { - MPRINTF(( - "MAC Framework: mac_check_sysv_shmctl access denied\n")); + error = mac_check_sysv_shmctl(td->td_ucred, shmseg, cmd); + if (error != 0) { + MPRINTF(("mac_check_sysv_shmctl returned %d\n", error)); goto done2; } #endif @@ -694,10 +693,9 @@ return (EEXIST); error = ipcperm(td, &shmseg->u.shm_perm, mode); #ifdef MAC - if ((error = mac_check_sysv_shmget(td->td_ucred,shmseg,uap->shmflg))) { - MPRINTF(( - "MAC Framework: mac_check_sysv_shmget access denied\n")); - } + error = mac_check_sysv_shmget(td->td_ucred, shmseg, uap->shmflg); + if (error != 0) + MPRINTF(("mac_check_sysv_shmget returned %d\n", error)); #endif if (error) return (error); From owner-p4-projects@FreeBSD.ORG Sat Oct 23 14:40:16 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E448416A4D0; Sat, 23 Oct 2004 14:40:15 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AA1C916A4CE for ; Sat, 23 Oct 2004 14:40:15 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 88A5F43D48 for ; Sat, 23 Oct 2004 14:40:15 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9NEeFA3002137 for ; Sat, 23 Oct 2004 14:40:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9NEeF7h002134 for perforce@freebsd.org; Sat, 23 Oct 2004 14:40:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 23 Oct 2004 14:40:15 GMT Message-Id: <200410231440.i9NEeF7h002134@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 63568 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Oct 2004 14:40:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=63568 Change 63568 by rwatson@rwatson_tislabs on 2004/10/23 14:39:20 Define AUDIT_ARG() in the !AUDIT case, as is done with audit system call enter/exit macros. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_kernel.h#7 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_kernel.h#7 (text+ko) ==== @@ -363,6 +363,9 @@ } while (0) #else /* !AUDIT */ +#define AUDIT_ARG(op, args...) do { \ + } while (0) + #define AUDIT_SYSCALL_ENTER(code, td) do { \ } while (0) From owner-p4-projects@FreeBSD.ORG Sat Oct 23 14:49:27 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3946116A4D0; Sat, 23 Oct 2004 14:49:27 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1624B16A4CE for ; Sat, 23 Oct 2004 14:49:27 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0BB2043D53 for ; Sat, 23 Oct 2004 14:49:27 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9NEnQgT002409 for ; Sat, 23 Oct 2004 14:49:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9NEnQ7T002406 for perforce@freebsd.org; Sat, 23 Oct 2004 14:49:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 23 Oct 2004 14:49:26 GMT Message-Id: <200410231449.i9NEnQ7T002406@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 63569 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Oct 2004 14:49:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=63569 Change 63569 by rwatson@rwatson_tislabs on 2004/10/23 14:48:38 Expose additional audit function prototypes for audit functions that are called regardless of AUDIT being enabled. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_kernel.h#8 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_kernel.h#8 (text+ko) ==== @@ -363,6 +363,12 @@ } while (0) #else /* !AUDIT */ + +void audit_proc_init(struct proc *p); +void audit_proc_fork(struct proc *parent, + struct proc *child); +void audit_proc_free(struct proc *p); + #define AUDIT_ARG(op, args...) do { \ } while (0) From owner-p4-projects@FreeBSD.ORG Sat Oct 23 14:49:28 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F1B9316A4DB; Sat, 23 Oct 2004 14:49:27 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7E34516A4F4 for ; Sat, 23 Oct 2004 14:49:27 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 59FC643D48 for ; Sat, 23 Oct 2004 14:49:27 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9NEnRQb002416 for ; Sat, 23 Oct 2004 14:49:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9NEnRSM002412 for perforce@freebsd.org; Sat, 23 Oct 2004 14:49:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 23 Oct 2004 14:49:27 GMT Message-Id: <200410231449.i9NEnRSM002412@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 63570 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Oct 2004 14:49:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=63570 Change 63570 by rwatson@rwatson_tislabs on 2004/10/23 14:49:09 Need to include audit_kernel.h regardless of #ifdef AUDIT to get declarations of SYSCALL_ENTER and EXIT macros. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/i386/i386/trap.c#3 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/i386/i386/trap.c#3 (text+ko) ==== @@ -72,9 +72,7 @@ #ifdef KTRACE #include #endif -#ifdef AUDIT #include -#endif #include #include From owner-p4-projects@FreeBSD.ORG Sat Oct 23 16:22:21 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CCA1B16A4D0; Sat, 23 Oct 2004 16:22:20 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A0B9916A4CE for ; Sat, 23 Oct 2004 16:22:20 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9579A43D39 for ; Sat, 23 Oct 2004 16:22:20 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9NGMK5J005313 for ; Sat, 23 Oct 2004 16:22:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9NGMK26005310 for perforce@freebsd.org; Sat, 23 Oct 2004 16:22:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 23 Oct 2004 16:22:20 GMT Message-Id: <200410231622.i9NGMK26005310@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 63574 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Oct 2004 16:22:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=63574 Change 63574 by rwatson@rwatson_tislabs on 2004/10/23 16:22:06 Do install BSM header files with installworld. Affected files ... .. //depot/projects/trustedbsd/audit3/etc/mtree/BSD.include.dist#2 edit .. //depot/projects/trustedbsd/audit3/include/Makefile#2 edit Differences ... ==== //depot/projects/trustedbsd/audit3/etc/mtree/BSD.include.dist#2 (text+ko) ==== @@ -7,6 +7,8 @@ . arpa .. + bsm + .. bsnmp .. c++ ==== //depot/projects/trustedbsd/audit3/include/Makefile#2 (text+ko) ==== @@ -27,7 +27,7 @@ LHDRS= aio.h errno.h fcntl.h linker_set.h poll.h stdint.h syslog.h \ termios.h ucontext.h -LDIRS= cam geom net net80211 netatalk netatm netgraph netinet netinet6 \ +LDIRS= bsm cam geom net net80211 netatalk netatm netgraph netinet netinet6 \ netipsec netipx netkey netnatm netncp netsmb nfs nfsclient nfsserver \ pccard posix4 sys vm From owner-p4-projects@FreeBSD.ORG Sat Oct 23 16:28:28 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D94016A4D0; Sat, 23 Oct 2004 16:28:28 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 78C4116A4CE for ; Sat, 23 Oct 2004 16:28:28 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6E1A643D1F for ; Sat, 23 Oct 2004 16:28:28 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9NGSS96005490 for ; Sat, 23 Oct 2004 16:28:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9NGSSbV005487 for perforce@freebsd.org; Sat, 23 Oct 2004 16:28:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 23 Oct 2004 16:28:28 GMT Message-Id: <200410231628.i9NGSSbV005487@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 63575 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Oct 2004 16:28:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=63575 Change 63575 by rwatson@rwatson_tislabs on 2004/10/23 16:27:37 Quick hack auditon command to make it easier to test while auditd is not yet fully functional. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.sbin/Makefile#2 edit .. //depot/projects/trustedbsd/audit3/usr.sbin/auditon/Makefile#1 add .. //depot/projects/trustedbsd/audit3/usr.sbin/auditon/auditon.c#1 add Differences ... ==== //depot/projects/trustedbsd/audit3/usr.sbin/Makefile#2 (text+ko) ==== @@ -12,6 +12,7 @@ ${_apmd} \ ${_arlconfig} \ arp \ + auditon \ ${_asf} \ ${_atm} \ ${_authpf} \ From owner-p4-projects@FreeBSD.ORG Sat Oct 23 16:32:34 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 25C3E16A4D0; Sat, 23 Oct 2004 16:32:34 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F2C4616A4CF for ; Sat, 23 Oct 2004 16:32:33 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CF0A243D1F for ; Sat, 23 Oct 2004 16:32:33 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9NGWX3h005604 for ; Sat, 23 Oct 2004 16:32:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9NGWXav005601 for perforce@freebsd.org; Sat, 23 Oct 2004 16:32:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 23 Oct 2004 16:32:33 GMT Message-Id: <200410231632.i9NGWXav005601@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 63576 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Oct 2004 16:32:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=63576 Change 63576 by rwatson@rwatson_tislabs on 2004/10/23 16:31:41 Hook up Makefile for contrib/audit_supt/audit. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.sbin/Makefile#3 edit .. //depot/projects/trustedbsd/audit3/usr.sbin/audit/Makefile#1 add Differences ... ==== //depot/projects/trustedbsd/audit3/usr.sbin/Makefile#3 (text+ko) ==== @@ -12,6 +12,7 @@ ${_apmd} \ ${_arlconfig} \ arp \ + audit \ auditon \ ${_asf} \ ${_atm} \ From owner-p4-projects@FreeBSD.ORG Sat Oct 23 16:45:51 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E17D116A4D0; Sat, 23 Oct 2004 16:45:50 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BCEB216A4CE for ; Sat, 23 Oct 2004 16:45:50 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9BD4F43D1F for ; Sat, 23 Oct 2004 16:45:50 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9NGjodu006033 for ; Sat, 23 Oct 2004 16:45:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9NGjo2j006030 for perforce@freebsd.org; Sat, 23 Oct 2004 16:45:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 23 Oct 2004 16:45:50 GMT Message-Id: <200410231645.i9NGjo2j006030@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 63578 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Oct 2004 16:45:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=63578 Change 63578 by rwatson@rwatson_tislabs on 2004/10/23 16:45:01 Very preliminary Makefile for libbsm. Affected files ... .. //depot/projects/trustedbsd/audit3/lib/libbsm/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Oct 23 17:18:30 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7599116A4D0; Sat, 23 Oct 2004 17:18:30 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4512016A4CE for ; Sat, 23 Oct 2004 17:18:30 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 36CC143D1F for ; Sat, 23 Oct 2004 17:18:30 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9NHIUuM013327 for ; Sat, 23 Oct 2004 17:18:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9NHITQE013324 for perforce@freebsd.org; Sat, 23 Oct 2004 17:18:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 23 Oct 2004 17:18:29 GMT Message-Id: <200410231718.i9NHITQE013324@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 63579 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Oct 2004 17:18:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=63579 Change 63579 by rwatson@rwatson_tislabs on 2004/10/23 17:17:55 Re-arrange some more. No matter what I do, the build doesn't love me because the source asks for "bsm/foo.h" and there is not a bsm source directory containing the include files until after an install of the include files to DESTDIR. It looks like we might want to ask Apple to rearrange their source tree so that the include files are in bsm/ inside the bsm tree rather than libbsm/. Affected files ... .. //depot/projects/trustedbsd/audit3/lib/libbsm/Makefile#2 edit Differences ... ==== //depot/projects/trustedbsd/audit3/lib/libbsm/Makefile#2 (text+ko) ==== @@ -2,15 +2,23 @@ # $FreeBSD$ # -SRCDIR=${.CURDIR}/../../contrib/bsm/lib -.PATH: ${SRCDIR} +BSMDIR= ${.CURDIR}/../../contrib/bsm -LIB= bsm +LIB= bsm SHLIB_MAJOR= 1 -SRCS= bsm_audit.c bsm_class.c bsm_control.c bsm_event.c bsm_flags.c \ - bsm_io.c bsm_mask.c bsm_notify.c bsm_token.c bsm_user.c \ - lib_wrappers.c -INCS= audit_uevents.h libbsm.h + +.PATH: ${BSMDIR}/lib +SRCS= bsm_audit.c bsm_class.c bsm_control.c bsm_event.c \ + bsm_flags.c bsm_io.c bsm_mask.c bsm_notify.c \ + bsm_token.c bsm_user.c lib_wrappers.c + +# +# Must use BSM include files from within the contrib area, not the system. +# +CFLAGS+= -I${BSMDIR} + +INCS= audit_uevents.h libbsm.h +INCSDIR= ${INCLUDEDIR}/bsm NOMAN= yes From owner-p4-projects@FreeBSD.ORG Sat Oct 23 17:22:36 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0260816A4D0; Sat, 23 Oct 2004 17:22:35 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B738016A4CE for ; Sat, 23 Oct 2004 17:22:35 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9600243D39 for ; Sat, 23 Oct 2004 17:22:35 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9NHMZE0013439 for ; Sat, 23 Oct 2004 17:22:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9NHMZUW013436 for perforce@freebsd.org; Sat, 23 Oct 2004 17:22:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 23 Oct 2004 17:22:35 GMT Message-Id: <200410231722.i9NHMZUW013436@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 63580 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Oct 2004 17:22:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=63580 Change 63580 by rwatson@rwatson_tislabs on 2004/10/23 17:22:09 Temporarily omit bsm_notify.c. Affected files ... .. //depot/projects/trustedbsd/audit3/lib/libbsm/Makefile#3 edit Differences ... ==== //depot/projects/trustedbsd/audit3/lib/libbsm/Makefile#3 (text+ko) ==== @@ -9,7 +9,7 @@ .PATH: ${BSMDIR}/lib SRCS= bsm_audit.c bsm_class.c bsm_control.c bsm_event.c \ - bsm_flags.c bsm_io.c bsm_mask.c bsm_notify.c \ + bsm_flags.c bsm_io.c bsm_mask.c \ bsm_token.c bsm_user.c lib_wrappers.c # From owner-p4-projects@FreeBSD.ORG Sat Oct 23 17:25:40 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F023C16A4D0; Sat, 23 Oct 2004 17:25:39 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C9E4916A4CE for ; Sat, 23 Oct 2004 17:25:39 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A97EA43D3F for ; Sat, 23 Oct 2004 17:25:39 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9NHPdhb013537 for ; Sat, 23 Oct 2004 17:25:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9NHPd6Z013534 for perforce@freebsd.org; Sat, 23 Oct 2004 17:25:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 23 Oct 2004 17:25:39 GMT Message-Id: <200410231725.i9NHPd6Z013534@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 63581 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Oct 2004 17:25:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=63581 Change 63581 by rwatson@rwatson_tislabs on 2004/10/23 17:24:38 Initial Makefile for auditd. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.sbin/auditd/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Oct 23 17:26:42 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A9D416A4D0; Sat, 23 Oct 2004 17:26:41 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7419516A4CE for ; Sat, 23 Oct 2004 17:26:41 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 69C4143D31 for ; Sat, 23 Oct 2004 17:26:41 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9NHQfbg013557 for ; Sat, 23 Oct 2004 17:26:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9NHQfZ3013554 for perforce@freebsd.org; Sat, 23 Oct 2004 17:26:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 23 Oct 2004 17:26:41 GMT Message-Id: <200410231726.i9NHQfZ3013554@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 63582 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Oct 2004 17:26:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=63582 Change 63582 by rwatson@rwatson_tislabs on 2004/10/23 17:26:39 Add LIBBSM. Affected files ... .. //depot/projects/trustedbsd/audit3/share/mk/bsd.libnames.mk#2 edit Differences ... ==== //depot/projects/trustedbsd/audit3/share/mk/bsd.libnames.mk#2 (text+ko) ==== @@ -16,6 +16,7 @@ LIBATM?= ${DESTDIR}${LIBDIR}/libatm.a LIBBLUETOOTH?= ${DESTDIR}${LIBDIR}/libbluetooth.a LIBBSDXML?= ${DESTDIR}${LIBDIR}/libbsdxml.a +LIBBSM?= ${DESTDIR}${LIBDIR}/libbsm.a LIBBSNMP?= ${DESTDIR}${LIBDIR}/libbsnmp.a LIBBZ2?= ${DESTDIR}${LIBDIR}/libbz2.a LIBC?= ${DESTDIR}${LIBDIR}/libc.a From owner-p4-projects@FreeBSD.ORG Sat Oct 23 17:27:43 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 706CB16A4D0; Sat, 23 Oct 2004 17:27:43 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 49E0716A4CE for ; Sat, 23 Oct 2004 17:27:43 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 27E0943D39 for ; Sat, 23 Oct 2004 17:27:43 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9NHRhgs013577 for ; Sat, 23 Oct 2004 17:27:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9NHRgE8013574 for perforce@freebsd.org; Sat, 23 Oct 2004 17:27:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 23 Oct 2004 17:27:42 GMT Message-Id: <200410231727.i9NHRgE8013574@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 63583 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Oct 2004 17:27:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=63583 Change 63583 by rwatson@rwatson_tislabs on 2004/10/23 17:26:56 Link against LIBBSM. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.sbin/auditd/Makefile#2 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.sbin/auditd/Makefile#2 (text+ko) ==== @@ -9,4 +9,7 @@ MAN= auditd.8 SRCS= auditd.c audit_warn.c +DPADD= ${LIBBSM} +LDADD= -lbsm + .include From owner-p4-projects@FreeBSD.ORG Sat Oct 23 17:31:49 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CFC7216A4D0; Sat, 23 Oct 2004 17:31:48 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AAD8016A4CE for ; Sat, 23 Oct 2004 17:31:48 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8A93E43D3F for ; Sat, 23 Oct 2004 17:31:48 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9NHVmtj013745 for ; Sat, 23 Oct 2004 17:31:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9NHVmt5013742 for perforce@freebsd.org; Sat, 23 Oct 2004 17:31:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 23 Oct 2004 17:31:48 GMT Message-Id: <200410231731.i9NHVmt5013742@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 63584 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Oct 2004 17:31:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=63584 Change 63584 by rwatson@rwatson_tislabs on 2004/10/23 17:31:14 Audit /var/audit. Affected files ... .. //depot/projects/trustedbsd/audit3/etc/mtree/BSD.var.dist#2 edit Differences ... ==== //depot/projects/trustedbsd/audit3/etc/mtree/BSD.var.dist#2 (text+ko) ==== @@ -16,6 +16,8 @@ /set uname=root .. /set mode=0750 + audit + .. backups .. crash From owner-p4-projects@FreeBSD.ORG Sat Oct 23 22:54:29 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C965F16A4D0; Sat, 23 Oct 2004 22:54:28 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A428216A4CE for ; Sat, 23 Oct 2004 22:54:28 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8455E43D1D for ; Sat, 23 Oct 2004 22:54:28 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9NMsSgX032304 for ; Sat, 23 Oct 2004 22:54:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9NMsSDs032301 for perforce@freebsd.org; Sat, 23 Oct 2004 22:54:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 23 Oct 2004 22:54:28 GMT Message-Id: <200410232254.i9NMsSDs032301@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 63605 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Oct 2004 22:54:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=63605 Change 63605 by rwatson@rwatson_tislabs on 2004/10/23 22:53:47 Revert local change to include libbsm.h via bsm directory -- instead just add the bsm/lib directory to the include search path. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_audit.c#3 edit .. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_class.c#3 edit .. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_control.c#3 edit .. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_event.c#3 edit .. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_flags.c#3 edit .. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_io.c#3 edit .. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_mask.c#3 edit .. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_notify.c#3 edit .. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_token.c#4 edit .. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_user.c#3 edit .. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/lib_wrappers.c#3 edit .. //depot/projects/trustedbsd/audit3/lib/libbsm/Makefile#4 edit Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_audit.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ #include #include -#include +#include /* array of used descriptors */ static au_record_t* open_desc_table[MAX_AUDIT_RECORDS]; ==== //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_class.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ #include #include -#include +#include /* * Parse the contents of the audit_class file to return ==== //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_control.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ #include #include -#include +#include /* * Parse the contents of the audit_control file to return ==== //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_event.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ #include #include -#include +#include /* * Parse the contents of the audit_event file to return ==== //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_flags.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ #include #include -#include +#include char *delim = ","; ==== //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_io.c#3 (text+ko) ==== @@ -40,7 +40,7 @@ #include #include -#include +#include #define READ_TOKEN_BYTES(buf, len, dest, size, bytesread, err) \ do {\ ==== //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_mask.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ #include #include -#include +#include /* MT-Safe */ static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; ==== //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_notify.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ #include /* uint32_t */ #include /* syslog() */ #include /* syslog() */ -#include +#include /* if 1, assumes a kernel that sends the right notification */ #define AUDIT_NOTIFICATION_ENABLED 1 ==== //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_token.c#4 (text+ko) ==== @@ -34,7 +34,7 @@ #include #include -#include +#include #define GET_TOKEN_AREA(t, dptr, length) \ do {\ ==== //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_user.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ #include #include -#include +#include /* * Parse the contents of the audit_user file into au_user_ent structures ==== //depot/projects/trustedbsd/audit3/contrib/bsm/lib/lib_wrappers.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ #include #include /* syslog() */ #include /* STDIN_FILENO, gete[ug]id(), getpid() */ -#include +#include #include /* [f]stat() */ #include /* sysctl() */ #include /* [f]stat(), sysctl(), gete[ug]id(), getpid() */ ==== //depot/projects/trustedbsd/audit3/lib/libbsm/Makefile#4 (text+ko) ==== @@ -15,7 +15,7 @@ # # Must use BSM include files from within the contrib area, not the system. # -CFLAGS+= -I${BSMDIR} +CFLAGS+= -I${BSMDIR}/lib INCS= audit_uevents.h libbsm.h INCSDIR= ${INCLUDEDIR}/bsm From owner-p4-projects@FreeBSD.ORG Sat Oct 23 22:57:33 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1000016A4D0; Sat, 23 Oct 2004 22:57:33 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E034E16A4CE for ; Sat, 23 Oct 2004 22:57:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C08C043D39 for ; Sat, 23 Oct 2004 22:57:32 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9NMvWac032416 for ; Sat, 23 Oct 2004 22:57:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9NMvWYm032413 for perforce@freebsd.org; Sat, 23 Oct 2004 22:57:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 23 Oct 2004 22:57:32 GMT Message-Id: <200410232257.i9NMvWYm032413@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 63606 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Oct 2004 22:57:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=63606 Change 63606 by rwatson@rwatson_tislabs on 2004/10/23 22:56:33 /etc/security is where Solaris puts audit configuration files, follow suit. Affected files ... .. //depot/projects/trustedbsd/audit3/etc/mtree/BSD.root.dist#2 edit Differences ... ==== //depot/projects/trustedbsd/audit3/etc/mtree/BSD.root.dist#2 (text+ko) ==== @@ -75,6 +75,8 @@ .. sbin .. + security + .. tmp mode=01777 .. usr From owner-p4-projects@FreeBSD.ORG Sat Oct 23 23:07:46 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B41B116A4D0; Sat, 23 Oct 2004 23:07:45 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8DF9A16A4CE for ; Sat, 23 Oct 2004 23:07:45 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7F7A843D1D for ; Sat, 23 Oct 2004 23:07:45 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9NN7jAn032744 for ; Sat, 23 Oct 2004 23:07:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9NN7jGn032741 for perforce@freebsd.org; Sat, 23 Oct 2004 23:07:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 23 Oct 2004 23:07:45 GMT Message-Id: <200410232307.i9NN7jGn032741@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 63607 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Oct 2004 23:07:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=63607 Change 63607 by rwatson@rwatson_tislabs on 2004/10/23 23:07:06 Install audit_* files from contrib/bsm/etc into /etc/security. Affected files ... .. //depot/projects/trustedbsd/audit3/etc/Makefile#2 edit Differences ... ==== //depot/projects/trustedbsd/audit3/etc/Makefile#2 (text+ko) ==== @@ -19,6 +19,16 @@ ${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config \ ${.CURDIR}/../usr.bin/mail/misc/mail.rc \ ${.CURDIR}/../usr.bin/locate/locate/locate.rc + +.if !defined(NO_AUDIT) +BSM_ETC_OPEN_FILES= ${.CURDIR}/../contrib/bsm/etc/audit_class \ + ${.CURDIR}/../contrib/bsm/etc/audit_event +BSM_ETC_RESTRICTED_FILES= ${.CURDIR}/../contrib/bsm/etc/audit_control \ + ${.CURDIR}/../contrib/bsm/etc/audit_user +BSM_ETC_EXEC_FILES= ${.CURDIR}/../contrib/bsm/etc/audit_warn +BSM_ETC_DIR= ${DESTDIR}/etc/security +.endif + .if !defined(NO_LPR) BIN1+= printcap .endif @@ -83,6 +93,14 @@ cd ${.CURDIR}/../share/termcap; ${MAKE} etc-termcap cd ${.CURDIR}/../usr.sbin/rmt; ${MAKE} etc-rmt cd ${.CURDIR}/pam.d; ${MAKE} install +.if !defined(NO_AUDIT) + cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0444 \ + ${BSM_ETC_OPEN_FILES} ${BSM_ETC_DIR} + cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0400 \ + ${BSM_ETC_RESTRICTED_FILES} ${BSM_ETC_DIR} + cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0500 \ + ${BSM_ETC_EXEC_FILES} ${BSM_ETC_DIR} +.endif .if !defined(NO_I4B) cd ${.CURDIR}/isdn; ${MAKE} install .endif From owner-p4-projects@FreeBSD.ORG Sat Oct 23 23:08:47 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 84A8B16A4D0; Sat, 23 Oct 2004 23:08:47 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6009516A4CE for ; Sat, 23 Oct 2004 23:08:47 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3EDFD43D2D for ; Sat, 23 Oct 2004 23:08:47 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9NN8lVM032764 for ; Sat, 23 Oct 2004 23:08:47 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9NN8k0k032761 for perforce@freebsd.org; Sat, 23 Oct 2004 23:08:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 23 Oct 2004 23:08:46 GMT Message-Id: <200410232308.i9NN8k0k032761@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 63608 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Oct 2004 23:08:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=63608 Change 63608 by rwatson@rwatson_tislabs on 2004/10/23 23:08:31 Don't leak "delim" symbol. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_flags.c#4 edit Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_flags.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ #include -char *delim = ","; +static char *delim = ","; /* * Convert the character representation of audit values From owner-p4-projects@FreeBSD.ORG Sat Oct 23 23:11:52 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE32516A4D0; Sat, 23 Oct 2004 23:11:51 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8A68F16A4CE for ; Sat, 23 Oct 2004 23:11:51 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6AC7F43D1F for ; Sat, 23 Oct 2004 23:11:51 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9NNBpYw032899 for ; Sat, 23 Oct 2004 23:11:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9NNBpVf032896 for perforce@freebsd.org; Sat, 23 Oct 2004 23:11:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 23 Oct 2004 23:11:51 GMT Message-Id: <200410232311.i9NNBpVf032896@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 63609 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Oct 2004 23:11:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=63609 Change 63609 by rwatson@rwatson_tislabs on 2004/10/23 23:11:22 Hook up auditd to the build. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.sbin/Makefile#4 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.sbin/Makefile#4 (text+ko) ==== @@ -13,6 +13,7 @@ ${_arlconfig} \ arp \ audit \ + auditd \ auditon \ ${_asf} \ ${_atm} \