PERFORCE change 140430 for review

John Birrell jb at FreeBSD.org
Tue Apr 22 22:26:17 UTC 2008 

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

Change 140430 by jb at freebsd3 on 2008/04/22 22:25:50

	IFC

Affected files ...

.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#70 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#42 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#34 integrate
.. //depot/projects/dtrace/doc/share/pgpkeys/pgj.key#1 branch
.. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#34 integrate
.. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#33 integrate
.. //depot/projects/dtrace/ports/MOVED#79 integrate
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/devid.h#2 integrate
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/libintl.h#2 integrate
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/mnttab.h#2 integrate
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/priv.h#2 integrate
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/solaris.h#2 integrate
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/zone.h#2 integrate
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/lib/libumem/umem.c#2 integrate
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/lib/libumem/umem.h#2 integrate
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/misc/mkdirp.c#2 integrate
.. //depot/projects/dtrace/src/etc/rc.d/initrandom#5 integrate
.. //depot/projects/dtrace/src/lib/libc/stdio/fopen.c#6 integrate
.. //depot/projects/dtrace/src/release/amd64/boot_crunch.conf#5 integrate
.. //depot/projects/dtrace/src/release/i386/boot_crunch.conf#5 integrate
.. //depot/projects/dtrace/src/release/ia64/boot_crunch.conf#5 integrate
.. //depot/projects/dtrace/src/release/pc98/boot_crunch.conf#5 integrate
.. //depot/projects/dtrace/src/release/picobsd/bridge/crunch.conf#6 integrate
.. //depot/projects/dtrace/src/release/powerpc/boot_crunch.conf#5 integrate
.. //depot/projects/dtrace/src/release/sparc64/boot_crunch.conf#5 integrate
.. //depot/projects/dtrace/src/release/sun4v/boot_crunch.conf#3 integrate
.. //depot/projects/dtrace/src/share/misc/committers-doc.dot#4 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/machdep.c#27 integrate
.. //depot/projects/dtrace/src/sys/amd64/include/clock.h#10 integrate
.. //depot/projects/dtrace/src/sys/amd64/isa/clock.c#12 integrate
.. //depot/projects/dtrace/src/sys/arm/sa11x0/sa11x0_ost.c#6 integrate
.. //depot/projects/dtrace/src/sys/i386/bios/apm.c#8 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/machdep.c#27 integrate
.. //depot/projects/dtrace/src/sys/i386/include/clock.h#10 integrate
.. //depot/projects/dtrace/src/sys/i386/isa/clock.c#15 integrate
.. //depot/projects/dtrace/src/sys/i386/isa/pmtimer.c#5 integrate
.. //depot/projects/dtrace/src/sys/ia64/ia64/clock.c#9 integrate
.. //depot/projects/dtrace/src/sys/ia64/ia64/machdep.c#20 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_clock.c#8 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_rtc.c#4 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_mount.c#31 integrate
.. //depot/projects/dtrace/src/sys/netinet6/udp6_usrreq.c#17 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/nfs_vfsops.c#19 integrate
.. //depot/projects/dtrace/src/sys/pc98/cbus/clock.c#10 integrate
.. //depot/projects/dtrace/src/sys/pc98/pc98/machdep.c#22 integrate
.. //depot/projects/dtrace/src/sys/powerpc/aim/clock.c#5 integrate
.. //depot/projects/dtrace/src/sys/powerpc/aim/machdep.c#8 integrate
.. //depot/projects/dtrace/src/sys/powerpc/booke/clock.c#4 integrate
.. //depot/projects/dtrace/src/sys/sys/clock.h#6 integrate
.. //depot/projects/dtrace/src/sys/sys/time.h#16 integrate
.. //depot/projects/dtrace/src/sys/ufs/ufs/inode.h#7 integrate
.. //depot/projects/dtrace/src/sys/ufs/ufs/ufs_lookup.c#11 integrate
.. //depot/projects/dtrace/src/usr.bin/calendar/calendars/calendar.freebsd#19 integrate
.. //depot/projects/dtrace/www/en/developers.sgml#33 integrate
.. //depot/projects/dtrace/www/en/projects/Makefile#7 integrate
.. //depot/projects/dtrace/www/en/projects/summerofcode-2008.sgml#1 branch
.. //depot/projects/dtrace/www/en/projects/summerofcode.xsl#6 integrate
.. //depot/projects/dtrace/www/share/sgml/news.xml#46 integrate

