diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2005-12-03 19:06:13 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2005-12-03 19:06:13 +0000 |
| commit | 65918656862c3fb71a7d65c1a06fc226956c6e1f (patch) | |
| tree | 1a71fdb617fb2604569f79604873f02f8b5e9421 /sys/arch/mvme88k | |
| parent | b3c523e0390f0d29a36adf0ab1ad4d6630c5e4dc (diff) | |
Replace simplelocks with __cpu_simple_locks for cmmu and pmap locking,
for the MULTIPROCESSOR case.
Diffstat (limited to 'sys/arch/mvme88k')
| -rw-r--r-- | sys/arch/mvme88k/mvme88k/m88110.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sys/arch/mvme88k/mvme88k/m88110.c b/sys/arch/mvme88k/mvme88k/m88110.c index 74da1df8ab3..587fa6774e0 100644 --- a/sys/arch/mvme88k/mvme88k/m88110.c +++ b/sys/arch/mvme88k/mvme88k/m88110.c @@ -1,4 +1,4 @@ -/* $OpenBSD: m88110.c,v 1.31 2005/12/03 18:48:22 miod Exp $ */ +/* $OpenBSD: m88110.c,v 1.32 2005/12/03 19:06:12 miod Exp $ */ /* * Copyright (c) 1998 Steve Murphree, Jr. * All rights reserved. @@ -59,10 +59,10 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/simplelock.h> #include <uvm/uvm_extern.h> +#include <machine/lock.h> #include <machine/cmmu.h> #include <machine/m88110.h> #include <machine/m88410.h> @@ -180,19 +180,20 @@ m88110_cpu_configuration_print(int master) int proctype = (pid & PID_ARN) >> ARN_SHIFT; int procvers = (pid & PID_VN) >> VN_SHIFT; int cpu = cpu_number(); - struct simplelock print_lock; + static __cpu_simple_lock_t print_lock; CMMU_LOCK; if (master) - simple_lock_init(&print_lock); + __cpu_simple_lock_init(&print_lock); - simple_lock(&print_lock); + __cpu_simple_lock(&print_lock); printf("cpu%d: ", cpu); if (proctype != ARN_88110) { printf("unknown model arch 0x%x version 0x%x\n", proctype, procvers); - simple_unlock(&print_lock); + __cpu_simple_unlock(&print_lock); + CMMU_UNLOCK; return; } @@ -201,7 +202,7 @@ m88110_cpu_configuration_print(int master) printf(", external M88410 cache controller"); printf("\n"); - simple_unlock(&print_lock); + __cpu_simple_unlock(&print_lock); CMMU_UNLOCK; } |