From owner-p4-projects@FreeBSD.ORG  Wed Jan 19 21:44:58 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CC47216A4D0; Wed, 19 Jan 2005 21:44:57 +0000 (GMT)
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 A3A4616A4CE
	for <perforce@freebsd.org>; Wed, 19 Jan 2005 21:44:57 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 902EB43D45
	for <perforce@freebsd.org>; Wed, 19 Jan 2005 21:44:57 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0JLivWR000121
	for <perforce@freebsd.org>; Wed, 19 Jan 2005 21:44:57 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0JLivvB000118
	for perforce@freebsd.org; Wed, 19 Jan 2005 21:44:57 GMT
	(envelope-from jhb@freebsd.org)
Date: Wed, 19 Jan 2005 21:44:57 GMT
Message-Id: <200501192144.j0JLivvB000118@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 69328 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Wed, 19 Jan 2005 21:44:58 -0000

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

Change 69328 by jhb@jhb_twclab on 2005/01/19 21:44:15

	Compile.

Affected files ...

.. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#62 edit
.. //depot/projects/smpng/sys/i386/isa/npx.c#45 edit

Differences ...

==== //depot/projects/smpng/sys/i386/i386/vm_machdep.c#62 (text+ko) ====

@@ -313,7 +313,7 @@
 
 
 #ifdef DEV_NPX
-	npxexit();
+	npxexit(td);
 #endif
 
 	/* Disable any hardware breakpoints. */

==== //depot/projects/smpng/sys/i386/isa/npx.c#45 (text+ko) ====

@@ -497,8 +497,9 @@
 	register_t savecrit;
 
 	savecrit = intr_disable();
-	if (curthread == PCPU_GET(fpcurthread))
-		npxsave(&PCPU_GET(curpcb)->pcb_save);
+	if (td == PCPU_GET(fpcurthread))
+		/* XXX: npxdrop() instead? */
+		npxsave(&td->td_pcb->pcb_save);
 	intr_restore(savecrit);
 #ifdef NPX_DEBUG
 	if (npx_exists) {