From a0ca06de3d5a6288b293bd44b97b75eb7c084bf8 Mon Sep 17 00:00:00 2001 From: ad Date: Wed, 5 Dec 2007 08:39:46 +0000 Subject: lockmgr -> mutex --- sys/dev/raidframe/rf_driver.c | 6 +++--- sys/dev/raidframe/rf_threadstuff.h | 11 ++++++----- 2 files changed, 9 insertions(+), 8 deletions(-) (limited to 'sys/dev/raidframe') diff --git a/sys/dev/raidframe/rf_driver.c b/sys/dev/raidframe/rf_driver.c index 5706530d4ab..117d1af4a94 100644 --- a/sys/dev/raidframe/rf_driver.c +++ b/sys/dev/raidframe/rf_driver.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_driver.c,v 1.114 2007/03/04 06:02:37 christos Exp $ */ +/* $NetBSD: rf_driver.c,v 1.115 2007/12/05 08:39:46 ad Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. * All rights reserved. @@ -73,7 +73,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: rf_driver.c,v 1.114 2007/03/04 06:02:37 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_driver.c,v 1.115 2007/12/05 08:39:46 ad Exp $"); #include "opt_raid_diagnostic.h" @@ -166,7 +166,7 @@ rf_BootRaidframe() if (raidframe_booted) return (EBUSY); raidframe_booted = 1; - lockinit(&configureMutex, PRIBIO, "RAIDframe lock", 0, 0); + mutex_init(&configureMutex, MUTEX_DEFAULT, IPL_NONE); configureCount = 0; isconfigged = 0; globalShutdown = NULL; diff --git a/sys/dev/raidframe/rf_threadstuff.h b/sys/dev/raidframe/rf_threadstuff.h index 975869f8113..4b416df4447 100644 --- a/sys/dev/raidframe/rf_threadstuff.h +++ b/sys/dev/raidframe/rf_threadstuff.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_threadstuff.h,v 1.23 2007/07/18 19:04:59 ad Exp $ */ +/* $NetBSD: rf_threadstuff.h,v 1.24 2007/12/05 08:39:53 ad Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -48,7 +48,8 @@ #include #include #include -#include +#include +#include #include @@ -68,14 +69,14 @@ typedef void *RF_ThreadArg_t; /* non-spinlock */ -#define decl_lock_data(a,b) a struct lock b; +#define decl_lock_data(a,b) a kmutex_t b; #define RF_DECLARE_LKMGR_MUTEX(_m_) decl_lock_data(,(_m_)) #define RF_DECLARE_LKMGR_STATIC_MUTEX(_m_) decl_lock_data(static,(_m_)) #define RF_DECLARE_LKMGR_EXTERN_MUTEX(_m_) decl_lock_data(extern,(_m_)) -#define RF_LOCK_LKMGR_MUTEX(_m_) lockmgr(&(_m_),LK_EXCLUSIVE,NULL) -#define RF_UNLOCK_LKMGR_MUTEX(_m_) lockmgr(&(_m_),LK_RELEASE,NULL) +#define RF_LOCK_LKMGR_MUTEX(_m_) mutex_enter(&(_m_)) +#define RF_UNLOCK_LKMGR_MUTEX(_m_) mutex_exit(&(_m_)) /* -- cgit