From owner-freebsd-stable@FreeBSD.ORG Thu Aug 28 21:19:42 2008 Return-Path: Delivered-To: stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9281E106566B; Thu, 28 Aug 2008 21:19:42 +0000 (UTC) (envelope-from jb@what-creek.com) Received: from what-creek.com (what-creek.com [66.111.37.70]) by mx1.freebsd.org (Postfix) with ESMTP id 67A038FC15; Thu, 28 Aug 2008 21:19:42 +0000 (UTC) (envelope-from jb@what-creek.com) Received: by what-creek.com (Postfix, from userid 102) id 0067B7439B; Thu, 28 Aug 2008 21:19:41 +0000 (GMT) Date: Thu, 28 Aug 2008 21:19:41 +0000 From: John Birrell To: Kostik Belousov Message-ID: <20080828211941.GA28382@what-creek.com> References: <20080828113315.0B8A31B5078@freebsd-stable.sentex.ca> <20080828132554.GP2038@deviant.kiev.zoral.com.ua> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20080828132554.GP2038@deviant.kiev.zoral.com.ua> User-Agent: Mutt/1.4.2.3i Cc: stable@freebsd.org, jb@freebsd.org Subject: Re: [releng_7 tinderbox] failure on amd64/amd64 X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Aug 2008 21:19:42 -0000 On Thu, Aug 28, 2008 at 04:25:54PM +0300, Kostik Belousov wrote: > > /src/sys/modules/cyclic/../../cddl/compat/opensolaris/sys/cpuvar.h:72: error: size of array 'cpuc_pad' is too large > > *** Error code 1 > > This one is caused by struct sx difference between stable/7 and head. > More detailed, sizeof(struct sx) in the LINT build exceeds 56 bytes, > and causes CPUC_PADSIZE to be negative. > > I think that CPU_CACHE_COHERENCE_SIZE shall be defined as roundup. Unless > you have objections, I will commit this to HEAD with short MFC period: Please go ahead. Thanks (and sorry for the pain). > > diff --git a/sys/cddl/compat/opensolaris/sys/cpuvar.h b/sys/cddl/compat/opensolaris/sys/cpuvar.h > index df0af5c..b42fda6 100644 > --- a/sys/cddl/compat/opensolaris/sys/cpuvar.h > +++ b/sys/cddl/compat/opensolaris/sys/cpuvar.h > @@ -65,7 +65,8 @@ extern solaris_cpu_t solaris_cpu[]; > */ > #define CPUC_SIZE (sizeof (uint16_t) + sizeof (uintptr_t) + \ > sizeof (kmutex_t)) > -#define CPUC_PADSIZE CPU_CACHE_COHERENCE_SIZE - CPUC_SIZE > +#define CPUC_SIZE1 roundup(CPUC_SIZE, CPU_CACHE_COHERENCE_SIZE) > +#define CPUC_PADSIZE CPUC_SIZE1 - CPUC_SIZE > > typedef struct cpu_core { > uint16_t cpuc_dtrace_flags; /* DTrace flags */ -- John Birrell