Differences ...

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

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.785 2008/04/16 08:32:58 jadawin Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.786 2008/04/22 15:26:14 pgj Exp $ -->
 <!--
 	NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
 	order by first name.
@@ -3079,11 +3079,6 @@
     </listitem>
 
     <listitem>
-      <para>G&aacute;bor P&aacute;li
-	<email>pali.gabor at gmail.com</email></para>
-    </listitem>
-
-    <listitem>
       <para>G&aacute;bor Zahemszky
 	<email>zgabor at CoDe.hu</email></para>
     </listitem>

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

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.223 2008/03/14 11:15:47 rdivacky Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.224 2008/04/22 15:26:14 pgj Exp $ -->
 <!--
 	NOTE TO NEW COMMITTERS: Core and committers lists are sorted in
 	alphabetical order by last name. Please keep in mind that fact while
@@ -958,6 +958,10 @@
     </listitem>
 
     <listitem>
+      <para>&a.pgj;</para>
+    </listitem>
+
+    <listitem>
       <para>&a.hmp;</para>
     </listitem>
 

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#34 (text+ko) ====

@@ -13,7 +13,7 @@
                  builds for the other languages, and we will poke fun of you
                  in public.
 
-     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.444 2008/03/13 17:10:48 rdivacky Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.445 2008/04/22 15:26:14 pgj Exp $
 -->
 
 <!ENTITY a.aaron "Aaron Dalton <email>aaron at FreeBSD.org</email>">
@@ -812,6 +812,8 @@
 
 <!ENTITY a.peter "Peter Wemm <email>peter at FreeBSD.org</email>">
 
+<!ENTITY a.pgj "G&aacute;bor P&aacute;li <email>pgj at FreeBSD.org</email>">
+
 <!ENTITY a.phantom "Alexey Zelkin <email>phantom at FreeBSD.org</email>">
 
 <!ENTITY a.philip "Philip Paeps <email>philip at FreeBSD.org</email>">

==== //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#34 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.67 2008/03/14 16:38:22 rdivacky Exp $
+     $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.68 2008/04/22 15:26:14 pgj Exp $
 -->
 
     <sect2 id="pgpkey-ariff">
@@ -799,6 +799,11 @@
       &pgpkey.philip;
     </sect2>
 
+    <sect2 id="pgpkey-pgj">
+      <title>&a.pgj;</title>
+      &pgpkey.pgj;
+    </sect2>
+
     <sect2 id="pgpkey-hmp">
       <title>&a.hmp;</title>
       &pgpkey.hmp;

==== //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#33 (text+ko) ====

@@ -1,5 +1,5 @@
 
-<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.164 2008/03/14 16:38:22 rdivacky Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.165 2008/04/22 15:26:14 pgj Exp $ -->
 <!-- PGP keyblocks -->
 <!ENTITY pgpkey.aaron SYSTEM "aaron.key">
 <!ENTITY pgpkey.ache SYSTEM "ache.key">
@@ -209,6 +209,7 @@
 <!ENTITY pgpkey.perky SYSTEM "perky.key">
 <!ENTITY pgpkey.petef SYSTEM "petef.key">
 <!ENTITY pgpkey.peter SYSTEM "peter.key">
+<!ENTITY pgpkey.pgj SYSTEM "pgj.key">
 <!ENTITY pgpkey.phantom SYSTEM "phantom.key">
 <!ENTITY pgpkey.philip SYSTEM "philip.key">
 <!ENTITY pgpkey.phk SYSTEM "phk.key">

==== //depot/projects/dtrace/ports/MOVED#79 (text+ko) ====

@@ -1,7 +1,7 @@
 #
 # MOVED - a list of (recently) moved or removed ports
 #
-# $FreeBSD: ports/MOVED,v 1.1576 2008/04/20 22:40:34 pav Exp $
+# $FreeBSD: ports/MOVED,v 1.1577 2008/04/22 21:11:12 ehaupt Exp $
 #
 # Each entry consists of a single line containing the following four
 # fields in the order named, separated with the pipe (`|') character:
@@ -3453,3 +3453,4 @@
 games/teewars|games/teeworls|2008-04-17|Project renamed
 multimedia/exportvideo||2008-04-21|Add-on for soon to be removed nuppelvideo port
 multimedia/nuppelvideo||2008-04-21|Unmaintained upstream for years.  The nuppelvideo format is now supported by mencoder
+graphics/ascii0|graphics/asciio|2008-04-22|renamed by delete+add

==== //depot/projects/dtrace/src/cddl/compat/opensolaris/include/devid.h#2 (text+ko) ====

