d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove Malloc definitions (now in vinumext.h)

Browse Source
This commit is contained in:
Greg Lehey 2001-05-22 06:08:52 +00:00
parent 12635f9c89
commit 74f5bf080b
1 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sys/dev/vinum/vinumhdr.h
View File

@ -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;