diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/vinum/vinumext.h | 2 | ||||
| -rw-r--r-- | sys/dev/vinum/vinummemory.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/vinum/vinumext.h b/sys/dev/vinum/vinumext.h index e60356cae36c..ed2e6a51c0cf 100644 --- a/sys/dev/vinum/vinumext.h +++ b/sys/dev/vinum/vinumext.h @@ -247,7 +247,7 @@ void FFree(void *mem, char *, int); #define LOCKDRIVE(d) lockdrive (d, __FILE__, __LINE__) #else #define Malloc(x) malloc((x), M_DEVBUF, \ - curthread->td_proc->p_intr_nesting_level == 0? M_WAITOK: M_NOWAIT) + curthread->td_intr_nesting_level == 0? M_WAITOK: M_NOWAIT) #define Free(x) free((x), M_DEVBUF) #define LOCKDRIVE(d) lockdrive (d) #endif diff --git a/sys/dev/vinum/vinummemory.c b/sys/dev/vinum/vinummemory.c index ef8a541bb762..43e19379f4b5 100644 --- a/sys/dev/vinum/vinummemory.c +++ b/sys/dev/vinum/vinummemory.c @@ -92,7 +92,6 @@ LongJmp(jmp_buf buf, int retval) #else /* not i386 */ #define LongJmp longjmp /* just use the kernel function */ #endif /* i386 */ -#endif /* VINUMDEBUG */ /* find the base name of a path name */ char * @@ -105,6 +104,7 @@ basename(char *file) else return ++f; /* skip the / */ } +#endif /* VINUMDEBUG */ #ifdef VINUMDEBUG void |