[src/trunk]: src/sys/arch/x86/x86 pmap_map_ptes: fix a bug introduced by rmin...

[yamt <yamt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/654529b9621b
branches:  trunk
changeset: 766498:654529b9621b
user:      yamt <yamt%NetBSD.org@localhost>
date:      Fri Jun 24 01:39:41 2011 +0000

description:
pmap_map_ptes: fix a bug introduced by rmind-uvmplock merge

diffstat:

 sys/arch/x86/x86/pmap.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 2c93d47167fb -r 654529b9621b sys/arch/x86/x86/pmap.c
--- a/sys/arch/x86/x86/pmap.c   Fri Jun 24 01:39:22 2011 +0000
+++ b/sys/arch/x86/x86/pmap.c   Fri Jun 24 01:39:41 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.125 2011/06/23 16:25:09 rmind Exp $ */
+/*     $NetBSD: pmap.c,v 1.126 2011/06/24 01:39:41 yamt Exp $  */
 
 /*-
  * Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
@@ -171,7 +171,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.125 2011/06/23 16:25:09 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.126 2011/06/24 01:39:41 yamt Exp $");
 
 #include "opt_user_ldt.h"
 #include "opt_lockdebug.h"
@@ -744,8 +744,8 @@
 
        l = curlwp;
  retry:
+       mutex_enter(pmap->pm_lock);
        ci = curcpu();
-       mutex_enter(pmap->pm_lock);
        curpmap = ci->ci_pmap;
        if (vm_map_pmap(&l->l_proc->p_vmspace->vm_map) == pmap) {
                /* Our own pmap so just load it: easy. */