From owner-p4-projects@FreeBSD.ORG  Sat Nov  4 00:34:00 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2920816A510; Sat,  4 Nov 2006 00:34:00 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id F0DB016A503
	for <perforce@freebsd.org>; Sat,  4 Nov 2006 00:33:59 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1B2EA43D58
	for <perforce@freebsd.org>; Sat,  4 Nov 2006 00:33:59 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA40Xw1f035936
	for <perforce@freebsd.org>; Sat, 4 Nov 2006 00:33:58 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA40Xw6a035933
	for perforce@freebsd.org; Sat, 4 Nov 2006 00:33:58 GMT
	(envelope-from jb@freebsd.org)
Date: Sat, 4 Nov 2006 00:33:58 GMT
Message-Id: <200611040033.kA40Xw6a035933@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 109176 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Nov 2006 00:34:00 -0000

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

Change 109176 by jb@jb_freebsd8 on 2006/11/04 00:33:09

	Manual merge from current.

Affected files ...

.. //depot/projects/dtrace/src/sys/kern/kern_fork.c#11 edit

Differences ...

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

@@ -67,6 +67,7 @@
 #ifdef KDTRACE
 #include <sys/sdt.h>
 #endif
+
 #include <security/audit/audit.h>
 #include <security/mac/mac_framework.h>
 
@@ -207,6 +208,7 @@
 	struct filedesc_to_leader *fdtol;
 	struct thread *td2;
 #ifdef KSE
+	struct ksegrp *kg2;
 #endif
 	struct sigacts *newsigacts;
 	int error;
@@ -475,6 +477,7 @@
 	 */
 	td2 = FIRST_THREAD_IN_PROC(p2);
 #ifdef KSE
+	kg2 = FIRST_KSEGRP_IN_PROC(p2);
 #endif
 
 	/* Allocate and switch to an alternate kstack if specified. */
@@ -489,6 +492,8 @@
 	bzero(&td2->td_startzero,
 	    __rangeof(struct thread, td_startzero, td_endzero));
 #ifdef KSE
+	bzero(&kg2->kg_startzero,
+	    __rangeof(struct ksegrp, kg_startzero, kg_endzero));
 #endif
 
 	bcopy(&p1->p_startcopy, &p2->p_startcopy,
@@ -496,6 +501,8 @@
 	bcopy(&td->td_startcopy, &td2->td_startcopy,
 	    __rangeof(struct thread, td_startcopy, td_endcopy));
 #ifdef KSE
+	bcopy(&td->td_ksegrp->kg_startcopy, &kg2->kg_startcopy,
+	    __rangeof(struct ksegrp, kg_startcopy, kg_endcopy));
 #endif
 
 	td2->td_sigstk = td->td_sigstk;