PERFORCE change 141821 for review

[John Birrell]

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

Change 141821 by jb at freebsd3 on 2008/05/18 21:05:57

	IFC

Affected files ...

.. //depot/projects/dtrace/src/sys/conf/files#90 integrate
.. //depot/projects/dtrace/src/sys/conf/options#52 integrate
.. //depot/projects/dtrace/src/sys/i386/conf/GENERIC#38 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_dtrace.c#7 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_sdt.c#9 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_bus.c#15 integrate
.. //depot/projects/dtrace/src/sys/sys/proc.h#44 integrate
.. //depot/projects/dtrace/src/usr.bin/calendar/calendars/calendar.freebsd#21 integrate

Differences ...

==== //depot/projects/dtrace/src/sys/conf/files#90 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1298 2008/05/16 18:46:29 jfv Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1299 2008/05/18 19:47:49 jb Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and

==== //depot/projects/dtrace/src/sys/conf/options#52 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.629 2008/05/16 06:27:03 benno Exp $
+# $FreeBSD: src/sys/conf/options,v 1.630 2008/05/18 19:28:51 jb Exp $
 #
 #        On the handling of kernel options
 #

==== //depot/projects/dtrace/src/sys/i386/conf/GENERIC#38 (text+ko) ====

@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.
 #
-# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.487 2008/05/17 23:49:59 remko Exp $
+# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.488 2008/05/18 11:08:26 jb Exp $
 
 cpu		I486_CPU
 cpu		I586_CPU

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


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


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

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/subr_bus.c,v 1.207 2008/03/20 21:24:32 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/subr_bus.c,v 1.208 2008/05/18 13:55:51 rpaulo Exp $");
 
 #include "opt_bus.h"
 
@@ -514,7 +514,7 @@
 boolean_t
 devctl_process_running(void)
 {
-	return (devsoftc.async_proc != NULL);
+	return (devsoftc.inuse == 1);
 }
 
 /**

==== //depot/projects/dtrace/src/sys/sys/proc.h#44 (text+ko) ====

@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)proc.h	8.15 (Berkeley) 5/19/95
- * $FreeBSD: src/sys/sys/proc.h,v 1.513 2008/05/09 23:02:59 julian Exp $
+ * $FreeBSD: src/sys/sys/proc.h,v 1.514 2008/05/18 19:50:43 jb Exp $
  */
 
 #ifndef _SYS_PROC_H_

==== //depot/projects/dtrace/src/usr.bin/calendar/calendars/calendar.freebsd#21 (text+ko) ====

@@ -1,7 +1,7 @@
 /*
  * FreeBSD
  *
- * $FreeBSD: src/usr.bin/calendar/calendars/calendar.freebsd,v 1.233 2008/05/13 23:24:06 adrian Exp $
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.freebsd,v 1.234 2008/05/18 11:05:41 rpaulo Exp $
  */
 
 #ifndef _calendar_freebsd_
@@ -135,6 +135,7 @@
 05/21	Kris Kennaway <kris at FreeBSD.org> born in Winnipeg, Manitoba, Canada, 1978
 05/22	Clive Tong-I Lin <clive at FreeBSD.org> born in Changhua, Taiwan, Republic of China, 1978
 05/22	Michael Bushkov <bushman at FreeBSD.org> born in Rostov-on-Don, Russia, 1985
+05/22	Rui Paulo <rpaulo at FreeBSD.org>, born in Evora, Portugal, 1986
 05/23	Munechika Sumikawa <sumikawa at FreeBSD.org> born in Osaka, Osaka, Japan, 1972
 05/24	Duncan McLennan Barclay <dmlb at FreeBSD.org> born in London, Middlesex, United Kingdom, 1970
 05/24	Oliver Lehmann <oliver at FreeBSD.org> born in Karlsburg, Germany, 1981