@@ -18,6 +18,8 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
+ *
+ * $FreeBSD: src/cddl/compat/opensolaris/include/devid.h,v 1.4 2008/04/22 07:42:58 jb Exp $
  */
 /*
  * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.

==== //depot/projects/dtrace/src/cddl/compat/opensolaris/include/libintl.h#2 (text+ko) ====

@@ -1,3 +1,5 @@
+/* $FreeBSD: src/cddl/compat/opensolaris/include/libintl.h,v 1.3 2008/04/22 07:42:58 jb Exp $ */
+
 #ifndef	_LIBINTL_H_
 #define	_LIBINTL_H_
 

==== //depot/projects/dtrace/src/cddl/compat/opensolaris/include/mnttab.h#2 (text+ko) ====

@@ -1,3 +1,5 @@
+/* $FreeBSD: src/cddl/compat/opensolaris/include/mnttab.h,v 1.3 2008/04/22 07:42:58 jb Exp $ */
+
 #ifndef	_OPENSOLARIS_MNTTAB_H_
 #define	_OPENSOLARIS_MNTTAB_H_
 

==== //depot/projects/dtrace/src/cddl/compat/opensolaris/include/priv.h#2 (text+ko) ====

@@ -1,3 +1,5 @@
+/* $FreeBSD: src/cddl/compat/opensolaris/include/priv.h,v 1.3 2008/04/22 07:42:58 jb Exp $ */
+
 #ifndef	_OPENSOLARIS_PRIV_H_
 #define	_OPENSOLARIS_PRIV_H_
 

==== //depot/projects/dtrace/src/cddl/compat/opensolaris/include/solaris.h#2 (text+ko) ====

@@ -1,3 +1,5 @@
+/* $FreeBSD: src/cddl/compat/opensolaris/include/solaris.h,v 1.3 2008/04/22 07:42:58 jb Exp $ */
+
 #ifndef	_SOLARIS_H_
 #define	_SOLARIS_H_
 

==== //depot/projects/dtrace/src/cddl/compat/opensolaris/include/zone.h#2 (text+ko) ====

@@ -1,3 +1,5 @@
+/* $FreeBSD: src/cddl/compat/opensolaris/include/zone.h,v 1.3 2008/04/22 07:42:58 jb Exp $ */
+
 #ifndef	_ZONE_H_
 #define	_ZONE_H_
 

==== //depot/projects/dtrace/src/cddl/compat/opensolaris/lib/libumem/umem.c#2 (text+ko) ====

@@ -17,6 +17,8 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
+ *
+ * $FreeBSD: src/cddl/compat/opensolaris/lib/libumem/umem.c,v 1.3 2008/04/22 07:42:59 jb Exp $
  */
 /*
  * Copyright 2006 Ricardo Correia.  All rights reserved.

==== //depot/projects/dtrace/src/cddl/compat/opensolaris/lib/libumem/umem.h#2 (text+ko) ====

@@ -18,6 +18,8 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
+ *
+ * $FreeBSD: src/cddl/compat/opensolaris/lib/libumem/umem.h,v 1.3 2008/04/22 07:42:59 jb Exp $
  */
 /*
  * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.

==== //depot/projects/dtrace/src/cddl/compat/opensolaris/misc/mkdirp.c#2 (text+ko) ====

@@ -18,6 +18,8 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
+ *
+ * $FreeBSD: src/cddl/compat/opensolaris/misc/mkdirp.c,v 1.3 2008/04/22 07:42:59 jb Exp $
  */
 
 /*	Copyright (c) 1988 AT&T	*/

==== //depot/projects/dtrace/src/etc/rc.d/initrandom#5 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/initrandom,v 1.7 2007/05/24 05:58:20 rse Exp $
+# $FreeBSD: src/etc/rc.d/initrandom,v 1.8 2008/04/22 15:18:47 ru Exp $
 #
 
 # PROVIDE: initrandom
@@ -28,24 +28,26 @@
 
 	if [ \! -z "${soft_random_generator}" ] ; then
 
-		if checkyesno harvest_interrupt; then
-			if [ -w /dev/random ]; then
+		if [ -w /dev/random ]; then
+			if checkyesno harvest_interrupt; then
 				${SYSCTL_W} kern.random.sys.harvest.interrupt=1 >/dev/null
 				echo -n ' interrupts'
+			else
+				${SYSCTL_W} kern.random.sys.harvest.interrupt=0 >/dev/null
 			fi
