From owner-p4-projects@FreeBSD.ORG  Fri Jul 15 02:42:58 2005
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 E460116A420; Fri, 15 Jul 2005 02:42:57 +0000 (GMT)
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 BE11916A41C
	for <perforce@freebsd.org>; Fri, 15 Jul 2005 02:42:57 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8FF6C43D46
	for <perforce@freebsd.org>; Fri, 15 Jul 2005 02:42:57 +0000 (GMT)
	(envelope-from peter@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 j6F2gvrH051774
	for <perforce@freebsd.org>; Fri, 15 Jul 2005 02:42:57 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6F2gvtx051771
	for perforce@freebsd.org; Fri, 15 Jul 2005 02:42:57 GMT
	(envelope-from peter@freebsd.org)
Date: Fri, 15 Jul 2005 02:42:57 GMT
Message-Id: <200507150242.j6F2gvtx051771@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>
Cc: 
Subject: PERFORCE change 80233 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: Fri, 15 Jul 2005 02:42:58 -0000

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

Change 80233 by peter@peter_overcee on 2005/07/15 02:42:26

	Integ -b i386_hammer

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/exception.S#42 integrate
.. //depot/projects/hammer/sys/amd64/amd64/machdep.c#139 integrate
.. //depot/projects/hammer/sys/amd64/amd64/trap.c#70 integrate
.. //depot/projects/hammer/sys/amd64/conf/GENERIC#76 integrate
.. //depot/projects/hammer/sys/amd64/isa/clock.c#47 integrate

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/exception.S#42 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#139 (text+ko) ====


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

@@ -219,9 +219,9 @@
 			    type);
 			/*
 			 * We shouldn't enable interrupts while in a critical
-			 * section.
+			 * section or servicing an NMI.
 			 */
-			if (td->td_critnest == 0)
+			if (type != T_NMI && td->td_critnest == 0)
 				enable_intr();
 		}
 	}

==== //depot/projects/hammer/sys/amd64/conf/GENERIC#76 (text+ko) ====


==== //depot/projects/hammer/sys/amd64/isa/clock.c#47 (text+ko) ====