From owner-p4-projects@FreeBSD.ORG Fri May 23 01:04:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E5F231065679; Fri, 23 May 2008 01:04:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 756651065675 for ; Fri, 23 May 2008 01:04:36 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 663EC8FC1F for ; Fri, 23 May 2008 01:04:36 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m4N14aYe015650 for ; Fri, 23 May 2008 01:04:36 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4N14ave015648 for perforce@freebsd.org; Fri, 23 May 2008 01:04:36 GMT (envelope-from jb@freebsd.org) Date: Fri, 23 May 2008 01:04:36 GMT Message-Id: <200805230104.m4N14ave015648@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 142078 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 May 2008 01:04:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=142078 Change 142078 by jb@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 -__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 -__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 -__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_