From owner-p4-projects@FreeBSD.ORG  Tue Mar  2 11:29:21 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 42DCC16A4D0; Tue,  2 Mar 2004 11:29:21 -0800 (PST)
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 1D41216A4CE
	for <perforce@freebsd.org>; Tue,  2 Mar 2004 11:29:21 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1837C43D2D
	for <perforce@freebsd.org>; Tue,  2 Mar 2004 11:29:21 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i22JTKGe098599
	for <perforce@freebsd.org>; Tue, 2 Mar 2004 11:29:20 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i22JTKVR098596
	for perforce@freebsd.org; Tue, 2 Mar 2004 11:29:20 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Tue, 2 Mar 2004 11:29:20 -0800 (PST)
Message-Id: <200403021929.i22JTKVR098596@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 48003 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: Tue, 02 Mar 2004 19:29:21 -0000

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

Change 48003 by peter@peter_daintree on 2004/03/02 11:28:26

	IFi386: we dont have to test curpcb != null anymore.

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/trap.c#39 integrate

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/trap.c#39 (text+ko) ====

@@ -371,8 +371,7 @@
 				frame.tf_rip = (long)doreti_iret_fault;
 				goto out;
 			}
-			if (PCPU_GET(curpcb) != NULL &&
-			    PCPU_GET(curpcb)->pcb_onfault != NULL) {
+			if (PCPU_GET(curpcb)->pcb_onfault != NULL) {
 				frame.tf_rip =
 				    (long)PCPU_GET(curpcb)->pcb_onfault;
 				goto out;
@@ -555,7 +554,6 @@
 nogo:
 	if (!usermode) {
 		if (td->td_intr_nesting_level == 0 &&
-		    PCPU_GET(curpcb) != NULL &&
 		    PCPU_GET(curpcb)->pcb_onfault != NULL) {
 			frame->tf_rip = (long)PCPU_GET(curpcb)->pcb_onfault;
 			return (0);