From 74f5bf080bcf381a45469f70bb1a527db29a5996 Mon Sep 17 00:00:00 2001
From: Greg Lehey <grog@FreeBSD.org>
Date: Tue, 22 May 2001 06:08:52 +0000
Subject: [PATCH] Remove Malloc definitions (now in vinumext.h)

---
 sys/dev/vinum/vinumhdr.h | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/sys/dev/vinum/vinumhdr.h b/sys/dev/vinum/vinumhdr.h
index d6f65179c0d1..2fd1cd0e37a3 100644
--- a/sys/dev/vinum/vinumhdr.h
+++ b/sys/dev/vinum/vinumhdr.h
@@ -36,7 +36,7 @@
 
 /* Header files used by all modules */
 /*
- * $Id: vinumhdr.h,v 1.18 2001/01/04 00:14:14 grog Exp grog $
+ * $Id: vinumhdr.h,v 1.19 2001/05/22 04:07:22 grog Exp grog $
  * $FreeBSD$
  */
 
@@ -75,25 +75,6 @@
 #include <dev/vinum/vinumio.h>
 #include <dev/vinum/vinumkw.h>
 #include <dev/vinum/vinumext.h>
+#include <dev/vinum/vinumutil.h>
 #include <machine/cpu.h>
-
-#undef Free						    /* defined in some funny net stuff */
-#ifdef _KERNEL
-#ifdef VINUMDEBUG
-#define Malloc(x)  MMalloc ((x), __FILE__, __LINE__)	    /* show where we came from */
-#define Free(x)	   FFree ((x), __FILE__, __LINE__)	    /* show where we came from */
-caddr_t MMalloc (int size, char *, int);
-void FFree (void *mem, char *, int);
-#define LOCKDRIVE(d) lockdrive (d, __FILE__, __LINE__)
-#else
-#define Malloc(x)  malloc((x), M_DEVBUF, \
-	curproc->p_intr_nesting_level == 0? M_WAITOK: M_NOWAIT)
-#define Free(x)    free((x), M_DEVBUF)
-#define LOCKDRIVE(d) lockdrive (d)
-#endif
-#else
-#define Malloc(x)  malloc ((x))				    /* just the size */
-#define Free(x)	   free ((x))				    /* just the address */
-#endif
-
 extern struct cdevsw vinum_cdevsw;