PERFORCE change 140580 for review

John Birrell jb at FreeBSD.org
Fri Apr 25 06:42:22 UTC 2008


http://perforce.freebsd.org/chv.cgi?CH=140580

Change 140580 by jb at freebsd3 on 2008/04/25 06:41:22

	IFC

Affected files ...

.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#71 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/p4-primer/article.sgml#5 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml#8 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/problem-reports/article.sgml#6 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/users/chapter.sgml#5 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#70 integrate
.. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/Makefile#8 integrate
.. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/linux-users/Makefile#1 branch
.. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/linux-users/article.sgml#1 branch
.. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/freebsd.dsl#3 integrate
.. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/share/sgml/bookinfo.ent#1 branch
.. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/share/sgml/books.ent#1 branch
.. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/share/sgml/catalog#3 integrate
.. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/share/sgml/freebsd.dsl#3 integrate
.. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/share/sgml/freebsd.ent#1 branch
.. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/share/sgml/glossary/freebsd-glossary.sgml#1 branch
.. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/share/sgml/mirrors-local.xsl#1 branch
.. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/share/sgml/transtable-local.xsl#1 branch
.. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/share/sgml/transtable.xml#1 branch
.. //depot/projects/dtrace/ports/Mk/bsd.gnustep.mk#13 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.sites.mk#29 integrate
.. //depot/projects/dtrace/src/contrib/cvs/FREEBSD-vendstock#1 branch
.. //depot/projects/dtrace/src/contrib/cvs/src/filesubr.c#6 integrate
.. //depot/projects/dtrace/src/etc/defaults/rc.conf#33 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/send-pr/categories#5 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/send-pr/send-pr.1#5 integrate
.. //depot/projects/dtrace/src/lib/libc/stdlib/malloc.c#21 integrate
.. //depot/projects/dtrace/src/lib/libc/stdlib/rb.h#1 branch
.. //depot/projects/dtrace/src/lib/libc/stdlib/strfmon.c#6 integrate
.. //depot/projects/dtrace/src/lib/libdisk/open_disk.c#5 integrate
.. //depot/projects/dtrace/src/lib/libdisk/open_ia64_disk.c#5 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_affinity.c#4 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_attr.c#9 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_create.c#11 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_spinlock.c#6 integrate
.. //depot/projects/dtrace/src/lib/libutil/Makefile#7 integrate
.. //depot/projects/dtrace/src/lib/libutil/gr_util.c#1 branch
.. //depot/projects/dtrace/src/lib/libutil/libutil.h#7 integrate
.. //depot/projects/dtrace/src/share/misc/committers-doc.dot#5 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/machdep.c#28 integrate
.. //depot/projects/dtrace/src/sys/amd64/include/pcpu.h#5 integrate
.. //depot/projects/dtrace/src/sys/amd64/linux32/linux32_dummy.c#12 integrate
.. //depot/projects/dtrace/src/sys/arm/arm/machdep.c#8 integrate
.. //depot/projects/dtrace/src/sys/compat/linux/linux_file.c#16 integrate
.. //depot/projects/dtrace/src/sys/dev/hme/if_hme.c#8 integrate
.. //depot/projects/dtrace/src/sys/dev/hme/if_hme_pci.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/hme/if_hme_sbus.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/hme/if_hmereg.h#4 integrate
.. //depot/projects/dtrace/src/sys/dev/hme/if_hmevar.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/sym/sym_hipd.c#7 integrate
.. //depot/projects/dtrace/src/sys/dev/vx/if_vx.c#4 integrate
.. //depot/projects/dtrace/src/sys/geom/part/g_part.c#8 integrate
.. //depot/projects/dtrace/src/sys/geom/part/g_part_apm.c#4 integrate
.. //depot/projects/dtrace/src/sys/geom/part/g_part_bsd.c#5 integrate
.. //depot/projects/dtrace/src/sys/geom/part/g_part_gpt.c#6 integrate
.. //depot/projects/dtrace/src/sys/geom/part/g_part_mbr.c#5 integrate
.. //depot/projects/dtrace/src/sys/geom/part/g_part_pc98.c#3 integrate
.. //depot/projects/dtrace/src/sys/geom/part/g_part_vtoc8.c#3 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/machdep.c#28 integrate
.. //depot/projects/dtrace/src/sys/i386/include/pcpu.h#6 integrate
.. //depot/projects/dtrace/src/sys/i386/linux/linux_dummy.c#12 integrate
.. //depot/projects/dtrace/src/sys/ia64/ia64/machdep.c#21 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_descrip.c#26 integrate
.. //depot/projects/dtrace/src/sys/kern/sched_4bsd.c#37 integrate
.. //depot/projects/dtrace/src/sys/kern/sched_ule.c#35 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_subr.c#38 integrate
.. //depot/projects/dtrace/src/sys/mips/mips/machdep.c#3 integrate
.. //depot/projects/dtrace/src/sys/net/radix_mpath.c#2 integrate
.. //depot/projects/dtrace/src/sys/pc98/pc98/machdep.c#23 integrate
.. //depot/projects/dtrace/src/sys/powerpc/aim/machdep.c#9 integrate
.. //depot/projects/dtrace/src/sys/powerpc/booke/machdep.c#3 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit.h#8 integrate
.. //depot/projects/dtrace/src/sys/sparc64/fhc/fhc.c#5 integrate
.. //depot/projects/dtrace/src/sys/sparc64/include/bus_common.h#5 integrate
.. //depot/projects/dtrace/src/sys/sparc64/include/intr_machdep.h#7 integrate
.. //depot/projects/dtrace/src/sys/sparc64/include/sysarch.h#4 integrate
.. //depot/projects/dtrace/src/sys/sparc64/pci/psycho.c#11 integrate
.. //depot/projects/dtrace/src/sys/sparc64/sbus/sbus.c#7 integrate
.. //depot/projects/dtrace/src/sys/sparc64/sparc64/intr_machdep.c#11 integrate
.. //depot/projects/dtrace/src/sys/sparc64/sparc64/machdep.c#11 integrate
.. //depot/projects/dtrace/src/sys/sparc64/sparc64/mp_machdep.c#9 integrate
.. //depot/projects/dtrace/src/sys/sparc64/sparc64/nexus.c#6 integrate
.. //depot/projects/dtrace/src/sys/sparc64/sparc64/upa.c#3 integrate
.. //depot/projects/dtrace/src/sys/sun4v/sun4v/machdep.c#15 integrate
.. //depot/projects/dtrace/src/sys/sys/proc.h#42 integrate
.. //depot/projects/dtrace/src/tools/regression/environ/envctl.c#3 integrate
.. //depot/projects/dtrace/src/tools/regression/environ/envtest.t#2 integrate
.. //depot/projects/dtrace/src/tools/regression/lib/libutil/Makefile#5 integrate
.. //depot/projects/dtrace/src/tools/regression/lib/libutil/test-grp.c#1 branch
.. //depot/projects/dtrace/src/tools/regression/lib/libutil/test-grp.t#1 branch
.. //depot/projects/dtrace/src/tools/tools/mctest/mctest.1#2 integrate
.. //depot/projects/dtrace/src/tools/tools/mctest/mctest.cc#3 integrate
.. //depot/projects/dtrace/src/tools/tools/mctest/mctest_run.sh#1 branch
.. //depot/projects/dtrace/src/usr.bin/calendar/calendars/calendar.christian#5 integrate
.. //depot/projects/dtrace/www/en/cgi/cvsweb.conf-freebsd#4 integrate
.. //depot/projects/dtrace/www/en/ports/categories#5 integrate
.. //depot/projects/dtrace/www/en/projects/summerofcode-2008.sgml#2 integrate
.. //depot/projects/dtrace/www/en/send-pr.sgml#7 integrate
.. //depot/projects/dtrace/www/ja/share/sgml/l10n.ent#3 integrate

