Re: [head tinderbox] failure on i386/i386

On Thu, Dec 08, 2005 at 09:16:12PM -0500, FreeBSD Tinderbox wrote:
> >>> Kernel build for LINT started on Fri Dec  9 02:15:40 UTC 2005
> >>> stage 1: configuring the kernel
> >>> stage 2.1: cleaning up the object tree
> >>> stage 2.2: rebuilding the object tree
> >>> stage 2.3: build tools
> >>> stage 3.1: making dependencies
> [...]
>                  from /src/sys/net/if.h:390,
>                  from /src/sys/i386/i386/genassym.c:63:
> /src/sys/sys/mbuf.h: In function `m_getjcl':
> /src/sys/sys/mbuf.h:424: error: duplicate case value
> /src/sys/sys/mbuf.h:421: error: previously used here
> /src/sys/sys/mbuf.h: In function `m_cljget':
> /src/sys/sys/mbuf.h:488: error: duplicate case value
> /src/sys/sys/mbuf.h:485: error: previously used here
> *** Error code 1
> 
> Stop in /obj/src/sys/LINT.
> *** Error code 1
> 
> Stop in /src.
> *** Error code 1
> 
> Stop in /src.
> TB --- 2005-12-09 02:16:12 - WARNING: /usr/bin/make returned exit code  1 
> TB --- 2005-12-09 02:16:12 - ERROR: failed to build lint kernel
> TB --- 2005-12-09 02:16:12 - tinderbox aborted

MCLBYTES is a tunable value, so I sent the following patch to Andre:

%%%
Index: mbuf.h
===================================================================
RCS file: /home/ncvs/src/sys/sys/mbuf.h,v
retrieving revision 1.183
diff -u -p -r1.183 mbuf.h
--- mbuf.h	8 Dec 2005 13:13:05 -0000	1.183
+++ mbuf.h	9 Dec 2005 07:51:50 -0000
_at__at_ -421,15 +421,21 _at__at_ m_getjcl(int how, short type, int flags,
 	case MCLBYTES:
 		zone = zone_clust;
 		break;
+#if MJUM4BYTES != MCLBYTES
 	case MJUM4BYTES:
 		zone = zone_jumbo4;
 		break;
+#endif
+#if MJUM9BYTES != MCLBYTES
 	case MJUM9BYTES:
 		zone = zone_jumbo9;
 		break;
+#endif
+#if MJUM16BYTES != MCLBYTES
 	case MJUM16BYTES:
 		zone = zone_jumbo16;
 		break;
+#endif
 	default:
 		panic("%s: m_getjcl: invalid cluster type", __func__);
 	}
_at__at_ -485,15 +491,21 _at__at_ m_cljget(struct mbuf *m, int how, int si
 	case MCLBYTES:
 		zone = zone_clust;
 		break;
+#if MJUM4BYTES != MCLBYTES
 	case MJUM4BYTES:
 		zone = zone_jumbo4;
 		break;
+#endif
+#if MJUM9BYTES != MCLBYTES
 	case MJUM9BYTES:
 		zone = zone_jumbo9;
 		break;
+#endif
+#if MJUM16BYTES != MCLBYTES
 	case MJUM16BYTES:
 		zone = zone_jumbo16;
 		break;
+#endif
 	default:
 		panic("%s: m_getjcl: invalid cluster type", __func__);
 	}
%%%


Cheers,
-- 
Ruslan Ermilov
ru_at_FreeBSD.org
FreeBSD committer