3 files changed, 15 insertions, 16 deletions

diff --git a/sys/fs/hpfs/hpfs_subr.c b/sys/fs/hpfs/hpfs_subr.c
index 6844545..ae9a70d 100644
--- a/sys/fs/hpfs/hpfs_subr.c
+++ b/sys/fs/hpfs/hpfs_subr.c
@@ -85,8 +85,8 @@ hpfs_bmdeinit(
 		}
 	}
 
-	FREE(hpmp->hpm_bitmap,M_HPFSMNT);
-	FREE(hpmp->hpm_bmind,M_HPFSMNT);
+	free(hpmp->hpm_bitmap,M_HPFSMNT);
+	free(hpmp->hpm_bmind,M_HPFSMNT);
 
 	dprintf(("\n"));
 }
@@ -109,18 +109,18 @@ hpfs_bminit(
 
 	dprintf(("0x%lx data bands, ", hpmp->hpm_dbnum));
 
-	MALLOC(hpmp->hpm_bmind, lsn_t *, hpmp->hpm_dbnum * sizeof(lsn_t),
+	hpmp->hpm_bmind = malloc(hpmp->hpm_dbnum * sizeof(lsn_t),
 		M_HPFSMNT, M_WAITOK);
 
-	MALLOC(hpmp->hpm_bitmap, u_int8_t *, hpmp->hpm_dbnum * BMSIZE,
+	hpmp->hpm_bitmap = malloc(hpmp->hpm_dbnum * BMSIZE,
 		M_HPFSMNT, M_WAITOK);
 
 	error = bread(hpmp->hpm_devvp, hpmp->hpm_su.su_bitmap.lsn1,
 		((hpmp->hpm_dbnum + 0x7F) & ~(0x7F)) << 2, NOCRED, &bp);
 	if (error) {
 		brelse(bp);
-		FREE(hpmp->hpm_bitmap, M_HPFSMNT);
-		FREE(hpmp->hpm_bmind, M_HPFSMNT);
+		free(hpmp->hpm_bitmap, M_HPFSMNT);
+		free(hpmp->hpm_bmind, M_HPFSMNT);
 		dprintf((" error %d\n", error));
 		return (error);
 	}
@@ -138,8 +138,8 @@ hpfs_bminit(
 				BMSIZE, NOCRED, &bp);
 		if (error) {
 			brelse(bp);
-			FREE(hpmp->hpm_bitmap, M_HPFSMNT);
-			FREE(hpmp->hpm_bmind, M_HPFSMNT);
+			free(hpmp->hpm_bitmap, M_HPFSMNT);
+			free(hpmp->hpm_bmind, M_HPFSMNT);
 			dprintf((" error %d\n", error));
 			return (error);
 		}
@@ -278,8 +278,7 @@ hpfs_cpinit (
 
 	cpicnt = hpmp->hpm_sp.sp_cpinum;
 
-	MALLOC(hpmp->hpm_cpdblk, struct cpdblk *,	
-		cpicnt * sizeof(struct cpdblk), M_HPFSMNT, M_WAITOK);
+	hpmp->hpm_cpdblk = malloc(		cpicnt * sizeof(struct cpdblk), M_HPFSMNT, M_WAITOK);
 
 	cpdbp = hpmp->hpm_cpdblk;
 	lsn = hpmp->hpm_sp.sp_cpi;
@@ -317,7 +316,7 @@ hpfs_cpdeinit (
 	struct hpfsmount *hpmp)
 {
 	dprintf(("hpmp_cpdeinit: "));
-	FREE(hpmp->hpm_cpdblk,M_HPFSMNT);
+	free(hpmp->hpm_cpdblk,M_HPFSMNT);
 	return (0);
 }
 
diff --git a/sys/fs/hpfs/hpfs_vfsops.c b/sys/fs/hpfs/hpfs_vfsops.c
index 02b5ea4..36d3dd5 100644
--- a/sys/fs/hpfs/hpfs_vfsops.c
+++ b/sys/fs/hpfs/hpfs_vfsops.c
@@ -371,7 +371,7 @@ hpfs_unmount(
 	MNT_ILOCK(mp);
 	mp->mnt_flag &= ~MNT_LOCAL;
 	MNT_IUNLOCK(mp);
-	FREE(hpmp, M_HPFSMNT);
+	free(hpmp, M_HPFSMNT);
 
 	return (0);
 }
@@ -476,13 +476,13 @@ hpfs_vget(
 	 * at that time is little, and anyway - we'll
 	 * check for it).
 	 */
-	MALLOC(hp, struct hpfsnode *, sizeof(struct hpfsnode), 
+	hp = malloc(sizeof(struct hpfsnode), 
 		M_HPFSNO, M_WAITOK);
 
 	error = getnewvnode("hpfs", mp, &hpfs_vnodeops, &vp);
 	if (error) {
 		printf("hpfs_vget: can't get new vnode\n");
-		FREE(hp, M_HPFSNO);
+		free(hp, M_HPFSNO);
 		return (error);
 	}
 
diff --git a/sys/fs/hpfs/hpfs_vnops.c b/sys/fs/hpfs/hpfs_vnops.c
index ed343e0..af7cd52 100644
--- a/sys/fs/hpfs/hpfs_vnops.c
+++ b/sys/fs/hpfs/hpfs_vnops.c
@@ -611,7 +611,7 @@ hpfs_reclaim(ap)
 
 	vp->v_data = NULL;
 
-	FREE(hp, M_HPFSNO);
+	free(hp, M_HPFSNO);
 
 	return (0);
 }
@@ -1003,7 +1003,7 @@ readdone:
 		dpStart = (struct dirent *)
 		     ((caddr_t)uio->uio_iov->iov_base -
 			 (uio->uio_offset - off));
-		MALLOC(cookies, u_long *, ncookies * sizeof(u_long),
+		cookies = malloc(ncookies * sizeof(u_long),
 		       M_TEMP, M_WAITOK);
 		for (dp = dpStart, cookiep = cookies, i=0;
 		     i < ncookies;