Date: Sun, 18 May 2008 09:46:59 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 141800 for review Message-ID: <200805180946.m4I9kxhf096066@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=141800 Change 141800 by jb@freebsd3 on 2008/05/18 09:46:05 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#74 integrate .. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/articles/linux-comparison/article.sgml#3 integrate .. //depot/projects/dtrace/ports/MOVED#87 integrate .. //depot/projects/dtrace/ports/UPDATING#73 integrate .. //depot/projects/dtrace/src/etc/portsnap.conf#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/netif#9 integrate .. //depot/projects/dtrace/src/etc/rc.d/routing#5 integrate .. //depot/projects/dtrace/src/share/man/man5/portsnap.conf.5#5 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#44 integrate .. //depot/projects/dtrace/src/sys/amd64/conf/GENERIC#39 integrate .. //depot/projects/dtrace/src/sys/arm/arm/pmap.c#31 integrate .. //depot/projects/dtrace/src/sys/conf/NOTES#52 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usbdevs#37 integrate .. //depot/projects/dtrace/src/sys/dev/usb/uscanner.c#12 integrate .. //depot/projects/dtrace/src/sys/i386/conf/GENERIC#36 integrate .. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#40 integrate .. //depot/projects/dtrace/src/sys/ia64/ia64/pmap.c#17 integrate .. //depot/projects/dtrace/src/sys/mips/mips/pmap.c#4 integrate .. //depot/projects/dtrace/src/sys/pc98/conf/GENERIC#19 integrate .. //depot/projects/dtrace/src/sys/powerpc/booke/pmap.c#3 integrate .. //depot/projects/dtrace/src/sys/powerpc/powerpc/mmu_if.m#8 integrate .. //depot/projects/dtrace/src/sys/powerpc/powerpc/pmap_dispatch.c#12 integrate .. //depot/projects/dtrace/src/sys/sparc64/conf/GENERIC#23 integrate .. //depot/projects/dtrace/src/sys/sparc64/sparc64/pmap.c#18 integrate .. //depot/projects/dtrace/src/sys/sun4v/sun4v/pmap.c#28 integrate .. //depot/projects/dtrace/src/sys/vm/device_pager.c#7 integrate .. //depot/projects/dtrace/src/sys/vm/pmap.h#12 integrate .. //depot/projects/dtrace/src/sys/vm/vm_mmap.c#14 integrate .. //depot/projects/dtrace/src/tools/regression/doat/Makefile#1 branch .. //depot/projects/dtrace/src/tools/regression/doat/README#1 branch .. //depot/projects/dtrace/src/tools/regression/doat/doat.c#1 branch .. //depot/projects/dtrace/src/usr.bin/tar/Makefile#7 integrate .. //depot/projects/dtrace/src/usr.bin/tar/bsdtar.1#11 integrate .. //depot/projects/dtrace/src/usr.bin/tar/bsdtar.c#10 integrate .. //depot/projects/dtrace/src/usr.bin/tar/bsdtar.h#8 integrate .. //depot/projects/dtrace/src/usr.bin/tar/read.c#9 integrate .. //depot/projects/dtrace/src/usr.bin/tar/siginfo.c#1 branch .. //depot/projects/dtrace/src/usr.bin/tar/write.c#10 integrate .. //depot/projects/dtrace/src/usr.sbin/portsnap/portsnap/portsnap.sh#8 integrate .. //depot/projects/dtrace/www/en/docproj/translations.sgml#13 integrate .. //depot/projects/dtrace/www/hu/about.sgml#4 integrate .. //depot/projects/dtrace/www/hu/community/mailinglists.sgml#3 integrate .. //depot/projects/dtrace/www/hu/community/newsgroups.sgml#2 integrate .. //depot/projects/dtrace/www/hu/developers/cvs.sgml#3 integrate .. //depot/projects/dtrace/www/hu/docs/books.sgml#6 integrate .. //depot/projects/dtrace/www/hu/index.xsl#6 integrate .. //depot/projects/dtrace/www/hu/mailto.sgml#3 integrate .. //depot/projects/dtrace/www/hu/platforms/ppc.sgml#3 integrate .. //depot/projects/dtrace/www/hu/search/search.sgml#5 integrate .. //depot/projects/dtrace/www/hu/search/site.map#3 integrate .. //depot/projects/dtrace/www/hu/search/web.atoz#4 integrate .. //depot/projects/dtrace/www/hu/share/sgml/navibar.l10n.ent#5 integrate .. //depot/projects/dtrace/www/hu/where.sgml#6 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#74 (text+ko) ==== @@ -1,4 +1,4 @@ -<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.791 2008/05/06 13:00:00 itetcu Exp $ --> +<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.792 2008/05/17 15:23:58 lippe Exp $ --> <!-- NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical order by first name. @@ -5498,6 +5498,11 @@ </listitem> <listitem> + <para>Luiz Otavio O Souza + <email>loos.br@gmail.com</email></para> + </listitem> + + <listitem> <para>Lupe Christoph <email>lupe@lupe-christoph.de</email></para> </listitem> ==== //depot/projects/dtrace/doc/hu_HU.ISO8859-2/articles/linux-comparison/article.sgml#3 (text+ko) ==== @@ -28,7 +28,7 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/hu_HU.ISO8859-2/articles/linux-comparison/article.sgml,v 1.4 2008/03/05 13:07:53 gabor Exp $ + $FreeBSD: doc/hu_HU.ISO8859-2/articles/linux-comparison/article.sgml,v 1.5 2008/05/17 14:24:24 pgj Exp $ --> <!-- The FreeBSD Hungarian Documentation Project @@ -59,7 +59,7 @@ <holder role="mailto:dru@isecom.org">Dru Lavigne</holder> </copyright> - <releaseinfo>$FreeBSD: doc/hu_HU.ISO8859-2/articles/linux-comparison/article.sgml,v 1.4 2008/03/05 13:07:53 gabor Exp $</releaseinfo> + <releaseinfo>$FreeBSD: doc/hu_HU.ISO8859-2/articles/linux-comparison/article.sgml,v 1.5 2008/05/17 14:24:24 pgj Exp $</releaseinfo> <legalnotice id="trademarks" role="trademarks"> &tm-attrib.freebsd; @@ -351,7 +351,7 @@ <varlistentry> <term>MAC</term> - <listitem><para>A <ulink url="&url.base;/doc/en_US.ISO8859-1/books/handbook/mac.html">MAC</ulink>, + <listitem><para>A <ulink url="&url.base;/doc/hu_HU.ISO8859-2/books/handbook/mac.html">MAC</ulink>, avagy Mandatory Access Control lehetõvé teszi a fájlokhoz való hozzáférési jog finomhangolását, kiegészítve ezzel @@ -512,8 +512,8 @@ rendszer részeként és az Interneten is. A man oldalak világosak és tömörek és mûködõ példákat is tartalmaznak. - <ulink url="&url.base;/doc/en_US.ISO8859-1/books/handbook/"> - A &os; Kézikönyv</ulink> + <ulink url="&url.base;/doc/hu_HU.ISO8859-2/books/handbook/"> + A &os; kézikönyv</ulink> háttérinformációkat és konfigurációs példákat nyújt majdnem minden feladathoz, amin egy &os; felhasználó @@ -521,7 +521,7 @@ során.</para></listitem> <listitem><para>A &os; sok <ulink - url="&url.base;/doc/en_US.ISO8859-1/books/handbook/eresources.html#ERESOURCES-MAIL"> + url="&url.base;/doc/hu_HU.ISO8859-2/books/handbook/eresources.html#ERESOURCES-MAIL"> levelezési listával</ulink> rendelkezik, ahol a válaszok archiválva vannak és teljes mértékben kereshetõek. Ha olyan ==== //depot/projects/dtrace/ports/MOVED#87 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1594 2008/05/15 22:00:08 flz Exp $ +# $FreeBSD: ports/MOVED,v 1.1596 2008/05/17 19:17:42 miwi Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -3475,3 +3475,5 @@ devel/swigruby||2008-05-11|Has expired: use devel/swig13 instead, last release was 8 years ago japanese/epson-ttfonts||2008-05-12|Removed because of extremely restrictive license x11-servers/xorg-printserver||2008-05-15|Has expired, software is obsolete +www/mod_evasive20|www/mod_evasive|2008-05-17|No reason to have the 20 in the name, so remove it. +multimedia/smplayer-qt4||2008-05-17|Functionality is now included in smplayer. ==== //depot/projects/dtrace/ports/UPDATING#73 (text+ko) ==== @@ -6,6 +6,18 @@ time you update your ports collection, before attempting any port upgrades. +20080517: + AFFECTS: users of multimedia/smplayer-* + AUTHOR: miwi@FreeBSD.org + + The slave port multimedia/smplayer-qt4 has been removed + with the upgrade of multimedia/smplayer to 0.6.0, qt3 is + no longer supported. They are now fully integrated into + multimedia/smplayer. + + Please uninstall multimedia/smplayer-qt4 port before + upgrading multimedia/smplayer to version 0.6.0 or higher. + 20080513: AFFECTS: users of secutity/amavisd-new AUTHOR: scheidell@secnap.net @@ -15,20 +27,20 @@ sql schema. If you have third party programs that access sql tables, you will need to update those also. -COMPATIBILITY WITH 2.5.4 + COMPATIBILITY WITH 2.5.4 -- when using SQL for logging (e.g. for a pen pals feature) or for - quarantining, SQL tables tables maddr, msgs, msgrcpt and quarantine need - to be extended by a new field 'partition_tag'; see below for details; + - when using SQL for logging (e.g. for a pen pals feature) or for + quarantining, SQL tables tables maddr, msgs, msgrcpt and quarantine need + to be extended by a new field 'partition_tag'; see below for details; -- when SQL logging (pen pals) or SQL lookups are used, one can choose a - binary or a character data type for fields users.email, mailaddr.email, - and maddr.email; now may be a good opportunity to change a data type - to binary (string of bytes); see below for details; + - when SQL logging (pen pals) or SQL lookups are used, one can choose a + binary or a character data type for fields users.email, mailaddr.email, + and maddr.email; now may be a good opportunity to change a data type + to binary (string of bytes); see below for details; -- when using SQL for logging, a default for $sql_clause{'upd_msg'} - has changed, so if a configuration file replaces this SQL clause - by a non-default setting, it needs to be updated; + - when using SQL for logging, a default for $sql_clause{'upd_msg'} + has changed, so if a configuration file replaces this SQL clause + by a non-default setting, it needs to be updated; Full information in /usr/local/share/doc/amavisd-new/RELEASE_NOTES @@ -6425,4 +6437,4 @@ 2) Update all p5-* modules. portupgrade -f p5-\* -$FreeBSD: ports/UPDATING,v 1.629 2008/05/13 13:44:23 gabor Exp $ +$FreeBSD: ports/UPDATING,v 1.631 2008/05/17 19:17:42 miwi Exp $ ==== //depot/projects/dtrace/src/etc/portsnap.conf#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/portsnap.conf,v 1.3 2006/01/18 03:40:57 cperciva Exp $ +# $FreeBSD: src/etc/portsnap.conf,v 1.4 2008/05/17 16:26:27 cperciva Exp $ # Default directory where compressed snapshots are stored. # WORKDIR=/var/db/portsnap @@ -28,3 +28,8 @@ # # REFUSE arabic chinese french german hebrew hungarian japanese # REFUSE korean polish portuguese russian ukrainian vietnamese + +# List of INDEX files to build and the DESCRIBE file to use for each +INDEX INDEX-5 DESCRIBE.5 +INDEX INDEX-6 DESCRIBE.6 +INDEX INDEX-7 DESCRIBE.7 ==== //depot/projects/dtrace/src/etc/rc.d/netif#9 (text+ko) ==== @@ -22,7 +22,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/netif,v 1.27 2008/05/15 01:06:10 brooks Exp $ +# $FreeBSD: src/etc/rc.d/netif,v 1.28 2008/05/18 02:57:54 brooks Exp $ # # PROVIDE: netif @@ -70,29 +70,6 @@ # Configure the interface(s). network_common ifn_start - if [ -z "$cmdifn" ]; then - dhcp_interfaces=`list_net_interfaces dhcp` - if [ -n "${dhcp_interfaces}" ]; then - delay=${if_up_delay} - while [ ${delay} -gt 0 ]; do - defif=`get_default_if -inet` - if [ -n "${defif}" ]; then - if [ ${delay} -ne ${if_up_delay} ]; then - echo "($defif)" - fi - break - fi - if [ ${delay} -eq ${if_up_delay} ]; then - echo -n "Waiting for an interface to come up: " - else - echo -n . - fi - sleep 1 - delay=`expr $delay - 1` - done - fi - fi - if [ -f /etc/rc.d/ipfilter ] ; then # Resync ipfilter /etc/rc.d/ipfilter quietresync ==== //depot/projects/dtrace/src/etc/rc.d/routing#5 (text+ko) ==== @@ -2,14 +2,15 @@ # # Configure routing and miscellaneous network tunables # -# $FreeBSD: src/etc/rc.d/routing,v 1.143 2007/05/02 15:49:30 mtm Exp $ +# $FreeBSD: src/etc/rc.d/routing,v 1.144 2008/05/18 02:57:54 brooks Exp $ # # PROVIDE: routing -# REQUIRE: netif ppp +# REQUIRE: devd netif ppp # KEYWORD: nojail . /etc/rc.subr +. /etc/network.subr name="routing" start_cmd="routing_start" @@ -22,6 +23,31 @@ { static_start options_start + + # Return without waiting if we don't have dhcp interfaces. + # Once we can test that the link is actually up, we should + # remove this test and always wait. + dhcp_interfaces=`list_net_interfaces dhcp` + [ -z "`list_net_interfaces dhcp`" ] && return + + # Wait for a default route + delay=${if_up_delay} + while [ ${delay} -gt 0 ]; do + defif=`get_default_if -inet` + if [ -n "${defif}" ]; then + if [ ${delay} -ne ${if_up_delay} ]; then + echo "($defif)" + fi + break + fi + if [ ${delay} -eq ${if_up_delay} ]; then + echo -n "Waiting ${delay}s for an interface to come up: " + else + echo -n . + fi + sleep 1 + delay=`expr $delay - 1` + done } routing_stop() ==== //depot/projects/dtrace/src/share/man/man5/portsnap.conf.5#5 (text+ko) ==== @@ -23,7 +23,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/portsnap.conf.5,v 1.3 2006/09/18 15:24:20 ru Exp $ +.\" $FreeBSD: src/share/man/man5/portsnap.conf.5,v 1.4 2008/05/17 16:26:27 cperciva Exp $ .\" .Dd January 30, 2005 .Dt PORTSNAP.CONF 5 @@ -89,6 +89,13 @@ .Nm then only the last one will take effect. .Pp +A line of the form +.Dl INDEX INDEXFILE DESCRIBEFILE +will instruct +.Xr portsnap 8 +that the specified INDEX file is generated from the specified +describe file distributed by the portsnap server. +.Pp Finally, a line of the form .Dl REFUSE foo bar will instruct ==== //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#44 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.617 2008/05/11 20:33:46 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.618 2008/05/18 04:16:55 alc Exp $"); /* * Manages physical address maps. @@ -4458,18 +4458,6 @@ critical_exit(); } -vm_offset_t -pmap_addr_hint(vm_object_t obj, vm_offset_t addr, vm_size_t size) -{ - - if ((obj == NULL) || (size < NBPDR) || (obj->type != OBJT_DEVICE)) { - return addr; - } - - addr = (addr + (NBPDR - 1)) & ~(NBPDR - 1); - return addr; -} - /* * Increase the starting virtual address of the given mapping if a * different alignment might result in more superpage mappings. ==== //depot/projects/dtrace/src/sys/amd64/conf/GENERIC#39 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.498 2008/05/03 17:05:38 sam Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.499 2008/05/17 23:49:59 remko Exp $ cpu HAMMER ident GENERIC @@ -196,6 +196,7 @@ device em # Intel PRO/1000 adapter Gigabit Ethernet Card device ixgb # Intel PRO/10GbE Ethernet Card device le # AMD Am7900 LANCE and Am79C9xx PCnet +device ti # Alteon Networks Tigon I/II gigabit Ethernet device txp # 3Com 3cR990 (``Typhoon'') device vx # 3Com 3c590, 3c595 (``Vortex'') @@ -219,7 +220,6 @@ device sis # Silicon Integrated Systems SiS 900/SiS 7016 device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet device ste # Sundance ST201 (D-Link DFE-550TX) -device ti # Alteon Networks Tigon I/II gigabit Ethernet device tl # Texas Instruments ThunderLAN device tx # SMC EtherPower II (83c170 ``EPIC'') device vge # VIA VT612x gigabit Ethernet ==== //depot/projects/dtrace/src/sys/arm/arm/pmap.c#31 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.100 2008/05/09 23:31:41 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.101 2008/05/18 04:16:55 alc Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -4350,13 +4350,6 @@ } -vm_offset_t -pmap_addr_hint(vm_object_t obj, vm_offset_t addr, vm_size_t size) -{ - - return(addr); -} - /* * Increase the starting virtual address of the given mapping if a * different alignment might result in more superpage mappings. ==== //depot/projects/dtrace/src/sys/conf/NOTES#52 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1486 2008/05/16 06:50:40 benno Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1487 2008/05/17 23:50:00 remko Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1917,7 +1917,6 @@ device sis # Silicon Integrated Systems SiS 900/SiS 7016 device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet device ste # Sundance ST201 (D-Link DFE-550TX) -device ti # Alteon Networks Tigon I/II gigabit Ethernet device tl # Texas Instruments ThunderLAN device tx # SMC EtherPower II (83c170 ``EPIC'') device vr # VIA Rhine, Rhine II @@ -1932,6 +1931,7 @@ device le # AMD Am7900 LANCE and Am79C9xx PCnet device mxge # Myricom Myri-10G 10GbE NIC device nxge # Neterion Xframe 10GbE Server/Storage Adapter +device ti # Alteon Networks Tigon I/II gigabit Ethernet device txp # 3Com 3cR990 (``Typhoon'') device vx # 3Com 3c590, 3c595 (``Vortex'') ==== //depot/projects/dtrace/src/sys/dev/usb/usbdevs#37 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.354 2008/05/16 19:47:15 remko Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.355 2008/05/18 03:07:40 remko Exp $ /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */ /*- @@ -1216,6 +1216,7 @@ product EPSON CX5400 0x0808 CX5400 scanner product EPSON 3500 0x080e CX-3500/3600/3650 MFP product EPSON RX425 0x080f Stylus Photo RX425 scanner +product EPSON 4800 0x0819 CX4800 MP scanner product EPSON 4200 0x0820 CX4200 MP scanner product EPSON 5000 0x082b DX-50x0 MFP scanner product EPSON 6000 0x082e DX-60x0 MFP scanner ==== //depot/projects/dtrace/src/sys/dev/usb/uscanner.c#12 (text+ko) ==== @@ -5,7 +5,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb/uscanner.c,v 1.91 2008/04/29 00:51:20 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/uscanner.c,v 1.92 2008/05/18 03:07:40 remko Exp $"); /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -209,6 +209,7 @@ {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_3500 }, USC_KEEP_OPEN }, {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_3590 }, 0 }, {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_4200 }, 0 }, + {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_4800 }, 0 }, {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_4990 }, 0 }, {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_5000 }, 0 }, {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_6000 }, 0 }, ==== //depot/projects/dtrace/src/sys/i386/conf/GENERIC#36 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.486 2008/05/03 17:05:38 sam Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.487 2008/05/17 23:49:59 remko Exp $ cpu I486_CPU cpu I586_CPU @@ -207,6 +207,7 @@ device em # Intel PRO/1000 adapter Gigabit Ethernet Card device ixgb # Intel PRO/10GbE Ethernet Card device le # AMD Am7900 LANCE and Am79C9xx PCnet +device ti # Alteon Networks Tigon I/II gigabit Ethernet device txp # 3Com 3cR990 (``Typhoon'') device vx # 3Com 3c590, 3c595 (``Vortex'') @@ -231,7 +232,6 @@ device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet device ste # Sundance ST201 (D-Link DFE-550TX) device stge # Sundance/Tamarack TC9021 gigabit Ethernet -device ti # Alteon Networks Tigon I/II gigabit Ethernet device tl # Texas Instruments ThunderLAN device tx # SMC EtherPower II (83c170 ``EPIC'') device vge # VIA VT612x gigabit Ethernet @@ -328,3 +328,6 @@ device fwip # IP over FireWire (RFC 2734,3146) device dcons # Dumb console driver device dcons_crom # Configuration ROM for dcons + +# test +device mbg # Meinberg GPS receiver ==== //depot/projects/dtrace/src/sys/i386/i386/pmap.c#40 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.619 2008/05/11 20:33:47 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.620 2008/05/18 04:16:55 alc Exp $"); /* * Manages physical address maps. @@ -4586,18 +4586,6 @@ critical_exit(); } -vm_offset_t -pmap_addr_hint(vm_object_t obj, vm_offset_t addr, vm_size_t size) -{ - - if ((obj == NULL) || (size < NBPDR) || (obj->type != OBJT_DEVICE)) { - return addr; - } - - addr = (addr + PDRMASK) & ~PDRMASK; - return addr; -} - /* * Increase the starting virtual address of the given mapping if a * different alignment might result in more superpage mappings. ==== //depot/projects/dtrace/src/sys/ia64/ia64/pmap.c#17 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.200 2008/05/09 23:31:41 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.201 2008/05/18 04:16:56 alc Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -2259,13 +2259,6 @@ return (prevpm); } -vm_offset_t -pmap_addr_hint(vm_object_t obj, vm_offset_t addr, vm_size_t size) -{ - - return addr; -} - /* * Increase the starting virtual address of the given mapping if a * different alignment might result in more superpage mappings. ==== //depot/projects/dtrace/src/sys/mips/mips/pmap.c#4 (text+ko) ==== @@ -66,7 +66,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/mips/mips/pmap.c,v 1.4 2008/05/09 23:31:41 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/mips/mips/pmap.c,v 1.5 2008/05/18 04:16:56 alc Exp $"); #include "opt_ddb.h" #include <sys/param.h> @@ -2838,19 +2838,6 @@ critical_exit(); } -/* TBD */ - -vm_offset_t -pmap_addr_hint(vm_object_t obj, vm_offset_t addr, vm_size_t size) -{ - - if ((obj == NULL) || (size < NBSEG) || (obj->type != OBJT_DEVICE)) { - return addr; - } - addr = (addr + (NBSEG - 1)) & ~(NBSEG - 1); - return addr; -} - /* * Increase the starting virtual address of the given mapping if a * different alignment might result in more superpage mappings. @@ -2859,6 +2846,20 @@ pmap_align_superpage(vm_object_t object, vm_ooffset_t offset, vm_offset_t *addr, vm_size_t size) { + vm_offset_t superpage_offset; + + if (size < NBSEG) + return; + if (object != NULL && (object->flags & OBJ_COLORED) != 0) + offset += ptoa(object->pg_color); + superpage_offset = offset & SEGOFSET; + if (size - ((NBSEG - superpage_offset) & SEGOFSET) < NBSEG || + (*addr & SEGOFSET) == superpage_offset) + return; + if ((*addr & SEGOFSET) < superpage_offset) + *addr = (*addr & ~SEGOFSET) + superpage_offset; + else + *addr = ((*addr + SEGOFSET) & ~SEGOFSET) + superpage_offset; } int pmap_pid_dump(int pid); ==== //depot/projects/dtrace/src/sys/pc98/conf/GENERIC#19 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/pc98/conf/GENERIC,v 1.305 2008/05/03 17:05:38 sam Exp $ +# $FreeBSD: src/sys/pc98/conf/GENERIC,v 1.306 2008/05/17 23:50:00 remko Exp $ cpu I486_CPU cpu I586_CPU @@ -173,6 +173,7 @@ device de # DEC/Intel DC21x4x (``Tulip'') device em # Intel PRO/1000 adapter Gigabit Ethernet Card device le # AMD Am7900 LANCE and Am79C9xx PCnet +device ti # Alteon Networks Tigon I/II gigabit Ethernet device txp # 3Com 3cR990 (``Typhoon'') device vx # 3Com 3c590, 3c595 (``Vortex'') @@ -192,7 +193,6 @@ device sis # Silicon Integrated Systems SiS 900/SiS 7016 device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet device ste # Sundance ST201 (D-Link DFE-550TX) -device ti # Alteon Networks Tigon I/II gigabit Ethernet device tl # Texas Instruments ThunderLAN device tx # SMC EtherPower II (83c170 ``EPIC'') device vge # VIA VT612x gigabit Ethernet ==== //depot/projects/dtrace/src/sys/powerpc/booke/pmap.c#3 (text+ko) ==== @@ -50,7 +50,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/powerpc/booke/pmap.c,v 1.2 2008/04/27 21:04:54 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/booke/pmap.c,v 1.3 2008/05/18 04:16:56 alc Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -269,7 +269,6 @@ /* * Kernel MMU interface */ -static vm_offset_t mmu_booke_addr_hint(mmu_t, vm_object_t, vm_offset_t, vm_size_t); static void mmu_booke_change_wiring(mmu_t, pmap_t, vm_offset_t, boolean_t); static void mmu_booke_clear_modify(mmu_t, vm_page_t); static void mmu_booke_clear_reference(mmu_t, vm_page_t); @@ -323,7 +322,6 @@ static mmu_method_t mmu_booke_methods[] = { /* pmap dispatcher interface */ - MMUMETHOD(mmu_addr_hint, mmu_booke_addr_hint), MMUMETHOD(mmu_change_wiring, mmu_booke_change_wiring), MMUMETHOD(mmu_clear_modify, mmu_booke_clear_modify), MMUMETHOD(mmu_clear_reference, mmu_booke_clear_reference), @@ -2320,14 +2318,6 @@ return (0); } -static vm_offset_t -mmu_booke_addr_hint(mmu_t mmu, vm_object_t object, vm_offset_t va, - vm_size_t size) -{ - - return (va); -} - /**************************************************************************/ /* TID handling */ /**************************************************************************/ ==== //depot/projects/dtrace/src/sys/powerpc/powerpc/mmu_if.m#8 (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/powerpc/powerpc/mmu_if.m,v 1.8 2007/11/17 22:52:29 alc Exp $ +# $FreeBSD: src/sys/powerpc/powerpc/mmu_if.m,v 1.9 2008/05/18 04:16:56 alc Exp $ # #include <sys/param.h> @@ -100,10 +100,10 @@ return; } - static vm_offset_t mmu_null_addr_hint(mmu_t mmu, vm_object_t object, - vm_offset_t va, vm_size_t size) + static void mmu_null_align_superpage(mmu_t mmu, vm_object_t object, + vm_ooffset_t offset, vm_offset_t *addr, vm_size_t size) { - return (va); + return; } }; @@ -659,15 +659,17 @@ * return the given tentative start address. * * @param _obj VM backing object + * @param _offset starting offset with the VM object * @param _addr initial guess at virtual address * @param _size size of virtual address range */ -METHOD vm_offset_t addr_hint { +METHOD void align_superpage { mmu_t _mmu; vm_object_t _obj; - vm_offset_t _addr; + vm_ooffset_t _offset; + vm_offset_t *_addr; vm_size_t _size; -} DEFAULT mmu_null_addr_hint; +} DEFAULT mmu_null_align_superpage; ==== //depot/projects/dtrace/src/sys/powerpc/powerpc/pmap_dispatch.c#12 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/pmap_dispatch.c,v 1.13 2008/05/09 23:31:41 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/pmap_dispatch.c,v 1.14 2008/05/18 04:16:56 alc Exp $"); /* * Dispatch MI pmap calls to the appropriate MMU implementation @@ -297,12 +297,6 @@ MMU_DEACTIVATE(mmu_obj, td); } -vm_offset_t -pmap_addr_hint(vm_object_t obj, vm_offset_t addr, vm_size_t size) -{ - return (MMU_ADDR_HINT(mmu_obj, obj, addr, size)); -} - /* * Increase the starting virtual address of the given mapping if a * different alignment might result in more superpage mappings. @@ -311,6 +305,8 @@ pmap_align_superpage(vm_object_t object, vm_ooffset_t offset, vm_offset_t *addr, vm_size_t size) { + + MMU_ALIGN_SUPERPAGE(mmu_obj, object, offset, addr, size); } ==== //depot/projects/dtrace/src/sys/sparc64/conf/GENERIC#23 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/sparc64/conf/GENERIC,v 1.136 2008/05/03 17:05:38 sam Exp $ +# $FreeBSD: src/sys/sparc64/conf/GENERIC,v 1.137 2008/05/17 23:50:00 remko Exp $ cpu SUN4U ident GENERIC @@ -162,6 +162,7 @@ device em # Intel PRO/1000 adapter Gigabit Ethernet Card #device ixgb # Intel PRO/10GbE Ethernet Card device le # AMD Am7900 LANCE and Am79C9xx PCnet +device ti # Alteon Networks Tigon I/II gigabit Ethernet #device txp # 3Com 3cR990 (``Typhoon'') #device vx # 3Com 3c590, 3c595 (``Vortex'') @@ -182,7 +183,6 @@ device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet #device ste # Sundance ST201 (D-Link DFE-550TX) device stge # Sundance/Tamarack TC9021 gigabit Ethernet -device ti # Alteon Networks Tigon I/II gigabit Ethernet #device tl # Texas Instruments ThunderLAN #device tx # SMC EtherPower II (83c170 ``EPIC'') device vr # VIA Rhine, Rhine II ==== //depot/projects/dtrace/src/sys/sparc64/sparc64/pmap.c#18 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/pmap.c,v 1.172 2008/05/09 23:31:41 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/pmap.c,v 1.173 2008/05/18 04:16:56 alc Exp $"); /* * Manages physical address maps. @@ -1978,13 +1978,6 @@ mtx_unlock_spin(&sched_lock); } -vm_offset_t -pmap_addr_hint(vm_object_t object, vm_offset_t va, vm_size_t size) -{ - - return (va); -} - /* * Increase the starting virtual address of the given mapping if a * different alignment might result in more superpage mappings. ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/pmap.c#28 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/pmap.c,v 1.43 2008/05/09 23:31:42 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/pmap.c,v 1.44 2008/05/18 04:16:56 alc Exp $"); #include "opt_kstack_pages.h" #include "opt_msgbuf.h" @@ -424,12 +424,6 @@ critical_exit(); } -vm_offset_t -pmap_addr_hint(vm_object_t object, vm_offset_t va, vm_size_t size) -{ - return (va); -} - /* * Increase the starting virtual address of the given mapping if a * different alignment might result in more superpage mappings. ==== //depot/projects/dtrace/src/sys/vm/device_pager.c#7 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/vm/device_pager.c,v 1.84 2007/08/18 16:41:31 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/device_pager.c,v 1.85 2008/05/17 16:26:34 alc Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -146,10 +146,14 @@ object = vm_pager_object_lookup(&dev_pager_object_list, handle); if (object == NULL) { /* - * Allocate object and associate it with the pager. + * Allocate object and associate it with the pager. Initialize + * the object's pg_color based upon the physical address of the + * device's memory. */ mtx_unlock(&dev_pager_mtx); object1 = vm_object_allocate(OBJT_DEVICE, pindex); + object1->flags |= OBJ_COLORED; + object1->pg_color = atop(paddr) - OFF_TO_IDX(off - PAGE_SIZE); mtx_lock(&dev_pager_mtx); object = vm_pager_object_lookup(&dev_pager_object_list, handle); if (object != NULL) { ==== //depot/projects/dtrace/src/sys/vm/pmap.h#12 (text+ko) ==== @@ -57,7 +57,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/pmap.h,v 1.84 2008/05/09 16:48:07 alc Exp $ + * $FreeBSD: src/sys/vm/pmap.h,v 1.85 2008/05/18 04:16:57 alc Exp $ */ /* @@ -132,7 +132,6 @@ void pmap_zero_page_idle(vm_page_t); int pmap_mincore(pmap_t pmap, vm_offset_t addr); void pmap_activate(struct thread *td); -vm_offset_t pmap_addr_hint(vm_object_t obj, vm_offset_t addr, vm_size_t size); #define pmap_resident_count(pm) ((pm)->pm_stats.resident_count) #define pmap_wired_count(pm) ((pm)->pm_stats.wired_count) ==== //depot/projects/dtrace/src/sys/vm/vm_mmap.c#14 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/vm/vm_mmap.c,v 1.219 2008/04/28 05:30:23 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_mmap.c,v 1.220 2008/05/17 19:32:48 alc Exp $"); #include "opt_compat.h" #include "opt_hwpmc_hooks.h" @@ -1456,15 +1456,13 @@ maxprot |= VM_PROT_EXECUTE; #endif - if (fitit) - *addr = pmap_addr_hint(object, *addr, size); - if (flags & MAP_STACK) rv = vm_map_stack(map, *addr, size, prot, maxprot, docow | MAP_STACK_GROWS_DOWN); else if (fitit) - rv = vm_map_find(map, object, foff, addr, size, TRUE, - prot, maxprot, docow); + rv = vm_map_find(map, object, foff, addr, size, + object != NULL && object->type == OBJT_DEVICE ? + VMFS_ALIGNED_SPACE : VMFS_ANY_SPACE, prot, maxprot, docow); else rv = vm_map_fixed(map, object, foff, *addr, size, prot, maxprot, docow); ==== //depot/projects/dtrace/src/usr.bin/tar/Makefile#7 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/usr.bin/tar/Makefile,v 1.34 2008/03/18 06:18:49 kientzle Exp $ +# $FreeBSD: src/usr.bin/tar/Makefile,v 1.35 2008/05/18 06:24:47 cperciva Exp $ PROG= bsdtar BSDTAR_VERSION_STRING=2.5.0b -SRCS= bsdtar.c getdate.y matching.c read.c tree.c util.c write.c +SRCS= bsdtar.c getdate.y matching.c read.c siginfo.c tree.c util.c write.c WARNS?= 5 DPADD= ${LIBARCHIVE} ${LIBBZ2} ${LIBZ} LDADD= -larchive -lbz2 -lz ==== //depot/projects/dtrace/src/usr.bin/tar/bsdtar.1#11 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/usr.bin/tar/bsdtar.1,v 1.41 2008/05/02 05:40:05 kientzle Exp $ +.\" $FreeBSD: src/usr.bin/tar/bsdtar.1,v 1.42 2008/05/17 15:55:29 cperciva Exp $ .\" .Dd April 13, 2004 .Dt BSDTAR 1 @@ -225,6 +225,10 @@ Do not overwrite existing files. In particular, if a file appears more than once in an archive, later copies will not overwrite earlier copies. +.It Fl -keep-newer-files ( Fl W Cm keep-newer-files ) +(x mode only) +Do not overwrite existing files that are newer than the +versions appearing in the archive being extracted. .It Fl L (c and r mode only) All symbolic links will be followed. ==== //depot/projects/dtrace/src/usr.bin/tar/bsdtar.c#10 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "bsdtar_platform.h" -__FBSDID("$FreeBSD: src/usr.bin/tar/bsdtar.c,v 1.88 2008/05/02 05:40:05 kientzle Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/tar/bsdtar.c,v 1.89 2008/05/17 15:55:29 cperciva Exp $"); #ifdef HAVE_SYS_PARAM_H #include <sys/param.h> >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200805180946.m4I9kxhf096066>