From owner-svn-src-all@FreeBSD.ORG  Mon Jan 17 17:30:35 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 658D21065672;
	Mon, 17 Jan 2011 17:30:35 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 54B1E8FC0A;
	Mon, 17 Jan 2011 17:30:35 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0HHUZ8f007706;
	Mon, 17 Jan 2011 17:30:35 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0HHUZG5007703;
	Mon, 17 Jan 2011 17:30:35 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201101171730.p0HHUZG5007703@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Mon, 17 Jan 2011 17:30:35 +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: r217506 - in head/sys: amd64/amd64 i386/i386
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Jan 2011 17:30:35 -0000

Author: jkim
Date: Mon Jan 17 17:30:35 2011
New Revision: 217506
URL: http://svn.freebsd.org/changeset/base/217506

Log:
  Avoid preemption while manipulating CRs and MTRRs.
  
  Tested by:	ariff

Modified:
  head/sys/amd64/amd64/amd64_mem.c
  head/sys/i386/i386/i686_mem.c

Modified: head/sys/amd64/amd64/amd64_mem.c
==============================================================================
--- head/sys/amd64/amd64/amd64_mem.c	Mon Jan 17 17:25:46 2011	(r217505)
+++ head/sys/amd64/amd64/amd64_mem.c	Mon Jan 17 17:30:35 2011	(r217506)
@@ -311,6 +311,8 @@ amd64_mrstoreone(void *arg)
 
 	mrd = sc->mr_desc;
 
+	critical_enter();
+
 	/* Disable PGE. */
 	cr4 = rcr4();
 	load_cr4(cr4 & ~CR4_PGE);
@@ -399,6 +401,8 @@ amd64_mrstoreone(void *arg)
 	/* Restore caches and PGE. */
 	load_cr0(cr0);
 	load_cr4(cr4);
+
+	critical_exit();
 }
 
 /*

Modified: head/sys/i386/i386/i686_mem.c
==============================================================================
--- head/sys/i386/i386/i686_mem.c	Mon Jan 17 17:25:46 2011	(r217505)
+++ head/sys/i386/i386/i686_mem.c	Mon Jan 17 17:30:35 2011	(r217506)
@@ -305,6 +305,8 @@ i686_mrstoreone(void *arg)
 
 	mrd = sc->mr_desc;
 
+	critical_enter();
+
 	/* Disable PGE. */
 	cr4 = rcr4();
 	load_cr4(cr4 & ~CR4_PGE);
@@ -393,6 +395,8 @@ i686_mrstoreone(void *arg)
 	/* Restore caches and PGE. */
 	load_cr0(cr0);
 	load_cr4(cr4);
+
+	critical_exit();
 }
 
 /*