summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/solbourne/include/pmap.h3
-rw-r--r--sys/arch/solbourne/solbourne/pmap.c8
2 files changed, 2 insertions, 9 deletions
diff --git a/sys/arch/solbourne/include/pmap.h b/sys/arch/solbourne/include/pmap.h
index e65202d0736..50cbc89af4c 100644
--- a/sys/arch/solbourne/include/pmap.h
+++ b/sys/arch/solbourne/include/pmap.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap.h,v 1.8 2014/01/30 18:16:41 miod Exp $ */
+/* $OpenBSD: pmap.h,v 1.9 2014/12/17 15:27:17 deraadt Exp $ */
/*
* Copyright (c) 2005, Miodrag Vallat
@@ -38,7 +38,6 @@ struct pmap {
paddr_t pm_psegtab; /* pa of above */
int pm_refcount; /* reference count */
- struct simplelock pm_lock;
struct pmap_statistics pm_stats; /* pmap statistics */
};
diff --git a/sys/arch/solbourne/solbourne/pmap.c b/sys/arch/solbourne/solbourne/pmap.c
index 58f85528376..66785433f2c 100644
--- a/sys/arch/solbourne/solbourne/pmap.c
+++ b/sys/arch/solbourne/solbourne/pmap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap.c,v 1.7 2014/11/16 12:30:58 deraadt Exp $ */
+/* $OpenBSD: pmap.c,v 1.8 2014/12/17 15:27:17 deraadt Exp $ */
/*
* Copyright (c) 2005, Miodrag Vallat
*
@@ -259,7 +259,6 @@ pmap_bootstrap(size_t promdata)
/*
* Initialize kernel pmap.
*/
- simple_lock_init(&pmap_kernel()->pm_lock);
pmap_kernel()->pm_refcount = 1;
/*
@@ -505,7 +504,6 @@ pmap_create()
pmap = pool_get(&pmappool, PR_WAITOK | PR_ZERO);
pmap->pm_refcount = 1;
- simple_lock_init(&pmap->pm_lock);
/*
* Allocate the page directory.
@@ -543,9 +541,7 @@ pmap_destroy(struct pmap *pmap)
DPRINTF(PDB_DESTROY, ("pmap_destroy(%p)\n", pmap));
- simple_lock(&pmap->pm_lock);
count = --pmap->pm_refcount;
- simple_unlock(&pmap->pm_lock);
if (count == 0) {
pmap_release(pmap);
pool_put(&pmappool, pmap);
@@ -636,9 +632,7 @@ pmap_reference(struct pmap *pmap)
{
DPRINTF(PDB_REFERENCE, ("pmap_reference(%p)\n", pmap));
- simple_lock(&pmap->pm_lock);
pmap->pm_refcount++;
- simple_unlock(&pmap->pm_lock);
}
/*