Differences ...

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#71 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.786 2008/04/22 15:26:14 pgj Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.787 2008/04/24 05:48:43 osa Exp $ -->
 <!--
 	NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
 	order by first name.
@@ -9347,6 +9347,11 @@
     </listitem>
 
     <listitem>
+      <para>Tofig Suleymanov
+	<email>tofig at freebsd.az</email></para>
+    </listitem>
+
+    <listitem>
       <para>Tom
 	<email>root at majestix.cmr.no</email></para>
     </listitem>

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/p4-primer/article.sgml#5 (text+ko) ====

@@ -23,7 +23,7 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/p4-primer/article.sgml,v 1.9 2007/09/09 09:03:34 danger Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/p4-primer/article.sgml,v 1.10 2008/04/24 19:44:25 danger Exp $</pubdate>
 
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
@@ -872,6 +872,10 @@
       <para><filename
 	role="directory">//depot/projects/soc2007/<replaceable>project-name</replaceable>/...</filename></para>
     </listitem>
+    <listitem>
+      <para><filename
+	role="directory">//depot/projects/soc2008/<replaceable>project-name</replaceable>/...</filename></para>
+    </listitem>
   </itemizedlist>
 
   <para>The project mentor is responsible for choosing a suitable

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml#8 (text+ko) ====

@@ -15,7 +15,7 @@
   <articleinfo>
     <title>Problem Report Handling Guidelines</title>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml,v 1.29 2008/01/25 22:15:03 linimon Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml,v 1.30 2008/04/23 09:30:01 linimon Exp $</pubdate>
 
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
@@ -292,7 +292,7 @@
 
 	    <row>
 	      <entry>architecture-specific</entry>
-	      <entry>alpha, i386, ia64, powerpc, sparc64</entry>
+	      <entry>alpha, amd64, arm, i386, ia64, powerpc, sparc64</entry>
 	      <entry>freebsd-<replaceable>arch</replaceable></entry>
 	    </row>
 

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/problem-reports/article.sgml#6 (text+ko) ====

@@ -7,7 +7,7 @@
   <articleinfo>
     <title>Writing &os; Problem Reports</title>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/problem-reports/article.sgml,v 1.54 2008/02/03 08:54:34 linimon Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/problem-reports/article.sgml,v 1.55 2008/04/23 09:30:01 linimon Exp $</pubdate>
 
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
@@ -907,6 +907,11 @@
 	    </listitem>
 
 	    <listitem>
+	      <para><literal>arm:</literal> problems specific to the
+		ARM platform.</para>
+	    </listitem>
+
+	    <listitem>
 	      <para><literal>bin:</literal> problems with userland
 		programs in the base system.</para>
 	    </listitem>

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/users/chapter.sgml#5 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/users/chapter.sgml,v 1.58 2007/07/04 09:31:06 blackend Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/users/chapter.sgml,v 1.59 2008/04/24 16:17:44 roam Exp $
 -->
 
 <chapter id="users">
@@ -982,7 +982,7 @@
       the <groupname>teamtwo</groupname> group.</para>
 
     <example>
-      <title>Adding Somebody to a Group Using &man.pw.8;</title>
+      <title>Setting the List of Members of a Group Using &man.pw.8;</title>
 
       <screen>&prompt.root; <userinput>pw groupmod teamtwo -M jru</userinput>
 &prompt.root; <userinput>pw groupshow teamtwo</userinput>
