Date: Mon, 17 Jan 2011 17:30:35 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r217506 - in head/sys: amd64/amd64 i386/i386 Message-ID: <201101171730.p0HHUZG5007703@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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(); } /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201101171730.p0HHUZG5007703>