CVS commit: src/sys/arch/xen/x86

[Andrew Doran]

Module Name:    src
Committed By:   ad
Date:           Tue Jan  7 13:48:01 UTC 2020

Modified Files:
        src/sys/arch/xen/x86: xen_pmap.c

Log Message:
Correction to previous.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/xen/x86/xen_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/xen/x86/xen_pmap.c
diff -u src/sys/arch/xen/x86/xen_pmap.c:1.36 src/sys/arch/xen/x86/xen_pmap.c:1.37
--- src/sys/arch/xen/x86/xen_pmap.c:1.36	Tue Jan  7 13:20:18 2020
+++ src/sys/arch/xen/x86/xen_pmap.c	Tue Jan  7 13:48:01 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: xen_pmap.c,v 1.36 2020/01/07 13:20:18 ad Exp $	*/
+/*	$NetBSD: xen_pmap.c,v 1.37 2020/01/07 13:48:01 ad Exp $	*/
 
 /*
  * Copyright (c) 2007 Manuel Bouyer.
@@ -101,7 +101,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xen_pmap.c,v 1.36 2020/01/07 13:20:18 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xen_pmap.c,v 1.37 2020/01/07 13:48:01 ad Exp $");
 
 #include "opt_user_ldt.h"
 #include "opt_lockdebug.h"
@@ -220,7 +220,9 @@ pmap_extract_ma(struct pmap *pmap, vaddr
 	pmap_map_ptes(pmap, &pmap2, &ptes, &pdes);
 	if (!pmap_pdes_valid(va, pdes, &pde, &lvl)) {
 		pmap_unmap_ptes(pmap, pmap2);
-		mutex_exit(&pmap->pm_lock);
+		if (pmap != pmap_kernel()) {
+			mutex_exit(&pmap->pm_lock);
+		}
 		return false;
 	}