Index: sys/dev/cgd.c
===================================================================
RCS file: /cvsroot/src/sys/dev/cgd.c,v
retrieving revision 1.84
diff -u -p -r1.84 cgd.c
--- sys/dev/cgd.c	16 Mar 2014 05:20:26 -0000	1.84
+++ sys/dev/cgd.c	17 Mar 2014 22:12:56 -0000
@@ -200,7 +200,7 @@ cgd_attach(device_t parent, device_t sel
 {
 	struct cgd_softc *sc = device_private(self);
 
-	simple_lock_init(&sc->sc_slock);
+	mutex_init(&sc->sc_slock, MUTEX_DEFAULT, IPL_BIO);
 	dk_sc_init(&sc->sc_dksc, device_xname(self));
 	sc->sc_dksc.sc_dev = self;
 	disk_init(&sc->sc_dksc.sc_dkdev, sc->sc_dksc.sc_xname, &cgddkdriver);
@@ -354,12 +354,12 @@ cgd_getdata(struct dk_softc *dksc, unsig
 	struct	cgd_softc *cs = (struct cgd_softc *)dksc;
 	void *	data = NULL;
 
-	simple_lock(&cs->sc_slock);
+	mutex_enter(&cs->sc_slock);
 	if (cs->sc_data_used == 0) {
 		cs->sc_data_used = 1;
 		data = cs->sc_data;
 	}
-	simple_unlock(&cs->sc_slock);
+	mutex_exit(&cs->sc_slock);
 
 	if (data)
 		return data;
@@ -373,9 +373,9 @@ cgd_putdata(struct dk_softc *dksc, void 
 	struct	cgd_softc *cs = (struct cgd_softc *)dksc;
 
 	if (data == cs->sc_data) {
-		simple_lock(&cs->sc_slock);
+		mutex_enter(&cs->sc_slock);
 		cs->sc_data_used = 0;
-		simple_unlock(&cs->sc_slock);
+		mutex_exit(&cs->sc_slock);
 	} else {
 		free(data, M_DEVBUF);
 	}
Index: sys/dev/cgdvar.h
===================================================================
RCS file: /cvsroot/src/sys/dev/cgdvar.h,v
retrieving revision 1.16
diff -u -p -r1.16 cgdvar.h
--- sys/dev/cgdvar.h	5 Dec 2012 02:23:20 -0000	1.16
+++ sys/dev/cgdvar.h	17 Mar 2014 22:12:56 -0000
@@ -32,8 +32,6 @@
 #ifndef _DEV_CGDVAR_H_
 #define	_DEV_CGDVAR_H_
 
-#include <sys/simplelock.h>
-
 /* ioctl(2) code: used by CGDIOCSET and CGDIOCCLR */
 struct cgd_ioctl {
 	const char	*ci_disk;
@@ -90,7 +88,7 @@ struct cgd_softc {
 	size_t			 sc_tpathlen;	/* length of prior string */
 	struct cryptdata	 sc_cdata;	/* crypto data */
 	const struct cryptfuncs	*sc_cfuncs;	/* encryption functions */
-	struct simplelock	 sc_slock;	/* our lock */
+	kmutex_t		 sc_slock;	/* our lock */
 };
 #endif
 
 	statvfs.h syscall.h syscallargs.h sysctl.h stdarg.h stdint.h swap.h \