From owner-p4-projects@FreeBSD.ORG  Mon Oct  9 21:18:01 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 6A48C16A412; Mon,  9 Oct 2006 21:18:01 +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 29C5316A407
	for <perforce@freebsd.org>; Mon,  9 Oct 2006 21:18:01 +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 8C0B443D6D
	for <perforce@freebsd.org>; Mon,  9 Oct 2006 21:17: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 k99LHxmO097199
	for <perforce@freebsd.org>; Mon, 9 Oct 2006 21:17:59 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k99LHxK4097190
	for perforce@freebsd.org; Mon, 9 Oct 2006 21:17:59 GMT
	(envelope-from jb@freebsd.org)
Date: Mon, 9 Oct 2006 21:17:59 GMT
Message-Id: <200610092117.k99LHxK4097190@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 107582 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: Mon, 09 Oct 2006 21:18:01 -0000

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

Change 107582 by jb@jb_freebsd7 on 2006/10/09 21:17:37

	Fix a p4 mis-merge to retain KSE support but as a kernel option.

Affected files ...

.. //depot/projects/dtrace/src/sys/amd64/amd64/trap.c#9 edit

Differences ...

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

@@ -302,7 +302,7 @@
 #ifdef KSE
 			if (td->td_pflags & TDP_SA)
 				thread_user_enter(td);
-			i = trap_pfault(&frame, TRUE);
+#endif
 			i = trap_pfault(&frame, TRUE);
 			if (i == -1)
 				goto userout;