From e8f3ae987441eee401c44dd1a8e113ca9cea484f Mon Sep 17 00:00:00 2001
From: Theo de Raadt <deraadt@cvs.openbsd.org>
Date: Fri, 7 Nov 1997 08:11:45 +0000
Subject: simple_lock api changed slightly

---
 sys/arch/sparc/include/pmap.h | 6 ++----
 sys/arch/sparc/sparc/pmap.c   | 6 +++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/sys/arch/sparc/include/pmap.h b/sys/arch/sparc/include/pmap.h
index af3b5e420a9..a96e5fc48f6 100644
--- a/sys/arch/sparc/include/pmap.h
+++ b/sys/arch/sparc/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.6 1997/09/17 06:47:14 downsj Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.7 1997/11/07 08:11:41 deraadt Exp $	*/
 /*	$NetBSD: pmap.h,v 1.30 1997/08/04 20:00:47 pk Exp $ */
 
 /*
@@ -139,9 +139,7 @@ TAILQ_HEAD(mmuhd,mmuentry);
 struct pmap {
 	union	ctxinfo *pm_ctx;	/* current context, if any */
 	int	pm_ctxnum;		/* current context's number */
-#if 0
-	simple_lock_data_t pm_lock;	/* spinlock */
-#endif
+	struct simplelock pm_lock;	/* spinlock */
 	int	pm_refcount;		/* just what it says */
 
 	struct mmuhd	pm_reglist;	/* MMU regions on this pmap (4/4c) */
diff --git a/sys/arch/sparc/sparc/pmap.c b/sys/arch/sparc/sparc/pmap.c
index 14c3de9b933..e0b9072f327 100644
--- a/sys/arch/sparc/sparc/pmap.c
+++ b/sys/arch/sparc/sparc/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.18 1997/09/17 06:47:21 downsj Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.19 1997/11/07 08:11:44 deraadt Exp $	*/
 /*	$NetBSD: pmap.c,v 1.96 1997/09/14 19:20:48 pk Exp $ */
 
 /*
@@ -66,12 +66,12 @@
 #include <sys/exec.h>
 #include <sys/core.h>
 #include <sys/kcore.h>
+#include <sys/lock.h>
 
 #include <vm/vm.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_prot.h>
 #include <vm/vm_page.h>
-#include <vm/lock.h>
 
 #include <machine/autoconf.h>
 #include <machine/bsd_openprom.h>
@@ -2647,7 +2647,7 @@ pmap_bootstrap4_4c(nctx, nregion, nsegment)
 	 * Intialize the kernel pmap.
 	 */
 	/* kernel_pmap_store.pm_ctxnum = 0; */
-	simple_lock_init(kernel_pmap_store.pm_lock);
+	simple_lock_init(&kernel_pmap_store.pm_lock);
 	kernel_pmap_store.pm_refcount = 1;
 #if defined(SUN4_MMU3L)
 	TAILQ_INIT(&kernel_pmap_store.pm_reglist);
-- 
cgit v1.2.3