PERFORCE change 142106 for review

[John Birrell]

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

Change 142106 by jb at freebsd3 on 2008/05/23 07:48:59

	IFC

Affected files ...

.. //depot/projects/dtrace/src/lib/libelf/elf_strptr.c#7 integrate
.. //depot/projects/dtrace/src/lib/libelf/libelf_align.c#6 integrate
.. //depot/projects/dtrace/src/lib/libelf/libelf_data.c#10 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_linker.c#34 integrate

Differences ...

==== //depot/projects/dtrace/src/lib/libelf/elf_strptr.c#7 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libelf/elf_strptr.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $");
+__FBSDID("$FreeBSD: src/lib/libelf/elf_strptr.c,v 1.2 2008/05/23 07:35:36 jb Exp $");
 
 #include <sys/param.h>
 

==== //depot/projects/dtrace/src/lib/libelf/libelf_align.c#6 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libelf/libelf_align.c,v 1.2 2006/12/18 05:36:23 jkoshy Exp $");
+__FBSDID("$FreeBSD: src/lib/libelf/libelf_align.c,v 1.3 2008/05/23 07:33:45 jb Exp $");
 
 #include <sys/types.h>
 

==== //depot/projects/dtrace/src/lib/libelf/libelf_data.c#10 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libelf/libelf_data.c,v 1.3 2007/11/23 11:29:36 jkoshy Exp $");
+__FBSDID("$FreeBSD: src/lib/libelf/libelf_data.c,v 1.4 2008/05/23 07:32:19 jb Exp $");
 
 #include <libelf.h>
 #include <osreldate.h>

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

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_linker.c,v 1.157 2008/04/21 17:22:35 pjd Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_linker.c,v 1.158 2008/05/23 07:08:59 jb Exp $");
 
 #include "opt_ddb.h"
 #include "opt_hwpmc_hooks.h"