X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/blobdiff_plain/ec7f08095fa634a1bf84155704685c1fb33d5fbc..b13267a5123f6a14e47d788c4a8a2a8692e2a119:/sys/bus/cam/cam_extend.c

diff --git a/sys/bus/cam/cam_extend.c b/sys/bus/cam/cam_extend.c
index 5520b917dd..b19ea16d0f 100644
--- a/sys/bus/cam/cam_extend.c
+++ b/sys/bus/cam/cam_extend.c
@@ -13,12 +13,12 @@
  * functioning of this software in any circumstances.
  *
  * $FreeBSD: src/sys/cam/cam_extend.c,v 1.3 1999/08/28 00:40:39 peter Exp $
- * $DragonFly: src/sys/bus/cam/cam_extend.c,v 1.5 2005/05/28 01:16:30 swildner Exp $
+ * $DragonFly: src/sys/bus/cam/cam_extend.c,v 1.7 2006/09/10 01:26:32 dillon Exp $
  */
 /*
  * XXX XXX XXX XXX  We should get DEVFS working so that we
  * don't have to do this, possibly sparse, array based junk.
- * XXX: We can do this now with dev_t, that's even better.
+ * XXX: We can do this now with cdev_t, that's even better.
  */
 /*
  * Extensible arrays: Use a realloc like implementation to permit
@@ -47,7 +47,7 @@ struct extend_array
 struct extend_array *
 cam_extend_new(void)
 {
-	return(malloc(sizeof(struct extend_array), M_DEVBUF,
+	return(kmalloc(sizeof(struct extend_array), M_DEVBUF,
 	    M_INTWAIT | M_ZERO));
 }
 
@@ -56,13 +56,13 @@ cam_extend_set(struct extend_array *ea, int index, void *value)
 {
 	if (index >= ea->nelem) {
 		void **space;
-		space = malloc(sizeof(void *) * (index + EXTEND_CHUNK),
+		space = kmalloc(sizeof(void *) * (index + EXTEND_CHUNK),
 		    M_DEVBUF, M_INTWAIT | M_ZERO);
 
 		/* Make sure we have something to copy before we copy it */
 		if (ea->nelem) {
 			bcopy(ea->ps, space, sizeof(void *) * ea->nelem);
-			free(ea->ps, M_DEVBUF);
+			kfree(ea->ps, M_DEVBUF);
 		}
 
 		ea->ps = space;