Date: Mon, 7 Jan 2008 22:48:54 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 132753 for review Message-ID: <200801072248.m07MmsZk080540@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=132753 Change 132753 by jb@jb_freebsd1 on 2008/01/07 22:48:49 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/book.sgml#8 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#15 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#52 integrate .. //depot/projects/dtrace/doc/share/mk/doc.xml.mk#6 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/parseinfo.c#4 integrate .. //depot/projects/dtrace/src/games/fortune/datfiles/limerick#7 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_sem.c#8 integrate .. //depot/projects/dtrace/src/share/man/man4/ipmi.4#9 integrate .. //depot/projects/dtrace/src/share/man/man4/ng_pppoe.4#8 integrate .. //depot/projects/dtrace/src/share/man/man4/pci.4#7 integrate .. //depot/projects/dtrace/src/share/man/man4/pcib.4#2 integrate .. //depot/projects/dtrace/src/share/man/man4/textdump.4#2 integrate .. //depot/projects/dtrace/src/share/man/man9/style.9#6 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#30 integrate .. //depot/projects/dtrace/src/sys/amd64/conf/GENERIC#30 integrate .. //depot/projects/dtrace/src/sys/amd64/include/pmap.h#10 integrate .. //depot/projects/dtrace/src/sys/arm/at91/if_ate.c#13 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_stats.c#11 integrate .. //depot/projects/dtrace/src/sys/conf/NOTES#38 integrate .. //depot/projects/dtrace/src/sys/conf/options#37 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/sys/mvec.h#3 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/sys/uipc_mvec.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/ichwd/ichwd.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/ichwd/ichwd.h#7 integrate .. //depot/projects/dtrace/src/sys/dev/streams/streams.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/usb/if_rum.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/usb/if_zyd.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usbdevs#23 integrate .. //depot/projects/dtrace/src/sys/fs/devfs/devfs_vnops.c#13 integrate .. //depot/projects/dtrace/src/sys/fs/fifofs/fifo_vnops.c#6 integrate .. //depot/projects/dtrace/src/sys/fs/hpfs/hpfs_vfsops.c#7 integrate .. //depot/projects/dtrace/src/sys/i386/conf/GENERIC#28 integrate .. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#26 integrate .. //depot/projects/dtrace/src/sys/i386/include/pmap.h#11 integrate .. //depot/projects/dtrace/src/sys/ia64/conf/GENERIC#12 integrate .. //depot/projects/dtrace/src/sys/kern/imgact_elf.c#10 integrate .. //depot/projects/dtrace/src/sys/kern/kern_descrip.c#15 integrate .. //depot/projects/dtrace/src/sys/kern/kern_event.c#11 integrate .. //depot/projects/dtrace/src/sys/kern/sched_ule.c#24 integrate .. //depot/projects/dtrace/src/sys/kern/sys_generic.c#11 integrate .. //depot/projects/dtrace/src/sys/kern/sys_pipe.c#12 integrate .. //depot/projects/dtrace/src/sys/kern/sys_socket.c#8 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_mqueue.c#10 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_sem.c#10 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_syscalls.c#17 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_vnops.c#12 integrate .. //depot/projects/dtrace/src/sys/opencrypto/cryptodev.c#8 integrate .. //depot/projects/dtrace/src/sys/pc98/conf/GENERIC#14 integrate .. //depot/projects/dtrace/src/sys/powerpc/conf/GENERIC#14 integrate .. //depot/projects/dtrace/src/sys/sparc64/conf/GENERIC#16 integrate .. //depot/projects/dtrace/src/sys/sys/file.h#7 integrate .. //depot/projects/dtrace/src/sys/sys/syscallsubr.h#9 integrate .. //depot/projects/dtrace/src/usr.bin/kdump/kdump.c#11 integrate .. //depot/projects/dtrace/src/usr.sbin/gstat/gstat.c#5 integrate .. //depot/projects/dtrace/www/en/internal/fortunes.sgml#4 integrate .. //depot/projects/dtrace/www/en/news/Makefile#6 integrate .. //depot/projects/dtrace/www/en/releng/index.sgml#25 integrate .. //depot/projects/dtrace/www/share/mk/doc.xml.mk#7 integrate .. //depot/projects/dtrace/www/share/sgml/events.xml#15 integrate .. //depot/projects/dtrace/www/share/sgml/libcommon.xsl#5 integrate .. //depot/projects/dtrace/www/share/sgml/templates.news-rss.xsl#1 branch Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/book.sgml#8 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/book.sgml,v 1.171 2007/04/06 07:38:50 murray Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/book.sgml,v 1.172 2008/01/06 13:49:29 danger Exp $ --> <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [ @@ -74,6 +74,7 @@ <year>2005</year> <year>2006</year> <year>2007</year> + <year>2008</year> <holder>The FreeBSD Documentation Project</holder> </copyright> ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#15 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml,v 1.442 2007/12/08 10:21:49 gabor Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml,v 1.443 2008/01/06 11:05:27 hrs Exp $ --> <appendix id="mirrors"> @@ -2621,6 +2621,24 @@ </varlistentry> <varlistentry> + <term>RELENG_7</term> + + <listitem> + <para>The line of development for FreeBSD-7.X, also known + as FreeBSD 7-STABLE</para> + </listitem> + </varlistentry> + + <varlistentry> + <term>RELENG_7_0</term> + + <listitem> + <para>The release branch for FreeBSD-7.0, used only for + security advisories and other critical fixes.</para> + </listitem> + </varlistentry> + + <varlistentry> <term>RELENG_6</term> <listitem> @@ -2630,6 +2648,15 @@ </varlistentry> <varlistentry> + <term>RELENG_6_3</term> + + <listitem> + <para>The release branch for FreeBSD-6.3, used only for + security advisories and other critical fixes.</para> + </listitem> + </varlistentry> + + <varlistentry> <term>RELENG_6_2</term> <listitem> @@ -2850,6 +2877,22 @@ <variablelist> <varlistentry> + <term>RELENG_7_0_0_RELEASE</term> + + <listitem> + <para>FreeBSD 7.0</para> + </listitem> + </varlistentry> + + <varlistentry> + <term>RELENG_6_3_0_RELEASE</term> + + <listitem> + <para>FreeBSD 6.3</para> + </listitem> + </varlistentry> + + <varlistentry> <term>RELENG_6_2_0_RELEASE</term> <listitem> ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#52 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.893 2007/12/25 18:44:04 rwatson Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.894 2008/01/06 11:00:31 hrs Exp $ --> <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [ @@ -28,6 +28,7 @@ <year>2005</year> <year>2006</year> <year>2007</year> + <year>2008</year> <holder role="mailto:doc@FreeBSD.org">The FreeBSD Documentation Project</holder> </copyright> @@ -11328,6 +11329,11 @@ <entry>603100</entry> </row> <row> + <entry>6.3-STABLE after fixing + multibyte type support in bit macro.</entry> + <entry>603101</entry> + </row> + <row> <entry>7.0-CURRENT.</entry> <entry>700000</entry> </row> @@ -11613,7 +11619,7 @@ <entry>700054</entry> </row> <row> - <entry>7.0-CURRENT after ABI backwards compatibility + <entry>7.0-RELEASE, and 7.0-CURRENT after ABI backwards compatibility to the FreeBSD 4/5/6 versions of the PCIOCGETCONF, PCIOCREAD and PCIOCWRITE IOCTLs was MFC'ed, which required the ABI of the PCIOCGETCONF IOCTL to be ==== //depot/projects/dtrace/doc/share/mk/doc.xml.mk#6 (text+ko) ==== @@ -1,5 +1,5 @@ # doc.xml.mk -# $FreeBSD: doc/share/mk/doc.xml.mk,v 1.11 2006/09/22 21:05:03 hrs Exp $ +# $FreeBSD: doc/share/mk/doc.xml.mk,v 1.12 2008/01/07 10:08:29 murray Exp $ XML_CATALOG_FILES= file://${.OBJDIR}/catalog-cwd.xml \ file://${DOC_PREFIX}/${LANGCODE}/share/sgml/catalog.xml \ @@ -140,6 +140,7 @@ _DEPENDSET.news= ${XML_NEWS_NEWS_MASTER} ${XML_NEWS_NEWS} \ ${XSL_NEWS_NEWSFLASH} \ ${XSL_NEWS_NEWS_RDF} \ + ${XSL_NEWS_NEWS_RSS} \ ${XML_INCLUDES} _PARAMS.news= --param news.project.xml-master "'${XML_NEWS_NEWS_MASTER}'" \ --param news.project.xml "'${XML_NEWS_NEWS}'" @@ -153,6 +154,7 @@ XSL_NEWS_NEWSFLASH= ${WEB_PREFIX}/share/sgml/templates.newsflash.xsl XSL_NEWS_NEWSFLASH_OLD= ${WEB_PREFIX}/share/sgml/templates.oldnewsflash.xsl XSL_NEWS_NEWS_RDF= ${WEB_PREFIX}/share/sgml/templates.news-rdf.xsl +XSL_NEWS_NEWS_RSS= ${WEB_PREFIX}/share/sgml/templates.news-rss.xsl # DEPENDSET: press .......................................................... _DEPENDSET.press= ${XML_NEWS_PRESS_MASTER} ${XML_NEWS_PRESS} \ ==== //depot/projects/dtrace/src/contrib/cvs/src/parseinfo.c#4 (text+ko) ==== @@ -5,7 +5,7 @@ * You may distribute under the terms of the GNU General Public License as * specified in the README file that comes with the CVS source distribution. * - * $FreeBSD: src/contrib/cvs/src/parseinfo.c,v 1.3 2004/04/15 01:17:27 peter Exp $ + * $FreeBSD: src/contrib/cvs/src/parseinfo.c,v 1.4 2008/01/07 07:47:21 peter Exp $ */ #include "cvs.h" @@ -429,6 +429,16 @@ else if (strcmp (p, "stat") == 0) RereadLogAfterVerify = LOGMSG_REREAD_STAT; } + else if (strcmp(line, "LocalKeyword") == 0) + { + /* Recognize cvs-1.12-style keyword control rather than erroring out. */ + RCS_setlocalid(p); + } + else if (strcmp(line, "KeywordExpand") == 0) + { + /* Recognize cvs-1.12-style keyword control rather than erroring out. */ + RCS_setincexc(p); + } else { /* We may be dealing with a keyword which was added in a ==== //depot/projects/dtrace/src/games/fortune/datfiles/limerick#7 (text+ko) ==== @@ -1,4 +1,4 @@ -%% $FreeBSD: src/games/fortune/datfiles/limerick,v 1.14 2007/12/07 22:41:39 dougb Exp $ +%% $FreeBSD: src/games/fortune/datfiles/limerick,v 1.15 2008/01/07 10:31:17 schweikh Exp $ % A bad little girl in Madrid, A most reprehensible kid, @@ -4421,7 +4421,7 @@ There was an old man of St. Bees, Who was stung in the arm by a wasp. When asked, "Does it hurt?" - He relied, "No, it doesn't. + He replied, "No, it doesn't. I'm so glad that it wasn't a hornet." -- W.S. Gilbert % ==== //depot/projects/dtrace/src/lib/libthr/thread/thr_sem.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_sem.c,v 1.12 2007/11/23 05:42:52 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_sem.c,v 1.13 2008/01/07 02:26:29 davidxu Exp $ */ #include "namespace.h" @@ -282,8 +282,8 @@ if ((*sem)->nwaiters) { retval = _thr_umtx_wake(&(*sem)->count, 1); - if (retval > 0) - retval = 0; + if (retval != 0) + retval = -1; } return (retval); } ==== //depot/projects/dtrace/src/share/man/man4/ipmi.4#9 (text) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ipmi.4,v 1.9 2008/01/04 12:55:23 gabor Exp $ +.\" $FreeBSD: src/share/man/man4/ipmi.4,v 1.11 2008/01/07 14:55:20 gabor Exp $ .\" .Dd July 10, 2007 .Dt IPMI 4 @@ -186,7 +186,7 @@ The .Nm driver first appeared in -.Fx 6.3 . +.Fx 6.2 . .Sh AUTHORS .An -nosplit The ==== //depot/projects/dtrace/src/share/man/man4/ng_pppoe.4#8 (text+ko) ==== @@ -32,10 +32,10 @@ .\" .\" Author: Archie Cobbs <archie@FreeBSD.org> .\" -.\" $FreeBSD: src/share/man/man4/ng_pppoe.4,v 1.40 2007/12/29 19:59:58 mav Exp $ +.\" $FreeBSD: src/share/man/man4/ng_pppoe.4,v 1.41 2008/01/05 23:41:15 brueffer Exp $ .\" $Whistle: ng_pppoe.8,v 1.1 1999/01/25 23:46:27 archie Exp $ .\" -.Dd October 22, 2006 +.Dd December 27, 2007 .Dt NG_PPPOE 4 .Os .Sh NAME @@ -104,9 +104,10 @@ the state machine as a client. It must be newly created and a service name can be given as an argument. It is legal to specify a zero-length service name, this is common -on some DSL setups. It is possible to request connection to specific -access concentrator by it's name using "AC-Name\\Service-Name" syntax. -A session request packet will be broadcast on the Ethernet. +on some DSL setups. +It is possible to request a connection to a specific +access concentrator by its name using the "AC-Name\\Service-Name" syntax. +A session request packet will be broadcasted on the Ethernet. This command uses the .Dv ngpppoe_init_data structure shown below. ==== //depot/projects/dtrace/src/share/man/man4/pci.4#7 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/pci.4,v 1.20 2008/01/04 08:19:52 imp Exp $ +.\" $FreeBSD: src/share/man/man4/pci.4,v 1.21 2008/01/05 23:21:32 brueffer Exp $ .\" .Dd January 3, 2008 .Dt PCI 4 @@ -57,18 +57,30 @@ .Pp The .Nm -driver implements the pci bus in the kernel. -It enumerates and devices on the pci bus and gives pci client drivers the -chance to attach to them. -It assigns resources to children, when the BIOS doesn't. +driver implements the +.Tn PCI +bus in the kernel. +It enumerates any devices on the +.Tn PCI +bus and gives +.Tn PCI +client drivers the chance to attach to them. +It assigns resources to children, when the BIOS does not. It takes care of routing interrupts when necessary. -It reprobes the unattached pci children when pci client drivers are dynamically +It reprobes the unattached +.Tn PCI +children when +.Tn PCI +client drivers are dynamically loaded at runtime. .Sh KERNEL CONFIGURATION The .Nm device is included in the kernel as described in the SYNOPSIS section. -The pci driver cannot be built as a kld. +The +.Nm +driver cannot be built as a +.Xr kld 4 . .Sh IOCTLS The following .Xr ioctl 2 ==== //depot/projects/dtrace/src/share/man/man4/pcib.4#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/pcib.4,v 1.1 2008/01/04 08:26:22 imp Exp $ +.\" $FreeBSD: src/share/man/man4/pcib.4,v 1.2 2008/01/05 23:27:59 brueffer Exp $ .\" .Dd January 4, 2008 .Dt PCIB 4 @@ -31,11 +31,19 @@ .Nm pcib .Nd PCI bridge driver .Sh SYNOPSIS -.Cd device pcib +To compile this driver into the kernel, +place the following line in your +kernel configuration file: +.Bd -ragged -offset indent +.Cd "device pcib" +.Ed .Sh DESCRIPTION The .Nm -driver provides for host and pci bridges in a pci system. +driver provides for host and +.Tn PCI +bridges in a +.Tn PCI +system. .Sh BUGS This man page is too short. - ==== //depot/projects/dtrace/src/share/man/man4/textdump.4#2 (text+ko) ==== @@ -25,9 +25,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/textdump.4,v 1.2 2007/12/26 12:18:21 rwatson Exp $ +.\" $FreeBSD: src/share/man/man4/textdump.4,v 1.3 2008/01/07 16:47:30 brueffer Exp $ .\" -.Dd 26 December, 2007 +.Dd December 26, 2007 .Dt textdump 4 .Os .Sh NAME @@ -93,7 +93,7 @@ .It Pa version.txt Kernel version string. My be disabled by clearing the -.Dv dbeug.ddb.textdump.do_panic +.Dv debug.ddb.textdump.do_version sysctl. .El .Pp ==== //depot/projects/dtrace/src/share/man/man9/style.9#6 (text+ko) ==== @@ -24,7 +24,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)style 1.14 (Berkeley) 4/28/95 -.\" $FreeBSD: src/share/man/man9/style.9,v 1.123 2007/01/28 20:51:04 joel Exp $ +.\" $FreeBSD: src/share/man/man9/style.9,v 1.124 2008/01/05 21:39:21 grog Exp $ .\" .Dd February 10, 2005 .Dt STYLE 9 @@ -46,7 +46,7 @@ * Style guide for FreeBSD. Based on the CSRG's KNF (Kernel Normal Form). * * @(#)style 1.14 (Berkeley) 4/28/95 - * $FreeBSD: src/share/man/man9/style.9,v 1.123 2007/01/28 20:51:04 joel Exp $ + * $FreeBSD: src/share/man/man9/style.9,v 1.124 2008/01/05 21:39:21 grog Exp $ */ /* @@ -68,7 +68,7 @@ * Copyright (c) 1984-2025 John Q. Public * All rights reserved. * - * Long, boring license goes here, but redacted for brevity + * Long, boring license goes here, but trimmed for brevity */ .Ed .Pp @@ -111,7 +111,7 @@ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/share/man/man9/style.9,v 1.123 2007/01/28 20:51:04 joel Exp $"); +__FBSDID("$FreeBSD: src/share/man/man9/style.9,v 1.124 2008/01/05 21:39:21 grog Exp $"); .Ed .Pp Leave another blank line before the header files. ==== //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#30 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.601 2008/01/03 07:34:32 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.602 2008/01/06 18:51:03 alc Exp $"); /* * Manages physical address maps. @@ -614,7 +614,6 @@ { TAILQ_INIT(&m->md.pv_list); - m->md.pv_list_count = 0; } /* @@ -1699,7 +1698,6 @@ TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); - m->md.pv_list_count--; free_pv_entry(pmap, pv); if (pmap != locked_pmap) PMAP_UNLOCK(pmap); @@ -1847,7 +1845,6 @@ } KASSERT(pv != NULL, ("pmap_remove_entry: pv not found")); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); - m->md.pv_list_count--; if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); free_pv_entry(pmap, pv); @@ -1867,7 +1864,6 @@ pv = get_pv_entry(pmap, FALSE); pv->pv_va = va; TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); - m->md.pv_list_count++; } /* @@ -1884,7 +1880,6 @@ (pv = get_pv_entry(pmap, TRUE)) != NULL) { pv->pv_va = va; TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list); - m->md.pv_list_count++; return (TRUE); } else return (FALSE); @@ -2118,7 +2113,6 @@ pmap_invalidate_page(pmap, pv->pv_va); pmap_free_zero_pages(free); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); - m->md.pv_list_count--; free_pv_entry(pmap, pv); PMAP_UNLOCK(pmap); } @@ -3045,7 +3039,6 @@ PV_STAT(pv_entry_spare++); pv_entry_count--; pc->pc_map[field] |= bitmask; - m->md.pv_list_count--; TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); ==== //depot/projects/dtrace/src/sys/amd64/conf/GENERIC#30 (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.490 2007/12/15 00:56:16 scottl Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.491 2008/01/07 21:40:09 jhb Exp $ cpu HAMMER ident GENERIC @@ -52,6 +52,7 @@ options COMPAT_FREEBSD4 # Compatible with FreeBSD4 options COMPAT_FREEBSD5 # Compatible with FreeBSD5 options COMPAT_FREEBSD6 # Compatible with FreeBSD6 +options COMPAT_FREEBSD7 # Compatible with FreeBSD7 options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support options STACK # stack(9) support ==== //depot/projects/dtrace/src/sys/amd64/include/pmap.h#10 (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.138 2006/12/05 11:31:33 ru Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.139 2008/01/06 18:51:04 alc Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -231,7 +231,6 @@ struct pv_chunk; struct md_page { - int pv_list_count; TAILQ_HEAD(,pv_entry) pv_list; }; ==== //depot/projects/dtrace/src/sys/arm/at91/if_ate.c#13 (text) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.22 2007/12/16 12:57:12 stas Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.23 2008/01/07 00:36:09 cognet Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -191,7 +191,7 @@ callout_init_mtx(&sc->tick_ch, &sc->sc_mtx, 0); if ((err = ate_get_mac(sc, eaddr)) != 0) { - device_printf(dev, "No MAC address set"); + device_printf(dev, "No MAC address set\n"); goto out; } ate_set_mac(sc, eaddr); ==== //depot/projects/dtrace/src/sys/compat/linux/linux_stats.c#11 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.89 2007/12/29 14:25:29 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.90 2008/01/05 12:36:35 kib Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -270,13 +270,15 @@ #ifdef DEBUG if (ldebug(stat)) - printf(ARGS(stat, "%s, *"), args->path); + printf(ARGS(stat, "%s, *"), path); #endif error = kern_stat(td, path, UIO_SYSSPACE, &buf); + if (error) { + LFREEPATH(path); + return (error); + } + translate_path_major_minor(td, path, &buf); LFREEPATH(path); - if (error) - return (error); - translate_path_major_minor(td, args->path, &buf); return(stat_copyout(&buf, args->up)); } @@ -291,13 +293,15 @@ #ifdef DEBUG if (ldebug(lstat)) - printf(ARGS(lstat, "%s, *"), args->path); + printf(ARGS(lstat, "%s, *"), path); #endif - error = kern_lstat(td, args->path, UIO_SYSSPACE, &buf); + error = kern_lstat(td, path, UIO_SYSSPACE, &buf); + if (error) { + LFREEPATH(path); + return (error); + } + translate_path_major_minor(td, path, &buf); LFREEPATH(path); - if (error) - return (error); - translate_path_major_minor(td, args->path, &buf); return(stat_copyout(&buf, args->up)); } ==== //depot/projects/dtrace/src/sys/conf/NOTES#38 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1464 2007/12/27 23:19:03 des Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1465 2008/01/07 21:40:09 jhb Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -300,6 +300,9 @@ # Enable FreeBSD6 compatibility syscalls options COMPAT_FREEBSD6 +# Enable FreeBSD7 compatibility syscalls +options COMPAT_FREEBSD7 + # # These three options provide support for System V Interface # Definition-style interprocess communication, in the form of shared ==== //depot/projects/dtrace/src/sys/conf/options#37 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.614 2007/12/27 16:45:39 alc Exp $ +# $FreeBSD: src/sys/conf/options,v 1.615 2008/01/07 21:40:09 jhb Exp $ # # On the handling of kernel options # @@ -67,6 +67,7 @@ COMPAT_FREEBSD4 opt_compat.h COMPAT_FREEBSD5 opt_compat.h COMPAT_FREEBSD6 opt_compat.h +COMPAT_FREEBSD7 opt_compat.h COMPILING_LINT opt_global.h CY_PCI_FASTINTR DIRECTIO ==== //depot/projects/dtrace/src/sys/dev/cxgb/sys/mvec.h#3 (text+ko) ==== @@ -25,7 +25,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/cxgb/sys/mvec.h,v 1.8 2007/12/17 08:17:50 kmacy Exp $ + * $FreeBSD: src/sys/dev/cxgb/sys/mvec.h,v 1.9 2008/01/07 01:18:16 kmacy Exp $ * ***************************************************************************/ @@ -84,6 +84,7 @@ * along that needs 1 byte */ uint16_t mi_pad; + struct mbuf *mi_mbuf; /* need to be able to handle the @#$@@#%$ing packet zone */ #define mi_size mi_ext.ext_size #define mi_base mi_ext.ext_buf #define mi_args mi_ext.ext_args ==== //depot/projects/dtrace/src/sys/dev/cxgb/sys/uipc_mvec.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ ***************************************************************************/ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/cxgb/sys/uipc_mvec.c,v 1.15 2007/12/16 05:19:48 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cxgb/sys/uipc_mvec.c,v 1.16 2008/01/07 01:18:16 kmacy Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -125,6 +125,7 @@ mi->mi_flags = m->m_flags; mi->mi_len = m->m_len; + mi->mi_mbuf = NULL; if (m->m_flags & M_PKTHDR) { mi->mi_ether_vtag = m->m_pkthdr.ether_vtag; @@ -151,6 +152,7 @@ mi->mi_type = m->m_ext.ext_type; mi->mi_size = m->m_ext.ext_size; mi->mi_refcnt = m->m_ext.ref_cnt; + mi->mi_mbuf = m; } else { mi->mi_base = (caddr_t)m; mi->mi_data = m->m_data; @@ -267,7 +269,8 @@ goto err_out; } else if (seg_count >= TX_MAX_SEGS) { if (cxgb_debug) - printf("mbuf chain too long: %d max allowed %d\n", seg_count, TX_MAX_SEGS); + printf("mbuf chain too long: %d max allowed %d\n", + seg_count, TX_MAX_SEGS); if (!defragged) { n = m_defrag(*m, M_DONTWAIT); if (n == NULL) { @@ -300,9 +303,10 @@ } n = *m; while (n) { - if (((n->m_flags & (M_EXT|M_NOFREE)) == M_EXT) && (n->m_len > 0)) + if (((n->m_flags & (M_EXT|M_NOFREE)) == M_EXT) && + (n->m_len > 0) && (n->m_ext.ext_type != EXT_PACKET) ) n->m_flags &= ~M_EXT; - else if (n->m_len > 0) { + else if ((n->m_len > 0) || (n->m_ext.ext_type == EXT_PACKET)) { n = n->m_next; continue; } @@ -380,6 +384,10 @@ */ while (dofree == 0) { cnt = *(mi->mi_refcnt); + if (mi->mi_type == EXT_PACKET) { + dofree = 1; + break; + } if (atomic_cmpset_int(mi->mi_refcnt, cnt, cnt - 1)) { if (cnt == 1) dofree = 1; @@ -419,7 +427,10 @@ ("%s: ext_free not set", __func__)); (*(mi->mi_ext.ext_free))(mi->mi_ext.ext_buf, mi->mi_ext.ext_args); - break; + break; + case EXT_PACKET: + uma_zfree(zone_pack, mi->mi_mbuf); + break; default: dump_mi(mi); panic("unknown mv type in m_free_vec type=%d idx=%d", type, idx); ==== //depot/projects/dtrace/src/sys/dev/ichwd/ichwd.c#8 (text+ko) ==== @@ -56,7 +56,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ichwd/ichwd.c,v 1.13 2007/12/31 11:44:01 des Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ichwd/ichwd.c,v 1.14 2008/01/07 09:46:39 des Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -93,6 +93,7 @@ { DEVICEID_ICH8, "Intel ICH8 watchdog timer", 8 }, { DEVICEID_ICH8DH, "Intel ICH8DH watchdog timer", 8 }, { DEVICEID_ICH8DO, "Intel ICH8DO watchdog timer", 8 }, + { DEVICEID_ICH8M, "Intel ICH8M watchdog timer", 8 }, { DEVICEID_63XXESB, "Intel 63XXESB watchdog timer", 8 }, { DEVICEID_ICH9, "Intel ICH9 watchdog timer", 9 }, { DEVICEID_ICH9R, "Intel ICH9R watchdog timer", 9 }, ==== //depot/projects/dtrace/src/sys/dev/ichwd/ichwd.h#7 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ichwd/ichwd.h,v 1.7 2007/12/31 11:44:01 des Exp $ + * $FreeBSD: src/sys/dev/ichwd/ichwd.h,v 1.8 2008/01/07 09:46:39 des Exp $ */ #ifndef _ICHWD_H_ @@ -85,6 +85,7 @@ #define DEVICEID_ICH8 0x2810 #define DEVICEID_ICH8DH 0x2812 #define DEVICEID_ICH8DO 0x2814 +#define DEVICEID_ICH8M 0x2815 #define DEVICEID_ICH9 0x2918 #define DEVICEID_ICH9R 0x2916 #define DEVICEID_ICH9DH 0x2912 ==== //depot/projects/dtrace/src/sys/dev/streams/streams.c#7 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/streams/streams.c,v 1.57 2007/12/30 01:42:12 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/streams/streams.c,v 1.58 2008/01/07 20:05:18 jhb Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -90,6 +90,7 @@ static struct fileops svr4_netops = { .fo_read = soo_read, .fo_write = soo_write, + .fo_truncate = soo_truncate, .fo_ioctl = soo_ioctl, .fo_poll = soo_poll, .fo_kqfilter = soo_kqfilter, ==== //depot/projects/dtrace/src/sys/dev/usb/if_rum.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/if_rum.c,v 1.15 2007/11/21 05:51:43 kevlo Exp $ */ +/* $FreeBSD: src/sys/dev/usb/if_rum.c,v 1.16 2008/01/07 09:14:37 kevlo Exp $ */ /*- * Copyright (c) 2005-2007 Damien Bergamini <damien.bergamini@free.fr> @@ -18,7 +18,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb/if_rum.c,v 1.15 2007/11/21 05:51:43 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_rum.c,v 1.16 2008/01/07 09:14:37 kevlo Exp $"); /*- * Ralink Technology RT2501USB/RT2601USB chipset driver @@ -118,6 +118,7 @@ { USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2671 }, { USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL113R2 }, { USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL172 }, + { USB_VENDOR_SPARKLAN, USB_PRODUCT_SPARKLAN_RT2573 }, { USB_VENDOR_SURECOM, USB_PRODUCT_SURECOM_RT2573 } }; ==== //depot/projects/dtrace/src/sys/dev/usb/if_zyd.c#8 (text+ko) ==== @@ -1,6 +1,6 @@ /* $OpenBSD: if_zyd.c,v 1.52 2007/02/11 00:08:04 jsg Exp $ */ /* $NetBSD: if_zyd.c,v 1.7 2007/06/21 04:04:29 kiyohara Exp $ */ -/* $FreeBSD: src/sys/dev/usb/if_zyd.c,v 1.11 2007/12/01 08:53:03 kevlo Exp $ */ +/* $FreeBSD: src/sys/dev/usb/if_zyd.c,v 1.12 2008/01/07 11:31:55 weongyo Exp $ */ /*- * Copyright (c) 2006 by Damien Bergamini <damien.bergamini@free.fr> @@ -2788,6 +2788,6 @@ static devclass_t zyd_devclass; DRIVER_MODULE(zyd, uhub, zyd_driver, zyd_devclass, usbd_driver_load, 0); -MODULE_DEPEND(rum, wlan, 1, 1, 1); -MODULE_DEPEND(rum, wlan_amrr, 1, 1, 1); -MODULE_DEPEND(rum, usb, 1, 1, 1); +MODULE_DEPEND(zyd, wlan, 1, 1, 1); +MODULE_DEPEND(zyd, wlan_amrr, 1, 1, 1); +MODULE_DEPEND(zyd, usb, 1, 1, 1); ==== //depot/projects/dtrace/src/sys/dev/usb/usbdevs#23 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.336 2007/12/11 06:41:38 davidxu Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.337 2008/01/07 09:14:37 kevlo Exp $ /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */ /*- @@ -594,6 +594,7 @@ vendor OQO 0x1557 OQO vendor UMEDIA 0x157e U-MEDIA Communications vendor FIBERLINE 0x1582 Fiberline +vendor SPARKLAN 0x15a9 SparkLAN vendor SOHOWARE 0x15e8 SOHOware vendor UMAX 0x1606 UMAX Data Systems vendor INSIDEOUT 0x1608 Inside Out Networks @@ -2111,6 +2112,9 @@ product SOURCENEXT KEIKAI8 0x039f KeikaiDenwa 8 product SOURCENEXT KEIKAI8_CHG 0x012e KeikaiDenwa 8 with charger +/* SparkLAN products */ +product SPARKLAN RT2573 0x0004 RT2573 + /* Sphairon Access Systems GmbH products */ product SPHAIRON UB801R 0x0110 UB801R ==== //depot/projects/dtrace/src/sys/fs/devfs/devfs_vnops.c#13 (text+ko) ==== @@ -31,7 +31,7 @@ * @(#)kernfs_vnops.c 8.15 (Berkeley) 5/21/95 * From: FreeBSD: src/sys/miscfs/kernfs/kernfs_vnops.c 1.43 * - * $FreeBSD: src/sys/fs/devfs/devfs_vnops.c,v 1.151 2007/12/30 01:42:13 jeff Exp $ + * $FreeBSD: src/sys/fs/devfs/devfs_vnops.c,v 1.152 2008/01/07 20:05:18 jhb Exp $ */ /* @@ -1278,6 +1278,13 @@ return (devfs_allocv(de, ap->a_dvp->v_mount, ap->a_vpp, td)); } +static int +devfs_truncate_f(struct file *fp, off_t length, struct ucred *cred, struct thread *td) +{ + + return (vnops.fo_truncate(fp, length, cred, td)); +} + /* ARGSUSED */ static int devfs_write_f(struct file *fp, struct uio *uio, struct ucred *cred, int flags, struct thread *td) @@ -1322,6 +1329,7 @@ static struct fileops devfs_ops_f = { .fo_read = devfs_read_f, .fo_write = devfs_write_f, + .fo_truncate = devfs_truncate_f, .fo_ioctl = devfs_ioctl_f, .fo_poll = devfs_poll_f, .fo_kqfilter = devfs_kqfilter_f, ==== //depot/projects/dtrace/src/sys/fs/fifofs/fifo_vnops.c#6 (text+ko) ==== @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * @(#)fifo_vnops.c 8.10 (Berkeley) 5/27/95 - * $FreeBSD: src/sys/fs/fifofs/fifo_vnops.c,v 1.139 2007/12/30 01:42:13 jeff Exp $ + * $FreeBSD: src/sys/fs/fifofs/fifo_vnops.c,v 1.140 2008/01/07 20:05:18 jhb Exp $ */ #include <sys/param.h> @@ -61,10 +61,12 @@ static fo_kqfilter_t fifo_kqfilter_f; static fo_stat_t fifo_stat_f; static fo_close_t fifo_close_f; +static fo_truncate_t fifo_truncate_f; struct fileops fifo_ops_f = { .fo_read = fifo_read_f, >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200801072248.m07MmsZk080540>