From owner-cvs-all@FreeBSD.ORG  Tue Sep 27 18:13:11 2005
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B798316A41F;
	Tue, 27 Sep 2005 18:13:11 +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 8A51D43D72;
	Tue, 27 Sep 2005 18:13:08 +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 j8RID8Eh022455;
	Tue, 27 Sep 2005 18:13:08 GMT
	(envelope-from peter@repoman.freebsd.org)
Received: (from peter@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j8RID8Ov022454;
	Tue, 27 Sep 2005 18:13:08 GMT (envelope-from peter)
Message-Id: <200509271813.j8RID8Ov022454@repoman.freebsd.org>
From: Peter Wemm <peter@FreeBSD.org>
Date: Tue, 27 Sep 2005 18:13:07 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/sys/amd64/amd64 trap.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Sep 2005 18:13:11 -0000

peter       2005-09-27 18:13:07 UTC

  FreeBSD src repository

  Modified files:
    sys/amd64/amd64      trap.c 
  Log:
  MFi386:  If we take a trap with interrupts disabled while in a critical
  section, don't enable them if we're servicing an NMI.
  
  Revision  Changes    Path
  1.292     +2 -2      src/sys/amd64/amd64/trap.c