-		fi
 
-		if checkyesno harvest_ethernet; then
-			if [ -w /dev/random ]; then
+			if checkyesno harvest_ethernet; then
 				${SYSCTL_W} kern.random.sys.harvest.ethernet=1 >/dev/null
 				echo -n ' ethernet'
+			else
+				${SYSCTL_W} kern.random.sys.harvest.ethernet=0 >/dev/null
 			fi
-		fi
 
-		if checkyesno harvest_p_to_p; then
-			if [ -w /dev/random ]; then
-			${SYSCTL_W} kern.random.sys.harvest.point_to_point=1 >/dev/null
+			if checkyesno harvest_p_to_p; then
+				${SYSCTL_W} kern.random.sys.harvest.point_to_point=1 >/dev/null
 				echo -n ' point_to_point'
+			else
+				${SYSCTL_W} kern.random.sys.harvest.point_to_point=0 >/dev/null
 			fi
 		fi
 

==== //depot/projects/dtrace/src/lib/libc/stdio/fopen.c#6 (text+ko) ====

@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)fopen.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fopen.c,v 1.13 2008/02/27 21:25:19 jhb Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fopen.c,v 1.14 2008/04/22 17:03:32 jhb Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
@@ -73,6 +73,7 @@
 	 * open.
 	 */
 	if (f > SHRT_MAX) {
+		fp->_flags = 0;			/* release */
 		_close(f);
 		errno = EMFILE;
 		return (NULL);

==== //depot/projects/dtrace/src/release/amd64/boot_crunch.conf#5 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/amd64/boot_crunch.conf,v 1.62 2008/01/22 16:35:08 kensmith Exp $
+# $FreeBSD: src/release/amd64/boot_crunch.conf,v 1.63 2008/04/22 18:20:03 thompsa Exp $
 
 buildopts -DRELEASE_CRUNCH -Dlint
 
@@ -44,3 +44,4 @@
 
 libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
 libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -ldevinfo
+libs -lbsdxml

==== //depot/projects/dtrace/src/release/i386/boot_crunch.conf#5 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/i386/boot_crunch.conf,v 1.62 2008/01/22 16:35:09 kensmith Exp $
+# $FreeBSD: src/release/i386/boot_crunch.conf,v 1.63 2008/04/22 18:20:04 thompsa Exp $
 
 buildopts -DRELEASE_CRUNCH -Dlint
 
@@ -44,3 +44,4 @@
 
 libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
 libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -ldevinfo
+libs -lbsdxml

==== //depot/projects/dtrace/src/release/ia64/boot_crunch.conf#5 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/ia64/boot_crunch.conf,v 1.12 2008/01/22 16:35:09 kensmith Exp $
+# $FreeBSD: src/release/ia64/boot_crunch.conf,v 1.13 2008/04/22 18:20:04 thompsa Exp $
 
 buildopts -DRELEASE_CRUNCH -Dlint
 
@@ -46,3 +46,4 @@
 
 libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
 libs -ldialog -lncurses -ldisk -lcam -lkiconv -lsbuf -lufs -ldevinfo
+libs -lbsdxml

==== //depot/projects/dtrace/src/release/pc98/boot_crunch.conf#5 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/pc98/boot_crunch.conf,v 1.63 2008/01/22 16:35:09 kensmith Exp $
+# $FreeBSD: src/release/pc98/boot_crunch.conf,v 1.64 2008/04/22 18:20:04 thompsa Exp $
 
 buildopts -DRELEASE_CRUNCH -Dlint
 
@@ -42,4 +42,4 @@
 progs sysinstall
 
 libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
-libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs
+libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -lbsdxml

==== //depot/projects/dtrace/src/release/picobsd/bridge/crunch.conf#6 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/release/picobsd/bridge/crunch.conf,v 1.22 2007/11/14 05:42:53 luigi Exp $
+# $FreeBSD: src/release/picobsd/bridge/crunch.conf,v 1.23 2008/04/22 18:20:05 thompsa Exp $
 #
 # configuration file for "bridge" floppy.
 # Depending on your needs, almost surely you will need to
@@ -181,3 +181,4 @@
 libs -lz -lpcap -lwrap
 libs -ltermcap -lgnuregex # -lcurses
 libs -lgeom
+libs -lbsdxml  # used by ifconfig

==== //depot/projects/dtrace/src/release/powerpc/boot_crunch.conf#5 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/powerpc/boot_crunch.conf,v 1.5 2008/01/22 16:35:09 kensmith Exp $
+# $FreeBSD: src/release/powerpc/boot_crunch.conf,v 1.6 2008/04/22 18:20:05 thompsa Exp $
 
 buildopts -DRELEASE_CRUNCH -Dlint
 
@@ -46,3 +46,4 @@
 
 libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
 libs -ldialog -lncurses -ldisk -lcam -lkiconv -lsbuf -lufs
+libs -lbsdxml

==== //depot/projects/dtrace/src/release/sparc64/boot_crunch.conf#5 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/sparc64/boot_crunch.conf,v 1.9 2008/01/22 16:35:09 kensmith Exp $
+# $FreeBSD: src/release/sparc64/boot_crunch.conf,v 1.10 2008/04/22 18:20:05 thompsa Exp $
 
 buildopts -DRELEASE_CRUNCH -Dlint
 
@@ -43,4 +43,4 @@
 progs usbdevs
 
 libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
-libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs
+libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -lbsdxml

==== //depot/projects/dtrace/src/release/sun4v/boot_crunch.conf#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/sun4v/boot_crunch.conf,v 1.2 2008/01/22 16:35:10 kensmith Exp $
+# $FreeBSD: src/release/sun4v/boot_crunch.conf,v 1.3 2008/04/22 18:20:05 thompsa Exp $
 
 buildopts -DRELEASE_CRUNCH -Dlint
 
@@ -43,4 +43,4 @@
 progs usbdevs
 
 libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
-libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs
+libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -lbsdxml

==== //depot/projects/dtrace/src/share/misc/committers-doc.dot#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/misc/committers-doc.dot,v 1.21 2008/02/27 07:37:24 ganbold Exp $
+# $FreeBSD: src/share/misc/committers-doc.dot,v 1.22 2008/04/22 15:42:20 pgj Exp $
 
 # This file is meant to list all FreeBSD doc+www committers and describe the
 # mentor-mentee relationships between them.
@@ -62,6 +62,7 @@
 murray [label="Murray Stokely\nmurray at FreeBSD.org\n2000/04/05"]
 nik [label="Nik Clayton\nnik at FreeBSD.org\n1998/02/26"]
 pav [label="Pav Lucistnik\npav at FreeBSD.org\n2005/08/12"]
+pgj [label="Gabor Pali\npgj at FreeBSD.org\n2008/04/21"]
 remko [label="Remko Lodder\nremko at FreeBSD.org\n2004/10/16"]
 roam [label="Peter Pentchev\nroam at FreeBSD.org\n2003/02/14"]
 simon [label="Simon L. Nielsen\nsimon at FreeBSD.org\n2003/07/20"]
@@ -86,6 +87,8 @@
 delphij -> chinsan
 delphij -> loader
 
+gabor -> pgj
+
 jesusr -> jcamou
 
 jim -> trhodes

==== //depot/projects/dtrace/src/sys/amd64/amd64/machdep.c#27 (text+ko) ====

@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.684 2008/04/19 07:25:57 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.685 2008/04/22 19:38:26 phk Exp $");
 
 #include "opt_atalk.h"
 #include "opt_atpic.h"
@@ -61,7 +61,6 @@
 #include <sys/buf.h>
 #include <sys/bus.h>
 #include <sys/callout.h>
-#include <sys/clock.h>
 #include <sys/cons.h>
 #include <sys/cpu.h>
 #include <sys/eventhandler.h>

==== //depot/projects/dtrace/src/sys/amd64/include/clock.h#10 (text+ko) ====

@@ -3,7 +3,7 @@
  * Garrett Wollman, September 1994.
  * This file is in the public domain.
  *
- * $FreeBSD: src/sys/amd64/include/clock.h,v 1.59 2008/04/14 07:59:59 phk Exp $
+ * $FreeBSD: src/sys/amd64/include/clock.h,v 1.60 2008/04/22 19:38:27 phk Exp $
  */
 
 #ifndef _MACHINE_CLOCK_H_
@@ -27,6 +27,7 @@
  * Driver to clock driver interface.
  */
 
+void	startrtclock(void);
 void	init_TSC(void);
 void	init_TSC_tc(void);
 

==== //depot/projects/dtrace/src/sys/amd64/isa/clock.c#12 (text+ko) ====

@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.242 2008/04/14 07:59:59 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.243 2008/04/22 19:38:27 phk Exp $");
 
 /*
  * Routines to handle clock hardware.
@@ -45,7 +45,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
-#include <sys/clock.h>
 #include <sys/lock.h>
 #include <sys/kdb.h>
 #include <sys/mutex.h>

==== //depot/projects/dtrace/src/sys/arm/sa11x0/sa11x0_ost.c#6 (text+ko) ====

@@ -38,14 +38,13 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_ost.c,v 1.7 2007/02/26 05:17:47 kevlo Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_ost.c,v 1.8 2008/04/22 19:38:27 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/time.h>
 #include <sys/bus.h>
-#include <sys/clock.h>
 #include <sys/module.h>
 
 #include <machine/bus.h>

==== //depot/projects/dtrace/src/sys/i386/bios/apm.c#8 (text+ko) ====

@@ -17,12 +17,11 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/bios/apm.c,v 1.150 2007/12/06 01:39:23 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/bios/apm.c,v 1.151 2008/04/22 19:38:27 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
-#include <sys/clock.h>
 #include <sys/conf.h>
 #include <sys/condvar.h>
 #include <sys/eventhandler.h>

==== //depot/projects/dtrace/src/sys/i386/i386/machdep.c#27 (text+ko) ====

@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.668 2008/03/16 10:58:03 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.669 2008/04/22 19:38:27 phk Exp $");
 
 #include "opt_apic.h"
 #include "opt_atalk.h"
@@ -62,7 +62,6 @@
 #include <sys/buf.h>
 #include <sys/bus.h>
 #include <sys/callout.h>
-#include <sys/clock.h>
 #include <sys/cons.h>
 #include <sys/cpu.h>
 #include <sys/eventhandler.h>

==== //depot/projects/dtrace/src/sys/i386/include/clock.h#10 (text+ko) ====

@@ -3,7 +3,7 @@
  * Garrett Wollman, September 1994.
  * This file is in the public domain.
  *
- * $FreeBSD: src/sys/i386/include/clock.h,v 1.61 2008/04/14 08:00:00 phk Exp $
+ * $FreeBSD: src/sys/i386/include/clock.h,v 1.62 2008/04/22 19:38:28 phk Exp $
  */
 
 #ifndef _MACHINE_CLOCK_H_
@@ -27,6 +27,7 @@
  * Driver to clock driver interface.
  */
 
+void	startrtclock(void);
 void	timer_restore(void);
 void	init_TSC(void);
 void	init_TSC_tc(void);

==== //depot/projects/dtrace/src/sys/i386/isa/clock.c#15 (text+ko) ====

@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/isa/clock.c,v 1.247 2008/04/14 08:00:00 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/isa/clock.c,v 1.248 2008/04/22 19:38:28 phk Exp $");
 
 /*
  * Routines to handle clock hardware.
@@ -49,7 +49,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
-#include <sys/clock.h>
 #include <sys/lock.h>
 #include <sys/kdb.h>
 #include <sys/mutex.h>

==== //depot/projects/dtrace/src/sys/i386/isa/pmtimer.c#5 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/isa/pmtimer.c,v 1.6 2006/10/02 12:59:57 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/isa/pmtimer.c,v 1.7 2008/04/22 19:38:28 phk Exp $");
 
 /*
  * Timer device driver for power management events.
@@ -35,7 +35,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
-#include <sys/clock.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/syslog.h>

==== //depot/projects/dtrace/src/sys/ia64/ia64/clock.c#9 (text+ko) ====

@@ -25,16 +25,14 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/ia64/ia64/clock.c,v 1.33 2008/04/15 17:02:23 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/clock.c,v 1.34 2008/04/22 19:38:28 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
-#include <sys/clock.h>
 #include <sys/queue.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
-#include <sys/clock.h>
 #include <sys/timetc.h>
 #include <sys/pcpu.h>
 

==== //depot/projects/dtrace/src/sys/ia64/ia64/machdep.c#20 (text+ko) ====

@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.236 2008/04/15 05:02:42 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.237 2008/04/22 19:38:28 phk Exp $");
 
 #include "opt_compat.h"
 #include "opt_ddb.h"
@@ -261,7 +261,6 @@
 	 */
 	identifycpu();
 
-	/* startrtclock(); */
 #ifdef PERFMON
 	perfmon_init();
 #endif

==== //depot/projects/dtrace/src/sys/kern/subr_clock.c#8 (text+ko) ====

@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/subr_clock.c,v 1.14 2008/04/12 21:51:54 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/subr_clock.c,v 1.15 2008/04/22 19:38:28 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -52,18 +52,14 @@
 #define ct_debug bootverbose
 static int adjkerntz;		/* local offset from GMT in seconds */
 static int wall_cmos_clock;	/* wall CMOS clock assumed if != 0 */
-int disable_rtc_set;		/* disable resettodr() if != 0 */
 
 int tz_minuteswest;
 int tz_dsttime;
 
 /*
- * These have traditionally been in machdep, but should probably be moved to
+ * This have traditionally been in machdep, but should probably be moved to
  * kern.
  */
-SYSCTL_INT(_machdep, OID_AUTO, disable_rtc_set,
-	CTLFLAG_RW, &disable_rtc_set, 0, "");
-
 SYSCTL_INT(_machdep, OID_AUTO, wall_cmos_clock,
 	CTLFLAG_RW, &wall_cmos_clock, 0, "");
 
@@ -71,8 +67,7 @@
 sysctl_machdep_adjkerntz(SYSCTL_HANDLER_ARGS)
 {
 	int error;
-	error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2,
-		req);
+	error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req);
 	if (!error && req->newptr)
 		resettodr();
 	return (error);

