diff options
| author | grog <grog@FreeBSD.org> | 2001-05-22 06:08:52 +0000 |
|---|---|---|
| committer | grog <grog@FreeBSD.org> | 2001-05-22 06:08:52 +0000 |
| commit | e36c2b74e17f49d51f8d1aaf8dea9d4441b048ad (patch) | |
| tree | 0d8d9a602eb215cb4f4b6c537bf770cf8e728cf7 /sys/dev/vinum | |
| parent | fd51037384391f8740eb023b0f19b170307057b7 (diff) | |
| download | FreeBSD-src-e36c2b74e17f49d51f8d1aaf8dea9d4441b048ad.zip FreeBSD-src-e36c2b74e17f49d51f8d1aaf8dea9d4441b048ad.tar.gz | |
Remove Malloc definitions (now in vinumext.h)
Diffstat (limited to 'sys/dev/vinum')
| -rw-r--r-- | sys/dev/vinum/vinumhdr.h | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/sys/dev/vinum/vinumhdr.h b/sys/dev/vinum/vinumhdr.h index d6f6517..2fd1cd0 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; |