@@ -990,7 +990,7 @@
     </example>
 
     <para>The argument to the <option>-M</option> option is a
-      comma-delimited list of users who are members of the group.  From the
+      comma-delimited list of users who are to be in the group.  From the
       preceding sections, we know that the password file also contains a
       group for each user.  The latter (the user) is automatically added to
       the group list by the system; the user will not show up as a member
@@ -1001,6 +1001,19 @@
       additionally data from <filename>/etc/passwd</filename>.</para>
 
     <example>
+      <title>Adding a New Member to a Group Using &man.pw.8;</title>
+
+      <screen>&prompt.root; <userinput>pw groupmod teamtwo -m db</userinput>
+&prompt.root; <userinput>pw groupshow teamtwo</userinput>
+teamtwo:*:1100:jru,db</screen>
+    </example>
+
+    <para>The argument to the <option>-m</option> option is a
+      comma-delimited list of users who are to be added to the group. Unlike
+      the previous example, these users are added to the group and do not
+      replace the list of users in the group.</para>
+
+    <example>
       <title>Using &man.id.1; to Determine Group Membership</title>
 
       <screen>&prompt.user; <userinput>id jru</userinput>

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#70 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.926 2008/04/21 16:48:24 jkim Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.927 2008/04/23 01:58:05 linimon Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -1556,14 +1556,14 @@
 	      </row>
 
 	      <row>
-		<entry><filename>graphics</filename></entry>
-		<entry>Graphics utilities.</entry>
+		<entry><filename>gnustep*</filename></entry>
+		<entry>Software related to the GNUstep desktop environment.</entry>
 		<entry></entry>
 	      </row>
 
 	      <row>
-		<entry><filename>gnustep*</filename></entry>
-		<entry>Software related to the GNUstep desktop environment.</entry>
+		<entry><filename>graphics</filename></entry>
+		<entry>Graphics utilities.</entry>
 		<entry></entry>
 	      </row>
 

==== //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/Makefile#8 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: doc/es_ES.ISO8859-1/articles/Makefile,v 1.11 2008/03/31 16:58:38 carvay Exp $
+# $FreeBSD: doc/es_ES.ISO8859-1/articles/Makefile,v 1.12 2008/04/24 19:11:13 carvay Exp $
 # $FreeBSDes: doc/es_ES.ISO8859-1/articles/Makefile,v 1.3 2004/10/09 02:01:17 jesusr Exp $
 
 SUBDIR =
@@ -12,6 +12,7 @@
 SUBDIR+= fdp-es
 SUBDIR+= laptop
 SUBDIR+= linux-comparison
+SUBDIR+= linux-users
 SUBDIR+= mailing-list-faq
 SUBDIR+= nanobsd
 SUBDIR+= p4-primer

==== //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/freebsd.dsl#3 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/es_ES.ISO8859-1/share/sgml/freebsd.dsl,v 1.10 2004/02/01 19:59:22 jesusr Exp $ -->
+<!-- $FreeBSD: doc/es_ES.ISO8859-1/share/sgml/freebsd.dsl,v 1.11 2008/04/24 21:40:03 carvay Exp $ -->
 
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
 <!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
