Module Name: src
Committed By: yamt
Date: Fri Jun 24 01:39:41 UTC 2011
Modified Files:
src/sys/arch/x86/x86: pmap.c
Log Message:
pmap_map_ptes: fix a bug introduced by rmind-uvmplock merge
To generate a diff of this commit:
cvs rdiff -u -r1.125 -r1.126 src/sys/arch/x86/x86/pmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.125 src/sys/arch/x86/x86/pmap.c:1.126
--- src/sys/arch/x86/x86/pmap.c:1.125 Thu Jun 23 16:25:09 2011
+++ src/sys/arch/x86/x86/pmap.c Fri Jun 24 01:39:41 2011
@@ -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:
- ci = curcpu();
mutex_enter(pmap->pm_lock);
+ ci = curcpu();
curpmap = ci->ci_pmap;
if (vm_map_pmap(&l->l_proc->p_vmspace->vm_map) == pmap) {
/* Our own pmap so just load it: easy. */