==== //depot/projects/dtrace/src/sys/kern/subr_rtc.c#4 (text+ko) ====

@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/subr_rtc.c,v 1.9 2006/10/02 18:23:37 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/subr_rtc.c,v 1.10 2008/04/22 19:38:28 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -63,6 +63,11 @@
 static device_t clock_dev = NULL;
 static long clock_res;
 
+/* XXX: should be kern. now, it's no longer machdep.  */
+static int disable_rtc_set;
+SYSCTL_INT(_machdep, OID_AUTO, disable_rtc_set,
+	CTLFLAG_RW, &disable_rtc_set, 0, "");
+
 void
 clock_register(device_t dev, long res)	/* res has units of microseconds */
 {
@@ -118,6 +123,7 @@
 		    "will not be set accurately\n");
 		return;
 	}
+	/* XXX: We should poll all registered RTCs in case of failure */
 	error = CLOCK_GETTIME(clock_dev, &ts);
 	if (error != 0 && error != EINVAL) {
 		printf("warning: clock_gettime failed (%d), the system time "
@@ -158,6 +164,7 @@
 
 	getnanotime(&ts);
 	ts.tv_sec -= utc_offset();
+	/* XXX: We should really set all registered RTCs */
 	if ((error = CLOCK_SETTIME(clock_dev, &ts)) != 0) {
 		printf("warning: clock_settime failed (%d), time-of-day clock "
 		    "not adjusted to system time\n", error);

==== //depot/projects/dtrace/src/sys/kern/vfs_mount.c#31 (text+ko) ====

@@ -35,11 +35,10 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/vfs_mount.c,v 1.279 2008/04/08 17:53:33 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_mount.c,v 1.280 2008/04/22 19:38:28 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
-#include <sys/clock.h>
 #include <sys/fcntl.h>
 #include <sys/jail.h>
 #include <sys/kernel.h>

==== //depot/projects/dtrace/src/sys/netinet6/udp6_usrreq.c#17 (text+ko) ====

@@ -63,7 +63,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet6/udp6_usrreq.c,v 1.86 2008/04/17 21:38:17 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet6/udp6_usrreq.c,v 1.87 2008/04/22 12:20:33 rwatson Exp $");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
@@ -129,7 +129,7 @@
 	struct socket *so;
 	struct mbuf *opts;
 
-	INP_WLOCK_ASSERT(inp);
+	INP_LOCK_ASSERT(inp);
 
 #ifdef IPSEC
 	/* Check AH/ESP integrity. */
@@ -277,9 +277,9 @@
 				struct mbuf *n;
 
 				if ((n = m_copy(m, 0, M_COPYALL)) != NULL) {
-					INP_WLOCK(last);
+					INP_RLOCK(last);
 					udp6_append(last, n, off, &fromsa);
-					INP_WUNLOCK(last);
+					INP_RUNLOCK(last);
 				}
 			}
 			last = inp;
@@ -306,9 +306,9 @@
 			udpstat.udps_noportmcast++;
 			goto badheadlocked;
 		}
-		INP_WLOCK(last);
+		INP_RLOCK(last);
 		udp6_append(last, m, off, &fromsa);
-		INP_WUNLOCK(last);
+		INP_RUNLOCK(last);
 		INP_INFO_RUNLOCK(&udbinfo);
 		return (IPPROTO_DONE);
 	}
