kern/71341: Cannot build 5.3 sparc64 kernel with vinum support

[Phil Budne]

>Number:         71341
>Category:       kern
>Synopsis:       Cannot build 5.3 sparc64 kernel with vinum support
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 03 14:30:18 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Phil Budne
>Release:        FreeBSD 5.3-BETA2 sparc64
>Organization:
TripAdvisor
>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:
CVSuped 5.3-BETA2 sources 9/1/2004, cannot build kernel on sparc64
with vinum support; compilation fails

NOTE: this was while building the initial 32btt system, but the problem
is unrelated to sizeof(time_t)

>How-To-Repeat:
kernel config:

include GENERIC
device vinum

>Fix:

The following changes allows kernel to build
(similar patches used to build&run 5.1-CURRENT kernel last November)


*** vinumext.h.orig	Wed Jun 16 05:47:01 2004
--- vinumext.h	Thu Sep  2 13:21:34 2004
***************
*** 247,253 ****
  #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
--- 247,253 ----
  #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
*** vinummemory.c.orig	Sat Jul 10 17:17:04 2004
--- vinummemory.c	Thu Sep  2 13:21:34 2004
***************
*** 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 ----
>Release-Note:
>Audit-Trail:
>Unformatted: