PERFORCE change 109176 for review

[John Birrell]

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

Change 109176 by jb at 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;