From owner-svn-src-head@FreeBSD.ORG  Wed Jan 14 14:20:10 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1B5A01065687;
	Wed, 14 Jan 2009 14:20:10 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 092A28FC16;
	Wed, 14 Jan 2009 14:20:10 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0EEK98c045403;
	Wed, 14 Jan 2009 14:20:09 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0EEK8B6045402;
	Wed, 14 Jan 2009 14:20:08 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <200901141420.n0EEK8B6045402@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Wed, 14 Jan 2009 14:20:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r187221 - head/sys/amd64/amd64
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Jan 2009 14:20:11 -0000

Author: kib
Date: Wed Jan 14 14:20:08 2009
New Revision: 187221
URL: http://svn.freebsd.org/changeset/base/187221

Log:
  Disable interrupts, if they were enabled, before doing swapgs.
  Otherwise, interrupt may happen while we run with kernel CS and usermode
  gsbase.
  
  Reviewed by:	jeff
  MFC after:	1 week

Modified:
  head/sys/amd64/amd64/exception.S

Modified: head/sys/amd64/amd64/exception.S
==============================================================================
--- head/sys/amd64/amd64/exception.S	Wed Jan 14 13:46:01 2009	(r187220)
+++ head/sys/amd64/amd64/exception.S	Wed Jan 14 14:20:08 2009	(r187221)
@@ -494,6 +494,7 @@ outofnmi:
 	movq	%rsp,%rdx			/* frame */
 	sti
 	call	*%rax
+	cli
 nocallchain:
 #endif
 	testl	%ebx,%ebx