PERFORCE change 142078 for review

[John Birrell]

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

Change 142078 by jb at freebsd3 on 2008/05/23 01:03:40

	IFC

Affected files ...

.. //depot/projects/dtrace/src/cddl/usr.sbin/Makefile#8 integrate
.. //depot/projects/dtrace/src/cddl/usr.sbin/dtrace/Makefile#13 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_malloc.c#11 integrate
.. //depot/projects/dtrace/src/sys/kern/link_elf.c#18 integrate
.. //depot/projects/dtrace/src/sys/kern/link_elf_obj.c#15 integrate
.. //depot/projects/dtrace/src/sys/sys/linker.h#21 integrate
.. //depot/projects/dtrace/src/sys/sys/malloc.h#7 integrate

Differences ...

==== //depot/projects/dtrace/src/cddl/usr.sbin/Makefile#8 (text+ko) ====


==== //depot/projects/dtrace/src/cddl/usr.sbin/dtrace/Makefile#13 (text+ko) ====


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

@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_malloc.c,v 1.164 2008/05/10 21:46:19 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_malloc.c,v 1.165 2008/05/23 00:43:36 jb Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kdtrace.h"

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

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/link_elf.c,v 1.96 2008/03/15 17:40:18 ru Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/link_elf.c,v 1.97 2008/05/23 00:49:39 jb Exp $");
 
 #include "opt_ddb.h"
 #include "opt_gdb.h"

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

@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/link_elf_obj.c,v 1.98 2008/03/15 17:40:18 ru Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/link_elf_obj.c,v 1.99 2008/05/23 00:49:39 jb Exp $");
 
 #include "opt_ddb.h"
 #include "opt_mac.h"

==== //depot/projects/dtrace/src/sys/sys/linker.h#21 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/sys/linker.h,v 1.50 2007/12/01 19:24:28 rwatson Exp $
+ * $FreeBSD: src/sys/sys/linker.h,v 1.51 2008/05/23 00:49:38 jb Exp $
  */
 
 #ifndef _SYS_LINKER_H_

==== //depot/projects/dtrace/src/sys/sys/malloc.h#7 (text+ko) ====

@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)malloc.h	8.5 (Berkeley) 5/3/95
- * $FreeBSD: src/sys/sys/malloc.h,v 1.84 2007/11/10 19:11:51 alc Exp $
+ * $FreeBSD: src/sys/sys/malloc.h,v 1.85 2008/05/23 00:43:35 jb Exp $
  */
 
 #ifndef _SYS_MALLOC_H_