kern/58991: vinum does not build

[Phil Budne]

>Number:         58991
>Category:       kern
>Synopsis:       vinum does not build
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 05 22:50:11 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Phil Budne
>Release:        FreeBSD 5.1-CURRENT sparc64
>Organization:
>Environment:
System: FreeBSD tenzing.tripadvisor.com 5.1-CURRENT FreeBSD 5.1-CURRENT #2: Wed Nov 5 12:56:03 EST 2003 root at tenzing.tripadvisor.com:/usr/src/sys/sparc64/compile/TENZING sparc64


>Description:
	Vinum does not build -- missing p_intr_nesting_level
	no basename prototype (not used when not debugging)

>How-To-Repeat:
	configure "device vinum" and build kernel

>Fix:


*** vinummemory.c.orig	Sun Aug 24 13:55:56 2003
--- vinummemory.c	Wed Nov  5 12:55:48 2003
***************
*** 92,98 ****
  #else /* not i386 */
  #define LongJmp longjmp					    /* just use the kernel function */
  #endif /* i386 */
- #endif /* VINUMDEBUG */
  
  /* find the base name of a path name */
  char *
--- 92,97 ----
***************
*** 106,112 ****
  	return ++f;					    /* skip the / */
  }
  
- #ifdef VINUMDEBUG
  void
  expand_table(void **table, int oldsize, int newsize, char *file, int line)
  #else
--- 105,110 ----
*** vinumext.h.orig	Thu May 22 21:13:43 2003
--- vinumext.h	Wed Nov  5 12:53:07 2003
***************
*** 249,255 ****
  #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)
  #define Free(x)    free((x), M_DEVBUF)
  #define LOCKDRIVE(d) lockdrive (d)
  #endif
--- 249,255 ----
  #define LOCKDRIVE(d) lockdrive (d, __FILE__, __LINE__)
  #else
  #define Malloc(x)  malloc((x), M_DEVBUF, \
! 	curthread->td_intr_nesting_level == 0? M_WAITOK: M_NOWAIT)
  #define Free(x)    free((x), M_DEVBUF)
  #define LOCKDRIVE(d) lockdrive (d)
  #endif
>Release-Note:
>Audit-Trail:
>Unformatted: