diff options
| author | grog <grog@FreeBSD.org> | 2001-01-10 21:42:06 +0000 |
|---|---|---|
| committer | grog <grog@FreeBSD.org> | 2001-01-10 21:42:06 +0000 |
| commit | d9512fd7b2bd158adad8ec83228eba16f4e6f1e8 (patch) | |
| tree | 217a72df50a8799794e91f6a939ae0099b492cec /sys | |
| parent | 6422e31b024e9e55827907ce4926bb5ac4b0d350 (diff) | |
| download | FreeBSD-src-d9512fd7b2bd158adad8ec83228eba16f4e6f1e8.zip FreeBSD-src-d9512fd7b2bd158adad8ec83228eba16f4e6f1e8.tar.gz | |
Reinstate 1.19.
Prodded by: iedowse
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/vinum/vinumhdr.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/vinum/vinumhdr.h b/sys/dev/vinum/vinumhdr.h index ef2a818..8a5f70e 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.15 1999/10/12 09:40:35 grog Exp grog $ + * $Id: vinumhdr.h,v 1.18 2001/01/04 00:14:14 grog Exp grog $ * $FreeBSD$ */ @@ -86,7 +86,8 @@ 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, intr_nesting_level == 0? M_WAITOK: M_NOWAIT) +#define Malloc(x) malloc((x), M_DEVBUF, \ + PCPU_GET(intr_nesting_level) == 0? M_WAITOK: M_NOWAIT) #define Free(x) free((x), M_DEVBUF) #define LOCKDRIVE(d) lockdrive (d) #endif |