@@ -343,9 +343,9 @@
 		icmp6_error(m, ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_NOPORT, 0);
 		return (IPPROTO_DONE);
 	}
-	INP_WLOCK(inp);
+	INP_RLOCK(inp);
 	udp6_append(inp, m, off, &fromsa);
-	INP_WUNLOCK(inp);
+	INP_RUNLOCK(inp);
 	INP_INFO_RUNLOCK(&udbinfo);
 	return (IPPROTO_DONE);
 
@@ -453,7 +453,7 @@
 		INP_INFO_RUNLOCK(&udbinfo);
 		return (ENOENT);
 	}
-	INP_WLOCK(inp);
+	INP_RLOCK(inp);
 	if (inp->inp_socket == NULL) {
 		error = ENOENT;
 		goto out;
@@ -463,7 +463,7 @@
 		goto out;
 	cru2x(inp->inp_socket->so_cred, &xuc);
 out:
-	INP_WUNLOCK(inp);
+	INP_RUNLOCK(inp);
 	INP_INFO_RUNLOCK(&udbinfo);
 	if (error == 0)
 		error = SYSCTL_OUT(req, &xuc, sizeof(struct xucred));

==== //depot/projects/dtrace/src/sys/nfsclient/nfs_vfsops.c#19 (text+ko) ====

@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_vfsops.c,v 1.203 2008/03/22 09:15:15 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_vfsops.c,v 1.204 2008/04/22 19:38:29 phk Exp $");
 
 
 #include "opt_bootp.h"
@@ -44,7 +44,6 @@
 #include <sys/kernel.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
-#include <sys/clock.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>

==== //depot/projects/dtrace/src/sys/pc98/cbus/clock.c#10 (text+ko) ====

@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/pc98/cbus/clock.c,v 1.168 2008/04/19 08:18:47 nyan Exp $");
+__FBSDID("$FreeBSD: src/sys/pc98/cbus/clock.c,v 1.169 2008/04/22 19:38:29 phk Exp $");
 
 /*
  * Routines to handle clock hardware.
@@ -51,7 +51,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
-#include <sys/clock.h>
 #include <sys/lock.h>
 #include <sys/kdb.h>
 #include <sys/mutex.h>

==== //depot/projects/dtrace/src/sys/pc98/pc98/machdep.c#22 (text+ko) ====

@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/pc98/pc98/machdep.c,v 1.403 2008/03/16 10:58:08 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/pc98/pc98/machdep.c,v 1.404 2008/04/22 19:38:29 phk Exp $");
 
 #include "opt_atalk.h"
 #include "opt_compat.h"
@@ -60,7 +60,6 @@
 #include <sys/buf.h>
 #include <sys/bus.h>
 #include <sys/callout.h>
-#include <sys/clock.h>
 #include <sys/cons.h>
 #include <sys/cpu.h>
 #include <sys/eventhandler.h>

==== //depot/projects/dtrace/src/sys/powerpc/aim/clock.c#5 (text+ko) ====

@@ -56,14 +56,13 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/powerpc/aim/clock.c,v 1.32 2008/04/21 04:41:37 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/powerpc/aim/clock.c,v 1.33 2008/04/22 19:38:30 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 #include <sys/bus.h>
-#include <sys/clock.h>
 #include <sys/timetc.h>
 #include <sys/interrupt.h>
 

==== //depot/projects/dtrace/src/sys/powerpc/aim/machdep.c#8 (text+ko) ====

@@ -55,7 +55,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/powerpc/aim/machdep.c,v 1.112 2008/04/16 23:28:12 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/powerpc/aim/machdep.c,v 1.113 2008/04/22 19:38:30 phk Exp $");
 
 #include "opt_compat.h"
 #include "opt_ddb.h"
@@ -196,7 +196,6 @@
 	 */
 	cpu_setup(PCPU_GET(cpuid));
 
-	/* startrtclock(); */
 #ifdef PERFMON
 	perfmon_init();
 #endif

==== //depot/projects/dtrace/src/sys/powerpc/booke/clock.c#4 (text+ko) ====

@@ -56,14 +56,13 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/powerpc/booke/clock.c,v 1.3 2008/04/13 21:20:26 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/powerpc/booke/clock.c,v 1.4 2008/04/22 19:38:30 phk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 #include <sys/bus.h>
-#include <sys/clock.h>
 #include <sys/timetc.h>
 #include <sys/interrupt.h>
 

==== //depot/projects/dtrace/src/sys/sys/clock.h#6 (text+ko) ====


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

More information about the p4-projects mailing list