@@ -22,7 +22,7 @@
 	    (make element gi: "p"
                   attributes: (list (list "align" "center"))
               (make element gi: "small"
-                (literal "Éste y otros documentos pueden obtenerse en ")
+                (literal "Puede descargar éste y muchos otros documentos desde ")
 		(create-link
 		  (list (list "HREF" "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
                   (literal "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
@@ -30,17 +30,17 @@
             (make element gi: "p"
                   attributes: (list (list "align" "center"))
               (make element gi: "small"  
-                (literal "Para preguntas acerca de FreeBSD, leer la ")
+                (literal "Si tiene dudas sobre FreeBSD consulte la ")
 		(create-link
 		  (list (list "HREF" "http://www.FreeBSD.org/docs.html"))
                   (literal "documentación"))
-                (literal " antes de contactar con la lista <")
+                (literal " antes de escribir a la lista <")
 		(create-link
 		  (list (list "HREF" "mailto:questions at FreeBSD.org"))
                   (literal "questions at FreeBSD.org"))
                 (literal ">.")
                 (make empty-element gi: "br")
-                (literal "Para preguntas acerca de esta documentación, e-mail a <")
+                (literal "Envíe sus preguntas sobre la documentación a <")
 		(create-link (list (list "HREF" "mailto:doc at FreeBSD.org"))
                   (literal "doc at FreeBSD.org"))
 	        (literal ">.")))))

==== //depot/projects/dtrace/doc/hu_HU.ISO8859-2/share/sgml/catalog#3 (text+ko) ====

@@ -4,22 +4,28 @@
   -- ...................................................................... --
   -- Hungarian specific ...................................................... --
   
-  -- $FreeBSD: doc/hu_HU.ISO8859-2/share/sgml/catalog,v 1.2 2007/10/01 13:37:44 gabor Exp $ --
+  -- $FreeBSD: doc/hu_HU.ISO8859-2/share/sgml/catalog,v 1.3 2008/04/24 18:34:27 pgj Exp $ --
 
 PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//HU"
 	"articles.ent"
 
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//EN"
+PUBLIC  "-//FreeBSD//ENTITIES DocBook BookInfo Entities//HU"
+	"bookinfo.ent"
+
+PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//HU"
 	"books.ent"
 
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
-        "freebsd.dsl"
+	"freebsd.dsl"
 
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//HU"
 	"freebsd.dsl"
 
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//HU"
-        "freebsd.dsl"
+	"freebsd.dsl"
+
+PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//HU"
+	"freebsd.ent"
 
 PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
 	"l10n.ent"

==== //depot/projects/dtrace/doc/hu_HU.ISO8859-2/share/sgml/freebsd.dsl#3 (text+ko) ====

@@ -1,8 +1,8 @@
 <!--
-	$FreeBSD: doc/hu_HU.ISO8859-2/share/sgml/freebsd.dsl,v 1.2 2007/10/01 13:37:44 gabor Exp $
+	$FreeBSD: doc/hu_HU.ISO8859-2/share/sgml/freebsd.dsl,v 1.3 2008/04/24 18:34:27 pgj Exp $
 	The FreeBSD Hungarian Documentation Project
 	Translated by: Gabor Kovesdan <gabor at FreeBSD.org>
-	Original revision: 1.20
+	Original revision: 1.22
 -->
 
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [

==== //depot/projects/dtrace/ports/Mk/bsd.gnustep.mk#13 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: ports/Mk/bsd.gnustep.mk,v 1.46 2008/04/19 17:46:02 miwi Exp $
+# $FreeBSD: ports/Mk/bsd.gnustep.mk,v 1.48 2008/04/24 05:04:25 dinoex Exp $
 #
 # This file contains some variable definitions that are supposed to
 # make your life easier when dealing with ports related to the GNUstep.
@@ -515,9 +515,11 @@
 #
 .if defined(USE_GNUSTEP_LDCONFIG)
 .for i in ${USE_GNUSTEP_LDCONFIG}
+# don't remove INSTALLS_SHLIB, see ports/123042
+#USE_LDCONFIG+=	${i}
 LDCONFIG_DIRS+=	${i}
 .endfor
-USE_LDCONFIG=		yes
+INSTALLS_SHLIB=	yes
 .endif
 
 # eof

==== //depot/projects/dtrace/ports/Mk/bsd.sites.mk#29 (text+ko) ====

@@ -20,7 +20,7 @@
 #
 # Note: all entries should terminate with a slash.
 #
-# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.445 2008/04/16 21:58:03 pav Exp $
+# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.446 2008/04/24 04:27:34 vanilla Exp $
 #
 
 # Where to put distfiles that don't have any other master site
@@ -383,8 +383,6 @@
 	ftp://ftp.port80.se/fedora/core/%SUBDIR%/ \
 	http://ftp.upjs.sk/pub/fedora/linux/core/%SUBDIR%/ \
 	ftp://ftp.upjs.sk/pub/fedora/linux/core/%SUBDIR%/ \
-	http://ftp.mirror.tw/pub/fedora/linux/core/%SUBDIR%/ \
-	ftp://ftp.mirror.tw/pub/fedora/linux/core/%SUBDIR%/ \
 	ftp://ftp.tlk-l.net/pub/mirrors/fedora.redhat.com/linux/core/%SUBDIR%/ \
 	http://limestone.uoregon.edu/ftp/fedora/%SUBDIR%/ \
 	ftp://limestone.uoregon.edu/fedora/%SUBDIR%/ \

==== //depot/projects/dtrace/src/contrib/cvs/src/filesubr.c#6 (text+ko) ====

@@ -17,10 +17,6 @@
    definitions under operating systems (like, say, Windows NT) with different
    file system semantics.  */
 
-/*
- * $FreeBSD: src/contrib/cvs/src/filesubr.c,v 1.14 2008/01/13 06:06:15 obrien Exp $
- */
-
 #include <assert.h>
 #include "cvs.h"
 

==== //depot/projects/dtrace/src/etc/defaults/rc.conf#33 (text+ko) ====

@@ -15,7 +15,7 @@
 # For a more detailed explanation of all the rc.conf variables, please
 # refer to the rc.conf(5) manual page.
 #
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.332 2008/04/21 18:17:48 brooks Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.333 2008/04/23 22:40:59 brooks Exp $
 
 ##############################################################
 ###  Important initial Boot-time options  ####################
@@ -33,7 +33,7 @@
 apm_enable="NO"		# Set to YES to enable APM BIOS functions (or NO).
 apmd_enable="NO"	# Run apmd to handle APM event from userland.
 apmd_flags=""		# Flags to apmd (if enabled).
-ddb_enable="YES"	# Load ddb scripts at boot.
+ddb_enable="NO"		# Set to YES to load ddb scripts at boot.
 ddb_config="/etc/ddb.conf"	# ddb(8) config file.
 devd_enable="YES" 	# Run devd, to trigger programs on device tree changes.
 devd_flags=""		# Additional flags for devd(8).

==== //depot/projects/dtrace/src/gnu/usr.bin/send-pr/categories#5 (text+ko) ====

@@ -1,7 +1,8 @@
-# $FreeBSD: src/gnu/usr.bin/send-pr/categories,v 1.18 2006/07/17 10:36:56 ceri Exp $
+# $FreeBSD: src/gnu/usr.bin/send-pr/categories,v 1.19 2008/04/23 03:05:31 linimon Exp $
 advocacy
 alpha
 amd64
+arm
 bin
 conf
 docs

==== //depot/projects/dtrace/src/gnu/usr.bin/send-pr/send-pr.1#5 (text+ko) ====

@@ -22,7 +22,7 @@
 .\"
 .\" ---------------------------------------------------------------------------
 .\"
-.\" $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.1,v 1.20 2006/10/15 11:50:11 ceri Exp $
+.\" $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.1,v 1.21 2008/04/23 03:05:31 linimon Exp $
 .nh
 .TH SEND-PR 1 3.113 "October 2006"
 .SH NAME
@@ -191,6 +191,9 @@
 .B amd64
 AMD64 processor specific problems.
 .TP
+.B arm
+ARM processor specific problems.
+.TP
 .B bin
 Corrections or enhancements to system executables.
 .TP

==== //depot/projects/dtrace/src/lib/libc/stdlib/malloc.c#21 (text+ko) ====

@@ -128,7 +128,7 @@
 #define	MALLOC_DSS
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.167 2008/03/07 16:54:03 jasone Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.168 2008/04/23 16:09:18 jasone Exp $");
 
 #include "libc_private.h"
 #ifdef MALLOC_DEBUG
@@ -142,7 +142,6 @@
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/sysctl.h>
-#include <sys/tree.h>
 #include <sys/uio.h>
 #include <sys/ktrace.h> /* Must come after several other sys/ includes. */
 
@@ -175,6 +174,8 @@
 #endif
 #include <assert.h>
 
+#include "rb.h"
+
 #ifdef MALLOC_DEBUG
    /* Disable inlining to make debugging easier. */
 #  define inline
@@ -439,10 +440,10 @@
 typedef struct extent_node_s extent_node_t;
 struct extent_node_s {
 	/* Linkage for the size/address-ordered tree. */
-	RB_ENTRY(extent_node_s) link_szad;
+	rb_node(extent_node_t) link_szad;
 
 	/* Linkage for the address-ordered tree. */
-	RB_ENTRY(extent_node_s) link_ad;
+	rb_node(extent_node_t) link_ad;
 
 	/* Pointer to the extent that this tree node is responsible for. */
 	void	*addr;
@@ -450,10 +451,7 @@
 	/* Total region size. */
 	size_t	size;
 };
-typedef struct extent_tree_szad_s extent_tree_szad_t;
-RB_HEAD(extent_tree_szad_s, extent_node_s);
-typedef struct extent_tree_ad_s extent_tree_ad_t;
-RB_HEAD(extent_tree_ad_s, extent_node_s);
+typedef rb_tree(extent_node_t) extent_tree_t;
 
 /******************************************************************************/
 /*
@@ -480,7 +478,7 @@
 	arena_t		*arena;
 
 	/* Linkage for the arena's chunk tree. */
-	RB_ENTRY(arena_chunk_s) link;
+	rb_node(arena_chunk_t) link;
 
 	/*
 	 * Number of pages in use.  This is maintained in order to make
@@ -495,7 +493,7 @@
 	 * Tree of extent nodes that are embedded in the arena chunk header
 	 * page(s).  These nodes are used by arena_chunk_node_alloc().
 	 */
-	extent_tree_ad_t nodes;
+	extent_tree_t	nodes;
 	extent_node_t	*nodes_past;
 
 	/*
@@ -505,13 +503,12 @@
 	 */
 	arena_chunk_map_t map[1]; /* Dynamically sized. */
 };
-typedef struct arena_chunk_tree_s arena_chunk_tree_t;
-RB_HEAD(arena_chunk_tree_s, arena_chunk_s);
+typedef rb_tree(arena_chunk_t) arena_chunk_tree_t;
 
 typedef struct arena_run_s arena_run_t;
 struct arena_run_s {
 	/* Linkage for run trees. */
-	RB_ENTRY(arena_run_s) link;
+	rb_node(arena_run_t) link;
 
 #ifdef MALLOC_DEBUG
 	uint32_t	magic;
@@ -530,8 +527,7 @@
 	/* Bitmask of in-use regions (0: in use, 1: free). */
 	unsigned	regs_mask[1]; /* Dynamically sized. */
 };
-typedef struct arena_run_tree_s arena_run_tree_t;
-RB_HEAD(arena_run_tree_s, arena_run_s);
+typedef rb_tree(arena_run_t) arena_run_tree_t;
 
 struct arena_bin_s {
 	/*
@@ -613,11 +609,11 @@
 	 * using one set of nodes, since one is needed for first-best-fit run
 	 * allocation, and the other is needed for coalescing.
 	 */
-	extent_tree_szad_t	runs_avail_szad;
-	extent_tree_ad_t	runs_avail_ad;
+	extent_tree_t		runs_avail_szad;
+	extent_tree_t		runs_avail_ad;
 
 	/* Tree of this arena's allocated (in-use) runs. */
-	extent_tree_ad_t	runs_alloced_ad;
+	extent_tree_t		runs_alloced_ad;
 
 #ifdef MALLOC_BALANCE
 	/*
@@ -694,7 +690,7 @@
 static malloc_mutex_t	huge_mtx;
 
 /* Tree of chunks that are stand-alone huge allocations. */
-static extent_tree_ad_t	huge;
+static extent_tree_t	huge;
 
 #ifdef MALLOC_DSS
 /*
@@ -715,8 +711,8 @@
  * address space.  Depending on function, different tree orderings are needed,
  * which is why there are two trees with the same contents.
  */
-static extent_tree_szad_t dss_chunks_szad;
-static extent_tree_ad_t	dss_chunks_ad;
+static extent_tree_t	dss_chunks_szad;
+static extent_tree_t	dss_chunks_ad;
 #endif
 
 #ifdef MALLOC_STATS
@@ -1431,9 +1427,20 @@
 	return (ret);
 }
 
-/* Generate red-black tree code for size/address-ordered extents. */
-RB_GENERATE_STATIC(extent_tree_szad_s, extent_node_s, link_szad,
-    extent_szad_comp)
+/* Wrap large red-black tree macros in functions. */
+static void
+extent_tree_szad_insert(extent_tree_t *tree, extent_node_t *extent)
+{
+
+	rb_insert(extent_node_t, link_szad, extent_szad_comp, tree, extent);
+}
+
+static void
+extent_tree_szad_remove(extent_tree_t *tree, extent_node_t *extent)
+{
+
+	rb_remove(extent_node_t, link_szad, extent_szad_comp, tree, extent);
+}
 
 static inline int
 extent_ad_comp(extent_node_t *a, extent_node_t *b)
@@ -1444,8 +1451,20 @@
 	return ((a_addr > b_addr) - (a_addr < b_addr));
 }
 
-/* Generate red-black tree code for address-ordered extents. */
-RB_GENERATE_STATIC(extent_tree_ad_s, extent_node_s, link_ad, extent_ad_comp)
+/* Wrap large red-black tree macros in functions. */
+static void
+extent_tree_ad_insert(extent_tree_t *tree, extent_node_t *extent)
+{
+
+	rb_insert(extent_node_t, link_ad, extent_ad_comp, tree, extent);
+}
+
+static void
+extent_tree_ad_remove(extent_tree_t *tree, extent_node_t *extent)
+{
+
+	rb_remove(extent_node_t, link_ad, extent_ad_comp, tree, extent);
+}
 
 /*
  * End extent tree code.
@@ -1561,14 +1580,15 @@
 	key.addr = NULL;
 	key.size = size;
 	malloc_mutex_lock(&dss_mtx);
-	node = RB_NFIND(extent_tree_szad_s, &dss_chunks_szad, &key);
+	rb_nsearch(extent_node_t, link_szad, extent_szad_comp, &dss_chunks_szad,
+	    &key, node);
 	if (node != NULL) {
 		void *ret = node->addr;
 
 		/* Remove node from the tree. */
-		RB_REMOVE(extent_tree_szad_s, &dss_chunks_szad, node);
+		extent_tree_szad_remove(&dss_chunks_szad, node);
 		if (node->size == size) {
-			RB_REMOVE(extent_tree_ad_s, &dss_chunks_ad, node);
+			extent_tree_ad_remove(&dss_chunks_ad, node);
 			base_node_dealloc(node);
 		} else {
 			/*
@@ -1579,7 +1599,7 @@
 			assert(node->size > size);
 			node->addr = (void *)((uintptr_t)node->addr + size);
 			node->size -= size;
-			RB_INSERT(extent_tree_szad_s, &dss_chunks_szad, node);
+			extent_tree_szad_insert(&dss_chunks_szad, node);
 		}
 		malloc_mutex_unlock(&dss_mtx);
 
@@ -1719,7 +1739,8 @@
 	extent_node_t *node, *prev, key;
 
 	key.addr = (void *)((uintptr_t)chunk + size);
-	node = RB_NFIND(extent_tree_ad_s, &dss_chunks_ad, &key);
+	rb_nsearch(extent_node_t, link_ad, extent_ad_comp, &dss_chunks_ad,
+	    &key, node);
 	/* Try to coalesce forward. */
 	if (node != NULL && node->addr == key.addr) {
 		/*
@@ -1727,10 +1748,10 @@
 		 * not change the position within dss_chunks_ad, so only
 		 * remove/insert from/into dss_chunks_szad.
 		 */
-		RB_REMOVE(extent_tree_szad_s, &dss_chunks_szad, node);
+		extent_tree_szad_remove(&dss_chunks_szad, node);
 		node->addr = chunk;
 		node->size += size;
-		RB_INSERT(extent_tree_szad_s, &dss_chunks_szad, node);
+		extent_tree_szad_insert(&dss_chunks_szad, node);
 	} else {
 		/*
 		 * Coalescing forward failed, so insert a new node.  Drop
@@ -1744,12 +1765,13 @@
 			return (NULL);
 		node->addr = chunk;
 		node->size = size;
-		RB_INSERT(extent_tree_ad_s, &dss_chunks_ad, node);
-		RB_INSERT(extent_tree_szad_s, &dss_chunks_szad, node);
+		extent_tree_ad_insert(&dss_chunks_ad, node);
+		extent_tree_szad_insert(&dss_chunks_szad, node);
 	}
 
 	/* Try to coalesce backward. */
-	prev = RB_PREV(extent_tree_ad_s, &dss_chunks_ad, node);
+	rb_prev(extent_node_t, link_ad, extent_ad_comp, &dss_chunks_ad, node,
+	    prev);
 	if (prev != NULL && (void *)((uintptr_t)prev->addr + prev->size) ==
 	    chunk) {
 		/*
@@ -1757,13 +1779,13 @@
 		 * not change the position within dss_chunks_ad, so only
 		 * remove/insert node from/into dss_chunks_szad.
 		 */
-		RB_REMOVE(extent_tree_szad_s, &dss_chunks_szad, prev);
-		RB_REMOVE(extent_tree_ad_s, &dss_chunks_ad, prev);
+		extent_tree_szad_remove(&dss_chunks_szad, prev);
+		extent_tree_ad_remove(&dss_chunks_ad, prev);
 
-		RB_REMOVE(extent_tree_szad_s, &dss_chunks_szad, node);
+		extent_tree_szad_remove(&dss_chunks_szad, node);
 		node->addr = prev->addr;
 		node->size += prev->size;
-		RB_INSERT(extent_tree_szad_s, &dss_chunks_szad, node);
+		extent_tree_szad_insert(&dss_chunks_szad, node);
 
 		base_node_dealloc(prev);
 	}
@@ -1803,10 +1825,8 @@
 			dss_max = (void *)((intptr_t)dss_prev - (intptr_t)size);
 
 			if (node != NULL) {
-				RB_REMOVE(extent_tree_szad_s, &dss_chunks_szad,
-				    node);
-				RB_REMOVE(extent_tree_ad_s, &dss_chunks_ad,
-				    node);
+				extent_tree_szad_remove(&dss_chunks_szad, node);
+				extent_tree_ad_remove(&dss_chunks_ad, node);
 				base_node_dealloc(node);
 			}
 			malloc_mutex_unlock(&dss_mtx);
@@ -1991,8 +2011,20 @@
 	return ((a_chunk > b_chunk) - (a_chunk < b_chunk));
 }
 
-/* Generate red-black tree code for arena chunks. */
-RB_GENERATE_STATIC(arena_chunk_tree_s, arena_chunk_s, link, arena_chunk_comp)
+/* Wrap large red-black tree macros in functions. */
+static void
+arena_chunk_tree_insert(arena_chunk_tree_t *tree, arena_chunk_t *chunk)
+{
+
+	rb_insert(arena_chunk_t, link, arena_chunk_comp, tree, chunk);
+}
+
+static void
+arena_chunk_tree_remove(arena_chunk_tree_t *tree, arena_chunk_t *chunk)
+{
+
+	rb_remove(arena_chunk_t, link, arena_chunk_comp, tree, chunk);
+}
 
 static inline int
 arena_run_comp(arena_run_t *a, arena_run_t *b)
@@ -2006,17 +2038,29 @@
 	return ((a_run > b_run) - (a_run < b_run));
 }
 
-/* Generate red-black tree code for arena runs. */
-RB_GENERATE_STATIC(arena_run_tree_s, arena_run_s, link, arena_run_comp)
+/* Wrap large red-black tree macros in functions. */
+static void
+arena_run_tree_insert(arena_run_tree_t *tree, arena_run_t *run)
+{
+
+	rb_insert(arena_run_t, link, arena_run_comp, tree, run);
+}
+
+static void
+arena_run_tree_remove(arena_run_tree_t *tree, arena_run_t *run)
+{
+
+	rb_remove(arena_run_t, link, arena_run_comp, tree, run);
+}
 
 static extent_node_t *
 arena_chunk_node_alloc(arena_chunk_t *chunk)
 {
 	extent_node_t *ret;
 
-	ret = RB_MIN(extent_tree_ad_s, &chunk->nodes);
+	rb_first(extent_node_t, link_ad, &chunk->nodes, ret);
 	if (ret != NULL)
-		RB_REMOVE(extent_tree_ad_s, &chunk->nodes, ret);
+		extent_tree_ad_remove(&chunk->nodes, ret);
 	else {
 		ret = chunk->nodes_past;
 		chunk->nodes_past = (extent_node_t *)
@@ -2034,7 +2078,7 @@
 {
 
 	node->addr = (void *)node;
-	RB_INSERT(extent_tree_ad_s, &chunk->nodes, node);
+	extent_tree_ad_insert(&chunk->nodes, node);
 }
 
 static inline void *
@@ -2213,10 +2257,11 @@
 	nodeA = arena_chunk_node_alloc(chunk);
 	nodeA->addr = run;
 	nodeA->size = size;
-	RB_INSERT(extent_tree_ad_s, &arena->runs_alloced_ad, nodeA);
+	extent_tree_ad_insert(&arena->runs_alloced_ad, nodeA);
 
 	key.addr = run;
-	nodeB = RB_FIND(extent_tree_ad_s, &arena->runs_avail_ad, &key);
+	rb_search(extent_node_t, link_ad, extent_ad_comp, &arena->runs_avail_ad,
+	    &key, nodeB);
 	assert(nodeB != NULL);
 
 	run_ind = (unsigned)(((uintptr_t)run - (uintptr_t)chunk)
@@ -2253,7 +2298,7 @@
 	}
 
 	/* Keep track of trailing unused pages for later use. */
-	RB_REMOVE(extent_tree_szad_s, &arena->runs_avail_szad, nodeB);
+	extent_tree_szad_remove(&arena->runs_avail_szad, nodeB);
 	if (rem_pages > 0) {
 		/*
 		 * Update nodeB in runs_avail_*.  Its position within
@@ -2261,10 +2306,10 @@
 		 */
 		nodeB->addr = (void *)((uintptr_t)nodeB->addr + size);
 		nodeB->size -= size;
-		RB_INSERT(extent_tree_szad_s, &arena->runs_avail_szad, nodeB);
+		extent_tree_szad_insert(&arena->runs_avail_szad, nodeB);
 	} else {
 		/* Remove nodeB from runs_avail_*. */
-		RB_REMOVE(extent_tree_ad_s, &arena->runs_avail_ad, nodeB);
+		extent_tree_ad_remove(&arena->runs_avail_ad, nodeB);
 		arena_chunk_node_dealloc(chunk, nodeB);
 	}
 
@@ -2290,7 +2335,7 @@
 
 		chunk->arena = arena;
 
-		RB_INSERT(arena_chunk_tree_s, &arena->chunks, chunk);
+		arena_chunk_tree_insert(&arena->chunks, chunk);
 
 		/*
 		 * Claim that no pages are in use, since the header is merely
@@ -2310,7 +2355,7 @@
 		    arena_chunk_header_npages));
 
 		/* Initialize the tree of unused extent nodes. */
-		RB_INIT(&chunk->nodes);
+		rb_tree_new(extent_node_t, link_ad, &chunk->nodes);
 		chunk->nodes_past = (extent_node_t *)QUANTUM_CEILING(
 		    (uintptr_t)&chunk->map[chunk_npages]);
 	}
@@ -2320,8 +2365,8 @@
 	node->addr = (void *)((uintptr_t)chunk + (arena_chunk_header_npages <<
 	    pagesize_2pow));
 	node->size = chunksize - (arena_chunk_header_npages << pagesize_2pow);
-	RB_INSERT(extent_tree_szad_s, &arena->runs_avail_szad, node);
-	RB_INSERT(extent_tree_ad_s, &arena->runs_avail_ad, node);
+	extent_tree_szad_insert(&arena->runs_avail_szad, node);
+	extent_tree_ad_insert(&arena->runs_avail_ad, node);
 
 	return (chunk);
 }
@@ -2332,8 +2377,7 @@
 	extent_node_t *node, key;
 
 	if (arena->spare != NULL) {
-		RB_REMOVE(arena_chunk_tree_s, &chunk->arena->chunks,
-		    arena->spare);
+		arena_chunk_tree_remove(&chunk->arena->chunks, arena->spare);
 		arena->ndirty -= arena->spare->ndirty;
 		chunk_dealloc((void *)arena->spare, chunksize);
 #ifdef MALLOC_STATS
@@ -2349,10 +2393,11 @@
 	 */
 	key.addr = (void *)((uintptr_t)chunk + (arena_chunk_header_npages <<
 	    pagesize_2pow));
-	node = RB_FIND(extent_tree_ad_s, &arena->runs_avail_ad, &key);
+	rb_search(extent_node_t, link_ad, extent_ad_comp, &arena->runs_avail_ad,
+	    &key, node);
 	assert(node != NULL);
-	RB_REMOVE(extent_tree_szad_s, &arena->runs_avail_szad, node);
-	RB_REMOVE(extent_tree_ad_s, &arena->runs_avail_ad, node);
+	extent_tree_szad_remove(&arena->runs_avail_szad, node);
+	extent_tree_ad_remove(&arena->runs_avail_ad, node);
 	arena_chunk_node_dealloc(chunk, node);
 
 	arena->spare = chunk;
@@ -2372,7 +2417,8 @@
 	/* Search the arena's chunks for the lowest best fit. */
 	key.addr = NULL;
 	key.size = size;
-	node = RB_NFIND(extent_tree_szad_s, &arena->runs_avail_szad, &key);
+	rb_nsearch(extent_node_t, link_szad, extent_szad_comp,
+	    &arena->runs_avail_szad, &key, node);
 	if (node != NULL) {
 		run = (arena_run_t *)node->addr;
 		arena_run_split(arena, run, size, small, zero);
@@ -2400,9 +2446,9 @@
 	size_t ndirty;
 
 	ndirty = 0;
-	RB_FOREACH(chunk, arena_chunk_tree_s, &arena->chunks) {
+	rb_foreach_begin(arena_chunk_t, link, &arena->chunks, chunk) {
 		ndirty += chunk->ndirty;
-	}
+	} rb_foreach_end(arena_chunk_t, link, &arena->chunks, chunk)
 	assert(ndirty == arena->ndirty);
 #endif
 	assert(arena->ndirty > opt_dirty_max);
@@ -2415,7 +2461,7 @@
 	 * Iterate downward through chunks until enough dirty memory has been
 	 * purged.
 	 */
-	RB_FOREACH_REVERSE(chunk, arena_chunk_tree_s, &arena->chunks) {
+	rb_foreach_reverse_begin(arena_chunk_t, link, &arena->chunks, chunk) {
 		if (chunk->ndirty > 0) {
 			size_t i;
 
@@ -2453,7 +2499,7 @@
 				}
 			}
 		}
-	}
+	} rb_foreach_reverse_end(arena_chunk_t, link, &arena->chunks, chunk)
 }
 
 static void
@@ -2465,9 +2511,10 @@
 
 	/* Remove run from runs_alloced_ad. */
 	key.addr = run;
-	nodeB = RB_FIND(extent_tree_ad_s, &arena->runs_alloced_ad, &key);
+	rb_search(extent_node_t, link_ad, extent_ad_comp,
+	    &arena->runs_alloced_ad, &key, nodeB);
 	assert(nodeB != NULL);
-	RB_REMOVE(extent_tree_ad_s, &arena->runs_alloced_ad, nodeB);
+	extent_tree_ad_remove(&arena->runs_alloced_ad, nodeB);
 	size = nodeB->size;
 
 	chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(run);
@@ -2505,29 +2552,31 @@
 
 	/* Try to coalesce forward. */
 	key.addr = (void *)((uintptr_t)run + size);
-	nodeC = RB_NFIND(extent_tree_ad_s, &arena->runs_avail_ad, &key);
+	rb_nsearch(extent_node_t, link_ad, extent_ad_comp,
+	    &arena->runs_avail_ad, &key, nodeC);
 	if (nodeC != NULL && nodeC->addr == key.addr) {
 		/*
 		 * Coalesce forward.  This does not change the position within
 		 * runs_avail_ad, so only remove/insert from/into
 		 * runs_avail_szad.
 		 */
-		RB_REMOVE(extent_tree_szad_s, &arena->runs_avail_szad, nodeC);
+		extent_tree_szad_remove(&arena->runs_avail_szad, nodeC);

>>> TRUNCATED FOR MAIL (1000 lines) <<<


More information about the p4-projects mailing list