From owner-p4-projects@FreeBSD.ORG  Thu Oct 12 03:38:48 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 4524616A5A2; Thu, 12 Oct 2006 03:38:48 +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 0C2D016A58F
	for <perforce@freebsd.org>; Thu, 12 Oct 2006 03:38:48 +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 AC16943D4C
	for <perforce@freebsd.org>; Thu, 12 Oct 2006 03:38:47 +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 k9C3cl5S098825
	for <perforce@freebsd.org>; Thu, 12 Oct 2006 03:38:47 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9C3claK098822
	for perforce@freebsd.org; Thu, 12 Oct 2006 03:38:47 GMT
	(envelope-from jb@freebsd.org)
Date: Thu, 12 Oct 2006 03:38:47 GMT
Message-Id: <200610120338.k9C3claK098822@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 107731 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: Thu, 12 Oct 2006 03:38:48 -0000

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

Change 107731 by jb@jb_freebsd8 on 2006/10/12 03:38:38

	Remove optional KSE now it's being done on a different branch.

Affected files ...

.. //depot/projects/dtrace/src/sys/amd64/amd64/machdep.c#11 edit
.. //depot/projects/dtrace/src/sys/amd64/amd64/trap.c#10 edit

Differences ...

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

@@ -1118,11 +1118,7 @@
  	 * This may be done better later if it gets more high level
  	 * components in it. If so just link td->td_proc here.
 	 */
-#ifdef KSE
 	proc_linkup(&proc0, &ksegrp0, &thread0);
-#else
-	proc_linkup(&proc0, &thread0);
-#endif
 
 	preload_metadata = (caddr_t)(uintptr_t)(modulep + KERNBASE);
 	preload_bootstrap_relocate(KERNBASE);

==== //depot/projects/dtrace/src/sys/amd64/amd64/trap.c#10 (text+ko) ====

@@ -299,10 +299,8 @@
 
 		case T_PAGEFLT:		/* page fault */
 			addr = frame.tf_addr;
-#ifdef KSE
 			if (td->td_pflags & TDP_SA)
 				thread_user_enter(td);
-#endif
 			i = trap_pfault(&frame, TRUE);
 			if (i == -1)
 				goto userout;
@@ -759,10 +757,8 @@
 	td->td_frame = &frame;
 	if (td->td_ucred != p->p_ucred) 
 		cred_update_thread(td);
-#ifdef KSE
 	if (p->p_flag & P_SA)
 		thread_user_enter(td);
-#endif
 	params = (caddr_t)frame.tf_rsp + sizeof(register_t);
 	code = frame.tf_rax;
 	orig_tf_rflags = frame.tf_rflags;